Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix license in Cargo.toml files #4616

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

Jump to bottom
Merged
merged 2 commits into from
Oct 9, 2019
Merged

Fix license in Cargo.toml files #4616

merged 2 commits into from
Oct 9, 2019

Conversation

mati865
Copy link
Member

@mati865 mati865 commented Oct 3, 2019

Missed in #3269

changelog: none

r? @Manishearth

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 3, 2019

📌 Commit d743a89 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Oct 3, 2019

⌛ Testing commit d743a89 with merge 5ed118f...

bors added a commit that referenced this pull request Oct 3, 2019
@bors
Auto merge of #4616 - mati865:license, r=Manishearth
5ed118f 
Fix license in Cargo.toml files

Missed in #3269

changelog: none

r? @Manishearth
@bors
Copy link
Contributor

bors commented Oct 3, 2019

💔 Test failed - status-appveyor

@mati865
Copy link
Member Author

mati865 commented Oct 3, 2019

Right, forgot the CI is broken.

@Manishearth
Copy link
Member

Huh, why's it broken? Do we have an issue for this?

@mati865
Copy link
Member Author

mati865 commented Oct 3, 2019

There is no issue opened but on every PR (since today?) fails with:

error: no such subcommand: `+nightly`

To me it looks like cargo command isn't proxied through rustup wrappers but runs cargo directly. I suppose it could be AppVeyor issue but I haven't investigated.

tesuji
tesuji reviewed Oct 3, 2019
View reviewed changes
Copy link
Contributor

@tesuji tesuji left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is recommended to use OR operator instead: https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata

@mati865
Copy link
Member Author

mati865 commented Oct 3, 2019

It is recommended to use OR operator instead: doc.rust-lang.org/cargo/reference/manifest.html#package-metadata

I just copied it from topmost Cargo.toml:

rust-clippy/Cargo.toml

Line 14 in 737f0a6

license = "MIT/Apache-2.0"

I'll update it later or tomorrow.

@flip1995 flip1995 added the S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) label Oct 4, 2019
@mati865
Copy link
Member Author

mati865 commented Oct 4, 2019

Ready for review.

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 4, 2019

📌 Commit 4f1d907 has been approved by Manishearth

@mati865
Copy link
Member Author

mati865 commented Oct 4, 2019

@Manishearth it won't work until #4628 is merged.

I think Clippy could do @bors treeclose whether the CI is broken and reopen it when rustups are merged.

@Manishearth
Copy link
Member

@bors r-

@flip1995 flip1995 mentioned this pull request Oct 5, 2019
Merged
3 tasks
@mati865
Copy link
Member Author

mati865 commented Oct 9, 2019

Let's merge it before Clippy breaks again.

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 9, 2019

📌 Commit 4f1d907 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Oct 9, 2019

⌛ Testing commit 4f1d907 with merge db233b0...

bors added a commit that referenced this pull request Oct 9, 2019
@bors
Auto merge of #4616 - mati865:license, r=Manishearth
db233b0 
Fix license in Cargo.toml files

Missed in #3269

changelog: none

r? @Manishearth
@bors
Copy link
Contributor

bors commented Oct 9, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Manishearth
Pushing db233b0 to master...

@bors bors merged commit 4f1d907 into rust-lang:master Oct 9, 2019
@mati865 mati865 deleted the license branch October 9, 2019 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@tesuji tesuji tesuji left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mati865 @Manishearth @bors @tesuji @flip1995