From 4d6836f418e35de76ca072092372cbd55b01867a Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 24 Jan 2014 11:02:03 -0800 Subject: [PATCH] Fix privacy fallout from previous change --- doc/guide-container.md | 4 ++-- src/libextra/arc.rs | 4 ++-- src/libextra/dlist.rs | 8 ++++---- src/libextra/lru_cache.rs | 10 +++++----- src/libextra/sync.rs | 4 ++-- src/librustc/middle/ty.rs | 2 +- src/librustc/util/sha2.rs | 4 ++-- src/librustpkg/package_source.rs | 4 ++-- src/librustuv/homing.rs | 2 +- src/libstd/comm/select.rs | 2 +- src/libsyntax/parse/parser.rs | 2 +- src/test/auxiliary/iss.rs | 2 +- src/test/bench/shootout-meteor.rs | 6 +++--- src/test/compile-fail/lint-missing-doc.rs | 4 ++-- src/test/compile-fail/mutable-class-fields-2.rs | 2 +- src/test/compile-fail/mutable-class-fields.rs | 2 +- src/test/compile-fail/useless-priv.rs | 4 ++-- .../run-pass/class-cast-to-trait-multiple-types.rs | 4 ++-- src/test/run-pass/class-cast-to-trait.rs | 2 +- .../run-pass/class-impl-very-parameterized-trait.rs | 2 +- src/test/run-pass/class-implement-trait-cross-crate.rs | 2 +- src/test/run-pass/class-implement-traits.rs | 2 +- src/test/run-pass/class-methods.rs | 2 +- src/test/run-pass/class-poly-methods.rs | 4 ++-- src/test/run-pass/class-separate-impl.rs | 2 +- src/test/run-pass/class-typarams.rs | 2 +- src/test/run-pass/classes-simple-method.rs | 2 +- src/test/run-pass/classes-simple.rs | 2 +- src/test/run-pass/classes.rs | 2 +- src/test/run-pass/issue-3563-3.rs | 4 ++-- src/test/run-pass/private-class-field.rs | 2 +- src/test/run-pass/private-method.rs | 2 +- 32 files changed, 51 insertions(+), 51 deletions(-) diff --git a/doc/guide-container.md b/doc/guide-container.md index 628e4f223b4..a586cfcf0d7 100644 --- a/doc/guide-container.md +++ b/doc/guide-container.md @@ -90,7 +90,7 @@ Reaching the end of the iterator is signalled by returning `None` instead of # fn main() {} /// A stream of N zeroes struct ZeroStream { - priv remaining: uint + remaining: uint } impl ZeroStream { @@ -305,7 +305,7 @@ The `ZeroStream` from earlier can provide an exact lower and upper bound: # fn main() {} /// A stream of N zeroes struct ZeroStream { - priv remaining: uint + remaining: uint } impl ZeroStream { diff --git a/src/libextra/arc.rs b/src/libextra/arc.rs index a411c4e9185..f914fa1ac09 100644 --- a/src/libextra/arc.rs +++ b/src/libextra/arc.rs @@ -148,7 +148,7 @@ fn clone(&self) -> Arc { ****************************************************************************/ #[doc(hidden)] -struct MutexArcInner { priv lock: Mutex, priv failed: bool, priv data: T } +struct MutexArcInner { lock: Mutex, failed: bool, data: T } /// An Arc with mutable data protected by a blocking mutex. #[no_freeze] @@ -312,7 +312,7 @@ fn new<'a>(flag: &'a mut bool) -> PoisonOnFail { ****************************************************************************/ #[doc(hidden)] -struct RWArcInner { priv lock: RWLock, priv failed: bool, priv data: T } +struct RWArcInner { lock: RWLock, failed: bool, data: T } /** * A dual-mode Arc protected by a reader-writer lock. The data can be accessed * mutably or immutably, and immutably-accessing tasks may run concurrently. diff --git a/src/libextra/dlist.rs b/src/libextra/dlist.rs index fa6e7c15ee0..32079788942 100644 --- a/src/libextra/dlist.rs +++ b/src/libextra/dlist.rs @@ -38,12 +38,12 @@ pub struct DList { } type Link = Option<~Node>; -struct Rawlink { priv p: *mut T } +struct Rawlink { p: *mut T } struct Node { - priv next: Link, - priv prev: Rawlink>, - priv value: T, + next: Link, + prev: Rawlink>, + value: T, } /// Double-ended DList iterator diff --git a/src/libextra/lru_cache.rs b/src/libextra/lru_cache.rs index e1cb54ae452..f602db2e54d 100644 --- a/src/libextra/lru_cache.rs +++ b/src/libextra/lru_cache.rs @@ -43,13 +43,13 @@ use std::ptr; use std::cast; -struct KeyRef { priv k: *K } +struct KeyRef { k: *K } struct LruEntry { - priv key: Option, - priv value: Option, - priv next: *mut LruEntry, - priv prev: *mut LruEntry, + key: Option, + value: Option, + next: *mut LruEntry, + prev: *mut LruEntry, } /// An LRU Cache. diff --git a/src/libextra/sync.rs b/src/libextra/sync.rs index c4277bddac7..9aefb6eaf76 100644 --- a/src/libextra/sync.rs +++ b/src/libextra/sync.rs @@ -709,8 +709,8 @@ pub struct Barrier { // The inner state of a double barrier struct BarrierState { - priv count: uint, - priv generation_id: uint, + count: uint, + generation_id: uint, } impl Barrier { diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index 01fb18d73c2..ba9cc153531 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -257,7 +257,7 @@ pub enum AutoRef { /// The data structure to keep track of all the information that typechecker /// generates so that so that it can be reused and doesn't have to be redone /// later on. -struct ctxt_ { +pub struct ctxt_ { diag: @syntax::diagnostic::SpanHandler, interner: RefCell>, next_id: Cell, diff --git a/src/librustc/util/sha2.rs b/src/librustc/util/sha2.rs index ee2f7638be9..ab7c62ccf16 100644 --- a/src/librustc/util/sha2.rs +++ b/src/librustc/util/sha2.rs @@ -109,8 +109,8 @@ trait FixedBuffer { /// A FixedBuffer of 64 bytes useful for implementing Sha256 which has a 64 byte blocksize. struct FixedBuffer64 { - priv buffer: [u8, ..64], - priv buffer_idx: uint, + buffer: [u8, ..64], + buffer_idx: uint, } impl FixedBuffer64 { diff --git a/src/librustpkg/package_source.rs b/src/librustpkg/package_source.rs index 5ac62c5284e..02c6294f236 100644 --- a/src/librustpkg/package_source.rs +++ b/src/librustpkg/package_source.rs @@ -78,8 +78,8 @@ fn prefixes(p: &Path) -> Prefixes { } struct Prefixes { - priv components: ~[~str], - priv remaining: ~[~str] + components: ~[~str], + remaining: ~[~str] } impl Iterator<(Path, Path)> for Prefixes { diff --git a/src/librustuv/homing.rs b/src/librustuv/homing.rs index 16534b7b38b..d6061088469 100644 --- a/src/librustuv/homing.rs +++ b/src/librustuv/homing.rs @@ -126,7 +126,7 @@ fn fire_homing_missile(&mut self) -> HomingMissile { /// task back to its appropriate home (if applicable). The field is used to /// assert that we are where we think we are. struct HomingMissile { - priv io_home: uint, + io_home: uint, } impl HomingMissile { diff --git a/src/libstd/comm/select.rs b/src/libstd/comm/select.rs index fe3fc573788..57ea205134a 100644 --- a/src/libstd/comm/select.rs +++ b/src/libstd/comm/select.rs @@ -95,7 +95,7 @@ pub struct Handle<'port, T> { priv port: &'port mut Port, } -struct Packets { priv cur: *mut Packet } +struct Packets { cur: *mut Packet } impl Select { /// Creates a new selection structure. This set is initially empty and diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 557e7e04ebf..7d36d3da561 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -122,7 +122,7 @@ struct PathSegmentAndBoundSet { } /// A path paired with optional type bounds. -struct PathAndBounds { +pub struct PathAndBounds { path: ast::Path, bounds: Option>, } diff --git a/src/test/auxiliary/iss.rs b/src/test/auxiliary/iss.rs index 85847a6fdeb..28437c4585d 100644 --- a/src/test/auxiliary/iss.rs +++ b/src/test/auxiliary/iss.rs @@ -13,7 +13,7 @@ // part of issue-6919.rs struct C<'a> { - k: 'a ||, + pub k: 'a ||, } fn no_op() { } diff --git a/src/test/bench/shootout-meteor.rs b/src/test/bench/shootout-meteor.rs index 53d188962e8..c06f338f018 100644 --- a/src/test/bench/shootout-meteor.rs +++ b/src/test/bench/shootout-meteor.rs @@ -18,8 +18,8 @@ fn iterate<'a, T>(x: T, f: 'a |&T| -> T) -> Iterate<'a, T> { Iterate {f: f, next: x} } struct Iterate<'a, T> { - priv f: 'a |&T| -> T, - priv next: T + f: 'a |&T| -> T, + next: T } impl<'a, T> Iterator for Iterate<'a, T> { fn next(&mut self) -> Option { @@ -35,7 +35,7 @@ enum List<'a, T> { Cons(T, &'a List<'a, T>) } struct ListIterator<'a, T> { - priv cur: &'a List<'a, T> + cur: &'a List<'a, T> } impl<'a, T> List<'a, T> { fn iter(&'a self) -> ListIterator<'a, T> { diff --git a/src/test/compile-fail/lint-missing-doc.rs b/src/test/compile-fail/lint-missing-doc.rs index a6440e67f9b..9d640647fe0 100644 --- a/src/test/compile-fail/lint-missing-doc.rs +++ b/src/test/compile-fail/lint-missing-doc.rs @@ -20,7 +20,7 @@ struct Foo { a: int, - priv b: int, + b: int, } pub struct PubFoo { //~ ERROR: missing documentation @@ -99,7 +99,7 @@ pub fn baz() {} enum Baz { BazA { a: int, - priv b: int + b: int }, BarB } diff --git a/src/test/compile-fail/mutable-class-fields-2.rs b/src/test/compile-fail/mutable-class-fields-2.rs index 30c2b9eef8c..377c745acf3 100644 --- a/src/test/compile-fail/mutable-class-fields-2.rs +++ b/src/test/compile-fail/mutable-class-fields-2.rs @@ -9,7 +9,7 @@ // except according to those terms. struct cat { - priv meows : uint, + meows : uint, how_hungry : int, } diff --git a/src/test/compile-fail/mutable-class-fields.rs b/src/test/compile-fail/mutable-class-fields.rs index a88156a4b47..4d77d1824ab 100644 --- a/src/test/compile-fail/mutable-class-fields.rs +++ b/src/test/compile-fail/mutable-class-fields.rs @@ -9,7 +9,7 @@ // except according to those terms. struct cat { - priv meows : uint, + meows : uint, how_hungry : int, } diff --git a/src/test/compile-fail/useless-priv.rs b/src/test/compile-fail/useless-priv.rs index 3d6841c919a..5a4dd42f49d 100644 --- a/src/test/compile-fail/useless-priv.rs +++ b/src/test/compile-fail/useless-priv.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -struct A { pub i: int } //~ ERROR: unnecessary `pub` -struct B { priv i: int } // don't warn b/c B can still be returned +struct A { pub i: int } +struct B { priv i: int } //~ ERROR: unnecessary `priv` pub enum C { pub Variant } //~ ERROR: unnecessary `pub` enum D { priv Variant2 } //~ ERROR: unnecessary `priv` diff --git a/src/test/run-pass/class-cast-to-trait-multiple-types.rs b/src/test/run-pass/class-cast-to-trait-multiple-types.rs index 8c142768944..10b0ac375a9 100644 --- a/src/test/run-pass/class-cast-to-trait-multiple-types.rs +++ b/src/test/run-pass/class-cast-to-trait-multiple-types.rs @@ -15,7 +15,7 @@ trait noisy { } struct dog { - priv barks: uint, + barks: uint, volume: int, } @@ -50,7 +50,7 @@ fn dog() -> dog { #[deriving(Clone)] struct cat { - priv meows: uint, + meows: uint, how_hungry: int, name: ~str, diff --git a/src/test/run-pass/class-cast-to-trait.rs b/src/test/run-pass/class-cast-to-trait.rs index 86764df6ae0..56b61dc5691 100644 --- a/src/test/run-pass/class-cast-to-trait.rs +++ b/src/test/run-pass/class-cast-to-trait.rs @@ -15,7 +15,7 @@ trait noisy { } struct cat { - priv meows: uint, + meows: uint, how_hungry: int, name: ~str, } diff --git a/src/test/run-pass/class-impl-very-parameterized-trait.rs b/src/test/run-pass/class-impl-very-parameterized-trait.rs index 918547a3a2b..e8b35c9882f 100644 --- a/src/test/run-pass/class-impl-very-parameterized-trait.rs +++ b/src/test/run-pass/class-impl-very-parameterized-trait.rs @@ -27,7 +27,7 @@ fn ne(&self, other: &cat_type) -> bool { !(*self).eq(other) } // ok: T should be in scope when resolving the trait ref for map struct cat { // Yes, you can have negative meows - priv meows : int, + meows : int, how_hungry : int, name : T, diff --git a/src/test/run-pass/class-implement-trait-cross-crate.rs b/src/test/run-pass/class-implement-trait-cross-crate.rs index 88051e18c30..4c492eecd95 100644 --- a/src/test/run-pass/class-implement-trait-cross-crate.rs +++ b/src/test/run-pass/class-implement-trait-cross-crate.rs @@ -14,7 +14,7 @@ use cci_class_trait::animals::noisy; struct cat { - priv meows: uint, + meows: uint, how_hungry : int, name : ~str, diff --git a/src/test/run-pass/class-implement-traits.rs b/src/test/run-pass/class-implement-traits.rs index 433d7f7a22f..6d5b9a9329e 100644 --- a/src/test/run-pass/class-implement-traits.rs +++ b/src/test/run-pass/class-implement-traits.rs @@ -16,7 +16,7 @@ trait noisy { #[deriving(Clone)] struct cat { - priv meows : uint, + meows : uint, how_hungry : int, name : ~str, diff --git a/src/test/run-pass/class-methods.rs b/src/test/run-pass/class-methods.rs index f5fa72e4ce5..25a2009bb9a 100644 --- a/src/test/run-pass/class-methods.rs +++ b/src/test/run-pass/class-methods.rs @@ -9,7 +9,7 @@ // except according to those terms. struct cat { - priv meows : uint, + meows : uint, how_hungry : int, } diff --git a/src/test/run-pass/class-poly-methods.rs b/src/test/run-pass/class-poly-methods.rs index 0201501bc7c..f4d3a115ef1 100644 --- a/src/test/run-pass/class-poly-methods.rs +++ b/src/test/run-pass/class-poly-methods.rs @@ -9,8 +9,8 @@ // except according to those terms. struct cat { - priv info : ~[U], - priv meows : uint, + info : ~[U], + meows : uint, how_hungry : int, } diff --git a/src/test/run-pass/class-separate-impl.rs b/src/test/run-pass/class-separate-impl.rs index eb7e608a9f1..3e9765f0b2b 100644 --- a/src/test/run-pass/class-separate-impl.rs +++ b/src/test/run-pass/class-separate-impl.rs @@ -12,7 +12,7 @@ // xfail-fast struct cat { - priv meows : uint, + meows : uint, how_hungry : int, name : ~str, diff --git a/src/test/run-pass/class-typarams.rs b/src/test/run-pass/class-typarams.rs index ab6a8b1597b..9d4e73da813 100644 --- a/src/test/run-pass/class-typarams.rs +++ b/src/test/run-pass/class-typarams.rs @@ -9,7 +9,7 @@ // except according to those terms. struct cat { - priv meows : uint, + meows : uint, how_hungry : int, } diff --git a/src/test/run-pass/classes-simple-method.rs b/src/test/run-pass/classes-simple-method.rs index 6e08a4db14e..6f21afff120 100644 --- a/src/test/run-pass/classes-simple-method.rs +++ b/src/test/run-pass/classes-simple-method.rs @@ -9,7 +9,7 @@ // except according to those terms. struct cat { - priv meows : uint, + meows : uint, how_hungry : int, } diff --git a/src/test/run-pass/classes-simple.rs b/src/test/run-pass/classes-simple.rs index 49e8f5c04e3..496efc2172e 100644 --- a/src/test/run-pass/classes-simple.rs +++ b/src/test/run-pass/classes-simple.rs @@ -9,7 +9,7 @@ // except according to those terms. struct cat { - priv meows : uint, + meows : uint, how_hungry : int, } diff --git a/src/test/run-pass/classes.rs b/src/test/run-pass/classes.rs index e5220b15520..f65bf329823 100644 --- a/src/test/run-pass/classes.rs +++ b/src/test/run-pass/classes.rs @@ -9,7 +9,7 @@ // except according to those terms. struct cat { - priv meows : uint, + meows : uint, how_hungry : int, name : ~str, diff --git a/src/test/run-pass/issue-3563-3.rs b/src/test/run-pass/issue-3563-3.rs index 57ae7ad015f..db1032a7137 100644 --- a/src/test/run-pass/issue-3563-3.rs +++ b/src/test/run-pass/issue-3563-3.rs @@ -47,8 +47,8 @@ struct Rect { struct AsciiArt { width: uint, height: uint, - priv fill: char, - priv lines: ~[~[char]], + fill: char, + lines: ~[~[char]], // This struct can be quite large so we'll disable copying: developers need // to either pass these structs around via references or move them. diff --git a/src/test/run-pass/private-class-field.rs b/src/test/run-pass/private-class-field.rs index 868cbbfa802..93872bebec9 100644 --- a/src/test/run-pass/private-class-field.rs +++ b/src/test/run-pass/private-class-field.rs @@ -9,7 +9,7 @@ // except according to those terms. struct cat { - priv meows : uint, + meows : uint, how_hungry : int, } diff --git a/src/test/run-pass/private-method.rs b/src/test/run-pass/private-method.rs index 8b2b5bfa00b..b64ca955cde 100644 --- a/src/test/run-pass/private-method.rs +++ b/src/test/run-pass/private-method.rs @@ -9,7 +9,7 @@ // except according to those terms. struct cat { - priv meows : uint, + meows : uint, how_hungry : int, }