Skip to content

Commit

Permalink
Unrolled build for rust-lang#132560
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#132560 - Urgau:tidy-license-deps, r=onur-ozkan

Remove outdated tidy license fixmes

~~This PR re-enables license dependency checking for:~~
 - ~~the `backtrace` submodule~~
 - ~~and the `portable-simd` subtree~~

~~The `stdarch` submodule doesn't have a `Cargo.lock` yet so we can't re-enable it.~~

This PR removes outdated tidy license fixmes, rust-lang#132560 (comment).

r? bootstrap
  • Loading branch information
rust-timer authored Nov 4, 2024
2 parents 42188c3 + b3fc11b commit b2e5905
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions src/tools/tidy/src/deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>,
),
// tidy-alphabetical-start
("compiler/rustc_codegen_gcc", EXCEPTIONS_GCC, None, &[]),
//("library/backtrace", &[], None), // FIXME uncomment once rust-lang/backtrace#562 has been synced back to the rust repo
//("library/portable-simd", &[], None), // FIXME uncomment once rust-lang/portable-simd#363 has been synced back to the rust repo
//("library/stdarch", EXCEPTIONS_STDARCH, None), // FIXME uncomment once rust-lang/stdarch#1462 has been synced back to the rust repo
("src/bootstrap", EXCEPTIONS_BOOTSTRAP, None, &[]),
("src/ci/docker/host-x86_64/test-various/uefi_qemu_test", EXCEPTIONS_UEFI_QEMU_TEST, None, &[]),
("src/etc/test-float-parse", EXCEPTIONS, None, &[]),
Expand Down Expand Up @@ -116,17 +113,6 @@ const EXCEPTIONS_STDLIB: ExceptionList = &[
// tidy-alphabetical-end
];

// FIXME uncomment once rust-lang/stdarch#1462 lands
/*
const EXCEPTIONS_STDARCH: ExceptionList = &[
// tidy-alphabetical-start
("ryu", "Apache-2.0 OR BSL-1.0"), // BSL is not acceptble, but we use it under Apache-2.0
("wasmparser", "Apache-2.0 WITH LLVM-exception"),
("wasmprinter", "Apache-2.0 WITH LLVM-exception"),
// tidy-alphabetical-end
];
*/

const EXCEPTIONS_CARGO: ExceptionList = &[
// tidy-alphabetical-start
("arrayref", "BSD-2-Clause"),
Expand Down

0 comments on commit b2e5905

Please sign in to comment.