---

yaml
---
r: 63327
b: refs/heads/snap-stage3
c: a710e61
h: refs/heads/master
i:
  63325: aaa6b20
  63323: da49381
  63319: d2cdfe9
  63311: e372c2b
  63295: 7a59a88
v: v3

Author: dotdash

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 104e6120b1161e6d242644c987b65525daa5ad5a
+refs/heads/snap-stage3: a710e619038c9ff96c332eedb72a8c77a3a370be
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/RELEASES.txt

@@ -4,7 +4,7 @@ Version 0.7 (July 2013)
    * ??? changes, numerous bugfixes
 
    * Syntax changes
-      * `#[deriving(Encodable)]`, `#[deriving(Decodable)]`
+      * `#[deriving(Encodable)]`, `#[deriving(Decodable)]`      
 
    * Semantic changes
       * The `self` parameter no longer implicitly means `&'self self`,

branches/snap-stage3/src/etc/adb_run_wrapper.sh

@@ -2,7 +2,7 @@
 # usage : adb_run_wrapper [test dir - where test executables exist] [test executable]
 #
 
-# Sometimes android shell produce exitcode "1 : Text File Busy"
+# Sometimes android shell produce exitcode "1 : Text File Busy" 
 # Retry after $WAIT seconds, expecting resource cleaned-up
 WAIT=10
 PATH=$1
@@ -20,15 +20,15 @@ then
         while [ $L_RET -eq 1 ]
         do
             LD_LIBRARY_PATH=$PATH $PATH/$RUN $@ 1>$PATH/$RUN.stdout 2>$PATH/$RUN.stderr
-            L_RET=$?
+            L_RET=$? 
             if [ $L_COUNT -gt 0 ]
             then
                /system/bin/sleep $WAIT
                /system/bin/sync
             fi
             L_COUNT=`expr $L_COUNT+1`
         done
-
+        
         echo $L_RET > $PATH/$RUN.exitcode
 
     fi

branches/snap-stage3/src/librustc/middle/borrowck/gather_loans/gather_moves.rs

@@ -161,3 +161,4 @@ fn check_is_legal_to_move_from(bccx: @BorrowckCtxt,
         }
     }
 }
+

branches/snap-stage3/src/librustc/middle/effect.rs

@@ -154,3 +154,4 @@ pub fn check_crate(tcx: ty::ctxt,
 
     visit::visit_crate(crate, ((), visitor))
 }
+

branches/snap-stage3/src/librustc/middle/trans/base.rs

@@ -3094,6 +3094,7 @@ pub fn trans_crate(sess: session::Session,
               const_globals: @mut HashMap::new(),
               const_values: @mut HashMap::new(),
               extern_const_values: @mut HashMap::new(),
+              impl_method_cache: @mut HashMap::new(),
               module_data: @mut HashMap::new(),
               lltypes: @mut HashMap::new(),
               llsizingtypes: @mut HashMap::new(),

branches/snap-stage3/src/librustc/middle/trans/common.rs

@@ -205,6 +205,8 @@ pub struct CrateContext {
      // Cache of external const values
      extern_const_values: @mut HashMap<ast::def_id, ValueRef>,
 
+     impl_method_cache: @mut HashMap<(ast::def_id, ast::ident), ast::def_id>,
+
      module_data: @mut HashMap<~str, ValueRef>,
      lltypes: @mut HashMap<ty::t, TypeRef>,
      llsizingtypes: @mut HashMap<ty::t, TypeRef>,

branches/snap-stage3/src/librustc/middle/trans/meth.rs

@@ -381,35 +381,37 @@ pub fn method_from_methods(ms: &[@ast::method], name: ast::ident)
 pub fn method_with_name_or_default(ccx: @CrateContext,
                                    impl_id: ast::def_id,
                                    name: ast::ident) -> ast::def_id {
-    if impl_id.crate == ast::local_crate {
-        match ccx.tcx.items.get_copy(&impl_id.node) {
-          ast_map::node_item(@ast::item {
-                node: ast::item_impl(_, _, _, ref ms), _
-          }, _) => {
-              let did = method_from_methods(*ms, name);
-              if did.is_some() {
-                  return did.get();
-              } else {
-                  // Look for a default method
-                  let pmm = ccx.tcx.provided_methods;
-                  match pmm.find(&impl_id) {
-                      Some(pmis) => {
-                          for pmis.each |pmi| {
-                              if pmi.method_info.ident == name {
-                                  debug!("pmi.method_info.did = %?", pmi.method_info.did);
-                                  return pmi.method_info.did;
-                              }
-                          }
-                          fail!()
-                      }
-                      None => fail!()
-                  }
-              }
-          }
-          _ => fail!("method_with_name")
+    *do ccx.impl_method_cache.find_or_insert_with((impl_id, name)) |_| {
+        if impl_id.crate == ast::local_crate {
+            match ccx.tcx.items.get_copy(&impl_id.node) {
+                ast_map::node_item(@ast::item {
+                                   node: ast::item_impl(_, _, _, ref ms), _
+                                   }, _) => {
+                    let did = method_from_methods(*ms, name);
+                    if did.is_some() {
+                        did.get()
+                    } else {
+                        // Look for a default method
+                        let pmm = ccx.tcx.provided_methods;
+                        match pmm.find(&impl_id) {
+                            Some(pmis) => {
+                                for pmis.each |pmi| {
+                                    if pmi.method_info.ident == name {
+                                        debug!("pmi.method_info.did = %?", pmi.method_info.did);
+                                        return pmi.method_info.did;
+                                    }
+                                }
+                                fail!()
+                            }
+                            None => fail!()
+                        }
+                    }
+                }
+                _ => fail!("method_with_name")
+            }
+        } else {
+            csearch::get_impl_method(ccx.sess.cstore, impl_id, name)
         }
-    } else {
-        csearch::get_impl_method(ccx.sess.cstore, impl_id, name)
     }
 }
 

branches/snap-stage3/src/librustc/middle/ty.rs

@@ -271,6 +271,8 @@ struct ctxt_ {
     // A cache for the trait_methods() routine
     trait_methods_cache: @mut HashMap<def_id, @~[@Method]>,
 
+    impl_trait_cache: @mut HashMap<ast::def_id, Option<@ty::TraitRef>>,
+
     trait_refs: @mut HashMap<node_id, @TraitRef>,
     trait_defs: @mut HashMap<def_id, @TraitDef>,
 
@@ -967,6 +969,7 @@ pub fn mk_ctxt(s: session::Session,
         methods: @mut HashMap::new(),
         trait_method_def_ids: @mut HashMap::new(),
         trait_methods_cache: @mut HashMap::new(),
+        impl_trait_cache: @mut HashMap::new(),
         ty_param_defs: @mut HashMap::new(),
         adjustments: @mut HashMap::new(),
         normalized_cache: new_ty_hash(),
@@ -3749,22 +3752,24 @@ pub fn trait_method_def_ids(cx: ctxt, id: ast::def_id) -> @~[def_id] {
 }
 
 pub fn impl_trait_ref(cx: ctxt, id: ast::def_id) -> Option<@TraitRef> {
-    if id.crate == ast::local_crate {
-        debug!("(impl_trait_ref) searching for trait impl %?", id);
-        match cx.items.find(&id.node) {
-           Some(&ast_map::node_item(@ast::item {
-                        node: ast::item_impl(_, opt_trait, _, _),
-                        _},
-                    _)) => {
-               match opt_trait {
-                   Some(t) => Some(ty::node_id_to_trait_ref(cx, t.ref_id)),
-                   None => None
-               }
-           }
-           _ => None
+    *do cx.impl_trait_cache.find_or_insert_with(id) |_| {
+        if id.crate == ast::local_crate {
+            debug!("(impl_trait_ref) searching for trait impl %?", id);
+            match cx.items.find(&id.node) {
+                Some(&ast_map::node_item(@ast::item {
+                                         node: ast::item_impl(_, opt_trait, _, _),
+                                         _},
+                                         _)) => {
+                    match opt_trait {
+                        Some(t) => Some(ty::node_id_to_trait_ref(cx, t.ref_id)),
+                        None => None
+                    }
+                }
+                _ => None
+            }
+        } else {
+            csearch::get_impl_trait(cx, id)
         }
-    } else {
-        csearch::get_impl_trait(cx, id)
     }
 }
 

branches/snap-stage3/src/libstd/core.rc

@@ -232,3 +232,4 @@ mod std {
     pub use str;
     pub use os;
 }
+

branches/snap-stage3/src/libstd/path.rs

@@ -947,7 +947,6 @@ pub mod windows {
 mod tests {
     use option::{None, Some};
     use path::{PosixPath, WindowsPath, windows};
-    use str;
 
     #[test]
     fn test_double_slash_collapsing() {

branches/snap-stage3/src/libstd/rt/comm.rs

@@ -615,3 +615,4 @@ mod test {
         }
     }
 }
+

branches/snap-stage3/src/libstd/rt/io/stdio.rs

@@ -50,3 +50,4 @@ impl Writer for StdWriter {
 
     fn flush(&mut self) { fail!() }
 }
+

branches/snap-stage3/src/libstd/rt/task.rs

@@ -228,3 +228,4 @@ mod test {
         }
     }
 }
+

branches/snap-stage3/src/libstd/rt/test.rs

@@ -189,3 +189,4 @@ pub fn stress_factor() -> uint {
         None => 1
     }
 }
+

branches/snap-stage3/src/libsyntax/ext/pipes/ast_builder.rs

@@ -63,3 +63,4 @@ impl append_types for @ast::Path {
         }
     }
 }
+

branches/snap-stage3/src/rt/rust_env.cpp

@@ -156,3 +156,4 @@ free_env(rust_env *env) {
     free(env->rust_seed);
     free(env);
 }
+

branches/snap-stage3/src/rustllvm/rustllvm.h

@@ -54,3 +54,4 @@
 #include <fcntl.h>
 #include <unistd.h>
 #endif
+

branches/snap-stage3/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs

@@ -20,3 +20,4 @@ use std::libc;
 extern {
     pub fn rust_get_argc() -> libc::c_int;
 }
+

branches/snap-stage3/src/test/auxiliary/private_variant_xc.rs

@@ -2,3 +2,4 @@ pub enum Foo {
     pub Bar,
     priv Baz,
 }
+

branches/snap-stage3/src/test/auxiliary/use_from_trait_xc.rs

@@ -7,3 +7,4 @@ struct Foo;
 impl Foo {
     pub fn new() {}
 }
+

branches/snap-stage3/src/test/compile-fail/lint-unused-import-tricky-names.rs

@@ -44,3 +44,4 @@ mod issue6935 {
 }
 
 fn main(){}
+

branches/snap-stage3/src/test/compile-fail/private-variant-xc.rs

@@ -6,3 +6,4 @@ pub fn main() {
     let _ = private_variant_xc::Bar;
     let _ = private_variant_xc::Baz;    //~ ERROR unresolved name
 }
+

branches/snap-stage3/src/test/compile-fail/use-from-trait-xc.rs

@@ -9,3 +9,4 @@ use use_from_trait_xc::Foo::new;    //~ ERROR cannot import from a trait or type
 
 fn main() {
 }
+

branches/snap-stage3/src/test/compile-fail/use-from-trait.rs

@@ -14,3 +14,4 @@ impl Foo {
 }
 
 fn main() {}
+

branches/snap-stage3/src/test/run-pass/auto-encode.rs

@@ -10,8 +10,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test #6122
-
 #[forbid(deprecated_pattern)];
 
 extern mod extra;

branches/snap-stage3/src/test/run-pass/const-struct-offsets.rs

@@ -11,3 +11,4 @@ struct Bar {
 static bar: Bar = Bar { i: 0, v: IntVal(0) };
 
 fn main() {}
+

branches/snap-stage3/src/test/run-pass/issue-4735.rs

@@ -26,3 +26,5 @@ fn main() {
     let p = unsafe { transmute::<~int, *c_void>(t) };
     let z = NonCopyable(p);
 }
+
+

branches/snap-stage3/src/test/run-pass/monomorphize-abi-alignment.rs

@@ -24,8 +24,8 @@ struct A((u32, u32));
 struct B(u64);
 
 pub fn main() {
-    static Ca: S<A> = S { i: 0, t: A((13, 104)) };
-    static Cb: S<B> = S { i: 0, t: B(31337) };
-    assert_eq!(*(Ca.unwrap()), (13, 104));
-    assert_eq!(*(Cb.unwrap()), 31337);
+	static Ca: S<A> = S { i: 0, t: A((13, 104)) };
+	static Cb: S<B> = S { i: 0, t: B(31337) };
+	assert_eq!(*(Ca.unwrap()), (13, 104));
+	assert_eq!(*(Cb.unwrap()), 31337);
 }

branches/snap-stage3/src/test/run-pass/multi-let.rs

@@ -13,3 +13,4 @@ pub fn main() {
     let y = x;
     assert!((y == 10));
 }
+

branches/snap-stage3/src/test/run-pass/pub-extern-privacy.rs

@@ -11,3 +11,4 @@ fn main() {
         a::free(transmute(0));
     }
 }
+