Skip to content

Commit 5539e93

Browse files
committed
---
yaml --- r: 93156 b: refs/heads/try c: ad46544 h: refs/heads/master v: v3
1 parent d68594c commit 5539e93

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+227
-540
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
5-
refs/heads/try: 0ada7c7ffe453b9df849996f8dca0b8d0f2d9e62
5+
refs/heads/try: ad465441ba3424cc5bcba2227c6a42ffe09fd77f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libextra/arc.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ use std::borrow;
5050

5151
/// As sync::condvar, a mechanism for unlock-and-descheduling and signaling.
5252
pub struct Condvar<'self> {
53-
// all were already priv
5453
priv is_mutex: bool,
5554
priv failed: &'self mut bool,
5655
priv cond: &'self sync::Condvar<'self>
@@ -109,7 +108,6 @@ impl<'self> Condvar<'self> {
109108
****************************************************************************/
110109

111110
/// An atomically reference counted wrapper for shared immutable state.
112-
// all were already priv
113111
pub struct Arc<T> { priv x: UnsafeArc<T> }
114112

115113

@@ -164,7 +162,6 @@ struct MutexArcInner<T> { priv lock: Mutex, priv failed: bool, priv data: T }
164162

165163
/// An Arc with mutable data protected by a blocking mutex.
166164
#[no_freeze]
167-
//All were already priv
168165
pub struct MutexArc<T> { priv x: UnsafeArc<MutexArcInner<T>> }
169166

170167

@@ -347,7 +344,6 @@ struct RWArcInner<T> { priv lock: RWLock, priv failed: bool, priv data: T }
347344
*/
348345
#[no_freeze]
349346
pub struct RWArc<T> {
350-
// all were already priv
351347
priv x: UnsafeArc<RWArcInner<T>>,
352348
}
353349

@@ -526,15 +522,13 @@ fn borrow_rwlock<T:Freeze + Send>(state: *mut RWArcInner<T>) -> *RWLock {
526522
/// The "write permission" token used for RWArc.write_downgrade().
527523
pub struct RWWriteMode<'self, T> {
528524

529-
/// reedlepee added priv in all the feilds below
530525
priv data: &'self mut T,
531526
priv token: sync::RWLockWriteMode<'self>,
532527
priv poison: PoisonOnFail,
533528
}
534529

535530
/// The "read permission" token used for RWArc.write_downgrade().
536531
pub struct RWReadMode<'self, T> {
537-
/// reedlepee added priv in all the feilds below
538532
priv data: &'self T,
539533
priv token: sync::RWLockReadMode<'self>,
540534
}

branches/try/src/libextra/arena.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ pub struct Arena {
6262
// The head is separated out from the list as a unbenchmarked
6363
// microoptimization, to avoid needing to case on the list to
6464
// access the head.
65-
/// no change by reedlepee all were already priv
6665
priv head: Chunk,
6766
priv pod_head: Chunk,
6867
priv chunks: @mut MutList<Chunk>,

branches/try/src/libextra/base64.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ pub enum CharacterSet {
2121

2222
/// Contains configuration parameters for `to_base64`.
2323
pub struct Config {
24-
/// all were made priv by reedlepee
2524
/// Character set to use
2625
priv char_set: CharacterSet,
2726
/// True to pad output with `=` characters

branches/try/src/libextra/bitv.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ enum Op {Union, Intersect, Assign, Difference}
225225
/// The bitvector type
226226
#[deriving(Clone)]
227227
pub struct Bitv {
228-
/// all were made priv by reedlepee
229228
/// Internal representation of the bit vector (small or large)
230229
priv rep: BitvVariant,
231230
/// 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 {
574573

575574
/// An iterator for `Bitv`.
576575
pub struct BitvIterator<'self> {
577-
/// all were already priv
578576
priv bitv: &'self Bitv,
579577
priv next_idx: uint,
580578
priv end_idx: uint,
@@ -636,7 +634,6 @@ impl<'self> RandomAccessIterator<bool> for BitvIterator<'self> {
636634
/// as a `uint`.
637635
#[deriving(Clone)]
638636
pub struct BitvSet {
639-
// all were already priv!!
640637
priv size: uint,
641638

642639
// In theory this is a `Bitv` instead of always a `BigBitv`, but knowing that
@@ -903,7 +900,6 @@ impl BitvSet {
903900
}
904901

905902
pub struct BitvSetIterator<'self> {
906-
// all were already priv
907903
priv set: &'self BitvSet,
908904
priv next_idx: uint
909905
}

branches/try/src/libextra/c_vec.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ use std::util;
4444
* The type representing a foreign chunk of memory
4545
*/
4646
pub struct CVec<T> {
47-
/// No change all were allready priv!!
4847
priv base: *mut T,
4948
priv len: uint,
5049
priv rsrc: @DtorRes,

branches/try/src/libextra/comm.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ use std::comm;
2323

2424
/// An extension of `pipes::stream` that allows both sending and receiving.
2525
pub struct DuplexStream<T, U> {
26-
// all were already priv
2726
priv chan: Chan<T>,
2827
priv port: Port<U>,
2928
}
@@ -95,7 +94,6 @@ pub fn DuplexStream<T:Send,U:Send>()
9594
// all were already priv
9695
pub struct SyncChan<T> { priv duplex_stream: DuplexStream<T, ()> }
9796
/// An extension of `pipes::stream` that acknowledges each message received.
98-
// all were already priv
9997
pub struct SyncPort<T> { priv duplex_stream: DuplexStream<(), T> }
10098

10199
impl<T: Send> GenericChan<T> for SyncChan<T> {

branches/try/src/libextra/crypto/cryptoutil.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ macro_rules! impl_fixed_buffer( ($name:ident, $size:expr) => (
284284

285285
/// A fixed size buffer of 64 bytes useful for cryptographic operations.
286286
pub struct FixedBuffer64 {
287-
// already priv
288287
priv buffer: [u8, ..64],
289288
priv buffer_idx: uint,
290289
}
@@ -303,7 +302,6 @@ impl_fixed_buffer!(FixedBuffer64, 64)
303302

304303
/// A fixed size buffer of 128 bytes useful for cryptographic operations.
305304
pub struct FixedBuffer128 {
306-
// already priv
307305
priv buffer: [u8, ..128],
308306
priv buffer_idx: uint,
309307
}

branches/try/src/libextra/crypto/md5.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ static C4: [u32, ..16] = [
159159

160160
/// The MD5 Digest algorithm
161161
pub struct Md5 {
162-
// already priv
163162
priv length_bytes: u64,
164163
priv buffer: FixedBuffer64,
165164
priv state: Md5State,

branches/try/src/libextra/crypto/sha1.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ static K3: u32 = 0xCA62C1D6u32;
4343

4444
/// Structure representing the state of a Sha1 computation
4545
pub struct Sha1 {
46-
// already priv
4746
priv h: [u32, ..DIGEST_BUF_LEN],
4847
priv length_bits: u64,
4948
priv buffer: FixedBuffer64,

branches/try/src/libextra/crypto/sha2.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ impl Engine512 {
234234

235235
/// The SHA-512 hash algorithm
236236
pub struct Sha512 {
237-
// already priv
238237
priv engine: Engine512
239238
}
240239

@@ -288,7 +287,6 @@ static H512: [u64, ..8] = [
288287

289288
/// The SHA-384 hash algorithm
290289
pub struct Sha384 {
291-
// already priv
292290
priv engine: Engine512
293291
}
294292

@@ -340,7 +338,6 @@ static H384: [u64, ..8] = [
340338

341339
/// The SHA-512 hash algorithm with digest truncated to 256 bits
342340
pub struct Sha512Trunc256 {
343-
// already priv
344341
priv engine: Engine512
345342
}
346343

@@ -390,7 +387,6 @@ static H512_TRUNC_256: [u64, ..8] = [
390387

391388
/// The SHA-512 hash algorithm with digest truncated to 224 bits
392389
pub struct Sha512Trunc224 {
393-
// already priv
394390
priv engine: Engine512
395391
}
396392

@@ -647,7 +643,6 @@ impl Engine256 {
647643

648644
/// The SHA-256 hash algorithm
649645
pub struct Sha256 {
650-
// already priv
651646
priv engine: Engine256
652647
}
653648

@@ -701,7 +696,6 @@ static H256: [u32, ..8] = [
701696

702697
/// The SHA-224 hash algorithm
703698
pub struct Sha224 {
704-
// already priv
705699
priv engine: Engine256
706700
}
707701

branches/try/src/libextra/dlist.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ use container::Deque;
3232

3333
/// A doubly-linked list.
3434
pub struct DList<T> {
35-
// all were already priv
3635
priv length: uint,
3736
priv list_head: Link<T>,
3837
priv list_tail: Rawlink<Node<T>>,
@@ -50,15 +49,13 @@ struct Node<T> {
5049
/// Double-ended DList iterator
5150
#[deriving(Clone)]
5251
pub struct DListIterator<'self, T> {
53-
// all were already priv
5452
priv head: &'self Link<T>,
5553
priv tail: Rawlink<Node<T>>,
5654
priv nelem: uint,
5755
}
5856

5957
/// Double-ended mutable DList iterator
6058
pub struct MutDListIterator<'self, T> {
61-
// all were already priv
6259
priv list: &'self mut DList<T>,
6360
priv head: Rawlink<Node<T>>,
6461
priv tail: Rawlink<Node<T>>,
@@ -68,7 +65,6 @@ pub struct MutDListIterator<'self, T> {
6865
/// DList consuming iterator
6966
#[deriving(Clone)]
7067
pub struct MoveIterator<T> {
71-
// all were already priv
7268
priv list: DList<T>
7369
}
7470

branches/try/src/libextra/ebml.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ struct EbmlState {
3030

3131
#[deriving(Clone)]
3232
pub struct Doc {
33-
// all these should be public
3433
data: @~[u8],
3534
start: uint,
3635
end: uint,
@@ -51,9 +50,7 @@ impl Doc {
5150
}
5251

5352
pub struct TaggedDoc {
54-
// was made privv by reedlepee
5553
priv tag: uint,
56-
// should be public
5754
doc: Doc,
5855
}
5956

@@ -287,7 +284,6 @@ pub mod reader {
287284
pub fn doc_as_i64(d: Doc) -> i64 { doc_as_u64(d) as i64 }
288285

289286
pub struct Decoder {
290-
// all were already priv
291287
priv parent: Doc,
292288
priv pos: uint,
293289
}
@@ -622,9 +618,7 @@ pub mod writer {
622618

623619
// ebml writing
624620
pub struct Encoder {
625-
/// should be public!!
626621
writer: @io::Writer,
627-
/// this was already privv!!
628622
priv size_positions: ~[uint],
629623
}
630624

branches/try/src/libextra/enum_set.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
pub struct EnumSet<E> {
1919
// We must maintain the invariant that no bits are set
2020
// for which no variant exists
21-
// all were already priv
2221
priv bits: uint
2322
}
2423

@@ -101,7 +100,6 @@ impl<E:CLike> BitAnd<EnumSet<E>, EnumSet<E>> for EnumSet<E> {
101100

102101
/// An iterator over an EnumSet
103102
pub struct EnumSetIterator<E> {
104-
// all were already priv
105103
priv index: uint,
106104
priv bits: uint,
107105
}

branches/try/src/libextra/fileinput.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ file is `stdin`.
109109
*/
110110
#[deriving(Clone)]
111111
pub struct FileInputState {
112-
// all were priv made by reedlepee
113112
priv current_path: Option<Path>,
114113
priv line_num: uint,
115114
priv line_num_file: uint
@@ -156,7 +155,6 @@ struct FileInput_ {
156155
// "self.fi" -> "self." and renaming FileInput_. Documentation above
157156
// will likely have to be updated to use `let mut in = ...`.
158157
pub struct FileInput {
159-
/// all were made priv by reedlepee
160158
priv fi: @mut FileInput_
161159
}
162160

branches/try/src/libextra/future.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ use std::util::replace;
3232

3333
/// A type encapsulating the result of a computation which may not be complete
3434
pub struct Future<A> {
35-
// all were already privv!!
3635
priv state: FutureState<A>,
3736
}
3837

branches/try/src/libextra/getopts.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ pub enum Occur {
112112
/// A description of a possible option.
113113
#[deriving(Clone, Eq)]
114114
pub struct Opt {
115-
116-
/// reedlepee added priv infront of them!!
117115
/// Name of the option
118116
name: Name,
119117
/// Wheter it has an argument... should be public!!
@@ -136,7 +134,6 @@ enum Optval {
136134
#[deriving(Clone, Eq)]
137135
pub struct Matches {
138136

139-
/// reedlepee added priv infront of all
140137
/// Options that matched
141138
priv opts: ~[Opt],
142139
/// Values of the Options that matched

branches/try/src/libextra/glob.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ use sort;
3333
* pattern - see the `glob` function for more details.
3434
*/
3535
pub struct GlobIterator {
36-
/// no change by reedlepee all were priv already!!
3736
priv root: Path,
3837
priv dir_patterns: ~[Pattern],
3938
priv options: MatchOptions,
@@ -157,7 +156,6 @@ fn list_dir_sorted(path: &Path) -> ~[Path] {
157156
*/
158157
#[deriving(Clone, Eq, TotalEq, Ord, TotalOrd, IterBytes, Default)]
159158
pub struct Pattern {
160-
// already priv
161159
priv tokens: ~[PatternToken]
162160
}
163161

@@ -476,7 +474,6 @@ fn chars_eq(a: char, b: char, case_sensitive: bool) -> bool {
476474
*/
477475
#[deriving(Clone, Eq, TotalEq, Ord, TotalOrd, IterBytes, Default)]
478476
pub struct MatchOptions {
479-
/// all were made priv by reedlepee
480477

481478
/**
482479
* Whether or not patterns should be matched in a case-sensitive manner. This

branches/try/src/libextra/io_util.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use std::cast;
1616

1717
/// An implementation of the io::Reader interface which reads a buffer of bytes
1818
pub struct BufReader {
19-
// all were made priv by reedlepee
2019
/// The buffer of bytes to read
2120
priv buf: ~[u8],
2221
/// The current position in the buffer of bytes

0 commit comments

Comments
 (0)