Automated fixes to follow Rust development

Applied fixes: *attribute fix (cf rust-lang/rust#2569) *priv attribute removal (cf rust-lang/rust@f2a5c7a)
Geal · Apr 2, 2014 · 64a2773 · 64a2773
1 parent b190e27
commit 64a2773
Show file tree

Hide file tree

Showing 45 changed files with 226 additions and 226 deletions.
diff --git a/examples/balls_vee2d.rs b/examples/balls_vee2d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/examples/balls_vee3d.rs b/examples/balls_vee3d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/examples/boxes_vee2d.rs b/examples/boxes_vee2d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/examples/boxes_vee3d.rs b/examples/boxes_vee3d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/examples/compound2d.rs b/examples/compound2d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/examples/compound3d.rs b/examples/compound3d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/examples/cross2d.rs b/examples/cross2d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/examples/cross3d.rs b/examples/cross3d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/examples/graphics2d/camera.rs b/examples/graphics2d/camera.rs
@@ -7,12 +7,12 @@ use rsfml::window::event;
 static ZOOM_FACTOR: f32 = 0.1;
 
 pub struct Camera {
-    priv pressing:  bool,
-    priv ui:        Rc<RefCell<graphics::View>>,
-    priv scene:     Rc<RefCell<graphics::View>>,
-    priv lastx:     int,
-    priv lasty:     int,
-    priv curr_zoom: f32
+    pressing:  bool,
+    ui:        Rc<RefCell<graphics::View>>,
+    scene:     Rc<RefCell<graphics::View>>,
+    lastx:     int,
+    lasty:     int,
+    curr_zoom: f32
 }
 
 impl Camera {

diff --git a/examples/graphics2d/fps.rs b/examples/graphics2d/fps.rs
@@ -5,9 +5,9 @@ use rsfml::graphics;
 use time;
 
 pub struct Fps<'a> {
-    priv delta:     f64,
-    priv last_time: f64,
-    priv fps:       Text<'a>
+    delta:     f64,
+    last_time: f64,
+    fps:       Text<'a>
 }
 
 impl<'a> Fps<'a> {

diff --git a/examples/graphics2d/graphics2d.rs b/examples/graphics2d/graphics2d.rs
@@ -1,7 +1,7 @@
-#[crate_id = "graphics2d"];
-#[crate_type = "lib"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_id = "graphics2d"]
+#![crate_type = "lib"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate rand;

diff --git a/examples/graphics2d/objects/ball.rs b/examples/graphics2d/objects/ball.rs
@@ -9,10 +9,10 @@ use nphysics::object::RigidBody;
 use draw_helper::DRAW_SCALE;
 
 pub struct Ball<'a> {
-    priv color: Vec3<u8>,
-    priv delta: Iso2<f32>,
-    priv body:  Rc<RefCell<RigidBody>>,
-    priv gfx:   CircleShape<'a>
+    color: Vec3<u8>,
+    delta: Iso2<f32>,
+    body:  Rc<RefCell<RigidBody>>,
+    gfx:   CircleShape<'a>
 }
 
 impl<'a> Ball<'a> {

diff --git a/examples/graphics2d/objects/box_node.rs b/examples/graphics2d/objects/box_node.rs
@@ -9,10 +9,10 @@ use nphysics::object::RigidBody;
 use draw_helper::DRAW_SCALE;
 
 pub struct Box<'a> {
-    priv color: Vec3<u8>,
-    priv delta: Iso2<f32>,
-    priv body:  Rc<RefCell<RigidBody>>,
-    priv gfx:   RectangleShape<'a>
+    color: Vec3<u8>,
+    delta: Iso2<f32>,
+    body:  Rc<RefCell<RigidBody>>,
+    gfx:   RectangleShape<'a>
 }
 
 impl<'a> Box<'a> {

diff --git a/examples/graphics2d/objects/lines.rs b/examples/graphics2d/objects/lines.rs
@@ -8,11 +8,11 @@ use nphysics::object::RigidBody;
 use draw_helper::draw_line;
 
 pub struct Lines {
-    priv color:    Vec3<u8>,
-    priv delta:    Iso2<f32>,
-    priv body:     Rc<RefCell<RigidBody>>,
-    priv indices:  Arc<Vec<uint>>,
-    priv vertices: Arc<Vec<Vec2<f32>>>
+    color:    Vec3<u8>,
+    delta:    Iso2<f32>,
+    body:     Rc<RefCell<RigidBody>>,
+    indices:  Arc<Vec<uint>>,
+    vertices: Arc<Vec<Vec2<f32>>>
 }
 
 impl Lines {

diff --git a/examples/graphics3d/graphics3d.rs b/examples/graphics3d/graphics3d.rs
@@ -1,7 +1,7 @@
-#[crate_id = "graphics3d"];
-#[crate_type = "lib"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_id = "graphics3d"]
+#![crate_type = "lib"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate rand;

diff --git a/examples/graphics3d/objects/ball.rs b/examples/graphics3d/objects/ball.rs
@@ -7,11 +7,11 @@ use nalgebra::na;
 use nphysics::object::RigidBody;
 
 pub struct Ball {
-    priv color:      Vec3<f32>,
-    priv base_color: Vec3<f32>,
-    priv delta:      Iso3<f32>,
-    priv gfx:        Object,
-    priv body:       Rc<RefCell<RigidBody>>
+    color:      Vec3<f32>,
+    base_color: Vec3<f32>,
+    delta:      Iso3<f32>,
+    gfx:        Object,
+    body:       Rc<RefCell<RigidBody>>
 }
 
 impl Ball {

diff --git a/examples/graphics3d/objects/box_node.rs b/examples/graphics3d/objects/box_node.rs
@@ -7,11 +7,11 @@ use nalgebra::na;
 use nphysics::object::RigidBody;
 
 pub struct Box {
-    priv color:      Vec3<f32>,
-    priv base_color: Vec3<f32>,
-    priv delta:      Iso3<f32>,
-    priv gfx:        Object,
-    priv body:       Rc<RefCell<RigidBody>>,
+    color:      Vec3<f32>,
+    base_color: Vec3<f32>,
+    delta:      Iso3<f32>,
+    gfx:        Object,
+    body:       Rc<RefCell<RigidBody>>,
 }
 
 impl Box {

diff --git a/examples/graphics3d/objects/cone.rs b/examples/graphics3d/objects/cone.rs
@@ -8,11 +8,11 @@ use nalgebra::na;
 use nphysics::object::RigidBody;
 
 pub struct Cone {
-    priv color:      Vec3<f32>,
-    priv base_color: Vec3<f32>,
-    priv delta:      Iso3<f32>,
-    priv gfx:        Object,
-    priv body:       Rc<RefCell<RigidBody>>,
+    color:      Vec3<f32>,
+    base_color: Vec3<f32>,
+    delta:      Iso3<f32>,
+    gfx:        Object,
+    body:       Rc<RefCell<RigidBody>>,
 }
 
 impl Cone {

diff --git a/examples/graphics3d/objects/cylinder.rs b/examples/graphics3d/objects/cylinder.rs
@@ -8,11 +8,11 @@ use nalgebra::na;
 use nphysics::object::RigidBody;
 
 pub struct Cylinder {
-    priv color:      Vec3<f32>,
-    priv base_color: Vec3<f32>,
-    priv delta:      Iso3<f32>,
-    priv gfx:        Object,
-    priv body:       Rc<RefCell<RigidBody>>,
+    color:      Vec3<f32>,
+    base_color: Vec3<f32>,
+    delta:      Iso3<f32>,
+    gfx:        Object,
+    body:       Rc<RefCell<RigidBody>>,
 }
 
 impl Cylinder {

diff --git a/examples/graphics3d/objects/mesh.rs b/examples/graphics3d/objects/mesh.rs
@@ -8,11 +8,11 @@ use nalgebra::na;
 use nphysics::object::RigidBody;
 
 pub struct Mesh {
-    priv color:      Vec3<f32>,
-    priv base_color: Vec3<f32>,
-    priv delta:      Iso3<f32>,
-    priv gfx:        Object,
-    priv body:       Rc<RefCell<RigidBody>>
+    color:      Vec3<f32>,
+    base_color: Vec3<f32>,
+    delta:      Iso3<f32>,
+    gfx:        Object,
+    body:       Rc<RefCell<RigidBody>>
 }
 
 impl Mesh {

diff --git a/examples/graphics3d/objects/plane.rs b/examples/graphics3d/objects/plane.rs
@@ -6,8 +6,8 @@ use nalgebra::na::Vec3;
 use nphysics::object::RigidBody;
 
 pub struct Plane {
-    priv gfx:  Object,
-    priv body: Rc<RefCell<RigidBody>>,
+    gfx:  Object,
+    body: Rc<RefCell<RigidBody>>,
 }
 
 impl Plane {

diff --git a/examples/mesh2d.rs b/examples/mesh2d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate rand;

diff --git a/examples/mesh3d.rs b/examples/mesh3d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/examples/primitives3d.rs b/examples/primitives3d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/examples/pyramid2d.rs b/examples/pyramid2d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/examples/pyramid3d.rs b/examples/pyramid3d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/examples/regression_tests/bug_long_thin_box_one_shot_manifold.rs b/examples/regression_tests/bug_long_thin_box_one_shot_manifold.rs
@@ -21,9 +21,9 @@
  */
 
 
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/examples/wall2d.rs b/examples/wall2d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/examples/wall3d.rs b/examples/wall3d.rs
@@ -1,6 +1,6 @@
-#[crate_type = "bin"];
-#[warn(non_camel_case_types)];
-#[feature(managed_boxes)];
+#![crate_type = "bin"]
+#![warn(non_camel_case_types)]
+#![feature(managed_boxes)]
 
 extern crate std;
 extern crate native;

diff --git a/src/detection/activation_manager.rs b/src/detection/activation_manager.rs
@@ -15,13 +15,13 @@ use utils::union_find;
 ///
 /// It is responsible for making objects sleep or wake up.
 pub struct ActivationManager {
-    priv threshold:      Scalar,
-    priv mix_factor:     Scalar,
-    priv ufind:          Vec<UnionFindSet>,
-    priv can_deactivate: Vec<bool>,
-    priv collector:      Vec<Constraint>,
-    priv to_activate:    Vec<Rc<RefCell<RigidBody>>>,
-    priv to_deactivate:  Vec<uint>
+    threshold:      Scalar,
+    mix_factor:     Scalar,
+    ufind:          Vec<UnionFindSet>,
+    can_deactivate: Vec<bool>,
+    collector:      Vec<Constraint>,
+    to_activate:    Vec<Rc<RefCell<RigidBody>>>,
+    to_deactivate:  Vec<uint>
 }
 
 impl ActivationManager {