awhile -> a while where appropriate #143340

nabijaczleweli · 2025-07-02T18:02:30Z

No description provided.

rustbot · 2025-07-02T18:02:35Z

rustbot has assigned @thomcc.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-07-02T18:02:37Z

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

lnicola · 2025-07-02T18:11:21Z

The other parts are fine, but the rust-analyzer change will break a test. Please apply this change or file it separately in the rust-analyzer repo:

diff --git i/crates/ide/src/file_structure.rs w/crates/ide/src/file_structure.rs
index 347da4e85b..6820f99fac 100644
--- i/crates/ide/src/file_structure.rs
+++ w/crates/ide/src/file_structure.rs
@@ -329,7 +329,7 @@ macro_rules! mcexp {
 #[deprecated]
 fn obsolete() {}
 
-#[deprecated(note = "for awhile")]
+#[deprecated(note = "for a while")]
 fn very_obsolete() {}
 
 // region: Some region name
@@ -608,8 +608,8 @@ fn let_statements() {
                     StructureNode {
                         parent: None,
                         label: "very_obsolete",
-                        navigation_range: 511..524,
-                        node_range: 473..529,
+                        navigation_range: 512..525,
+                        node_range: 473..530,
                         kind: SymbolKind(
                             Function,
                         ),
@@ -621,8 +621,8 @@ fn let_statements() {
                     StructureNode {
                         parent: None,
                         label: "Some region name",
-                        navigation_range: 531..558,
-                        node_range: 531..558,
+                        navigation_range: 532..559,
+                        node_range: 532..559,
                         kind: Region,
                         detail: None,
                         deprecated: false,
@@ -630,8 +630,8 @@ fn let_statements() {
                     StructureNode {
                         parent: None,
                         label: "m",
-                        navigation_range: 598..599,
-                        node_range: 573..636,
+                        navigation_range: 599..600,
+                        node_range: 574..637,
                         kind: SymbolKind(
                             Module,
                         ),
@@ -643,8 +643,8 @@ fn let_statements() {
                             22,
                         ),
                         label: "dontpanic",
-                        navigation_range: 573..593,
-                        node_range: 573..593,
+                        navigation_range: 574..594,
+                        node_range: 574..594,
                         kind: Region,
                         detail: None,
                         deprecated: false,
@@ -654,8 +654,8 @@ fn let_statements() {
                             22,
                         ),
                         label: "f",
-                        navigation_range: 605..606,
-                        node_range: 602..611,
+                        navigation_range: 606..607,
+                        node_range: 603..612,
                         kind: SymbolKind(
                             Function,
                         ),
@@ -669,8 +669,8 @@ fn let_statements() {
                             22,
                         ),
                         label: "g",
-                        navigation_range: 628..629,
-                        node_range: 612..634,
+                        navigation_range: 629..630,
+                        node_range: 613..635,
                         kind: SymbolKind(
                             Function,
                         ),
@@ -682,8 +682,8 @@ fn let_statements() {
                     StructureNode {
                         parent: None,
                         label: "extern \"C\"",
-                        navigation_range: 638..648,
-                        node_range: 638..651,
+                        navigation_range: 639..649,
+                        node_range: 639..652,
                         kind: ExternBlock,
                         detail: None,
                         deprecated: false,
@@ -691,8 +691,8 @@ fn let_statements() {
                     StructureNode {
                         parent: None,
                         label: "let_statements",
-                        navigation_range: 656..670,
-                        node_range: 653..813,
+                        navigation_range: 657..671,
+                        node_range: 654..814,
                         kind: SymbolKind(
                             Function,
                         ),
@@ -706,8 +706,8 @@ fn let_statements() {
                             27,
                         ),
                         label: "x",
-                        navigation_range: 683..684,
-                        node_range: 679..690,
+                        navigation_range: 684..685,
+                        node_range: 680..691,
                         kind: SymbolKind(
                             Local,
                         ),
@@ -719,8 +719,8 @@ fn let_statements() {
                             27,
                         ),
                         label: "mut y",
-                        navigation_range: 699..704,
-                        node_range: 695..709,
+                        navigation_range: 700..705,
+                        node_range: 696..710,
                         kind: SymbolKind(
                             Local,
                         ),
@@ -732,8 +732,8 @@ fn let_statements() {
                             27,
                         ),
                         label: "Foo { .. }",
-                        navigation_range: 718..740,
-                        node_range: 714..753,
+                        navigation_range: 719..741,
+                        node_range: 715..754,
                         kind: SymbolKind(
                             Local,
                         ),
@@ -745,8 +745,8 @@ fn let_statements() {
                             27,
                         ),
                         label: "_",
-                        navigation_range: 803..804,
-                        node_range: 799..811,
+                        navigation_range: 804..805,
+                        node_range: 800..812,
                         kind: SymbolKind(
                             Local,
                         ),

nabijaczleweli · 2025-07-02T18:17:41Z

Applied

mati865 · 2025-07-07T16:49:33Z

Looks like prone to bitrot (RA tests) and trivial so I'll just steal it.

r? mati865

@bors r+ rollup

Thanks for the fixes!

bors · 2025-07-07T16:49:36Z

📌 Commit a0111ec has been approved by mati865

It is now in the queue for this repository.

Rollup of 9 pull requests Successful merges: - #132469 (Do not suggest borrow that is already there in fully-qualified call) - #143340 (awhile -> a while where appropriate) - #143438 (Fix the link in `rustdoc.md`) - #143539 (Regression tests for repr ICEs) - #143566 (Fix `x86_64-unknown-netbsd` platform support page) - #143572 (Remove unused allow attrs) - #143583 (`loop_match`: fix 'no terminator on block') - #143584 (make `Machine::load_mir` infallible) - #143591 (Fix missing words in future tracking issue) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #143340 - nabijaczleweli:awhile, r=mati865 awhile -> a while where appropriate

awhile -> a while where appropriate

Rollup of 9 pull requests Successful merges: - rust-lang/rust#132469 (Do not suggest borrow that is already there in fully-qualified call) - rust-lang/rust#143340 (awhile -> a while where appropriate) - rust-lang/rust#143438 (Fix the link in `rustdoc.md`) - rust-lang/rust#143539 (Regression tests for repr ICEs) - rust-lang/rust#143566 (Fix `x86_64-unknown-netbsd` platform support page) - rust-lang/rust#143572 (Remove unused allow attrs) - rust-lang/rust#143583 (`loop_match`: fix 'no terminator on block') - rust-lang/rust#143584 (make `Machine::load_mir` infallible) - rust-lang/rust#143591 (Fix missing words in future tracking issue) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned thomcc Jul 2, 2025

lnicola approved these changes Jul 2, 2025

View reviewed changes

awhile -> a while where appropriate

a0111ec

nabijaczleweli force-pushed the awhile branch from 17d92c4 to a0111ec Compare July 2, 2025 18:17

rustbot assigned mati865 and unassigned thomcc Jul 7, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 7, 2025

matthiaskrgr mentioned this pull request Jul 7, 2025

Rollup of 9 pull requests #143601

Merged

bors merged commit 2554c42 into rust-lang:master Jul 7, 2025
10 checks passed

rustbot added this to the 1.90.0 milestone Jul 7, 2025

rust-timer added a commit that referenced this pull request Jul 7, 2025

Unrolled build for #143340

ee1dcfd

Rollup merge of #143340 - nabijaczleweli:awhile, r=mati865 awhile -> a while where appropriate

github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Jul 11, 2025

Rollup merge of rust-lang#143340 - nabijaczleweli:awhile, r=mati865

ea21e9e

awhile -> a while where appropriate

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

awhile -> a while where appropriate #143340

awhile -> a while where appropriate #143340

Uh oh!

nabijaczleweli commented Jul 2, 2025

Uh oh!

rustbot commented Jul 2, 2025

Uh oh!

rustbot commented Jul 2, 2025

Uh oh!

lnicola commented Jul 2, 2025

Uh oh!

nabijaczleweli commented Jul 2, 2025

Uh oh!

mati865 commented Jul 7, 2025

Uh oh!

bors commented Jul 7, 2025

Uh oh!

Uh oh!

Uh oh!

awhile -> a while where appropriate #143340

awhile -> a while where appropriate #143340

Uh oh!

Conversation

nabijaczleweli commented Jul 2, 2025

Uh oh!

rustbot commented Jul 2, 2025

Uh oh!

rustbot commented Jul 2, 2025

Uh oh!

lnicola commented Jul 2, 2025

Uh oh!

nabijaczleweli commented Jul 2, 2025

Uh oh!

mati865 commented Jul 7, 2025

Uh oh!

bors commented Jul 7, 2025

Uh oh!

Uh oh!

Uh oh!