auto merge of #13958 : pcwalton/rust/detilde, r=pcwalton

for `~str`/`~[]`.

Note that `~self` still remains, since I forgot to add support for
`Box<self>` before the snapshot.

r? @brson or @alexcrichton or whoever

1 files changed, 4 insertions, 2 deletions

diff --git a/src/libstd/default.rs b/src/libstd/default.rs
index 8dcce3fd146..9cf3a763648 100644
--- a/src/libstd/default.rs
+++ b/src/libstd/default.rs
@@ -10,6 +10,8 @@
 
 //! The `Default` trait for types which may have meaningful default values
 
+use owned::Box;
+
 /// A trait that types which have a useful default value should implement.
 pub trait Default {
     /// Return the "default value" for a type.
@@ -20,6 +22,6 @@ impl<T: Default + 'static> Default for @T {
     fn default() -> @T { @Default::default() }
 }
 
-impl<T: Default> Default for ~T {
-    fn default() -> ~T { box Default::default() }
+impl<T: Default> Default for Box<T> {
+    fn default() -> Box<T> { box Default::default() }
 }