From 64885c4213c97c818f37026c7071975f299466fb Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Wed, 22 Feb 2017 23:38:48 +0100
Subject: [PATCH] Update to rustc 1.17.0-nightly (413a975e3 2017-02-23)

Fix #15704
---
 components/script/lib.rs     |  1 -
 rust-commit-hash             |  2 +-
 tests/unit/script/size_of.rs | 16 ++++++++--------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/components/script/lib.rs b/components/script/lib.rs
index 81c7eb0901f..9d3abf169b9 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -6,7 +6,6 @@
 #![feature(conservative_impl_trait)]
 #![feature(const_fn)]
 #![feature(core_intrinsics)]
-#![feature(field_init_shorthand)]
 #![feature(mpsc_select)]
 #![feature(nonzero)]
 #![feature(on_unimplemented)]
diff --git a/rust-commit-hash b/rust-commit-hash
index 88ae055e46e..49bdc9a6645 100644
--- a/rust-commit-hash
+++ b/rust-commit-hash
@@ -1 +1 @@
-025c328bf5ab336ff708e62a59292298dc1bc089
+413a975e31584d1e22d158a70c6d3073b991a618
diff --git a/tests/unit/script/size_of.rs b/tests/unit/script/size_of.rs
index 30bc822fdbf..af5228df562 100644
--- a/tests/unit/script/size_of.rs
+++ b/tests/unit/script/size_of.rs
@@ -29,14 +29,14 @@ macro_rules! sizeof_checker (
 );
 
 // Update the sizes here
-sizeof_checker!(size_event_target, EventTarget, 40);
-sizeof_checker!(size_node, Node, 152);
-sizeof_checker!(size_element, Element, 312);
-sizeof_checker!(size_htmlelement, HTMLElement, 328);
-sizeof_checker!(size_div, HTMLDivElement, 328);
-sizeof_checker!(size_span, HTMLSpanElement, 328);
-sizeof_checker!(size_text, Text, 184);
-sizeof_checker!(size_characterdata, CharacterData, 184);
+sizeof_checker!(size_event_target, EventTarget, 48);
+sizeof_checker!(size_node, Node, 160);
+sizeof_checker!(size_element, Element, 320);
+sizeof_checker!(size_htmlelement, HTMLElement, 336);
+sizeof_checker!(size_div, HTMLDivElement, 336);
+sizeof_checker!(size_span, HTMLSpanElement, 336);
+sizeof_checker!(size_text, Text, 192);
+sizeof_checker!(size_characterdata, CharacterData, 192);
 sizeof_checker!(size_servothreadsafelayoutnode, ServoThreadSafeLayoutNode, 16);
 
 // We use these types in the parallel traversal. They should stay pointer-sized.