diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-06 15:34:10 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-06 15:34:10 -0800 |
| commit | 771fe9026a38cb673d0928fea1f6ebd4ba796e43 (patch) | |
| tree | eec8f16ffcd231cbdb822662a4aaca76eb10bcf0 /src/libcore/num | |
| parent | 3892dd1eaa9e1c52aba0179b9d6e27a5ced0afc7 (diff) | |
| parent | 9f07d055f7823ac0e17e014f3effa2a0be0947e9 (diff) | |
| download | rust-771fe9026a38cb673d0928fea1f6ebd4ba796e43.tar.gz rust-771fe9026a38cb673d0928fea1f6ebd4ba796e43.zip | |
rollup merge of #20607: nrc/kinds
Conflicts: src/libcore/array.rs src/libcore/cell.rs src/libcore/prelude.rs src/libstd/path/posix.rs src/libstd/prelude/v1.rs src/test/compile-fail/dst-sized-trait-param.rs
Diffstat (limited to 'src/libcore/num')
| -rw-r--r-- | src/libcore/num/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 3bcdd54463f..490d8111f46 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -21,7 +21,7 @@ use cmp::{PartialEq, Eq}; use cmp::{PartialOrd, Ord}; use intrinsics; use iter::IteratorExt; -use kinds::Copy; +use marker::Copy; use mem::size_of; use ops::{Add, Sub, Mul, Div, Rem, Neg}; use ops::{Not, BitAnd, BitOr, BitXor, Shl, Shr, Index}; @@ -992,7 +992,7 @@ impl_to_primitive_float! { f64 } /// A generic trait for converting a number to a value. #[experimental = "trait is likely to be removed"] -pub trait FromPrimitive : ::kinds::Sized { +pub trait FromPrimitive : ::marker::Sized { /// Convert an `int` to return an optional value of this type. If the /// value cannot be represented by this value, the `None` is returned. #[inline] |