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

Fix license in Cargo.toml files #4616

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
Contributor

@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
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
Contributor 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
Contributor 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.

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

clippy_lints/Cargo.toml Outdated Show resolved Hide resolved
mini-macro/Cargo.toml Outdated Show resolved Hide resolved
@mati865
Copy link
Contributor 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:

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
Co-Authored-By: lzutao <taolzu@gmail.com>
@mati865
Copy link
Contributor 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
Contributor 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
3 tasks
@mati865
Copy link
Contributor 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
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
Labels
S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants