Avoid pluralizing 'retry' for single value (#16535)
This commit is contained in:
@@ -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>,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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>,
|
||||
|
||||
Reference in New Issue
Block a user