Skip to content
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.

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

Use OR in the license field #1123

Merged
merged 1 commit into from
Nov 16, 2018
Merged

Use OR in the license field #1123

merged 1 commit into from
Nov 16, 2018

Conversation

newpavlov
Copy link
Contributor

According to The Manifest Format:

Multiple licenses can be separated with a /, although that usage is deprecated. Instead, use a license expression with AND and OR operators to get more explicit semantics.

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 16, 2018

r? @gnzlbg

bors: r+

@rust-highfive rust-highfive assigned gnzlbg and unassigned alexcrichton Nov 16, 2018
@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 16, 2018

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 16, 2018

📌 Commit eb09cfe has been approved by gnzlbg

@bors
Copy link
Contributor

bors commented Nov 16, 2018

⌛ Testing commit eb09cfe with merge 4e5ef22...

bors added a commit that referenced this pull request Nov 16, 2018
Use OR in the license field

According to [The Manifest Format](https://doc.rust-lang.org/cargo/reference/manifest.html):
>Multiple licenses can be separated with a `/`, although that usage is deprecated.  Instead, use a license expression with AND and OR operators to get more explicit semantics.
@bors
Copy link
Contributor

bors commented Nov 16, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: gnzlbg
Pushing 4e5ef22 to master...

@bors bors merged commit eb09cfe into rust-lang:master Nov 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants