Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to bitflags 0.6.0 and selectors 0.5.6

Browse source 
Types generated by `bitflags!` are now private by default.  This PR marks them
`pub` where necessary.
This commit is contained in:
Matt Brubeck 2016-04-29 10:45:48 -07:00
parent d3f55fbf60
commit 1e23d90631
29 changed files with 77 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/devtools_traits/Cargo.toml
View file

@ -16,7 +16,7 @@ heapsize = "0.3.0"
heapsize_plugin = "0.1.2" heapsize_plugin = "0.1.2"
hyper = { version = "0.9", features = [ "serde-serialization" ] } hyper = { version = "0.9", features = [ "serde-serialization" ] }
time = "0.1" time = "0.1"
bitflags = "0.3" bitflags = "0.6.0"
serde = "0.7" serde = "0.7"
serde_macros = "0.7" serde_macros = "0.7"
url = {version = "1.0.0", features = ["heap_size"]} url = {version = "1.0.0", features = ["heap_size"]}

2
components/devtools_traits/lib.rs
View file

@ -242,7 +242,7 @@ pub struct ConsoleMessage {
bitflags! { bitflags! {
#[derive(Deserialize, Serialize)] #[derive(Deserialize, Serialize)]
flags CachedConsoleMessageTypes: u8 { pub flags CachedConsoleMessageTypes: u8 {
const PAGE_ERROR = 1 << 0, const PAGE_ERROR = 1 << 0,
const CONSOLE_API = 1 << 1, const CONSOLE_API = 1 << 1,
} }

2
components/gfx/Cargo.toml
View file

@ -11,7 +11,7 @@ path = "lib.rs"
[dependencies] [dependencies]
app_units = {version = "0.2.3", features = ["plugins"]} app_units = {version = "0.2.3", features = ["plugins"]}
bitflags = "0.3" bitflags = "0.6.0"
euclid = {version = "0.6.4", features = ["plugins"]} euclid = {version = "0.6.4", features = ["plugins"]}
fnv = "1.0" fnv = "1.0"
harfbuzz-sys = "0.1" harfbuzz-sys = "0.1"

2
components/gfx/font.rs
View file

@ -105,7 +105,7 @@ pub struct Font {
} }
bitflags! { bitflags! {
flags ShapingFlags: u8 { pub flags ShapingFlags: u8 {
#[doc = "Set if the text is entirely whitespace."] #[doc = "Set if the text is entirely whitespace."]
const IS_WHITESPACE_SHAPING_FLAG = 0x01, const IS_WHITESPACE_SHAPING_FLAG = 0x01,
#[doc = "Set if we are to ignore ligatures."] #[doc = "Set if we are to ignore ligatures."]

2
components/layout/Cargo.toml
View file

@ -27,7 +27,7 @@ util = {path = "../util"}
ipc-channel = {git = "https://github.com/servo/ipc-channel"} ipc-channel = {git = "https://github.com/servo/ipc-channel"}
webrender_traits = {git = "https://github.com/servo/webrender_traits"} webrender_traits = {git = "https://github.com/servo/webrender_traits"}
app_units = {version = "0.2.3", features = ["plugins"]} 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"]} cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
euclid = {version = "0.6.4", features = ["plugins"]} euclid = {version = "0.6.4", features = ["plugins"]}
fnv = "1.0" fnv = "1.0"

2
components/layout/block.rs
View file

@ -520,7 +520,7 @@ pub struct BlockFlow {
pub float: Option<Box<FloatedBlockInfo>>, pub float: Option<Box<FloatedBlockInfo>>,
/// Various flags. /// Various flags.
pub flags: BlockFlowFlags, flags: BlockFlowFlags,
} }
bitflags! { bitflags! {

2
components/layout/data.rs
View file

@ -51,7 +51,7 @@ impl PrivateLayoutData {
} }
bitflags! { bitflags! {
flags LayoutDataFlags: u8 { pub flags LayoutDataFlags: u8 {
#[doc = "Whether a flow has been newly constructed."] #[doc = "Whether a flow has been newly constructed."]
const HAS_NEWLY_CONSTRUCTED_FLOW = 0x01 const HAS_NEWLY_CONSTRUCTED_FLOW = 0x01
} }

2
components/layout/flow.rs
View file

@ -629,7 +629,7 @@ pub trait InorderFlowTraversal {
bitflags! { bitflags! {
#[doc = "Flags used in flows."] #[doc = "Flags used in flows."]
flags FlowFlags: u32 { pub flags FlowFlags: u32 {
// text align flags // text align flags
#[doc = "Whether this flow must have its own layer. Even if this flag is not set, it might"] #[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"] #[doc = "get its own layer if it's deemed to be likely to overlap flows with their own"]

4
components/layout/fragment.rs
View file

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

4
components/layout/incremental.rs
View file

@ -11,7 +11,7 @@ use style::properties::{ComputedValues, ServoComputedValues};
bitflags! { bitflags! {
#[doc = "Individual layout actions that may be necessary after restyling."] #[doc = "Individual layout actions that may be necessary after restyling."]
flags RestyleDamage: u8 { pub flags RestyleDamage: u8 {
#[doc = "Repaint the node itself."] #[doc = "Repaint the node itself."]
#[doc = "Currently unused; need to decide how this propagates."] #[doc = "Currently unused; need to decide how this propagates."]
const REPAINT = 0x01, const REPAINT = 0x01,
@ -45,7 +45,7 @@ bitflags! {
} }
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 \ #[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."] temporary hack to deal with cases that we don't handle incrementally yet."]
const REFLOW_ENTIRE_DOCUMENT = 0x01, const REFLOW_ENTIRE_DOCUMENT = 0x01,

2
components/layout/inline.rs
View file

@ -1859,7 +1859,7 @@ pub struct InlineFragmentNodeInfo {
} }
bitflags! { bitflags! {
flags InlineFragmentNodeFlags: u8 { pub flags InlineFragmentNodeFlags: u8 {
const FIRST_FRAGMENT_OF_ELEMENT = 0x01, const FIRST_FRAGMENT_OF_ELEMENT = 0x01,
const LAST_FRAGMENT_OF_ELEMENT = 0x02, const LAST_FRAGMENT_OF_ELEMENT = 0x02,
} }

2
components/msg/Cargo.toml
View file

@ -14,7 +14,7 @@ layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
ipc-channel = {git = "https://github.com/servo/ipc-channel"} ipc-channel = {git = "https://github.com/servo/ipc-channel"}
plugins = {path = "../plugins"} plugins = {path = "../plugins"}
webrender_traits = {git = "https://github.com/servo/webrender_traits"} 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"]} cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
euclid = {version = "0.6.4", features = ["plugins"]} euclid = {version = "0.6.4", features = ["plugins"]}
heapsize = "0.3.0" heapsize = "0.3.0"

2
components/msg/constellation_msg.rs
View file

@ -194,7 +194,7 @@ pub enum Key {
bitflags! { bitflags! {
#[derive(Deserialize, Serialize)] #[derive(Deserialize, Serialize)]
flags KeyModifiers: u8 { pub flags KeyModifiers: u8 {
const NONE = 0x00, const NONE = 0x00,
const SHIFT = 0x01, const SHIFT = 0x01,
const CONTROL = 0x02, const CONTROL = 0x02,

2
components/script/Cargo.toml
View file

@ -31,7 +31,7 @@ xml5ever = {version = "0.1.2", features = ["unstable"]}
gfx_traits = {path = "../gfx_traits"} gfx_traits = {path = "../gfx_traits"}
webrender_traits = {git = "https://github.com/servo/webrender_traits"} webrender_traits = {git = "https://github.com/servo/webrender_traits"}
app_units = {version = "0.2.3", features = ["plugins"]} app_units = {version = "0.2.3", features = ["plugins"]}
bitflags = "0.3" bitflags = "0.6.0"
caseless = "0.1.0" caseless = "0.1.0"
cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
encoding = "0.2" encoding = "0.2"

2
components/script/dom/node.rs
View file

@ -131,7 +131,7 @@ pub struct Node {
bitflags! { bitflags! {
#[doc = "Flags for node items."] #[doc = "Flags for node items."]
#[derive(JSTraceable, HeapSizeOf)] #[derive(JSTraceable, HeapSizeOf)]
flags NodeFlags: u8 { pub flags NodeFlags: u8 {
#[doc = "Specifies whether this node is in a document."] #[doc = "Specifies whether this node is in a document."]
const IS_IN_DOC = 0x01, const IS_IN_DOC = 0x01,
#[doc = "Specifies whether this node _must_ be reflowed regardless of style differences."] #[doc = "Specifies whether this node _must_ be reflowed regardless of style differences."]

33
components/servo/Cargo.lock generated
View file

@ -3,7 +3,6 @@ name = "servo"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "browserhtml 0.1.4 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
"canvas 0.0.1", "canvas 0.0.1",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
@ -160,7 +159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "0.5.0" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -451,7 +450,7 @@ dependencies = [
name = "devtools_traits" name = "devtools_traits"
version = "0.0.1" version = "0.0.1"
dependencies = [ 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 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)", "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)", "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -702,7 +701,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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-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-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)", "core-text 1.1.0 (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" name = "glutin_app"
version = "0.0.1" version = "0.0.1"
dependencies = [ 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", "compositing 0.0.1",
"euclid 0.6.6 (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.15 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1076,7 +1075,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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", "canvas_traits 0.0.1",
"cssparser 0.5.5 (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)", "euclid 0.6.6 (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)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
"script 0.0.1", "script 0.0.1",
"script_traits 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_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)", "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)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1280,7 +1279,7 @@ dependencies = [
name = "msg" name = "msg"
version = "0.0.1" version = "0.0.1"
dependencies = [ 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)", "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)", "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)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1796,7 +1795,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"angle 0.1.0 (git+https://github.com/emilio/angle?branch=servo)", "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)", "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 0.0.1",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
"caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1829,7 +1828,7 @@ dependencies = [
"regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.19 (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", "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)", "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)", "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)", "string_cache 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1883,10 +1882,10 @@ dependencies = [
[[package]] [[package]]
name = "selectors" name = "selectors"
version = "0.5.5" version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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)", "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.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2072,7 +2071,7 @@ name = "style"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2085,7 +2084,7 @@ dependencies = [
"num-traits 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)",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.19 (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.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 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)", "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)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2106,7 +2105,7 @@ dependencies = [
"msg 0.0.1", "msg 0.0.1",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.19 (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.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)", "string_cache 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1", "style 0.0.1",
"style_traits 0.0.1", "style_traits 0.0.1",
@ -2126,7 +2125,7 @@ dependencies = [
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.19 (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.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 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)", "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)", "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2289,7 +2288,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "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)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",

1
components/servo/Cargo.toml
View file

@ -69,7 +69,6 @@ ipc-channel = {git = "https://github.com/servo/ipc-channel"}
layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]} layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
gleam = "0.2" gleam = "0.2"
browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "gh-pages"} browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "gh-pages"}
bitflags = "0.3"
env_logger = "0.3" env_logger = "0.3"
euclid = {version = "0.6.4", features = ["plugins"]} euclid = {version = "0.6.4", features = ["plugins"]}
libc = "0.2" libc = "0.2"

2
components/style/Cargo.toml
View file

@ -18,7 +18,7 @@ plugins = {path = "../plugins"}
util = {path = "../util"} util = {path = "../util"}
style_traits = {path = "../style_traits"} style_traits = {path = "../style_traits"}
app_units = {version = "0.2.3", features = ["plugins"]} 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"]} cssparser = {version = "0.5.5", features = ["heap_size", "serde-serialization"]}
encoding = "0.2" encoding = "0.2"
euclid = {version = "0.6.4", features = ["plugins"]} euclid = {version = "0.6.4", features = ["plugins"]}

2
components/style/element_state.rs
View file

@ -5,7 +5,7 @@
bitflags! { bitflags! {
#[doc = "Event-based element states."] #[doc = "Event-based element states."]
#[derive(HeapSizeOf)] #[derive(HeapSizeOf)]
flags ElementState: u8 { pub flags ElementState: u8 {
#[doc = "The mouse is down on this element. \ #[doc = "The mouse is down on this element. \
https://html.spec.whatwg.org/multipage/#selector-active \ https://html.spec.whatwg.org/multipage/#selector-active \
FIXME(#7333): set/unset this when appropriate"] FIXME(#7333): set/unset this when appropriate"]

2
components/style/logical_geometry.rs
View file

@ -23,7 +23,7 @@ pub enum InlineBaseDirection {
bitflags!( bitflags!(
#[derive(HeapSizeOf, RustcEncodable)] #[derive(HeapSizeOf, RustcEncodable)]
flags WritingMode: u8 { pub flags WritingMode: u8 {
const FLAG_RTL = 1 << 0, const FLAG_RTL = 1 << 0,
const FLAG_VERTICAL = 1 << 1, const FLAG_VERTICAL = 1 << 1,
const FLAG_VERTICAL_LR = 1 << 2, const FLAG_VERTICAL_LR = 1 << 2,

2
components/style/restyle_hints.rs
View file

@ -20,7 +20,7 @@ use string_cache::{Atom, Namespace};
/// short-circuit work we know is unnecessary. /// short-circuit work we know is unnecessary.
bitflags! { bitflags! {
flags RestyleHint: u8 { pub flags RestyleHint: u8 {
#[doc = "Rerun selector matching on the element."] #[doc = "Rerun selector matching on the element."]
const RESTYLE_SELF = 0x01, const RESTYLE_SELF = 0x01,
#[doc = "Rerun selector matching on all of the element's descendants."] #[doc = "Rerun selector matching on all of the element's descendants."]

2
components/util/Cargo.toml
View file

@ -23,7 +23,7 @@ js = {git = "https://github.com/servo/rust-mozjs", optional = true}
ipc-channel = {git = "https://github.com/servo/ipc-channel"} ipc-channel = {git = "https://github.com/servo/ipc-channel"}
app_units = {version = "0.2.3", features = ["plugins"]} app_units = {version = "0.2.3", features = ["plugins"]}
backtrace = "0.2.1" backtrace = "0.2.1"
bitflags = "0.3" bitflags = "0.6.0"
deque = "0.3.1" deque = "0.3.1"
euclid = {version = "0.6.4", features = ["unstable", "plugins"]} euclid = {version = "0.6.4", features = ["unstable", "plugins"]}
getopts = "0.2.11" getopts = "0.2.11"

2
components/util/thread_state.rs
View file

@ -11,7 +11,7 @@
pub use self::imp::{enter, exit, get, initialize}; pub use self::imp::{enter, exit, get, initialize};
bitflags! { bitflags! {
flags ThreadState: u32 { pub flags ThreadState: u32 {
const SCRIPT = 0x01, const SCRIPT = 0x01,
const LAYOUT = 0x02, const LAYOUT = 0x02,
const PAINT = 0x04, const PAINT = 0x04,

31
ports/cef/Cargo.lock generated
View file

@ -145,7 +145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "0.5.0" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -421,7 +421,7 @@ dependencies = [
name = "devtools_traits" name = "devtools_traits"
version = "0.0.1" version = "0.0.1"
dependencies = [ 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 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)", "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)", "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -631,7 +631,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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-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-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)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -722,7 +722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "glutin_app" name = "glutin_app"
version = "0.0.1" version = "0.0.1"
dependencies = [ 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", "compositing 0.0.1",
"euclid 0.6.6 (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.15 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
@ -996,7 +996,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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", "canvas_traits 0.0.1",
"cssparser 0.5.5 (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)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1017,7 +1017,7 @@ dependencies = [
"rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
"script 0.0.1", "script 0.0.1",
"script_traits 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_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)", "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)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1193,7 +1193,7 @@ dependencies = [
name = "msg" name = "msg"
version = "0.0.1" version = "0.0.1"
dependencies = [ 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)", "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)", "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)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1664,7 +1664,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"angle 0.1.0 (git+https://github.com/emilio/angle?branch=servo)", "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)", "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 0.0.1",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
"caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1697,7 +1697,7 @@ dependencies = [
"regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.19 (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", "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)", "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)", "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)", "string_cache 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1740,10 +1740,10 @@ dependencies = [
[[package]] [[package]]
name = "selectors" name = "selectors"
version = "0.5.5" version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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)", "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.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1795,7 +1795,6 @@ dependencies = [
name = "servo" name = "servo"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"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)", "browserhtml 0.1.4 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
"canvas 0.0.1", "canvas 0.0.1",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
@ -1966,7 +1965,7 @@ name = "style"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1979,7 +1978,7 @@ dependencies = [
"num-traits 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)",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.19 (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.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 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)", "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)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2002,7 +2001,7 @@ dependencies = [
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.19 (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.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 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)", "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)", "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2165,7 +2164,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "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)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",

22
ports/geckolib/Cargo.lock generated
View file

@ -3,7 +3,6 @@ name = "geckoservo"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)",
"cssparser 0.5.5 (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)", "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)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -13,7 +12,7 @@ dependencies = [
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1", "plugins 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)",
"smallvec 0.1.5 (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)", "string_cache 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1", "style 0.0.1",
@ -73,12 +72,7 @@ dependencies = [
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "0.3.3" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "bitflags"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -424,10 +418,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "selectors" name = "selectors"
version = "0.5.5" version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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)", "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.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -485,7 +479,7 @@ name = "style"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -498,7 +492,7 @@ dependencies = [
"num-traits 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)",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.19 (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.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 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)", "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)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -521,7 +515,7 @@ dependencies = [
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.19 (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.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 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)", "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)", "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -583,7 +577,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "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)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",

1
ports/geckolib/Cargo.toml
View file

@ -12,7 +12,6 @@ crate-type = ["staticlib"]
[dependencies] [dependencies]
app_units = {version = "0.2.3", features = ["plugins"]} app_units = {version = "0.2.3", features = ["plugins"]}
bitflags = "0.4"
cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
euclid = {version = "0.6.4", features = ["plugins"]} euclid = {version = "0.6.4", features = ["plugins"]}
heapsize = "0.3.0" heapsize = "0.3.0"

2
ports/geckolib/lib.rs
View file

@ -14,8 +14,6 @@
extern crate app_units; extern crate app_units;
#[macro_use] #[macro_use]
extern crate bitflags;
#[macro_use]
extern crate cssparser; extern crate cssparser;
extern crate euclid; extern crate euclid;
extern crate heapsize; extern crate heapsize;

2
ports/glutin/Cargo.toml
View file

@ -8,7 +8,7 @@ name = "glutin_app"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
bitflags = "0.4" bitflags = "0.6.0"
url = {version = "1.0.0", features = ["heap_size"]} url = {version = "1.0.0", features = ["heap_size"]}
gleam = "0.2.8" gleam = "0.2.8"
euclid = {version = "0.6.4", features = ["plugins"]} euclid = {version = "0.6.4", features = ["plugins"]}

29
ports/gonk/Cargo.lock generated
View file

@ -138,7 +138,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "0.5.0" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -414,7 +414,7 @@ dependencies = [
name = "devtools_traits" name = "devtools_traits"
version = "0.0.1" version = "0.0.1"
dependencies = [ 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 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)", "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)", "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -634,7 +634,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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-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-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)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -979,7 +979,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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", "canvas_traits 0.0.1",
"cssparser 0.5.5 (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)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1000,7 +1000,7 @@ dependencies = [
"rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
"script 0.0.1", "script 0.0.1",
"script_traits 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_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)", "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)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1176,7 +1176,7 @@ dependencies = [
name = "msg" name = "msg"
version = "0.0.1" version = "0.0.1"
dependencies = [ 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)", "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)", "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)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1647,7 +1647,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"angle 0.1.0 (git+https://github.com/emilio/angle?branch=servo)", "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)", "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 0.0.1",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
"caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1680,7 +1680,7 @@ dependencies = [
"regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.19 (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", "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)", "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)", "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)", "string_cache 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1723,10 +1723,10 @@ dependencies = [
[[package]] [[package]]
name = "selectors" name = "selectors"
version = "0.5.5" version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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)", "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.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1778,7 +1778,6 @@ dependencies = [
name = "servo" name = "servo"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"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)", "browserhtml 0.1.4 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
"canvas 0.0.1", "canvas 0.0.1",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
@ -1947,7 +1946,7 @@ name = "style"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1960,7 +1959,7 @@ dependencies = [
"num-traits 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)",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.19 (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.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 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)", "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)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1983,7 +1982,7 @@ dependencies = [
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.19 (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.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 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)", "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)", "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2146,7 +2145,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "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)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",