Skip to content

tidy: Better license checks. #69443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 19, 2020
+362 −350
Merged

tidy: Better license checks. #69443

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
349fcb9
tidy: Use cargo_metadata for license checks.
ehuss Feb 24, 2020
3f45da0
tidy: Check if exceptions are no longer used.
ehuss Feb 24, 2020
be10f14
tidy: check the licenses don't change
ehuss Feb 24, 2020
bc738f2
tidy: Verify the runtime crates don't have license exceptions.
ehuss Feb 24, 2020
3c48c89
tidy: Add some clarifying comments in license checks.
ehuss Feb 24, 2020
2e46faa
tidy: Add `test` to RUNTIME_CRATES.
ehuss Feb 25, 2020
9a53cf3
tidy: Sort WHITELIST.
ehuss Feb 25, 2020
ed0158d
tidy: Remove chalk-engine/chalk-macros.
ehuss Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
@@ -386,9 +386,9 @@ dependencies = [

[[package]]
name = "cargo_metadata"
version = "0.9.0"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d2d1617e838936c0d2323a65cc151e03ae19a7678dd24f72bccf27119b90a5d"
checksum = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202"
dependencies = [
"semver",
"serde",
@@ -450,7 +450,7 @@ dependencies = [
name = "clippy"
version = "0.0.212"
dependencies = [
"cargo_metadata 0.9.0",
"cargo_metadata 0.9.1",
"clippy-mini-macro-test",
"clippy_lints",
"compiletest_rs",
@@ -474,7 +474,7 @@ version = "0.2.0"
name = "clippy_lints"
version = "0.0.212"
dependencies = [
"cargo_metadata 0.9.0",
"cargo_metadata 0.9.1",
"if_chain",
"itertools 0.8.0",
"lazy_static 1.4.0",
@@ -2124,7 +2124,7 @@ name = "miri"
version = "0.1.0"
dependencies = [
"byteorder",
"cargo_metadata 0.9.0",
"cargo_metadata 0.9.1",
"colored",
"compiletest_rs",
"directories",
@@ -4818,10 +4818,9 @@ dependencies = [
name = "tidy"
version = "0.1.0"
dependencies = [
"cargo_metadata 0.9.1",
"lazy_static 1.4.0",
"regex",
"serde",
"serde_json",
"walkdir",
]

3 changes: 0 additions & 3 deletions src/bootstrap/test.rs
View file
Original file line number Diff line number Diff line change
@@ -726,9 +726,6 @@ impl Step for Tidy {
let mut cmd = builder.tool_cmd(Tool::Tidy);
cmd.arg(builder.src.join("src"));
cmd.arg(&builder.initial_cargo);
if !builder.config.vendor {
cmd.arg("--no-vendor");
}
if builder.is_verbose() {
cmd.arg("--verbose");
}
3 changes: 1 addition & 2 deletions src/tools/tidy/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -5,8 +5,7 @@ authors = ["Alex Crichton <[email protected]>"]
edition = "2018"

[dependencies]
cargo_metadata = "0.9.1"
regex = "1"
serde = { version = "1.0.8", features = ["derive"] }
serde_json = "1.0.2"
lazy_static = "1"
walkdir = "2"
688 changes: 354 additions & 334 deletions src/tools/tidy/src/deps.rs
View file

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions src/tools/tidy/src/main.rs
View file
Original file line number Diff line number Diff line change
@@ -30,10 +30,7 @@ fn main() {
pal::check(&path, &mut bad);
unstable_book::check(&path, collected, &mut bad);
unit_tests::check(&path, &mut bad);
if !args.iter().any(|s| *s == "--no-vendor") {
deps::check(&path, &mut bad);
}
deps::check_whitelist(&path, &cargo, &mut bad);
deps::check(&path, &cargo, &mut bad);
extdeps::check(&path, &mut bad);
ui_tests::check(&path, &mut bad);
error_codes_check::check(&path, &mut bad);