development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-08-28 03:39:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(util-schemas): error type for RustVerion

Browse source
This commit is contained in:
Weihang Lo 2023-12-19 16:59:41 -05:00
parent d7b811b686
commit 90017c0747
No known key found for this signature in database
GPG key ID: D7DBF189825E82E7
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
crates/cargo-util-schemas/src/manifest.rs
View file

@ -18,6 +18,7 @@ use serde_untagged::UntaggedEnumVisitor;
use crate::core::PackageIdSpec;
use crate::core::PartialVersion;
use crate::core::PartialVersionError;
use crate::restricted_names;
/// This type is used to deserialize `Cargo.toml` files.
@ -1334,15 +1335,15 @@ impl std::ops::Deref for RustVersion {
}
impl std::str::FromStr for RustVersion {
type Err = anyhow::Error;
type Err = RustVersionError;
fn from_str(value: &str) -> Result<Self, Self::Err> {
let partial = value.parse::<PartialVersion>()?;
if partial.pre.is_some() {
anyhow::bail!("unexpected prerelease field, expected a version like \"1.32\"")
return Err(RustVersionError::Prerelease);
}
if partial.build.is_some() {
anyhow::bail!("unexpected prerelease field, expected a version like \"1.32\"")
return Err(RustVersionError::BuildMetadata);
}
Ok(Self(partial))
}
@ -1366,6 +1367,20 @@ impl Display for RustVersion {
}
}
/// Error parsing a [`PartialVersion`].
#[non_exhaustive]
#[derive(Debug, thiserror::Error)]
pub enum RustVersionError {
#[error("unexpected prerelease field, expected a version like \"1.32\"")]
Prerelease,
#[error("unexpected build field, expected a version like \"1.32\"")]
BuildMetadata,
#[error(transparent)]
PartialVersion(#[from] PartialVersionError),
}
#[derive(Copy, Clone, Debug)]
pub struct InvalidCargoFeatures {}