Skip to content

Remove some imports to the rustc crate - #69920

Merged
bors merged 2 commits into
rust-lang:masterfrom
Centril:hir-cleanup
Mar 19, 2020
Merged

Remove some imports to the rustc crate#69920
bors merged 2 commits into
rust-lang:masterfrom
Centril:hir-cleanup

Conversation

@Centril

@CentrilCentril commented Mar 11, 2020

Copy link
Copy Markdown
Contributor

  • When we have NestedVisitorMap::None, we use type Map = dyn intravisit::Map<'v>; instead of the actual map. This doesn't actually result in dynamic dispatch (in the future we may want to use an associated type default to simplify the code).

  • Use rustc_session:: imports instead of rustc::{session, lint}.

r? @Zoxc

@CentrilCentril mentioned this pull request Mar 11, 2020
Merged
@bors

This comment has been minimized.

Sign in to view
@borsbors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 13, 2020
@CentrilCentril mentioned this pull request Mar 15, 2020
Closed
@CentrilCentril added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 15, 2020
@Centril

Centril commented Mar 15, 2020

Copy link
Copy Markdown
ContributorAuthor

r? @Mark-Simulacrum

@Zoxc

Zoxc commented Mar 15, 2020

Copy link
Copy Markdown
Contributor

I guess type Map = dyn intravisit::Map<'v>; needs to be changed to type Map = &'static dyn intravisit::Map<'static>; once #68944 lands.

@bors

This comment has been minimized.

Sign in to view
@Centril

Centril commented Mar 16, 2020

Copy link
Copy Markdown
ContributorAuthor

@Zoxc I don't think that will work. I had to introduce pub struct ErasedMap<'hir>(&'hir dyn Map<'hir>); to make things compile again (but that won't actually work without ::None, but that's OK for now). I think we need GATs to make dynamic dispatch actually work for ::OnlyBodies(...).

r? @Zoxc

@Zoxc

Zoxc commented Mar 18, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 18, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 4392a8b has been approved by Zoxc

@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 Mar 18, 2020
Centril added a commit to Centril/rust that referenced this pull request Mar 18, 2020
@Centril
Rollup merge ofrust-lang#69920- Centril:hir-cleanup, r=Zoxc
304816b
Remove some imports to the rustc crate
- When we have `NestedVisitorMap::None`, we use `type Map = dyn intravisit::Map<'v>;` instead of the actual map. This doesn't actually result in dynamic dispatch (in the future we may want to use an associated type default to simplify the code).
- Use `rustc_session::` imports instead of `rustc::{session, lint}`.
r? @Zoxc
@CentrilCentril mentioned this pull request Mar 18, 2020
Closed
@CentrilCentril mentioned this pull request Mar 18, 2020
Merged
emilyalbini added a commit to emilyalbini/rust that referenced this pull request Mar 18, 2020
@emilyalbini
Rollup merge ofrust-lang#70112- Centril:rollup-gpi5tbq, r=Centril
11053ba
Rollup of 10 pull requests
Successful merges:
- rust-lang#67749 (keyword docs for else and inkeyword docs for else and in.)
- rust-lang#69139 (clean up E0308 explanation)
- rust-lang#69189 (Erase regions in writeback)
- rust-lang#69837 (Use smaller discriminants for generators)
- rust-lang#69838 (Expansion-driven outline module parsing)
- rust-lang#69839 (Miri error reform)
- rust-lang#69899 (Make methods declared by `newtype_index` macro `const`)
- rust-lang#69920 (Remove some imports to the rustc crate)
- rust-lang#70075 (Fix repr pretty display)
- rust-lang#70106 (Tidy: fix running rustfmt twice)
Failed merges:
- rust-lang#70051 (Allow `hir().find` to return `None`)
- rust-lang#70074 (Expand: nix all fatal errors)
r? @ghost
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Mar 18, 2020
@matthiaskrgr
rustuprust-lang/rust#69920
701ff40
@bors
bors merged commit 292c538 into rust-lang:masterMar 19, 2020
@Centril
Centril deleted the hir-cleanup branch March 19, 2020 03:35
bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 19, 2020
@bors
Auto merge of#5336- matthiaskrgr:rustup_35, r=phansch
99f8522
rustup rust-lang/rust#69920
changelog: none
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Mar 19, 2020
@matthiaskrgr
rustuprust-lang/rust#69920
b9d6bf3
bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 19, 2020
@bors
Auto merge of#5336- matthiaskrgr:rustup_35, r=phansch
e8cc1d5
rustup rust-lang/rust#69920
changelog: none
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Mar 19, 2020
@matthiaskrgr
Rollup merge ofrust-lang#5336- matthiaskrgr:rustup_35, r=phansch
5e26fe9
rustup rust-lang/rust#69920
changelog: none
@matthiaskrgrmatthiaskrgr mentioned this pull request Mar 19, 2020
Closed
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Mar 19, 2020
@matthiaskrgr
Rollup merge ofrust-lang#5336- matthiaskrgr:rustup_35, r=phansch
1f5f833
rustup rust-lang/rust#69920
changelog: none
@matthiaskrgrmatthiaskrgr mentioned this pull request Mar 19, 2020
Closed
flip1995 added a commit to flip1995/rust-clippy that referenced this pull request Mar 19, 2020
@flip1995
Rollup merge ofrust-lang#5336- matthiaskrgr:rustup_35, r=flip1995
a46675f
rustup rust-lang/rust#69920
changelog: none
@flip1995flip1995 mentioned this pull request Mar 19, 2020
Merged
bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 19, 2020
@bors
Auto merge of#5342- flip1995:rollup-77s2pmt, r=<try>
0aff00d
Rollup of 4 pull requests
Successful merges:
- #5326 (rustup rust-lang/rust#69838)
- #5333 (rustup rust-lang/rust#69189)
- #5336 (rustup rust-lang/rust#69920)
- #5341 (Rustup to rust-lang/rust#66131)
Failed merges:
r? @ghost
bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 19, 2020
@bors
Auto merge of#5342- flip1995:rollup-77s2pmt, r=<try>
2c01ab0
Rollup of 4 pull requests
Successful merges:
- #5326 (rustup rust-lang/rust#69838)
- #5333 (rustup rust-lang/rust#69189)
- #5336 (rustup rust-lang/rust#69920)
- #5341 (Rustup to rust-lang/rust#66131)
Failed merges:
r? @ghost
changelog: none
Xanewok added a commit to rust-lang/rls that referenced this pull request Mar 19, 2020
@Xanewok
Fix fallout afterrust-lang/rust#69920
4a587b5
bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 19, 2020
@bors
Auto merge of#5342- flip1995:rollup-77s2pmt, r=<try>
3afbbf1
Rollup of 4 pull requests
Successful merges:
- #5326 (rustup rust-lang/rust#69838)
- #5333 (rustup rust-lang/rust#69189)
- #5336 (rustup rust-lang/rust#69920)
- #5341 (Rustup to rust-lang/rust#66131)
Failed merges:
r? @ghost
changelog: none
bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 19, 2020
@bors
Auto merge of#5342- flip1995:rollup-77s2pmt, r=<try>
37941d5
Rollup of 4 pull requests
Successful merges:
- #5326 (rustup rust-lang/rust#69838)
- #5333 (rustup rust-lang/rust#69189)
- #5336 (rustup rust-lang/rust#69920)
- #5341 (Rustup to rust-lang/rust#66131)
Failed merges:
r? @ghost
changelog: none
bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 19, 2020
@bors
Auto merge of#5342- flip1995:rollup-77s2pmt, r=flip1995
d8e6e4c
Rollup of 4 pull requests
Successful merges:
- #5326 (rustup rust-lang/rust#69838)
- #5333 (rustup rust-lang/rust#69189)
- #5336 (rustup rust-lang/rust#69920)
- #5341 (Rustup to rust-lang/rust#66131)
Failed merges:
r? @ghost
changelog: none
@SimonSapinSimonSapin mentioned this pull request Mar 20, 2020
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@ZoxcZoxc

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Centril@bors@Zoxc@Mark-Simulacrum