Skip to content

Commit ee1dcfd

Browse files
rust-timerrust-timer
authored
Unrolled build for #143340
Rollup merge of #143340 - nabijaczleweli:awhile, r=mati865 awhile -> a while where appropriate
2 parents 2f8eeb2 + a0111ec commit ee1dcfd

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

‎compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,7 @@ extern "C" void LLVMRustSetModuleCodeModel(LLVMModuleRef M,
12751275
//
12761276
// Otherwise I'll apologize in advance, it probably requires a relatively
12771277
// significant investment on your part to "truly understand" what's going on
1278-
// here. Not saying I do myself, but it took me awhile staring at LLVM's source
1278+
// here. Not saying I do myself, but it took me a while staring at LLVM's source
12791279
// and various online resources about ThinLTO to make heads or tails of all
12801280
// this.
12811281

‎library/std/src/sync/mpmc/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ use crate::time::{Duration, Instant};
187187
/// sender.send(expensive_computation()).unwrap();
188188
/// });
189189
///
190-
/// // Do some useful work for awhile
190+
/// // Do some useful work for a while
191191
///
192192
/// // Let's see what that answer was
193193
/// println!("{:?}", receiver.recv().unwrap());

‎library/std/src/sync/mpsc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ pub enum TrySendError<T> {
509509
/// sender.send(expensive_computation()).unwrap();
510510
/// });
511511
///
512-
/// // Do some useful work for awhile
512+
/// // Do some useful work for a while
513513
///
514514
/// // Let's see what that answer was
515515
/// println!("{:?}", receiver.recv().unwrap());

‎src/tools/rust-analyzer/crates/ide/src/file_structure.rs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ macro_rules! mcexp {
329329
#[deprecated]
330330
fn obsolete() {}
331331
332-
#[deprecated(note = "for awhile")]
332+
#[deprecated(note = "for a while")]
333333
fn very_obsolete() {}
334334
335335
// region: Some region name
@@ -608,8 +608,8 @@ fn let_statements() {
608608
StructureNode {
609609
parent: None,
610610
label: "very_obsolete",
611-
navigation_range: 511..524,
612-
node_range: 473..529,
611+
navigation_range: 512..525,
612+
node_range: 473..530,
613613
kind: SymbolKind(
614614
Function,
615615
),
@@ -621,17 +621,17 @@ fn let_statements() {
621621
StructureNode {
622622
parent: None,
623623
label: "Some region name",
624-
navigation_range: 531..558,
625-
node_range: 531..558,
624+
navigation_range: 532..559,
625+
node_range: 532..559,
626626
kind: Region,
627627
detail: None,
628628
deprecated: false,
629629
},
630630
StructureNode {
631631
parent: None,
632632
label: "m",
633-
navigation_range: 598..599,
634-
node_range: 573..636,
633+
navigation_range: 599..600,
634+
node_range: 574..637,
635635
kind: SymbolKind(
636636
Module,
637637
),
@@ -643,8 +643,8 @@ fn let_statements() {
643643
22,
644644
),
645645
label: "dontpanic",
646-
navigation_range: 573..593,
647-
node_range: 573..593,
646+
navigation_range: 574..594,
647+
node_range: 574..594,
648648
kind: Region,
649649
detail: None,
650650
deprecated: false,
@@ -654,8 +654,8 @@ fn let_statements() {
654654
22,
655655
),
656656
label: "f",
657-
navigation_range: 605..606,
658-
node_range: 602..611,
657+
navigation_range: 606..607,
658+
node_range: 603..612,
659659
kind: SymbolKind(
660660
Function,
661661
),
@@ -669,8 +669,8 @@ fn let_statements() {
669669
22,
670670
),
671671
label: "g",
672-
navigation_range: 628..629,
673-
node_range: 612..634,
672+
navigation_range: 629..630,
673+
node_range: 613..635,
674674
kind: SymbolKind(
675675
Function,
676676
),
@@ -682,17 +682,17 @@ fn let_statements() {
682682
StructureNode {
683683
parent: None,
684684
label: "extern \"C\"",
685-
navigation_range: 638..648,
686-
node_range: 638..651,
685+
navigation_range: 639..649,
686+
node_range: 639..652,
687687
kind: ExternBlock,
688688
detail: None,
689689
deprecated: false,
690690
},
691691
StructureNode {
692692
parent: None,
693693
label: "let_statements",
694-
navigation_range: 656..670,
695-
node_range: 653..813,
694+
navigation_range: 657..671,
695+
node_range: 654..814,
696696
kind: SymbolKind(
697697
Function,
698698
),
@@ -706,8 +706,8 @@ fn let_statements() {
706706
27,
707707
),
708708
label: "x",
709-
navigation_range: 683..684,
710-
node_range: 679..690,
709+
navigation_range: 684..685,
710+
node_range: 680..691,
711711
kind: SymbolKind(
712712
Local,
713713
),
@@ -719,8 +719,8 @@ fn let_statements() {
719719
27,
720720
),
721721
label: "mut y",
722-
navigation_range: 699..704,
723-
node_range: 695..709,
722+
navigation_range: 700..705,
723+
node_range: 696..710,
724724
kind: SymbolKind(
725725
Local,
726726
),
@@ -732,8 +732,8 @@ fn let_statements() {
732732
27,
733733
),
734734
label: "Foo { .. }",
735-
navigation_range: 718..740,
736-
node_range: 714..753,
735+
navigation_range: 719..741,
736+
node_range: 715..754,
737737
kind: SymbolKind(
738738
Local,
739739
),
@@ -745,8 +745,8 @@ fn let_statements() {
745745
27,
746746
),
747747
label: "_",
748-
navigation_range: 803..804,
749-
node_range: 799..811,
748+
navigation_range: 804..805,
749+
node_range: 800..812,
750750
kind: SymbolKind(
751751
Local,
752752
),

‎tests/ui/process/core-run-destroy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub fn sleeper() -> Child {
3737
pub fn sleeper() -> Child {
3838
// There's a `timeout` command on windows, but it doesn't like having
3939
// its output piped, so instead just ping ourselves a few times with
40-
// gaps in between so we're sure this process is alive for awhile
40+
// gaps in between so we're sure this process is alive for a while
4141
t!(Command::new("ping").arg("127.0.0.1").arg("-n").arg("1000").spawn())
4242
}
4343

0 commit comments

Comments
 (0)