about summary refs log tree commit diff
path: root/src/libcore/str
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/libcore/str
parent188d7c0bc36e69b99f6bdefd613027e53fa8b2d0 (diff)
downloadrust-3a2530d611fc92bd8094ec1745a927e059ac432a.tar.gz
rust-3a2530d611fc92bd8094ec1745a927e059ac432a.zip
Test fixes and rebase conflicts
Also some tidying up of a bunch of crate attributes
Diffstat (limited to 'src/libcore/str')
-rw-r--r--src/libcore/str/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs
index ee62cede191..cb7af3b3d35 100644
--- a/src/libcore/str/mod.rs
+++ b/src/libcore/str/mod.rs
@@ -148,7 +148,7 @@ impl FromStr for bool {
 }
 
 /// An error returned when parsing a `bool` from a string fails.
-#[derive(Show, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq)]
 #[allow(missing_copy_implementations)]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub struct ParseBoolError { _priv: () }