Removed Unnecessary comments and white spaces #4386
This commit is contained in:
parent
0ada7c7ffe
commit
ad465441ba
111 changed files with 221 additions and 534 deletions
|
|
@ -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>,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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>,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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> {
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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],
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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_
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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>,
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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],
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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>,
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>>
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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 }
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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>>,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)];
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue