Skip to content

Commit a98aec6

Browse files
authored
chang 1 tries to 1 try (#15328)
### What does this PR try to resolve? The "1 tries remaining" message is boring, "1 try remaining" seems better. ### How should we test and review this PR? Run `cargo update` without network and watch the output messages.
2 parents 7918c7e + 776ea25 commit a98aec6

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

src/cargo/util/network/retry.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,11 @@ impl<'a> Retry<'a> {
108108
.downcast_ref::<HttpNotSuccessful>()
109109
.map(|http_err| http_err.display_short())
110110
.unwrap_or_else(|| e.root_cause().to_string());
111+
let left_retries = self.max_retries - self.retries;
111112
let msg = format!(
112-
"spurious network error ({} tries remaining): {err_msg}",
113-
self.max_retries - self.retries,
113+
"spurious network error ({} {} remaining): {err_msg}",
114+
left_retries,
115+
if left_retries != 1 { "tries" } else { "try" }
114116
);
115117
if let Err(e) = self.gctx.shell().warn(msg) {
116118
return RetryResult::Err(e);

tests/testsuite/git_auth.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ fn net_err_suggests_fetch_with_cli() {
372372
[UPDATING] git repository `ssh://needs-proxy.invalid/git`
373373
[WARNING] spurious network error (3 tries remaining): [..] resolve [..] needs-proxy.invalid: [..] known[..]
374374
[WARNING] spurious network error (2 tries remaining): [..] resolve [..] needs-proxy.invalid: [..] known[..]
375-
[WARNING] spurious network error (1 tries remaining): [..] resolve [..] needs-proxy.invalid: [..] known[..]
375+
[WARNING] spurious network error (1 try remaining): [..] resolve [..] needs-proxy.invalid: [..] known[..]
376376
[ERROR] failed to get `foo` as a dependency of package `foo v0.0.0 ([ROOT]/foo)`
377377
378378
Caused by:

tests/testsuite/net_config.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fn net_retry_loads_from_config() {
3535
.with_status(101)
3636
.with_stderr_data(str![[r#"
3737
...
38-
[WARNING] spurious network error (1 tries remaining): [..]
38+
[WARNING] spurious network error (1 try remaining): [..]
3939
...
4040
"#]])
4141
.run();
@@ -71,7 +71,7 @@ fn net_retry_git_outputs_warning() {
7171
.with_stderr_data(str![[r#"
7272
...
7373
[WARNING] spurious network error (2 tries remaining): [..]
74-
[WARNING] spurious network error (1 tries remaining): [..]
74+
[WARNING] spurious network error (1 try remaining): [..]
7575
...
7676
"#]])
7777
.run();

tests/testsuite/registry.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3695,11 +3695,12 @@ fn sparse_retry_multiple() {
36953695
let remain = 3 - retry;
36963696
write!(
36973697
&mut expected,
3698-
"[WARNING] spurious network error ({remain} tries remaining): \
3698+
"[WARNING] spurious network error ({remain} {} remaining): \
36993699
failed to get successful HTTP response from \
37003700
`http://127.0.0.1:[..]/{ab}/{cd}/{name}` (127.0.0.1), got 500\n\
37013701
body:\n\
3702-
internal server error\n"
3702+
internal server error\n",
3703+
if remain != 1 { "tries" } else { "try" }
37033704
)
37043705
.unwrap();
37053706
}
@@ -3847,11 +3848,12 @@ fn dl_retry_multiple() {
38473848
let remain = 3 - retry;
38483849
write!(
38493850
&mut expected,
3850-
"[WARNING] spurious network error ({remain} tries remaining): \
3851+
"[WARNING] spurious network error ({remain} {} remaining): \
38513852
failed to get successful HTTP response from \
38523853
`http://127.0.0.1:[..]/dl/{name}/1.0.0/download` (127.0.0.1), got 500\n\
38533854
body:\n\
3854-
internal server error\n"
3855+
internal server error\n",
3856+
if remain != 1 { "tries" } else { "try" }
38553857
)
38563858
.unwrap();
38573859
}
@@ -4220,7 +4222,7 @@ Please slow down
42204222
[WARNING] spurious network error (2 tries remaining): failed to get successful HTTP response from `http://127.0.0.1:[..]/index/3/b/bar` (127.0.0.1), got 503
42214223
body:
42224224
Please slow down
4223-
[WARNING] spurious network error (1 tries remaining): failed to get successful HTTP response from `http://127.0.0.1:[..]/index/3/b/bar` (127.0.0.1), got 503
4225+
[WARNING] spurious network error (1 try remaining): failed to get successful HTTP response from `http://127.0.0.1:[..]/index/3/b/bar` (127.0.0.1), got 503
42244226
body:
42254227
Please slow down
42264228
[ERROR] failed to get `bar` as a dependency of package `foo v0.1.0 ([ROOT]/foo)`
@@ -4285,7 +4287,7 @@ Please slow down
42854287
[WARNING] spurious network error (2 tries remaining): failed to get successful HTTP response from `http://127.0.0.1:[..]/dl/bar/1.0.0/download` (127.0.0.1), got 503
42864288
body:
42874289
Please slow down
4288-
[WARNING] spurious network error (1 tries remaining): failed to get successful HTTP response from `http://127.0.0.1:[..]/dl/bar/1.0.0/download` (127.0.0.1), got 503
4290+
[WARNING] spurious network error (1 try remaining): failed to get successful HTTP response from `http://127.0.0.1:[..]/dl/bar/1.0.0/download` (127.0.0.1), got 503
42894291
body:
42904292
Please slow down
42914293
[ERROR] failed to download from `http://127.0.0.1:[..]/dl/bar/1.0.0/download`

0 commit comments

Comments
 (0)