diff --git a/.travis.yml b/.travis.yml index 0ada8a1408a..8b128eeedac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,7 @@ matrix: env: CCACHE=/usr/bin/ccache RUSTFLAGS=-Dwarnings + CARGO_INCREMENTAL=0 addons: apt: sources: diff --git a/Cargo.lock b/Cargo.lock index 3cd5e55a42d..34643bd0e8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -281,11 +281,11 @@ dependencies = [ "cssparser 0.23.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "webrender 0.56.1 (git+https://github.com/servo/webrender)", "webrender_api 0.56.1 (git+https://github.com/servo/webrender)", @@ -302,7 +302,7 @@ dependencies = [ "malloc_size_of 0.0.1", "malloc_size_of_derive 0.0.1", "nonzero 0.0.1", - "offscreen_gl_context 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "webrender_api 0.56.1 (git+https://github.com/servo/webrender)", @@ -354,7 +354,7 @@ name = "cgl" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -453,7 +453,7 @@ version = "0.0.1" dependencies = [ "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", - "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -795,7 +795,7 @@ dependencies = [ "compositing 0.0.1", "devtools 0.0.1", "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", "glutin_app 0.0.1", "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "libservo 0.0.1", @@ -1132,7 +1132,7 @@ dependencies = [ [[package]] name = "gl_generator" -version = "0.6.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "khronos_api 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1142,10 +1142,10 @@ dependencies = [ [[package]] name = "gleam" -version = "0.4.15" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gl_generator 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1162,7 +1162,7 @@ dependencies = [ "compositing 0.0.1", "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", "libservo 0.0.1", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1171,7 +1171,7 @@ dependencies = [ "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "servo_geometry 0.0.1", "servo_url 0.0.1", @@ -1184,10 +1184,10 @@ dependencies = [ [[package]] name = "glx" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gl_generator 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1362,7 +1362,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1626,7 +1626,7 @@ dependencies = [ "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", - "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "layout_thread 0.0.1", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2130,24 +2130,21 @@ dependencies = [ [[package]] name = "offscreen_gl_context" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", - "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2480,10 +2477,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rust-webvr" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gl_generator 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gvr-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2569,7 +2566,7 @@ dependencies = [ "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "gecko-media 0.1.0 (git+https://github.com/servo/gecko-media.git)", - "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", "half 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2591,7 +2588,7 @@ dependencies = [ "net_traits 0.0.1", "nonzero 0.0.1", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2846,7 +2843,7 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.13.1" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2856,10 +2853,10 @@ dependencies = [ "core-graphics 0.12.3 (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.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2879,14 +2876,14 @@ dependencies = [ "cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", - "glx 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", + "glx 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig-sys 4.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3580,7 +3577,7 @@ dependencies = [ "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3620,7 +3617,7 @@ dependencies = [ "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "rust-webvr 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rust-webvr 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "servo_config 0.0.1", "webvr_traits 0.0.1", @@ -3649,11 +3646,30 @@ name = "winapi" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "winapi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi-i686-pc-windows-gnu 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-x86_64-pc-windows-gnu 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "winapi-build" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "ws" version = "0.6.0" @@ -3842,10 +3858,10 @@ dependencies = [ "checksum gecko-media 0.1.0 (git+https://github.com/servo/gecko-media.git)" = "" "checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685" "checksum gif 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8a80d6fe9e52f637df9afd4779449a7be17c39cc9c35b01589bb833f956ba596" -"checksum gl_generator 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "75d69f914b49d9ff32fdf394cbd798f8c716d74fd19f9cc29da3e99797b2a78d" -"checksum gleam 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "dff613336334932baaa2759d001f14e06ea1a08a247c05962d1423aa0e89ee99" +"checksum gl_generator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f5c19cde55637681450c92f7a05ea16c78e2b6d0587e601ec1ebdab6960854b" +"checksum gleam 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)" = "437fdf7818d999b299e159611d7bb733fc7bcee683640ec2275b7d38a70688dd" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" -"checksum glx 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "19b213a7bc1223a511cbe49f4a719aa2969766e7be376fc19ae2449ce1c3e4e2" +"checksum glx 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ac56da48dff37e91aa7bf6a47af1de951ef4666dd3dd85de1bd804334c5f933c" "checksum gvr-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92de62505f21ed0ce04f36cb0dca582a100fc4204d392e6b97bba2a15f9d24b3" "checksum half 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63d68db75012a85555434ee079e7e6337931f87a087ab2988becbadf64673a7f" "checksum harfbuzz-sys 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "52aa65c5649a0a2f1b27ab30093b3cc84681e17ddb552267e21948c5a6fa6b05" @@ -3913,7 +3929,7 @@ dependencies = [ "checksum objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "877f30f37acef6749b1841cceab289707f211aecfc756553cd63976190e6cc2e" "checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" "checksum objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e4730aa1c64d722db45f7ccc4113a3e2c465d018de6db4d3e7dfe031e8c8a297" -"checksum offscreen_gl_context 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9a6999c2e60ed44c2a39b14aaa07ec4f1c8211419fca3b2c727254dc3b316fc5" +"checksum offscreen_gl_context 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "65e8ba692a8190d1c590d1a005ff502893a3f3e75e6b14719b930d4639173f10" "checksum ogg 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7137bf02687385302f4c0aecd77cfce052b69f5b4ee937be778e125c62f67e30" "checksum ogg_metadata 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fc665717454399cba557c55ad226148996e9266ee291f8a37a98bb2cded0a490" "checksum open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3478ed1686bd1300c8a981a940abc92b06fac9cbef747f4c668d4e032ff7b842" @@ -3949,7 +3965,7 @@ dependencies = [ "checksum ref_slice 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "825740057197b7d43025e7faf6477eaabc03434e153233da02d1f44602f71527" "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b" "checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db" -"checksum rust-webvr 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)" = "21a89f9ba8748fcc13d33c60c27be995fd20d3a85a72681fa052c16c6fc9de13" +"checksum rust-webvr 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)" = "4f0a5115abda9e10f6ea04c475a92d97bf8c4e6ddb6276e4db548c0d3c1524cd" "checksum rust-webvr-api 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "712e22ba3c03a7075b40842ae91029a0ab96a81f95e97c0cf623800ec0cbac07" "checksum rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3058a43ada2c2d0b92b3ae38007a2d0fa5e9db971be260e0171408a4ff471c95" "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" @@ -3970,7 +3986,7 @@ dependencies = [ "checksum servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "93f799b649b4a2bf362398910eca35240704c7e765e780349b2bb1070d892262" "checksum servo-fontconfig-sys 4.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "38b494f03009ee81914b0e7d387ad7c145cafcd69747c2ec89b0e17bb94f303a" "checksum servo-freetype-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9232032c2e85118c0282c6562c84cab12316e655491ba0a5d1905b2320060d1b" -"checksum servo-glutin 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "19ddbce9573bd316e4fe59924386997c4921dfa30c41a188c63cf18319283afa" +"checksum servo-glutin 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3267faf3d12f1c2210f691e82826493d732f7288cd3842a0739db3c2ce3d5048" "checksum servo-skia 0.30000009.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b47b49a24c705e80b193cb3c08ef37caef652abd844063f5bfea9b45e858576e" "checksum servo-websocket 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efde78dfcf2178d5a11e1e2268e0d8df0627dfe2724546db8585d6678e1af150" "checksum sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cc30b1e1e8c40c121ca33b86c23308a090d19974ef001b4bf6e61fd1a0fb095c" @@ -4032,7 +4048,10 @@ dependencies = [ "checksum webrender_api 0.56.1 (git+https://github.com/servo/webrender)" = "" "checksum which 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4be6cfa54dab45266e98b5d7be2f8ce959ddd49abd141a05d52dce4b07f803bb" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +"checksum winapi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b09fb3b6f248ea4cd42c9a65113a847d612e17505d6ebd1f7357ad68a8bf8693" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +"checksum winapi-i686-pc-windows-gnu 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ec6667f60c23eca65c561e63a13d81b44234c2e38a6b6c959025ee907ec614cc" +"checksum winapi-x86_64-pc-windows-gnu 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "98f12c52b2630cd05d2c3ffd8e008f7f48252c042b4871c72aed9dc733b96668" "checksum ws 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04614a58714f3fd4a8b1da4bcae9f031c532d35988c3d39627619248113f8be8" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" "checksum x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db27c597c187da52194a4b8232e7d869503911aab9ff726fefb76d7a830f78ed" diff --git a/Cargo.toml b/Cargo.toml index 35eb7d55cc6..6c492634dd2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,9 +14,6 @@ default-members = [ ] exclude = [".cargo"] -[profile.dev] -codegen-units = 4 - [profile.release] opt-level = 3 # Uncomment to profile on Linux: diff --git a/appveyor.yml b/appveyor.yml index 184e347a16e..a5e70156ba8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,7 @@ version: 1.0.{build} environment: CCACHE_DIR: "%APPVEYOR_BUILD_FOLDER%\\.ccache" + CARGO_INCREMENTAL: 0 RUST_BACKTRACE: 1 RUSTFLAGS: -Dwarnings # The appveyor image we use has a pretty huge set of things installed... we make the diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 6f0dd003e8d..4a377aa351f 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -2539,7 +2539,7 @@ def CopyUnforgeablePropertiesToInstance(descriptor): # reflector, so we can make sure we don't get confused by named getters. if descriptor.proxy: copyCode += """\ -rooted!(in(cx) let mut expando = ptr::null_mut()); +rooted!(in(cx) let mut expando = ptr::null_mut::()); ensure_expando_object(cx, obj.handle(), expando.handle_mut()); """ obj = "expando" @@ -2554,7 +2554,7 @@ ensure_expando_object(cx, obj.handle(), expando.handle_mut()); else: copyFunc = "JS_InitializePropertiesFromCompatibleNativeObject" copyCode += """\ -rooted!(in(cx) let mut unforgeable_holder = ptr::null_mut()); +rooted!(in(cx) let mut unforgeable_holder = ptr::null_mut::()); unforgeable_holder.handle_mut().set( JS_GetReservedSlot(proto.get(), DOM_PROTO_UNFORGEABLE_HOLDER_SLOT).to_object()); assert!(%(copyFunc)s(cx, %(obj)s.handle(), unforgeable_holder.handle())); @@ -2586,7 +2586,7 @@ let scope = scope.reflector().get_jsobject(); assert!(!scope.get().is_null()); assert!(((*get_object_class(scope.get())).flags & JSCLASS_IS_GLOBAL) != 0); -rooted!(in(cx) let mut proto = ptr::null_mut()); +rooted!(in(cx) let mut proto = ptr::null_mut::()); let _ac = JSAutoCompartment::new(cx, scope.get()); GetProtoObject(cx, scope, proto.handle_mut()); assert!(!proto.is_null()); @@ -2631,7 +2631,7 @@ class CGWrapGlobalMethod(CGAbstractMethod): let raw = Box::into_raw(object); let _rt = RootedTraceable::new(&*raw); -rooted!(in(cx) let mut obj = ptr::null_mut()); +rooted!(in(cx) let mut obj = ptr::null_mut::()); create_global_object( cx, &Class.base, @@ -2643,7 +2643,7 @@ assert!(!obj.is_null()); (*raw).init_reflector(obj.get()); let _ac = JSAutoCompartment::new(cx, obj.get()); -rooted!(in(cx) let mut proto = ptr::null_mut()); +rooted!(in(cx) let mut proto = ptr::null_mut::()); GetProtoObject(cx, obj.handle(), proto.handle_mut()); assert!(JS_SplicePrototype(cx, obj.handle(), proto.handle())); let mut immutable = false; @@ -2771,7 +2771,7 @@ class CGCreateInterfaceObjectsMethod(CGAbstractMethod): return CGGeneric("""\ rooted!(in(cx) let proto = %(proto)s); assert!(!proto.is_null()); -rooted!(in(cx) let mut namespace = ptr::null_mut()); +rooted!(in(cx) let mut namespace = ptr::null_mut::()); create_namespace_object(cx, global, proto.handle(), &NAMESPACE_OBJECT_CLASS, %(methods)s, %(name)s, namespace.handle_mut()); assert!(!namespace.is_null()); @@ -2784,7 +2784,7 @@ assert!((*cache)[PrototypeList::Constructor::%(id)s as usize].is_null()); if self.descriptor.interface.isCallback(): assert not self.descriptor.interface.ctor() and self.descriptor.interface.hasConstants() return CGGeneric("""\ -rooted!(in(cx) let mut interface = ptr::null_mut()); +rooted!(in(cx) let mut interface = ptr::null_mut::()); create_callback_interface_object(cx, global, sConstants, %(name)s, interface.handle_mut()); assert!(!interface.is_null()); assert!((*cache)[PrototypeList::Constructor::%(id)s as usize].is_null()); @@ -2807,7 +2807,7 @@ assert!((*cache)[PrototypeList::Constructor::%(id)s as usize].is_null()); toBindingNamespace(parentName)) code = [CGGeneric("""\ -rooted!(in(cx) let mut prototype_proto = ptr::null_mut()); +rooted!(in(cx) let mut prototype_proto = ptr::null_mut::()); %s; assert!(!prototype_proto.is_null());""" % getPrototypeProto)] @@ -2835,7 +2835,7 @@ assert!(!prototype_proto.is_null());""" % getPrototypeProto)] proto_properties = properties code.append(CGGeneric(""" -rooted!(in(cx) let mut prototype = ptr::null_mut()); +rooted!(in(cx) let mut prototype = ptr::null_mut::()); create_interface_prototype_object(cx, prototype_proto.handle(), &PrototypeClass, @@ -2862,7 +2862,7 @@ assert!((*cache)[PrototypeList::ID::%(id)s as usize].is_null()); if parentName: parentName = toBindingNamespace(parentName) code.append(CGGeneric(""" -rooted!(in(cx) let mut interface_proto = ptr::null_mut()); +rooted!(in(cx) let mut interface_proto = ptr::null_mut::()); %s::GetConstructorObject(cx, global, interface_proto.handle_mut());""" % parentName)) else: code.append(CGGeneric(""" @@ -2870,7 +2870,7 @@ rooted!(in(cx) let interface_proto = JS_GetFunctionPrototype(cx, global));""")) code.append(CGGeneric("""\ assert!(!interface_proto.is_null()); -rooted!(in(cx) let mut interface = ptr::null_mut()); +rooted!(in(cx) let mut interface = ptr::null_mut::()); create_noncallback_interface_object(cx, global, interface_proto.handle(), @@ -2973,7 +2973,7 @@ assert!((*cache)[PrototypeList::Constructor::%(id)s as usize].is_null()); holderClass = "&Class.base as *const JSClass" holderProto = "prototype.handle()" code.append(CGGeneric(""" -rooted!(in(cx) let mut unforgeable_holder = ptr::null_mut()); +rooted!(in(cx) let mut unforgeable_holder = ptr::null_mut::()); unforgeable_holder.handle_mut().set( JS_NewObjectWithoutMetadata(cx, %(holderClass)s, %(holderProto)s)); assert!(!unforgeable_holder.is_null()); @@ -3151,7 +3151,7 @@ if !ConstructorEnabled(cx, global) { return; } -rooted!(in(cx) let mut proto = ptr::null_mut()); +rooted!(in(cx) let mut proto = ptr::null_mut::()); %s(cx, global, proto.handle_mut()); assert!(!proto.is_null());""" % (function,)) @@ -4941,7 +4941,7 @@ if %s { # FIXME(#11868) Should assign to desc.obj, desc.get() is a copy. return get + """\ -rooted!(in(cx) let mut expando = ptr::null_mut()); +rooted!(in(cx) let mut expando = ptr::null_mut::()); get_expando_object(proxy, expando.handle_mut()); //if (!xpc::WrapperFactory::IsXrayWrapper(proxy) && (expando = GetExpandoObject(proxy))) { if !expando.is_null() { @@ -5071,7 +5071,7 @@ class CGDOMJSProxyHandler_ownPropertyKeys(CGAbstractExternMethod): body += dedent( """ - rooted!(in(cx) let mut expando = ptr::null_mut()); + rooted!(in(cx) let mut expando = ptr::null_mut::()); get_expando_object(proxy, expando.handle_mut()); if !expando.is_null() { GetPropertyKeys(cx, expando.handle(), JSITER_OWNONLY | JSITER_HIDDEN | JSITER_SYMBOLS, props); @@ -5114,7 +5114,7 @@ class CGDOMJSProxyHandler_getOwnEnumerablePropertyKeys(CGAbstractExternMethod): body += dedent( """ - rooted!(in(cx) let mut expando = ptr::null_mut()); + rooted!(in(cx) let mut expando = ptr::null_mut::()); get_expando_object(proxy, expando.handle_mut()); if !expando.is_null() { GetPropertyKeys(cx, expando.handle(), JSITER_OWNONLY | JSITER_HIDDEN | JSITER_SYMBOLS, props); @@ -5173,7 +5173,7 @@ if %s { named = "" return indexed + """\ -rooted!(in(cx) let mut expando = ptr::null_mut()); +rooted!(in(cx) let mut expando = ptr::null_mut::()); get_expando_object(proxy, expando.handle_mut()); if !expando.is_null() { let ok = JS_HasPropertyById(cx, expando.handle(), id, bp); @@ -5200,7 +5200,7 @@ class CGDOMJSProxyHandler_get(CGAbstractExternMethod): # https://heycam.github.io/webidl/#LegacyPlatformObjectGetOwnProperty def getBody(self): getFromExpando = """\ -rooted!(in(cx) let mut expando = ptr::null_mut()); +rooted!(in(cx) let mut expando = ptr::null_mut::()); get_expando_object(proxy, expando.handle_mut()); if !expando.is_null() { let mut hasProp = false; @@ -5406,7 +5406,7 @@ if args.callee() == new_target.get() { } // Step 6 -rooted!(in(cx) let mut prototype = ptr::null_mut()); +rooted!(in(cx) let mut prototype = ptr::null_mut::()); { rooted!(in(cx) let mut proto_val = UndefinedValue()); let _ac = JSAutoCompartment::new(cx, new_target.get()); @@ -6594,7 +6594,7 @@ class CGCallback(CGClass): bodyWithThis = string.Template( setupCall + - "rooted!(in(s.get_context()) let mut thisObjJS = ptr::null_mut());\n" + "rooted!(in(s.get_context()) let mut thisObjJS = ptr::null_mut::());\n" "wrap_call_this_object(s.get_context(), thisObj, thisObjJS.handle_mut());\n" "if thisObjJS.is_null() {\n" " return Err(JSFailed);\n" @@ -6605,7 +6605,7 @@ class CGCallback(CGClass): }) bodyWithoutThis = string.Template( setupCall + - "rooted!(in(s.get_context()) let thisObjJS = ptr::null_mut());\n" + "rooted!(in(s.get_context()) let thisObjJS = ptr::null_mut::());\n" "return ${methodName}(${callArgs});").substitute({ "callArgs": ", ".join(argnamesWithoutThis), "methodName": 'self.' + method.name, diff --git a/components/script/dom/bindings/htmlconstructor.rs b/components/script/dom/bindings/htmlconstructor.rs index c639dcca105..fb8640f0f91 100644 --- a/components/script/dom/bindings/htmlconstructor.rs +++ b/components/script/dom/bindings/htmlconstructor.rs @@ -81,7 +81,7 @@ use html5ever::LocalName; use html5ever::interface::QualName; use js::glue::UnwrapObject; use js::jsapi::{CallArgs, CurrentGlobalOrNull}; -use js::jsapi::{JSAutoCompartment, JSContext}; +use js::jsapi::{JSAutoCompartment, JSContext, JSObject}; use js::jsapi::HandleObject; use js::jsapi::MutableHandleObject; use script_thread::ScriptThread; @@ -111,7 +111,7 @@ pub unsafe fn html_constructor(window: &Window, call_args: &CallArgs) -> Fall { let _ac = JSAutoCompartment::new(window.get_cx(), callee.get()); - rooted!(in(window.get_cx()) let mut constructor = ptr::null_mut()); + rooted!(in(window.get_cx()) let mut constructor = ptr::null_mut::()); rooted!(in(window.get_cx()) let global_object = CurrentGlobalOrNull(window.get_cx())); if definition.is_autonomous() { diff --git a/components/script/dom/bindings/interface.rs b/components/script/dom/bindings/interface.rs index 7492cc9464e..5fc0c8a0590 100644 --- a/components/script/dom/bindings/interface.rs +++ b/components/script/dom/bindings/interface.rs @@ -186,7 +186,7 @@ pub unsafe fn create_interface_prototype_object( create_object(cx, proto, class, regular_methods, regular_properties, constants, rval); if !unscopable_names.is_empty() { - rooted!(in(cx) let mut unscopable_obj = ptr::null_mut()); + rooted!(in(cx) let mut unscopable_obj = ptr::null_mut::()); create_unscopable_object(cx, unscopable_names, unscopable_obj.handle_mut()); let unscopable_symbol = GetWellKnownSymbol(cx, SymbolCode::unscopables); @@ -231,7 +231,7 @@ pub unsafe fn create_named_constructors( global: HandleObject, named_constructors: &[(ConstructorClassHook, &[u8], u32)], interface_prototype_object: HandleObject) { - rooted!(in(cx) let mut constructor = ptr::null_mut()); + rooted!(in(cx) let mut constructor = ptr::null_mut::()); for &(native, name, arity) in named_constructors { assert!(*name.last().unwrap() == b'\0'); diff --git a/components/script/dom/bindings/iterable.rs b/components/script/dom/bindings/iterable.rs index 183c17a2578..36cef24d4bd 100644 --- a/components/script/dom/bindings/iterable.rs +++ b/components/script/dom/bindings/iterable.rs @@ -16,7 +16,7 @@ use dom::bindings::trace::JSTraceable; use dom::globalscope::GlobalScope; use dom_struct::dom_struct; use js::conversions::ToJSValConvertible; -use js::jsapi::{HandleValue, Heap, JSContext, MutableHandleObject}; +use js::jsapi::{HandleValue, Heap, JSContext, MutableHandleObject, JSObject}; use js::jsval::UndefinedValue; use std::cell::Cell; use std::ptr; @@ -76,7 +76,7 @@ impl IterableIterator { pub fn Next(&self, cx: *mut JSContext) -> Fallible { let index = self.index.get(); rooted!(in(cx) let mut value = UndefinedValue()); - rooted!(in(cx) let mut rval = ptr::null_mut()); + rooted!(in(cx) let mut rval = ptr::null_mut::()); let result = if index >= self.iterable.get_iterable_length() { dict_return(cx, rval.handle_mut(), true, value.handle()) } else { diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs index a604a34e377..4774425d531 100644 --- a/components/script/dom/bindings/proxyhandler.rs +++ b/components/script/dom/bindings/proxyhandler.rs @@ -32,7 +32,7 @@ pub unsafe extern "C" fn shadow_check_callback(cx: *mut JSContext, -> DOMProxyShadowsResult { // TODO: support OverrideBuiltins when #12978 is fixed. - rooted!(in(cx) let mut expando = ptr::null_mut()); + rooted!(in(cx) let mut expando = ptr::null_mut::()); get_expando_object(object, expando.handle_mut()); if !expando.get().is_null() { let mut has_own = false; @@ -73,7 +73,7 @@ pub unsafe extern "C" fn get_property_descriptor(cx: *mut JSContext, return true; } - rooted!(in(cx) let mut proto = ptr::null_mut()); + rooted!(in(cx) let mut proto = ptr::null_mut::()); if !GetObjectProto(cx, proxy, proto.handle_mut()) { // FIXME(#11868) Should assign to desc.obj, desc.get() is a copy. desc.get().obj = ptr::null_mut(); @@ -95,7 +95,7 @@ pub unsafe extern "C" fn define_property(cx: *mut JSContext, return true; } - rooted!(in(cx) let mut expando = ptr::null_mut()); + rooted!(in(cx) let mut expando = ptr::null_mut::()); ensure_expando_object(cx, proxy, expando.handle_mut()); JS_DefinePropertyById(cx, expando.handle(), id, desc, result) } @@ -106,7 +106,7 @@ pub unsafe extern "C" fn delete(cx: *mut JSContext, id: HandleId, bp: *mut ObjectOpResult) -> bool { - rooted!(in(cx) let mut expando = ptr::null_mut()); + rooted!(in(cx) let mut expando = ptr::null_mut::()); get_expando_object(proxy, expando.handle_mut()); if expando.is_null() { (*bp).code_ = 0 /* OkCode */; diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index 2a23281c8fe..4a6d19f972a 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -134,7 +134,7 @@ pub unsafe fn get_property_on_prototype(cx: *mut JSContext, found: *mut bool, vp: MutableHandleValue) -> bool { - rooted!(in(cx) let mut proto = ptr::null_mut()); + rooted!(in(cx) let mut proto = ptr::null_mut::()); if !JS_GetPrototype(cx, proxy, proto.handle_mut()) || proto.is_null() { *found = false; return true; @@ -287,7 +287,7 @@ pub unsafe fn has_property_on_prototype(cx: *mut JSContext, id: HandleId, found: &mut bool) -> bool { - rooted!(in(cx) let mut proto = ptr::null_mut()); + rooted!(in(cx) let mut proto = ptr::null_mut::()); if !JS_GetPrototype(cx, proxy, proto.handle_mut()) { return false; } diff --git a/components/script/dom/customelementregistry.rs b/components/script/dom/customelementregistry.rs index 21276d8f5bb..99b38717ac2 100644 --- a/components/script/dom/customelementregistry.rs +++ b/components/script/dom/customelementregistry.rs @@ -29,7 +29,7 @@ use html5ever::{LocalName, Namespace, Prefix}; use js::conversions::ToJSValConvertible; use js::glue::UnwrapObject; use js::jsapi::{Construct1, IsCallable, IsConstructor, HandleValueArray, HandleObject, MutableHandleValue}; -use js::jsapi::{Heap, JS_GetProperty, JS_SameValue, JSAutoCompartment, JSContext}; +use js::jsapi::{Heap, JS_GetProperty, JS_SameValue, JSAutoCompartment, JSContext, JSObject}; use js::jsval::{JSVal, NullValue, ObjectValue, UndefinedValue}; use microtask::Microtask; use script_thread::ScriptThread; @@ -436,7 +436,7 @@ impl CustomElementDefinition { let cx = window.get_cx(); // Step 2 rooted!(in(cx) let constructor = ObjectValue(self.constructor.callback())); - rooted!(in(cx) let mut element = ptr::null_mut()); + rooted!(in(cx) let mut element = ptr::null_mut::()); { // Go into the constructor's compartment let _ac = JSAutoCompartment::new(cx, self.constructor.callback()); @@ -545,7 +545,7 @@ fn run_upgrade_constructor(constructor: &Rc, element: &Element) -> Err rooted!(in(cx) let constructor_val = ObjectValue(constructor.callback())); rooted!(in(cx) let mut element_val = UndefinedValue()); unsafe { element.to_jsval(cx, element_val.handle_mut()); } - rooted!(in(cx) let mut construct_result = ptr::null_mut()); + rooted!(in(cx) let mut construct_result = ptr::null_mut::()); { // Go into the constructor's compartment let _ac = JSAutoCompartment::new(cx, constructor.callback()); diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index 43a0a3502a3..426752e42d5 100644 --- a/components/script/dom/eventtarget.rs +++ b/components/script/dom/eventtarget.rs @@ -34,7 +34,7 @@ use dom::virtualmethods::VirtualMethods; use dom::window::Window; use dom_struct::dom_struct; use fnv::FnvHasher; -use js::jsapi::{CompileFunction, JS_GetFunctionObject, JSAutoCompartment}; +use js::jsapi::{CompileFunction, JS_GetFunctionObject, JSAutoCompartment, JSFunction}; use js::rust::{AutoObjectVectorWrapper, CompileOptionsWrapper}; use libc::{c_char, size_t}; use servo_atoms::Atom; @@ -443,7 +443,7 @@ impl EventTarget { let scopechain = AutoObjectVectorWrapper::new(cx); let _ac = JSAutoCompartment::new(cx, window.reflector().get_jsobject().get()); - rooted!(in(cx) let mut handler = ptr::null_mut()); + rooted!(in(cx) let mut handler = ptr::null_mut::()); let rv = unsafe { CompileFunction(cx, scopechain.ptr, diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index 7a2674f293a..7475e4adbd6 100644 --- a/components/script/dom/filereader.rs +++ b/components/script/dom/filereader.rs @@ -26,6 +26,7 @@ use hyper::mime::{Attr, Mime}; use js::jsapi::Heap; use js::jsapi::JSAutoCompartment; use js::jsapi::JSContext; +use js::jsapi::JSObject; use js::jsval::{self, JSVal}; use js::typedarray::{ArrayBuffer, CreateWith}; use servo_atoms::Atom; @@ -261,7 +262,7 @@ impl FileReader { fn perform_readasarraybuffer(result: &DomRefCell>, cx: *mut JSContext, _: ReadMetaData, bytes: &[u8]) { unsafe { - rooted!(in(cx) let mut array_buffer = ptr::null_mut()); + rooted!(in(cx) let mut array_buffer = ptr::null_mut::()); assert!(ArrayBuffer::create(cx, CreateWith::Slice(bytes), array_buffer.handle_mut()).is_ok()); *result.borrow_mut() = Some(FileReaderResult::ArrayBuffer(Heap::default())); diff --git a/components/script/dom/gamepad.rs b/components/script/dom/gamepad.rs index 99f52cb203f..e5381d5587b 100644 --- a/components/script/dom/gamepad.rs +++ b/components/script/dom/gamepad.rs @@ -93,7 +93,7 @@ impl Gamepad { ); let cx = global.get_cx(); - rooted!(in (cx) let mut array = ptr::null_mut()); + rooted!(in (cx) let mut array = ptr::null_mut::()); unsafe { let _ = Float64Array::create(cx, CreateWith::Slice(&state.axes), array.handle_mut()); } diff --git a/components/script/dom/imagedata.rs b/components/script/dom/imagedata.rs index f0270fbe7b7..6be4e5d89c2 100644 --- a/components/script/dom/imagedata.rs +++ b/components/script/dom/imagedata.rs @@ -36,7 +36,7 @@ impl ImageData { let len = width * height * 4; unsafe { let cx = global.get_cx(); - rooted!(in (cx) let mut js_object = ptr::null_mut()); + rooted!(in (cx) let mut js_object = ptr::null_mut::()); let data = match data { Some(ref mut d) => { d.resize(len as usize, 0); @@ -103,7 +103,7 @@ impl ImageData { } else { let len = width * height * 4; let cx = global.get_cx(); - rooted!(in (cx) let mut array = ptr::null_mut()); + rooted!(in (cx) let mut array = ptr::null_mut::()); Uint8ClampedArray::create(cx, CreateWith::Length(len), array.handle_mut()).unwrap(); (*imagedata).data.set(array.get()); } diff --git a/components/script/dom/paintworkletglobalscope.rs b/components/script/dom/paintworkletglobalscope.rs index 7e2e5f3f825..eda9021e64c 100644 --- a/components/script/dom/paintworkletglobalscope.rs +++ b/components/script/dom/paintworkletglobalscope.rs @@ -35,6 +35,7 @@ use js::jsapi::Heap; use js::jsapi::IsCallable; use js::jsapi::IsConstructor; use js::jsapi::JSAutoCompartment; +use js::jsapi::JSObject; use js::jsapi::JS_ClearPendingException; use js::jsapi::JS_IsExceptionPending; use js::jsapi::JS_NewArrayObject; @@ -240,7 +241,7 @@ impl PaintWorkletGlobalScope { Entry::Vacant(entry) => { // Step 5.2-5.3 let args = HandleValueArray::new(); - rooted!(in(cx) let mut result = null_mut()); + rooted!(in(cx) let mut result = null_mut::()); unsafe { Construct1(cx, class_constructor.handle(), &args, result.handle_mut()); } paint_instance.set(ObjectValue(result.get())); if unsafe { JS_IsExceptionPending(cx) } { diff --git a/components/script/dom/promise.rs b/components/script/dom/promise.rs index df9838ed5cc..20485618c18 100644 --- a/components/script/dom/promise.rs +++ b/components/script/dom/promise.rs @@ -72,7 +72,7 @@ impl Promise { #[allow(unsafe_code)] pub fn new(global: &GlobalScope) -> Rc { let cx = global.get_cx(); - rooted!(in(cx) let mut obj = ptr::null_mut()); + rooted!(in(cx) let mut obj = ptr::null_mut::()); unsafe { Promise::create_js_promise(cx, HandleObject::null(), obj.handle_mut()); Promise::new_with_js_promise(obj.handle(), cx) diff --git a/components/script/dom/textencoder.rs b/components/script/dom/textencoder.rs index 7ca2a429525..8fb97ac9e78 100644 --- a/components/script/dom/textencoder.rs +++ b/components/script/dom/textencoder.rs @@ -11,7 +11,7 @@ use dom::bindings::root::DomRoot; use dom::bindings::str::{DOMString, USVString}; use dom::globalscope::GlobalScope; use dom_struct::dom_struct; -use js::jsapi::JSContext; +use js::jsapi::{JSContext, JSObject}; use js::typedarray::{Uint8Array, CreateWith}; use std::ptr; @@ -50,7 +50,7 @@ impl TextEncoderMethods for TextEncoder { unsafe fn Encode(&self, cx: *mut JSContext, input: USVString) -> NonNullJSObjectPtr { let encoded = input.0.as_bytes(); - rooted!(in(cx) let mut js_object = ptr::null_mut()); + rooted!(in(cx) let mut js_object = ptr::null_mut::()); assert!(Uint8Array::create(cx, CreateWith::Slice(&encoded), js_object.handle_mut()).is_ok()); NonNullJSObjectPtr::new_unchecked(js_object.get()) diff --git a/components/script/dom/vreyeparameters.rs b/components/script/dom/vreyeparameters.rs index b573d3d96b8..496277ba65d 100644 --- a/components/script/dom/vreyeparameters.rs +++ b/components/script/dom/vreyeparameters.rs @@ -43,7 +43,7 @@ impl VREyeParameters { let fov = VRFieldOfView::new(&global, parameters.field_of_view.clone()); let cx = global.get_cx(); - rooted!(in (cx) let mut array = ptr::null_mut()); + rooted!(in (cx) let mut array = ptr::null_mut::()); unsafe { let _ = Float32Array::create(cx, CreateWith::Slice(¶meters.offset), array.handle_mut()); } diff --git a/components/script/dom/vrframedata.rs b/components/script/dom/vrframedata.rs index 0c36536e4b7..530a3727020 100644 --- a/components/script/dom/vrframedata.rs +++ b/components/script/dom/vrframedata.rs @@ -73,7 +73,7 @@ impl VRFrameData { #[allow(unsafe_code)] fn create_typed_array(cx: *mut JSContext, src: &[f32], dst: &Heap<*mut JSObject>) { - rooted!(in (cx) let mut array = ptr::null_mut()); + rooted!(in (cx) let mut array = ptr::null_mut::()); unsafe { let _ = Float32Array::create(cx, CreateWith::Slice(src), array.handle_mut()); } diff --git a/components/script/dom/vrpose.rs b/components/script/dom/vrpose.rs index b6a9fad10a0..a0b3ec7c92a 100644 --- a/components/script/dom/vrpose.rs +++ b/components/script/dom/vrpose.rs @@ -32,7 +32,7 @@ unsafe fn update_or_create_typed_array(cx: *mut JSContext, match src { Some(data) => { if dst.get().is_null() { - rooted!(in (cx) let mut array = ptr::null_mut()); + rooted!(in (cx) let mut array = ptr::null_mut::()); let _ = Float32Array::create(cx, CreateWith::Slice(data), array.handle_mut()); (*dst).set(array.get()); } else { diff --git a/components/script/dom/vrstageparameters.rs b/components/script/dom/vrstageparameters.rs index fa545621001..9a34af4c03e 100644 --- a/components/script/dom/vrstageparameters.rs +++ b/components/script/dom/vrstageparameters.rs @@ -38,7 +38,7 @@ impl VRStageParameters { #[allow(unsafe_code)] pub fn new(parameters: WebVRStageParameters, global: &GlobalScope) -> DomRoot { let cx = global.get_cx(); - rooted!(in (cx) let mut array = ptr::null_mut()); + rooted!(in (cx) let mut array = ptr::null_mut::()); unsafe { let _ = Float32Array::create(cx, CreateWith::Slice(¶meters.sitting_to_standing_transform), array.handle_mut()); diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index 5fc38aa0ac8..df67630119b 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -22,7 +22,7 @@ use dom::globalscope::GlobalScope; use dom::messageevent::MessageEvent; use dom_struct::dom_struct; use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; -use js::jsapi::JSAutoCompartment; +use js::jsapi::{JSAutoCompartment, JSObject}; use js::jsval::UndefinedValue; use js::typedarray::{ArrayBuffer, CreateWith}; use net_traits::{CoreResourceMsg, FetchChannels}; @@ -510,7 +510,7 @@ impl TaskOnce for MessageReceivedTask { blob.to_jsval(cx, message.handle_mut()); } BinaryType::Arraybuffer => { - rooted!(in(cx) let mut array_buffer = ptr::null_mut()); + rooted!(in(cx) let mut array_buffer = ptr::null_mut::()); assert!(ArrayBuffer::create(cx, CreateWith::Slice(&data), array_buffer.handle_mut()) diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index a316ed8b898..716115307d2 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -1129,7 +1129,7 @@ impl XMLHttpRequest { // Step 2 let bytes = self.response.borrow(); - rooted!(in(cx) let mut array_buffer = ptr::null_mut()); + rooted!(in(cx) let mut array_buffer = ptr::null_mut::()); ArrayBuffer::create(cx, CreateWith::Slice(&bytes), array_buffer.handle_mut()).ok().and_then(|()| { self.response_arraybuffer.set(array_buffer.get()); Some(NonNullJSObjectPtr::new_unchecked(array_buffer.get())) diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml index 62ba5177841..a37593de292 100644 --- a/etc/ci/buildbot_steps.yml +++ b/etc/ci/buildbot_steps.yml @@ -1,5 +1,6 @@ env: RUSTFLAGS: -Dwarnings + CARGO_INCREMENTAL: "0" mac-rel-wpt1: - ./mach clean-nightlies --keep 3 --force diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 1f3d784ebc3..bfc7192df97 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -297,9 +297,8 @@ class CommandBase(object): def set_use_geckolib_toolchain(self, use_geckolib_toolchain=True): self._use_geckolib_toolchain = use_geckolib_toolchain if use_geckolib_toolchain: - # Cargo maintainer's position is that CARGO_INCREMENTAL is a nightly-only feature - # and should not be used on the stable channel. - # https://github.com/rust-lang/cargo/issues/3835 + # We use Cargo Nightly 1.24 with Rust 1.22, + # it passes `-C incremental` to rustc, which is new in Rust 1.24. self.config["build"]["incremental"] = False def toolchain(self): diff --git a/rust-toolchain b/rust-toolchain index 45c170f9e3f..6fc54862630 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2017-11-14 +nightly-2018-01-04 diff --git a/servo-tidy.toml b/servo-tidy.toml index d9bcc9def68..2f668675af8 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -42,6 +42,7 @@ packages = [ "semver", "toml", "unicase", + "winapi", ] # Files that are ignored for all tidy and lint checks. files = [