Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid pluralizing 'retry' for single value (#16535)

This commit is contained in:
Charlie Marsh 2025-10-31 10:28:51 -04:00 committed by GitHub
parent 5c71b5c124
commit 82aa0d0ef5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/uv-bin-install/src/lib.rs
View File

@ -137,7 +137,7 @@ pub enum Error {
#[error("Failed to detect platform")]
Platform(#[from] uv_platform::Error),
#[error("Attempt failed after {retries} retries")]
#[error("Attempt failed after {retries} {subject}", subject = if *retries > 1 { "retries" } else { "retry" })]
RetriedError {
#[source]
err: Box<Error>,

7
crates/uv-client/src/error.rs
View File

@ -78,8 +78,9 @@ impl Display for Error {
if self.retries > 0 {
write!(
f,
"Request failed after {retries} retries",
retries = self.retries
"Request failed after {retries} {subject}",
retries = self.retries,
subject = if self.retries > 1 { "retries" } else { "retry" }
)
} else {
Display::fmt(&self.kind, f)
@ -294,7 +295,7 @@ pub enum ErrorKind {
WrappedReqwestError(DisplaySafeUrl, #[source] WrappedReqwestError),
/// Add the number of failed retries to the error.
#[error("Request failed after {retries} retries")]
#[error("Request failed after {retries} {subject}", subject = if *retries > 1 { "retries" } else { "retry" })]
RequestWithRetries {
source: Box<ErrorKind>,
retries: u32,

2
crates/uv-python/src/downloads.rs
View File

@ -56,7 +56,7 @@ pub enum Error {
TooManyParts(String),
#[error("Failed to download {0}")]
NetworkError(DisplaySafeUrl, #[source] WrappedReqwestError),
#[error("Request failed after {retries} retries")]
#[error("Request failed after {retries} {subject}", subject = if *retries > 1 { "retries" } else { "retry" })]
NetworkErrorWithRetries {
#[source]
err: Box<Error>,