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

Rollup of 5 pull requests #73093

Merged
merged 12 commits into from
Jun 7, 2020
Merged

Rollup of 5 pull requests #73093

merged 12 commits into from
Jun 7, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

jonas-schievink and 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

Closes rust-lang#72694
…c, r=Amanieu

Mention that some atomic operations may not be available on some platforms

fixes rust-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
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jun 7, 2020

📌 Commit a23b51e has been approved by Dylan-DPC

@bors bors 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
Copy link
Contributor

bors commented Jun 7, 2020

⌛ Testing commit a23b51e with merge f9fdf64...

@bors
Copy link
Contributor

bors commented Jun 7, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 7, 2020
@bors bors merged commit f9fdf64 into rust-lang:master Jun 7, 2020
@bors bors mentioned this pull request Jun 7, 2020
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

9 participants