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

Rollup of 4 pull requests #34883

Closed
wants to merge 8 commits into from
Closed

Conversation

sanxiyn and others added 8 commits July 14, 2016 05:29
…omez

Partial rewrite/expansion of `Vec::truncate` documentation.

None
…richton

Refactored code to access TLS only in case of panic (II)

Fixes rust-lang#34787
r? @alexcrichton
Do it **very** carefully this time!
Do not resolve inherent static methods from other crates prematurely

Under some specific circumstances paths like `Type::method` can be resolved early in rustc_resolve instead of type checker. `Type` must be defined in another crate, it should be an enum or a trait object (i.e. a type that acts as a "module" in resolve), and `method` should be an inherent static method.
As a result, such paths don't go through `resolve_ufcs`, may be resolved incorrectly and break some invariants in type checker. This patch removes special treatment of such methods.

The removed code was introduced in rust-lang@2bd46e7 to fix a problem that no longer exists.

r? @jseyfried
@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@Manishearth
Copy link
Member Author

@bors r+ p=5

@bors
Copy link
Contributor

bors commented Jul 17, 2016

📌 Commit 6f9f903 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Jul 17, 2016

⌛ Testing commit 6f9f903 with merge 8750c89...

@bors
Copy link
Contributor

bors commented Jul 17, 2016

💔 Test failed - auto-win-gnu-32-opt-rustbuild

@Manishearth Manishearth deleted the rollup branch July 17, 2016 15:13
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants