---

yaml
---
r: 159102
b: refs/heads/snap-stage3
c: 8771394
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 40fb87d40f681f5356af42175fc7b85da387f037
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 15ba87f0314fda5e81603f37ae5f40e2022bcfc1
+refs/heads/snap-stage3: 877139495d4c572493f2440cff038283a3ba4e5e
 refs/heads/try: f58aad6dce273570fb130b4df008ef9acd5a5be2
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

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

@@ -17,7 +17,8 @@ use syntax::{attr, visit};
 use syntax::ast;
 use syntax::ast::{Attribute, Block, Crate, DefId, FnDecl, NodeId, Variant};
 use syntax::ast::{Item, RequiredMethod, ProvidedMethod, TraitItem};
-use syntax::ast::{TypeMethod, Method, Generics, StructField, TypeTraitItem};
+use syntax::ast::{TypeMethod, Method, Generics, StructDef, StructField};
+use syntax::ast::{Ident, TypeTraitItem};
 use syntax::ast_util::is_local;
 use syntax::attr::Stability;
 use syntax::visit::{FnKind, FkMethod, Visitor};
@@ -47,15 +48,9 @@ impl Annotator {
         match attr::find_stability(attrs.as_slice()) {
             Some(stab) => {
                 self.index.local.insert(id, stab.clone());
-
-                // Don't inherit #[stable]
-                if stab.level != attr::Stable {
-                    let parent = replace(&mut self.parent, Some(stab));
-                    f(self);
-                    self.parent = parent;
-                } else {
-                    f(self);
-                }
+                let parent = replace(&mut self.parent, Some(stab));
+                f(self);
+                self.parent = parent;
             }
             None => {
                 self.parent.clone().map(|stab| self.index.local.insert(id, stab));
@@ -68,15 +63,6 @@ impl Annotator {
 impl<'v> Visitor<'v> for Annotator {
     fn visit_item(&mut self, i: &Item) {
         self.annotate(i.id, &i.attrs, |v| visit::walk_item(v, i));
-
-        match i.node {
-            ast::ItemStruct(ref sd, _) => {
-                sd.ctor_id.map(|id| {
-                    self.annotate(id, &i.attrs, |_| {})
-                });
-            }
-            _ => {}
-        }
     }
 
     fn visit_fn(&mut self, fk: FnKind<'v>, fd: &'v FnDecl,
@@ -109,6 +95,13 @@ impl<'v> Visitor<'v> for Annotator {
         self.annotate(var.node.id, &var.node.attrs, |v| visit::walk_variant(v, var, g))
     }
 
+    fn visit_struct_def(&mut self, s: &StructDef, _: Ident, _: &Generics, _: NodeId) {
+        match s.ctor_id {
+            Some(id) => self.annotate(id, &vec![], |v| visit::walk_struct_def(v, s)),
+            None => visit::walk_struct_def(self, s)
+        }
+    }
+
     fn visit_struct_field(&mut self, s: &StructField) {
         self.annotate(s.node.id, &s.node.attrs, |v| visit::walk_struct_field(v, s));
     }

branches/snap-stage3/src/librustc/util/common.rs

@@ -35,7 +35,7 @@ pub fn time<T, U>(do_it: bool, what: &str, u: U, f: |U| -> T) -> T {
     let rv = rv.unwrap();
 
     println!("{}time: {}.{:03} \t{}", "  ".repeat(old),
-             dur.num_seconds(), dur.num_milliseconds(), what);
+             dur.num_seconds(), dur.num_milliseconds() % 1000, what);
     depth.replace(Some(old));
 
     rv

branches/snap-stage3/src/libstd/time/duration.rs

@@ -140,7 +140,7 @@ impl Duration {
     pub fn span(f: ||) -> Duration {
         let before = super::precise_time_ns();
         f();
-        Duration::nanoseconds((before - super::precise_time_ns()) as i64)
+        Duration::nanoseconds((super::precise_time_ns() - before) as i64)
     }
 
     /// Returns the total number of whole weeks in the duration.
@@ -565,4 +565,11 @@ mod tests {
         assert_eq!(format!("{:30}", Duration::days(1) + Duration::milliseconds(2345)),
                    "P1DT2.345S".to_string());
     }
+
+    #[test]
+    fn span() {
+        use io::timer::sleep;
+        let dur = Duration::span(|| sleep(Duration::milliseconds(5)));
+        assert!(dur > Duration::milliseconds(1));
+    }
 }

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

@@ -18,18 +18,10 @@ pub fn stable() {}
 
 #[stable]
 pub mod stable_mod {
-    pub fn experimental() {}
-
-    #[stable]
-    pub fn stable() {}
-}
-
-#[unstable]
-pub mod unstable_mod {
     #[experimental]
     pub fn experimental() {}
 
-    pub fn unstable() {}
+    pub fn stable() {}
 }
 
 pub mod experimental_mod {
@@ -41,9 +33,9 @@ pub mod experimental_mod {
 
 #[stable]
 pub trait Stable {
+    #[experimental]
     fn experimental(&self);
 
-    #[stable]
     fn stable(&self);
 }
 

branches/snap-stage3/src/test/compile-fail/lint-stability.rs

@@ -165,9 +165,6 @@ mod inheritance {
         stable_mod::experimental(); //~ ERROR use of experimental item
         stable_mod::stable();
 
-        unstable_mod::experimental(); //~ ERROR use of experimental item
-        unstable_mod::unstable(); //~ ERROR use of unstable item
-
         experimental_mod::experimental(); //~ ERROR use of experimental item
         experimental_mod::stable();