Skip to content

Commit 7ce700a

Browse files
committed
auto merge of #6966 : alco/rust/fix-typo, r=sanxiyn
2 parents 7e62ad6 + e75572c commit 7ce700a

File tree

19 files changed

+24
-25
lines changed

19 files changed

+24
-25
lines changed

doc/rust.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1297,7 +1297,7 @@ with matching types and type parameter counts.
12971297

12981298
An implementation can take type parameters,
12991299
which can be different from the type parameters taken by the trait it implements.
1300-
Implementation parameters are written after after the `impl` keyword.
1300+
Implementation parameters are written after the `impl` keyword.
13011301

13021302
~~~~
13031303
# trait Seq<T> { }

src/libextra/arc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ impl<'self> Condvar<'self> {
9696

9797
/**
9898
* Wake up all blocked tasks on a specified condvar (as
99-
* sync::cond.broadcast_on). Returns Returns the number of tasks woken.
99+
* sync::cond.broadcast_on). Returns the number of tasks woken.
100100
*/
101101
#[inline(always)]
102102
pub fn broadcast_on(&self, condvar_id: uint) -> uint {

src/libextra/treemap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use core::uint;
1919
use core::util::{swap, replace};
2020

2121
// This is implemented as an AA tree, which is a simplified variation of
22-
// a red-black tree where where red (horizontal) nodes can only be added
22+
// a red-black tree where red (horizontal) nodes can only be added
2323
// as a right child. The time complexity is the same, and re-balancing
2424
// operations are more frequent but also cheaper.
2525

src/librustc/middle/borrowck/check_loans.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl<'self> CheckLoanCtxt<'self> {
7676
scope_id: ast::node_id,
7777
op: &fn(&Loan) -> bool)
7878
-> bool {
79-
//! Iterates over each loan that that has been issued
79+
//! Iterates over each loan that has been issued
8080
//! on entrance to `scope_id`, regardless of whether it is
8181
//! actually *in scope* at that point. Sometimes loans
8282
//! are issued for future scopes and thus they may have been
@@ -219,7 +219,7 @@ impl<'self> CheckLoanCtxt<'self> {
219219
self.bccx.span_err(
220220
new_loan.span,
221221
fmt!("cannot borrow `%s` as mutable \
222-
more than once at at a time",
222+
more than once at a time",
223223
self.bccx.loan_path_to_str(new_loan.loan_path)));
224224
self.bccx.span_note(
225225
old_loan.span,

src/librustc/middle/borrowck/gather_loans/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ mod gather_moves;
4040

4141
/// Context used while gathering loans:
4242
///
43-
/// - `bccx`: the the borrow check context
43+
/// - `bccx`: the borrow check context
4444
/// - `item_ub`: the id of the block for the enclosing fn/method item
4545
/// - `root_ub`: the id of the outermost block for which we can root
4646
/// an `@T`. This is the id of the innermost enclosing

src/librustc/middle/liveness.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1113,7 +1113,7 @@ impl Liveness {
11131113
}
11141114

11151115
expr_again(opt_label) => {
1116-
// Find which label this expr continues to to
1116+
// Find which label this expr continues to
11171117
let sc = self.find_loop_scope(opt_label, expr.id, expr.span);
11181118

11191119
// Now that we know the label we're going to,

src/librustc/middle/resolve.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ pub enum RibKind {
206206
FunctionRibKind(node_id /* func id */, node_id /* body id */),
207207

208208
// We passed through an impl or trait and are now in one of its
209-
// methods. Allow references to ty params that that impl or trait
209+
// methods. Allow references to ty params that impl or trait
210210
// binds. Disallow any other upvars (including other ty params that are
211211
// upvars).
212212
// parent; method itself

src/librustc/middle/trans/closure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ pub fn trans_expr_fn(bcx: block,
374374
* - `decl`
375375
* - `body`
376376
* - `outer_id`: The id of the closure expression with the correct
377-
* type. This is usually the same as as `user_id`, but in the
377+
* type. This is usually the same as `user_id`, but in the
378378
* case of a `for` loop, the `outer_id` will have the return
379379
* type of boolean, and the `user_id` will have the return type
380380
* of `nil`.

src/librustc/middle/ty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ pub enum AutoRef {
221221
// implementations.
222222
//
223223
// This is a map from ID of each implementation to the method info and trait
224-
// method ID of each of the default methods belonging to the trait that that
224+
// method ID of each of the default methods belonging to the trait that
225225
// implementation implements.
226226
pub type ProvidedMethodsMap = @mut HashMap<def_id,@mut ~[@ProvidedMethodInfo]>;
227227

src/librustc/middle/typeck/infer/coercion.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,7 @@ impl Coerce {
369369

370370
// although borrowed ptrs and unsafe ptrs have the same
371371
// representation, we still register an AutoDerefRef so that
372-
// regionck knows that that the region for `a` must be valid
373-
// here
372+
// regionck knows that the region for `a` must be valid here
374373
Ok(Some(@AutoDerefRef(AutoDerefRef {
375374
autoderefs: 1,
376375
autoref: Some(ty::AutoUnsafe(mt_b.mutbl))

0 commit comments

Comments
 (0)