Skip to content

save-analysis: Don't panic for macro-generated use globs - #55879

Merged
bors merged 1 commit into
rust-lang:masterfrom
Xanewok:dont-panic-with-globs
Nov 14, 2018
Merged

save-analysis: Don't panic for macro-generated use globs#55879
bors merged 1 commit into
rust-lang:masterfrom
Xanewok:dont-panic-with-globs

Conversation

@Xanewok

@XanewokXanewok commented Nov 11, 2018

Copy link
Copy Markdown
Contributor

Follow-up to c2bb7ca - as before, ignore the use globs in macro expansions.

Fixesrust-lang/rls#1117.
Closes#55480.

r? @nrc

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

nrc commented Nov 11, 2018

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Nov 11, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 04cc0d6 has been approved by nrc

@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 Nov 11, 2018
emilyalbini added a commit to emilyalbini/rust that referenced this pull request Nov 12, 2018
save-analysis: Don't panic for macro-generated use globs
Follow-up to rust-lang@c2bb7ca - as before, ignore the use globs in macro expansions.
Fixesrust-lang/rls#1117.
Closesrust-lang#55480.
r? @nrc
@kennytmkennytm mentioned this pull request Nov 13, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Nov 13, 2018
save-analysis: Don't panic for macro-generated use globs
Follow-up to rust-lang@c2bb7ca - as before, ignore the use globs in macro expansions.
Fixesrust-lang/rls#1117.
Closesrust-lang#55480.
r? @nrc
bors added a commit that referenced this pull request Nov 13, 2018
Rollup of 20 pull requests
Successful merges:
- #55136 (Remove short doc where it starts with a codeblock)
- #55711 (Format BtreeMap::range_mut example)
- #55722 (impl_stable_hash_for: support enums and tuple structs with generic parameters)
- #55754 (Avoid converting bytes to UTF-8 strings to print, just pass bytes to stdout/err)
- #55804 (rustdoc: don't inline `pub use some_crate` unless directly asked to)
- #55805 (Move `static_assert!` into librustc_data_structures)
- #55837 (Make PhantomData #[structural_match])
- #55840 (Fix TLS errors when downloading stage0)
- #55843 (add FromIterator<A> to Box<[A]>)
- #55858 (Small fixes on code blocks in rustdoc)
- #55863 (Fix a typo in std::panic)
- #55870 (Fix typos.)
- #55874 (string: Add documentation for `From` impls)
- #55879 (save-analysis: Don't panic for macro-generated use globs)
- #55882 (Reference count `crate_inherent_impls`s return value.)
- #55888 (miri: for uniformity, also move memory_deallocated to AllocationExtra)
- #55889 (global allocators: add a few comments)
- #55896 (Document optimizations enabled by FusedIterator)
- #55905 (Change `Lit::short_name` to `Lit::literal_name`.)
- #55908 (Fix their/there grammar nit)
@bors
bors merged commit 04cc0d6 into rust-lang:masterNov 14, 2018
@Xanewok
Xanewok deleted the dont-panic-with-globs branch November 14, 2018 17:48
@nrcnrc added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 19, 2018
@nikomatsakisnikomatsakis added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. 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
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.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@Xanewok@nrc@bors@alexcrichton@nikomatsakis@rust-highfive