Skip to content

Commit

Permalink
Auto merge of #55830 - alexcrichton:update-cargo, r=alexcrichton
Browse files Browse the repository at this point in the history 
Update Cargo submodule

Hopefully a relatively routine update!
  • Loading branch information
@bors
bors committed Nov 10, 2018
2 parents 4cd3294 + 62d7801 commit 42959a2
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
27 changes: 14 additions & 13 deletions src/Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ dependencies = [
"crates-io 0.21.0",
"crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"curl 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)",
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
"curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"filetime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -230,7 +231,7 @@ dependencies = [
"serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)",
"shell-escape 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"tar 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)",
"tar 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile 3.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"termcolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -474,7 +475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "crates-io"
version = "0.21.0"
dependencies = [
"curl 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)",
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -561,10 +562,10 @@ dependencies = [

[[package]]
name = "curl"
version = "0.4.18"
version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"curl-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
"curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
Expand All @@ -576,7 +577,7 @@ dependencies = [

[[package]]
name = "curl-sys"
version = "0.4.13"
version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -848,7 +849,7 @@ name = "git2-curl"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"curl 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)",
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
"git2 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -966,7 +967,7 @@ dependencies = [
"flate2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"tar 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)",
"tar 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
"walkdir 2.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"xz2 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -1088,7 +1089,7 @@ version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
"curl-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
"curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
"libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"libz-sys 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -2838,7 +2839,7 @@ dependencies = [

[[package]]
name = "tar"
version = "0.4.16"
version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"filetime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -3210,8 +3211,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9"
"checksum crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "677d453a17e8bd2b913fa38e8b9cf04bcdbb5be790aa294f2389661d72036015"
"checksum crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "09de9ee0fc255ace04c7fa0763c9395a945c37c8292bb554f8d48361d1dcf1b4"
"checksum curl 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)" = "a9e5285b49b44401518c947d3b808d14d99a538a6c9ffb3ec0205c11f9fc4389"
"checksum curl-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "08459503c415173da1ce6b41036a37b8bfdd86af46d45abb9964d4c61fe670ef"
"checksum curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)" = "c7c9d851c825e0c033979d4516c9173bc19a78a96eb4d6ae51d4045440eafa16"
"checksum curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "721c204978be2143fab0a84b708c49d79d1f6100b8785610f456043a90708870"
"checksum datafrog 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "16d724bf4ffe77cdceeecd461009b5f8d9e23c5d645d68bedb4586bf43e7e142"
"checksum derive-new 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ceed73957c449214f8440eec8ad7fa282b67dc9eacbb24a3085b15d60397a17a"
"checksum derive_more 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46c7f14685a20f5dd08e7f754f2ea8cc064d8f4214ae21116c106a2768ba7b9b"
Expand Down Expand Up @@ -3390,7 +3391,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
"checksum synstructure 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85bb9b7550d063ea184027c9b8c20ac167cd36d3e06b3a40bceb9d746dc1a7b7"
"checksum tar 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)" = "e8f41ca4a5689f06998f0247fcb60da6c760f1950cc9df2a10d71575ad0b062a"
"checksum tar 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)" = "69e16840a1e0a1f1a880b739ef1cc6a4b85496c99b8aa786ccffce6e0c15624c"
"checksum tempfile 3.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c4b103c6d08d323b92ff42c8ce62abcd83ca8efa7fd5bf7927efefec75f58c76"
"checksum tendril 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9de21546595a0873061940d994bbbc5c35f024ae4fd61ec5c5b159115684f508"
"checksum term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 44 files
+1 −0 .travis.yml
+3 −2 Cargo.toml
+2 −0 src/cargo/core/compiler/context/mod.rs
+8 −7 src/cargo/core/compiler/job_queue.rs
+18 −3 src/cargo/core/compiler/mod.rs
+174 −27 src/cargo/core/package.rs
+3 −3 src/cargo/core/resolver/conflict_cache.rs
+10 −9 src/cargo/core/resolver/context.rs
+2 −1 src/cargo/core/resolver/encode.rs
+20 −1 src/cargo/core/resolver/errors.rs
+13 −8 src/cargo/core/resolver/mod.rs
+4 −0 src/cargo/core/resolver/resolve.rs
+2 −20 src/cargo/core/resolver/types.rs
+27 −9 src/cargo/core/workspace.rs
+1 −0 src/cargo/lib.rs
+11 −1 src/cargo/ops/cargo_new.rs
+3 −0 src/cargo/ops/cargo_package.rs
+8 −4 src/cargo/ops/fix.rs
+2 −1 src/cargo/ops/mod.rs
+46 −29 src/cargo/ops/registry.rs
+15 −8 src/cargo/sources/git/utils.rs
+4 −3 src/cargo/util/config.rs
+25 −1 src/cargo/util/graph.rs
+4 −2 src/cargo/util/network.rs
+25 −15 src/cargo/util/process_builder.rs
+3 −1 src/cargo/util/progress.rs
+26 −1 src/cargo/util/toml/mod.rs
+17 −0 src/cargo/util/toml/targets.rs
+1 −1 src/doc/src/reference/config.md
+1 −1 src/doc/src/reference/manifest.md
+2 −2 tests/testsuite/alt_registry.rs
+1 −1 tests/testsuite/bad_config.rs
+62 −0 tests/testsuite/build.rs
+45 −1 tests/testsuite/fix.rs
+45 −0 tests/testsuite/git.rs
+10 −1 tests/testsuite/metabuild.rs
+17 −0 tests/testsuite/new.rs
+14 −8 tests/testsuite/package.rs
+142 −0 tests/testsuite/proc_macro.rs
+1 −1 tests/testsuite/rename_deps.rs
+90 −29 tests/testsuite/resolve.rs
+22 −2 tests/testsuite/support/mod.rs
+70 −20 tests/testsuite/support/resolver.rs
+119 −0 tests/testsuite/workspaces.rs
2 changes: 1 addition & 1 deletion src/tools/rustc-workspace-hack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ openssl = { version = "0.10.12", optional = true }


[features]
all-static = ['openssl/vendored', 'curl-sys/static-curl']
all-static = ['openssl/vendored', 'curl-sys/static-curl', 'curl-sys/force-system-lib-on-osx']

0 comments on commit 42959a2

Please sign in to comment.