Skip to content

Commit 3bc6858

Browse files
committed
auto merge of #8551 : huonw/rust/speling, r=alexcrichton
(This doesn't add/remove `u`s or change `ize` to `ise`, or anything like that.)
2 parents 6009011 + 6440343 commit 3bc6858

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+80
-79
lines changed

doc/rust.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ a referencing source file, or by the name of the crate itself.
582582

583583
Each source file contains a sequence of zero or more `item` definitions,
584584
and may optionally begin with any number of `attributes` that apply to the containing module.
585-
Atributes on the anonymous crate module define important metadata that influences
585+
Attributes on the anonymous crate module define important metadata that influences
586586
the behavior of the compiler.
587587

588588
~~~~~~~~
@@ -1273,7 +1273,7 @@ since the typechecker checks that any type with an implementation of `Circle` al
12731273

12741274
In type-parameterized functions,
12751275
methods of the supertrait may be called on values of subtrait-bound type parameters.
1276-
Refering to the previous example of `trait Circle : Shape`:
1276+
Referring to the previous example of `trait Circle : Shape`:
12771277

12781278
~~~
12791279
# trait Shape { fn area(&self) -> float; }
@@ -1914,7 +1914,7 @@ A field access on a record is an [lvalue](#lvalues-rvalues-and-temporaries) refe
19141914
When the field is mutable, it can be [assigned](#assignment-expressions) to.
19151915

19161916
When the type of the expression to the left of the dot is a pointer to a record or structure,
1917-
it is automatically derferenced to make the field access possible.
1917+
it is automatically dereferenced to make the field access possible.
19181918

19191919

19201920
### Vector expressions

src/etc/cmathconsts.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <math.h>
1414
#include <stdio.h>
1515

16-
// must match core::ctypes
16+
// must match std::ctypes
1717

1818
#define C_FLT(x) (float)x
1919
#define C_DBL(x) (double)x

src/etc/ziggurat_tables.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# xfail-license
33

44
# This creates the tables used for distributions implemented using the
5-
# ziggurat algorithm in `core::rand::distributions;`. They are
5+
# ziggurat algorithm in `std::rand::distributions;`. They are
66
# (basically) the tables as used in the ZIGNOR variant (Doornik 2005).
77
# They are changed rarely, so the generated file should be checked in
88
# to git.

src/etc/zsh/_rust

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ _rustc_opts_lint=(
3636
'path-statement[path statements with no effect]'
3737
'missing-trait-doc[detects missing documentation for traits]'
3838
'missing-struct-doc[detects missing documentation for structs]'
39-
'ctypes[proper use of core::libc types in foreign modules]'
39+
'ctypes[proper use of std::libc types in foreign modules]'
4040
"unused-mut[detect mut variables which don't need to be mutable]"
4141
'unused-imports[imports that are never used]'
4242
'heap-memory[use of any (~ type or @ type) heap memory]'

src/libextra/crypto/cryptoutil.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ pub fn add_bytes_to_bits_tuple
176176
/// method that modifies the buffer directory or provides the caller with bytes that can be modifies
177177
/// results in those bytes being marked as used by the buffer.
178178
pub trait FixedBuffer {
179-
/// Input a vector of bytes. If the buffer becomes full, proccess it with the provided
179+
/// Input a vector of bytes. If the buffer becomes full, process it with the provided
180180
/// function and then clear the buffer.
181181
fn input(&mut self, input: &[u8], func: &fn(&[u8]));
182182

src/libextra/crypto/digest.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,18 @@ pub trait Digest {
4747
fn output_bits(&self) -> uint;
4848

4949
/**
50-
* Convenience functon that feeds a string into a digest
50+
* Convenience function that feeds a string into a digest.
5151
*
5252
* # Arguments
5353
*
54-
* * in The string to feed into the digest
54+
* * `input` The string to feed into the digest
5555
*/
5656
fn input_str(&mut self, input: &str) {
5757
self.input(input.as_bytes());
5858
}
5959

6060
/**
61-
* Convenience functon that retrieves the result of a digest as a
61+
* Convenience function that retrieves the result of a digest as a
6262
* ~str in hexadecimal format.
6363
*/
6464
fn result_str(&mut self) -> ~str {

src/libextra/enum_set.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub struct EnumSet<E> {
1818
priv bits: uint
1919
}
2020

21-
/// An iterface for casting C-like enum to uint and back.
21+
/// An interface for casting C-like enum to uint and back.
2222
pub trait CLike {
2323
/// Converts C-like enum to uint.
2424
fn to_uint(&self) -> uint;

src/libextra/fileinput.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ impl FileInput {
156156
/**
157157
Create a `FileInput` object from a vec of files. An empty
158158
vec means lines are read from `stdin` (use `from_vec_raw` to stop
159-
this behaviour). Any occurence of `None` represents `stdin`.
159+
this behaviour). Any occurrence of `None` represents `stdin`.
160160
*/
161161
pub fn from_vec(files: ~[Option<Path>]) -> FileInput {
162162
FileInput::from_vec_raw(

src/libextra/flatpipes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Constructors for flat pipes that send POD types using memcpy.
166166
167167
This module is currently unsafe because it uses `Clone + Send` as a type
168168
parameter bounds meaning POD (plain old data), but `Clone + Send` and
169-
POD are not equivelant.
169+
POD are not equivalent.
170170
171171
*/
172172
pub mod pod {

src/libextra/stats.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ pub fn write_boxplot(w: @io::Writer, s: &Summary, width_hint: uint) {
365365
w.write_str(histr);
366366
}
367367

368-
/// Returns a HashMap with the number of occurences of every element in the
368+
/// Returns a HashMap with the number of occurrences of every element in the
369369
/// sequence that the iterator exposes.
370370
pub fn freq_count<T: Iterator<U>, U: Eq+Hash>(mut iter: T) -> hashmap::HashMap<U, uint> {
371371
let mut map = hashmap::HashMap::new::<U, uint>();

0 commit comments

Comments
 (0)