Skip to content

Commit 4d6836f

Browse files
committed
Fix privacy fallout from previous change
1 parent 31ac9c4 commit 4d6836f

32 files changed

+51
-51
lines changed

doc/guide-container.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Reaching the end of the iterator is signalled by returning `None` instead of
9090
# fn main() {}
9191
/// A stream of N zeroes
9292
struct ZeroStream {
93-
priv remaining: uint
93+
remaining: uint
9494
}
9595

9696
impl ZeroStream {
@@ -305,7 +305,7 @@ The `ZeroStream` from earlier can provide an exact lower and upper bound:
305305
# fn main() {}
306306
/// A stream of N zeroes
307307
struct ZeroStream {
308-
priv remaining: uint
308+
remaining: uint
309309
}
310310
311311
impl ZeroStream {

src/libextra/arc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ impl<T:Freeze + Send> Clone for Arc<T> {
148148
****************************************************************************/
149149

150150
#[doc(hidden)]
151-
struct MutexArcInner<T> { priv lock: Mutex, priv failed: bool, priv data: T }
151+
struct MutexArcInner<T> { lock: Mutex, failed: bool, data: T }
152152

153153
/// An Arc with mutable data protected by a blocking mutex.
154154
#[no_freeze]
@@ -312,7 +312,7 @@ impl PoisonOnFail {
312312
****************************************************************************/
313313

314314
#[doc(hidden)]
315-
struct RWArcInner<T> { priv lock: RWLock, priv failed: bool, priv data: T }
315+
struct RWArcInner<T> { lock: RWLock, failed: bool, data: T }
316316
/**
317317
* A dual-mode Arc protected by a reader-writer lock. The data can be accessed
318318
* mutably or immutably, and immutably-accessing tasks may run concurrently.

src/libextra/dlist.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ pub struct DList<T> {
3838
}
3939

4040
type Link<T> = Option<~Node<T>>;
41-
struct Rawlink<T> { priv p: *mut T }
41+
struct Rawlink<T> { p: *mut T }
4242

4343
struct Node<T> {
44-
priv next: Link<T>,
45-
priv prev: Rawlink<Node<T>>,
46-
priv value: T,
44+
next: Link<T>,
45+
prev: Rawlink<Node<T>>,
46+
value: T,
4747
}
4848

4949
/// Double-ended DList iterator

src/libextra/lru_cache.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ use std::to_bytes::Cb;
4343
use std::ptr;
4444
use std::cast;
4545

46-
struct KeyRef<K> { priv k: *K }
46+
struct KeyRef<K> { k: *K }
4747

4848
struct LruEntry<K, V> {
49-
priv key: Option<K>,
50-
priv value: Option<V>,
51-
priv next: *mut LruEntry<K, V>,
52-
priv prev: *mut LruEntry<K, V>,
49+
key: Option<K>,
50+
value: Option<V>,
51+
next: *mut LruEntry<K, V>,
52+
prev: *mut LruEntry<K, V>,
5353
}
5454

5555
/// An LRU Cache.

src/libextra/sync.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -709,8 +709,8 @@ pub struct Barrier {
709709

710710
// The inner state of a double barrier
711711
struct BarrierState {
712-
priv count: uint,
713-
priv generation_id: uint,
712+
count: uint,
713+
generation_id: uint,
714714
}
715715

716716
impl Barrier {

src/librustc/middle/ty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ pub type ctxt = @ctxt_;
257257
/// The data structure to keep track of all the information that typechecker
258258
/// generates so that so that it can be reused and doesn't have to be redone
259259
/// later on.
260-
struct ctxt_ {
260+
pub struct ctxt_ {
261261
diag: @syntax::diagnostic::SpanHandler,
262262
interner: RefCell<HashMap<intern_key, ~t_box_>>,
263263
next_id: Cell<uint>,

src/librustc/util/sha2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ trait FixedBuffer {
109109

110110
/// A FixedBuffer of 64 bytes useful for implementing Sha256 which has a 64 byte blocksize.
111111
struct FixedBuffer64 {
112-
priv buffer: [u8, ..64],
113-
priv buffer_idx: uint,
112+
buffer: [u8, ..64],
113+
buffer_idx: uint,
114114
}
115115

116116
impl FixedBuffer64 {

src/librustpkg/package_source.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ fn prefixes(p: &Path) -> Prefixes {
7878
}
7979

8080
struct Prefixes {
81-
priv components: ~[~str],
82-
priv remaining: ~[~str]
81+
components: ~[~str],
82+
remaining: ~[~str]
8383
}
8484

8585
impl Iterator<(Path, Path)> for Prefixes {

src/librustuv/homing.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ pub trait HomingIO {
126126
/// task back to its appropriate home (if applicable). The field is used to
127127
/// assert that we are where we think we are.
128128
struct HomingMissile {
129-
priv io_home: uint,
129+
io_home: uint,
130130
}
131131

132132
impl HomingMissile {

src/libstd/comm/select.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ pub struct Handle<'port, T> {
9595
priv port: &'port mut Port<T>,
9696
}
9797

98-
struct Packets { priv cur: *mut Packet }
98+
struct Packets { cur: *mut Packet }
9999

100100
impl Select {
101101
/// Creates a new selection structure. This set is initially empty and

0 commit comments

Comments
 (0)