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

Use rustc_on_unimplemented's trait name argument in try #43238

Merged
merged 1 commit into from
Jul 28, 2017

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Jul 14, 2017

Follow up to #43000 and #43001. Fix #42694.

@rust-highfive
Copy link
Collaborator

r? @brson

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

@shepmaster shepmaster added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 14, 2017
@kennytm
Copy link
Member

kennytm commented Jul 15, 2017

Travis failed with:

[00:02:28] error[E0230]: there is no type parameter Try on trait Try
[00:02:28]   --> /checkout/src/libcore/ops/try.rs:18:1
[00:02:28]    |
[00:02:28] 18 | / #[rustc_on_unimplemented = "the `?` operator can only be used in a function that returns `Result` \
[00:02:28] 19 | |                             (or another type that implements `{Try}`)"]
[00:02:28]    | |_______________________________________________________________________^

This probably needs a cfg_attr(not(stage0), ...).

@estebank
Copy link
Contributor Author

@kennytm @brson, I'm thinking that we should just wait until #43000 is part of the release. It's a minor thing, I feel.

@arielb1 arielb1 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 18, 2017
@arielb1
Copy link
Contributor

arielb1 commented Jul 18, 2017

Yeah that will happen the next time we'll have a snapshot, which should be in a ~week or so

@alexcrichton
Copy link
Member

@estebank I think we've got a new stage0 so this should be ready for a rebase!

@estebank estebank force-pushed the try-on-unimplemented-2 branch from ef86ca6 to 4f7834e Compare July 28, 2017 02:18
@estebank
Copy link
Contributor Author

@alexcrichton This PR is ready for merging.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 28, 2017

📌 Commit 4f7834e has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jul 28, 2017

⌛ Testing commit 4f7834e with merge 4d5150c...

bors added a commit that referenced this pull request Jul 28, 2017
Use `rustc_on_unimplemented`'s trait name argument in `try`

Follow up to #43000 and #43001. Fix #42694.
@bors
Copy link
Contributor

bors commented Jul 28, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 4d5150c to master...

@bors bors merged commit 4f7834e into rust-lang:master Jul 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants