Skip to content

Commit c4a63fa

Browse files
committed
auto merge of #16182 : jbcrail/rust/fix-test-comments, r=sfackler
2 parents 23276f9 + 2016742 commit c4a63fa

25 files changed

+32
-32
lines changed

src/test/bench/rt-messaging-ping-pong.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use std::uint;
2222

2323
// This is a simple bench that creates M pairs of tasks. These
2424
// tasks ping-pong back and forth over a pair of streams. This is a
25-
// cannonical message-passing benchmark as it heavily strains message
25+
// canonical message-passing benchmark as it heavily strains message
2626
// passing and almost nothing else.
2727

2828
fn ping_pong_bench(n: uint, m: uint) {

src/test/bench/shootout-meteor.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl<'a, T> Iterator<&'a T> for ListIterator<'a, T> {
101101
// every possible transformations (the 6 rotations with their
102102
// corresponding mirrored piece), with, as minimum coordinates, (0,
103103
// 0). If all is false, only generate half of the possibilities (used
104-
// to break the symetry of the board).
104+
// to break the symmetry of the board).
105105
fn transform(piece: Vec<(int, int)> , all: bool) -> Vec<Vec<(int, int)>> {
106106
let mut res: Vec<Vec<(int, int)>> =
107107
// rotations
@@ -124,9 +124,9 @@ fn transform(piece: Vec<(int, int)> , all: bool) -> Vec<Vec<(int, int)>> {
124124
res
125125
}
126126

127-
// A mask is a piece somewere on the board. It is represented as a
127+
// A mask is a piece somewhere on the board. It is represented as a
128128
// u64: for i in the first 50 bits, m[i] = 1 if the cell at (i/5, i%5)
129-
// is occuped. m[50 + id] = 1 if the identifier of the piece is id.
129+
// is occupied. m[50 + id] = 1 if the identifier of the piece is id.
130130

131131
// Takes a piece with minimum coordinate (0, 0) (as generated by
132132
// transform). Returns the corresponding mask if p translated by (dy,
@@ -159,7 +159,7 @@ fn make_masks() -> Vec<Vec<Vec<u64> > > {
159159
vec!((0i,0i),(0,1),(0,2),(1,2),(1,3)),
160160
vec!((0i,0i),(0,1),(0,2),(0,3),(1,2)));
161161

162-
// To break the central symetry of the problem, every
162+
// To break the central symmetry of the problem, every
163163
// transformation must be taken except for one piece (piece 3
164164
// here).
165165
let transforms: Vec<Vec<Vec<(int, int)>>> =
@@ -263,7 +263,7 @@ impl Data {
263263
// Records a new found solution. Returns false if the search must be
264264
// stopped.
265265
fn handle_sol(raw_sol: &List<u64>, data: &mut Data) {
266-
// because we break the symetry, 2 solutions correspond to a call
266+
// because we break the symmetry, 2 solutions correspond to a call
267267
// to this method: the normal solution, and the same solution in
268268
// reverse order, i.e. the board rotated by half a turn.
269269
data.nb += 2;
@@ -298,7 +298,7 @@ fn search(
298298
for id in range(0u, 10).filter(|id| board & (1 << (id + 50)) == 0) {
299299
// for each mask that fits on the board
300300
for m in masks_at.get(id).iter().filter(|&m| board & *m == 0) {
301-
// This check is too costy.
301+
// This check is too costly.
302302
//if is_board_unfeasible(board | m, masks) {continue;}
303303
search(masks, board | *m, i + 1, Cons(*m, &cur), data);
304304
}

src/test/bench/shootout-spectralnorm.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ fn dot(v: &[f64], u: &[f64]) -> f64 {
3636

3737
fn mult(v: Arc<RWLock<Vec<f64>>>, out: Arc<RWLock<Vec<f64>>>,
3838
f: fn(&Vec<f64>, uint) -> f64) {
39-
// We lanch in different tasks the work to be done. To finish
40-
// this fuction, we need to wait for the completion of every
39+
// We launch in different tasks the work to be done. To finish
40+
// this function, we need to wait for the completion of every
4141
// tasks. To do that, we give to each tasks a wait_chan that we
4242
// drop at the end of the work. At the end of this function, we
4343
// wait until the channel hang up.

src/test/compile-fail/borrowck-forbid-static-unsafe-interior.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// Verify that it is not possible to take the address of
12-
// static items with usnafe interior.
12+
// static items with unsafe interior.
1313

1414
use std::kinds::marker;
1515
use std::cell::UnsafeCell;

src/test/compile-fail/borrowck-managed-pointer-deref-scope.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// Verify that managed pointers scope is treated like ownoed pointers.
12-
// regresion test for #11586
11+
// Verify that managed pointers scope is treated like owned pointers.
12+
// regression test for #11586
1313

1414

1515
use std::gc::{GC, Gc};

src/test/compile-fail/check-static-values-constraints.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static STATIC7: SafeStruct = SafeStruct{field1: Variant1, field2: Variant3(WithD
7272
//~^ ERROR static items are not allowed to have destructors
7373

7474
// Test variadic constructor for structs. The base struct should be examined
75-
// as well as every field persent in the constructor.
75+
// as well as every field present in the constructor.
7676
// This example shouldn't fail because all the fields are safe.
7777
static STATIC8: SafeStruct = SafeStruct{field1: Variant1,
7878
..SafeStruct{field1: Variant1, field2: Variant1}};

src/test/compile-fail/issue-5806.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// opyright 2013 The Rust Project Developers. See the COPYRIGHT
11+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1212
// file at the top-level directory of this distribution and at
1313
// http://rust-lang.org/COPYRIGHT.
1414
//

src/test/compile-fail/privacy1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
pub trait Sized {}
1616

1717
mod bar {
18-
// shouln't bring in too much
18+
// shouldn't bring in too much
1919
pub use self::glob::*;
2020

2121
// can't publicly re-export private items

src/test/compile-fail/typeck-unsafe-always-share.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// Verify that UnsafeCell is *always* sync regardles `T` is sync.
11+
// Verify that UnsafeCell is *always* sync regardless if `T` is sync.
1212

1313
// ignore-tidy-linelength
1414

src/test/compile-fail/variance-regions-indirect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// Test that we correctly infer variance for region parameters in
12-
// case that involve multiple intracrate types.
12+
// case that involve multiple intricate types.
1313
// Try enums too.
1414

1515
#[rustc_variance]

0 commit comments

Comments
 (0)