Skip to content

Commit 542f5b9

Browse files
committed
rename LintStoreMarker trait to DynLintStore
1 parent 67e36af commit 542f5b9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

compiler/rustc_lint/src/context.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use rustc_middle::ty::layout::{LayoutError, LayoutOfHelpers, TyAndLayout};
2424
use rustc_middle::ty::print::{PrintError, PrintTraitRefExt as _, Printer, with_no_trimmed_paths};
2525
use rustc_middle::ty::{self, GenericArg, RegisteredTools, Ty, TyCtxt, TypingEnv, TypingMode};
2626
use rustc_session::lint::{FutureIncompatibleInfo, Lint, LintBuffer, LintExpectationId, LintId};
27-
use rustc_session::{LintStoreMarker, Session};
27+
use rustc_session::{DynLintStore, Session};
2828
use rustc_span::edit_distance::find_best_match_for_names;
2929
use rustc_span::{Ident, Span, Symbol, sym};
3030
use tracing::debug;
@@ -62,7 +62,7 @@ pub struct LintStore {
6262
lint_groups: FxIndexMap<&'static str, LintGroup>,
6363
}
6464

65-
impl LintStoreMarker for LintStore {
65+
impl DynLintStore for LintStore {
6666
fn lint_groups_iter(&self) -> Box<dyn Iterator<Item = rustc_session::LintGroup> + '_> {
6767
Box::new(self.get_lint_groups().map(|(name, lints, is_externally_loaded)| {
6868
rustc_session::LintGroup { name, lints, is_externally_loaded }

compiler/rustc_session/src/session.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ pub struct CompilerIO {
140140
pub temps_dir: Option<PathBuf>,
141141
}
142142

143-
pub trait LintStoreMarker: Any + DynSync + DynSend {
143+
pub trait DynLintStore: Any + DynSync + DynSend {
144144
/// Provides a way to access lint groups without depending on [`rustc_lint`]
145145
fn lint_groups_iter(&self) -> Box<dyn Iterator<Item = LintGroup> + '_>;
146146
}
@@ -168,7 +168,7 @@ pub struct Session {
168168
pub code_stats: CodeStats,
169169

170170
/// This only ever stores a `LintStore` but we don't want a dependency on that type here.
171-
pub lint_store: Option<Arc<dyn LintStoreMarker>>,
171+
pub lint_store: Option<Arc<dyn DynLintStore>>,
172172

173173
/// Cap lint level specified by a driver specifically.
174174
pub driver_lint_caps: FxHashMap<lint::LintId, lint::Level>,

0 commit comments

Comments
 (0)