From d6479c6f0fa62ccde33252b385cafaee6aab49bc Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Thu, 27 Oct 2016 19:08:14 +0200 Subject: [PATCH] Update Rust to 1.14.0-nightly (c59cb71d9 2016-10-26) --- cargo-nightly-build | 2 +- components/script/Cargo.toml | 4 +- .../dom/bindings/codegen/CodegenRust.py | 6 +-- components/script/lib.rs | 1 - components/servo/Cargo.lock | 52 +++++++++---------- components/util/lib.rs | 1 - ports/cef/Cargo.lock | 52 +++++++++---------- ports/glutin/window.rs | 8 +-- rust-nightly-date | 2 +- 9 files changed, 63 insertions(+), 65 deletions(-) diff --git a/cargo-nightly-build b/cargo-nightly-build index 7a8b72d2b7a..759d0344f7b 100644 --- a/cargo-nightly-build +++ b/cargo-nightly-build @@ -1 +1 @@ -2016-10-09 +2016-10-27 diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 9f2ca18af3f..6837f07e738 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -52,8 +52,8 @@ num-traits = "0.1.32" offscreen_gl_context = "0.4" open = "1.1.1" parking_lot = "0.3" -phf = "0.7.17" -phf_macros = "0.7.17" +phf = "0.7.18" +phf_macros = "0.7.18" plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} rand = "0.3" diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 7fc824c27b8..4c67f61af2d 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -2437,7 +2437,7 @@ def CreateBindingJSObject(descriptor, parent=None): create = "let raw = Box::into_raw(object);\nlet _rt = RootedTraceable::new(&*raw);\n" if descriptor.proxy: create += """ -let handler = RegisterBindings::proxy_handlers[PrototypeList::Proxies::%s as usize]; +let handler = RegisterBindings::PROXY_HANDLERS[PrototypeList::Proxies::%s as usize]; rooted!(in(cx) let private = PrivateValue(raw as *const libc::c_void)); let obj = NewProxyObject(cx, handler, private.handle(), @@ -6014,7 +6014,7 @@ class CGRegisterProxyHandlersMethod(CGAbstractMethod): def definition_body(self): return CGList([ - CGGeneric("proxy_handlers[Proxies::%s as usize] = Bindings::%s::DefineProxyHandler();" + CGGeneric("PROXY_HANDLERS[Proxies::%s as usize] = Bindings::%s::DefineProxyHandler();" % (desc.name, '::'.join([desc.name + 'Binding'] * 2))) for desc in self.descriptors ], "\n") @@ -6025,7 +6025,7 @@ class CGRegisterProxyHandlers(CGThing): descriptors = config.getDescriptors(proxy=True) length = len(descriptors) self.root = CGList([ - CGGeneric("pub static mut proxy_handlers: [*const libc::c_void; %d] = [0 as *const libc::c_void; %d];" + CGGeneric("pub static mut PROXY_HANDLERS: [*const libc::c_void; %d] = [0 as *const libc::c_void; %d];" % (length, length)), CGRegisterProxyHandlersMethod(descriptors), ], "\n") diff --git a/components/script/lib.rs b/components/script/lib.rs index d3161c410f3..f2227fc363a 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -14,7 +14,6 @@ #![feature(on_unimplemented)] #![feature(optin_builtin_traits)] #![feature(plugin)] -#![feature(question_mark)] #![feature(slice_patterns)] #![feature(stmt_expr_attributes)] #![feature(try_from)] diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 090fcb3835f..9b02c390859 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -970,8 +970,8 @@ dependencies = [ "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1341,8 +1341,8 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1722,42 +1722,42 @@ dependencies = [ [[package]] name = "phf" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_codegen" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_generator" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_macros" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_shared" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1968,8 +1968,8 @@ dependencies = [ "offscreen_gl_context 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_macros 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_macros 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2259,8 +2259,8 @@ dependencies = [ "debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2779,8 +2779,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2931,11 +2931,11 @@ dependencies = [ "checksum owning_ref 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d91377085359426407a287ab16884a0111ba473aa6844ff01d4ec20ce3d75e7" "checksum parking_lot 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3562f3de7bdff194212be82366abf5c6565aff8a433b71c53c63d0e7c9913878" "checksum parking_lot_core 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "06f24c980718110494e9cfb7db7438895c3f54505101bb6170329d5e43a53f64" -"checksum phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f02853ab706e88121d7ad33ed06bedce0a7cdb96136be7c20ff0dce7b4adb9ef" -"checksum phf_codegen 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "563b670811792d49bff142e7bb9787530d9b689fb4c55c6c309822d8d956a242" -"checksum phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "21416830a6c83526443b960fd41b5e18f64c4e4f90970499aeed2be592029042" -"checksum phf_macros 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "1ce32ea1f8124c0a5a67611e47d9deb1874d213154213e6659e385d477e65933" -"checksum phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "4a65f09191172833c798d31e5317ecd1e4be890a3d5acc6c2f85e1460c8828bd" +"checksum phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "971dd94df0728890a6fd7cf01b61e3f1fc84acb308175d196a9ceb2aa0e04b90" +"checksum phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "29fa7fa119b1dd493cc17d69052281ad38767c6e5f6f29263bbd57027aee7f71" +"checksum phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "e3497bdd90ab6e6f9295d4877ac89b74dd0635304b9c89a6677f17d87bb5ef8d" +"checksum phf_macros 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "8afd16b67d77b27647f1c0e49457d814cc0e48dad567b3808d783cad7c0eecaa" +"checksum phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "69668cdb43ef62e348ec04e4acea0ba200f9945230523fb1f1c1f462f27a8e2b" "checksum pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8cee804ecc7eaf201a4a207241472cc870e825206f6c031e3ee2a72fa425f2fa" "checksum pnacl-build-helper 1.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "61c9231d31aea845007443d62fcbb58bb6949ab9c18081ee1e09920e0cf1118b" "checksum png 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "06208e2ee243e3118a55dda9318f821f206d8563fb8d4df258767f8e62bb0997" diff --git a/components/util/lib.rs b/components/util/lib.rs index 931cd2dc1a5..36680583a4b 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -6,7 +6,6 @@ #![cfg_attr(feature = "servo", feature(nonzero))] #![cfg_attr(feature = "servo", feature(plugin))] #![cfg_attr(feature = "servo", feature(proc_macro))] -#![cfg_attr(feature = "servo", feature(reflect_marker))] #![cfg_attr(feature = "servo", feature(structural_match))] #![cfg_attr(feature = "servo", plugin(plugins))] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index bf5ea98ad47..268c5b610c6 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -877,8 +877,8 @@ dependencies = [ "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1241,8 +1241,8 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1593,42 +1593,42 @@ dependencies = [ [[package]] name = "phf" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_codegen" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_generator" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_macros" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_shared" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1819,8 +1819,8 @@ dependencies = [ "offscreen_gl_context 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_macros 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_macros 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2142,8 +2142,8 @@ dependencies = [ "debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2637,8 +2637,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2783,11 +2783,11 @@ dependencies = [ "checksum owning_ref 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d91377085359426407a287ab16884a0111ba473aa6844ff01d4ec20ce3d75e7" "checksum parking_lot 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3562f3de7bdff194212be82366abf5c6565aff8a433b71c53c63d0e7c9913878" "checksum parking_lot_core 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "06f24c980718110494e9cfb7db7438895c3f54505101bb6170329d5e43a53f64" -"checksum phf 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f02853ab706e88121d7ad33ed06bedce0a7cdb96136be7c20ff0dce7b4adb9ef" -"checksum phf_codegen 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "563b670811792d49bff142e7bb9787530d9b689fb4c55c6c309822d8d956a242" -"checksum phf_generator 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "21416830a6c83526443b960fd41b5e18f64c4e4f90970499aeed2be592029042" -"checksum phf_macros 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "1ce32ea1f8124c0a5a67611e47d9deb1874d213154213e6659e385d477e65933" -"checksum phf_shared 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "4a65f09191172833c798d31e5317ecd1e4be890a3d5acc6c2f85e1460c8828bd" +"checksum phf 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "971dd94df0728890a6fd7cf01b61e3f1fc84acb308175d196a9ceb2aa0e04b90" +"checksum phf_codegen 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "29fa7fa119b1dd493cc17d69052281ad38767c6e5f6f29263bbd57027aee7f71" +"checksum phf_generator 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "e3497bdd90ab6e6f9295d4877ac89b74dd0635304b9c89a6677f17d87bb5ef8d" +"checksum phf_macros 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "8afd16b67d77b27647f1c0e49457d814cc0e48dad567b3808d783cad7c0eecaa" +"checksum phf_shared 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "69668cdb43ef62e348ec04e4acea0ba200f9945230523fb1f1c1f462f27a8e2b" "checksum pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8cee804ecc7eaf201a4a207241472cc870e825206f6c031e3ee2a72fa425f2fa" "checksum pnacl-build-helper 1.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "61c9231d31aea845007443d62fcbb58bb6949ab9c18081ee1e09920e0cf1118b" "checksum png 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "06208e2ee243e3118a55dda9318f821f206d8563fb8d4df258767f8e62bb0997" diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index 5a8b811aff4..25c6f111521 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -46,7 +46,7 @@ use util::resource_files; #[cfg(target_os = "windows")] use winapi; -static mut g_nested_event_loop_listener: Option<*mut (NestedEventLoopListener + 'static)> = None; +static mut G_NESTED_EVENT_LOOP_LISTENER: Option<*mut (NestedEventLoopListener + 'static)> = None; bitflags! { flags KeyModifiers: u8 { @@ -303,7 +303,7 @@ impl Window { fn nested_window_resize(width: u32, height: u32) { unsafe { - match g_nested_event_loop_listener { + match G_NESTED_EVENT_LOOP_LISTENER { None => {} Some(listener) => { (*listener).handle_event_from_nested_event_loop( @@ -604,11 +604,11 @@ impl Window { pub unsafe fn set_nested_event_loop_listener( &self, listener: *mut (NestedEventLoopListener + 'static)) { - g_nested_event_loop_listener = Some(listener) + G_NESTED_EVENT_LOOP_LISTENER = Some(listener) } pub unsafe fn remove_nested_event_loop_listener(&self) { - g_nested_event_loop_listener = None + G_NESTED_EVENT_LOOP_LISTENER = None } fn glutin_key_to_script_key(key: glutin::VirtualKeyCode) -> Result { diff --git a/rust-nightly-date b/rust-nightly-date index 7a8b72d2b7a..759d0344f7b 100644 --- a/rust-nightly-date +++ b/rust-nightly-date @@ -1 +1 @@ -2016-10-09 +2016-10-27