Slimmer syntax by Centril · Pull Request #68133 · rust-lang/rust

Centril · 2020-01-11T16:23:48Z

High-level summary of changes:

The syntax::node_count pass is moved into rustc_ast_passes. This works towards improving The rustc_query_impl crate is too big, which hurts compile times for the compiler itself #65031 by making compiling syntax go faster.
The syntax::{GLOBALS, with_globals, ..} business is consolidated into syntax::attr for cleaner code and future possible improvements.
The pretty printer loses its dependency on ParseSess, opting to use SourceMap & friends directly instead.
Some drive by cleanup of syntax::attr::HasAttr happens.
Builtin attribute logic (syntax::attr::builtin) + syntax::attr::allow_internal_unstable is moved into a new rustc_attr crate. More logic from syntax::attr should be moved into that crate over time. This also means that syntax loses all mentions of ParseSess, which enables the next point.
The pretty printer syntax::print is moved into a new crate rustc_ast_pretty.
rustc_session::node_id is moved back as syntax::node_id. As a result, syntax gets to drop dependencies on rustc_session (and implicitly rustc_target), rustc_error_codes, and rustc_errors. Moreover rustc_hir gets to drop its dependency on rustc_session as well. At this point, these crates are mostly "pure data crates", which is approaching a desirable end state.
- We should consider renaming syntax to rustc_ast now.

…lacrum Move more of `rustc::lint` into `rustc_lint` Based on rust-lang#67806. Here we try to consolidate more of the linting infra into `rustc::lint`. Some high-level notes: - We now store an `Lrc<dyn Any + Send + Sync>` as opposed to `Lrc<LintStore>` in the `GlobalCtxt`. This enables us to avoid referring to the type, breaking a cyclic dependency, and so we can move things from `rustc::lint` to `rustc_lint`. - `in_derive_expansion` is, and needs to, be moved as a method on `Span`. - We reduce the number of ways on `tcx` to emit a lint so that the developer UX is more streamlined. - `LintLevelsBuilder` is moved to `rustc_lint::levels`, leaving behind `LintLevelMap/Set` in a purified form due to current constraints (hopefully fixable in the future after rust-lang#68133). - `struct_lint_level` is moved to `rustc::lint` due to current dependency constraints. - `rustc::context` is moved to `rustc_lint::context`. - The visitors in `rustc::lint` are moved to `rustc_lint::passes`.

…lacrum Move more of `rustc::lint` into `rustc_lint` Based on rust-lang#67806. Here we try to consolidate more of the linting infra into `rustc::lint`. Some high-level notes: - We now store an `Lrc<dyn Any + Send + Sync>` as opposed to `Lrc<LintStore>` in the `GlobalCtxt`. This enables us to avoid referring to the type, breaking a cyclic dependency, and so we can move things from `rustc::lint` to `rustc_lint`. - `in_derive_expansion` is, and needs to, be moved as a method on `Span`. - We reduce the number of ways on `tcx` to emit a lint so that the developer UX is more streamlined. - `LintLevelsBuilder` is moved to `rustc_lint::levels`, leaving behind `LintLevelMap/Set` in a purified form due to current constraints (hopefully fixable in the future after rust-lang#68133). - `struct_lint_level` is moved to `rustc::lint` due to current dependency constraints. - `rustc::lint::context` is moved to `rustc_lint::context`. - The visitors in `rustc::lint` are moved to `rustc_lint::passes`.

Centril · 2020-01-17T14:03:56Z

r? @petrochenkov

petrochenkov · 2020-01-17T21:56:20Z

We should consider renaming syntax to rustc_ast now.

👍

Centril · 2020-01-17T22:02:30Z

We should consider renaming syntax to rustc_ast now.
👍

Cool; I'll follow up with this. :)

Centril · 2020-01-18T18:22:23Z

Addressed the review comments.

petrochenkov · 2020-01-18T19:37:04Z

@bors r+

bors · 2020-01-18T19:37:06Z

📌 Commit 1fbab97f3d177c4f4d58f69a2b73d938740a2abc has been approved by petrochenkov

Centril · 2020-02-01T18:02:05Z

@bors r=petrochenkov

bors · 2020-02-01T18:02:06Z

📌 Commit 1a3141c has been approved by petrochenkov

bors · 2020-02-01T18:29:18Z

⌛ Testing commit 1a3141c with merge 13db650...

Slimmer syntax High-level summary of changes: - The `syntax::node_count` pass is moved into `rustc_ast_passes`. This works towards improving #65031 by making compiling `syntax` go faster. - The `syntax::{GLOBALS, with_globals, ..}` business is consolidated into `syntax::attr` for cleaner code and future possible improvements. - The pretty printer loses its dependency on `ParseSess`, opting to use `SourceMap` & friends directly instead. - Some drive by cleanup of `syntax::attr::HasAttr` happens. - Builtin attribute logic (`syntax::attr::builtin`) + `syntax::attr::allow_internal_unstable` is moved into a new `rustc_attr` crate. More logic from `syntax::attr` should be moved into that crate over time. This also means that `syntax` loses all mentions of `ParseSess`, which enables the next point. - The pretty printer `syntax::print` is moved into a new crate `rustc_ast_pretty`. - `rustc_session::node_id` is moved back as `syntax::node_id`. As a result, `syntax` gets to drop dependencies on `rustc_session` (and implicitly `rustc_target`), `rustc_error_codes`, and `rustc_errors`. Moreover `rustc_hir` gets to drop its dependency on `rustc_session` as well. At this point, these crates are mostly "pure data crates", which is approaching a desirable end state. - We should consider renaming `syntax` to `rustc_ast` now.

bors · 2020-02-01T21:45:13Z

☀️ Test successful - checks-azure
Approved by: petrochenkov
Pushing 13db650 to master...

rust-highfive · 2020-02-01T21:46:32Z

📣 Toolstate changed by #68133!

Tested on commit 13db650.
Direct link to PR: #68133

💔 clippy-driver on windows: test-fail → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-fail → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).

@mcarton

Tested on commit rust-lang/rust@13db650. Direct link to PR: <rust-lang/rust#68133> 💔 clippy-driver on windows: test-fail → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra). 💔 clippy-driver on linux: test-fail → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).

Rustup to rust-lang/rust#68133 changelog: none