Skip to content

Rollup of 5 pull requests - #73093

Merged
bors merged 12 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-9gh5tyu
Jun 7, 2020
Merged

Rollup of 5 pull requests#73093
bors merged 12 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-9gh5tyu

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

jonas-schievinkand others added 12 commits May 30, 2020 03:04
- lint: add `feature_gate` field, allow specifying it in `declare_lint!`
- generalize the lint feature gate check
- librustdoc: generalize whitelisting of feature-gated lints
Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>
…stebank
Be more careful around ty::Error in generators
cc rust-lang#72685
(doesn't close it because it's missing a reproduction to use as a test case)
r? @estebank
rename FalseEdges -> FalseEdge
There's just a single false edge in this terminator, not multiple of them.
r? @matthewjasper@jonas-schievink
… r=petrochenkov
Properly handle feature-gated lints
Closesrust-lang#72694
…c, r=Amanieu
Mention that some atomic operations may not be available on some platforms
fixesrust-lang#54250
This simply adds a line saying the type/function/method may not be available on some platforms, depending on said platform capabilities.
I *think* I got them all.
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=5

@bors

bors commented Jun 7, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit a23b51e has been approved by Dylan-DPC

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 7, 2020
@bors

bors commented Jun 7, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a23b51e with merge f9fdf64...

@bors

bors commented Jun 7, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing f9fdf64 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 7, 2020
@bors
bors merged commit f9fdf64 into rust-lang:masterJun 7, 2020
@borsbors mentioned this pull request Jun 7, 2020
@cuvipercuviper added this to the 1.46 milestone May 2, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: 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.

9 participants

@Dylan-DPC-zz@bors@cuviper@jonas-schievink@poliorcetics@OddCoincidence@pickfire@RalfJung@Dylan-DPC