mirror of
https://github.com/servo/servo.git
synced 2025-08-16 10:55:34 +01:00
Update Rust to 1.14.0-nightly (c59cb71d9 2016-10-26)
This commit is contained in:
Anthony Ramine
parent
6b40f97289
commit
d6479c6f0f
9 changed files with 63 additions and 65 deletions
52
ports/cef/Cargo.lock
generated
52
ports/cef/Cargo.lock
generated
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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<constellation_msg::Key, ()> {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue