Skip to content

Commit

Permalink
Update cargo
Browse files Browse the repository at this point in the history
  • Loading branch information
@weihanglo
weihanglo committed Jun 14, 2023
1 parent 371994e commit b40b92f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 27 files
+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
5 changes: 4 additions & 1 deletion src/tools/tidy/src/deps.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"),
Expand Down

0 comments on commit b40b92f

Please sign in to comment.