From 863bb1f5150419dc16ed9c511a7e790f0b8ba79c Mon Sep 17 00:00:00 2001
From: Andrew Paseltiner <apaseltiner@gmail.com>
Date: Fri, 23 Oct 2015 21:51:38 -0400
Subject: [PATCH] Make `{Default, From, FromIterator, One, Zero}` well-formed

Using these traits in an object context previously resulted in an RFC
1214 warning.
---
 src/libcore/convert.rs | 2 +-
 src/libcore/default.rs | 4 +++-
 src/libcore/iter.rs    | 2 +-
 src/libcore/num/mod.rs | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs
index 70868805299f3..b02b2a06b75d5 100644
--- a/src/libcore/convert.rs
+++ b/src/libcore/convert.rs
@@ -95,7 +95,7 @@ pub trait Into<T>: Sized {
 /// assert_eq!(string, other_string);
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-pub trait From<T> {
+pub trait From<T>: Sized {
     /// Performs the conversion.
     #[stable(feature = "rust1", since = "1.0.0")]
     fn from(T) -> Self;
diff --git a/src/libcore/default.rs b/src/libcore/default.rs
index 0e318f204eb9d..f7fda3d04fd61 100644
--- a/src/libcore/default.rs
+++ b/src/libcore/default.rs
@@ -78,6 +78,8 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
+use marker::Sized;
+
 /// A trait for giving a type a useful default value.
 ///
 /// A struct can derive default implementations of `Default` for basic types using
@@ -93,7 +95,7 @@
 /// }
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-pub trait Default {
+pub trait Default: Sized {
     /// Returns the "default value" for a type.
     ///
     /// Default values are often some kind of initial value, identity value, or anything else that
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
index 7c113fde658b8..fc69472310bca 100644
--- a/src/libcore/iter.rs
+++ b/src/libcore/iter.rs
@@ -1490,7 +1490,7 @@ impl<'a, I: Iterator + ?Sized> Iterator for &'a mut I {
 #[stable(feature = "rust1", since = "1.0.0")]
 #[rustc_on_unimplemented="a collection of type `{Self}` cannot be \
                           built from an iterator over elements of type `{A}`"]
-pub trait FromIterator<A> {
+pub trait FromIterator<A>: Sized {
     /// Builds a container with elements from something iterable.
     ///
     /// # Examples
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index 4b68591aa86a3..de56cf902a4fd 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -58,7 +58,7 @@ pub mod diy_float;
 #[unstable(feature = "zero_one",
            reason = "unsure of placement, wants to use associated constants",
            issue = "27739")]
-pub trait Zero {
+pub trait Zero: Sized {
     /// The "zero" (usually, additive identity) for this type.
     fn zero() -> Self;
 }
@@ -70,7 +70,7 @@ pub trait Zero {
 #[unstable(feature = "zero_one",
            reason = "unsure of placement, wants to use associated constants",
            issue = "27739")]
-pub trait One {
+pub trait One: Sized {
     /// The "one" (usually, multiplicative identity) for this type.
     fn one() -> Self;
 }