Skip to content
/ rust Public
forked from rust-lang/rust

Commit e2b231c

Browse files
authored
Rollup merge of rust-lang#159250 - GuillaumeGomez:rename-diag, r=JonathanBrouwer
Rename `errors.rs` file to `diagnostics.rs` (13/N) Follow-up of rust-lang#157485. r? @JonathanBrouwer
2 parents 9932c0d + 2a74949 commit e2b231c

61 files changed

Lines changed: 121 additions & 115 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::errors::feature_err;
8+
use rustc_session::diagnostics::feature_err;
99
use rustc_span::{Span, sym};
1010
use rustc_target::asm;
1111

compiler/rustc_ast_lowering/src/expr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rustc_hir::def::{DefKind, Res};
1111
use rustc_hir::{HirId, Target, find_attr};
1212
use rustc_middle::span_bug;
1313
use rustc_middle::ty::TyCtxt;
14-
use rustc_session::errors::report_lit_error;
14+
use rustc_session::diagnostics::report_lit_error;
1515
use rustc_span::{ByteSymbol, DUMMY_SP, DesugaringKind, Ident, Span, Spanned, Symbol, respan, sym};
1616
use thin_vec::{ThinVec, thin_vec};
1717
use visit::{Visitor, walk_expr};
@@ -1644,7 +1644,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
16441644
&& !self.tcx.features().coroutines()
16451645
&& !self.tcx.features().gen_blocks()
16461646
{
1647-
rustc_session::errors::feature_err(
1647+
rustc_session::diagnostics::feature_err(
16481648
&self.tcx.sess,
16491649
sym::yield_expr,
16501650
span,

compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ use rustc_macros::extension;
6767
use rustc_middle::queries::Providers;
6868
use rustc_middle::span_bug;
6969
use rustc_middle::ty::{PerOwnerResolverData, ResolverAstLowering, TyCtxt};
70-
use rustc_session::errors::add_feature_diagnostics;
70+
use rustc_session::diagnostics::add_feature_diagnostics;
7171
use rustc_span::symbol::{Ident, Symbol, kw, sym};
7272
use rustc_span::{DUMMY_SP, DesugaringKind, Span};
7373
use smallvec::{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::errors::add_feature_diagnostics;
9+
use rustc_session::diagnostics::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::errors::feature_err;
6+
use rustc_session::diagnostics::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,7 +30,7 @@ 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;
33+
use rustc_session::diagnostics::feature_err;
3434
use rustc_session::lint::builtin::{
3535
DEPRECATED_WHERE_CLAUSE_LOCATION, MISSING_ABI, MISSING_UNSAFE_ON_EXTERN,
3636
PATTERNS_IN_FNS_WITHOUT_BODY, UNUSED_VISIBILITIES,

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::Features;
66
use rustc_hir::Attribute;
77
use rustc_hir::attrs::AttributeKind;
88
use rustc_session::Session;
9-
use rustc_session::errors::{feature_err, feature_warn};
9+
use rustc_session::diagnostics::{feature_err, feature_warn};
1010
use rustc_span::{Span, Spanned, Symbol, sym};
1111

1212
use crate::diagnostics;

compiler/rustc_attr_parsing/src/attributes/cfg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rustc_parse::parser::{ForceCollect, Parser, Recovery};
1111
use rustc_parse::{exp, parse_in};
1212
use rustc_session::Session;
1313
use rustc_session::config::ExpectedValues;
14-
use rustc_session::errors::feature_err;
14+
use rustc_session::diagnostics::feature_err;
1515
use rustc_session::lint::builtin::UNEXPECTED_CFGS;
1616
use rustc_session::parse::ParseSess;
1717
use rustc_span::{ErrorGuaranteed, Span, Symbol, sym};

compiler/rustc_attr_parsing/src/attributes/codegen_attrs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use rustc_feature::AttributeStability;
22
use rustc_hir::attrs::{
33
CoverageAttrKind, InstrumentFnAttr, OptimizeAttr, RtsanSetting, SanitizerSet, UsedBy,
44
};
5-
use rustc_session::errors::feature_err;
5+
use rustc_session::diagnostics::feature_err;
66
use rustc_span::edition::Edition::Edition2024;
77

88
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
@@ -7,7 +7,7 @@ use rustc_hir::attrs::{
77
AttributeKind, CfgEntry, CfgHideShow, DocAttribute, DocCfgHideShow, DocCfgHideShowValue,
88
DocInline, HideOrShow,
99
};
10-
use rustc_session::errors::feature_err;
10+
use rustc_session::diagnostics::feature_err;
1111
use rustc_span::{Span, Symbol, edition, sym};
1212

1313
use super::prelude::{ALL_TARGETS, AllowedTargets};

0 commit comments

Comments
 (0)