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 | |
| parent | 0ada7c7ffe453b9df849996f8dca0b8d0f2d9e62 (diff) | |
| download | rust-ad465441ba3424cc5bcba2227c6a42ffe09fd77f.tar.gz rust-ad465441ba3424cc5bcba2227c6a42ffe09fd77f.zip | |
Removed Unnecessary comments and white spaces #4386
Diffstat (limited to 'src')
111 files changed, 226 insertions, 539 deletions
diff --git a/src/libextra/arc.rs b/src/libextra/arc.rs index 932dac4195c..2e394014c33 100644 --- a/src/libextra/arc.rs +++ b/src/libextra/arc.rs @@ -50,7 +50,6 @@ use std::borrow; /// As sync::condvar, a mechanism for unlock-and-descheduling and signaling. pub struct Condvar<'self> { - // all were already priv priv is_mutex: bool, priv failed: &'self mut bool, priv cond: &'self sync::Condvar<'self> @@ -109,7 +108,6 @@ impl<'self> Condvar<'self> { ****************************************************************************/ /// An atomically reference counted wrapper for shared immutable state. -// all were already priv pub struct Arc<T> { priv x: UnsafeArc<T> } @@ -164,7 +162,6 @@ struct MutexArcInner<T> { priv lock: Mutex, priv failed: bool, priv data: T } /// An Arc with mutable data protected by a blocking mutex. #[no_freeze] -//All were already priv pub struct MutexArc<T> { priv x: UnsafeArc<MutexArcInner<T>> } @@ -347,7 +344,6 @@ struct RWArcInner<T> { priv lock: RWLock, priv failed: bool, priv data: T } */ #[no_freeze] pub struct RWArc<T> { - // all were already priv priv x: UnsafeArc<RWArcInner<T>>, } @@ -526,7 +522,6 @@ fn borrow_rwlock<T:Freeze + Send>(state: *mut RWArcInner<T>) -> *RWLock { /// The "write permission" token used for RWArc.write_downgrade(). pub struct RWWriteMode<'self, T> { -/// reedlepee added priv in all the feilds below priv data: &'self mut T, priv token: sync::RWLockWriteMode<'self>, priv poison: PoisonOnFail, @@ -534,7 +529,6 @@ pub struct RWWriteMode<'self, T> { /// The "read permission" token used for RWArc.write_downgrade(). pub struct RWReadMode<'self, T> { -/// reedlepee added priv in all the feilds below priv data: &'self T, priv token: sync::RWLockReadMode<'self>, } diff --git a/src/libextra/arena.rs b/src/libextra/arena.rs index 934217f581b..b684e0d429e 100644 --- a/src/libextra/arena.rs +++ b/src/libextra/arena.rs @@ -62,7 +62,6 @@ pub struct Arena { // The head is separated out from the list as a unbenchmarked // microoptimization, to avoid needing to case on the list to // access the head. -/// no change by reedlepee all were already priv priv head: Chunk, priv pod_head: Chunk, priv chunks: @mut MutList<Chunk>, diff --git a/src/libextra/base64.rs b/src/libextra/base64.rs index 212525508c1..15b93267753 100644 --- a/src/libextra/base64.rs +++ b/src/libextra/base64.rs @@ -21,7 +21,6 @@ pub enum CharacterSet { /// Contains configuration parameters for `to_base64`. pub struct Config { - /// all were made priv by reedlepee /// Character set to use priv char_set: CharacterSet, /// True to pad output with `=` characters diff --git a/src/libextra/bitv.rs b/src/libextra/bitv.rs index 39a5f1d7a66..96123ad75b2 100644 --- a/src/libextra/bitv.rs +++ b/src/libextra/bitv.rs @@ -225,7 +225,6 @@ enum Op {Union, Intersect, Assign, Difference} /// The bitvector type #[deriving(Clone)] pub struct Bitv { - /// all were made priv by reedlepee /// Internal representation of the bit vector (small or large) priv rep: BitvVariant, /// The number of valid bits in the internal representation @@ -574,7 +573,6 @@ fn iterate_bits(base: uint, bits: uint, f: &fn(uint) -> bool) -> bool { /// An iterator for `Bitv`. pub struct BitvIterator<'self> { - /// all were already priv priv bitv: &'self Bitv, priv next_idx: uint, priv end_idx: uint, @@ -636,7 +634,6 @@ impl<'self> RandomAccessIterator<bool> for BitvIterator<'self> { /// as a `uint`. #[deriving(Clone)] pub struct BitvSet { - // all were already priv!! priv size: uint, // In theory this is a `Bitv` instead of always a `BigBitv`, but knowing that @@ -903,7 +900,6 @@ impl BitvSet { } pub struct BitvSetIterator<'self> { - // all were already priv priv set: &'self BitvSet, priv next_idx: uint } diff --git a/src/libextra/c_vec.rs b/src/libextra/c_vec.rs index 501a71fca15..bd3ce20742e 100644 --- a/src/libextra/c_vec.rs +++ b/src/libextra/c_vec.rs @@ -44,7 +44,6 @@ use std::util; * The type representing a foreign chunk of memory */ pub struct CVec<T> { - /// No change all were allready priv!! priv base: *mut T, priv len: uint, priv rsrc: @DtorRes, diff --git a/src/libextra/comm.rs b/src/libextra/comm.rs index d96925bce69..a31f27a2885 100644 --- a/src/libextra/comm.rs +++ b/src/libextra/comm.rs @@ -23,7 +23,6 @@ use std::comm; /// An extension of `pipes::stream` that allows both sending and receiving. pub struct DuplexStream<T, U> { -// all were already priv priv chan: Chan<T>, priv port: Port<U>, } @@ -95,7 +94,6 @@ pub fn DuplexStream<T:Send,U:Send>() // all were already priv pub struct SyncChan<T> { priv duplex_stream: DuplexStream<T, ()> } /// An extension of `pipes::stream` that acknowledges each message received. -// all were already priv pub struct SyncPort<T> { priv duplex_stream: DuplexStream<(), T> } impl<T: Send> GenericChan<T> for SyncChan<T> { diff --git a/src/libextra/crypto/cryptoutil.rs b/src/libextra/crypto/cryptoutil.rs index d6189e33911..97b82383d84 100644 --- a/src/libextra/crypto/cryptoutil.rs +++ b/src/libextra/crypto/cryptoutil.rs @@ -284,7 +284,6 @@ macro_rules! impl_fixed_buffer( ($name:ident, $size:expr) => ( /// A fixed size buffer of 64 bytes useful for cryptographic operations. pub struct FixedBuffer64 { - // already priv priv buffer: [u8, ..64], priv buffer_idx: uint, } @@ -303,7 +302,6 @@ impl_fixed_buffer!(FixedBuffer64, 64) /// A fixed size buffer of 128 bytes useful for cryptographic operations. pub struct FixedBuffer128 { - // already priv priv buffer: [u8, ..128], priv buffer_idx: uint, } diff --git a/src/libextra/crypto/md5.rs b/src/libextra/crypto/md5.rs index 63ee2ccf790..864fc64f82b 100644 --- a/src/libextra/crypto/md5.rs +++ b/src/libextra/crypto/md5.rs @@ -159,7 +159,6 @@ static C4: [u32, ..16] = [ /// The MD5 Digest algorithm pub struct Md5 { - // already priv priv length_bytes: u64, priv buffer: FixedBuffer64, priv state: Md5State, diff --git a/src/libextra/crypto/sha1.rs b/src/libextra/crypto/sha1.rs index 9343124e83d..4d4d47feee8 100644 --- a/src/libextra/crypto/sha1.rs +++ b/src/libextra/crypto/sha1.rs @@ -43,7 +43,6 @@ static K3: u32 = 0xCA62C1D6u32; /// Structure representing the state of a Sha1 computation pub struct Sha1 { - // already priv priv h: [u32, ..DIGEST_BUF_LEN], priv length_bits: u64, priv buffer: FixedBuffer64, diff --git a/src/libextra/crypto/sha2.rs b/src/libextra/crypto/sha2.rs index 529cab91337..fb9a6df50e4 100644 --- a/src/libextra/crypto/sha2.rs +++ b/src/libextra/crypto/sha2.rs @@ -234,7 +234,6 @@ impl Engine512 { /// The SHA-512 hash algorithm pub struct Sha512 { - // already priv priv engine: Engine512 } @@ -288,7 +287,6 @@ static H512: [u64, ..8] = [ /// The SHA-384 hash algorithm pub struct Sha384 { - // already priv priv engine: Engine512 } @@ -340,7 +338,6 @@ static H384: [u64, ..8] = [ /// The SHA-512 hash algorithm with digest truncated to 256 bits pub struct Sha512Trunc256 { - // already priv priv engine: Engine512 } @@ -390,7 +387,6 @@ static H512_TRUNC_256: [u64, ..8] = [ /// The SHA-512 hash algorithm with digest truncated to 224 bits pub struct Sha512Trunc224 { - // already priv priv engine: Engine512 } @@ -647,7 +643,6 @@ impl Engine256 { /// The SHA-256 hash algorithm pub struct Sha256 { - // already priv priv engine: Engine256 } @@ -701,7 +696,6 @@ static H256: [u32, ..8] = [ /// The SHA-224 hash algorithm pub struct Sha224 { - // already priv priv engine: Engine256 } diff --git a/src/libextra/dlist.rs b/src/libextra/dlist.rs index 102f0eac853..f29cbd6ee52 100644 --- a/src/libextra/dlist.rs +++ b/src/libextra/dlist.rs @@ -32,7 +32,6 @@ use container::Deque; /// A doubly-linked list. pub struct DList<T> { - // all were already priv priv length: uint, priv list_head: Link<T>, priv list_tail: Rawlink<Node<T>>, @@ -50,7 +49,6 @@ struct Node<T> { /// Double-ended DList iterator #[deriving(Clone)] pub struct DListIterator<'self, T> { - // all were already priv priv head: &'self Link<T>, priv tail: Rawlink<Node<T>>, priv nelem: uint, @@ -58,7 +56,6 @@ pub struct DListIterator<'self, T> { /// Double-ended mutable DList iterator pub struct MutDListIterator<'self, T> { - // all were already priv priv list: &'self mut DList<T>, priv head: Rawlink<Node<T>>, priv tail: Rawlink<Node<T>>, @@ -68,7 +65,6 @@ pub struct MutDListIterator<'self, T> { /// DList consuming iterator #[deriving(Clone)] pub struct MoveIterator<T> { - // all were already priv priv list: DList<T> } diff --git a/src/libextra/ebml.rs b/src/libextra/ebml.rs index ac1edd3f116..3612b256f1b 100644 --- a/src/libextra/ebml.rs +++ b/src/libextra/ebml.rs @@ -30,7 +30,6 @@ struct EbmlState { #[deriving(Clone)] pub struct Doc { - // all these should be public data: @~[u8], start: uint, end: uint, @@ -51,9 +50,7 @@ impl Doc { } pub struct TaggedDoc { - // was made privv by reedlepee priv tag: uint, - // should be public doc: Doc, } @@ -287,7 +284,6 @@ pub mod reader { pub fn doc_as_i64(d: Doc) -> i64 { doc_as_u64(d) as i64 } pub struct Decoder { - // all were already priv priv parent: Doc, priv pos: uint, } @@ -622,9 +618,7 @@ pub mod writer { // ebml writing pub struct Encoder { - /// should be public!! writer: @io::Writer, - /// this was already privv!! priv size_positions: ~[uint], } diff --git a/src/libextra/enum_set.rs b/src/libextra/enum_set.rs index 7908f73453a..da9e0a225ba 100644 --- a/src/libextra/enum_set.rs +++ b/src/libextra/enum_set.rs @@ -18,7 +18,6 @@ pub struct EnumSet<E> { // We must maintain the invariant that no bits are set // for which no variant exists - // all were already priv priv bits: uint } @@ -101,7 +100,6 @@ impl<E:CLike> BitAnd<EnumSet<E>, EnumSet<E>> for EnumSet<E> { /// An iterator over an EnumSet pub struct EnumSetIterator<E> { - // all were already priv priv index: uint, priv bits: uint, } diff --git a/src/libextra/fileinput.rs b/src/libextra/fileinput.rs index abc3f4b98f1..112babf271b 100644 --- a/src/libextra/fileinput.rs +++ b/src/libextra/fileinput.rs @@ -109,7 +109,6 @@ file is `stdin`. */ #[deriving(Clone)] pub struct FileInputState { - // all were priv made by reedlepee priv current_path: Option<Path>, priv line_num: uint, priv line_num_file: uint @@ -156,7 +155,6 @@ struct FileInput_ { // "self.fi" -> "self." and renaming FileInput_. Documentation above // will likely have to be updated to use `let mut in = ...`. pub struct FileInput { -/// all were made priv by reedlepee priv fi: @mut FileInput_ } diff --git a/src/libextra/future.rs b/src/libextra/future.rs index f2bedd9bc7a..fdb296e5f40 100644 --- a/src/libextra/future.rs +++ b/src/libextra/future.rs @@ -32,7 +32,6 @@ use std::util::replace; /// A type encapsulating the result of a computation which may not be complete pub struct Future<A> { - // all were already privv!! priv state: FutureState<A>, } diff --git a/src/libextra/getopts.rs b/src/libextra/getopts.rs index 255c3fef24d..3663b5c8d08 100644 --- a/src/libextra/getopts.rs +++ b/src/libextra/getopts.rs @@ -112,8 +112,6 @@ pub enum Occur { /// A description of a possible option. #[deriving(Clone, Eq)] pub struct Opt { - - /// reedlepee added priv infront of them!! /// Name of the option name: Name, /// Wheter it has an argument... should be public!! @@ -136,7 +134,6 @@ enum Optval { #[deriving(Clone, Eq)] pub struct Matches { -/// reedlepee added priv infront of all /// Options that matched priv opts: ~[Opt], /// Values of the Options that matched diff --git a/src/libextra/glob.rs b/src/libextra/glob.rs index a094df4e756..5297b48b0e1 100644 --- a/src/libextra/glob.rs +++ b/src/libextra/glob.rs @@ -33,7 +33,6 @@ use sort; * pattern - see the `glob` function for more details. */ pub struct GlobIterator { - /// no change by reedlepee all were priv already!! priv root: Path, priv dir_patterns: ~[Pattern], priv options: MatchOptions, @@ -157,7 +156,6 @@ fn list_dir_sorted(path: &Path) -> ~[Path] { */ #[deriving(Clone, Eq, TotalEq, Ord, TotalOrd, IterBytes, Default)] pub struct Pattern { - // already priv priv tokens: ~[PatternToken] } @@ -476,7 +474,6 @@ fn chars_eq(a: char, b: char, case_sensitive: bool) -> bool { */ #[deriving(Clone, Eq, TotalEq, Ord, TotalOrd, IterBytes, Default)] pub struct MatchOptions { -/// all were made priv by reedlepee /** * Whether or not patterns should be matched in a case-sensitive manner. This diff --git a/src/libextra/io_util.rs b/src/libextra/io_util.rs index 415fa590d4c..27a09be3a62 100644 --- a/src/libextra/io_util.rs +++ b/src/libextra/io_util.rs @@ -16,7 +16,6 @@ use std::cast; /// An implementation of the io::Reader interface which reads a buffer of bytes pub struct BufReader { - // all were made priv by reedlepee /// The buffer of bytes to read priv buf: ~[u8], /// The current position in the buffer of bytes diff --git a/src/libextra/json.rs b/src/libextra/json.rs index 2ddb389398d..90260282e4b 100644 --- a/src/libextra/json.rs +++ b/src/libextra/json.rs @@ -48,7 +48,6 @@ pub type Object = TreeMap<~str, Json>; /// If an error occurs while parsing some JSON, this is the structure which is /// returned pub struct Error { - // all were made privv by reedlepee /// The line number at which the error occurred priv line: uint, /// The column number at which the error occurred @@ -87,7 +86,6 @@ fn spaces(n: uint) -> ~str { /// A structure for implementing serialization to JSON. pub struct Encoder { - // all were already priv priv wr: @io::Writer, } @@ -245,7 +243,6 @@ impl serialize::Encoder for Encoder { /// Another encoder for JSON, but prints out human-readable JSON instead of /// compact data pub struct PrettyEncoder { - // all were already priv priv wr: @io::Writer, priv indent: uint, } @@ -482,7 +479,6 @@ impl Json{ } pub struct Parser<T> { - // all were already priv priv rdr: ~T, priv ch: char, priv line: uint, @@ -872,7 +868,6 @@ pub fn from_str(s: &str) -> Result<Json, Error> { /// A structure to decode JSON to values in rust. pub struct Decoder { - // all were already priv priv stack: ~[Json], } diff --git a/src/libextra/num/bigint.rs b/src/libextra/num/bigint.rs index 33803cb5ff3..cd5ccc14caf 100644 --- a/src/libextra/num/bigint.rs +++ b/src/libextra/num/bigint.rs @@ -86,7 +86,6 @@ A `BigUint`-typed value `BigUint { data: @[a, b, c] }` represents a number */ #[deriving(Clone)] pub struct BigUint { - // already priv priv data: ~[BigDigit] } @@ -894,7 +893,6 @@ impl Neg<Sign> for Sign { /// A big signed integer type. #[deriving(Clone)] pub struct BigInt { - // already priv priv sign: Sign, priv data: BigUint } diff --git a/src/libextra/num/complex.rs b/src/libextra/num/complex.rs index a59a09c84e2..021a069fbbe 100644 --- a/src/libextra/num/complex.rs +++ b/src/libextra/num/complex.rs @@ -24,7 +24,6 @@ use std::num::{Zero,One,ToStrRadix}; /// A complex number in Cartesian form. #[deriving(Eq,Clone)] pub struct Cmplx<T> { - // all made real by reedlepee /// Real portion of the complex number priv re: T, /// Imaginary portion of the complex number diff --git a/src/libextra/num/rational.rs b/src/libextra/num/rational.rs index 01176f7150f..bdec950c87b 100644 --- a/src/libextra/num/rational.rs +++ b/src/libextra/num/rational.rs @@ -20,7 +20,6 @@ use super::bigint::BigInt; #[deriving(Clone)] #[allow(missing_doc)] pub struct Ratio<T> { - // made priv by reedlepee priv numer: T, priv denom: T } diff --git a/src/libextra/priority_queue.rs b/src/libextra/priority_queue.rs index a5851778ab3..587f8372087 100644 --- a/src/libextra/priority_queue.rs +++ b/src/libextra/priority_queue.rs @@ -20,7 +20,6 @@ use std::vec; /// A priority queue implemented with a binary heap #[deriving(Clone)] pub struct PriorityQueue<T> { - // all were already priv priv data: ~[T], } @@ -179,7 +178,6 @@ impl<T:Ord> PriorityQueue<T> { /// PriorityQueue iterator pub struct PriorityQueueIterator <'self, T> { - // all were already priv priv iter: vec::VecIterator<'self, T>, } diff --git a/src/libextra/ringbuf.rs b/src/libextra/ringbuf.rs index 29460464852..e7032db5a91 100644 --- a/src/libextra/ringbuf.rs +++ b/src/libextra/ringbuf.rs @@ -25,7 +25,6 @@ static MINIMUM_CAPACITY: uint = 2u; /// RingBuf is a circular buffer that implements Deque. #[deriving(Clone)] pub struct RingBuf<T> { - // all were already priv priv nelts: uint, priv lo: uint, priv elts: ~[Option<T>] @@ -249,7 +248,6 @@ macro_rules! iterator_rev { /// RingBuf iterator pub struct RingBufIterator<'self, T> { - // all were already priv priv lo: uint, priv index: uint, priv rindex: uint, @@ -277,7 +275,6 @@ impl<'self, T> RandomAccessIterator<&'self T> for RingBufIterator<'self, T> { /// RingBuf mutable iterator pub struct RingBufMutIterator<'self, T> { - // all were already priv priv lo: uint, priv index: uint, priv rindex: uint, diff --git a/src/libextra/semver.rs b/src/libextra/semver.rs index b9225e66399..02c35000ce3 100644 --- a/src/libextra/semver.rs +++ b/src/libextra/semver.rs @@ -70,7 +70,6 @@ impl ToStr for Identifier { /// Represents a version number conforming to the semantic versioning scheme. #[deriving(Clone, Eq)] pub struct Version { - /// reedlepee added priv in all /// The major version, to be incremented on incompatible changes. priv major: uint, /// The minor version, to be incremented when functionality is added in a diff --git a/src/libextra/smallintmap.rs b/src/libextra/smallintmap.rs index c0d40514c4c..0ca0ff66039 100644 --- a/src/libextra/smallintmap.rs +++ b/src/libextra/smallintmap.rs @@ -22,7 +22,6 @@ use std::vec; #[allow(missing_doc)] pub struct SmallIntMap<T> { - /// all were already priv!! priv v: ~[Option<T>], } @@ -234,7 +233,6 @@ macro_rules! double_ended_iterator { } pub struct SmallIntMapIterator<'self, T> { - /// all were already priv!! priv front: uint, priv back: uint, priv iter: VecIterator<'self, Option<T>> @@ -245,7 +243,6 @@ double_ended_iterator!(impl SmallIntMapIterator -> (uint, &'self T), get_ref) pub type SmallIntMapRevIterator<'self, T> = Invert<SmallIntMapIterator<'self, T>>; pub struct SmallIntMapMutIterator<'self, T> { - /// all were already priv!! priv front: uint, priv back: uint, priv iter: VecMutIterator<'self, Option<T>> diff --git a/src/libextra/stats.rs b/src/libextra/stats.rs index 3e252e30842..40f99716ca7 100644 --- a/src/libextra/stats.rs +++ b/src/libextra/stats.rs @@ -105,7 +105,6 @@ pub trait Stats { #[deriving(Clone, Eq)] #[allow(missing_doc)] pub struct Summary { - /// all were made privv by reedlepee priv sum: f64, // public min: f64, diff --git a/src/libextra/sync.rs b/src/libextra/sync.rs index cda912857d7..9a53fd639c5 100644 --- a/src/libextra/sync.rs +++ b/src/libextra/sync.rs @@ -168,7 +168,6 @@ enum ReacquireOrderLock<'self> { /// A mechanism for atomic-unlock-and-deschedule blocking and signalling. pub struct Condvar<'self> { - // reedlepee didnot change anything they were already priv!!! // The 'Sem' object associated with this condvar. This is the one that's // atomically-unlocked-and-descheduled upon and reacquired during wakeup. @@ -380,7 +379,6 @@ impl Semaphore { * unwinds. */ -// reedlepee did not change !! pub struct Mutex { priv sem: Sem<~[WaitQueue]> } impl Clone for Mutex { /// Create a new handle to the mutex. @@ -448,7 +446,6 @@ struct RWLockInner { * unwinds. */ pub struct RWLock { - // reedlepee did not change they were already priv!! priv order_lock: Semaphore, priv access_lock: Sem<~[WaitQueue]>, priv state: UnsafeArc<RWLockInner>, @@ -669,11 +666,9 @@ impl RWLock { /// The "write permission" token used for rwlock.write_downgrade(). -// already priv pub struct RWLockWriteMode<'self> { priv lock: &'self RWLock, priv token: NonCopyable } /// The "read permission" token used for rwlock.write_downgrade(). -// already priv pub struct RWLockReadMode<'self> { priv lock: &'self RWLock, priv token: NonCopyable } diff --git a/src/libextra/task_pool.rs b/src/libextra/task_pool.rs index 50ddac3f84b..f7db66dc4e0 100644 --- a/src/libextra/task_pool.rs +++ b/src/libextra/task_pool.rs @@ -28,7 +28,6 @@ enum Msg<T> { } pub struct TaskPool<T> { - /// all were made priv by reedlepee priv channels: ~[Chan<Msg<T>>], priv next_index: uint, } diff --git a/src/libextra/tempfile.rs b/src/libextra/tempfile.rs index f2a022de233..d8fa130916a 100644 --- a/src/libextra/tempfile.rs +++ b/src/libextra/tempfile.rs @@ -18,7 +18,6 @@ use std::rand; /// A wrapper for a path to temporary directory implementing automatic /// scope-pased deletion. pub struct TempDir { - // all were already priv!! priv path: Option<Path> } diff --git a/src/libextra/term.rs b/src/libextra/term.rs index 095afe7f77e..6bef136f414 100644 --- a/src/libextra/term.rs +++ b/src/libextra/term.rs @@ -96,18 +96,14 @@ fn cap_for_attr(attr: attr::Attr) -> &'static str { #[cfg(not(target_os = "win32"))] pub struct Terminal { -// this was made priv by reedlepee priv num_colors: u16, - // These were already priv priv out: @io::Writer, priv ti: ~TermInfo } #[cfg(target_os = "win32")] pub struct Terminal { - // this was made priv by reedlepee priv num_colors: u16, - // These were already priv priv out: @io::Writer, } diff --git a/src/libextra/terminfo/parm.rs b/src/libextra/terminfo/parm.rs index 618067efb32..c0a5d9d53aa 100644 --- a/src/libextra/terminfo/parm.rs +++ b/src/libextra/terminfo/parm.rs @@ -47,7 +47,6 @@ pub enum Param { /// Container for static and dynamic variable arrays pub struct Variables { - // made priv by redlpee /// Static variables A-Z priv sta: [Param, ..26], /// Dynamic variables a-z diff --git a/src/libextra/terminfo/terminfo.rs b/src/libextra/terminfo/terminfo.rs index 691f5420dc8..06bf6e47c32 100644 --- a/src/libextra/terminfo/terminfo.rs +++ b/src/libextra/terminfo/terminfo.rs @@ -14,7 +14,6 @@ use std::hashmap::HashMap; /// A parsed terminfo entry. pub struct TermInfo { - // made priv by redlpee /// Names for the terminal priv names: ~[~str], /// Map of capability name to boolean value diff --git a/src/libextra/test.rs b/src/libextra/test.rs index 78ee0db399e..f95c7aa22b7 100644 --- a/src/libextra/test.rs +++ b/src/libextra/test.rs @@ -102,11 +102,9 @@ impl TestFn { // Structure passed to BenchFns pub struct BenchHarness { - // all changed to priv by reedlepee priv iterations: u64, priv ns_start: u64, priv ns_end: u64, - // should be public bytes: u64 } @@ -114,27 +112,23 @@ pub struct BenchHarness { // these. #[deriving(Clone)] pub struct TestDesc { - // all changed to priv by reedlepee name: TestName, ignore: bool, should_fail: bool } pub struct TestDescAndFn { - // all changed to priv by reedlepee desc: TestDesc, testfn: TestFn, } #[deriving(Clone, Encodable, Decodable, Eq)] pub struct Metric { - // all changed to priv by reedlepee priv value: f64, priv noise: f64 } #[deriving(Eq)] -/// not adding priv infront of this struct b/c its a tuple struct!! - reedlepee pub struct MetricMap(TreeMap<~str,Metric>); impl Clone for MetricMap { @@ -192,7 +186,6 @@ pub fn test_main_static(args: &[~str], tests: &[TestDescAndFn]) { } pub struct TestOpts { - /// priv added in all by reedlepee!! filter: Option<~str>, run_ignored: bool, run_tests: bool, @@ -329,7 +322,6 @@ pub fn opt_shard(maybestr: Option<~str>) -> Option<(uint,uint)> { #[deriving(Clone, Eq)] pub struct BenchSamples { - /// priv added in all by reedlepee priv ns_iter_summ: stats::Summary, priv mb_s: uint } diff --git a/src/libextra/time.rs b/src/libextra/time.rs index 5b1754e7243..71569be3a81 100644 --- a/src/libextra/time.rs +++ b/src/libextra/time.rs @@ -32,7 +32,6 @@ pub mod rustrt { /// A record specifying a time value in seconds and nanoseconds. -/// all were made priv reedlepee #[deriving(Clone, DeepClone, Eq, Encodable, Decodable)] pub struct Timespec { priv sec: i64, priv nsec: i32 } @@ -107,7 +106,6 @@ pub fn tzset() { #[deriving(Clone, DeepClone, Eq, Encodable, Decodable)] pub struct Tm { - /// all were made priv by reedlepee priv tm_sec: i32, // seconds after the minute ~[0-60] priv tm_min: i32, // minutes after the hour ~[0-59] priv tm_hour: i32, // hours after midnight ~[0-23] diff --git a/src/libextra/treemap.rs b/src/libextra/treemap.rs index ebb3494b5eb..ad196b32fb2 100644 --- a/src/libextra/treemap.rs +++ b/src/libextra/treemap.rs @@ -36,7 +36,6 @@ use std::cmp::Ordering; #[allow(missing_doc)] #[deriving(Clone)] pub struct TreeMap<K, V> { - /// all were already priv!! priv root: Option<~TreeNode<K, V>>, priv length: uint } @@ -230,7 +229,6 @@ impl<K: TotalOrd, V> TreeMap<K, V> { /// Lazy forward iterator over a map pub struct TreeMapIterator<'self, K, V> { - // all were already priv priv stack: ~[&'self ~TreeNode<K, V>], priv node: &'self Option<~TreeNode<K, V>>, priv remaining_min: uint, @@ -277,7 +275,6 @@ impl<'self, K, V> Iterator<(&'self K, &'self V)> for TreeMapIterator<'self, K, V /// Lazy backward iterator over a map pub struct TreeMapRevIterator<'self, K, V> { - // all were already priv priv iter: TreeMapIterator<'self, K, V>, } @@ -336,7 +333,6 @@ fn iter_traverse_complete<'a, K, V>(it: &mut TreeMapIterator<'a, K, V>) { /// Lazy forward iterator over a map that consumes the map while iterating pub struct TreeMapMoveIterator<K, V> { - // all were laready priv!! priv stack: ~[TreeNode<K, V>], priv remaining: uint } @@ -405,7 +401,6 @@ impl<'self, T> Iterator<&'self T> for TreeSetRevIterator<'self, T> { /// only requirement is that the type of the elements contained ascribes to the /// `TotalOrd` trait. pub struct TreeSet<T> { - //all were already priv priv map: TreeMap<T, ()> } @@ -558,40 +553,34 @@ impl<T: TotalOrd> TreeSet<T> { /// Lazy forward iterator over a set pub struct TreeSetIterator<'self, T> { - // all were already priv priv iter: TreeMapIterator<'self, T, ()> } /// Lazy backward iterator over a set pub struct TreeSetRevIterator<'self, T> { - // all were already priv priv iter: TreeMapRevIterator<'self, T, ()> } /// Lazy iterator producing elements in the set difference (in-order) pub struct Difference<'self, T> { - // all were already priv priv a: Peekable<&'self T, TreeSetIterator<'self, T>>, priv b: Peekable<&'self T, TreeSetIterator<'self, T>>, } /// Lazy iterator producing elements in the set symmetric difference (in-order) pub struct SymDifference<'self, T> { - // all were already priv priv a: Peekable<&'self T, TreeSetIterator<'self, T>>, priv b: Peekable<&'self T, TreeSetIterator<'self, T>>, } /// Lazy iterator producing elements in the set intersection (in-order) pub struct Intersection<'self, T> { - // all were already priv priv a: Peekable<&'self T, TreeSetIterator<'self, T>>, priv b: Peekable<&'self T, TreeSetIterator<'self, T>>, } /// Lazy iterator producing elements in the set intersection (in-order) pub struct Union<'self, T> { - // all were already priv priv a: Peekable<&'self T, TreeSetIterator<'self, T>>, priv b: Peekable<&'self T, TreeSetIterator<'self, T>>, } diff --git a/src/libextra/url.rs b/src/libextra/url.rs index 103d185aa1e..e836d3b5270 100644 --- a/src/libextra/url.rs +++ b/src/libextra/url.rs @@ -22,21 +22,19 @@ use std::uint; #[deriving(Clone, Eq)] pub struct Url { - // all were made privv bt reedlepee - priv scheme: ~str, - priv user: Option<UserInfo>, - priv host: ~str, - priv port: Option<~str>, - priv path: ~str, - priv query: Query, - priv fragment: Option<~str> + scheme: ~str, + user: Option<UserInfo>, + host: ~str, + port: Option<~str>, + path: ~str, + query: Query, + fragment: Option<~str> } #[deriving(Clone, Eq)] pub struct UserInfo { - // all were made privv bt reedlepee - priv user: ~str, - priv pass: Option<~str> + user: ~str, + pass: Option<~str> } pub type Query = ~[(~str, ~str)]; diff --git a/src/libextra/uuid.rs b/src/libextra/uuid.rs index fa5c302faee..345cf64f128 100644 --- a/src/libextra/uuid.rs +++ b/src/libextra/uuid.rs @@ -102,7 +102,6 @@ pub enum UuidVariant { /// A Universally Unique Identifier (UUID) pub struct Uuid { /// The 128-bit number stored in 16 bytes - /// should be public bytes: UuidBytes } diff --git a/src/libextra/workcache.rs b/src/libextra/workcache.rs index f30fa3362c5..4d79b2059db 100644 --- a/src/libextra/workcache.rs +++ b/src/libextra/workcache.rs @@ -128,7 +128,6 @@ impl WorkMap { } pub struct Database { - /// all were made by reedlepee priv db_filename: Path, priv db_cache: TreeMap<~str, ~str>, db_dirty: bool @@ -210,7 +209,6 @@ impl Drop for Database { pub struct Logger { // FIXME #4432: Fill in - /// alll were made priv reeldepee priv a: () } @@ -229,7 +227,6 @@ pub type FreshnessMap = TreeMap<~str,extern fn(&str,&str)->bool>; #[deriving(Clone)] pub struct Context { -//// all were made priv by reedlepee db: RWArc<Database>, priv logger: RWArc<Logger>, priv cfg: Arc<json::Object>, @@ -243,14 +240,12 @@ pub struct Context { } pub struct Prep<'self> { -//// all were made priv by reedlepee priv ctxt: &'self Context, priv fn_name: &'self str, priv declared_inputs: WorkMap, } pub struct Exec { -//// all were made priv by reedlepee priv discovered_inputs: WorkMap, priv discovered_outputs: WorkMap } diff --git a/src/libstd/c_str.rs b/src/libstd/c_str.rs index 2f1ac2c6b6b..acfa02a4def 100644 --- a/src/libstd/c_str.rs +++ b/src/libstd/c_str.rs @@ -92,7 +92,6 @@ condition! { /// This structure wraps a `*libc::c_char`, and will automatically free the /// memory it is pointing to when it goes out of scope. pub struct CString { - // already priv priv buf: *libc::c_char, priv owns_buffer_: bool, } @@ -333,7 +332,6 @@ fn check_for_null(v: &[u8], buf: *mut libc::c_char) { /// /// Use with the `std::iterator` module. pub struct CStringIterator<'self> { - // already priv priv ptr: *libc::c_char, priv lifetime: &'self libc::c_char, // FIXME: #5922 } diff --git a/src/libstd/cell.rs b/src/libstd/cell.rs index e1ba46e8f27..a1459b780df 100644 --- a/src/libstd/cell.rs +++ b/src/libstd/cell.rs @@ -26,7 +26,6 @@ Similar to a mutable option type, but friendlier. #[deriving(Clone, DeepClone, Eq)] #[allow(missing_doc)] pub struct Cell<T> { - // already priv priv value: Option<T> } diff --git a/src/libstd/condition.rs b/src/libstd/condition.rs index 346e8a51322..cb9552b189c 100644 --- a/src/libstd/condition.rs +++ b/src/libstd/condition.rs @@ -72,7 +72,6 @@ use unstable::raw::Closure; #[doc(hidden)] pub struct Handler<T, U> { - //already priv priv handle: Closure, priv prev: Option<@Handler<T, U>>, } @@ -84,7 +83,6 @@ pub struct Handler<T, U> { /// This struct should never be created directly, but rather only through the /// `condition!` macro provided to all libraries using libstd. pub struct Condition<T, U> { - // all made priv by reedlepee /// Name of the condition handler name: &'static str, /// TLS key used to insert/remove values in TLS. diff --git a/src/libstd/fmt/mod.rs b/src/libstd/fmt/mod.rs index b47559b6055..e5188d737bd 100644 --- a/src/libstd/fmt/mod.rs +++ b/src/libstd/fmt/mod.rs @@ -477,7 +477,6 @@ pub mod rt; /// should be formatted. A mutable version of this is passed to all formatting /// traits. pub struct Formatter<'self> { - // made by reedlepee /// Flags for formatting (packed version of rt::Flag) flags: uint, /// Character used as 'fill' whenever there is alignment @@ -502,7 +501,6 @@ pub struct Formatter<'self> { /// compile time it is ensured that the function and the value have the correct /// types, and then this struct is used to canonicalize arguments to one type. pub struct Argument<'self> { - // already priv priv formatter: extern "Rust" fn(&util::Void, &mut Formatter), priv value: &'self util::Void, } @@ -529,7 +527,6 @@ impl<'self> Arguments<'self> { /// string at compile-time so usage of the `write` and `format` functions can /// be safely performed. pub struct Arguments<'self> { - // already priv priv fmt: &'self [rt::Piece<'self>], priv args: &'self [Argument<'self>], } diff --git a/src/libstd/fmt/parse.rs b/src/libstd/fmt/parse.rs index fea512c08b4..504050f9a77 100644 --- a/src/libstd/fmt/parse.rs +++ b/src/libstd/fmt/parse.rs @@ -38,20 +38,17 @@ pub enum Piece<'self> { /// Representation of an argument specification. #[deriving(Eq)] pub struct Argument<'self> { - // made by reedlepee /// Where to find this argument position: Position<'self>, - /// How to format the argument + /// How to format the argument format: FormatSpec<'self>, /// If not `None`, what method to invoke on the argument - // should be public method: Option<~Method<'self>> } /// Specification for the formatting of an argument in the format string. #[deriving(Eq)] pub struct FormatSpec<'self> { - // made by reedlepee /// Optionally specified character to fill alignment with fill: Option<char>, /// Optionally specified alignment @@ -128,7 +125,6 @@ pub enum Method<'self> { /// Structure representing one "arm" of the `plural` function. #[deriving(Eq)] pub struct PluralArm<'self> { - // made by reedlepee /// A selector can either be specified by a keyword or with an integer /// literal. selector: Either<PluralKeyword, uint>, @@ -149,7 +145,6 @@ pub enum PluralKeyword { /// Structure representing one "arm" of the `select` function. #[deriving(Eq)] pub struct SelectArm<'self> { - // made by reedlepee /// String selector which guards this arm selector: &'self str, /// Array of pieces which are the format of this arm @@ -163,7 +158,6 @@ pub struct SelectArm<'self> { /// This is a recursive-descent parser for the sake of simplicity, and if /// necessary there's probably lots of room for improvement performance-wise. pub struct Parser<'self> { - // already priv priv input: &'self str, priv cur: str::CharOffsetIterator<'self>, priv depth: uint, diff --git a/src/libstd/fmt/rt.rs b/src/libstd/fmt/rt.rs index a623695c8a1..d9a7557e553 100644 --- a/src/libstd/fmt/rt.rs +++ b/src/libstd/fmt/rt.rs @@ -29,14 +29,12 @@ pub enum Piece<'self> { } pub struct Argument<'self> { - /// should be public position: Position, format: FormatSpec, method: Option<&'self Method<'self>> } pub struct FormatSpec { - /// made by redlepee fill: char, align: parse::Alignment, flags: uint, @@ -58,13 +56,11 @@ pub enum Method<'self> { } pub struct PluralArm<'self> { - /// made by redlepee selector: Either<parse::PluralKeyword, uint>, result: &'self [Piece<'self>], } pub struct SelectArm<'self> { - /// made by redlepee selector: &'self str, result: &'self [Piece<'self>], } diff --git a/src/libstd/hashmap.rs b/src/libstd/hashmap.rs index ec792510271..edefd39ebb4 100644 --- a/src/libstd/hashmap.rs +++ b/src/libstd/hashmap.rs @@ -48,7 +48,6 @@ struct Bucket<K,V> { /// `IterBytes` traits as `Hash` is automatically implemented for types that /// implement `IterBytes`. pub struct HashMap<K,V> { - // already priv priv k0: u64, priv k1: u64, priv resize_at: uint, @@ -518,32 +517,27 @@ impl<K:Hash + Eq + Clone,V:Clone> Clone for HashMap<K,V> { /// HashMap iterator #[deriving(Clone)] pub struct HashMapIterator<'self, K, V> { - // already priv priv iter: vec::VecIterator<'self, Option<Bucket<K, V>>>, } /// HashMap mutable values iterator pub struct HashMapMutIterator<'self, K, V> { - // already priv priv iter: vec::VecMutIterator<'self, Option<Bucket<K, V>>>, } /// HashMap move iterator pub struct HashMapMoveIterator<K, V> { - // already priv priv iter: vec::MoveRevIterator<Option<Bucket<K, V>>>, } /// HashSet iterator #[deriving(Clone)] pub struct HashSetIterator<'self, K> { - // already priv priv iter: vec::VecIterator<'self, Option<Bucket<K, ()>>>, } /// HashSet move iterator pub struct HashSetMoveIterator<K> { - // already priv priv iter: vec::MoveRevIterator<Option<Bucket<K, ()>>>, } @@ -637,7 +631,6 @@ impl<K: Eq + Hash, V> Default for HashMap<K, V> { /// HashMap where the value is (). As with the `HashMap` type, a `HashSet` /// requires that the elements implement the `Eq` and `Hash` traits. pub struct HashSet<T> { - // already priv priv map: HashMap<T, ()> } diff --git a/src/libstd/io.rs b/src/libstd/io.rs index 297ba84fbf9..922150cb279 100644 --- a/src/libstd/io.rs +++ b/src/libstd/io.rs @@ -1009,7 +1009,6 @@ impl<R:Reader,C> Reader for Wrapper<R, C> { } pub struct FILERes { - // all by reedlepee priv f: *libc::FILE, } @@ -1081,7 +1080,6 @@ pub fn file_reader(path: &Path) -> Result<@Reader, ~str> { // Byte readers pub struct BytesReader { - // all by reedlepee // FIXME(#5723) see other FIXME below // FIXME(#7268) this should also be parameterized over <'self> bytes: &'static [u8], @@ -1284,7 +1282,6 @@ impl Writer for fd_t { } pub struct FdRes { - // all by reedlepee priv fd: fd_t, } @@ -1677,7 +1674,6 @@ pub fn println(s: &str) { } pub struct BytesWriter { - // all by reedlepee bytes: @mut ~[u8], pos: @mut uint, } @@ -1796,7 +1792,6 @@ pub mod fsync { // Artifacts that need to fsync on destruction pub struct Res<t> { - // all by reedlepee priv arg: Arg<t>, } @@ -1820,7 +1815,6 @@ pub mod fsync { } pub struct Arg<t> { - // all by reedlepee priv val: t, priv opt_level: Option<Level>, priv fsync_fn: extern "Rust" fn(f: &t, Level) -> int, diff --git a/src/libstd/iter.rs b/src/libstd/iter.rs index 4985557dff7..e854d338f54 100644 --- a/src/libstd/iter.rs +++ b/src/libstd/iter.rs @@ -765,8 +765,6 @@ impl<A, B, T: ExactSize<A>, U: ExactSize<B>> ExactSize<(A, B)> for Zip<T, U> {} /// An double-ended iterator with the direction inverted #[deriving(Clone)] pub struct Invert<T> { - // already priv - // already priv priv iter: T } diff --git a/src/libstd/libc.rs b/src/libstd/libc.rs index 67d64596460..d4df0e826f6 100644 --- a/src/libstd/libc.rs +++ b/src/libstd/libc.rs @@ -226,16 +226,15 @@ pub mod types { use libc::types::common::c95::{c_void}; use libc::types::os::arch::c95::{c_char, size_t}; pub struct glob_t { - // all made by reedlepee - priv gl_pathc: size_t, - priv gl_pathv: **c_char, - priv gl_offs: size_t, - - priv __unused1: *c_void, - priv __unused2: *c_void, - priv __unused3: *c_void, - __unused4: *c_void, - __unused5: *c_void, + gl_pathc: size_t, + gl_pathv: **c_char, + gl_offs: size_t, + + __unused1: *c_void, + __unused2: *c_void, + __unused3: *c_void, + __unused4: *c_void, + __unused5: *c_void, } } } @@ -305,16 +304,15 @@ pub mod types { pub type blkcnt_t = i32; pub struct stat { - // all made by reedlepee st_dev: dev_t, - __pad1: c_short, + __pad1: c_short, st_ino: ino_t, st_mode: mode_t, st_nlink: nlink_t, - st_uid: uid_t, + st_uid: uid_t, st_gid: gid_t, - st_rdev: dev_t, - __pad2: c_short, + st_rdev: dev_t, + __pad2: c_short, st_size: off_t, st_blksize: blksize_t, st_blocks: blkcnt_t, @@ -325,7 +323,7 @@ pub mod types { st_ctime: time_t, st_ctime_nsec: c_long, __unused4: c_long, - __unused5: c_long, + __unused5: c_long, } } #[cfg(target_arch = "arm")] @@ -339,16 +337,15 @@ pub mod types { pub type blkcnt_t = u32; pub struct stat { - // all made priv by reedlepee st_dev: c_ulonglong, - priv __pad0: [c_uchar, ..4], - priv __st_ino: ino_t, + __pad0: [c_uchar, ..4], + __st_ino: ino_t, st_mode: c_uint, st_nlink: c_uint, - st_uid: uid_t, - st_gid: gid_t, - st_rdev: c_ulonglong, - priv __pad3: [c_uchar, ..4], + st_uid: uid_t, + st_gid: gid_t, + st_rdev: c_ulonglong, + __pad3: [c_uchar, ..4], st_size: c_longlong, st_blksize: blksize_t, st_blocks: c_ulonglong, @@ -356,8 +353,8 @@ pub mod types { st_atime_nsec: c_ulong, st_mtime: time_t, st_mtime_nsec: c_ulong, - st_ctime: time_t, - st_ctime_nsec: c_ulong, + st_ctime: time_t, + st_ctime_nsec: c_ulong, st_ino: c_ulonglong } } @@ -373,18 +370,17 @@ pub mod types { pub type blkcnt_t = i32; pub struct stat { - /// all made priv by reedlepee st_dev: c_ulong, - priv st_pad1: [c_long, ..3], + st_pad1: [c_long, ..3], st_ino: ino_t, st_mode: mode_t, st_nlink: nlink_t, st_uid: uid_t, st_gid: gid_t, st_rdev: c_ulong, - priv st_pad2: [c_long, ..2], + st_pad2: [c_long, ..2], st_size: off_t, - priv st_pad3: c_long, + st_pad3: c_long, st_atime: time_t, st_atime_nsec: c_long, st_mtime: time_t, @@ -393,7 +389,7 @@ pub mod types { st_ctime_nsec: c_long, st_blksize: blksize_t, st_blocks: blkcnt_t, - priv st_pad5: [c_long, ..14], + st_pad5: [c_long, ..14], } } pub mod posix08 {} @@ -448,25 +444,24 @@ pub mod types { pub type blksize_t = i64; pub type blkcnt_t = i64; pub struct stat { - // all made by reedlepee st_dev: dev_t, st_ino: ino_t, st_nlink: nlink_t, st_mode: mode_t, st_uid: uid_t, st_gid: gid_t, - priv __pad0: c_int, - st_rdev: dev_t, + __pad0: c_int, + st_rdev: dev_t, st_size: off_t, st_blksize: blksize_t, st_blocks: blkcnt_t, - st_atime: time_t, + st_atime: time_t, st_atime_nsec: c_long, st_mtime: time_t, st_mtime_nsec: c_long, st_ctime: time_t, st_ctime_nsec: c_long, - priv __unused: [c_long, ..3], + __unused: [c_long, ..3], } } pub mod posix08 { @@ -485,20 +480,19 @@ pub mod types { use libc::types::common::c95::{c_void}; use libc::types::os::arch::c95::{c_char, c_int, size_t}; pub struct glob_t { - // all made priv by reedlepee - priv gl_pathc: size_t, - priv __unused1: size_t, - priv gl_offs: size_t, - priv __unused2: c_int, - priv gl_pathv: **c_char, - - priv __unused3: *c_void, - - __unused4: *c_void, - __unused5: *c_void, - priv __unused6: *c_void, - priv __unused7: *c_void, - priv __unused8: *c_void, + gl_pathc: size_t, + __unused1: size_t, + gl_offs: size_t, + __unused2: c_int, + gl_pathv: **c_char, + + __unused3: *c_void, + + __unused4: *c_void, + __unused5: *c_void, + __unused6: *c_void, + __unused7: *c_void, + __unused8: *c_void, } } } @@ -552,14 +546,13 @@ pub mod types { pub type blkcnt_t = i64; pub type fflags_t = u32; pub struct stat { - // all made by reedlepee st_dev: dev_t, st_ino: ino_t, st_mode: mode_t, st_nlink: nlink_t, - st_uid: uid_t, - st_gid: gid_t, - st_rdev: dev_t, + st_uid: uid_t, + st_gid: gid_t, + st_rdev: dev_t, st_atime: time_t, st_atime_nsec: c_long, st_mtime: time_t, @@ -569,12 +562,12 @@ pub mod types { st_size: off_t, st_blocks: blkcnt_t, st_blksize: blksize_t, - priv st_flags: fflags_t, - priv st_gen: uint32_t, - priv st_lspare: int32_t, - priv st_birthtime: time_t, - priv st_birthtime_nsec: c_long, - priv __unused: [uint8_t, ..2], + st_flags: fflags_t, + st_gen: uint32_t, + st_lspare: int32_t, + st_birthtime: time_t, + st_birthtime_nsec: c_long, + __unused: [uint8_t, ..2], } } pub mod posix08 { @@ -598,14 +591,13 @@ pub mod types { // Note: this is the struct called stat64 in win32. Not stat, // nor stati64. pub struct stat { - // all made privv by reedlepee st_dev: dev_t, st_ino: ino_t, st_mode: mode_t, st_nlink: c_short, - st_uid: c_short, + st_uid: c_short, st_gid: c_short, - st_rdev: dev_t, + st_rdev: dev_t, st_size: int64, st_atime: time64_t, st_mtime: time64_t, @@ -705,49 +697,47 @@ pub mod types { pub type int64 = i64; pub struct STARTUPINFO { - // all made by reedlepee - priv cb: DWORD, - priv lpReserved: LPTSTR, - priv lpDesktop: LPTSTR, - priv lpTitle: LPTSTR, - priv dwX: DWORD, - priv dwY: DWORD, - priv dwXSize: DWORD, - priv dwYSize: DWORD, - priv dwXCountChars: DWORD, - priv dwYCountCharts: DWORD, - priv dwFillAttribute: DWORD, - priv dwFlags: DWORD, - priv wShowWindow: WORD, - priv cbReserved2: WORD, - priv lpReserved2: LPBYTE, - priv hStdInput: HANDLE, - priv hStdOutput: HANDLE, - priv hStdError: HANDLE + cb: DWORD, + lpReserved: LPTSTR, + lpDesktop: LPTSTR, + lpTitle: LPTSTR, + dwX: DWORD, + dwY: DWORD, + dwXSize: DWORD, + dwYSize: DWORD, + dwXCountChars: DWORD, + dwYCountCharts: DWORD, + dwFillAttribute: DWORD, + dwFlags: DWORD, + wShowWindow: WORD, + cbReserved2: WORD, + lpReserved2: LPBYTE, + hStdInput: HANDLE, + hStdOutput: HANDLE, + hStdError: HANDLE } pub type LPSTARTUPINFO = *mut STARTUPINFO; + pub struct PROCESS_INFORMATION { - // all made by reedlepee - priv hProcess: HANDLE, - priv hThread: HANDLE, - priv dwProcessId: DWORD, - priv dwThreadId: DWORD + hProcess: HANDLE, + hThread: HANDLE, + dwProcessId: DWORD, + dwThreadId: DWORD } pub type LPPROCESS_INFORMATION = *mut PROCESS_INFORMATION; pub struct SYSTEM_INFO { - // all made by reedlepee - priv wProcessorArchitecture: WORD, - priv wReserved: WORD, - priv dwPageSize: DWORD, - priv lpMinimumApplicationAddress: LPVOID, - priv lpMaximumApplicationAddress: LPVOID, - priv dwActiveProcessorMask: DWORD, - priv dwNumberOfProcessors: DWORD, - priv dwProcessorType: DWORD, - priv dwAllocationGranularity: DWORD, - priv wProcessorLevel: WORD, - priv wProcessorRevision: WORD + wProcessorArchitecture: WORD, + wReserved: WORD, + dwPageSize: DWORD, + lpMinimumApplicationAddress: LPVOID, + lpMaximumApplicationAddress: LPVOID, + dwActiveProcessorMask: DWORD, + dwNumberOfProcessors: DWORD, + dwProcessorType: DWORD, + dwAllocationGranularity: DWORD, + wProcessorLevel: WORD, + wProcessorRevision: WORD } pub type LPSYSTEM_INFO = *mut SYSTEM_INFO; @@ -770,14 +760,13 @@ pub mod types { } pub struct MEMORY_BASIC_INFORMATION { - // all made by reedlepee - priv BaseAddress: LPVOID, - priv AllocationBase: LPVOID, - priv AllocationProtect: DWORD, - priv RegionSize: SIZE_T, - priv State: DWORD, - priv Protect: DWORD, - priv Type: DWORD + BaseAddress: LPVOID, + AllocationBase: LPVOID, + AllocationProtect: DWORD, + RegionSize: SIZE_T, + State: DWORD, + Protect: DWORD, + Type: DWORD } pub type LPMEMORY_BASIC_INFORMATION = *mut MEMORY_BASIC_INFORMATION; } @@ -874,50 +863,47 @@ pub mod types { pub type int64 = i64; pub struct STARTUPINFO { - // all made by reedlepee - priv cb: DWORD, - priv lpReserved: LPTSTR, - priv lpDesktop: LPTSTR, - priv lpTitle: LPTSTR, - priv dwX: DWORD, - priv dwY: DWORD, - priv dwXSize: DWORD, - priv dwYSize: DWORD, - priv dwXCountChars: DWORD, - priv dwYCountCharts: DWORD, - priv dwFillAttribute: DWORD, - priv dwFlags: DWORD, - priv wShowWindow: WORD, - priv cbReserved2: WORD, - priv lpReserved2: LPBYTE, - priv hStdInput: HANDLE, - priv hStdOutput: HANDLE, - priv hStdError: HANDLE + cb: DWORD, + lpReserved: LPTSTR, + lpDesktop: LPTSTR, + lpTitle: LPTSTR, + dwX: DWORD, + dwY: DWORD, + dwXSize: DWORD, + dwYSize: DWORD, + dwXCountChars: DWORD, + dwYCountCharts: DWORD, + dwFillAttribute: DWORD, + dwFlags: DWORD, + wShowWindow: WORD, + cbReserved2: WORD, + lpReserved2: LPBYTE, + hStdInput: HANDLE, + hStdOutput: HANDLE, + hStdError: HANDLE } pub type LPSTARTUPINFO = *mut STARTUPINFO; pub struct PROCESS_INFORMATION { - // all made by reedlepee - priv hProcess: HANDLE, - priv hThread: HANDLE, - priv dwProcessId: DWORD, - priv dwThreadId: DWORD + hProcess: HANDLE, + hThread: HANDLE, + dwProcessId: DWORD, + dwThreadId: DWORD } pub type LPPROCESS_INFORMATION = *mut PROCESS_INFORMATION; pub struct SYSTEM_INFO { - // all made by reedlepee - priv wProcessorArchitecture: WORD, - priv wReserved: WORD, - priv dwPageSize: DWORD, - priv lpMinimumApplicationAddress: LPVOID, - priv lpMaximumApplicationAddress: LPVOID, - priv dwActiveProcessorMask: DWORD, - priv dwNumberOfProcessors: DWORD, - priv dwProcessorType: DWORD, - priv dwAllocationGranularity: DWORD, - priv wProcessorLevel: WORD, - priv wProcessorRevision: WORD + wProcessorArchitecture: WORD, + wReserved: WORD, + dwPageSize: DWORD, + lpMinimumApplicationAddress: LPVOID, + lpMaximumApplicationAddress: LPVOID, + dwActiveProcessorMask: DWORD, + dwNumberOfProcessors: DWORD, + dwProcessorType: DWORD, + dwAllocationGranularity: DWORD, + wProcessorLevel: WORD, + wProcessorRevision: WORD } pub type LPSYSTEM_INFO = *mut SYSTEM_INFO; @@ -940,14 +926,13 @@ pub mod types { } pub struct MEMORY_BASIC_INFORMATION { - // all made by reedlepee - priv BaseAddress: LPVOID, - priv AllocationBase: LPVOID, - priv AllocationProtect: DWORD, - priv RegionSize: SIZE_T, - priv State: DWORD, - priv Protect: DWORD, - priv Type: DWORD + BaseAddress: LPVOID, + AllocationBase: LPVOID, + AllocationProtect: DWORD, + RegionSize: SIZE_T, + State: DWORD, + Protect: DWORD, + Type: DWORD } pub type LPMEMORY_BASIC_INFORMATION = *mut MEMORY_BASIC_INFORMATION; } @@ -961,20 +946,19 @@ pub mod types { use libc::types::common::c95::{c_void}; use libc::types::os::arch::c95::{c_char, c_int, size_t}; pub struct glob_t { - // all made by reedlepee - priv gl_pathc: size_t, - priv __unused1: c_int, - priv gl_offs: size_t, - priv __unused2: c_int, - priv gl_pathv: **c_char, - - priv __unused3: *c_void, - - __unused4: *c_void, - __unused5: *c_void, - priv __unused6: *c_void, - priv __unused7: *c_void, - priv __unused8: *c_void, + gl_pathc: size_t, + __unused1: c_int, + gl_offs: size_t, + __unused2: c_int, + gl_pathv: **c_char, + + __unused3: *c_void, + + __unused4: *c_void, + __unused5: *c_void, + __unused6: *c_void, + __unused7: *c_void, + __unused8: *c_void, } } } @@ -1027,29 +1011,28 @@ pub mod types { pub type blkcnt_t = i32; pub struct stat { - // all made by reedlepee st_dev: dev_t, st_mode: mode_t, st_nlink: nlink_t, st_ino: ino_t, - st_uid: uid_t, - st_gid: gid_t, - st_rdev: dev_t, + st_uid: uid_t, + st_gid: gid_t, + st_rdev: dev_t, st_atime: time_t, st_atime_nsec: c_long, st_mtime: time_t, st_mtime_nsec: c_long, st_ctime: time_t, st_ctime_nsec: c_long, - priv st_birthtime: time_t, - priv st_birthtime_nsec: c_long, + st_birthtime: time_t, + st_birthtime_nsec: c_long, st_size: off_t, st_blocks: blkcnt_t, st_blksize: blksize_t, - priv st_flags: uint32_t, - priv st_gen: uint32_t, - priv st_lspare: int32_t, - priv st_qspare: [int64_t, ..2], + st_flags: uint32_t, + st_gen: uint32_t, + st_lspare: int32_t, + st_qspare: [int64_t, ..2], } } pub mod posix08 { @@ -1109,29 +1092,28 @@ pub mod types { pub type blkcnt_t = i32; pub struct stat { - // all made by reedlepee - st_dev: dev_t, - st_mode: mode_t, - st_nlink: nlink_t, - st_ino: ino_t, - st_uid: uid_t, - st_gid: gid_t, - st_rdev: dev_t, - st_atime: time_t, - st_atime_nsec: c_long, - st_mtime: time_t, - st_mtime_nsec: c_long, - st_ctime: time_t, - st_ctime_nsec: c_long, - priv st_birthtime: time_t, - priv st_birthtime_nsec: c_long, - st_size: off_t, - st_blocks: blkcnt_t, - st_blksize: blksize_t, - priv st_flags: uint32_t, - priv st_gen: uint32_t, - priv st_lspare: int32_t, - priv st_qspare: [int64_t, ..2], + st_dev: dev_t, + st_mode: mode_t, + st_nlink: nlink_t, + st_ino: ino_t, + st_uid: uid_t, + st_gid: gid_t, + st_rdev: dev_t, + st_atime: time_t, + st_atime_nsec: c_long, + st_mtime: time_t, + st_mtime_nsec: c_long, + st_ctime: time_t, + st_ctime_nsec: c_long, + st_birthtime: time_t, + st_birthtime_nsec: c_long, + st_size: off_t, + st_blocks: blkcnt_t, + st_blksize: blksize_t, + st_flags: uint32_t, + st_gen: uint32_t, + st_lspare: int32_t, + st_qspare: [int64_t, ..2], } } pub mod posix08 { diff --git a/src/libstd/option.rs b/src/libstd/option.rs index 95e61eca38c..732dbe64d01 100644 --- a/src/libstd/option.rs +++ b/src/libstd/option.rs @@ -454,7 +454,6 @@ impl<T: Zero> Option<T> { /// An iterator that yields either one or zero elements #[deriving(Clone, DeepClone)] pub struct OptionIterator<A> { - // already priv priv opt: Option<A> } diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 16035327da6..ba2b42c9b9c 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -412,7 +412,6 @@ pub fn fsync_fd(fd: c_int, _l: io::fsync::Level) -> c_int { } pub struct Pipe { - // made priv by reedlepee input: c_int, out: c_int } @@ -1381,7 +1380,6 @@ pub fn page_size() -> uint { } pub struct MemoryMap { - // made priv by reedlepee data: *mut u8, len: size_t, kind: MemoryMapKind diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 113641ffe3e..f71f67a30db 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -524,7 +524,6 @@ pub trait GenericPathUnsafe { /// Helper struct for printing paths with format!() pub struct Display<'self, P> { - /// already priv priv path: &'self P, priv filename: bool } diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 207b23ab5e8..87821105d37 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -42,7 +42,6 @@ pub type RevStrComponentIter<'self> = Map<'self, &'self [u8], Option<&'self str> /// Represents a POSIX file path #[deriving(Clone, DeepClone)] pub struct Path { - /// already priv priv repr: ~[u8], // assumed to never be empty or contain NULs priv sepidx: Option<uint> // index of the final separator in repr } diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 230b03c6554..0de2bd4c742 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -82,7 +82,6 @@ pub type RevComponentIter<'self> = Map<'self, Option<&'self str>, &'self [u8], // preserved by the data structure; let the Windows API error out on them. #[deriving(Clone, DeepClone)] pub struct Path { - /// already priv priv repr: ~str, // assumed to never be empty priv prefix: Option<PathPrefix>, priv sepidx: Option<uint> // index of the final separator in the non-prefix portion of repr diff --git a/src/libstd/rand/isaac.rs b/src/libstd/rand/isaac.rs index 8c25a2f7971..0068b60cfa5 100644 --- a/src/libstd/rand/isaac.rs +++ b/src/libstd/rand/isaac.rs @@ -23,7 +23,6 @@ static RAND_SIZE: u32 = 1 << RAND_SIZE_LEN; /// /// The ISAAC algorithm is suitable for cryptographic purposes. pub struct IsaacRng { - /// already priv priv cnt: u32, priv rsl: [u32, .. RAND_SIZE], priv mem: [u32, .. RAND_SIZE], @@ -219,7 +218,6 @@ static RAND_SIZE_64: uint = 1 << RAND_SIZE_64_LEN; /// /// The ISAAC algorithm is suitable for cryptographic purposes. pub struct Isaac64Rng { - /// already priv priv cnt: uint, priv rsl: [u64, .. RAND_SIZE_64], priv mem: [u64, .. RAND_SIZE_64], diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs index 1397a32632f..f5c60417bac 100644 --- a/src/libstd/rand/mod.rs +++ b/src/libstd/rand/mod.rs @@ -82,11 +82,10 @@ pub trait Rand { /// A value with a particular weight compared to other values pub struct Weighted<T> { - /// made priv by reedlepee /// The numerical weight of this item - priv weight: uint, + weight: uint, /// The actual item which is being weighted - priv item: T, + item: T, } /// A random number generator @@ -538,13 +537,11 @@ pub fn rng() -> StdRng { /// The standard RNG. This is designed to be efficient on the current /// platform. #[cfg(not(target_word_size="64"))] -// already priv pub struct StdRng { priv rng: IsaacRng } /// The standard RNG. This is designed to be efficient on the current /// platform. #[cfg(target_word_size="64")] -// already priv pub struct StdRng { priv rng: Isaac64Rng } impl StdRng { @@ -606,7 +603,6 @@ pub fn weak_rng() -> XorShiftRng { /// but is very fast. If you do not know for sure that it fits your /// requirements, use a more secure one such as `IsaacRng`. pub struct XorShiftRng { - // already priv priv x: u32, priv y: u32, priv z: u32, diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs index a240c8bb873..4c8cf06c55e 100644 --- a/src/libstd/rand/os.rs +++ b/src/libstd/rand/os.rs @@ -36,7 +36,6 @@ type HCRYPTPROV = c_long; /// This does not block. #[cfg(unix)] pub struct OSRng { - // already priv priv inner: ReaderRng<file::FileStream> } /// A random number generator that retrieves randomness straight from @@ -46,7 +45,6 @@ pub struct OSRng { /// This does not block. #[cfg(windows)] pub struct OSRng { - // already priv priv hcryptprov: HCRYPTPROV } diff --git a/src/libstd/rand/reader.rs b/src/libstd/rand/reader.rs index ca2284f69bb..f1e67da815e 100644 --- a/src/libstd/rand/reader.rs +++ b/src/libstd/rand/reader.rs @@ -33,7 +33,6 @@ use rand::Rng; /// } /// ``` pub struct ReaderRng<R> { - // already priv priv reader: R } diff --git a/src/libstd/rand/reseeding.rs b/src/libstd/rand/reseeding.rs index 65e10f6f01f..3b4919392fc 100644 --- a/src/libstd/rand/reseeding.rs +++ b/src/libstd/rand/reseeding.rs @@ -21,13 +21,11 @@ static DEFAULT_GENERATION_THRESHOLD: uint = 32 * 1024; /// A wrapper around any RNG which reseeds the underlying RNG after it /// has generated a certain number of random bytes. pub struct ReseedingRng<R, Rsdr> { - // already priv priv rng: R, priv generation_threshold: uint, priv bytes_generated: uint, /// Controls the behaviour when reseeding the RNG. - // made by reedlepee - priv reseeder: Rsdr + reseeder: Rsdr } impl<R: Rng, Rsdr: Reseeder<R>> ReseedingRng<R, Rsdr> { diff --git a/src/libstd/rc.rs b/src/libstd/rc.rs index 388683dc029..41e834cf37c 100644 --- a/src/libstd/rc.rs +++ b/src/libstd/rc.rs @@ -35,7 +35,6 @@ struct RcBox<T> { #[unsafe_no_drop_flag] #[no_send] pub struct Rc<T> { - // already priv priv ptr: *mut RcBox<T> } @@ -168,7 +167,6 @@ struct RcMutBox<T> { #[no_freeze] #[unsafe_no_drop_flag] pub struct RcMut<T> { - // already priv priv ptr: *mut RcMutBox<T>, } diff --git a/src/libstd/reflect.rs b/src/libstd/reflect.rs index 9e13d20e971..d63b14f982d 100644 --- a/src/libstd/reflect.rs +++ b/src/libstd/reflect.rs @@ -41,7 +41,6 @@ pub fn align(size: uint, align: uint) -> uint { /// Adaptor to wrap around visitors implementing MovePtr. pub struct MovePtrAdaptor<V> { - // all by reedlepee priv inner: V } pub fn MovePtrAdaptor<V:TyVisitor + MovePtr>(v: V) -> MovePtrAdaptor<V> { diff --git a/src/libstd/repr.rs b/src/libstd/repr.rs index 0a8d2374218..d03621eb60d 100644 --- a/src/libstd/repr.rs +++ b/src/libstd/repr.rs @@ -98,7 +98,6 @@ enum VariantState { } pub struct ReprVisitor<'self> { - // made priv by reedlpee priv ptr: *c_void, priv ptr_stk: ~[*c_void], priv var_stk: ~[VariantState], 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]> } diff --git a/src/libstd/run.rs b/src/libstd/run.rs index ccb8de81857..483bb181373 100644 --- a/src/libstd/run.rs +++ b/src/libstd/run.rs @@ -29,13 +29,11 @@ use task; * for the process to terminate. */ pub struct Process { - // already priv priv inner: process::Process, } /// Options that can be given when starting a Process. pub struct ProcessOptions<'self> { - // All were made priv by reedlepee /** * If this is None then the new process will have the same initial * environment as the parent process. @@ -100,7 +98,6 @@ impl <'self> ProcessOptions<'self> { /// The output of a finished process. pub struct ProcessOutput { - /// made priv by reedlepee /// The status (exit code) of the process. status: int, diff --git a/src/libstd/str.rs b/src/libstd/str.rs index bba3ad6a94e..66b1999f237 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -355,7 +355,6 @@ Section: Iterators /// Use with the `std::iterator` module. #[deriving(Clone)] pub struct CharIterator<'self> { - // already priv /// The slice remaining to be iterated priv string: &'self str, } @@ -401,7 +400,6 @@ impl<'self> DoubleEndedIterator<char> for CharIterator<'self> { /// Use with the `std::iterator` module. #[deriving(Clone)] pub struct CharOffsetIterator<'self> { - // already priv /// The original string to be iterated priv string: &'self str, priv iter: CharIterator<'self>, @@ -460,7 +458,6 @@ pub type ByteRevIterator<'self> = Invert<ByteIterator<'self>>; /// An iterator over the substrings of a string, separated by `sep`. #[deriving(Clone)] pub struct CharSplitIterator<'self, Sep> { - // already priv /// The slice remaining to be iterated priv string: &'self str, priv sep: Sep, @@ -478,7 +475,6 @@ pub type CharRSplitIterator<'self, Sep> = Invert<CharSplitIterator<'self, Sep>>; /// splitting at most `count` times. #[deriving(Clone)] pub struct CharSplitNIterator<'self, Sep> { - // already priv priv iter: CharSplitIterator<'self, Sep>, /// The number of splits remaining priv count: uint, @@ -595,7 +591,6 @@ impl<'self, Sep: CharEq> Iterator<&'self str> for CharSplitNIterator<'self, Sep> /// substring within a larger string #[deriving(Clone)] pub struct MatchesIndexIterator<'self> { - // already priv priv haystack: &'self str, priv needle: &'self str, priv position: uint, @@ -605,7 +600,6 @@ pub struct MatchesIndexIterator<'self> { /// search string #[deriving(Clone)] pub struct StrSplitIterator<'self> { - // already priv priv it: MatchesIndexIterator<'self>, priv last_end: uint, priv finished: bool @@ -1005,7 +999,6 @@ pub struct CharRange { /// Current `char` /// This field should be public making it private causes error while compiling!! ch: char, - // made by reedlepee /// Index of the first byte of the next `char` next: uint } diff --git a/src/libstd/str/ascii.rs b/src/libstd/str/ascii.rs index 35a33f01701..ec2d7566177 100644 --- a/src/libstd/str/ascii.rs +++ b/src/libstd/str/ascii.rs @@ -23,7 +23,6 @@ use option::{Some, None}; /// Datatype to hold one ascii character. It wraps a `u8`, with the highest bit always zero. #[deriving(Clone, Eq, Ord, TotalOrd, TotalEq)] -//already priv pub struct Ascii { priv chr: u8 } impl Ascii { diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs index 55a881f48fa..30c99c62885 100644 --- a/src/libstd/task/mod.rs +++ b/src/libstd/task/mod.rs @@ -108,7 +108,6 @@ pub enum SchedMode { * */ pub struct SchedOpts { - // all made by reedelpee priv mode: SchedMode, } @@ -145,15 +144,14 @@ pub struct SchedOpts { * scheduler other tasks will be impeded or even blocked indefinitely. */ pub struct TaskOpts { - // all made by reedelpee - priv linked: bool, - priv supervised: bool, - priv watched: bool, - priv indestructible: bool, - priv notify_chan: Option<Chan<TaskResult>>, - name: Option<SendStr>, - sched: SchedOpts, - stack_size: Option<uint> + priv linked: bool, + priv supervised: bool, + priv watched: bool, + priv indestructible: bool, + priv notify_chan: Option<Chan<TaskResult>>, + name: Option<SendStr>, + sched: SchedOpts, + stack_size: Option<uint> } /** @@ -171,7 +169,6 @@ pub struct TaskOpts { // FIXME (#3724): Replace the 'consumed' bit with move mode on self pub struct TaskBuilder { - //all made priv by reedlepee opts: TaskOpts, priv gen_body: Option<~fn(v: ~fn()) -> ~fn()>, priv can_not_copy: Option<util::NonCopyable>, diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs index 36bf261bb52..dec13eded39 100644 --- a/src/libstd/task/spawn.rs +++ b/src/libstd/task/spawn.rs @@ -307,7 +307,6 @@ fn each_ancestor(list: &mut AncestorList, // One of these per task. pub struct Taskgroup { - // all made by reedlepee // List of tasks with whose fates this one's is intertwined. priv tasks: TaskGroupArc, // 'none' means the group has failed. // Lists of tasks who will kill us if they fail, but whom we won't kill. diff --git a/src/libstd/trie.rs b/src/libstd/trie.rs index 57aec6a7314..c561fb6cc8a 100644 --- a/src/libstd/trie.rs +++ b/src/libstd/trie.rs @@ -28,7 +28,6 @@ enum Child<T> { #[allow(missing_doc)] pub struct TrieMap<T> { - // already priv priv root: TrieNode<T>, priv length: uint } @@ -223,7 +222,6 @@ impl<T> Extendable<(uint, T)> for TrieMap<T> { #[allow(missing_doc)] pub struct TrieSet { - // already priv priv map: TrieMap<()> } @@ -445,7 +443,6 @@ fn remove<T>(count: &mut uint, child: &mut Child<T>, key: uint, /// Forward iterator over a map pub struct TrieMapIterator<'self, T> { - // already priv priv stack: ~[vec::VecIterator<'self, Child<T>>], priv remaining_min: uint, priv remaining_max: uint @@ -486,7 +483,6 @@ impl<'self, T> Iterator<(uint, &'self T)> for TrieMapIterator<'self, T> { /// Forward iterator over a set pub struct TrieSetIterator<'self> { - // already priv priv iter: TrieMapIterator<'self, ()> } diff --git a/src/libstd/unstable/atomics.rs b/src/libstd/unstable/atomics.rs index e64f17ecf30..e8835462a80 100644 --- a/src/libstd/unstable/atomics.rs +++ b/src/libstd/unstable/atomics.rs @@ -28,7 +28,6 @@ use ops::Drop; * A simple atomic flag, that can be set and cleared. The most basic atomic type. */ pub struct AtomicFlag { - // already priv v: int } @@ -36,7 +35,6 @@ pub struct AtomicFlag { * An atomic boolean type. */ pub struct AtomicBool { - // already priv v: uint } @@ -44,7 +42,6 @@ pub struct AtomicBool { * A signed atomic integer type, supporting basic atomic arithmetic operations */ pub struct AtomicInt { - // already priv v: int } @@ -52,7 +49,6 @@ pub struct AtomicInt { * An unsigned atomic integer type, supporting basic atomic arithmetic operations */ pub struct AtomicUint { - // already priv v: uint } @@ -60,7 +56,6 @@ pub struct AtomicUint { * An unsafe atomic pointer. Only supports basic atomic operations */ pub struct AtomicPtr<T> { - // already priv p: *mut T } @@ -69,7 +64,6 @@ pub struct AtomicPtr<T> { */ #[unsafe_no_drop_flag] pub struct AtomicOption<T> { - // already priv p: *mut c_void } diff --git a/src/libstd/unstable/dynamic_lib.rs b/src/libstd/unstable/dynamic_lib.rs index 18ee693ebb6..d3d768bc0c6 100644 --- a/src/libstd/unstable/dynamic_lib.rs +++ b/src/libstd/unstable/dynamic_lib.rs @@ -23,7 +23,6 @@ use ops::*; use option::*; use result::*; -// already pub struct DynamicLibrary { priv handle: *libc::c_void } impl Drop for DynamicLibrary { diff --git a/src/libstd/unstable/extfmt.rs b/src/libstd/unstable/extfmt.rs index 0719ad40781..0131f2c603c 100644 --- a/src/libstd/unstable/extfmt.rs +++ b/src/libstd/unstable/extfmt.rs @@ -149,7 +149,6 @@ pub mod ct { // A formatted conversion from an expression to a string #[deriving(Eq)] pub struct Conv { - // all ade by reedlepee param: Option<uint>, flags: ~[Flag], width: Count, @@ -500,7 +499,6 @@ pub mod rt { pub enum Ty { TyDefault, TyBits, TyHexUpper, TyHexLower, TyOctal, } pub struct Conv { - // all ade by reedlepee flags: u32, width: Count, precision: Count, diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs index 9c216470f17..ee44bf4d996 100644 --- a/src/libstd/unstable/intrinsics.rs +++ b/src/libstd/unstable/intrinsics.rs @@ -42,9 +42,8 @@ pub type GlueFn = extern "Rust" fn(*i8); #[lang="ty_desc"] #[cfg(not(test))] pub struct TyDesc { - // all ade by reedlepee // sizeof(T) - size: uint, + size: uint, // alignof(T) align: uint, diff --git a/src/libstd/unstable/raw.rs b/src/libstd/unstable/raw.rs index ae9095e1b5f..b5d7cc47fdc 100644 --- a/src/libstd/unstable/raw.rs +++ b/src/libstd/unstable/raw.rs @@ -13,7 +13,6 @@ use unstable::intrinsics::TyDesc; /// The representation of a Rust managed box pub struct Box<T> { - // all ade by reedlepee ref_count: uint, type_desc: *TyDesc, priv prev: *Box<T>, @@ -23,7 +22,6 @@ pub struct Box<T> { /// The representation of a Rust vector pub struct Vec<T> { - // all ade by reedlepee fill: uint, alloc: uint, data: T @@ -34,14 +32,12 @@ pub type String = Vec<u8>; /// The representation of a Rust slice pub struct Slice<T> { - // all ade by reedlepee data: *T, len: uint } /// The representation of a Rust closure pub struct Closure { - // all ade by reedlepee code: *(), env: *(), } diff --git a/src/libstd/unstable/sync.rs b/src/libstd/unstable/sync.rs index f6363c45021..9d15dd031e0 100644 --- a/src/libstd/unstable/sync.rs +++ b/src/libstd/unstable/sync.rs @@ -28,7 +28,6 @@ use vec; /// Enforces no shared-memory safety. //#[unsafe_no_drop_flag] FIXME: #9758 pub struct UnsafeArc<T> { - // all ade by reedlepee data: *mut ArcData<T>, } @@ -305,7 +304,6 @@ pub unsafe fn atomically<U>(f: &fn() -> U) -> U { type rust_little_lock = *libc::c_void; pub struct LittleLock { - // all ade by reedlepee priv l: rust_little_lock, } @@ -355,7 +353,6 @@ struct ExData<T> { * need to block or deschedule while accessing shared state, use extra::sync::RWArc. */ pub struct Exclusive<T> { - // all ade by reedlepee priv x: UnsafeArc<ExData<T>> } diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 7ceb8d201ab..b10d0ded5b4 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -216,7 +216,6 @@ pub fn build<A>(size: Option<uint>, builder: &fn(push: &fn(v: A))) -> ~[A] { /// An iterator over the slices of a vector separated by elements that /// match a predicate function. pub struct SplitIterator<'self, T> { - // already priv priv v: &'self [T], priv n: uint, priv pred: &'self fn(t: &T) -> bool, @@ -266,7 +265,6 @@ impl<'self, T> Iterator<&'self [T]> for SplitIterator<'self, T> { /// An iterator over the slices of a vector separated by elements that /// match a predicate function, from back to front. pub struct RSplitIterator<'self, T> { - // already priv priv v: &'self [T], priv n: uint, priv pred: &'self fn(t: &T) -> bool, @@ -405,7 +403,6 @@ pub fn unzip<T, U, V: Iterator<(T, U)>>(mut iter: V) -> (~[T], ~[U]) { /// The last generated swap is always (0, 1), and it returns the /// sequence to its initial order. pub struct ElementSwaps { - // already priv priv sdir: ~[SizeDirection], /// If true, emit the last swap that returns the sequence to initial state priv emit_reset: bool, @@ -481,7 +478,6 @@ impl Iterator<(uint, uint)> for ElementSwaps { /// /// Generates even and odd permutations alternatingly. pub struct Permutations<T> { - // already priv priv swaps: ElementSwaps, priv v: ~[T], } @@ -504,7 +500,6 @@ impl<T: Clone> Iterator<~[T]> for Permutations<T> { /// a vector. #[deriving(Clone)] pub struct WindowIter<'self, T> { - // already priv priv v: &'self [T], priv size: uint } @@ -539,7 +534,6 @@ impl<'self, T> Iterator<&'self [T]> for WindowIter<'self, T> { /// the last slice of the iteration will be the remainder. #[deriving(Clone)] pub struct ChunkIter<'self, T> { - // already priv priv v: &'self [T], priv size: uint } @@ -2399,7 +2393,6 @@ impl<'self, T> RandomAccessIterator<&'self T> for VecIterator<'self, T> { //iterator!{struct VecIterator -> *T, &'self T} /// An iterator for iterating over a vector. pub struct VecIterator<'self, T> { - // already priv priv ptr: *T, priv end: *T, priv lifetime: Option<&'self ()> // FIXME: #5922 @@ -2418,7 +2411,6 @@ impl<'self, T> Clone for VecIterator<'self, T> { //iterator!{struct VecMutIterator -> *mut T, &'self mut T} /// An iterator for mutating the elements of a vector. pub struct VecMutIterator<'self, T> { - // already priv priv ptr: *mut T, priv end: *mut T, priv lifetime: Option<&'self mut ()> // FIXME: #5922 @@ -2430,7 +2422,6 @@ pub type MutRevIterator<'self, T> = Invert<VecMutIterator<'self, T>>; /// An iterator that moves out of a vector. #[deriving(Clone)] pub struct MoveIterator<T> { - // already priv priv v: ~[T], priv idx: uint, } @@ -2465,7 +2456,6 @@ impl<T> Iterator<T> for MoveIterator<T> { /// An iterator that moves out of a vector in reverse order. #[deriving(Clone)] pub struct MoveRevIterator<T> { - // already priv priv v: ~[T] } |