Test fixes and rebase conflicts, round 2

2015-03-31 11:41:18 -07:00
parent 554946c81e
commit 30532884f8
15 changed files with 80 additions and 91 deletions
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -46,7 +46,7 @@ use str::{FromStr, StrExt};
 /// intended to have wrapping semantics.
 #[stable(feature = "rust1", since = "1.0.0")]
 #[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Debug)]
-pub struct Wrapping<T>(pub T);
+pub struct Wrapping<T>(#[stable(feature = "rust1", since = "1.0.0")] pub T);

 #[unstable(feature = "core", reason = "may be removed or relocated")]
 pub mod wrapping;