Merge remote-tracking branch 'remotes/origin/master' into str-remove-null

[rust.git] / src / librustc / middle / trans / meth.rs

diff --git a/src/librustc/middle/trans/meth.rs b/src/librustc/middle/trans/meth.rs
index b3939a3105065b03e979aa69ceff657800f0819e..13f11d23c3bf3b6c899d80adeaa96a0094d6c1af 100644 (file)
--- a/src/librustc/middle/trans/meth.rs
+++ b/src/librustc/middle/trans/meth.rs
@@ -58,7 +58,7 @@ pub fn trans_impl(ccx: @mut CrateContext,
 
     if !generics.ty_params.is_empty() { return; }
     let sub_path = vec::append_one(path, path_name(name));
-    foreach method in methods.iter() {
+    for method in methods.iter() {
         if method.generics.ty_params.len() == 0u {
             let llfn = get_item_val(ccx, method.id);
             let path = vec::append_one(sub_path.clone(),
@@ -138,7 +138,6 @@ pub fn trans_self_arg(bcx: @mut Block,
                    mentry.self_mode,
                    base,
                    temp_cleanups,
-                   None,
                    DontAutorefArg)
 }
 
@@ -600,7 +599,7 @@ pub fn make_vtable(ccx: &mut CrateContext,
         let _icx = push_ctxt("impl::make_vtable");
 
         let mut components = ~[ tydesc.tydesc ];
-        foreach &ptr in ptrs.iter() {
+        for &ptr in ptrs.iter() {
             components.push(ptr)
         }