diff options
| author | bors <bors@rust-lang.org> | 2014-12-19 16:02:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-12-19 16:02:31 +0000 |
| commit | 95c2ed31aeb66b2662933200dbfd661a573b1f49 (patch) | |
| tree | 3e397ee769c09211083f8aa12377e41104575f7f /src/libstd/path | |
| parent | bd90b936d73c0ea2c261cd8e7b9c43764cb2da05 (diff) | |
| parent | f975b10310b2f38a5ac1e50f30778b85ed963849 (diff) | |
| download | rust-95c2ed31aeb66b2662933200dbfd661a573b1f49.tar.gz rust-95c2ed31aeb66b2662933200dbfd661a573b1f49.zip | |
auto merge of #19867 : japaric/rust/deriving-copy, r=acrichto
r? @alexcrichton
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/windows.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 5cbefb0d3d8..b498b3e8ad0 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -22,7 +22,6 @@ use hash; use io::Writer; use iter::{AdditiveIterator, DoubleEndedIteratorExt, Extend}; use iter::{Iterator, IteratorExt, Map}; -use kinds::Copy; use mem; use option::Option; use option::Option::{Some, None}; @@ -970,7 +969,7 @@ pub fn is_sep_byte_verbatim(u: &u8) -> bool { } /// Prefix types for Path -#[deriving(PartialEq, Clone, Show)] +#[deriving(Copy, PartialEq, Clone, Show)] pub enum PathPrefix { /// Prefix `\\?\`, uint is the length of the following component VerbatimPrefix(uint), @@ -986,8 +985,6 @@ pub enum PathPrefix { DiskPrefix } -impl Copy for PathPrefix {} - fn parse_prefix<'a>(mut path: &'a str) -> Option<PathPrefix> { if path.starts_with("\\\\") { // \\ |