Auto merge of rust-lang#112601 - weihanglo:update-cargo, r=weihanglo

Update cargo 11 commits in 49b6d9e179a91cf7645142541c9563443f64bf2b..0c14026aa84ee2ec4c67460c0a18abc8519ca6b2 2023-06-09 17:21:19 +0000 to 2023-06-14 18:43:05 +0000 - fix(embedded): Don't append hash to bin names (rust-lang/cargo#12269) - Fix version requirement example in Dependency Resolution, SemVer compatibility section (rust-lang/cargo#12267) - Update triagebot links. (rust-lang/cargo#12265) - Show a better error when container tests fail. (rust-lang/cargo#12264) - chore: update dependencies (rust-lang/cargo#12261) - refactor(embedded) (rust-lang/cargo#12262) - docs: clarify the use of `default` branch instead of `main` by default (rust-lang/cargo#12251) - docs: update changelog for 1.71 backport and 1.72 (rust-lang/cargo#12256) - feat: Initial support for single-file packages (rust-lang/cargo#12245) - test(z-flags): Verify `-Z` flags list is sorted (rust-lang/cargo#12224) - refactor: registry data kinds cleanup (rust-lang/cargo#12248) --- This commit also update LICENSE exceptions, as Cargo introduced a newer version of `dunce` and `blake3` as dependencies. r? `@ghost`
rust-lang-ci · Jun 15, 2023 · 5a65be8 · 5a65be8
2 parents 314c39d + b40b92f
commit 5a65be8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/tools/cargo b/src/tools/cargo
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
@@ -16,6 +16,9 @@ const LICENSES: &[&str] = &[
     "Apache-2.0 OR MIT",
     "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT", // wasi license
     "Apache-2.0/MIT",
+    "BSD-2-Clause",                                        // arrayref from Cargo
+    "CC0-1.0 OR Apache-2.0",                               // blake3 from Cargo
+    "CC0-1.0 OR MIT-0 OR Apache-2.0",                      // constant_time_eq from cargo
     "ISC",
     "MIT / Apache-2.0",
     "MIT OR Apache-2.0 OR Zlib",                           // tinyvec_macros
@@ -54,7 +57,7 @@ const EXCEPTIONS_CARGO: &[(&str, &str)] = &[
     // tidy-alphabetical-start
     ("bitmaps", "MPL-2.0+"),
     ("bytesize", "Apache-2.0"),
-    ("dunce", "CC0-1.0 OR MIT-0"),
+    ("dunce", "CC0-1.0 OR MIT-0 OR Apache-2.0"),
     ("fiat-crypto", "MIT OR Apache-2.0 OR BSD-1-Clause"),
     ("im-rc", "MPL-2.0+"),
     ("imara-diff", "Apache-2.0"),
+39 −5		CHANGELOG.md
+282 −244		Cargo.lock
+7 −0		Cargo.toml
+3 −1		crates/cargo-test-support/src/containers.rs
+3 −1		crates/cargo-test-support/src/lib.rs
+1 −0		deny.toml
+77 −14		src/bin/cargo/cli.rs
+55 −22		src/bin/cargo/commands/run.rs
+22 −0		src/cargo/core/features.rs
+4 −28		src/cargo/core/package.rs
+5 −0		src/cargo/core/package_id.rs
+1 −1		src/cargo/ops/cargo_package.rs
+5 −12		src/cargo/sources/registry/download.rs
+10 −23		src/cargo/sources/registry/http_remote.rs
+2 −4		src/cargo/sources/registry/local.rs
+5 −6		src/cargo/sources/registry/mod.rs
+3 −14		src/cargo/sources/registry/remote.rs
+35 −4		src/cargo/util/network/mod.rs
+870 −0		src/cargo/util/toml/embedded.rs
+1 −0		src/cargo/util/toml/mod.rs
+5 −5		src/doc/contrib/src/process/index.md
+1 −1		src/doc/contrib/src/process/working-on-cargo.md
+1 −1		src/doc/src/reference/resolver.md
+2 −1		src/doc/src/reference/specifying-dependencies.md
+100 −0		src/doc/src/reference/unstable.md
+1 −0		tests/testsuite/main.rs
+510 −0		tests/testsuite/script.rs