about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-02-10 08:42:45 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-02-10 08:42:45 -0800
commit7e378edb39df4c5499fc37103feeeddc8e3e6269 (patch)
treeaf12fb440fe1696ee71b4256c082996ab4787205 /src/libstd
parent0568422a27ce4dd9a7f2b1c71710700be54a1da4 (diff)
parent34afe5e193182a0029abe1ae8258f79f4cd56cd9 (diff)
downloadrust-7e378edb39df4c5499fc37103feeeddc8e3e6269.tar.gz
rust-7e378edb39df4c5499fc37103feeeddc8e3e6269.zip
rollup merge of #22094: alkor/cleanup-show-string
Rename several remaining `Show`s to Debug, `String`s to Display (mostly in comments and docs).
Update reference.md:
 - derive() no longer supports Zero trait
 - derive() now supports Copy trait
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/old_path/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/old_path/mod.rs b/src/libstd/old_path/mod.rs
index 0d80258d7e0..17cfe1c8297 100644
--- a/src/libstd/old_path/mod.rs
+++ b/src/libstd/old_path/mod.rs
@@ -228,7 +228,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
     /// ```
     fn into_vec(self) -> Vec<u8>;
 
-    /// Returns an object that implements `Show` for printing paths
+    /// Returns an object that implements `Display` for printing paths
     ///
     /// # Example
     ///
@@ -244,7 +244,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
         Display{ path: self, filename: false }
     }
 
-    /// Returns an object that implements `Show` for printing filenames
+    /// Returns an object that implements `Display` for printing filenames
     ///
     /// If there is no filename, nothing will be printed.
     ///