refactor: Do all feature name validation through FeatureName

This commit is contained in:
Ed Page 2023-12-12 15:37:18 -06:00
parent 4e1fac8ce5
commit 586b010663

View file

@ -1,7 +1,7 @@
use crate::core::{Dependency, PackageId, SourceId}; use crate::core::{Dependency, PackageId, SourceId};
use crate::util::interning::InternedString; use crate::util::interning::InternedString;
use crate::util::restricted_names::validate_feature_name;
use crate::util::CargoResult; use crate::util::CargoResult;
use crate::util_schemas::manifest::FeatureName;
use crate::util_schemas::manifest::RustVersion; use crate::util_schemas::manifest::RustVersion;
use anyhow::bail; use anyhow::bail;
use semver::Version; use semver::Version;
@ -191,7 +191,7 @@ fn build_feature_map(
// Validate features are listed properly. // Validate features are listed properly.
for (feature, fvs) in &map { for (feature, fvs) in &map {
validate_feature_name(feature)?; FeatureName::new(feature)?;
for fv in fvs { for fv in fvs {
// Find data for the referenced dependency... // Find data for the referenced dependency...
let dep_data = { let dep_data = {