itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(toml): remove unnecessary ? operators

Browse Source
This commit is contained in:
Weihang Lo 2024-04-24 23:58:35 -04:00
parent 7ed7612a79
commit d855cd634a
No known key found for this signature in database
GPG Key ID: D7DBF189825E82E7
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cargo/util/toml/mod.rs
View File

@ -1894,7 +1894,7 @@ fn to_dependency_source_id<P: ResolveToPath + Clone>(
name_in_toml: &str, name_in_toml: &str,
manifest_ctx: &mut ManifestContext<'_, '_>, manifest_ctx: &mut ManifestContext<'_, '_>,
) -> CargoResult<SourceId> { ) -> CargoResult<SourceId> {
let new_source_id = match ( match (
orig.git.as_ref(), orig.git.as_ref(),
orig.path.as_ref(), orig.path.as_ref(),
orig.registry.as_deref(), orig.registry.as_deref(),
@ -1945,7 +1945,7 @@ fn to_dependency_source_id<P: ResolveToPath + Clone>(
manifest_ctx.warnings.push(msg); manifest_ctx.warnings.push(msg);
} }
SourceId::for_git(&loc, reference)? SourceId::for_git(&loc, reference)
} }
(None, Some(path), _, _) => { (None, Some(path), _, _) => {
let path = path.resolve(manifest_ctx.gctx); let path = path.resolve(manifest_ctx.gctx);
@ -1960,20 +1960,18 @@ fn to_dependency_source_id<P: ResolveToPath + Clone>(
if manifest_ctx.source_id.is_path() { if manifest_ctx.source_id.is_path() {
let path = manifest_ctx.root.join(path); let path = manifest_ctx.root.join(path);
let path = paths::normalize_path(&path); let path = paths::normalize_path(&path);
SourceId::for_path(&path)? SourceId::for_path(&path)
} else { } else {
manifest_ctx.source_id Ok(manifest_ctx.source_id)
} }
} }
(None, None, Some(registry), None) => SourceId::alt_registry(manifest_ctx.gctx, registry)?, (None, None, Some(registry), None) => SourceId::alt_registry(manifest_ctx.gctx, registry),
(None, None, None, Some(registry_index)) => { (None, None, None, Some(registry_index)) => {
let url = registry_index.into_url()?; let url = registry_index.into_url()?;
SourceId::for_registry(&url)? SourceId::for_registry(&url)
}
(None, None, None, None) => SourceId::crates_io(manifest_ctx.gctx),
} }
(None, None, None, None) => SourceId::crates_io(manifest_ctx.gctx)?,
};
Ok(new_source_id)
} }
pub trait ResolveToPath { pub trait ResolveToPath {