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

Rustup #6126

Merged
merged 6 commits into from
Oct 6, 2020
Merged

Rustup #6126

merged 6 commits into from
Oct 6, 2020

Conversation

flip1995
Copy link
Member

@flip1995 flip1995 commented Oct 6, 2020

Supersedes #6121. There was another breakage.

r? @ghost

changelog: none

pnkfelix and others added 5 commits October 4, 2020 13:14
That is, this changes `#[forbid(foo)] #[allow(foo)]` from allowing foo to
forbidding foo.
…e-forbid-in-same-scope, r=petrochenkov

Disallow overriding forbid in same scope

Rebased #73379.

Fixes #70819.
Fix LitKind's byte buffer to use refcounted slice

While working on adding a new lint for clippy (see rust-lang#6044) for avoiding shared ownership of "mutable buffer" types (such as using `Rc<Vec<T>>` instead of `Rc<[T]>`), I noticed a type exported from rustc_ast and used by clippy gets caught by the lint. This PR fixes the exported type.

This PR includes the actual change to clippy too, but I will open a PR directly against clippy for that part (although it will currently fail to build there).
@flip1995 flip1995 mentioned this pull request Oct 6, 2020
@flip1995
Copy link
Member Author

flip1995 commented Oct 6, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Oct 6, 2020

📌 Commit b05aeaa has been approved by flip1995

@bors
Copy link
Contributor

bors commented Oct 6, 2020

⌛ Testing commit b05aeaa with merge 1a4175b...

@bors
Copy link
Contributor

bors commented Oct 6, 2020

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995
Pushing 1a4175b to master...

@bors bors merged commit 1a4175b into rust-lang:master Oct 6, 2020
bors added a commit that referenced this pull request Oct 6, 2020
Reinstate test for forbid(clippy::restriction)

In [this commit](5747c15) coming from rust-lang/rust (#6126) the test for `#![forbid(clippy::restriction)]` was removed because some restriction lints were being allowed after the forbid.

This change reinstates the test for `forbid` by using a separate file.

changelog: none

r? `@flip1995`
@flip1995 flip1995 deleted the rustup branch October 6, 2020 22:35
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.

6 participants