rpass/cfail: Update field privacy where necessary

alexcrichton · alexcrichton · commit d0a80cca6c43 · 2014-03-31T15:47:36.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -11,7 +11,7 @@
 #[crate_type="lib"];
 
 pub struct Struct {
-    x: int
+    pub x: int
 }
 
 impl Struct {
diff --git a/src/test/compile-fail/issue-3763.rs b/src/test/compile-fail/issue-3763.rs
@@ -12,7 +12,7 @@
 
 mod my_mod {
     pub struct MyStruct {
-        priv priv_field: int
+        priv_field: int
     }
     pub fn MyStruct () -> MyStruct {
         MyStruct {priv_field: 4}
diff --git a/src/test/compile-fail/lint-missing-doc.rs b/src/test/compile-fail/lint-missing-doc.rs
@@ -24,14 +24,14 @@ struct Foo {
 }
 
 pub struct PubFoo { //~ ERROR: missing documentation
-    a: int,      //~ ERROR: missing documentation
-    priv b: int,
+    pub a: int,      //~ ERROR: missing documentation
+    b: int,
 }
 
 #[allow(missing_doc)]
 pub struct PubFoo2 {
-    a: int,
-    c: int,
+    pub a: int,
+    pub c: int,
 }
 
 mod module_no_dox {}
@@ -106,8 +106,8 @@ enum Baz {
 
 pub enum PubBaz { //~ ERROR: missing documentation
     PubBazA { //~ ERROR: missing documentation
-        a: int, //~ ERROR: missing documentation
-        priv b: int
+        pub a: int, //~ ERROR: missing documentation
+        b: int
     },
 
     priv PubBazB
@@ -118,17 +118,17 @@ pub enum PubBaz2 {
     /// dox
     PubBaz2A {
         /// dox
-        a: int,
-        priv b: int
+        pub a: int,
+        b: int
     },
     priv PubBaz2B
 }
 
 #[allow(missing_doc)]
 pub enum PubBaz3 {
     PubBaz3A {
-        a: int,
-        priv b: int
+        pub a: int,
+        b: int
     },
     priv PubBaz3B
 }
diff --git a/src/test/compile-fail/lint-unused-imports.rs b/src/test/compile-fail/lint-unused-imports.rs
@@ -40,8 +40,8 @@ mod test {
 }
 
 mod foo {
-    pub struct Point{x: int, y: int}
-    pub struct Square{p: Point, h: uint, w: uint}
+    pub struct Point{pub x: int, pub y: int}
+    pub struct Square{pub p: Point, pub h: uint, pub w: uint}
 }
 
 mod bar {
diff --git a/src/test/compile-fail/lint-visible-private-types.rs b/src/test/compile-fail/lint-visible-private-types.rs
@@ -46,8 +46,8 @@ fn y(_: Private<int>) {}
 
 
 pub struct Foo {
-    x: Private<int>, //~ ERROR private type in exported type signature
-    priv y: Private<int>
+    pub x: Private<int>, //~ ERROR private type in exported type signature
+    y: Private<int>
 }
 
 struct Bar {
@@ -57,8 +57,8 @@ struct Bar {
 pub enum Baz {
     Baz1(Private<int>), //~ ERROR private type in exported type signature
     Baz2 {
-        x: Private<int>, //~ ERROR private type in exported type signature
-        priv y: Private<int>
+        pub x: Private<int>, //~ ERROR private type in exported type signature
+        y: Private<int>
     },
 
     priv Baz3(Private<int>),
diff --git a/src/test/compile-fail/private-impl-method.rs b/src/test/compile-fail/private-impl-method.rs
@@ -10,7 +10,7 @@
 
 mod a {
     pub struct Foo {
-        x: int
+        pub x: int
     }
 
     impl Foo {
diff --git a/src/test/compile-fail/private-struct-field-ctor.rs b/src/test/compile-fail/private-struct-field-ctor.rs
@@ -10,7 +10,7 @@
 
 mod a {
     pub struct Foo {
-        priv x: int
+        x: int
     }
 }
 
diff --git a/src/test/compile-fail/private-struct-field-pattern.rs b/src/test/compile-fail/private-struct-field-pattern.rs
diff --git a/src/test/compile-fail/private-struct-field.rs b/src/test/compile-fail/private-struct-field.rs
diff --git a/src/test/compile-fail/struct-field-privacy.rs b/src/test/compile-fail/struct-field-privacy.rs
diff --git a/src/test/run-pass/issue-3847.rs b/src/test/run-pass/issue-3847.rs
diff --git a/src/test/run-pass/issue-4830.rs b/src/test/run-pass/issue-4830.rs
diff --git a/src/test/run-pass/module-qualified-struct-destructure.rs b/src/test/run-pass/module-qualified-struct-destructure.rs
diff --git a/src/test/run-pass/overloaded-autoderef-order.rs b/src/test/run-pass/overloaded-autoderef-order.rs
diff --git a/src/test/run-pass/trait-default-method-xc.rs b/src/test/run-pass/trait-default-method-xc.rs

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`// except according to those terms.`
`10`	`10`
`11`	`11`	`pub struct Foo {`
`12`		`- x: int`
	`12`	`+ pub x: int`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`impl Foo {`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@`
`10`	`10`
`11`	`11`	`pub mod kitties {`
`12`	`12`	`pub struct cat {`
`13`		`- priv meows : uint,`
	`13`	`+ meows : uint,`
`14`	`14`
`15`		`- how_hungry : int,`
	`15`	`+ pub how_hungry : int,`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`pub fn cat(in_x : uint, in_y : int) -> cat {`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`
`11`	`11`	`pub mod kitties {`
`12`	`12`	`pub struct cat {`
`13`		`- priv meows : uint,`
`14`		`- how_hungry : int,`
	`13`	`+ meows : uint,`
	`14`	`+ pub how_hungry : int,`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`impl cat {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`#[crate_type = "lib"];`
`14`	`14`
`15`		`-pub struct NameVal { name: ~str, val: int }`
	`15`	`+pub struct NameVal { pub name: ~str, pub val: int }`
`16`	`16`	`pub fn struct_nameval() -> NameVal {`
`17`	`17`	`NameVal { name: ~"crateresolve5", val: 10 }`
`18`	`18`	`}`