diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-05-12 18:57:32 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 18:57:32 -0600 |
| commit | cde12ee198aebe5afb60123b2aebf07227f59dc2 (patch) | |
| tree | 0b976ee35166ba602b49b8012d531fdeddb4e9f3 | |
| parent | 82c31634612310725d5517816b5a0c37b3d657e8 (diff) | |
| parent | 084b67f56a66b440657e6aa66227e971790a87a4 (diff) | |
| download | rust-cde12ee198aebe5afb60123b2aebf07227f59dc2.tar.gz rust-cde12ee198aebe5afb60123b2aebf07227f59dc2.zip | |
Rollup merge of #41918 - brson:lic, r=alexcrichton
Annotate the license exceptions
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 3bf396db4d3..8b7da2267cd 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -23,12 +23,15 @@ static LICENSES: &'static [&'static str] = &[ "Unlicense/MIT", ]; -/// These MPL licensed projects are acceptable, but only these. +// These are exceptions to Rust's permissive licensing policy, and +// should be considered bugs. Exceptions are only allowed in Rust +// tooling. It is _crucial_ that no exception crates be dependencies +// of the Rust runtime (std / test). static EXCEPTIONS: &'static [&'static str] = &[ - "mdbook", - "openssl", - "pest", - "thread-id", + "mdbook", // MPL2, mdbook + "openssl", // BSD+advertising clause, cargo, mdbook + "pest", // MPL2, mdbook via handlebars + "thread-id", // Apache-2.0, mdbook ]; pub fn check(path: &Path, bad: &mut bool) { |
