Cargo.toml: Replace '/' with 'OR' in 'license' #4920
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @matklad (rust_highfive has picked a reviewer for you, use r? to override) |
|
There's the second Cargo.toml at https://github.com/rust-lang/cargo/blob/master/src/crates-io/Cargo.toml |
Catch up with our recommendations from 7dee65f (src/doc/manifest: Pin 'license' to SPDX 2.1 expressions and the 2.4 list, 2018-01-04, rust-lang#4898), which deprecated '/' in favor of vanilla SPDX license expressions. I've gone with the disjunctive OR, because the README has: > Cargo is primarily distributed under the terms of both the MIT > license and the Apache License (Version 2.0).
wking
force-pushed
the
license-expression
branch
from
d14ef54
to
4977c4c
Compare
|
On Mon, Jan 08, 2018 at 06:44:30PM +0000, Aleksey Kladov wrote:
There's the second Cargo.toml at
https://github.com/rust-lang/cargo/blob/master/src/crates-io/Cargo.toml
Thanks. Updated that one too with d14ef54a → 4977c4c.
|
|
@bors r+ Thanks! |
|
📌 Commit 4977c4c has been approved by |
bors
added a commit
that referenced
this pull request
Jan 8, 2018
Cargo.toml: Replace '/' with 'OR' in 'license' Catch up with our recommendations from 7dee65f (#4898), which deprecated `/` in favor of vanilla SPDX license expressions. I've gone with the disjunctive `OR`, because the README has: > Cargo is primarily distributed under the terms of both the MIT license and the Apache License (Version 2.0).
|
☀️ Test successful - status-appveyor, status-travis |
wking
added a commit
to wking/licensee
that referenced
this pull request
Jan 9, 2018
Using a regex that is similar to the one in lib/licensee/matchers/spdx.rb in allowing spaces and parens. Parens aren't currently supported by Cargo's crates.io backing [1,2], but that's hopefully a temporary limitation. And Cargo/crates.io already supports OR forms [3]. Ideally licensee would return the full license expression in these cases instead of 'other' [4]. But since that conversion is happening outside the matcher this commit isn't making that any worse (although it means this test isn't quite a unit test). [1]: ehuss/license-exprs#3 [2]: rust-lang/cargo@c89dd64 [3]: rust-lang/cargo#4920 [4]: licensee#244
This was referenced Jan 9, 2018
wking
added a commit
to wking/licensee
that referenced
this pull request
Jan 9, 2018
Using a regex that is similar to the one in lib/licensee/matchers/spdx.rb in allowing spaces and parens. Parens aren't currently supported by Cargo's crates.io backing [1,2], but that's hopefully a temporary limitation. And Cargo/crates.io already supports OR forms [3]. Ideally licensee would return the full license expression in these cases instead of 'other' [4]. But since that conversion is happening outside the matcher, this commit isn't making that any worse (although it means this test isn't quite a unit test). [1]: ehuss/license-exprs#3 [2]: rust-lang/cargo@c89dd64 [3]: rust-lang/cargo#4920 [4]: licensee#244
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Catch up with our recommendations from 7dee65f (#4898), which deprecated
/in favor of vanilla SPDX license expressions.I've gone with the disjunctive
OR, because the README has: