Skip to content

Commit bac6462

Browse files
committed
rename LintStoreMarker trait to DynLintStore
1 parent 8e1c707 commit bac6462

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
@@ -23,7 +23,7 @@ use rustc_middle::ty::layout::{LayoutError, LayoutOfHelpers, TyAndLayout};
2323
use rustc_middle::ty::print::{PrintError, PrintTraitRefExt as _, Printer, with_no_trimmed_paths};
2424
use rustc_middle::ty::{self, GenericArg, RegisteredTools, Ty, TyCtxt, TypingEnv, TypingMode};
2525
use rustc_session::lint::{FutureIncompatibleInfo, Lint, LintBuffer, LintExpectationId, LintId};
26-
use rustc_session::{LintStoreMarker, Session};
26+
use rustc_session::{DynLintStore, Session};
2727
use rustc_span::edit_distance::find_best_match_for_names;
2828
use rustc_span::{Ident, Span, Symbol, sym};
2929
use tracing::debug;
@@ -61,7 +61,7 @@ pub struct LintStore {
6161
lint_groups: FxIndexMap<&'static str, LintGroup>,
6262
}
6363

64-
impl LintStoreMarker for LintStore {
64+
impl DynLintStore for LintStore {
6565
fn lint_groups_iter(&self) -> Box<dyn Iterator<Item = rustc_session::LintGroup> + '_> {
6666
Box::new(self.get_lint_groups().map(|(name, lints, is_externally_loaded)| {
6767
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
@@ -138,7 +138,7 @@ pub struct CompilerIO {
138138
pub temps_dir: Option<PathBuf>,
139139
}
140140

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

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

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

0 commit comments

Comments
 (0)