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

resolve: Do not skip extern prelude during speculative resolution #55102

Merged
merged 1 commit into from
Oct 18, 2018
Merged

resolve: Do not skip extern prelude during speculative resolution #55102

merged 1 commit into from
Oct 18, 2018

Conversation

petrochenkov
Copy link
Contributor

Fixes #54665

@rust-highfive
Copy link
Collaborator

r? @zackmdavis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 15, 2018
@petrochenkov
Copy link
Contributor Author

r? @nikomatsakis

This was referenced Oct 15, 2018
Closed
Closed
petrochenkov
petrochenkov commented Oct 15, 2018
View reviewed changes
src/test/run-pass/extern/extern-prelude-no-speculative.rs
@@ -10,7 +10,7 @@

// run-pass
#![allow(unused_variables)]
// compile-flags: --extern LooksLikeExternCrate=/path/to/nowhere
// compile-flags: --extern LooksLikeExternCrate
Copy link
Contributor Author

Choose a reason for hiding this comment

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

cc #55103

@petrochenkov petrochenkov added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 15, 2018
@petrochenkov
Copy link
Contributor Author

petrochenkov commented Oct 15, 2018 •
edited
Loading

I've added beta nomination just in case, since the issue has backward compatibility implications and affects anything using extern prelude and extern prelude is stabilized on beta.

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Oct 16, 2018

📌 Commit 01c694b2dcab6d8d3d58c68d5e64b38309136391 has been approved by nikomatsakis

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 16, 2018
@bors
Copy link
Contributor

bors commented Oct 17, 2018

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

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 17, 2018
@petrochenkov
Copy link
Contributor Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Oct 17, 2018

📌 Commit 350f9a2 has been approved by nikomatsakis

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 17, 2018
@kennytm kennytm mentioned this pull request Oct 18, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Oct 18, 2018
@kennytm
Rollup merge of rust-lang#55102 - petrochenkov:trextra, r=nikomatsakis
8988403 
resolve: Do not skip extern prelude during speculative resolution

Fixes rust-lang#54665
bors added a commit that referenced this pull request Oct 18, 2018
@bors
Auto merge of #55171 - kennytm:rollup, r=kennytm
af204b1 
Rollup of 18 pull requests

Successful merges:

 - #54646 (improve documentation on std::thread::sleep)
 - #54933 (Cleanup the rest of codegen_llvm)
 - #54964 (Run both lldb and gdb tests)
 - #55016 (Deduplicate some code and compile-time values around vtables)
 - #55031 (Improve verify_llvm_ir config option)
 - #55050 (doc std::fmt: the Python inspiration is already mentioned in precedin…)
 - #55077 (rustdoc: Use dyn keyword when rendering dynamic traits)
 - #55080 (Detect if access to localStorage is forbidden by the user's browser)
 - #55090 (regression test for move out of borrow via pattern)
 - #55102 (resolve: Do not skip extern prelude during speculative resolution)
 - #55104 (Add test for #34229)
 - #55111 ([Rustc Book] Explain --cfg's arguments)
 - #55122 (Cleanup mir/borrowck)
 - #55127 (Remove HybridBitSet::dummy)
 - #55128 (Fix LLVMRustInlineAsmVerify return type mismatch)
 - #55142 (miri: layout should not affect CTFE checks (outside of validation))
 - #55151 (Cleanup nll)
 - #55161 ([librustdoc] Disable spellcheck for search field)
@petrochenkov
Copy link
Contributor Author

@bors p=1
(Because beta-nominated and the release is soon.)

@bors
Copy link
Contributor

bors commented Oct 18, 2018

⌛ Testing commit 350f9a2 with merge af204b1...

@bors
Copy link
Contributor

bors commented Oct 18, 2018

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

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 18, 2018
@bors bors merged commit 350f9a2 into rust-lang:master Oct 18, 2018
@pnkfelix
Copy link
Member

discussed at compiler team meeting. beta-accepted.

@pnkfelix pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 18, 2018
@pietroalbini pietroalbini mentioned this pull request Oct 18, 2018
Merged
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 18, 2018
bors added a commit that referenced this pull request Oct 18, 2018
@bors
Auto merge of #55184 - pietroalbini:beta-backports, r=pietroalbini
777a59a 
[beta] Rollup backports

Merged and approved:

* #54300: Updated RELEASES.md for 1.30.0
* #54939: rustdoc: don't prefer dynamic linking in doc tests
* #54671: resolve: Scale back hard-coded extern prelude additions on 2015 edition
* #55102: resolve: Do not skip extern prelude during speculative resolution

r? @ghost
@petrochenkov petrochenkov deleted the trextra branch June 5, 2019 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@petrochenkov @rust-highfive @nikomatsakis @bors @pnkfelix @zackmdavis @pietroalbini