resolve: Do not skip extern prelude during speculative resolution by petrochenkov · Pull Request #55102 · rust-lang/rust

petrochenkov · 2018-10-15T20:46:20Z

Fixes#54665

rust-highfive · 2018-10-15T20:46:25Z

r? @zackmdavis

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

petrochenkov · 2018-10-15T20:46:37Z

r? @nikomatsakis

petrochenkov · 2018-10-15T20:54:12Z

petrochenkov · 2018-10-15T21:28:28Z

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 · 2018-10-16T13:59:10Z

@bors r+

bors · 2018-10-16T13:59:11Z

📌 Commit 01c694b2dcab6d8d3d58c68d5e64b38309136391 has been approved by nikomatsakis

bors · 2018-10-17T04:35:40Z

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

petrochenkov · 2018-10-17T07:58:33Z

@bors r=nikomatsakis

bors · 2018-10-17T07:58:34Z

📌 Commit 350f9a2 has been approved by nikomatsakis

resolve: Do not skip extern prelude during speculative resolution Fixesrust-lang#54665

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 · 2018-10-18T09:18:30Z

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

bors · 2018-10-18T09:52:58Z

⌛ Testing commit 350f9a2 with merge af204b1...

bors · 2018-10-18T09:52:59Z

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

pnkfelix · 2018-10-18T14:36:57Z

discussed at compiler team meeting. beta-accepted.

@ghost

[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

rust-highfive assigned zackmdavis Oct 15, 2018

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

rust-highfive assigned nikomatsakis and unassigned zackmdavis Oct 15, 2018

This was referenced Oct 15, 2018
trait permitting extra members #54665
Closed
Speculative crate loading is not speculative enough #55103
Closed

petrochenkov commented Oct 15, 2018
View reviewed changes

Comment threadsrc/test/run-pass/extern/extern-prelude-no-speculative.rs Outdated
petrochenkovOct 15, 2018
Copy link
Copy Markdown
ContributorAuthor
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cc #55103

petrochenkov added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 15, 2018

nikomatsakis approved these changes Oct 16, 2018
View reviewed changes

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 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

resolve: Do not skip extern prelude during speculative resolution
350f9a2

petrochenkov force-pushed the trextra branch from 01c694b to 350f9a2Compare October 17, 2018 07:58

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 mentioned this pull request Oct 18, 2018
Rollup of 18 pull requests #55171
Merged

kennytm added a commit to kennytm/rust that referenced this pull request Oct 18, 2018
Rollup merge ofrust-lang#55102- petrochenkov:trextra, r=nikomatsakis
8988403
resolve: Do not skip extern prelude during speculative resolution Fixesrust-lang#54665

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 merged commit 350f9a2 into rust-lang:masterOct 18, 2018

pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 18, 2018

emilyalbini mentioned this pull request Oct 18, 2018
[beta] Rollup backports #55184
Merged

emilyalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 18, 2018

petrochenkov deleted the trextra branch June 5, 2019 16:21

Uh oh!

Uh oh!

Conversation

petrochenkov commented Oct 15, 2018

Uh oh!

rust-highfive commented Oct 15, 2018

Uh oh!

petrochenkov commented Oct 15, 2018

Uh oh!

petrochenkovOct 15, 2018

Choose a reason for hiding this comment

Uh oh!

petrochenkov commented Oct 15, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nikomatsakis commented Oct 16, 2018

Uh oh!

bors commented Oct 16, 2018

Uh oh!

bors commented Oct 17, 2018

Uh oh!

petrochenkov commented Oct 17, 2018

Uh oh!

bors commented Oct 17, 2018

Uh oh!

petrochenkov commented Oct 18, 2018

Uh oh!

bors commented Oct 18, 2018

Uh oh!

bors commented Oct 18, 2018

Uh oh!

pnkfelix commented Oct 18, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

petrochenkov commented Oct 15, 2018•
edited
Loading