More `rustc_interface` cleanups #117376

nnethercote · 2023-10-30T05:47:12Z

In particular, following up #117268 with more improvement to --cfg/--check-cfg handling.

By storing the unparsed values in `Config` and then parsing them within `run_compiler`, the parsing functions can use the main symbol interner, and not create their own short-lived interners. This change also eliminates the need for one `EarlyErrorHandler` in rustdoc, because parsing errors can be reported by another, slightly later `EarlyErrorHandler`.

They now only ever contains symbols.

It was added in 51938c6, a commit with a 7,720 line diff and a one line commit message. Even then the comment was incorrect; there was a removed a `build_output_filenames` call with a `&[]` argument in rustdoc, but the commit removed that call. In such a large commit, it's easy for small errors to occur.

Using `find` and `any` from `std` makes the code shorter and clearer.

nnethercote · 2023-10-30T05:49:35Z

Best reviewed one commit at a time.

BTW the diff on the first commit looks awful, but most of it comes from parse_cfg and parse_check_cfg losing the rustc_span::create_default_session_if_not_set_then and then everything gets unindented by one level.

Here's the non-whitespace diff which is much easier to read.

compiler/rustc_interface/src/util.rs

compiler/rustc_interface/src/callbacks.rs

- The early return can be right at the top. - The control flow is simplified with `if let`. - The `collect` isn't necessary. - The "Unconditionally" comment is erroneously duplicated from `check_attr_crate_type`, and can be removed.

nnethercote · 2023-10-30T09:46:01Z

I have updated commits 9 and 10 to address the review comments. Thanks for the fast reviews!

oli-obk · 2023-10-30T09:54:12Z

@bors r+

bors · 2023-10-30T09:54:14Z

📌 Commit 0c381ec has been approved by oli-obk

It is now in the queue for this repository.

…r=oli-obk More `rustc_interface` cleanups In particular, following up rust-lang#117268 with more improvement to `--cfg`/`--check-cfg` handling. r? `@oli-obk`

…llaumeGomez Rollup of 11 pull requests Successful merges: - rust-lang#112463 (rustdoc: elide cross-crate default generic arguments) - rust-lang#117068 (Clean up `compiler/rustc*/Cargo.toml`) - rust-lang#117132 (On object safety error, mention new enum as alternative) - rust-lang#117317 (share some track_caller logic between interpret and codegen) - rust-lang#117356 (Add support for mipsel-unknown-netbsd, 32-bit LE mips.) - rust-lang#117357 (Rename a few remaining references to abort terminator) - rust-lang#117370 (C-variadic error improvements) - rust-lang#117376 (More `rustc_interface` cleanups) - rust-lang#117383 (improve and fix `x install`) - rust-lang#117390 (Fix unused variables lint issue for args in macro) - rust-lang#117395 (Fix missing leading space in suggestion) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#117376 - nnethercote:rustc_interface-more, r=oli-obk More `rustc_interface` cleanups In particular, following up rust-lang#117268 with more improvement to `--cfg`/`--check-cfg` handling. r? ``@oli-obk``

nnethercote added 8 commits October 30, 2023 13:46

Reduce exposure of cfg parsers.

bfcff79

Change cfg parsers to produce symbols instead of strings.

8e4ac98

Make Cfg and CheckCfg non-generic.

5c6a12c

They now only ever contains symbols.

Improve readability of parse_check_cfg.

371f972

Wrap some overlong comments.

a60d643

Remove check_output.

95b0088

Using `find` and `any` from `std` makes the code shorter and clearer.

rustbot assigned oli-obk Oct 30, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Oct 30, 2023

klensy reviewed Oct 30, 2023

View reviewed changes

compiler/rustc_interface/src/util.rs Outdated Show resolved Hide resolved

oli-obk reviewed Oct 30, 2023

View reviewed changes

compiler/rustc_interface/src/callbacks.rs Outdated Show resolved Hide resolved

nnethercote added 3 commits October 30, 2023 20:42

Streamline collect_crate_types.

be8fd8b

- The early return can be right at the top. - The control flow is simplified with `if let`. - The `collect` isn't necessary. - The "Unconditionally" comment is erroneously duplicated from `check_attr_crate_type`, and can be removed.

Remove an unnecessary drop.

90862f6

Streamline some use items.

0c381ec

nnethercote force-pushed the rustc_interface-more branch from 5f0735e to 0c381ec Compare October 30, 2023 09:45

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 Oct 30, 2023

This was referenced Oct 30, 2023

Rollup of 12 pull requests #117404

Closed

Rollup of 11 pull requests #117405

Merged

bors merged commit d96bdbe into rust-lang:master Oct 30, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 30, 2023

nnethercote deleted the rustc_interface-more branch October 30, 2023 21:03

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

ChrisDenton mentioned this pull request Oct 31, 2023

CI: Bootstrap no longer documents compiler crates #117430

Closed

nnethercote mentioned this pull request Nov 19, 2023

Remove support for compiler plugins. #116412

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More `rustc_interface` cleanups #117376

More `rustc_interface` cleanups #117376

nnethercote commented Oct 30, 2023

nnethercote commented Oct 30, 2023 •

edited

nnethercote commented Oct 30, 2023

oli-obk commented Oct 30, 2023

bors commented Oct 30, 2023

More rustc_interface cleanups #117376

More rustc_interface cleanups #117376

Conversation

nnethercote commented Oct 30, 2023

nnethercote commented Oct 30, 2023 • edited

nnethercote commented Oct 30, 2023

oli-obk commented Oct 30, 2023

bors commented Oct 30, 2023

More `rustc_interface` cleanups #117376

More `rustc_interface` cleanups #117376

nnethercote commented Oct 30, 2023 •

edited