Skip to content

Commit b60026a

Browse files
committed
Remove no longer needed handling of nonstandard licenses
1 parent ab4024e commit b60026a

File tree

1 file changed

+0
-19
lines changed

1 file changed

+0
-19
lines changed

src/tools/tidy/src/deps.rs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -226,20 +226,6 @@ const EXCEPTIONS_UEFI_QEMU_TEST: ExceptionList = &[
226226
("r-efi", "MIT OR Apache-2.0 OR LGPL-2.1-or-later"), // LGPL is not acceptable, but we use it under MIT OR Apache-2.0
227227
];
228228

229-
/// Placeholder for non-standard license file.
230-
const NON_STANDARD_LICENSE: &str = "NON_STANDARD_LICENSE";
231-
232-
/// These dependencies have non-standard licenses but are genenrally permitted.
233-
const EXCEPTIONS_NON_STANDARD_LICENSE_DEPS: &[&str] = &[
234-
// `ring` is included because it is an optional dependency of `hyper`,
235-
// which is a training data in rustc-perf for optimized build.
236-
// The license of it is generally `ISC AND MIT AND OpenSSL`,
237-
// though the `package.license` field is not set.
238-
//
239-
// See https://github.com/briansmith/ring/issues/902
240-
"ring",
241-
];
242-
243229
const PERMITTED_DEPS_LOCATION: &str = concat!(file!(), ":", line!());
244230

245231
/// Crates rustc is allowed to depend on. Avoid adding to the list if possible.
@@ -751,11 +737,6 @@ fn check_license_exceptions(
751737
for pkg in metadata.packages.iter().filter(|p| *p.name == *name) {
752738
match &pkg.license {
753739
None => {
754-
if *license == NON_STANDARD_LICENSE
755-
&& EXCEPTIONS_NON_STANDARD_LICENSE_DEPS.contains(&pkg.name.as_str())
756-
{
757-
continue;
758-
}
759740
tidy_error!(
760741
bad,
761742
"dependency exception `{}` in workspace `{workspace}` does not declare a license expression",

0 commit comments

Comments
 (0)