From d9eb9c6f771fdbb7ba9eb1ba6f91233fcc0e9577 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 6 Aug 2024 03:18:25 -0500 Subject: [PATCH] Adjust licensing exceptions for WASM components Recent versions of wasm-tools are now Apache-2.0 or MIT or Apache-2.0 with the LLVM exception, rather than strictly Apache-2.0 with the LLVM exception. The only component with the exception has moved to a new dependency `wasi-preview1-component-adapter-provider`. Update tidy exceptions to reflect this. --- src/tools/tidy/src/deps.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index e23e931b0eb04..b2a5e6927a73e 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -98,13 +98,14 @@ const EXCEPTIONS: ExceptionList = &[ ("ryu", "Apache-2.0 OR BSL-1.0"), // BSL is not acceptble, but we use it under Apache-2.0 // cargo/... (because of serde) ("self_cell", "Apache-2.0"), // rustc (fluent translations) ("snap", "BSD-3-Clause"), // rustc - ("wasm-encoder", "Apache-2.0 WITH LLVM-exception"), // rustc - ("wasm-metadata", "Apache-2.0 WITH LLVM-exception"), // rustc - ("wasmparser", "Apache-2.0 WITH LLVM-exception"), // rustc - ("wast", "Apache-2.0 WITH LLVM-exception"), // rustc - ("wat", "Apache-2.0 WITH LLVM-exception"), // rustc - ("wit-component", "Apache-2.0 WITH LLVM-exception"), // rustc - ("wit-parser", "Apache-2.0 WITH LLVM-exception"), // rustc + ("wasi-preview1-component-adapter-provider", "Apache-2.0 WITH LLVM-exception"), // rustc + // ("wasm-encoder", "Apache-2.0 WITH LLVM-exception"), // rustc + // ("wasm-metadata", "Apache-2.0 WITH LLVM-exception"), // rustc + // ("wasmparser", "Apache-2.0 WITH LLVM-exception"), // rustc + // ("wast", "Apache-2.0 WITH LLVM-exception"), // rustc + // ("wat", "Apache-2.0 WITH LLVM-exception"), // rustc + // ("wit-component", "Apache-2.0 WITH LLVM-exception"), // rustc + // ("wit-parser", "Apache-2.0 WITH LLVM-exception"), // rustc // tidy-alphabetical-end ];