From d6d1fd1818f68a6e7ec96a307cc26fc2284f8a4d Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 6 Apr 2016 10:26:12 -0400 Subject: [PATCH 1/4] Update glx. --- components/servo/Cargo.lock | 8 ++++---- ports/cef/Cargo.lock | 8 ++++---- ports/gonk/Cargo.lock | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index c79dc272bb8..f700a5700d2 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -814,10 +814,10 @@ dependencies = [ [[package]] name = "glx" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1041,7 +1041,7 @@ dependencies = [ "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "glx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1917,7 +1917,7 @@ dependencies = [ "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "glx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index bc67f473a43..af3c7ff9c43 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -733,10 +733,10 @@ dependencies = [ [[package]] name = "glx" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -960,7 +960,7 @@ dependencies = [ "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "glx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1813,7 +1813,7 @@ dependencies = [ "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "glx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index eb6108a1a7d..5124f2da51b 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -715,10 +715,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "glx" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -942,7 +942,7 @@ dependencies = [ "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "glx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1793,7 +1793,7 @@ dependencies = [ "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "glx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", From 8bcab909f7e0c831f84aad369b134aa348b2342b Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 6 Apr 2016 10:26:33 -0400 Subject: [PATCH 2/4] Update rust-offscreen-gl-context. --- components/servo/Cargo.lock | 20 ++++++++++---------- ports/cef/Cargo.lock | 20 ++++++++++---------- ports/gonk/Cargo.lock | 20 ++++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index f700a5700d2..d5e6c41650d 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -30,7 +30,7 @@ dependencies = [ "net_tests 0.0.1", "net_traits 0.0.1", "net_traits_tests 0.0.1", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugin_compiletest 0.0.1", "plugin_tests 0.0.1", "profile 0.0.1", @@ -176,7 +176,7 @@ dependencies = [ "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -193,7 +193,7 @@ dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -310,7 +310,7 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (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)", @@ -1416,13 +1416,13 @@ dependencies = [ [[package]] name = "offscreen_gl_context" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1729,7 +1729,7 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", @@ -1780,7 +1780,7 @@ dependencies = [ "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2341,7 +2341,7 @@ dependencies = [ "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "scoped_threadpool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -2358,7 +2358,7 @@ dependencies = [ "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index af3c7ff9c43..b0d4f6300a8 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -160,7 +160,7 @@ dependencies = [ "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -177,7 +177,7 @@ dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -279,7 +279,7 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (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)", @@ -1302,13 +1302,13 @@ dependencies = [ [[package]] name = "offscreen_gl_context" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1596,7 +1596,7 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", @@ -1638,7 +1638,7 @@ dependencies = [ "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1727,7 +1727,7 @@ dependencies = [ "msg 0.0.1", "net 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "profile 0.0.1", "profile_traits 0.0.1", "script 0.0.1", @@ -2209,7 +2209,7 @@ dependencies = [ "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "scoped_threadpool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -2226,7 +2226,7 @@ dependencies = [ "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 5124f2da51b..5c9f36dc2b2 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -153,7 +153,7 @@ dependencies = [ "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -170,7 +170,7 @@ dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -272,7 +272,7 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (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)", @@ -1284,13 +1284,13 @@ dependencies = [ [[package]] name = "offscreen_gl_context" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1578,7 +1578,7 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", @@ -1620,7 +1620,7 @@ dependencies = [ "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1708,7 +1708,7 @@ dependencies = [ "msg 0.0.1", "net 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "profile 0.0.1", "profile_traits 0.0.1", "script 0.0.1", @@ -2159,7 +2159,7 @@ dependencies = [ "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "scoped_threadpool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -2176,7 +2176,7 @@ dependencies = [ "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)", - "offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] From 12c04aa66d74bdaa5d7773841ae4a0bfc72688a5 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 6 Apr 2016 10:26:51 -0400 Subject: [PATCH 3/4] Update glutin. --- components/servo/Cargo.lock | 19 ++++--------------- ports/cef/Cargo.lock | 19 ++++--------------- ports/glutin/window.rs | 2 +- ports/gonk/Cargo.lock | 17 +++-------------- 4 files changed, 12 insertions(+), 45 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index d5e6c41650d..eb412f12751 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -758,16 +758,6 @@ dependencies = [ "lzw 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "gl_generator" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "gl_generator" version = "0.5.1" @@ -805,7 +795,7 @@ dependencies = [ "net_traits 0.0.1", "script_traits 0.0.1", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1881,7 +1871,7 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1891,9 +1881,8 @@ dependencies = [ "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1923,7 +1912,7 @@ dependencies = [ "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index b0d4f6300a8..369a845bfd9 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -677,16 +677,6 @@ dependencies = [ "lzw 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "gl_generator" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "gl_generator" version = "0.5.1" @@ -724,7 +714,7 @@ dependencies = [ "net_traits 0.0.1", "script_traits 0.0.1", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1777,7 +1767,7 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1787,9 +1777,8 @@ dependencies = [ "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1819,7 +1808,7 @@ dependencies = [ "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index 0ec095c40e1..e691191f3dd 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -220,7 +220,7 @@ impl Window { self.handle_mouse(mouse_button, element_state, mouse_pos.x, mouse_pos.y); } } - Event::MouseMoved((x, y)) => { + Event::MouseMoved(x, y) => { self.mouse_pos.set(Point2D::new(x, y)); self.event_queue.borrow_mut().push( WindowEvent::MouseWindowMoveEventClass(Point2D::typed(x as f32, y as f32))); diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 5c9f36dc2b2..4a94a0f8988 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -680,16 +680,6 @@ dependencies = [ "lzw 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "gl_generator" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "gl_generator" version = "0.5.1" @@ -1757,7 +1747,7 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1767,9 +1757,8 @@ dependencies = [ "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1799,7 +1788,7 @@ dependencies = [ "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] From 7b9a7bdaeca8abe74be5d45352a1ed8d36c34811 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 6 Apr 2016 10:27:21 -0400 Subject: [PATCH 4/4] Remove gl_generator version exception. --- python/tidy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/tidy.py b/python/tidy.py index ea7062dd1b1..8af8f31a446 100644 --- a/python/tidy.py +++ b/python/tidy.py @@ -220,7 +220,7 @@ def check_lock(file_name, contents): raise StopIteration # package names to be neglected (as named by cargo) - exceptions = ["bitflags", "xml-rs", "gl_generator", "byteorder", "uuid"] + exceptions = ["bitflags", "xml-rs", "byteorder", "uuid"] import toml content = toml.loads(contents)