Auto merge of #10944 - mbrubeck:bitflags-0.6, r=frewsxcv

Upgrade a bunch of dependencies  This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10944)
2025-08-06 14:10:11 +01:00 · 2016-04-30 15:21:22 -07:00 · 2016-04-30 15:21:22 -07:00 · 8db0367301
commit 8db0367301
parent b5a23a16be 8d540d1f9e
30 changed files with 234 additions and 207 deletions
--- a/components/devtools_traits/Cargo.toml
+++ b/components/devtools_traits/Cargo.toml
@ -16,7 +16,7 @@ heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
 hyper = { version = "0.9", features = [ "serde-serialization" ] }
 time = "0.1"
-bitflags = "0.3"
+bitflags = "0.6.0"
 serde = "0.7"
 serde_macros = "0.7"
 url = {version = "1.0.0", features = ["heap_size"]}
--- a/components/devtools_traits/lib.rs
+++ b/components/devtools_traits/lib.rs
@ -242,7 +242,7 @@ pub struct ConsoleMessage {

 bitflags! {
    #[derive(Deserialize, Serialize)]
-    flags CachedConsoleMessageTypes: u8 {
+    pub flags CachedConsoleMessageTypes: u8 {
        const PAGE_ERROR  = 1 << 0,
        const CONSOLE_API = 1 << 1,
    }
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@ -11,7 +11,7 @@ path = "lib.rs"

 [dependencies]
 app_units = {version = "0.2.3", features = ["plugins"]}
-bitflags = "0.3"
+bitflags = "0.6.0"
 euclid = {version = "0.6.4", features = ["plugins"]}
 fnv = "1.0"
 harfbuzz-sys = "0.1"
--- a/components/gfx/font.rs
+++ b/components/gfx/font.rs
@ -105,7 +105,7 @@ pub struct Font {
 }

 bitflags! {
-    flags ShapingFlags: u8 {
+    pub flags ShapingFlags: u8 {
        #[doc = "Set if the text is entirely whitespace."]
        const IS_WHITESPACE_SHAPING_FLAG = 0x01,
        #[doc = "Set if we are to ignore ligatures."]
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@ -27,7 +27,7 @@ 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"]}
-bitflags = "0.3"
+bitflags = "0.6.0"
 cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
 euclid = {version = "0.6.4", features = ["plugins"]}
 fnv = "1.0"
--- a/components/layout/block.rs
+++ b/components/layout/block.rs
@ -520,7 +520,7 @@ pub struct BlockFlow {
    pub float: Option<Box<FloatedBlockInfo>>,

    /// Various flags.
-    pub flags: BlockFlowFlags,
+    flags: BlockFlowFlags,
 }

 bitflags! {
--- a/components/layout/data.rs
+++ b/components/layout/data.rs
@ -51,7 +51,7 @@ impl PrivateLayoutData {
 }

 bitflags! {
-    flags LayoutDataFlags: u8 {
+    pub flags LayoutDataFlags: u8 {
        #[doc = "Whether a flow has been newly constructed."]
        const HAS_NEWLY_CONSTRUCTED_FLOW = 0x01
    }
--- a/components/layout/flow.rs
+++ b/components/layout/flow.rs
@ -629,7 +629,7 @@ pub trait InorderFlowTraversal {

 bitflags! {
    #[doc = "Flags used in flows."]
-    flags FlowFlags: u32 {
+    pub flags FlowFlags: u32 {
        // text align flags
        #[doc = "Whether this flow must have its own layer. Even if this flag is not set, it might"]
        #[doc = "get its own layer if it's deemed to be likely to overlap flows with their own"]
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@ -666,7 +666,7 @@ pub struct ScannedTextFragmentInfo {
 }

 bitflags! {
-    flags ScannedTextFlags: u8 {
+    pub flags ScannedTextFlags: u8 {
        /// Whether a line break is required after this fragment if wrapping on newlines (e.g. if
        /// `white-space: pre` is in effect).
        const REQUIRES_LINE_BREAK_AFTERWARD_IF_WRAPPING_ON_NEWLINES = 0x01,
@ -2707,7 +2707,7 @@ impl Overflow {
 }

 bitflags! {
-    flags FragmentFlags: u8 {
+    pub flags FragmentFlags: u8 {
        /// Whether this fragment has a layer.
        const HAS_LAYER = 0x01,
    }
--- a/components/layout/incremental.rs
+++ b/components/layout/incremental.rs
@ -11,7 +11,7 @@ use style::properties::{ComputedValues, ServoComputedValues};

 bitflags! {
    #[doc = "Individual layout actions that may be necessary after restyling."]
-    flags RestyleDamage: u8 {
+    pub flags RestyleDamage: u8 {
        #[doc = "Repaint the node itself."]
        #[doc = "Currently unused; need to decide how this propagates."]
        const REPAINT = 0x01,
@ -45,7 +45,7 @@ bitflags! {
 }

 bitflags! {
-    flags SpecialRestyleDamage: u8 {
+    pub flags SpecialRestyleDamage: u8 {
        #[doc = "If this flag is set, we need to reflow the entire document. This is more or less a \
                 temporary hack to deal with cases that we don't handle incrementally yet."]
        const REFLOW_ENTIRE_DOCUMENT = 0x01,
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@ -1859,7 +1859,7 @@ pub struct InlineFragmentNodeInfo {
 }

 bitflags! {
-    flags InlineFragmentNodeFlags: u8 {
+    pub flags InlineFragmentNodeFlags: u8 {
        const FIRST_FRAGMENT_OF_ELEMENT = 0x01,
        const LAST_FRAGMENT_OF_ELEMENT = 0x02,
    }
--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@ -14,7 +14,7 @@ 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.3"
+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"
--- a/components/msg/constellation_msg.rs
+++ b/components/msg/constellation_msg.rs
@ -194,7 +194,7 @@ pub enum Key {

 bitflags! {
    #[derive(Deserialize, Serialize)]
-    flags KeyModifiers: u8 {
+    pub flags KeyModifiers: u8 {
        const NONE = 0x00,
        const SHIFT = 0x01,
        const CONTROL = 0x02,
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@ -31,7 +31,7 @@ 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.3"
+bitflags = "0.6.0"
 caseless = "0.1.0"
 cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
 encoding = "0.2"
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@ -131,7 +131,7 @@ pub struct Node {
 bitflags! {
    #[doc = "Flags for node items."]
    #[derive(JSTraceable, HeapSizeOf)]
-    flags NodeFlags: u8 {
+    pub flags NodeFlags: u8 {
        #[doc = "Specifies whether this node is in a document."]
        const IS_IN_DOC = 0x01,
        #[doc = "Specifies whether this node _must_ be reflowed regardless of style differences."]
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@ -3,7 +3,6 @@ name = "servo"
 version = "0.0.1"
 dependencies = [
 "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "browserhtml 0.1.4 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
 "canvas 0.0.1",
 "canvas_traits 0.0.1",
@ -139,11 +138,11 @@ dependencies = [

 [[package]]
 name = "bincode"
-version = "0.5.3"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 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)",
 "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -160,7 +159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "bitflags"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -223,7 +222,7 @@ name = "caseless"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -265,7 +264,7 @@ dependencies = [

 [[package]]
 name = "cmake"
-version = "0.1.14"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)",
@ -451,7 +450,7 @@ dependencies = [
 name = "devtools_traits"
 version = "0.0.1"
 dependencies = [
- "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.6.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.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -566,7 +565,7 @@ name = "energymon-builder"
 version = "0.2.0"
 source = "git+https://github.com/energymon/energymon-sys.git#a0fb99b0312372958b110ae6378b5c89c2287172"
 dependencies = [
- "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -601,7 +600,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -624,7 +623,7 @@ version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "make-cmd 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -638,7 +637,7 @@ dependencies = [

 [[package]]
 name = "fnv"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -702,12 +701,12 @@ version = "0.0.1"
 dependencies = [
 "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "azure 0.4.3 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.2.0 (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)",
- "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
 "gfx_traits 0.0.1",
 "harfbuzz-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -802,7 +801,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "glutin_app"
 version = "0.0.1"
 dependencies = [
- "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.6.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.15 (registry+https://github.com/rust-lang/crates.io-index)",
@ -834,7 +833,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -842,8 +841,8 @@ name = "hbs-builder"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cmake 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -995,7 +994,7 @@ name = "ipc-channel"
 version = "0.2.2"
 source = "git+https://github.com/servo/ipc-channel#e43fb22c431740a9bc54ce96caebd0e67d1a0586"
 dependencies = [
- "bincode 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bincode 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "byteorder 0.5.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.10 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1076,11 +1075,11 @@ version = "0.0.1"
 dependencies = [
 "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "azure 0.4.3 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "canvas_traits 0.0.1",
 "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx 0.0.1",
 "gfx_traits 0.0.1",
 "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1097,7 +1096,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.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "selectors 0.5.6 (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.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1184,7 +1183,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1280,7 +1279,7 @@ dependencies = [
 name = "msg"
 version = "0.0.1"
 dependencies = [
- "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cssparser 0.5.5 (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)",
@ -1539,7 +1538,7 @@ dependencies = [
 "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "libressl-pnacl-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1604,7 +1603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "pkg-config"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -1653,7 +1652,7 @@ dependencies = [
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
 "profile_traits 0.0.1",
- "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 0.7.0 (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.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1755,18 +1754,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "regex"
-version = "0.1.55"
+version = "0.1.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "aho-corasick 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "memchr 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "regex-syntax"
-version = "0.2.5"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -1784,11 +1784,8 @@ dependencies = [

 [[package]]
 name = "scoped_threadpool"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rustc_version 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]

 [[package]]
 name = "script"
@ -1796,7 +1793,7 @@ version = "0.0.1"
 dependencies = [
 "angle 0.1.0 (git+https://github.com/emilio/angle?branch=servo)",
 "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.6.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)",
@ -1804,7 +1801,7 @@ dependencies = [
 "devtools_traits 0.0.1",
 "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)",
- "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "gfx_traits 0.0.1",
 "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)",
@ -1826,10 +1823,10 @@ dependencies = [
 "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "ref_filter_map 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ref_slice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "selectors 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "string_cache 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1883,12 +1880,12 @@ dependencies = [

 [[package]]
 name = "selectors"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.0 (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)",
 "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1957,7 +1954,7 @@ version = "2.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1966,7 +1963,7 @@ name = "servo-freetype-sys"
 version = "2.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -2072,11 +2069,11 @@ name = "style"
 version = "0.0.1"
 dependencies = [
 "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cssparser 0.5.5 (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)",
- "fnv 1.0.0 (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)",
 "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2085,7 +2082,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.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "selectors 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2106,7 +2103,7 @@ dependencies = [
 "msg 0.0.1",
 "plugins 0.0.1",
 "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "selectors 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "selectors 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "string_cache 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "style 0.0.1",
 "style_traits 0.0.1",
@ -2126,7 +2123,7 @@ dependencies = [
 "log 0.3.6 (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.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "selectors 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2176,6 +2173,23 @@ dependencies = [
 "utf-8 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "thread-id"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thread_local"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "threadpool"
 version = "1.0.0"
@ -2289,7 +2303,7 @@ version = "0.0.1"
 dependencies = [
 "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "backtrace 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.6.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)",
@ -2395,7 +2409,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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)",
 ]

@ -2410,7 +2424,7 @@ dependencies = [
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "plugins 0.0.1",
- "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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)",
 "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
@ -2428,7 +2442,7 @@ dependencies = [
 "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)",
- "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
 "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
@ -2436,7 +2450,7 @@ dependencies = [
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "scoped_threadpool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
 "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
@ -2498,7 +2512,7 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@ -69,7 +69,6 @@ ipc-channel = {git = "https://github.com/servo/ipc-channel"}
 layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
 gleam = "0.2"
 browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "gh-pages"}
-bitflags = "0.3"
 env_logger = "0.3"
 euclid = {version = "0.6.4", features = ["plugins"]}
 libc = "0.2"
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@ -18,7 +18,7 @@ plugins = {path = "../plugins"}
 util = {path = "../util"}
 style_traits = {path = "../style_traits"}
 app_units = {version = "0.2.3", features = ["plugins"]}
-bitflags = "0.3"
+bitflags = "0.6.0"
 cssparser = {version = "0.5.5", features = ["heap_size", "serde-serialization"]}
 encoding = "0.2"
 euclid = {version = "0.6.4", features = ["plugins"]}
--- a/components/style/element_state.rs
+++ b/components/style/element_state.rs
@ -5,7 +5,7 @@
 bitflags! {
    #[doc = "Event-based element states."]
    #[derive(HeapSizeOf)]
-    flags ElementState: u8 {
+    pub flags ElementState: u8 {
        #[doc = "The mouse is down on this element. \
                 https://html.spec.whatwg.org/multipage/#selector-active \
                 FIXME(#7333): set/unset this when appropriate"]
--- a/components/style/logical_geometry.rs
+++ b/components/style/logical_geometry.rs
@ -23,7 +23,7 @@ pub enum InlineBaseDirection {

 bitflags!(
    #[derive(HeapSizeOf, RustcEncodable)]
-    flags WritingMode: u8 {
+    pub flags WritingMode: u8 {
        const FLAG_RTL = 1 << 0,
        const FLAG_VERTICAL = 1 << 1,
        const FLAG_VERTICAL_LR = 1 << 2,
--- a/components/style/restyle_hints.rs
+++ b/components/style/restyle_hints.rs
@ -20,7 +20,7 @@ use string_cache::{Atom, Namespace};
 /// short-circuit work we know is unnecessary.

 bitflags! {
-    flags RestyleHint: u8 {
+    pub flags RestyleHint: u8 {
        #[doc = "Rerun selector matching on the element."]
        const RESTYLE_SELF = 0x01,
        #[doc = "Rerun selector matching on all of the element's descendants."]
--- a/components/util/Cargo.toml
+++ b/components/util/Cargo.toml
@ -23,7 +23,7 @@ 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.3"
+bitflags = "0.6.0"
 deque = "0.3.1"
 euclid = {version = "0.6.4", features = ["unstable", "plugins"]}
 getopts = "0.2.11"
--- a/components/util/thread_state.rs
+++ b/components/util/thread_state.rs
@ -11,7 +11,7 @@
 pub use self::imp::{enter, exit, get, initialize};

 bitflags! {
-    flags ThreadState: u32 {
+    pub flags ThreadState: u32 {
        const SCRIPT          = 0x01,
        const LAYOUT          = 0x02,
        const PAINT           = 0x04,