Skip to content

Commit fb38e4b

Browse files
committed
Auto merge of #18025 - cuishuang:master, r=lnicola
minor: remove repetitive words
2 parents c7f4874 + ddb1e41 commit fb38e4b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/tools/rust-analyzer/crates/hir/src/semantics/source_to_def.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ impl SourceToDefCtx<'_, '_> {
281281
let (body, source_map) = self.db.body_with_source_map(container);
282282
let src = src.cloned().map(ast::Pat::from);
283283
let pat_id = source_map.node_pat(src.as_ref())?;
284-
// the pattern could resolve to a constant, verify that that is not the case
284+
// the pattern could resolve to a constant, verify that this is not the case
285285
if let crate::Pat::Bind { id, .. } = body[pat_id] {
286286
Some((container, id))
287287
} else {

src/tools/rust-analyzer/crates/intern/src/symbol/symbols.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ macro_rules! define_symbols {
1515
(@WITH_NAME: $($alias:ident = $value:literal,)* @PLAIN: $($name:ident,)*) => {
1616
// Ideally we would be emitting `const` here, but then we no longer have stable addresses
1717
// which is what we are relying on for equality! In the future if consts can refer to
18-
// statics we should swap these for `const`s and have the the string literal being pointed
18+
// statics we should swap these for `const`s and have the string literal being pointed
1919
// to be statics to refer to such that their address is stable.
2020
$(
2121
pub static $name: Symbol = Symbol { repr: TaggedArcPtr::non_arc(&stringify!($name)) };

src/tools/rust-analyzer/crates/rust-analyzer/src/cli/scip.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ impl flags::Scip {
142142
let mut symbol_roles = Default::default();
143143

144144
if let Some(def) = token.definition {
145-
// if the the range of the def and the range of the token are the same, this must be the definition.
145+
// if the range of the def and the range of the token are the same, this must be the definition.
146146
// they also must be in the same file. See https://github.com/rust-lang/rust-analyzer/pull/17988
147147
if def.file_id == file_id && def.range == text_range {
148148
symbol_roles |= scip_types::SymbolRole::Definition as i32;

src/tools/rust-analyzer/crates/span/src/hygiene.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ pub struct SyntaxContextData {
8181
/// Invariant: Only [`SyntaxContextId::ROOT`] has a [`None`] outer expansion.
8282
// FIXME: The None case needs to encode the context crate id. We can encode that as the MSB of
8383
// MacroCallId is reserved anyways so we can do bit tagging here just fine.
84-
// The bigger issue is that that will cause interning to now create completely separate chains
84+
// The bigger issue is that this will cause interning to now create completely separate chains
8585
// per crate. Though that is likely not a problem as `MacroCallId`s are already crate calling dependent.
8686
pub outer_expn: Option<MacroCallId>,
8787
pub outer_transparency: Transparency,

0 commit comments

Comments
 (0)