Skip to content

Commit 01920a0

Browse files
committed
Check more workspaces
1 parent 26a29c5 commit 01920a0

File tree

1 file changed

+23
-0
lines changed

1 file changed

+23
-0
lines changed

src/tools/tidy/src/deps.rs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ type ExceptionList = &'static [(&'static str, &'static str)];
4141
/// * Optionally a tuple of:
4242
/// * A list of crates for which dependencies need to be explicitly allowed.
4343
/// * The list of allowed dependencies.
44+
// FIXME auto detect all cargo workspaces
4445
pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>)] = &[
4546
// The root workspace has to be first for check_rustfix to work.
4647
(".", EXCEPTIONS, Some((&["rustc-main"], PERMITTED_RUSTC_DEPENDENCIES))),
@@ -52,8 +53,15 @@ pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>)
5253
),
5354
// tidy-alphabetical-start
5455
("compiler/rustc_codegen_gcc", EXCEPTIONS_GCC, None),
56+
("library/backtrace", &[], None),
57+
//("library/portable-simd", &[], None), // FIXME uncomment once rust-lang/portable-simd#363 has been synced back to the rust repo
58+
//("library/stdarch", EXCEPTIONS_STDARCH, None), // FIXME uncomment once rust-lang/stdarch#1462 lands
5559
("src/bootstrap", EXCEPTIONS_BOOTSTRAP, None),
60+
("src/ci/docker/host-x86_64/test-various/uefi_qemu_test", EXCEPTIONS_UEFI_QEMU_TEST, None),
61+
("src/etc/test-float-parse", &[], None),
5662
("src/tools/cargo", EXCEPTIONS_CARGO, None),
63+
("src/tools/miri/test-cargo-miri", &[], None),
64+
("src/tools/miri/test_dependencies", &[], None),
5765
("src/tools/rust-analyzer", EXCEPTIONS_RUST_ANALYZER, None),
5866
("src/tools/x", &[], None),
5967
// tidy-alphabetical-end
@@ -82,6 +90,17 @@ const EXCEPTIONS: ExceptionList = &[
8290
// tidy-alphabetical-end
8391
];
8492

93+
// FIXME uncomment once rust-lang/stdarch#1462 lands
94+
/*
95+
const EXCEPTIONS_STDARCH: ExceptionList = &[
96+
// tidy-alphabetical-start
97+
("ryu", "Apache-2.0 OR BSL-1.0"), // BSL is not acceptble, but we use it under Apache-2.0
98+
("wasmparser", "Apache-2.0 WITH LLVM-exception"),
99+
("wasmprinter", "Apache-2.0 WITH LLVM-exception"),
100+
// tidy-alphabetical-end
101+
];
102+
*/
103+
85104
const EXCEPTIONS_CARGO: ExceptionList = &[
86105
// tidy-alphabetical-start
87106
("bitmaps", "MPL-2.0+"),
@@ -150,6 +169,10 @@ const EXCEPTIONS_BOOTSTRAP: ExceptionList = &[
150169
("ryu", "Apache-2.0 OR BSL-1.0"), // through serde. BSL is not acceptble, but we use it under Apache-2.0
151170
];
152171

172+
const EXCEPTIONS_UEFI_QEMU_TEST: ExceptionList = &[
173+
("r-efi", "MIT OR Apache-2.0 OR LGPL-2.1-or-later"), // LGPL is not acceptible, but we use it under MIT OR Apache-2.0
174+
];
175+
153176
/// These are the root crates that are part of the runtime. The licenses for
154177
/// these and all their dependencies *must not* be in the exception list.
155178
const RUNTIME_CRATES: &[&str] = &["std", "core", "alloc", "test", "panic_abort", "panic_unwind"];

0 commit comments

Comments
 (0)