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)",