From d580226a9c055674dc2f8cd73f52cfa9e1121b02 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Sun, 15 May 2016 12:51:56 +0200 Subject: [PATCH 01/11] Reorder dependencies in many Cargo.toml files --- components/devtools_traits/Cargo.toml | 10 ++++---- components/gfx/Cargo.toml | 26 +++++++++---------- components/layout/Cargo.toml | 36 +++++++++++++-------------- components/msg/Cargo.toml | 12 ++++----- components/net/Cargo.toml | 24 +++++++++--------- components/script/Cargo.toml | 36 +++++++++++++-------------- components/style/Cargo.toml | 6 ++--- components/util/Cargo.toml | 6 ++--- ports/glutin/Cargo.toml | 10 ++++---- 9 files changed, 83 insertions(+), 83 deletions(-) diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml index bc1878b5a37..7a4e5093618 100644 --- a/components/devtools_traits/Cargo.toml +++ b/components/devtools_traits/Cargo.toml @@ -9,13 +9,13 @@ name = "devtools_traits" path = "lib.rs" [dependencies] -msg = {path = "../msg"} -ipc-channel = {git = "https://github.com/servo/ipc-channel"} +bitflags = "0.6.0" heapsize = "0.3.0" heapsize_plugin = "0.1.2" -hyper = { version = "0.9", features = [ "serde-serialization" ] } -time = "0.1" -bitflags = "0.6.0" +hyper = {version = "0.9", features = ["serde-serialization"]} +ipc-channel = {git = "https://github.com/servo/ipc-channel"} +msg = {path = "../msg"} serde = "0.7" serde_macros = "0.7" +time = "0.1" url = {version = "1.0.0", features = ["heap_size"]} diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index b08fc584bba..69b16aa5fe1 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -11,38 +11,38 @@ path = "lib.rs" [dependencies] app_units = {version = "0.2.3", features = ["plugins"]} +azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} bitflags = "0.6.0" euclid = {version = "0.6.4", features = ["plugins"]} fnv = "1.0" +gfx_traits = {path = "../gfx_traits"} harfbuzz-sys = "0.1" heapsize = "0.3.0" heapsize_plugin = "0.1.2" +ipc-channel = {git = "https://github.com/servo/ipc-channel"} +layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]} lazy_static = "0.2" libc = "0.2" log = "0.3.5" mime = "0.2" +msg = {path = "../msg"} +net_traits = {path = "../net_traits"} +plugins = {path = "../plugins"} +profile_traits = {path = "../profile_traits"} rand = "0.3" +range = {path = "../range"} rustc-serialize = "0.3" serde = "0.7" serde_macros = "0.7" servo-skia = "0.20130412.0" smallvec = "0.1" string_cache = {version = "0.2.12", features = ["heap_size"]} -time = "0.1.12" -unicode-script = { version = "0.1", features = ["harfbuzz"] } -url = {version = "1.0.0", features = ["heap_size"]} -plugins = {path = "../plugins"} -gfx_traits = {path = "../gfx_traits"} -net_traits = {path = "../net_traits"} -util = {path = "../util"} -msg = {path = "../msg"} -profile_traits = {path = "../profile_traits"} -range = {path = "../range"} style = {path = "../style"} style_traits = {path = "../style_traits"} -azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} -layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]} -ipc-channel = {git = "https://github.com/servo/ipc-channel"} +time = "0.1.12" +unicode-script = {version = "0.1", features = ["harfbuzz"]} +url = {version = "1.0.0", features = ["heap_size"]} +util = {path = "../util"} webrender_traits = {git = "https://github.com/servo/webrender_traits"} xi-unicode = "0.0.1" diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index f097dccdd26..d09a6160a97 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -9,39 +9,39 @@ name = "layout" path = "lib.rs" [dependencies] -azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} -canvas_traits = {path = "../canvas_traits"} -gfx = {path = "../gfx"} -gfx_traits = {path = "../gfx_traits"} -msg = {path = "../msg"} -script = {path = "../script"} -layout_traits = {path = "../layout_traits"} -range = {path = "../range"} -script_traits = {path = "../script_traits"} -style = {path = "../style"} -style_traits = {path = "../style_traits"} -plugins = {path = "../plugins"} -net_traits = {path = "../net_traits"} -profile_traits = {path = "../profile_traits"} -util = {path = "../util"} -ipc-channel = {git = "https://github.com/servo/ipc-channel"} -webrender_traits = {git = "https://github.com/servo/webrender_traits"} app_units = {version = "0.2.3", features = ["plugins"]} +azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} bitflags = "0.6.0" +canvas_traits = {path = "../canvas_traits"} cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} euclid = {version = "0.6.4", features = ["plugins"]} fnv = "1.0" +gfx = {path = "../gfx"} +gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.0" heapsize_plugin = "0.1.2" +ipc-channel = {git = "https://github.com/servo/ipc-channel"} +layout_traits = {path = "../layout_traits"} libc = "0.2" log = "0.3.5" +msg = {path = "../msg"} +net_traits = {path = "../net_traits"} +plugins = {path = "../plugins"} +profile_traits = {path = "../profile_traits"} +range = {path = "../range"} rustc-serialize = "0.3" +script = {path = "../script"} +script_traits = {path = "../script_traits"} selectors = {version = "0.5.1", features = ["heap_size"]} serde_json = "0.7" serde_macros = "0.7" smallvec = "0.1" string_cache = {version = "0.2.12", features = ["heap_size"]} +style = {path = "../style"} +style_traits = {path = "../style_traits"} time = "0.1" unicode-bidi = "0.2" -unicode-script = { version = "0.1", features = ["harfbuzz"] } +unicode-script = {version = "0.1", features = ["harfbuzz"]} url = {version = "1.0.0", features = ["heap_size"]} +util = {path = "../util"} +webrender_traits = {git = "https://github.com/servo/webrender_traits"} diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index 077a51f0186..ee5d57ef2cd 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -9,18 +9,18 @@ name = "msg" path = "lib.rs" [dependencies] -util = {path = "../util"} -layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]} -ipc-channel = {git = "https://github.com/servo/ipc-channel"} -plugins = {path = "../plugins"} -webrender_traits = {git = "https://github.com/servo/webrender_traits"} bitflags = "0.6.0" cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} euclid = {version = "0.6.4", features = ["plugins"]} heapsize = "0.3.0" heapsize_plugin = "0.1.2" -hyper = { version = "0.9", features = [ "serde-serialization" ] } +hyper = {version = "0.9", features = ["serde-serialization"]} +ipc-channel = {git = "https://github.com/servo/ipc-channel"} +layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]} +plugins = {path = "../plugins"} rustc-serialize = "0.3.4" serde = "0.7" serde_macros = "0.7" url = {version = "1.0.0", features = ["heap_size"]} +util = {path = "../util"} +webrender_traits = {git = "https://github.com/servo/webrender_traits"} diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index aea1f11e5bc..461f8fae071 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -9,32 +9,32 @@ name = "net" path = "lib.rs" [dependencies] -net_traits = {path = "../net_traits"} -util = {path = "../util"} -devtools_traits = {path = "../devtools_traits"} -brotli = {git = "https://github.com/ende76/brotli-rs"} -plugins = {path = "../plugins"} -msg = {path = "../msg"} -ipc-channel = {git = "https://github.com/servo/ipc-channel"} -webrender_traits = {git = "https://github.com/servo/webrender_traits"} -device = {git = "https://github.com/servo/devices"} bitflags = "0.6.0" -cookie = { version = "0.2.4", features = [ "serialize-rustc" ] } +brotli = {git = "https://github.com/ende76/brotli-rs"} +cookie = {version = "0.2.4", features = ["serialize-rustc"]} +device = {git = "https://github.com/servo/devices"} +devtools_traits = {path = "../devtools_traits"} flate2 = "0.2.0" -hyper = { version = "0.9", features = [ "serde-serialization" ] } +hyper = {version = "0.9", features = ["serde-serialization"]} immeta = "0.3.1" +ipc-channel = {git = "https://github.com/servo/ipc-channel"} log = "0.3.5" matches = "0.1" mime = "0.2.0" mime_guess = "1.6.0" +msg = {path = "../msg"} +net_traits = {path = "../net_traits"} openssl = "0.7.6" openssl-verify = "0.1" +plugins = {path = "../plugins"} rustc-serialize = "0.3" threadpool = "1.0" time = "0.1.17" unicase = "1.4.0" url = {version = "1.0.0", features = ["heap_size", "rustc-serialize"]} -uuid = { version = "0.2", features = ["v4"] } +util = {path = "../util"} +uuid = {version = "0.2", features = ["v4"]} +webrender_traits = {git = "https://github.com/servo/webrender_traits"} websocket = "0.17" [target.'cfg(any(target_os = "macos", target_os = "linux"))'.dependencies] diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index b14b5b6a21a..3a0762d26b5 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -17,52 +17,52 @@ debugmozjs = ['js/debugmozjs'] tinyfiledialogs = {git = "https://github.com/jdm/tinyfiledialogs"} [dependencies] -plugins = {path = "../plugins"} -util = {path = "../util"} -msg = {path = "../msg"} -net_traits = {path = "../net_traits"} -profile_traits = {path = "../profile_traits"} -script_traits = {path = "../script_traits"} -devtools_traits = {path = "../devtools_traits"} -style = {path = "../style"} -canvas = {path = "../canvas"} -canvas_traits = {path = "../canvas_traits"} -js = {git = "https://github.com/servo/rust-mozjs"} angle = {git = "https://github.com/emilio/angle", branch = "servo"} -ipc-channel = {git = "https://github.com/servo/ipc-channel"} -xml5ever = {version = "0.1.2", features = ["unstable"]} -gfx_traits = {path = "../gfx_traits"} -webrender_traits = {git = "https://github.com/servo/webrender_traits"} app_units = {version = "0.2.3", features = ["plugins"]} bitflags = "0.6.0" +canvas = {path = "../canvas"} +canvas_traits = {path = "../canvas_traits"} caseless = "0.1.0" cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} +devtools_traits = {path = "../devtools_traits"} encoding = "0.2" euclid = {version = "0.6.4", features = ["plugins"]} fnv = "1.0" +gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.0" heapsize_plugin = "0.1.2" html5ever = {version = "0.5.1", features = ["heap_size", "unstable"]} -hyper = { version = "0.9", features = [ "serde-serialization" ] } +hyper = {version = "0.9", features = ["serde-serialization"]} image = "0.10" +ipc-channel = {git = "https://github.com/servo/ipc-channel"} +js = {git = "https://github.com/servo/rust-mozjs"} libc = "0.2" log = "0.3.5" mime = "0.2.0" +msg = {path = "../msg"} +net_traits = {path = "../net_traits"} num-traits = "0.1.32" offscreen_gl_context = "0.1.2" -rand = "0.3" phf = "0.7.13" phf_macros = "0.7.13" +plugins = {path = "../plugins"} +profile_traits = {path = "../profile_traits"} +rand = "0.3" ref_filter_map = "1.0" ref_slice = "1.0" regex = "0.1.43" rustc-serialize = "0.3" +script_traits = {path = "../script_traits"} selectors = {version = "0.5", features = ["heap_size"]} serde = "0.7" smallvec = "0.1" string_cache = {version = "0.2.12", features = ["heap_size", "unstable"]} +style = {path = "../style"} time = "0.1.12" unicase = "1.0" url = {version = "1.0.0", features = ["heap_size", "query_encoding"]} -uuid = { version = "0.2", features = ["v4"] } +util = {path = "../util"} +uuid = {version = "0.2", features = ["v4"]} +webrender_traits = {git = "https://github.com/servo/webrender_traits"} websocket = "0.17" +xml5ever = {version = "0.1.2", features = ["unstable"]} diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 4b91a6edbc1..28cbed57f45 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -14,9 +14,6 @@ path = "lib.rs" gecko = [] [dependencies] -plugins = {path = "../plugins"} -util = {path = "../util"} -style_traits = {path = "../style_traits"} app_units = {version = "0.2.3", features = ["plugins"]} bitflags = "0.6.0" cssparser = {version = "0.5.5", features = ["heap_size", "serde-serialization"]} @@ -29,14 +26,17 @@ lazy_static = "0.2" log = "0.3.5" matches = "0.1" num-traits = "0.1.32" +plugins = {path = "../plugins"} rustc-serialize = "0.3" selectors = {version = "0.5", features = ["heap_size", "unstable"]} serde = {version = "0.7", features = ["nightly"]} serde_macros = "0.7" smallvec = "0.1" string_cache = {version = "0.2.12", features = ["heap_size"]} +style_traits = {path = "../style_traits"} time = "0.1" url = {version = "1.0.0", features = ["heap_size"]} +util = {path = "../util"} [build-dependencies] walkdir = "0.1" diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml index 3e1d776e25e..0a78977cd55 100644 --- a/components/util/Cargo.toml +++ b/components/util/Cargo.toml @@ -18,9 +18,6 @@ path = "lib.rs" non-geckolib = ["js"] [dependencies] -plugins = {path = "../plugins"} -js = {git = "https://github.com/servo/rust-mozjs", optional = true} -ipc-channel = {git = "https://github.com/servo/ipc-channel"} app_units = {version = "0.2.3", features = ["plugins"]} backtrace = "0.2.1" bitflags = "0.6.0" @@ -29,11 +26,14 @@ euclid = {version = "0.6.4", features = ["unstable", "plugins"]} getopts = "0.2.11" heapsize = "0.3.0" heapsize_plugin = "0.1.2" +ipc-channel = {git = "https://github.com/servo/ipc-channel"} +js = {git = "https://github.com/servo/rust-mozjs", optional = true} lazy_static = "0.2" libc = "0.2" log = "0.3.5" num = "0.1.32" num_cpus = "0.2.2" +plugins = {path = "../plugins"} rand = "0.3" rustc-serialize = "0.3" serde = "0.7" diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml index 5998f23999c..0202b1aaa6a 100644 --- a/ports/glutin/Cargo.toml +++ b/ports/glutin/Cargo.toml @@ -9,16 +9,16 @@ path = "lib.rs" [dependencies] bitflags = "0.6.0" -url = {version = "1.0.0", features = ["heap_size"]} -gleam = "0.2.8" -euclid = {version = "0.6.4", features = ["plugins"]} -servo-glutin = "0.4" compositing = {path = "../../components/compositing"} -script_traits = {path = "../../components/script_traits"} +euclid = {version = "0.6.4", features = ["plugins"]} +gleam = "0.2.8" layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]} msg = {path = "../../components/msg"} net_traits = {path = "../../components/net_traits"} +script_traits = {path = "../../components/script_traits"} +servo-glutin = "0.4" style_traits = {path = "../../components/style_traits"} +url = {version = "1.0.0", features = ["heap_size"]} util = {path = "../../components/util"} [target.'cfg(target_os = "linux")'.dependencies] From b9cda99ca5ecab31c5924d6d313d71ee72d7b4e5 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Sun, 15 May 2016 12:53:42 +0200 Subject: [PATCH 02/11] Update internal crates to bitflags 0.7 --- components/devtools_traits/Cargo.toml | 2 +- components/gfx/Cargo.toml | 2 +- components/layout/Cargo.toml | 2 +- components/msg/Cargo.toml | 2 +- components/net/Cargo.toml | 2 +- components/script/Cargo.toml | 2 +- components/servo/Cargo.lock | 23 ++++++++++++++--------- components/style/Cargo.toml | 2 +- components/util/Cargo.toml | 2 +- ports/cef/Cargo.lock | 23 ++++++++++++++--------- ports/geckolib/Cargo.lock | 9 +++++++-- ports/glutin/Cargo.toml | 2 +- ports/gonk/Cargo.lock | 21 +++++++++++++-------- 13 files changed, 57 insertions(+), 37 deletions(-) diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml index 7a4e5093618..9d141155297 100644 --- a/components/devtools_traits/Cargo.toml +++ b/components/devtools_traits/Cargo.toml @@ -9,7 +9,7 @@ name = "devtools_traits" path = "lib.rs" [dependencies] -bitflags = "0.6.0" +bitflags = "0.7" heapsize = "0.3.0" heapsize_plugin = "0.1.2" hyper = {version = "0.9", features = ["serde-serialization"]} diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 69b16aa5fe1..cf758332296 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -12,7 +12,7 @@ path = "lib.rs" [dependencies] app_units = {version = "0.2.3", features = ["plugins"]} azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} -bitflags = "0.6.0" +bitflags = "0.7" euclid = {version = "0.6.4", features = ["plugins"]} fnv = "1.0" gfx_traits = {path = "../gfx_traits"} diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index d09a6160a97..250b3e3614c 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -11,7 +11,7 @@ path = "lib.rs" [dependencies] app_units = {version = "0.2.3", features = ["plugins"]} azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} -bitflags = "0.6.0" +bitflags = "0.7" canvas_traits = {path = "../canvas_traits"} cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} euclid = {version = "0.6.4", features = ["plugins"]} diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index ee5d57ef2cd..13e2ae8f863 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -9,7 +9,7 @@ name = "msg" path = "lib.rs" [dependencies] -bitflags = "0.6.0" +bitflags = "0.7" cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} euclid = {version = "0.6.4", features = ["plugins"]} heapsize = "0.3.0" diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 461f8fae071..edab633ab83 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -9,7 +9,7 @@ name = "net" path = "lib.rs" [dependencies] -bitflags = "0.6.0" +bitflags = "0.7" brotli = {git = "https://github.com/ende76/brotli-rs"} cookie = {version = "0.2.4", features = ["serialize-rustc"]} device = {git = "https://github.com/servo/devices"} diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 3a0762d26b5..408836b88c8 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -19,7 +19,7 @@ tinyfiledialogs = {git = "https://github.com/jdm/tinyfiledialogs"} [dependencies] angle = {git = "https://github.com/emilio/angle", branch = "servo"} app_units = {version = "0.2.3", features = ["plugins"]} -bitflags = "0.6.0" +bitflags = "0.7" canvas = {path = "../canvas"} canvas_traits = {path = "../canvas_traits"} caseless = "0.1.0" diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 9a9cd199ef5..2ec19d2ac5b 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -157,6 +157,11 @@ name = "bitflags" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "bitflags" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "block" version = "0.1.5" @@ -470,7 +475,7 @@ dependencies = [ name = "devtools_traits" version = "0.0.1" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (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)", "hyper 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -720,7 +725,7 @@ version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "azure 0.4.5 (git+https://github.com/servo/rust-azure)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -821,7 +826,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "glutin_app" version = "0.0.1" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1098,7 +1103,7 @@ version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "azure 0.4.5 (git+https://github.com/servo/rust-azure)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1308,7 +1313,7 @@ dependencies = [ name = "msg" version = "0.0.1" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1329,7 +1334,7 @@ dependencies = [ name = "net" version = "0.0.1" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "brotli 0.3.23 (git+https://github.com/ende76/brotli-rs)", "cookie 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "device 0.0.1 (git+https://github.com/servo/devices)", @@ -1835,7 +1840,7 @@ version = "0.0.1" dependencies = [ "angle 0.1.0 (git+https://github.com/emilio/angle?branch=servo)", "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", "canvas_traits 0.0.1", "caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2113,7 +2118,7 @@ name = "style" version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2342,7 +2347,7 @@ version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 28cbed57f45..46bfa35bbbe 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -15,7 +15,7 @@ gecko = [] [dependencies] app_units = {version = "0.2.3", features = ["plugins"]} -bitflags = "0.6.0" +bitflags = "0.7" cssparser = {version = "0.5.5", features = ["heap_size", "serde-serialization"]} encoding = "0.2" euclid = {version = "0.6.4", features = ["plugins"]} diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml index 0a78977cd55..4373de0a040 100644 --- a/components/util/Cargo.toml +++ b/components/util/Cargo.toml @@ -20,7 +20,7 @@ non-geckolib = ["js"] [dependencies] app_units = {version = "0.2.3", features = ["plugins"]} backtrace = "0.2.1" -bitflags = "0.6.0" +bitflags = "0.7" deque = "0.3.1" euclid = {version = "0.6.4", features = ["unstable", "plugins"]} getopts = "0.2.11" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 1fb391c5163..ed85f6f6d0d 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -135,6 +135,11 @@ name = "bitflags" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "bitflags" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "block" version = "0.1.5" @@ -433,7 +438,7 @@ dependencies = [ name = "devtools_traits" version = "0.0.1" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (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)", "hyper 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -642,7 +647,7 @@ version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "azure 0.4.5 (git+https://github.com/servo/rust-azure)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -734,7 +739,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "glutin_app" version = "0.0.1" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1011,7 +1016,7 @@ version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "azure 0.4.5 (git+https://github.com/servo/rust-azure)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1214,7 +1219,7 @@ dependencies = [ name = "msg" version = "0.0.1" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1235,7 +1240,7 @@ dependencies = [ name = "net" version = "0.0.1" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "brotli 0.3.23 (git+https://github.com/ende76/brotli-rs)", "cookie 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "device 0.0.1 (git+https://github.com/servo/devices)", @@ -1695,7 +1700,7 @@ version = "0.0.1" dependencies = [ "angle 0.1.0 (git+https://github.com/emilio/angle?branch=servo)", "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", "canvas_traits 0.0.1", "caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1998,7 +2003,7 @@ name = "style" version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2211,7 +2216,7 @@ version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock index b5245a85a3b..60d4cc03be0 100644 --- a/ports/geckolib/Cargo.lock +++ b/ports/geckolib/Cargo.lock @@ -86,6 +86,11 @@ name = "bitflags" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "bitflags" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "byteorder" version = "0.5.1" @@ -529,7 +534,7 @@ name = "style" version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -645,7 +650,7 @@ version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml index 0202b1aaa6a..888454698f6 100644 --- a/ports/glutin/Cargo.toml +++ b/ports/glutin/Cargo.toml @@ -8,7 +8,7 @@ name = "glutin_app" path = "lib.rs" [dependencies] -bitflags = "0.6.0" +bitflags = "0.7" compositing = {path = "../../components/compositing"} euclid = {version = "0.6.4", features = ["plugins"]} gleam = "0.2.8" diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 6811dbe68fb..dbbce513542 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -137,6 +137,11 @@ name = "bitflags" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "bitflags" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "block" version = "0.1.5" @@ -435,7 +440,7 @@ dependencies = [ name = "devtools_traits" version = "0.0.1" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (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)", "hyper 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -654,7 +659,7 @@ version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "azure 0.4.5 (git+https://github.com/servo/rust-azure)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1003,7 +1008,7 @@ version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "azure 0.4.5 (git+https://github.com/servo/rust-azure)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1206,7 +1211,7 @@ dependencies = [ name = "msg" version = "0.0.1" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1227,7 +1232,7 @@ dependencies = [ name = "net" version = "0.0.1" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "brotli 0.3.23 (git+https://github.com/ende76/brotli-rs)", "cookie 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "device 0.0.1 (git+https://github.com/servo/devices)", @@ -1687,7 +1692,7 @@ version = "0.0.1" dependencies = [ "angle 0.1.0 (git+https://github.com/emilio/angle?branch=servo)", "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", "canvas_traits 0.0.1", "caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1988,7 +1993,7 @@ name = "style" version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2201,7 +2206,7 @@ version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", From ff5aace4a5651e38b879d6236ef95b4a294c7548 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Sun, 15 May 2016 12:54:37 +0200 Subject: [PATCH 03/11] Update cocoa to 0.4.1 and servo-glutin to 0.4.21 --- components/servo/Cargo.lock | 35 ++++++++++++++++++----------------- ports/cef/Cargo.lock | 37 +++++++++++++++++++------------------ ports/cef/Cargo.toml | 2 +- ports/gonk/Cargo.lock | 33 +++++++++++++++++---------------- 4 files changed, 55 insertions(+), 52 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 2ec19d2ac5b..8ea97ef5d9f 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -98,7 +98,7 @@ name = "azure" version = "0.4.5" source = "git+https://github.com/servo/rust-azure#a7177c8df81554352bc51de2f5b77cbb47ec2635" dependencies = [ - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -281,10 +281,10 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -360,16 +360,16 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-foundation-sys" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -380,7 +380,7 @@ name = "core-graphics" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -390,7 +390,7 @@ name = "core-text" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -726,7 +726,7 @@ dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "azure 0.4.5 (git+https://github.com/servo/rust-azure)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -835,7 +835,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.17 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1010,7 +1010,7 @@ version = "0.2.0" 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.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1082,7 +1082,7 @@ source = "git+https://github.com/servo/rust-layers#0a44672108ff33dc9675e4b72a398 dependencies = [ "azure 0.4.5 (git+https://github.com/servo/rust-azure)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1541,7 +1541,7 @@ version = "0.1.4" 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.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (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.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2017,17 +2017,18 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.17" +version = "0.4.21" 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)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2058,7 +2059,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.17 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index ed85f6f6d0d..5b8d6d7a6ba 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -2,7 +2,7 @@ name = "embedding" version = "0.0.1" dependencies = [ - "cocoa 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", "devtools 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -76,7 +76,7 @@ name = "azure" version = "0.4.5" source = "git+https://github.com/servo/rust-azure#a7177c8df81554352bc51de2f5b77cbb47ec2635" dependencies = [ - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -259,10 +259,10 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -323,16 +323,16 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-foundation-sys" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -343,7 +343,7 @@ name = "core-graphics" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -353,7 +353,7 @@ name = "core-text" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -648,7 +648,7 @@ dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "azure 0.4.5 (git+https://github.com/servo/rust-azure)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -748,7 +748,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.17 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -923,7 +923,7 @@ version = "0.2.0" 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.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -995,7 +995,7 @@ source = "git+https://github.com/servo/rust-layers#0a44672108ff33dc9675e4b72a398 dependencies = [ "azure 0.4.5 (git+https://github.com/servo/rust-azure)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1421,7 +1421,7 @@ version = "0.1.4" 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.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (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.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1902,17 +1902,18 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.17" +version = "0.4.21" 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)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1943,7 +1944,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.17 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml index eb5c0311e30..091236abb36 100644 --- a/ports/cef/Cargo.toml +++ b/ports/cef/Cargo.toml @@ -34,7 +34,7 @@ layers = {git = "https://github.com/servo/rust-layers"} [target.'cfg(target_os="macos")'.dependencies] objc = "0.2" -cocoa = "0.3" +cocoa = "0.4" [target.'cfg(target_os="linux")'.dependencies] x11 = "2.3" diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index dbbce513542..f8028d793d7 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -78,7 +78,7 @@ name = "azure" version = "0.4.5" source = "git+https://github.com/servo/rust-azure#a7177c8df81554352bc51de2f5b77cbb47ec2635" dependencies = [ - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -261,10 +261,10 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -325,16 +325,16 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-foundation-sys" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -345,7 +345,7 @@ name = "core-graphics" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -355,7 +355,7 @@ name = "core-text" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -660,7 +660,7 @@ dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "azure 0.4.5 (git+https://github.com/servo/rust-azure)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -915,7 +915,7 @@ version = "0.2.0" 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.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -987,7 +987,7 @@ source = "git+https://github.com/servo/rust-layers#0a44672108ff33dc9675e4b72a398 dependencies = [ "azure 0.4.5 (git+https://github.com/servo/rust-azure)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1413,7 +1413,7 @@ version = "0.1.4" 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.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (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.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1892,17 +1892,18 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.17" +version = "0.4.21" 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)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1933,7 +1934,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.17 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] From d58ec5ab14e71660898767eac2d1d9a488ebe81f Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Sun, 15 May 2016 12:55:22 +0200 Subject: [PATCH 04/11] Update websocket to 0.17.1 --- components/servo/Cargo.lock | 10 +++++----- ports/cef/Cargo.lock | 10 +++++----- ports/gonk/Cargo.lock | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 8ea97ef5d9f..d591517db11 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1361,7 +1361,7 @@ dependencies = [ "util 0.0.1", "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", - "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1412,7 +1412,7 @@ dependencies = [ "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1886,7 +1886,7 @@ dependencies = [ "util 0.0.1", "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", - "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2525,10 +2525,10 @@ dependencies = [ [[package]] name = "websocket" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 5b8d6d7a6ba..05bebebc7ff 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1267,7 +1267,7 @@ dependencies = [ "util 0.0.1", "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", - "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1299,7 +1299,7 @@ dependencies = [ "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1746,7 +1746,7 @@ dependencies = [ "util 0.0.1", "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", - "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2387,10 +2387,10 @@ dependencies = [ [[package]] name = "websocket" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index f8028d793d7..67827e05f53 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -1259,7 +1259,7 @@ dependencies = [ "util 0.0.1", "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", - "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1291,7 +1291,7 @@ dependencies = [ "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1738,7 +1738,7 @@ dependencies = [ "util 0.0.1", "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", - "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2347,10 +2347,10 @@ dependencies = [ [[package]] name = "websocket" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", From 0aeb110bc8c5ace7d0e77ca28665561598786e8c Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Sun, 15 May 2016 15:01:38 +0200 Subject: [PATCH 05/11] Update selectors to 0.5.9 --- components/servo/Cargo.lock | 12 ++++++------ ports/cef/Cargo.lock | 10 +++++----- ports/geckolib/Cargo.lock | 13 ++++--------- ports/gonk/Cargo.lock | 10 +++++----- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index d591517db11..42c6a505ec2 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1124,7 +1124,7 @@ dependencies = [ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "script 0.0.1", "script_traits 0.0.1", - "selectors 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "selectors 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1874,7 +1874,7 @@ dependencies = [ "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "selectors 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "selectors 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1929,10 +1929,10 @@ dependencies = [ [[package]] name = "selectors" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2132,7 +2132,7 @@ dependencies = [ "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "selectors 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2152,7 +2152,7 @@ dependencies = [ "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "selectors 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 05bebebc7ff..e89f7c3cd6c 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1037,7 +1037,7 @@ dependencies = [ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "script 0.0.1", "script_traits 0.0.1", - "selectors 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "selectors 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1734,7 +1734,7 @@ dependencies = [ "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "selectors 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "selectors 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1778,10 +1778,10 @@ dependencies = [ [[package]] name = "selectors" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2017,7 +2017,7 @@ dependencies = [ "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "selectors 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock index 60d4cc03be0..9f6d2d930ca 100644 --- a/ports/geckolib/Cargo.lock +++ b/ports/geckolib/Cargo.lock @@ -14,7 +14,7 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", - "selectors 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "selectors 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", @@ -81,11 +81,6 @@ dependencies = [ "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "bitflags" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "bitflags" version = "0.7.0" @@ -473,10 +468,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "selectors" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -547,7 +542,7 @@ dependencies = [ "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "selectors 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 67827e05f53..0e3e1d5361b 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -1029,7 +1029,7 @@ dependencies = [ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "script 0.0.1", "script_traits 0.0.1", - "selectors 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "selectors 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1726,7 +1726,7 @@ dependencies = [ "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "selectors 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "selectors 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1770,10 +1770,10 @@ dependencies = [ [[package]] name = "selectors" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2007,7 +2007,7 @@ dependencies = [ "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "selectors 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", From 736dad868db12946f79e3d8af9ff5311849f0ebf Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Mon, 16 May 2016 02:47:19 +0200 Subject: [PATCH 06/11] Update xml-rs to 0.3.4 --- 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 42c6a505ec2..69314ec6aea 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -806,7 +806,7 @@ 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.6 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "xml-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2432,7 +2432,7 @@ name = "wayland-scanner" version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "xml-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "xml-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2583,10 +2583,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "xml-rs" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index e89f7c3cd6c..bc9e50fe43a 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -719,7 +719,7 @@ 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.6 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "xml-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2294,7 +2294,7 @@ name = "wayland-scanner" version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "xml-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "xml-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2445,10 +2445,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "xml-rs" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 0e3e1d5361b..c3fc6727585 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -731,7 +731,7 @@ 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.6 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "xml-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2284,7 +2284,7 @@ name = "wayland-scanner" version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "xml-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "xml-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2405,10 +2405,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "xml-rs" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] From 7682f4c3f97dc90f19b155d925ed535a9f68631b Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Mon, 16 May 2016 12:56:15 +0200 Subject: [PATCH 07/11] Update png to 0.5.1 --- components/servo/Cargo.lock | 6 +++--- ports/cef/Cargo.lock | 6 +++--- ports/gonk/Cargo.lock | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 69314ec6aea..92b4ce054e7 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -986,7 +986,7 @@ dependencies = [ "num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "png 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "png 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1678,10 +1678,10 @@ dependencies = [ [[package]] name = "png" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index bc9e50fe43a..7916c85c5b5 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -899,7 +899,7 @@ dependencies = [ "num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "png 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "png 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1549,10 +1549,10 @@ dependencies = [ [[package]] name = "png" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index c3fc6727585..5d5ef21125c 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -891,7 +891,7 @@ dependencies = [ "num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "png 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "png 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1541,10 +1541,10 @@ dependencies = [ [[package]] name = "png" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", From b2a0b0f620eb1b0e4161be8d23f6bfc9fd7c2597 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 17 May 2016 10:19:37 +0200 Subject: [PATCH 08/11] Update openssl to 0.7.12 --- components/servo/Cargo.lock | 24 ++++++++++++------------ ports/cef/Cargo.lock | 24 ++++++++++++------------ ports/gonk/Cargo.lock | 24 ++++++++++++------------ 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 92b4ce054e7..1fe6fd38fa4 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -352,7 +352,7 @@ name = "cookie" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -951,7 +951,7 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-verify 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1349,7 +1349,7 @@ dependencies = [ "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-verify 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1554,20 +1554,20 @@ dependencies = [ [[package]] name = "openssl" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys-extras 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys-extras 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl-sys" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1579,12 +1579,12 @@ dependencies = [ [[package]] name = "openssl-sys-extras" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1592,7 +1592,7 @@ name = "openssl-verify" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2532,7 +2532,7 @@ dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 7916c85c5b5..8250d4e4c55 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -315,7 +315,7 @@ name = "cookie" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -864,7 +864,7 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-verify 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1255,7 +1255,7 @@ dependencies = [ "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-verify 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1434,20 +1434,20 @@ dependencies = [ [[package]] name = "openssl" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys-extras 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys-extras 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl-sys" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1459,12 +1459,12 @@ dependencies = [ [[package]] name = "openssl-sys-extras" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1472,7 +1472,7 @@ name = "openssl-verify" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2394,7 +2394,7 @@ dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 5d5ef21125c..325fd889412 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -317,7 +317,7 @@ name = "cookie" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -856,7 +856,7 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-verify 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1247,7 +1247,7 @@ dependencies = [ "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-verify 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1426,20 +1426,20 @@ dependencies = [ [[package]] name = "openssl" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys-extras 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys-extras 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl-sys" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1451,12 +1451,12 @@ dependencies = [ [[package]] name = "openssl-sys-extras" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1464,7 +1464,7 @@ name = "openssl-verify" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2354,7 +2354,7 @@ dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", From f65db3756b92ce086382531e1329076edd80164e Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 17 May 2016 23:18:26 +0200 Subject: [PATCH 09/11] Update wayland-client to 0.5.12 --- components/servo/Cargo.lock | 15 +++++---------- ports/cef/Cargo.lock | 15 +++++---------- ports/gonk/Cargo.lock | 15 +++++---------- 3 files changed, 15 insertions(+), 30 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 1fe6fd38fa4..ed41d233b75 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -152,11 +152,6 @@ name = "bitflags" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "bitflags" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "bitflags" version = "0.7.0" @@ -2037,7 +2032,7 @@ dependencies = [ "shared_library 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-kbd 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-window 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2404,10 +2399,10 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2424,7 +2419,7 @@ dependencies = [ "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2451,7 +2446,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 8250d4e4c55..dcc38f148c3 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -130,11 +130,6 @@ name = "bitflags" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "bitflags" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "bitflags" version = "0.7.0" @@ -1922,7 +1917,7 @@ dependencies = [ "shared_library 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-kbd 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-window 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2266,10 +2261,10 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2286,7 +2281,7 @@ dependencies = [ "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2313,7 +2308,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 325fd889412..34489a22684 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -132,11 +132,6 @@ name = "bitflags" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "bitflags" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "bitflags" version = "0.7.0" @@ -1912,7 +1907,7 @@ dependencies = [ "shared_library 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-kbd 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-window 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2256,10 +2251,10 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2276,7 +2271,7 @@ dependencies = [ "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2303,7 +2298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] From 9f4c04ca13b7a256e52822d64551698ebcc0702d Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 17 May 2016 23:22:36 +0200 Subject: [PATCH 10/11] Update wayland-kbd to 0.3.6 --- components/servo/Cargo.lock | 11 +++-------- ports/cef/Cargo.lock | 11 +++-------- ports/gonk/Cargo.lock | 11 +++-------- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index ed41d233b75..a1b29d0cf53 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -147,11 +147,6 @@ dependencies = [ "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "bitflags" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "bitflags" version = "0.7.0" @@ -2033,7 +2028,7 @@ dependencies = [ "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-client 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-kbd 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-kbd 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-window 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "x11-dl 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2412,10 +2407,10 @@ dependencies = [ [[package]] name = "wayland-kbd" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index dcc38f148c3..337c3392598 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -125,11 +125,6 @@ dependencies = [ "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "bitflags" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "bitflags" version = "0.7.0" @@ -1918,7 +1913,7 @@ dependencies = [ "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-client 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-kbd 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-kbd 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-window 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "x11-dl 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2274,10 +2269,10 @@ dependencies = [ [[package]] name = "wayland-kbd" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 34489a22684..b161085d1b2 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -127,11 +127,6 @@ dependencies = [ "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "bitflags" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "bitflags" version = "0.7.0" @@ -1908,7 +1903,7 @@ dependencies = [ "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-client 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-kbd 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-kbd 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-window 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "x11-dl 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2264,10 +2259,10 @@ dependencies = [ [[package]] name = "wayland-kbd" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", From 3cda52c6a42af81c47bd35b8aa7093dce2413482 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 17 May 2016 23:27:02 +0200 Subject: [PATCH 11/11] Disallow bitflags dupes again --- python/tidy/servo_tidy/tidy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index 1007fcb0440..c3c603c7c11 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -231,7 +231,7 @@ def check_lock(file_name, contents): raise StopIteration # package names to be neglected (as named by cargo) - exceptions = ["bitflags", "lazy_static"] + exceptions = ["lazy_static"] import toml content = toml.loads(contents)