diff options
| author | bors <bors@rust-lang.org> | 2013-05-31 02:01:44 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-05-31 02:01:44 -0700 |
| commit | 030f471f26dbb6642c54a1e12ce63f7989db01ab (patch) | |
| tree | 2da4c9bac32cb4e51911a67c5af98b8a01116895 /src/libstd | |
| parent | 1dd5cd9731e7c32180f9cc7ce1bcf675b5724c50 (diff) | |
| parent | 5113f68a86594b189371756534117a60e1ce2be2 (diff) | |
| download | rust-030f471f26dbb6642c54a1e12ce63f7989db01ab.tar.gz rust-030f471f26dbb6642c54a1e12ce63f7989db01ab.zip | |
auto merge of #6853 : bblum/rust/sized, r=pcwalton
r? @nikomatsakis @pcwalton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/kinds.rs | 5 | ||||
| -rw-r--r-- | src/libstd/prelude.rs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/libstd/kinds.rs b/src/libstd/kinds.rs index b6c22f29c3e..05c963a32cc 100644 --- a/src/libstd/kinds.rs +++ b/src/libstd/kinds.rs @@ -53,3 +53,8 @@ pub trait Owned { pub trait Const { // Empty. } + +#[lang="sized"] +pub trait Sized { + // Empty. +} diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index 07864ce419e..4dcef60781f 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -12,7 +12,7 @@ // Reexported core operators pub use either::{Either, Left, Right}; -pub use kinds::{Const, Copy, Owned}; +pub use kinds::{Const, Copy, Owned, Sized}; pub use ops::{Add, Sub, Mul, Div, Rem, Neg, Not}; pub use ops::{BitAnd, BitOr, BitXor}; pub use ops::{Drop}; |