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

Beta backport #29443

Merged
merged 4 commits into from
Oct 29, 2015
Merged

Beta backport #29443

merged 4 commits into from
Oct 29, 2015

Conversation

alexcrichton
Copy link
Member

Backport of #29403 and #29415

nikomatsakis and others added 4 commits October 28, 2015 17:12
`as_local_node_id`, instead just compare against `Some(id)`.
Fixes rust-lang#29161.
Although the compiler itself does not depend on this DLL the `libstdc++-6.dll`
that we're shipping does, so we still need to include it.
@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive
Copy link
Collaborator

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

brson added a commit that referenced this pull request Oct 29, 2015
@brson brson merged commit b0f4401 into rust-lang:beta Oct 29, 2015
@alexcrichton alexcrichton deleted the beta-backport branch October 29, 2015 00:14
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.

4 participants