Skip to content

Commit

Permalink
Auto merge of #74923 - ehuss:update-cargo, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history 
Update cargo

14 commits in aa6872140ab0fa10f641ab0b981d5330d419e927..974eb438da8ced6e3becda2bbf63d9b643eacdeb
2020-07-23 13:46:27 +0000 to 2020-07-29 16:15:05 +0000
- Fix O0 build scripts by default without `[profile.release]` (rust-lang/cargo#8560)
- Emphasize git dependency version locking behavior. (rust-lang/cargo#8561)
- Update lock file encodings on changes (rust-lang/cargo#8554)
- Fix sporadic lto test failures. (rust-lang/cargo#8559)
- build-std: Fix libraries paths following upstream (rust-lang/cargo#8558)
- Flag git http errors as maybe spurious (rust-lang/cargo#8553)
- Display builtin aliases with `cargo --list` (rust-lang/cargo#8542)
- Check manifest for requiring nonexistent features (rust-lang/cargo#7950)
- Clarify test name filter usage (rust-lang/cargo#8552)
- Revert Cargo Book changes for default edition (rust-lang/cargo#8551)
- Prepare for not defaulting to master branch for git deps (rust-lang/cargo#8522)
- Include `+` for crates.io feature requirements in the Cargo Book section on features (rust-lang/cargo#8547)
- Update termcolor and fwdansi versions (rust-lang/cargo#8540)
- Cargo book nitpick in Manifest section (rust-lang/cargo#8543)
  • Loading branch information
@bors
bors committed Jul 30, 2020
2 parents fb0b123 + 89d7906 commit 6e50a22
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 19 deletions.
24 changes: 7 additions & 17 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1121,9 +1121,9 @@ checksum = "45dc39533a6cae6da2b56da48edae506bb767ec07370f86f70fc062e9d435869"

[[package]]
name = "fwdansi"
version = "1.0.1"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34dd4c507af68d37ffef962063dfa1944ce0dd4d5b82043dbab1dabe088610c3"
checksum = "08c1f5787fe85505d1f7777268db5103d80a7a374d2316a7ce262e57baf8f208"
dependencies = [
"memchr",
"termcolor",
Expand Down Expand Up @@ -4548,11 +4548,11 @@ dependencies = [

[[package]]
name = "termcolor"
version = "1.0.4"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
dependencies = [
"wincolor",
"winapi-util",
]

[[package]]
Expand Down Expand Up @@ -5180,9 +5180,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

[[package]]
name = "winapi-util"
version = "0.1.2"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
dependencies = [
"winapi 0.3.8",
]
Expand All @@ -5193,16 +5193,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

[[package]]
name = "wincolor"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
dependencies = [
"winapi 0.3.8",
"winapi-util",
]

[[package]]
name = "ws2_32-sys"
version = "0.2.1"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 55 files
+2 −2 Cargo.toml
+28 −6 src/bin/cargo/main.rs
+6 −6 src/cargo/core/compiler/standard_lib.rs
+10 −2 src/cargo/core/dependency.rs
+23 −11 src/cargo/core/profiles.rs
+7 −8 src/cargo/core/registry.rs
+7 −10 src/cargo/core/resolver/context.rs
+54 −9 src/cargo/core/resolver/dep_cache.rs
+93 −39 src/cargo/core/resolver/encode.rs
+4 −3 src/cargo/core/resolver/mod.rs
+25 −50 src/cargo/core/resolver/resolve.rs
+100 −61 src/cargo/core/source/source_id.rs
+72 −1 src/cargo/ops/cargo_compile.rs
+4 −4 src/cargo/ops/cargo_generate_lockfile.rs
+2 −2 src/cargo/ops/cargo_package.rs
+30 −15 src/cargo/ops/lockfile.rs
+2 −2 src/cargo/ops/resolve.rs
+6 −4 src/cargo/sources/git/source.rs
+160 −12 src/cargo/sources/git/utils.rs
+1 −1 src/cargo/sources/registry/remote.rs
+4 −1 src/cargo/util/network.rs
+8 −2 src/doc/man/cargo-test.adoc
+13 −2 src/doc/man/generated/cargo-test.html
+1 −1 src/doc/src/reference/features.md
+18 −0 src/doc/src/reference/profiles.md
+5 −2 src/doc/src/reference/specifying-dependencies.md
+23 −4 src/etc/man/cargo-test.1
+3 −0 tests/testsuite/bench.rs
+35 −0 tests/testsuite/build.rs
+11 −0 tests/testsuite/cargo_command.rs
+51 −8 tests/testsuite/features.rs
+196 −9 tests/testsuite/git.rs
+142 −16 tests/testsuite/lockfile_compat.rs
+4 −2 tests/testsuite/lto.rs
+5 −5 tests/testsuite/mock-std/Cargo.toml
+0 −3 tests/testsuite/mock-std/library/alloc/Cargo.toml
+0 −0 tests/testsuite/mock-std/library/alloc/src/lib.rs
+0 −3 tests/testsuite/mock-std/library/compiler_builtins/Cargo.toml
+0 −0 tests/testsuite/mock-std/library/compiler_builtins/src/lib.rs
+0 −3 tests/testsuite/mock-std/library/core/Cargo.toml
+0 −0 tests/testsuite/mock-std/library/core/src/lib.rs
+0 −3 tests/testsuite/mock-std/library/panic_unwind/Cargo.toml
+0 −0 tests/testsuite/mock-std/library/panic_unwind/src/lib.rs
+0 −3 tests/testsuite/mock-std/library/proc_macro/Cargo.toml
+0 −0 tests/testsuite/mock-std/library/proc_macro/src/lib.rs
+1 −1 tests/testsuite/mock-std/library/rustc-std-workspace-alloc/Cargo.toml
+0 −0 tests/testsuite/mock-std/library/rustc-std-workspace-alloc/lib.rs
+1 −1 tests/testsuite/mock-std/library/rustc-std-workspace-core/Cargo.toml
+0 −0 tests/testsuite/mock-std/library/rustc-std-workspace-core/lib.rs
+1 −1 tests/testsuite/mock-std/library/rustc-std-workspace-std/Cargo.toml
+0 −0 tests/testsuite/mock-std/library/rustc-std-workspace-std/lib.rs
+0 −3 tests/testsuite/mock-std/library/std/Cargo.toml
+0 −0 tests/testsuite/mock-std/library/std/src/lib.rs
+4 −7 tests/testsuite/mock-std/library/test/Cargo.toml
+0 −0 tests/testsuite/mock-std/library/test/src/lib.rs
1 change: 0 additions & 1 deletion src/tools/tidy/src/deps.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
"winapi-i686-pc-windows-gnu",
"winapi-util",
"winapi-x86_64-pc-windows-gnu",
"wincolor",
];

/// Dependency checks.
Expand Down

0 comments on commit 6e50a22

Please sign in to comment.