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

+1-1
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

+6-6
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

+2-2
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

+1-1
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

+2-2
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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]

src/test/run-make/unicode-input/multiple_files.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use std::io::{File, Command};
1313
use std::rand::{task_rng, Rng};
1414

1515
// creates unicode_input_multiple_files_{main,chars}.rs, where the
16-
// former imports the latter. `_chars` just contains an indentifier
16+
// former imports the latter. `_chars` just contains an identifier
1717
// made up of random characters, because will emit an error message
1818
// about the ident being in the wrong place, with a span (and creating
1919
// this span used to upset the compiler).

src/test/run-pass/builtin-superkinds-phantom-typaram.rs

+1-1
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-
// Tests that even when a type paramenter doesn't implement a required
11+
// Tests that even when a type parameter doesn't implement a required
1212
// super-builtin-kind of a trait, if the type parameter is never used,
1313
// the type can implement the trait anyway.
1414

src/test/run-pass/cleanup-shortcircuit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// option. this file may not be copied, modified, or distributed
1919
// except according to those terms.
2020

21-
// Test that cleanups for the RHS of shorcircuiting operators work.
21+
// Test that cleanups for the RHS of shortcircuiting operators work.
2222

2323
use std::os;
2424

src/test/run-pass/close-over-big-then-small-data.rs

+1-1
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-
// If we use GEPi rathern than GEP_tup_like when
11+
// If we use GEPi rather than GEP_tup_like when
1212
// storing closure data (as we used to do), the u64 would
1313
// overwrite the u16.
1414

src/test/run-pass/core-run-destroy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pub fn sleeper() -> Process {
7676
pub fn sleeper() -> Process {
7777
// There's a `timeout` command on windows, but it doesn't like having
7878
// its output piped, so instead just ping ourselves a few times with
79-
// gaps inbetweeen so we're sure this process is alive for awhile
79+
// gaps in between so we're sure this process is alive for awhile
8080
Command::new("ping").arg("127.0.0.1").arg("-n").arg("1000").spawn().unwrap()
8181
}
8282

src/test/run-pass/deriving-encodable-decodable-cell-refcell.rs

+1-1
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-
// This briefuly tests the capability of `Cell` and `RefCell` to implement the
11+
// This briefly tests the capability of `Cell` and `RefCell` to implement the
1212
// `Encodable` and `Decodable` traits via `#[deriving(Encodable, Decodable)]`
1313

1414
extern crate serialize;

src/test/run-pass/deriving-meta-multiple.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
use std::hash::hash;
1313

14-
// testing mulptiple separate deriving attributes
14+
// testing multiple separate deriving attributes
1515
#[deriving(PartialEq)]
1616
#[deriving(Clone)]
1717
#[deriving(Hash)]

src/test/run-pass/foreign-dupe.rs

+1-1
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-
// calling pin_task and that's having wierd side-effects.
11+
// calling pin_task and that's having weird side-effects.
1212

1313
mod rustrt1 {
1414
extern crate libc;

src/test/run-pass/issue-11709.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
// Don't fail on blocks without results
1414
// There are several tests in this run-pass that raised
15-
// when this bug was oppened. The cases where the compiler
15+
// when this bug was opened. The cases where the compiler
1616
// failed before the fix have a comment.
1717

1818
struct S {x:()}

src/test/run-pass/issue-2185.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
// notes on this test case:
1515
// On Thu, Apr 18, 2013-2014 at 6:30 PM, John Clements <[email protected]> wrote:
16-
// the "issue-2185.rs" test was ignoreed with a ref to #2263. Issue #2263 is now fixed,
16+
// the "issue-2185.rs" test was ignored with a ref to #2263. Issue #2263 is now fixed,
1717
// so I tried it again, and after adding some &self parameters, I got this error:
1818
//
1919
// Running /usr/local/bin/rustc:

src/test/run-pass/issue-9382.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#![allow(unnecessary_allocation)]
1212

13-
// Tests for a previous bug that occured due to an interaction
13+
// Tests for a previous bug that occurred due to an interaction
1414
// between struct field initialization and the auto-coercion
1515
// from a vector to a slice. The drop glue was being invoked on
1616
// the temporary slice with a wrong type, triggering an LLVM assert.

src/test/run-pass/linkage1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fn main() {
2828
// It appears that the --as-needed flag to linkers will not pull in a dynamic
2929
// library unless it satisfies a non weak undefined symbol. The 'other' crate
3030
// is compiled as a dynamic library where it would only be used for a
31-
// weak-symbol as part of an executable, so the dynamic library woudl be
31+
// weak-symbol as part of an executable, so the dynamic library would be
3232
// discarded. By adding and calling `other::bar`, we get around this problem.
3333
other::bar();
3434

src/test/run-pass/regions-infer-borrow-scope-addr-of.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub fn main() {
1515

1616
for i in range(0u, 3) {
1717
// ensure that the borrow in this alt
18-
// does not inferfere with the swap
18+
// does not interfere with the swap
1919
// below. note that it would it you
2020
// naively borrowed &x for the lifetime
2121
// of the variable x, as we once did

src/test/run-pass/regions-lifetime-nonfree-late-bound.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
// The original issue causing the ICE: the LUB-computations during
1414
// type inference were encountering late-bound lifetimes, and
15-
// asserting that such lifetimes should have already been subsituted
15+
// asserting that such lifetimes should have already been substituted
1616
// with a concrete lifetime.
1717
//
1818
// However, those encounters were occurring within the lexical scope

src/test/run-pass/shebang.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// option. This file may not be copied, modified, or distributed
1010
// except according to those terms.
1111

12-
// ignore-pretty: `expand` addes some preludes before shebang
12+
// ignore-pretty: `expand` adds some preludes before shebang
1313
//
1414
// ignore-lexer-test FIXME #15878
1515

0 commit comments

Comments
 (0)