diff options
| author | bors <bors@rust-lang.org> | 2025-09-23 18:14:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-23 18:14:16 +0000 |
| commit | 975e6c8fec280816d24fbde6b8dfe19620f2efe6 (patch) | |
| tree | d8bce208a81f7be58cea0cb192fcc1fd7a19a237 /src/tools | |
| parent | 40560823602064f4c726aea3e15e104449e1a392 (diff) | |
| parent | 8e21b8913533764ed19f13598130cc236b3c238a (diff) | |
| download | rust-975e6c8fec280816d24fbde6b8dfe19620f2efe6.tar.gz rust-975e6c8fec280816d24fbde6b8dfe19620f2efe6.zip | |
Auto merge of #146938 - matthiaskrgr:rollup-y06ggfz, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang/rust#146632 (Fix uses of "adaptor") - rust-lang/rust#146731 (test: Use SVG for terminal url test) - rust-lang/rust#146775 (fixes for numerous clippy warnings) - rust-lang/rust#146784 ([win] Use find-msvc-tools instead of cc to find the linker and rc on Windows) - rust-lang/rust#146799 (Fix a dangling reference in `rustc_thread_pool`) - rust-lang/rust#146802 (mbe: Simplifications and refactoring) - rust-lang/rust#146806 (add private module override re-export test) - rust-lang/rust#146827 (Linker-plugin-based LTO: update list of good combinations (inc. beta + nightly)) - rust-lang/rust#146875 (tests/run-make/crate-loading: Rename source files for clarity) - rust-lang/rust#146877 (prevent line number from being copied in chrome) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/compiletest/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml index cdada5a2230..6597c3c70f6 100644 --- a/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml @@ -12,7 +12,7 @@ path = "src/bin/main.rs" [dependencies] # tidy-alphabetical-start -anstyle-svg = "0.1.3" +anstyle-svg = "0.1.11" build_helper = { path = "../../build_helper" } camino = "1" colored = "2" diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index e275d3042cb..247080102fb 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -367,6 +367,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[ "expect-test", "fallible-iterator", // dependency of `thorin` "fastrand", + "find-msvc-tools", "flate2", "fluent-bundle", "fluent-langneg", |