about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-04-30 20:46:51 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-05-07 08:13:56 -0700
commitdfd967f239a079cf90f45bfc3d827547e6fe9008 (patch)
tree8967850d349d0835c2c3225a42cce65d1f958f16 /src/libstd
parent17cb238ee80726c057a16c90b8c4e7e8bfd25c9d (diff)
downloadrust-dfd967f239a079cf90f45bfc3d827547e6fe9008.tar.gz
rust-dfd967f239a079cf90f45bfc3d827547e6fe9008.zip
core: Inherit the default module
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/default.rs27
-rw-r--r--src/libstd/lib.rs1
2 files changed, 1 insertions, 27 deletions
diff --git a/src/libstd/default.rs b/src/libstd/default.rs
deleted file mode 100644
index 9cf3a763648..00000000000
--- a/src/libstd/default.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! 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.
-    fn default() -> Self;
-}
-
-impl<T: Default + 'static> Default for @T {
-    fn default() -> @T { @Default::default() }
-}
-
-impl<T: Default> Default for Box<T> {
-    fn default() -> Box<T> { box Default::default() }
-}
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 4485da81969..ef07fc2f995 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -141,6 +141,7 @@ pub use core::any;
 pub use core::cast;
 pub use core::char;
 pub use core::container;
+pub use core::default;
 pub use core::intrinsics;
 pub use core::mem;
 pub use core::ptr;