Skip to content

Commit a373fb2

Browse files
VeykrilVeykril
committed
Expose symbol of CrateName 
1 parent 4d9be70 commit a373fb2

File tree

14 files changed

+33
-34
lines changed

14 files changed

+33
-34
lines changed

‎src/tools/rust-analyzer/crates/base-db/src/input.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ impl fmt::Display for CrateName {
129129
}
130130

131131
impl ops::Deref for CrateName {
132-
type Target = str;
133-
fn deref(&self) -> &str {
134-
self.0.as_str()
132+
type Target = Symbol;
133+
fn deref(&self) -> &Symbol {
134+
&self.0
135135
}
136136
}
137137

@@ -230,8 +230,8 @@ impl fmt::Display for CrateDisplayName {
230230
}
231231

232232
impl ops::Deref for CrateDisplayName {
233-
type Target = str;
234-
fn deref(&self) -> &str {
233+
type Target = Symbol;
234+
fn deref(&self) -> &Symbol {
235235
&self.crate_name
236236
}
237237
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ mod tests {
519519
crate_graph[krate]
520520
.display_name
521521
.as_ref()
522-
.is_some_and(|it| &**it.crate_name() == crate_name)
522+
.is_some_and(|it| it.crate_name().as_str() == crate_name)
523523
})
524524
.expect("could not find crate");
525525

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ impl DefMap {
337337
pub(crate) fn crate_def_map_query(db: &dyn DefDatabase, crate_id: CrateId) -> Arc<DefMap> {
338338
let crate_graph = db.crate_graph();
339339
let krate = &crate_graph[crate_id];
340-
let name = krate.display_name.as_deref().unwrap_or_default();
340+
let name = krate.display_name.as_deref().map(Symbol::as_str).unwrap_or_default();
341341
let _p = tracing::info_span!("crate_def_map_query", ?name).entered();
342342

343343
let module_data = ModuleData::new(

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,6 @@ impl AsName for ast::FieldKind {
262262

263263
impl AsName for base_db::Dependency {
264264
fn as_name(&self) -> Name {
265-
Name::new_root(&self.name)
265+
Name::new_symbol_root((*self.name).clone())
266266
}
267267
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ pub fn prettify_macro_expansion(
4141
} else if let Some(dep) =
4242
target_crate.dependencies.iter().find(|dep| dep.crate_id == macro_def_crate)
4343
{
44-
make::tokens::ident(&dep.name)
44+
make::tokens::ident(dep.name.as_str())
4545
} else if let Some(crate_name) = &crate_graph[macro_def_crate].display_name {
46-
make::tokens::ident(crate_name.crate_name())
46+
make::tokens::ident(crate_name.crate_name().as_str())
4747
} else {
4848
return dollar_crate.clone();
4949
}

‎src/tools/rust-analyzer/crates/ide-db/src/prime_caches.rs

+8-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ mod topologic_sort;
66

77
use std::time::Duration;
88

9-
use hir::db::DefDatabase;
9+
use hir::{db::DefDatabase, Symbol};
1010
use itertools::Itertools;
1111

1212
use crate::{
@@ -22,7 +22,7 @@ use crate::{
2222
#[derive(Debug)]
2323
pub struct ParallelPrimeCachesProgress {
2424
/// the crates that we are currently priming.
25-
pub crates_currently_indexing: Vec<String>,
25+
pub crates_currently_indexing: Vec<Symbol>,
2626
/// the total number of crates we want to prime.
2727
pub crates_total: usize,
2828
/// the total number of crates that have finished priming
@@ -49,7 +49,7 @@ pub fn parallel_prime_caches(
4949
};
5050

5151
enum ParallelPrimeCacheWorkerProgress {
52-
BeginCrate { crate_id: CrateId, crate_name: String },
52+
BeginCrate { crate_id: CrateId, crate_name: Symbol },
5353
EndCrate { crate_id: CrateId },
5454
}
5555

@@ -112,7 +112,11 @@ pub fn parallel_prime_caches(
112112

113113
for crate_id in &mut crates_to_prime {
114114
let krate = &graph[crate_id];
115-
let name = krate.display_name.as_deref().unwrap_or_default().to_owned();
115+
let name = krate
116+
.display_name
117+
.as_deref()
118+
.cloned()
119+
.unwrap_or_else(|| Symbol::integer(crate_id.into_raw().into_u32() as usize));
116120
if krate.origin.is_lang() {
117121
additional_phases.push((crate_id, name.clone(), PrimingPhase::ImportMap));
118122
} else if krate.origin.is_local() {
@@ -195,7 +199,6 @@ pub fn parallel_prime_caches(
195199
}
196200
ParallelPrimeCacheWorkerProgress::EndCrate { crate_id } => {
197201
crates_currently_indexing.swap_remove(&crate_id);
198-
crates_to_prime.mark_done(crate_id);
199202
crates_done += 1;
200203
}
201204
};

‎src/tools/rust-analyzer/crates/ide/src/view_crate_graph.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ impl<'a> dot::Labeller<'a, CrateId, Edge<'a>> for DotCrateGraph {
8484
}
8585

8686
fn node_label(&'a self, n: &CrateId) -> LabelText<'a> {
87-
let name = self.graph[*n].display_name.as_ref().map_or("(unnamed crate)", |name| name);
87+
let name =
88+
self.graph[*n].display_name.as_ref().map_or("(unnamed crate)", |name| name.as_str());
8889
LabelText::LabelStr(name.into())
8990
}
9091
}

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

+1
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ define_symbols! {
480480
u64,
481481
u8,
482482
unadjusted,
483+
unknown,
483484
Unknown,
484485
unpin,
485486
unreachable_2015,

‎src/tools/rust-analyzer/crates/project-model/src/project_json.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -508,5 +508,5 @@ fn serialize_crate_name<S>(name: &CrateName, se: S) -> Result<S::Ok, S::Error>
508508
where
509509
S: serde::Serializer,
510510
{
511-
se.serialize_str(name)
511+
se.serialize_str(name.as_str())
512512
}

‎src/tools/rust-analyzer/crates/project-model/src/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ fn rust_project_is_proc_macro_has_proc_macro_dep() {
230230
let crate_data = &crate_graph[crate_id];
231231
// Assert that the project crate with `is_proc_macro` has a dependency
232232
// on the proc_macro sysroot crate.
233-
crate_data.dependencies.iter().find(|&dep| dep.name.deref() == "proc_macro").unwrap();
233+
crate_data.dependencies.iter().find(|&dep| *dep.name.deref() == sym::proc_macro).unwrap();
234234
}
235235

236236
#[test]

‎src/tools/rust-analyzer/crates/rust-analyzer/src/cli/diagnostics.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use project_model::{CargoConfig, RustLibSource};
55
use rustc_hash::FxHashSet;
66

7-
use hir::{db::HirDatabase, Crate, HirFileIdExt, Module};
7+
use hir::{db::HirDatabase, sym, Crate, HirFileIdExt, Module};
88
use ide::{AnalysisHost, AssistResolveStrategy, Diagnostic, DiagnosticsConfig, Severity};
99
use ide_db::{base_db::SourceRootDatabase, LineIndexDatabase};
1010
use load_cargo::{load_workspace_at, LoadCargoConfig, ProcMacroServerChoice};
@@ -60,7 +60,7 @@ impl flags::Diagnostics {
6060
let file_id = module.definition_source_file_id(db).original_file(db);
6161
if !visited_files.contains(&file_id) {
6262
let crate_name =
63-
module.krate().display_name(db).as_deref().unwrap_or("unknown").to_owned();
63+
module.krate().display_name(db).as_deref().unwrap_or(&sym::unknown).to_owned();
6464
println!(
6565
"processing crate: {crate_name}, module: {}",
6666
_vfs.file_path(file_id.into())

‎src/tools/rust-analyzer/crates/rust-analyzer/src/cli/unresolved_references.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//! Reports references in code that the IDE layer cannot resolve.
2-
use hir::{db::HirDatabase, AnyDiagnostic, Crate, HirFileIdExt as _, Module, Semantics};
2+
use hir::{db::HirDatabase, sym, AnyDiagnostic, Crate, HirFileIdExt as _, Module, Semantics};
33
use ide::{AnalysisHost, RootDatabase, TextRange};
44
use ide_db::{
55
base_db::{SourceDatabase, SourceRootDatabase},
@@ -66,7 +66,7 @@ impl flags::UnresolvedReferences {
6666
let file_id = module.definition_source_file_id(db).original_file(db);
6767
if !visited_files.contains(&file_id) {
6868
let crate_name =
69-
module.krate().display_name(db).as_deref().unwrap_or("unknown").to_owned();
69+
module.krate().display_name(db).as_deref().unwrap_or(&sym::unknown).to_owned();
7070
let file_path = vfs.file_path(file_id.into());
7171
eprintln!("processing crate: {crate_name}, module: {file_path}",);
7272

‎src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -339,14 +339,16 @@ impl GlobalState {
339339

340340
message = match &*report.crates_currently_indexing {
341341
[crate_name] => Some(format!(
342-
"{}/{} ({crate_name})",
343-
report.crates_done, report.crates_total
342+
"{}/{} ({})",
343+
report.crates_done,
344+
report.crates_total,
345+
crate_name.as_str(),
344346
)),
345347
[crate_name, rest @ ..] => Some(format!(
346348
"{}/{} ({} + {} more)",
347349
report.crates_done,
348350
report.crates_total,
349-
crate_name,
351+
crate_name.as_str(),
350352
rest.len()
351353
)),
352354
_ => None,

‎src/tools/rust-analyzer/crates/test-fixture/src/lib.rs

+1-9
Original file line numberDiff line numberDiff line change
@@ -258,15 +258,7 @@ impl ChangeFixture {
258258
let to_id = crates[&to];
259259
let sysroot = crate_graph[to_id].origin.is_lang();
260260
crate_graph
261-
.add_dep(
262-
from_id,
263-
Dependency::with_prelude(
264-
CrateName::new(&to).unwrap(),
265-
to_id,
266-
prelude,
267-
sysroot,
268-
),
269-
)
261+
.add_dep(from_id, Dependency::with_prelude(to.clone(), to_id, prelude, sysroot))
270262
.unwrap();
271263
}
272264
}

0 commit comments

Comments
 (0)