Skip to content

Commit 64a2773

Browse files
committed
Automated fixes to follow Rust development
Applied fixes: *attribute fix (cf rust-lang/rust#2569) *priv attribute removal (cf rust-lang/rust@f2a5c7a)
1 parent b190e27 commit 64a2773

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+226
-226
lines changed

examples/balls_vee2d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate native;

examples/balls_vee3d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate native;

examples/boxes_vee2d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate native;

examples/boxes_vee3d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate native;

examples/compound2d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate native;

examples/compound3d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate native;

examples/cross2d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate native;

examples/cross3d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate native;

examples/graphics2d/camera.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ use rsfml::window::event;
77
static ZOOM_FACTOR: f32 = 0.1;
88

99
pub struct Camera {
10-
priv pressing: bool,
11-
priv ui: Rc<RefCell<graphics::View>>,
12-
priv scene: Rc<RefCell<graphics::View>>,
13-
priv lastx: int,
14-
priv lasty: int,
15-
priv curr_zoom: f32
10+
pressing: bool,
11+
ui: Rc<RefCell<graphics::View>>,
12+
scene: Rc<RefCell<graphics::View>>,
13+
lastx: int,
14+
lasty: int,
15+
curr_zoom: f32
1616
}
1717

1818
impl Camera {

examples/graphics2d/fps.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use rsfml::graphics;
55
use time;
66

77
pub struct Fps<'a> {
8-
priv delta: f64,
9-
priv last_time: f64,
10-
priv fps: Text<'a>
8+
delta: f64,
9+
last_time: f64,
10+
fps: Text<'a>
1111
}
1212

1313
impl<'a> Fps<'a> {

examples/graphics2d/graphics2d.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#[crate_id = "graphics2d"];
2-
#[crate_type = "lib"];
3-
#[warn(non_camel_case_types)];
4-
#[feature(managed_boxes)];
1+
#![crate_id = "graphics2d"]
2+
#![crate_type = "lib"]
3+
#![warn(non_camel_case_types)]
4+
#![feature(managed_boxes)]
55

66
extern crate std;
77
extern crate rand;

examples/graphics2d/objects/ball.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ use nphysics::object::RigidBody;
99
use draw_helper::DRAW_SCALE;
1010

1111
pub struct Ball<'a> {
12-
priv color: Vec3<u8>,
13-
priv delta: Iso2<f32>,
14-
priv body: Rc<RefCell<RigidBody>>,
15-
priv gfx: CircleShape<'a>
12+
color: Vec3<u8>,
13+
delta: Iso2<f32>,
14+
body: Rc<RefCell<RigidBody>>,
15+
gfx: CircleShape<'a>
1616
}
1717

1818
impl<'a> Ball<'a> {

examples/graphics2d/objects/box_node.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ use nphysics::object::RigidBody;
99
use draw_helper::DRAW_SCALE;
1010

1111
pub struct Box<'a> {
12-
priv color: Vec3<u8>,
13-
priv delta: Iso2<f32>,
14-
priv body: Rc<RefCell<RigidBody>>,
15-
priv gfx: RectangleShape<'a>
12+
color: Vec3<u8>,
13+
delta: Iso2<f32>,
14+
body: Rc<RefCell<RigidBody>>,
15+
gfx: RectangleShape<'a>
1616
}
1717

1818
impl<'a> Box<'a> {

examples/graphics2d/objects/lines.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ use nphysics::object::RigidBody;
88
use draw_helper::draw_line;
99

1010
pub struct Lines {
11-
priv color: Vec3<u8>,
12-
priv delta: Iso2<f32>,
13-
priv body: Rc<RefCell<RigidBody>>,
14-
priv indices: Arc<Vec<uint>>,
15-
priv vertices: Arc<Vec<Vec2<f32>>>
11+
color: Vec3<u8>,
12+
delta: Iso2<f32>,
13+
body: Rc<RefCell<RigidBody>>,
14+
indices: Arc<Vec<uint>>,
15+
vertices: Arc<Vec<Vec2<f32>>>
1616
}
1717

1818
impl Lines {

examples/graphics3d/graphics3d.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#[crate_id = "graphics3d"];
2-
#[crate_type = "lib"];
3-
#[warn(non_camel_case_types)];
4-
#[feature(managed_boxes)];
1+
#![crate_id = "graphics3d"]
2+
#![crate_type = "lib"]
3+
#![warn(non_camel_case_types)]
4+
#![feature(managed_boxes)]
55

66
extern crate std;
77
extern crate rand;

examples/graphics3d/objects/ball.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ use nalgebra::na;
77
use nphysics::object::RigidBody;
88

99
pub struct Ball {
10-
priv color: Vec3<f32>,
11-
priv base_color: Vec3<f32>,
12-
priv delta: Iso3<f32>,
13-
priv gfx: Object,
14-
priv body: Rc<RefCell<RigidBody>>
10+
color: Vec3<f32>,
11+
base_color: Vec3<f32>,
12+
delta: Iso3<f32>,
13+
gfx: Object,
14+
body: Rc<RefCell<RigidBody>>
1515
}
1616

1717
impl Ball {

examples/graphics3d/objects/box_node.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ use nalgebra::na;
77
use nphysics::object::RigidBody;
88

99
pub struct Box {
10-
priv color: Vec3<f32>,
11-
priv base_color: Vec3<f32>,
12-
priv delta: Iso3<f32>,
13-
priv gfx: Object,
14-
priv body: Rc<RefCell<RigidBody>>,
10+
color: Vec3<f32>,
11+
base_color: Vec3<f32>,
12+
delta: Iso3<f32>,
13+
gfx: Object,
14+
body: Rc<RefCell<RigidBody>>,
1515
}
1616

1717
impl Box {

examples/graphics3d/objects/cone.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ use nalgebra::na;
88
use nphysics::object::RigidBody;
99

1010
pub struct Cone {
11-
priv color: Vec3<f32>,
12-
priv base_color: Vec3<f32>,
13-
priv delta: Iso3<f32>,
14-
priv gfx: Object,
15-
priv body: Rc<RefCell<RigidBody>>,
11+
color: Vec3<f32>,
12+
base_color: Vec3<f32>,
13+
delta: Iso3<f32>,
14+
gfx: Object,
15+
body: Rc<RefCell<RigidBody>>,
1616
}
1717

1818
impl Cone {

examples/graphics3d/objects/cylinder.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ use nalgebra::na;
88
use nphysics::object::RigidBody;
99

1010
pub struct Cylinder {
11-
priv color: Vec3<f32>,
12-
priv base_color: Vec3<f32>,
13-
priv delta: Iso3<f32>,
14-
priv gfx: Object,
15-
priv body: Rc<RefCell<RigidBody>>,
11+
color: Vec3<f32>,
12+
base_color: Vec3<f32>,
13+
delta: Iso3<f32>,
14+
gfx: Object,
15+
body: Rc<RefCell<RigidBody>>,
1616
}
1717

1818
impl Cylinder {

examples/graphics3d/objects/mesh.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ use nalgebra::na;
88
use nphysics::object::RigidBody;
99

1010
pub struct Mesh {
11-
priv color: Vec3<f32>,
12-
priv base_color: Vec3<f32>,
13-
priv delta: Iso3<f32>,
14-
priv gfx: Object,
15-
priv body: Rc<RefCell<RigidBody>>
11+
color: Vec3<f32>,
12+
base_color: Vec3<f32>,
13+
delta: Iso3<f32>,
14+
gfx: Object,
15+
body: Rc<RefCell<RigidBody>>
1616
}
1717

1818
impl Mesh {

examples/graphics3d/objects/plane.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use nalgebra::na::Vec3;
66
use nphysics::object::RigidBody;
77

88
pub struct Plane {
9-
priv gfx: Object,
10-
priv body: Rc<RefCell<RigidBody>>,
9+
gfx: Object,
10+
body: Rc<RefCell<RigidBody>>,
1111
}
1212

1313
impl Plane {

examples/mesh2d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate rand;

examples/mesh3d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate native;

examples/primitives3d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate native;

examples/pyramid2d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate native;

examples/pyramid3d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate native;

examples/regression_tests/bug_long_thin_box_one_shot_manifold.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
*/
2222

2323

24-
#[crate_type = "bin"];
25-
#[warn(non_camel_case_types)];
26-
#[feature(managed_boxes)];
24+
#![crate_type = "bin"]
25+
#![warn(non_camel_case_types)]
26+
#![feature(managed_boxes)]
2727

2828
extern crate std;
2929
extern crate native;

examples/wall2d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate native;

examples/wall3d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#[crate_type = "bin"];
2-
#[warn(non_camel_case_types)];
3-
#[feature(managed_boxes)];
1+
#![crate_type = "bin"]
2+
#![warn(non_camel_case_types)]
3+
#![feature(managed_boxes)]
44

55
extern crate std;
66
extern crate native;

src/detection/activation_manager.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ use utils::union_find;
1515
///
1616
/// It is responsible for making objects sleep or wake up.
1717
pub struct ActivationManager {
18-
priv threshold: Scalar,
19-
priv mix_factor: Scalar,
20-
priv ufind: Vec<UnionFindSet>,
21-
priv can_deactivate: Vec<bool>,
22-
priv collector: Vec<Constraint>,
23-
priv to_activate: Vec<Rc<RefCell<RigidBody>>>,
24-
priv to_deactivate: Vec<uint>
18+
threshold: Scalar,
19+
mix_factor: Scalar,
20+
ufind: Vec<UnionFindSet>,
21+
can_deactivate: Vec<bool>,
22+
collector: Vec<Constraint>,
23+
to_activate: Vec<Rc<RefCell<RigidBody>>>,
24+
to_deactivate: Vec<uint>
2525
}
2626

2727
impl ActivationManager {

0 commit comments

Comments
 (0)