Move Sessions into (new) librustc_session #66878

Mark-Simulacrum · 2019-11-29T21:20:53Z

This PR moves ParseSess and Session from their current locations into a new crate, librustc_session.

There are several intents behind this change. librustc is a very large crate, and we want to split it up over time -- this movement removes the sizeable session module from it. It also helps allow for future movement of things not coupled to TyCtxt but coupled to Session out of the crate.

This movement allows allows for a future follow-up PR which unifies Session and ParseSess, allowing for a single source of truth for APIs interested in global options throughout the compiler; the ParseSess is already created directly as a member of Session in the current compiler (i.e., we do not first construct a ParseSess and then move it into Session later in the compilation).

This PR intentionally avoids changing numerous imports throughout the tree to new locations of the moved types; this is needless noise and can be done as needed.

In the process of moving the sessions back, the lint system received an update as well -- notably, early buffered lints are no longer ad-hoc declared as enum pairs and later associated with proper lint declarations. They are still separately handled (buffered), it is a little unclear whether this is truly necessary, but regardless is left for future PRs.

Many of the types moved back are sort of ad-hoc placed into the same crate (librustc_session) instead of creating other crates; it's unclear whether this is actually a good thing, but it seemed better than creating numerous tiny crates which served no purpose on their own.

Mark-Simulacrum · 2019-11-29T21:21:21Z

Tentatively r? @Centril for at least initial review

Cargo.lock

Centril · 2019-11-29T21:50:09Z

src/librustc/lint/builtin.rs

@@ -12,6 +12,8 @@ use syntax::ast;
 use syntax::edition::Edition;


I wonder what, if anything, is holding us back from moving more lints from this file to rustc_lints.
It might be good to structure things as one lint per file like is done in Clippy.
(Also not actionable but making a note of it... cc @oli-obk)

src/librustc/lint/internal.rs

src/libsyntax/early_buffered_lints.rs

Centril · 2019-11-29T22:09:13Z

src/librustc_session/feature_gate.rs

@@ -0,0 +1,94 @@
+use syntax_pos::edition::Edition;


My reaction to this is that I would prefer the following layout for feature gating:

A crate dedicated to declaring feature gates and the structs ("data crate"); this would consist of active.rs, accepted.rs, removed.rs, most of builtin_attrs.rs (at least the parts not dependent on libsyntax), the structs from mod.rs). Let's call this crate librustc_feature and we'd have librustc_session depend on it.

A module for checking (check.rs -> gate_features.rs), possibly as part of librustc_passes.

Implemented the first part of this in #66895, which should be sufficient for this PR to build upon.

Will rebase atop that.

Cargo.lock

src/librustc_session/config.rs

src/librustc_session/lib.rs

src/librustc_session/search_paths.rs

src/librustc_session/config.rs

Mark-Simulacrum · 2019-11-30T13:51:23Z

Rebased on #66895 (but will need to do so again once it lands).

@oli-obk

Feature gating *declarations* => new crate `rustc_feature` This PR moves the data-oriented parts of feature gating into its own crate, `rustc_feature`. The parts consist of some data types as well as `accepted`, `active`, `removed`, and `builtin_attrs`. Feature gate checking itself remains in `syntax::feature_gate::check`. The parts which define how to emit feature gate errors could probably be moved to `rustc_errors` or to the new `rustc_session` crate introduced in rust-lang#66878. The visitor itself could probably be moved as a pass in `rustc_passes` depending on how the dependency edges work out. The PR also contains some drive-by cleanup of feature gate checking. As such, the PR probably best read commit-by-commit. r? @oli-obk cc @petrochenkov cc @Mark-Simulacrum

Mark-Simulacrum · 2019-12-01T15:38:47Z

r? @Centril

Rebased atop your PR and force pushed.

This commit breaks early-lint registration, which will be fixed in the next commit. This movement will allow essentially all crates in the compiler tree to declare lints (though not lint passes).

Since it's just a type alias this isn't too difficult and once Session is moved back we can make this be the canonical location.

Mark-Simulacrum · 2019-12-03T17:20:40Z

@bors r=Centril

bors · 2019-12-03T17:20:41Z

📌 Commit 68fb218 has been approved by Centril

@oli-obk

de-macro-ize feature gate checking This PR removes the usage of macros in feature gating preferring to take in symbols instead. The aim is to make feature gating more understandable overall while also reducing some duplication. To check whether a feature gate is active, `tcx.features().on(sym::my_feature)` can be used. Inside `PostExpansionVisitor` it's however better to use `self.gate(...)` which provides a nicer API atop of that. Outside of the visitor, if `gate_feature` can be used, it should be preferred over `feature_err`. As a follow-up, and once #66878 is merged, it might be a good idea to add a method to `Session` for more convenient access to `gate_feature` and `feature_err` respectively. Originally I intended to go for a `HashSet` representation, but this felt like a smaller change to just expand to a `match` on the symbol => field pairs. r? @oli-obk

…ntril Move Sessions into (new) librustc_session This PR moves `ParseSess` and `Session` from their current locations into a new crate, `librustc_session`. There are several intents behind this change. librustc is a very large crate, and we want to split it up over time -- this movement removes the sizeable session module from it. It also helps allow for future movement of things not coupled to TyCtxt but coupled to Session out of the crate. This movement allows allows for a future follow-up PR which unifies Session and ParseSess, allowing for a single source of truth for APIs interested in global options throughout the compiler; the ParseSess is already created directly as a member of Session in the current compiler (i.e., we do not first construct a ParseSess and then move it into Session later in the compilation). This PR intentionally avoids changing numerous imports throughout the tree to new locations of the moved types; this is needless noise and can be done as needed. In the process of moving the sessions back, the lint system received an update as well -- notably, early buffered lints are no longer ad-hoc declared as enum pairs and later associated with proper lint declarations. They are still separately handled (buffered), it is a little unclear whether this is truly necessary, but regardless is left for future PRs. Many of the types moved back are sort of ad-hoc placed into the same crate (librustc_session) instead of creating other crates; it's unclear whether this is actually a good thing, but it seemed better than creating numerous tiny crates which served no purpose on their own.

@ghost

Rollup of 7 pull requests Successful merges: - #66750 (Update the `wasi` crate for `wasm32-wasi`) - #66878 (Move Sessions into (new) librustc_session) - #66903 (parse_enum_item -> parse_enum_variant) - #66951 (miri: add throw_machine_stop macro) - #66957 (Change Linker for x86_64-fortanix-unknown-sgx target to rust-lld) - #66960 ([const-prop] Fix ICE calculating enum discriminant) - #66973 (Update the minimum external LLVM to 7) Failed merges: r? @ghost

Rustup to rust-lang/rust#66878 I need to sleep now, feel free to pick it up. The output of the `lint_without_lint_pass` test seems to disappear, I'm not sure why.. :/ changelog: none

rust-highfive assigned zackmdavis Nov 29, 2019

This comment has been minimized.

Sign in to view

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 29, 2019

rust-highfive assigned Centril and unassigned zackmdavis Nov 29, 2019

This comment has been minimized.

Sign in to view

petrochenkov self-assigned this Nov 29, 2019

Centril reviewed Nov 29, 2019

View reviewed changes

Centril mentioned this pull request Nov 30, 2019

Feature gating *declarations* => new crate rustc_feature #66895

Merged

oli-obk reviewed Nov 30, 2019

View reviewed changes

src/librustc_session/config.rs Show resolved Hide resolved

petrochenkov removed their assignment Nov 30, 2019

Mark-Simulacrum force-pushed the sess-decouple branch from 8a36b2a to ce40988 Compare November 30, 2019 13:09

This comment has been minimized.

Sign in to view

Mark-Simulacrum force-pushed the sess-decouple branch from ce40988 to 2e8cc35 Compare November 30, 2019 13:47

Centril 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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 1, 2019

Mark-Simulacrum force-pushed the sess-decouple branch from 2e8cc35 to 13b92d3 Compare December 1, 2019 15:37

Mark-Simulacrum 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 Dec 1, 2019

This comment has been minimized.

Sign in to view

Mark-Simulacrum force-pushed the sess-decouple branch from 81efd11 to 7c2c4f7 Compare December 1, 2019 19:28

This comment has been minimized.

Sign in to view

Mark-Simulacrum force-pushed the sess-decouple branch from 7c2c4f7 to 4180d07 Compare December 1, 2019 20:50

Centril mentioned this pull request Dec 2, 2019

de-macro-ize feature gate checking #66945

Closed

This comment has been minimized.

Sign in to view

Mark-Simulacrum added 14 commits December 3, 2019 12:18

Move duration_to_secs_str to rustc_session

4351698

Move Level to rustc_session

433e546

Move Lint to rustc_session

526ee51

This commit breaks early-lint registration, which will be fixed in the next commit. This movement will allow essentially all crates in the compiler tree to declare lints (though not lint passes).

Move early lint declarations to librustc_session

f03d8f3

Move NativeLibraryKind to rustc_session

285144a

Re-export Client from rustc_data_structures::jobserver

72c67be

Directly use types from libsyntax::ast

f2a8aed

Remove dead cfg method

e810b7e

Duplicate CrateConfig into Session

2731075

Since it's just a type alias this isn't too difficult and once Session is moved back we can make this be the canonical location.

Move BufferedEarlyLint to librustc_session

817d1ae

Move ParseSess to librustc_session

52d4d47

Move Session to librustc_session

cc2c33a

Deduplicate CrateConfig

42c4ae0

Fix UI tests for new locations

68fb218

Mark-Simulacrum force-pushed the sess-decouple branch from f21d1ea to 68fb218 Compare December 3, 2019 17:19

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 Dec 3, 2019

Centril mentioned this pull request Dec 3, 2019

Rollup of 7 pull requests #66997

Merged

bors merged commit 68fb218 into rust-lang:master Dec 3, 2019

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Dec 3, 2019

[wip] rustup rust-lang/rust#66878

67fbdb3

flip1995 pushed a commit to matthiaskrgr/rust-clippy that referenced this pull request Dec 4, 2019

Rustup to rust-lang/rust#66878

8028be2

flip1995 pushed a commit to matthiaskrgr/rust-clippy that referenced this pull request Dec 4, 2019

Rustup to rust-lang/rust#66878

21bb9ab

flip1995 pushed a commit to matthiaskrgr/rust-clippy that referenced this pull request Dec 4, 2019

Rustup to rust-lang/rust#66878

98e433d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move Sessions into (new) librustc_session #66878

Move Sessions into (new) librustc_session #66878

Mark-Simulacrum commented Nov 29, 2019

This comment has been minimized.

Mark-Simulacrum commented Nov 29, 2019

This comment has been minimized.

Centril Nov 29, 2019

Centril Nov 29, 2019

Centril Nov 30, 2019

Mark-Simulacrum Nov 30, 2019

This comment has been minimized.

Mark-Simulacrum commented Nov 30, 2019

Mark-Simulacrum commented Dec 1, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Mark-Simulacrum commented Dec 3, 2019

bors commented Dec 3, 2019

		@@ -12,6 +12,8 @@ use syntax::ast;
		use syntax::edition::Edition;

Move Sessions into (new) librustc_session #66878

Move Sessions into (new) librustc_session #66878

Conversation

Mark-Simulacrum commented Nov 29, 2019

This comment has been minimized.

Mark-Simulacrum commented Nov 29, 2019

This comment has been minimized.

Centril Nov 29, 2019

Choose a reason for hiding this comment

Centril Nov 29, 2019

Choose a reason for hiding this comment

Centril Nov 30, 2019

Choose a reason for hiding this comment

Mark-Simulacrum Nov 30, 2019

Choose a reason for hiding this comment

This comment has been minimized.

Mark-Simulacrum commented Nov 30, 2019

Mark-Simulacrum commented Dec 1, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Mark-Simulacrum commented Dec 3, 2019

bors commented Dec 3, 2019