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

Replace try! with ?. #36041

Merged
merged 13 commits into from
Sep 14, 2016
Merged

Replace try! with ?. #36041

merged 13 commits into from
Sep 14, 2016

Conversation

ahmedcharles
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @nrc

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

@nrc
Copy link
Member

nrc commented Aug 28, 2016

lgtm, but just checking with @rust-lang/compiler that they approve

@eddyb
Copy link
Member

eddyb commented Aug 28, 2016

cc @jonathandturner Does this change anything libsyntax uses or might use?
cc @erickt @dtolnay Making sure syntex doesn't get blocked.

@nrc
Copy link
Member

nrc commented Aug 28, 2016

This is all internal stuff, linbsyntax is touched in #36037

@eddyb
Copy link
Member

eddyb commented Aug 28, 2016

@nrc I was asking mostly because of a potential move of libsyntax to the error code system used in rustc.

@ahmedcharles
Copy link
Contributor Author

I can move changes (if there are any) that would impact syntex to #36037, easily enough and then get this merged.

@dtolnay
Copy link
Member

dtolnay commented Aug 28, 2016

None of these affect syntex.

@nrc
Copy link
Member

nrc commented Aug 29, 2016

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 29, 2016

📌 Commit 26296c4 has been approved by nrc

@nikomatsakis
Copy link
Contributor

👍

@bors
Copy link
Contributor

bors commented Sep 1, 2016

☔ The latest upstream changes (presumably #35718) made this pull request unmergeable. Please resolve the merge conflicts.

@ahmedcharles
Copy link
Contributor Author

I assume this needs to be approved again @nrc?

@bors
Copy link
Contributor

bors commented Sep 3, 2016

☔ The latest upstream changes (presumably #36227) made this pull request unmergeable. Please resolve the merge conflicts.

@nrc
Copy link
Member

nrc commented Sep 5, 2016

@ahmedcharles yes, and unfortunately it needs another rebase now. When you push new commits, it is a good idea to ping the reviewer in a comment since GitHub does not send notifications about new commits (thus why I missed this).

@dtolnay
Copy link
Member

dtolnay commented Sep 5, 2016

@nrc

GitHub does not send notifications about new commits (thus why I missed this).

It does if you check the "Pull Request pushes" box at https://github.com/settings/notifications:

selection_007

@sophiajt
Copy link
Contributor

sophiajt commented Sep 5, 2016

@dtolnay - if we checked that, for the amount of PRs we review, we'd likely swamp our inbox and still not see it, sadly

@ahmedcharles
Copy link
Contributor Author

@nrc Probably ready for another try.

@nrc
Copy link
Member

nrc commented Sep 9, 2016

@bors: r+

@bors
Copy link
Contributor

bors commented Sep 9, 2016

📌 Commit a51dc66 has been approved by nrc

@bors
Copy link
Contributor

bors commented Sep 9, 2016

⌛ Testing commit a51dc66 with merge 97d8c0c...

@bors
Copy link
Contributor

bors commented Sep 9, 2016

💔 Test failed - auto-win-msvc-64-cargotest

@alexcrichton
Copy link
Member

@bors: retry

On Fri, Sep 9, 2016 at 2:04 PM, bors notifications@github.com wrote:

💔 Test failed - auto-win-msvc-64-cargotest
https://buildbot.rust-lang.org/builders/auto-win-msvc-64-cargotest/builds/1774


You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#36041 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95KX4xXyVGHZWsOyAUhE62f2G0Uz9ks5qocnhgaJpZM4JutjV
.

@bors
Copy link
Contributor

bors commented Sep 10, 2016

💔 Test failed - auto-win-msvc-64-cargotest

@ahmedcharles
Copy link
Contributor Author

Seems like an intermittent failure @alexcrichton @nrc ?

@@ -0,0 +1,95 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
Copy link
Contributor

Choose a reason for hiding this comment

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

This file does not look like it's actually part of this PR.

@ahmedcharles
Copy link
Contributor Author

The merge conflict issue is fixed. @nrc.

@nrc
Copy link
Member

nrc commented Sep 13, 2016

@bors: r+

@bors
Copy link
Contributor

bors commented Sep 13, 2016

📌 Commit 694d601 has been approved by nrc

@bors
Copy link
Contributor

bors commented Sep 14, 2016

⌛ Testing commit 694d601 with merge 389abeb...

@bors
Copy link
Contributor

bors commented Sep 14, 2016

💔 Test failed - auto-win-msvc-64-opt-rustbuild

@alexcrichton
Copy link
Member

@bors: retry

On Tue, Sep 13, 2016 at 6:43 PM, bors notifications@github.com wrote:

💔 Test failed - auto-win-msvc-64-opt-rustbuild
https://buildbot.rust-lang.org/builders/auto-win-msvc-64-opt-rustbuild/builds/2482


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#36041 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95BZszGUfH0VDa7urOsQCCOQdy3Tdks5qp1E2gaJpZM4JutjV
.

bors added a commit that referenced this pull request Sep 14, 2016
@bors
Copy link
Contributor

bors commented Sep 14, 2016

⌛ Testing commit 694d601 with merge 739d571...

@bors bors merged commit 694d601 into rust-lang:master Sep 14, 2016
@ahmedcharles ahmedcharles deleted the try branch September 17, 2016 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants