Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #19829 - servo:rustup, r=nox

Browse source 
Update Rust and use the newly-stable std::ptr::NonNull

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19829)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-01-22 11:11:44 -06:00 • committed by GitHub
commit c1ed4bb2d5
44 changed files with 137 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/rule_tree/mod.rs
View file

@ -828,6 +828,8 @@ impl MallocSizeOf for RuleNode {
}
}
// FIXME: use std::ptr::NonNull when Firefox requires Rust 1.25+
#[derive(Clone)]
struct WeakRuleNode {
p: NonZeroPtrMut<RuleNode>,