diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-08-27 10:29:41 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-10-10 12:47:26 +0000 |
| commit | 175e4326f73935fb4c2d976ceb2b26ea2888bee4 (patch) | |
| tree | 36d3bb88ade86096c37198fbeed7d46e51db5173 | |
| parent | 9f63776121db2f5cb8833e2f7d2fac37165dde87 (diff) | |
| download | rust-175e4326f73935fb4c2d976ceb2b26ea2888bee4.tar.gz rust-175e4326f73935fb4c2d976ceb2b26ea2888bee4.zip | |
Check more workspaces
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 2f7440cba88..a4b1676790d 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -42,6 +42,7 @@ type ExceptionList = &'static [(&'static str, &'static str)]; /// * Optionally a tuple of: /// * A list of crates for which dependencies need to be explicitly allowed. /// * The list of allowed dependencies. +// FIXME auto detect all cargo workspaces pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>)] = &[ // The root workspace has to be first for check_rustfix to work. (".", EXCEPTIONS, Some((&["rustc-main"], PERMITTED_RUSTC_DEPENDENCIES))), @@ -53,8 +54,15 @@ pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>) ), // tidy-alphabetical-start ("compiler/rustc_codegen_gcc", EXCEPTIONS_GCC, None), + ("library/backtrace", &[], None), + //("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 lands ("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", &[], None), ("src/tools/cargo", EXCEPTIONS_CARGO, None), + ("src/tools/miri/test-cargo-miri", &[], None), + ("src/tools/miri/test_dependencies", &[], None), ("src/tools/rust-analyzer", EXCEPTIONS_RUST_ANALYZER, None), ("src/tools/x", &[], None), // tidy-alphabetical-end @@ -84,6 +92,17 @@ const EXCEPTIONS: 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 ("bitmaps", "MPL-2.0+"), @@ -152,6 +171,10 @@ const EXCEPTIONS_BOOTSTRAP: ExceptionList = &[ ("ryu", "Apache-2.0 OR BSL-1.0"), // through serde. BSL is not acceptble, but we use it under Apache-2.0 ]; +const EXCEPTIONS_UEFI_QEMU_TEST: ExceptionList = &[ + ("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 +]; + /// These are the root crates that are part of the runtime. The licenses for /// these and all their dependencies *must not* be in the exception list. const RUNTIME_CRATES: &[&str] = &["std", "core", "alloc", "test", "panic_abort", "panic_unwind"]; |
