Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +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/layout/Cargo.toml
View file

@ -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"

2
components/layout/block.rs
View file

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

2
components/layout/data.rs
View file

@ -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
}

2
components/layout/flow.rs
View file

@ -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"]

4
components/layout/fragment.rs
View file

@ -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,
}

4
components/layout/incremental.rs
View file

@ -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,

2
components/layout/inline.rs
View file

@ -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,
}