aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-01-10 08:33:27 +0100
committertomaka <pierre.krieger1708@gmail.com>2015-01-10 08:33:27 +0100
commitf72b09bcb7efee96b05dbcfc34b4a5fd72ef37aa (patch)
treeeb5d69fa2deb0326a4dc43bddb1f4ff6be8c4051
parent9d7dbf7eb039d5614976a184082163bc97a319c6 (diff)
parent469d0eafd1704d5e9a172adfc673708fc76923e9 (diff)
downloadglutin-f72b09bcb7efee96b05dbcfc34b4a5fd72ef37aa.tar.gz
glutin-f72b09bcb7efee96b05dbcfc34b4a5fd72ef37aa.zip
Merge pull request #190 from tomaka/update-rustc
Update for rust alpha 1.0
-rw-r--r--appveyor.yml5
m---------deps/apk-builder0
-rw-r--r--examples/fullscreen.rs6
-rw-r--r--examples/multiwindow.rs6
-rw-r--r--examples/support/mod.rs2
-rw-r--r--examples/window.rs2
-rw-r--r--src/win32/init.rs2
-rw-r--r--tests/headless.rs2
8 files changed, 11 insertions, 14 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 12fb639..b7a558c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,13 +1,10 @@
install:
- ps: Start-FileDownload 'https://static.rust-lang.org/dist/rust-nightly-i686-pc-windows-gnu.exe'
- - ps: Start-FileDownload 'https://static.rust-lang.org/cargo-dist/cargo-nightly-i686-pc-windows-gnu.tar.gz'
- rust-nightly-i686-pc-windows-gnu.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
- - 7z e cargo-nightly-i686-pc-windows-gnu.tar.gz
- - 7z x cargo-nightly-i686-pc-windows-gnu.tar
- SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
- - SET PATH=%PATH%;%CD%\cargo-nightly-i686-pc-windows-gnu\bin
- rustc -V
- cargo -V
+ - git submodule update --init --recursive
build: false
diff --git a/deps/apk-builder b/deps/apk-builder
deleted file mode 160000
-Subproject fe9acb5bd465da1df4561e2bd4ebcc6d305134a
diff --git a/examples/fullscreen.rs b/examples/fullscreen.rs
index c77569f..7c2ece8 100644
--- a/examples/fullscreen.rs
+++ b/examples/fullscreen.rs
@@ -19,7 +19,7 @@ fn main() {
// enumerating monitors
let monitor = {
for (num, monitor) in glutin::get_available_monitors().enumerate() {
- println!("Monitor #{}: {}", num, monitor.get_name());
+ println!("Monitor #{}: {:?}", num, monitor.get_name());
}
print!("Please write the number of the monitor to use: ");
@@ -27,7 +27,7 @@ fn main() {
.expect("Plase enter a number");
let monitor = glutin::get_available_monitors().nth(num).expect("Please enter a valid ID");
- println!("Using {}", monitor.get_name());
+ println!("Using {:?}", monitor.get_name());
monitor
};
@@ -47,6 +47,6 @@ fn main() {
context.draw_frame((0.0, 1.0, 0.0, 1.0));
window.swap_buffers();
- println!("{}", window.wait_events().collect::<Vec<glutin::Event>>());
+ println!("{:?}", window.wait_events().collect::<Vec<glutin::Event>>());
}
}
diff --git a/examples/multiwindow.rs b/examples/multiwindow.rs
index fc01ef0..96b5842 100644
--- a/examples/multiwindow.rs
+++ b/examples/multiwindow.rs
@@ -20,15 +20,15 @@ fn main() {
let window2 = glutin::Window::new().unwrap();
let window3 = glutin::Window::new().unwrap();
- let t1 = Thread::spawn(move || {
+ let t1 = Thread::scoped(move || {
run(window1, (0.0, 1.0, 0.0, 1.0));
});
- let t2 = Thread::spawn(move || {
+ let t2 = Thread::scoped(move || {
run(window2, (0.0, 0.0, 1.0, 1.0));
});
- let t3 = Thread::spawn(move || {
+ let t3 = Thread::scoped(move || {
run(window3, (1.0, 0.0, 0.0, 1.0));
});
diff --git a/examples/support/mod.rs b/examples/support/mod.rs
index 7144952..94ef1a7 100644
--- a/examples/support/mod.rs
+++ b/examples/support/mod.rs
@@ -22,7 +22,7 @@ pub fn load(window: &glutin::Window) -> Context {
let version = unsafe {
use std::ffi;
- ffi::c_str_to_bytes(&(gl.GetString(gl::VERSION) as *const i8)).to_string()
+ String::from_utf8(ffi::c_str_to_bytes(&(gl.GetString(gl::VERSION) as *const i8)).to_vec()).unwrap()
};
println!("OpenGL version {}", version);
diff --git a/examples/window.rs b/examples/window.rs
index 9cb59c8..11ab737 100644
--- a/examples/window.rs
+++ b/examples/window.rs
@@ -30,6 +30,6 @@ fn main() {
context.draw_frame((0.0, 1.0, 0.0, 1.0));
window.swap_buffers();
- println!("{}", window.wait_events().collect::<Vec<glutin::Event>>());
+ println!("{:?}", window.wait_events().collect::<Vec<glutin::Event>>());
}
}
diff --git a/src/win32/init.rs b/src/win32/init.rs
index 77965ea..b88cfb2 100644
--- a/src/win32/init.rs
+++ b/src/win32/init.rs
@@ -419,7 +419,7 @@ pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: Strin
unsafe { winapi::TranslateMessage(&msg) };
unsafe { winapi::DispatchMessageW(&msg) }; // calls `callback` (see below)
}
- }).detach();
+ });
rx.recv().unwrap()
}
diff --git a/tests/headless.rs b/tests/headless.rs
index 542445e..fdbb6c2 100644
--- a/tests/headless.rs
+++ b/tests/headless.rs
@@ -23,6 +23,6 @@ fn main() {
assert!(value == (0, 255, 0, 255) || value == (0, 64, 0, 255) ||
value == (0, 64, 0, 255) || value == (0, 64, 0, 0),
- "value is: {}", value);
+ "value is: {:?}", value);
}
}