diff options
| author | Jubilee <workingjubilee@gmail.com> | 2025-01-04 07:57:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-04 07:57:34 -0800 |
| commit | 6adcdc368ae1bfa6584e4af0034765cc1dc8e4ee (patch) | |
| tree | 262e3d8e9ecd75201adac6d1bc909a172eca56bf /src/tools | |
| parent | 0da5bb405d1f4516386b66546a4b945e38aba1ea (diff) | |
| parent | 4d3a0286e915ed732bb88c39aeaa95670fa8fdcb (diff) | |
| download | rust-6adcdc368ae1bfa6584e4af0034765cc1dc8e4ee.tar.gz rust-6adcdc368ae1bfa6584e4af0034765cc1dc8e4ee.zip | |
Rollup merge of #135070 - klensy:backtrace-deps, r=workingjubilee
std: sync to dep versions of backtrace Minor versions from backtrace desynced with std (they still differs in patch numbers, but still better): https://github.com/rust-lang/backtrace-rs/blob/4d7906bb24ae91ee6587127020d360f5298f9e7e/Cargo.toml#L44-L48 There is hidden bug here, let's see if CI can find it. cc `@workingjubilee`
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index d00d5a9b4da..912cbb668b0 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -18,7 +18,7 @@ const LICENSES: &[&str] = &[ // tidy-alphabetical-start "(MIT OR Apache-2.0) AND Unicode-3.0", // unicode_ident (1.0.14) "(MIT OR Apache-2.0) AND Unicode-DFS-2016", // unicode_ident (1.0.12) - "0BSD OR MIT OR Apache-2.0", // adler license + "0BSD OR MIT OR Apache-2.0", // adler2 license "0BSD", "Apache-2.0 / MIT", "Apache-2.0 OR ISC OR MIT", @@ -462,7 +462,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[ const PERMITTED_STDLIB_DEPENDENCIES: &[&str] = &[ // tidy-alphabetical-start "addr2line", - "adler", + "adler2", "allocator-api2", "cc", "cfg-if", |