Skip to content

rustc_resolve: don't record uniform_paths canaries as reexports. - #53993

Merged
bors merged 1 commit into
rust-lang:masterfrom
eddyb:issue-53691
Sep 8, 2018
Merged

rustc_resolve: don't record uniform_paths canaries as reexports.#53993
bors merged 1 commit into
rust-lang:masterfrom
eddyb:issue-53691

Conversation

@eddyb

@eddybeddyb commented Sep 6, 2018

Copy link
Copy Markdown
Contributor

Fixes#53691, fixes#53484.

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 6, 2018
@petrochenkov

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Sep 6, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit c34dd37 has been approved by petrochenkov

@borsbors 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 Sep 6, 2018
@kennytmkennytm mentioned this pull request Sep 7, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Sep 7, 2018
rustc_resolve: don't record uniform_paths canaries as reexports.
Fixesrust-lang#53691, fixesrust-lang#53484.
kennytm added a commit to kennytm/rust that referenced this pull request Sep 8, 2018
rustc_resolve: don't record uniform_paths canaries as reexports.
Fixesrust-lang#53691, fixesrust-lang#53484.
@kennytmkennytm mentioned this pull request Sep 8, 2018
bors added a commit that referenced this pull request Sep 8, 2018
Rollup of 11 pull requests
Successful merges:
- #51366 (stabilize #[panic_handler])
- #53162 (rustdoc: collect trait impls as an early pass)
- #53932 ([NLL] Remove base_place)
- #53942 (Rewrite `precompute_borrows_out_of_scope` for fewer hash table lookups.)
- #53973 (Have rust-lldb look for the rust-enabled lldb)
- #53981 (Implement initializer() for FileDesc)
- #53987 (rustbuild: allow configuring llvm version suffix)
- #53993 (rustc_resolve: don't record uniform_paths canaries as reexports.)
- #54007 (crates that provide a `panic_handler` are exempt from the `unused_extern_crates` lint)
- #54040 (update books for next release)
- #54050 (Update `petgraph` dependency to 0.4.13 to fix build with nightly)
Failed merges:
r? @ghost
kennytm added a commit to kennytm/rust that referenced this pull request Sep 8, 2018
rustc_resolve: don't record uniform_paths canaries as reexports.
Fixesrust-lang#53691, fixesrust-lang#53484.
bors added a commit that referenced this pull request Sep 8, 2018
Rollup of 10 pull requests
Successful merges:
- #53315 (use `NonZeroU32` in `newtype_index!`macro, change syntax)
- #53932 ([NLL] Remove base_place)
- #53942 (Rewrite `precompute_borrows_out_of_scope` for fewer hash table lookups.)
- #53973 (Have rust-lldb look for the rust-enabled lldb)
- #53981 (Implement initializer() for FileDesc)
- #53987 (rustbuild: allow configuring llvm version suffix)
- #53993 (rustc_resolve: don't record uniform_paths canaries as reexports.)
- #54007 (crates that provide a `panic_handler` are exempt from the `unused_extern_crates` lint)
- #54040 (update books for next release)
- #54050 (Update `petgraph` dependency to 0.4.13 to fix build with nightly)
@bors
bors merged commit c34dd37 into rust-lang:masterSep 8, 2018
@eddyb
eddyb deleted the issue-53691 branch September 8, 2018 16:36
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

4 participants

@eddyb@petrochenkov@bors@rust-highfive