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

Issue 29161 #29415

Merged
merged 2 commits into from
Oct 28, 2015
Merged

Issue 29161 #29415

merged 2 commits into from
Oct 28, 2015

Conversation

nikomatsakis
Copy link
Contributor

Fix corner case in privacy that was causing ICEs when the source_did was not crate-local.

Full confession: I only kinda sorta understand this code, but afaict it's legit for source_did to be from another crate.

r? @alexcrichton

@nikomatsakis
Copy link
Contributor Author

cc #29161

@alexcrichton
Copy link
Member

@bors: r+ c70fd5825ed65a98dfd6d58675661a3abb371ebd

@brson brson added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 28, 2015
@brson
Copy link
Contributor

brson commented Oct 28, 2015

This didn't land before 1.5 branched.

@bors
Copy link
Contributor

bors commented Oct 28, 2015

⌛ Testing commit c70fd58 with merge 48b9c5a...

@bors
Copy link
Contributor

bors commented Oct 28, 2015

💔 Test failed - auto-mac-64-opt

@nikomatsakis
The source_did may not be local, so don't unwrap the
19996d4 
`as_local_node_id`, instead just compare against `Some(id)`.
Fixes rust-lang#29161.
@nikomatsakis
Copy link
Contributor Author

@bors r+

@bors
Copy link
Contributor

bors commented Oct 28, 2015

📌 Commit 19996d4 has been approved by nikomatsakis

bors added a commit that referenced this pull request Oct 28, 2015
@bors
Auto merge of #29415 - nikomatsakis:issue-29161, r=nikomatsakis
e6ad039 
Fix corner case in privacy that was causing ICEs when the `source_did` was not crate-local.

Full confession: I only kinda sorta understand this code, but afaict it's legit for `source_did` to be from another crate.

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Oct 28, 2015

⌛ Testing commit 19996d4 with merge e6ad039...

@bors
Copy link
Contributor

bors commented Oct 28, 2015

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

@bors bors merged commit 19996d4 into rust-lang:master Oct 28, 2015
@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 29, 2015
@alexcrichton alexcrichton mentioned this pull request Oct 29, 2015
Merged
@brson brson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 29, 2015
@nikomatsakis nikomatsakis deleted the issue-29161 branch March 30, 2016 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nikomatsakis @alexcrichton @brson @bors