Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-30 16:49:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #26071 - servo:rustup, r=nox

Browse source 
Upgrade to rustc 1.44.0-nightly (42abbd887 2020-04-07)

~Blocked on https://github.com/rust-lang/rust/issues/70280~
This commit is contained in:
bors-servo 2020-04-10 00:37:54 -04:00 • committed by GitHub
commit 9fd668488e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 40 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ports/glutin/events_loop.rs
View file

@ -90,7 +90,7 @@ impl EventsLoop {
}
EventLoop::Headless(ref data) => {
let &(ref flag, ref condvar) = &**data;
while { !*flag.lock().unwrap() } {
while !*flag.lock().unwrap() {
self.sleep(flag, condvar);
if callback(glutin::Event::Awakened) == glutin::ControlFlow::Break {
break;

2
ports/libsimpleservo/capi/src/lib.rs
View file

@ -37,7 +37,7 @@ extern "C" fn default_panic_handler(msg: *const c_char) {
lazy_static! {
static ref ON_PANIC: RwLock<extern "C" fn(*const c_char)> = RwLock::new(default_panic_handler);
static ref SERVO_VERSION: CString =
{ CString::new(simpleservo::servo_version()).expect("Can't create string") };
CString::new(simpleservo::servo_version()).expect("Can't create string");
}
#[no_mangle]