@@ -78,7 +78,7 @@ const EXCEPTIONS: ExceptionList = &[
7878 ( "openssl" , "Apache-2.0" ) , // opt-dist
7979 ( "option-ext" , "MPL-2.0" ) , // cargo-miri (via `directories`)
8080 ( "rustc_apfloat" , "Apache-2.0 WITH LLVM-exception" ) , // rustc (license is the same as LLVM uses)
81- ( "ryu" , "Apache-2.0 OR BSL-1.0" ) , // cargo/... (because of serde)
81+ ( "ryu" , "Apache-2.0 OR BSL-1.0" ) , // BSL is not acceptble, but we use it under Apache-2.0 // cargo/... (because of serde)
8282 ( "self_cell" , "Apache-2.0" ) , // rustc (fluent translations)
8383 ( "snap" , "BSD-3-Clause" ) , // rustc
8484 // tidy-alphabetical-end
@@ -98,7 +98,7 @@ const EXCEPTIONS_CARGO: ExceptionList = &[
9898 ( "im-rc" , "MPL-2.0+" ) ,
9999 ( "normalize-line-endings" , "Apache-2.0" ) ,
100100 ( "openssl" , "Apache-2.0" ) ,
101- ( "ryu" , "Apache-2.0 OR BSL-1.0" ) ,
101+ ( "ryu" , "Apache-2.0 OR BSL-1.0" ) , // BSL is not acceptble, but we use it under Apache-2.0
102102 ( "sha1_smol" , "BSD-3-Clause" ) ,
103103 ( "similar" , "Apache-2.0" ) ,
104104 ( "sized-chunks" , "MPL-2.0+" ) ,
@@ -109,12 +109,12 @@ const EXCEPTIONS_CARGO: ExceptionList = &[
109109
110110const EXCEPTIONS_RUST_ANALYZER : ExceptionList = & [
111111 // tidy-alphabetical-start
112- ( "anymap" , "BlueOak-1.0.0 OR MIT OR Apache-2.0" ) ,
112+ ( "anymap" , "BlueOak-1.0.0 OR MIT OR Apache-2.0" ) , // BlueOak is not acceptable, but we use it under MIT OR Apache-2 .0
113113 ( "dissimilar" , "Apache-2.0" ) ,
114114 ( "instant" , "BSD-3-Clause" ) ,
115115 ( "notify" , "CC0-1.0 OR Artistic-2.0" ) ,
116116 ( "pulldown-cmark-to-cmark" , "Apache-2.0" ) ,
117- ( "ryu" , "Apache-2.0 OR BSL-1.0" ) ,
117+ ( "ryu" , "Apache-2.0 OR BSL-1.0" ) , // BSL is not acceptble, but we use it under Apache-2.0
118118 ( "scip" , "Apache-2.0" ) ,
119119 ( "snap" , "BSD-3-Clause" ) ,
120120 // tidy-alphabetical-end
@@ -149,7 +149,7 @@ const EXCEPTIONS_GCC: ExceptionList = &[
149149] ;
150150
151151const EXCEPTIONS_BOOTSTRAP : ExceptionList = & [
152- ( "ryu" , "Apache-2.0 OR BSL-1.0" ) , // through serde
152+ ( "ryu" , "Apache-2.0 OR BSL-1.0" ) , // through serde. BSL is not acceptble, but we use it under Apache-2.0
153153] ;
154154
155155/// These are the root crates that are part of the runtime. The licenses for
@@ -494,14 +494,11 @@ fn check_runtime_license_exceptions(
494494 }
495495 } ;
496496 if !LICENSES . contains ( & license. as_str ( ) ) {
497- if pkg. name == "fortanix-sgx-abi" {
498- // This is a specific exception because SGX is considered
499- // "third party". See
500- // https://github.com/rust-lang/rust/issues/62620 for more. In
501- // general, these should never be added.
502- if pkg. license . as_deref ( ) != Some ( "MPL-2.0" ) {
503- tidy_error ! ( bad, "invalid license `{}` in `{}`" , license, pkg. id) ;
504- }
497+ // This is a specific exception because SGX is considered "third party".
498+ // See https://github.com/rust-lang/rust/issues/62620 for more.
499+ // In general, these should never be added and this exception
500+ // should not be taken as precedent for any new target.
501+ if pkg. name == "fortanix-sgx-abi" && pkg. license . as_deref ( ) == Some ( "MPL-2.0" ) {
505502 continue ;
506503 }
507504 tidy_error ! ( bad, "invalid license `{}` in `{}`" , license, pkg. id) ;
0 commit comments