Skip to content

Fix typos in comments, debug statements #6345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/compiletest/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ fn _arm_exec_compiled_test(config: config, props: TestProps,
logv(config, fmt!("executing (%s) %s", config.target, cmdline));

// adb shell dose not forward stdout and stderr of internal result
// to stdout and stderr seperately but to stdout only
// to stdout and stderr separately but to stdout only
let mut newargs_out = ~[];
let mut newargs_err = ~[];
let subargs = args.args;
Expand Down
6 changes: 3 additions & 3 deletions src/libcore/at_vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pub fn capacity<T>(v: @[T]) -> uint {
* # Arguments
*
* * size - An initial size of the vector to reserve
* * builder - A function that will construct the vector. It recieves
* * builder - A function that will construct the vector. It receives
* as an argument a function that will push an element
* onto the vector being constructed.
*/
Expand All @@ -70,7 +70,7 @@ pub fn build_sized<A>(size: uint, builder: &fn(push: &fn(v: A))) -> @[A] {
*
* # Arguments
*
* * builder - A function that will construct the vector. It recieves
* * builder - A function that will construct the vector. It receives
* as an argument a function that will push an element
* onto the vector being constructed.
*/
Expand All @@ -87,7 +87,7 @@ pub fn build<A>(builder: &fn(push: &fn(v: A))) -> @[A] {
* # Arguments
*
* * size - An option, maybe containing initial size of the vector to reserve
* * builder - A function that will construct the vector. It recieves
* * builder - A function that will construct the vector. It receives
* as an argument a function that will push an element
* onto the vector being constructed.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/rt/io/extensions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
//! Utility mixins that apply to all Readers and Writers

// XXX: Not sure how this should be structured
// XXX: Iteration should probably be considered seperately
// XXX: Iteration should probably be considered separately

pub trait ReaderUtil {

Expand Down
2 changes: 1 addition & 1 deletion src/libcore/task/local_data_priv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ unsafe fn get_newsched_local_map(local: *mut LocalStorage) -> TaskLocalMap {

unsafe fn key_to_key_value<T: 'static>(key: LocalDataKey<T>) -> *libc::c_void {
// Keys are closures, which are (fnptr,envptr) pairs. Use fnptr.
// Use reintepret_cast -- transmute would leak (forget) the closure.
// Use reinterpret_cast -- transmute would leak (forget) the closure.
let pair: (*libc::c_void, *libc::c_void) = cast::transmute_copy(&key);
pair.first()
}
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ pub fn build<A>(builder: &fn(push: &fn(v: A))) -> ~[A] {
* # Arguments
*
* * size - An option, maybe containing initial size of the vector to reserve
* * builder - A function that will construct the vector. It recieves
* * builder - A function that will construct the vector. It receives
* as an argument a function that will push an element
* onto the vector being constructed.
*/
Expand Down
4 changes: 2 additions & 2 deletions src/librustc/middle/trans/machine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pub fn nonzero_llsize_of(cx: @CrateContext, t: TypeRef) -> ValueRef {
}

// Returns the preferred alignment of the given type for the current target.
// The preffered alignment may be larger than the alignment used when
// The preferred alignment may be larger than the alignment used when
// packing the type into structs. This will be used for things like
// allocations inside a stack frame, which LLVM has a free hand in.
pub fn llalign_of_pref(cx: @CrateContext, t: TypeRef) -> uint {
Expand All @@ -96,7 +96,7 @@ pub fn llalign_of_pref(cx: @CrateContext, t: TypeRef) -> uint {
}
}

// Returns the minimum alignment of a type required by the plattform.
// Returns the minimum alignment of a type required by the platform.
// This is the alignment that will be used for struct fields, arrays,
// and similar ABI-mandated things.
pub fn llalign_of_min(cx: @CrateContext, t: TypeRef) -> uint {
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/middle/typeck/check/vtable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use syntax::print::pprust::expr_to_str;
use syntax::visit;

// vtable resolution looks for places where trait bounds are
// subsituted in and figures out which vtable is used. There is some
// substituted in and figures out which vtable is used. There is some
// extra complication thrown in to support early "opportunistic"
// vtable resolution. This is a hacky mechanism that is invoked while
// typechecking function calls (after typechecking non-closure
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/arena.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// calling the destructors on them.
// One subtle point that needs to be addressed is how to handle
// failures while running the user provided initializer function. It
// is important to not run the destructor on uninitalized objects, but
// is important to not run the destructor on uninitialized objects, but
// how to detect them is somewhat subtle. Since alloc() can be invoked
// recursively, it is not sufficient to simply exclude the most recent
// object. To solve this without requiring extra space, we use the low
Expand Down
8 changes: 4 additions & 4 deletions src/libstd/flatpipes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ or transformed to and from, byte vectors.

The `FlatPort` and `FlatChan` types implement the generic channel and
port interface for arbitrary types and transport strategies. It can
particularly be used to send and recieve serializable types over I/O
particularly be used to send and receive serializable types over I/O
streams.

`FlatPort` and `FlatChan` implement the same comm traits as pipe-based
Expand Down Expand Up @@ -55,7 +55,7 @@ use core::sys::size_of;
use core::vec;

/**
A FlatPort, consisting of a `BytePort` that recieves byte vectors,
A FlatPort, consisting of a `BytePort` that receives byte vectors,
and an `Unflattener` that converts the bytes to a value.

Create using the constructors in the `serial` and `pod` modules.
Expand Down Expand Up @@ -819,7 +819,7 @@ mod test {
}
}

// Reciever task
// Receiver task
do task::spawn || {
// Wait for a connection
let (conn, res_chan) = accept_port.recv();
Expand All @@ -838,7 +838,7 @@ mod test {

for int::range(0, 10) |i| {
let j = port.recv();
debug!("receieved %?", j);
debug!("received %?", j);
assert!(i == j);
}

Expand Down
2 changes: 1 addition & 1 deletion src/libstd/getopts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ pub mod groups {
desc_sep
};

// Normalize desc to contain words seperated by one space character
// Normalize desc to contain words separated by one space character
let mut desc_normalized_whitespace = ~"";
for str::each_word(desc) |word| {
desc_normalized_whitespace.push_str(word);
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/net_ip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ mod test {
if result::is_err(&ga_result) {
fail!(~"got err result from net::ip::get_addr();")
}
// note really sure how to realiably test/assert
// note really sure how to reliably test/assert
// this.. mostly just wanting to see it work, atm.
let results = result::unwrap(ga_result);
debug!("test_get_addr: Number of results for %s: %?",
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/rope.rs
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ pub mod node {
*
* # Fields
*
* * byte_offset = The number of bytes skippen in `content`
* * byte_offset = The number of bytes skipped in `content`
* * byte_len - The number of bytes of `content` to use
* * char_len - The number of chars in the leaf.
* * content - Contents of the leaf.
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub mod rustrt {
}

// The name of a test. By convention this follows the rules for rust
// paths; i.e. it should be a series of identifiers seperated by double
// paths; i.e. it should be a series of identifiers separated by double
// colons. This way if some test runner wants to arrange the tests
// hierarchically it may.

Expand Down
2 changes: 1 addition & 1 deletion src/libstd/uv_global_loop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,6 @@ mod test {
exit_po.recv();
};
debug!(~"test_stress_gl_uv_global_loop_high_level_global_timer"+
~" exiting sucessfully!");
~" exiting successfully!");
}
}
2 changes: 1 addition & 1 deletion src/libstd/uv_iotask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ fn impl_uv_iotask_async(iotask: &IoTask) {
exit_po.recv();
}

// this fn documents the bear minimum neccesary to roll your own
// this fn documents the bear minimum necessary to roll your own
// high_level_loop
#[cfg(test)]
fn spawn_test_loop(exit_ch: ~Chan<()>) -> IoTask {
Expand Down
6 changes: 3 additions & 3 deletions src/libstd/uv_ll.rs
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ pub struct sockaddr_in {
}

// unix size: 28 .. FIXME #1645
// stuck with 32 becuse of rust padding structs?
// stuck with 32 because of rust padding structs?
#[cfg(target_arch="x86_64")]
pub struct sockaddr_in6 {
a0: *u8, a1: *u8,
Expand All @@ -286,7 +286,7 @@ pub struct sockaddr_in6 {
}

// unix size: 28 .. FIXME #1645
// stuck with 32 becuse of rust padding structs?
// stuck with 32 because of rust padding structs?
pub type addr_in = addr_in_impl::addr_in;
#[cfg(unix)]
pub mod addr_in_impl {
Expand Down Expand Up @@ -1376,7 +1376,7 @@ mod test {
let tcp_init_result = tcp_init(test_loop as *libc::c_void,
tcp_handle_ptr);
if (tcp_init_result == 0) {
debug!(~"sucessful tcp_init_result");
debug!(~"successful tcp_init_result");

debug!(~"building addr...");
let addr = ip4_addr(ip, port);
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/ext/quote.rs
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ fn expand_tts(cx: @ext_ctxt,
// compiler (which we don't really want to do) and, in any case, only
// pushed the problem a very small step further back: an error
// resulting from a parse of the resulting quote is still attributed to
// the site the string literal occured, which was in a source file
// the site the string literal occurred, which was in a source file
// _other_ than the one the user has control over. For example, an
// error in a quote from the protocol compiler, invoked in user code
// using proto! for example, will be attributed to the pipec.rs file in
Expand Down
2 changes: 1 addition & 1 deletion src/rt/rust_log.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/
static lock_and_signal _log_lock;
/**
* Indicates whether we are outputing to the console.
* Indicates whether we are outputting to the console.
* Protected by _log_lock;
*/
static bool _log_to_console = true;
Expand Down
2 changes: 1 addition & 1 deletion src/rt/rust_signal.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef RUST_SIGNAL_H
#define RUST_SIGNAL_H

// Just an abstrict class that reperesents something that can be signalled
// Just an abstract class that represents something that can be signalled
class rust_signal {
public:
virtual void signal() = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/test/compile-fail/borrowck-lend-flow-match.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// xfail-pretty -- comments are infaithfully preserved
// xfail-pretty -- comments are unfaithfully preserved

#[allow(unused_variable)];
#[allow(dead_assignment)];
Expand Down
2 changes: 1 addition & 1 deletion src/test/compile-fail/borrowck-pat-reassign-binding.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// xfail-pretty -- comments are infaithfully preserved
// xfail-pretty -- comments are unfaithfully preserved

fn main() {
let mut x: Option<int> = None;
Expand Down
2 changes: 1 addition & 1 deletion src/test/compile-fail/issue-1448-2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// Regresion test for issue #1448 and #1386
// Regression test for issue #1448 and #1386

fn main() {
debug!("%u", 10i); //~ ERROR mismatched types
Expand Down
2 changes: 1 addition & 1 deletion src/test/compile-fail/issue-4935.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// Regresion test for issue #4935
// Regression test for issue #4935

fn foo(a: uint) {}
fn main() { foo(5, 6) } //~ ERROR this function takes 1 parameter but 2 parameters were supplied
2 changes: 1 addition & 1 deletion src/test/run-fail/too-much-recursion-unwinding.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// xfail-test leaks
// error-pattern:ran out of stack

// Test that the task fails after hiting the recursion limit
// Test that the task fails after hitting the recursion limit
// during unwinding

fn recurse() {
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/extern-pass-TwoU64s.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

// xfail-fast This works standalone on windows but not with check-fast.
// possibly because there is another test that uses this extern fn but gives it
// a diferent signature
// a different signature

#[deriving(Eq)]
struct TwoU64s {
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/issue-2989.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ impl methods for () {
}

// the position of this function is significant! - if it comes before methods
// then it works, if it comes after it then it doesnt!
// then it works, if it comes after it then it doesn't!
fn to_bools(bitv: Storage) -> ~[bool] {
vec::from_fn(8, |i| {
let w = i / 64;
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/while-cont.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// Issue #825: Should recheck the loop contition after continuing
// Issue #825: Should recheck the loop condition after continuing
pub fn main() {
let mut i = 1;
while i > 0 {
Expand Down