diff options
| author | Jorge Aparicio <japaricious@gmail.com> | 2015-01-28 08:34:18 -0500 |
|---|---|---|
| committer | Jorge Aparicio <japaricious@gmail.com> | 2015-01-29 07:49:02 -0500 |
| commit | 788181d4055747b5307f186a873ab5d2acd29994 (patch) | |
| tree | 9b96bbdba0acfccaa447f312c07381425776ca80 /src/libstd | |
| parent | 09ba9f5c87a24f82d9a332fdb913511eedf5a4ec (diff) | |
| download | rust-788181d4055747b5307f186a873ab5d2acd29994.tar.gz rust-788181d4055747b5307f186a873ab5d2acd29994.zip | |
s/Show/Debug/g
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/num/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/old_io/mod.rs | 14 | ||||
| -rw-r--r-- | src/libstd/old_io/net/addrinfo.rs | 10 | ||||
| -rw-r--r-- | src/libstd/old_io/net/ip.rs | 4 | ||||
| -rw-r--r-- | src/libstd/old_io/process.rs | 6 | ||||
| -rw-r--r-- | src/libstd/old_io/util.rs | 16 | ||||
| -rw-r--r-- | src/libstd/os.rs | 2 | ||||
| -rw-r--r-- | src/libstd/path/windows.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/mod.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/sync.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/common/net.rs | 2 | ||||
| -rw-r--r-- | src/libstd/time/duration.rs | 2 |
12 files changed, 33 insertions, 33 deletions
diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs index cb74c741b2f..d010a5de622 100644 --- a/src/libstd/num/mod.rs +++ b/src/libstd/num/mod.rs @@ -951,7 +951,7 @@ mod tests { test_checked_next_power_of_two! { test_checked_next_power_of_two_u64, u64 } test_checked_next_power_of_two! { test_checked_next_power_of_two_uint, uint } - #[derive(PartialEq, Show)] + #[derive(PartialEq, Debug)] struct Value { x: int } impl ToPrimitive for Value { diff --git a/src/libstd/old_io/mod.rs b/src/libstd/old_io/mod.rs index 6c5ce129a33..c9cabe648b9 100644 --- a/src/libstd/old_io/mod.rs +++ b/src/libstd/old_io/mod.rs @@ -320,7 +320,7 @@ pub type IoResult<T> = Result<T, IoError>; /// # FIXME /// /// Is something like this sufficient? It's kind of archaic -#[derive(PartialEq, Eq, Clone, Show)] +#[derive(PartialEq, Eq, Clone, Debug)] pub struct IoError { /// An enumeration which can be matched against for determining the flavor /// of error. @@ -376,7 +376,7 @@ impl Error for IoError { } /// A list specifying general categories of I/O error. -#[derive(Copy, PartialEq, Eq, Clone, Show)] +#[derive(Copy, PartialEq, Eq, Clone, Debug)] pub enum IoErrorKind { /// Any I/O error not part of this list. OtherIoError, @@ -1662,7 +1662,7 @@ pub fn standard_error(kind: IoErrorKind) -> IoError { /// A mode specifies how a file should be opened or created. These modes are /// passed to `File::open_mode` and are used to control where the file is /// positioned when it is initially opened. -#[derive(Copy, Clone, PartialEq, Eq, Show)] +#[derive(Copy, Clone, PartialEq, Eq, Debug)] pub enum FileMode { /// Opens a file positioned at the beginning. Open, @@ -1674,7 +1674,7 @@ pub enum FileMode { /// Access permissions with which the file should be opened. `File`s /// opened with `Read` will return an error if written to. -#[derive(Copy, Clone, PartialEq, Eq, Show)] +#[derive(Copy, Clone, PartialEq, Eq, Debug)] pub enum FileAccess { /// Read-only access, requests to write will result in an error Read, @@ -1685,7 +1685,7 @@ pub enum FileAccess { } /// Different kinds of files which can be identified by a call to stat -#[derive(Copy, PartialEq, Show, Hash, Clone)] +#[derive(Copy, PartialEq, Debug, Hash, Clone)] pub enum FileType { /// This is a normal file, corresponding to `S_IFREG` RegularFile, @@ -1789,7 +1789,7 @@ pub struct UnstableFileStat { bitflags! { /// A set of permissions for a file or directory is represented by a set of /// flags which are or'd together. - #[derive(Show)] + #[derive(Debug)] flags FilePermission: u32 { const USER_READ = 0o400, const USER_WRITE = 0o200, @@ -1845,7 +1845,7 @@ mod tests { use prelude::v1::{Ok, Vec, Buffer, SliceExt}; use uint; - #[derive(Clone, PartialEq, Show)] + #[derive(Clone, PartialEq, Debug)] enum BadReaderBehavior { GoodBehavior(uint), BadBehavior(uint) diff --git a/src/libstd/old_io/net/addrinfo.rs b/src/libstd/old_io/net/addrinfo.rs index 9800cc6829e..e37744f3aa3 100644 --- a/src/libstd/old_io/net/addrinfo.rs +++ b/src/libstd/old_io/net/addrinfo.rs @@ -29,7 +29,7 @@ use sys; use vec::Vec; /// Hints to the types of sockets that are desired when looking up hosts -#[derive(Copy, Show)] +#[derive(Copy, Debug)] pub enum SocketType { Stream, Datagram, Raw } @@ -38,7 +38,7 @@ pub enum SocketType { /// to manipulate how a query is performed. /// /// The meaning of each of these flags can be found with `man -s 3 getaddrinfo` -#[derive(Copy, Show)] +#[derive(Copy, Debug)] pub enum Flag { AddrConfig, All, @@ -51,7 +51,7 @@ pub enum Flag { /// A transport protocol associated with either a hint or a return value of /// `lookup` -#[derive(Copy, Show)] +#[derive(Copy, Debug)] pub enum Protocol { TCP, UDP } @@ -61,7 +61,7 @@ pub enum Protocol { /// /// For details on these fields, see their corresponding definitions via /// `man -s 3 getaddrinfo` -#[derive(Copy, Show)] +#[derive(Copy, Debug)] pub struct Hint { pub family: uint, pub socktype: Option<SocketType>, @@ -69,7 +69,7 @@ pub struct Hint { pub flags: uint, } -#[derive(Copy, Show)] +#[derive(Copy, Debug)] pub struct Info { pub address: SocketAddr, pub family: uint, diff --git a/src/libstd/old_io/net/ip.rs b/src/libstd/old_io/net/ip.rs index e60b455aecd..f0b73bd37f2 100644 --- a/src/libstd/old_io/net/ip.rs +++ b/src/libstd/old_io/net/ip.rs @@ -32,7 +32,7 @@ use vec::Vec; pub type Port = u16; -#[derive(Copy, PartialEq, Eq, Clone, Hash, Show)] +#[derive(Copy, PartialEq, Eq, Clone, Hash, Debug)] pub enum IpAddr { Ipv4Addr(u8, u8, u8, u8), Ipv6Addr(u16, u16, u16, u16, u16, u16, u16, u16) @@ -64,7 +64,7 @@ impl fmt::Display for IpAddr { } } -#[derive(Copy, PartialEq, Eq, Clone, Hash, Show)] +#[derive(Copy, PartialEq, Eq, Clone, Hash, Debug)] pub struct SocketAddr { pub ip: IpAddr, pub port: Port, diff --git a/src/libstd/old_io/process.rs b/src/libstd/old_io/process.rs index e6037d12c28..d3e60de2780 100644 --- a/src/libstd/old_io/process.rs +++ b/src/libstd/old_io/process.rs @@ -96,12 +96,12 @@ pub struct Process { /// A representation of environment variable name /// It compares case-insensitive on Windows and case-sensitive everywhere else. #[cfg(not(windows))] -#[derive(Hash, PartialEq, Eq, Clone, Show)] +#[derive(Hash, PartialEq, Eq, Clone, Debug)] struct EnvKey(CString); #[doc(hidden)] #[cfg(windows)] -#[derive(Eq, Clone, Show)] +#[derive(Eq, Clone, Debug)] struct EnvKey(CString); #[cfg(windows)] @@ -492,7 +492,7 @@ pub enum StdioContainer { /// Describes the result of a process after it has terminated. /// Note that Windows have no signals, so the result is usually ExitStatus. -#[derive(PartialEq, Eq, Clone, Copy, Show)] +#[derive(PartialEq, Eq, Clone, Copy, Debug)] pub enum ProcessExit { /// Normal termination with an exit status. ExitStatus(int), diff --git a/src/libstd/old_io/util.rs b/src/libstd/old_io/util.rs index 87b3b9fe415..9a55f32c372 100644 --- a/src/libstd/old_io/util.rs +++ b/src/libstd/old_io/util.rs @@ -16,7 +16,7 @@ use old_io; use slice::bytes::MutableByteVector; /// Wraps a `Reader`, limiting the number of bytes that can be read from it. -#[derive(Show)] +#[derive(Debug)] pub struct LimitReader<R> { limit: uint, inner: R @@ -78,7 +78,7 @@ impl<R: Buffer> Buffer for LimitReader<R> { } /// A `Writer` which ignores bytes written to it, like /dev/null. -#[derive(Copy, Show)] +#[derive(Copy, Debug)] pub struct NullWriter; impl Writer for NullWriter { @@ -87,7 +87,7 @@ impl Writer for NullWriter { } /// A `Reader` which returns an infinite stream of 0 bytes, like /dev/zero. -#[derive(Copy, Show)] +#[derive(Copy, Debug)] pub struct ZeroReader; impl Reader for ZeroReader { @@ -108,7 +108,7 @@ impl Buffer for ZeroReader { } /// A `Reader` which is always at EOF, like /dev/null. -#[derive(Copy, Show)] +#[derive(Copy, Debug)] pub struct NullReader; impl Reader for NullReader { @@ -129,7 +129,7 @@ impl Buffer for NullReader { /// /// The `Writer`s are delegated to in order. If any `Writer` returns an error, /// that error is returned immediately and remaining `Writer`s are not called. -#[derive(Show)] +#[derive(Debug)] pub struct MultiWriter<W> { writers: Vec<W> } @@ -161,7 +161,7 @@ impl<W> Writer for MultiWriter<W> where W: Writer { /// A `Reader` which chains input from multiple `Reader`s, reading each to /// completion before moving onto the next. -#[derive(Clone, Show)] +#[derive(Clone, Debug)] pub struct ChainedReader<I, R> { readers: I, cur_reader: Option<R>, @@ -200,7 +200,7 @@ impl<R: Reader, I: Iterator<Item=R>> Reader for ChainedReader<I, R> { /// A `Reader` which forwards input from another `Reader`, passing it along to /// a `Writer` as well. Similar to the `tee(1)` command. -#[derive(Show)] +#[derive(Debug)] pub struct TeeReader<R, W> { reader: R, writer: W, @@ -242,7 +242,7 @@ pub fn copy<R: Reader, W: Writer>(r: &mut R, w: &mut W) -> old_io::IoResult<()> } /// An adaptor converting an `Iterator<u8>` to a `Reader`. -#[derive(Clone, Show)] +#[derive(Clone, Debug)] pub struct IterReader<T> { iter: T, } diff --git a/src/libstd/os.rs b/src/libstd/os.rs index fc5ac861b30..38c0a7b8f9b 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -857,7 +857,7 @@ pub enum MapOption { } /// Possible errors when creating a map. -#[derive(Copy, Show)] +#[derive(Copy, Debug)] pub enum MapError { /// # The following are POSIX-specific /// diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 34faa65af75..2e6b9d50553 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -959,7 +959,7 @@ pub fn is_sep_byte_verbatim(u: &u8) -> bool { } /// Prefix types for Path -#[derive(Copy, PartialEq, Clone, Show)] +#[derive(Copy, PartialEq, Clone, Debug)] pub enum PathPrefix { /// Prefix `\\?\`, uint is the length of the following component VerbatimPrefix(uint), diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index 43e1b1a2264..6a43eccbaba 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -390,13 +390,13 @@ pub struct SendError<T>(pub T); /// /// The `recv` operation can only fail if the sending half of a channel is /// disconnected, implying that no further messages will ever be received. -#[derive(PartialEq, Eq, Clone, Copy, Show)] +#[derive(PartialEq, Eq, Clone, Copy, Debug)] #[stable(feature = "rust1", since = "1.0.0")] pub struct RecvError; /// This enumeration is the list of the possible reasons that try_recv could not /// return data when called. -#[derive(PartialEq, Clone, Copy, Show)] +#[derive(PartialEq, Clone, Copy, Debug)] #[stable(feature = "rust1", since = "1.0.0")] pub enum TryRecvError { /// This channel is currently empty, but the sender(s) have not yet diff --git a/src/libstd/sync/mpsc/sync.rs b/src/libstd/sync/mpsc/sync.rs index 574892d419a..da3ce51a652 100644 --- a/src/libstd/sync/mpsc/sync.rs +++ b/src/libstd/sync/mpsc/sync.rs @@ -105,7 +105,7 @@ struct Buffer<T> { size: uint, } -#[derive(Show)] +#[derive(Debug)] pub enum Failure { Empty, Disconnected, diff --git a/src/libstd/sys/common/net.rs b/src/libstd/sys/common/net.rs index e42db42dc60..51b6e0a1c1e 100644 --- a/src/libstd/sys/common/net.rs +++ b/src/libstd/sys/common/net.rs @@ -32,7 +32,7 @@ use old_io; // FIXME: move uses of Arc and deadline tracking to std::io -#[derive(Show)] +#[derive(Debug)] pub enum SocketStatus { Readable, Writable, diff --git a/src/libstd/time/duration.rs b/src/libstd/time/duration.rs index fdd9cbdccf5..483e5995298 100644 --- a/src/libstd/time/duration.rs +++ b/src/libstd/time/duration.rs @@ -45,7 +45,7 @@ macro_rules! try_opt { /// ISO 8601 time duration with nanosecond precision. /// This also allows for the negative duration; see individual methods for details. -#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Show)] +#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)] pub struct Duration { secs: i64, nanos: i32, // Always 0 <= nanos < NANOS_PER_SEC |
