Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dead code left over from #10085 #10941

Merged
merged 2 commits into from Apr 30, 2016
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -1518,8 +1518,6 @@ impl BlockFlow {
}
}
}

flags.union_floated_descendants_flags(child_base.flags);
}

// FIXME(pcwalton): This should consider all float descendants, not just children.
@@ -676,12 +676,6 @@ bitflags! {
}
}

// NB: If you update this field, you must update the the floated descendants flags.
/// The bitmask of flags that represent the `has_left_floated_descendants` and
/// `has_right_floated_descendants` fields.

static HAS_FLOATED_DESCENDANTS_BITMASK: FlowFlags = FlowFlags { bits: 0b0000_0011 };

/// The number of bits we must shift off to handle the text alignment field.
///
/// NB: If you update this, update `TEXT_ALIGN` above.
@@ -699,11 +693,6 @@ impl FlowFlags {
FlowFlags::from_bits(value.to_u32() << TEXT_ALIGN_SHIFT).unwrap();
}

#[inline]
pub fn union_floated_descendants_flags(&mut self, other: FlowFlags) {
self.insert(other & HAS_FLOATED_DESCENDANTS_BITMASK);
}

#[inline]
pub fn float_kind(&self) -> float::T {
if self.contains(FLOATS_LEFT) {
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.