diff options
| author | reedlepee <reedlepee123@gmail.com> | 2013-10-20 08:56:42 +0530 |
|---|---|---|
| committer | reedlepee <reedlepee123@gmail.com> | 2013-10-23 01:10:50 +0530 |
| commit | ad465441ba3424cc5bcba2227c6a42ffe09fd77f (patch) | |
| tree | 6ee335e4b7e144450fdc2e1d729602cc5a70148e /src/libstd/rt | |
| parent | 0ada7c7ffe453b9df849996f8dca0b8d0f2d9e62 (diff) | |
| download | rust-ad465441ba3424cc5bcba2227c6a42ffe09fd77f.tar.gz rust-ad465441ba3424cc5bcba2227c6a42ffe09fd77f.zip | |
Removed Unnecessary comments and white spaces #4386
Diffstat (limited to 'src/libstd/rt')
36 files changed, 25 insertions, 112 deletions
diff --git a/src/libstd/rt/borrowck.rs b/src/libstd/rt/borrowck.rs index 182515e12be..4426a3eafe1 100644 --- a/src/libstd/rt/borrowck.rs +++ b/src/libstd/rt/borrowck.rs @@ -29,7 +29,6 @@ static ALL_BITS: uint = FROZEN_BIT | MUT_BIT; #[deriving(Eq)] pub struct BorrowRecord { - // all made byt reedlepee priv box: *mut raw::Box<()>, file: *c_char, priv line: size_t diff --git a/src/libstd/rt/comm.rs b/src/libstd/rt/comm.rs index b74ae01fa30..0d4271a33c2 100644 --- a/src/libstd/rt/comm.rs +++ b/src/libstd/rt/comm.rs @@ -48,14 +48,12 @@ struct Packet<T> { // A one-shot channel. pub struct ChanOne<T> { - // all made priv by reeldepee priv void_packet: *mut Void, priv suppress_finalize: bool } /// A one-shot port. pub struct PortOne<T> { - // all made priv by reeldepee priv void_packet: *mut Void, priv suppress_finalize: bool } @@ -445,14 +443,12 @@ type StreamPortOne<T> = PortOne<StreamPayload<T>>; /// A channel with unbounded size. pub struct Chan<T> { - // all made priv by reeldepee // FIXME #5372. Using Cell because we don't take &mut self next: Cell<StreamChanOne<T>> } /// An port with unbounded size. pub struct Port<T> { - // all made priv by reeldepee // FIXME #5372. Using Cell because we don't take &mut self next: Cell<StreamPortOne<T>> } @@ -581,7 +577,6 @@ impl<'self, T> SelectPortInner<T> for &'self Port<T> { impl<'self, T> SelectPort<T> for &'self Port<T> { } pub struct SharedChan<T> { - // already priv // Just like Chan, but a shared AtomicOption instead of Cell priv next: UnsafeArc<AtomicOption<StreamChanOne<T>>> } @@ -635,7 +630,6 @@ impl<T> Clone for SharedChan<T> { } pub struct SharedPort<T> { - // already priv // The next port on which we will receive the next port on which we will receive T priv next_link: UnsafeArc<AtomicOption<PortOne<StreamPortOne<T>>>> } diff --git a/src/libstd/rt/crate_map.rs b/src/libstd/rt/crate_map.rs index 54a1c2406d0..dd71426938d 100644 --- a/src/libstd/rt/crate_map.rs +++ b/src/libstd/rt/crate_map.rs @@ -21,13 +21,11 @@ use vec::ImmutableVector; extern {} pub struct ModEntry<'self> { - // made priv by reedlepee name: &'self str, log_level: *mut u32 } pub struct CrateMap<'self> { - // made priv by reedlepee priv version: i32, priv entries: &'self [ModEntry<'self>], priv children: &'self [&'self CrateMap<'self>] diff --git a/src/libstd/rt/io/buffered.rs b/src/libstd/rt/io/buffered.rs index a33892736b0..9dcb35c806f 100644 --- a/src/libstd/rt/io/buffered.rs +++ b/src/libstd/rt/io/buffered.rs @@ -64,7 +64,6 @@ static DEFAULT_CAPACITY: uint = 64 * 1024; /// Wraps a Reader and buffers input from it pub struct BufferedReader<R> { - // all already priv priv inner: R, priv buf: ~[u8], priv pos: uint, @@ -176,7 +175,6 @@ impl<R: Reader> Decorator<R> for BufferedReader<R> { /// /// Note that `BufferedWriter` will NOT flush its buffer when dropped. pub struct BufferedWriter<W> { - // all already priv priv inner: W, priv buf: ~[u8], priv pos: uint @@ -252,7 +250,6 @@ impl<W: Reader> Reader for InternalBufferedWriter<W> { /// /// Note that `BufferedStream` will NOT flush its output buffer when dropped. pub struct BufferedStream<S> { - // all already priv priv inner: BufferedReader<InternalBufferedWriter<S>> } diff --git a/src/libstd/rt/io/extensions.rs b/src/libstd/rt/io/extensions.rs index 5a3524195c7..99634b532b0 100644 --- a/src/libstd/rt/io/extensions.rs +++ b/src/libstd/rt/io/extensions.rs @@ -368,7 +368,6 @@ impl<T: Reader> ReaderUtil for T { /// each call to its `.next()` method. /// Yields `None` if the condition is handled. pub struct ByteIterator<T> { - // all already priv priv reader: T, } diff --git a/src/libstd/rt/io/file.rs b/src/libstd/rt/io/file.rs index 9d633ec1c65..3869f99adea 100644 --- a/src/libstd/rt/io/file.rs +++ b/src/libstd/rt/io/file.rs @@ -298,7 +298,6 @@ pub fn readdir<P: PathLike>(path: &P) -> Option<~[Path]> { /// Constrained version of `FileStream` that only exposes read-specific operations. /// /// Can be retreived via `FileInfo.open_reader()`. -/// all already priv pub struct FileReader { priv stream: FileStream } /// a `std::rt::io::Reader` trait impl for file I/O. @@ -326,7 +325,6 @@ impl Seek for FileReader { /// Constrained version of `FileStream` that only exposes write-specific operations. /// /// Can be retreived via `FileInfo.open_writer()`. -// already priv pub struct FileWriter { priv stream: FileStream } /// a `std::rt::io::Writer` trait impl for file I/O. @@ -364,7 +362,6 @@ impl Seek for FileWriter { /// For this reason, it is best to use the access-constrained wrappers that are /// exposed via `FileInfo.open_reader()` and `FileInfo.open_writer()`. pub struct FileStream { - // all made by reedlepee priv fd: ~RtioFileStream, priv last_nread: int, } diff --git a/src/libstd/rt/io/flate.rs b/src/libstd/rt/io/flate.rs index 9c49f2afb1e..8a5aa171eb8 100644 --- a/src/libstd/rt/io/flate.rs +++ b/src/libstd/rt/io/flate.rs @@ -17,7 +17,6 @@ use super::*; /// A Writer decorator that compresses using the 'deflate' scheme pub struct DeflateWriter<W> { - // all made by reedlepee priv inner_writer: W } @@ -57,7 +56,6 @@ impl<W: Writer> Decorator<W> for DeflateWriter<W> { /// A Reader decorator that decompresses using the 'deflate' scheme pub struct InflateReader<R> { - // all made by reedlepee priv inner_reader: R } diff --git a/src/libstd/rt/io/mem.rs b/src/libstd/rt/io/mem.rs index 85bd46ebaf4..5f6b4398c22 100644 --- a/src/libstd/rt/io/mem.rs +++ b/src/libstd/rt/io/mem.rs @@ -22,7 +22,6 @@ use vec; /// Writes to an owned, growable byte vector pub struct MemWriter { - // already priv priv buf: ~[u8] } @@ -67,7 +66,6 @@ impl Decorator<~[u8]> for MemWriter { /// Reads from an owned byte vector pub struct MemReader { - // already priv priv buf: ~[u8], priv pos: uint } @@ -131,7 +129,6 @@ impl Decorator<~[u8]> for MemReader { /// Writes to a fixed-size byte slice pub struct BufWriter<'self> { - // already priv priv buf: &'self mut [u8], priv pos: uint } @@ -160,7 +157,6 @@ impl<'self> Seek for BufWriter<'self> { /// Reads from a fixed-size byte slice pub struct BufReader<'self> { - // already priv priv buf: &'self [u8], priv pos: uint } diff --git a/src/libstd/rt/io/mock.rs b/src/libstd/rt/io/mock.rs index 30775ec90ba..44709c7b7b6 100644 --- a/src/libstd/rt/io/mock.rs +++ b/src/libstd/rt/io/mock.rs @@ -12,7 +12,6 @@ use option::{Option, None}; use rt::io::{Reader, Writer}; pub struct MockReader { - // all made by reedlepee read: ~fn(buf: &mut [u8]) -> Option<uint>, priv eof: ~fn() -> bool } diff --git a/src/libstd/rt/io/mod.rs b/src/libstd/rt/io/mod.rs index d9951741ab2..c0971b5d3cd 100644 --- a/src/libstd/rt/io/mod.rs +++ b/src/libstd/rt/io/mod.rs @@ -341,7 +341,6 @@ pub static DEFAULT_BUF_SIZE: uint = 1024 * 64; /// /// Is something like this sufficient? It's kind of archaic pub struct IoError { - // all made by reedlepee kind: IoErrorKind, desc: &'static str, detail: Option<~str> @@ -649,7 +648,6 @@ pub enum FileAccess { } pub struct FileStat { - // all made by reedlepee /// A `Path` object containing information about the `PathInfo`'s location path: Path, /// `true` if the file pointed at by the `PathInfo` is a regular file diff --git a/src/libstd/rt/io/native/file.rs b/src/libstd/rt/io/native/file.rs index cce2e851452..d6820981181 100644 --- a/src/libstd/rt/io/native/file.rs +++ b/src/libstd/rt/io/native/file.rs @@ -61,7 +61,6 @@ fn keep_going(data: &[u8], f: &fn(*u8, uint) -> i64) -> i64 { pub type fd_t = libc::c_int; pub struct FileDesc { - // aleady priv priv fd: fd_t, } @@ -127,7 +126,6 @@ impl Drop for FileDesc { } pub struct CFile { - // aleady priv priv file: *libc::FILE } diff --git a/src/libstd/rt/io/native/process.rs b/src/libstd/rt/io/native/process.rs index 73ce330cd49..91fff6d9263 100644 --- a/src/libstd/rt/io/native/process.rs +++ b/src/libstd/rt/io/native/process.rs @@ -25,7 +25,6 @@ use super::file; * for the process to terminate. */ pub struct Process { - // aleady priv /// The unique id of the process (this should never be negative). priv pid: pid_t, diff --git a/src/libstd/rt/io/native/stdio.rs b/src/libstd/rt/io/native/stdio.rs index 41c25e0841a..5661725d77b 100644 --- a/src/libstd/rt/io/native/stdio.rs +++ b/src/libstd/rt/io/native/stdio.rs @@ -31,7 +31,6 @@ pub fn println(s: &str) { } pub struct StdIn { - // aleady priv priv fd: file::FileDesc } @@ -50,7 +49,6 @@ impl Reader for StdIn { } pub struct StdOut { - // aleady priv priv fd: file::FileDesc } diff --git a/src/libstd/rt/io/net/ip.rs b/src/libstd/rt/io/net/ip.rs index 945014867e2..f72d2e1f19b 100644 --- a/src/libstd/rt/io/net/ip.rs +++ b/src/libstd/rt/io/net/ip.rs @@ -48,7 +48,6 @@ impl ToStr for IpAddr { #[deriving(Eq, TotalEq, Clone)] pub struct SocketAddr { - // all made by reedlpee ip: IpAddr, port: Port, } diff --git a/src/libstd/rt/io/net/tcp.rs b/src/libstd/rt/io/net/tcp.rs index 0ed5861e296..f29e17cfc2f 100644 --- a/src/libstd/rt/io/net/tcp.rs +++ b/src/libstd/rt/io/net/tcp.rs @@ -21,7 +21,6 @@ use rt::rtio::{IoFactory, IoFactoryObject, use rt::local::Local; pub struct TcpStream { - // aleady priv priv obj: ~RtioTcpStreamObject } @@ -100,7 +99,6 @@ impl Writer for TcpStream { } pub struct TcpListener { - // aleady priv priv obj: ~RtioTcpListenerObject } @@ -144,7 +142,6 @@ impl Listener<TcpStream, TcpAcceptor> for TcpListener { } pub struct TcpAcceptor { - // aleady priv priv obj: ~RtioTcpAcceptorObject } diff --git a/src/libstd/rt/io/net/udp.rs b/src/libstd/rt/io/net/udp.rs index 5c63dd5352e..27faae0838b 100644 --- a/src/libstd/rt/io/net/udp.rs +++ b/src/libstd/rt/io/net/udp.rs @@ -17,7 +17,6 @@ use rt::rtio::{RtioSocket, RtioUdpSocketObject, RtioUdpSocket, IoFactory, IoFact use rt::local::Local; pub struct UdpSocket { - // aleady priv priv obj: ~RtioUdpSocketObject } @@ -73,7 +72,6 @@ impl UdpSocket { } pub struct UdpStream { - // aleady priv priv socket: UdpSocket, priv connectedTo: SocketAddr } diff --git a/src/libstd/rt/io/pipe.rs b/src/libstd/rt/io/pipe.rs index a89419fa41f..d2cd531ed26 100644 --- a/src/libstd/rt/io/pipe.rs +++ b/src/libstd/rt/io/pipe.rs @@ -21,7 +21,6 @@ use rt::rtio::{RtioPipe, RtioPipeObject, IoFactoryObject, IoFactory}; use rt::rtio::RtioUnboundPipeObject; pub struct PipeStream { - // already priv priv obj: RtioPipeObject } diff --git a/src/libstd/rt/io/process.rs b/src/libstd/rt/io/process.rs index e6029e0ff9c..5f2453852ee 100644 --- a/src/libstd/rt/io/process.rs +++ b/src/libstd/rt/io/process.rs @@ -26,16 +26,13 @@ use rt::rtio::{RtioProcess, RtioProcessObject, IoFactoryObject, IoFactory}; #[cfg(not(windows))] pub static MustDieSignal: int = libc::SIGKILL as int; pub struct Process { - // already priv priv handle: ~RtioProcessObject, - // made by reedlepee io: ~[Option<io::PipeStream>], } /// This configuration describes how a new process should be spawned. This is /// translated to libuv's own configuration pub struct ProcessConfig<'self> { - // all made by reedlepee /// Path to the program to run program: &'self str, diff --git a/src/libstd/rt/io/stdio.rs b/src/libstd/rt/io/stdio.rs index 9f540dd0a81..e6dd9a48099 100644 --- a/src/libstd/rt/io/stdio.rs +++ b/src/libstd/rt/io/stdio.rs @@ -87,7 +87,6 @@ pub fn println_args(fmt: &fmt::Arguments) { /// Representation of a reader of a standard input stream pub struct StdReader { - // aleady priv priv inner: ~RtioFileStream } @@ -107,7 +106,6 @@ impl Reader for StdReader { /// Representation of a writer to a standard output stream pub struct StdWriter { - // aleady priv priv inner: ~RtioFileStream } diff --git a/src/libstd/rt/io/timer.rs b/src/libstd/rt/io/timer.rs index cb35fdf5883..b41d7541a60 100644 --- a/src/libstd/rt/io/timer.rs +++ b/src/libstd/rt/io/timer.rs @@ -16,7 +16,6 @@ use rt::rtio::{IoFactory, IoFactoryObject, use rt::local::Local; pub struct Timer { - // aleady priv priv obj: ~RtioTimerObject } diff --git a/src/libstd/rt/kill.rs b/src/libstd/rt/kill.rs index 603e6627ee4..19f17ca966d 100644 --- a/src/libstd/rt/kill.rs +++ b/src/libstd/rt/kill.rs @@ -215,22 +215,21 @@ pub struct KillHandle(UnsafeArc<KillHandleInner>); /// Per-task state related to task death, killing, failure, etc. pub struct Death { - // all made priv by reedlepee // Shared among this task, its watched children, and any linked tasks who // might kill it. This is optional so we can take it by-value at exit time. - kill_handle: Option<KillHandle>, + kill_handle: Option<KillHandle>, // Handle to a watching parent, if we have one, for exit code propagation. - priv watching_parent: Option<KillHandle>, + priv watching_parent: Option<KillHandle>, // Action to be done with the exit code. If set, also makes the task wait // until all its watched children exit before collecting the status. - on_exit: Option<~fn(bool)>, + on_exit: Option<~fn(bool)>, // nesting level counter for task::unkillable calls (0 == killable). - priv unkillable: int, + priv unkillable: int, // nesting level counter for unstable::atomically calls (0 == can deschedule). - priv wont_sleep: int, + priv wont_sleep: int, // A "spare" handle to the kill flag inside the kill handle. Used during // blocking/waking as an optimization to avoid two xadds on the refcount. - priv spare_kill_flag: Option<KillFlagHandle>, + priv spare_kill_flag: Option<KillFlagHandle>, } impl Drop for KillFlag { diff --git a/src/libstd/rt/local_heap.rs b/src/libstd/rt/local_heap.rs index 0f28880871d..14df292343e 100644 --- a/src/libstd/rt/local_heap.rs +++ b/src/libstd/rt/local_heap.rs @@ -32,7 +32,6 @@ pub type OpaqueBox = c_void; pub type TypeDesc = c_void; pub struct LocalHeap { - // all made by reedlepee priv memory_region: *MemoryRegion, priv boxed_region: *BoxedRegion } diff --git a/src/libstd/rt/message_queue.rs b/src/libstd/rt/message_queue.rs index 1864ebdad33..99b5156b319 100644 --- a/src/libstd/rt/message_queue.rs +++ b/src/libstd/rt/message_queue.rs @@ -20,7 +20,6 @@ use unstable::sync::{UnsafeArc, LittleLock}; use clone::Clone; pub struct MessageQueue<T> { - // already priv priv state: UnsafeArc<State<T>> } diff --git a/src/libstd/rt/rc.rs b/src/libstd/rt/rc.rs index 3e641196cb4..2699dab6d38 100644 --- a/src/libstd/rt/rc.rs +++ b/src/libstd/rt/rc.rs @@ -24,7 +24,6 @@ use libc::c_void; use cast; pub struct RC<T> { - // all made priv by reedlepe priv p: *c_void // ~(uint, T) } diff --git a/src/libstd/rt/rtio.rs b/src/libstd/rt/rtio.rs index 485239d307f..501def8b060 100644 --- a/src/libstd/rt/rtio.rs +++ b/src/libstd/rt/rtio.rs @@ -61,7 +61,6 @@ pub trait RemoteCallback { /// Using unix flag conventions for now, which happens to also be what's supported /// libuv (it does translation to windows under the hood). pub struct FileOpenConfig { - // all made by reedlepe /// Path to file to be opened path: Path, /// Flags for file access mode (as per open(2)) diff --git a/src/libstd/rt/sched.rs b/src/libstd/rt/sched.rs index 82c56d7d9a3..d157301533c 100644 --- a/src/libstd/rt/sched.rs +++ b/src/libstd/rt/sched.rs @@ -40,7 +40,6 @@ use vec::{OwnedVector}; /// in too much allocation and too many events. pub struct Scheduler { /// There are N work queues, one per scheduler. - // already priv work_queue: WorkQueue<~Task>, /// Work queues for the other schedulers. These are created by /// cloning the core work queues. @@ -48,7 +47,6 @@ pub struct Scheduler { /// The queue of incoming messages from other schedulers. /// These are enqueued by SchedHandles after which a remote callback /// is triggered to handle the message. - // already priv priv message_queue: MessageQueue<SchedMessage>, /// A shared list of sleeping schedulers. We'll use this to wake /// up schedulers when pushing work onto the work queue. @@ -59,7 +57,6 @@ pub struct Scheduler { /// not active since there are multiple event sources that may /// wake the scheduler. It just prevents the scheduler from pushing /// multiple handles onto the sleeper list. - // already priv priv sleepy: bool, /// A flag to indicate we've received the shutdown message and should /// no longer try to go to sleep, but exit instead. @@ -796,10 +793,8 @@ pub enum SchedMessage { } pub struct SchedHandle { - //already priv priv remote: ~RemoteCallbackObject, priv queue: MessageQueue<SchedMessage>, - // made by reedlepee sched_id: uint } diff --git a/src/libstd/rt/sleeper_list.rs b/src/libstd/rt/sleeper_list.rs index 5135ed76005..f4fdf15cda6 100644 --- a/src/libstd/rt/sleeper_list.rs +++ b/src/libstd/rt/sleeper_list.rs @@ -20,7 +20,6 @@ use rt::sched::SchedHandle; use clone::Clone; pub struct SleeperList { - // already priv priv state: UnsafeArc<State> } diff --git a/src/libstd/rt/stack.rs b/src/libstd/rt/stack.rs index 7bffc93c693..55bd4b0732a 100644 --- a/src/libstd/rt/stack.rs +++ b/src/libstd/rt/stack.rs @@ -15,7 +15,6 @@ use ops::Drop; use libc::{c_uint, uintptr_t}; pub struct StackSegment { - // all made by reedlepee priv buf: ~[u8], priv valgrind_id: c_uint } diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs index 6e0b96c221e..ca96ee032e2 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -43,7 +43,6 @@ use send_str::SendStr; // the type-specific state. pub struct Task { - //all priv made br reedlepe heap: LocalHeap, priv gc: GarbageCollector, storage: LocalStorage, @@ -57,7 +56,6 @@ pub struct Task { sched: Option<~Scheduler>, task_type: TaskType, // Dynamic borrowck debugging info - // should be public borrow_list: Option<~[BorrowRecord]> } @@ -71,7 +69,6 @@ pub struct Coroutine { /// The segment of stack on which the task is currently running or /// if the task is blocked, on which the task will resume /// execution. - //all priv made br reedlepe priv current_stack_segment: StackSegment, /// Always valid if the task is alive and not running. saved_context: Context @@ -87,7 +84,6 @@ pub struct GarbageCollector; pub struct LocalStorage(Option<local_data::Map>); pub struct Unwinder { - //all priv made br reedlepe unwinding: bool, } diff --git a/src/libstd/rt/tube.rs b/src/libstd/rt/tube.rs index 869f23baf32..16fd3fa38ea 100644 --- a/src/libstd/rt/tube.rs +++ b/src/libstd/rt/tube.rs @@ -28,7 +28,6 @@ struct TubeState<T> { } pub struct Tube<T> { - //all priv made br reedlepe priv p: RC<TubeState<T>> } diff --git a/src/libstd/rt/uv/addrinfo.rs b/src/libstd/rt/uv/addrinfo.rs index 8fa8fbdc4a1..f2abcd3aca7 100644 --- a/src/libstd/rt/uv/addrinfo.rs +++ b/src/libstd/rt/uv/addrinfo.rs @@ -25,7 +25,6 @@ type GetAddrInfoCallback = ~fn(GetAddrInfoRequest, &UvAddrInfo, Option<UvError>) pub struct GetAddrInfoRequest(*uvll::uv_getaddrinfo_t); pub struct RequestData { - // all made by reedlepee priv getaddrinfo_cb: Option<GetAddrInfoCallback>, } diff --git a/src/libstd/rt/uv/file.rs b/src/libstd/rt/uv/file.rs index 5e20f5fad88..5d64ca4d755 100644 --- a/src/libstd/rt/uv/file.rs +++ b/src/libstd/rt/uv/file.rs @@ -25,7 +25,6 @@ pub struct FsRequest(*uvll::uv_fs_t); impl Request for FsRequest {} pub struct RequestData { - // all made by reedlepee priv complete_cb: Option<FsCallback> } diff --git a/src/libstd/rt/uv/mod.rs b/src/libstd/rt/uv/mod.rs index 4c547276a50..3a6a3acbc53 100644 --- a/src/libstd/rt/uv/mod.rs +++ b/src/libstd/rt/uv/mod.rs @@ -80,7 +80,6 @@ pub mod pipe; /// with dtors may not be destructured, but tuple structs can, /// but the results are not correct. pub struct Loop { - // all made by reedlepee priv handle: *uvll::uv_loop_t } diff --git a/src/libstd/rt/uv/uvio.rs b/src/libstd/rt/uv/uvio.rs index 5e441a5414b..13c3a30eed3 100644 --- a/src/libstd/rt/uv/uvio.rs +++ b/src/libstd/rt/uv/uvio.rs @@ -180,7 +180,6 @@ fn socket_name<T, U: Watcher + NativeHandle<*T>>(sk: SocketNameKind, // Obviously an Event Loop is always home. pub struct UvEventLoop { - // all made by reedlepee priv uvio: UvIoFactory } @@ -241,7 +240,6 @@ impl EventLoop for UvEventLoop { } pub struct UvPausibleIdleCallback { - // all made by reedlepee priv watcher: IdleWatcher, priv idle_flag: bool, priv closed: bool @@ -295,7 +293,6 @@ fn test_callback_run_once() { // The entire point of async is to call into a loop from other threads so it does not need to home. pub struct UvRemoteCallback { - // all made by reedlepee // The uv async handle for triggering the callback priv async: AsyncWatcher, // A flag to tell the callback to exit, set from the dtor. This is @@ -804,7 +801,6 @@ impl IoFactory for UvIoFactory { } pub struct UvTcpListener { - // all made by reedlepee priv watcher : TcpWatcher, priv home: SchedHandle, } @@ -867,7 +863,6 @@ impl RtioTcpListener for UvTcpListener { } pub struct UvTcpAcceptor { - // all made by reedlepee priv listener: UvTcpListener, priv incoming: Tube<Result<~RtioTcpStreamObject, IoError>>, } @@ -992,7 +987,6 @@ fn write_stream(mut watcher: StreamWatcher, } pub struct UvUnboundPipe { - // all made by reedlepee pipe: Pipe, priv home: SchedHandle, } @@ -1023,7 +1017,6 @@ impl UvUnboundPipe { } pub struct UvPipeStream { - // already priv inner: ~UvUnboundPipe, } @@ -1047,7 +1040,6 @@ impl RtioPipe for UvPipeStream { } pub struct UvTcpStream { - // all made by reedlepee priv watcher: TcpWatcher, priv home: SchedHandle, } @@ -1148,7 +1140,6 @@ impl RtioTcpStream for UvTcpStream { } pub struct UvUdpSocket { - // all made by reedelpee priv watcher: UdpWatcher, priv home: SchedHandle, } @@ -1359,7 +1350,6 @@ impl RtioUdpSocket for UvUdpSocket { } pub struct UvTimer { - // all made by reedelpee priv watcher: timer::TimerWatcher, priv home: SchedHandle, } @@ -1407,7 +1397,6 @@ impl RtioTimer for UvTimer { } pub struct UvFileStream { - // all made by reedelpee priv loop_: Loop, priv fd: c_int, priv close_on_drop: bool, @@ -1541,7 +1530,6 @@ impl RtioFileStream for UvFileStream { } pub struct UvProcess { - // two made by reedelpee priv process: process::Process, // Sadly, this structure must be created before we return it, so in that @@ -1549,7 +1537,6 @@ pub struct UvProcess { priv home: Option<SchedHandle>, // All None until the process exits (exit_error may stay None) - // Rest were already priv priv exit_status: Option<int>, priv term_signal: Option<int>, priv exit_error: Option<UvError>, diff --git a/src/libstd/rt/uv/uvll.rs b/src/libstd/rt/uv/uvll.rs index 98d4fd33277..341c5b8c6e1 100644 --- a/src/libstd/rt/uv/uvll.rs +++ b/src/libstd/rt/uv/uvll.rs @@ -84,7 +84,6 @@ pub static STDIO_WRITABLE_PIPE: c_int = 0x20; // see libuv/include/uv-unix.h #[cfg(unix)] pub struct uv_buf_t { - // all made by reedelpee base: *u8, len: libc::size_t, } @@ -92,29 +91,26 @@ pub struct uv_buf_t { // see libuv/include/uv-win.h #[cfg(windows)] pub struct uv_buf_t { - // all made by reedelpee len: u32, base: *u8, } pub struct uv_process_options_t { - // all made by reedelpee - exit_cb: uv_exit_cb, - file: *libc::c_char, - args: **libc::c_char, - env: **libc::c_char, - cwd: *libc::c_char, - flags: libc::c_uint, - stdio_count: libc::c_int, - stdio: *uv_stdio_container_t, - uid: uv_uid_t, - gid: uv_gid_t, + exit_cb: uv_exit_cb, + file: *libc::c_char, + args: **libc::c_char, + env: **libc::c_char, + cwd: *libc::c_char, + flags: libc::c_uint, + stdio_count: libc::c_int, + stdio: *uv_stdio_container_t, + uid: uv_uid_t, + gid: uv_gid_t, } // These fields are private because they must be interfaced with through the // functions below. pub struct uv_stdio_container_t { - // already priv priv flags: libc::c_int, priv stream: *uv_stream_t, } @@ -137,13 +133,11 @@ pub type uv_process_t = c_void; pub type uv_pipe_t = c_void; pub struct uv_timespec_t { - // all made by reedelpee tv_sec: libc::c_long, priv tv_nsec: libc::c_long } pub struct uv_stat_t { - // all made by reedelpee priv st_dev: libc::uint64_t, st_mode: libc::uint64_t, priv st_nlink: libc::uint64_t, @@ -237,21 +231,19 @@ pub type socklen_t = c_int; #[cfg(target_os = "android")] #[cfg(target_os = "linux")] pub struct addrinfo { - // all made by reedelpee - priv ai_flags: c_int, - priv ai_family: c_int, - priv ai_socktype: c_int, - priv ai_protocol: c_int, - priv ai_addrlen: socklen_t, - ai_addr: *sockaddr, - priv ai_canonname: *char, - ai_next: *addrinfo + priv ai_flags: c_int, + priv ai_family: c_int, + priv ai_socktype: c_int, + priv ai_protocol: c_int, + priv ai_addrlen: socklen_t, + ai_addr: *sockaddr, + priv ai_canonname: *char, + ai_next: *addrinfo } #[cfg(target_os = "macos")] #[cfg(target_os = "freebsd")] pub struct addrinfo { - // all made by reedelpee priv ai_flags: c_int, priv ai_family: c_int, priv ai_socktype: c_int, @@ -264,7 +256,6 @@ pub struct addrinfo { #[cfg(windows)] pub struct addrinfo { - // all made by reedelpee priv ai_flags: c_int, priv ai_family: c_int, priv ai_socktype: c_int, @@ -272,7 +263,7 @@ pub struct addrinfo { priv ai_addrlen: size_t, priv ai_canonname: *char, ai_addr: *sockaddr, - priv vai_next: *addrinfo + priv ai_next: *addrinfo } #[cfg(unix)] pub type uv_uid_t = libc::types::os::arch::posix88::uid_t; @@ -969,7 +960,6 @@ pub unsafe fn freeaddrinfo(ai: *addrinfo) { } pub struct uv_err_data { - // all made by reedelpee priv err_name: ~str, priv err_msg: ~str, } diff --git a/src/libstd/rt/work_queue.rs b/src/libstd/rt/work_queue.rs index 7700855d7b7..24792f3904e 100644 --- a/src/libstd/rt/work_queue.rs +++ b/src/libstd/rt/work_queue.rs @@ -17,7 +17,6 @@ use kinds::Send; use clone::Clone; pub struct WorkQueue<T> { - // already priv // XXX: Another mystery bug fixed by boxing this lock priv queue: ~Exclusive<~[T]> } |
