Skip to content

Adjust Ids of path segments in visibility modifiers - #55487

Merged
bors merged 1 commit into
rust-lang:masterfrom
nrc:path-fix
Oct 30, 2018
Merged

Adjust Ids of path segments in visibility modifiers#55487
bors merged 1 commit into
rust-lang:masterfrom
nrc:path-fix

Conversation

@nrc

@nrcnrc commented Oct 29, 2018

Copy link
Copy Markdown
Member

Fixes#55376 (nightly regression)

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

Copy link
Copy Markdown
Contributor

Thanks!
@bors r+

@bors

bors commented Oct 29, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit f586ac9 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 Oct 29, 2018
@petrochenkovpetrochenkov added beta-nominated Nominated for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Oct 29, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Oct 30, 2018
Adjust Ids of path segments in visibility modifiers
Fixesrust-lang#55376 (nightly regression)
r? @petrochenkov
@kennytmkennytm mentioned this pull request Oct 30, 2018
bors added a commit that referenced this pull request Oct 30, 2018
Rollup of 12 pull requests
Successful merges:
- #54885 (Don't lint 'unused_parens` on `if (break _) { .. }`)
- #55205 (Improve a few cases of collecting to an FxHash(Map/Set))
- #55450 (msp430: remove the whole Atomic* API)
- #55459 (Add UI test for #49296)
- #55472 (Use opt.take() instead of mem::replace(opt, None))
- #55473 (Take advantage of impl Iterator in (transitive/elaborate)_bounds)
- #55474 (Fix validation false positive)
- #55476 (Change a flat_map with 0/1-element vecs to a filter_map)
- #55487 (Adjust Ids of path segments in visibility modifiers)
- #55493 (Doc fixes)
- #55494 (borrowck=migrate must look at parents of closures)
- #55496 (Update clippy)
Failed merges:
r? @ghost
@bors
bors merged commit f586ac9 into rust-lang:masterOct 30, 2018
@nrcnrc added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 19, 2018
@nikomatsakisnikomatsakis mentioned this pull request Nov 20, 2018
20 tasks
@alexcrichtonalexcrichton added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Nov 20, 2018
@alexcrichtonalexcrichton added this to the Rust 2018 Release milestone Nov 20, 2018
bors added a commit that referenced this pull request Nov 20, 2018
beta backport rollup
Backports of some beta-approved PRs
- [x] #55385: NLL: cast causes failure to promote to static
- [x] #56043: remove "approx env bounds" if we already know from trait
- [x] #56003: do not propagate inferred bounds on trait objects if they involve `Self`
- [x] #55852: Rewrite `...` as `..=` as a `MachineApplicable` 2018 idiom lint
- [x] #55804: rustdoc: don't inline `pub use some_crate` unless directly asked to
- [x] #56059: Increase `Duration` approximate equal threshold to 1us
- [x] Keep resolved defs in path prefixes and emit them in save-analysis #54145
- [x] Adjust Ids of path segments in visibility modifiers #55487
- [x] save-analysis: bug fix and optimisation. #55521
- [x] save-analysis: be even more aggressive about ignorning macro-generated defs #55936
- [x] save-analysis: fallback to using path id #56060
- [x] save-analysis: Don't panic for macro-generated use globs #55879
- [x] Add temporary renames to manifests for rustfmt/clippy #56081
- [x] Revert #51601#56049
- [x] Fix stability hole with `static _` #55983
- [x] #56077
- [x] Fix Rustdoc ICE when checking blanket impls #55258
- [x] Updated RELEASES.md for 1.31.0 #55678
- [x] ~~#56061~~ #56111
- [x] Stabilize `extern_crate_item_prelude` #56032
Still running tests locally, and I plan to backport @nrc's other PRs too
(cc @petrochenkov -- thanks for the advice)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@nrc@petrochenkov@bors@alexcrichton@rust-highfive