auto merge of #6345 : seanmoon/rust/fix-typos, r=sanxiyn
Hi there, Really enjoying Rust. Noticed a few typos so I searched around for a few more--here's some fixes. Ran `make check` and got `summary of 24 test runs: 4868 passed; 0 failed; 330 ignored`. Thanks! Sean
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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.
|
||||
@@ -821,7 +821,7 @@ mod test {
|
||||
}
|
||||
}
|
||||
|
||||
// Reciever task
|
||||
// Receiver task
|
||||
do task::spawn || {
|
||||
// Wait for a connection
|
||||
let (conn, res_chan) = accept_port.recv();
|
||||
@@ -840,7 +840,7 @@ mod test {
|
||||
|
||||
for int::range(0, 10) |i| {
|
||||
let j = port.recv();
|
||||
debug!("receieved %?", j);
|
||||
debug!("received %?", j);
|
||||
assert!(i == j);
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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: %?",
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -227,6 +227,6 @@ mod test {
|
||||
exit_po.recv();
|
||||
};
|
||||
debug!(~"test_stress_gl_uv_global_loop_high_level_global_timer"+
|
||||
~" exiting sucessfully!");
|
||||
~" exiting successfully!");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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,
|
||||
@@ -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 {
|
||||
@@ -1377,7 +1377,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);
|
||||
|
||||
Reference in New Issue
Block a user