Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Rollup of 3 pull requests #70534

Merged
merged 6 commits into from
Mar 29, 2020
Merged

Rollup of 3 pull requests #70534

merged 6 commits into from
Mar 29, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Mar 29, 2020

Successful merges:

Failed merges:

r? @ghost

Nemo157 and others added 6 commits March 19, 2020 11:21
@Nemo157
Add Result<Result<T, E>, E>::flatten -> Result<T, E>
6fe7867
@Centril
reduce rustc_attr usage in places
59a6970
@Amanieu
Update LLVM submodule
4a4314e
@Centril
Rollup merge of rust-lang#70140 - Nemo157:result-flatten, r=Amanieu
8212a1c 
Add Result<Result<T, E>, E>::flatten -> Result<T, E>

This PR makes this possible (modulo type inference):

```rust
assert_eq!(Ok(6), Ok(Ok(6)).flatten());
```

Tracking issue: rust-lang#70142

<sub>largely cribbed directly from <https://github.com/rust-lang/rust/pull/60256></sub>
@Centril
Rollup merge of rust-lang#70526 - Centril:less-attr, r=eddyb
b4491e5 
reduce `rustc_attr` usage in places

This cleans up some unused `rustc_attr` dependencies.
@Centril
Rollup merge of rust-lang#70527 - Amanieu:fix_fastisel, r=Mark-Simula…
b851591 
…crum

Update LLVM submodule

Fixes rust-lang#70148
@Centril
Copy link
Contributor Author

Centril commented Mar 29, 2020

@bors r+ p=3 rollup=never

@bors
Copy link
Contributor

bors commented Mar 29, 2020

📌 Commit b851591 has been approved by Centril

@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 Mar 29, 2020
@bors
Copy link
Contributor

bors commented Mar 29, 2020

⌛ Testing commit b851591 with merge 285519d...

@bors
Copy link
Contributor

bors commented Mar 29, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 285519d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 29, 2020
@bors bors merged commit 285519d into rust-lang:master Mar 29, 2020
@Centril Centril deleted the rollup-t59tcx2 branch March 29, 2020 22:31
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Centril @bors @Nemo157 @Amanieu