]> git.lizzy.rs Git - rust.git/commitdiff
Merge pull request #20674 from jbcrail/fix-misspelled-comments
authorbors <bors@rust-lang.org>
Wed, 7 Jan 2015 15:35:30 +0000 (15:35 +0000)
committerbors <bors@rust-lang.org>
Wed, 7 Jan 2015 15:35:30 +0000 (15:35 +0000)
Fix misspelled comments.

Reviewed-by: steveklabnik
22 files changed:
1  2 
src/doc/reference.md
src/libcollections/btree/node.rs
src/libcollections/slice.rs
src/libcore/ptr.rs
src/librustc/metadata/encoder.rs
src/librustc/middle/infer/error_reporting.rs
src/librustc/middle/infer/region_inference/mod.rs
src/librustc/middle/traits/object_safety.rs
src/librustc/middle/traits/project.rs
src/librustc/middle/traits/select.rs
src/librustc/middle/ty.rs
src/librustc/middle/ty_fold.rs
src/librustc/util/snapshot_vec.rs
src/librustc_trans/trans/meth.rs
src/librustc_typeck/check/_match.rs
src/librustc_typeck/check/method/confirm.rs
src/librustc_typeck/check/wf.rs
src/libstd/collections/hash/map.rs
src/libstd/fmt.rs
src/libstd/thread.rs
src/libsyntax/parse/parser.rs
src/libsyntax/parse/token.rs

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index c618889f3f5dca438b951f744f003219d0200426,7f45c05fbbdd9149d6a93bf1fe1c45196d823c85..28718ffa980a0113c08f463b980a3cfa187ec67f
@@@ -563,11 -557,10 +563,11 @@@ pub fn trans_object_shim<'a, 'tcx>
  
      // Upcast to the trait in question and extract out the substitutions.
      let upcast_trait_ref = traits::upcast(ccx.tcx(), object_trait_ref.clone(), trait_id).unwrap();
 -    let object_substs = upcast_trait_ref.substs().clone().erase_regions();
 +    let upcast_trait_ref = ty::erase_late_bound_regions(tcx, &upcast_trait_ref);
 +    let object_substs = upcast_trait_ref.substs.clone().erase_regions();
      debug!("trans_object_shim: object_substs={}", object_substs.repr(tcx));
  
-     // Lookup the type of this method as deeclared in the trait and apply substitutions.
+     // Lookup the type of this method as declared in the trait and apply substitutions.
      let method_ty = match ty::trait_item(tcx, trait_id, method_offset_in_trait) {
          ty::MethodTraitItem(method) => method,
          ty::TypeTraitItem(_) => {
Simple merge
Simple merge
Simple merge
Simple merge
index 71321ed3b7174208cd15da1cbf89d8924af1c41e,d7f30207273d57d5afa670eef4f3a1660a5d5df6..c103365745cd612207f2112322a3c21f9c70b0f7
@@@ -164,9 -142,8 +164,9 @@@ use thunk::Thunk
  use sys::thread as imp;
  use sys_common::{stack, thread_info};
  
- /// Thread configuation. Provides detailed control over the properties
+ /// Thread configuration. Provides detailed control over the properties
  /// and behavior of new threads.
 +#[stable]
  pub struct Builder {
      // A name for the thread-to-be, for identification in panic messages
      name: Option<String>,
Simple merge
Simple merge