mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update license check post-cargo update

Browse source
This commit is contained in:
Mark Rousskov 2020-08-17 15:13:04 -04:00
parent 342d956749
commit 4b9675fb05
1 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/tools/tidy/src/deps.rs
View file

@ -25,24 +25,24 @@ const LICENSES: &[&str] = &[
/// tooling. It is _crucial_ that no exception crates be dependencies /// tooling. It is _crucial_ that no exception crates be dependencies
/// of the Rust runtime (std/test). /// of the Rust runtime (std/test).
const EXCEPTIONS: &[(&str, &str)] = &[ const EXCEPTIONS: &[(&str, &str)] = &[
("mdbook", "MPL-2.0"), // mdbook ("mdbook", "MPL-2.0"), // mdbook
("openssl", "Apache-2.0"), // cargo, mdbook ("openssl", "Apache-2.0"), // cargo, mdbook
("rdrand", "ISC"), // mdbook, rustfmt ("fuchsia-zircon-sys", "BSD-3-Clause"), // rustdoc, rustc, cargo
("fuchsia-cprng", "BSD-3-Clause"), // mdbook, rustfmt ("fuchsia-zircon", "BSD-3-Clause"), // rustdoc, rustc, cargo (jobserver & tempdir)
("fuchsia-zircon-sys", "BSD-3-Clause"), // rustdoc, rustc, cargo ("colored", "MPL-2.0"), // rustfmt
("fuchsia-zircon", "BSD-3-Clause"), // rustdoc, rustc, cargo (jobserver & tempdir) ("ordslice", "Apache-2.0"), // rls
("colored", "MPL-2.0"), // rustfmt ("cloudabi", "BSD-2-Clause"), // (rls -> crossbeam-channel 0.2 -> rand 0.5)
("ordslice", "Apache-2.0"), // rls ("ryu", "Apache-2.0 OR BSL-1.0"), // rls/cargo/... (because of serde)
("cloudabi", "BSD-2-Clause"), // (rls -> crossbeam-channel 0.2 -> rand 0.5) ("bytesize", "Apache-2.0"), // cargo
("ryu", "Apache-2.0 OR BSL-1.0"), // rls/cargo/... (because of serde) ("im-rc", "MPL-2.0+"), // cargo
("bytesize", "Apache-2.0"), // cargo ("constant_time_eq", "CC0-1.0"), // rustfmt
("im-rc", "MPL-2.0+"), // cargo ("sized-chunks", "MPL-2.0+"), // cargo via im-rc
("constant_time_eq", "CC0-1.0"), // rustfmt ("bitmaps", "MPL-2.0+"), // cargo via im-rc
("sized-chunks", "MPL-2.0+"), // cargo via im-rc ("crossbeam-queue", "MIT/Apache-2.0 AND BSD-2-Clause"), // rls via rayon
("bitmaps", "MPL-2.0+"), // cargo via im-rc ("arrayref", "BSD-2-Clause"), // cargo-miri/directories/.../rust-argon2 (redox)
("instant", "BSD-3-Clause"), // rustc_driver/tracing-subscriber/parking_lot
// FIXME: this dependency violates the documentation comment above: // FIXME: this dependency violates the documentation comment above:
("fortanix-sgx-abi", "MPL-2.0"), // libstd but only for `sgx` target ("fortanix-sgx-abi", "MPL-2.0"), // libstd but only for `sgx` target
("crossbeam-channel", "MIT/Apache-2.0 AND BSD-2-Clause"), // cargo
]; ];
/// These are the root crates that are part of the runtime. The licenses for /// These are the root crates that are part of the runtime. The licenses for
@ -69,8 +69,8 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
"bitflags", "bitflags",
"block-buffer", "block-buffer",
"block-padding", "block-padding",
"byte-tools",
"byteorder", "byteorder",
"byte-tools",
"cc", "cc",
"cfg-if", "cfg-if",
"chalk-derive", "chalk-derive",
@ -103,6 +103,7 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
"hermit-abi", "hermit-abi",
"humantime", "humantime",
"indexmap", "indexmap",
"instant",
"itertools", "itertools",
"jobserver", "jobserver",
"kernel32-sys", "kernel32-sys",
@ -112,13 +113,13 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
"lock_api", "lock_api",
"log", "log",
"log_settings", "log_settings",
"maybe-uninit",
"md-5", "md-5",
"measureme", "measureme",
"memchr", "memchr",
"memmap", "memmap",
"memoffset", "memoffset",
"miniz_oxide", "miniz_oxide",
"nodrop",
"num_cpus", "num_cpus",
"object", "object",
"once_cell", "once_cell",
@ -233,6 +234,14 @@ fn check_exceptions(metadata: &Metadata, bad: &mut bool) {
} }
Some(pkg_license) => { Some(pkg_license) => {
if pkg_license.as_str() != *license { if pkg_license.as_str() != *license {
if *name == "crossbeam-queue"
&& *license == "MIT/Apache-2.0 AND BSD-2-Clause"
{
// We have two versions of crossbeam-queue and both
// are fine.
continue;
}
println!("dependency exception `{}` license has changed", name); println!("dependency exception `{}` license has changed", name);
println!(" previously `{}` now `{}`", license, pkg_license); println!(" previously `{}` now `{}`", license, pkg_license);
println!(" update EXCEPTIONS for the new license"); println!(" update EXCEPTIONS for the new license");