Skip to content

Commit 756b7b2

Browse files
committed
auto merge of #16180 : jbcrail/rust/fix-comments, r=steveklabnik
2 parents 147d117 + ad06dfe commit 756b7b2

File tree

22 files changed

+29
-29
lines changed

22 files changed

+29
-29
lines changed

src/compiletest/common.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ pub struct Config {
136136
// Extra parameter to run adb on arm-linux-androideabi
137137
pub adb_path: String,
138138

139-
// Extra parameter to run test sute on arm-linux-androideabi
139+
// Extra parameter to run test suite on arm-linux-androideabi
140140
pub adb_test_dir: String,
141141

142142
// status whether android device available or not

src/compiletest/runtest.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
325325
let DebuggerCommands { commands, check_lines, .. } = parse_debugger_commands(testfile, "gdb");
326326
let mut cmds = commands.connect("\n");
327327

328-
// compile test file (it shoud have 'compile-flags:-g' in the header)
328+
// compile test file (it should have 'compile-flags:-g' in the header)
329329
let compiler_run_result = compile_test(config, props, testfile);
330330
if !compiler_run_result.status.success() {
331331
fatal_proc_rec("compilation failed!", &compiler_run_result);
@@ -520,7 +520,7 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
520520

521521
let config = &mut config;
522522

523-
// compile test file (it shoud have 'compile-flags:-g' in the header)
523+
// compile test file (it should have 'compile-flags:-g' in the header)
524524
let compile_result = compile_test(config, props, testfile);
525525
if !compile_result.status.success() {
526526
fatal_proc_rec("compilation failed!", &compile_result);

src/libcollections/bitv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1532,7 +1532,7 @@ pub struct BitPositions<'a> {
15321532
next_idx: uint
15331533
}
15341534

1535-
/// An iterator combining wo `BitvSet` iterators.
1535+
/// An iterator combining two `BitvSet` iterators.
15361536
pub struct TwoBitPositions<'a> {
15371537
set: &'a BitvSet,
15381538
other: &'a BitvSet,

src/libcollections/priority_queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
//! // 10 | |
120120
//! // +---------------+
121121
//! //
122-
//! // The graph is represented as an adjecency list where each index,
122+
//! // The graph is represented as an adjacency list where each index,
123123
//! // corresponding to a node value, has a list of outgoing edges.
124124
//! // Chosen for it's efficiency.
125125
//! let graph = vec![

src/libcollections/string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ pub mod raw {
842842
/// Create a `String` from a null-terminated *u8 buffer
843843
///
844844
/// This function is unsafe because we dereference memory until we find the NUL character,
845-
/// which is not guaranteed to be present. Additionaly, the slice is not checked to see
845+
/// which is not guaranteed to be present. Additionally, the slice is not checked to see
846846
/// whether it contains valid UTF-8
847847
pub unsafe fn from_buf(buf: *const u8) -> String {
848848
let mut len = 0;

src/libcore/cell.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ pub struct UnsafeCell<T> {
449449
}
450450

451451
impl<T> UnsafeCell<T> {
452-
/// Construct a new instance of `UnsafeCell` which will wrapp the specified
452+
/// Construct a new instance of `UnsafeCell` which will wrap the specified
453453
/// value.
454454
///
455455
/// All access to the inner value through methods is `unsafe`, and it is

src/libgreen/task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ extern fn bootstrap_green_task(task: uint, code: *mut (), env: *mut ()) -> ! {
118118
// preserving a handle to the GreenTask down to this point, this
119119
// unfortunately must call `GreenTask::convert`. In order to avoid
120120
// this we could add a `terminate` function to the `Runtime` trait
121-
// in libstd, but that seems less appropriate since the coversion
121+
// in libstd, but that seems less appropriate since the conversion
122122
// method exists.
123123
GreenTask::convert(task).terminate();
124124
}

src/libnative/io/net.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ impl rtio::RtioUdpSocket for UdpSocket {
769769
// It turns out that there's this nifty MSG_DONTWAIT flag which can be passed to
770770
// send/recv, but the niftiness wears off once you realize it only works well on
771771
// linux [1] [2]. This means that it's pretty easy to get a nonblocking
772-
// operation on linux (no flag fidding, no affecting other objects), but not on
772+
// operation on linux (no flag fiddling, no affecting other objects), but not on
773773
// other platforms.
774774
//
775775
// To work around this constraint on other platforms, we end up using the

src/libnative/io/pipe_win32.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ impl UnixStream {
311311
}
312312
}
313313

314-
// An example I found on microsoft's website used 20
314+
// An example I found on Microsoft's website used 20
315315
// seconds, libuv uses 30 seconds, hence we make the
316316
// obvious choice of waiting for 25 seconds.
317317
None => {

src/librustc/metadata/loader.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//! Finds crate binaries and loads their metadata
1212
//!
1313
//! Might I be the first to welcome you to a world of platform differences,
14-
//! version requirements, dependency graphs, conficting desires, and fun! This
14+
//! version requirements, dependency graphs, conflicting desires, and fun! This
1515
//! is the major guts (along with metadata::creader) of the compiler for loading
1616
//! crates and resolving dependencies. Let's take a tour!
1717
//!
@@ -83,7 +83,7 @@
8383
//! 5. Does the target in the metadata agree with the current target?
8484
//! 6. Does the SVH match? (more on this later)
8585
//!
86-
//! If the file answeres `yes` to all these questions, then the file is
86+
//! If the file answers `yes` to all these questions, then the file is
8787
//! considered as being *candidate* for being accepted. It is illegal to have
8888
//! more than two candidates as the compiler has no method by which to resolve
8989
//! this conflict. Additionally, rlib/dylib candidates are considered
@@ -173,7 +173,7 @@
173173
//! ## Loading transitive dependencies
174174
//!
175175
//! Dealing with same-named-but-distinct crates is not just a local problem, but
176-
//! one that also needs to be dealt with for transitive dependences. Note that
176+
//! one that also needs to be dealt with for transitive dependencies. Note that
177177
//! in the letter above `--extern` flags only apply to the *local* set of
178178
//! dependencies, not the upstream transitive dependencies. Consider this
179179
//! dependency graph:
@@ -660,7 +660,7 @@ impl<'a> Context<'a> {
660660
false
661661
});
662662

663-
// Now that we have an itertor of good candidates, make sure there's at
663+
// Now that we have an iterator of good candidates, make sure there's at
664664
// most one rlib and at most one dylib.
665665
let mut rlibs = HashSet::new();
666666
let mut dylibs = HashSet::new();

0 commit comments

Comments
 (0)