From b486c89149343091bc591e362ecd409bf5cc48af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Sun, 4 Mar 2018 15:23:33 +0100 Subject: [PATCH] style: Remove more rustc_has_pr45225 stuff. Also cleans up references to a fixed issue. --- ports/geckolib/tests/build.rs | 5 ----- ports/geckolib/tests/size_of.rs | 9 ++------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ports/geckolib/tests/build.rs b/ports/geckolib/tests/build.rs index bfb20d5af4e..ab21e2186cd 100644 --- a/ports/geckolib/tests/build.rs +++ b/ports/geckolib/tests/build.rs @@ -11,11 +11,6 @@ use std::io::{BufRead, BufReader, Write}; use std::path::Path; fn main() { - if std::mem::size_of::>() == 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"); diff --git a/ports/geckolib/tests/size_of.rs b/ports/geckolib/tests/size_of.rs index eaa95dce24f..054dee754ec 100644 --- a/ports/geckolib/tests/size_of.rs +++ b/ports/geckolib/tests/size_of.rs @@ -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);