Skip to content

Commit 031d37f

Browse files
borsbors
committed
Auto merge of #17398 - Veykril:bogus-file, r=Veykril
internal: Remove FileId::BOGUS
2 parents a97aef8 + c86f3d3 commit 031d37f

File tree

8 files changed

+40
-70
lines changed

8 files changed

+40
-70
lines changed

‎src/tools/rust-analyzer/crates/hir-def/src/lib.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ use hir_expand::{
9090
use item_tree::ExternBlock;
9191
use la_arena::Idx;
9292
use nameres::DefMap;
93-
use span::{AstIdNode, Edition, FileAstId, FileId, SyntaxContextId};
93+
use span::{AstIdNode, Edition, FileAstId, SyntaxContextId};
9494
use stdx::impl_from;
9595
use syntax::{ast, AstNode};
9696

@@ -958,15 +958,14 @@ impl GenericDefId {
958958
match self {
959959
GenericDefId::FunctionId(it) => file_id_and_params_of_item_loc(db, it),
960960
GenericDefId::TypeAliasId(it) => file_id_and_params_of_item_loc(db, it),
961-
GenericDefId::ConstId(_) => (FileId::BOGUS.into(), None),
962961
GenericDefId::AdtId(AdtId::StructId(it)) => file_id_and_params_of_item_loc(db, it),
963962
GenericDefId::AdtId(AdtId::UnionId(it)) => file_id_and_params_of_item_loc(db, it),
964963
GenericDefId::AdtId(AdtId::EnumId(it)) => file_id_and_params_of_item_loc(db, it),
965964
GenericDefId::TraitId(it) => file_id_and_params_of_item_loc(db, it),
966965
GenericDefId::TraitAliasId(it) => file_id_and_params_of_item_loc(db, it),
967966
GenericDefId::ImplId(it) => file_id_and_params_of_item_loc(db, it),
968-
// We won't be using this ID anyway
969-
GenericDefId::EnumVariantId(_) => (FileId::BOGUS.into(), None),
967+
GenericDefId::ConstId(it) => (it.lookup(db).id.file_id(), None),
968+
GenericDefId::EnumVariantId(it) => (it.lookup(db).id.file_id(), None),
970969
}
971970
}
972971

‎src/tools/rust-analyzer/crates/hir-def/src/nameres/collector.rs

+19-44
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use itertools::{izip, Itertools};
2121
use la_arena::Idx;
2222
use limit::Limit;
2323
use rustc_hash::{FxHashMap, FxHashSet};
24-
use span::{Edition, ErasedFileAstId, FileAstId, Span, SyntaxContextId};
24+
use span::{Edition, ErasedFileAstId, FileAstId, SyntaxContextId};
2525
use syntax::ast;
2626
use triomphe::Arc;
2727

@@ -75,36 +75,23 @@ pub(super) fn collect_defs(db: &dyn DefDatabase, def_map: DefMap, tree_id: TreeI
7575

7676
let proc_macros = if krate.is_proc_macro {
7777
match db.proc_macros().get(&def_map.krate) {
78-
Some(Ok(proc_macros)) => {
79-
Ok(proc_macros
80-
.iter()
81-
.enumerate()
82-
.map(|(idx, it)| {
83-
// FIXME: a hacky way to create a Name from string.
84-
let name = tt::Ident {
85-
text: it.name.clone(),
86-
span: Span {
87-
range: syntax::TextRange::empty(syntax::TextSize::new(0)),
88-
anchor: span::SpanAnchor {
89-
file_id: FileId::BOGUS,
90-
ast_id: span::ROOT_ERASED_FILE_AST_ID,
91-
},
92-
ctx: SyntaxContextId::ROOT,
93-
},
94-
};
95-
(
96-
name.as_name(),
97-
if it.disabled {
98-
CustomProcMacroExpander::disabled()
99-
} else {
100-
CustomProcMacroExpander::new(
101-
hir_expand::proc_macro::ProcMacroId::new(idx as u32),
102-
)
103-
},
104-
)
105-
})
106-
.collect())
107-
}
78+
Some(Ok(proc_macros)) => Ok(proc_macros
79+
.iter()
80+
.enumerate()
81+
.map(|(idx, it)| {
82+
let name = Name::new_text_dont_use(it.name.clone());
83+
(
84+
name,
85+
if it.disabled {
86+
CustomProcMacroExpander::disabled()
87+
} else {
88+
CustomProcMacroExpander::new(hir_expand::proc_macro::ProcMacroId::new(
89+
idx as u32,
90+
))
91+
},
92+
)
93+
})
94+
.collect()),
10895
Some(Err(e)) => Err(e.clone().into_boxed_str()),
10996
None => Err("No proc-macros present for crate".to_owned().into_boxed_str()),
11097
}
@@ -2154,19 +2141,7 @@ impl ModCollector<'_, '_> {
21542141
let name;
21552142
let name = match attrs.by_key("rustc_builtin_macro").string_value() {
21562143
Some(it) => {
2157-
// FIXME: a hacky way to create a Name from string.
2158-
name = tt::Ident {
2159-
text: it.into(),
2160-
span: Span {
2161-
range: syntax::TextRange::empty(syntax::TextSize::new(0)),
2162-
anchor: span::SpanAnchor {
2163-
file_id: FileId::BOGUS,
2164-
ast_id: span::ROOT_ERASED_FILE_AST_ID,
2165-
},
2166-
ctx: SyntaxContextId::ROOT,
2167-
},
2168-
}
2169-
.as_name();
2144+
name = Name::new_text_dont_use(it.into());
21702145
&name
21712146
}
21722147
None => {

‎src/tools/rust-analyzer/crates/hir-expand/src/db.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,11 @@ pub fn expand_speculative(
146146
token_to_map: SyntaxToken,
147147
) -> Option<(SyntaxNode, SyntaxToken)> {
148148
let loc = db.lookup_intern_macro_call(actual_macro_call);
149+
let (_, _, span) = db.macro_arg_considering_derives(actual_macro_call, &loc.kind);
149150

150-
// FIXME: This BOGUS here is dangerous once the proc-macro server can call back into the database!
151-
let span_map = RealSpanMap::absolute(FileId::BOGUS);
151+
let span_map = RealSpanMap::absolute(span.anchor.file_id);
152152
let span_map = SpanMapRef::RealSpanMap(&span_map);
153153

154-
let (_, _, span) = db.macro_arg_considering_derives(actual_macro_call, &loc.kind);
155-
156154
// Build the subtree and token mapping for the speculative args
157155
let (mut tt, undo_info) = match loc.kind {
158156
MacroCallKind::FnLike { .. } => (

‎src/tools/rust-analyzer/crates/hir-expand/src/fixup.rs

+11-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
use mbe::DocCommentDesugarMode;
55
use rustc_hash::{FxHashMap, FxHashSet};
66
use smallvec::SmallVec;
7-
use span::{ErasedFileAstId, Span, SpanAnchor, FIXUP_ERASED_FILE_AST_ID_MARKER};
7+
use span::{
8+
ErasedFileAstId, Span, SpanAnchor, SyntaxContextId, FIXUP_ERASED_FILE_AST_ID_MARKER,
9+
ROOT_ERASED_FILE_AST_ID,
10+
};
811
use stdx::never;
912
use syntax::{
1013
ast::{self, AstNode, HasLoopBody},
@@ -307,8 +310,13 @@ pub(crate) fn reverse_fixups(tt: &mut Subtree, undo_info: &SyntaxFixupUndoInfo)
307310
tt.delimiter.close.anchor.ast_id == FIXUP_DUMMY_AST_ID
308311
|| tt.delimiter.open.anchor.ast_id == FIXUP_DUMMY_AST_ID
309312
) {
310-
tt.delimiter.close = Span::DUMMY;
311-
tt.delimiter.open = Span::DUMMY;
313+
let span = |file_id| Span {
314+
range: TextRange::empty(TextSize::new(0)),
315+
anchor: SpanAnchor { file_id, ast_id: ROOT_ERASED_FILE_AST_ID },
316+
ctx: SyntaxContextId::ROOT,
317+
};
318+
tt.delimiter.open = span(tt.delimiter.open.anchor.file_id);
319+
tt.delimiter.close = span(tt.delimiter.close.anchor.file_id);
312320
}
313321
reverse_fixups_(tt, undo_info);
314322
}

‎src/tools/rust-analyzer/crates/hir-expand/src/quote.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ mod tests {
231231

232232
const DUMMY: tt::Span = tt::Span {
233233
range: TextRange::empty(TextSize::new(0)),
234-
anchor: SpanAnchor { file_id: FileId::BOGUS, ast_id: ROOT_ERASED_FILE_AST_ID },
234+
anchor: SpanAnchor { file_id: FileId::from_raw(0xe4e4e), ast_id: ROOT_ERASED_FILE_AST_ID },
235235
ctx: SyntaxContextId::ROOT,
236236
};
237237

‎src/tools/rust-analyzer/crates/mbe/src/syntax_bridge.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub(crate) mod dummy_test_span_utils {
4747
pub const DUMMY: Span = Span {
4848
range: TextRange::empty(TextSize::new(0)),
4949
anchor: span::SpanAnchor {
50-
file_id: span::FileId::BOGUS,
50+
file_id: span::FileId::from_raw(0xe4e4e),
5151
ast_id: span::ROOT_ERASED_FILE_AST_ID,
5252
},
5353
ctx: SyntaxContextId::ROOT,
@@ -60,7 +60,7 @@ pub(crate) mod dummy_test_span_utils {
6060
Span {
6161
range,
6262
anchor: span::SpanAnchor {
63-
file_id: span::FileId::BOGUS,
63+
file_id: span::FileId::from_raw(0xe4e4e),
6464
ast_id: span::ROOT_ERASED_FILE_AST_ID,
6565
},
6666
ctx: SyntaxContextId::ROOT,

‎src/tools/rust-analyzer/crates/span/src/lib.rs

+2-9
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,6 @@ impl<Ctx: Copy> SpanData<Ctx> {
8686
}
8787
}
8888

89-
impl Span {
90-
#[deprecated = "dummy spans will panic if surfaced incorrectly, as such they should be replaced appropriately"]
91-
pub const DUMMY: Self = Self {
92-
range: TextRange::empty(TextSize::new(0)),
93-
anchor: SpanAnchor { file_id: FileId::BOGUS, ast_id: ROOT_ERASED_FILE_AST_ID },
94-
ctx: SyntaxContextId::ROOT,
95-
};
96-
}
97-
9889
impl fmt::Display for Span {
9990
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
10091
fmt::Debug::fmt(&self.anchor.file_id.index(), f)?;
@@ -178,6 +169,8 @@ impl salsa::InternKey for MacroCallId {
178169
}
179170

180171
impl MacroCallId {
172+
pub const MAX_ID: u32 = 0x7fff_ffff;
173+
181174
pub fn as_file(self) -> HirFileId {
182175
MacroFileId { macro_call_id: self }.into()
183176
}

‎src/tools/rust-analyzer/crates/vfs/src/lib.rs

-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ pub struct FileId(u32);
6969
// pub struct FileId(NonMaxU32);
7070

7171
impl FileId {
72-
/// Think twice about using this outside of tests. If this ends up in a wrong place it will cause panics!
73-
// FIXME: To be removed once we get rid of all `SpanData::DUMMY` usages.
74-
pub const BOGUS: FileId = FileId(0xe4e4e);
7572
pub const MAX_FILE_ID: u32 = 0x7fff_ffff;
7673

7774
#[inline]

0 commit comments

Comments
 (0)