mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-02 04:48:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Reduce some anyhow usages (#4323)

Browse source
This commit is contained in:
Charlie Marsh 2024-06-13 21:15:53 -07:00 • committed by GitHub
parent 7d9541d0f4
commit 83067c1802
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/uv-resolver/src/lock.rs
View file

@ -8,7 +8,6 @@ use std::fmt::{Debug, Display};
use std::path::{Path, PathBuf};
use std::str::FromStr;
use anyhow::Result;
use either::Either;
use petgraph::visit::EdgeRef;
use rustc_hash::FxHashMap;
@ -259,7 +258,7 @@ impl From<Lock> for LockWire {
impl Lock {
/// Returns the TOML representation of this lock file.
pub fn to_toml(&self) -> Result<String> {
pub fn to_toml(&self) -> anyhow::Result<String> {
// We construct a TOML document manually instead of going through Serde to enable
// the use of inline tables.
let mut doc = toml_edit::DocumentMut::new();
@ -332,7 +331,7 @@ impl Lock {
Ok(table)
})
.collect::<Result<Array>>()?;
.collect::<anyhow::Result<Array>>()?;
table.insert("wheels", value(wheels));
}
@ -1237,7 +1236,7 @@ impl SourceDist {
impl SourceDist {
/// Returns the TOML representation of this source distribution.
fn to_toml(&self) -> Result<InlineTable> {
fn to_toml(&self) -> anyhow::Result<InlineTable> {
let mut table = InlineTable::new();
match &self {
SourceDist::Url { url, .. } => {
@ -1589,7 +1588,7 @@ struct WheelWire {
impl Wheel {
/// Returns the TOML representation of this wheel.
fn to_toml(&self) -> Result<InlineTable> {
fn to_toml(&self) -> anyhow::Result<InlineTable> {
let mut table = InlineTable::new();
table.insert("url", Value::from(self.url.to_string()));
if let Some(ref hash) = self.hash {

4
crates/uv-resolver/src/resolution/graph.rs
View file

@ -53,7 +53,7 @@ impl ResolutionGraph {
git: &GitResolver,
python: &PythonRequirement,
resolution: Resolution,
) -> anyhow::Result<Self, ResolveError> {
) -> Result<Self, ResolveError> {
let mut petgraph: Graph<AnnotatedDist, Option<MarkerTree>, Directed> =
Graph::with_capacity(resolution.packages.len(), resolution.packages.len());
let mut inverse: FxHashMap<NodeKey, NodeIndex<u32>> = FxHashMap::with_capacity_and_hasher(
@ -331,7 +331,7 @@ impl ResolutionGraph {
manifest: &Manifest,
index: &InMemoryIndex,
marker_env: &MarkerEnvironment,
) -> anyhow::Result<pep508_rs::MarkerTree, Box<ParsedUrlError>> {
) -> Result<MarkerTree, Box<ParsedUrlError>> {
use pep508_rs::{
MarkerExpression, MarkerOperator, MarkerTree, MarkerValueString, MarkerValueVersion,
};