From b7bfe04b2d003d08f6ac450f41d7f221cb87f129 Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Tue, 2 Sep 2014 01:35:58 -0400 Subject: [PATCH] Fix spelling errors and capitalization. --- src/libcollections/lib.rs | 2 +- src/libcollections/ringbuf.rs | 2 +- src/libcollections/smallintmap.rs | 2 +- src/libcollections/str.rs | 2 +- src/libcore/char.rs | 4 ++-- src/libcore/intrinsics.rs | 2 +- src/libcore/str.rs | 8 ++++---- src/liblibc/lib.rs | 2 +- src/libnative/io/net.rs | 6 +++--- src/libnative/io/pipe_windows.rs | 2 +- src/libnative/io/process.rs | 2 +- src/libnative/io/timer_unix.rs | 4 ++-- src/libnative/io/tty_windows.rs | 2 +- src/libregex/lib.rs | 2 +- src/libregex/parse.rs | 6 +++--- src/libregex/vm.rs | 2 +- src/librustc/back/link.rs | 2 +- src/librustc/back/lto.rs | 2 +- src/librustc/middle/const_eval.rs | 2 +- src/librustc/middle/trans/base.rs | 2 +- src/librustc/middle/trans/debuginfo.rs | 2 +- src/librustc/middle/trans/expr.rs | 2 +- src/librustc/middle/ty.rs | 2 +- src/librustc/util/snapshot_vec.rs | 4 ++-- src/librustc_back/x86_64.rs | 2 +- src/librustdoc/html/render.rs | 2 +- src/librustdoc/stability_summary.rs | 2 +- src/librustrt/args.rs | 2 +- src/librustrt/c_str.rs | 2 +- src/librustrt/local_ptr.rs | 4 ++-- src/libserialize/json.rs | 2 +- src/libstd/io/mod.rs | 2 +- src/libstd/path/mod.rs | 2 +- src/libstd/rt/backtrace.rs | 6 +++--- src/libstd/rtdeps.rs | 2 +- src/libstd/time/duration.rs | 2 +- src/libsyntax/ext/format.rs | 2 +- src/libsyntax/parse/lexer/mod.rs | 2 +- src/libsyntax/print/pprust.rs | 2 +- src/libsyntax/util/parser_testing.rs | 4 ++-- src/libunicode/u_char.rs | 4 ++-- src/test/run-make/unicode-input/multiple_files.rs | 2 +- src/test/run-make/unicode-input/span_length.rs | 2 +- src/test/run-pass/no-std-xcrate2.rs | 4 ++-- src/test/run-pass/nullable-pointer-ffi-compat.rs | 2 +- src/test/run-pass/tag-align-dyn-u64.rs | 2 +- src/test/run-pass/tag-align-dyn-variants.rs | 2 +- src/test/run-pass/tag-align-u64.rs | 2 +- 48 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index 175597c77f6..834c9549733 100644 --- a/src/libcollections/lib.rs +++ b/src/libcollections/lib.rs @@ -289,7 +289,7 @@ fn is_superset(&self, other: &Self) -> bool { } /// A mutable collection of values which are distinct from one another that -/// can be mutaed. +/// can be mutated. pub trait MutableSet: Set + Mutable { /// Adds a value to the set. Returns `true` if the value was not already /// present in the set. diff --git a/src/libcollections/ringbuf.rs b/src/libcollections/ringbuf.rs index c71367265db..3665535e720 100644 --- a/src/libcollections/ringbuf.rs +++ b/src/libcollections/ringbuf.rs @@ -132,7 +132,7 @@ pub fn with_capacity(n: uint) -> RingBuf { elts: Vec::from_fn(cmp::max(MINIMUM_CAPACITY, n), |_| None)} } - /// Retrieva an element in the `RingBuf` by index. + /// Retrieve an element in the `RingBuf` by index. /// /// Fails if there is no element with the given index. /// diff --git a/src/libcollections/smallintmap.rs b/src/libcollections/smallintmap.rs index b3b3bb1ea22..dd3a639aeac 100644 --- a/src/libcollections/smallintmap.rs +++ b/src/libcollections/smallintmap.rs @@ -324,7 +324,7 @@ impl SmallIntMap { /// Updates a value in the map. If the key already exists in the map, /// modifies the value with `ff` taking `oldval, newval`. /// Otherwise, sets the value to `newval`. - /// Returasn `true` if the key did not already exist in the map. + /// Returns `true` if the key did not already exist in the map. /// /// # Example /// diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index c13695e2b84..88c683ef44e 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -44,7 +44,7 @@ //! //! # Representation //! -//! Rust's string type, `str`, is a sequence of unicode scalar values encoded as a +//! Rust's string type, `str`, is a sequence of Unicode scalar values encoded as a //! stream of UTF-8 bytes. All strings are guaranteed to be validly encoded UTF-8 //! sequences. Additionally, strings are not null-terminated and can contain null //! bytes. diff --git a/src/libcore/char.rs b/src/libcore/char.rs index 95267a8f9e5..c870f1b8f70 100644 --- a/src/libcore/char.rs +++ b/src/libcore/char.rs @@ -201,7 +201,7 @@ pub fn escape_unicode(c: char, f: |char|) { /// - Tab, CR and LF are escaped as '\t', '\r' and '\n' respectively. /// - Single-quote, double-quote and backslash chars are backslash-escaped. /// - Any other chars in the range [0x20,0x7e] are not escaped. -/// - Any other chars are given hex unicode escapes; see `escape_unicode`. +/// - Any other chars are given hex Unicode escapes; see `escape_unicode`. /// pub fn escape_default(c: char, f: |char|) { match c { @@ -290,7 +290,7 @@ pub trait Char { /// * Single-quote, double-quote and backslash chars are backslash- /// escaped. /// * Any other chars in the range [0x20,0x7e] are not escaped. - /// * Any other chars are given hex unicode escapes; see `escape_unicode`. + /// * Any other chars are given hex Unicode escapes; see `escape_unicode`. fn escape_default(&self, f: |char|); /// Returns the amount of bytes this character would need if encoded in diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs index 9636ce6a736..a3d63bbe06c 100644 --- a/src/libcore/intrinsics.rs +++ b/src/libcore/intrinsics.rs @@ -311,7 +311,7 @@ fn visit_leave_fn(&mut self, purity: uint, proto: uint, /// Gives the address for the return value of the enclosing function. /// - /// Using this instrinsic in a function that does not use an out pointer + /// Using this intrinsic in a function that does not use an out pointer /// will trigger a compiler error. pub fn return_address() -> *const u8; diff --git a/src/libcore/str.rs b/src/libcore/str.rs index b067e6299ee..d6f35b0dcc6 100644 --- a/src/libcore/str.rs +++ b/src/libcore/str.rs @@ -1128,7 +1128,7 @@ pub trait StrSlice<'a> { fn contains_char(&self, needle: char) -> bool; /// An iterator over the characters of `self`. Note, this iterates - /// over unicode code-points, not unicode graphemes. + /// over Unicode code-points, not Unicode graphemes. /// /// # Example /// @@ -1505,7 +1505,7 @@ pub trait StrSlice<'a> { /// Pluck a character out of a string and return the index of the next /// character. /// - /// This function can be used to iterate over the unicode characters of a + /// This function can be used to iterate over the Unicode characters of a /// string. /// /// # Example @@ -1549,7 +1549,7 @@ pub trait StrSlice<'a> { /// # Return value /// /// A record {ch: char, next: uint} containing the char value and the byte - /// index of the next unicode character. + /// index of the next Unicode character. /// /// # Failure /// @@ -1559,7 +1559,7 @@ pub trait StrSlice<'a> { /// Given a byte position and a str, return the previous char and its position. /// - /// This function can be used to iterate over a unicode string in reverse. + /// This function can be used to iterate over a Unicode string in reverse. /// /// Returns 0 for next index if called on start index 0. /// diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index 52e5de24931..c64bfb93af3 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -65,7 +65,7 @@ * definitions common-to-all (held in modules named c95, c99, posix88, posix01 * and posix08) and definitions that appear only on *some* platforms (named * 'extra'). This would be things like significant OSX foundation kit, or Windows -* library kernel32.dll, or various fancy glibc, linux or BSD extensions. +* library kernel32.dll, or various fancy glibc, Linux or BSD extensions. * * In addition to the per-platform 'extra' modules, we define a module of * 'common BSD' libc routines that never quite made it into POSIX but show up diff --git a/src/libnative/io/net.rs b/src/libnative/io/net.rs index 368b5914444..cbfc673e6af 100644 --- a/src/libnative/io/net.rs +++ b/src/libnative/io/net.rs @@ -901,8 +901,8 @@ fn set_write_timeout(&mut self, timeout: Option) { // // It turns out that there's this nifty MSG_DONTWAIT flag which can be passed to // send/recv, but the niftiness wears off once you realize it only works well on -// linux [1] [2]. This means that it's pretty easy to get a nonblocking -// operation on linux (no flag fiddling, no affecting other objects), but not on +// Linux [1] [2]. This means that it's pretty easy to get a nonblocking +// operation on Linux (no flag fiddling, no affecting other objects), but not on // other platforms. // // To work around this constraint on other platforms, we end up using the @@ -922,7 +922,7 @@ fn set_write_timeout(&mut self, timeout: Option) { // operations performed in the lock are *nonblocking* to avoid holding the mutex // forever. // -// So, in summary, linux uses MSG_DONTWAIT and doesn't need mutexes, everyone +// So, in summary, Linux uses MSG_DONTWAIT and doesn't need mutexes, everyone // else uses O_NONBLOCK and mutexes with some trickery to make sure blocking // reads/writes are still blocking. // diff --git a/src/libnative/io/pipe_windows.rs b/src/libnative/io/pipe_windows.rs index 95afa11f4a9..1f1880d712d 100644 --- a/src/libnative/io/pipe_windows.rs +++ b/src/libnative/io/pipe_windows.rs @@ -655,7 +655,7 @@ pub fn native_accept(&mut self) -> IoResult { // using the original server pipe. let handle = self.listener.handle; - // If we've had an artifical call to close_accept, be sure to never + // If we've had an artificial call to close_accept, be sure to never // proceed in accepting new clients in the future if self.inner.closed.load(atomic::SeqCst) { return Err(util::eof()) } diff --git a/src/libnative/io/process.rs b/src/libnative/io/process.rs index 0cc7158bb5d..cad2ed0b97e 100644 --- a/src/libnative/io/process.rs +++ b/src/libnative/io/process.rs @@ -151,7 +151,7 @@ fn kill(&mut self, signum: int) -> IoResult<()> { #[cfg(unix)] use libc::EINVAL as ERROR; #[cfg(windows)] use libc::ERROR_NOTHING_TO_TERMINATE as ERROR; - // On linux (and possibly other unices), a process that has exited will + // On Linux (and possibly other unices), a process that has exited will // continue to accept signals because it is "defunct". The delivery of // signals will only fail once the child has been reaped. For this // reason, if the process hasn't exited yet, then we attempt to collect diff --git a/src/libnative/io/timer_unix.rs b/src/libnative/io/timer_unix.rs index 06b78a54e53..801434f8101 100644 --- a/src/libnative/io/timer_unix.rs +++ b/src/libnative/io/timer_unix.rs @@ -8,12 +8,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -//! Timers for non-linux/non-windows OSes +//! Timers for non-Linux/non-Windows OSes //! //! This module implements timers with a worker thread, select(), and a lot of //! witchcraft that turns out to be horribly inaccurate timers. The unfortunate //! part is that I'm at a loss of what else to do one these OSes. This is also -//! why linux has a specialized timerfd implementation and windows has its own +//! why Linux has a specialized timerfd implementation and windows has its own //! implementation (they're more accurate than this one). //! //! The basic idea is that there is a worker thread that's communicated to via a diff --git a/src/libnative/io/tty_windows.rs b/src/libnative/io/tty_windows.rs index e98fe1e20b1..7f344279cd5 100644 --- a/src/libnative/io/tty_windows.rs +++ b/src/libnative/io/tty_windows.rs @@ -15,7 +15,7 @@ //! This module contains the implementation of a Windows specific console TTY. //! Also converts between UTF-16 and UTF-8. Windows has very poor support for //! UTF-8 and some functions will fail. In particular ReadFile and ReadConsole -//! will fail when the codepage is set to UTF-8 and a unicode character is +//! will fail when the codepage is set to UTF-8 and a Unicode character is //! entered. //! //! FIXME diff --git a/src/libregex/lib.rs b/src/libregex/lib.rs index 1d25a0c31d8..9f15d0a4708 100644 --- a/src/libregex/lib.rs +++ b/src/libregex/lib.rs @@ -381,7 +381,7 @@ #[cfg(test)] extern crate regex; -// unicode tables for character classes are defined in libunicode +// Unicode tables for character classes are defined in libunicode extern crate unicode; pub use parse::Error; diff --git a/src/libregex/parse.rs b/src/libregex/parse.rs index 13b094a2cf2..c3ce7bbd9f2 100644 --- a/src/libregex/parse.rs +++ b/src/libregex/parse.rs @@ -620,9 +620,9 @@ fn parse_escape(&mut self) -> Result { } } - // Parses a unicode character class name, either of the form \pF where - // F is a one letter unicode class name or of the form \p{name} where - // name is the unicode class name. + // Parses a Unicode character class name, either of the form \pF where + // F is a one letter Unicode class name or of the form \p{name} where + // name is the Unicode class name. // Assumes that \p or \P has been read (and 'p' or 'P' is the current // character). fn parse_unicode_name(&mut self) -> Result { diff --git a/src/libregex/vm.rs b/src/libregex/vm.rs index 507a7641f22..1adaf9c92a6 100644 --- a/src/libregex/vm.rs +++ b/src/libregex/vm.rs @@ -364,7 +364,7 @@ pub fn new(input: &'t str) -> CharReader<'t> { } /// Sets the previous and current character given any arbitrary byte - /// index (at a unicode codepoint boundary). + /// index (at a Unicode codepoint boundary). #[inline] pub fn set(&mut self, ic: uint) -> uint { self.prev = None; diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 2877442e42b..4e4a28cc538 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -1748,7 +1748,7 @@ fn add_static_crate(cmd: &mut Command, sess: &Session, tmpdir: &Path, // // We must continue to link to the upstream archives to be sure // to pull in native static dependencies. As the final caveat, - // on linux it is apparently illegal to link to a blank archive, + // on Linux it is apparently illegal to link to a blank archive, // so if an archive no longer has any object files in it after // we remove `lib.o`, then don't link against it at all. // diff --git a/src/librustc/back/lto.rs b/src/librustc/back/lto.rs index 4212513f56a..6c6a07f3502 100644 --- a/src/librustc/back/lto.rs +++ b/src/librustc/back/lto.rs @@ -162,7 +162,7 @@ pub fn run(sess: &session::Session, llmod: ModuleRef, "verify".with_c_str(|s| llvm::LLVMRustAddPass(pm, s)); - time(sess.time_passes(), "LTO pases", (), |()| + time(sess.time_passes(), "LTO passes", (), |()| llvm::LLVMRunPassManager(pm, llmod)); llvm::LLVMDisposePassManager(pm); diff --git a/src/librustc/middle/const_eval.rs b/src/librustc/middle/const_eval.rs index 03a7021b70d..2a00724cafb 100644 --- a/src/librustc/middle/const_eval.rs +++ b/src/librustc/middle/const_eval.rs @@ -56,7 +56,7 @@ // copies of general constants // // (in theory, probably not at first: if/match on integer-const -// conditions / descriminants) +// conditions / discriminants) // // - Non-constants: everything else. // diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs index 7c0a332ce43..5bad46e5b7c 100644 --- a/src/librustc/middle/trans/base.rs +++ b/src/librustc/middle/trans/base.rs @@ -1068,7 +1068,7 @@ pub fn load_ty(cx: &Block, ptr: ValueRef, t: ty::t) -> ValueRef { } else if ty::type_is_bool(t) { Trunc(cx, LoadRangeAssert(cx, ptr, 0, 2, llvm::False), Type::i1(cx.ccx())) } else if ty::type_is_char(t) { - // a char is a unicode codepoint, and so takes values from 0 + // a char is a Unicode codepoint, and so takes values from 0 // to 0x10FFFF inclusive only. LoadRangeAssert(cx, ptr, 0, 0x10FFFF + 1, llvm::False) } else { diff --git a/src/librustc/middle/trans/debuginfo.rs b/src/librustc/middle/trans/debuginfo.rs index 62cd38c1e90..8403e84f7b6 100644 --- a/src/librustc/middle/trans/debuginfo.rs +++ b/src/librustc/middle/trans/debuginfo.rs @@ -740,7 +740,7 @@ pub fn finalize(cx: &CrateContext) { "Dwarf Version".with_c_str( |s| llvm::LLVMRustAddModuleFlag(cx.llmod, s, 2)); } else { - // FIXME(#13611) this is a kludge fix because the linux bots have + // FIXME(#13611) this is a kludge fix because the Linux bots have // gdb 7.4 which doesn't understand dwarf4, we should // do something more graceful here. "Dwarf Version".with_c_str( diff --git a/src/librustc/middle/trans/expr.rs b/src/librustc/middle/trans/expr.rs index 53e2da6ac0f..4fe687da4b1 100644 --- a/src/librustc/middle/trans/expr.rs +++ b/src/librustc/middle/trans/expr.rs @@ -1386,7 +1386,7 @@ pub fn trans_adt<'a>(mut bcx: &'a Block<'a>, } } - // Now, we just overwrite the fields we've explicity specified + // Now, we just overwrite the fields we've explicitly specified for &(i, ref e) in fields.iter() { let dest = adt::trans_field_ptr(bcx, &*repr, addr, discr, i); let e_ty = expr_ty_adjusted(bcx, &**e); diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index de598fcc671..72f6338f4c9 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -903,7 +903,7 @@ pub enum sty { /// Substs here, possibly against intuition, *may* contain `ty_param`s. /// That is, even after substitution it is possible that there are type /// variables. This happens when the `ty_enum` corresponds to an enum - /// definition and not a concerete use of it. To get the correct `ty_enum` + /// definition and not a concrete use of it. To get the correct `ty_enum` /// from the tcx, use the `NodeId` from the `ast::Ty` and look it up in /// the `ast_ty_to_ty_cache`. This is probably true for `ty_struct` as /// well.` diff --git a/src/librustc/util/snapshot_vec.rs b/src/librustc/util/snapshot_vec.rs index 60e50c84c61..03e1559cba2 100644 --- a/src/librustc/util/snapshot_vec.rs +++ b/src/librustc/util/snapshot_vec.rs @@ -148,12 +148,12 @@ pub fn rollback_to(&mut self, snapshot: Snapshot) { match self.undo_log.pop().unwrap() { OpenSnapshot => { // This indicates a failure to obey the stack discipline. - fail!("Cannot rollback an uncommited snapshot"); + fail!("Cannot rollback an uncommitted snapshot"); } CommittedSnapshot => { // This occurs when there are nested snapshots and - // the inner is commited but outer is rolled back. + // the inner is committed but outer is rolled back. } NewElem(i) => { diff --git a/src/librustc_back/x86_64.rs b/src/librustc_back/x86_64.rs index 43c4d646ec9..88cd6743192 100644 --- a/src/librustc_back/x86_64.rs +++ b/src/librustc_back/x86_64.rs @@ -30,7 +30,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs } abi::OsWindows => { - // FIXME: Test this. Copied from linux (#2398) + // FIXME: Test this. Copied from Linux (#2398) "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\ s0:64:64-f80:128:128-n8:16:32:64-S128".to_string() diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index fc8fd0d086b..74ea5af0f1c 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -1155,7 +1155,7 @@ fn render(w: io::File, cx: &Context, it: &clean::Item, // We have a huge number of calls to write, so try to alleviate some // of the pain by using a buffered writer instead of invoking the - // write sycall all the time. + // write syscall all the time. let mut writer = BufferedWriter::new(w); if !cx.render_redirect_pages { try!(layout::render(&mut writer, &cx.layout, &page, diff --git a/src/librustdoc/stability_summary.rs b/src/librustdoc/stability_summary.rs index bbcf38f4955..11d00fa20a4 100644 --- a/src/librustdoc/stability_summary.rs +++ b/src/librustdoc/stability_summary.rs @@ -11,7 +11,7 @@ //! This module crawls a `clean::Crate` and produces a summarization of the //! stability levels within the crate. The summary contains the module //! hierarchy, with item counts for every stability level per module. A parent -//! module's count includes its childrens's. +//! module's count includes its children's. use std::ops::Add; use std::num::Zero; diff --git a/src/librustrt/args.rs b/src/librustrt/args.rs index 6ac36f8b856..4c444036e1d 100644 --- a/src/librustrt/args.rs +++ b/src/librustrt/args.rs @@ -14,7 +14,7 @@ //! the processes `argc` and `argv` arguments to be stored //! in a globally-accessible location for use by the `os` module. //! -//! Only valid to call on linux. Mac and Windows use syscalls to +//! Only valid to call on Linux. Mac and Windows use syscalls to //! discover the command line arguments. //! //! FIXME #7756: Would be nice for this to not exist. diff --git a/src/librustrt/c_str.rs b/src/librustrt/c_str.rs index d68fef30622..000def0cc3b 100644 --- a/src/librustrt/c_str.rs +++ b/src/librustrt/c_str.rs @@ -19,7 +19,7 @@ The other problem with translating Rust strings to C strings is that Rust strings can validly contain a null-byte in the middle of the string (0 is a -valid unicode codepoint). This means that not all Rust strings can actually be +valid Unicode codepoint). This means that not all Rust strings can actually be translated to C strings. # Creation of a C string diff --git a/src/librustrt/local_ptr.rs b/src/librustrt/local_ptr.rs index ef56cd3b1da..8ce12a5157d 100644 --- a/src/librustrt/local_ptr.rs +++ b/src/librustrt/local_ptr.rs @@ -107,10 +107,10 @@ pub unsafe fn cleanup() {} // efficient sequence of instructions. This also involves dealing with fun // stuff in object files and whatnot. Regardless, it turns out this causes // trouble with green threads and lots of optimizations turned on. The - // following case study was done on linux x86_64, but I would imagine that + // following case study was done on Linux x86_64, but I would imagine that // other platforms are similar. // - // On linux, the instruction sequence for loading the tls pointer global + // On Linux, the instruction sequence for loading the tls pointer global // looks like: // // mov %fs:0x0, %rax diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index b37b4588af6..b29200597aa 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -278,7 +278,7 @@ pub fn error_str(error: ErrorCode) -> &'static str { UnrecognizedHex => "invalid \\u escape (unrecognized hex)", NotFourDigit => "invalid \\u escape (not four digits)", NotUtf8 => "contents not utf-8", - InvalidUnicodeCodePoint => "invalid unicode code point", + InvalidUnicodeCodePoint => "invalid Unicode code point", LoneLeadingSurrogateInHexEscape => "lone leading surrogate in hex escape", UnexpectedEndOfHexEscape => "unexpected end of hex escape", } diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 905012b7bf3..cb0adaadfe8 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1418,7 +1418,7 @@ pub trait Buffer: Reader { fn consume(&mut self, amt: uint); /// Reads the next line of input, interpreted as a sequence of UTF-8 - /// encoded unicode codepoints. If a newline is encountered, then the + /// encoded Unicode codepoints. If a newline is encountered, then the /// newline is contained in the returned string. /// /// # Example diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 86036c2a2dc..5a5068f4d01 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -841,7 +841,7 @@ impl<'a, P: GenericPath> Display<'a, P> { /// Returns the path as a possibly-owned string. /// /// If the path is not UTF-8, invalid sequences will be replaced with the - /// unicode replacement char. This involves allocation. + /// Unicode replacement char. This involves allocation. #[inline] pub fn as_maybe_owned(&self) -> MaybeOwned<'a> { String::from_utf8_lossy(if self.filename { diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs index cf99efd24e6..c28b6c144a2 100644 --- a/src/libstd/rt/backtrace.rs +++ b/src/libstd/rt/backtrace.rs @@ -138,7 +138,7 @@ macro_rules! demangle( "$RP$" => ")", "$C$" => ",", - // in theory we can demangle any unicode code point, but + // in theory we can demangle any Unicode code point, but // for simplicity we just catch the common ones. "$x20" => " ", "$x27" => "'", @@ -461,7 +461,7 @@ fn backtrace_syminfo(state: *mut backtrace_state, // // An additionally oddity in this function is that we initialize the // filename via self_exe_name() to pass to libbacktrace. It turns out - // that on linux libbacktrace seamlessly gets the filename of the + // that on Linux libbacktrace seamlessly gets the filename of the // current executable, but this fails on freebsd. by always providing // it, we make sure that libbacktrace never has a reason to not look up // the symbols. The libbacktrace API also states that the filename must @@ -631,7 +631,7 @@ fn _Unwind_VRS_Get(ctx: *mut _Unwind_Context, (val & !1) as libc::uintptr_t } - // This function also doesn't exist on android or arm/linux, so make it + // This function also doesn't exist on Android or ARM/Linux, so make it // a no-op #[cfg(target_os = "android")] #[cfg(target_os = "linux", target_arch = "arm")] diff --git a/src/libstd/rtdeps.rs b/src/libstd/rtdeps.rs index 4267d6020b2..35a87137115 100644 --- a/src/libstd/rtdeps.rs +++ b/src/libstd/rtdeps.rs @@ -22,7 +22,7 @@ // LLVM implements the `frem` instruction as a call to `fmod`, which lives in // libm. Hence, we must explicitly link to it. // -// On linux librt and libdl are indirect dependencies via rustrt, +// On Linux, librt and libdl are indirect dependencies via rustrt, // and binutils 2.22+ won't add them automatically #[cfg(target_os = "linux")] #[link(name = "dl")] diff --git a/src/libstd/time/duration.rs b/src/libstd/time/duration.rs index 17dba9af9e7..85aed47265f 100644 --- a/src/libstd/time/duration.rs +++ b/src/libstd/time/duration.rs @@ -21,7 +21,7 @@ /// The number of nanoseconds in a microsecond. static NANOS_PER_MICRO: i32 = 1000; -/// The number of nanosecdons in a millisecond. +/// The number of nanoseconds in a millisecond. static NANOS_PER_MILLI: i32 = 1000_000; /// The number of nanoseconds in seconds. static NANOS_PER_SEC: i32 = 1_000_000_000; diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index 0994abaadc7..3c6cf54a6cf 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -501,7 +501,7 @@ fn to_expr(&self, invocation: Invocation) -> Gc { // Right now there is a bug such that for the expression: // foo(bar(&1)) // the lifetime of `1` doesn't outlast the call to `bar`, so it's not - // vald for the call to `foo`. To work around this all arguments to the + // valid for the call to `foo`. To work around this all arguments to the // format! string are shoved into locals. Furthermore, we shove the address // of each variable because we don't want to move out of the arguments // passed to this function. diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 17249628989..da43f08a4e5 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -1114,7 +1114,7 @@ fn next_token_inner(&mut self) -> token::Token { self.bump(); valid &= self.scan_char_or_byte(ch_start, ch, /* ascii_only = */ false, '"'); } - // adjust for the ACSII " at the start of the literal + // adjust for the ASCII " at the start of the literal let id = if valid { self.name_from(start_bpos + BytePos(1)) } else { token::intern("??") }; self.bump(); diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index afea9e01de9..d5bc1bfe956 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -180,7 +180,7 @@ pub fn to_string(f: |&mut State| -> IoResult<()>) -> String { // FIXME (Issue #16472): the thing_to_string_impls macro should go away // after we revise the syntax::ext::quote::ToToken impls to go directly -// to token-trees instea of thing -> string -> token-trees. +// to token-trees instead of thing -> string -> token-trees. macro_rules! thing_to_string_impls { ($to_string:ident) => { diff --git a/src/libsyntax/util/parser_testing.rs b/src/libsyntax/util/parser_testing.rs index f50739a7069..7b96cf3c60d 100644 --- a/src/libsyntax/util/parser_testing.rs +++ b/src/libsyntax/util/parser_testing.rs @@ -81,9 +81,9 @@ pub fn strs_to_idents(ids: Vec<&str> ) -> Vec { /// Does the given string match the pattern? whitespace in the first string /// may be deleted or replaced with other whitespace to match the pattern. -/// this function is unicode-ignorant; fortunately, the careful design of +/// this function is Unicode-ignorant; fortunately, the careful design of /// UTF-8 mitigates this ignorance. In particular, this function only collapses -/// sequences of \n, \r, ' ', and \t, but it should otherwise tolerate unicode +/// sequences of \n, \r, ' ', and \t, but it should otherwise tolerate Unicode /// chars. Unsurprisingly, it doesn't do NKF-normalization(?). pub fn matches_codepattern(a : &str, b : &str) -> bool { let mut idx_a = 0; diff --git a/src/libunicode/u_char.rs b/src/libunicode/u_char.rs index 91e7589b8ca..d8665143854 100644 --- a/src/libunicode/u_char.rs +++ b/src/libunicode/u_char.rs @@ -120,7 +120,7 @@ pub fn is_digit(c: char) -> bool { /// Convert a char to its uppercase equivalent /// /// The case-folding performed is the common or simple mapping: -/// it maps one unicode codepoint (one char in Rust) to its uppercase equivalent according +/// it maps one Unicode codepoint (one char in Rust) to its uppercase equivalent according /// to the Unicode database at ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt /// The additional SpecialCasing.txt is not considered here, as it expands to multiple /// codepoints in some cases. @@ -233,7 +233,7 @@ pub trait UnicodeChar { /// Converts a character to its uppercase equivalent. /// /// The case-folding performed is the common or simple mapping: it maps - /// one unicode codepoint (one character in Rust) to its uppercase + /// one Unicode codepoint (one character in Rust) to its uppercase /// equivalent according to the Unicode database [1]. The additional /// `SpecialCasing.txt` is not considered here, as it expands to multiple /// codepoints in some cases. diff --git a/src/test/run-make/unicode-input/multiple_files.rs b/src/test/run-make/unicode-input/multiple_files.rs index 31802dd9f06..7c6d97dd5a3 100644 --- a/src/test/run-make/unicode-input/multiple_files.rs +++ b/src/test/run-make/unicode-input/multiple_files.rs @@ -20,7 +20,7 @@ fn random_char() -> char { let mut rng = task_rng(); - // a subset of the XID_start unicode table (ensuring that the + // a subset of the XID_start Unicode table (ensuring that the // compiler doesn't fail with an "unrecognised token" error) let (lo, hi): (u32, u32) = match rng.gen_range(1u32, 4u32 + 1) { 1 => (0x41, 0x5a), diff --git a/src/test/run-make/unicode-input/span_length.rs b/src/test/run-make/unicode-input/span_length.rs index 913f1318ebf..e213e266548 100644 --- a/src/test/run-make/unicode-input/span_length.rs +++ b/src/test/run-make/unicode-input/span_length.rs @@ -19,7 +19,7 @@ fn random_char() -> char { let mut rng = task_rng(); - // a subset of the XID_start unicode table (ensuring that the + // a subset of the XID_start Unicode table (ensuring that the // compiler doesn't fail with an "unrecognised token" error) let (lo, hi): (u32, u32) = match rng.gen_range(1u32, 4u32 + 1) { 1 => (0x41, 0x5a), diff --git a/src/test/run-pass/no-std-xcrate2.rs b/src/test/run-pass/no-std-xcrate2.rs index b19541a0b1a..dcafb5f451f 100644 --- a/src/test/run-pass/no-std-xcrate2.rs +++ b/src/test/run-pass/no-std-xcrate2.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-test: this has weird linking problems on linux, and it probably needs a +// ignore-test: this has weird linking problems on Linux, and it probably needs a // solution along the lines of disabling segmented stacks and/or the // stack checks. // aux-build:no_std_crate.rs @@ -20,7 +20,7 @@ extern crate no_std_crate; -// This is an unfortunate thing to have to do on linux :( +// This is an unfortunate thing to have to do on Linux :( #[cfg(target_os = "linux")] #[doc(hidden)] pub mod linkhack { diff --git a/src/test/run-pass/nullable-pointer-ffi-compat.rs b/src/test/run-pass/nullable-pointer-ffi-compat.rs index 548a16bd120..b5c541b0c63 100644 --- a/src/test/run-pass/nullable-pointer-ffi-compat.rs +++ b/src/test/run-pass/nullable-pointer-ffi-compat.rs @@ -9,7 +9,7 @@ // except according to those terms. // #11303, #11040: -// This would previously crash on i686 linux due to abi differences +// This would previously crash on i686 Linux due to abi differences // between returning an Option and T, where T is a non nullable // pointer. // If we have an enum with two variants such that one is zero sized diff --git a/src/test/run-pass/tag-align-dyn-u64.rs b/src/test/run-pass/tag-align-dyn-u64.rs index a260ad66ce2..0fc20ef66b3 100644 --- a/src/test/run-pass/tag-align-dyn-u64.rs +++ b/src/test/run-pass/tag-align-dyn-u64.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-linux #7340 fails on 32-bit linux +// ignore-linux #7340 fails on 32-bit Linux // ignore-macos #7340 fails on 32-bit macos use std::mem; diff --git a/src/test/run-pass/tag-align-dyn-variants.rs b/src/test/run-pass/tag-align-dyn-variants.rs index 1e22f0f3dee..130c2c5e2e3 100644 --- a/src/test/run-pass/tag-align-dyn-variants.rs +++ b/src/test/run-pass/tag-align-dyn-variants.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-linux #7340 fails on 32-bit linux +// ignore-linux #7340 fails on 32-bit Linux // ignore-macos #7340 fails on 32-bit macos use std::mem; diff --git a/src/test/run-pass/tag-align-u64.rs b/src/test/run-pass/tag-align-u64.rs index f3996065936..8942e0b6b5d 100644 --- a/src/test/run-pass/tag-align-u64.rs +++ b/src/test/run-pass/tag-align-u64.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-linux #7340 fails on 32-bit linux +// ignore-linux #7340 fails on 32-bit Linux // ignore-macos #7340 fails on 32-bit macos use std::mem;