Skip to content

Commit

Permalink
Auto merge of rust-lang#54334 - steveklabnik:update-cargo, r=alexcric…
Browse files Browse the repository at this point in the history 
…hton

update cargo

This pulls in rust-lang/cargo#6052, which is needed for the edition preview, and will be backported to beta as well.
  • Loading branch information
@bors
bors committed Sep 22, 2018
2 parents 63c75d3 + 8ccf112 commit c97b60f
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 14 deletions.
43 changes: 30 additions & 13 deletions src/Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,18 +170,24 @@ name = "byteorder"
version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "bytesize"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "cargo"
version = "0.31.0"
version = "0.32.0"
dependencies = [
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"crates-io 0.19.0",
"crates-io 0.20.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.14 (registry+https://github.com/rust-lang/crates.io-index)",
"curl 0.4.17 (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 All @@ -198,7 +204,7 @@ dependencies = [
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazycell 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
"libgit2-sys 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
"libgit2-sys 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -452,9 +458,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "crates-io"
version = "0.19.0"
version = "0.20.0"
dependencies = [
"curl 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
"curl 0.4.17 (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 @@ -546,7 +552,7 @@ dependencies = [

[[package]]
name = "curl"
version = "0.4.14"
version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"curl-sys 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
Expand All @@ -566,6 +572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
"libnghttp2-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libz-sys 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-sys 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -825,7 +832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
"libgit2-sys 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
"libgit2-sys 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-sys 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)",
Expand All @@ -837,7 +844,7 @@ name = "git2-curl"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"curl 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
"curl 0.4.17 (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.4 (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 @@ -1073,7 +1080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "libgit2-sys"
version = "0.7.8"
version = "0.7.9"
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 All @@ -1085,6 +1092,14 @@ dependencies = [
"pkg-config 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "libnghttp2-sys"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "libssh2-sys"
version = "0.2.11"
Expand Down Expand Up @@ -1761,7 +1776,7 @@ dependencies = [
name = "rls"
version = "0.130.5"
dependencies = [
"cargo 0.31.0",
"cargo 0.32.0",
"cargo_metadata 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"clippy_lints 0.0.212",
"crossbeam-channel 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -3144,6 +3159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
"checksum bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f382711e76b9de6c744cc00d0497baba02fb00a787f088c879f01d09468e32"
"checksum byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "74c0b906e9446b0a2e4f760cdb3fa4b2c48cdc6db8766a845c54b6ff063fd2e9"
"checksum bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "716960a18f978640f25101b5cbf1c6f6b0d3192fab36a2d98ca96f0ecbe41010"
"checksum cargo_metadata 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d6809b327f87369e6f3651efd2c5a96c49847a3ed2559477ecba79014751ee1"
"checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"
"checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
Expand All @@ -3168,7 +3184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum crossbeam-utils 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ea52fab26a99d96cdff39d0ca75c9716125937f5dba2ab83923aaaf5928f684a"
"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.14 (registry+https://github.com/rust-lang/crates.io-index)" = "444c2f9e71458b34e75471ed8d756947a0bb920b8b8b9bfc56dfcc4fc6819a13"
"checksum curl 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c8172e96ecfb1a2bfe3843d9d7154099a15130cf4a2f658259c7aa9cc2b5d4ff"
"checksum curl-sys 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "2edeedbbd9c7cdccb14bfb5dfbcc108901f99d3411eb5bab3758789377c5bec4"
"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"
Expand Down Expand Up @@ -3224,7 +3240,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca488b89a5657b0a2ecd45b95609b3e848cf1755da332a0da46e2b2b1cb371a7"
"checksum lazycell 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d33a48d0365c96081958cc663eef834975cb1e8d8bea3378513fc72bdbf11e50"
"checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d"
"checksum libgit2-sys 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "44b1900be992dd5698bd3bb422921e336306d413e2860e6ba3b50e62e6219c4c"
"checksum libgit2-sys 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "93f2b22fce91fb820363cf88a849a8f8fdfd8be37774b6a9dd6cbda05cf940e6"
"checksum libnghttp2-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ffbfb81475cc9f625e44f3a8f8b9cf7173815ae1c7cc2fa91853ec009e38198"
"checksum libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "126a1f4078368b163bfdee65fbab072af08a1b374a5551b21e87ade27b1fbf9d"
"checksum libz-sys 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "65ff614643d7635dfa2151913d95c4ee90ee1fe15d9e0980f4dcb1a7e5837c18"
"checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 76 files
+37 −0 .github/stale.yml
+5 −0 .travis.yml
+5 −4 Cargo.toml
+1 −0 appveyor.yml
+1 −2 src/bin/cargo/commands/bench.rs
+1 −1 src/bin/cargo/commands/build.rs
+1 −1 src/bin/cargo/commands/check.rs
+1 −1 src/bin/cargo/commands/fix.rs
+1 −1 src/bin/cargo/commands/rustc.rs
+1 −1 src/bin/cargo/commands/rustdoc.rs
+6 −3 src/bin/cargo/commands/test.rs
+1 −18 src/cargo/core/compiler/build_context/mod.rs
+0 −1 src/cargo/core/compiler/compilation.rs
+28 −2 src/cargo/core/compiler/context/mod.rs
+181 −82 src/cargo/core/compiler/context/unit_dependencies.rs
+3 −11 src/cargo/core/compiler/job_queue.rs
+8 −8 src/cargo/core/dependency.rs
+468 −15 src/cargo/core/package.rs
+4 −2 src/cargo/core/registry.rs
+10 −4 src/cargo/core/resolver/conflict_cache.rs
+36 −20 src/cargo/core/resolver/mod.rs
+1 −1 src/cargo/core/resolver/resolve.rs
+63 −2 src/cargo/core/source/mod.rs
+1 −0 src/cargo/lib.rs
+1 −1 src/cargo/ops/cargo_clean.rs
+67 −34 src/cargo/ops/cargo_compile.rs
+3 −6 src/cargo/ops/cargo_doc.rs
+3 −1 src/cargo/ops/cargo_fetch.rs
+17 −9 src/cargo/ops/cargo_install.rs
+19 −19 src/cargo/ops/cargo_output_metadata.rs
+1 −16 src/cargo/ops/cargo_test.rs
+0 −33 src/cargo/ops/fix.rs
+2 −1 src/cargo/ops/lockfile.rs
+1 −0 src/cargo/ops/registry.rs
+3 −3 src/cargo/ops/resolve.rs
+7 −1 src/cargo/sources/directory.rs
+6 −2 src/cargo/sources/git/source.rs
+7 −1 src/cargo/sources/path.rs
+11 −6 src/cargo/sources/registry/local.rs
+64 −25 src/cargo/sources/registry/mod.rs
+27 −57 src/cargo/sources/registry/remote.rs
+17 −1 src/cargo/sources/replaced.rs
+0 −21 src/cargo/util/diagnostic_server.rs
+12 −0 src/cargo/util/mod.rs
+35 −14 src/cargo/util/network.rs
+64 −23 src/cargo/util/process_builder.rs
+128 −58 src/cargo/util/progress.rs
+13 −13 src/cargo/util/toml/mod.rs
+1 −1 src/crates-io/Cargo.toml
+4 −1 src/crates-io/lib.rs
+1 −0 src/doc/src/reference/config.md
+1 −1 src/doc/src/reference/manifest.md
+3 −1 src/etc/cargo.bashcomp.sh
+13 −9 tests/testsuite/alt_registry.rs
+7 −9 tests/testsuite/build.rs
+4 −2 tests/testsuite/build_script.rs
+5 −3 tests/testsuite/cfg.rs
+2 −1 tests/testsuite/directory.rs
+5 −5 tests/testsuite/doc.rs
+6 −6 tests/testsuite/fetch.rs
+0 −23 tests/testsuite/fix.rs
+2 −2 tests/testsuite/git.rs
+26 −6 tests/testsuite/install.rs
+1 −1 tests/testsuite/lockfile_compat.rs
+6 −0 tests/testsuite/main.rs
+9 −5 tests/testsuite/overrides.rs
+5 −8 tests/testsuite/package.rs
+12 −6 tests/testsuite/patch.rs
+107 −37 tests/testsuite/registry.rs
+2 −1 tests/testsuite/rename_deps.rs
+169 −1 tests/testsuite/resolve.rs
+9 −0 tests/testsuite/support/mod.rs
+86 −33 tests/testsuite/support/registry.rs
+81 −0 tests/testsuite/test.rs
+4 −3 tests/testsuite/warn_on_failure.rs
+8 −4 tests/testsuite/workspaces.rs
1 change: 1 addition & 0 deletions src/tools/tidy/src/deps.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ const EXCEPTIONS: &[&str] = &[
"ordslice", // Apache-2.0, rls
"cloudabi", // BSD-2-Clause, (rls -> crossbeam-channel 0.2 -> rand 0.5)
"ryu", // Apache-2.0, rls/cargo/... (b/c of serde)
"bytesize", // Apache-2.0, cargo
];

/// Which crates to check against the whitelist?
Expand Down

0 comments on commit c97b60f

Please sign in to comment.