diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-03-28 11:09:31 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-03-31 15:47:36 -0700 |
| commit | d0a80cca6c433e76daad13f7308a3e33abca77e0 (patch) | |
| tree | 8775763b793015dabb661fc95f007ada107679c2 /src/test/auxiliary | |
| parent | 0b36e9d913c3321206e6c783b2498aae18d950b8 (diff) | |
| download | rust-d0a80cca6c433e76daad13f7308a3e33abca77e0.tar.gz rust-d0a80cca6c433e76daad13f7308a3e33abca77e0.zip | |
rpass/cfail: Update field privacy where necessary
Diffstat (limited to 'src/test/auxiliary')
27 files changed, 46 insertions, 46 deletions
diff --git a/src/test/auxiliary/anon_trait_static_method_lib.rs b/src/test/auxiliary/anon_trait_static_method_lib.rs index a15373a7033..666d2569c42 100644 --- a/src/test/auxiliary/anon_trait_static_method_lib.rs +++ b/src/test/auxiliary/anon_trait_static_method_lib.rs @@ -9,7 +9,7 @@ // except according to those terms. pub struct Foo { - x: int + pub x: int } impl Foo { diff --git a/src/test/auxiliary/cci_class.rs b/src/test/auxiliary/cci_class.rs index e27fc68df9c..50116b39737 100644 --- a/src/test/auxiliary/cci_class.rs +++ b/src/test/auxiliary/cci_class.rs @@ -10,9 +10,9 @@ pub mod kitties { pub struct cat { - priv meows : uint, + meows : uint, - how_hungry : int, + pub how_hungry : int, } pub fn cat(in_x : uint, in_y : int) -> cat { diff --git a/src/test/auxiliary/cci_class_2.rs b/src/test/auxiliary/cci_class_2.rs index c0275249ca6..55fb424205e 100644 --- a/src/test/auxiliary/cci_class_2.rs +++ b/src/test/auxiliary/cci_class_2.rs @@ -10,9 +10,9 @@ pub mod kitties { pub struct cat { - priv meows : uint, + meows : uint, - how_hungry : int, + pub how_hungry : int, } diff --git a/src/test/auxiliary/cci_class_3.rs b/src/test/auxiliary/cci_class_3.rs index 7ebf5a1e75a..6a57bb36663 100644 --- a/src/test/auxiliary/cci_class_3.rs +++ b/src/test/auxiliary/cci_class_3.rs @@ -10,9 +10,9 @@ pub mod kitties { pub struct cat { - priv meows : uint, + meows : uint, - how_hungry : int, + pub how_hungry : int, } impl cat { diff --git a/src/test/auxiliary/cci_class_4.rs b/src/test/auxiliary/cci_class_4.rs index 7479ddc3e57..733509753d3 100644 --- a/src/test/auxiliary/cci_class_4.rs +++ b/src/test/auxiliary/cci_class_4.rs @@ -10,10 +10,10 @@ pub mod kitties { pub struct cat { - priv meows : uint, + meows : uint, - how_hungry : int, - name : ~str, + pub how_hungry : int, + pub name : ~str, } impl cat { diff --git a/src/test/auxiliary/cci_class_5.rs b/src/test/auxiliary/cci_class_5.rs index 63a7392fc70..d113859a6bd 100644 --- a/src/test/auxiliary/cci_class_5.rs +++ b/src/test/auxiliary/cci_class_5.rs @@ -10,8 +10,8 @@ pub mod kitties { pub struct cat { - priv meows : uint, - how_hungry : int, + meows : uint, + pub how_hungry : int, } impl cat { diff --git a/src/test/auxiliary/cci_class_6.rs b/src/test/auxiliary/cci_class_6.rs index 3ebb23706b6..71552f4c97e 100644 --- a/src/test/auxiliary/cci_class_6.rs +++ b/src/test/auxiliary/cci_class_6.rs @@ -11,10 +11,10 @@ pub mod kitties { pub struct cat<U> { - priv info : Vec<U> , - priv meows : uint, + info : Vec<U> , + meows : uint, - how_hungry : int, + pub how_hungry : int, } impl<U> cat<U> { diff --git a/src/test/auxiliary/cci_class_cast.rs b/src/test/auxiliary/cci_class_cast.rs index e7e0e6d450a..2ce4f818659 100644 --- a/src/test/auxiliary/cci_class_cast.rs +++ b/src/test/auxiliary/cci_class_cast.rs @@ -12,9 +12,9 @@ pub mod kitty { use std::fmt; pub struct cat { - priv meows : uint, - how_hungry : int, - name : ~str, + meows : uint, + pub how_hungry : int, + pub name : ~str, } impl fmt::Show for cat { diff --git a/src/test/auxiliary/crateresolve5-1.rs b/src/test/auxiliary/crateresolve5-1.rs index 0336abae19c..4a1a4810919 100644 --- a/src/test/auxiliary/crateresolve5-1.rs +++ b/src/test/auxiliary/crateresolve5-1.rs @@ -12,7 +12,7 @@ #[crate_type = "lib"]; -pub struct NameVal { name: ~str, val: int } +pub struct NameVal { pub name: ~str, pub val: int } pub fn struct_nameval() -> NameVal { NameVal { name: ~"crateresolve5", val: 10 } diff --git a/src/test/auxiliary/crateresolve5-2.rs b/src/test/auxiliary/crateresolve5-2.rs index 9c5720680ed..f2896ec6ecb 100644 --- a/src/test/auxiliary/crateresolve5-2.rs +++ b/src/test/auxiliary/crateresolve5-2.rs @@ -12,7 +12,7 @@ #[crate_type = "lib"]; -pub struct NameVal { name: ~str, val: int } +pub struct NameVal { pub name: ~str, pub val: int } pub fn struct_nameval() -> NameVal { NameVal { name: ~"crateresolve5", val: 10 } } diff --git a/src/test/auxiliary/explicit_self_xcrate.rs b/src/test/auxiliary/explicit_self_xcrate.rs index 2f9d77691c5..e482e8c62ca 100644 --- a/src/test/auxiliary/explicit_self_xcrate.rs +++ b/src/test/auxiliary/explicit_self_xcrate.rs @@ -14,7 +14,7 @@ pub trait Foo { } pub struct Bar { - x: ~str + pub x: ~str } impl Foo for Bar { diff --git a/src/test/auxiliary/impl_privacy_xc_1.rs b/src/test/auxiliary/impl_privacy_xc_1.rs index 356990e1e01..de182c48c41 100644 --- a/src/test/auxiliary/impl_privacy_xc_1.rs +++ b/src/test/auxiliary/impl_privacy_xc_1.rs @@ -11,7 +11,7 @@ #[crate_type = "lib"]; pub struct Fish { - x: int + pub x: int } impl Fish { diff --git a/src/test/auxiliary/impl_privacy_xc_2.rs b/src/test/auxiliary/impl_privacy_xc_2.rs index 92e6ca1cc48..b98e86fc3b0 100644 --- a/src/test/auxiliary/impl_privacy_xc_2.rs +++ b/src/test/auxiliary/impl_privacy_xc_2.rs @@ -11,7 +11,7 @@ #[crate_type = "lib"]; pub struct Fish { - x: int + pub x: int } mod unexported { diff --git a/src/test/auxiliary/issue-8044.rs b/src/test/auxiliary/issue-8044.rs index 7d9a4b60384..12b871b566b 100644 --- a/src/test/auxiliary/issue-8044.rs +++ b/src/test/auxiliary/issue-8044.rs @@ -11,11 +11,11 @@ #[feature(struct_variant)]; pub struct BTree<V> { - node: TreeItem<V>, + pub node: TreeItem<V>, } pub enum TreeItem<V> { - TreeLeaf { value: V }, + TreeLeaf { pub value: V }, } pub fn leaf<V>(value: V) -> TreeItem<V> { diff --git a/src/test/auxiliary/issue2378b.rs b/src/test/auxiliary/issue2378b.rs index 1ec6ab90696..72fe2bcec97 100644 --- a/src/test/auxiliary/issue2378b.rs +++ b/src/test/auxiliary/issue2378b.rs @@ -14,7 +14,7 @@ extern crate issue2378a; use issue2378a::maybe; -pub struct two_maybes<T> {a: maybe<T>, b: maybe<T>} +pub struct two_maybes<T> {pub a: maybe<T>, pub b: maybe<T>} impl<T:Clone> Index<uint,(T,T)> for two_maybes<T> { fn index(&self, idx: &uint) -> (T, T) { diff --git a/src/test/auxiliary/lint_stability.rs b/src/test/auxiliary/lint_stability.rs index 4e71f3c0c2a..30224912d92 100644 --- a/src/test/auxiliary/lint_stability.rs +++ b/src/test/auxiliary/lint_stability.rs @@ -116,18 +116,18 @@ pub trait Trait { impl Trait for MethodTester {} #[deprecated] -pub struct DeprecatedStruct { i: int } +pub struct DeprecatedStruct { pub i: int } #[experimental] -pub struct ExperimentalStruct { i: int } +pub struct ExperimentalStruct { pub i: int } #[unstable] -pub struct UnstableStruct { i: int } -pub struct UnmarkedStruct { i: int } +pub struct UnstableStruct { pub i: int } +pub struct UnmarkedStruct { pub i: int } #[stable] -pub struct StableStruct { i: int } +pub struct StableStruct { pub i: int } #[frozen] -pub struct FrozenStruct { i: int } +pub struct FrozenStruct { pub i: int } #[locked] -pub struct LockedStruct { i: int } +pub struct LockedStruct { pub i: int } #[deprecated] pub struct DeprecatedUnitStruct; diff --git a/src/test/auxiliary/overloaded_autoderef_xc.rs b/src/test/auxiliary/overloaded_autoderef_xc.rs index 65a404d1ff3..850050fe3a5 100644 --- a/src/test/auxiliary/overloaded_autoderef_xc.rs +++ b/src/test/auxiliary/overloaded_autoderef_xc.rs @@ -11,7 +11,7 @@ use std::ops::Deref; struct DerefWithHelper<H, T> { - helper: H + pub helper: H } trait Helper<T> { diff --git a/src/test/auxiliary/pub_use_xcrate1.rs b/src/test/auxiliary/pub_use_xcrate1.rs index 18b3fe0f767..8e1e591d94f 100644 --- a/src/test/auxiliary/pub_use_xcrate1.rs +++ b/src/test/auxiliary/pub_use_xcrate1.rs @@ -9,5 +9,5 @@ // except according to those terms. pub struct Foo { - name: int + pub name: int } diff --git a/src/test/auxiliary/struct-field-privacy.rs b/src/test/auxiliary/struct-field-privacy.rs index 497d50a2390..e2c16ae8b5c 100644 --- a/src/test/auxiliary/struct-field-privacy.rs +++ b/src/test/auxiliary/struct-field-privacy.rs @@ -14,6 +14,6 @@ struct A { } pub struct B { - a: int, - priv b: int, + pub a: int, + b: int, } diff --git a/src/test/auxiliary/struct_destructuring_cross_crate.rs b/src/test/auxiliary/struct_destructuring_cross_crate.rs index 8887cbee3fe..32838331363 100644 --- a/src/test/auxiliary/struct_destructuring_cross_crate.rs +++ b/src/test/auxiliary/struct_destructuring_cross_crate.rs @@ -11,6 +11,6 @@ #[crate_type="lib"]; pub struct S { - x: int, - y: int + pub x: int, + pub y: int, } diff --git a/src/test/auxiliary/struct_variant_xc_aux.rs b/src/test/auxiliary/struct_variant_xc_aux.rs index 1bd52d1d1e2..1a756e432c3 100644 --- a/src/test/auxiliary/struct_variant_xc_aux.rs +++ b/src/test/auxiliary/struct_variant_xc_aux.rs @@ -14,5 +14,5 @@ #![feature(struct_variant)] pub enum Enum { - Variant { arg: u8 } + Variant { pub arg: u8 } } diff --git a/src/test/auxiliary/trait_default_method_xc_aux.rs b/src/test/auxiliary/trait_default_method_xc_aux.rs index f9f8a6be7d8..535ebebc722 100644 --- a/src/test/auxiliary/trait_default_method_xc_aux.rs +++ b/src/test/auxiliary/trait_default_method_xc_aux.rs @@ -10,7 +10,7 @@ #[crate_id="trait_default_method_xc_aux"]; -pub struct Something { x: int } +pub struct Something { pub x: int } pub trait A { fn f(&self) -> int; diff --git a/src/test/auxiliary/trait_default_method_xc_aux_2.rs b/src/test/auxiliary/trait_default_method_xc_aux_2.rs index 6a8c03ec6ad..984264a969c 100644 --- a/src/test/auxiliary/trait_default_method_xc_aux_2.rs +++ b/src/test/auxiliary/trait_default_method_xc_aux_2.rs @@ -13,7 +13,7 @@ extern crate aux = "trait_default_method_xc_aux"; use aux::A; -pub struct a_struct { x: int } +pub struct a_struct { pub x: int } impl A for a_struct { fn f(&self) -> int { 10 } diff --git a/src/test/auxiliary/trait_inheritance_auto_xc_2_aux.rs b/src/test/auxiliary/trait_inheritance_auto_xc_2_aux.rs index 7d6178db485..9ef53795a26 100644 --- a/src/test/auxiliary/trait_inheritance_auto_xc_2_aux.rs +++ b/src/test/auxiliary/trait_inheritance_auto_xc_2_aux.rs @@ -12,7 +12,7 @@ pub trait Foo { fn f(&self) -> int; } pub trait Bar { fn g(&self) -> int; } pub trait Baz { fn h(&self) -> int; } -pub struct A { x: int } +pub struct A { pub x: int } impl Foo for A { fn f(&self) -> int { 10 } } impl Bar for A { fn g(&self) -> int { 20 } } diff --git a/src/test/auxiliary/trait_inheritance_cross_trait_call_xc_aux.rs b/src/test/auxiliary/trait_inheritance_cross_trait_call_xc_aux.rs index c9694fec610..0a84595124a 100644 --- a/src/test/auxiliary/trait_inheritance_cross_trait_call_xc_aux.rs +++ b/src/test/auxiliary/trait_inheritance_cross_trait_call_xc_aux.rs @@ -14,7 +14,7 @@ pub trait Foo { } pub struct A { - x: int + pub x: int } impl Foo for A { diff --git a/src/test/auxiliary/trait_inheritance_overloading_xc.rs b/src/test/auxiliary/trait_inheritance_overloading_xc.rs index 6c98cd11169..4b7a72f5043 100644 --- a/src/test/auxiliary/trait_inheritance_overloading_xc.rs +++ b/src/test/auxiliary/trait_inheritance_overloading_xc.rs @@ -15,7 +15,7 @@ pub trait MyNum : Add<Self,Self> + Sub<Self,Self> + Mul<Self,Self> + Eq { #[deriving(Show)] pub struct MyInt { - val: int + pub val: int } impl Add<MyInt, MyInt> for MyInt { diff --git a/src/test/auxiliary/xc_private_method_lib.rs b/src/test/auxiliary/xc_private_method_lib.rs index a9e5775fb4e..b9f15f1c54e 100644 --- a/src/test/auxiliary/xc_private_method_lib.rs +++ b/src/test/auxiliary/xc_private_method_lib.rs @@ -11,7 +11,7 @@ #[crate_type="lib"]; pub struct Struct { - x: int + pub x: int } impl Struct { |
