Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 01:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #15323 - lowr:patch/dep-kind-no-alloc, r=lnicola

Browse source 
internal: optimize `DepKindInfo` -> `DepKind` conversion

We don't need to allocate a `Vec`, nor do we need sorting.
This commit is contained in:
bors 2023-07-21 10:49:45 +00:00
commit 899dd84b4d
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
crates/project-model/src/cargo_workspace.rs
View file

@ -145,7 +145,7 @@ pub struct PackageDependency {
pub kind: DepKind, pub kind: DepKind,
} }
#[derive(Debug, Clone, Eq, PartialEq, PartialOrd, Ord)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum DepKind { pub enum DepKind {
/// Available to the library, binary, and dev targets in the package (but not the build script). /// Available to the library, binary, and dev targets in the package (but not the build script).
Normal, Normal,
@ -156,23 +156,20 @@ pub enum DepKind {
} }
impl DepKind { impl DepKind {
fn iter(list: &[cargo_metadata::DepKindInfo]) -> impl Iterator<Item = Self> + '_ { fn iter(list: &[cargo_metadata::DepKindInfo]) -> impl Iterator<Item = Self> {
let mut dep_kinds = Vec::new(); let mut dep_kinds = [None; 3];
if list.is_empty() { if list.is_empty() {
dep_kinds.push(Self::Normal); dep_kinds[0] = Some(Self::Normal);
} }
for info in list { for info in list {
let kind = match info.kind { match info.kind {
cargo_metadata::DependencyKind::Normal => Self::Normal, cargo_metadata::DependencyKind::Normal => dep_kinds[0] = Some(Self::Normal),
cargo_metadata::DependencyKind::Development => Self::Dev, cargo_metadata::DependencyKind::Development => dep_kinds[1] = Some(Self::Dev),
cargo_metadata::DependencyKind::Build => Self::Build, cargo_metadata::DependencyKind::Build => dep_kinds[2] = Some(Self::Build),
cargo_metadata::DependencyKind::Unknown => continue, cargo_metadata::DependencyKind::Unknown => continue,
}; }
dep_kinds.push(kind);
} }
dep_kinds.sort_unstable(); dep_kinds.into_iter().flatten()
dep_kinds.dedup();
dep_kinds.into_iter()
} }
} }