Decouple `rustc_hir::print` into `rustc_hir_pretty` #70344

Centril · 2020-03-24T02:43:38Z

High level summary:

The HIR pretty printer, rustc_hir::print is moved into a new crate rustc_hir_pretty.
rustc_ast_pretty and rustc_errors are dropped as rustc_hir dependencies.
The dependence on HIR pretty is generally reduced, leaving rustc_save_analysis, rustdoc, rustc_metadata, and rustc_driver as the remaining clients.

The main goal here is to reduce rustc_hir's dependencies and its size such that it can start and finish earlier, thereby working towards #65031.

r? @Zoxc

Zoxc · 2020-03-25T04:18:10Z

The printing stuff isn't quite my wheelhouse.

r? @eddyb

eddyb · 2020-03-26T07:40:33Z

src/librustc_typeck/check/expr.rs

@@ -696,10 +696,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                    self,
                    &cause,
                    &mut |db| {
-                        db.span_label(
-                            fn_decl.output.span(),
-                            format!("expected `{}` because of this return type", fn_decl.output,),


I wonder if this was always meant to print a Ty but accidentally printed HIR.

eddyb · 2020-03-26T07:42:34Z

src/librustc_typeck/check/_match.rs

-                    return self.get_fn_decl(hir_id).map(|(fn_decl, _)| {
-                        (
-                            fn_decl.output.span(),
-                            format!("expected `{}` because of this return type", fn_decl.output),


This also looks like it might be meant to be a Ty not HIR.

eddyb · 2020-03-26T07:45:02Z

src/librustc_trait_selection/traits/object_safety.rs

@@ -170,6 +170,24 @@ fn object_safety_violations_for_trait(
    violations
 }

+fn trait_bound_spans<'tcx>(


sized_trait_bound_spans, maybe?

Yea I wasn't really satisfied with the current name, yours is better.

eddyb · 2020-03-26T08:10:00Z

r=me after addressing #70344 (comment), the hir::FnRetTy -> Ty stuff is probably too messy.

Centril · 2020-03-26T09:00:39Z

@bors r=eddyb

bors · 2020-03-26T09:00:40Z

📌 Commit b514c42 has been approved by eddyb

bors · 2020-03-26T10:40:45Z

⌛ Testing commit b514c42 with merge dbc53eff3922c88a47237fef10fe21d9e39e61a5...

@Zoxc

Decouple `rustc_hir::print` into `rustc_hir_pretty` High level summary: - The HIR pretty printer, `rustc_hir::print` is moved into a new crate `rustc_hir_pretty`. - `rustc_ast_pretty` and `rustc_errors` are dropped as `rustc_hir` dependencies. - The dependence on HIR pretty is generally reduced, leaving `rustc_save_analysis`, `rustdoc`, `rustc_metadata`, and `rustc_driver` as the remaining clients. The main goal here is to reduce `rustc_hir`'s dependencies and its size such that it can start and finish earlier, thereby working towards rust-lang#65031. r? @Zoxc

Centril · 2020-03-26T10:42:13Z

@bors retry

Centril · 2020-03-26T12:31:26Z

Failed in #70425 (comment), @bors r-
(Note to self: add #![recursion_limit="256"] to rustc_hir_pretty.)

Centril · 2020-03-26T12:50:24Z

@bors r=eddyb

bors · 2020-03-26T12:50:25Z

📌 Commit b2f7a95 has been approved by eddyb

@ghost

Rollup of 5 pull requests Successful merges: - rust-lang#69644 (Remove framework in `dataflow/mod.rs` in favor of "generic" one) - rust-lang#69936 (Fix cycle error when emitting suggestion for mismatched `fn` type) - rust-lang#70048 (Allow obtaining &mut OsStr) - rust-lang#70344 (Decouple `rustc_hir::print` into `rustc_hir_pretty`) - rust-lang#70435 (Add regression test for rust-lang#66706) Failed merges: r? @ghost

Changes: ```` remove redundant import rustup rust-lang#68404 rustup rust-lang#69644 rustup rust-lang#70344 Move verbose_file_reads to restriction move redundant_pub_crate to nursery readme: explain how to run only a single lint on a codebase Remove dependency on `matches` crate Move useless_transmute to nursery nursery group -> style Update for PR feedback Auto merge of rust-lang#5314 - ehuss:remove-git2, r=flip1995 Lint for `pub(crate)` items that are not crate visible due to the visibility of the module that contains them ```` Fixes rust-lang#70456

submodules: update clippy from 1ff81c1 to 70b93aa Changes: ```` remove redundant import rustup rust-lang#68404 rustup rust-lang#69644 rustup rust-lang#70344 Move verbose_file_reads to restriction move redundant_pub_crate to nursery readme: explain how to run only a single lint on a codebase Remove dependency on `matches` crate Move useless_transmute to nursery nursery group -> style Update for PR feedback Auto merge of rust-lang#5314 - ehuss:remove-git2, r=flip1995 Lint for `pub(crate)` items that are not crate visible due to the visibility of the module that contains them ```` Fixes rust-lang#70456

Changes: ```` remove redundant import rustup rust-lang/rust#68404 rustup rust-lang/rust#69644 rustup rust-lang/rust#70344 Move verbose_file_reads to restriction move redundant_pub_crate to nursery readme: explain how to run only a single lint on a codebase Remove dependency on `matches` crate Move useless_transmute to nursery nursery group -> style Update for PR feedback Auto merge of rust-lang#5314 - ehuss:remove-git2, r=flip1995 Lint for `pub(crate)` items that are not crate visible due to the visibility of the module that contains them ```` Fixes #70456

rust-highfive assigned Zoxc Mar 24, 2020

This comment has been minimized.

Sign in to view

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 24, 2020

Centril added 3 commits March 24, 2020 06:22

decouple rustc_hir::print from crate

f07802c

rustc_hir: nix rustc_errors dep

b60d732

move rustc_hir::print -> rustc_hir_pretty

b3866a5

Centril force-pushed the hir-pretty branch from 012e1ca to f16c798 Compare March 24, 2020 05:26

This comment has been minimized.

Sign in to view

Centril added 2 commits March 24, 2020 08:38

rustc_typeck: remove rustc_hir_pretty usage

92885e3

rustc: remove rustc_hir_pretty dependency.

f1701dd

Centril force-pushed the hir-pretty branch from f16c798 to f1701dd Compare March 24, 2020 07:45

Centril 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 24, 2020

rust-highfive assigned eddyb and unassigned Zoxc Mar 25, 2020

eddyb reviewed Mar 26, 2020

View reviewed changes

eddyb approved these changes Mar 26, 2020

View reviewed changes

trait_bound_spans -> sized_trait_bound_spans

b514c42

bors 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 26, 2020

Centril mentioned this pull request Mar 26, 2020

Rollup of 4 pull requests #70425

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 26, 2020

rustc_hir_pretty: bump recursion_limit

b2f7a95

bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 26, 2020

Dylan-DPC-zz mentioned this pull request Mar 27, 2020

Rollup of 5 pull requests #70451

Merged

bors merged commit 7041efc into rust-lang:master Mar 27, 2020

Centril deleted the hir-pretty branch March 27, 2020 03:57

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Mar 27, 2020

rustup rust-lang/rust#70344

7a986c1

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Mar 27, 2020

rustup rust-lang/rust#70344

2546961

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Mar 27, 2020

rustup rust-lang/rust#70344

3270d8f

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Mar 27, 2020

rustup rust-lang/rust#70344

8177e49

floriangru added a commit to hacspec/rust-clippy that referenced this pull request Apr 1, 2020

dirty workaround for rust-lang/rust#70344

7a4803c

petrochenkov mentioned this pull request Dec 28, 2020

Add support for range params to rustdoc #80220

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Decouple `rustc_hir::print` into `rustc_hir_pretty` #70344

Decouple `rustc_hir::print` into `rustc_hir_pretty` #70344

Centril commented Mar 24, 2020 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

Zoxc commented Mar 25, 2020

eddyb Mar 26, 2020

eddyb Mar 26, 2020

eddyb Mar 26, 2020

Centril Mar 26, 2020

eddyb commented Mar 26, 2020

Centril commented Mar 26, 2020

bors commented Mar 26, 2020

bors commented Mar 26, 2020

Centril commented Mar 26, 2020

Centril commented Mar 26, 2020

Centril commented Mar 26, 2020

bors commented Mar 26, 2020

Decouple rustc_hir::print into rustc_hir_pretty #70344

Decouple rustc_hir::print into rustc_hir_pretty #70344

Conversation

Centril commented Mar 24, 2020 • edited Loading

This comment has been minimized.

This comment has been minimized.

Zoxc commented Mar 25, 2020

eddyb Mar 26, 2020

Choose a reason for hiding this comment

eddyb Mar 26, 2020

Choose a reason for hiding this comment

eddyb Mar 26, 2020

Choose a reason for hiding this comment

Centril Mar 26, 2020

Choose a reason for hiding this comment

eddyb commented Mar 26, 2020

Centril commented Mar 26, 2020

bors commented Mar 26, 2020

bors commented Mar 26, 2020

Centril commented Mar 26, 2020

Centril commented Mar 26, 2020

Centril commented Mar 26, 2020

bors commented Mar 26, 2020

Decouple `rustc_hir::print` into `rustc_hir_pretty` #70344

Decouple `rustc_hir::print` into `rustc_hir_pretty` #70344

Centril commented Mar 24, 2020 •

edited

Loading