From c8a3db8e8f25f8b9626b760c172dba7abee46a7a Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Fri, 23 Oct 2020 16:12:10 -0700 Subject: [PATCH] Minor cleanup. --- src/cargo/core/resolver/features.rs | 1 - src/cargo/core/summary.rs | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cargo/core/resolver/features.rs b/src/cargo/core/resolver/features.rs index 113d18461..8db68ceae 100644 --- a/src/cargo/core/resolver/features.rs +++ b/src/cargo/core/resolver/features.rs @@ -475,7 +475,6 @@ impl<'a, 'cfg> FeatureResolver<'a, 'cfg> { // Activate the crate on self. let fv = FeatureValue::Crate { dep_name: *dep_name, - // explicit: *explicit, }; self.activate_fv(pkg_id, &fv, for_host)?; if !explicit { diff --git a/src/cargo/core/summary.rs b/src/cargo/core/summary.rs index 0ca8e2cbc..a18fa4be4 100644 --- a/src/cargo/core/summary.rs +++ b/src/cargo/core/summary.rs @@ -350,8 +350,8 @@ impl FeatureValue { Some(pos) => { let (dep, dep_feat) = feature.split_at(pos); let dep_feat = &dep_feat[1..]; - let (dep, explicit) = if dep.starts_with("crate:") { - (&dep[6..], true) + let (dep, explicit) = if let Some(dep) = dep.strip_prefix("crate:") { + (dep, true) } else { (dep, false) }; -- 2.39.5