From 3d9c1b66fd38b47205ed51ae7c913434ce68975d Mon Sep 17 00:00:00 2001 From: Saurav Sachidanand Date: Mon, 4 Apr 2016 18:48:12 +0530 Subject: [PATCH] Update crates to use bitflags 0.5 --- components/devtools_traits/Cargo.toml | 3 +-- components/devtools_traits/lib.rs | 2 +- components/gfx/Cargo.toml | 2 +- components/gfx/font.rs | 3 +-- components/layout/Cargo.toml | 2 +- components/layout/block.rs | 2 +- components/layout/data.rs | 2 +- components/layout/flow.rs | 2 +- components/layout/fragment.rs | 8 +++---- components/layout/incremental.rs | 4 ++-- components/layout/inline.rs | 2 +- components/msg/Cargo.toml | 2 +- components/msg/constellation_msg.rs | 2 +- components/script/Cargo.toml | 2 +- components/script/dom/node.rs | 2 +- .../script/dom/webglrenderingcontext.rs | 2 +- components/servo/Cargo.lock | 23 +++++++++++-------- components/servo/Cargo.toml | 2 +- components/style/Cargo.toml | 3 +-- components/style/element_state.rs | 2 +- components/style/logical_geometry.rs | 2 +- components/style/restyle_hints.rs | 2 +- components/util/Cargo.toml | 2 +- components/util/thread_state.rs | 2 +- ports/cef/Cargo.lock | 23 +++++++++++-------- ports/geckolib/Cargo.lock | 8 +++---- ports/geckolib/Cargo.toml | 2 +- ports/glutin/Cargo.toml | 2 +- ports/glutin/window.rs | 2 +- ports/gonk/Cargo.lock | 21 ++++++++++------- 30 files changed, 75 insertions(+), 63 deletions(-) diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml index fb9fb4f2cf52..d945ef9debca 100644 --- a/components/devtools_traits/Cargo.toml +++ b/components/devtools_traits/Cargo.toml @@ -25,8 +25,7 @@ heapsize = "0.3.0" heapsize_plugin = "0.1.2" hyper = { version = "0.8", features = [ "serde-serialization" ] } time = "0.1" -bitflags = "0.3" +bitflags = "0.5" serde = "0.7" serde_macros = "0.7" url = {version = "0.5.7", features = ["heap_size"]} - diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index f084d70d6382..23308b91a2c7 100644 --- 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, } diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 823b78ed2714..1da79722f694 100644 --- 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.5" euclid = {version = "0.6.4", features = ["plugins"]} fnv = "1.0" harfbuzz-sys = "0.1" diff --git a/components/gfx/font.rs b/components/gfx/font.rs index 8e5a80939abe..35256edda838 100644 --- 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."] @@ -266,4 +266,3 @@ pub fn get_and_reset_text_shaping_performance_counter() -> usize { TEXT_SHAPING_PERFORMANCE_COUNTER.store(0, Ordering::SeqCst); value } - diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index f7371a7a34ad..83d30b2de7a4 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -62,7 +62,7 @@ git = "https://github.com/servo/webrender_traits" [dependencies] app_units = {version = "0.2.3", features = ["plugins"]} -bitflags = "0.3" +bitflags = "0.5" cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} euclid = {version = "0.6.4", features = ["plugins"]} fnv = "1.0" diff --git a/components/layout/block.rs b/components/layout/block.rs index 72bd5de12cd2..d54427cf501a 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -524,7 +524,7 @@ pub struct BlockFlow { } bitflags! { - flags BlockFlowFlags: u8 { + pub flags BlockFlowFlags: u8 { #[doc = "If this is set, then this block flow is the root flow."] const IS_ROOT = 0x01, } diff --git a/components/layout/data.rs b/components/layout/data.rs index f582ec71ffb8..ce26601f0a84 100644 --- a/components/layout/data.rs +++ b/components/layout/data.rs @@ -50,7 +50,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 } diff --git a/components/layout/flow.rs b/components/layout/flow.rs index 6f603c7a1ac8..02600e1755db 100644 --- 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"] diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 8a6d8bf1c858..2b177b1b33c6 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -672,7 +672,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, @@ -2558,7 +2558,7 @@ impl fmt::Debug for Fragment { } bitflags! { - flags QuantitiesIncludedInIntrinsicInlineSizes: u8 { + pub flags QuantitiesIncludedInIntrinsicInlineSizes: u8 { const INTRINSIC_INLINE_SIZE_INCLUDES_MARGINS = 0x01, const INTRINSIC_INLINE_SIZE_INCLUDES_PADDING = 0x02, const INTRINSIC_INLINE_SIZE_INCLUDES_BORDER = 0x04, @@ -2569,7 +2569,7 @@ bitflags! { bitflags! { // Various flags we can use when splitting fragments. See // `calculate_split_position_using_breaking_strategy()`. - flags SplitOptions: u8 { + pub flags SplitOptions: u8 { #[doc = "True if this is the first fragment on the line."] const STARTS_LINE = 0x01, #[doc = "True if we should attempt to split at character boundaries if this split fails. \ @@ -2690,7 +2690,7 @@ impl Overflow { } bitflags! { - flags FragmentFlags: u8 { + pub flags FragmentFlags: u8 { /// Whether this fragment has a layer. const HAS_LAYER = 0x01, } diff --git a/components/layout/incremental.rs b/components/layout/incremental.rs index df63fa43af49..1422c97ef67e 100644 --- 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, diff --git a/components/layout/inline.rs b/components/layout/inline.rs index c0e209d5f784..0453f6f793fe 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -1860,7 +1860,7 @@ pub struct InlineFragmentNodeInfo { } bitflags! { - flags InlineFragmentNodeFlags: u8 { + pub flags InlineFragmentNodeFlags: u8 { const FIRST_FRAGMENT_OF_ELEMENT = 0x01, const LAST_FRAGMENT_OF_ELEMENT = 0x02, } diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index 9017d5dbba51..e6109720d0e7 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -25,7 +25,7 @@ path = "../plugins" git = "https://github.com/servo/webrender_traits" [dependencies] -bitflags = "0.3" +bitflags = "0.5" 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/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index 8c1c02feaf06..5e24b10ba371 100644 --- a/components/msg/constellation_msg.rs +++ b/components/msg/constellation_msg.rs @@ -193,7 +193,7 @@ pub enum Key { bitflags! { #[derive(Deserialize, Serialize)] - flags KeyModifiers: u8 { + pub flags KeyModifiers: u8 { const NONE = 0x00, const SHIFT = 0x01, const CONTROL = 0x02, diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index fb90edec2674..ab552b205f56 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -65,7 +65,7 @@ git = "https://github.com/servo/webrender_traits" [dependencies] app_units = {version = "0.2.3", features = ["plugins"]} -bitflags = "0.3" +bitflags = "0.5" caseless = "0.1.0" cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} encoding = "0.2" diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 39ad21a46b69..fb3081b77fe5 100644 --- 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."] diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index e614b7afc6f1..731c9cc76188 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -58,7 +58,7 @@ macro_rules! handle_potential_webgl_error { /// Set of bitflags for texture unpacking (texImage2d, etc...) bitflags! { #[derive(HeapSizeOf, JSTraceable)] - flags TextureUnpacking: u8 { + pub flags TextureUnpacking: u8 { const FLIP_Y_AXIS = 0x01, const PREMULTIPLY_ALPHA = 0x02, const CONVERT_COLORSPACE = 0x04, diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index fc36769ea0f6..e603c63aabd9 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -3,7 +3,7 @@ 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)", + "bitflags 0.5.0 (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", @@ -138,6 +138,11 @@ name = "bitflags" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "bitflags" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "block" version = "0.1.4" @@ -423,7 +428,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.5.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.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -679,7 +684,7 @@ 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.5.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)", @@ -790,7 +795,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.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1054,7 +1059,7 @@ 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.5.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.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1262,7 +1267,7 @@ dependencies = [ name = "msg" version = "0.0.1" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.5.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.4 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1702,7 +1707,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.5.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)", @@ -1978,7 +1983,7 @@ 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.5.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.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2183,7 +2188,7 @@ name = "util" 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.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.5 (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.4 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index f412b16af0a7..9a32a8e6830e 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -167,7 +167,7 @@ git = "https://github.com/browserhtml/browserhtml" branch = "gh-pages" [dependencies] -bitflags = "0.3" +bitflags = "0.5" env_logger = "0.3" euclid = {version = "0.6.4", features = ["plugins"]} libc = "0.2" diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 47a308192bf4..18704da94300 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -21,7 +21,7 @@ path = "../style_traits" [dependencies] app_units = {version = "0.2.3", features = ["plugins"]} -bitflags = "0.3" +bitflags = "0.5" cssparser = {version = "0.5.5", features = ["heap_size", "serde-serialization"]} encoding = "0.2" euclid = {version = "0.6.4", features = ["plugins"]} @@ -40,4 +40,3 @@ smallvec = "0.1" string_cache = {version = "0.2.11", features = ["heap_size"]} time = "0.1" url = {version = "0.5.7", features = ["heap_size"]} - diff --git a/components/style/element_state.rs b/components/style/element_state.rs index 41846085fc82..3d42449e850d 100644 --- 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"] diff --git a/components/style/logical_geometry.rs b/components/style/logical_geometry.rs index 3f3bf1e45098..b6afaf6f5407 100644 --- 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, diff --git a/components/style/restyle_hints.rs b/components/style/restyle_hints.rs index b5dbdc37a3f2..b946d4c77526 100644 --- 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."] diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml index d9290e46fba7..82bb10d8bcd9 100644 --- a/components/util/Cargo.toml +++ b/components/util/Cargo.toml @@ -29,7 +29,7 @@ git = "https://github.com/servo/ipc-channel" [dependencies] app_units = {version = "0.2.3", features = ["plugins"]} -bitflags = "0.3" +bitflags = "0.5" cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} deque = "0.3.1" euclid = {version = "0.6.4", features = ["unstable", "plugins"]} diff --git a/components/util/thread_state.rs b/components/util/thread_state.rs index 5435e7079863..25e77ecbb45b 100644 --- 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, diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index cd447b68a3a5..c2c4fd57adbe 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -122,6 +122,11 @@ name = "bitflags" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "bitflags" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "block" version = "0.1.4" @@ -392,7 +397,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.5.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.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -607,7 +612,7 @@ 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.5.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)", @@ -709,7 +714,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.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", "euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -973,7 +978,7 @@ 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.5.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.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1174,7 +1179,7 @@ dependencies = [ name = "msg" version = "0.0.1" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.5.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.4 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1569,7 +1574,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.5.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)", @@ -1701,7 +1706,7 @@ dependencies = [ name = "servo" version = "0.0.1" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.5.0 (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", @@ -1874,7 +1879,7 @@ 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.5.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.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2062,7 +2067,7 @@ name = "util" 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.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.5 (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.4 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock index 90e6b99f4425..3a38b885e9a9 100644 --- a/ports/geckolib/Cargo.lock +++ b/ports/geckolib/Cargo.lock @@ -3,7 +3,7 @@ name = "geckoservo" version = "0.0.1" dependencies = [ "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.5.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.4 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -57,7 +57,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "bitflags" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -382,7 +382,7 @@ 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.5.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.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -483,7 +483,7 @@ name = "util" 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.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.5 (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.4 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml index cd9031ee98ea..fc8299ca62b4 100644 --- a/ports/geckolib/Cargo.toml +++ b/ports/geckolib/Cargo.toml @@ -12,7 +12,7 @@ crate-type = ["staticlib"] [dependencies] app_units = {version = "0.2.3", features = ["plugins"]} -bitflags = "0.4" +bitflags = "0.5" cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} euclid = {version = "0.6.4", features = ["plugins"]} heapsize = "0.3.0" diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml index c292f105a0c1..5b53a9763edf 100644 --- a/ports/glutin/Cargo.toml +++ b/ports/glutin/Cargo.toml @@ -8,7 +8,7 @@ name = "glutin_app" path = "lib.rs" [dependencies] -bitflags = "0.4" +bitflags = "0.5" url = {version = "0.5.7", features = ["heap_size"]} gleam = "0.2.8" euclid = {version = "0.6.4", features = ["plugins"]} diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index c85347107973..3dbf9acb6614 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -33,7 +33,7 @@ use util::opts::{self, RenderApi}; static mut g_nested_event_loop_listener: Option<*mut (NestedEventLoopListener + 'static)> = None; bitflags! { - flags KeyModifiers: u8 { + pub flags KeyModifiers: u8 { const LEFT_CONTROL = 1, const RIGHT_CONTROL = 2, const LEFT_SHIFT = 4, diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index c26ed50b438c..0ca245f50c04 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -115,6 +115,11 @@ name = "bitflags" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "bitflags" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "block" version = "0.1.4" @@ -385,7 +390,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.5.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.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -610,7 +615,7 @@ 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.5.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)", @@ -955,7 +960,7 @@ 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.5.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.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1156,7 +1161,7 @@ dependencies = [ name = "msg" version = "0.0.1" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.5.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.4 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1551,7 +1556,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.5.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)", @@ -1683,7 +1688,7 @@ dependencies = [ name = "servo" version = "0.0.1" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.5.0 (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", @@ -1854,7 +1859,7 @@ 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.5.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.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2042,7 +2047,7 @@ name = "util" 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.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.5 (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.4 (registry+https://github.com/rust-lang/crates.io-index)",