Skip to content

Commit 095d9ef

Browse files
borsbors
committed
Auto merge of #161043 - mejrs:rustc_session-lints, r=camelid
rustc_session; remove rustc_lint_defs re-exports Some crates and tools were depending on just rustc_session for its re-exporting of an entire crate. rustc_lint still re-exports rustc_lint_defs; that one would have been rather messy to remove because a lot of modules in clippy/rustdoc would have to import some from one and some from the other.
2 parents 8925ea3 + 9a4a803 commit 095d9ef

547 files changed

Lines changed: 731 additions & 1125 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Cargo.lock‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3635,6 +3635,7 @@ dependencies = [
36353635
"rustc_data_structures",
36363636
"rustc_errors",
36373637
"rustc_feature",
3638+
"rustc_lint_defs",
36383639
"rustc_macros",
36393640
"rustc_session",
36403641
"rustc_span",
@@ -3716,6 +3717,7 @@ dependencies = [
37163717
"rustc_index",
37173718
"rustc_infer",
37183719
"rustc_lexer",
3720+
"rustc_lint_defs",
37193721
"rustc_macros",
37203722
"rustc_middle",
37213723
"rustc_mir_dataflow",
@@ -3775,6 +3777,7 @@ dependencies = [
37753777
"rustc_hashes",
37763778
"rustc_hir",
37773779
"rustc_index",
3780+
"rustc_lint_defs",
37783781
"rustc_llvm",
37793782
"rustc_macros",
37803783
"rustc_metadata",
@@ -3846,6 +3849,7 @@ dependencies = [
38463849
"rustc_hir",
38473850
"rustc_index",
38483851
"rustc_infer",
3852+
"rustc_lint_defs",
38493853
"rustc_macros",
38503854
"rustc_middle",
38513855
"rustc_mir_dataflow",
@@ -3934,6 +3938,7 @@ dependencies = [
39343938
"rustc_interface",
39353939
"rustc_lexer",
39363940
"rustc_lint",
3941+
"rustc_lint_defs",
39373942
"rustc_log",
39383943
"rustc_macros",
39393944
"rustc_metadata",
@@ -4139,6 +4144,7 @@ dependencies = [
41394144
"rustc_index",
41404145
"rustc_infer",
41414146
"rustc_lint",
4147+
"rustc_lint_defs",
41424148
"rustc_macros",
41434149
"rustc_middle",
41444150
"rustc_session",
@@ -4231,6 +4237,7 @@ dependencies = [
42314237
"rustc_hir_typeck",
42324238
"rustc_incremental",
42334239
"rustc_lint",
4240+
"rustc_lint_defs",
42344241
"rustc_macros",
42354242
"rustc_metadata",
42364243
"rustc_middle",
@@ -4279,6 +4286,7 @@ dependencies = [
42794286
"rustc_hir",
42804287
"rustc_index",
42814288
"rustc_infer",
4289+
"rustc_lint_defs",
42824290
"rustc_macros",
42834291
"rustc_middle",
42844292
"rustc_parse_format",
@@ -4358,6 +4366,7 @@ dependencies = [
43584366
"rustc_hir",
43594367
"rustc_hir_pretty",
43604368
"rustc_index",
4369+
"rustc_lint_defs",
43614370
"rustc_macros",
43624371
"rustc_middle",
43634372
"rustc_proc_macro",
@@ -4422,7 +4431,6 @@ dependencies = [
44224431
"rustc_macros",
44234432
"rustc_middle",
44244433
"rustc_pattern_analysis",
4425-
"rustc_session",
44264434
"rustc_span",
44274435
"rustc_trait_selection",
44284436
"tracing",
@@ -4462,6 +4470,7 @@ dependencies = [
44624470
"rustc_hir",
44634471
"rustc_index",
44644472
"rustc_infer",
4473+
"rustc_lint_defs",
44654474
"rustc_macros",
44664475
"rustc_middle",
44674476
"rustc_mir_dataflow",
@@ -4483,6 +4492,7 @@ dependencies = [
44834492
"rustc_errors",
44844493
"rustc_hir",
44854494
"rustc_index",
4495+
"rustc_lint_defs",
44864496
"rustc_macros",
44874497
"rustc_middle",
44884498
"rustc_serialize",
@@ -4522,6 +4532,7 @@ dependencies = [
45224532
"rustc_feature",
45234533
"rustc_index",
45244534
"rustc_lexer",
4535+
"rustc_lint_defs",
45254536
"rustc_macros",
45264537
"rustc_session",
45274538
"rustc_span",
@@ -4554,6 +4565,7 @@ dependencies = [
45544565
"rustc_feature",
45554566
"rustc_hir",
45564567
"rustc_index",
4568+
"rustc_lint_defs",
45574569
"rustc_macros",
45584570
"rustc_middle",
45594571
"rustc_privacy",
@@ -4575,9 +4587,9 @@ dependencies = [
45754587
"rustc_errors",
45764588
"rustc_hir",
45774589
"rustc_index",
4590+
"rustc_lint_defs",
45784591
"rustc_macros",
45794592
"rustc_middle",
4580-
"rustc_session",
45814593
"rustc_span",
45824594
"smallvec",
45834595
"tracing",
@@ -4593,9 +4605,9 @@ dependencies = [
45934605
"rustc_data_structures",
45944606
"rustc_errors",
45954607
"rustc_hir",
4608+
"rustc_lint_defs",
45964609
"rustc_macros",
45974610
"rustc_middle",
4598-
"rustc_session",
45994611
"rustc_span",
46004612
"rustc_ty_walk",
46014613
"tracing",
@@ -4672,6 +4684,7 @@ dependencies = [
46724684
"rustc_feature",
46734685
"rustc_hir",
46744686
"rustc_index",
4687+
"rustc_lint_defs",
46754688
"rustc_macros",
46764689
"rustc_metadata",
46774690
"rustc_middle",
@@ -4830,6 +4843,7 @@ dependencies = [
48304843
"rustc_errors",
48314844
"rustc_hir",
48324845
"rustc_infer",
4846+
"rustc_lint_defs",
48334847
"rustc_macros",
48344848
"rustc_middle",
48354849
"rustc_next_trait_solver",

‎compiler/rustc_ast_passes/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ rustc_attr_parsing = { path = "../rustc_attr_parsing" }
1414
rustc_data_structures = { path = "../rustc_data_structures" }
1515
rustc_errors = { path = "../rustc_errors" }
1616
rustc_feature = { path = "../rustc_feature" }
17+
rustc_lint_defs = { path = "../rustc_lint_defs" }
1718
rustc_macros = { path = "../rustc_macros" }
1819
rustc_session = { path = "../rustc_session" }
1920
rustc_span = { path = "../rustc_span" }

‎compiler/rustc_ast_passes/src/ast_validation.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ use rustc_attr_parsing::validate_attr;
2929
use rustc_data_structures::fx::FxIndexMap;
3030
use rustc_errors::{DiagCtxtHandle, Diagnostic, LintBuffer};
3131
use rustc_feature::Features;
32-
use rustc_session::Session;
33-
use rustc_session::diagnostics::feature_err;
34-
use rustc_session::lint::builtin::{
32+
use rustc_lint_defs::builtin::{
3533
DEPRECATED_WHERE_CLAUSE_LOCATION, MISSING_ABI, MISSING_UNSAFE_ON_EXTERN,
3634
PATTERNS_IN_FNS_WITHOUT_BODY, UNUSED_VISIBILITIES,
3735
};
36+
use rustc_session::Session;
37+
use rustc_session::diagnostics::feature_err;
3838
use rustc_span::{Ident, Span, Symbol, kw, sym};
3939
use rustc_target::spec::{AbiMap, AbiMapping};
4040

‎compiler/rustc_attr_parsing/src/attributes/cfg.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ use rustc_attr_ir::target::Target;
77
use rustc_attr_ir::{AttrPath, CfgEntry, RustcVersion};
88
use rustc_errors::{Applicability, Diagnostic, PResult, msg};
99
use rustc_feature::{Features, GatedCfg, find_gated_cfg};
10+
use rustc_lint_defs::builtin::UNEXPECTED_CFGS;
1011
use rustc_parse::parser::{ForceCollect, Parser, Recovery};
1112
use rustc_parse::{exp, parse_in};
1213
use rustc_session::Session;
1314
use rustc_session::config::ExpectedValues;
1415
use rustc_session::diagnostics::feature_err;
15-
use rustc_session::lint::builtin::UNEXPECTED_CFGS;
1616
use rustc_session::parse::ParseSess;
1717
use rustc_span::{ErrorGuaranteed, Span, Symbol, sym};
1818
use thin_vec::ThinVec;

‎compiler/rustc_attr_parsing/src/attributes/cfg_select.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ use rustc_attr_ir::{AttrPath, CfgEntry};
66
use rustc_data_structures::fx::FxHashMap;
77
use rustc_errors::{Diagnostic, MultiSpan};
88
use rustc_feature::Features;
9+
use rustc_lint_defs::builtin::UNREACHABLE_CFG_SELECT_PREDICATES;
910
use rustc_parse::exp;
1011
use rustc_parse::parser::{Parser, Recovery};
1112
use rustc_session::Session;
12-
use rustc_session::lint::builtin::UNREACHABLE_CFG_SELECT_PREDICATES;
1313
use rustc_span::{ErrorGuaranteed, Span, Symbol, sym};
1414

1515
use crate::attributes::AttributeSafety;

‎compiler/rustc_attr_parsing/src/attributes/crate_level.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rustc_attr_ir::{CrateType, WindowsSubsystemKind};
22
use rustc_data_structures::fx::FxIndexSet;
33
use rustc_feature::AttributeStability;
4-
use rustc_session::lint::builtin::{DUPLICATE_TOOLS, UNKNOWN_CRATE_TYPES};
4+
use rustc_lint_defs::builtin::{DUPLICATE_TOOLS, UNKNOWN_CRATE_TYPES};
55
use rustc_span::Symbol;
66
use rustc_span::edit_distance::find_best_match_for_name_with_substrings;
77

‎compiler/rustc_attr_parsing/src/attributes/diagnostic/do_not_recommend.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rustc_attr_ir::AttributeKind;
22
use rustc_attr_ir::target::Target;
33
use rustc_feature::AttributeStability;
4-
use rustc_session::lint::builtin::MALFORMED_DIAGNOSTIC_ATTRIBUTES;
4+
use rustc_lint_defs::builtin::MALFORMED_DIAGNOSTIC_ATTRIBUTES;
55
use rustc_span::{Symbol, sym};
66

77
use crate::attributes::prelude::Allow;

‎compiler/rustc_attr_parsing/src/attributes/diagnostic/mod.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ use rustc_attr_ir::diagnostic::{
77
};
88
use rustc_errors::{Diagnostic, MultiSpan};
99
use rustc_lint_defs::LintId;
10-
use rustc_parse_format::{
11-
Argument, FormatSpec, ParseError, ParseMode, Parser, Piece as RpfPiece, Position,
12-
};
13-
use rustc_session::lint::builtin::{
10+
use rustc_lint_defs::builtin::{
1411
MALFORMED_DIAGNOSTIC_ATTRIBUTES, MALFORMED_DIAGNOSTIC_FILTERS,
1512
MALFORMED_DIAGNOSTIC_FORMAT_LITERALS, UNKNOWN_DIAGNOSTIC_ATTRIBUTES,
1613
};
14+
use rustc_parse_format::{
15+
Argument, FormatSpec, ParseError, ParseMode, Parser, Piece as RpfPiece, Position,
16+
};
1717
use rustc_span::edit_distance::find_best_match_for_name;
1818
use rustc_span::{Ident, InnerSpan, Span, Symbol, kw, sym};
1919
use thin_vec::{ThinVec, thin_vec};

‎compiler/rustc_attr_parsing/src/attributes/diagnostic/opaque.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rustc_attr_ir::AttributeKind;
22
use rustc_attr_ir::target::Target;
33
use rustc_feature::AttributeStability;
4-
use rustc_session::lint::builtin::MALFORMED_DIAGNOSTIC_ATTRIBUTES;
4+
use rustc_lint_defs::builtin::MALFORMED_DIAGNOSTIC_ATTRIBUTES;
55
use rustc_span::{Span, sym};
66

77
use crate::attributes::diagnostic::gate_diagnostic_attr;

0 commit comments

Comments
 (0)