Skip to content

Commit 8123c56

Browse files
Rollup merge of rust-lang#155980 - nnethercote:mv-feature-methods, r=TaKO8Ki
Move `feature*` methods from `parse` mod to `errors` mod. As the FIXME comment says, these no longer use `ParseSess` and so the `parse` mod is not a good place for them. The `errors` mod is a better home. r? @TaKO8Ki
2 parents 443b3e7 + 6d79bc6 commit 8123c56

43 files changed

Lines changed: 216 additions & 220 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.

compiler/rustc_ast_lowering/src/asm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap};
55
use rustc_errors::msg;
66
use rustc_hir as hir;
77
use rustc_hir::def::{DefKind, Res};
8-
use rustc_session::parse::feature_err;
8+
use rustc_session::errors::feature_err;
99
use rustc_span::{Span, sym};
1010
use rustc_target::asm;
1111

compiler/rustc_ast_lowering/src/expr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1693,7 +1693,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
16931693
&& !self.tcx.features().coroutines()
16941694
&& !self.tcx.features().gen_blocks()
16951695
{
1696-
rustc_session::parse::feature_err(
1696+
rustc_session::errors::feature_err(
16971697
&self.tcx.sess,
16981698
sym::yield_expr,
16991699
span,

compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ use rustc_macros::extension;
6262
use rustc_middle::hir::{self as mid_hir};
6363
use rustc_middle::span_bug;
6464
use rustc_middle::ty::{DelegationInfo, ResolverAstLowering, TyCtxt};
65-
use rustc_session::parse::add_feature_diagnostics;
65+
use rustc_session::errors::add_feature_diagnostics;
6666
use rustc_span::symbol::{Ident, Symbol, kw, sym};
6767
use rustc_span::{DUMMY_SP, DesugaringKind, Span};
6868
use smallvec::SmallVec;

compiler/rustc_ast_lowering/src/path.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc_hir::def::{DefKind, PartialRes, PerNS, Res};
66
use rustc_hir::def_id::DefId;
77
use rustc_hir::{self as hir, GenericArg};
88
use rustc_middle::{span_bug, ty};
9-
use rustc_session::parse::add_feature_diagnostics;
9+
use rustc_session::errors::add_feature_diagnostics;
1010
use rustc_span::{BytePos, DUMMY_SP, DesugaringKind, Ident, Span, Symbol, sym};
1111
use smallvec::smallvec;
1212
use tracing::{debug, instrument};

compiler/rustc_ast_lowering/src/stability.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::fmt;
33
use rustc_abi::ExternAbi;
44
use rustc_feature::Features;
55
use rustc_session::Session;
6-
use rustc_session::parse::feature_err;
6+
use rustc_session::errors::feature_err;
77
use rustc_span::symbol::sym;
88
use rustc_span::{Span, Symbol};
99

compiler/rustc_ast_passes/src/ast_validation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ use rustc_data_structures::fx::FxIndexMap;
3030
use rustc_errors::{DiagCtxtHandle, Diagnostic, LintBuffer};
3131
use rustc_feature::Features;
3232
use rustc_session::Session;
33+
use rustc_session::errors::feature_err;
3334
use rustc_session::lint::builtin::{
3435
DEPRECATED_WHERE_CLAUSE_LOCATION, MISSING_ABI, MISSING_UNSAFE_ON_EXTERN,
3536
PATTERNS_IN_FNS_WITHOUT_BODY, UNUSED_VISIBILITIES,
3637
};
37-
use rustc_session::parse::feature_err;
3838
use rustc_span::{Ident, Span, kw, sym};
3939
use rustc_target::spec::{AbiMap, AbiMapping};
4040
use thin_vec::thin_vec;

compiler/rustc_ast_passes/src/feature_gate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc_feature::{AttributeGate, BUILTIN_ATTRIBUTE_MAP, BuiltinAttribute, Feat
66
use rustc_hir::Attribute;
77
use rustc_hir::attrs::AttributeKind;
88
use rustc_session::Session;
9-
use rustc_session::parse::{feature_err, feature_warn};
9+
use rustc_session::errors::{feature_err, feature_warn};
1010
use rustc_span::{Span, Spanned, Symbol, sym};
1111
use thin_vec::ThinVec;
1212

compiler/rustc_attr_parsing/src/attributes/cfg.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ use rustc_parse::parser::{ForceCollect, Parser, Recovery};
1313
use rustc_parse::{exp, parse_in};
1414
use rustc_session::Session;
1515
use rustc_session::config::ExpectedValues;
16+
use rustc_session::errors::feature_err;
1617
use rustc_session::lint::builtin::UNEXPECTED_CFGS;
17-
use rustc_session::parse::{ParseSess, feature_err};
18+
use rustc_session::parse::ParseSess;
1819
use rustc_span::{ErrorGuaranteed, Span, Symbol, sym};
1920
use thin_vec::ThinVec;
2021

compiler/rustc_attr_parsing/src/attributes/codegen_attrs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use rustc_hir::attrs::{CoverageAttrKind, OptimizeAttr, RtsanSetting, SanitizerSet, UsedBy};
2-
use rustc_session::parse::feature_err;
2+
use rustc_session::errors::feature_err;
33
use rustc_span::edition::Edition::Edition2024;
44

55
use super::prelude::*;

compiler/rustc_attr_parsing/src/attributes/doc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use rustc_hir::Target;
55
use rustc_hir::attrs::{
66
AttributeKind, CfgEntry, CfgHideShow, CfgInfo, DocAttribute, DocInline, HideOrShow,
77
};
8-
use rustc_session::parse::feature_err;
8+
use rustc_session::errors::feature_err;
99
use rustc_span::{Span, Symbol, edition, sym};
1010
use thin_vec::ThinVec;
1111

0 commit comments

Comments
 (0)