Skip to content

Commit

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

6 commits in 05f54fdc34310f458033af8a63ce1d699fae8bf6..20a443231846b81c7b909691ec3f15eb173f2b18
2024-12-03 03:14:12 +0000 to 2024-12-06 21:56:56 +0000
- fix(fingerprint): Don't throwaway the cache on RUSTFLAGS changes  (rust-lang/cargo#14830)
- fix(build-rs)!: Remove meaningless 'cargo_cfg_debug_assertions' (rust-lang/cargo#14901)
- docs(fingerprint): cargo-rustc extra flags do not affect the metadata  (rust-lang/cargo#14898)
- fix(add): Don't select yanked versions when normalizing names (rust-lang/cargo#14895)
- fix(fix): Migrate workspace dependencies (rust-lang/cargo#14890)
- test(build-std): make mock-std closer to real world (rust-lang/cargo#14896)
  • Loading branch information
@bors
bors committed Dec 7, 2024
2 parents 9c707a8 + 71304f6 commit 8c5b940
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 69 files
+1 −1 Cargo.lock
+1 −1 Cargo.toml
+0 −1 crates/build-rs-test-lib/build.rs
+1 −1 crates/build-rs/Cargo.toml
+5 −0 crates/build-rs/src/input.rs
+106 −47 src/cargo/core/compiler/build_runner/compilation_files.rs
+39 −30 src/cargo/core/compiler/fingerprint/mod.rs
+63 −10 src/cargo/ops/fix.rs
+7 −1 src/cargo/sources/registry/mod.rs
+1 −0 src/cargo/util/hasher.rs
+8 −6 tests/testsuite/cargo_add/mod.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_git/in
+0 −0 tests/testsuite/cargo_add/normalize_name_git/mod.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_git/out/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_git/stderr.term.svg
+0 −0 tests/testsuite/cargo_add/normalize_name_path/in/dependency/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_path/in/dependency/src/lib.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_path/in/primary/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_path/in/primary/src/lib.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_path/mod.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_path/out/dependency/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_path/out/primary/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_path/stderr.term.svg
+0 −0 tests/testsuite/cargo_add/normalize_name_path_existing/in/Cargo.lock
+0 −0 tests/testsuite/cargo_add/normalize_name_path_existing/in/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_path_existing/in/fuzzy_name/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_path_existing/in/fuzzy_name/src/lib.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_path_existing/in/primary/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_path_existing/in/primary/src/lib.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_path_existing/mod.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_path_existing/out/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_path_existing/out/primary/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_path_existing/out/primary/src/lib.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_path_existing/stderr.term.svg
+0 −0 tests/testsuite/cargo_add/normalize_name_registry/in
+0 −0 tests/testsuite/cargo_add/normalize_name_registry/mod.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_registry/out/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_registry/stderr.term.svg
+0 −0 tests/testsuite/cargo_add/normalize_name_registry_existing/in/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_registry_existing/in/src/lib.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_registry_existing/mod.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_registry_existing/out/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_registry_existing/stderr.term.svg
+1 −0 tests/testsuite/cargo_add/normalize_name_registry_yanked/in
+31 −0 tests/testsuite/cargo_add/normalize_name_registry_yanked/mod.rs
+9 −0 tests/testsuite/cargo_add/normalize_name_registry_yanked/out/Cargo.toml
+34 −0 tests/testsuite/cargo_add/normalize_name_registry_yanked/stderr.term.svg
+0 −0 tests/testsuite/cargo_add/normalize_name_workspace_dep/in/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_workspace_dep/in/primary/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_workspace_dep/in/primary/src/lib.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_workspace_dep/mod.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_workspace_dep/out/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_workspace_dep/out/primary/Cargo.toml
+0 −0 tests/testsuite/cargo_add/normalize_name_workspace_dep/out/primary/src/lib.rs
+0 −0 tests/testsuite/cargo_add/normalize_name_workspace_dep/stderr.term.svg
+1 −0 tests/testsuite/cargo_add/yanked/in
+31 −0 tests/testsuite/cargo_add/yanked/mod.rs
+9 −0 tests/testsuite/cargo_add/yanked/out/Cargo.toml
+31 −0 tests/testsuite/cargo_add/yanked/stderr.term.svg
+0 −1 tests/testsuite/config_include.rs
+75 −0 tests/testsuite/fix.rs
+37 −5 tests/testsuite/freshness.rs
+41 −5 tests/testsuite/freshness_checksum.rs
+1 −1 tests/testsuite/mock-std/library/compiler_builtins/src/lib.rs
+1 −0 tests/testsuite/mock-std/library/core/src/lib.rs
+0 −1 tests/testsuite/pgo.rs
+0 −1 tests/testsuite/rustc.rs
+136 −42 tests/testsuite/rustflags.rs
+6 −5 tests/testsuite/standard_lib.rs

0 comments on commit 8c5b940

Please sign in to comment.