diff options
| author | Alexander Korolkov <alexander.korolkov@gmail.com> | 2015-02-05 15:04:07 +0300 |
|---|---|---|
| committer | Alexander Korolkov <alexander.korolkov@gmail.com> | 2015-02-08 20:00:30 +0300 |
| commit | 34afe5e193182a0029abe1ae8258f79f4cd56cd9 (patch) | |
| tree | b3b464820ac3147838891a66351701f8071ce00c /src/libstd | |
| parent | 725cc06464abda7a657780f12feaefb7f10333c6 (diff) | |
| download | rust-34afe5e193182a0029abe1ae8258f79f4cd56cd9.tar.gz rust-34afe5e193182a0029abe1ae8258f79f4cd56cd9.zip | |
Rename Show to Debug, String to Display
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.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/windows/os.rs | 2 |
2 files changed, 3 insertions, 3 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. /// diff --git a/src/libstd/sys/windows/os.rs b/src/libstd/sys/windows/os.rs index d8e3e6981df..7e684c52341 100644 --- a/src/libstd/sys/windows/os.rs +++ b/src/libstd/sys/windows/os.rs @@ -191,7 +191,7 @@ impl<'a> Iterator for SplitPaths<'a> { } } -#[derive(Show)] +#[derive(Debug)] pub struct JoinPathsError; pub fn join_paths<I, T>(paths: I) -> Result<OsString, JoinPathsError> |