about summary refs log tree commit diff
path: root/src/libstd/path
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-30 12:26:44 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-30 14:53:34 -0800
commit3a2530d611fc92bd8094ec1745a927e059ac432a (patch)
tree0e02c7b12ca7ab267ba36903a535ec3cb286a23e /src/libstd/path
parent188d7c0bc36e69b99f6bdefd613027e53fa8b2d0 (diff)
Test fixes and rebase conflicts
Also some tidying up of a bunch of crate attributes
Diffstat (limited to 'src/libstd/path')
-rw-r--r--src/libstd/path/posix.rs2
-rw-r--r--src/libstd/path/windows.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs
index 72c41f2399e..6a0c8a93010 100644
--- a/src/libstd/path/posix.rs
+++ b/src/libstd/path/posix.rs
@@ -97,7 +97,7 @@ impl FromStr for Path {
 }
 
 /// Valuelue indicating that a path could not be parsed from a string.
-#[derive(Show, Clone, PartialEq, Copy)]
+#[derive(Debug, Clone, PartialEq, Copy)]
 pub struct ParsePathError;
 
 impl<S: hash::Writer + hash::Hasher> hash::Hash<S> for Path {
diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs
index e04f697b2a4..b524b89ef9f 100644
--- a/src/libstd/path/windows.rs
+++ b/src/libstd/path/windows.rs
@@ -126,7 +126,7 @@ impl FromStr for Path {
 }
 
 /// Value indicating that a path could not be parsed from a string.
-#[derive(Show, Clone, PartialEq, Copy)]
+#[derive(Debug, Clone, PartialEq, Copy)]
 pub struct ParsePathError;
 
 impl<S: hash::Writer + hash::Hasher> hash::Hash<S> for Path {