Skip to content

Commit 175e432

Browse files
committed
Check more workspaces
1 parent 9f63776 commit 175e432

File tree

1 file changed

+23
-0
lines changed

1 file changed

+23
-0
lines changed

src/tools/tidy/src/deps.rs

+23
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ type ExceptionList = &'static [(&'static str, &'static str)];
4242
/// * Optionally a tuple of:
4343
/// * A list of crates for which dependencies need to be explicitly allowed.
4444
/// * The list of allowed dependencies.
45+
// FIXME auto detect all cargo workspaces
4546
pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>)] = &[
4647
// The root workspace has to be first for check_rustfix to work.
4748
(".", EXCEPTIONS, Some((&["rustc-main"], PERMITTED_RUSTC_DEPENDENCIES))),
@@ -53,8 +54,15 @@ pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>)
5354
),
5455
// tidy-alphabetical-start
5556
("compiler/rustc_codegen_gcc", EXCEPTIONS_GCC, None),
57+
("library/backtrace", &[], None),
58+
//("library/portable-simd", &[], None), // FIXME uncomment once rust-lang/portable-simd#363 has been synced back to the rust repo
59+
//("library/stdarch", EXCEPTIONS_STDARCH, None), // FIXME uncomment once rust-lang/stdarch#1462 lands
5660
("src/bootstrap", EXCEPTIONS_BOOTSTRAP, None),
61+
("src/ci/docker/host-x86_64/test-various/uefi_qemu_test", EXCEPTIONS_UEFI_QEMU_TEST, None),
62+
("src/etc/test-float-parse", &[], None),
5763
("src/tools/cargo", EXCEPTIONS_CARGO, None),
64+
("src/tools/miri/test-cargo-miri", &[], None),
65+
("src/tools/miri/test_dependencies", &[], None),
5866
("src/tools/rust-analyzer", EXCEPTIONS_RUST_ANALYZER, None),
5967
("src/tools/x", &[], None),
6068
// tidy-alphabetical-end
@@ -84,6 +92,17 @@ const EXCEPTIONS: ExceptionList = &[
8492
// tidy-alphabetical-end
8593
];
8694

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

174+
const EXCEPTIONS_UEFI_QEMU_TEST: ExceptionList = &[
175+
("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
176+
];
177+
155178
/// These are the root crates that are part of the runtime. The licenses for
156179
/// these and all their dependencies *must not* be in the exception list.
157180
const RUNTIME_CRATES: &[&str] = &["std", "core", "alloc", "test", "panic_abort", "panic_unwind"];

0 commit comments

Comments
 (0)