Skip to content

save-analysis: Nest tables when processing impl block definitions - #65511

Merged
bors merged 2 commits into
rust-lang:masterfrom
Xanewok:sa-nest-in-impls
Oct 19, 2019
Merged

save-analysis: Nest tables when processing impl block definitions#65511
bors merged 2 commits into
rust-lang:masterfrom
Xanewok:sa-nest-in-impls

Conversation

@Xanewok

Copy link
Copy Markdown
Contributor

Similar to #65353 (which this PR should've been a part of), however in this case we didn't previously nest the tables when processing trait paths in impl block declarations.

Closes#65411

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @petrochenkov

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 17, 2019
@XanewokXanewok changed the title Sa nest in implssave-analysis: Nest tables when processing impl block definitionsOct 17, 2019
@Xanewok

Copy link
Copy Markdown
ContributorAuthor

@nikomatsakis similarly to #65353 (comment) I'd like to nominate this for a beta backport if possible (these 2 changes can be safely rolled up)

@Mark-SimulacrumMark-Simulacrum added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 17, 2019
@pnkfelix

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 18, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit ad6ce46 has been approved by pnkfelix

@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 18, 2019
@pnkfelix

Copy link
Copy Markdown
Contributor

@bors rollup

Centril added a commit to Centril/rust that referenced this pull request Oct 18, 2019
save-analysis: Nest tables when processing impl block definitions
Similar to rust-lang#65353 (which this PR should've been a part of), however in this case we didn't previously nest the tables when processing trait paths in impl block declarations.
Closesrust-lang#65411
@CentrilCentril mentioned this pull request Oct 18, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Oct 18, 2019
save-analysis: Nest tables when processing impl block definitions
Similar to rust-lang#65353 (which this PR should've been a part of), however in this case we didn't previously nest the tables when processing trait paths in impl block declarations.
Closesrust-lang#65411
@tmandrytmandry mentioned this pull request Oct 18, 2019
bors added a commit that referenced this pull request Oct 18, 2019
Rollup of 17 pull requests
Successful merges:
- #65016 (Always inline `mem::{size_of,align_of}` in debug builds)
- #65197 (Prepare `MutVisitor`s to handle interned projections)
- #65201 (Disable Go and OCaml bindings when building LLVM)
- #65364 (Collect occurrences of empty blocks for mismatched braces diagnostic)
- #65417 (Add more coherence tests)
- #65434 (Add long error explanation for E0577)
- #65455 (Avoid unnecessary `TokenTree` to `TokenStream` conversions)
- #65472 (Use a sharded dep node to dep node index map)
- #65480 (Speed up `LexicalResolve::expansion()`)
- #65496 (properly document panics in div_euclid and rem_euclid)
- #65508 (add option to ping llvm ice-breakers to triagebot)
- #65511 (save-analysis: Nest tables when processing impl block definitions)
- #65513 (reorder fmt docs for more clarity)
- #65532 (doc: make BitSet intro more short)
- #65540 (show up some extra info when t!() fails)
- #65549 (Fix left/right shift typo in wrapping rotate docs)
- #65552 (Clarify diagnostics when using `~` as a unary op)
Failed merges:
- #65471 (Add long error explanation for E0578)
r? @ghost
tmandry added a commit to tmandry/rust that referenced this pull request Oct 18, 2019
save-analysis: Nest tables when processing impl block definitions
Similar to rust-lang#65353 (which this PR should've been a part of), however in this case we didn't previously nest the tables when processing trait paths in impl block declarations.
Closesrust-lang#65411
@tmandrytmandry mentioned this pull request Oct 18, 2019
@petrochenkov

Copy link
Copy Markdown
Contributor

r? @pnkfelix

bors added a commit that referenced this pull request Oct 19, 2019
Rollup of 19 pull requests
Successful merges:
- #65016 (Always inline `mem::{size_of,align_of}` in debug builds)
- #65197 (Prepare `MutVisitor`s to handle interned projections)
- #65201 (Disable Go and OCaml bindings when building LLVM)
- #65334 (Add long error explanation for E0575)
- #65364 (Collect occurrences of empty blocks for mismatched braces diagnostic)
- #65455 (Avoid unnecessary `TokenTree` to `TokenStream` conversions)
- #65472 (Use a sharded dep node to dep node index map)
- #65480 (Speed up `LexicalResolve::expansion()`)
- #65493 (Add long error explanation for E0584)
- #65496 (properly document panics in div_euclid and rem_euclid)
- #65498 (Plugins deprecation: don’t suggest simply removing the attribute)
- #65508 (add option to ping llvm ice-breakers to triagebot)
- #65511 (save-analysis: Nest tables when processing impl block definitions)
- #65513 (reorder fmt docs for more clarity)
- #65532 (doc: make BitSet intro more short)
- #65535 (rustc: arena-allocate the slice in `ty::GenericsPredicate`, not the whole struct.)
- #65540 (show up some extra info when t!() fails)
- #65549 (Fix left/right shift typo in wrapping rotate docs)
- #65552 (Clarify diagnostics when using `~` as a unary op)
Failed merges:
- #65390 (Add long error explanation for E0576)
- #65434 (Add long error explanation for E0577)
- #65471 (Add long error explanation for E0578)
r? @ghost
@bors
bors merged commit ad6ce46 into rust-lang:masterOct 19, 2019
@Xanewok
Xanewok deleted the sa-nest-in-impls branch October 20, 2019 13:45
@nikomatsakis

Copy link
Copy Markdown
Contributor

Discussed in the @rust-lang/compiler meeting, accepted for beta backport.

@nikomatsakisnikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 24, 2019
@Mark-SimulacrumMark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 25, 2019
bors added a commit that referenced this pull request Oct 26, 2019
[beta] backport rollup
This includes a bunch of PRs:
* Fix redundant semicolon lint interaction with proc macro attributes #64387
* Upgrade async/await to "used" keywords. #64875
* syntax: fix dropping of attribute on first param of non-method assocated fn #64894
* async/await: improve not-send errors #64895
* Silence unreachable code lint from await desugaring #64930
* Always mark rust and rust-call abi's as unwind #65020
* Account for macro invocation in `let mut $pat` diagnostic. #65123
* Ensure that associated `async fn`s have unique fresh param names #65142
* Add troubleshooting section to PGO chapter in rustc book. #65402
* Upgrade GCC to 8.3.0, glibc to 1.17.0 and crosstool-ng to 1.24.0 for dist-armv7-linux #65302
* Optimize `try_expand_impl_trait_type` #65293
* use precalculated dominators in explain_borrow #65172
* Fix ICE #64964#64989
* [beta] Revert "Auto merge of #62948 - matklad:failable-file-loading, r=petro… #65273
* save-analysis: Don't ICE when resolving qualified type paths in struct members #65353
* save-analysis: Nest tables when processing impl block definitions #65511
* Avoid ICE when checking `Destination` of `break` inside a closure #65518
* Avoid ICE when adjusting bad self ty #65755
* workaround msys2 bug #65762
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.

-Z save-analysis ICE when processing impl under an fn item

7 participants

@Xanewok@rust-highfive@pnkfelix@bors@petrochenkov@nikomatsakis@Mark-Simulacrum