Skip to content

Commit

Permalink
Rollup merge of rust-lang#64952 - michaelwoerister:update-cargo, r=al…
Browse files Browse the repository at this point in the history 
…excrichton

Update cargo.

Pulls rust-lang/cargo@f3c92ed into nightly Rust.

r? @alexcrichton
  • Loading branch information
@tmandry
tmandry committed Oct 2, 2019
2 parents 73aa2bd + 8d9abcd commit 2f29548
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
15 changes: 7 additions & 8 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ dependencies = [

[[package]]
name = "cargo"
version = "0.40.0"
version = "0.41.0"
dependencies = [
"atty",
"bytesize",
Expand Down Expand Up @@ -600,7 +600,7 @@ checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"

[[package]]
name = "crates-io"
version = "0.28.0"
version = "0.29.0"
dependencies = [
"curl",
"failure",
Expand Down Expand Up @@ -730,25 +730,24 @@ dependencies = [

[[package]]
name = "curl"
version = "0.4.21"
version = "0.4.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a85f2f95f2bd277d316d1aa8a477687ab4a6942258c7db7c89c187534669979c"
checksum = "d08ad3cb89d076a36b0ce5749eec2c9964f70c0c58480ab6b75a91ec4fc206d8"
dependencies = [
"curl-sys",
"kernel32-sys",
"libc",
"openssl-probe",
"openssl-sys",
"schannel",
"socket2",
"winapi 0.2.8",
"winapi 0.3.6",
]

[[package]]
name = "curl-sys"
version = "0.4.18"
version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d91a0052d5b982887d8e829bee0faffc7218ea3c6ebd3d6c2c8f678a93c9a42"
checksum = "2e9a9a4e417722876332136a00cacf92c2ceb331fab4b52b6a1ad16c6cd79255"
dependencies = [
"cc",
"libc",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 84 files
+92 −3 CHANGELOG.md
+4 −4 Cargo.toml
+2 −4 crates/cargo-test-support/src/lib.rs
+1 −1 crates/crates-io/Cargo.toml
+11 −2 src/bin/cargo/commands/bench.rs
+7 −1 src/bin/cargo/commands/build.rs
+2 −2 src/bin/cargo/commands/check.rs
+3 −1 src/bin/cargo/commands/clean.rs
+3 −1 src/bin/cargo/commands/clippy.rs
+3 −1 src/bin/cargo/commands/doc.rs
+2 −2 src/bin/cargo/commands/fix.rs
+10 −3 src/bin/cargo/commands/install.rs
+7 −1 src/bin/cargo/commands/run.rs
+7 −2 src/bin/cargo/commands/rustc.rs
+2 −0 src/bin/cargo/commands/rustdoc.rs
+13 −1 src/bin/cargo/commands/test.rs
+43 −38 src/cargo/core/compiler/build_config.rs
+63 −67 src/cargo/core/compiler/build_context/mod.rs
+18 −46 src/cargo/core/compiler/build_context/target_info.rs
+2 −2 src/cargo/core/compiler/build_plan.rs
+15 −8 src/cargo/core/compiler/compilation.rs
+128 −0 src/cargo/core/compiler/compile_kind.rs
+21 −51 src/cargo/core/compiler/context/compilation_files.rs
+23 −31 src/cargo/core/compiler/context/mod.rs
+12 −19 src/cargo/core/compiler/custom_build.rs
+2 −2 src/cargo/core/compiler/fingerprint.rs
+6 −5 src/cargo/core/compiler/job_queue.rs
+16 −22 src/cargo/core/compiler/layout.rs
+12 −43 src/cargo/core/compiler/mod.rs
+5 −10 src/cargo/core/compiler/standard_lib.rs
+2 −11 src/cargo/core/compiler/timings.rs
+3 −3 src/cargo/core/compiler/unit.rs
+10 −12 src/cargo/core/compiler/unit_dependencies.rs
+5 −0 src/cargo/core/features.rs
+20 −1 src/cargo/core/interning.rs
+365 −67 src/cargo/core/profiles.rs
+18 −13 src/cargo/core/resolver/context.rs
+1 −1 src/cargo/core/resolver/errors.rs
+24 −13 src/cargo/ops/cargo_clean.rs
+16 −19 src/cargo/ops/cargo_compile.rs
+10 −19 src/cargo/ops/cargo_doc.rs
+37 −35 src/cargo/ops/cargo_fetch.rs
+7 −9 src/cargo/ops/cargo_install.rs
+10 −1 src/cargo/ops/cargo_package.rs
+11 −19 src/cargo/ops/common_for_install_and_uninstall.rs
+37 −3 src/cargo/ops/registry.rs
+2 −2 src/cargo/sources/registry/mod.rs
+59 −4 src/cargo/util/command_prelude.rs
+26 −0 src/cargo/util/config.rs
+2 −2 src/cargo/util/dependency_queue.rs
+7 −0 src/cargo/util/network.rs
+1 −2 src/cargo/util/progress.rs
+3 −2 src/cargo/util/rustc.rs
+136 −34 src/cargo/util/toml/mod.rs
+7 −0 src/doc/src/reference/config.md
+60 −1 src/doc/src/reference/unstable.md
+9 −2 tests/testsuite/bad_config.rs
+23 −23 tests/testsuite/bench.rs
+0 −12 tests/testsuite/build.rs
+6 −6 tests/testsuite/build_script.rs
+106 −30 tests/testsuite/config.rs
+5 −5 tests/testsuite/cross_compile.rs
+1 −7 tests/testsuite/fix.rs
+25 −26 tests/testsuite/freshness.rs
+1 −1 tests/testsuite/git.rs
+1 −0 tests/testsuite/main.rs
+5 −1 tests/testsuite/member_errors.rs
+0 −20 tests/testsuite/message_format.rs
+1 −1 tests/testsuite/new.rs
+57 −0 tests/testsuite/patch.rs
+2 −2 tests/testsuite/path.rs
+1 −6 tests/testsuite/profile_config.rs
+477 −0 tests/testsuite/profile_custom.rs
+0 −36 tests/testsuite/profile_overrides.rs
+128 −104 tests/testsuite/profile_targets.rs
+1 −1 tests/testsuite/profiles.rs
+55 −0 tests/testsuite/publish_lockfile.rs
+22 −22 tests/testsuite/required_features.rs
+4 −4 tests/testsuite/rustflags.rs
+5 −1 tests/testsuite/search.rs
+2 −2 tests/testsuite/standard_lib.rs
+47 −47 tests/testsuite/test.rs
+1 −6 tests/testsuite/timings.rs
+2 −2 tests/testsuite/tool_paths.rs
2 changes: 1 addition & 1 deletion src/tools/rls
Submodule rls updated from 80a1d3 to 8dc9ba
1 change: 1 addition & 0 deletions src/tools/rustc-workspace-hack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ features = [
"jobapi",
"jobapi2",
"knownfolders",
"libloaderapi",
"lmcons",
"memoryapi",
"minschannel",
Expand Down

0 comments on commit 2f29548

Please sign in to comment.