language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-29 10:58:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

internal: Symbol is not PartialOrd

Browse source
This commit is contained in:
Lukas Wirth 2025-03-14 13:54:17 +01:00
parent 8b5816b4f5
commit c28b80c321
2 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/hir-expand/src/proc_macro.rs
View file

@ -78,8 +78,10 @@ impl ProcMacrosBuilder {
if let Ok(proc_macros) = &mut proc_macro { if let Ok(proc_macros) = &mut proc_macro {
// Sort proc macros to improve incrementality when only their order has changed (ideally the build system // Sort proc macros to improve incrementality when only their order has changed (ideally the build system
// will not change their order, but just to be sure). // will not change their order, but just to be sure).
proc_macros proc_macros.sort_unstable_by(|proc_macro, proc_macro2| {
.sort_unstable_by_key(|proc_macro| (proc_macro.name.clone(), proc_macro.kind)); (proc_macro.name.as_str(), proc_macro.kind)
.cmp(&(proc_macro2.name.as_str(), proc_macro2.kind))
});
} }
self.0.insert( self.0.insert(
proc_macros_crate, proc_macros_crate,

14
crates/intern/src/symbol.rs
View file

@ -42,18 +42,6 @@ struct TaggedArcPtr {
unsafe impl Send for TaggedArcPtr {} unsafe impl Send for TaggedArcPtr {}
unsafe impl Sync for TaggedArcPtr {} unsafe impl Sync for TaggedArcPtr {}
impl Ord for TaggedArcPtr {
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
self.as_str().cmp(other.as_str())
}
}
impl PartialOrd for TaggedArcPtr {
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
Some(self.cmp(other))
}
}
impl TaggedArcPtr { impl TaggedArcPtr {
const BOOL_BITS: usize = true as usize; const BOOL_BITS: usize = true as usize;
@ -125,7 +113,7 @@ impl TaggedArcPtr {
} }
} }
#[derive(PartialEq, Eq, Hash, PartialOrd, Ord)] #[derive(PartialEq, Eq, Hash)]
pub struct Symbol { pub struct Symbol {
repr: TaggedArcPtr, repr: TaggedArcPtr,
} }