From 809f13ea9441d972b5777a9c8bf837add9484a45 Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Mon, 21 Apr 2014 00:49:39 -0400 Subject: [PATCH] Fix misspellings in comments. --- src/libcollections/btree.rs | 4 ++-- src/libcollections/hashmap.rs | 8 ++++---- src/libcollections/treemap.rs | 2 +- src/libcollections/trie.rs | 2 +- src/libnum/lib.rs | 2 +- src/librustc/back/link.rs | 6 +++--- src/librustc/back/svh.rs | 2 +- src/librustc/metadata/loader.rs | 4 ++-- src/librustc/middle/dead.rs | 2 +- src/librustc/middle/liveness.rs | 4 ++-- src/librustc/middle/privacy.rs | 6 +++--- src/librustc/middle/region.rs | 6 +++--- src/librustc/middle/resolve.rs | 4 ++-- src/librustc/middle/subst.rs | 2 +- src/librustc/middle/trans/_match.rs | 2 +- src/librustc/middle/trans/callee.rs | 2 +- src/librustc/middle/trans/closure.rs | 2 +- src/librustc/middle/trans/debuginfo.rs | 2 +- src/librustc/middle/trans/monomorphize.rs | 2 +- src/librustc/middle/ty.rs | 2 +- src/librustc/middle/typeck/check/mod.rs | 4 ++-- src/librustc/middle/typeck/infer/resolve.rs | 2 +- src/librustc/util/sha2.rs | 4 ++-- src/libstd/cmp.rs | 4 ++-- src/libstd/iter.rs | 2 +- src/libstd/macros.rs | 2 +- src/libstd/ptr.rs | 2 +- src/libstd/raw.rs | 2 +- src/libstd/result.rs | 4 ++-- src/libstd/rt/local_ptr.rs | 2 +- src/libstd/str.rs | 6 +++--- src/libstd/strbuf.rs | 2 +- src/libstd/vec.rs | 4 ++-- 33 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/libcollections/btree.rs b/src/libcollections/btree.rs index a258cf8b175ed..b6dc790ea88a0 100644 --- a/src/libcollections/btree.rs +++ b/src/libcollections/btree.rs @@ -659,13 +659,13 @@ impl fmt::Show for Branch { } } -//A LeafElt containts no left child, but a key-value pair. +//A LeafElt contains no left child, but a key-value pair. struct LeafElt { key: K, value: V } -//A BranchElt has a left child in insertition to a key-value pair. +//A BranchElt has a left child in insertion to a key-value pair. struct BranchElt { left: ~Node, key: K, diff --git a/src/libcollections/hashmap.rs b/src/libcollections/hashmap.rs index 03b486e628c20..c3a36dc935945 100644 --- a/src/libcollections/hashmap.rs +++ b/src/libcollections/hashmap.rs @@ -587,7 +587,7 @@ static INITIAL_LOAD_FACTOR: Fraction = (9, 10); // // > Why a load factor of 90%? // -// In general, all the distances to inital buckets will converge on the mean. +// In general, all the distances to initial buckets will converge on the mean. // At a load factor of α, the odds of finding the target bucket after k // probes is approximately 1-α^k. If we set this equal to 50% (since we converge // on the mean) and set k=8 (64-byte cache line / 8-byte hash), α=0.92. I round @@ -600,7 +600,7 @@ static INITIAL_LOAD_FACTOR: Fraction = (9, 10); // > Wait, what? Where did you get 1-α^k from? // // On the first probe, your odds of a collision with an existing element is α. -// The odds of doing this twice in a row is approximatelly α^2. For three times, +// The odds of doing this twice in a row is approximately α^2. For three times, // α^3, etc. Therefore, the odds of colliding k times is α^k. The odds of NOT // colliding after k tries is 1-α^k. // @@ -681,7 +681,7 @@ static INITIAL_LOAD_FACTOR: Fraction = (9, 10); /// let mut book_reviews = HashMap::new(); /// /// // review some books. -/// book_reviews.insert("Adventures of Hucklebury Fin", "My favorite book."); +/// book_reviews.insert("Adventures of Huckleberry Finn", "My favorite book."); /// book_reviews.insert("Grimms' Fairy Tales", "Masterpiece."); /// book_reviews.insert("Pride and Prejudice", "Very enjoyable."); /// book_reviews.insert("The Adventures of Sherlock Holmes", "Eye lyked it alot."); @@ -771,7 +771,7 @@ impl, V, S, H: Hasher> HashMap { /// from its 'ideal' location. /// /// In the cited blog posts above, this is called the "distance to - /// inital bucket", or DIB. + /// initial bucket", or DIB. fn bucket_distance(&self, index_of_elem: &table::FullIndex) -> uint { // where the hash of the element that happens to reside at // `index_of_elem` tried to place itself first. diff --git a/src/libcollections/treemap.rs b/src/libcollections/treemap.rs index 3db12b5a538cb..dc8e64ed86b50 100644 --- a/src/libcollections/treemap.rs +++ b/src/libcollections/treemap.rs @@ -308,7 +308,7 @@ pub struct RevMutEntries<'a, K, V> { // (with many different `x`) below, so we need to optionally pass mut // as a tt, but the only thing we can do with a `tt` is pass them to // other macros, so this takes the `& ` token -// sequence and forces their evalutation as an expression. +// sequence and forces their evaluation as an expression. macro_rules! addr { ($e:expr) => { $e }} // putting an optional mut into type signatures macro_rules! item { ($i:item) => { $i }} diff --git a/src/libcollections/trie.rs b/src/libcollections/trie.rs index e831b394b9c23..e040bb0a9e5a2 100644 --- a/src/libcollections/trie.rs +++ b/src/libcollections/trie.rs @@ -141,7 +141,7 @@ impl TrieMap { // (with many different `x`) below, so we need to optionally pass mut // as a tt, but the only thing we can do with a `tt` is pass them to // other macros, so this takes the `& ` token -// sequence and forces their evalutation as an expression. (see also +// sequence and forces their evaluation as an expression. (see also // `item!` below.) macro_rules! addr { ($e:expr) => { $e } } diff --git a/src/libnum/lib.rs b/src/libnum/lib.rs index 986ba9e9a5c14..e68c5f227289a 100644 --- a/src/libnum/lib.rs +++ b/src/libnum/lib.rs @@ -171,7 +171,7 @@ macro_rules! impl_integer_for_int { /// `other`. #[inline] fn lcm(&self, other: &$T) -> $T { - // should not have to recaluculate abs + // should not have to recalculate abs ((*self * *other) / self.gcd(other)).abs() } diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 9211827e6a691..9fd3894d7948e 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -1171,7 +1171,7 @@ fn link_args(sess: &Session, // actually creates "invalid" objects [1] [2], but only for some // introspection tools, not in terms of whether it can be loaded. // - // Long story shory, passing this flag forces the linker to *not* + // Long story short, passing this flag forces the linker to *not* // truncate section names (so we can find the metadata section after // it's compiled). The real kicker is that rust compiled just fine on // windows for quite a long time *without* this flag, so I have no idea @@ -1491,7 +1491,7 @@ fn add_upstream_rust_crates(args: &mut Vec<~str>, sess: &Session, } // Link in all of our upstream crates' native dependencies. Remember that -// all of these upstream native depenencies are all non-static +// all of these upstream native dependencies are all non-static // dependencies. We've got two cases then: // // 1. The upstream crate is an rlib. In this case we *must* link in the @@ -1509,7 +1509,7 @@ fn add_upstream_rust_crates(args: &mut Vec<~str>, sess: &Session, // be instantiated in the target crate, meaning that the native symbol must // also be resolved in the target crate. fn add_upstream_native_libraries(args: &mut Vec<~str>, sess: &Session) { - // Be sure to use a topological sorting of crates becuase there may be + // Be sure to use a topological sorting of crates because there may be // interdependencies between native libraries. When passing -nodefaultlibs, // for example, almost all native libraries depend on libc, so we have to // make sure that's all the way at the right (liblibc is near the base of diff --git a/src/librustc/back/svh.rs b/src/librustc/back/svh.rs index a2c579d13f438..633850f37180d 100644 --- a/src/librustc/back/svh.rs +++ b/src/librustc/back/svh.rs @@ -20,7 +20,7 @@ //! such. //! //! The core of this problem is when an upstream dependency changes and -//! downstream dependants are not recompiled. This causes compile errors because +//! downstream dependents are not recompiled. This causes compile errors because //! the upstream crate's metadata has changed but the downstream crates are //! still referencing the older crate's metadata. //! diff --git a/src/librustc/metadata/loader.rs b/src/librustc/metadata/loader.rs index 5a342e39d701a..bd95ba95c70d9 100644 --- a/src/librustc/metadata/loader.rs +++ b/src/librustc/metadata/loader.rs @@ -222,7 +222,7 @@ impl<'a> Context<'a> { // // A Library candidate is created if the metadata for the set of // libraries corresponds to the crate id and hash criteria that this - // serach is being performed for. + // search is being performed for. let mut libraries = Vec::new(); for (_hash, (rlibs, dylibs)) in candidates.move_iter() { let mut metadata = None; @@ -278,7 +278,7 @@ impl<'a> Context<'a> { // rlib/dylib). // // The return value is `None` if `file` doesn't look like a rust-generated - // library, or if a specific version was requested and it doens't match the + // library, or if a specific version was requested and it doesn't match the // apparent file's version. // // If everything checks out, then `Some(hash)` is returned where `hash` is diff --git a/src/librustc/middle/dead.rs b/src/librustc/middle/dead.rs index d0bf70ea1c2c1..413c6a4de1d03 100644 --- a/src/librustc/middle/dead.rs +++ b/src/librustc/middle/dead.rs @@ -275,7 +275,7 @@ fn create_and_seed_worklist(tcx: &ty::ctxt, None => () } - // Seed implemeneted trait methods + // Seed implemented trait methods let mut life_seeder = LifeSeeder { worklist: worklist }; diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs index c943744147d5b..40022ff2403cc 100644 --- a/src/librustc/middle/liveness.rs +++ b/src/librustc/middle/liveness.rs @@ -480,7 +480,7 @@ fn visit_expr(ir: &mut IrMaps, expr: &Expr) { // var must be dead afterwards moves::CapMove => true, - // var can stil be used + // var can still be used moves::CapCopy | moves::CapRef => false }; call_caps.push(CaptureInfo {ln: cv_ln, @@ -613,7 +613,7 @@ impl<'a> Liveness<'a> { f: |&mut Liveness<'a>, LiveNode, Variable, Span, NodeId|) { // only consider the first pattern; any later patterns must have // the same bindings, and we also consider the first pattern to be - // the "authoratative" set of ids + // the "authoritative" set of ids if !pats.is_empty() { self.pat_bindings(pats[0], f) } diff --git a/src/librustc/middle/privacy.rs b/src/librustc/middle/privacy.rs index 20b17cce12e27..1e160df106124 100644 --- a/src/librustc/middle/privacy.rs +++ b/src/librustc/middle/privacy.rs @@ -63,7 +63,7 @@ impl Visitor<()> for ParentVisitor { let prev = self.curparent; match item.node { ast::ItemMod(..) => { self.curparent = item.id; } - // Enum variants are parented to the enum definition itself beacuse + // Enum variants are parented to the enum definition itself because // they inherit privacy ast::ItemEnum(ref def, _) => { for variant in def.variants.iter() { @@ -1034,7 +1034,7 @@ impl<'a> Visitor<()> for SanePrivacyVisitor<'a> { } impl<'a> SanePrivacyVisitor<'a> { - /// Validates all of the visibility qualifers placed on the item given. This + /// Validates all of the visibility qualifiers placed on the item given. This /// ensures that there are no extraneous qualifiers that don't actually do /// anything. In theory these qualifiers wouldn't parse, but that may happen /// later on down the road... @@ -1262,7 +1262,7 @@ impl<'a> Visitor<()> for VisiblePrivateTypesVisitor<'a> { self_is_public_path = visitor.outer_type_is_public_path; } - // miscellanous info about the impl + // miscellaneous info about the impl // `true` iff this is `impl Private for ...`. let not_private_trait = diff --git a/src/librustc/middle/region.rs b/src/librustc/middle/region.rs index 8a5e0d3df1711..33db3b44d9503 100644 --- a/src/librustc/middle/region.rs +++ b/src/librustc/middle/region.rs @@ -182,7 +182,7 @@ impl RegionMaps { // else, locate the innermost terminating scope // if there's one. Static items, for instance, won't - // have an enclusing scope, hence no scope will be + // have an enclosing scope, hence no scope will be // returned. let mut id = match self.opt_encl_scope(expr_id) { Some(i) => i, @@ -533,7 +533,7 @@ fn resolve_expr(visitor: &mut RegionResolutionVisitor, // the invoked function is actually running* and call.id // represents *the time to prepare the arguments and make the // call*. See the section "Borrows in Calls" borrowck/doc.rs - // for an extended explanantion of why this distinction is + // for an extended explanation of why this distinction is // important. // // record_superlifetime(new_cx, expr.callee_id); @@ -604,7 +604,7 @@ fn resolve_local(visitor: &mut RegionResolutionVisitor, // (covers cases `expr` borrows an rvalue that is then assigned // to memory (at least partially) owned by the binding) // - // Here are some examples hopefully giving an intution where each + // Here are some examples hopefully giving an intuition where each // rule comes into play and why: // // Rule A. `let (ref x, ref y) = (foo().x, 44)`. The rvalue `(22, 44)` diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs index 9112434b12c83..cd9d88537b4f0 100644 --- a/src/librustc/middle/resolve.rs +++ b/src/librustc/middle/resolve.rs @@ -72,7 +72,7 @@ pub enum LastPrivate { // `use` directives (imports) can refer to two separate definitions in the // type and value namespaces. We record here the last private node for each // and whether the import is in fact used for each. - // If the Option fields are None, it means there is no defintion + // If the Option fields are None, it means there is no definition // in that namespace. LastImport{pub value_priv: Option, pub value_used: ImportUse, @@ -3610,7 +3610,7 @@ impl<'a> Resolver<'a> { } } - // n.b. the discr expr gets visted twice. + // n.b. the discr expr gets visited twice. // but maybe it's okay since the first time will signal an // error if there is one? -- tjc self.with_type_parameter_rib(HasTypeParameters(generics, diff --git a/src/librustc/middle/subst.rs b/src/librustc/middle/subst.rs index 0fbaf74561583..e964bc5d6b0bc 100644 --- a/src/librustc/middle/subst.rs +++ b/src/librustc/middle/subst.rs @@ -272,7 +272,7 @@ impl Subst for ty::Region { substs: &ty::substs, _: Option) -> ty::Region { // Note: This routine only handles regions that are bound on - // type declarationss and other outer declarations, not those + // type declarations and other outer declarations, not those // bound in *fn types*. Region substitution of the bound // regions that appear in a function signature is done using // the specialized routine diff --git a/src/librustc/middle/trans/_match.rs b/src/librustc/middle/trans/_match.rs index 72818576cbb71..bab7a22757235 100644 --- a/src/librustc/middle/trans/_match.rs +++ b/src/librustc/middle/trans/_match.rs @@ -963,7 +963,7 @@ fn get_options(bcx: &Block, m: &[Match], col: uint) -> Vec { if set.iter().any(|l| opt_eq(tcx, l, &val)) {return;} set.push(val); } - // Vector comparisions are special in that since the actual + // Vector comparisons are special in that since the actual // conditions over-match, we need to be careful about them. This // means that in order to properly handle things in order, we need // to not always merge conditions. diff --git a/src/librustc/middle/trans/callee.rs b/src/librustc/middle/trans/callee.rs index 8bc217343f7fe..7002d09beca66 100644 --- a/src/librustc/middle/trans/callee.rs +++ b/src/librustc/middle/trans/callee.rs @@ -370,7 +370,7 @@ pub fn trans_fn_ref_with_vtables( false }; - // Create a monomorphic verison of generic functions + // Create a monomorphic version of generic functions if must_monomorphise { // Should be either intra-crate or inlined. assert_eq!(def_id.krate, ast::LOCAL_CRATE); diff --git a/src/librustc/middle/trans/closure.rs b/src/librustc/middle/trans/closure.rs index c90d457e83a28..68744643ca606 100644 --- a/src/librustc/middle/trans/closure.rs +++ b/src/librustc/middle/trans/closure.rs @@ -84,7 +84,7 @@ use syntax::ast_util; // because the alignment requirements of the bound data affects the // alignment requires of the closure_data struct as a whole. However, // right now this is a non-issue in any case, because the size of the -// rust_opaque_box header is always a mutiple of 16-bytes, which is +// rust_opaque_box header is always a multiple of 16-bytes, which is // the maximum alignment requirement we ever have to worry about. // // The only reason alignment matters is that, in order to learn what data diff --git a/src/librustc/middle/trans/debuginfo.rs b/src/librustc/middle/trans/debuginfo.rs index 1a57acf84d221..c5739960a1910 100644 --- a/src/librustc/middle/trans/debuginfo.rs +++ b/src/librustc/middle/trans/debuginfo.rs @@ -2503,7 +2503,7 @@ fn populate_scope_map(cx: &CrateContext, ast::PatIdent(_, ref path_ref, ref sub_pat_opt) => { // Check if this is a binding. If so we need to put it on the scope stack and maybe - // introduce an articial scope + // introduce an artificial scope if pat_util::pat_is_binding(def_map, pat) { let ident = ast_util::path_to_ident(path_ref); diff --git a/src/librustc/middle/trans/monomorphize.rs b/src/librustc/middle/trans/monomorphize.rs index 20b468a067014..7d7ea5a221106 100644 --- a/src/librustc/middle/trans/monomorphize.rs +++ b/src/librustc/middle/trans/monomorphize.rs @@ -128,7 +128,7 @@ pub fn monomorphic_fn(ccx: &CrateContext, // Static default methods are a little unfortunate, in // that the "internal" and "external" type of them differ. // Internally, the method body can refer to Self, but the - // externally visable type of the method has a type param + // externally visible type of the method has a type param // inserted in between the trait type params and the // method type params. The substs that we are given are // the proper substs *internally* to the method body, so diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index 037182d8b7b80..7745b0cc08fa4 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -2338,7 +2338,7 @@ pub fn is_instantiable(cx: &ctxt, r_ty: t) -> bool { let r = match get(ty).sty { // fixed length vectors need special treatment compared to // normal vectors, since they don't necessarily have the - // possibilty to have length zero. + // possibility to have length zero. ty_vec(_, Some(0)) => false, // don't need no contents ty_vec(mt, Some(_)) => type_requires(cx, seen, r_ty, mt.ty), diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs index fb470cbdfb1ab..f80b8f2f9e85d 100644 --- a/src/librustc/middle/typeck/check/mod.rs +++ b/src/librustc/middle/typeck/check/mod.rs @@ -238,7 +238,7 @@ pub struct FnCtxt<'a> { // // What we do in such cases is to generate a region variable with // `region_lb` as a lower bound. The regionck pass then adds - // other constriants based on how the variable is used and region + // other constraints based on how the variable is used and region // inference selects the ultimate value. Finally, borrowck is // charged with guaranteeing that the value whose address was taken // can actually be made to live as long as it needs to live. @@ -2548,7 +2548,7 @@ fn check_expr_with_unifier(fcx: &FnCtxt, ty::mt {ty: t, mutbl: mutability}, None)), // Sadly, we know the length // - Some(args.len()) - but - // must thow it away or cause + // must throw it away or cause // confusion further down the // pipeline. Hopefully we can // remedy this later. diff --git a/src/librustc/middle/typeck/infer/resolve.rs b/src/librustc/middle/typeck/infer/resolve.rs index 5348a623d86cc..9df610dc7bc2a 100644 --- a/src/librustc/middle/typeck/infer/resolve.rs +++ b/src/librustc/middle/typeck/infer/resolve.rs @@ -36,7 +36,7 @@ // therefore cannot sensibly be mapped to any particular result. By // default, we will leave such variables as is (so you will get back a // variable in your result). The options force_* will cause the -// resolution to fail in this case intead, except for the case of +// resolution to fail in this case instead, except for the case of // integral variables, which resolve to `int` if forced. // // # resolve_all and force_all diff --git a/src/librustc/util/sha2.rs b/src/librustc/util/sha2.rs index 8de7cabde0ed7..cbc3be3f6e164 100644 --- a/src/librustc/util/sha2.rs +++ b/src/librustc/util/sha2.rs @@ -146,14 +146,14 @@ impl FixedBuffer for FixedBuffer64 { } } - // While we have at least a full buffer size chunks's worth of data, process that data + // While we have at least a full buffer size chunk's worth of data, process that data // without copying it into the buffer while input.len() - i >= size { func(input.slice(i, i + size)); i += size; } - // Copy any input data into the buffer. At this point in the method, the ammount of + // Copy any input data into the buffer. At this point in the method, the amount of // data left in the input vector will be less than the buffer size and the buffer will // be empty. let input_remaining = input.len() - i; diff --git a/src/libstd/cmp.rs b/src/libstd/cmp.rs index e39ab4144fd07..a6d6649aca0d5 100644 --- a/src/libstd/cmp.rs +++ b/src/libstd/cmp.rs @@ -26,7 +26,7 @@ //! //! // Our implementation of `Eq` to support `==` and `!=`. //! impl Eq for SketchyNum { -//! // Our custom eq allows numbers which are near eachother to be equal! :D +//! // Our custom eq allows numbers which are near each other to be equal! :D //! fn eq(&self, other: &SketchyNum) -> bool { //! (self.num - other.num).abs() < 5 //! } @@ -283,7 +283,7 @@ mod test { // Our implementation of `Eq` to support `==` and `!=`. impl Eq for SketchyNum { - // Our custom eq allows numbers which are near eachother to be equal! :D + // Our custom eq allows numbers which are near each other to be equal! :D fn eq(&self, other: &SketchyNum) -> bool { (self.num - other.num).abs() < 5 } diff --git a/src/libstd/iter.rs b/src/libstd/iter.rs index 1c7579e6b8e75..7a04303268b1f 100644 --- a/src/libstd/iter.rs +++ b/src/libstd/iter.rs @@ -937,7 +937,7 @@ impl> OrdIterator for T { loop { // `first` and `second` are the two next elements we want to look at. // We first compare `first` and `second` (#1). The smaller one is then compared to - // current mininum (#2). The larger one is compared to current maximum (#3). This + // current minimum (#2). The larger one is compared to current maximum (#3). This // way we do 3 comparisons for 2 elements. let first = match self.next() { None => break, diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 06a6a6da79671..dbaef3358043e 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -24,7 +24,7 @@ /// which is transmitted. /// /// The multi-argument form of this macro fails with a string and has the -/// `format!` sytnax for building a string. +/// `format!` syntax for building a string. /// /// # Example /// diff --git a/src/libstd/ptr.rs b/src/libstd/ptr.rs index 61461096ed9c4..f70715ed756dc 100644 --- a/src/libstd/ptr.rs +++ b/src/libstd/ptr.rs @@ -15,7 +15,7 @@ //! an unsafe pointer when safe pointers are unsuitable; //! checking for null; and converting back to safe pointers. //! As a result, there is not yet an abundance of library code -//! for working with unsafe poniters, and in particular, +//! for working with unsafe pointers, and in particular, //! since pointer math is fairly uncommon in Rust, it is not //! all that convenient. //! diff --git a/src/libstd/raw.rs b/src/libstd/raw.rs index b285b42ee5ec2..9b0463089d0f9 100644 --- a/src/libstd/raw.rs +++ b/src/libstd/raw.rs @@ -15,7 +15,7 @@ //! They can be used as targets of transmutes in unsafe code for manipulating //! the raw representations directly. //! -//! Their definitition should always match the ABI defined in `rustc::back::abi`. +//! Their definition should always match the ABI defined in `rustc::back::abi`. use cast; diff --git a/src/libstd/result.rs b/src/libstd/result.rs index 0f993598747f0..7080da266f666 100644 --- a/src/libstd/result.rs +++ b/src/libstd/result.rs @@ -103,7 +103,7 @@ //! ~~~ //! //! *Note: The actual definition of `Writer` uses `IoResult`, which -//! is just a synonymn for `Result`.* +//! is just a synonym for `Result`.* //! //! This method doesn`t produce a value, but the write may //! fail. It's crucial to handle the error case, and *not* write @@ -255,7 +255,7 @@ //! handling requires encapsulating fallable code in a task. Calling //! the `fail!` macro, or invoking `fail!` indirectly should be //! avoided as an error reporting strategy. Failure is only for -//! unrecovereable errors and a failing task is typically the sign of +//! unrecoverable errors and a failing task is typically the sign of //! a bug. //! //! A module that instead returns `Results` is alerting the caller diff --git a/src/libstd/rt/local_ptr.rs b/src/libstd/rt/local_ptr.rs index ff82be97489b5..f60cfa23e81f9 100644 --- a/src/libstd/rt/local_ptr.rs +++ b/src/libstd/rt/local_ptr.rs @@ -374,7 +374,7 @@ pub mod native { pub fn maybe_tls_key() -> Option { unsafe { // NB: This is a little racy because, while the key is - // initalized under a mutex and it's assumed to be initalized + // initialized under a mutex and it's assumed to be initialized // in the Scheduler ctor by any thread that needs to use it, // we are not accessing the key under a mutex. Threads that // are not using the new Scheduler but still *want to check* diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 3c03bddb293ed..672442bb931f4 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -662,7 +662,7 @@ impl<'a> Iterator for Normalizations<'a> { /// /// # Return value /// -/// The original string with all occurances of `from` replaced with `to` +/// The original string with all occurrences of `from` replaced with `to` pub fn replace(s: &str, from: &str, to: &str) -> ~str { let mut result = StrBuf::new(); let mut last_end = 0; @@ -1443,7 +1443,7 @@ pub mod raw { /// Sets the length of a string /// /// This will explicitly set the size of the string, without actually - /// modifing its buffers, so it is up to the caller to ensure that + /// modifying its buffers, so it is up to the caller to ensure that /// the string is actually the specified size. #[test] fn test_from_buf_len() { @@ -2022,7 +2022,7 @@ pub trait StrSlice<'a> { /// /// # Return value /// - /// The original string with all occurances of `from` replaced with `to`. + /// The original string with all occurrences of `from` replaced with `to`. /// /// # Example /// diff --git a/src/libstd/strbuf.rs b/src/libstd/strbuf.rs index 873b7293032cf..86da11aceda13 100644 --- a/src/libstd/strbuf.rs +++ b/src/libstd/strbuf.rs @@ -31,7 +31,7 @@ pub struct StrBuf { } impl StrBuf { - /// Creates a new string buffer initalized with the empty string. + /// Creates a new string buffer initialized with the empty string. #[inline] pub fn new() -> StrBuf { StrBuf { diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 585bed83101dd..c5f3206d9d557 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -135,7 +135,7 @@ impl Vec { Vec { len: length, cap: capacity, ptr: ptr } } - /// Consumes the `Vec`, partitioning it based on a predcate. + /// Consumes the `Vec`, partitioning it based on a predicate. /// /// Partitions the `Vec` into two `Vec`s `(A,B)`, where all elements of `A` /// satisfy `f` and all elements of `B` do not. The order of elements is @@ -279,7 +279,7 @@ impl Vec { *self.get_mut(index) = value; } - /// Partitions a vector based on a predcate. + /// Partitions a vector based on a predicate. /// /// Clones the elements of the vector, partitioning them into two `Vec`s /// `(A,B)`, where all elements of `A` satisfy `f` and all elements of `B`