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

style: Remove more rustc_has_pr45225 stuff.

Browse source 
Also cleans up references to a fixed issue.
This commit is contained in:
Emilio Cobos Álvarez 2018-03-04 15:23:33 +01:00
parent 9ace0e43ce
commit b486c89149
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ports/geckolib/tests/build.rs
View file

@ -11,11 +11,6 @@ use std::io::{BufRead, BufReader, Write};
use std::path::Path;
fn main() {
if std::mem::size_of::<Option<bool>>() == 1 {
// https://github.com/rust-lang/rust/pull/45225
println!("cargo:rustc-cfg=rustc_has_pr45225")
}
let root_path = Path::new("../../../");
let bindings_file = root_path.join("components/style/gecko/generated/bindings.rs");
let glue_file = root_path.join("ports/geckolib/glue.rs");

9
ports/geckolib/tests/size_of.rs
View file

@ -36,9 +36,6 @@ size_of_test!(test_size_of_element_data, ElementData, 24);
size_of_test!(test_size_of_property_declaration, style::properties::PropertyDeclaration, 32);
size_of_test!(test_size_of_application_declaration_block, ApplicableDeclarationBlock, 24);
// FIXME(bholley): This can shrink with a little bit of work.
// See https://github.com/servo/servo/issues/17280
size_of_test!(test_size_of_rule_node, RuleNode, 80);
// This is huge, but we allocate it on the stack and then never move it,
@ -50,7 +47,5 @@ size_of_test!(test_size_of_specified_image, specified::image::Image, 40);
// FIXME(bz): These can shrink if we move the None_ value inside the
// enum instead of paying an extra word for the Either discriminant.
size_of_test!(test_size_of_computed_image_layer, computed::image::ImageLayer,
if cfg!(rustc_has_pr45225) { 40 } else { 48 });
size_of_test!(test_size_of_specified_image_layer, specified::image::ImageLayer,
if cfg!(rustc_has_pr45225) { 40 } else { 48 });
size_of_test!(test_size_of_computed_image_layer, computed::image::ImageLayer, 40);
size_of_test!(test_size_of_specified_image_layer, specified::image::ImageLayer, 40);