Skip to content

Commit 65690e9

Browse files
committed
add attribute #[feature(struct_variant)] and #[feature(globs)] + fix examples
1 parent 0aa0db5 commit 65690e9

File tree

7 files changed

+16
-5
lines changed

7 files changed

+16
-5
lines changed

src/examples/pong/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fn main () -> () {
3838
None => fail!("Cannot load Ball sound buffer.")
3939
};
4040

41-
let mut ballSound = match Sound::new(ballSoundBuffer) {
41+
let mut ballSound = match Sound::new_with_buffer(ballSoundBuffer) {
4242
Some(sound) => sound,
4343
None => fail!("Error cannot create sound.")
4444
};

src/examples/sound_capture/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fn main() -> () {
6868
buffer.save_to_file(filename);
6969
}
7070
else {
71-
let mut sound : Sound = match Sound::new(buffer) {
71+
let mut sound : Sound = match Sound::new_with_buffer(buffer) {
7272
Some(sound) => sound,
7373
None => fail!("Error cannot create Sound")
7474
};

src/rsfml/graphics/circle_shape.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
*
3030
*/
3131

32+
#[feature(globs)]
33+
34+
3235
use std::libc::{c_float, c_uint};
3336
use std::ptr;
3437

@@ -50,7 +53,7 @@ pub mod ffi {
5053
use std::libc::{c_void, c_float, c_uint};
5154

5255
use graphics::texture;
53-
use sfml_types::{SfBool};
56+
use sfml_types::SfBool;
5457
use graphics::rect::{IntRect, FloatRect};
5558
use system::vector2::Vector2f;
5659
use graphics::color::Color;

src/rsfml/graphics/render_texture.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ pub mod ffi {
9191
pub fn sfRenderTexture_mapCoordsToPixel(renderTexture : *sfRenderTexture, point : Vector2f, view : *view::ffi::sfView) -> Vector2i;
9292
pub fn sfRenderTexture_drawSprite(renderTexture : *sfRenderTexture, object : *sprite::ffi::sfSprite, states : *render_states::ffi::sfRenderStates) -> ();
9393
pub fn sfRenderTexture_drawText(renderTexture : *sfRenderTexture, object : *text::ffi::sfText, states : *render_states::ffi::sfRenderStates) -> ();
94-
fn sfRenderTexture_drawShape(renderTexture : *sfRenderTexture, object : *shape::ffi::sfShape, states : *render_states::ffi::sfRenderStates) -> ();
94+
pub fn sfRenderTexture_drawShape(renderTexture : *sfRenderTexture, object : *shape::ffi::sfShape, states : *render_states::ffi::sfRenderStates) -> ();
9595
pub fn sfRenderTexture_drawCircleShape(renderTexture : *sfRenderTexture, object : *circle_shape::ffi::sfCircleShape, states : *render_states::ffi::sfRenderStates) -> ();
9696
pub fn sfRenderTexture_drawConvexShape(renderTexture : *sfRenderTexture, object : *convex_shape::ffi::sfConvexShape, states : *render_states::ffi::sfRenderStates) -> ();
9797
pub fn sfRenderTexture_drawRectangleShape(renderTexture : *sfRenderTexture, object : *rectangle_shape::ffi::sfRectangleShape, states : *render_states::ffi::sfRenderStates) -> ();

src/rsfml/graphics/render_window.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ pub mod ffi {
125125
pub fn sfRenderWindow_mapCoordsToPixel(renderWindow : *sfRenderWindow, point : Vector2f, view : *sfView) -> Vector2i;
126126
pub fn sfRenderWindow_drawSprite(renderWindow : *sfRenderWindow, object : *sfSprite, states : *render_states::ffi::sfRenderStates) -> ();
127127
pub fn sfRenderWindow_drawText(renderWindow : *sfRenderWindow, object : *sfText, states : *render_states::ffi::sfRenderStates) -> ();
128-
fn sfRenderWindow_drawShape(renderWindow : *sfRenderWindow, object : *sfShape, states : *render_states::ffi::sfRenderStates) -> ();
128+
pub fn sfRenderWindow_drawShape(renderWindow : *sfRenderWindow, object : *sfShape, states : *render_states::ffi::sfRenderStates) -> ();
129129
pub fn sfRenderWindow_drawCircleShape(renderWindow : *sfRenderWindow, object : *sfCircleShape, states : *render_states::ffi::sfRenderStates) -> ();
130130
pub fn sfRenderWindow_drawConvexShape(renderWindow : *sfRenderWindow, object : *sfConvexShape, states : *render_states::ffi::sfRenderStates) -> ();
131131
pub fn sfRenderWindow_drawRectangleShape(renderWindow : *sfRenderWindow, object : *sfRectangleShape, states : *render_states::ffi::sfRenderStates) -> ();

src/rsfml/lib.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
* Here is a list of all modules :
2727
*/
2828

29+
#[feature(globs)];
30+
#[feature(struct_variant)];
31+
2932
#[link(name = "rsfml",
3033
vers = "0.2",
3134
author = "letang.jeremy@gmail.com",
@@ -36,6 +39,7 @@
3639
#[license = "Zlib/png"];
3740
#[crate_type = "lib"];
3841

42+
3943
extern mod extra;
4044

4145
pub mod traits;
@@ -45,4 +49,6 @@ pub mod audio;
4549
pub mod graphics;
4650
pub mod network;
4751
#[doc(hidden)]
52+
53+
#[feature(globs)]
4854
mod sfml_types;

src/rsfml/sfml_types.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
* 3. This notice may not be removed or altered from any source distribution.
2323
*/
2424

25+
#[feature(globs)]
26+
2527
use std::libc::{c_int};
2628

2729
pub type SfBool = c_int;

0 commit comments

Comments
 (0)