Skip to content

Commit 3621785

Browse files
committed
Add Apache-2.0 WITH LLVM-exception to list of allowed licenses
It is more permissive than Apache-2.0 which is already allowed.
1 parent 66c81a0 commit 3621785

File tree

1 file changed

+1
-24
lines changed

1 file changed

+1
-24
lines changed

src/tools/tidy/src/deps.rs

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const LICENSES: &[&str] = &[
2727
"Apache-2.0 OR ISC OR MIT",
2828
"Apache-2.0 OR MIT",
2929
"Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT", // wasi license
30+
"Apache-2.0 WITH LLVM-exception",
3031
"Apache-2.0",
3132
"Apache-2.0/MIT",
3233
"BSD-2-Clause OR Apache-2.0 OR MIT", // zerocopy
@@ -169,16 +170,13 @@ pub(crate) const WORKSPACES: &[WorkspaceInfo<'static>] = &[
169170
#[rustfmt::skip]
170171
const EXCEPTIONS: ExceptionList = &[
171172
// tidy-alphabetical-start
172-
("ar_archive_writer", "Apache-2.0 WITH LLVM-exception"), // rustc
173173
("arrayref", "BSD-2-Clause"), // rustc
174174
("blake3", "CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception"), // rustc
175175
("colored", "MPL-2.0"), // rustfmt
176176
("constant_time_eq", "CC0-1.0 OR MIT-0 OR Apache-2.0"), // rustc
177177
("foldhash", "Zlib"), // rustc
178178
("option-ext", "MPL-2.0"), // cargo-miri (via `directories`)
179-
("rustc_apfloat", "Apache-2.0 WITH LLVM-exception"), // rustc (license is the same as LLVM uses)
180179
("ryu", "Apache-2.0 OR BSL-1.0"), // BSL is not acceptble, but we use it under Apache-2.0 // cargo/... (because of serde)
181-
("wasi-preview1-component-adapter-provider", "Apache-2.0 WITH LLVM-exception"), // rustc
182180
// tidy-alphabetical-end
183181
];
184182

@@ -218,7 +216,6 @@ const EXCEPTIONS_RUST_ANALYZER: ExceptionList = &[
218216
("foldhash", "Zlib"),
219217
("notify", "CC0-1.0"),
220218
("option-ext", "MPL-2.0"),
221-
("rustc_apfloat", "Apache-2.0 WITH LLVM-exception"),
222219
("ryu", "Apache-2.0 OR BSL-1.0"), // BSL is not acceptble, but we use it under Apache-2.0
223220
// tidy-alphabetical-end
224221
];
@@ -250,28 +247,8 @@ const EXCEPTIONS_RUSTBOOK: ExceptionList = &[
250247

251248
const EXCEPTIONS_CRANELIFT: ExceptionList = &[
252249
// tidy-alphabetical-start
253-
("cranelift-assembler-x64", "Apache-2.0 WITH LLVM-exception"),
254-
("cranelift-assembler-x64-meta", "Apache-2.0 WITH LLVM-exception"),
255-
("cranelift-bforest", "Apache-2.0 WITH LLVM-exception"),
256-
("cranelift-bitset", "Apache-2.0 WITH LLVM-exception"),
257-
("cranelift-codegen", "Apache-2.0 WITH LLVM-exception"),
258-
("cranelift-codegen-meta", "Apache-2.0 WITH LLVM-exception"),
259-
("cranelift-codegen-shared", "Apache-2.0 WITH LLVM-exception"),
260-
("cranelift-control", "Apache-2.0 WITH LLVM-exception"),
261-
("cranelift-entity", "Apache-2.0 WITH LLVM-exception"),
262-
("cranelift-frontend", "Apache-2.0 WITH LLVM-exception"),
263-
("cranelift-isle", "Apache-2.0 WITH LLVM-exception"),
264-
("cranelift-jit", "Apache-2.0 WITH LLVM-exception"),
265-
("cranelift-module", "Apache-2.0 WITH LLVM-exception"),
266-
("cranelift-native", "Apache-2.0 WITH LLVM-exception"),
267-
("cranelift-object", "Apache-2.0 WITH LLVM-exception"),
268-
("cranelift-srcgen", "Apache-2.0 WITH LLVM-exception"),
269250
("foldhash", "Zlib"),
270251
("mach2", "BSD-2-Clause OR MIT OR Apache-2.0"),
271-
("regalloc2", "Apache-2.0 WITH LLVM-exception"),
272-
("target-lexicon", "Apache-2.0 WITH LLVM-exception"),
273-
("wasmtime-jit-icache-coherence", "Apache-2.0 WITH LLVM-exception"),
274-
("wasmtime-math", "Apache-2.0 WITH LLVM-exception"),
275252
// tidy-alphabetical-end
276253
];
277254

0 commit comments

Comments
 (0)