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.

Sign up for GitHub

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

Jump to bottom

Provide better compiler output when using ? on Option in fn returning Result and vice-versa #71141

Merged
merged 2 commits into from
Apr 16, 2020
Merged

Provide better compiler output when using ? on Option in fn returning Result and vice-versa #71141

merged 2 commits into from
Apr 16, 2020

Conversation

Duddino
Copy link

@Duddino Duddino commented Apr 14, 2020

Fixes #71089

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ecstatic-morse (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 14, 2020
@estebank
Copy link
Contributor

Please rebase on top of master (we don't allow merges in PRs) and squash your commits into a single commit.

@Duddino Duddino requested a review from estebank April 14, 2020 20:49
estebank
estebank approved these changes Apr 15, 2020
View reviewed changes
Copy link
Contributor

@estebank estebank left a comment

Choose a reason for hiding this comment

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

Other than the nitpicks, r=me.

src/librustc_trait_selection/traits/error_reporting/mod.rs Outdated Show resolved Hide resolved
src/librustc_trait_selection/traits/error_reporting/mod.rs Outdated Show resolved Hide resolved
@Duddino
Copy link
Author

Duddino commented Apr 15, 2020

@estebank I pushed a new commit, tell me if I should squash it with the previous one

@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Apr 15, 2020

📌 Commit fbc4168 has been approved by estebank

@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 Apr 15, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 15, 2020
@Dylan-DPC
Rollup merge of rust-lang#71141 - Duddino:master, r=estebank
3051c28 
Provide better compiler output when using `?` on `Option` in fn returning `Result` and vice-versa

Fixes rust-lang#71089
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 15, 2020
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 15, 2020
@Dylan-DPC
Rollup merge of rust-lang#71141 - Duddino:master, r=estebank
f8de74b 
Provide better compiler output when using `?` on `Option` in fn returning `Result` and vice-versa

Fixes rust-lang#71089
This was referenced Apr 15, 2020
Closed
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 16, 2020
@Dylan-DPC
Rollup merge of rust-lang#71141 - Duddino:master, r=estebank
398d332 
Provide better compiler output when using `?` on `Option` in fn returning `Result` and vice-versa

Fixes rust-lang#71089
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 16, 2020
@Dylan-DPC
Rollup merge of rust-lang#71141 - Duddino:master, r=estebank
5a3b9db 
Provide better compiler output when using `?` on `Option` in fn returning `Result` and vice-versa

Fixes rust-lang#71089
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 16, 2020
Closed
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 16, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 16, 2020
@bors
Auto merge of rust-lang#71201 - Dylan-DPC:rollup-23202uf, r=Dylan-DPC
7f3df57 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#70566 (Don't bail out before linting in generic contexts.)
 - rust-lang#71141 (Provide better compiler output when using `?` on `Option` in fn returning `Result` and vice-versa)
 - rust-lang#71149 (remove an impossible branch from check_consts)
 - rust-lang#71179 (fix more clippy warnings)
 - rust-lang#71191 (Clean up E0520 explanation)

Failed merges:

r? @ghost
@bors bors merged commit e4ec796 into rust-lang:master Apr 16, 2020
@LeSeulArtichaut LeSeulArtichaut mentioned this pull request Apr 20, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@estebank estebank estebank approved these changes

Assignees

@ecstatic-morse ecstatic-morse

Labels
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.

Provide better compiler output when using ? on Option in fn returning Result or vice-versa?
5 participants
@Duddino @rust-highfive @estebank @bors @ecstatic-morse