Skip to content

Conversation

jonas-schievink
Copy link
Contributor

This should hopefully work around #65023, which currently makes almost every bootstrap fail for me.

This should hopefully work around #65023, which currently makes almost every bootstrap fail for me.
@rust-highfive
Copy link
Contributor

r? @ecstatic-morse

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 28, 2020
@Mark-Simulacrum
Copy link
Member

Gah. Would be great to fix these lints to work properly. Approving since it seems like a low-loss and quite harmful to productivity change.

@bors r+

@bors
Copy link
Collaborator

bors commented May 29, 2020

📌 Commit d4ef174 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 29, 2020
@@ -366,7 +366,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
// FIXME(#14407)
ungated!(rustc_const_stable, Whitelisted, template!(List: r#"feature = "name""#)),
gated!(
allow_internal_unstable, Normal, template!(Word, List: "feat1, feat2, ..."),
allow_internal_unstable, Whitelisted, template!(Word, List: "feat1, feat2, ..."),
Copy link
Contributor

Choose a reason for hiding this comment

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

It might be a good idea to add a FIXME mentioning that this should eventually be changed back to Normal.

Copy link
Member

Choose a reason for hiding this comment

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

I think in the long term Whitelisted should just not exist, right? But r=me with such a comment too.

bors added a commit to rust-lang-ci/rust that referenced this pull request May 29, 2020
Rollup of 11 pull requests

Successful merges:

 - rust-lang#71633 (Impl Error for Infallible)
 - rust-lang#71843 (Tweak and stabilize AtomicN::fetch_update)
 - rust-lang#72288 (Stabilization of weak-into-raw)
 - rust-lang#72324 (Stabilize AtomicN::fetch_min and AtomicN::fetch_max)
 - rust-lang#72452 (Clarified the documentation for Formatter::precision)
 - rust-lang#72495 (Improve E0601 explanation)
 - rust-lang#72534 (Improve missing `@` in slice binding pattern diagnostics)
 - rust-lang#72547 (Added a codegen test for a recent optimization for overflow-checks=on)
 - rust-lang#72711 (remove redundant `mk_const`)
 - rust-lang#72713 (Whitelist #[allow_internal_unstable])
 - rust-lang#72720 (Clarify the documentation of `take`)

Failed merges:

r? @ghost
@bors bors merged commit 5207428 into master May 29, 2020
@oli-obk oli-obk deleted the jonas-schievink-patch-2 branch May 31, 2020 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants