about summary refs log tree commit diff
path: root/src/libcore/ops.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-09-09 20:16:19 +0000
committerbors <bors@rust-lang.org>2014-09-09 20:16:19 +0000
commit651106462c357b71a4ca2c02ba2bfedfc38b0035 (patch)
tree79cd7984fb470f273f5907c579a2db5f71296c7e /src/libcore/ops.rs
parentb625d43f8fd2e9a800ca8a419f7d3f5f52604205 (diff)
parente5abe15ff55212c60fc4acc9bfc2bc79038507b8 (diff)
auto merge of #17127 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libcore/ops.rs')
-rw-r--r--src/libcore/ops.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs
index 836285bc313..94febf03635 100644
--- a/src/libcore/ops.rs
+++ b/src/libcore/ops.rs
@@ -55,6 +55,8 @@
  *
  */
 
+use kinds::Sized;
+
 /**
  *
  * The `Drop` trait is used to run some code when a value goes out of scope. This
@@ -700,7 +702,7 @@ pub trait IndexMut<Index,Result> {
  * ```
  */
 #[lang="deref"]
-pub trait Deref<Result> {
+pub trait Deref<Sized? Result> {
     /// The method called to dereference a value
     fn deref<'a>(&'a self) -> &'a Result;
 }
@@ -740,7 +742,7 @@ pub trait Deref<Result> {
  * ```
  */
 #[lang="deref_mut"]
-pub trait DerefMut<Result>: Deref<Result> {
+pub trait DerefMut<Sized? Result>: Deref<Result> {
     /// The method called to mutably dereference a value
     fn deref_mut<'a>(&'a mut self) -> &'a mut Result;
 }