Skip to content

Commit

Permalink
Auto merge of rust-lang#118663 - weihanglo:update-cargo, r=weihanglo
Browse files Browse the repository at this point in the history 
Update cargo

5 commits in 623b788496b3e51dc2f9282373cf0f6971a229b5..9787229614b27854cf73d57ffae430d7c1e6caa4
2023-12-02 18:10:03 +0000 to 2023-12-06 02:29:23 +0000
- feat(spec): Extend PackageIdSpec with source kind + git ref for unambiguous specs (rust-lang/cargo#12933)
- test(trim-paths): assert `OSO` and `SO` cannot be trimmed (rust-lang/cargo#13118)
- refactor(schemas): Pull out mod for proposed schemas package (rust-lang/cargo#13097)
- chore(test): remove unnecesary packages and versions for `optionals` tests (rust-lang/cargo#13108)
- chore(config): migrate renovate config (rust-lang/cargo#13106)

r? ghost
  • Loading branch information
@bors
bors committed Dec 6, 2023
2 parents 1dd4db5 + 2bf976d commit 17a520a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 45 files
+4 −4 .github/renovate.json5
+1 −1 src/bin/cargo/main.rs
+2 −2 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/core/manifest.rs
+1 −1 src/cargo/core/mod.rs
+183 −3 src/cargo/core/package_id_spec.rs
+5 −5 src/cargo/core/profiles.rs
+6 −2 src/cargo/core/source_id.rs
+2 −3 src/cargo/core/workspace.rs
+2 −1 src/cargo/lib.rs
+1 −1 src/cargo/util/command_prelude.rs
+108 −107 src/cargo/util/toml/mod.rs
+4 −4 src/cargo/util/toml/targets.rs
+0 −0 src/cargo/util_schemas/manifest.rs
+8 −0 src/cargo/util_schemas/mod.rs
+24 −18 src/doc/src/reference/pkgid-spec.md
+1 −0 tests/testsuite/cargo_add/mod.rs
+2 −14 tests/testsuite/cargo_add/no_optional/mod.rs
+1 −2 tests/testsuite/cargo_add/no_optional/out/Cargo.toml
+1 −2 tests/testsuite/cargo_add/no_optional/stderr.log
+2 −14 tests/testsuite/cargo_add/optional/mod.rs
+2 −4 tests/testsuite/cargo_add/optional/out/Cargo.toml
+1 −2 tests/testsuite/cargo_add/optional/stderr.log
+1 −2 tests/testsuite/cargo_add/overwrite_no_optional/in/Cargo.toml
+2 −14 tests/testsuite/cargo_add/overwrite_no_optional/mod.rs
+1 −2 tests/testsuite/cargo_add/overwrite_no_optional/out/Cargo.toml
+1 −2 tests/testsuite/cargo_add/overwrite_no_optional/stderr.log
+1 −2 tests/testsuite/cargo_add/overwrite_no_optional_with_optional/in/Cargo.toml
+2 −14 tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs
+2 −4 tests/testsuite/cargo_add/overwrite_no_optional_with_optional/out/Cargo.toml
+1 −2 tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.log
+1 −2 tests/testsuite/cargo_add/overwrite_optional/in/Cargo.toml
+2 −14 tests/testsuite/cargo_add/overwrite_optional/mod.rs
+2 −4 tests/testsuite/cargo_add/overwrite_optional/out/Cargo.toml
+1 −2 tests/testsuite/cargo_add/overwrite_optional/stderr.log
+0 −1 tests/testsuite/cargo_add/overwrite_optional_with_no_optional/in/Cargo.toml
+2 −12 tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs
+0 −1 tests/testsuite/cargo_add/overwrite_optional_with_no_optional/out/Cargo.toml
+0 −1 tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.log
+1 −11 tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs
+0 −1 tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.log
+3 −3 tests/testsuite/config.rs
+94 −4 tests/testsuite/pkgid.rs
+1 −1 tests/testsuite/profile_config.rs
+49 −8 tests/testsuite/profile_trim_paths.rs

0 comments on commit 17a520a

Please sign in to comment.