From 520490e404aeffdeb3524ad49b679bafe69345b0 Mon Sep 17 00:00:00 2001
From: Liang-Heng Chen <xeonchen@gmail.com>
Date: Mon, 20 May 2019 08:48:02 +0000
Subject: [PATCH 001/129] Bug 1552536 - add dummy page load origin; r=chutten

Differential Revision: https://phabricator.services.mozilla.com/D31666

--HG--
extra : moz-landing-system : lando
---
 dom/base/ContentBlockingLog.cpp               |  16 ++-
 .../telemetry/core/TelemetryOriginData.inc    |   3 +
 .../telemetry/tests/gtest/TestOrigins.cpp     | 117 +++++++++---------
 3 files changed, 73 insertions(+), 63 deletions(-)

diff --git a/dom/base/ContentBlockingLog.cpp b/dom/base/ContentBlockingLog.cpp
index f68c287ca9a1..1bab0857c55f 100644
--- a/dom/base/ContentBlockingLog.cpp
+++ b/dom/base/ContentBlockingLog.cpp
@@ -21,6 +21,9 @@ typedef mozilla::Telemetry::OriginMetricID OriginMetricID;
 namespace mozilla {
 namespace dom {
 
+// sync with TelemetryOriginData.inc
+NS_NAMED_LITERAL_CSTRING(kDummyOriginHash, "PAGELOAD");
+
 // randomly choose 1% users included in the content blocking measurement
 // based on their client id.
 static constexpr double kRatioReportUser = 0.01;
@@ -111,6 +114,12 @@ void ContentBlockingLog::ReportLog() {
     return;
   }
   LOG("ContentBlockingLog::ReportLog [this=%p]", this);
+  const bool testMode =
+      StaticPrefs::telemetry_origin_telemetry_test_mode_enabled();
+  OriginMetricID metricId =
+      testMode ? OriginMetricID::ContentBlocking_Blocked_TestOnly
+               : OriginMetricID::ContentBlocking_Blocked;
+  ReportOriginSingleHash(metricId, kDummyOriginHash);
 
   for (const auto& originEntry : mLog) {
     if (!originEntry.mData) {
@@ -126,12 +135,9 @@ void ContentBlockingLog::ReportLog() {
 
       const bool isBlocked = logEntry.mBlocked;
       Maybe<StorageAccessGrantedReason> reason = logEntry.mReason;
-      const bool testMode =
-          StaticPrefs::telemetry_origin_telemetry_test_mode_enabled();
 
-      OriginMetricID metricId =
-          testMode ? OriginMetricID::ContentBlocking_Blocked_TestOnly
-                   : OriginMetricID::ContentBlocking_Blocked;
+      metricId = testMode ? OriginMetricID::ContentBlocking_Blocked_TestOnly
+                          : OriginMetricID::ContentBlocking_Blocked;
       if (!isBlocked) {
         MOZ_ASSERT(reason.isSome());
         switch (reason.value()) {
diff --git a/toolkit/components/telemetry/core/TelemetryOriginData.inc b/toolkit/components/telemetry/core/TelemetryOriginData.inc
index f348b9af6af9..03b9337fbe60 100644
--- a/toolkit/components/telemetry/core/TelemetryOriginData.inc
+++ b/toolkit/components/telemetry/core/TelemetryOriginData.inc
@@ -1,3 +1,6 @@
+// dummy origin
+ORIGIN("PAGELOAD", "PAGELOAD")
+
 ORIGIN("advertstream.com", "lzPiT1FuoHNMKQ1Hw8AaTi68TokOB24ciFBqmCk62ek=")
 ORIGIN("kitaramedia.com", "r+U9PL3uMrjCKe8/T8goY9MHPA+6JckC3R+/1R9TQKA=")
 ORIGIN("questionmarket.com", "3KCO/qN+KmApmfH3RaXAmdR65Z/TRfrr6pds7aDKn1c=")
diff --git a/toolkit/components/telemetry/tests/gtest/TestOrigins.cpp b/toolkit/components/telemetry/tests/gtest/TestOrigins.cpp
index dd83354501cc..56ab3a4f4319 100644
--- a/toolkit/components/telemetry/tests/gtest/TestOrigins.cpp
+++ b/toolkit/components/telemetry/tests/gtest/TestOrigins.cpp
@@ -20,6 +20,26 @@ using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::StrEq;
 
+NS_NAMED_LITERAL_CSTRING(kTelemetryTest1Metric, "telemetry.test_test1");
+
+NS_NAMED_LITERAL_CSTRING(kDummyOrigin, "PAGELOAD");
+NS_NAMED_LITERAL_CSTRING(kDoubleclickOrigin, "doubleclick.net");
+NS_NAMED_LITERAL_CSTRING(kDoubleclickOriginHash,
+                         "uXNT1PzjAVau8b402OMAIGDejKbiXfQX5iXvPASfO/s=");
+NS_NAMED_LITERAL_CSTRING(kFacebookOrigin, "fb.com");
+NS_NAMED_LITERAL_CSTRING(kUnknownOrigin1,
+                         "this origin isn't known to Origin Telemetry");
+NS_NAMED_LITERAL_CSTRING(kUnknownOrigin2, "neither is this one");
+
+// Properly prepare the prio prefs
+// (Sourced from PrioEncoder.cpp from when it was being prototyped)
+NS_NAMED_LITERAL_CSTRING(
+    prioKeyA,
+    "35AC1C7576C7C6EDD7FED6BCFC337B34D48CB4EE45C86BEEFB40BD8875707733");
+NS_NAMED_LITERAL_CSTRING(
+    prioKeyB,
+    "26E6674E65425B823F1F1D5F96E3BB3EF9E406EC7FBA7DEF8B08A35DD135AF50");
+
 // Test that we can properly record origin stuff using the C++ API.
 TEST_F(TelemetryTestFixture, RecordOrigin) {
   AutoJSContextWithGlobal cx(mCleanGlobal);
@@ -27,10 +47,7 @@ TEST_F(TelemetryTestFixture, RecordOrigin) {
 
   Unused << mTelemetry->ClearOrigins();
 
-  const nsLiteralCString doubleclick("doubleclick.net");
-  const nsLiteralCString telemetryTest1("telemetry.test_test1");
-
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, doubleclick);
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, kDummyOrigin);
 
   JS::RootedValue originSnapshot(aCx);
   GetOriginSnapshot(aCx, &originSnapshot);
@@ -40,12 +57,13 @@ TEST_F(TelemetryTestFixture, RecordOrigin) {
 
   JS::RootedValue origins(aCx);
   JS::RootedObject snapshotObj(aCx, &originSnapshot.toObject());
-  ASSERT_TRUE(JS_GetProperty(aCx, snapshotObj, telemetryTest1.get(), &origins))
+  ASSERT_TRUE(
+      JS_GetProperty(aCx, snapshotObj, kTelemetryTest1Metric.get(), &origins))
   << "telemetry.test_test1 must be in the snapshot.";
 
   JS::RootedObject originsObj(aCx, &origins.toObject());
   JS::RootedValue count(aCx);
-  ASSERT_TRUE(JS_GetProperty(aCx, originsObj, doubleclick.get(), &count));
+  ASSERT_TRUE(JS_GetProperty(aCx, originsObj, kDummyOrigin.get(), &count));
   ASSERT_TRUE(count.isInt32() && count.toInt32() == 1)
   << "Must have recorded the origin exactly once.";
 
@@ -64,11 +82,10 @@ TEST_F(TelemetryTestFixture, RecordOriginTwiceAndClear) {
 
   Unused << mTelemetry->ClearOrigins();
 
-  const nsLiteralCString doubleclick("doubleclick.net");
-  const nsLiteralCString telemetryTest1("telemetry.test_test1");
-
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, doubleclick);
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, doubleclick);
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1,
+                          kDoubleclickOrigin);
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1,
+                          kDoubleclickOrigin);
 
   JS::RootedValue originSnapshot(aCx);
   GetOriginSnapshot(aCx, &originSnapshot, true /* aClear */);
@@ -78,12 +95,14 @@ TEST_F(TelemetryTestFixture, RecordOriginTwiceAndClear) {
 
   JS::RootedValue origins(aCx);
   JS::RootedObject snapshotObj(aCx, &originSnapshot.toObject());
-  ASSERT_TRUE(JS_GetProperty(aCx, snapshotObj, telemetryTest1.get(), &origins))
+  ASSERT_TRUE(
+      JS_GetProperty(aCx, snapshotObj, kTelemetryTest1Metric.get(), &origins))
   << "telemetry.test_test1 must be in the snapshot.";
 
   JS::RootedObject originsObj(aCx, &origins.toObject());
   JS::RootedValue count(aCx);
-  ASSERT_TRUE(JS_GetProperty(aCx, originsObj, doubleclick.get(), &count));
+  ASSERT_TRUE(
+      JS_GetProperty(aCx, originsObj, kDoubleclickOrigin.get(), &count));
   ASSERT_TRUE(count.isInt32() && count.toInt32() == 2)
   << "Must have recorded the origin exactly twice.";
 
@@ -102,26 +121,17 @@ TEST_F(TelemetryTestFixture, RecordOriginTwiceMixed) {
 
   Unused << mTelemetry->ClearOrigins();
 
-  const nsLiteralCString doubleclick("doubleclick.net");
-  const nsLiteralCString doubleclickHash(
-      "uXNT1PzjAVau8b402OMAIGDejKbiXfQX5iXvPASfO/s=");
-  const nsLiteralCString telemetryTest1("telemetry.test_test1");
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1,
+                          kDoubleclickOrigin);
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1,
+                          kDoubleclickOriginHash);
 
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, doubleclick);
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, doubleclickHash);
-
-  // Properly prepare the prio prefs
-  // (Sourced from PrioEncoder.cpp from when it was being prototyped)
-  const nsLiteralCString prioKeyA(
-      "35AC1C7576C7C6EDD7FED6BCFC337B34D48CB4EE45C86BEEFB40BD8875707733");
-  const nsLiteralCString prioKeyB(
-      "26E6674E65425B823F1F1D5F96E3BB3EF9E406EC7FBA7DEF8B08A35DD135AF50");
   Preferences::SetCString("prio.publicKeyA", prioKeyA);
   Preferences::SetCString("prio.publicKeyB", prioKeyB);
 
   nsTArray<Tuple<nsCString, nsCString>> encodedStrings;
-  GetEncodedOriginStrings(aCx, telemetryTest1 + NS_LITERAL_CSTRING("-%u"),
-                          encodedStrings);
+  GetEncodedOriginStrings(
+      aCx, kTelemetryTest1Metric + NS_LITERAL_CSTRING("-%u"), encodedStrings);
   ASSERT_EQ(2 * TelemetryOrigin::SizeOfPrioDatasPerMetric(),
             encodedStrings.Length());
 
@@ -133,12 +143,14 @@ TEST_F(TelemetryTestFixture, RecordOriginTwiceMixed) {
 
   JS::RootedValue origins(aCx);
   JS::RootedObject snapshotObj(aCx, &originSnapshot.toObject());
-  ASSERT_TRUE(JS_GetProperty(aCx, snapshotObj, telemetryTest1.get(), &origins))
+  ASSERT_TRUE(
+      JS_GetProperty(aCx, snapshotObj, kTelemetryTest1Metric.get(), &origins))
   << "telemetry.test_test1 must be in the snapshot.";
 
   JS::RootedObject originsObj(aCx, &origins.toObject());
   JS::RootedValue count(aCx);
-  ASSERT_TRUE(JS_GetProperty(aCx, originsObj, doubleclick.get(), &count));
+  ASSERT_TRUE(
+      JS_GetProperty(aCx, originsObj, kDoubleclickOrigin.get(), &count));
   ASSERT_TRUE(count.isInt32() && count.toInt32() == 2)
   << "Must have recorded the origin exactly twice.";
 }
@@ -149,11 +161,7 @@ TEST_F(TelemetryTestFixture, RecordUnknownOrigin) {
 
   Unused << mTelemetry->ClearOrigins();
 
-  const nsLiteralCString telemetryTest1("telemetry.test_test1");
-  const nsLiteralCString unknown("this origin isn't known to Origin Telemetry");
-  const nsLiteralCString unknown2("neither is this one");
-
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, unknown);
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, kUnknownOrigin1);
 
   JS::RootedValue originSnapshot(aCx);
   GetOriginSnapshot(aCx, &originSnapshot);
@@ -163,7 +171,8 @@ TEST_F(TelemetryTestFixture, RecordUnknownOrigin) {
 
   JS::RootedValue origins(aCx);
   JS::RootedObject snapshotObj(aCx, &originSnapshot.toObject());
-  ASSERT_TRUE(JS_GetProperty(aCx, snapshotObj, telemetryTest1.get(), &origins))
+  ASSERT_TRUE(
+      JS_GetProperty(aCx, snapshotObj, kTelemetryTest1Metric.get(), &origins))
   << "telemetry.test_test1 must be in the snapshot.";
 
   JS::RootedObject originsObj(aCx, &origins.toObject());
@@ -173,7 +182,7 @@ TEST_F(TelemetryTestFixture, RecordUnknownOrigin) {
   << "Must have recorded the unknown origin exactly once.";
 
   // Record a second, different unknown origin and ensure only one is stored.
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, unknown2);
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, kUnknownOrigin2);
 
   GetOriginSnapshot(aCx, &originSnapshot);
 
@@ -181,7 +190,8 @@ TEST_F(TelemetryTestFixture, RecordUnknownOrigin) {
   << "Origin snapshot must not be null/undefined.";
 
   JS::RootedObject snapshotObj2(aCx, &originSnapshot.toObject());
-  ASSERT_TRUE(JS_GetProperty(aCx, snapshotObj2, telemetryTest1.get(), &origins))
+  ASSERT_TRUE(
+      JS_GetProperty(aCx, snapshotObj2, kTelemetryTest1Metric.get(), &origins))
   << "telemetry.test_test1 must be in the snapshot.";
 
   JS::RootedObject originsObj2(aCx, &origins.toObject());
@@ -197,30 +207,21 @@ TEST_F(TelemetryTestFixture, EncodedSnapshot) {
 
   Unused << mTelemetry->ClearOrigins();
 
-  const nsLiteralCString doubleclick("doubleclick.net");
-  const nsLiteralCString unknown("this origin isn't known to Origin Telemetry");
-  const nsLiteralCString telemetryTest1("telemetry.test_test1");
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1,
+                          kDoubleclickOrigin);
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, kUnknownOrigin1);
 
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, doubleclick);
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, unknown);
-
-  // Properly prepare the prio prefs
-  // (Sourced from PrioEncoder.cpp from when it was being prototyped)
-  const nsLiteralCString prioKeyA(
-      "35AC1C7576C7C6EDD7FED6BCFC337B34D48CB4EE45C86BEEFB40BD8875707733");
-  const nsLiteralCString prioKeyB(
-      "26E6674E65425B823F1F1D5F96E3BB3EF9E406EC7FBA7DEF8B08A35DD135AF50");
   Preferences::SetCString("prio.publicKeyA", prioKeyA);
   Preferences::SetCString("prio.publicKeyB", prioKeyB);
 
   nsTArray<Tuple<nsCString, nsCString>> firstStrings;
-  GetEncodedOriginStrings(aCx, telemetryTest1 + NS_LITERAL_CSTRING("-%u"),
-                          firstStrings);
+  GetEncodedOriginStrings(
+      aCx, kTelemetryTest1Metric + NS_LITERAL_CSTRING("-%u"), firstStrings);
 
   // Now snapshot a second time and ensure the encoded payloads change.
   nsTArray<Tuple<nsCString, nsCString>> secondStrings;
-  GetEncodedOriginStrings(aCx, telemetryTest1 + NS_LITERAL_CSTRING("-%u"),
-                          secondStrings);
+  GetEncodedOriginStrings(
+      aCx, kTelemetryTest1Metric + NS_LITERAL_CSTRING("-%u"), secondStrings);
 
   const auto sizeOfPrioDatasPerMetric =
       TelemetryOrigin::SizeOfPrioDatasPerMetric();
@@ -265,8 +266,6 @@ TEST_F(TelemetryTestFixture, OriginTelemetryNotifiesTopic) {
   Unused << mTelemetry->ClearOrigins();
 
   const char* kTopic = "origin-telemetry-storage-limit-reached";
-  NS_NAMED_LITERAL_CSTRING(doubleclick, "doubleclick.net");
-  NS_NAMED_LITERAL_CSTRING(fb, "fb.com");
 
   MockObserver* mo = new MockObserver();
   nsCOMPtr<nsIObserver> nsMo(mo);
@@ -280,9 +279,11 @@ TEST_F(TelemetryTestFixture, OriginTelemetryNotifiesTopic) {
   for (size_t i = 0; i < size; ++i) {
     if (i < size - 1) {
       // Let's ensure we only notify the once.
-      Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, fb);
+      Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1,
+                              kFacebookOrigin);
     }
-    Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, doubleclick);
+    Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1,
+                            kDoubleclickOrigin);
   }
 
   os->RemoveObserver(nsMo, kTopic);

From 2da1acaef86b04b7649d951534ccd13882520f63 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 20 May 2019 14:29:15 +0000
Subject: [PATCH 002/129] Bug 1509423 - Disable the gfxCoreText backend and use
 native HarfBuzz shaping for AAT fonts. r=jrmuizel

Differential Revision: https://phabricator.services.mozilla.com/D31094

--HG--
extra : moz-landing-system : lando
---
 gfx/thebes/gfxMacFont.cpp   | 4 +++-
 gfx/thebes/gfxPlatform.cpp  | 7 +++++++
 gfx/thebes/gfxPrefs.h       | 3 +++
 modules/libpref/init/all.js | 5 +++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/gfx/thebes/gfxMacFont.cpp b/gfx/thebes/gfxMacFont.cpp
index 61eeaebe4812..60b869af14c3 100644
--- a/gfx/thebes/gfxMacFont.cpp
+++ b/gfx/thebes/gfxMacFont.cpp
@@ -16,6 +16,7 @@
 #include "gfxFontUtils.h"
 #include "gfxMacPlatformFontList.h"
 #include "gfxFontConstants.h"
+#include "gfxPrefs.h"
 #include "gfxTextRun.h"
 #include "nsCocoaFeatures.h"
 
@@ -199,7 +200,8 @@ bool gfxMacFont::ShapeText(DrawTarget* aDrawTarget, const char16_t* aText,
   // Currently, we don't support vertical shaping via CoreText,
   // so we ignore RequiresAATLayout if vertical is requested.
   auto macFontEntry = static_cast<MacOSFontEntry*>(GetFontEntry());
-  if (macFontEntry->RequiresAATLayout() && !aVertical) {
+  if (macFontEntry->RequiresAATLayout() && !aVertical &&
+      gfxPrefs::CoreTextEnabled()) {
     if (!mCoreTextShaper) {
       mCoreTextShaper = MakeUnique<gfxCoreTextShaper>(this);
     }
diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
index 5220245cc936..02e53089d917 100644
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -409,6 +409,9 @@ NS_IMPL_ISUPPORTS(SRGBOverrideObserver, nsIObserver, nsISupportsWeakReference)
 #define GFX_PREF_WORD_CACHE_MAXENTRIES "gfx.font_rendering.wordcache.maxentries"
 
 #define GFX_PREF_GRAPHITE_SHAPING "gfx.font_rendering.graphite.enabled"
+#if defined(XP_MACOSX)
+#define GFX_PREF_CORETEXT_SHAPING "gfx.font_rendering.coretext.enabled"
+#endif
 
 #define BIDI_NUMERAL_PREF "bidi.numeral"
 
@@ -2216,6 +2219,10 @@ void gfxPlatform::FontsPrefsChanged(const char* aPref) {
   } else if (!strcmp(GFX_PREF_GRAPHITE_SHAPING, aPref)) {
     mGraphiteShapingEnabled = UNINITIALIZED_VALUE;
     FlushFontAndWordCaches();
+#if defined(XP_MACOSX)
+  } else if (!strcmp(GFX_PREF_CORETEXT_SHAPING, aPref)) {
+    FlushFontAndWordCaches();
+#endif
   } else if (!strcmp(BIDI_NUMERAL_PREF, aPref)) {
     mBidiNumeralOption = UNINITIALIZED_VALUE;
   } else if (!strcmp(GFX_PREF_OPENTYPE_SVG, aPref)) {
diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h
index a31b1f070503..9eae349a199b 100644
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@@ -498,6 +498,9 @@ class gfxPrefs final {
   DECL_GFX_PREF(Live, "gfx.draw-color-bars",                   CompositorDrawColorBars, bool, false);
   DECL_GFX_PREF(Once, "gfx.e10s.hide-plugins-for-scroll",      HidePluginsForScroll, bool, true);
   DECL_GFX_PREF(Once, "gfx.e10s.font-list.shared",             SharedFontList, bool, false);
+#if defined(XP_MACOSX)
+  DECL_GFX_PREF(Live, "gfx.font_rendering.coretext.enabled",   CoreTextEnabled, bool, false);
+#endif
   DECL_GFX_PREF(Live, "gfx.layerscope.enabled",                LayerScopeEnabled, bool, false);
   DECL_GFX_PREF(Live, "gfx.layerscope.port",                   LayerScopePort, int32_t, 23456);
   // Note that        "gfx.logging.level" is defined in Logging.h.
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 7e7b06bb80d2..09db78d7f808 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -853,6 +853,11 @@ pref("gfx.font_rendering.wordcache.maxentries", 10000);
 
 pref("gfx.font_rendering.graphite.enabled", true);
 
+#ifdef XP_MACOSX
+// Set to true to revert from HarfBuzz AAT shaping to the old Core Text backend
+pref("gfx.font_rendering.coretext.enabled", false);
+#endif
+
 #ifdef XP_WIN
 pref("gfx.font_rendering.directwrite.use_gdi_table_loading", true);
 #endif

From 35bcd113af647633e7deb31f99624280e6ce4bfa Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 20 May 2019 14:29:35 +0000
Subject: [PATCH 003/129] Bug 1509423 - Test/manifest updates to account for
 minor rendering differences between HarfBuzz and Core Text. r=jrmuizel

Differential Revision: https://phabricator.services.mozilla.com/D31095

--HG--
extra : moz-landing-system : lando
---
 layout/generic/test/test_selection_expanding.html         | 2 +-
 layout/reftests/bugs/reftest.list                         | 4 ++--
 layout/reftests/line-breaking/reftest.list                | 2 +-
 layout/reftests/mathml/reftest.list                       | 4 ++--
 layout/reftests/svg/reftest.list                          | 2 +-
 layout/reftests/svg/svg-integration/reftest.list          | 2 +-
 layout/reftests/svg/text/reftest.list                     | 8 ++++----
 layout/reftests/text-stroke/reftest.list                  | 6 +++---
 .../web-platform/meta/css/CSS2/bidi-text/bidi-001.xht.ini | 3 +++
 .../web-platform/meta/css/CSS2/bidi-text/bidi-002.xht.ini | 3 +++
 .../meta/css/CSS2/css1/c43-rpl-ibx-000.xht.ini            | 1 -
 .../css/CSS2/floats-clear/clear-applies-to-008.xht.ini    | 3 ---
 ...tain-paint-independent-formatting-context-002.html.ini | 3 ---
 .../css/css-display/display-contents-details.html.ini     | 4 ----
 .../css/css-display/display-contents-fieldset.html.ini    | 3 ---
 .../multi-line-wrap-reverse-column-reverse.html.ini       | 5 -----
 .../multi-line-wrap-with-column-reverse.html.ini          | 4 ----
 .../css/css-text-decor/text-emphasis-style-006.html.ini   | 2 ++
 .../css-text/word-break/word-break-break-all-004.html.ini | 3 ---
 .../tests/css/css-display/display-contents-details.html   | 1 +
 20 files changed, 24 insertions(+), 41 deletions(-)
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/clear-applies-to-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-contain/contain-paint-independent-formatting-context-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-display/display-contents-details.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-display/display-contents-fieldset.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/word-break/word-break-break-all-004.html.ini

diff --git a/layout/generic/test/test_selection_expanding.html b/layout/generic/test/test_selection_expanding.html
index b9d187ad7910..e6e5eb3b5420 100644
--- a/layout/generic/test/test_selection_expanding.html
+++ b/layout/generic/test/test_selection_expanding.html
@@ -346,7 +346,7 @@ function test()
 
   // ***********************************************************
   // selection starting at iframe
-  synthesizeMouse(iframe, 30, 5, { type: "mousedown" });
+  synthesizeMouse(iframe, 20, 5, { type: "mousedown" });
 
   // inside iframe
   synthesizeMouse(iframe, 50, 5, { type: "mousemove" });
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index bcd65bcc9258..10b3f6676341 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1328,7 +1328,7 @@ fails-if(Android) == 481024-1c.html 481024-1-ref.html
 == 481024-1e.html 481024-1-ref.html
 != 481948-1.html 481948-1-ref.html
 != 481948-2.html 481948-2-ref.html
-fails-if(Android||gtkWidget) random-if(winWidget) == 481948-3.html 481948-3-ref.html # questionable test, see bug 488364
+fails-if(Android||gtkWidget) random-if(winWidget||cocoaWidget) == 481948-3.html 481948-3-ref.html # questionable test, see bug 488364
 == 482398-1.html 482398-1-ref.html
 random-if(d2d) == 482592-1a.xhtml 482592-1-ref.html # bug 586771
 random-if(d2d) == 482592-1b.xhtml 482592-1-ref.html # bug 586771
@@ -1425,7 +1425,7 @@ fuzzy-if(Android,0-5,0-1656) fuzzy-if(skiaContent,0-1,0-1200) == 512410.html 512
 == 512631-1.html 512631-1-ref.html
 == 513153-1a.html 513153-1-ref.html
 == 513153-1b.html 513153-1-ref.html
-fuzzy-if(webrender&&winWidget,82-82,76-76) == 513153-2a.html 513153-2-ref.html
+fuzzy-if(webrender&&winWidget,82-82,76-76) fuzzy-if(webrender&&cocoaWidget,0-34,0-103) == 513153-2a.html 513153-2-ref.html
 fuzzy-if(webrender&&cocoaWidget,34-34,103-103) == 513153-2b.html 513153-2-ref.html
 == 513318-1.xul 513318-1-ref.xul
 fails-if(Android&&(!asyncPan)) != 513318-2.xul 513318-2-ref.xul
diff --git a/layout/reftests/line-breaking/reftest.list b/layout/reftests/line-breaking/reftest.list
index a59f7bda1785..689122608966 100644
--- a/layout/reftests/line-breaking/reftest.list
+++ b/layout/reftests/line-breaking/reftest.list
@@ -33,7 +33,7 @@ skip-if(gtkWidget) == quotationmarks-cjk-1.html quotationmarks-cjk-1-ref.html
 == smileys-1.html smileys-1-ref.html
 == smileys-2.html smileys-2-ref.html
 == space-cluster-1.html space-cluster-1-ref.html
-== space-cluster-2.html space-cluster-2-ref.html
+random-if(cocoaWidget) == space-cluster-2.html space-cluster-2-ref.html # harfbuzz vs coretext, different positioning of stray diacritics
 == surrogates-1.html surrogates-1-ref.html
 == surrogates-2.html surrogates-2-ref.html
 == surrogates-3.html surrogates-3-ref.html
diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftest.list
index 0774f3c33afc..532a7cee3c6e 100644
--- a/layout/reftests/mathml/reftest.list
+++ b/layout/reftests/mathml/reftest.list
@@ -3,8 +3,8 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == dir-2.html dir-2-ref.htm
 random-if(gtkWidget) == dir-3.html dir-3-ref.html # bug 1309426
 == dir-4.html dir-4-ref.html
 == dir-5.html dir-5-ref.html
-== dir-6.html dir-6-ref.html
-== dir-6a.html dir-6a-ref.html
+fuzzy-if(cocoaWidget,0-135,0-56) == dir-6.html dir-6-ref.html
+fuzzy-if(cocoaWidget,0-135,0-56) == dir-6a.html dir-6a-ref.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == dir-7.html dir-7-ref.html # Bug 1392106
 fails == dir-8.html dir-8-ref.html
 fails == dir-9.html dir-9-ref.html # Bug 787215
diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index d76646bfe9aa..c6141ea6c2fa 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -211,7 +211,7 @@ skip pref(security.fileuri.strict_origin_policy,true) == filter-extref-different
 == filter-foreignObject-01.svg pass.svg
 == filter-in-mask-01.svg pass.svg
 == filter-invalidation-01.svg pass.svg
-fuzzy(0-71,0-817) fails-if(winWidget) fuzzy-if(webrender&&cocoaWidget,67-67,887-887) == filter-on-continuation-box-01.html filter-on-continuation-box-ref.html
+fuzzy(0-71,0-821) fails-if(winWidget) fuzzy-if(webrender&&cocoaWidget,67-67,887-892) == filter-on-continuation-box-01.html filter-on-continuation-box-ref.html
 == filter-result-01.svg filter-result-01-ref.svg
 == filter-scaled-01.svg pass.svg
 fuzzy-if(skiaContent,0-1,0-500) == filter-scaled-02.html filter-scaled-02-ref.html
diff --git a/layout/reftests/svg/svg-integration/reftest.list b/layout/reftests/svg/svg-integration/reftest.list
index 167f62f8381d..b539f65dc128 100644
--- a/layout/reftests/svg/svg-integration/reftest.list
+++ b/layout/reftests/svg/svg-integration/reftest.list
@@ -48,5 +48,5 @@ fuzzy(0-1,0-5000) == mask-clipPath-opacity-01e.xhtml mask-clipPath-opacity-01-re
 
 # box-decoration-break tests
 fuzzy-if(Android,0-4,0-10) fuzzy-if(webrender&&cocoaWidget,9-9,3-3) == box-decoration-break-01.xhtml box-decoration-break-01-ref.xhtml
-fuzzy(0-62,0-14) == box-decoration-break-02.xhtml box-decoration-break-02-ref.xhtml
+fuzzy(0-119,0-16) == box-decoration-break-02.xhtml box-decoration-break-02-ref.xhtml
 fuzzy(0-67,0-238) == box-decoration-break-03.xhtml box-decoration-break-01-ref.xhtml
diff --git a/layout/reftests/svg/text/reftest.list b/layout/reftests/svg/text/reftest.list
index eafb50a847c9..94e6f98c6396 100644
--- a/layout/reftests/svg/text/reftest.list
+++ b/layout/reftests/svg/text/reftest.list
@@ -4,8 +4,8 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&!gtkWid
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == simple-underline-scaled.svg simple-underline-scaled-ref.svg # Bug 1392106
 fuzzy-if(webrender&&!gtkWidget,119-166,255-318) == simple-anchor-end-bidi.svg simple-anchor-end-bidi-ref.html
 fuzzy-if(webrender&&!gtkWidget,117-138,182-204) == simple-anchor-end-rtl.svg simple-anchor-end-rtl-ref.html
-fuzzy-if(webrender&&!gtkWidget,122-137,220-250) == simple-anchor-end.svg simple-anchor-end-ref.html
-fuzzy-if(skiaContent&&dwrite,0-104,0-131) fuzzy-if(webrender&&!gtkWidget,125-200,259-319) == simple-anchor-middle-bidi.svg simple-anchor-middle-bidi-ref.html
+fuzzy-if(webrender&&!gtkWidget,119-137,220-250) == simple-anchor-end.svg simple-anchor-end-ref.html
+fuzzy-if(skiaContent&&dwrite,0-104,0-131) fuzzy-if(cocoaWidget,0-143,0-124) fuzzy-if(webrender&&!gtkWidget,125-200,259-319) == simple-anchor-middle-bidi.svg simple-anchor-middle-bidi-ref.html
 fuzzy-if(webrender&&!gtkWidget,132-138,188-207) == simple-anchor-middle-rtl.svg simple-anchor-middle-rtl-ref.html
 fuzzy-if(skiaContent,0-111,0-81) fuzzy-if(webrender&&!gtkWidget,122-181,221-257) == simple-anchor-middle.svg simple-anchor-middle-ref.html
 fuzzy-if(webrender&&!gtkWidget,132-138,261-319) == simple-bidi.svg simple-bidi-ref.html
@@ -196,10 +196,10 @@ needs-focus == deselectAll.svg deselectAll-ref.svg
 fuzzy-if(skiaContent,0-1,0-250) needs-focus == selectSubString.svg selectSubString-ref.svg
 fuzzy-if(skiaContent,0-1,0-600) needs-focus == selectSubString-2.svg selectSubString-2-ref.svg
 fuzzy-if(skiaContent,0-1,0-250) needs-focus == selectSubString-3.svg selectSubString-3-ref.svg
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender,1-1,237-237) needs-focus fuzzy-if(webrender&&!gtkWidget,127-148,221-254) == simple-selection.svg simple-selection-ref.html # Bug 1392106
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender,1-1,237-237) needs-focus fuzzy-if(webrender&&!gtkWidget,125-148,221-254) == simple-selection.svg simple-selection-ref.html # Bug 1392106
 fuzzy-if(skiaContent,0-1,0-100) fuzzy-if(webrender,1-1,575-575) needs-focus fuzzy-if(webrender&&!gtkWidget,134-148,261-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html
 fuzzy-if(skiaContent,0-1,0-50) fuzzy-if(webrender,1-1,237-237) needs-focus fuzzy-if(webrender&&!gtkWidget,127-148,221-254) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html
-fuzzy-if(skiaContent,0-1,0-150) fuzzy-if(webrender,1-1,222-222) needs-focus fuzzy-if(webrender&&!gtkWidget,127-148,221-254) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == simple-underline-selection.svg simple-underline-selection-ref.html # Bug 1392106
+fuzzy-if(skiaContent,0-1,0-150) fuzzy-if(webrender,1-1,222-222) needs-focus fuzzy-if(webrender&&!gtkWidget,125-148,221-254) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == simple-underline-selection.svg simple-underline-selection-ref.html # Bug 1392106
 fuzzy-if(skiaContent,0-1,0-300) fuzzy-if(webrender,1-1,934-934) needs-focus fuzzy-if(webrender&&!gtkWidget,134-152,432-501) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == multiple-text-selection.svg multiple-text-selection-ref.html # Bug 1392106
 needs-focus == multiple-chunks-selection.svg multiple-chunks-selection-ref.svg
 fuzzy-if(skiaContent,0-1,0-200) needs-focus == textpath-selection.svg textpath-selection-ref.svg
diff --git a/layout/reftests/text-stroke/reftest.list b/layout/reftests/text-stroke/reftest.list
index 52407d35fdb3..e4eba563319b 100644
--- a/layout/reftests/text-stroke/reftest.list
+++ b/layout/reftests/text-stroke/reftest.list
@@ -3,9 +3,9 @@
 default-preferences pref(layout.css.prefixes.webkit,true)
 
 # These fail on Linux without webrender due to lack of antialiasing of the HTML text stroke
-fuzzy(0-64,0-44) fails-if(gtkWidget&&!webrender) == webkit-text-stroke-property-001.html webkit-text-stroke-property-001-ref.html
+fuzzy(0-64,0-46) fails-if(gtkWidget&&!webrender) == webkit-text-stroke-property-001.html webkit-text-stroke-property-001-ref.html
 fuzzy(0-4,0-24) fails-if(gtkWidget&&!webrender) == webkit-text-stroke-property-002.html webkit-text-stroke-property-002-ref.html
-fuzzy(0-48,0-26) fails-if(gtkWidget&&!webrender) == webkit-text-stroke-property-003.html webkit-text-stroke-property-003-ref.html
+fuzzy(0-48,0-28) fails-if(gtkWidget&&!webrender) == webkit-text-stroke-property-003.html webkit-text-stroke-property-003-ref.html
 fuzzy(0-64,0-33) fails-if(gtkWidget&&!webrender) == webkit-text-stroke-property-004.html webkit-text-stroke-property-004-ref.html
-fuzzy(0-64,0-44) fails-if(gtkWidget&&!webrender) == webkit-text-stroke-property-005.html webkit-text-stroke-property-005-ref.html
+fuzzy(0-64,0-46) fails-if(gtkWidget&&!webrender) == webkit-text-stroke-property-005.html webkit-text-stroke-property-005-ref.html
 fuzzy(0-71,0-10) fails-if(gtkWidget&&!webrender) == webkit-text-stroke-property-006.html webkit-text-stroke-property-006-ref.html
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-001.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-001.xht.ini
new file mode 100644
index 000000000000..f5aab79f77ea
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-001.xht.ini
@@ -0,0 +1,3 @@
+[bidi-001.xht]
+  fuzzy:
+    if os == "mac": maxDifference=3;totalPixels=0-1
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-002.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-002.xht.ini
new file mode 100644
index 000000000000..a606245391fd
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-002.xht.ini
@@ -0,0 +1,3 @@
+[bidi-002.xht]
+  fuzzy:
+    if os == "mac": maxDifference=1;totalPixels=0-1
diff --git a/testing/web-platform/meta/css/CSS2/css1/c43-rpl-ibx-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c43-rpl-ibx-000.xht.ini
index 35dec9c4d2bf..cf2293fca384 100644
--- a/testing/web-platform/meta/css/CSS2/css1/c43-rpl-ibx-000.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c43-rpl-ibx-000.xht.ini
@@ -1,5 +1,4 @@
 [c43-rpl-ibx-000.xht]
   expected:
-    if os == "mac": FAIL
     if (os == "android") and not e10s: FAIL
     if (os == "android") and e10s: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/clear-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/clear-applies-to-008.xht.ini
deleted file mode 100644
index 2e006a9b0d04..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/clear-applies-to-008.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clear-applies-to-008.xht]
-  expected:
-    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-paint-independent-formatting-context-002.html.ini b/testing/web-platform/meta/css/css-contain/contain-paint-independent-formatting-context-002.html.ini
deleted file mode 100644
index 4cf4d64a1910..000000000000
--- a/testing/web-platform/meta/css/css-contain/contain-paint-independent-formatting-context-002.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[contain-paint-independent-formatting-context-002.html]
-  expected:
-    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-display/display-contents-details.html.ini b/testing/web-platform/meta/css/css-display/display-contents-details.html.ini
deleted file mode 100644
index bd1f88b4e7e2..000000000000
--- a/testing/web-platform/meta/css/css-display/display-contents-details.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[display-contents-details.html]
-  expected:
-    if (os == "mac"): PASS
-    FAIL
diff --git a/testing/web-platform/meta/css/css-display/display-contents-fieldset.html.ini b/testing/web-platform/meta/css/css-display/display-contents-fieldset.html.ini
deleted file mode 100644
index 1c0e7423700c..000000000000
--- a/testing/web-platform/meta/css/css-display/display-contents-fieldset.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[display-contents-fieldset.html]
-  expected:
-    if os == "mac": FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse.html.ini b/testing/web-platform/meta/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse.html.ini
deleted file mode 100644
index 3ba3d26c6671..000000000000
--- a/testing/web-platform/meta/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[multi-line-wrap-reverse-column-reverse.html]
-  expected:
-    if (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    if (os == "mac") and (version == "OS X 10.14") and (processor == "x86_64") and (bits == 64): FAIL
-  
\ No newline at end of file
diff --git a/testing/web-platform/meta/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse.html.ini b/testing/web-platform/meta/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse.html.ini
deleted file mode 100644
index d06595bf7178..000000000000
--- a/testing/web-platform/meta/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[multi-line-wrap-with-column-reverse.html]
-  expected:
-    if (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    if (os == "mac") and (version == "OS X 10.14") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text-decor/text-emphasis-style-006.html.ini b/testing/web-platform/meta/css/css-text-decor/text-emphasis-style-006.html.ini
index 793080fd905b..8f63b06b8583 100644
--- a/testing/web-platform/meta/css/css-text-decor/text-emphasis-style-006.html.ini
+++ b/testing/web-platform/meta/css/css-text-decor/text-emphasis-style-006.html.ini
@@ -1,3 +1,5 @@
 [text-emphasis-style-006.html]
   disabled:
     if (os == "android") and e10s: bug 1550895 (frequently fails on geckoview)
+  fuzzy:
+    if os == "mac": maxDifference=96;totalPixels=0-12
diff --git a/testing/web-platform/meta/css/css-text/word-break/word-break-break-all-004.html.ini b/testing/web-platform/meta/css/css-text/word-break/word-break-break-all-004.html.ini
deleted file mode 100644
index 7d42ee5ee3b9..000000000000
--- a/testing/web-platform/meta/css/css-text/word-break/word-break-break-all-004.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[word-break-break-all-004.html]
-  expected:
-    if (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/tests/css/css-display/display-contents-details.html b/testing/web-platform/tests/css/css-display/display-contents-details.html
index b6a6540f0139..0dcda91ab380 100644
--- a/testing/web-platform/tests/css/css-display/display-contents-details.html
+++ b/testing/web-platform/tests/css/css-display/display-contents-details.html
@@ -5,6 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-display/#unbox-html">
 <link rel="match" href="display-contents-pass-ref.html">
 <style>
+  html { font-kerning: none; font-feature-settings: "kern" off; }
   details, summary {
     all: initial;
     border: 10px solid red;

From 250aff00e7134b982ea256b7183977d623e7844e Mon Sep 17 00:00:00 2001
From: David Major <dmajor@mozilla.com>
Date: Tue, 7 May 2019 18:37:13 +0000
Subject: [PATCH 004/129] Bug 1523526 - Don't allow CFG on old releases of
 Windows for arm64 r=bobowen,aklotz

There's a bug in ole32.dll on arm64 versions of Windows prior to 1809, that crashes our content processes if we enable CFG. We've reported the issue, but even if it gets fixed, we can't assume users will have the update.

This patch uses process mitigation policy flags to disable CFG on arm64 before 1809. Based on testing, we only need to do this in the sandbox for child processes, and it's not strictly necessary for the launcher stub to set the flag on the main process. But I've included that anyway as a guard against some yet-undiscovered scenario that might hit the issue and make the browser unusable.

The effects of this patch won't be visible until we actually enable CFG in a subsequent landing.

Differential Revision: https://phabricator.services.mozilla.com/D29474

--HG--
extra : moz-landing-system : lando
---
 .../app/winlauncher/LauncherProcessWin.cpp    | 13 ++++++
 .../sandbox/chromium-shim/base/win/sdkdecls.h | 11 +++++
 .../aarch64_control_flow_guard.patch          | 44 +++++++++++++++++++
 .../patches/with_update/patch_order.txt       |  1 +
 .../sandbox/win/src/process_mitigations.cc    |  5 +++
 .../chromium/sandbox/win/src/security_level.h |  9 ++++
 .../win/src/sandboxbroker/sandboxBroker.cpp   |  7 +++
 7 files changed, 90 insertions(+)
 create mode 100644 security/sandbox/chromium-shim/patches/with_update/aarch64_control_flow_guard.patch

diff --git a/browser/app/winlauncher/LauncherProcessWin.cpp b/browser/app/winlauncher/LauncherProcessWin.cpp
index f11c83a9e63d..e872ba327d62 100644
--- a/browser/app/winlauncher/LauncherProcessWin.cpp
+++ b/browser/app/winlauncher/LauncherProcessWin.cpp
@@ -60,6 +60,11 @@ static mozilla::LauncherVoidResult PostCreationSetup(
     (0x00000001ULL << 60)
 #endif  // !defined(PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON)
 
+#if !defined(PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF)
+#  define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF \
+    (0x00000002ULL << 40)
+#endif  // !defined(PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF)
+
 #if (_WIN32_WINNT < 0x0602)
 BOOL WINAPI
 SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY aMitigationPolicy,
@@ -76,6 +81,14 @@ static void SetMitigationPolicies(mozilla::ProcThreadAttributes& aAttrs,
     aAttrs.AddMitigationPolicy(
         PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON);
   }
+
+#if defined(_M_ARM64)
+  // Disable CFG on older versions of ARM64 Windows to avoid a crash in COM.
+  if (!mozilla::IsWin10Sep2018UpdateOrLater()) {
+    aAttrs.AddMitigationPolicy(
+        PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF);
+  }
+#endif  // defined(_M_ARM64)
 }
 
 static mozilla::LauncherFlags ProcessCmdLine(int& aArgc, wchar_t* aArgv[]) {
diff --git a/security/sandbox/chromium-shim/base/win/sdkdecls.h b/security/sandbox/chromium-shim/base/win/sdkdecls.h
index 60561a4e4e21..c2bf6670cefc 100644
--- a/security/sandbox/chromium-shim/base/win/sdkdecls.h
+++ b/security/sandbox/chromium-shim/base/win/sdkdecls.h
@@ -210,6 +210,17 @@ typedef struct _PROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY {
 #define PROCESS_CREATION_MITIGATION_POLICY_PROHIBIT_DYNAMIC_CODE_ALWAYS_OFF               (0x00000002uLL << 36)
 #define PROCESS_CREATION_MITIGATION_POLICY_PROHIBIT_DYNAMIC_CODE_ALWAYS_ON_ALLOW_OPT_OUT  (0x00000003uLL << 36)
 
+//
+// Define Control Flow Guard (CFG) mitigation policy options.  Control Flow
+// Guard allows indirect control transfers to be checked at runtime.
+//
+
+#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_MASK                        (0x00000003uLL << 40)
+#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_DEFER                       (0x00000000uLL << 40)
+#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_ON                   (0x00000001uLL << 40)
+#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF                  (0x00000002uLL << 40)
+#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_EXPORT_SUPPRESSION          (0x00000003uLL << 40)
+
 //
 // Define module signature options.  When enabled, this option will
 // block mapping of non-microsoft binaries.
diff --git a/security/sandbox/chromium-shim/patches/with_update/aarch64_control_flow_guard.patch b/security/sandbox/chromium-shim/patches/with_update/aarch64_control_flow_guard.patch
new file mode 100644
index 000000000000..725cfa966d25
--- /dev/null
+++ b/security/sandbox/chromium-shim/patches/with_update/aarch64_control_flow_guard.patch
@@ -0,0 +1,44 @@
+Bug 1523526: Don't allow CFG on old releases of Windows for arm64
+
+There's a bug in ole32.dll on arm64 versions of Windows prior to 1809, that crashes our content processes if we enable CFG. We've reported the issue, but even if it gets fixed, we can't assume users will have the update.
+
+This patch uses process mitigation policy flags to disable CFG on arm64 before 1809. Based on testing, we only need to do this in the sandbox for child processes, and it's not strictly necessary for the launcher stub to set the flag on the main process. But I've included that anyway as a guard against some yet-undiscovered scenario that might hit the issue and make the browser unusable.
+
+The effects of this patch won't be visible until we actually enable CFG in a subsequent landing.
+
+Differential Revision: https://phabricator.services.mozilla.com/D29474
+
+diff --git a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
+--- a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
++++ b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
+@@ -354,6 +354,11 @@ void ConvertProcessMitigationsToPolicy(M
+         PROCESS_CREATION_MITIGATION_POLICY_PROHIBIT_DYNAMIC_CODE_ALWAYS_ON;
+   }
+ 
++  if (flags & MITIGATION_CONTROL_FLOW_GUARD_DISABLE) {
++    *policy_flags |=
++        PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF;
++  }
++
+   if (version < base::win::VERSION_WIN10)
+     return;
+ 
+diff --git a/security/sandbox/chromium/sandbox/win/src/security_level.h b/security/sandbox/chromium/sandbox/win/src/security_level.h
+--- a/security/sandbox/chromium/sandbox/win/src/security_level.h
++++ b/security/sandbox/chromium/sandbox/win/src/security_level.h
+@@ -255,6 +255,15 @@ const MitigationFlags MITIGATION_IMAGE_L
+ // PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON.
+ const MitigationFlags MITIGATION_IMAGE_LOAD_PREFER_SYS32 = 0x00100000;
+ 
++// Begin Mozilla-added flags.
++// Working down from the high bit to avoid conflict with new upstream flags.
++
++// Disable Control Flow Guard. This may seem more like an anti-mitigation, but
++// this flag allows code to make targeted changes to CFG to avoid bugs, while
++// leaving it enabled in the common case. Corresponds to
++// PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_ON.
++const MitigationFlags MITIGATION_CONTROL_FLOW_GUARD_DISABLE = 0x80000000;
++
+ }  // namespace sandbox
+ 
+ #endif  // SANDBOX_SRC_SECURITY_LEVEL_H_
diff --git a/security/sandbox/chromium-shim/patches/with_update/patch_order.txt b/security/sandbox/chromium-shim/patches/with_update/patch_order.txt
index e6e5c901ac4b..527101105473 100755
--- a/security/sandbox/chromium-shim/patches/with_update/patch_order.txt
+++ b/security/sandbox/chromium-shim/patches/with_update/patch_order.txt
@@ -21,3 +21,4 @@ mingw_disable_one_try.patch
 mingw_noexports_casts.patch
 mingw_offsetof.patch
 add_aarch64_windows_support.patch
+aarch64_control_flow_guard.patch
diff --git a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
index 3084284fe49c..8b76b93b5956 100644
--- a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
+++ b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
@@ -354,6 +354,11 @@ void ConvertProcessMitigationsToPolicy(MitigationFlags flags,
         PROCESS_CREATION_MITIGATION_POLICY_PROHIBIT_DYNAMIC_CODE_ALWAYS_ON;
   }
 
+  if (flags & MITIGATION_CONTROL_FLOW_GUARD_DISABLE) {
+    *policy_flags |=
+        PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF;
+  }
+
   if (version < base::win::VERSION_WIN10)
     return;
 
diff --git a/security/sandbox/chromium/sandbox/win/src/security_level.h b/security/sandbox/chromium/sandbox/win/src/security_level.h
index d01609bfd7fa..139212433a57 100644
--- a/security/sandbox/chromium/sandbox/win/src/security_level.h
+++ b/security/sandbox/chromium/sandbox/win/src/security_level.h
@@ -255,6 +255,15 @@ const MitigationFlags MITIGATION_IMAGE_LOAD_NO_LOW_LABEL = 0x00080000;
 // PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON.
 const MitigationFlags MITIGATION_IMAGE_LOAD_PREFER_SYS32 = 0x00100000;
 
+// Begin Mozilla-added flags.
+// Working down from the high bit to avoid conflict with new upstream flags.
+
+// Disable Control Flow Guard. This may seem more like an anti-mitigation, but
+// this flag allows code to make targeted changes to CFG to avoid bugs, while
+// leaving it enabled in the common case. Corresponds to
+// PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_ON.
+const MitigationFlags MITIGATION_CONTROL_FLOW_GUARD_DISABLE = 0x80000000;
+
 }  // namespace sandbox
 
 #endif  // SANDBOX_SRC_SECURITY_LEVEL_H_
diff --git a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
index 1b137f0abb90..329d63858863 100644
--- a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
+++ b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
@@ -508,6 +508,13 @@ void SandboxBroker::SetSecurityLevelForContentProcess(int32_t aSandboxLevel,
       sandbox::MITIGATION_DEP | sandbox::MITIGATION_EXTENSION_POINT_DISABLE |
       sandbox::MITIGATION_IMAGE_LOAD_PREFER_SYS32;
 
+#if defined(_M_ARM64)
+  // Disable CFG on older versions of ARM64 Windows to avoid a crash in COM.
+  if (!IsWin10Sep2018UpdateOrLater()) {
+    mitigations |= sandbox::MITIGATION_CONTROL_FLOW_GUARD_DISABLE;
+  }
+#endif
+
   if (aSandboxLevel > 4) {
     result = mPolicy->SetAlternateDesktop(false);
     if (NS_WARN_IF(result != sandbox::SBOX_ALL_OK)) {

From f0dc4b3dbe19eb47203ba230f96653319ab3e30a Mon Sep 17 00:00:00 2001
From: David Major <dmajor@mozilla.com>
Date: Mon, 13 May 2019 18:38:23 +0000
Subject: [PATCH 005/129] Bug 1526443 - Pick up LLVM fix for CFG on
 arm64-windows builds r=froydnj

Cherry-picks https://bugs.llvm.org/show_bug.cgi?id=39799 and enables CFG on aarch64-windows automation. It's keyed on an explicit --enable-hardening to avoid breaking the local builds of developers who haven't yet picked up the compiler patch.

Differential Revision: https://phabricator.services.mozilla.com/D28236

--HG--
extra : moz-landing-system : lando
---
 .../mozconfigs/win64-aarch64/common-win64     |   4 +
 build/build-clang/clang-win64.json            |   1 +
 build/build-clang/r355141-arm64-cfg.patch     | 112 ++++++++++++++++++
 build/moz.configure/toolchain.configure       |   5 +-
 4 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 build/build-clang/r355141-arm64-cfg.patch

diff --git a/browser/config/mozconfigs/win64-aarch64/common-win64 b/browser/config/mozconfigs/win64-aarch64/common-win64
index 191bb407fcea..b1bdc5a756a6 100644
--- a/browser/config/mozconfigs/win64-aarch64/common-win64
+++ b/browser/config/mozconfigs/win64-aarch64/common-win64
@@ -1,3 +1,7 @@
 # This file is used by all AArch64 Win64 builds
 
 ac_add_options --target=aarch64-windows-mingw32
+
+# Temporary signal to toolchain.configure that our compiler is patched to
+# support CFG, until such support can be assumed.
+ac_add_options --enable-hardening
diff --git a/build/build-clang/clang-win64.json b/build/build-clang/clang-win64.json
index 686b64ddf1e9..82ac64971d51 100644
--- a/build/build-clang/clang-win64.json
+++ b/build/build-clang/clang-win64.json
@@ -17,6 +17,7 @@
       "workaround-issue38586.patch",
       "unpoison-thread-stacks.patch",
       "downgrade-mangling-error.patch",
+      "r355141-arm64-cfg.patch",
       "loosen-msvc-detection.patch",
       "revert-r355311.patch"
     ]
diff --git a/build/build-clang/r355141-arm64-cfg.patch b/build/build-clang/r355141-arm64-cfg.patch
new file mode 100644
index 000000000000..50db8992d048
--- /dev/null
+++ b/build/build-clang/r355141-arm64-cfg.patch
@@ -0,0 +1,112 @@
+[COFF] Add address-taken import thunks to the fid table
+
+https://bugs.llvm.org/show_bug.cgi?id=39799
+https://reviews.llvm.org/D58739
+
+--- a/lld/COFF/Writer.cpp
++++ b/lld/COFF/Writer.cpp
+@@ -1390,19 +1390,47 @@
+ // symbol in an executable section.
+ static void maybeAddAddressTakenFunction(SymbolRVASet &AddressTakenSyms,
+                                          Symbol *S) {
+-  auto *D = dyn_cast_or_null<DefinedCOFF>(S);
+-
+-  // Ignore undefined symbols and references to non-functions (e.g. globals and
+-  // labels).
+-  if (!D ||
+-      D->getCOFFSymbol().getComplexType() != COFF::IMAGE_SYM_DTYPE_FUNCTION)
++  if (!S)
+     return;
+ 
+-  // Mark the symbol as address taken if it's in an executable section.
+-  Chunk *RefChunk = D->getChunk();
+-  OutputSection *OS = RefChunk ? RefChunk->getOutputSection() : nullptr;
+-  if (OS && OS->Header.Characteristics & IMAGE_SCN_MEM_EXECUTE)
+-    addSymbolToRVASet(AddressTakenSyms, D);
++  switch (S->kind()) {
++  case Symbol::DefinedLocalImportKind:
++  case Symbol::DefinedImportDataKind:
++    // Defines an __imp_ pointer, so it is data, so it is ignored.
++    break;
++  case Symbol::DefinedCommonKind:
++    // Common is always data, so it is ignored.
++    break;
++  case Symbol::DefinedAbsoluteKind:
++  case Symbol::DefinedSyntheticKind:
++    // Absolute is never code, synthetic generally isn't and usually isn't
++    // determinable.
++    break;
++  case Symbol::LazyKind:
++  case Symbol::UndefinedKind:
++    // Undefined symbols resolve to zero, so they don't have an RVA. Lazy
++    // symbols shouldn't have relocations.
++    break;
++
++  case Symbol::DefinedImportThunkKind:
++    // Thunks are always code, include them.
++    addSymbolToRVASet(AddressTakenSyms, cast<Defined>(S));
++    break;
++
++  case Symbol::DefinedRegularKind: {
++    // This is a regular, defined, symbol from a COFF file. Mark the symbol as
++    // address taken if the symbol type is function and it's in an executable
++    // section.
++    auto *D = cast<DefinedRegular>(S);
++    if (D->getCOFFSymbol().getComplexType() == COFF::IMAGE_SYM_DTYPE_FUNCTION) {
++      Chunk *RefChunk = D->getChunk();
++      OutputSection *OS = RefChunk ? RefChunk->getOutputSection() : nullptr;
++      if (OS && OS->Header.Characteristics & IMAGE_SCN_MEM_EXECUTE)
++        addSymbolToRVASet(AddressTakenSyms, D);
++    }
++    break;
++  }
++  }
+ }
+ 
+ // Visit all relocations from all section contributions of this object file and
+--- a/lld/test/COFF/guardcf-thunk.s
++++ b/lld/test/COFF/guardcf-thunk.s
+@@ -0,0 +1,43 @@
++# REQUIRES: x86
++
++# Make a DLL that exports exportfn1.
++# RUN: yaml2obj < %p/Inputs/export.yaml > %t.obj
++# RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1 /implib:%t.lib
++
++# Make an obj that takes the address of that exported function.
++# RUN: llvm-mc -filetype=obj -triple=x86_64-windows-msvc %s -o %t2.obj
++# RUN: lld-link -entry:main -guard:cf %t2.obj %t.lib -nodefaultlib -out:%t.exe
++# RUN: llvm-readobj -coff-load-config %t.exe | FileCheck %s
++
++# Check that the gfids table contains *exactly* two entries, one for exportfn1
++# and one for main.
++# CHECK: GuardFidTable [
++# CHECK-NEXT: 0x{{[0-9A-Fa-f]+0$}}
++# CHECK-NEXT: 0x{{[0-9A-Fa-f]+0$}}
++# CHECK-NEXT: ]
++
++
++        .def     @feat.00;
++        .scl    3;
++        .type   0;
++        .endef
++        .globl  @feat.00
++@feat.00 = 0x001
++
++        .section .text,"rx"
++        .def     main; .scl    2; .type   32; .endef
++        .global main
++main:
++        leaq exportfn1(%rip), %rax
++        retq
++
++        .section .rdata,"dr"
++.globl _load_config_used
++_load_config_used:
++        .long 256
++        .fill 124, 1, 0
++        .quad __guard_fids_table
++        .quad __guard_fids_count
++        .long __guard_flags
++        .fill 128, 1, 0
++
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index 611d5d52fe8c..6d8d548491ac 100755
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1666,9 +1666,10 @@ def security_hardening_cflags(hardening_flag, asan, optimize, c_compiler, target
             js_ldflags.append("-Wl,--dynamicbase")
 
         # Control Flow Guard (CFG) ----------------------------
-        # See Bug 1525588 for why this doesn't work on Windows ARM
+        # On aarch64, this is enabled only with explicit --enable-hardening
+        # (roughly: automation) due to a dependency on a patched clang-cl.
         if c_compiler.type == 'clang-cl' and c_compiler.version >= '8' and \
-           target.cpu != 'aarch64':
+           (target.cpu != 'aarch64' or hardening_flag):
             flags.append("-guard:cf")
             js_flags.append("-guard:cf")
             # nolongjmp is needed because clang doesn't emit the CFG tables of

From e82acf45036c72b3ba6a83f005203668a50673f0 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 20 May 2019 14:32:00 +0000
Subject: [PATCH 006/129] Bug 1359240 - When loading an SVG glyph, check if the
 SVG document is gz-compressed, and decompress before attempting to parse.
 r=jrmuizel

Differential Revision: https://phabricator.services.mozilla.com/D31107

--HG--
extra : moz-landing-system : lando
---
 gfx/thebes/gfxSVGGlyphs.cpp | 40 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/gfx/thebes/gfxSVGGlyphs.cpp b/gfx/thebes/gfxSVGGlyphs.cpp
index d2d1c3e14914..7bfa4beda1b0 100644
--- a/gfx/thebes/gfxSVGGlyphs.cpp
+++ b/gfx/thebes/gfxSVGGlyphs.cpp
@@ -32,6 +32,7 @@
 #include "gfxFont.h"
 #include "gfxContext.h"
 #include "harfbuzz/hb.h"
+#include "zlib.h"
 
 #define SVG_CONTENT_TYPE NS_LITERAL_CSTRING("image/svg+xml")
 #define UTF8_CHARSET NS_LITERAL_CSTRING("utf-8")
@@ -257,7 +258,44 @@ gfxSVGGlyphsDocument::gfxSVGGlyphsDocument(const uint8_t* aBuffer,
                                            uint32_t aBufLen,
                                            gfxSVGGlyphs* aSVGGlyphs)
     : mOwner(aSVGGlyphs) {
-  ParseDocument(aBuffer, aBufLen);
+  if (aBufLen >= 14 && aBuffer[0] == 31 && aBuffer[1] == 139) {
+    // It's a gzip-compressed document; decompress it before parsing.
+    // The original length (modulo 2^32) is found in the last 4 bytes
+    // of the data, stored in little-endian format. We read it as
+    // individual bytes to avoid possible alignment issues.
+    // (Note that if the original length was >2^32, then origLen here
+    // will be incorrect; but then the inflate() call will not return
+    // Z_STREAM_END and we'll bail out safely.)
+    size_t origLen = (size_t(aBuffer[aBufLen - 1]) << 24) +
+                     (size_t(aBuffer[aBufLen - 2]) << 16) +
+                     (size_t(aBuffer[aBufLen - 3]) << 8) +
+                     size_t(aBuffer[aBufLen - 4]);
+    AutoTArray<uint8_t, 4096> outBuf;
+    if (outBuf.SetLength(origLen, mozilla::fallible)) {
+      z_stream s = {0};
+      s.next_in = const_cast<Byte*>(aBuffer);
+      s.avail_in = aBufLen;
+      s.next_out = outBuf.Elements();
+      s.avail_out = outBuf.Length();
+      // The magic number 16 here is the zlib flag to expect gzip format,
+      // see http://www.zlib.net/manual.html#Advanced
+      if (Z_OK == inflateInit2(&s, 16 + MAX_WBITS)) {
+        int result = inflate(&s, Z_FINISH);
+        if (Z_STREAM_END == result) {
+          MOZ_ASSERT(size_t(s.next_out - outBuf.Elements()) == origLen);
+          ParseDocument(outBuf.Elements(), outBuf.Length());
+        } else {
+          NS_WARNING("Failed to decompress SVG glyphs document");
+        }
+        inflateEnd(&s);
+      }
+    } else {
+      NS_WARNING("Failed to allocate memory for SVG glyphs document");
+    }
+  } else {
+    ParseDocument(aBuffer, aBufLen);
+  }
+
   if (!mDocument) {
     NS_WARNING("Could not parse SVG glyphs document");
     return;

From 0ac415c764ae14c7a465f985b541a8ece4a46905 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 20 May 2019 12:25:07 +0000
Subject: [PATCH 007/129] Bug 1359240 - Reftest for SVG-in-OT font using
 gzip-compressed SVG glyph documents. r=jrmuizel

Depends on D31107

Differential Revision: https://phabricator.services.mozilla.com/D31108

--HG--
extra : moz-landing-system : lando
---
 layout/reftests/text-svgglyphs/reftest.list         |  1 +
 layout/reftests/text-svgglyphs/resources/svg-gz.ttf |  0
 .../text-svgglyphs/svg-glyph-compressed-ref.html    | 13 +++++++++++++
 .../text-svgglyphs/svg-glyph-compressed.html        | 13 +++++++++++++
 4 files changed, 27 insertions(+)
 create mode 100644 layout/reftests/text-svgglyphs/resources/svg-gz.ttf
 create mode 100644 layout/reftests/text-svgglyphs/svg-glyph-compressed-ref.html
 create mode 100644 layout/reftests/text-svgglyphs/svg-glyph-compressed.html

diff --git a/layout/reftests/text-svgglyphs/reftest.list b/layout/reftests/text-svgglyphs/reftest.list
index 97a1d07b4a87..f19e137f7657 100644
--- a/layout/reftests/text-svgglyphs/reftest.list
+++ b/layout/reftests/text-svgglyphs/reftest.list
@@ -21,3 +21,4 @@ pref(gfx.font_rendering.opentype_svg.enabled,true)    fuzzy-if(skiaContent,0-15,
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-paint-server.svg svg-glyph-paint-server-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-transform.svg svg-glyph-transform-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-extents.html svg-glyph-extents-ref.html
+pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-compressed.html svg-glyph-compressed-ref.html
diff --git a/layout/reftests/text-svgglyphs/resources/svg-gz.ttf b/layout/reftests/text-svgglyphs/resources/svg-gz.ttf
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/layout/reftests/text-svgglyphs/svg-glyph-compressed-ref.html b/layout/reftests/text-svgglyphs/svg-glyph-compressed-ref.html
new file mode 100644
index 000000000000..3325c05f2255
--- /dev/null
+++ b/layout/reftests/text-svgglyphs/svg-glyph-compressed-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<title>Test for compressed SVG glyphs</title>
+<style>
+  @font-face {
+    font-family: test;
+    src: url(resources/svg.woff); /* uses uncompressed SVG documents */
+  }
+  html { width: 400px; height: 400px; background-color: white; }
+  body { margin: 0; }
+  div { font: 200px test; color: fuchsia; line-height: 1; stroke: none; }
+</style>
+<div>abcdefg</div>
+<div>LMNOPQR</div>
diff --git a/layout/reftests/text-svgglyphs/svg-glyph-compressed.html b/layout/reftests/text-svgglyphs/svg-glyph-compressed.html
new file mode 100644
index 000000000000..0c51a54b1236
--- /dev/null
+++ b/layout/reftests/text-svgglyphs/svg-glyph-compressed.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<title>Test for compressed SVG glyphs</title>
+<style>
+  @font-face {
+    font-family: test;
+    src: url(resources/svg-gz.ttf); /* copy of svg.woff using gzip-compressed SVG documents */
+  }
+  html { width: 400px; height: 400px; background-color: white; }
+  body { margin: 0; }
+  div { font: 200px test; color: fuchsia; line-height: 1; stroke: none; }
+</style>
+<div>abcdefg</div>
+<div>LMNOPQR</div>

From 0c8c03610cd975b2aea1e17754d7ad297848f38b Mon Sep 17 00:00:00 2001
From: Mathieu Leplatre <mathieu@mozilla.com>
Date: Mon, 20 May 2019 14:34:10 +0000
Subject: [PATCH 008/129] Bug 1552199 - Include records from dump in Remote
 Settings sync event created data r=glasserc

Differential Revision: https://phabricator.services.mozilla.com/D31599

--HG--
extra : moz-landing-system : lando
---
 services/settings/RemoteSettingsClient.jsm    |  10 +-
 .../test/unit/test_remote_settings.js         | 117 +++++++++++++-----
 2 files changed, 92 insertions(+), 35 deletions(-)

diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
index 9afd2787ade2..cdc595e0231c 100644
--- a/services/settings/RemoteSettingsClient.jsm
+++ b/services/settings/RemoteSettingsClient.jsm
@@ -282,6 +282,7 @@ class RemoteSettingsClient extends EventEmitter {
   async maybeSync(expectedTimestamp, options = {}) {
     const { loadDump = true, trigger = "manual" } = options;
 
+    let importedFromDump = [];
     const startedAt = new Date();
     let reportStatus = null;
     try {
@@ -295,7 +296,11 @@ class RemoteSettingsClient extends EventEmitter {
       // cold start.
       if (!collectionLastModified && loadDump) {
         try {
-          await RemoteSettingsWorker.importJSONDump(this.bucketName, this.collectionName);
+          const imported = await RemoteSettingsWorker.importJSONDump(this.bucketName, this.collectionName);
+          // The worker only returns an integer. List the imported records to build the sync event.
+          if (imported > 0) {
+            ({ data: importedFromDump } = await kintoCollection.list());
+          }
           collectionLastModified = await kintoCollection.db.getLastModified();
         } catch (e) {
           // Report but go-on.
@@ -337,6 +342,9 @@ class RemoteSettingsClient extends EventEmitter {
           // With SERVER_WINS, there cannot be any conflicts, but don't silent it anyway.
           throw new Error("Synced failed");
         }
+        // The records imported from the dump should be considered as "created" for the
+        // listeners.
+        syncResult.created = importedFromDump.concat(syncResult.created);
       } catch (e) {
         if (e instanceof RemoteSettingsClient.InvalidSignatureError) {
           // Signature verification failed during synchronization.
diff --git a/services/settings/test/unit/test_remote_settings.js b/services/settings/test/unit/test_remote_settings.js
index e268371c56a8..d56117813bf7 100644
--- a/services/settings/test/unit/test_remote_settings.js
+++ b/services/settings/test/unit/test_remote_settings.js
@@ -51,39 +51,12 @@ function run_test() {
   clientWithDump = RemoteSettings("language-dictionaries");
   clientWithDump.verifySignature = false;
 
-  // Setup server fake responses.
-  function handleResponse(request, response) {
-    try {
-      const sample = getSampleResponse(request, server.identity.primaryPort);
-      if (!sample) {
-        do_throw(`unexpected ${request.method} request for ${request.path}?${request.queryString}`);
-      }
-
-      response.setStatusLine(null, sample.status.status,
-                             sample.status.statusText);
-      // send the headers
-      for (let headerLine of sample.sampleHeaders) {
-        let headerElements = headerLine.split(":");
-        response.setHeader(headerElements[0], headerElements[1].trimLeft());
-      }
-      response.setHeader("Date", (new Date()).toUTCString());
-
-      const body = typeof sample.responseBody == "string" ? sample.responseBody
-                                                          : JSON.stringify(sample.responseBody);
-      response.write(body);
-      response.finish();
-    } catch (e) {
-      info(e);
-    }
-  }
-  const configPath = "/v1/";
-  const changesPath = "/v1/buckets/monitor/collections/changes/records";
-  const metadataPath = "/v1/buckets/main/collections/password-fields";
-  const recordsPath  = "/v1/buckets/main/collections/password-fields/records";
-  server.registerPathHandler(configPath, handleResponse);
-  server.registerPathHandler(changesPath, handleResponse);
-  server.registerPathHandler(metadataPath, handleResponse);
-  server.registerPathHandler(recordsPath, handleResponse);
+  server.registerPathHandler("/v1/", handleResponse);
+  server.registerPathHandler("/v1/buckets/monitor/collections/changes/records", handleResponse);
+  server.registerPathHandler("/v1/buckets/main/collections/password-fields", handleResponse);
+  server.registerPathHandler("/v1/buckets/main/collections/password-fields/records", handleResponse);
+  server.registerPathHandler("/v1/buckets/main/collections/language-dictionaries", handleResponse);
+  server.registerPathHandler("/v1/buckets/main/collections/language-dictionaries/records", handleResponse);
   server.registerPathHandler("/fake-x5u", handleResponse);
 
   run_next_test();
@@ -104,6 +77,22 @@ add_task(async function test_records_obtained_from_server_are_stored_in_db() {
 });
 add_task(clear_state);
 
+add_task(async function test_records_from_dump_are_listed_as_created_in_event() {
+  let received;
+  clientWithDump.on("sync", ({ data }) => received = data);
+  // Use a timestamp superior to latest record in dump.
+  const timestamp = 5000000000000; // Fri Jun 11 2128
+
+  await clientWithDump.maybeSync(timestamp);
+
+  const list = await clientWithDump.get();
+  ok(list.length > 20, "The dump was loaded");
+  equal(received.created[received.created.length - 1].id, "xx", "Last record comes from the sync.");
+  equal(received.created.length, list.length, "The list of created records contains the dump");
+  equal(received.current.length, received.created.length);
+});
+add_task(clear_state);
+
 add_task(async function test_records_can_have_local_fields() {
   const c = RemoteSettings("password-fields", { localFields: ["accepted"] });
   await c.maybeSync(2000);
@@ -487,7 +476,30 @@ add_task(async function test_inspect_changes_the_list_when_bucket_pref_is_change
 });
 add_task(clear_state);
 
-// get a response for a given request from sample data
+function handleResponse(request, response) {
+  try {
+    const sample = getSampleResponse(request, server.identity.primaryPort);
+    if (!sample) {
+      do_throw(`unexpected ${request.method} request for ${request.path}?${request.queryString}`);
+    }
+
+    response.setStatusLine(null, sample.status.status, sample.status.statusText);
+    // send the headers
+    for (let headerLine of sample.sampleHeaders) {
+      let headerElements = headerLine.split(":");
+      response.setHeader(headerElements[0], headerElements[1].trimLeft());
+    }
+    response.setHeader("Date", (new Date()).toUTCString());
+
+    const body = typeof sample.responseBody == "string" ? sample.responseBody
+      : JSON.stringify(sample.responseBody);
+    response.write(body);
+    response.finish();
+  } catch (e) {
+    info(e);
+  }
+}
+
 function getSampleResponse(req, port) {
   const responses = {
     "OPTIONS": {
@@ -741,6 +753,43 @@ wNuvFqc=
         }],
       },
     },
+    "GET:/v1/buckets/main/collections/language-dictionaries": {
+      "sampleHeaders": [
+        "Access-Control-Allow-Origin: *",
+        "Access-Control-Expose-Headers: Retry-After, Content-Length, Alert, Backoff",
+        "Content-Type: application/json; charset=UTF-8",
+        "Server: waitress",
+        "Etag: \"1234\"",
+      ],
+      "status": { status: 200, statusText: "OK" },
+      "responseBody": JSON.stringify({
+        "data": {
+          "id": "language-dictionaries",
+          "last_modified": 1234,
+          "signature": {
+            "signature": "xyz",
+            "x5u": `http://localhost:${port}/fake-x5u`,
+          },
+        },
+      }),
+    },
+    "GET:/v1/buckets/main/collections/language-dictionaries/records": {
+      "sampleHeaders": [
+        "Access-Control-Allow-Origin: *",
+        "Access-Control-Expose-Headers: Retry-After, Content-Length, Alert, Backoff",
+        "Content-Type: application/json; charset=UTF-8",
+        "Server: waitress",
+        "Etag: \"5000000000000\"",
+      ],
+      "status": { status: 200, statusText: "OK" },
+      "responseBody": {
+        "data": [{
+          "id": "xx",
+          "last_modified": 5000000000000,
+          "dictionaries": ["xx-XX@dictionaries.addons.mozilla.org"],
+        }],
+      },
+    },
     "GET:/v1/buckets/monitor/collections/changes/records?collection=no-mocked-responses&bucket=main": {
       "sampleHeaders": [
         "Access-Control-Allow-Origin: *",

From 8965da92035d8a3f330060db40cd445393b6b3f7 Mon Sep 17 00:00:00 2001
From: Bogdan Tara <btara@mozilla.com>
Date: Mon, 20 May 2019 17:49:27 +0300
Subject: [PATCH 009/129] Backed out changeset c77c46ac90a5 (bug 1552536) by
 xeonchen's request

---
 dom/base/ContentBlockingLog.cpp               |  16 +--
 .../telemetry/core/TelemetryOriginData.inc    |   3 -
 .../telemetry/tests/gtest/TestOrigins.cpp     | 117 +++++++++---------
 3 files changed, 63 insertions(+), 73 deletions(-)

diff --git a/dom/base/ContentBlockingLog.cpp b/dom/base/ContentBlockingLog.cpp
index 1bab0857c55f..f68c287ca9a1 100644
--- a/dom/base/ContentBlockingLog.cpp
+++ b/dom/base/ContentBlockingLog.cpp
@@ -21,9 +21,6 @@ typedef mozilla::Telemetry::OriginMetricID OriginMetricID;
 namespace mozilla {
 namespace dom {
 
-// sync with TelemetryOriginData.inc
-NS_NAMED_LITERAL_CSTRING(kDummyOriginHash, "PAGELOAD");
-
 // randomly choose 1% users included in the content blocking measurement
 // based on their client id.
 static constexpr double kRatioReportUser = 0.01;
@@ -114,12 +111,6 @@ void ContentBlockingLog::ReportLog() {
     return;
   }
   LOG("ContentBlockingLog::ReportLog [this=%p]", this);
-  const bool testMode =
-      StaticPrefs::telemetry_origin_telemetry_test_mode_enabled();
-  OriginMetricID metricId =
-      testMode ? OriginMetricID::ContentBlocking_Blocked_TestOnly
-               : OriginMetricID::ContentBlocking_Blocked;
-  ReportOriginSingleHash(metricId, kDummyOriginHash);
 
   for (const auto& originEntry : mLog) {
     if (!originEntry.mData) {
@@ -135,9 +126,12 @@ void ContentBlockingLog::ReportLog() {
 
       const bool isBlocked = logEntry.mBlocked;
       Maybe<StorageAccessGrantedReason> reason = logEntry.mReason;
+      const bool testMode =
+          StaticPrefs::telemetry_origin_telemetry_test_mode_enabled();
 
-      metricId = testMode ? OriginMetricID::ContentBlocking_Blocked_TestOnly
-                          : OriginMetricID::ContentBlocking_Blocked;
+      OriginMetricID metricId =
+          testMode ? OriginMetricID::ContentBlocking_Blocked_TestOnly
+                   : OriginMetricID::ContentBlocking_Blocked;
       if (!isBlocked) {
         MOZ_ASSERT(reason.isSome());
         switch (reason.value()) {
diff --git a/toolkit/components/telemetry/core/TelemetryOriginData.inc b/toolkit/components/telemetry/core/TelemetryOriginData.inc
index 03b9337fbe60..f348b9af6af9 100644
--- a/toolkit/components/telemetry/core/TelemetryOriginData.inc
+++ b/toolkit/components/telemetry/core/TelemetryOriginData.inc
@@ -1,6 +1,3 @@
-// dummy origin
-ORIGIN("PAGELOAD", "PAGELOAD")
-
 ORIGIN("advertstream.com", "lzPiT1FuoHNMKQ1Hw8AaTi68TokOB24ciFBqmCk62ek=")
 ORIGIN("kitaramedia.com", "r+U9PL3uMrjCKe8/T8goY9MHPA+6JckC3R+/1R9TQKA=")
 ORIGIN("questionmarket.com", "3KCO/qN+KmApmfH3RaXAmdR65Z/TRfrr6pds7aDKn1c=")
diff --git a/toolkit/components/telemetry/tests/gtest/TestOrigins.cpp b/toolkit/components/telemetry/tests/gtest/TestOrigins.cpp
index 56ab3a4f4319..dd83354501cc 100644
--- a/toolkit/components/telemetry/tests/gtest/TestOrigins.cpp
+++ b/toolkit/components/telemetry/tests/gtest/TestOrigins.cpp
@@ -20,26 +20,6 @@ using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::StrEq;
 
-NS_NAMED_LITERAL_CSTRING(kTelemetryTest1Metric, "telemetry.test_test1");
-
-NS_NAMED_LITERAL_CSTRING(kDummyOrigin, "PAGELOAD");
-NS_NAMED_LITERAL_CSTRING(kDoubleclickOrigin, "doubleclick.net");
-NS_NAMED_LITERAL_CSTRING(kDoubleclickOriginHash,
-                         "uXNT1PzjAVau8b402OMAIGDejKbiXfQX5iXvPASfO/s=");
-NS_NAMED_LITERAL_CSTRING(kFacebookOrigin, "fb.com");
-NS_NAMED_LITERAL_CSTRING(kUnknownOrigin1,
-                         "this origin isn't known to Origin Telemetry");
-NS_NAMED_LITERAL_CSTRING(kUnknownOrigin2, "neither is this one");
-
-// Properly prepare the prio prefs
-// (Sourced from PrioEncoder.cpp from when it was being prototyped)
-NS_NAMED_LITERAL_CSTRING(
-    prioKeyA,
-    "35AC1C7576C7C6EDD7FED6BCFC337B34D48CB4EE45C86BEEFB40BD8875707733");
-NS_NAMED_LITERAL_CSTRING(
-    prioKeyB,
-    "26E6674E65425B823F1F1D5F96E3BB3EF9E406EC7FBA7DEF8B08A35DD135AF50");
-
 // Test that we can properly record origin stuff using the C++ API.
 TEST_F(TelemetryTestFixture, RecordOrigin) {
   AutoJSContextWithGlobal cx(mCleanGlobal);
@@ -47,7 +27,10 @@ TEST_F(TelemetryTestFixture, RecordOrigin) {
 
   Unused << mTelemetry->ClearOrigins();
 
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, kDummyOrigin);
+  const nsLiteralCString doubleclick("doubleclick.net");
+  const nsLiteralCString telemetryTest1("telemetry.test_test1");
+
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, doubleclick);
 
   JS::RootedValue originSnapshot(aCx);
   GetOriginSnapshot(aCx, &originSnapshot);
@@ -57,13 +40,12 @@ TEST_F(TelemetryTestFixture, RecordOrigin) {
 
   JS::RootedValue origins(aCx);
   JS::RootedObject snapshotObj(aCx, &originSnapshot.toObject());
-  ASSERT_TRUE(
-      JS_GetProperty(aCx, snapshotObj, kTelemetryTest1Metric.get(), &origins))
+  ASSERT_TRUE(JS_GetProperty(aCx, snapshotObj, telemetryTest1.get(), &origins))
   << "telemetry.test_test1 must be in the snapshot.";
 
   JS::RootedObject originsObj(aCx, &origins.toObject());
   JS::RootedValue count(aCx);
-  ASSERT_TRUE(JS_GetProperty(aCx, originsObj, kDummyOrigin.get(), &count));
+  ASSERT_TRUE(JS_GetProperty(aCx, originsObj, doubleclick.get(), &count));
   ASSERT_TRUE(count.isInt32() && count.toInt32() == 1)
   << "Must have recorded the origin exactly once.";
 
@@ -82,10 +64,11 @@ TEST_F(TelemetryTestFixture, RecordOriginTwiceAndClear) {
 
   Unused << mTelemetry->ClearOrigins();
 
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1,
-                          kDoubleclickOrigin);
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1,
-                          kDoubleclickOrigin);
+  const nsLiteralCString doubleclick("doubleclick.net");
+  const nsLiteralCString telemetryTest1("telemetry.test_test1");
+
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, doubleclick);
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, doubleclick);
 
   JS::RootedValue originSnapshot(aCx);
   GetOriginSnapshot(aCx, &originSnapshot, true /* aClear */);
@@ -95,14 +78,12 @@ TEST_F(TelemetryTestFixture, RecordOriginTwiceAndClear) {
 
   JS::RootedValue origins(aCx);
   JS::RootedObject snapshotObj(aCx, &originSnapshot.toObject());
-  ASSERT_TRUE(
-      JS_GetProperty(aCx, snapshotObj, kTelemetryTest1Metric.get(), &origins))
+  ASSERT_TRUE(JS_GetProperty(aCx, snapshotObj, telemetryTest1.get(), &origins))
   << "telemetry.test_test1 must be in the snapshot.";
 
   JS::RootedObject originsObj(aCx, &origins.toObject());
   JS::RootedValue count(aCx);
-  ASSERT_TRUE(
-      JS_GetProperty(aCx, originsObj, kDoubleclickOrigin.get(), &count));
+  ASSERT_TRUE(JS_GetProperty(aCx, originsObj, doubleclick.get(), &count));
   ASSERT_TRUE(count.isInt32() && count.toInt32() == 2)
   << "Must have recorded the origin exactly twice.";
 
@@ -121,17 +102,26 @@ TEST_F(TelemetryTestFixture, RecordOriginTwiceMixed) {
 
   Unused << mTelemetry->ClearOrigins();
 
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1,
-                          kDoubleclickOrigin);
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1,
-                          kDoubleclickOriginHash);
+  const nsLiteralCString doubleclick("doubleclick.net");
+  const nsLiteralCString doubleclickHash(
+      "uXNT1PzjAVau8b402OMAIGDejKbiXfQX5iXvPASfO/s=");
+  const nsLiteralCString telemetryTest1("telemetry.test_test1");
 
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, doubleclick);
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, doubleclickHash);
+
+  // Properly prepare the prio prefs
+  // (Sourced from PrioEncoder.cpp from when it was being prototyped)
+  const nsLiteralCString prioKeyA(
+      "35AC1C7576C7C6EDD7FED6BCFC337B34D48CB4EE45C86BEEFB40BD8875707733");
+  const nsLiteralCString prioKeyB(
+      "26E6674E65425B823F1F1D5F96E3BB3EF9E406EC7FBA7DEF8B08A35DD135AF50");
   Preferences::SetCString("prio.publicKeyA", prioKeyA);
   Preferences::SetCString("prio.publicKeyB", prioKeyB);
 
   nsTArray<Tuple<nsCString, nsCString>> encodedStrings;
-  GetEncodedOriginStrings(
-      aCx, kTelemetryTest1Metric + NS_LITERAL_CSTRING("-%u"), encodedStrings);
+  GetEncodedOriginStrings(aCx, telemetryTest1 + NS_LITERAL_CSTRING("-%u"),
+                          encodedStrings);
   ASSERT_EQ(2 * TelemetryOrigin::SizeOfPrioDatasPerMetric(),
             encodedStrings.Length());
 
@@ -143,14 +133,12 @@ TEST_F(TelemetryTestFixture, RecordOriginTwiceMixed) {
 
   JS::RootedValue origins(aCx);
   JS::RootedObject snapshotObj(aCx, &originSnapshot.toObject());
-  ASSERT_TRUE(
-      JS_GetProperty(aCx, snapshotObj, kTelemetryTest1Metric.get(), &origins))
+  ASSERT_TRUE(JS_GetProperty(aCx, snapshotObj, telemetryTest1.get(), &origins))
   << "telemetry.test_test1 must be in the snapshot.";
 
   JS::RootedObject originsObj(aCx, &origins.toObject());
   JS::RootedValue count(aCx);
-  ASSERT_TRUE(
-      JS_GetProperty(aCx, originsObj, kDoubleclickOrigin.get(), &count));
+  ASSERT_TRUE(JS_GetProperty(aCx, originsObj, doubleclick.get(), &count));
   ASSERT_TRUE(count.isInt32() && count.toInt32() == 2)
   << "Must have recorded the origin exactly twice.";
 }
@@ -161,7 +149,11 @@ TEST_F(TelemetryTestFixture, RecordUnknownOrigin) {
 
   Unused << mTelemetry->ClearOrigins();
 
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, kUnknownOrigin1);
+  const nsLiteralCString telemetryTest1("telemetry.test_test1");
+  const nsLiteralCString unknown("this origin isn't known to Origin Telemetry");
+  const nsLiteralCString unknown2("neither is this one");
+
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, unknown);
 
   JS::RootedValue originSnapshot(aCx);
   GetOriginSnapshot(aCx, &originSnapshot);
@@ -171,8 +163,7 @@ TEST_F(TelemetryTestFixture, RecordUnknownOrigin) {
 
   JS::RootedValue origins(aCx);
   JS::RootedObject snapshotObj(aCx, &originSnapshot.toObject());
-  ASSERT_TRUE(
-      JS_GetProperty(aCx, snapshotObj, kTelemetryTest1Metric.get(), &origins))
+  ASSERT_TRUE(JS_GetProperty(aCx, snapshotObj, telemetryTest1.get(), &origins))
   << "telemetry.test_test1 must be in the snapshot.";
 
   JS::RootedObject originsObj(aCx, &origins.toObject());
@@ -182,7 +173,7 @@ TEST_F(TelemetryTestFixture, RecordUnknownOrigin) {
   << "Must have recorded the unknown origin exactly once.";
 
   // Record a second, different unknown origin and ensure only one is stored.
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, kUnknownOrigin2);
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, unknown2);
 
   GetOriginSnapshot(aCx, &originSnapshot);
 
@@ -190,8 +181,7 @@ TEST_F(TelemetryTestFixture, RecordUnknownOrigin) {
   << "Origin snapshot must not be null/undefined.";
 
   JS::RootedObject snapshotObj2(aCx, &originSnapshot.toObject());
-  ASSERT_TRUE(
-      JS_GetProperty(aCx, snapshotObj2, kTelemetryTest1Metric.get(), &origins))
+  ASSERT_TRUE(JS_GetProperty(aCx, snapshotObj2, telemetryTest1.get(), &origins))
   << "telemetry.test_test1 must be in the snapshot.";
 
   JS::RootedObject originsObj2(aCx, &origins.toObject());
@@ -207,21 +197,30 @@ TEST_F(TelemetryTestFixture, EncodedSnapshot) {
 
   Unused << mTelemetry->ClearOrigins();
 
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1,
-                          kDoubleclickOrigin);
-  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, kUnknownOrigin1);
+  const nsLiteralCString doubleclick("doubleclick.net");
+  const nsLiteralCString unknown("this origin isn't known to Origin Telemetry");
+  const nsLiteralCString telemetryTest1("telemetry.test_test1");
 
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, doubleclick);
+  Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, unknown);
+
+  // Properly prepare the prio prefs
+  // (Sourced from PrioEncoder.cpp from when it was being prototyped)
+  const nsLiteralCString prioKeyA(
+      "35AC1C7576C7C6EDD7FED6BCFC337B34D48CB4EE45C86BEEFB40BD8875707733");
+  const nsLiteralCString prioKeyB(
+      "26E6674E65425B823F1F1D5F96E3BB3EF9E406EC7FBA7DEF8B08A35DD135AF50");
   Preferences::SetCString("prio.publicKeyA", prioKeyA);
   Preferences::SetCString("prio.publicKeyB", prioKeyB);
 
   nsTArray<Tuple<nsCString, nsCString>> firstStrings;
-  GetEncodedOriginStrings(
-      aCx, kTelemetryTest1Metric + NS_LITERAL_CSTRING("-%u"), firstStrings);
+  GetEncodedOriginStrings(aCx, telemetryTest1 + NS_LITERAL_CSTRING("-%u"),
+                          firstStrings);
 
   // Now snapshot a second time and ensure the encoded payloads change.
   nsTArray<Tuple<nsCString, nsCString>> secondStrings;
-  GetEncodedOriginStrings(
-      aCx, kTelemetryTest1Metric + NS_LITERAL_CSTRING("-%u"), secondStrings);
+  GetEncodedOriginStrings(aCx, telemetryTest1 + NS_LITERAL_CSTRING("-%u"),
+                          secondStrings);
 
   const auto sizeOfPrioDatasPerMetric =
       TelemetryOrigin::SizeOfPrioDatasPerMetric();
@@ -266,6 +265,8 @@ TEST_F(TelemetryTestFixture, OriginTelemetryNotifiesTopic) {
   Unused << mTelemetry->ClearOrigins();
 
   const char* kTopic = "origin-telemetry-storage-limit-reached";
+  NS_NAMED_LITERAL_CSTRING(doubleclick, "doubleclick.net");
+  NS_NAMED_LITERAL_CSTRING(fb, "fb.com");
 
   MockObserver* mo = new MockObserver();
   nsCOMPtr<nsIObserver> nsMo(mo);
@@ -279,11 +280,9 @@ TEST_F(TelemetryTestFixture, OriginTelemetryNotifiesTopic) {
   for (size_t i = 0; i < size; ++i) {
     if (i < size - 1) {
       // Let's ensure we only notify the once.
-      Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1,
-                              kFacebookOrigin);
+      Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, fb);
     }
-    Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1,
-                            kDoubleclickOrigin);
+    Telemetry::RecordOrigin(OriginMetricID::TelemetryTest_Test1, doubleclick);
   }
 
   os->RemoveObserver(nsMo, kTopic);

From f20a8dc5633ef4df93d45b8495f7e29d519f19fe Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date: Mon, 20 May 2019 12:33:06 +0000
Subject: [PATCH 010/129] Bug 1541355 - Don't display DevTools internal frames
 in Netmonitor stacktrace. r=Honza.

Before sending back the stacktrace, we remove all the
devtools internal frames using removeFramesAboveDebuggerEval.
A test (that was failing without the fix) is added to ensure
this works as expected.
The test revealed some issues in webconsole-connection-proxy
(mostly trying to access webConsoleUI while closing the toolbox),
which we fix in the patch as well.

Differential Revision: https://phabricator.services.mozilla.com/D31249

--HG--
extra : moz-landing-system : lando
---
 .../client/shared/components/StackTrace.js    |  4 ++
 .../webconsole/test/mochitest/browser.ini     |  1 +
 ...es_stacktrace_console_initiated_request.js | 63 +++++++++++++++++++
 .../webconsole/webconsole-connection-proxy.js |  9 +++
 .../network-monitor/stack-trace-collector.js  |  4 +-
 5 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_stacktrace_console_initiated_request.js

diff --git a/devtools/client/shared/components/StackTrace.js b/devtools/client/shared/components/StackTrace.js
index be63c69c4857..620372f677cf 100644
--- a/devtools/client/shared/components/StackTrace.js
+++ b/devtools/client/shared/components/StackTrace.js
@@ -48,6 +48,10 @@ class StackTrace extends Component {
       sourceMapService,
     } = this.props;
 
+    if (!stacktrace) {
+      return null;
+    }
+
     const frames = [];
     stacktrace.forEach((s, i) => {
       if (s.asyncCause) {
diff --git a/devtools/client/webconsole/test/mochitest/browser.ini b/devtools/client/webconsole/test/mochitest/browser.ini
index 2f9ff7349575..ef449592670f 100644
--- a/devtools/client/webconsole/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/test/mochitest/browser.ini
@@ -341,6 +341,7 @@ skip-if = true  # Bug 1438979
 [browser_webconsole_network_message_ctrl_click.js]
 [browser_webconsole_network_messages_openinnet.js]
 [browser_webconsole_network_messages_resend_request.js]
+[browser_webconsole_network_messages_stacktrace_console_initiated_request.js]
 [browser_webconsole_network_messages_status_code.js]
 [browser_webconsole_network_requests_from_chrome.js]
 [browser_webconsole_network_reset_filter.js]
diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_stacktrace_console_initiated_request.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_stacktrace_console_initiated_request.js
new file mode 100644
index 000000000000..ec01a6f2b5d7
--- /dev/null
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_stacktrace_console_initiated_request.js
@@ -0,0 +1,63 @@
+
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const TEST_FILE = "test-network-request.html";
+const TEST_PATH = "https://example.com/browser/devtools/client/webconsole/" +
+                  "test/mochitest/";
+const TEST_URI = TEST_PATH + TEST_FILE;
+
+pushPref("devtools.webconsole.filter.netxhr", true);
+
+add_task(async function task() {
+  const hud = await openNewTabAndConsole(TEST_URI);
+
+  const xhrUrl = TEST_PATH + "sjs_slow-response-test-server.sjs";
+  const onRequestUpdates = waitForRequestUpdates(hud);
+  const onPayloadReady = waitForPayloadReady(hud);
+
+  info("Fire an XHR POST request from the console.");
+  const { node: messageNode } = await executeAndWaitForMessage(hud, `
+    xhrConsole = () => testXhrPostSlowResponse();
+    xhrConsole();
+  `, xhrUrl);
+
+  ok(messageNode, "Network message found.");
+
+  await onRequestUpdates;
+
+  info("Expand the network message");
+  await expandXhrMessage(messageNode);
+
+  await onPayloadReady;
+
+  const stackTraceTab = messageNode.querySelector("#stack-trace-tab");
+  ok(stackTraceTab, "StackTrace tab is available");
+
+  stackTraceTab.click();
+  const selector = "#stack-trace-panel .frame-link";
+  await waitFor(() => messageNode.querySelector(selector));
+  const frames = [...messageNode.querySelectorAll(selector)];
+
+  is(frames.length, 4, "There's the expected frames");
+  const functionNames = frames.map(f =>
+    f.querySelector(".frame-link-function-display-name").textContent);
+  is(functionNames.join("|"), "makeXhr|testXhrPostSlowResponse|xhrConsole|<anonymous>",
+    "The stacktrace does not have devtools' internal frames");
+});
+
+async function waitForPayloadReady(hud) {
+  return hud.ui.once("network-request-payload-ready");
+}
+
+async function waitForRequestUpdates(hud) {
+  return hud.ui.once("network-message-updated");
+}
+
+function expandXhrMessage(node) {
+  info("Click on XHR message and wait for the network detail panel to be displayed");
+  node.querySelector(".url").click();
+  return waitFor(() => node.querySelector(".network-info"));
+}
diff --git a/devtools/client/webconsole/webconsole-connection-proxy.js b/devtools/client/webconsole/webconsole-connection-proxy.js
index 5d95c5d50a6d..1367a26dfb99 100644
--- a/devtools/client/webconsole/webconsole-connection-proxy.js
+++ b/devtools/client/webconsole/webconsole-connection-proxy.js
@@ -219,10 +219,19 @@ WebConsoleConnectionProxy.prototype = {
    * Dispatch a message event on the new frontend and emit an event for tests.
    */
   dispatchMessageUpdate: function(networkInfo, response) {
+    // Some message might try to update while we are closing the toolbox.
+    if (!this.webConsoleUI) {
+      return;
+    }
     this.webConsoleUI.wrapper.dispatchMessageUpdate(networkInfo, response);
   },
 
   dispatchRequestUpdate: function(id, data) {
+    // Some request might try to update while we are closing the toolbox.
+    if (!this.webConsoleUI) {
+      return;
+    }
+
     this.webConsoleUI.wrapper.dispatchRequestUpdate(id, data);
   },
 
diff --git a/devtools/server/actors/network-monitor/stack-trace-collector.js b/devtools/server/actors/network-monitor/stack-trace-collector.js
index 38c78e9efff6..aee4f2f8ef80 100644
--- a/devtools/server/actors/network-monitor/stack-trace-collector.js
+++ b/devtools/server/actors/network-monitor/stack-trace-collector.js
@@ -15,6 +15,8 @@ loader.lazyRequireGetter(this, "ChannelEventSinkFactory",
 loader.lazyRequireGetter(this, "matchRequest",
                          "devtools/server/actors/network-monitor/network-observer",
                          true);
+loader.lazyRequireGetter(this, "WebConsoleUtils",
+                         "devtools/server/actors/webconsole/utils", true);
 
 function StackTraceCollector(filters, netmonitors) {
   this.filters = filters;
@@ -156,7 +158,7 @@ StackTraceCollector.prototype = {
   getStackTrace(channelId) {
     const trace = this.stacktracesById.get(channelId);
     this.stacktracesById.delete(channelId);
-    return trace;
+    return WebConsoleUtils.removeFramesAboveDebuggerEval(trace);
   },
 
   onGetStack(msg) {

From 0b10e77ba6c84ca66d005f20160028977a4745bf Mon Sep 17 00:00:00 2001
From: David Walsh <dwalsh@mozilla.com>
Date: Mon, 20 May 2019 14:40:10 +0000
Subject: [PATCH 011/129] Bug 1550001 - Provide event listener breakpoint UI
 r=loganfsmyth

Differential Revision: https://phabricator.services.mozilla.com/D30986

--HG--
extra : moz-landing-system : lando
---
 .../debugger/src/actions/event-listeners.js   |  93 ++++-
 .../debugger/src/actions/types/index.js       |  27 +-
 .../client/debugger/src/client/firefox.js     |   3 +
 .../debugger/src/client/firefox/commands.js   |  17 +-
 .../debugger/src/client/firefox/types.js      |   7 +-
 devtools/client/debugger/src/client/index.js  |   8 +-
 .../SecondaryPanes/EventListeners.js          | 142 ++++----
 .../tests/EventListeners.spec.js              |  82 +++++
 .../__snapshots__/EventListeners.spec.js.snap | 320 ++++++++++++++++++
 .../debugger/src/reducers/event-listeners.js  |  68 ++--
 .../client/debugger/src/reducers/types.js     |   2 +
 devtools/client/debugger/src/utils/prefs.js   |   5 +-
 devtools/client/preferences/debugger.js       |   4 +-
 13 files changed, 648 insertions(+), 130 deletions(-)
 create mode 100644 devtools/client/debugger/src/components/SecondaryPanes/tests/EventListeners.spec.js
 create mode 100644 devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/EventListeners.spec.js.snap

diff --git a/devtools/client/debugger/src/actions/event-listeners.js b/devtools/client/debugger/src/actions/event-listeners.js
index 0e47899bf087..4e1e41e321f7 100644
--- a/devtools/client/debugger/src/actions/event-listeners.js
+++ b/devtools/client/debugger/src/actions/event-listeners.js
@@ -4,29 +4,88 @@
 
 // @flow
 
+import { uniq, remove } from "lodash";
+
 import { asyncStore } from "../utils/prefs";
 
+import {
+  getActiveEventListeners,
+  getEventListenerExpanded,
+} from "../selectors";
+
 import type { ThunkArgs } from "./types";
-import type { EventListenerBreakpoints } from "../types";
 
-export function addEventListeners(events: EventListenerBreakpoints) {
-  return async ({ dispatch, client }: ThunkArgs) => {
-    await dispatch({
-      type: "ADD_EVENT_LISTENERS",
-      events,
-    });
-    const newList = await asyncStore.eventListenerBreakpoints;
-    client.setEventListenerBreakpoints(newList);
+async function updateBreakpoints(dispatch, client, newEvents: string[]) {
+  dispatch({ type: "UPDATE_EVENT_LISTENERS", active: newEvents });
+
+  const current = await asyncStore.eventListenerBreakpoints;
+  asyncStore.eventListenerBreakpoints = {
+    ...current,
+    active: newEvents,
+  };
+
+  client.setEventListenerBreakpoints(newEvents);
+}
+
+async function updateExpanded(dispatch, newExpanded: string[]) {
+  dispatch({
+    type: "UPDATE_EVENT_LISTENER_EXPANDED",
+    expanded: newExpanded,
+  });
+
+  const current = await asyncStore.eventListenerBreakpoints;
+  asyncStore.eventListenerBreakpoints = {
+    ...current,
+    expanded: newExpanded,
   };
 }
 
-export function removeEventListeners(events: EventListenerBreakpoints) {
-  return async ({ dispatch, client }: ThunkArgs) => {
-    await dispatch({
-      type: "REMOVE_EVENT_LISTENERS",
-      events,
-    });
-    const newList = await asyncStore.eventListenerBreakpoints;
-    client.setEventListenerBreakpoints(newList);
+export function addEventListenerBreakpoints(eventsToAdd: string[]) {
+  return async ({ dispatch, client, getState }: ThunkArgs) => {
+    const activeListenerBreakpoints = await getActiveEventListeners(getState());
+
+    const newEvents = uniq([...eventsToAdd, ...activeListenerBreakpoints]);
+
+    updateBreakpoints(dispatch, client, newEvents);
+  };
+}
+
+export function removeEventListenerBreakpoints(eventsToRemove: string[]) {
+  return async ({ dispatch, client, getState }: ThunkArgs) => {
+    const activeListenerBreakpoints = await getActiveEventListeners(getState());
+
+    const newEvents = remove(
+      activeListenerBreakpoints,
+      event => !eventsToRemove.includes(event)
+    );
+
+    updateBreakpoints(dispatch, client, newEvents);
+  };
+}
+
+export function addEventListenerExpanded(category: string) {
+  return async ({ dispatch, getState }: ThunkArgs) => {
+    const expanded = await getEventListenerExpanded(getState());
+
+    const newExpanded = uniq([...expanded, category]);
+
+    await updateExpanded(dispatch, newExpanded);
+  };
+}
+
+export function removeEventListenerExpanded(category: string) {
+  return async ({ dispatch, getState }: ThunkArgs) => {
+    const expanded = await getEventListenerExpanded(getState());
+
+    const newExpanded = expanded.filter(expand => expand != category);
+
+    updateExpanded(dispatch, newExpanded);
+  };
+}
+
+export function getEventListenerBreakpointTypes() {
+  return async ({ dispatch, client }: ThunkArgs) => {
+    const categories = await client.getEventListenerBreakpointTypes();
+    dispatch({ type: "RECEIVE_EVENT_LISTENER_TYPES", categories });
   };
 }
diff --git a/devtools/client/debugger/src/actions/types/index.js b/devtools/client/debugger/src/actions/types/index.js
index 51a110cf42c6..01296b64b8e7 100644
--- a/devtools/client/debugger/src/actions/types/index.js
+++ b/devtools/client/debugger/src/actions/types/index.js
@@ -159,6 +159,30 @@ export type {
 
 export type { panelPositionType } from "./UIAction";
 
+export type { ASTAction } from "./ASTAction";
+
+type ActiveEventListener = string;
+type EventListenerEvent = { name: string, id: ActiveEventListener };
+type EventListenerCategory = { name: string, events: EventListenerEvent[] };
+
+export type EventListenerActiveList = ActiveEventListener[];
+export type EventListenerCategoryList = EventListenerCategory[];
+export type EventListenerExpandedList = string[];
+
+export type EventListenerAction =
+  | {|
+      +type: "UPDATE_EVENT_LISTENERS",
+      +active: EventListenerActiveList,
+    |}
+  | {|
+      +type: "RECEIVE_EVENT_LISTENER_TYPES",
+      +categories: EventListenerCategoryList,
+    |}
+  | {|
+      +type: "UPDATE_EVENT_LISTENER_EXPANDED",
+      +expanded: EventListenerExpandedList,
+    |};
+
 /**
  * Actions: Source, Breakpoint, and Navigation
  *
@@ -180,4 +204,5 @@ export type Action =
   | FileTextSearchAction
   | ProjectTextSearchAction
   | DebuggeeAction
-  | SourceTreeAction;
+  | SourceTreeAction
+  | EventListenerAction;
diff --git a/devtools/client/debugger/src/client/firefox.js b/devtools/client/debugger/src/client/firefox.js
index 3d8fb32624cb..e24f96eb7bee 100644
--- a/devtools/client/debugger/src/client/firefox.js
+++ b/devtools/client/debugger/src/client/firefox.js
@@ -47,6 +47,9 @@ export async function onConnect(connection: any, actions: Object) {
     skipBreakpoints: prefs.skipPausing,
   });
 
+  // Retrieve possible event listener breakpoints
+  actions.getEventListenerBreakpointTypes();
+
   // In Firefox, we need to initially request all of the sources. This
   // usually fires off individual `newSource` notifications as the
   // debugger finds them, but there may be existing sources already in
diff --git a/devtools/client/debugger/src/client/firefox/commands.js b/devtools/client/debugger/src/client/firefox/commands.js
index 59758b83ee75..b7cf035a7f43 100644
--- a/devtools/client/debugger/src/client/firefox/commands.js
+++ b/devtools/client/debugger/src/client/firefox/commands.js
@@ -16,7 +16,6 @@ import type {
   BreakpointLocation,
   BreakpointOptions,
   PendingLocation,
-  EventListenerBreakpoints,
   Frame,
   FrameId,
   GeneratedSourceData,
@@ -36,6 +35,8 @@ import type {
   SourcesPacket,
 } from "./types";
 
+import type { EventListenerCategoryList } from "../../actions/types";
+
 let workerClients: Object;
 let threadClient: ThreadClient;
 let tabTarget: TabTarget;
@@ -361,8 +362,17 @@ function interrupt(thread: string): Promise<*> {
   return lookupThreadClient(thread).interrupt();
 }
 
-function setEventListenerBreakpoints(eventTypes: EventListenerBreakpoints) {
-  // TODO: Figure out what sendpoint we want to hit
+async function setEventListenerBreakpoints(ids: string[]) {
+  await threadClient.setActiveEventBreakpoints(ids);
+  await forEachWorkerThread(thread => thread.setActiveEventBreakpoints(ids));
+}
+
+// eslint-disable-next-line
+async function getEventListenerBreakpointTypes(): Promise<
+  EventListenerCategoryList
+> {
+  const { value } = await threadClient.getAvailableEventBreakpoints();
+  return value;
 }
 
 function pauseGrip(thread: string, func: Function): ObjectClient {
@@ -525,6 +535,7 @@ const clientCommands = {
   sendPacket,
   setSkipPausing,
   setEventListenerBreakpoints,
+  getEventListenerBreakpointTypes,
   waitForWorkers,
   detachWorkers,
   hasWasmSupport,
diff --git a/devtools/client/debugger/src/client/firefox/types.js b/devtools/client/debugger/src/client/firefox/types.js
index 8f87962d777c..3c89c5041aec 100644
--- a/devtools/client/debugger/src/client/firefox/types.js
+++ b/devtools/client/debugger/src/client/firefox/types.js
@@ -25,6 +25,8 @@ import type {
   Range,
 } from "../../types";
 
+import type { EventListenerCategoryList } from "../../actions/types";
+
 type URL = string;
 
 /**
@@ -369,7 +371,10 @@ export type ThreadClient = {
   actor: ActorId,
   request: (payload: Object) => Promise<*>,
   url: string,
-  setEventListenerBreakpoints: (string[]) => void,
+  setActiveEventBreakpoints: (string[]) => void,
+  getAvailableEventBreakpoints: () => Promise<{|
+    value: EventListenerCategoryList,
+  |}>,
   skipBreakpoints: boolean => Promise<{| skip: boolean |}>,
 };
 
diff --git a/devtools/client/debugger/src/client/index.js b/devtools/client/debugger/src/client/index.js
index e68801c9ec6f..e4fe19c14671 100644
--- a/devtools/client/debugger/src/client/index.js
+++ b/devtools/client/debugger/src/client/index.js
@@ -15,6 +15,7 @@ import {
   bootstrapStore,
   bootstrapWorkers,
 } from "../utils/bootstrap";
+
 import { initialBreakpointsState } from "../reducers/breakpoints";
 
 import type { Panel } from "./firefox/types";
@@ -47,7 +48,12 @@ async function loadInitialState() {
 
   const breakpoints = initialBreakpointsState(xhrBreakpoints);
 
-  return { pendingBreakpoints, tabs, breakpoints, eventListenerBreakpoints };
+  return {
+    pendingBreakpoints,
+    tabs,
+    breakpoints,
+    eventListenerBreakpoints,
+  };
 }
 
 function getClient(connection: any) {
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js b/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
index be2ce126448f..ad18d6c0a01d 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
@@ -9,141 +9,121 @@ import classnames from "classnames";
 
 import { connect } from "../../utils/connect";
 import actions from "../../actions";
-import { getActiveEventListeners } from "../../selectors";
+import {
+  getActiveEventListeners,
+  getEventListenerBreakpointTypes,
+  getEventListenerExpanded,
+} from "../../selectors";
 
 import AccessibleImage from "../shared/AccessibleImage";
 
-import type { EventListenerBreakpoints } from "../../types";
+import type {
+  EventListenerActiveList,
+  EventListenerCategoryList,
+  EventListenerExpandedList,
+} from "../../actions/types";
 
 import "./EventListeners.css";
 
-const CATEGORIES = {
-  Mouse: ["click", "mouseover", "dblclick"],
-  Keyboard: ["keyup", "keydown"],
-};
-
 type Props = {
-  addEventListeners: typeof actions.addEventListeners,
-  removeEventListeners: typeof actions.removeEventListeners,
-  activeEventListeners: EventListenerBreakpoints,
+  categories: EventListenerCategoryList,
+  expandedCategories: EventListenerExpandedList,
+  activeEventListeners: EventListenerActiveList,
+  addEventListeners: typeof actions.addEventListenerBreakpoints,
+  removeEventListeners: typeof actions.removeEventListenerBreakpoints,
+  addEventListenerExpanded: typeof actions.addEventListenerExpanded,
+  removeEventListenerExpanded: typeof actions.removeEventListenerExpanded,
 };
 
-type State = {
-  expandedCategories: string[],
-};
-
-function getKey(category: string, eventType: string) {
-  return `${category}:${eventType}`;
-}
-
-class EventListeners extends Component<Props, State> {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      expandedCategories: [],
-    };
-  }
-
-  onCategoryToggle(category, event) {
-    const { expandedCategories } = this.state;
+class EventListeners extends Component<Props> {
+  onCategoryToggle(category) {
+    const {
+      expandedCategories,
+      removeEventListenerExpanded,
+      addEventListenerExpanded,
+    } = this.props;
 
     if (expandedCategories.includes(category)) {
-      this.setState({
-        expandedCategories: expandedCategories.filter(
-          eventCategory => eventCategory !== category
-        ),
-      });
+      removeEventListenerExpanded(category);
     } else {
-      this.setState({
-        expandedCategories: [...expandedCategories, category],
-      });
+      addEventListenerExpanded(category);
     }
   }
 
   onCategoryClick(category, isChecked) {
     const { addEventListeners, removeEventListeners } = this.props;
-    const events = CATEGORIES[category].map(eventType =>
-      getKey(category, eventType)
-    );
+    const eventsIds = category.events.map(event => event.id);
 
     if (isChecked) {
-      addEventListeners(events);
+      addEventListeners(eventsIds);
     } else {
-      removeEventListeners(events);
+      removeEventListeners(eventsIds);
     }
   }
 
-  onEventTypeClick(eventType, isChecked) {
+  onEventTypeClick(eventId, isChecked) {
     const { addEventListeners, removeEventListeners } = this.props;
     if (isChecked) {
-      addEventListeners([eventType]);
+      addEventListeners([eventId]);
     } else {
-      removeEventListeners([eventType]);
+      removeEventListeners([eventId]);
     }
   }
 
   renderCategoryHeading(category) {
-    const { expandedCategories } = this.state;
-    const { activeEventListeners } = this.props;
+    const { activeEventListeners, expandedCategories } = this.props;
+    const { events } = category;
 
-    const eventTypes = CATEGORIES[category];
-
-    const expanded = expandedCategories.includes(category);
-    const checked = eventTypes.every(eventType =>
-      activeEventListeners.includes(getKey(category, eventType))
-    );
+    const expanded = expandedCategories.includes(category.name);
+    const checked = events.every(({ id }) => activeEventListeners.includes(id));
     const indeterminate =
-      !checked &&
-      eventTypes.some(eventType =>
-        activeEventListeners.includes(getKey(category, eventType))
-      );
+      !checked && events.some(({ id }) => activeEventListeners.includes(id));
 
     return (
       <div className="event-listener-header">
         <button
           className="event-listener-expand"
-          onClick={e => this.onCategoryToggle(category, e)}
+          onClick={() => this.onCategoryToggle(category.name)}
         >
           <AccessibleImage className={classnames("arrow", { expanded })} />
         </button>
         <label className="event-listener-label">
           <input
             type="checkbox"
-            value={category}
+            value={category.name}
             onChange={e => this.onCategoryClick(category, e.target.checked)}
             checked={checked}
             ref={el => el && (el.indeterminate = indeterminate)}
           />
-          <span className="event-listener-category">{category}</span>
+          <span className="event-listener-category">{category.name}</span>
         </label>
       </div>
     );
   }
 
   renderCategoryListing(category) {
-    const { activeEventListeners } = this.props;
-    const { expandedCategories } = this.state;
+    const { activeEventListeners, expandedCategories } = this.props;
 
-    const expanded = expandedCategories.includes(category);
+    const expanded = expandedCategories.includes(category.name);
     if (!expanded) {
       return null;
     }
 
     return (
       <ul>
-        {CATEGORIES[category].map(eventType => {
-          const key = getKey(category, eventType);
+        {category.events.map(event => {
           return (
-            <li className="event-listener-event" key={key}>
+            <li className="event-listener-event" key={event.id}>
               <label className="event-listener-label">
                 <input
                   type="checkbox"
-                  value={key}
-                  onChange={e => this.onEventTypeClick(key, e.target.checked)}
-                  checked={activeEventListeners.includes(key)}
+                  value={event.id}
+                  onChange={e =>
+                    this.onEventTypeClick(event.id, e.target.checked)
+                  }
+                  checked={activeEventListeners.includes(event.id)}
                 />
-                <span className="event-listener-name">{eventType}</span>
+                <span className="event-listener-name">{event.name}</span>
               </label>
             </li>
           );
@@ -153,12 +133,14 @@ class EventListeners extends Component<Props, State> {
   }
 
   render() {
+    const { categories } = this.props;
+
     return (
       <div className="event-listeners-content">
         <ul className="event-listeners-list">
-          {Object.keys(CATEGORIES).map(category => {
+          {categories.map((category, index) => {
             return (
-              <li className="event-listener-group" key={category}>
+              <li className="event-listener-group" key={index}>
                 {this.renderCategoryHeading(category)}
                 {this.renderCategoryListing(category)}
               </li>
@@ -170,14 +152,20 @@ class EventListeners extends Component<Props, State> {
   }
 }
 
-const mapStateToProps = state => ({
-  activeEventListeners: getActiveEventListeners(state),
-});
+const mapStateToProps = state => {
+  return {
+    activeEventListeners: getActiveEventListeners(state),
+    categories: getEventListenerBreakpointTypes(state),
+    expandedCategories: getEventListenerExpanded(state),
+  };
+};
 
 export default connect(
   mapStateToProps,
   {
-    addEventListeners: actions.addEventListeners,
-    removeEventListeners: actions.removeEventListeners,
+    addEventListeners: actions.addEventListenerBreakpoints,
+    removeEventListeners: actions.removeEventListenerBreakpoints,
+    addEventListenerExpanded: actions.addEventListenerExpanded,
+    removeEventListenerExpanded: actions.removeEventListenerExpanded,
   }
 )(EventListeners);
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/tests/EventListeners.spec.js b/devtools/client/debugger/src/components/SecondaryPanes/tests/EventListeners.spec.js
new file mode 100644
index 000000000000..8d837ac6412c
--- /dev/null
+++ b/devtools/client/debugger/src/components/SecondaryPanes/tests/EventListeners.spec.js
@@ -0,0 +1,82 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
+
+// @flow
+
+import React from "react";
+import { shallow } from "enzyme";
+import EventListeners from "../EventListeners";
+
+function getCategories() {
+  return [
+    {
+      name: "Category 1",
+      events: [
+        { name: "Subcategory 1", id: "category1.subcategory1" },
+        { name: "Subcategory 2", id: "category1.subcategory2" },
+      ],
+    },
+    {
+      name: "Category 2",
+      events: [
+        { name: "Subcategory 3", id: "category2.subcategory1" },
+        { name: "Subcategory 4", id: "category2.subcategory2" },
+      ],
+    },
+  ];
+}
+
+function generateDefaults(overrides = {}) {
+  const defaults = {
+    activeEventListeners: [],
+    expandedCategories: [],
+    categories: [],
+  };
+
+  return { ...defaults, ...overrides };
+}
+
+function render(overrides = {}) {
+  const props = generateDefaults(overrides);
+  // $FlowIgnore
+  const component = shallow(<EventListeners.WrappedComponent {...props} />);
+  return { component, props };
+}
+
+describe("EventListeners", () => {
+  it("should render", async () => {
+    const { component } = render();
+    expect(component).toMatchSnapshot();
+  });
+
+  it("should render categories appropriately", async () => {
+    const props = {
+      ...generateDefaults(),
+      categories: getCategories(),
+    };
+    const { component } = render(props);
+    expect(component).toMatchSnapshot();
+  });
+
+  it("should render expanded categories appropriately", async () => {
+    const props = {
+      ...generateDefaults(),
+      categories: getCategories(),
+      expandedCategories: ["Category 2"],
+    };
+    const { component } = render(props);
+    expect(component).toMatchSnapshot();
+  });
+
+  it("should render checked subcategories appropriately", async () => {
+    const props = {
+      ...generateDefaults(),
+      categories: getCategories(),
+      activeEventListeners: ["category1.subcategory2"],
+      expandedCategories: ["Category 1"],
+    };
+    const { component } = render(props);
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/EventListeners.spec.js.snap b/devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/EventListeners.spec.js.snap
new file mode 100644
index 000000000000..02869aa02edd
--- /dev/null
+++ b/devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/EventListeners.spec.js.snap
@@ -0,0 +1,320 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EventListeners should render 1`] = `
+<div
+  className="event-listeners-content"
+>
+  <ul
+    className="event-listeners-list"
+  />
+</div>
+`;
+
+exports[`EventListeners should render categories appropriately 1`] = `
+<div
+  className="event-listeners-content"
+>
+  <ul
+    className="event-listeners-list"
+  >
+    <li
+      className="event-listener-group"
+      key="0"
+    >
+      <div
+        className="event-listener-header"
+      >
+        <button
+          className="event-listener-expand"
+          onClick={[Function]}
+        >
+          <AccessibleImage
+            className="arrow"
+          />
+        </button>
+        <label
+          className="event-listener-label"
+        >
+          <input
+            checked={false}
+            onChange={[Function]}
+            type="checkbox"
+            value="Category 1"
+          />
+          <span
+            className="event-listener-category"
+          >
+            Category 1
+          </span>
+        </label>
+      </div>
+    </li>
+    <li
+      className="event-listener-group"
+      key="1"
+    >
+      <div
+        className="event-listener-header"
+      >
+        <button
+          className="event-listener-expand"
+          onClick={[Function]}
+        >
+          <AccessibleImage
+            className="arrow"
+          />
+        </button>
+        <label
+          className="event-listener-label"
+        >
+          <input
+            checked={false}
+            onChange={[Function]}
+            type="checkbox"
+            value="Category 2"
+          />
+          <span
+            className="event-listener-category"
+          >
+            Category 2
+          </span>
+        </label>
+      </div>
+    </li>
+  </ul>
+</div>
+`;
+
+exports[`EventListeners should render checked subcategories appropriately 1`] = `
+<div
+  className="event-listeners-content"
+>
+  <ul
+    className="event-listeners-list"
+  >
+    <li
+      className="event-listener-group"
+      key="0"
+    >
+      <div
+        className="event-listener-header"
+      >
+        <button
+          className="event-listener-expand"
+          onClick={[Function]}
+        >
+          <AccessibleImage
+            className="arrow expanded"
+          />
+        </button>
+        <label
+          className="event-listener-label"
+        >
+          <input
+            checked={false}
+            onChange={[Function]}
+            type="checkbox"
+            value="Category 1"
+          />
+          <span
+            className="event-listener-category"
+          >
+            Category 1
+          </span>
+        </label>
+      </div>
+      <ul>
+        <li
+          className="event-listener-event"
+          key="category1.subcategory1"
+        >
+          <label
+            className="event-listener-label"
+          >
+            <input
+              checked={false}
+              onChange={[Function]}
+              type="checkbox"
+              value="category1.subcategory1"
+            />
+            <span
+              className="event-listener-name"
+            >
+              Subcategory 1
+            </span>
+          </label>
+        </li>
+        <li
+          className="event-listener-event"
+          key="category1.subcategory2"
+        >
+          <label
+            className="event-listener-label"
+          >
+            <input
+              checked={true}
+              onChange={[Function]}
+              type="checkbox"
+              value="category1.subcategory2"
+            />
+            <span
+              className="event-listener-name"
+            >
+              Subcategory 2
+            </span>
+          </label>
+        </li>
+      </ul>
+    </li>
+    <li
+      className="event-listener-group"
+      key="1"
+    >
+      <div
+        className="event-listener-header"
+      >
+        <button
+          className="event-listener-expand"
+          onClick={[Function]}
+        >
+          <AccessibleImage
+            className="arrow"
+          />
+        </button>
+        <label
+          className="event-listener-label"
+        >
+          <input
+            checked={false}
+            onChange={[Function]}
+            type="checkbox"
+            value="Category 2"
+          />
+          <span
+            className="event-listener-category"
+          >
+            Category 2
+          </span>
+        </label>
+      </div>
+    </li>
+  </ul>
+</div>
+`;
+
+exports[`EventListeners should render expanded categories appropriately 1`] = `
+<div
+  className="event-listeners-content"
+>
+  <ul
+    className="event-listeners-list"
+  >
+    <li
+      className="event-listener-group"
+      key="0"
+    >
+      <div
+        className="event-listener-header"
+      >
+        <button
+          className="event-listener-expand"
+          onClick={[Function]}
+        >
+          <AccessibleImage
+            className="arrow"
+          />
+        </button>
+        <label
+          className="event-listener-label"
+        >
+          <input
+            checked={false}
+            onChange={[Function]}
+            type="checkbox"
+            value="Category 1"
+          />
+          <span
+            className="event-listener-category"
+          >
+            Category 1
+          </span>
+        </label>
+      </div>
+    </li>
+    <li
+      className="event-listener-group"
+      key="1"
+    >
+      <div
+        className="event-listener-header"
+      >
+        <button
+          className="event-listener-expand"
+          onClick={[Function]}
+        >
+          <AccessibleImage
+            className="arrow expanded"
+          />
+        </button>
+        <label
+          className="event-listener-label"
+        >
+          <input
+            checked={false}
+            onChange={[Function]}
+            type="checkbox"
+            value="Category 2"
+          />
+          <span
+            className="event-listener-category"
+          >
+            Category 2
+          </span>
+        </label>
+      </div>
+      <ul>
+        <li
+          className="event-listener-event"
+          key="category2.subcategory1"
+        >
+          <label
+            className="event-listener-label"
+          >
+            <input
+              checked={false}
+              onChange={[Function]}
+              type="checkbox"
+              value="category2.subcategory1"
+            />
+            <span
+              className="event-listener-name"
+            >
+              Subcategory 3
+            </span>
+          </label>
+        </li>
+        <li
+          className="event-listener-event"
+          key="category2.subcategory2"
+        >
+          <label
+            className="event-listener-label"
+          >
+            <input
+              checked={false}
+              onChange={[Function]}
+              type="checkbox"
+              value="category2.subcategory2"
+            />
+            <span
+              className="event-listener-name"
+            >
+              Subcategory 4
+            </span>
+          </label>
+        </li>
+      </ul>
+    </li>
+  </ul>
+</div>
+`;
diff --git a/devtools/client/debugger/src/reducers/event-listeners.js b/devtools/client/debugger/src/reducers/event-listeners.js
index 41da38eb09bf..e7349e38dbdc 100644
--- a/devtools/client/debugger/src/reducers/event-listeners.js
+++ b/devtools/client/debugger/src/reducers/event-listeners.js
@@ -4,45 +4,61 @@
 
 // @flow
 
-import { uniq } from "lodash";
+import type { State } from "./types";
+import type {
+  EventListenerAction,
+  EventListenerActiveList,
+  EventListenerCategoryList,
+  EventListenerExpandedList,
+} from "../actions/types";
 
-import { asyncStore } from "../utils/prefs";
-import type { EventListenerBreakpoints } from "../types";
+export type EventListenersState = {
+  active: EventListenerActiveList,
+  categories: EventListenerCategoryList,
+  expanded: EventListenerExpandedList,
+};
 
-type OuterState = { eventListenerBreakpoints: EventListenerBreakpoints };
+export function initialEventListenerState(): EventListenersState {
+  return {
+    active: [],
+    categories: [],
+    expanded: [],
+  };
+}
 
-function update(state: EventListenerBreakpoints = [], action: any) {
+function update(
+  state: EventListenersState = initialEventListenerState(),
+  action: EventListenerAction
+) {
   switch (action.type) {
-    case "ADD_EVENT_LISTENERS":
-      return updateEventTypes("add", state, action.events);
+    case "UPDATE_EVENT_LISTENERS":
+      return { ...state, active: action.active };
 
-    case "REMOVE_EVENT_LISTENERS":
-      return updateEventTypes("remove", state, action.events);
+    case "RECEIVE_EVENT_LISTENER_TYPES":
+      return { ...state, categories: action.categories };
+
+    case "UPDATE_EVENT_LISTENER_EXPANDED":
+      return { ...state, expanded: action.expanded };
 
     default:
       return state;
   }
 }
 
-function updateEventTypes(
-  addOrRemove: string,
-  currentEvents: EventListenerBreakpoints,
-  events: EventListenerBreakpoints
-): EventListenerBreakpoints {
-  let newEventListeners;
-
-  if (addOrRemove === "add") {
-    newEventListeners = uniq([...currentEvents, ...events]);
-  } else {
-    newEventListeners = currentEvents.filter(event => !events.includes(event));
-  }
-
-  asyncStore.eventListenerBreakpoints = newEventListeners;
-  return newEventListeners;
+export function getActiveEventListeners(state: State): EventListenerActiveList {
+  return state.eventListenerBreakpoints.active;
 }
 
-export function getActiveEventListeners(state: OuterState) {
-  return state.eventListenerBreakpoints;
+export function getEventListenerBreakpointTypes(
+  state: State
+): EventListenerCategoryList {
+  return state.eventListenerBreakpoints.categories;
+}
+
+export function getEventListenerExpanded(
+  state: State
+): EventListenerExpandedList {
+  return state.eventListenerBreakpoints.expanded;
 }
 
 export default update;
diff --git a/devtools/client/debugger/src/reducers/types.js b/devtools/client/debugger/src/reducers/types.js
index 97d9e3de5a9f..0abc8d955b09 100644
--- a/devtools/client/debugger/src/reducers/types.js
+++ b/devtools/client/debugger/src/reducers/types.js
@@ -24,11 +24,13 @@ import type { SourceActorsState } from "./source-actors";
 import type { TabList } from "./tabs";
 import type { UIState } from "./ui";
 import type { QuickOpenState } from "./quick-open";
+import type { EventListenersState } from "./event-listeners";
 
 export type State = {
   ast: ASTState,
   breakpoints: BreakpointsState,
   expressions: Record<ExpressionState>,
+  eventListenerBreakpoints: EventListenersState,
   debuggee: DebuggeeState,
   fileSearch: Record<FileSearchState>,
   pause: PauseState,
diff --git a/devtools/client/debugger/src/utils/prefs.js b/devtools/client/debugger/src/utils/prefs.js
index 1bb248d78cf0..8f4634331764 100644
--- a/devtools/client/debugger/src/utils/prefs.js
+++ b/devtools/client/debugger/src/utils/prefs.js
@@ -12,7 +12,7 @@ import { asyncStoreHelper } from "./asyncStoreHelper";
 // Schema version to bump when the async store format has changed incompatibly
 // and old stores should be cleared. This needs to match the prefs schema
 // version in devtools/client/preferences/debugger.js.
-const prefsSchemaVersion = "1.0.9";
+const prefsSchemaVersion = "1.0.10";
 const pref = Services.pref;
 
 if (isDevelopment()) {
@@ -134,7 +134,7 @@ export const asyncStore = asyncStoreHelper("debugger", {
   pendingBreakpoints: ["pending-breakpoints", {}],
   tabs: ["tabs", []],
   xhrBreakpoints: ["xhr-breakpoints", []],
-  eventListenerBreakpoints: ["event-listener-breakpoints", []],
+  eventListenerBreakpoints: ["event-listener-breakpoints", undefined],
 });
 
 export function verifyPrefSchema() {
@@ -143,6 +143,7 @@ export function verifyPrefSchema() {
     asyncStore.pendingBreakpoints = {};
     asyncStore.tabs = [];
     asyncStore.xhrBreakpoints = [];
+    asyncStore.eventListenerBreakpoints = undefined;
     prefs.debuggerPrefsSchemaVersion = prefsSchemaVersion;
   }
 }
diff --git a/devtools/client/preferences/debugger.js b/devtools/client/preferences/debugger.js
index 8cfde1502e97..a07b62c5320d 100644
--- a/devtools/client/preferences/debugger.js
+++ b/devtools/client/preferences/debugger.js
@@ -20,7 +20,7 @@ pref("devtools.debugger.workers", false);
 
 // The default Debugger UI settings
 // This schema version needs to match that in devtools/client/debugger/src/utils/prefs.js.
-pref("devtools.debugger.prefs-schema-version", "1.0.9");
+pref("devtools.debugger.prefs-schema-version", "1.0.10");
 pref("devtools.debugger.ui.panes-workers-and-sources-width", 200);
 pref("devtools.debugger.ui.panes-instruments-width", 300);
 pref("devtools.debugger.ui.panes-visible-on-startup", false);
@@ -46,7 +46,7 @@ pref("devtools.debugger.tabsBlackBoxed", "[]");
 pref("devtools.debugger.pending-selected-location", "{}");
 pref("devtools.debugger.pending-breakpoints", "{}");
 pref("devtools.debugger.expressions", "[]");
-pref("devtools.debugger.event-listener-breakpoints", "[]");
+pref("devtools.debugger.event-listener-breakpoints", undefined);
 pref("devtools.debugger.file-search-case-sensitive", false);
 pref("devtools.debugger.file-search-whole-word", false);
 pref("devtools.debugger.file-search-regex-match", false);

From 6b25c13613b029c51e4fa2368e8c194a4749b5d3 Mon Sep 17 00:00:00 2001
From: Andrei Oprea <andrei.br92@gmail.com>
Date: Mon, 20 May 2019 15:02:22 +0000
Subject: [PATCH 012/129] Bug 1548478 - Fix fluent warnings about missing
 translations for Bookmark Panel messages r=zbraniecki

Differential Revision: https://phabricator.services.mozilla.com/D30060

--HG--
extra : moz-landing-system : lando
---
 browser/components/newtab/lib/BookmarkPanelHub.jsm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/browser/components/newtab/lib/BookmarkPanelHub.jsm b/browser/components/newtab/lib/BookmarkPanelHub.jsm
index 288cc3a3eaf7..25c0fa0bb5ff 100644
--- a/browser/components/newtab/lib/BookmarkPanelHub.jsm
+++ b/browser/components/newtab/lib/BookmarkPanelHub.jsm
@@ -38,10 +38,7 @@ class _BookmarkPanelHub {
     this._handleMessageRequest = handleMessageRequest;
     this._addImpression = addImpression;
     this._dispatch = dispatch;
-    this._l10n = new DOMLocalization([
-      "browser/branding/sync-brand.ftl",
-      "browser/newtab/asrouter.ftl",
-    ]);
+    this._l10n = new DOMLocalization();
     this._initialized = true;
   }
 
@@ -92,6 +89,9 @@ class _BookmarkPanelHub {
     };
 
     if (response && response.content) {
+      // Only insert localization files if we need to show a message
+      win.MozXULElement.insertFTLIfNeeded("browser/newtab/asrouter.ftl");
+      win.MozXULElement.insertFTLIfNeeded("browser/branding/sync-brand.ftl");
       this.showMessage(response.content, target, win);
       this.sendImpression();
       this.sendUserEventTelemetry("IMPRESSION", win);
@@ -149,7 +149,6 @@ class _BookmarkPanelHub {
       recommendation.appendChild(title);
       recommendation.appendChild(content);
       recommendation.appendChild(cta);
-      this._l10n.translateElements([...recommendation.children]);
       target.container.appendChild(recommendation);
     }
 

From 09aeeca068cd75e9459d1d1c159e57e3c59bbae9 Mon Sep 17 00:00:00 2001
From: b4hand <bforehand@mozilla.com>
Date: Mon, 20 May 2019 08:59:56 +0000
Subject: [PATCH 013/129] Bug 1532607 - Add configuration to run telemetry
 tests directly; r=raphael,ahal

Differential Revision: https://phabricator.services.mozilla.com/D30663

--HG--
extra : moz-landing-system : lando
---
 python/mozbuild/mozbuild/frontend/context.py          |  3 +++
 python/mozbuild/mozbuild/testing.py                   |  4 ++++
 testing/mozbase/moztest/moztest/resolve.py            |  7 +++++++
 .../components/telemetry/tests/marionette/moz.build   | 11 +++++++++++
 toolkit/toolkit.mozbuild                              |  1 +
 5 files changed, 26 insertions(+)
 create mode 100644 toolkit/components/telemetry/tests/marionette/moz.build

diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py
index 2e3242937616..a0efc2a853cb 100644
--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/python/mozbuild/mozbuild/frontend/context.py
@@ -1908,6 +1908,9 @@ VARIABLES = {
         """List of manifest files defining cram unit tests.
         """),
 
+    'TELEMETRY_TESTS_CLIENT_MANIFESTS': (ManifestparserManifestList, list,
+        """List of manifest files defining telemetry client tests.
+        """),
 
     # The following variables are used to control the target of installed files.
     'XPI_NAME': (unicode, unicode,
diff --git a/python/mozbuild/mozbuild/testing.py b/python/mozbuild/mozbuild/testing.py
index 2e5a6b6efafe..9418940fb43b 100644
--- a/python/mozbuild/mozbuild/testing.py
+++ b/python/mozbuild/mozbuild/testing.py
@@ -49,6 +49,10 @@ TEST_MANIFESTS = dict(
     PUPPETEER_FIREFOX=('firefox-ui-functional', 'firefox-ui', '.', False),
     PYTHON_UNITTEST=('python', 'python', '.', False),
     CRAMTEST=('cram', 'cram', '.', False),
+    TELEMETRY_TESTS_CLIENT=(
+        'telemetry-tests-client',
+        'toolkit/components/telemetry/tests/marionette', '.', False
+    ),
 
     # marionette tests are run from the srcdir
     # TODO(ato): make packaging work as for other test suites
diff --git a/testing/mozbase/moztest/moztest/resolve.py b/testing/mozbase/moztest/moztest/resolve.py
index 98c742ba881d..a849f70f5024 100644
--- a/testing/mozbase/moztest/moztest/resolve.py
+++ b/testing/mozbase/moztest/moztest/resolve.py
@@ -144,6 +144,12 @@ TEST_SUITES = {
         'mach_command': 'python-test',
         'kwargs': {'tests': None},
     },
+    'telemetry-tests-client': {
+        'aliases': ('ttc',),
+        'mach_command': 'telemetry-tests-client',
+        'kwargs': {},
+        'task_regex': ['telemetry-tests-client($|.*(-1|[^0-9])$)'],
+    },
     'reftest': {
         'aliases': ('rr',),
         'mach_command': 'reftest',
@@ -224,6 +230,7 @@ _test_flavors = {
     'python': 'python',
     'reftest': 'reftest',
     'steeplechase': '',
+    'telemetry-tests-client': 'telemetry-tests-client',
     'web-platform-tests': 'web-platform-tests',
     'xpcshell': 'xpcshell',
 }
diff --git a/toolkit/components/telemetry/tests/marionette/moz.build b/toolkit/components/telemetry/tests/marionette/moz.build
new file mode 100644
index 000000000000..464949739aba
--- /dev/null
+++ b/toolkit/components/telemetry/tests/marionette/moz.build
@@ -0,0 +1,11 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+TELEMETRY_TESTS_CLIENT_MANIFESTS += ["tests/manifest.ini"]
+
+with Files("**"):
+    BUG_COMPONENT = ("Tookit", "Telemetry")
+    SCHEDULES.exclusive = ["telemetry-tests-client"]
\ No newline at end of file
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index 99de2b0437fc..94b9b96a3fba 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -167,6 +167,7 @@ if CONFIG['ENABLE_MARIONETTE']:
     DIRS += [
         '/testing/firefox-ui',
         '/testing/marionette',
+        '/toolkit/components/telemetry/tests/marionette',
     ]
 
 if CONFIG['ENABLE_GECKODRIVER'] and not CONFIG['MOZ_TSAN'] and not CONFIG['FUZZING_INTERFACES']:

From 48d4ac04dfbb6f473848f4782d75bf1f306d3858 Mon Sep 17 00:00:00 2001
From: Michael Kaply <mozilla@kaply.com>
Date: Mon, 20 May 2019 15:12:06 +0000
Subject: [PATCH 014/129] Bug 1446639 - Update policy tests to show URLs.
 r=jaws

Differential Revision: https://phabricator.services.mozilla.com/D31657

--HG--
extra : moz-landing-system : lando
---
 .../tests/browser/browser_policy_block_about_addons.js        | 4 ++--
 .../tests/browser/browser_policy_block_about_config.js        | 4 ++--
 .../tests/browser/browser_policy_block_about_profiles.js      | 4 ++--
 .../tests/browser/browser_policy_block_about_support.js       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_addons.js b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_addons.js
index 1bb63e81edc4..1a9ed35d343c 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_addons.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_addons.js
@@ -14,8 +14,8 @@ add_task(async function test_about_addons() {
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:addons", false);
 
   await ContentTask.spawn(tab.linkedBrowser, null, async function() {
-    ok(content.document.documentURI.startsWith("about:neterror"),
-       "about:addons should display the net error page");
+    ok(content.document.documentURI.startsWith("about:neterror?e=blockedByPolicy"),
+       content.document.documentURI + "should start with about:neterror?e=blockedByPolicy");
 
     // There is currently a testing-specific race condition that causes this test
     // to fail, but it is not a problem if we test after the first page load.
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_config.js b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_config.js
index 53ec86077c20..e24b85e57654 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_config.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_config.js
@@ -12,8 +12,8 @@ add_task(async function test_about_config() {
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:config", false);
 
   await ContentTask.spawn(tab.linkedBrowser, null, async function() {
-    ok(content.document.documentURI.startsWith("about:neterror"),
-       "about:config should display the net error page");
+    ok(content.document.documentURI.startsWith("about:neterror?e=blockedByPolicy"),
+       content.document.documentURI + "should start with about:neterror?e=blockedByPolicy");
 
     // There is currently a testing-specific race condition that causes this test
     // to fail, but it is not a problem if we test after the first page load.
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_profiles.js b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_profiles.js
index 7d0f2d9bf90b..15a4f605a84f 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_profiles.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_profiles.js
@@ -14,8 +14,8 @@ add_task(async function test_about_profiles() {
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:profiles", false);
 
   await ContentTask.spawn(tab.linkedBrowser, null, async function() {
-    ok(content.document.documentURI.startsWith("about:neterror"),
-       "about:profiles should display the net error page");
+    ok(content.document.documentURI.startsWith("about:neterror?e=blockedByPolicy"),
+       content.document.documentURI + "should start with about:neterror?e=blockedByPolicy");
 
     // There is currently a testing-specific race condition that causes this test
     // to fail, but it is not a problem if we test after the first page load.
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_support.js b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_support.js
index 7eb8d543df84..d8a7982ce4a0 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_support.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_block_about_support.js
@@ -14,8 +14,8 @@ add_task(async function test_about_support() {
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:support", false);
 
   await ContentTask.spawn(tab.linkedBrowser, null, async function() {
-    ok(content.document.documentURI.startsWith("about:neterror"),
-       "about:support should display the net error page");
+    ok(content.document.documentURI.startsWith("about:neterror?e=blockedByPolicy"),
+       content.document.documentURI + "should start with about:neterror?e=blockedByPolicy");
 
     // There is currently a testing-specific race condition that causes this test
     // to fail, but it is not a problem if we test after the first page load.

From aa9560f5f043da2193e5e3dca00c0da6bd23ec45 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Mon, 20 May 2019 15:18:25 +0000
Subject: [PATCH 015/129] Bug 1487113 - nsICacheInfoChannel.originalInputStream
 as attribute, r=valentin

Differential Revision: https://phabricator.services.mozilla.com/D31790

--HG--
extra : moz-landing-system : lando
---
 netwerk/base/nsICacheInfoChannel.idl          |  5 +-
 netwerk/protocol/http/HttpChannelChild.cpp    | 82 ++++++++++---------
 netwerk/protocol/http/HttpChannelChild.h      | 12 +--
 netwerk/protocol/http/HttpChannelParent.cpp   | 34 +++-----
 netwerk/protocol/http/HttpChannelParent.h     |  1 -
 .../protocol/http/InterceptedHttpChannel.cpp  |  5 +-
 netwerk/protocol/http/PHttpChannel.ipdl       |  6 +-
 netwerk/protocol/http/nsHttpChannel.cpp       | 14 ++--
 netwerk/test/unit/test_alt-data_simple.js     |  6 +-
 9 files changed, 74 insertions(+), 91 deletions(-)

diff --git a/netwerk/base/nsICacheInfoChannel.idl b/netwerk/base/nsICacheInfoChannel.idl
index 015f264a5ce9..140810d12b14 100644
--- a/netwerk/base/nsICacheInfoChannel.idl
+++ b/netwerk/base/nsICacheInfoChannel.idl
@@ -148,10 +148,9 @@ interface nsICacheInfoChannel : nsISupports
 
   /**
    * Sometimes when the channel is delivering alt-data, we may want to somehow
-   * access the original content too. This method asynchronously opens the
-   * input stream and delivers it to the receiver.
+   * access the original content too.
    */
-  void getOriginalInputStream(in nsIInputStreamReceiver aReceiver);
+  readonly attribute nsIInputStream originalInputStream;
 
   /**
    * Opens and returns an output stream that a consumer may use to save an
diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index 9dceeb4745a2..8efd96fb23a9 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -395,20 +395,24 @@ void HttpChannelChild::AssociateApplicationCache(const nsCString& groupID,
 
 class StartRequestEvent : public NeckoTargetChannelEvent<HttpChannelChild> {
  public:
-  StartRequestEvent(
-      HttpChannelChild* aChild, const nsresult& aChannelStatus,
-      const nsHttpResponseHead& aResponseHead, const bool& aUseResponseHead,
-      const nsHttpHeaderArray& aRequestHeaders,
-      const ParentLoadInfoForwarderArgs& loadInfoForwarder,
-      const bool& aIsFromCache, const bool& aIsRacing,
-      const bool& aCacheEntryAvailable, const uint64_t& aCacheEntryId,
-      const int32_t& aCacheFetchCount, const uint32_t& aCacheExpirationTime,
-      const nsCString& aCachedCharset,
-      const nsCString& aSecurityInfoSerialization, const NetAddr& aSelfAddr,
-      const NetAddr& aPeerAddr, const uint32_t& aCacheKey,
-      const nsCString& altDataType, const int64_t& altDataLen,
-      const bool& deliveringAltData, const bool& aApplyConversion,
-      const bool& aIsResolvedByTRR, const ResourceTimingStruct& aTiming)
+  StartRequestEvent(HttpChannelChild* aChild, const nsresult& aChannelStatus,
+                    const nsHttpResponseHead& aResponseHead,
+                    const bool& aUseResponseHead,
+                    const nsHttpHeaderArray& aRequestHeaders,
+                    const ParentLoadInfoForwarderArgs& loadInfoForwarder,
+                    const bool& aIsFromCache, const bool& aIsRacing,
+                    const bool& aCacheEntryAvailable,
+                    const uint64_t& aCacheEntryId,
+                    const int32_t& aCacheFetchCount,
+                    const uint32_t& aCacheExpirationTime,
+                    const nsCString& aCachedCharset,
+                    const nsCString& aSecurityInfoSerialization,
+                    const NetAddr& aSelfAddr, const NetAddr& aPeerAddr,
+                    const uint32_t& aCacheKey, const nsCString& altDataType,
+                    const int64_t& altDataLen, const bool& deliveringAltData,
+                    already_AddRefed<nsIInputStream> originalCacheInputStream,
+                    const bool& aApplyConversion, const bool& aIsResolvedByTRR,
+                    const ResourceTimingStruct& aTiming)
       : NeckoTargetChannelEvent<HttpChannelChild>(aChild),
         mChannelStatus(aChannelStatus),
         mResponseHead(aResponseHead),
@@ -429,6 +433,7 @@ class StartRequestEvent : public NeckoTargetChannelEvent<HttpChannelChild> {
         mAltDataType(altDataType),
         mAltDataLen(altDataLen),
         mDeliveringAltData(deliveringAltData),
+        mOriginalCacheInputStream(originalCacheInputStream),
         mLoadInfoForwarder(loadInfoForwarder),
         mIsResolvedByTRR(aIsResolvedByTRR),
         mTiming(aTiming) {}
@@ -440,8 +445,9 @@ class StartRequestEvent : public NeckoTargetChannelEvent<HttpChannelChild> {
         mLoadInfoForwarder, mIsFromCache, mIsRacing, mCacheEntryAvailable,
         mCacheEntryId, mCacheFetchCount, mCacheExpirationTime, mCachedCharset,
         mSecurityInfoSerialization, mSelfAddr, mPeerAddr, mCacheKey,
-        mAltDataType, mAltDataLen, mDeliveringAltData, mApplyConversion,
-        mIsResolvedByTRR, mTiming);
+        mAltDataType, mAltDataLen, mDeliveringAltData,
+        mOriginalCacheInputStream.forget(), mApplyConversion, mIsResolvedByTRR,
+        mTiming);
   }
 
  private:
@@ -464,6 +470,7 @@ class StartRequestEvent : public NeckoTargetChannelEvent<HttpChannelChild> {
   nsCString mAltDataType;
   int64_t mAltDataLen;
   bool mDeliveringAltData;
+  nsCOMPtr<nsIInputStream> mOriginalCacheInputStream;
   ParentLoadInfoForwarderArgs mLoadInfoForwarder;
   bool mIsResolvedByTRR;
   ResourceTimingStruct mTiming;
@@ -480,8 +487,10 @@ mozilla::ipc::IPCResult HttpChannelChild::RecvOnStartRequest(
     const NetAddr& selfAddr, const NetAddr& peerAddr,
     const int16_t& redirectCount, const uint32_t& cacheKey,
     const nsCString& altDataType, const int64_t& altDataLen,
-    const bool& deliveringAltData, const bool& aApplyConversion,
-    const bool& aIsResolvedByTRR, const ResourceTimingStruct& aTiming) {
+    const bool& deliveringAltData,
+    const Maybe<IPCStream>& aOriginalCacheInputStream,
+    const bool& aApplyConversion, const bool& aIsResolvedByTRR,
+    const ResourceTimingStruct& aTiming) {
   AUTO_PROFILER_LABEL("HttpChannelChild::RecvOnStartRequest", NETWORK);
   LOG(("HttpChannelChild::RecvOnStartRequest [this=%p]\n", this));
   // mFlushedForDiversion and mDivertingToParent should NEVER be set at this
@@ -495,13 +504,16 @@ mozilla::ipc::IPCResult HttpChannelChild::RecvOnStartRequest(
 
   mRedirectCount = redirectCount;
 
+  nsCOMPtr<nsIInputStream> originalCacheInputStream =
+      DeserializeIPCStream(aOriginalCacheInputStream);
+
   mEventQ->RunOrEnqueue(new StartRequestEvent(
       this, channelStatus, responseHead, useResponseHead, requestHeaders,
       loadInfoForwarder, isFromCache, isRacing, cacheEntryAvailable,
       cacheEntryId, cacheFetchCount, cacheExpirationTime, cachedCharset,
       securityInfoSerialization, selfAddr, peerAddr, cacheKey, altDataType,
-      altDataLen, deliveringAltData, aApplyConversion, aIsResolvedByTRR,
-      aTiming));
+      altDataLen, deliveringAltData, originalCacheInputStream.forget(),
+      aApplyConversion, aIsResolvedByTRR, aTiming));
 
   {
     // Child's mEventQ is to control the execution order of the IPC messages
@@ -534,8 +546,10 @@ void HttpChannelChild::OnStartRequest(
     const nsCString& cachedCharset, const nsCString& securityInfoSerialization,
     const NetAddr& selfAddr, const NetAddr& peerAddr, const uint32_t& cacheKey,
     const nsCString& altDataType, const int64_t& altDataLen,
-    const bool& deliveringAltData, const bool& aApplyConversion,
-    const bool& aIsResolvedByTRR, const ResourceTimingStruct& aTiming) {
+    const bool& deliveringAltData,
+    already_AddRefed<nsIInputStream> originalCacheInputStream,
+    const bool& aApplyConversion, const bool& aIsResolvedByTRR,
+    const ResourceTimingStruct& aTiming) {
   LOG(("HttpChannelChild::OnStartRequest [this=%p]\n", this));
 
   // mFlushedForDiversion and mDivertingToParent should NEVER be set at this
@@ -547,6 +561,8 @@ void HttpChannelChild::OnStartRequest(
       !mDivertingToParent,
       "mDivertingToParent should be unset before OnStartRequest!");
 
+  mOriginalCacheInputStream = originalCacheInputStream;
+
   // If this channel was aborted by ActorDestroy, then there may be other
   // OnStartRequest/OnStopRequest/OnDataAvailable IPC messages that need to
   // be handled. In that case we just ignore them to avoid calling the listener
@@ -3236,17 +3252,15 @@ HttpChannelChild::OpenAlternativeOutputStream(const nsACString& aType,
 }
 
 NS_IMETHODIMP
-HttpChannelChild::GetOriginalInputStream(nsIInputStreamReceiver* aReceiver) {
-  if (aReceiver == nullptr) {
-    return NS_ERROR_INVALID_ARG;
-  }
+HttpChannelChild::GetOriginalInputStream(nsIInputStream** aInputStream) {
+  NS_ENSURE_ARG_POINTER(aInputStream);
 
   if (!mIPCOpen) {
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  mOriginalInputStreamReceiver = aReceiver;
-  Unused << SendOpenOriginalCacheInputStream();
+  nsCOMPtr<nsIInputStream> is = mOriginalCacheInputStream;
+  is.forget(aInputStream);
 
   return NS_OK;
 }
@@ -3268,18 +3282,6 @@ HttpChannelChild::GetAltDataInputStream(const nsACString& aType,
   return NS_OK;
 }
 
-mozilla::ipc::IPCResult HttpChannelChild::RecvOriginalCacheInputStreamAvailable(
-    const Maybe<IPCStream>& aStream) {
-  nsCOMPtr<nsIInputStream> stream = DeserializeIPCStream(aStream);
-  nsCOMPtr<nsIInputStreamReceiver> receiver;
-  receiver.swap(mOriginalInputStreamReceiver);
-  if (receiver) {
-    receiver->OnInputStreamReady(stream);
-  }
-
-  return IPC_OK();
-}
-
 mozilla::ipc::IPCResult HttpChannelChild::RecvAltDataCacheInputStreamAvailable(
     const Maybe<IPCStream>& aStream) {
   nsCOMPtr<nsIInputStream> stream = DeserializeIPCStream(aStream);
diff --git a/netwerk/protocol/http/HttpChannelChild.h b/netwerk/protocol/http/HttpChannelChild.h
index deaec9682560..a825f7540864 100644
--- a/netwerk/protocol/http/HttpChannelChild.h
+++ b/netwerk/protocol/http/HttpChannelChild.h
@@ -146,6 +146,7 @@ class HttpChannelChild final : public PHttpChannelChild,
       const NetAddr& peerAddr, const int16_t& redirectCount,
       const uint32_t& cacheKey, const nsCString& altDataType,
       const int64_t& altDataLen, const bool& deliveringAltData,
+      const Maybe<IPCStream>& originalCacheInputStream,
       const bool& aApplyConversion, const bool& aIsResolvedByTRR,
       const ResourceTimingStruct& aTiming) override;
   mozilla::ipc::IPCResult RecvFailedAsyncOpen(const nsresult& status) override;
@@ -177,9 +178,6 @@ class HttpChannelChild final : public PHttpChannelChild,
 
   mozilla::ipc::IPCResult RecvCancelRedirected() override;
 
-  mozilla::ipc::IPCResult RecvOriginalCacheInputStreamAvailable(
-      const Maybe<IPCStream>& aStream) override;
-
   mozilla::ipc::IPCResult RecvAltDataCacheInputStreamAvailable(
       const Maybe<IPCStream>& aStream) override;
 
@@ -350,7 +348,7 @@ class HttpChannelChild final : public PHttpChannelChild,
   nsCOMPtr<nsICacheInfoChannel> mSynthesizedCacheInfo;
   RefPtr<ChannelEventQueue> mEventQ;
 
-  nsCOMPtr<nsIInputStreamReceiver> mOriginalInputStreamReceiver;
+  nsCOMPtr<nsIInputStream> mOriginalCacheInputStream;
   nsCOMPtr<nsIInputStreamReceiver> mAltDataInputStreamReceiver;
 
   // Used to ensure atomicity of mBgChild and mBgInitFailCallback
@@ -478,8 +476,10 @@ class HttpChannelChild final : public PHttpChannelChild,
       const nsCString& securityInfoSerialization, const NetAddr& selfAddr,
       const NetAddr& peerAddr, const uint32_t& cacheKey,
       const nsCString& altDataType, const int64_t& altDataLen,
-      const bool& deliveringAltData, const bool& aApplyConversion,
-      const bool& aIsResolvedByTRR, const ResourceTimingStruct& aTiming);
+      const bool& deliveringAltData,
+      already_AddRefed<nsIInputStream> originalCacheInputStream,
+      const bool& aApplyConversion, const bool& aIsResolvedByTRR,
+      const ResourceTimingStruct& aTiming);
   void MaybeDivertOnData(const nsCString& data, const uint64_t& offset,
                          const uint32_t& count);
   void OnTransportAndData(const nsresult& channelStatus, const nsresult& status,
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index f39b3a9b56a8..0a46ce56075f 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -1467,6 +1467,17 @@ HttpChannelParent::OnStartRequest(nsIRequest* aRequest) {
   bool isResolvedByTRR = false;
   chan->GetIsResolvedByTRR(&isResolvedByTRR);
 
+  AutoIPCStream originalCacheInputStream(true /* delay start */);
+  if (mCacheEntry) {
+    nsCOMPtr<nsIInputStream> inputStream;
+    nsresult rv = mCacheEntry->OpenInputStream(0, getter_AddRefs(inputStream));
+    if (NS_SUCCEEDED(rv)) {
+      PContentParent* pcp = Manager()->Manager();
+      Unused << originalCacheInputStream.Serialize(
+          inputStream, static_cast<ContentParent*>(pcp));
+    }
+  }
+
   rv = NS_OK;
   if (mIPCClosed ||
       !SendOnStartRequest(
@@ -1476,7 +1487,8 @@ HttpChannelParent::OnStartRequest(nsIRequest* aRequest) {
           mCacheEntry ? true : false, cacheEntryId, fetchCount, expirationTime,
           cachedCharset, secInfoSerialization, chan->GetSelfAddr(),
           chan->GetPeerAddr(), redirectCount, cacheKey, altDataType, altDataLen,
-          deliveringAltData, applyConversion, isResolvedByTRR, timing)) {
+          deliveringAltData, originalCacheInputStream.TakeOptionalValue(),
+          applyConversion, isResolvedByTRR, timing)) {
     rv = NS_ERROR_UNEXPECTED;
   }
   requestHead->Exit();
@@ -1692,26 +1704,6 @@ mozilla::ipc::IPCResult HttpChannelParent::RecvBytesRead(
   return IPC_OK();
 }
 
-mozilla::ipc::IPCResult HttpChannelParent::RecvOpenOriginalCacheInputStream() {
-  if (mIPCClosed) {
-    return IPC_OK();
-  }
-  AutoIPCStream autoStream;
-  if (mCacheEntry) {
-    nsCOMPtr<nsIInputStream> inputStream;
-    nsresult rv = mCacheEntry->OpenInputStream(0, getter_AddRefs(inputStream));
-    if (NS_SUCCEEDED(rv)) {
-      PContentParent* pcp = Manager()->Manager();
-      Unused << autoStream.Serialize(inputStream,
-                                     static_cast<ContentParent*>(pcp));
-    }
-  }
-
-  Unused << SendOriginalCacheInputStreamAvailable(
-      autoStream.TakeOptionalValue());
-  return IPC_OK();
-}
-
 mozilla::ipc::IPCResult HttpChannelParent::RecvOpenAltDataCacheInputStream(
     const nsCString& aType) {
   if (mIPCClosed) {
diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h
index 825728ad26a4..1b65e8fd32aa 100644
--- a/netwerk/protocol/http/HttpChannelParent.h
+++ b/netwerk/protocol/http/HttpChannelParent.h
@@ -205,7 +205,6 @@ class HttpChannelParent final : public nsIInterfaceRequestor,
       const URIParams& uri,
       const mozilla::ipc::PrincipalInfo& requestingPrincipal) override;
   virtual mozilla::ipc::IPCResult RecvBytesRead(const int32_t& aCount) override;
-  virtual mozilla::ipc::IPCResult RecvOpenOriginalCacheInputStream() override;
   virtual mozilla::ipc::IPCResult RecvOpenAltDataCacheInputStream(
       const nsCString& aType) override;
   virtual void ActorDestroy(ActorDestroyReason why) override;
diff --git a/netwerk/protocol/http/InterceptedHttpChannel.cpp b/netwerk/protocol/http/InterceptedHttpChannel.cpp
index b2e194f188fc..2d458206ca66 100644
--- a/netwerk/protocol/http/InterceptedHttpChannel.cpp
+++ b/netwerk/protocol/http/InterceptedHttpChannel.cpp
@@ -1284,10 +1284,9 @@ InterceptedHttpChannel::OpenAlternativeOutputStream(
 }
 
 NS_IMETHODIMP
-InterceptedHttpChannel::GetOriginalInputStream(
-    nsIInputStreamReceiver* aReceiver) {
+InterceptedHttpChannel::GetOriginalInputStream(nsIInputStream** aStream) {
   if (mSynthesizedCacheInfo) {
-    return mSynthesizedCacheInfo->GetOriginalInputStream(aReceiver);
+    return mSynthesizedCacheInfo->GetOriginalInputStream(aStream);
   }
   return NS_ERROR_NOT_AVAILABLE;
 }
diff --git a/netwerk/protocol/http/PHttpChannel.ipdl b/netwerk/protocol/http/PHttpChannel.ipdl
index e58a0752a1c1..48baf1fad9c8 100644
--- a/netwerk/protocol/http/PHttpChannel.ipdl
+++ b/netwerk/protocol/http/PHttpChannel.ipdl
@@ -94,9 +94,6 @@ parent:
   // sure not to send any more messages after that.
   async DeletingChannel();
 
-  // Called to get the input stream when altData was delivered.
-  async OpenOriginalCacheInputStream();
-
   // Called to get the input stream when altData is available.
   async OpenAltDataCacheInputStream(nsCString aType);
 
@@ -127,6 +124,7 @@ child:
                        nsCString           altDataType,
                        int64_t             altDataLength,
                        bool                deliveringAltData,
+                       IPCStream?          originalCacheInputStream,
                        bool                applyConversion,
                        bool                isResolvedByTRR,
                        ResourceTimingStruct timing);
@@ -185,8 +183,6 @@ child:
   // See ADivertableParentChannel::CancelDiversion
   async CancelDiversion();
 
-  async OriginalCacheInputStreamAvailable(IPCStream? stream);
-
   async AltDataCacheInputStreamAvailable(IPCStream? stream);
 
 both:
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index c02bfed4a3db..c387d908dc29 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -8613,18 +8613,18 @@ nsHttpChannel::OpenAlternativeOutputStream(const nsACString& type,
 }
 
 NS_IMETHODIMP
-nsHttpChannel::GetOriginalInputStream(nsIInputStreamReceiver* aReceiver) {
-  if (aReceiver == nullptr) {
-    return NS_ERROR_INVALID_ARG;
-  }
-  nsCOMPtr<nsIInputStream> inputStream;
+nsHttpChannel::GetOriginalInputStream(nsIInputStream** aInputStream) {
+  NS_ENSURE_ARG_POINTER(aInputStream);
+
+  *aInputStream = nullptr;
 
   nsCOMPtr<nsICacheEntry> cacheEntry =
       mCacheEntry ? mCacheEntry : mAltDataCacheEntry;
   if (cacheEntry) {
-    cacheEntry->OpenInputStream(0, getter_AddRefs(inputStream));
+    nsresult rv = cacheEntry->OpenInputStream(0, aInputStream);
+    NS_ENSURE_SUCCESS(rv, rv);
   }
-  aReceiver->OnInputStreamReady(inputStream);
+
   return NS_OK;
 }
 
diff --git a/netwerk/test/unit/test_alt-data_simple.js b/netwerk/test/unit/test_alt-data_simple.js
index 8aa86d4b655c..3b005d0fa48e 100644
--- a/netwerk/test/unit/test_alt-data_simple.js
+++ b/netwerk/test/unit/test_alt-data_simple.js
@@ -150,11 +150,7 @@ function readAltContent(request, buffer)
   Assert.equal(buffer, altContent);
   check_has_alt_data_in_index(true);
 
-  cc.getOriginalInputStream({
-    onInputStreamReady: function(aInputStream) {
-      executeSoon(() => readOriginalInputStream(aInputStream));
-    }
-  });
+  executeSoon(() => readOriginalInputStream(cc.originalInputStream));
 }
 
 function readOriginalInputStream(aInputStream)

From 32fb7a2445768692b4df4427d059f3df2cd96892 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Mon, 20 May 2019 15:22:47 +0000
Subject: [PATCH 016/129] Bug 1487113 -
 nsICacheInfoChannel.alternativeDataInputStream as attribute, r=valentin

Differential Revision: https://phabricator.services.mozilla.com/D31791

--HG--
extra : moz-landing-system : lando
---
 netwerk/base/nsICacheInfoChannel.idl          |  7 ++-
 netwerk/protocol/http/HttpChannelChild.cpp    | 46 +++++++---------
 netwerk/protocol/http/HttpChannelChild.h      |  9 ++--
 netwerk/protocol/http/HttpChannelParent.cpp   | 53 +++++++++----------
 netwerk/protocol/http/HttpChannelParent.h     |  2 -
 .../protocol/http/InterceptedHttpChannel.cpp  |  6 +--
 netwerk/protocol/http/PHttpChannel.ipdl       |  6 +--
 netwerk/protocol/http/nsHttpChannel.cpp       | 17 +++---
 netwerk/test/unit/test_alt-data_stream.js     |  8 +--
 .../test_alt-data_cross_process_wrap.js       | 34 +-----------
 10 files changed, 66 insertions(+), 122 deletions(-)

diff --git a/netwerk/base/nsICacheInfoChannel.idl b/netwerk/base/nsICacheInfoChannel.idl
index 140810d12b14..26346109e46f 100644
--- a/netwerk/base/nsICacheInfoChannel.idl
+++ b/netwerk/base/nsICacheInfoChannel.idl
@@ -140,11 +140,10 @@ interface nsICacheInfoChannel : nsISupports
 
   /**
    * If preferAlternativeDataType() has been called passing deliverAltData
-   * equal to false, this method will expose the alt-data inputStream if
-   * aviable.
+   * equal to false, this attribute will expose the alt-data inputStream if
+   * avaiable.
    */
-  void getAltDataInputStream(in ACString type,
-                             in nsIInputStreamReceiver aReceiver);
+  readonly attribute nsIInputStream alternativeDataInputStream;
 
   /**
    * Sometimes when the channel is delivering alt-data, we may want to somehow
diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index 8efd96fb23a9..70ddfef3ccbf 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -411,6 +411,7 @@ class StartRequestEvent : public NeckoTargetChannelEvent<HttpChannelChild> {
                     const uint32_t& aCacheKey, const nsCString& altDataType,
                     const int64_t& altDataLen, const bool& deliveringAltData,
                     already_AddRefed<nsIInputStream> originalCacheInputStream,
+                    already_AddRefed<nsIInputStream> altDataInputStream,
                     const bool& aApplyConversion, const bool& aIsResolvedByTRR,
                     const ResourceTimingStruct& aTiming)
       : NeckoTargetChannelEvent<HttpChannelChild>(aChild),
@@ -434,6 +435,7 @@ class StartRequestEvent : public NeckoTargetChannelEvent<HttpChannelChild> {
         mAltDataLen(altDataLen),
         mDeliveringAltData(deliveringAltData),
         mOriginalCacheInputStream(originalCacheInputStream),
+        mAltDataInputStream(altDataInputStream),
         mLoadInfoForwarder(loadInfoForwarder),
         mIsResolvedByTRR(aIsResolvedByTRR),
         mTiming(aTiming) {}
@@ -446,8 +448,8 @@ class StartRequestEvent : public NeckoTargetChannelEvent<HttpChannelChild> {
         mCacheEntryId, mCacheFetchCount, mCacheExpirationTime, mCachedCharset,
         mSecurityInfoSerialization, mSelfAddr, mPeerAddr, mCacheKey,
         mAltDataType, mAltDataLen, mDeliveringAltData,
-        mOriginalCacheInputStream.forget(), mApplyConversion, mIsResolvedByTRR,
-        mTiming);
+        mOriginalCacheInputStream.forget(), mAltDataInputStream.forget(),
+        mApplyConversion, mIsResolvedByTRR, mTiming);
   }
 
  private:
@@ -471,6 +473,7 @@ class StartRequestEvent : public NeckoTargetChannelEvent<HttpChannelChild> {
   int64_t mAltDataLen;
   bool mDeliveringAltData;
   nsCOMPtr<nsIInputStream> mOriginalCacheInputStream;
+  nsCOMPtr<nsIInputStream> mAltDataInputStream;
   ParentLoadInfoForwarderArgs mLoadInfoForwarder;
   bool mIsResolvedByTRR;
   ResourceTimingStruct mTiming;
@@ -489,8 +492,8 @@ mozilla::ipc::IPCResult HttpChannelChild::RecvOnStartRequest(
     const nsCString& altDataType, const int64_t& altDataLen,
     const bool& deliveringAltData,
     const Maybe<IPCStream>& aOriginalCacheInputStream,
-    const bool& aApplyConversion, const bool& aIsResolvedByTRR,
-    const ResourceTimingStruct& aTiming) {
+    const Maybe<IPCStream>& aAltDataInputStream, const bool& aApplyConversion,
+    const bool& aIsResolvedByTRR, const ResourceTimingStruct& aTiming) {
   AUTO_PROFILER_LABEL("HttpChannelChild::RecvOnStartRequest", NETWORK);
   LOG(("HttpChannelChild::RecvOnStartRequest [this=%p]\n", this));
   // mFlushedForDiversion and mDivertingToParent should NEVER be set at this
@@ -507,13 +510,17 @@ mozilla::ipc::IPCResult HttpChannelChild::RecvOnStartRequest(
   nsCOMPtr<nsIInputStream> originalCacheInputStream =
       DeserializeIPCStream(aOriginalCacheInputStream);
 
+  nsCOMPtr<nsIInputStream> altDataInputStream =
+      DeserializeIPCStream(aAltDataInputStream);
+
   mEventQ->RunOrEnqueue(new StartRequestEvent(
       this, channelStatus, responseHead, useResponseHead, requestHeaders,
       loadInfoForwarder, isFromCache, isRacing, cacheEntryAvailable,
       cacheEntryId, cacheFetchCount, cacheExpirationTime, cachedCharset,
       securityInfoSerialization, selfAddr, peerAddr, cacheKey, altDataType,
       altDataLen, deliveringAltData, originalCacheInputStream.forget(),
-      aApplyConversion, aIsResolvedByTRR, aTiming));
+      altDataInputStream.forget(), aApplyConversion, aIsResolvedByTRR,
+      aTiming));
 
   {
     // Child's mEventQ is to control the execution order of the IPC messages
@@ -548,6 +555,7 @@ void HttpChannelChild::OnStartRequest(
     const nsCString& altDataType, const int64_t& altDataLen,
     const bool& deliveringAltData,
     already_AddRefed<nsIInputStream> originalCacheInputStream,
+    already_AddRefed<nsIInputStream> altDataInputStream,
     const bool& aApplyConversion, const bool& aIsResolvedByTRR,
     const ResourceTimingStruct& aTiming) {
   LOG(("HttpChannelChild::OnStartRequest [this=%p]\n", this));
@@ -562,6 +570,7 @@ void HttpChannelChild::OnStartRequest(
       "mDivertingToParent should be unset before OnStartRequest!");
 
   mOriginalCacheInputStream = originalCacheInputStream;
+  mAltDataInputStream = altDataInputStream;
 
   // If this channel was aborted by ActorDestroy, then there may be other
   // OnStartRequest/OnStopRequest/OnDataAvailable IPC messages that need to
@@ -3266,34 +3275,15 @@ HttpChannelChild::GetOriginalInputStream(nsIInputStream** aInputStream) {
 }
 
 NS_IMETHODIMP
-HttpChannelChild::GetAltDataInputStream(const nsACString& aType,
-                                        nsIInputStreamReceiver* aReceiver) {
-  if (aReceiver == nullptr) {
-    return NS_ERROR_INVALID_ARG;
-  }
+HttpChannelChild::GetAlternativeDataInputStream(nsIInputStream** aInputStream) {
+  NS_ENSURE_ARG_POINTER(aInputStream);
 
-  if (!mIPCOpen) {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  mAltDataInputStreamReceiver = aReceiver;
-  Unused << SendOpenAltDataCacheInputStream(nsCString(aType));
+  nsCOMPtr<nsIInputStream> is = mAltDataInputStream;
+  is.forget(aInputStream);
 
   return NS_OK;
 }
 
-mozilla::ipc::IPCResult HttpChannelChild::RecvAltDataCacheInputStreamAvailable(
-    const Maybe<IPCStream>& aStream) {
-  nsCOMPtr<nsIInputStream> stream = DeserializeIPCStream(aStream);
-  nsCOMPtr<nsIInputStreamReceiver> receiver;
-  receiver.swap(mAltDataInputStreamReceiver);
-  if (receiver) {
-    receiver->OnInputStreamReady(stream);
-  }
-
-  return IPC_OK();
-}
-
 //-----------------------------------------------------------------------------
 // HttpChannelChild::nsIResumableChannel
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/HttpChannelChild.h b/netwerk/protocol/http/HttpChannelChild.h
index a825f7540864..d6f4f2ba1021 100644
--- a/netwerk/protocol/http/HttpChannelChild.h
+++ b/netwerk/protocol/http/HttpChannelChild.h
@@ -147,7 +147,8 @@ class HttpChannelChild final : public PHttpChannelChild,
       const uint32_t& cacheKey, const nsCString& altDataType,
       const int64_t& altDataLen, const bool& deliveringAltData,
       const Maybe<IPCStream>& originalCacheInputStream,
-      const bool& aApplyConversion, const bool& aIsResolvedByTRR,
+      const Maybe<IPCStream>& altDataInputStream, const bool& aApplyConversion,
+      const bool& aIsResolvedByTRR,
       const ResourceTimingStruct& aTiming) override;
   mozilla::ipc::IPCResult RecvFailedAsyncOpen(const nsresult& status) override;
   mozilla::ipc::IPCResult RecvRedirect1Begin(
@@ -178,9 +179,6 @@ class HttpChannelChild final : public PHttpChannelChild,
 
   mozilla::ipc::IPCResult RecvCancelRedirected() override;
 
-  mozilla::ipc::IPCResult RecvAltDataCacheInputStreamAvailable(
-      const Maybe<IPCStream>& aStream) override;
-
   virtual void ActorDestroy(ActorDestroyReason aWhy) override;
 
   virtual void DoNotifyListenerCleanup() override;
@@ -349,7 +347,7 @@ class HttpChannelChild final : public PHttpChannelChild,
   RefPtr<ChannelEventQueue> mEventQ;
 
   nsCOMPtr<nsIInputStream> mOriginalCacheInputStream;
-  nsCOMPtr<nsIInputStreamReceiver> mAltDataInputStreamReceiver;
+  nsCOMPtr<nsIInputStream> mAltDataInputStream;
 
   // Used to ensure atomicity of mBgChild and mBgInitFailCallback
   Mutex mBgChildMutex;
@@ -478,6 +476,7 @@ class HttpChannelChild final : public PHttpChannelChild,
       const nsCString& altDataType, const int64_t& altDataLen,
       const bool& deliveringAltData,
       already_AddRefed<nsIInputStream> originalCacheInputStream,
+      already_AddRefed<nsIInputStream> altDataInputStream,
       const bool& aApplyConversion, const bool& aIsResolvedByTRR,
       const ResourceTimingStruct& aTiming);
   void MaybeDivertOnData(const nsCString& data, const uint64_t& offset,
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index 0a46ce56075f..c1be31a58917 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -1468,13 +1468,29 @@ HttpChannelParent::OnStartRequest(nsIRequest* aRequest) {
   chan->GetIsResolvedByTRR(&isResolvedByTRR);
 
   AutoIPCStream originalCacheInputStream(true /* delay start */);
+  AutoIPCStream altDataInputStream(true /* delay start */);
+
   if (mCacheEntry) {
-    nsCOMPtr<nsIInputStream> inputStream;
-    nsresult rv = mCacheEntry->OpenInputStream(0, getter_AddRefs(inputStream));
-    if (NS_SUCCEEDED(rv)) {
-      PContentParent* pcp = Manager()->Manager();
-      Unused << originalCacheInputStream.Serialize(
-          inputStream, static_cast<ContentParent*>(pcp));
+    PContentParent* pcp = Manager()->Manager();
+
+    {
+      nsCOMPtr<nsIInputStream> inputStream;
+      nsresult rv =
+          mCacheEntry->OpenInputStream(0, getter_AddRefs(inputStream));
+      if (NS_SUCCEEDED(rv)) {
+        Unused << originalCacheInputStream.Serialize(
+            inputStream, static_cast<ContentParent*>(pcp));
+      }
+    }
+
+    if (!altDataType.IsEmpty()) {
+      nsCOMPtr<nsIInputStream> inputStream;
+      nsresult rv = mCacheEntry->OpenAlternativeInputStream(
+          altDataType, getter_AddRefs(inputStream));
+      if (NS_SUCCEEDED(rv)) {
+        Unused << altDataInputStream.Serialize(
+            inputStream, static_cast<ContentParent*>(pcp));
+      }
     }
   }
 
@@ -1488,7 +1504,8 @@ HttpChannelParent::OnStartRequest(nsIRequest* aRequest) {
           cachedCharset, secInfoSerialization, chan->GetSelfAddr(),
           chan->GetPeerAddr(), redirectCount, cacheKey, altDataType, altDataLen,
           deliveringAltData, originalCacheInputStream.TakeOptionalValue(),
-          applyConversion, isResolvedByTRR, timing)) {
+          altDataInputStream.TakeOptionalValue(), applyConversion,
+          isResolvedByTRR, timing)) {
     rv = NS_ERROR_UNEXPECTED;
   }
   requestHead->Exit();
@@ -1704,28 +1721,6 @@ mozilla::ipc::IPCResult HttpChannelParent::RecvBytesRead(
   return IPC_OK();
 }
 
-mozilla::ipc::IPCResult HttpChannelParent::RecvOpenAltDataCacheInputStream(
-    const nsCString& aType) {
-  if (mIPCClosed) {
-    return IPC_OK();
-  }
-  AutoIPCStream autoStream;
-  if (mCacheEntry) {
-    nsCOMPtr<nsIInputStream> inputStream;
-    nsresult rv = mCacheEntry->OpenAlternativeInputStream(
-        aType, getter_AddRefs(inputStream));
-    if (NS_SUCCEEDED(rv)) {
-      PContentParent* pcp = Manager()->Manager();
-      Unused << autoStream.Serialize(inputStream,
-                                     static_cast<ContentParent*>(pcp));
-    }
-  }
-
-  Unused << SendAltDataCacheInputStreamAvailable(
-      autoStream.TakeOptionalValue());
-  return IPC_OK();
-}
-
 //-----------------------------------------------------------------------------
 // HttpChannelParent::nsIProgressEventSink
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h
index 1b65e8fd32aa..6a2109dae2c7 100644
--- a/netwerk/protocol/http/HttpChannelParent.h
+++ b/netwerk/protocol/http/HttpChannelParent.h
@@ -205,8 +205,6 @@ class HttpChannelParent final : public nsIInterfaceRequestor,
       const URIParams& uri,
       const mozilla::ipc::PrincipalInfo& requestingPrincipal) override;
   virtual mozilla::ipc::IPCResult RecvBytesRead(const int32_t& aCount) override;
-  virtual mozilla::ipc::IPCResult RecvOpenAltDataCacheInputStream(
-      const nsCString& aType) override;
   virtual void ActorDestroy(ActorDestroyReason why) override;
 
   // Supporting function for ADivertableParentChannel.
diff --git a/netwerk/protocol/http/InterceptedHttpChannel.cpp b/netwerk/protocol/http/InterceptedHttpChannel.cpp
index 2d458206ca66..e33c0680bbcd 100644
--- a/netwerk/protocol/http/InterceptedHttpChannel.cpp
+++ b/netwerk/protocol/http/InterceptedHttpChannel.cpp
@@ -1292,10 +1292,10 @@ InterceptedHttpChannel::GetOriginalInputStream(nsIInputStream** aStream) {
 }
 
 NS_IMETHODIMP
-InterceptedHttpChannel::GetAltDataInputStream(
-    const nsACString& aType, nsIInputStreamReceiver* aReceiver) {
+InterceptedHttpChannel::GetAlternativeDataInputStream(
+    nsIInputStream** aInputStream) {
   if (mSynthesizedCacheInfo) {
-    return mSynthesizedCacheInfo->GetAltDataInputStream(aType, aReceiver);
+    return mSynthesizedCacheInfo->GetAlternativeDataInputStream(aInputStream);
   }
   return NS_ERROR_NOT_AVAILABLE;
 }
diff --git a/netwerk/protocol/http/PHttpChannel.ipdl b/netwerk/protocol/http/PHttpChannel.ipdl
index 48baf1fad9c8..05e7d271af4b 100644
--- a/netwerk/protocol/http/PHttpChannel.ipdl
+++ b/netwerk/protocol/http/PHttpChannel.ipdl
@@ -94,9 +94,6 @@ parent:
   // sure not to send any more messages after that.
   async DeletingChannel();
 
-  // Called to get the input stream when altData is available.
-  async OpenAltDataCacheInputStream(nsCString aType);
-
   // Tell the parent the amount bytes read by child for the e10s back pressure
   // flow control
   async BytesRead(int32_t count);
@@ -125,6 +122,7 @@ child:
                        int64_t             altDataLength,
                        bool                deliveringAltData,
                        IPCStream?          originalCacheInputStream,
+                       IPCStream?          altDataInputStream,
                        bool                applyConversion,
                        bool                isResolvedByTRR,
                        ResourceTimingStruct timing);
@@ -183,8 +181,6 @@ child:
   // See ADivertableParentChannel::CancelDiversion
   async CancelDiversion();
 
-  async AltDataCacheInputStreamAvailable(IPCStream? stream);
-
 both:
   // After receiving this message, the parent also calls
   // SendFinishInterceptedRedirect, and makes sure not to send any more messages
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index c387d908dc29..8c3da66cc2d4 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -8629,22 +8629,23 @@ nsHttpChannel::GetOriginalInputStream(nsIInputStream** aInputStream) {
 }
 
 NS_IMETHODIMP
-nsHttpChannel::GetAltDataInputStream(const nsACString& aType,
-                                     nsIInputStreamReceiver* aReceiver) {
-  if (aReceiver == nullptr) {
-    return NS_ERROR_INVALID_ARG;
+nsHttpChannel::GetAlternativeDataInputStream(nsIInputStream** aInputStream) {
+  NS_ENSURE_ARG_POINTER(aInputStream);
+
+  *aInputStream = nullptr;
+
+  if (!mAfterOnStartRequestBegun) {
+    return NS_ERROR_NOT_AVAILABLE;
   }
-  nsCOMPtr<nsIInputStream> inputStream;
 
   nsCOMPtr<nsICacheEntry> cacheEntry =
       mCacheEntry ? mCacheEntry : mAltDataCacheEntry;
-  if (cacheEntry) {
+  if (!mAvailableCachedAltDataType.IsEmpty() && cacheEntry) {
     nsresult rv = cacheEntry->OpenAlternativeInputStream(
-        aType, getter_AddRefs(inputStream));
+        mAvailableCachedAltDataType, aInputStream);
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
-  aReceiver->OnInputStreamReady(inputStream);
   return NS_OK;
 }
 
diff --git a/netwerk/test/unit/test_alt-data_stream.js b/netwerk/test/unit/test_alt-data_stream.js
index 0fa61985dfc9..d8b763a9dc32 100644
--- a/netwerk/test/unit/test_alt-data_stream.js
+++ b/netwerk/test/unit/test_alt-data_stream.js
@@ -144,10 +144,6 @@ var originalListener = {
 
 function testAltDataStream(cc)
 {
-  cc.getAltDataInputStream(altContentType, {
-    onInputStreamReady: function(aInputStream) {
-      Assert.ok(!!aInputStream);
-      httpServer.stop(do_test_finished);
-    }
-  });
+  Assert.ok(!!cc.alternativeDataInputStream);
+  httpServer.stop(do_test_finished);
 }
diff --git a/netwerk/test/unit_ipc/test_alt-data_cross_process_wrap.js b/netwerk/test/unit_ipc/test_alt-data_cross_process_wrap.js
index c7e5b7d9c402..02a34bbd4350 100644
--- a/netwerk/test/unit_ipc/test_alt-data_cross_process_wrap.js
+++ b/netwerk/test/unit_ipc/test_alt-data_cross_process_wrap.js
@@ -9,12 +9,6 @@ var cacheFlushObserver = { observe: function() {
 // We get this from the child a bit later
 var URL = null;
 
-// needs to be rooted
-var cacheFlushObserver2 = { observe: function() {
-  cacheFlushObserver2 = null;
-  openAltChannel();
-}};
-
 function run_test() {
   do_get_profile();
   do_await_remote_message('flush').then(() => {
@@ -50,31 +44,7 @@ function readTextData(request, buffer)
   // Now let's generate some alt-data in the parent, and make sure we can get it
   var altContent = "altContentParentGenerated";
   executeSoon(() => {
-    var os = cc.openAlternativeOutputStream("text/parent-binary", altContent.length);
-    os.write(altContent, altContent.length);
-    os.close();
-
-    executeSoon(() => {
-      Services.cache2.QueryInterface(Ci.nsICacheTesting).flush(cacheFlushObserver2);
-    });
+    Assert.throws(() => cc.openAlternativeOutputStream("text/parent-binary", altContent.length), /NS_ERROR_NOT_AVAILABLE/);
+    do_send_remote_message('finish');
   });
 }
-
-function openAltChannel() {
-  var chan = make_channel(URL);
-  var cc = chan.QueryInterface(Ci.nsICacheInfoChannel);
-  cc.preferAlternativeDataType("text/parent-binary", "", true);
-  chan.asyncOpen(new ChannelListener(readAltData, null));
-}
-
-function readAltData(request, buffer)
-{
-  var cc = request.QueryInterface(Ci.nsICacheInfoChannel);
-
-  // This was generated in the parent, so it's OK to get it.
-  Assert.equal(buffer, "altContentParentGenerated");
-  Assert.equal(cc.alternativeDataType, "text/parent-binary");
-
-  // FINISH
-  do_send_remote_message('finish');
-}

From b2c76acaf1f955e4fd20ed8db205ec12400c3b30 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Mon, 20 May 2019 15:16:06 +0000
Subject: [PATCH 017/129] Bug 1551729 - Revert bug 1548432 - Re-introducing the
 support for cookies without values, r=mayhemer

This patch reverts the second part of bug 1548432.

Differential Revision: https://phabricator.services.mozilla.com/D31267

--HG--
extra : moz-landing-system : lando
---
 .../browser/browser_favicon_firstParty.js     |  4 ++--
 .../browser/browser_favicon_userContextId.js  |  4 ++--
 .../browser_privatebrowsing_favicon.js        |  4 ++--
 .../test/browser_sessionStoreContainer.js     |  2 +-
 ...e_browserElement_CookiesNotThirdParty.html |  4 ++--
 netwerk/cookie/nsCookieService.cpp            | 19 ++++---------------
 netwerk/cookie/nsCookieService.h              |  3 +--
 netwerk/test/TestCookie.cpp                   |  8 ++++----
 .../http-state/chromium-tests.html.ini        | 12 ++++++++++++
 .../cookies/http-state/general-tests.html.ini | 14 ++++++++++++++
 .../thumbnails/test/thumbnails_background.sjs | 12 ++++++------
 11 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/browser/components/originattributes/test/browser/browser_favicon_firstParty.js b/browser/components/originattributes/test/browser/browser_favicon_firstParty.js
index d350aee8da57..5997c4af5476 100644
--- a/browser/components/originattributes/test/browser/browser_favicon_firstParty.js
+++ b/browser/components/originattributes/test/browser/browser_favicon_firstParty.js
@@ -183,8 +183,8 @@ async function assignCookiesUnderFirstParty(aURL, aFirstParty, aCookieValue) {
 async function generateCookies(aThirdParty) {
   // we generate two different cookies for two first party domains.
   let cookies = [];
-  cookies.push(Math.random().toString() + "=1");
-  cookies.push(Math.random().toString() + "=1");
+  cookies.push(Math.random().toString());
+  cookies.push(Math.random().toString());
 
   let firstSiteURL;
   let secondSiteURL;
diff --git a/browser/components/originattributes/test/browser/browser_favicon_userContextId.js b/browser/components/originattributes/test/browser/browser_favicon_userContextId.js
index 62f042aed2e4..00457eb1a522 100644
--- a/browser/components/originattributes/test/browser/browser_favicon_userContextId.js
+++ b/browser/components/originattributes/test/browser/browser_favicon_userContextId.js
@@ -128,8 +128,8 @@ function waitOnFaviconLoaded(aFaviconURL) {
 async function generateCookies(aHost) {
   // we generate two different cookies for two userContextIds.
   let cookies = [];
-  cookies.push(Math.random().toString() + "=1");
-  cookies.push(Math.random().toString() + "=1");
+  cookies.push(Math.random().toString());
+  cookies.push(Math.random().toString());
 
   // Then, we add cookies into the site for 'personal' and 'work'.
   let tabInfoA = await openTabInUserContext(aHost, USER_CONTEXT_ID_PERSONAL);
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js
index bbeebc5cea1c..bac6fa648631 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js
@@ -189,8 +189,8 @@ add_task(async function test_favicon_privateBrowsing() {
   // Generate two random cookies for non-private window and private window
   // respectively.
   let cookies = [];
-  cookies.push(Math.random().toString() + "=1");
-  cookies.push(Math.random().toString() + "=1");
+  cookies.push(Math.random().toString());
+  cookies.push(Math.random().toString());
 
   // Open a tab in private window and add a cookie into it.
   await assignCookies(privateWindow.gBrowser, TEST_SITE, cookies[0]);
diff --git a/browser/components/sessionstore/test/browser_sessionStoreContainer.js b/browser/components/sessionstore/test/browser_sessionStoreContainer.js
index e5627e23c66f..74830f16f0a3 100644
--- a/browser/components/sessionstore/test/browser_sessionStoreContainer.js
+++ b/browser/components/sessionstore/test/browser_sessionStoreContainer.js
@@ -114,7 +114,7 @@ add_task(async function test() {
   for (let userContextId of Object.keys(USER_CONTEXTS)) {
     // Load the page in 3 different contexts and set a cookie
     // which should only be visible in that context.
-    let cookie = USER_CONTEXTS[userContextId] + "=1";
+    let cookie = USER_CONTEXTS[userContextId];
 
     // Open our tab in the given user context.
     let { tab, browser } = await openTabInUserContext(userContextId);
diff --git a/dom/browser-element/mochitest/file_browserElement_CookiesNotThirdParty.html b/dom/browser-element/mochitest/file_browserElement_CookiesNotThirdParty.html
index 053953ed6fea..ff122f31a44f 100644
--- a/dom/browser-element/mochitest/file_browserElement_CookiesNotThirdParty.html
+++ b/dom/browser-element/mochitest/file_browserElement_CookiesNotThirdParty.html
@@ -5,11 +5,11 @@ file_browserElement_CookiesNotThirdParty.html
 <script type='text/javascript'>
 if (location.search != "?step=2") {
   // Step 1: Set a cookie.
-  document.cookie = "file_browserElement_CookiesNotThirdParty=1";
+  document.cookie = "file_browserElement_CookiesNotThirdParty";
   alert("next");
 } else {
   // Step 2: Read the cookie.
-  if (document.cookie == "file_browserElement_CookiesNotThirdParty=1") {
+  if (document.cookie == "file_browserElement_CookiesNotThirdParty") {
     alert("success: got the correct cookie");
   } else {
     alert('failure: got unexpected cookie: "' + document.cookie + '"');
diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp
index 23b4fb05a2b0..cceae5079db5 100644
--- a/netwerk/cookie/nsCookieService.cpp
+++ b/netwerk/cookie/nsCookieService.cpp
@@ -3239,8 +3239,7 @@ bool nsCookieService::CanSetCookie(nsIURI* aHostURI, const nsCookieKey& aKey,
 
   // newCookie says whether there are multiple cookies in the header;
   // so we can handle them separately.
-  bool discard = false;
-  bool newCookie = ParseAttributes(aCookieHeader, aCookieAttributes, discard);
+  bool newCookie = ParseAttributes(aCookieHeader, aCookieAttributes);
 
   // Collect telemetry on how often secure cookies are set from non-secure
   // origins, and vice-versa.
@@ -3386,7 +3385,7 @@ bool nsCookieService::CanSetCookie(nsIURI* aHostURI, const nsCookieKey& aKey,
     }
   }
 
-  aSetCookie = !discard;
+  aSetCookie = true;
   return newCookie;
 }
 
@@ -3787,8 +3786,7 @@ bool nsCookieService::GetTokenValue(nsACString::const_char_iterator& aIter,
 // folded into the cookie struct here, because we don't know which one to use
 // until we've parsed the header.
 bool nsCookieService::ParseAttributes(nsDependentCString& aCookieHeader,
-                                      nsCookieAttributes& aCookieAttributes,
-                                      bool& aDiscard) {
+                                      nsCookieAttributes& aCookieAttributes) {
   static const char kPath[] = "path";
   static const char kDomain[] = "domain";
   static const char kExpires[] = "expires";
@@ -3808,8 +3806,6 @@ bool nsCookieService::ParseAttributes(nsDependentCString& aCookieHeader,
   aCookieAttributes.isHttpOnly = false;
   aCookieAttributes.sameSite = nsICookie2::SAMESITE_UNSET;
 
-  aDiscard = false;
-
   nsDependentCSubstring tokenString(cookieStart, cookieStart);
   nsDependentCSubstring tokenValue(cookieStart, cookieStart);
   bool newCookie, equalsFound;
@@ -3824,11 +3820,8 @@ bool nsCookieService::ParseAttributes(nsDependentCString& aCookieHeader,
   if (equalsFound) {
     aCookieAttributes.name = tokenString;
     aCookieAttributes.value = tokenValue;
-    if (aCookieAttributes.name.IsEmpty()) {
-      aDiscard = true;
-    }
   } else {
-    aDiscard = true;
+    aCookieAttributes.value = tokenString;
   }
 
   // extract remaining attributes
@@ -3836,10 +3829,6 @@ bool nsCookieService::ParseAttributes(nsDependentCString& aCookieHeader,
     newCookie = GetTokenValue(cookieStart, cookieEnd, tokenString, tokenValue,
                               equalsFound);
 
-    if (aDiscard) {
-      continue;
-    }
-
     if (!tokenValue.IsEmpty()) {
       tokenValue.BeginReading(tempBegin);
       tokenValue.EndReading(tempEnd);
diff --git a/netwerk/cookie/nsCookieService.h b/netwerk/cookie/nsCookieService.h
index f614cc0822f9..c0a65bce2aa8 100644
--- a/netwerk/cookie/nsCookieService.h
+++ b/netwerk/cookie/nsCookieService.h
@@ -341,8 +341,7 @@ class nsCookieService final : public nsICookieService,
                             nsDependentCSubstring& aTokenValue,
                             bool& aEqualsFound);
   static bool ParseAttributes(nsDependentCString& aCookieHeader,
-                              nsCookieAttributes& aCookieAttributes,
-                              bool& aDiscard);
+                              nsCookieAttributes& aCookie);
   bool RequireThirdPartyCheck();
   static bool CheckDomain(nsCookieAttributes& aCookie, nsIURI* aHostURI,
                           const nsCString& aBaseDomain, bool aRequireHostMatch);
diff --git a/netwerk/test/TestCookie.cpp b/netwerk/test/TestCookie.cpp
index 2129e26ef64e..7c838a4a1c6c 100644
--- a/netwerk/test/TestCookie.cpp
+++ b/netwerk/test/TestCookie.cpp
@@ -620,7 +620,7 @@ TEST(TestCookie, TestCookieMain)
              nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
   EXPECT_TRUE(CheckResult(cookie.get(), MUST_CONTAIN, R"(test="fubar! = foo)"));
-  EXPECT_TRUE(CheckResult(cookie.get(), MUST_NOT_CONTAIN, "five"));
+  EXPECT_TRUE(CheckResult(cookie.get(), MUST_CONTAIN, "five"));
   SetACookie(cookieService, "http://parser.test/", nullptr,
              "test=kill; domain=.parser.test; max-age=0 \n five; max-age=0",
              nullptr);
@@ -632,13 +632,13 @@ TEST(TestCookie, TestCookieMain)
   // cookies to overwrite it
   SetACookie(cookieService, "http://parser.test/", nullptr, "six", nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
-  EXPECT_TRUE(CheckResult(cookie.get(), MUST_BE_NULL));
+  EXPECT_TRUE(CheckResult(cookie.get(), MUST_EQUAL, "six"));
   SetACookie(cookieService, "http://parser.test/", nullptr, "seven", nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
-  EXPECT_TRUE(CheckResult(cookie.get(), MUST_BE_NULL));
+  EXPECT_TRUE(CheckResult(cookie.get(), MUST_EQUAL, "seven"));
   SetACookie(cookieService, "http://parser.test/", nullptr, " =eight", nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
-  EXPECT_TRUE(CheckResult(cookie.get(), MUST_BE_NULL));
+  EXPECT_TRUE(CheckResult(cookie.get(), MUST_EQUAL, "eight"));
   SetACookie(cookieService, "http://parser.test/", nullptr, "test=six",
              nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
diff --git a/testing/web-platform/meta/cookies/http-state/chromium-tests.html.ini b/testing/web-platform/meta/cookies/http-state/chromium-tests.html.ini
index 2140bfe1f36e..8bc56f0d4f7f 100644
--- a/testing/web-platform/meta/cookies/http-state/chromium-tests.html.ini
+++ b/testing/web-platform/meta/cookies/http-state/chromium-tests.html.ini
@@ -1,7 +1,19 @@
 [chromium-tests.html]
+  [chromium0009 - chromium0009]
+    expected: FAIL
+
   [chromium0006 - chromium0006]
     expected: FAIL
 
+  [chromium0012 - chromium0012]
+    expected: FAIL
+
+  [disabled-chromium0022 - disabled-chromium0022]
+    expected: FAIL
+
+  [chromium0010 - chromium0010]
+    expected: FAIL
+
   [chromium0007 - chromium0007]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/cookies/http-state/general-tests.html.ini b/testing/web-platform/meta/cookies/http-state/general-tests.html.ini
index 6cc93211e20b..b5a16e51a642 100644
--- a/testing/web-platform/meta/cookies/http-state/general-tests.html.ini
+++ b/testing/web-platform/meta/cookies/http-state/general-tests.html.ini
@@ -1,4 +1,18 @@
 [general-tests.html]
+  [0021 - Ignore cookie without key in all 'Set-Cookie'.]
+    expected: FAIL
+
+  [0023 - Ignore cookies without '=' in all 'Set-Cookie'.]
+    expected: FAIL
+
+  [0026 - Ignore malformed cookies in all 'Set-Cookie' v2.]
+    expected: FAIL
+
+  [0027 - Ignore malformed cookies in all 'Set-Cookie' v3.]
+    expected: FAIL
+
   [0028 - [INVALID EXPECTATION\] Ignore malformed cookies in all 'Set-Cookie' v4.]
     expected: FAIL
 
+  [0004 - Ignore cookie without key.]
+    expected: FAIL
diff --git a/toolkit/components/thumbnails/test/thumbnails_background.sjs b/toolkit/components/thumbnails/test/thumbnails_background.sjs
index 5ec635005833..f1cce96a0edc 100644
--- a/toolkit/components/thumbnails/test/thumbnails_background.sjs
+++ b/toolkit/components/thumbnails/test/thumbnails_background.sjs
@@ -19,13 +19,13 @@ function handleRequest(req, resp) {
 
   let setCookieScript = "";
   if (opts.setRedCookie) {
-    resp.setHeader("Set-Cookie", "red=1", false);
-    setCookieScript = '<script>document.cookie="red=1";</script>';
+    resp.setHeader("Set-Cookie", "red", false);
+    setCookieScript = '<script>document.cookie="red";</script>';
   }
 
   if (opts.setGreenCookie) {
-    resp.setHeader("Set-Cookie", "green=1", false);
-    setCookieScript = '<script>document.cookie="green=1";</script>';
+    resp.setHeader("Set-Cookie", "green", false);
+    setCookieScript = '<script>document.cookie="green";</script>';
   }
 
   if (opts.iframe) {
@@ -43,14 +43,14 @@ function handleRequest(req, resp) {
   }
 
   if (req.hasHeader("Cookie") &&
-      req.getHeader("Cookie").split(";").indexOf("red=1") >= 0) {
+      req.getHeader("Cookie").split(";").indexOf("red") >= 0) {
     resp.write('<html style="background: #f00;">' + setCookieScript + '</html>');
     resp.finish();
     return;
   }
 
   if (req.hasHeader("Cookie") &&
-      req.getHeader("Cookie").split(";").indexOf("green=1") >= 0) {
+      req.getHeader("Cookie").split(";").indexOf("green") >= 0) {
     resp.write('<html style="background: #0f0;">' + setCookieScript + '</html>');
     resp.finish();
     return;

From 259109800408f067da74dd74ea862b302c1c3ae8 Mon Sep 17 00:00:00 2001
From: Andrei Oprea <andrei.br92@gmail.com>
Date: Mon, 20 May 2019 15:04:45 +0000
Subject: [PATCH 018/129] Bug 1548782 - Improve hover state and accessibility
 for Bookmark Panel message r=r1cky

Differential Revision: https://phabricator.services.mozilla.com/D31797

--HG--
extra : moz-landing-system : lando
---
 .../components/newtab/lib/BookmarkPanelHub.jsm |  3 ++-
 .../shared/places/editBookmarkPanel.inc.css    | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/browser/components/newtab/lib/BookmarkPanelHub.jsm b/browser/components/newtab/lib/BookmarkPanelHub.jsm
index 25c0fa0bb5ff..98de50ccdc8f 100644
--- a/browser/components/newtab/lib/BookmarkPanelHub.jsm
+++ b/browser/components/newtab/lib/BookmarkPanelHub.jsm
@@ -127,9 +127,10 @@ class _BookmarkPanelHub {
       });
       recommendation.style.color = message.color;
       recommendation.style.background = `-moz-linear-gradient(-45deg, ${message.background_color_1} 0%, ${message.background_color_2} 70%)`;
-      const close = createElement("a");
+      const close = createElement("button");
       close.setAttribute("id", "cfrClose");
       close.setAttribute("aria-label", "close");
+      close.style.color = message.color;
       this._l10n.setAttributes(close, message.close_button.tooltiptext);
       close.addEventListener("click", e => {
         this.sendUserEventTelemetry("DISMISS", win);
diff --git a/browser/themes/shared/places/editBookmarkPanel.inc.css b/browser/themes/shared/places/editBookmarkPanel.inc.css
index cb8024c0557e..8609f4f4f4ef 100644
--- a/browser/themes/shared/places/editBookmarkPanel.inc.css
+++ b/browser/themes/shared/places/editBookmarkPanel.inc.css
@@ -99,13 +99,20 @@
   text-align: start;
 }
 
+#editBookmarkPanelRecommendationCta:hover {
+  text-decoration: underline;
+}
+
 #editBookmarkPanelRecommendation #cfrClose {
   position: absolute;
-  padding: 3px 2px;
-  inset-inline-end: 16px;
+  padding: 10px;
+  inset-inline-end: 8px;
   top: 15px;
   width: 12px;
   height: 12px;
+  border: none;
+  border-radius: var(--toolbarbutton-border-radius);
+  background-color: transparent;
   background-image: url(chrome://browser/skin/stop.svg);
   background-size: 12px;
   background-repeat: no-repeat;
@@ -113,10 +120,17 @@
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: 0.6;
+  cursor: pointer;
 }
 
 #editBookmarkPanelRecommendation #cfrClose:hover {
   fill-opacity: 1;
+  background-color: var(--toolbarbutton-hover-background);
+}
+
+#editBookmarkPanelRecommendation #cfrClose:active,
+#editBookmarkPanelRecommendation #cfrClose:focus {
+  box-shadow: var(--focus-ring-box-shadow);
 }
 
 html|div#editBookmarkPanelFaviconContainer {

From d0cbcbfaf1ae8eb44bc451c06fc77c8185962fdc Mon Sep 17 00:00:00 2001
From: Mihai Alexandru Michis <malexandru@mozilla.com>
Date: Mon, 20 May 2019 18:31:21 +0300
Subject: [PATCH 019/129] Backed out 2 changesets (bug 1359240) for causing
 reftest failures. CLOSED TREE

Backed out changeset 10cac54d1bb9 (bug 1359240)
Backed out changeset 50ef8f8c6558 (bug 1359240)
---
 gfx/thebes/gfxSVGGlyphs.cpp                   | 40 +------------------
 layout/reftests/text-svgglyphs/reftest.list   |  1 -
 .../text-svgglyphs/resources/svg-gz.ttf       |  0
 .../svg-glyph-compressed-ref.html             | 13 ------
 .../text-svgglyphs/svg-glyph-compressed.html  | 13 ------
 5 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 layout/reftests/text-svgglyphs/resources/svg-gz.ttf
 delete mode 100644 layout/reftests/text-svgglyphs/svg-glyph-compressed-ref.html
 delete mode 100644 layout/reftests/text-svgglyphs/svg-glyph-compressed.html

diff --git a/gfx/thebes/gfxSVGGlyphs.cpp b/gfx/thebes/gfxSVGGlyphs.cpp
index 7bfa4beda1b0..d2d1c3e14914 100644
--- a/gfx/thebes/gfxSVGGlyphs.cpp
+++ b/gfx/thebes/gfxSVGGlyphs.cpp
@@ -32,7 +32,6 @@
 #include "gfxFont.h"
 #include "gfxContext.h"
 #include "harfbuzz/hb.h"
-#include "zlib.h"
 
 #define SVG_CONTENT_TYPE NS_LITERAL_CSTRING("image/svg+xml")
 #define UTF8_CHARSET NS_LITERAL_CSTRING("utf-8")
@@ -258,44 +257,7 @@ gfxSVGGlyphsDocument::gfxSVGGlyphsDocument(const uint8_t* aBuffer,
                                            uint32_t aBufLen,
                                            gfxSVGGlyphs* aSVGGlyphs)
     : mOwner(aSVGGlyphs) {
-  if (aBufLen >= 14 && aBuffer[0] == 31 && aBuffer[1] == 139) {
-    // It's a gzip-compressed document; decompress it before parsing.
-    // The original length (modulo 2^32) is found in the last 4 bytes
-    // of the data, stored in little-endian format. We read it as
-    // individual bytes to avoid possible alignment issues.
-    // (Note that if the original length was >2^32, then origLen here
-    // will be incorrect; but then the inflate() call will not return
-    // Z_STREAM_END and we'll bail out safely.)
-    size_t origLen = (size_t(aBuffer[aBufLen - 1]) << 24) +
-                     (size_t(aBuffer[aBufLen - 2]) << 16) +
-                     (size_t(aBuffer[aBufLen - 3]) << 8) +
-                     size_t(aBuffer[aBufLen - 4]);
-    AutoTArray<uint8_t, 4096> outBuf;
-    if (outBuf.SetLength(origLen, mozilla::fallible)) {
-      z_stream s = {0};
-      s.next_in = const_cast<Byte*>(aBuffer);
-      s.avail_in = aBufLen;
-      s.next_out = outBuf.Elements();
-      s.avail_out = outBuf.Length();
-      // The magic number 16 here is the zlib flag to expect gzip format,
-      // see http://www.zlib.net/manual.html#Advanced
-      if (Z_OK == inflateInit2(&s, 16 + MAX_WBITS)) {
-        int result = inflate(&s, Z_FINISH);
-        if (Z_STREAM_END == result) {
-          MOZ_ASSERT(size_t(s.next_out - outBuf.Elements()) == origLen);
-          ParseDocument(outBuf.Elements(), outBuf.Length());
-        } else {
-          NS_WARNING("Failed to decompress SVG glyphs document");
-        }
-        inflateEnd(&s);
-      }
-    } else {
-      NS_WARNING("Failed to allocate memory for SVG glyphs document");
-    }
-  } else {
-    ParseDocument(aBuffer, aBufLen);
-  }
-
+  ParseDocument(aBuffer, aBufLen);
   if (!mDocument) {
     NS_WARNING("Could not parse SVG glyphs document");
     return;
diff --git a/layout/reftests/text-svgglyphs/reftest.list b/layout/reftests/text-svgglyphs/reftest.list
index f19e137f7657..97a1d07b4a87 100644
--- a/layout/reftests/text-svgglyphs/reftest.list
+++ b/layout/reftests/text-svgglyphs/reftest.list
@@ -21,4 +21,3 @@ pref(gfx.font_rendering.opentype_svg.enabled,true)    fuzzy-if(skiaContent,0-15,
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-paint-server.svg svg-glyph-paint-server-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-transform.svg svg-glyph-transform-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-extents.html svg-glyph-extents-ref.html
-pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-compressed.html svg-glyph-compressed-ref.html
diff --git a/layout/reftests/text-svgglyphs/resources/svg-gz.ttf b/layout/reftests/text-svgglyphs/resources/svg-gz.ttf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/layout/reftests/text-svgglyphs/svg-glyph-compressed-ref.html b/layout/reftests/text-svgglyphs/svg-glyph-compressed-ref.html
deleted file mode 100644
index 3325c05f2255..000000000000
--- a/layout/reftests/text-svgglyphs/svg-glyph-compressed-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<title>Test for compressed SVG glyphs</title>
-<style>
-  @font-face {
-    font-family: test;
-    src: url(resources/svg.woff); /* uses uncompressed SVG documents */
-  }
-  html { width: 400px; height: 400px; background-color: white; }
-  body { margin: 0; }
-  div { font: 200px test; color: fuchsia; line-height: 1; stroke: none; }
-</style>
-<div>abcdefg</div>
-<div>LMNOPQR</div>
diff --git a/layout/reftests/text-svgglyphs/svg-glyph-compressed.html b/layout/reftests/text-svgglyphs/svg-glyph-compressed.html
deleted file mode 100644
index 0c51a54b1236..000000000000
--- a/layout/reftests/text-svgglyphs/svg-glyph-compressed.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<title>Test for compressed SVG glyphs</title>
-<style>
-  @font-face {
-    font-family: test;
-    src: url(resources/svg-gz.ttf); /* copy of svg.woff using gzip-compressed SVG documents */
-  }
-  html { width: 400px; height: 400px; background-color: white; }
-  body { margin: 0; }
-  div { font: 200px test; color: fuchsia; line-height: 1; stroke: none; }
-</style>
-<div>abcdefg</div>
-<div>LMNOPQR</div>

From a025133e9e4388e6c56cc457757bab70e9dea874 Mon Sep 17 00:00:00 2001
From: Mihai Alexandru Michis <malexandru@mozilla.com>
Date: Mon, 20 May 2019 18:33:53 +0300
Subject: [PATCH 020/129] Backed out changeset 36ada63cb9fb (bug 1541355) for
 failing
 browser_webconsole_network_messages_stacktrace_console_initiated_request.js
 CLOSED TREE

---
 .../client/shared/components/StackTrace.js    |  4 --
 .../webconsole/test/mochitest/browser.ini     |  1 -
 ...es_stacktrace_console_initiated_request.js | 63 -------------------
 .../webconsole/webconsole-connection-proxy.js |  9 ---
 .../network-monitor/stack-trace-collector.js  |  4 +-
 5 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_stacktrace_console_initiated_request.js

diff --git a/devtools/client/shared/components/StackTrace.js b/devtools/client/shared/components/StackTrace.js
index 620372f677cf..be63c69c4857 100644
--- a/devtools/client/shared/components/StackTrace.js
+++ b/devtools/client/shared/components/StackTrace.js
@@ -48,10 +48,6 @@ class StackTrace extends Component {
       sourceMapService,
     } = this.props;
 
-    if (!stacktrace) {
-      return null;
-    }
-
     const frames = [];
     stacktrace.forEach((s, i) => {
       if (s.asyncCause) {
diff --git a/devtools/client/webconsole/test/mochitest/browser.ini b/devtools/client/webconsole/test/mochitest/browser.ini
index ef449592670f..2f9ff7349575 100644
--- a/devtools/client/webconsole/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/test/mochitest/browser.ini
@@ -341,7 +341,6 @@ skip-if = true  # Bug 1438979
 [browser_webconsole_network_message_ctrl_click.js]
 [browser_webconsole_network_messages_openinnet.js]
 [browser_webconsole_network_messages_resend_request.js]
-[browser_webconsole_network_messages_stacktrace_console_initiated_request.js]
 [browser_webconsole_network_messages_status_code.js]
 [browser_webconsole_network_requests_from_chrome.js]
 [browser_webconsole_network_reset_filter.js]
diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_stacktrace_console_initiated_request.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_stacktrace_console_initiated_request.js
deleted file mode 100644
index ec01a6f2b5d7..000000000000
--- a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_stacktrace_console_initiated_request.js
+++ /dev/null
@@ -1,63 +0,0 @@
-
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-const TEST_FILE = "test-network-request.html";
-const TEST_PATH = "https://example.com/browser/devtools/client/webconsole/" +
-                  "test/mochitest/";
-const TEST_URI = TEST_PATH + TEST_FILE;
-
-pushPref("devtools.webconsole.filter.netxhr", true);
-
-add_task(async function task() {
-  const hud = await openNewTabAndConsole(TEST_URI);
-
-  const xhrUrl = TEST_PATH + "sjs_slow-response-test-server.sjs";
-  const onRequestUpdates = waitForRequestUpdates(hud);
-  const onPayloadReady = waitForPayloadReady(hud);
-
-  info("Fire an XHR POST request from the console.");
-  const { node: messageNode } = await executeAndWaitForMessage(hud, `
-    xhrConsole = () => testXhrPostSlowResponse();
-    xhrConsole();
-  `, xhrUrl);
-
-  ok(messageNode, "Network message found.");
-
-  await onRequestUpdates;
-
-  info("Expand the network message");
-  await expandXhrMessage(messageNode);
-
-  await onPayloadReady;
-
-  const stackTraceTab = messageNode.querySelector("#stack-trace-tab");
-  ok(stackTraceTab, "StackTrace tab is available");
-
-  stackTraceTab.click();
-  const selector = "#stack-trace-panel .frame-link";
-  await waitFor(() => messageNode.querySelector(selector));
-  const frames = [...messageNode.querySelectorAll(selector)];
-
-  is(frames.length, 4, "There's the expected frames");
-  const functionNames = frames.map(f =>
-    f.querySelector(".frame-link-function-display-name").textContent);
-  is(functionNames.join("|"), "makeXhr|testXhrPostSlowResponse|xhrConsole|<anonymous>",
-    "The stacktrace does not have devtools' internal frames");
-});
-
-async function waitForPayloadReady(hud) {
-  return hud.ui.once("network-request-payload-ready");
-}
-
-async function waitForRequestUpdates(hud) {
-  return hud.ui.once("network-message-updated");
-}
-
-function expandXhrMessage(node) {
-  info("Click on XHR message and wait for the network detail panel to be displayed");
-  node.querySelector(".url").click();
-  return waitFor(() => node.querySelector(".network-info"));
-}
diff --git a/devtools/client/webconsole/webconsole-connection-proxy.js b/devtools/client/webconsole/webconsole-connection-proxy.js
index 1367a26dfb99..5d95c5d50a6d 100644
--- a/devtools/client/webconsole/webconsole-connection-proxy.js
+++ b/devtools/client/webconsole/webconsole-connection-proxy.js
@@ -219,19 +219,10 @@ WebConsoleConnectionProxy.prototype = {
    * Dispatch a message event on the new frontend and emit an event for tests.
    */
   dispatchMessageUpdate: function(networkInfo, response) {
-    // Some message might try to update while we are closing the toolbox.
-    if (!this.webConsoleUI) {
-      return;
-    }
     this.webConsoleUI.wrapper.dispatchMessageUpdate(networkInfo, response);
   },
 
   dispatchRequestUpdate: function(id, data) {
-    // Some request might try to update while we are closing the toolbox.
-    if (!this.webConsoleUI) {
-      return;
-    }
-
     this.webConsoleUI.wrapper.dispatchRequestUpdate(id, data);
   },
 
diff --git a/devtools/server/actors/network-monitor/stack-trace-collector.js b/devtools/server/actors/network-monitor/stack-trace-collector.js
index aee4f2f8ef80..38c78e9efff6 100644
--- a/devtools/server/actors/network-monitor/stack-trace-collector.js
+++ b/devtools/server/actors/network-monitor/stack-trace-collector.js
@@ -15,8 +15,6 @@ loader.lazyRequireGetter(this, "ChannelEventSinkFactory",
 loader.lazyRequireGetter(this, "matchRequest",
                          "devtools/server/actors/network-monitor/network-observer",
                          true);
-loader.lazyRequireGetter(this, "WebConsoleUtils",
-                         "devtools/server/actors/webconsole/utils", true);
 
 function StackTraceCollector(filters, netmonitors) {
   this.filters = filters;
@@ -158,7 +156,7 @@ StackTraceCollector.prototype = {
   getStackTrace(channelId) {
     const trace = this.stacktracesById.get(channelId);
     this.stacktracesById.delete(channelId);
-    return WebConsoleUtils.removeFramesAboveDebuggerEval(trace);
+    return trace;
   },
 
   onGetStack(msg) {

From dea700c3255bd43699ca481da71ee78b39cfa152 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Mon, 20 May 2019 15:38:48 +0000
Subject: [PATCH 021/129] Bug 1551519 - Take screenshot at the end of each
 subtest. r=jdescottes

Differential Revision: https://phabricator.services.mozilla.com/D31060

--HG--
extra : moz-landing-system : lando
---
 devtools/docs/tests/performance-tests.md      | 33 ++++++++++++++++++-
 .../tests/devtools/addon/content/damp.js      | 32 ++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/devtools/docs/tests/performance-tests.md b/devtools/docs/tests/performance-tests.md
index f167b424b850..3ad4e49dcf98 100644
--- a/devtools/docs/tests/performance-tests.md
+++ b/devtools/docs/tests/performance-tests.md
@@ -14,6 +14,37 @@ This will run all DAMP tests, you can filter by test name with:
 ```
 This command will run all tests which contains "console" in their name.
 
+### Command line options
+
+#### Running tests only once
+
+```bash
+./mach talos-test --activeTests damp --cycles 1 --tppagecycles 1
+```
+`--cycles` will limit the number of Firefox restart to only one, while
+`--tppagecycles` will limit the number of test re-run in each firefox start to one.
+This is often helpful when debugging one particular subtest.
+
+#### Taking screenshots
+
+```bash
+DEBUG_DEVTOOLS_SCREENSHOTS=1 ./mach talos-test --activeTests damp
+```
+When passing `DEBUG_DEVTOOLS_SCREENSHOTS` env variable, screenshots will be taken after each subtest
+was run. The screenshot will be opened in new tabs and their title
+includes the subtest label. Firefox won't automatically close so that you can view the screenshots.
+
+#### Recording a profile
+
+```bash
+./mach talos-test --activeTests damp --geckoProfile --geckoProfileEntries 100000000
+```
+This will automatically record the tests and open the profile. You may use the following command in order
+to focus on just one subtest run:
+```bash
+./mach talos-test --activeTests damp --subtests custom.webconsole --cycles 1 --tppagecycles 1 --geckoProfile --geckoProfileEntries 100000000
+```
+
 ## How to run it on try?
 
 ```bash
@@ -107,7 +138,7 @@ The [main script](http://searchfox.org/mozilla-central/source/testing/talos/talo
 ## How to see the performance trends?
 
 You can find the dedicated performance dashboard for DevTools at http://firefox-dev.tools/performance-dashboard. You will find links to trend charts for various tools:
-* [Inspector dashboard](firefox-dev.tools/performance-dashboard/tools/inspector.html?days=60&filterstddev=true)
+* [Inspector dashboard](http://firefox-dev.tools/performance-dashboard/tools/inspector.html?days=60&filterstddev=true)
 * [Console dashboard](http://firefox-dev.tools/performance-dashboard/tools/console.html?days=60&filterstddev=true)
 * [Netmonitor dashboard](http://firefox-dev.tools/performance-dashboard/tools/netmonitor.html?days=60&filterstddev=true)
 * [Debugger dashboard](http://firefox-dev.tools/performance-dashboard/tools/debugger.html?days=60&filterstddev=true)
diff --git a/testing/talos/talos/tests/devtools/addon/content/damp.js b/testing/talos/talos/tests/devtools/addon/content/damp.js
index 3501a3336303..d824856ca8df 100644
--- a/testing/talos/talos/tests/devtools/addon/content/damp.js
+++ b/testing/talos/talos/tests/devtools/addon/content/damp.js
@@ -14,6 +14,8 @@ XPCOMUtils.defineLazyGetter(this, "require", function() {
 // "verbose".
 const DEBUG_ALLOCATIONS = env.get("DEBUG_DEVTOOLS_ALLOCATIONS");
 
+const DEBUG_SCREENSHOTS = env.get("DEBUG_DEVTOOLS_SCREENSHOTS");
+
 // Maximum time spent in one test, in milliseconds
 const TEST_TIMEOUT = 5 * 60000;
 
@@ -110,6 +112,26 @@ Damp.prototype = {
     this.TalosParentProfiler = await getTalosParentProfiler();
   },
 
+  // Take a screenshot of the whole browser window and open it in a background tab
+  async screenshot(label) {
+    const win = this._win;
+    const canvas = win.document.createElementNS(
+      "http://www.w3.org/1999/xhtml",
+      "html:canvas"
+    );
+    const context = canvas.getContext("2d");
+    canvas.width = win.innerWidth;
+    canvas.height = win.innerHeight;
+    context.drawWindow(win, 0, 0, canvas.width, canvas.height, "white");
+    const imgURL = canvas.toDataURL();
+    const url = `data:text/html,<title>${label}</title>
+      <h1>${label}</h1>
+      <img width="100%" height="100%" src="${imgURL}"/>`;
+    this._win.gBrowser.addTab(url, {
+      triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
+    });
+  },
+
   /**
    * Helper to tell when a test start and when it is finished.
    * It helps recording its duration, but also put markers for profiler.firefox.com
@@ -164,6 +186,9 @@ Damp.prototype = {
         } else if (DEBUG_ALLOCATIONS == "verbose") {
           this.allocationTracker.logAllocationSites();
         }
+        if (DEBUG_SCREENSHOTS) {
+          this.screenshot(label);
+        }
       },
     };
   },
@@ -312,6 +337,13 @@ Damp.prototype = {
     }
     this._log("\n" + out);
 
+    if (DEBUG_SCREENSHOTS) {
+      // When we are printing screenshots, we don't want to want to exit firefox
+      // so that we have time to view them.
+      dump("All tests are finished, please review the screenshots and close the browser manually.\n");
+      return;
+    }
+
     if (this.testDone) {
       this.testDone({testResults, testNames});
     } else {

From 27f815c4af853d555e258bf119c6a1e5eae68186 Mon Sep 17 00:00:00 2001
From: Brendan Dahl <bdahl@mozilla.com>
Date: Thu, 16 May 2019 07:12:15 +0000
Subject: [PATCH 022/129] Bug 1551320 - Don't allow CreateElement in XUL
 documents. r=bzbarsky

Soon XUL documents will be loaded as XHTML and createElement will create HTML
elements instead of XUL element by default. This restriction can be removed
once we migrate everything.

Differential Revision: https://phabricator.services.mozilla.com/D31294

--HG--
extra : moz-landing-system : lando
---
 dom/base/Document.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
index a6cf7e0ed0db..884c1f1fe8ca 100644
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
@@ -5483,6 +5483,14 @@ already_AddRefed<Element> Document::CreateElement(
     return nullptr;
   }
 
+  // Temporary check until XULDocument has been removed.
+  if (IsXULDocument()) {
+    MOZ_DIAGNOSTIC_ASSERT(false,
+                          "CreateElement() not allowed in XUL document.");
+    rv.Throw(NS_ERROR_FAILURE);
+    return nullptr;
+  }
+
   bool needsLowercase = IsHTMLDocument() && !IsLowercaseASCII(aTagName);
   nsAutoString lcTagName;
   if (needsLowercase) {

From 2c823b0508de91e44f65c8d60728484c80512999 Mon Sep 17 00:00:00 2001
From: Bogdan Tara <btara@mozilla.com>
Date: Mon, 20 May 2019 18:55:30 +0300
Subject: [PATCH 023/129] Backed out changeset 6519e3500428 (bug 1552199) for
 test_remote_settings.js failures

---
 services/settings/RemoteSettingsClient.jsm    |  10 +-
 .../test/unit/test_remote_settings.js         | 117 +++++-------------
 2 files changed, 35 insertions(+), 92 deletions(-)

diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
index cdc595e0231c..9afd2787ade2 100644
--- a/services/settings/RemoteSettingsClient.jsm
+++ b/services/settings/RemoteSettingsClient.jsm
@@ -282,7 +282,6 @@ class RemoteSettingsClient extends EventEmitter {
   async maybeSync(expectedTimestamp, options = {}) {
     const { loadDump = true, trigger = "manual" } = options;
 
-    let importedFromDump = [];
     const startedAt = new Date();
     let reportStatus = null;
     try {
@@ -296,11 +295,7 @@ class RemoteSettingsClient extends EventEmitter {
       // cold start.
       if (!collectionLastModified && loadDump) {
         try {
-          const imported = await RemoteSettingsWorker.importJSONDump(this.bucketName, this.collectionName);
-          // The worker only returns an integer. List the imported records to build the sync event.
-          if (imported > 0) {
-            ({ data: importedFromDump } = await kintoCollection.list());
-          }
+          await RemoteSettingsWorker.importJSONDump(this.bucketName, this.collectionName);
           collectionLastModified = await kintoCollection.db.getLastModified();
         } catch (e) {
           // Report but go-on.
@@ -342,9 +337,6 @@ class RemoteSettingsClient extends EventEmitter {
           // With SERVER_WINS, there cannot be any conflicts, but don't silent it anyway.
           throw new Error("Synced failed");
         }
-        // The records imported from the dump should be considered as "created" for the
-        // listeners.
-        syncResult.created = importedFromDump.concat(syncResult.created);
       } catch (e) {
         if (e instanceof RemoteSettingsClient.InvalidSignatureError) {
           // Signature verification failed during synchronization.
diff --git a/services/settings/test/unit/test_remote_settings.js b/services/settings/test/unit/test_remote_settings.js
index d56117813bf7..e268371c56a8 100644
--- a/services/settings/test/unit/test_remote_settings.js
+++ b/services/settings/test/unit/test_remote_settings.js
@@ -51,12 +51,39 @@ function run_test() {
   clientWithDump = RemoteSettings("language-dictionaries");
   clientWithDump.verifySignature = false;
 
-  server.registerPathHandler("/v1/", handleResponse);
-  server.registerPathHandler("/v1/buckets/monitor/collections/changes/records", handleResponse);
-  server.registerPathHandler("/v1/buckets/main/collections/password-fields", handleResponse);
-  server.registerPathHandler("/v1/buckets/main/collections/password-fields/records", handleResponse);
-  server.registerPathHandler("/v1/buckets/main/collections/language-dictionaries", handleResponse);
-  server.registerPathHandler("/v1/buckets/main/collections/language-dictionaries/records", handleResponse);
+  // Setup server fake responses.
+  function handleResponse(request, response) {
+    try {
+      const sample = getSampleResponse(request, server.identity.primaryPort);
+      if (!sample) {
+        do_throw(`unexpected ${request.method} request for ${request.path}?${request.queryString}`);
+      }
+
+      response.setStatusLine(null, sample.status.status,
+                             sample.status.statusText);
+      // send the headers
+      for (let headerLine of sample.sampleHeaders) {
+        let headerElements = headerLine.split(":");
+        response.setHeader(headerElements[0], headerElements[1].trimLeft());
+      }
+      response.setHeader("Date", (new Date()).toUTCString());
+
+      const body = typeof sample.responseBody == "string" ? sample.responseBody
+                                                          : JSON.stringify(sample.responseBody);
+      response.write(body);
+      response.finish();
+    } catch (e) {
+      info(e);
+    }
+  }
+  const configPath = "/v1/";
+  const changesPath = "/v1/buckets/monitor/collections/changes/records";
+  const metadataPath = "/v1/buckets/main/collections/password-fields";
+  const recordsPath  = "/v1/buckets/main/collections/password-fields/records";
+  server.registerPathHandler(configPath, handleResponse);
+  server.registerPathHandler(changesPath, handleResponse);
+  server.registerPathHandler(metadataPath, handleResponse);
+  server.registerPathHandler(recordsPath, handleResponse);
   server.registerPathHandler("/fake-x5u", handleResponse);
 
   run_next_test();
@@ -77,22 +104,6 @@ add_task(async function test_records_obtained_from_server_are_stored_in_db() {
 });
 add_task(clear_state);
 
-add_task(async function test_records_from_dump_are_listed_as_created_in_event() {
-  let received;
-  clientWithDump.on("sync", ({ data }) => received = data);
-  // Use a timestamp superior to latest record in dump.
-  const timestamp = 5000000000000; // Fri Jun 11 2128
-
-  await clientWithDump.maybeSync(timestamp);
-
-  const list = await clientWithDump.get();
-  ok(list.length > 20, "The dump was loaded");
-  equal(received.created[received.created.length - 1].id, "xx", "Last record comes from the sync.");
-  equal(received.created.length, list.length, "The list of created records contains the dump");
-  equal(received.current.length, received.created.length);
-});
-add_task(clear_state);
-
 add_task(async function test_records_can_have_local_fields() {
   const c = RemoteSettings("password-fields", { localFields: ["accepted"] });
   await c.maybeSync(2000);
@@ -476,30 +487,7 @@ add_task(async function test_inspect_changes_the_list_when_bucket_pref_is_change
 });
 add_task(clear_state);
 
-function handleResponse(request, response) {
-  try {
-    const sample = getSampleResponse(request, server.identity.primaryPort);
-    if (!sample) {
-      do_throw(`unexpected ${request.method} request for ${request.path}?${request.queryString}`);
-    }
-
-    response.setStatusLine(null, sample.status.status, sample.status.statusText);
-    // send the headers
-    for (let headerLine of sample.sampleHeaders) {
-      let headerElements = headerLine.split(":");
-      response.setHeader(headerElements[0], headerElements[1].trimLeft());
-    }
-    response.setHeader("Date", (new Date()).toUTCString());
-
-    const body = typeof sample.responseBody == "string" ? sample.responseBody
-      : JSON.stringify(sample.responseBody);
-    response.write(body);
-    response.finish();
-  } catch (e) {
-    info(e);
-  }
-}
-
+// get a response for a given request from sample data
 function getSampleResponse(req, port) {
   const responses = {
     "OPTIONS": {
@@ -753,43 +741,6 @@ wNuvFqc=
         }],
       },
     },
-    "GET:/v1/buckets/main/collections/language-dictionaries": {
-      "sampleHeaders": [
-        "Access-Control-Allow-Origin: *",
-        "Access-Control-Expose-Headers: Retry-After, Content-Length, Alert, Backoff",
-        "Content-Type: application/json; charset=UTF-8",
-        "Server: waitress",
-        "Etag: \"1234\"",
-      ],
-      "status": { status: 200, statusText: "OK" },
-      "responseBody": JSON.stringify({
-        "data": {
-          "id": "language-dictionaries",
-          "last_modified": 1234,
-          "signature": {
-            "signature": "xyz",
-            "x5u": `http://localhost:${port}/fake-x5u`,
-          },
-        },
-      }),
-    },
-    "GET:/v1/buckets/main/collections/language-dictionaries/records": {
-      "sampleHeaders": [
-        "Access-Control-Allow-Origin: *",
-        "Access-Control-Expose-Headers: Retry-After, Content-Length, Alert, Backoff",
-        "Content-Type: application/json; charset=UTF-8",
-        "Server: waitress",
-        "Etag: \"5000000000000\"",
-      ],
-      "status": { status: 200, statusText: "OK" },
-      "responseBody": {
-        "data": [{
-          "id": "xx",
-          "last_modified": 5000000000000,
-          "dictionaries": ["xx-XX@dictionaries.addons.mozilla.org"],
-        }],
-      },
-    },
     "GET:/v1/buckets/monitor/collections/changes/records?collection=no-mocked-responses&bucket=main": {
       "sampleHeaders": [
         "Access-Control-Allow-Origin: *",

From 20040f196d70afa0d9c32f2b326a18e26b8d414b Mon Sep 17 00:00:00 2001
From: Christoph Kerschbaumer <ckerschb@christophkerschbaumer.com>
Date: Mon, 20 May 2019 15:59:28 +0000
Subject: [PATCH 024/129] Bug 1551379: Allow non linkable about: pages to skip
 CORS when loading local module scripts. r=smaug

Differential Revision: https://phabricator.services.mozilla.com/D31514

--HG--
extra : moz-landing-system : lando
---
 dom/script/ScriptLoader.cpp | 64 +++++++++++++++++++++++++++++++++----
 dom/script/ScriptLoader.h   |  9 ++++++
 2 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp
index fec704fc673e..1ce18cb0b2f0 100644
--- a/dom/script/ScriptLoader.cpp
+++ b/dom/script/ScriptLoader.cpp
@@ -30,6 +30,7 @@
 #include "mozilla/dom/SRILogHelper.h"
 #include "mozilla/net/UrlClassifierFeatureFactory.h"
 #include "mozilla/StaticPrefs.h"
+#include "nsAboutProtocolUtils.h"
 #include "nsGkAtoms.h"
 #include "nsNetUtil.h"
 #include "nsGlobalWindowInner.h"
@@ -338,6 +339,50 @@ nsresult ScriptLoader::CheckContentPolicy(Document* aDocument,
   return NS_OK;
 }
 
+/* static */
+bool ScriptLoader::IsAboutPageLoadingChromeURI(ScriptLoadRequest* aRequest) {
+  // if we are not dealing with a codebasePrincipal it can not be a
+  // Principal with a scheme of about: and there is nothing left to do
+  if (!aRequest->TriggeringPrincipal()->GetIsCodebasePrincipal()) {
+    return false;
+  }
+
+  // if the triggering uri is not of scheme about:, there is nothing to do
+  nsCOMPtr<nsIURI> triggeringURI;
+  nsresult rv =
+      aRequest->TriggeringPrincipal()->GetURI(getter_AddRefs(triggeringURI));
+  NS_ENSURE_SUCCESS(rv, false);
+
+  bool isAbout =
+      (NS_SUCCEEDED(triggeringURI->SchemeIs("about", &isAbout)) && isAbout);
+  if (!isAbout) {
+    return false;
+  }
+
+  // if the about: page is linkable from content, there is nothing to do
+  nsCOMPtr<nsIAboutModule> aboutMod;
+  rv = NS_GetAboutModule(triggeringURI, getter_AddRefs(aboutMod));
+  NS_ENSURE_SUCCESS(rv, false);
+
+  uint32_t aboutModuleFlags = 0;
+  rv = aboutMod->GetURIFlags(triggeringURI, &aboutModuleFlags);
+  NS_ENSURE_SUCCESS(rv, false);
+
+  if (aboutModuleFlags & nsIAboutModule::MAKE_LINKABLE) {
+    return false;
+  }
+
+  // if the uri to be loaded is not of scheme chrome:, there is nothing to do.
+  bool isChrome =
+      (NS_SUCCEEDED(aRequest->mURI->SchemeIs("chrome", &isChrome)) && isChrome);
+  if (!isChrome) {
+    return false;
+  }
+
+  // seems like an about page wants to load a chrome URI.
+  return true;
+}
+
 bool ScriptLoader::ModuleMapContainsURL(nsIURI* aURL) const {
   // Returns whether we have fetched, or are currently fetching, a module script
   // for a URL.
@@ -1240,14 +1285,19 @@ nsresult ScriptLoader::StartLoad(ScriptLoadRequest* aRequest) {
   nsSecurityFlags securityFlags;
   if (aRequest->IsModuleRequest()) {
     // According to the spec, module scripts have different behaviour to classic
-    // scripts and always use CORS.
-    securityFlags = nsILoadInfo::SEC_REQUIRE_CORS_DATA_INHERITS;
-    if (aRequest->CORSMode() == CORS_NONE ||
-        aRequest->CORSMode() == CORS_ANONYMOUS) {
-      securityFlags |= nsILoadInfo::SEC_COOKIES_SAME_ORIGIN;
+    // scripts and always use CORS. Only exception: Non linkable about: pages
+    // which load local module scripts.
+    if (IsAboutPageLoadingChromeURI(aRequest)) {
+      securityFlags = nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL;
     } else {
-      MOZ_ASSERT(aRequest->CORSMode() == CORS_USE_CREDENTIALS);
-      securityFlags |= nsILoadInfo::SEC_COOKIES_INCLUDE;
+      securityFlags = nsILoadInfo::SEC_REQUIRE_CORS_DATA_INHERITS;
+      if (aRequest->CORSMode() == CORS_NONE ||
+          aRequest->CORSMode() == CORS_ANONYMOUS) {
+        securityFlags |= nsILoadInfo::SEC_COOKIES_SAME_ORIGIN;
+      } else {
+        MOZ_ASSERT(aRequest->CORSMode() == CORS_USE_CREDENTIALS);
+        securityFlags |= nsILoadInfo::SEC_COOKIES_INCLUDE;
+      }
     }
   } else {
     securityFlags = aRequest->CORSMode() == CORS_NONE
diff --git a/dom/script/ScriptLoader.h b/dom/script/ScriptLoader.h
index 0609a56fb0dc..8743e50233a7 100644
--- a/dom/script/ScriptLoader.h
+++ b/dom/script/ScriptLoader.h
@@ -387,6 +387,15 @@ class ScriptLoader final : public nsISupports {
                                      const nsAString& aType,
                                      ScriptLoadRequest* aRequest);
 
+  /**
+   * Helper function to determine whether an about: page loads a chrome: URI.
+   * Please note that this function only returns true if:
+   *   * the about: page uses a CodeBasePrincipal with scheme about:
+   *   * the about: page is not linkable from content
+   *     (e.g. the function will return false for about:blank or about:srcdoc)
+   */
+  static bool IsAboutPageLoadingChromeURI(ScriptLoadRequest* aRequest);
+
   /**
    * Start a load for aRequest's URI.
    */

From a64e4ed3bf97603bddd7bf4937d37a7a303507ab Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Mon, 20 May 2019 15:59:28 +0000
Subject: [PATCH 025/129] Bug 1552441 - Test to verify that only unlinkable
 about pages can load script[type=module]. r=smaug,ckerschb

Differential Revision: https://phabricator.services.mozilla.com/D31678

--HG--
extra : moz-landing-system : lando
---
 dom/tests/browser/.eslintrc.js                | 17 ++++++
 dom/tests/browser/browser.ini                 |  5 ++
 ...able_about_page_can_load_module_scripts.js | 54 +++++++++++++++++++
 .../browser/file_load_module_script.html      |  8 +++
 dom/tests/browser/file_module_loaded.js       |  3 ++
 dom/tests/browser/file_script_loaded.js       |  5 ++
 6 files changed, 92 insertions(+)
 create mode 100644 dom/tests/browser/.eslintrc.js
 create mode 100644 dom/tests/browser/browser_unlinkable_about_page_can_load_module_scripts.js
 create mode 100644 dom/tests/browser/file_load_module_script.html
 create mode 100644 dom/tests/browser/file_module_loaded.js
 create mode 100644 dom/tests/browser/file_script_loaded.js

diff --git a/dom/tests/browser/.eslintrc.js b/dom/tests/browser/.eslintrc.js
new file mode 100644
index 000000000000..de95be7b6de7
--- /dev/null
+++ b/dom/tests/browser/.eslintrc.js
@@ -0,0 +1,17 @@
+"use strict";
+
+module.exports = {
+  overrides: [
+    {
+      files: [
+        "file_module_loaded.js",
+      ],
+      parserOptions: {
+        sourceType: "module",
+      },
+    },
+  ],
+  "extends": [
+    "plugin:mozilla/browser-test"
+  ]
+};
diff --git a/dom/tests/browser/browser.ini b/dom/tests/browser/browser.ini
index c92fdb7bbd54..9fdd0efc7abd 100644
--- a/dom/tests/browser/browser.ini
+++ b/dom/tests/browser/browser.ini
@@ -79,6 +79,11 @@ support-files =
 [browser_test_toolbars_visibility.js]
 support-files =
   test_new_window_from_content_child.html
+[browser_unlinkable_about_page_can_load_module_scripts.js]
+support-files =
+  file_load_module_script.html
+  file_module_loaded.js
+  file_script_loaded.js
 [browser_xhr_sandbox.js]
 [browser_noopener.js]
 skip-if = (verify && debug && (os == 'linux'))
diff --git a/dom/tests/browser/browser_unlinkable_about_page_can_load_module_scripts.js b/dom/tests/browser/browser_unlinkable_about_page_can_load_module_scripts.js
new file mode 100644
index 000000000000..3d779b903844
--- /dev/null
+++ b/dom/tests/browser/browser_unlinkable_about_page_can_load_module_scripts.js
@@ -0,0 +1,54 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+"use strict";
+
+const kTestPage = getRootDirectory(gTestPath) + "file_load_module_script.html";
+
+const kAboutPagesRegistered = Promise.all([
+  BrowserTestUtils.registerAboutPage(
+    registerCleanupFunction, "test-linkable-page", kTestPage,
+    Ci.nsIAboutModule.URI_SAFE_FOR_UNTRUSTED_CONTENT | Ci.nsIAboutModule.MAKE_LINKABLE),
+  BrowserTestUtils.registerAboutPage(
+    registerCleanupFunction, "test-unlinkable-page", kTestPage,
+    Ci.nsIAboutModule.ALLOW_SCRIPT),
+]);
+
+add_task(async function() {
+  await kAboutPagesRegistered;
+
+  let consoleListener = {
+    observe() {
+      errorCount++;
+      if (shouldHaveJSError) {
+        ok(true, "JS error is expected and received");
+      } else {
+        ok(false, "Unexpected JS error was received");
+      }
+    },
+  };
+  Services.console.registerListener(consoleListener);
+  registerCleanupFunction(() => Services.console.unregisterListener(consoleListener));
+
+  let shouldHaveJSError = true;
+  let errorCount = 0;
+  await BrowserTestUtils.withNewTab({gBrowser, url: "about:test-linkable-page"}, async (browser) => {
+    await ContentTask.spawn(browser, null, () => {
+      isnot(content.document.body.textContent, "scriptLoaded",
+        "The page content shouldn't be changed on the linkable page");
+    });
+  });
+  ok(errorCount > 0, "Should have an error when loading test-linkable-page, got " + errorCount);
+
+  shouldHaveJSError = false;
+  errorCount = 0;
+  await BrowserTestUtils.withNewTab({gBrowser, url: "about:test-unlinkable-page"}, async (browser) => {
+    await ContentTask.spawn(browser, null, () => {
+      is(content.document.body.textContent, "scriptLoaded",
+        "The page content should be changed on the unlinkable page");
+    });
+  });
+  is(errorCount, 0, "Should have no errors when loading test-unlinkable-page");
+});
diff --git a/dom/tests/browser/file_load_module_script.html b/dom/tests/browser/file_load_module_script.html
new file mode 100644
index 000000000000..701d5fe03732
--- /dev/null
+++ b/dom/tests/browser/file_load_module_script.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="Content-Security-Policy" content="default-src *"/>
+  <script type="module" src="chrome://mochitests/content/browser/dom/tests/browser/file_script_loaded.js"></script>
+</head>
+<body></body>
+</html>
diff --git a/dom/tests/browser/file_module_loaded.js b/dom/tests/browser/file_module_loaded.js
new file mode 100644
index 000000000000..83b279e52856
--- /dev/null
+++ b/dom/tests/browser/file_module_loaded.js
@@ -0,0 +1,3 @@
+"use strict";
+
+import "file_script_loaded";
diff --git a/dom/tests/browser/file_script_loaded.js b/dom/tests/browser/file_script_loaded.js
new file mode 100644
index 000000000000..108562a6aae2
--- /dev/null
+++ b/dom/tests/browser/file_script_loaded.js
@@ -0,0 +1,5 @@
+"use strict";
+
+document.addEventListener("DOMContentLoaded", () => {
+  document.body.textContent = "scriptLoaded";
+});

From 3c9056d16f97502eb157a11840e31189dd65b24b Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Fri, 17 May 2019 12:45:35 +0000
Subject: [PATCH 026/129] Bug 1550881.  Prevent document.open() calls from
 descendant subframes' unload handlers triggered by document.open() from doing
 anything useful.  r=hsivonen

Differential Revision: https://phabricator.services.mozilla.com/D30728

--HG--
extra : moz-landing-system : lando
---
 dom/html/crashtests/1550881-1.html  | 13 +++++++++++++
 dom/html/crashtests/1550881-2.html  | 14 ++++++++++++++
 dom/html/crashtests/crashtests.list |  2 ++
 dom/html/nsHTMLDocument.cpp         | 10 +++++++++-
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 dom/html/crashtests/1550881-1.html
 create mode 100644 dom/html/crashtests/1550881-2.html

diff --git a/dom/html/crashtests/1550881-1.html b/dom/html/crashtests/1550881-1.html
new file mode 100644
index 000000000000..b9d73df957f0
--- /dev/null
+++ b/dom/html/crashtests/1550881-1.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<iframe srcdoc="<iframe></iframe>"></iframe>
+<script>
+  onload = function() {
+      parent = frames[0];
+      child = parent[0];
+      child.onunload = function() {
+          parent.document.open();
+      }
+      parent.document.open();
+      parent.document.write("Hello");
+  }
+</script>
diff --git a/dom/html/crashtests/1550881-2.html b/dom/html/crashtests/1550881-2.html
new file mode 100644
index 000000000000..97bf5ef35065
--- /dev/null
+++ b/dom/html/crashtests/1550881-2.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<iframe srcdoc="<iframe></iframe>"></iframe>
+<script>
+  onload = function() {
+      parent = frames[0];
+      child = parent[0];
+      child.onunload = function() {
+          parent.document.open();
+          parent.document.write("Nested");
+      }
+      parent.document.open();
+      parent.document.write("Hello");
+  }
+</script>
diff --git a/dom/html/crashtests/crashtests.list b/dom/html/crashtests/crashtests.list
index cb595d0f7c43..ab03961f46b4 100644
--- a/dom/html/crashtests/crashtests.list
+++ b/dom/html/crashtests/crashtests.list
@@ -89,3 +89,5 @@ asserts(0-4) load 1401726.html
 load 1412173.html
 load 1440523.html
 load 1547057.html
+load 1550881-1.html
+load 1550881-2.html
diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp
index 1636a7382ff2..f01990984502 100644
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@@ -1098,7 +1098,15 @@ Document* nsHTMLDocument::Open(const Optional<nsAString>& /* unused */,
   }
 
   // Step 10 -- remove all our DOM kids without firing any mutation events.
-  DisconnectNodeTree();
+  {
+    // We want to ignore any recursive calls to Open() that happen while
+    // disconnecting the node tree.  The spec doesn't say to do this, but the
+    // spec also doesn't envision unload events on subframes firing while we do
+    // this, while all browsers fire them in practice.  See
+    // <https://github.com/whatwg/html/issues/4611>.
+    IgnoreOpensDuringUnload ignoreOpenGuard(this);
+    DisconnectNodeTree();
+  }
 
   // Step 11 -- if we're the current document in our docshell, do the
   // equivalent of pushState() with the new URL we should have.

From 33d444f12334a2ca38e414d389dd22ffa7417a57 Mon Sep 17 00:00:00 2001
From: Bogdan Tara <btara@mozilla.com>
Date: Mon, 20 May 2019 19:28:24 +0300
Subject: [PATCH 027/129] Backed out changeset eb23da0a276b (bug 1550001) for
 causing xpcshells failures CLOSED TREE

---
 .../debugger/src/actions/event-listeners.js   |  97 ++----
 .../debugger/src/actions/types/index.js       |  27 +-
 .../client/debugger/src/client/firefox.js     |   3 -
 .../debugger/src/client/firefox/commands.js   |  17 +-
 .../debugger/src/client/firefox/types.js      |   7 +-
 devtools/client/debugger/src/client/index.js  |   8 +-
 .../SecondaryPanes/EventListeners.js          | 144 ++++----
 .../tests/EventListeners.spec.js              |  82 -----
 .../__snapshots__/EventListeners.spec.js.snap | 320 ------------------
 .../debugger/src/reducers/event-listeners.js  |  68 ++--
 .../client/debugger/src/reducers/types.js     |   2 -
 devtools/client/debugger/src/utils/prefs.js   |   5 +-
 devtools/client/preferences/debugger.js       |   4 +-
 13 files changed, 133 insertions(+), 651 deletions(-)
 delete mode 100644 devtools/client/debugger/src/components/SecondaryPanes/tests/EventListeners.spec.js
 delete mode 100644 devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/EventListeners.spec.js.snap

diff --git a/devtools/client/debugger/src/actions/event-listeners.js b/devtools/client/debugger/src/actions/event-listeners.js
index 4e1e41e321f7..0e47899bf087 100644
--- a/devtools/client/debugger/src/actions/event-listeners.js
+++ b/devtools/client/debugger/src/actions/event-listeners.js
@@ -4,88 +4,29 @@
 
 // @flow
 
-import { uniq, remove } from "lodash";
-
 import { asyncStore } from "../utils/prefs";
 
-import {
-  getActiveEventListeners,
-  getEventListenerExpanded,
-} from "../selectors";
-
 import type { ThunkArgs } from "./types";
+import type { EventListenerBreakpoints } from "../types";
 
-async function updateBreakpoints(dispatch, client, newEvents: string[]) {
-  dispatch({ type: "UPDATE_EVENT_LISTENERS", active: newEvents });
-
-  const current = await asyncStore.eventListenerBreakpoints;
-  asyncStore.eventListenerBreakpoints = {
-    ...current,
-    active: newEvents,
-  };
-
-  client.setEventListenerBreakpoints(newEvents);
-}
-
-async function updateExpanded(dispatch, newExpanded: string[]) {
-  dispatch({
-    type: "UPDATE_EVENT_LISTENER_EXPANDED",
-    expanded: newExpanded,
-  });
-
-  const current = await asyncStore.eventListenerBreakpoints;
-  asyncStore.eventListenerBreakpoints = {
-    ...current,
-    expanded: newExpanded,
-  };
-}
-
-export function addEventListenerBreakpoints(eventsToAdd: string[]) {
-  return async ({ dispatch, client, getState }: ThunkArgs) => {
-    const activeListenerBreakpoints = await getActiveEventListeners(getState());
-
-    const newEvents = uniq([...eventsToAdd, ...activeListenerBreakpoints]);
-
-    updateBreakpoints(dispatch, client, newEvents);
-  };
-}
-
-export function removeEventListenerBreakpoints(eventsToRemove: string[]) {
-  return async ({ dispatch, client, getState }: ThunkArgs) => {
-    const activeListenerBreakpoints = await getActiveEventListeners(getState());
-
-    const newEvents = remove(
-      activeListenerBreakpoints,
-      event => !eventsToRemove.includes(event)
-    );
-
-    updateBreakpoints(dispatch, client, newEvents);
-  };
-}
-
-export function addEventListenerExpanded(category: string) {
-  return async ({ dispatch, getState }: ThunkArgs) => {
-    const expanded = await getEventListenerExpanded(getState());
-
-    const newExpanded = uniq([...expanded, category]);
-
-    await updateExpanded(dispatch, newExpanded);
-  };
-}
-
-export function removeEventListenerExpanded(category: string) {
-  return async ({ dispatch, getState }: ThunkArgs) => {
-    const expanded = await getEventListenerExpanded(getState());
-
-    const newExpanded = expanded.filter(expand => expand != category);
-
-    updateExpanded(dispatch, newExpanded);
-  };
-}
-
-export function getEventListenerBreakpointTypes() {
+export function addEventListeners(events: EventListenerBreakpoints) {
   return async ({ dispatch, client }: ThunkArgs) => {
-    const categories = await client.getEventListenerBreakpointTypes();
-    dispatch({ type: "RECEIVE_EVENT_LISTENER_TYPES", categories });
+    await dispatch({
+      type: "ADD_EVENT_LISTENERS",
+      events,
+    });
+    const newList = await asyncStore.eventListenerBreakpoints;
+    client.setEventListenerBreakpoints(newList);
+  };
+}
+
+export function removeEventListeners(events: EventListenerBreakpoints) {
+  return async ({ dispatch, client }: ThunkArgs) => {
+    await dispatch({
+      type: "REMOVE_EVENT_LISTENERS",
+      events,
+    });
+    const newList = await asyncStore.eventListenerBreakpoints;
+    client.setEventListenerBreakpoints(newList);
   };
 }
diff --git a/devtools/client/debugger/src/actions/types/index.js b/devtools/client/debugger/src/actions/types/index.js
index 01296b64b8e7..51a110cf42c6 100644
--- a/devtools/client/debugger/src/actions/types/index.js
+++ b/devtools/client/debugger/src/actions/types/index.js
@@ -159,30 +159,6 @@ export type {
 
 export type { panelPositionType } from "./UIAction";
 
-export type { ASTAction } from "./ASTAction";
-
-type ActiveEventListener = string;
-type EventListenerEvent = { name: string, id: ActiveEventListener };
-type EventListenerCategory = { name: string, events: EventListenerEvent[] };
-
-export type EventListenerActiveList = ActiveEventListener[];
-export type EventListenerCategoryList = EventListenerCategory[];
-export type EventListenerExpandedList = string[];
-
-export type EventListenerAction =
-  | {|
-      +type: "UPDATE_EVENT_LISTENERS",
-      +active: EventListenerActiveList,
-    |}
-  | {|
-      +type: "RECEIVE_EVENT_LISTENER_TYPES",
-      +categories: EventListenerCategoryList,
-    |}
-  | {|
-      +type: "UPDATE_EVENT_LISTENER_EXPANDED",
-      +expanded: EventListenerExpandedList,
-    |};
-
 /**
  * Actions: Source, Breakpoint, and Navigation
  *
@@ -204,5 +180,4 @@ export type Action =
   | FileTextSearchAction
   | ProjectTextSearchAction
   | DebuggeeAction
-  | SourceTreeAction
-  | EventListenerAction;
+  | SourceTreeAction;
diff --git a/devtools/client/debugger/src/client/firefox.js b/devtools/client/debugger/src/client/firefox.js
index e24f96eb7bee..3d8fb32624cb 100644
--- a/devtools/client/debugger/src/client/firefox.js
+++ b/devtools/client/debugger/src/client/firefox.js
@@ -47,9 +47,6 @@ export async function onConnect(connection: any, actions: Object) {
     skipBreakpoints: prefs.skipPausing,
   });
 
-  // Retrieve possible event listener breakpoints
-  actions.getEventListenerBreakpointTypes();
-
   // In Firefox, we need to initially request all of the sources. This
   // usually fires off individual `newSource` notifications as the
   // debugger finds them, but there may be existing sources already in
diff --git a/devtools/client/debugger/src/client/firefox/commands.js b/devtools/client/debugger/src/client/firefox/commands.js
index b7cf035a7f43..59758b83ee75 100644
--- a/devtools/client/debugger/src/client/firefox/commands.js
+++ b/devtools/client/debugger/src/client/firefox/commands.js
@@ -16,6 +16,7 @@ import type {
   BreakpointLocation,
   BreakpointOptions,
   PendingLocation,
+  EventListenerBreakpoints,
   Frame,
   FrameId,
   GeneratedSourceData,
@@ -35,8 +36,6 @@ import type {
   SourcesPacket,
 } from "./types";
 
-import type { EventListenerCategoryList } from "../../actions/types";
-
 let workerClients: Object;
 let threadClient: ThreadClient;
 let tabTarget: TabTarget;
@@ -362,17 +361,8 @@ function interrupt(thread: string): Promise<*> {
   return lookupThreadClient(thread).interrupt();
 }
 
-async function setEventListenerBreakpoints(ids: string[]) {
-  await threadClient.setActiveEventBreakpoints(ids);
-  await forEachWorkerThread(thread => thread.setActiveEventBreakpoints(ids));
-}
-
-// eslint-disable-next-line
-async function getEventListenerBreakpointTypes(): Promise<
-  EventListenerCategoryList
-> {
-  const { value } = await threadClient.getAvailableEventBreakpoints();
-  return value;
+function setEventListenerBreakpoints(eventTypes: EventListenerBreakpoints) {
+  // TODO: Figure out what sendpoint we want to hit
 }
 
 function pauseGrip(thread: string, func: Function): ObjectClient {
@@ -535,7 +525,6 @@ const clientCommands = {
   sendPacket,
   setSkipPausing,
   setEventListenerBreakpoints,
-  getEventListenerBreakpointTypes,
   waitForWorkers,
   detachWorkers,
   hasWasmSupport,
diff --git a/devtools/client/debugger/src/client/firefox/types.js b/devtools/client/debugger/src/client/firefox/types.js
index 3c89c5041aec..8f87962d777c 100644
--- a/devtools/client/debugger/src/client/firefox/types.js
+++ b/devtools/client/debugger/src/client/firefox/types.js
@@ -25,8 +25,6 @@ import type {
   Range,
 } from "../../types";
 
-import type { EventListenerCategoryList } from "../../actions/types";
-
 type URL = string;
 
 /**
@@ -371,10 +369,7 @@ export type ThreadClient = {
   actor: ActorId,
   request: (payload: Object) => Promise<*>,
   url: string,
-  setActiveEventBreakpoints: (string[]) => void,
-  getAvailableEventBreakpoints: () => Promise<{|
-    value: EventListenerCategoryList,
-  |}>,
+  setEventListenerBreakpoints: (string[]) => void,
   skipBreakpoints: boolean => Promise<{| skip: boolean |}>,
 };
 
diff --git a/devtools/client/debugger/src/client/index.js b/devtools/client/debugger/src/client/index.js
index e4fe19c14671..e68801c9ec6f 100644
--- a/devtools/client/debugger/src/client/index.js
+++ b/devtools/client/debugger/src/client/index.js
@@ -15,7 +15,6 @@ import {
   bootstrapStore,
   bootstrapWorkers,
 } from "../utils/bootstrap";
-
 import { initialBreakpointsState } from "../reducers/breakpoints";
 
 import type { Panel } from "./firefox/types";
@@ -48,12 +47,7 @@ async function loadInitialState() {
 
   const breakpoints = initialBreakpointsState(xhrBreakpoints);
 
-  return {
-    pendingBreakpoints,
-    tabs,
-    breakpoints,
-    eventListenerBreakpoints,
-  };
+  return { pendingBreakpoints, tabs, breakpoints, eventListenerBreakpoints };
 }
 
 function getClient(connection: any) {
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js b/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
index ad18d6c0a01d..be2ce126448f 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
@@ -9,121 +9,141 @@ import classnames from "classnames";
 
 import { connect } from "../../utils/connect";
 import actions from "../../actions";
-import {
-  getActiveEventListeners,
-  getEventListenerBreakpointTypes,
-  getEventListenerExpanded,
-} from "../../selectors";
+import { getActiveEventListeners } from "../../selectors";
 
 import AccessibleImage from "../shared/AccessibleImage";
 
-import type {
-  EventListenerActiveList,
-  EventListenerCategoryList,
-  EventListenerExpandedList,
-} from "../../actions/types";
+import type { EventListenerBreakpoints } from "../../types";
 
 import "./EventListeners.css";
 
-type Props = {
-  categories: EventListenerCategoryList,
-  expandedCategories: EventListenerExpandedList,
-  activeEventListeners: EventListenerActiveList,
-  addEventListeners: typeof actions.addEventListenerBreakpoints,
-  removeEventListeners: typeof actions.removeEventListenerBreakpoints,
-  addEventListenerExpanded: typeof actions.addEventListenerExpanded,
-  removeEventListenerExpanded: typeof actions.removeEventListenerExpanded,
+const CATEGORIES = {
+  Mouse: ["click", "mouseover", "dblclick"],
+  Keyboard: ["keyup", "keydown"],
 };
 
-class EventListeners extends Component<Props> {
-  onCategoryToggle(category) {
-    const {
-      expandedCategories,
-      removeEventListenerExpanded,
-      addEventListenerExpanded,
-    } = this.props;
+type Props = {
+  addEventListeners: typeof actions.addEventListeners,
+  removeEventListeners: typeof actions.removeEventListeners,
+  activeEventListeners: EventListenerBreakpoints,
+};
+
+type State = {
+  expandedCategories: string[],
+};
+
+function getKey(category: string, eventType: string) {
+  return `${category}:${eventType}`;
+}
+
+class EventListeners extends Component<Props, State> {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      expandedCategories: [],
+    };
+  }
+
+  onCategoryToggle(category, event) {
+    const { expandedCategories } = this.state;
 
     if (expandedCategories.includes(category)) {
-      removeEventListenerExpanded(category);
+      this.setState({
+        expandedCategories: expandedCategories.filter(
+          eventCategory => eventCategory !== category
+        ),
+      });
     } else {
-      addEventListenerExpanded(category);
+      this.setState({
+        expandedCategories: [...expandedCategories, category],
+      });
     }
   }
 
   onCategoryClick(category, isChecked) {
     const { addEventListeners, removeEventListeners } = this.props;
-    const eventsIds = category.events.map(event => event.id);
+    const events = CATEGORIES[category].map(eventType =>
+      getKey(category, eventType)
+    );
 
     if (isChecked) {
-      addEventListeners(eventsIds);
+      addEventListeners(events);
     } else {
-      removeEventListeners(eventsIds);
+      removeEventListeners(events);
     }
   }
 
-  onEventTypeClick(eventId, isChecked) {
+  onEventTypeClick(eventType, isChecked) {
     const { addEventListeners, removeEventListeners } = this.props;
     if (isChecked) {
-      addEventListeners([eventId]);
+      addEventListeners([eventType]);
     } else {
-      removeEventListeners([eventId]);
+      removeEventListeners([eventType]);
     }
   }
 
   renderCategoryHeading(category) {
-    const { activeEventListeners, expandedCategories } = this.props;
-    const { events } = category;
+    const { expandedCategories } = this.state;
+    const { activeEventListeners } = this.props;
 
-    const expanded = expandedCategories.includes(category.name);
-    const checked = events.every(({ id }) => activeEventListeners.includes(id));
+    const eventTypes = CATEGORIES[category];
+
+    const expanded = expandedCategories.includes(category);
+    const checked = eventTypes.every(eventType =>
+      activeEventListeners.includes(getKey(category, eventType))
+    );
     const indeterminate =
-      !checked && events.some(({ id }) => activeEventListeners.includes(id));
+      !checked &&
+      eventTypes.some(eventType =>
+        activeEventListeners.includes(getKey(category, eventType))
+      );
 
     return (
       <div className="event-listener-header">
         <button
           className="event-listener-expand"
-          onClick={() => this.onCategoryToggle(category.name)}
+          onClick={e => this.onCategoryToggle(category, e)}
         >
           <AccessibleImage className={classnames("arrow", { expanded })} />
         </button>
         <label className="event-listener-label">
           <input
             type="checkbox"
-            value={category.name}
+            value={category}
             onChange={e => this.onCategoryClick(category, e.target.checked)}
             checked={checked}
             ref={el => el && (el.indeterminate = indeterminate)}
           />
-          <span className="event-listener-category">{category.name}</span>
+          <span className="event-listener-category">{category}</span>
         </label>
       </div>
     );
   }
 
   renderCategoryListing(category) {
-    const { activeEventListeners, expandedCategories } = this.props;
+    const { activeEventListeners } = this.props;
+    const { expandedCategories } = this.state;
 
-    const expanded = expandedCategories.includes(category.name);
+    const expanded = expandedCategories.includes(category);
     if (!expanded) {
       return null;
     }
 
     return (
       <ul>
-        {category.events.map(event => {
+        {CATEGORIES[category].map(eventType => {
+          const key = getKey(category, eventType);
           return (
-            <li className="event-listener-event" key={event.id}>
+            <li className="event-listener-event" key={key}>
               <label className="event-listener-label">
                 <input
                   type="checkbox"
-                  value={event.id}
-                  onChange={e =>
-                    this.onEventTypeClick(event.id, e.target.checked)
-                  }
-                  checked={activeEventListeners.includes(event.id)}
+                  value={key}
+                  onChange={e => this.onEventTypeClick(key, e.target.checked)}
+                  checked={activeEventListeners.includes(key)}
                 />
-                <span className="event-listener-name">{event.name}</span>
+                <span className="event-listener-name">{eventType}</span>
               </label>
             </li>
           );
@@ -133,14 +153,12 @@ class EventListeners extends Component<Props> {
   }
 
   render() {
-    const { categories } = this.props;
-
     return (
       <div className="event-listeners-content">
         <ul className="event-listeners-list">
-          {categories.map((category, index) => {
+          {Object.keys(CATEGORIES).map(category => {
             return (
-              <li className="event-listener-group" key={index}>
+              <li className="event-listener-group" key={category}>
                 {this.renderCategoryHeading(category)}
                 {this.renderCategoryListing(category)}
               </li>
@@ -152,20 +170,14 @@ class EventListeners extends Component<Props> {
   }
 }
 
-const mapStateToProps = state => {
-  return {
-    activeEventListeners: getActiveEventListeners(state),
-    categories: getEventListenerBreakpointTypes(state),
-    expandedCategories: getEventListenerExpanded(state),
-  };
-};
+const mapStateToProps = state => ({
+  activeEventListeners: getActiveEventListeners(state),
+});
 
 export default connect(
   mapStateToProps,
   {
-    addEventListeners: actions.addEventListenerBreakpoints,
-    removeEventListeners: actions.removeEventListenerBreakpoints,
-    addEventListenerExpanded: actions.addEventListenerExpanded,
-    removeEventListenerExpanded: actions.removeEventListenerExpanded,
+    addEventListeners: actions.addEventListeners,
+    removeEventListeners: actions.removeEventListeners,
   }
 )(EventListeners);
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/tests/EventListeners.spec.js b/devtools/client/debugger/src/components/SecondaryPanes/tests/EventListeners.spec.js
deleted file mode 100644
index 8d837ac6412c..000000000000
--- a/devtools/client/debugger/src/components/SecondaryPanes/tests/EventListeners.spec.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
-
-// @flow
-
-import React from "react";
-import { shallow } from "enzyme";
-import EventListeners from "../EventListeners";
-
-function getCategories() {
-  return [
-    {
-      name: "Category 1",
-      events: [
-        { name: "Subcategory 1", id: "category1.subcategory1" },
-        { name: "Subcategory 2", id: "category1.subcategory2" },
-      ],
-    },
-    {
-      name: "Category 2",
-      events: [
-        { name: "Subcategory 3", id: "category2.subcategory1" },
-        { name: "Subcategory 4", id: "category2.subcategory2" },
-      ],
-    },
-  ];
-}
-
-function generateDefaults(overrides = {}) {
-  const defaults = {
-    activeEventListeners: [],
-    expandedCategories: [],
-    categories: [],
-  };
-
-  return { ...defaults, ...overrides };
-}
-
-function render(overrides = {}) {
-  const props = generateDefaults(overrides);
-  // $FlowIgnore
-  const component = shallow(<EventListeners.WrappedComponent {...props} />);
-  return { component, props };
-}
-
-describe("EventListeners", () => {
-  it("should render", async () => {
-    const { component } = render();
-    expect(component).toMatchSnapshot();
-  });
-
-  it("should render categories appropriately", async () => {
-    const props = {
-      ...generateDefaults(),
-      categories: getCategories(),
-    };
-    const { component } = render(props);
-    expect(component).toMatchSnapshot();
-  });
-
-  it("should render expanded categories appropriately", async () => {
-    const props = {
-      ...generateDefaults(),
-      categories: getCategories(),
-      expandedCategories: ["Category 2"],
-    };
-    const { component } = render(props);
-    expect(component).toMatchSnapshot();
-  });
-
-  it("should render checked subcategories appropriately", async () => {
-    const props = {
-      ...generateDefaults(),
-      categories: getCategories(),
-      activeEventListeners: ["category1.subcategory2"],
-      expandedCategories: ["Category 1"],
-    };
-    const { component } = render(props);
-    expect(component).toMatchSnapshot();
-  });
-});
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/EventListeners.spec.js.snap b/devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/EventListeners.spec.js.snap
deleted file mode 100644
index 02869aa02edd..000000000000
--- a/devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/EventListeners.spec.js.snap
+++ /dev/null
@@ -1,320 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`EventListeners should render 1`] = `
-<div
-  className="event-listeners-content"
->
-  <ul
-    className="event-listeners-list"
-  />
-</div>
-`;
-
-exports[`EventListeners should render categories appropriately 1`] = `
-<div
-  className="event-listeners-content"
->
-  <ul
-    className="event-listeners-list"
-  >
-    <li
-      className="event-listener-group"
-      key="0"
-    >
-      <div
-        className="event-listener-header"
-      >
-        <button
-          className="event-listener-expand"
-          onClick={[Function]}
-        >
-          <AccessibleImage
-            className="arrow"
-          />
-        </button>
-        <label
-          className="event-listener-label"
-        >
-          <input
-            checked={false}
-            onChange={[Function]}
-            type="checkbox"
-            value="Category 1"
-          />
-          <span
-            className="event-listener-category"
-          >
-            Category 1
-          </span>
-        </label>
-      </div>
-    </li>
-    <li
-      className="event-listener-group"
-      key="1"
-    >
-      <div
-        className="event-listener-header"
-      >
-        <button
-          className="event-listener-expand"
-          onClick={[Function]}
-        >
-          <AccessibleImage
-            className="arrow"
-          />
-        </button>
-        <label
-          className="event-listener-label"
-        >
-          <input
-            checked={false}
-            onChange={[Function]}
-            type="checkbox"
-            value="Category 2"
-          />
-          <span
-            className="event-listener-category"
-          >
-            Category 2
-          </span>
-        </label>
-      </div>
-    </li>
-  </ul>
-</div>
-`;
-
-exports[`EventListeners should render checked subcategories appropriately 1`] = `
-<div
-  className="event-listeners-content"
->
-  <ul
-    className="event-listeners-list"
-  >
-    <li
-      className="event-listener-group"
-      key="0"
-    >
-      <div
-        className="event-listener-header"
-      >
-        <button
-          className="event-listener-expand"
-          onClick={[Function]}
-        >
-          <AccessibleImage
-            className="arrow expanded"
-          />
-        </button>
-        <label
-          className="event-listener-label"
-        >
-          <input
-            checked={false}
-            onChange={[Function]}
-            type="checkbox"
-            value="Category 1"
-          />
-          <span
-            className="event-listener-category"
-          >
-            Category 1
-          </span>
-        </label>
-      </div>
-      <ul>
-        <li
-          className="event-listener-event"
-          key="category1.subcategory1"
-        >
-          <label
-            className="event-listener-label"
-          >
-            <input
-              checked={false}
-              onChange={[Function]}
-              type="checkbox"
-              value="category1.subcategory1"
-            />
-            <span
-              className="event-listener-name"
-            >
-              Subcategory 1
-            </span>
-          </label>
-        </li>
-        <li
-          className="event-listener-event"
-          key="category1.subcategory2"
-        >
-          <label
-            className="event-listener-label"
-          >
-            <input
-              checked={true}
-              onChange={[Function]}
-              type="checkbox"
-              value="category1.subcategory2"
-            />
-            <span
-              className="event-listener-name"
-            >
-              Subcategory 2
-            </span>
-          </label>
-        </li>
-      </ul>
-    </li>
-    <li
-      className="event-listener-group"
-      key="1"
-    >
-      <div
-        className="event-listener-header"
-      >
-        <button
-          className="event-listener-expand"
-          onClick={[Function]}
-        >
-          <AccessibleImage
-            className="arrow"
-          />
-        </button>
-        <label
-          className="event-listener-label"
-        >
-          <input
-            checked={false}
-            onChange={[Function]}
-            type="checkbox"
-            value="Category 2"
-          />
-          <span
-            className="event-listener-category"
-          >
-            Category 2
-          </span>
-        </label>
-      </div>
-    </li>
-  </ul>
-</div>
-`;
-
-exports[`EventListeners should render expanded categories appropriately 1`] = `
-<div
-  className="event-listeners-content"
->
-  <ul
-    className="event-listeners-list"
-  >
-    <li
-      className="event-listener-group"
-      key="0"
-    >
-      <div
-        className="event-listener-header"
-      >
-        <button
-          className="event-listener-expand"
-          onClick={[Function]}
-        >
-          <AccessibleImage
-            className="arrow"
-          />
-        </button>
-        <label
-          className="event-listener-label"
-        >
-          <input
-            checked={false}
-            onChange={[Function]}
-            type="checkbox"
-            value="Category 1"
-          />
-          <span
-            className="event-listener-category"
-          >
-            Category 1
-          </span>
-        </label>
-      </div>
-    </li>
-    <li
-      className="event-listener-group"
-      key="1"
-    >
-      <div
-        className="event-listener-header"
-      >
-        <button
-          className="event-listener-expand"
-          onClick={[Function]}
-        >
-          <AccessibleImage
-            className="arrow expanded"
-          />
-        </button>
-        <label
-          className="event-listener-label"
-        >
-          <input
-            checked={false}
-            onChange={[Function]}
-            type="checkbox"
-            value="Category 2"
-          />
-          <span
-            className="event-listener-category"
-          >
-            Category 2
-          </span>
-        </label>
-      </div>
-      <ul>
-        <li
-          className="event-listener-event"
-          key="category2.subcategory1"
-        >
-          <label
-            className="event-listener-label"
-          >
-            <input
-              checked={false}
-              onChange={[Function]}
-              type="checkbox"
-              value="category2.subcategory1"
-            />
-            <span
-              className="event-listener-name"
-            >
-              Subcategory 3
-            </span>
-          </label>
-        </li>
-        <li
-          className="event-listener-event"
-          key="category2.subcategory2"
-        >
-          <label
-            className="event-listener-label"
-          >
-            <input
-              checked={false}
-              onChange={[Function]}
-              type="checkbox"
-              value="category2.subcategory2"
-            />
-            <span
-              className="event-listener-name"
-            >
-              Subcategory 4
-            </span>
-          </label>
-        </li>
-      </ul>
-    </li>
-  </ul>
-</div>
-`;
diff --git a/devtools/client/debugger/src/reducers/event-listeners.js b/devtools/client/debugger/src/reducers/event-listeners.js
index e7349e38dbdc..41da38eb09bf 100644
--- a/devtools/client/debugger/src/reducers/event-listeners.js
+++ b/devtools/client/debugger/src/reducers/event-listeners.js
@@ -4,61 +4,45 @@
 
 // @flow
 
-import type { State } from "./types";
-import type {
-  EventListenerAction,
-  EventListenerActiveList,
-  EventListenerCategoryList,
-  EventListenerExpandedList,
-} from "../actions/types";
+import { uniq } from "lodash";
 
-export type EventListenersState = {
-  active: EventListenerActiveList,
-  categories: EventListenerCategoryList,
-  expanded: EventListenerExpandedList,
-};
+import { asyncStore } from "../utils/prefs";
+import type { EventListenerBreakpoints } from "../types";
 
-export function initialEventListenerState(): EventListenersState {
-  return {
-    active: [],
-    categories: [],
-    expanded: [],
-  };
-}
+type OuterState = { eventListenerBreakpoints: EventListenerBreakpoints };
 
-function update(
-  state: EventListenersState = initialEventListenerState(),
-  action: EventListenerAction
-) {
+function update(state: EventListenerBreakpoints = [], action: any) {
   switch (action.type) {
-    case "UPDATE_EVENT_LISTENERS":
-      return { ...state, active: action.active };
+    case "ADD_EVENT_LISTENERS":
+      return updateEventTypes("add", state, action.events);
 
-    case "RECEIVE_EVENT_LISTENER_TYPES":
-      return { ...state, categories: action.categories };
-
-    case "UPDATE_EVENT_LISTENER_EXPANDED":
-      return { ...state, expanded: action.expanded };
+    case "REMOVE_EVENT_LISTENERS":
+      return updateEventTypes("remove", state, action.events);
 
     default:
       return state;
   }
 }
 
-export function getActiveEventListeners(state: State): EventListenerActiveList {
-  return state.eventListenerBreakpoints.active;
+function updateEventTypes(
+  addOrRemove: string,
+  currentEvents: EventListenerBreakpoints,
+  events: EventListenerBreakpoints
+): EventListenerBreakpoints {
+  let newEventListeners;
+
+  if (addOrRemove === "add") {
+    newEventListeners = uniq([...currentEvents, ...events]);
+  } else {
+    newEventListeners = currentEvents.filter(event => !events.includes(event));
+  }
+
+  asyncStore.eventListenerBreakpoints = newEventListeners;
+  return newEventListeners;
 }
 
-export function getEventListenerBreakpointTypes(
-  state: State
-): EventListenerCategoryList {
-  return state.eventListenerBreakpoints.categories;
-}
-
-export function getEventListenerExpanded(
-  state: State
-): EventListenerExpandedList {
-  return state.eventListenerBreakpoints.expanded;
+export function getActiveEventListeners(state: OuterState) {
+  return state.eventListenerBreakpoints;
 }
 
 export default update;
diff --git a/devtools/client/debugger/src/reducers/types.js b/devtools/client/debugger/src/reducers/types.js
index 0abc8d955b09..97d9e3de5a9f 100644
--- a/devtools/client/debugger/src/reducers/types.js
+++ b/devtools/client/debugger/src/reducers/types.js
@@ -24,13 +24,11 @@ import type { SourceActorsState } from "./source-actors";
 import type { TabList } from "./tabs";
 import type { UIState } from "./ui";
 import type { QuickOpenState } from "./quick-open";
-import type { EventListenersState } from "./event-listeners";
 
 export type State = {
   ast: ASTState,
   breakpoints: BreakpointsState,
   expressions: Record<ExpressionState>,
-  eventListenerBreakpoints: EventListenersState,
   debuggee: DebuggeeState,
   fileSearch: Record<FileSearchState>,
   pause: PauseState,
diff --git a/devtools/client/debugger/src/utils/prefs.js b/devtools/client/debugger/src/utils/prefs.js
index 8f4634331764..1bb248d78cf0 100644
--- a/devtools/client/debugger/src/utils/prefs.js
+++ b/devtools/client/debugger/src/utils/prefs.js
@@ -12,7 +12,7 @@ import { asyncStoreHelper } from "./asyncStoreHelper";
 // Schema version to bump when the async store format has changed incompatibly
 // and old stores should be cleared. This needs to match the prefs schema
 // version in devtools/client/preferences/debugger.js.
-const prefsSchemaVersion = "1.0.10";
+const prefsSchemaVersion = "1.0.9";
 const pref = Services.pref;
 
 if (isDevelopment()) {
@@ -134,7 +134,7 @@ export const asyncStore = asyncStoreHelper("debugger", {
   pendingBreakpoints: ["pending-breakpoints", {}],
   tabs: ["tabs", []],
   xhrBreakpoints: ["xhr-breakpoints", []],
-  eventListenerBreakpoints: ["event-listener-breakpoints", undefined],
+  eventListenerBreakpoints: ["event-listener-breakpoints", []],
 });
 
 export function verifyPrefSchema() {
@@ -143,7 +143,6 @@ export function verifyPrefSchema() {
     asyncStore.pendingBreakpoints = {};
     asyncStore.tabs = [];
     asyncStore.xhrBreakpoints = [];
-    asyncStore.eventListenerBreakpoints = undefined;
     prefs.debuggerPrefsSchemaVersion = prefsSchemaVersion;
   }
 }
diff --git a/devtools/client/preferences/debugger.js b/devtools/client/preferences/debugger.js
index a07b62c5320d..8cfde1502e97 100644
--- a/devtools/client/preferences/debugger.js
+++ b/devtools/client/preferences/debugger.js
@@ -20,7 +20,7 @@ pref("devtools.debugger.workers", false);
 
 // The default Debugger UI settings
 // This schema version needs to match that in devtools/client/debugger/src/utils/prefs.js.
-pref("devtools.debugger.prefs-schema-version", "1.0.10");
+pref("devtools.debugger.prefs-schema-version", "1.0.9");
 pref("devtools.debugger.ui.panes-workers-and-sources-width", 200);
 pref("devtools.debugger.ui.panes-instruments-width", 300);
 pref("devtools.debugger.ui.panes-visible-on-startup", false);
@@ -46,7 +46,7 @@ pref("devtools.debugger.tabsBlackBoxed", "[]");
 pref("devtools.debugger.pending-selected-location", "{}");
 pref("devtools.debugger.pending-breakpoints", "{}");
 pref("devtools.debugger.expressions", "[]");
-pref("devtools.debugger.event-listener-breakpoints", undefined);
+pref("devtools.debugger.event-listener-breakpoints", "[]");
 pref("devtools.debugger.file-search-case-sensitive", false);
 pref("devtools.debugger.file-search-whole-word", false);
 pref("devtools.debugger.file-search-regex-match", false);

From 2fffbab72eb06642f48aff377806632ca2d020d4 Mon Sep 17 00:00:00 2001
From: Bogdan Tara <btara@mozilla.com>
Date: Mon, 20 May 2019 19:31:47 +0300
Subject: [PATCH 028/129] Backed out changeset d19dbdb939af (bug 1551320) for
 CreateElement related failures CLOSED TREE

---
 dom/base/Document.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
index 884c1f1fe8ca..a6cf7e0ed0db 100644
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
@@ -5483,14 +5483,6 @@ already_AddRefed<Element> Document::CreateElement(
     return nullptr;
   }
 
-  // Temporary check until XULDocument has been removed.
-  if (IsXULDocument()) {
-    MOZ_DIAGNOSTIC_ASSERT(false,
-                          "CreateElement() not allowed in XUL document.");
-    rv.Throw(NS_ERROR_FAILURE);
-    return nullptr;
-  }
-
   bool needsLowercase = IsHTMLDocument() && !IsLowercaseASCII(aTagName);
   nsAutoString lcTagName;
   if (needsLowercase) {

From 55a63d15205717e3157ea8123e27de3bcba08284 Mon Sep 17 00:00:00 2001
From: Coroiu Cristina <ccoroiu@mozilla.com>
Date: Mon, 20 May 2019 20:21:56 +0300
Subject: [PATCH 029/129] Backed out 2 changesets (bug 1523526, bug 1526443)
 for Be bustage on Windows AArch on a CLOSED TREE

Backed out changeset 98013639d600 (bug 1526443)
Backed out changeset e8ac4b512f9d (bug 1523526)
---
 .../app/winlauncher/LauncherProcessWin.cpp    |  13 --
 .../mozconfigs/win64-aarch64/common-win64     |   4 -
 build/build-clang/clang-win64.json            |   1 -
 build/build-clang/r355141-arm64-cfg.patch     | 112 ------------------
 build/moz.configure/toolchain.configure       |   5 +-
 .../sandbox/chromium-shim/base/win/sdkdecls.h |  11 --
 .../aarch64_control_flow_guard.patch          |  44 -------
 .../patches/with_update/patch_order.txt       |   1 -
 .../sandbox/win/src/process_mitigations.cc    |   5 -
 .../chromium/sandbox/win/src/security_level.h |   9 --
 .../win/src/sandboxbroker/sandboxBroker.cpp   |   7 --
 11 files changed, 2 insertions(+), 210 deletions(-)
 delete mode 100644 build/build-clang/r355141-arm64-cfg.patch
 delete mode 100644 security/sandbox/chromium-shim/patches/with_update/aarch64_control_flow_guard.patch

diff --git a/browser/app/winlauncher/LauncherProcessWin.cpp b/browser/app/winlauncher/LauncherProcessWin.cpp
index e872ba327d62..f11c83a9e63d 100644
--- a/browser/app/winlauncher/LauncherProcessWin.cpp
+++ b/browser/app/winlauncher/LauncherProcessWin.cpp
@@ -60,11 +60,6 @@ static mozilla::LauncherVoidResult PostCreationSetup(
     (0x00000001ULL << 60)
 #endif  // !defined(PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON)
 
-#if !defined(PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF)
-#  define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF \
-    (0x00000002ULL << 40)
-#endif  // !defined(PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF)
-
 #if (_WIN32_WINNT < 0x0602)
 BOOL WINAPI
 SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY aMitigationPolicy,
@@ -81,14 +76,6 @@ static void SetMitigationPolicies(mozilla::ProcThreadAttributes& aAttrs,
     aAttrs.AddMitigationPolicy(
         PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON);
   }
-
-#if defined(_M_ARM64)
-  // Disable CFG on older versions of ARM64 Windows to avoid a crash in COM.
-  if (!mozilla::IsWin10Sep2018UpdateOrLater()) {
-    aAttrs.AddMitigationPolicy(
-        PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF);
-  }
-#endif  // defined(_M_ARM64)
 }
 
 static mozilla::LauncherFlags ProcessCmdLine(int& aArgc, wchar_t* aArgv[]) {
diff --git a/browser/config/mozconfigs/win64-aarch64/common-win64 b/browser/config/mozconfigs/win64-aarch64/common-win64
index b1bdc5a756a6..191bb407fcea 100644
--- a/browser/config/mozconfigs/win64-aarch64/common-win64
+++ b/browser/config/mozconfigs/win64-aarch64/common-win64
@@ -1,7 +1,3 @@
 # This file is used by all AArch64 Win64 builds
 
 ac_add_options --target=aarch64-windows-mingw32
-
-# Temporary signal to toolchain.configure that our compiler is patched to
-# support CFG, until such support can be assumed.
-ac_add_options --enable-hardening
diff --git a/build/build-clang/clang-win64.json b/build/build-clang/clang-win64.json
index 82ac64971d51..686b64ddf1e9 100644
--- a/build/build-clang/clang-win64.json
+++ b/build/build-clang/clang-win64.json
@@ -17,7 +17,6 @@
       "workaround-issue38586.patch",
       "unpoison-thread-stacks.patch",
       "downgrade-mangling-error.patch",
-      "r355141-arm64-cfg.patch",
       "loosen-msvc-detection.patch",
       "revert-r355311.patch"
     ]
diff --git a/build/build-clang/r355141-arm64-cfg.patch b/build/build-clang/r355141-arm64-cfg.patch
deleted file mode 100644
index 50db8992d048..000000000000
--- a/build/build-clang/r355141-arm64-cfg.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-[COFF] Add address-taken import thunks to the fid table
-
-https://bugs.llvm.org/show_bug.cgi?id=39799
-https://reviews.llvm.org/D58739
-
---- a/lld/COFF/Writer.cpp
-+++ b/lld/COFF/Writer.cpp
-@@ -1390,19 +1390,47 @@
- // symbol in an executable section.
- static void maybeAddAddressTakenFunction(SymbolRVASet &AddressTakenSyms,
-                                          Symbol *S) {
--  auto *D = dyn_cast_or_null<DefinedCOFF>(S);
--
--  // Ignore undefined symbols and references to non-functions (e.g. globals and
--  // labels).
--  if (!D ||
--      D->getCOFFSymbol().getComplexType() != COFF::IMAGE_SYM_DTYPE_FUNCTION)
-+  if (!S)
-     return;
- 
--  // Mark the symbol as address taken if it's in an executable section.
--  Chunk *RefChunk = D->getChunk();
--  OutputSection *OS = RefChunk ? RefChunk->getOutputSection() : nullptr;
--  if (OS && OS->Header.Characteristics & IMAGE_SCN_MEM_EXECUTE)
--    addSymbolToRVASet(AddressTakenSyms, D);
-+  switch (S->kind()) {
-+  case Symbol::DefinedLocalImportKind:
-+  case Symbol::DefinedImportDataKind:
-+    // Defines an __imp_ pointer, so it is data, so it is ignored.
-+    break;
-+  case Symbol::DefinedCommonKind:
-+    // Common is always data, so it is ignored.
-+    break;
-+  case Symbol::DefinedAbsoluteKind:
-+  case Symbol::DefinedSyntheticKind:
-+    // Absolute is never code, synthetic generally isn't and usually isn't
-+    // determinable.
-+    break;
-+  case Symbol::LazyKind:
-+  case Symbol::UndefinedKind:
-+    // Undefined symbols resolve to zero, so they don't have an RVA. Lazy
-+    // symbols shouldn't have relocations.
-+    break;
-+
-+  case Symbol::DefinedImportThunkKind:
-+    // Thunks are always code, include them.
-+    addSymbolToRVASet(AddressTakenSyms, cast<Defined>(S));
-+    break;
-+
-+  case Symbol::DefinedRegularKind: {
-+    // This is a regular, defined, symbol from a COFF file. Mark the symbol as
-+    // address taken if the symbol type is function and it's in an executable
-+    // section.
-+    auto *D = cast<DefinedRegular>(S);
-+    if (D->getCOFFSymbol().getComplexType() == COFF::IMAGE_SYM_DTYPE_FUNCTION) {
-+      Chunk *RefChunk = D->getChunk();
-+      OutputSection *OS = RefChunk ? RefChunk->getOutputSection() : nullptr;
-+      if (OS && OS->Header.Characteristics & IMAGE_SCN_MEM_EXECUTE)
-+        addSymbolToRVASet(AddressTakenSyms, D);
-+    }
-+    break;
-+  }
-+  }
- }
- 
- // Visit all relocations from all section contributions of this object file and
---- a/lld/test/COFF/guardcf-thunk.s
-+++ b/lld/test/COFF/guardcf-thunk.s
-@@ -0,0 +1,43 @@
-+# REQUIRES: x86
-+
-+# Make a DLL that exports exportfn1.
-+# RUN: yaml2obj < %p/Inputs/export.yaml > %t.obj
-+# RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1 /implib:%t.lib
-+
-+# Make an obj that takes the address of that exported function.
-+# RUN: llvm-mc -filetype=obj -triple=x86_64-windows-msvc %s -o %t2.obj
-+# RUN: lld-link -entry:main -guard:cf %t2.obj %t.lib -nodefaultlib -out:%t.exe
-+# RUN: llvm-readobj -coff-load-config %t.exe | FileCheck %s
-+
-+# Check that the gfids table contains *exactly* two entries, one for exportfn1
-+# and one for main.
-+# CHECK: GuardFidTable [
-+# CHECK-NEXT: 0x{{[0-9A-Fa-f]+0$}}
-+# CHECK-NEXT: 0x{{[0-9A-Fa-f]+0$}}
-+# CHECK-NEXT: ]
-+
-+
-+        .def     @feat.00;
-+        .scl    3;
-+        .type   0;
-+        .endef
-+        .globl  @feat.00
-+@feat.00 = 0x001
-+
-+        .section .text,"rx"
-+        .def     main; .scl    2; .type   32; .endef
-+        .global main
-+main:
-+        leaq exportfn1(%rip), %rax
-+        retq
-+
-+        .section .rdata,"dr"
-+.globl _load_config_used
-+_load_config_used:
-+        .long 256
-+        .fill 124, 1, 0
-+        .quad __guard_fids_table
-+        .quad __guard_fids_count
-+        .long __guard_flags
-+        .fill 128, 1, 0
-+
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index 6d8d548491ac..611d5d52fe8c 100755
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1666,10 +1666,9 @@ def security_hardening_cflags(hardening_flag, asan, optimize, c_compiler, target
             js_ldflags.append("-Wl,--dynamicbase")
 
         # Control Flow Guard (CFG) ----------------------------
-        # On aarch64, this is enabled only with explicit --enable-hardening
-        # (roughly: automation) due to a dependency on a patched clang-cl.
+        # See Bug 1525588 for why this doesn't work on Windows ARM
         if c_compiler.type == 'clang-cl' and c_compiler.version >= '8' and \
-           (target.cpu != 'aarch64' or hardening_flag):
+           target.cpu != 'aarch64':
             flags.append("-guard:cf")
             js_flags.append("-guard:cf")
             # nolongjmp is needed because clang doesn't emit the CFG tables of
diff --git a/security/sandbox/chromium-shim/base/win/sdkdecls.h b/security/sandbox/chromium-shim/base/win/sdkdecls.h
index c2bf6670cefc..60561a4e4e21 100644
--- a/security/sandbox/chromium-shim/base/win/sdkdecls.h
+++ b/security/sandbox/chromium-shim/base/win/sdkdecls.h
@@ -210,17 +210,6 @@ typedef struct _PROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY {
 #define PROCESS_CREATION_MITIGATION_POLICY_PROHIBIT_DYNAMIC_CODE_ALWAYS_OFF               (0x00000002uLL << 36)
 #define PROCESS_CREATION_MITIGATION_POLICY_PROHIBIT_DYNAMIC_CODE_ALWAYS_ON_ALLOW_OPT_OUT  (0x00000003uLL << 36)
 
-//
-// Define Control Flow Guard (CFG) mitigation policy options.  Control Flow
-// Guard allows indirect control transfers to be checked at runtime.
-//
-
-#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_MASK                        (0x00000003uLL << 40)
-#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_DEFER                       (0x00000000uLL << 40)
-#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_ON                   (0x00000001uLL << 40)
-#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF                  (0x00000002uLL << 40)
-#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_EXPORT_SUPPRESSION          (0x00000003uLL << 40)
-
 //
 // Define module signature options.  When enabled, this option will
 // block mapping of non-microsoft binaries.
diff --git a/security/sandbox/chromium-shim/patches/with_update/aarch64_control_flow_guard.patch b/security/sandbox/chromium-shim/patches/with_update/aarch64_control_flow_guard.patch
deleted file mode 100644
index 725cfa966d25..000000000000
--- a/security/sandbox/chromium-shim/patches/with_update/aarch64_control_flow_guard.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Bug 1523526: Don't allow CFG on old releases of Windows for arm64
-
-There's a bug in ole32.dll on arm64 versions of Windows prior to 1809, that crashes our content processes if we enable CFG. We've reported the issue, but even if it gets fixed, we can't assume users will have the update.
-
-This patch uses process mitigation policy flags to disable CFG on arm64 before 1809. Based on testing, we only need to do this in the sandbox for child processes, and it's not strictly necessary for the launcher stub to set the flag on the main process. But I've included that anyway as a guard against some yet-undiscovered scenario that might hit the issue and make the browser unusable.
-
-The effects of this patch won't be visible until we actually enable CFG in a subsequent landing.
-
-Differential Revision: https://phabricator.services.mozilla.com/D29474
-
-diff --git a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
---- a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
-+++ b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
-@@ -354,6 +354,11 @@ void ConvertProcessMitigationsToPolicy(M
-         PROCESS_CREATION_MITIGATION_POLICY_PROHIBIT_DYNAMIC_CODE_ALWAYS_ON;
-   }
- 
-+  if (flags & MITIGATION_CONTROL_FLOW_GUARD_DISABLE) {
-+    *policy_flags |=
-+        PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF;
-+  }
-+
-   if (version < base::win::VERSION_WIN10)
-     return;
- 
-diff --git a/security/sandbox/chromium/sandbox/win/src/security_level.h b/security/sandbox/chromium/sandbox/win/src/security_level.h
---- a/security/sandbox/chromium/sandbox/win/src/security_level.h
-+++ b/security/sandbox/chromium/sandbox/win/src/security_level.h
-@@ -255,6 +255,15 @@ const MitigationFlags MITIGATION_IMAGE_L
- // PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON.
- const MitigationFlags MITIGATION_IMAGE_LOAD_PREFER_SYS32 = 0x00100000;
- 
-+// Begin Mozilla-added flags.
-+// Working down from the high bit to avoid conflict with new upstream flags.
-+
-+// Disable Control Flow Guard. This may seem more like an anti-mitigation, but
-+// this flag allows code to make targeted changes to CFG to avoid bugs, while
-+// leaving it enabled in the common case. Corresponds to
-+// PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_ON.
-+const MitigationFlags MITIGATION_CONTROL_FLOW_GUARD_DISABLE = 0x80000000;
-+
- }  // namespace sandbox
- 
- #endif  // SANDBOX_SRC_SECURITY_LEVEL_H_
diff --git a/security/sandbox/chromium-shim/patches/with_update/patch_order.txt b/security/sandbox/chromium-shim/patches/with_update/patch_order.txt
index 527101105473..e6e5c901ac4b 100755
--- a/security/sandbox/chromium-shim/patches/with_update/patch_order.txt
+++ b/security/sandbox/chromium-shim/patches/with_update/patch_order.txt
@@ -21,4 +21,3 @@ mingw_disable_one_try.patch
 mingw_noexports_casts.patch
 mingw_offsetof.patch
 add_aarch64_windows_support.patch
-aarch64_control_flow_guard.patch
diff --git a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
index 8b76b93b5956..3084284fe49c 100644
--- a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
+++ b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
@@ -354,11 +354,6 @@ void ConvertProcessMitigationsToPolicy(MitigationFlags flags,
         PROCESS_CREATION_MITIGATION_POLICY_PROHIBIT_DYNAMIC_CODE_ALWAYS_ON;
   }
 
-  if (flags & MITIGATION_CONTROL_FLOW_GUARD_DISABLE) {
-    *policy_flags |=
-        PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF;
-  }
-
   if (version < base::win::VERSION_WIN10)
     return;
 
diff --git a/security/sandbox/chromium/sandbox/win/src/security_level.h b/security/sandbox/chromium/sandbox/win/src/security_level.h
index 139212433a57..d01609bfd7fa 100644
--- a/security/sandbox/chromium/sandbox/win/src/security_level.h
+++ b/security/sandbox/chromium/sandbox/win/src/security_level.h
@@ -255,15 +255,6 @@ const MitigationFlags MITIGATION_IMAGE_LOAD_NO_LOW_LABEL = 0x00080000;
 // PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON.
 const MitigationFlags MITIGATION_IMAGE_LOAD_PREFER_SYS32 = 0x00100000;
 
-// Begin Mozilla-added flags.
-// Working down from the high bit to avoid conflict with new upstream flags.
-
-// Disable Control Flow Guard. This may seem more like an anti-mitigation, but
-// this flag allows code to make targeted changes to CFG to avoid bugs, while
-// leaving it enabled in the common case. Corresponds to
-// PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_ON.
-const MitigationFlags MITIGATION_CONTROL_FLOW_GUARD_DISABLE = 0x80000000;
-
 }  // namespace sandbox
 
 #endif  // SANDBOX_SRC_SECURITY_LEVEL_H_
diff --git a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
index 329d63858863..1b137f0abb90 100644
--- a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
+++ b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
@@ -508,13 +508,6 @@ void SandboxBroker::SetSecurityLevelForContentProcess(int32_t aSandboxLevel,
       sandbox::MITIGATION_DEP | sandbox::MITIGATION_EXTENSION_POINT_DISABLE |
       sandbox::MITIGATION_IMAGE_LOAD_PREFER_SYS32;
 
-#if defined(_M_ARM64)
-  // Disable CFG on older versions of ARM64 Windows to avoid a crash in COM.
-  if (!IsWin10Sep2018UpdateOrLater()) {
-    mitigations |= sandbox::MITIGATION_CONTROL_FLOW_GUARD_DISABLE;
-  }
-#endif
-
   if (aSandboxLevel > 4) {
     result = mPolicy->SetAlternateDesktop(false);
     if (NS_WARN_IF(result != sandbox::SBOX_ALL_OK)) {

From 0c6443c5e8bdeabf637189a567fbce0422f972f7 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Tue, 14 May 2019 19:46:25 +0000
Subject: [PATCH 030/129] Bug 1550524 part 1.  Make NewHtml5Parser() return an
 nsHtml5Parser.  r=hsivonen

Differential Revision: https://phabricator.services.mozilla.com/D30750

--HG--
extra : moz-landing-system : lando
---
 dom/html/nsHTMLDocument.cpp   | 19 +++++++++++--------
 parser/html/nsHtml5Module.cpp | 13 ++-----------
 parser/html/nsHtml5Module.h   |  8 +++-----
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp
index f01990984502..b61d1c0a83d6 100644
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@@ -542,18 +542,20 @@ nsresult nsHTMLDocument::StartDocumentLoad(const char* aCommand,
   nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(aContainer));
 
   bool loadWithPrototype = false;
+  RefPtr<nsHtml5Parser> html5Parser;
   if (loadAsHtml5) {
-    mParser = nsHtml5Module::NewHtml5Parser();
+    html5Parser = nsHtml5Module::NewHtml5Parser();
+    mParser = html5Parser;
     if (mIsPlainText) {
       if (viewSource) {
-        mParser->MarkAsNotScriptCreated("view-source-plain");
+        html5Parser->MarkAsNotScriptCreated("view-source-plain");
       } else {
-        mParser->MarkAsNotScriptCreated("plain-text");
+        html5Parser->MarkAsNotScriptCreated("plain-text");
       }
     } else if (viewSource && !html) {
-      mParser->MarkAsNotScriptCreated("view-source-xml");
+      html5Parser->MarkAsNotScriptCreated("view-source-xml");
     } else {
-      mParser->MarkAsNotScriptCreated(aCommand);
+      html5Parser->MarkAsNotScriptCreated(aCommand);
     }
   } else if (xhtml && ShouldUsePrototypeDocument(aChannel, this)) {
     loadWithPrototype = true;
@@ -691,7 +693,7 @@ nsresult nsHTMLDocument::StartDocumentLoad(const char* aCommand,
     }
   } else {
     if (loadAsHtml5) {
-      nsHtml5Module::Initialize(mParser, this, uri, docShell, aChannel);
+      html5Parser->Initialize(this, uri, docShell, aChannel);
     } else {
       // about:blank *only*
       nsCOMPtr<nsIHTMLContentSink> htmlsink;
@@ -1178,8 +1180,9 @@ Document* nsHTMLDocument::Open(const Optional<nsAString>& /* unused */,
   // Step 14 -- create a new parser associated with document.  This also does
   // step 16 implicitly.
   mParserAborted = false;
-  mParser = nsHtml5Module::NewHtml5Parser();
-  nsHtml5Module::Initialize(mParser, this, GetDocumentURI(), shell, nullptr);
+  RefPtr<nsHtml5Parser> parser = nsHtml5Module::NewHtml5Parser();
+  mParser = parser;
+  parser->Initialize(this, GetDocumentURI(), shell, nullptr);
   if (mReferrerPolicySet) {
     // CSP may have set the referrer policy, so a speculative parser should
     // start with the new referrer policy.
diff --git a/parser/html/nsHtml5Module.cpp b/parser/html/nsHtml5Module.cpp
index 2bdcf0458b4c..d325e5e84c53 100644
--- a/parser/html/nsHtml5Module.cpp
+++ b/parser/html/nsHtml5Module.cpp
@@ -60,21 +60,12 @@ void nsHtml5Module::ReleaseStatics() {
 }
 
 // static
-already_AddRefed<nsIParser> nsHtml5Module::NewHtml5Parser() {
+already_AddRefed<nsHtml5Parser> nsHtml5Module::NewHtml5Parser() {
   MOZ_ASSERT(sNsHtml5ModuleInitialized, "nsHtml5Module not initialized.");
-  nsCOMPtr<nsIParser> rv = new nsHtml5Parser();
+  RefPtr<nsHtml5Parser> rv = new nsHtml5Parser();
   return rv.forget();
 }
 
-// static
-nsresult nsHtml5Module::Initialize(nsIParser* aParser, dom::Document* aDoc,
-                                   nsIURI* aURI, nsISupports* aContainer,
-                                   nsIChannel* aChannel) {
-  MOZ_ASSERT(sNsHtml5ModuleInitialized, "nsHtml5Module not initialized.");
-  nsHtml5Parser* parser = static_cast<nsHtml5Parser*>(aParser);
-  return parser->Initialize(aDoc, aURI, aContainer, aChannel);
-}
-
 class nsHtml5ParserThreadTerminator final : public nsIObserver {
  public:
   NS_DECL_ISUPPORTS
diff --git a/parser/html/nsHtml5Module.h b/parser/html/nsHtml5Module.h
index d14dc22ab014..2e582333629f 100644
--- a/parser/html/nsHtml5Module.h
+++ b/parser/html/nsHtml5Module.h
@@ -5,17 +5,15 @@
 #ifndef nsHtml5Module_h
 #define nsHtml5Module_h
 
-#include "nsIParser.h"
 #include "nsIThread.h"
 
+class nsHtml5Parser;
+
 class nsHtml5Module {
  public:
   static void InitializeStatics();
   static void ReleaseStatics();
-  static already_AddRefed<nsIParser> NewHtml5Parser();
-  static nsresult Initialize(nsIParser* aParser, mozilla::dom::Document* aDoc,
-                             nsIURI* aURI, nsISupports* aContainer,
-                             nsIChannel* aChannel);
+  static already_AddRefed<nsHtml5Parser> NewHtml5Parser();
   static nsIThread* GetStreamParserThread();
 
  private:

From dd41010b5d234b34f6e13d790c4a0f391db12c11 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Tue, 14 May 2019 19:46:26 +0000
Subject: [PATCH 031/129] Bug 1550524 part 2.  Add an explicit StartExecutor
 method on nsHtml5Parser, for use from document.open().  r=hsivonen

The code has mostly moved, but there are a few simplifications:

1) If !GetStreamParser(), then GetChannel() always returns null and hence we
never set isSrcdoc to true.  Which is good, because we don't want to apply the
special srcdoc-parsing rules to document.open() stuff.  So we just pass false
to setIsSrcdocDocument(): It's the same behavior as before, but a lot clearer.
I've confirmed that code coverage says the "isSrcdoc =
NS_IsSrcdocChannel(channel)" line is unreached in our tests.

2) In the document.write-after-document.open case, aContentType is now always
"text/html" (because that's what document.open sets mContentTypeForWriteCalls
to.  So the block checking for it not being "text/html" was dead code (also
confirmed via code coverage results) and I'm just removing it.

Differential Revision: https://phabricator.services.mozilla.com/D30751

--HG--
extra : moz-landing-system : lando
---
 dom/html/crashtests/1550524.html    |  7 ++++
 dom/html/crashtests/crashtests.list |  1 +
 dom/html/nsHTMLDocument.cpp         |  5 +++
 parser/html/nsHtml5Parser.cpp       | 50 ++++++++++++-----------------
 parser/html/nsHtml5Parser.h         |  7 ++++
 5 files changed, 41 insertions(+), 29 deletions(-)
 create mode 100644 dom/html/crashtests/1550524.html

diff --git a/dom/html/crashtests/1550524.html b/dom/html/crashtests/1550524.html
new file mode 100644
index 000000000000..1b41f527dc1f
--- /dev/null
+++ b/dom/html/crashtests/1550524.html
@@ -0,0 +1,7 @@
+<iframe></iframe>
+<script>
+  var doc = frames[0].document;
+  doc.open();
+  doc.open();
+  doc.close();
+</script>
diff --git a/dom/html/crashtests/crashtests.list b/dom/html/crashtests/crashtests.list
index ab03961f46b4..282998859ed1 100644
--- a/dom/html/crashtests/crashtests.list
+++ b/dom/html/crashtests/crashtests.list
@@ -89,5 +89,6 @@ asserts(0-4) load 1401726.html
 load 1412173.html
 load 1440523.html
 load 1547057.html
+load 1550524.html
 load 1550881-1.html
 load 1550881-2.html
diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp
index b61d1c0a83d6..d30552d4b1be 100644
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@@ -1193,6 +1193,11 @@ Document* nsHTMLDocument::Open(const Optional<nsAString>& /* unused */,
           static_cast<ReferrerPolicy>(mReferrerPolicy));
     }
   }
+  nsresult rv = parser->StartExecutor();
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    aError.Throw(rv);
+    return nullptr;
+  }
 
   // Some internal non-spec bookkeeping.
   mContentTypeForWriteCalls.AssignLiteral("text/html");
diff --git a/parser/html/nsHtml5Parser.cpp b/parser/html/nsHtml5Parser.cpp
index 2028fa70bd42..5f04d7c65e47 100644
--- a/parser/html/nsHtml5Parser.cpp
+++ b/parser/html/nsHtml5Parser.cpp
@@ -195,35 +195,7 @@ nsresult nsHtml5Parser::Parse(const nsAString& aSourceBuffer, void* aKey,
   mozilla::Unused << streamKungFuDeathGrip;  // Not used within function
   RefPtr<nsHtml5TreeOpExecutor> executor(mExecutor);
 
-  if (!executor->HasStarted()) {
-    NS_ASSERTION(!GetStreamParser(),
-                 "Had stream parser but document.write started life cycle.");
-    // This is the first document.write() on a document.open()ed document
-    executor->SetParser(this);
-    mTreeBuilder->setScriptingEnabled(executor->IsScriptEnabled());
-
-    bool isSrcdoc = false;
-    nsCOMPtr<nsIChannel> channel;
-    rv = GetChannel(getter_AddRefs(channel));
-    if (NS_SUCCEEDED(rv)) {
-      isSrcdoc = NS_IsSrcdocChannel(channel);
-    }
-    mTreeBuilder->setIsSrcdocDocument(isSrcdoc);
-
-    mTokenizer->start();
-    executor->Start();
-    if (!aContentType.EqualsLiteral("text/html")) {
-      mTreeBuilder->StartPlainText();
-      mTokenizer->StartPlainText();
-    }
-    /*
-     * If you move the following line, be very careful not to cause
-     * WillBuildModel to be called before the document has had its
-     * script global object set.
-     */
-    rv = executor->WillBuildModel(eDTDMode_unknown);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
+  MOZ_RELEASE_ASSERT(executor->HasStarted());
 
   // Return early if the parser has processed EOF
   if (executor->IsComplete()) {
@@ -670,6 +642,26 @@ nsresult nsHtml5Parser::ParseUntilBlocked() {
   }
 }
 
+nsresult nsHtml5Parser::StartExecutor() {
+  MOZ_ASSERT(!GetStreamParser(),
+             "Had stream parser but document.write started life cycle.");
+  // This is part of the setup document.open() does.
+  RefPtr<nsHtml5TreeOpExecutor> executor(mExecutor);
+  executor->SetParser(this);
+  mTreeBuilder->setScriptingEnabled(executor->IsScriptEnabled());
+
+  mTreeBuilder->setIsSrcdocDocument(false);
+
+  mTokenizer->start();
+  executor->Start();
+
+  /*
+   * We know we're in document.open(), so our document must already
+   * have a script global andthe WillBuildModel call is safe.
+   */
+  return executor->WillBuildModel(eDTDMode_unknown);
+}
+
 nsresult nsHtml5Parser::Initialize(mozilla::dom::Document* aDoc, nsIURI* aURI,
                                    nsISupports* aContainer,
                                    nsIChannel* aChannel) {
diff --git a/parser/html/nsHtml5Parser.h b/parser/html/nsHtml5Parser.h
index 725c47e68c7f..0a28f60d3151 100644
--- a/parser/html/nsHtml5Parser.h
+++ b/parser/html/nsHtml5Parser.h
@@ -254,6 +254,13 @@ class nsHtml5Parser final : public nsIParser, public nsSupportsWeakReference {
    */
   nsresult ParseUntilBlocked();
 
+  /**
+   * Start our executor.  This is meant to be used from document.open() _only_
+   * and does some work similar to what nsHtml5StreamParser::OnStartRequest does
+   * for normal parses.
+   */
+  nsresult StartExecutor();
+
  private:
   virtual ~nsHtml5Parser();
 

From f6c8cd1d1089ab53280934172b78e35d07fcc9c4 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Tue, 14 May 2019 19:46:26 +0000
Subject: [PATCH 032/129] Bug 1550524 part 3.  Remove the now-unused
 aContentType argument to nsHtml5Parser::Parse.  r=hsivonen

Differential Revision: https://phabricator.services.mozilla.com/D30752

--HG--
extra : moz-landing-system : lando
---
 dom/base/Document.cpp         |  1 -
 dom/base/Document.h           |  4 ----
 dom/html/nsHTMLDocument.cpp   | 11 ++++-------
 parser/html/nsHtml5Parser.cpp |  4 +---
 parser/html/nsHtml5Parser.h   |  6 +-----
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
index a6cf7e0ed0db..423350f26e06 100644
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
@@ -11910,7 +11910,6 @@ void Document::SetContentTypeInternal(const nsACString& aType) {
 
   mCachedEncoder = nullptr;
   mContentType = aType;
-  mContentTypeForWriteCalls = aType;
 }
 
 nsILoadContext* Document::GetLoadContext() const { return mDocumentContainer; }
diff --git a/dom/base/Document.h b/dom/base/Document.h
index cc389f77cf92..dddfdcf784be 100644
--- a/dom/base/Document.h
+++ b/dom/base/Document.h
@@ -4419,10 +4419,6 @@ class Document : public nsINode,
   nsCString mContentType;
 
  protected:
-  // For document.write() we may need a different content type than
-  // mContentType.
-  nsCString mContentTypeForWriteCalls;
-
   // The document's security info
   nsCOMPtr<nsISupports> mSecurityInfo;
 
diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp
index d30552d4b1be..9ed9c0d1d06d 100644
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@@ -1199,9 +1199,6 @@ Document* nsHTMLDocument::Open(const Optional<nsAString>& /* unused */,
     return nullptr;
   }
 
-  // Some internal non-spec bookkeeping.
-  mContentTypeForWriteCalls.AssignLiteral("text/html");
-
   if (shell) {
     // Prepare the docshell and the document viewer for the impending
     // out-of-band document.write()
@@ -1243,7 +1240,7 @@ void nsHTMLDocument::Close(ErrorResult& rv) {
 
   ++mWriteLevel;
   rv = (static_cast<nsHtml5Parser*>(mParser.get()))
-           ->Parse(EmptyString(), nullptr, mContentTypeForWriteCalls, true);
+           ->Parse(EmptyString(), nullptr, true);
   --mWriteLevel;
 
   // Even if that Parse() call failed, do the rest of this method
@@ -1375,10 +1372,10 @@ void nsHTMLDocument::WriteCommon(const nsAString& aText, bool aNewlineTerminate,
   // why pay that price when we don't need to?
   if (aNewlineTerminate) {
     aRv = (static_cast<nsHtml5Parser*>(mParser.get()))
-              ->Parse(aText + new_line, key, mContentTypeForWriteCalls, false);
+              ->Parse(aText + new_line, key, false);
   } else {
-    aRv = (static_cast<nsHtml5Parser*>(mParser.get()))
-              ->Parse(aText, key, mContentTypeForWriteCalls, false);
+    aRv =
+        (static_cast<nsHtml5Parser*>(mParser.get()))->Parse(aText, key, false);
   }
 
   --mWriteLevel;
diff --git a/parser/html/nsHtml5Parser.cpp b/parser/html/nsHtml5Parser.cpp
index 5f04d7c65e47..428ba98c9393 100644
--- a/parser/html/nsHtml5Parser.cpp
+++ b/parser/html/nsHtml5Parser.cpp
@@ -174,9 +174,7 @@ nsHtml5Parser::Parse(nsIURI* aURL, nsIRequestObserver* aObserver,
 }
 
 nsresult nsHtml5Parser::Parse(const nsAString& aSourceBuffer, void* aKey,
-                              const nsACString& aContentType, bool aLastCall,
-                              nsDTDMode aMode)  // ignored
-{
+                              bool aLastCall) {
   nsresult rv;
   if (NS_FAILED(rv = mExecutor->IsBroken())) {
     return rv;
diff --git a/parser/html/nsHtml5Parser.h b/parser/html/nsHtml5Parser.h
index 0a28f60d3151..a963fa8f149f 100644
--- a/parser/html/nsHtml5Parser.h
+++ b/parser/html/nsHtml5Parser.h
@@ -135,13 +135,9 @@ class nsHtml5Parser final : public nsIParser, public nsSupportsWeakReference {
    *
    * @param   aSourceBuffer the argument of document.write (empty for .close())
    * @param   aKey a key unique to the script element that caused this call
-   * @param   aContentType "text/html" for HTML mode, else text/plain mode
    * @param   aLastCall true if .close() false if .write()
-   * @param   aMode ignored (for interface compat only)
    */
-  nsresult Parse(const nsAString& aSourceBuffer, void* aKey,
-                 const nsACString& aContentType, bool aLastCall,
-                 nsDTDMode aMode = eDTDMode_autodetect);
+  nsresult Parse(const nsAString& aSourceBuffer, void* aKey, bool aLastCall);
 
   /**
    * Stops the parser prematurely

From 7029c5b0f844fd248073bf12b7fe66b5f45cdd1d Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Mon, 20 May 2019 16:19:22 +0000
Subject: [PATCH 033/129] Bug 1542362 (xpcshell test only) - Fix intermittent
 marAppApplyUpdateStageSuccessSvc.js failure. r=bytesized

When there were multiple matches the regexp included the newline from the previous match which caused the next match to fail

Differential Revision: https://phabricator.services.mozilla.com/D31739

--HG--
extra : moz-landing-system : lando
---
 toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
index 958c85c11834..aa78f230f848 100644
--- a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
+++ b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
@@ -2882,10 +2882,10 @@ function checkUpdateLogContents(aCompareLogFile, aStaged = false,
     // when there are files still in use. The following will remove the
     // additional entries from the log file when this happens so the log check
     // passes.
-    let re = new RegExp("\n" + ERR_RENAME_FILE + "[^\n]*\n" +
+    let re = new RegExp(ERR_RENAME_FILE + "[^\n]*\n" +
                         "PerformReplaceRequest: destDir rename[^\n]*\n" +
                         "rename_file: proceeding to rename the directory\n", "g");
-    updateLogContents = updateLogContents.replace(re, "\n");
+    updateLogContents = updateLogContents.replace(re, "");
   }
 
   // Replace error codes since they are different on each platform.

From e661e801afde86af556c2b7d4a9cafbd82e3465d Mon Sep 17 00:00:00 2001
From: Bastien Orivel <eijebong@bananium.fr>
Date: Mon, 20 May 2019 12:21:20 +0000
Subject: [PATCH 034/129] Bug 1552695 - Part 1: Deduplicate syn and quote.
 r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D31737

--HG--
extra : moz-landing-system : lando
---
 Cargo.lock                               | 96 +++++++-----------------
 build/workspace-hack/Cargo.toml          |  4 +-
 xpcom/rust/xpcom/xpcom_macros/Cargo.toml |  5 +-
 xpcom/rust/xpcom/xpcom_macros/src/lib.rs | 52 +++++++------
 4 files changed, 60 insertions(+), 97 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9a8708d242d0..57437b8dca4a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -736,10 +736,10 @@ dependencies = [
 
 [[package]]
 name = "cssparser"
-version = "0.25.3"
+version = "0.25.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cssparser-macros 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser-macros 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "dtoa-short 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -753,14 +753,14 @@ dependencies = [
 
 [[package]]
 name = "cssparser-macros"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -768,17 +768,17 @@ name = "cstr"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cstr-macros 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cstr-macros 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "cstr-macros"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1204,7 +1204,7 @@ name = "geckoservo"
 version = "0.0.1"
 dependencies = [
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "cstr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1681,7 +1681,7 @@ name = "malloc_size_of"
 version = "0.0.1"
 dependencies = [
  "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashglobe 0.1.0",
  "selectors 0.21.0",
@@ -1846,8 +1846,8 @@ name = "mozilla-central-workspace-hack"
 version = "0.1.0"
 dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.88 (git+https://github.com/servo/serde?branch=deserialize_from_enums10)",
  "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2018,13 +2018,12 @@ dependencies = [
 
 [[package]]
 name = "num-derive"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2249,14 +2248,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "prefs_parser"
 version = "0.0.1"
 
-[[package]]
-name = "proc-macro2"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "0.4.27"
@@ -2300,14 +2291,6 @@ name = "quick-error"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "quote"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "quote"
 version = "0.6.11"
@@ -2667,7 +2650,7 @@ name = "selectors"
 version = "0.21.0"
 dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive_more 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2884,7 +2867,7 @@ dependencies = [
  "bindgen 0.49.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive_more 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fallible 0.0.1",
@@ -2900,7 +2883,7 @@ dependencies = [
  "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "nsstring 0.1.0",
- "num-derive 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2946,7 +2929,7 @@ version = "0.0.1"
 dependencies = [
  "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "malloc_size_of 0.0.1",
@@ -2962,7 +2945,7 @@ name = "stylo_tests"
 version = "0.0.1"
 dependencies = [
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "cstr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "geckoservo 0.0.1",
@@ -2983,26 +2966,6 @@ name = "svg_fmt"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "syn"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "syn"
-version = "0.14.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "syn"
 version = "0.15.30"
@@ -3137,7 +3100,7 @@ dependencies = [
 name = "to_shmem"
 version = "0.0.1"
 dependencies = [
- "cssparser 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_arc 0.1.1",
  "smallbitvec 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3696,8 +3659,9 @@ name = "xpcom_macros"
 version = "0.1.0"
 dependencies = [
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3807,10 +3771,10 @@ dependencies = [
 "checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9"
 "checksum crossbeam-utils 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d636a8b3bcc1b409d7ffd3facef8f21dcb4009626adbd0c5e6c4305c07253c7b"
 "checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
-"checksum cssparser 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ba1ab4e1814be64bf6b6064ff532db0e34087f11b37706d6c96a21d32478761d"
-"checksum cssparser-macros 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f3a5383ae18dbfdeb569ed62019f5bddb2a95cd2d3833313c475a0d014777805"
+"checksum cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e06795910fc2f585a75bdc9690fbcc51e83519f07b6eb981db43944643c04933"
+"checksum cssparser-macros 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b16e382d9b983fdb9ac6a36b37fdeb84ce3ea81f749febfee3463cfa7f24275e"
 "checksum cstr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b6557bdb1dc9647eae1cf7f5601b14cd45fc3c7ccf2df618387416fe542da6ea"
-"checksum cstr-macros 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0472c17c83d3ec1af32fb6ee2b3ad56ae0b6e69355d63d1d30602055c34324a8"
+"checksum cstr-macros 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0f12dd847ec773fc98d75edba5394cb87d0f35e7ee548a4c81849ca6374b3d48"
 "checksum cubeb 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "db3f0df2ad5cb453126364a77921466ba6c1034e8bd9247f326cdb31430dbc2a"
 "checksum cubeb-backend 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "442cd5cfb980ff62730525278ce320d9b2ff635b725857ad3176832664262fec"
 "checksum cubeb-core 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0161f9327864922ba7a172c90bd86bc9094938433eca415e2c75629954045022"
@@ -3914,7 +3878,7 @@ dependencies = [
 "checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
 "checksum nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b"
 "checksum nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a"
-"checksum num-derive 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d2c31b75c36a993d30c7a13d70513cb93f02acafdd5b7ba250f9b0e18615de7"
+"checksum num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
 "checksum num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "af3fdbbc3291a5464dc57b03860ec37ca6bf915ed6ee385e7c6c052c422b2124"
 "checksum num-rational 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e96f040177bb3da242b5b1ecf3f54b5d5af3efbbfb18608977a5d2767b22f10"
@@ -3943,11 +3907,9 @@ dependencies = [
 "checksum png 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9adebf7fb91ccf5eac9da1a8e00e83cb8ae882c3e8d8e4ad59da73cb8c82a2c9"
 "checksum podio 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e5422a1ee1bc57cc47ae717b0137314258138f38fd5f3cea083f43a9725383a0"
 "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-"checksum proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "77997c53ae6edd6d187fec07ec41b207063b5ee6f33680e9fa86d405cdd313d4"
 "checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
 "checksum procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9f566249236c6ca4340f7ca78968271f0ed2b0f234007a61b66f9ecd0af09260"
 "checksum quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eda5fe9b71976e62bc81b781206aaa076401769b2143379d3eb2118388babac4"
-"checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
 "checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"
 "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
 "checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
@@ -4009,8 +3971,6 @@ dependencies = [
 "checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
 "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
 "checksum svg_fmt 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c666f0fed8e1e20e057af770af9077d72f3d5a33157b8537c1475dd8ffd6d32b"
-"checksum syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "91b52877572087400e83d24b9178488541e3d535259e04ff17a63df1e5ceff59"
-"checksum syn 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4e4b5274d4a0a3d2749d5c158dc64d3403e60554dc61194648787ada5212473d"
 "checksum syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)" = "66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum target-lexicon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b0ab4982b8945c35cc1c46a83a9094c414f6828a099ce5dcaa8ee2b04642dcb"
diff --git a/build/workspace-hack/Cargo.toml b/build/workspace-hack/Cargo.toml
index aef5c5c8c2b2..9eeb4b470030 100644
--- a/build/workspace-hack/Cargo.toml
+++ b/build/workspace-hack/Cargo.toml
@@ -19,8 +19,8 @@ syn = { features = ["clone-impls", "default", "derive", "extra-traits", "full",
 log = { features = ["release_max_level_info", "release_max_level_warn", "std"],  version = "0.4.6" }
 serde = { features = ["default", "rc", "serde_derive", "std"], version = "1.0.66" }
 serde_derive = { features = ["default", "deserialize_in_place"], version = "1.0.66" }
-quote = { features = ["default", "proc-macro"], version = "0.5.2" }
-proc-macro2 = { features = ["default", "proc-macro"], version = "0.3.5" }
+quote = { features = ["default", "proc-macro"], version = "0.6.11" }
+proc-macro2 = { features = ["default", "proc-macro"], version = "0.4.27" }
 
 [target."cfg(windows)".dependencies.winapi]
 version = "0.3.6"
diff --git a/xpcom/rust/xpcom/xpcom_macros/Cargo.toml b/xpcom/rust/xpcom/xpcom_macros/Cargo.toml
index af83cfe6225f..cae41b5f589c 100644
--- a/xpcom/rust/xpcom/xpcom_macros/Cargo.toml
+++ b/xpcom/rust/xpcom/xpcom_macros/Cargo.toml
@@ -7,6 +7,7 @@ authors = ["Michael Layzell <michael@thelayzells.com>"]
 proc-macro = true
 
 [dependencies]
-syn = "0.13"
-quote = "0.5"
+syn = "0.15"
+quote = "0.6"
+proc-macro2 = "0.4"
 lazy_static = "1.0"
diff --git a/xpcom/rust/xpcom/xpcom_macros/src/lib.rs b/xpcom/rust/xpcom/xpcom_macros/src/lib.rs
index c19b1ae7a75b..d18fe360a5da 100644
--- a/xpcom/rust/xpcom/xpcom_macros/src/lib.rs
+++ b/xpcom/rust/xpcom/xpcom_macros/src/lib.rs
@@ -150,15 +150,17 @@ extern crate quote;
 extern crate syn;
 
 extern crate proc_macro;
+extern crate proc_macro2;
 
 #[macro_use]
 extern crate lazy_static;
 
 use proc_macro::TokenStream;
 
-use quote::{ToTokens, Tokens};
+use quote::ToTokens;
+use proc_macro2::{Span, TokenStream as TokenStream2};
 
-use syn::*;
+use syn::{parse, parse_quote, Attribute, Data, DataStruct, DeriveInput, Field, Fields, Ident, Lit, Meta, NestedMeta, Token, Type};
 
 use syn::punctuated::Punctuated;
 
@@ -229,7 +231,7 @@ enum RefcntKind {
 
 /// Produces the tokens for the type representation.
 impl ToTokens for RefcntKind {
-    fn to_tokens(&self, tokens: &mut Tokens) {
+    fn to_tokens(&self, tokens: &mut TokenStream2) {
         match *self {
             RefcntKind::NonAtomic => quote!(xpcom::Refcnt).to_tokens(tokens),
             RefcntKind::Atomic => quote!(xpcom::AtomicRefcnt).to_tokens(tokens),
@@ -241,7 +243,7 @@ impl ToTokens for RefcntKind {
 fn get_refcnt_kind(attrs: &[Attribute]) -> Result<RefcntKind, Box<Error>> {
     for attr in attrs {
         if let Some(Meta::NameValue(ref attr)) = attr.interpret_meta() {
-            if attr.ident.as_ref() != "refcnt" {
+            if attr.ident != "refcnt" {
                 continue;
             }
 
@@ -272,13 +274,13 @@ fn get_bases(attrs: &[Attribute]) -> Result<Vec<&'static Interface>, Box<Error>>
     let mut inherits = Vec::new();
     for attr in attrs {
         if let Some(Meta::List(ref attr)) = attr.interpret_meta() {
-            if attr.ident.as_ref() != "xpimplements" {
+            if attr.ident != "xpimplements" {
                 continue;
             }
 
             for item in &attr.nested {
                 if let NestedMeta::Meta(Meta::Word(ref iface)) = *item {
-                    if let Some(&iface) = IFACES.get(iface.as_ref()) {
+                    if let Some(&iface) = IFACES.get(iface.to_string().as_str()) {
                         inherits.push(iface);
                     } else {
                         Err(format!("Unexpected invalid base interface `{}` in \
@@ -308,15 +310,15 @@ fn get_fields(di: &DeriveInput) -> Result<&Punctuated<Field, Token![,]>, Box<Err
 fn gen_real_struct(init: &DeriveInput, bases: &[&Interface], refcnt_ty: RefcntKind) -> Result<DeriveInput, Box<Error>> {
     // Determine the name for the real struct based on the name of the
     // initializer struct's name.
-    if !init.ident.as_ref().starts_with("Init") {
+    if !init.ident.to_string().starts_with("Init") {
         Err("The target struct's name must begin with Init")?
     }
-    let name: Ident = init.ident.as_ref()[4..].into();
+    let name: Ident = Ident::new(&init.ident.to_string()[4..], Span::call_site());
     let vis = &init.vis;
 
     let bases = bases.iter().map(|base| {
-        let ident = Ident::from(format!("__base_{}", base.name));
-        let vtable = Ident::from(format!("{}VTable", base.name));
+        let ident = Ident::new(&format!("__base_{}", base.name), Span::call_site());
+        let vtable = Ident::new(&format!("{}VTable", base.name), Span::call_site());
         quote!(#ident : *const xpcom::interfaces::#vtable)
      });
 
@@ -337,8 +339,8 @@ fn gen_real_struct(init: &DeriveInput, bases: &[&Interface], refcnt_ty: RefcntKi
 /// These methods attempt to invoke the `recover_self` method to translate from
 /// the passed-in raw pointer to the actual `&self` value, and it is expected to
 /// be in scope.
-fn gen_vtable_methods(iface: &Interface) -> Result<Tokens, Box<Error>> {
-    let base_ty = Ident::from(iface.name);
+fn gen_vtable_methods(iface: &Interface) -> Result<TokenStream2, Box<Error>> {
+    let base_ty = Ident::new(iface.name, Span::call_site());
 
     let base_methods = if let Some(base) = iface.base()? {
         gen_vtable_methods(base)?
@@ -352,13 +354,13 @@ fn gen_vtable_methods(iface: &Interface) -> Result<Tokens, Box<Error>> {
 
     let mut method_defs = Vec::new();
     for method in methods {
-        let name = Ident::from(method.name);
+        let name = Ident::new(method.name, Span::call_site());
         let ret = syn::parse_str::<Type>(method.ret)?;
 
         let mut params = Vec::new();
         let mut args = Vec::new();
         for param in method.params {
-            let name = Ident::from(param.name);
+            let name = Ident::new(param.name, Span::call_site());
             let ty = syn::parse_str::<Type>(param.ty)?;
 
             params.push(quote!{#name : #ty,});
@@ -381,8 +383,8 @@ fn gen_vtable_methods(iface: &Interface) -> Result<Tokens, Box<Error>> {
 
 /// Generates the VTable for a given base interface. This assumes that the
 /// implementations of each of the `extern "system"` methods are in scope.
-fn gen_inner_vtable(iface: &Interface) -> Result<Tokens, Box<Error>> {
-    let vtable_ty = Ident::from(format!("{}VTable", iface.name));
+fn gen_inner_vtable(iface: &Interface) -> Result<TokenStream2, Box<Error>> {
+    let vtable_ty = Ident::new(&format!("{}VTable", iface.name), Span::call_site());
 
     let methods = iface.methods
         .map_err(|reason| format!("Interface {} cannot be implemented in rust \
@@ -398,7 +400,7 @@ fn gen_inner_vtable(iface: &Interface) -> Result<Tokens, Box<Error>> {
 
     // Include each of the method definitions for this interface.
     let vtable_init = methods.into_iter().map(|method| {
-        let name = Ident::from(method.name);
+        let name = Ident::new(method.name, Span::call_site());
         quote!{ #name : #name , }
     }).collect::<Vec<_>>();
 
@@ -408,9 +410,9 @@ fn gen_inner_vtable(iface: &Interface) -> Result<Tokens, Box<Error>> {
     }))
 }
 
-fn gen_root_vtable(name: &Ident, base: &Interface) -> Result<Tokens, Box<Error>> {
-    let field = Ident::from(format!("__base_{}", base.name));
-    let vtable_ty = Ident::from(format!("{}VTable", base.name));
+fn gen_root_vtable(name: &Ident, base: &Interface) -> Result<TokenStream2, Box<Error>> {
+    let field = Ident::new(&format!("__base_{}", base.name), Span::call_site());
+    let vtable_ty = Ident::new(&format!("{}VTable", base.name), Span::call_site());
     let methods = gen_vtable_methods(base)?;
     let value = gen_inner_vtable(base)?;
 
@@ -455,7 +457,7 @@ fn gen_casts(
     name: &Ident,
     coerce_name: &Ident,
     vtable_field: &Ident,
-) -> Result<(Tokens, Tokens), Box<Error>> {
+) -> Result<(TokenStream2, TokenStream2), Box<Error>> {
     if !seen.insert(iface.name) {
         return Ok((quote!{}, quote!{}));
     }
@@ -474,7 +476,7 @@ fn gen_casts(
     };
 
     // Add the if statment to QueryInterface for the base class.
-    let base_name = Ident::from(iface.name);
+    let base_name = Ident::new(iface.name, Span::call_site());
 
     let qi = quote! {
         #base_qi
@@ -511,7 +513,7 @@ fn gen_casts(
 }
 
 /// The root xpcom procedural macro definition.
-fn xpcom(init: DeriveInput) -> Result<Tokens, Box<Error>> {
+fn xpcom(init: DeriveInput) -> Result<TokenStream2, Box<Error>> {
     if !init.generics.params.is_empty() || !init.generics.where_clause.is_none() {
         return Err("Cannot #[derive(xpcom)] on a generic type, due to \
                     rust limitations. It is not possible to instantiate \
@@ -534,7 +536,7 @@ fn xpcom(init: DeriveInput) -> Result<Tokens, Box<Error>> {
 
     let name_init = &init.ident;
     let name = &real.ident;
-    let coerce_name = Ident::from(format!("{}Coerce", name.as_ref()));
+    let coerce_name = Ident::new(&format!("{}Coerce", name.to_string()), Span::call_site());
 
     // Generate a VTable for each of the base interfaces.
     let mut vtables = Vec::new();
@@ -561,7 +563,7 @@ fn xpcom(init: DeriveInput) -> Result<Tokens, Box<Error>> {
             base,
             name,
             &coerce_name,
-            &Ident::from(format!("__base_{}", base.name)),
+            &Ident::new(&format!("__base_{}", base.name), Span::call_site()),
         )?;
         qi_impl.push(qi);
         coerce_impl.push(coerce);

From 360d89fad4be46ee3a2f4f0ed496720b0e188121 Mon Sep 17 00:00:00 2001
From: Bastien Orivel <eijebong@bananium.fr>
Date: Mon, 20 May 2019 12:22:04 +0000
Subject: [PATCH 035/129] Bug 1552695 - Part 2: Revendor dependencies.
 r=froydnj

Depends on D31737

Differential Revision: https://phabricator.services.mozilla.com/D31738

--HG--
extra : moz-landing-system : lando
---
 .../cssparser-macros/.cargo-checksum.json     |    2 +-
 third_party/rust/cssparser-macros/Cargo.toml  |    8 +-
 third_party/rust/cssparser-macros/lib.rs      |    1 +
 .../rust/cssparser/.cargo-checksum.json       |    2 +-
 third_party/rust/cssparser/Cargo.toml         |    2 +-
 third_party/rust/cssparser/build.rs           |    9 +-
 .../rust/cssparser/build/match_byte.rs        |   52 +-
 third_party/rust/cssparser/src/color.rs       |  127 +-
 third_party/rust/cssparser/src/cow_rc_str.rs  |   18 +-
 third_party/rust/cssparser/src/from_bytes.rs  |   40 +-
 third_party/rust/cssparser/src/lib.rs         |   87 +-
 third_party/rust/cssparser/src/macros.rs      |   14 +-
 third_party/rust/cssparser/src/nth.rs         |   67 +-
 third_party/rust/cssparser/src/parser.rs      |  264 +-
 .../cssparser/src/rules_and_declarations.rs   |  196 +-
 third_party/rust/cssparser/src/serializer.rs  |  211 +-
 .../rust/cssparser/src/size_of_tests.rs       |   24 +-
 third_party/rust/cssparser/src/tests.rs       |  719 +--
 third_party/rust/cssparser/src/tokenizer.rs   |  175 +-
 .../rust/cssparser/src/unicode_range.rs       |   36 +-
 .../rust/cstr-macros/.cargo-checksum.json     |    2 +-
 third_party/rust/cstr-macros/Cargo.toml       |    6 +-
 third_party/rust/cstr-macros/src/lib.rs       |   18 +-
 .../rust/num-derive/.cargo-checksum.json      |    2 +-
 third_party/rust/num-derive/Cargo.toml        |   16 +-
 third_party/rust/num-derive/RELEASES.md       |   32 +-
 third_party/rust/num-derive/bors.toml         |    3 -
 third_party/rust/num-derive/build.rs          |   35 +
 third_party/rust/num-derive/ci/rustup.sh      |   12 -
 third_party/rust/num-derive/ci/test_full.sh   |    9 -
 third_party/rust/num-derive/src/lib.rs        |  665 ++-
 third_party/rust/num-derive/tests/issue-6.rs  |    2 +-
 third_party/rust/num-derive/tests/issue-9.rs  |    2 +-
 third_party/rust/num-derive/tests/newtype.rs  |   91 +
 third_party/rust/num-derive/tests/trivial.rs  |   34 +-
 .../num-derive/tests/with_custom_values.rs    |   37 +-
 .../proc-macro2-0.3.5/.cargo-checksum.json    |    1 -
 .../rust/proc-macro2-0.3.5/.travis.yml        |   32 -
 third_party/rust/proc-macro2-0.3.5/Cargo.toml |   33 -
 .../rust/proc-macro2-0.3.5/LICENSE-APACHE     |  201 -
 .../rust/proc-macro2-0.3.5/LICENSE-MIT        |   25 -
 third_party/rust/proc-macro2-0.3.5/README.md  |   98 -
 third_party/rust/proc-macro2-0.3.5/src/lib.rs |  590 ---
 .../rust/proc-macro2-0.3.5/src/stable.rs      | 1227 ------
 .../rust/proc-macro2-0.3.5/src/strnom.rs      |  391 --
 .../rust/proc-macro2-0.3.5/src/unstable.rs    |  399 --
 .../rust/proc-macro2-0.3.5/tests/test.rs      |  235 -
 .../rust/quote-0.5.2/.cargo-checksum.json     |    1 -
 third_party/rust/quote-0.5.2/Cargo.toml       |   30 -
 third_party/rust/quote-0.5.2/LICENSE-APACHE   |  201 -
 third_party/rust/quote-0.5.2/LICENSE-MIT      |   25 -
 third_party/rust/quote-0.5.2/README.md        |  135 -
 third_party/rust/quote-0.5.2/src/lib.rs       |  511 ---
 third_party/rust/quote-0.5.2/src/to_tokens.rs |  179 -
 third_party/rust/quote-0.5.2/src/tokens.rs    |  266 --
 third_party/rust/quote-0.5.2/tests/test.rs    |  289 --
 .../rust/syn-0.13.1/.cargo-checksum.json      |    1 -
 third_party/rust/syn-0.13.1/Cargo.toml        |   59 -
 third_party/rust/syn-0.13.1/LICENSE-APACHE    |  201 -
 third_party/rust/syn-0.13.1/LICENSE-MIT       |   25 -
 third_party/rust/syn-0.13.1/README.md         |  278 --
 third_party/rust/syn-0.13.1/src/attr.rs       |  556 ---
 third_party/rust/syn-0.13.1/src/buffer.rs     |  460 --
 third_party/rust/syn-0.13.1/src/data.rs       |  390 --
 third_party/rust/syn-0.13.1/src/derive.rs     |  210 -
 third_party/rust/syn-0.13.1/src/error.rs      |   60 -
 third_party/rust/syn-0.13.1/src/expr.rs       | 3580 ---------------
 third_party/rust/syn-0.13.1/src/file.rs       |  122 -
 third_party/rust/syn-0.13.1/src/gen/fold.rs   | 2972 -------------
 third_party/rust/syn-0.13.1/src/gen/visit.rs  | 2287 ----------
 .../rust/syn-0.13.1/src/gen/visit_mut.rs      | 2288 ----------
 third_party/rust/syn-0.13.1/src/gen_helper.rs |  165 -
 third_party/rust/syn-0.13.1/src/generics.rs   | 1012 -----
 third_party/rust/syn-0.13.1/src/ident.rs      |  296 --
 third_party/rust/syn-0.13.1/src/item.rs       | 2033 ---------
 third_party/rust/syn-0.13.1/src/lib.rs        |  724 ----
 third_party/rust/syn-0.13.1/src/lifetime.rs   |  155 -
 third_party/rust/syn-0.13.1/src/lit.rs        | 1047 -----
 third_party/rust/syn-0.13.1/src/mac.rs        |  115 -
 third_party/rust/syn-0.13.1/src/macros.rs     |  186 -
 third_party/rust/syn-0.13.1/src/op.rs         |  223 -
 .../rust/syn-0.13.1/src/parse_quote.rs        |  160 -
 third_party/rust/syn-0.13.1/src/parsers.rs    | 1384 ------
 third_party/rust/syn-0.13.1/src/path.rs       |  572 ---
 third_party/rust/syn-0.13.1/src/punctuated.rs |  699 ---
 third_party/rust/syn-0.13.1/src/spanned.rs    |  144 -
 third_party/rust/syn-0.13.1/src/synom.rs      |  263 --
 third_party/rust/syn-0.13.1/src/token.rs      |  773 ----
 third_party/rust/syn-0.13.1/src/tt.rs         |  170 -
 third_party/rust/syn-0.13.1/src/ty.rs         |  811 ----
 .../rust/syn-0.14.6/.cargo-checksum.json      |    1 -
 third_party/rust/syn-0.14.6/Cargo.toml        |   62 -
 third_party/rust/syn-0.14.6/LICENSE-APACHE    |  201 -
 third_party/rust/syn-0.14.6/LICENSE-MIT       |   25 -
 third_party/rust/syn-0.14.6/README.md         |  282 --
 third_party/rust/syn-0.14.6/src/attr.rs       |  554 ---
 third_party/rust/syn-0.14.6/src/buffer.rs     |  463 --
 third_party/rust/syn-0.14.6/src/data.rs       |  393 --
 third_party/rust/syn-0.14.6/src/derive.rs     |  242 --
 third_party/rust/syn-0.14.6/src/error.rs      |   60 -
 third_party/rust/syn-0.14.6/src/expr.rs       | 3836 -----------------
 third_party/rust/syn-0.14.6/src/file.rs       |  123 -
 third_party/rust/syn-0.14.6/src/gen/fold.rs   | 2960 -------------
 third_party/rust/syn-0.14.6/src/gen/visit.rs  | 3384 ---------------
 .../rust/syn-0.14.6/src/gen/visit_mut.rs      | 3295 --------------
 third_party/rust/syn-0.14.6/src/gen_helper.rs |  162 -
 third_party/rust/syn-0.14.6/src/generics.rs   | 1015 -----
 third_party/rust/syn-0.14.6/src/item.rs       | 2118 ---------
 third_party/rust/syn-0.14.6/src/lib.rs        |  788 ----
 third_party/rust/syn-0.14.6/src/lifetime.rs   |  150 -
 third_party/rust/syn-0.14.6/src/lit.rs        | 1026 -----
 third_party/rust/syn-0.14.6/src/mac.rs        |  117 -
 third_party/rust/syn-0.14.6/src/macros.rs     |  202 -
 third_party/rust/syn-0.14.6/src/op.rs         |  224 -
 .../rust/syn-0.14.6/src/parse_quote.rs        |  163 -
 third_party/rust/syn-0.14.6/src/parsers.rs    | 1428 ------
 third_party/rust/syn-0.14.6/src/path.rs       |  577 ---
 third_party/rust/syn-0.14.6/src/punctuated.rs |  796 ----
 third_party/rust/syn-0.14.6/src/spanned.rs    |  142 -
 third_party/rust/syn-0.14.6/src/synom.rs      |  413 --
 third_party/rust/syn-0.14.6/src/token.rs      |  889 ----
 third_party/rust/syn-0.14.6/src/tt.rs         |  170 -
 third_party/rust/syn-0.14.6/src/ty.rs         |  818 ----
 third_party/rust/syn-0.14.6/src/verbatim.rs   |   20 -
 124 files changed, 2072 insertions(+), 57337 deletions(-)
 delete mode 100644 third_party/rust/num-derive/bors.toml
 create mode 100644 third_party/rust/num-derive/build.rs
 delete mode 100755 third_party/rust/num-derive/ci/rustup.sh
 delete mode 100755 third_party/rust/num-derive/ci/test_full.sh
 create mode 100644 third_party/rust/num-derive/tests/newtype.rs
 delete mode 100644 third_party/rust/proc-macro2-0.3.5/.cargo-checksum.json
 delete mode 100644 third_party/rust/proc-macro2-0.3.5/.travis.yml
 delete mode 100644 third_party/rust/proc-macro2-0.3.5/Cargo.toml
 delete mode 100644 third_party/rust/proc-macro2-0.3.5/LICENSE-APACHE
 delete mode 100644 third_party/rust/proc-macro2-0.3.5/LICENSE-MIT
 delete mode 100644 third_party/rust/proc-macro2-0.3.5/README.md
 delete mode 100644 third_party/rust/proc-macro2-0.3.5/src/lib.rs
 delete mode 100644 third_party/rust/proc-macro2-0.3.5/src/stable.rs
 delete mode 100644 third_party/rust/proc-macro2-0.3.5/src/strnom.rs
 delete mode 100644 third_party/rust/proc-macro2-0.3.5/src/unstable.rs
 delete mode 100644 third_party/rust/proc-macro2-0.3.5/tests/test.rs
 delete mode 100644 third_party/rust/quote-0.5.2/.cargo-checksum.json
 delete mode 100644 third_party/rust/quote-0.5.2/Cargo.toml
 delete mode 100644 third_party/rust/quote-0.5.2/LICENSE-APACHE
 delete mode 100644 third_party/rust/quote-0.5.2/LICENSE-MIT
 delete mode 100644 third_party/rust/quote-0.5.2/README.md
 delete mode 100644 third_party/rust/quote-0.5.2/src/lib.rs
 delete mode 100644 third_party/rust/quote-0.5.2/src/to_tokens.rs
 delete mode 100644 third_party/rust/quote-0.5.2/src/tokens.rs
 delete mode 100644 third_party/rust/quote-0.5.2/tests/test.rs
 delete mode 100644 third_party/rust/syn-0.13.1/.cargo-checksum.json
 delete mode 100644 third_party/rust/syn-0.13.1/Cargo.toml
 delete mode 100644 third_party/rust/syn-0.13.1/LICENSE-APACHE
 delete mode 100644 third_party/rust/syn-0.13.1/LICENSE-MIT
 delete mode 100644 third_party/rust/syn-0.13.1/README.md
 delete mode 100644 third_party/rust/syn-0.13.1/src/attr.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/buffer.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/data.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/derive.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/error.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/expr.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/file.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/gen/fold.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/gen/visit.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/gen/visit_mut.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/gen_helper.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/generics.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/ident.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/item.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/lib.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/lifetime.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/lit.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/mac.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/macros.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/op.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/parse_quote.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/parsers.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/path.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/punctuated.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/spanned.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/synom.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/token.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/tt.rs
 delete mode 100644 third_party/rust/syn-0.13.1/src/ty.rs
 delete mode 100644 third_party/rust/syn-0.14.6/.cargo-checksum.json
 delete mode 100644 third_party/rust/syn-0.14.6/Cargo.toml
 delete mode 100644 third_party/rust/syn-0.14.6/LICENSE-APACHE
 delete mode 100644 third_party/rust/syn-0.14.6/LICENSE-MIT
 delete mode 100644 third_party/rust/syn-0.14.6/README.md
 delete mode 100644 third_party/rust/syn-0.14.6/src/attr.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/buffer.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/data.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/derive.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/error.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/expr.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/file.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/gen/fold.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/gen/visit.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/gen/visit_mut.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/gen_helper.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/generics.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/item.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/lib.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/lifetime.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/lit.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/mac.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/macros.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/op.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/parse_quote.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/parsers.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/path.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/punctuated.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/spanned.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/synom.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/token.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/tt.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/ty.rs
 delete mode 100644 third_party/rust/syn-0.14.6/src/verbatim.rs

diff --git a/third_party/rust/cssparser-macros/.cargo-checksum.json b/third_party/rust/cssparser-macros/.cargo-checksum.json
index 60c0c496dc77..054e71b02c14 100644
--- a/third_party/rust/cssparser-macros/.cargo-checksum.json
+++ b/third_party/rust/cssparser-macros/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"a359c50f2f1777724b126573a568b3e94ad2674f645fae321ddf4b4293cef4cc","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","lib.rs":"218edca3cc07d460a65b6f937b77024a13ccca9d9d62ee715eeeb8dff8859f04"},"package":"f3a5383ae18dbfdeb569ed62019f5bddb2a95cd2d3833313c475a0d014777805"}
\ No newline at end of file
+{"files":{"Cargo.toml":"865ab5a711a4fea88adf215f7c0207f1ad2ee80c310229f6d2a5770d2ff36486","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","lib.rs":"66c99e9dd05190f31f59ccfd3f9558540f94a501e88849bcaf09191f9f3323da"},"package":"b16e382d9b983fdb9ac6a36b37fdeb84ce3ea81f749febfee3463cfa7f24275e"}
\ No newline at end of file
diff --git a/third_party/rust/cssparser-macros/Cargo.toml b/third_party/rust/cssparser-macros/Cargo.toml
index c01a37484711..384ca7646b3b 100644
--- a/third_party/rust/cssparser-macros/Cargo.toml
+++ b/third_party/rust/cssparser-macros/Cargo.toml
@@ -12,7 +12,7 @@
 
 [package]
 name = "cssparser-macros"
-version = "0.3.3"
+version = "0.3.5"
 authors = ["Simon Sapin <simon.sapin@exyr.org>"]
 description = "Procedural macros for cssparser"
 documentation = "https://docs.rs/cssparser-macros/"
@@ -26,14 +26,14 @@ proc-macro = true
 version = "0.7"
 
 [dependencies.proc-macro2]
-version = "0.3"
+version = "0.4"
 
 [dependencies.procedural-masquerade]
 version = "0.1"
 
 [dependencies.quote]
-version = "0.5"
+version = "0.6"
 
 [dependencies.syn]
-version = "0.13"
+version = "0.15.12"
 features = ["full", "extra-traits"]
diff --git a/third_party/rust/cssparser-macros/lib.rs b/third_party/rust/cssparser-macros/lib.rs
index 6e4c577d8037..83ec7613fa76 100644
--- a/third_party/rust/cssparser-macros/lib.rs
+++ b/third_party/rust/cssparser-macros/lib.rs
@@ -10,6 +10,7 @@ extern crate proc_macro2;
 extern crate syn;
 
 #[allow(unused_imports)] use std::ascii::AsciiExt;
+use quote::TokenStreamExt;
 use std::iter;
 use proc_macro2::{TokenStream, TokenTree};
 
diff --git a/third_party/rust/cssparser/.cargo-checksum.json b/third_party/rust/cssparser/.cargo-checksum.json
index c4211a4eaa9b..3e3c7578edbd 100644
--- a/third_party/rust/cssparser/.cargo-checksum.json
+++ b/third_party/rust/cssparser/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"150d450e43bcb9e523941408be883997ecffce7ff5f224329372edfe56334a55","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"b9d6c5dc56ccc267db9e0e2389061dc2524daefa4baed88b36c98efc7a51c2a9","build.rs":"310d6d7b1931ff783a8aa1a4c6baee87b4c9130c858e4694ef69cc96df5e38dc","build/match_byte.rs":"6f7ec4235c9f2da403ea0be9339661ecd8e1f5e1c788cf88a41448b1080c59b8","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"43f996fbd8da54bd8ffa870f5e3610e5ba6e61543f92a129fa6c850e9b10db7e","src/cow_rc_str.rs":"541216f8ef74ee3cc5cbbc1347e5f32ed66588c401851c9a7d68b867aede1de0","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558f4ff","src/lib.rs":"a474ee88ef8f73fcb7b7272d426e5eafb4ad10d104797a5a188d1676c8180972","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"5c70fb542d1376cddab69922eeb4c05e4fcf8f413f27563a2af50f72a47c8f8c","src/parser.rs":"22067562160a1294fa92779b66c25cbccf259a2ef7dcf687c791fecdd020ce7f","src/rules_and_declarations.rs":"622ce07c117a511d40ce595602d4f4730659a59273388f28553d1a2b0fac92ce","src/serializer.rs":"3e2dfc60613f885cb6f99abfc854fde2a1e00de507431bd2e51178b61abfd69b","src/size_of_tests.rs":"385a0d77fbd6f86cb8013fd8d7541886980876a9da1da714bf175954c0e726cf","src/tests.rs":"9d08b3943d453664e01d58e307f79345e240f9f9ce6f8d36a842eff37155563e","src/tokenizer.rs":"adcf5811955e8df57a519e3d1e44fe3afeb5afeb1076daeb8d36fed1abcf1327","src/unicode_range.rs":"ae159d2ebe4123a6666e18dc0362f89b475240a6b7ed5fb6fe21b9e7a4139da8"},"package":"ba1ab4e1814be64bf6b6064ff532db0e34087f11b37706d6c96a21d32478761d"}
\ No newline at end of file
+{"files":{"Cargo.toml":"26e11f3e55baf0de8784dc3ec88771411ceae587c64e162fed3939b87c3cc591","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"b9d6c5dc56ccc267db9e0e2389061dc2524daefa4baed88b36c98efc7a51c2a9","build.rs":"08e4a99d5184b2f22ab93bc0a024fec18dbd8fd38b9db638f19d4defede858ee","build/match_byte.rs":"e8537833ff1599a1bdbd0167f6295af7bd21e42024f32b982af32d58c156685c","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"8d3017ba8d644172908bd80d35e9be1081db477d2e0b0ea13971e29a466d451f","src/cow_rc_str.rs":"89b5dff5cf80eef3fcff0c11799e54a978d02d8b8963a621fbb999d35e7c03a3","src/from_bytes.rs":"b1cf15c4e975523fef46b575598737a39f3c63e5ce0b2bfd6ec627c69c6ea54a","src/lib.rs":"98b28ca7c72b8d20b3d76ae5b841be87bcadfc89e433ecc95fcf37aa15731442","src/macros.rs":"a50a0a7afa43e099dc008e54956e4c1fdfba2e9795d006b22e9eb45065fed61e","src/nth.rs":"a9d5fa0bd2c3ae7c48c851b9f5508ebdb07affdf5d0737bb8d85a7befab2ef9c","src/parser.rs":"fe2eb2be084923bf362de4b95c029beb21f172ad972a6452c400f640b43a583e","src/rules_and_declarations.rs":"712a5e893169e715bbcd18aac87a18ae728dc6bb922e79b237d34ce7a4548fcf","src/serializer.rs":"151305364cb1f20ea2dc0b3ebfbb77937e616ef4441d5dd3c9abda232f79a7af","src/size_of_tests.rs":"a628cacc876f240ac1bb9e287cdae293bffc4b86d45d9307e4fc2f822e8f3e84","src/tests.rs":"bf97071b691c0b0c932af5813e876142ce707ba57774742dbe60889b1dc54069","src/tokenizer.rs":"0450c38d140382161408a8fca5aac343f5a9405603234095dccd93f680831cb7","src/unicode_range.rs":"c4655c817db0dabb1d55669ac61a56ecf7f6a6c4353cf5b539b13bea6511c3dd"},"package":"e06795910fc2f585a75bdc9690fbcc51e83519f07b6eb981db43944643c04933"}
\ No newline at end of file
diff --git a/third_party/rust/cssparser/Cargo.toml b/third_party/rust/cssparser/Cargo.toml
index bab49e8faa58..cdd37d457fb7 100644
--- a/third_party/rust/cssparser/Cargo.toml
+++ b/third_party/rust/cssparser/Cargo.toml
@@ -12,7 +12,7 @@
 
 [package]
 name = "cssparser"
-version = "0.25.3"
+version = "0.25.5"
 authors = ["Simon Sapin <simon.sapin@exyr.org>"]
 build = "build.rs"
 exclude = ["src/css-parsing-tests/**", "src/big-data-url.css"]
diff --git a/third_party/rust/cssparser/build.rs b/third_party/rust/cssparser/build.rs
index 45fd8525a4ef..c4ca61b29445 100644
--- a/third_party/rust/cssparser/build.rs
+++ b/third_party/rust/cssparser/build.rs
@@ -33,9 +33,12 @@ mod codegen {
         println!("cargo:rerun-if-changed={}", input.display());
 
         // We have stack overflows on Servo's CI.
-        let handle = Builder::new().stack_size(128 * 1024 * 1024).spawn(move || {
-            match_byte::expand(&input, &output);
-        }).unwrap();
+        let handle = Builder::new()
+            .stack_size(128 * 1024 * 1024)
+            .spawn(move || {
+                match_byte::expand(&input, &output);
+            })
+            .unwrap();
 
         handle.join().unwrap();
     }
diff --git a/third_party/rust/cssparser/build/match_byte.rs b/third_party/rust/cssparser/build/match_byte.rs
index 5160e7f52ee3..144628d6a926 100644
--- a/third_party/rust/cssparser/build/match_byte.rs
+++ b/third_party/rust/cssparser/build/match_byte.rs
@@ -12,18 +12,27 @@ use syn::parse::{Parse, ParseStream, Result};
 
 use proc_macro2::{Span, TokenStream};
 
-struct MatchByteParser {
-}
+struct MatchByteParser {}
 
 pub fn expand(from: &Path, to: &Path) {
     let mut source = String::new();
-    File::open(from).unwrap().read_to_string(&mut source).unwrap();
+    File::open(from)
+        .unwrap()
+        .read_to_string(&mut source)
+        .unwrap();
     let ast = syn::parse_file(&source).expect("Parsing rules.rs module");
     let mut m = MatchByteParser {};
     let ast = m.fold_file(ast);
 
-    let code = ast.into_token_stream().to_string().replace("{ ", "{\n").replace(" }", "\n}");
-    File::create(to).unwrap().write_all(code.as_bytes()).unwrap();
+    let code = ast
+        .into_token_stream()
+        .to_string()
+        .replace("{ ", "{\n")
+        .replace(" }", "\n}");
+    File::create(to)
+        .unwrap()
+        .write_all(code.as_bytes())
+        .unwrap();
 }
 
 struct MatchByte {
@@ -45,7 +54,7 @@ impl Parse for MatchByte {
                     arms.push(input.call(syn::Arm::parse)?);
                 }
                 arms
-            }
+            },
         })
     }
 }
@@ -55,16 +64,14 @@ fn get_byte_from_expr_lit(expr: &Box<syn::Expr>) -> u8 {
         syn::Expr::Lit(syn::ExprLit { ref lit, .. }) => {
             if let syn::Lit::Byte(ref byte) = *lit {
                 byte.value()
-            }
-            else {
+            } else {
                 panic!("Found a pattern that wasn't a byte")
             }
-        },
+        }
         _ => unreachable!(),
     }
 }
 
-
 /// Expand a TokenStream corresponding to the `match_byte` macro.
 ///
 /// ## Example
@@ -93,12 +100,12 @@ fn expand_match_byte(body: &TokenStream) -> syn::Expr {
 
         for pat in &arm.pats {
             match pat {
-                &syn::Pat::Lit(syn::PatLit{ref expr}) => {
+                &syn::Pat::Lit(syn::PatLit { ref expr }) => {
                     let value = get_byte_from_expr_lit(expr);
                     if table[value as usize] == 0 {
                         table[value as usize] = case_id as u8;
                     }
-                },
+                }
                 &syn::Pat::Range(syn::PatRange { ref lo, ref hi, .. }) => {
                     let lo = get_byte_from_expr_lit(lo);
                     let hi = get_byte_from_expr_lit(hi);
@@ -110,14 +117,14 @@ fn expand_match_byte(body: &TokenStream) -> syn::Expr {
                     if table[hi as usize] == 0 {
                         table[hi as usize] = case_id as u8;
                     }
-                },
+                }
                 &syn::Pat::Wild(_) => {
                     for byte in table.iter_mut() {
                         if *byte == 0 {
                             *byte = case_id as u8;
                         }
                     }
-                },
+                }
                 &syn::Pat::Ident(syn::PatIdent { ref ident, .. }) => {
                     assert_eq!(wildcard, None);
                     wildcard = Some(ident);
@@ -126,7 +133,7 @@ fn expand_match_byte(body: &TokenStream) -> syn::Expr {
                             *byte = case_id as u8;
                         }
                     }
-                },
+                }
                 _ => {
                     panic!("Unexpected pattern: {:?}. Buggy code ?", pat);
                 }
@@ -159,11 +166,14 @@ fn expand_match_byte(body: &TokenStream) -> syn::Expr {
 impl Fold for MatchByteParser {
     fn fold_stmt(&mut self, stmt: syn::Stmt) -> syn::Stmt {
         match stmt {
-            syn::Stmt::Item(syn::Item::Macro(syn::ItemMacro{ ref mac, .. })) => {
+            syn::Stmt::Item(syn::Item::Macro(syn::ItemMacro { ref mac, .. })) => {
                 if mac.path == parse_quote!(match_byte) {
-                    return syn::fold::fold_stmt(self, syn::Stmt::Expr(expand_match_byte(&mac.tts)))
+                    return syn::fold::fold_stmt(
+                        self,
+                        syn::Stmt::Expr(expand_match_byte(&mac.tts)),
+                    );
                 }
-            },
+            }
             _ => {}
         }
 
@@ -172,11 +182,11 @@ impl Fold for MatchByteParser {
 
     fn fold_expr(&mut self, expr: syn::Expr) -> syn::Expr {
         match expr {
-            syn::Expr::Macro(syn::ExprMacro{ ref mac, .. }) => {
+            syn::Expr::Macro(syn::ExprMacro { ref mac, .. }) => {
                 if mac.path == parse_quote!(match_byte) {
-                    return syn::fold::fold_expr(self, expand_match_byte(&mac.tts))
+                    return syn::fold::fold_expr(self, expand_match_byte(&mac.tts));
                 }
-            },
+            }
             _ => {}
         }
 
diff --git a/third_party/rust/cssparser/src/color.rs b/third_party/rust/cssparser/src/color.rs
index a085324d4903..af9c0942cad4 100644
--- a/third_party/rust/cssparser/src/color.rs
+++ b/third_party/rust/cssparser/src/color.rs
@@ -2,10 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use std::fmt;
 use std::f32::consts::PI;
+use std::fmt;
 
-use super::{Token, Parser, ToCss, ParseError, BasicParseError};
+use super::{BasicParseError, ParseError, Parser, ToCss, Token};
 
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
@@ -47,7 +47,12 @@ impl RGBA {
     /// Same thing, but with `u8` values instead of floats in the 0 to 1 range.
     #[inline]
     pub fn new(red: u8, green: u8, blue: u8, alpha: u8) -> Self {
-        RGBA { red: red, green: green, blue: blue, alpha: alpha }
+        RGBA {
+            red: red,
+            green: green,
+            blue: blue,
+            alpha: alpha,
+        }
     }
 
     /// Returns the red channel in a floating point number form, from 0 to 1.
@@ -78,7 +83,8 @@ impl RGBA {
 #[cfg(feature = "serde")]
 impl Serialize for RGBA {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-        where S: Serializer
+    where
+        S: Serializer,
     {
         (self.red, self.green, self.blue, self.alpha).serialize(serializer)
     }
@@ -87,7 +93,8 @@ impl Serialize for RGBA {
 #[cfg(feature = "serde")]
 impl<'de> Deserialize<'de> for RGBA {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-        where D: Deserializer<'de>
+    where
+        D: Deserializer<'de>,
     {
         let (r, g, b, a) = Deserialize::deserialize(deserializer)?;
         Ok(RGBA::new(r, g, b, a))
@@ -99,7 +106,8 @@ known_heap_size!(0, RGBA);
 
 impl ToCss for RGBA {
     fn to_css<W>(&self, dest: &mut W) -> fmt::Result
-        where W: fmt::Write,
+    where
+        W: fmt::Write,
     {
         let serialize_alpha = self.alpha != 255;
 
@@ -137,7 +145,10 @@ pub enum Color {
 known_heap_size!(0, Color);
 
 impl ToCss for Color {
-    fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
+    fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+    where
+        W: fmt::Write,
+    {
         match *self {
             Color::CurrentColor => dest.write_str("currentcolor"),
             Color::RGBA(ref rgba) => rgba.to_css(dest),
@@ -210,7 +221,9 @@ pub trait ColorComponentParser<'i> {
         let location = input.current_source_location();
         Ok(match *input.next()? {
             Token::Number { value, .. } => AngleOrNumber::Number { value },
-            Token::Dimension { value: v, ref unit, .. } => {
+            Token::Dimension {
+                value: v, ref unit, ..
+            } => {
                 let degrees = match_ignore_ascii_case! { &*unit,
                     "deg" => v,
                     "grad" => v * 360. / 400.,
@@ -221,7 +234,7 @@ pub trait ColorComponentParser<'i> {
 
                 AngleOrNumber::Angle { degrees }
             }
-            ref t => return Err(location.new_unexpected_token_error(t.clone()))
+            ref t => return Err(location.new_unexpected_token_error(t.clone())),
         })
     }
 
@@ -252,7 +265,7 @@ pub trait ColorComponentParser<'i> {
         Ok(match *input.next()? {
             Token::Number { value, .. } => NumberOrPercentage::Number { value },
             Token::Percentage { unit_value, .. } => NumberOrPercentage::Percentage { unit_value },
-            ref t => return Err(location.new_unexpected_token_error(t.clone()))
+            ref t => return Err(location.new_unexpected_token_error(t.clone())),
         })
     }
 }
@@ -279,21 +292,20 @@ impl Color {
         match token {
             Token::Hash(ref value) | Token::IDHash(ref value) => {
                 Color::parse_hash(value.as_bytes())
-            },
+            }
             Token::Ident(ref value) => parse_color_keyword(&*value),
             Token::Function(ref name) => {
                 return input.parse_nested_block(|arguments| {
                     parse_color_function(component_parser, &*name, arguments)
                 })
             }
-            _ => Err(())
-        }.map_err(|()| location.new_unexpected_token_error(token))
+            _ => Err(()),
+        }
+        .map_err(|()| location.new_unexpected_token_error(token))
     }
 
     /// Parse a <color> value, per CSS Color Module Level 3.
-    pub fn parse<'i, 't>(
-        input: &mut Parser<'i, 't>,
-    ) -> Result<Color, BasicParseError<'i>> {
+    pub fn parse<'i, 't>(input: &mut Parser<'i, 't>) -> Result<Color, BasicParseError<'i>> {
         let component_parser = DefaultComponentParser;
         Self::parse_with(&component_parser, input).map_err(ParseError::basic)
     }
@@ -306,25 +318,25 @@ impl Color {
                 from_hex(value[0])? * 16 + from_hex(value[1])?,
                 from_hex(value[2])? * 16 + from_hex(value[3])?,
                 from_hex(value[4])? * 16 + from_hex(value[5])?,
-                from_hex(value[6])? * 16 + from_hex(value[7])?),
-            ),
+                from_hex(value[6])? * 16 + from_hex(value[7])?,
+            )),
             6 => Ok(rgb(
                 from_hex(value[0])? * 16 + from_hex(value[1])?,
                 from_hex(value[2])? * 16 + from_hex(value[3])?,
-                from_hex(value[4])? * 16 + from_hex(value[5])?),
-            ),
+                from_hex(value[4])? * 16 + from_hex(value[5])?,
+            )),
             4 => Ok(rgba(
                 from_hex(value[0])? * 17,
                 from_hex(value[1])? * 17,
                 from_hex(value[2])? * 17,
-                from_hex(value[3])? * 17),
-            ),
+                from_hex(value[3])? * 17,
+            )),
             3 => Ok(rgb(
                 from_hex(value[0])? * 17,
                 from_hex(value[1])? * 17,
-                from_hex(value[2])? * 17),
-            ),
-            _ => Err(())
+                from_hex(value[2])? * 17,
+            )),
+            _ => Err(()),
         }
     }
 }
@@ -339,7 +351,6 @@ fn rgba(red: u8, green: u8, blue: u8, alpha: u8) -> Color {
     Color::RGBA(RGBA::new(red, green, blue, alpha))
 }
 
-
 /// Return the named color with the given name.
 ///
 /// Matching is case-insensitive in the ASCII range.
@@ -355,7 +366,7 @@ pub fn parse_color_keyword(ident: &str) -> Result<Color, ()> {
                 blue: $blue,
                 alpha: 255,
             })
-        }
+        };
     }
     ascii_case_insensitive_phf_map! {
         keyword -> Color = {
@@ -516,14 +527,13 @@ pub fn parse_color_keyword(ident: &str) -> Result<Color, ()> {
     keyword(ident).cloned().ok_or(())
 }
 
-
 #[inline]
 fn from_hex(c: u8) -> Result<u8, ()> {
     match c {
-        b'0' ... b'9' => Ok(c - b'0'),
-        b'a' ... b'f' => Ok(c - b'a' + 10),
-        b'A' ... b'F' => Ok(c - b'A' + 10),
-        _ => Err(())
+        b'0'...b'9' => Ok(c - b'0'),
+        b'a'...b'f' => Ok(c - b'a' + 10),
+        b'A'...b'F' => Ok(c - b'A' + 10),
+        _ => Err(()),
     }
 }
 
@@ -553,7 +563,7 @@ fn clamp_floor_256_f32(val: f32) -> u8 {
 fn parse_color_function<'i, 't, ComponentParser>(
     component_parser: &ComponentParser,
     name: &str,
-    arguments: &mut Parser<'i, 't>
+    arguments: &mut Parser<'i, 't>,
 ) -> Result<Color, ParseError<'i, ComponentParser::Error>>
 where
     ComponentParser: ColorComponentParser<'i>,
@@ -570,7 +580,11 @@ where
         } else {
             arguments.expect_delim('/')?;
         };
-        clamp_unit_f32(component_parser.parse_number_or_percentage(arguments)?.unit_value())
+        clamp_unit_f32(
+            component_parser
+                .parse_number_or_percentage(arguments)?
+                .unit_value(),
+        )
     } else {
         255
     };
@@ -579,11 +593,10 @@ where
     Ok(rgba(red, green, blue, alpha))
 }
 
-
 #[inline]
 fn parse_rgb_components_rgb<'i, 't, ComponentParser>(
     component_parser: &ComponentParser,
-    arguments: &mut Parser<'i, 't>
+    arguments: &mut Parser<'i, 't>,
 ) -> Result<(u8, u8, u8, bool), ParseError<'i, ComponentParser::Error>>
 where
     ComponentParser: ColorComponentParser<'i>,
@@ -591,15 +604,11 @@ where
     // Either integers or percentages, but all the same type.
     // https://drafts.csswg.org/css-color/#rgb-functions
     let (red, is_number) = match component_parser.parse_number_or_percentage(arguments)? {
-        NumberOrPercentage::Number { value } => {
-            (clamp_floor_256_f32(value), true)
-        }
-        NumberOrPercentage::Percentage { unit_value } => {
-            (clamp_unit_f32(unit_value), false)
-        }
+        NumberOrPercentage::Number { value } => (clamp_floor_256_f32(value), true),
+        NumberOrPercentage::Percentage { unit_value } => (clamp_unit_f32(unit_value), false),
     };
 
-    let uses_commas = arguments.try(|i| i.expect_comma()).is_ok();
+    let uses_commas = arguments.try_parse(|i| i.expect_comma()).is_ok();
 
     let green;
     let blue;
@@ -623,7 +632,7 @@ where
 #[inline]
 fn parse_rgb_components_hsl<'i, 't, ComponentParser>(
     component_parser: &ComponentParser,
-    arguments: &mut Parser<'i, 't>
+    arguments: &mut Parser<'i, 't>,
 ) -> Result<(u8, u8, u8, bool), ParseError<'i, ComponentParser::Error>>
 where
     ComponentParser: ColorComponentParser<'i>,
@@ -638,7 +647,7 @@ where
 
     // Saturation and lightness are clamped to 0% ... 100%
     // https://drafts.csswg.org/css-color/#the-hsl-notation
-    let uses_commas = arguments.try(|i| i.expect_comma()).is_ok();
+    let uses_commas = arguments.try_parse(|i| i.expect_comma()).is_ok();
 
     let saturation = component_parser.parse_percentage(arguments)?;
     let saturation = saturation.max(0.).min(1.);
@@ -653,16 +662,28 @@ where
     // https://drafts.csswg.org/css-color/#hsl-color
     // except with h pre-multiplied by 3, to avoid some rounding errors.
     fn hue_to_rgb(m1: f32, m2: f32, mut h3: f32) -> f32 {
-        if h3 < 0. { h3 += 3. }
-        if h3 > 3. { h3 -= 3. }
+        if h3 < 0. {
+            h3 += 3.
+        }
+        if h3 > 3. {
+            h3 -= 3.
+        }
 
-        if h3 * 2. < 1. { m1 + (m2 - m1) * h3 * 2. }
-        else if h3 * 2. < 3. { m2 }
-        else if h3 < 2. { m1 + (m2 - m1) * (2. - h3) * 2. }
-        else { m1 }
+        if h3 * 2. < 1. {
+            m1 + (m2 - m1) * h3 * 2.
+        } else if h3 * 2. < 3. {
+            m2
+        } else if h3 < 2. {
+            m1 + (m2 - m1) * (2. - h3) * 2.
+        } else {
+            m1
+        }
     }
-    let m2 = if lightness <= 0.5 { lightness * (saturation + 1.) }
-             else { lightness + saturation - lightness * saturation };
+    let m2 = if lightness <= 0.5 {
+        lightness * (saturation + 1.)
+    } else {
+        lightness + saturation - lightness * saturation
+    };
     let m1 = lightness * 2. - m2;
     let hue_times_3 = hue * 3.;
     let red = clamp_unit_f32(hue_to_rgb(m1, m2, hue_times_3 + 1.));
diff --git a/third_party/rust/cssparser/src/cow_rc_str.rs b/third_party/rust/cssparser/src/cow_rc_str.rs
index b1e8597963a7..f89f4cdacf16 100644
--- a/third_party/rust/cssparser/src/cow_rc_str.rs
+++ b/third_party/rust/cssparser/src/cow_rc_str.rs
@@ -103,16 +103,12 @@ impl<'a> Clone for CowRcStr<'a> {
     fn clone(&self) -> Self {
         match self.unpack() {
             Err(ptr) => {
-                let rc = unsafe {
-                    Rc::from_raw(ptr)
-                };
+                let rc = unsafe { Rc::from_raw(ptr) };
                 let new_rc = rc.clone();
-                mem::forget(rc);  // Don’t actually take ownership of this strong reference
+                mem::forget(rc); // Don’t actually take ownership of this strong reference
                 CowRcStr::from_rc(new_rc)
             }
-            Ok(_) => {
-                CowRcStr { ..*self }
-            }
+            Ok(_) => CowRcStr { ..*self },
         }
     }
 }
@@ -121,9 +117,7 @@ impl<'a> Drop for CowRcStr<'a> {
     #[inline]
     fn drop(&mut self) {
         if let Err(ptr) = self.unpack() {
-            mem::drop(unsafe {
-                Rc::from_raw(ptr)
-            })
+            mem::drop(unsafe { Rc::from_raw(ptr) })
         }
     }
 }
@@ -133,9 +127,7 @@ impl<'a> Deref for CowRcStr<'a> {
 
     #[inline]
     fn deref(&self) -> &str {
-        self.unpack().unwrap_or_else(|ptr| unsafe {
-            &**ptr
-        })
+        self.unpack().unwrap_or_else(|ptr| unsafe { &**ptr })
     }
 }
 
diff --git a/third_party/rust/cssparser/src/from_bytes.rs b/third_party/rust/cssparser/src/from_bytes.rs
index d71d9efbb5a6..78a56d3e14fc 100644
--- a/third_party/rust/cssparser/src/from_bytes.rs
+++ b/third_party/rust/cssparser/src/from_bytes.rs
@@ -17,7 +17,6 @@ pub trait EncodingSupport {
     fn is_utf16_be_or_le(encoding: &Self::Encoding) -> bool;
 }
 
-
 /// Determine the character encoding of a CSS stylesheet.
 ///
 /// This is based on the presence of a BOM (Byte Order Mark), an `@charset` rule, and
@@ -30,31 +29,32 @@ pub trait EncodingSupport {
 ///     (https://drafts.csswg.org/css-syntax/#environment-encoding), if any.
 ///
 /// Returns the encoding to use.
-pub fn stylesheet_encoding<E>(css: &[u8], protocol_encoding_label: Option<&[u8]>,
-                              environment_encoding: Option<E::Encoding>)
-                              -> E::Encoding
-                              where E: EncodingSupport {
+pub fn stylesheet_encoding<E>(
+    css: &[u8],
+    protocol_encoding_label: Option<&[u8]>,
+    environment_encoding: Option<E::Encoding>,
+) -> E::Encoding
+where
+    E: EncodingSupport,
+{
     // https://drafts.csswg.org/css-syntax/#the-input-byte-stream
-    match protocol_encoding_label {
-        None => (),
-        Some(label) => match E::from_label(label) {
-            None => (),
-            Some(protocol_encoding) => return protocol_encoding
-        }
-    }
+    if let Some(label) = protocol_encoding_label {
+        if let Some(protocol_encoding) = E::from_label(label) {
+            return protocol_encoding;
+        };
+    };
+
     let prefix = b"@charset \"";
     if css.starts_with(prefix) {
         let rest = &css[prefix.len()..];
-        match rest.iter().position(|&b| b == b'"') {
-            None => (),
-            Some(label_length) => if rest[label_length..].starts_with(b"\";") {
+        if let Some(label_length) = rest.iter().position(|&b| b == b'"') {
+            if rest[label_length..].starts_with(b"\";") {
                 let label = &rest[..label_length];
-                match E::from_label(label) {
-                    None => (),
-                    Some(charset_encoding) => if E::is_utf16_be_or_le(&charset_encoding) {
-                        return E::utf8()
+                if let Some(charset_encoding) = E::from_label(label) {
+                    if E::is_utf16_be_or_le(&charset_encoding) {
+                        return E::utf8();
                     } else {
-                        return charset_encoding
+                        return charset_encoding;
                     }
                 }
             }
diff --git a/third_party/rust/cssparser/src/lib.rs b/third_party/rust/cssparser/src/lib.rs
index 537979c036c1..4ca80566dd0f 100644
--- a/third_party/rust/cssparser/src/lib.rs
+++ b/third_party/rust/cssparser/src/lib.rs
@@ -4,7 +4,6 @@
 
 #![crate_name = "cssparser"]
 #![crate_type = "rlib"]
-
 #![cfg_attr(feature = "bench", feature(test))]
 #![deny(missing_docs)]
 
@@ -32,7 +31,7 @@ As a consequence, when calling another parsing function, either:
 
 * Any `Err(())` return value must be propagated.
   This happens by definition for tail calls,
-  and can otherwise be done with the `try!` macro.
+  and can otherwise be done with the `?` operator.
 * Or the call must be wrapped in a `Parser::try` call.
   `try` takes a closure that takes a `Parser` and returns a `Result`,
   calls it once,
@@ -46,7 +45,7 @@ Examples:
 // 'none' | <image>
 fn parse_background_image(context: &ParserContext, input: &mut Parser)
                                     -> Result<Option<Image>, ()> {
-    if input.try(|input| input.expect_ident_matching("none")).is_ok() {
+    if input.try_parse(|input| input.expect_ident_matching("none")).is_ok() {
         Ok(None)
     } else {
         Image::parse(context, input).map(Some)  // tail call
@@ -58,50 +57,68 @@ fn parse_background_image(context: &ParserContext, input: &mut Parser)
 // [ <length> | <percentage> ] [ <length> | <percentage> ]?
 fn parse_border_spacing(_context: &ParserContext, input: &mut Parser)
                           -> Result<(LengthOrPercentage, LengthOrPercentage), ()> {
-    let first = try!(LengthOrPercentage::parse);
-    let second = input.try(LengthOrPercentage::parse).unwrap_or(first);
+    let first = LengthOrPercentage::parse?;
+    let second = input.try_parse(LengthOrPercentage::parse).unwrap_or(first);
     (first, second)
 }
 ```
 
 */
 
-#![recursion_limit="200"]  // For color::parse_color_keyword
+#![recursion_limit = "200"] // For color::parse_color_keyword
 
 extern crate dtoa_short;
 extern crate itoa;
-#[macro_use] extern crate cssparser_macros;
-#[macro_use] extern crate matches;
-#[macro_use] extern crate procedural_masquerade;
-#[doc(hidden)] pub extern crate phf as _internal__phf;
-#[cfg(test)] extern crate encoding_rs;
-#[cfg(test)] extern crate difference;
-#[cfg(test)] extern crate rustc_serialize;
-#[cfg(feature = "serde")] extern crate serde;
-#[cfg(feature = "heapsize")] #[macro_use] extern crate heapsize;
+#[macro_use]
+extern crate cssparser_macros;
+#[macro_use]
+extern crate matches;
+#[macro_use]
+extern crate procedural_masquerade;
+#[cfg(test)]
+extern crate difference;
+#[cfg(test)]
+extern crate encoding_rs;
+#[doc(hidden)]
+pub extern crate phf as _internal__phf;
+#[cfg(test)]
+extern crate rustc_serialize;
+#[cfg(feature = "serde")]
+extern crate serde;
+#[cfg(feature = "heapsize")]
+#[macro_use]
+extern crate heapsize;
 extern crate smallvec;
 
 pub use cssparser_macros::*;
 
-pub use tokenizer::{Token, SourcePosition, SourceLocation};
-pub use rules_and_declarations::{parse_important};
-pub use rules_and_declarations::{DeclarationParser, DeclarationListParser, parse_one_declaration};
-pub use rules_and_declarations::{RuleListParser, parse_one_rule};
-pub use rules_and_declarations::{AtRuleType, QualifiedRuleParser, AtRuleParser};
-pub use from_bytes::{stylesheet_encoding, EncodingSupport};
-pub use color::{RGBA, Color, parse_color_keyword, AngleOrNumber, NumberOrPercentage, ColorComponentParser};
-pub use nth::parse_nth;
-pub use serializer::{ToCss, CssStringWriter, serialize_identifier, serialize_name, serialize_string, TokenSerializationType};
-pub use parser::{Parser, Delimiter, Delimiters, ParserState, ParserInput};
-pub use parser::{ParseError, ParseErrorKind, BasicParseError, BasicParseErrorKind};
-pub use unicode_range::UnicodeRange;
+pub use color::{
+    parse_color_keyword, AngleOrNumber, Color, ColorComponentParser, NumberOrPercentage, RGBA,
+};
 pub use cow_rc_str::CowRcStr;
+pub use from_bytes::{stylesheet_encoding, EncodingSupport};
+pub use nth::parse_nth;
+pub use parser::{BasicParseError, BasicParseErrorKind, ParseError, ParseErrorKind};
+pub use parser::{Delimiter, Delimiters, Parser, ParserInput, ParserState};
+pub use rules_and_declarations::parse_important;
+pub use rules_and_declarations::{parse_one_declaration, DeclarationListParser, DeclarationParser};
+pub use rules_and_declarations::{parse_one_rule, RuleListParser};
+pub use rules_and_declarations::{AtRuleParser, AtRuleType, QualifiedRuleParser};
+pub use serializer::{
+    serialize_identifier, serialize_name, serialize_string, CssStringWriter, ToCss,
+    TokenSerializationType,
+};
+pub use tokenizer::{SourceLocation, SourcePosition, Token};
+pub use unicode_range::UnicodeRange;
 
 // For macros
-#[doc(hidden)] pub use macros::_internal__to_lowercase;
+#[doc(hidden)]
+pub use macros::_internal__to_lowercase;
 
 // For macros when used in this crate. Unsure how $crate works with procedural-masquerade.
-mod cssparser { pub use _internal__phf; }
+mod cssparser {
+    pub use _internal__phf;
+}
 
 #[macro_use]
 mod macros;
@@ -115,13 +132,15 @@ mod tokenizer;
 mod tokenizer {
     include!(concat!(env!("OUT_DIR"), "/tokenizer.rs"));
 }
-mod parser;
-mod from_bytes;
 mod color;
+mod cow_rc_str;
+mod from_bytes;
 mod nth;
+mod parser;
 mod serializer;
 mod unicode_range;
-mod cow_rc_str;
 
-#[cfg(test)] mod tests;
-#[cfg(test)] mod size_of_tests;
+#[cfg(test)]
+mod size_of_tests;
+#[cfg(test)]
+mod tests;
diff --git a/third_party/rust/cssparser/src/macros.rs b/third_party/rust/cssparser/src/macros.rs
index f3b80f09add3..986c18a4a744 100644
--- a/third_party/rust/cssparser/src/macros.rs
+++ b/third_party/rust/cssparser/src/macros.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/// See docs of the `procedural-masquerade` crate.
+// See docs of the `procedural-masquerade` crate.
 define_invoke_proc_macro!(cssparser_internal__invoke_proc_macro);
 
 /// Expands to a `match` expression with string patterns,
@@ -114,12 +114,10 @@ macro_rules! cssparser_internal__to_lowercase {
         // which initializes with `copy_from_slice` the part of the buffer it uses,
         // before it uses it.
         #[allow(unsafe_code)]
-        let mut buffer: [u8; $BUFFER_SIZE] = unsafe {
-            ::std::mem::uninitialized()
-        };
+        let mut buffer: [u8; $BUFFER_SIZE] = unsafe { ::std::mem::uninitialized() };
         let input: &str = $input;
         let $output = $crate::_internal__to_lowercase(&mut buffer, input);
-    }
+    };
 }
 
 /// Implementation detail of match_ignore_ascii_case! and ascii_case_insensitive_phf_map! macros.
@@ -134,12 +132,10 @@ pub fn _internal__to_lowercase<'a>(buffer: &'a mut [u8], input: &'a str) -> Opti
     if let Some(buffer) = buffer.get_mut(..input.len()) {
         if let Some(first_uppercase) = input.bytes().position(|byte| matches!(byte, b'A'...b'Z')) {
             buffer.copy_from_slice(input.as_bytes());
-            ::std::ascii::AsciiExt::make_ascii_lowercase(&mut buffer[first_uppercase..]);
+            buffer[first_uppercase..].make_ascii_lowercase();
             // `buffer` was initialized to a copy of `input` (which is &str so well-formed UTF-8)
             // then lowercased (which preserves UTF-8 well-formedness)
-            unsafe {
-                Some(::std::str::from_utf8_unchecked(buffer))
-            }
+            unsafe { Some(::std::str::from_utf8_unchecked(buffer)) }
         } else {
             // Input is already lower-case
             Some(input)
diff --git a/third_party/rust/cssparser/src/nth.rs b/third_party/rust/cssparser/src/nth.rs
index b3a6a600c199..691ff441d586 100644
--- a/third_party/rust/cssparser/src/nth.rs
+++ b/third_party/rust/cssparser/src/nth.rs
@@ -2,10 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#[allow(unused_imports)] use std::ascii::AsciiExt;
-
-use super::{Token, Parser, ParserInput, BasicParseError};
-
+use super::{BasicParseError, Parser, ParserInput, Token};
 
 /// Parse the *An+B* notation, as found in the `:nth-child()` selector.
 /// The input is typically the arguments of a function,
@@ -14,14 +11,18 @@ use super::{Token, Parser, ParserInput, BasicParseError};
 pub fn parse_nth<'i, 't>(input: &mut Parser<'i, 't>) -> Result<(i32, i32), BasicParseError<'i>> {
     // FIXME: remove .clone() when lifetimes are non-lexical.
     match input.next()?.clone() {
-        Token::Number { int_value: Some(b), .. } => {
-            Ok((0, b))
-        }
-        Token::Dimension { int_value: Some(a), unit, .. } => {
+        Token::Number {
+            int_value: Some(b), ..
+        } => Ok((0, b)),
+        Token::Dimension {
+            int_value: Some(a),
+            unit,
+            ..
+        } => {
             match_ignore_ascii_case! {
                 &unit,
-                "n" => Ok(try!(parse_b(input, a))),
-                "n-" => Ok(try!(parse_signless_b(input, a, -1))),
+                "n" => Ok(parse_b(input, a)?),
+                "n-" => Ok(parse_signless_b(input, a, -1)?),
                 _ => match parse_n_dash_digits(&*unit) {
                     Ok(b) => Ok((a, b)),
                     Err(()) => Err(input.new_basic_unexpected_token_error(Token::Ident(unit.clone())))
@@ -32,10 +33,10 @@ pub fn parse_nth<'i, 't>(input: &mut Parser<'i, 't>) -> Result<(i32, i32), Basic
             match_ignore_ascii_case! { &value,
                 "even" => Ok((2, 0)),
                 "odd" => Ok((2, 1)),
-                "n" => Ok(try!(parse_b(input, 1))),
-                "-n" => Ok(try!(parse_b(input, -1))),
-                "n-" => Ok(try!(parse_signless_b(input, 1, -1))),
-                "-n-" => Ok(try!(parse_signless_b(input, -1, -1))),
+                "n" => Ok(parse_b(input, 1)?),
+                "-n" => Ok(parse_b(input, -1)?),
+                "n-" => Ok(parse_signless_b(input, 1, -1)?),
+                "-n-" => Ok(parse_signless_b(input, -1, -1)?),
                 _ => {
                     let (slice, a) = if value.starts_with("-") {
                         (&value[1..], -1)
@@ -67,13 +68,16 @@ pub fn parse_nth<'i, 't>(input: &mut Parser<'i, 't>) -> Result<(i32, i32), Basic
     }
 }
 
-
 fn parse_b<'i, 't>(input: &mut Parser<'i, 't>, a: i32) -> Result<(i32, i32), BasicParseError<'i>> {
     let start = input.state();
     match input.next() {
         Ok(&Token::Delim('+')) => parse_signless_b(input, a, 1),
         Ok(&Token::Delim('-')) => parse_signless_b(input, a, -1),
-        Ok(&Token::Number { has_sign: true, int_value: Some(b), .. }) => Ok((a, b)),
+        Ok(&Token::Number {
+            has_sign: true,
+            int_value: Some(b),
+            ..
+        }) => Ok((a, b)),
         _ => {
             input.reset(&start);
             Ok((a, 0))
@@ -81,21 +85,29 @@ fn parse_b<'i, 't>(input: &mut Parser<'i, 't>, a: i32) -> Result<(i32, i32), Bas
     }
 }
 
-fn parse_signless_b<'i, 't>(input: &mut Parser<'i, 't>, a: i32, b_sign: i32) -> Result<(i32, i32), BasicParseError<'i>> {
+fn parse_signless_b<'i, 't>(
+    input: &mut Parser<'i, 't>,
+    a: i32,
+    b_sign: i32,
+) -> Result<(i32, i32), BasicParseError<'i>> {
     // FIXME: remove .clone() when lifetimes are non-lexical.
     match input.next()?.clone() {
-        Token::Number { has_sign: false, int_value: Some(b), .. } => Ok((a, b_sign * b)),
-        token => Err(input.new_basic_unexpected_token_error(token))
+        Token::Number {
+            has_sign: false,
+            int_value: Some(b),
+            ..
+        } => Ok((a, b_sign * b)),
+        token => Err(input.new_basic_unexpected_token_error(token)),
     }
 }
 
 fn parse_n_dash_digits(string: &str) -> Result<i32, ()> {
     let bytes = string.as_bytes();
     if bytes.len() >= 3
-    && bytes[..2].eq_ignore_ascii_case(b"n-")
-    && bytes[2..].iter().all(|&c| matches!(c, b'0'...b'9'))
+        && bytes[..2].eq_ignore_ascii_case(b"n-")
+        && bytes[2..].iter().all(|&c| matches!(c, b'0'...b'9'))
     {
-        Ok(parse_number_saturate(&string[1..]).unwrap())  // Include the minus sign
+        Ok(parse_number_saturate(&string[1..]).unwrap()) // Include the minus sign
     } else {
         Err(())
     }
@@ -104,14 +116,17 @@ fn parse_n_dash_digits(string: &str) -> Result<i32, ()> {
 fn parse_number_saturate(string: &str) -> Result<i32, ()> {
     let mut input = ParserInput::new(string);
     let mut parser = Parser::new(&mut input);
-    let int = if let Ok(&Token::Number {int_value: Some(int), ..})
-                = parser.next_including_whitespace_and_comments() {
+    let int = if let Ok(&Token::Number {
+        int_value: Some(int),
+        ..
+    }) = parser.next_including_whitespace_and_comments()
+    {
         int
     } else {
-        return Err(())
+        return Err(());
     };
     if !parser.is_exhausted() {
-        return Err(())
+        return Err(());
     }
     Ok(int)
 }
diff --git a/third_party/rust/cssparser/src/parser.rs b/third_party/rust/cssparser/src/parser.rs
index 2cc73b98862c..061040528f69 100644
--- a/third_party/rust/cssparser/src/parser.rs
+++ b/third_party/rust/cssparser/src/parser.rs
@@ -4,11 +4,9 @@
 
 use cow_rc_str::CowRcStr;
 use smallvec::SmallVec;
-use std::ops::Range;
-#[allow(unused_imports)] use std::ascii::AsciiExt;
 use std::ops::BitOr;
-use tokenizer::{Token, Tokenizer, SourcePosition, SourceLocation};
-
+use std::ops::Range;
+use tokenizer::{SourceLocation, SourcePosition, Token, Tokenizer};
 
 /// A capture of the internal state of a `Parser` (including the position within the input),
 /// obtained from the `Parser::position` method.
@@ -114,7 +112,10 @@ pub enum ParseErrorKind<'i, T: 'i> {
 
 impl<'i, T> ParseErrorKind<'i, T> {
     /// Like `std::convert::Into::into`
-    pub fn into<U>(self) -> ParseErrorKind<'i, U> where T: Into<U> {
+    pub fn into<U>(self) -> ParseErrorKind<'i, U>
+    where
+        T: Into<U>,
+    {
         match self {
             ParseErrorKind::Basic(basic) => ParseErrorKind::Basic(basic),
             ParseErrorKind::Custom(custom) => ParseErrorKind::Custom(custom.into()),
@@ -144,7 +145,10 @@ impl<'i, T> ParseError<'i, T> {
     }
 
     /// Like `std::convert::Into::into`
-    pub fn into<U>(self) -> ParseError<'i, U> where T: Into<U> {
+    pub fn into<U>(self) -> ParseError<'i, U>
+    where
+        T: Into<U>,
+    {
         ParseError {
             kind: self.kind.into(),
             location: self.location,
@@ -199,7 +203,6 @@ pub struct Parser<'i: 't, 't> {
     stop_before: Delimiters,
 }
 
-
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub(crate) enum BlockType {
     Parenthesis,
@@ -207,15 +210,13 @@ pub(crate) enum BlockType {
     CurlyBracket,
 }
 
-
 impl BlockType {
     fn opening(token: &Token) -> Option<BlockType> {
         match *token {
-            Token::Function(_) |
-            Token::ParenthesisBlock => Some(BlockType::Parenthesis),
+            Token::Function(_) | Token::ParenthesisBlock => Some(BlockType::Parenthesis),
             Token::SquareBracketBlock => Some(BlockType::SquareBracket),
             Token::CurlyBracketBlock => Some(BlockType::CurlyBracket),
-            _ => None
+            _ => None,
         }
     }
 
@@ -224,12 +225,11 @@ impl BlockType {
             Token::CloseParenthesis => Some(BlockType::Parenthesis),
             Token::CloseSquareBracket => Some(BlockType::SquareBracket),
             Token::CloseCurlyBracket => Some(BlockType::CurlyBracket),
-            _ => None
+            _ => None,
         }
     }
 }
 
-
 /// A set of characters, to be used with the `Parser::parse_until*` methods.
 ///
 /// The union of two sets can be obtained with the `|` operator. Example:
@@ -273,7 +273,9 @@ impl BitOr<Delimiters> for Delimiters {
 
     #[inline]
     fn bitor(self, other: Delimiters) -> Delimiters {
-        Delimiters { bits: self.bits | other.bits }
+        Delimiters {
+            bits: self.bits | other.bits,
+        }
     }
 }
 
@@ -338,16 +340,21 @@ impl<'i: 't, 't> Parser<'i, 't> {
     }
 
     /// Check whether the input is exhausted. That is, if `.next()` would return a token.
-    /// Return a `Result` so that the `try!` macro can be used: `try!(input.expect_exhausted())`
+    /// Return a `Result` so that the `?` operator can be used: `input.expect_exhausted()?`
     ///
     /// This ignores whitespace and comments.
     #[inline]
     pub fn expect_exhausted(&mut self) -> Result<(), BasicParseError<'i>> {
         let start = self.state();
         let result = match self.next() {
-            Err(BasicParseError { kind: BasicParseErrorKind::EndOfInput, .. }) => Ok(()),
+            Err(BasicParseError {
+                kind: BasicParseErrorKind::EndOfInput,
+                ..
+            }) => Ok(()),
             Err(e) => unreachable!("Unexpected error encountered: {:?}", e),
-            Ok(t) => Err(start.source_location().new_basic_unexpected_token_error(t.clone())),
+            Ok(t) => Err(start
+                .source_location()
+                .new_basic_unexpected_token_error(t.clone())),
         };
         self.reset(&start);
         result
@@ -426,7 +433,7 @@ impl<'i: 't, 't> Parser<'i, 't> {
     pub fn new_error_for_next_token<E>(&mut self) -> ParseError<'i, E> {
         let token = match self.next() {
             Ok(token) => token.clone(),
-            Err(e) => return e.into()
+            Err(e) => return e.into(),
         };
         self.new_error(BasicParseErrorKind::UnexpectedToken(token))
     }
@@ -438,7 +445,7 @@ impl<'i: 't, 't> Parser<'i, 't> {
     pub fn state(&self) -> ParserState {
         ParserState {
             at_start_of: self.at_start_of,
-            .. self.input.tokenizer.state()
+            ..self.input.tokenizer.state()
         }
     }
 
@@ -465,7 +472,7 @@ impl<'i: 't, 't> Parser<'i, 't> {
     pub(crate) fn next_byte(&self) -> Option<u8> {
         let byte = self.input.tokenizer.next_byte();
         if self.stop_before.contains(Delimiters::from_byte(byte)) {
-            return None
+            return None;
         }
         byte
     }
@@ -495,13 +502,24 @@ impl<'i: 't, 't> Parser<'i, 't> {
         self.input.tokenizer.seen_var_or_env_functions()
     }
 
+    /// The old name of `try_parse`, which requires raw identifiers in the Rust 2018 edition.
+    #[inline]
+    pub fn try<F, T, E>(&mut self, thing: F) -> Result<T, E>
+    where
+        F: FnOnce(&mut Parser<'i, 't>) -> Result<T, E>,
+    {
+        self.try_parse(thing)
+    }
+
     /// Execute the given closure, passing it the parser.
     /// If the result (returned unchanged) is `Err`,
     /// the internal state of the parser  (including position within the input)
     /// is restored to what it was before the call.
     #[inline]
-    pub fn try<F, T, E>(&mut self, thing: F) -> Result<T, E>
-    where F: FnOnce(&mut Parser<'i, 't>) -> Result<T, E> {
+    pub fn try_parse<F, T, E>(&mut self, thing: F) -> Result<T, E>
+    where
+        F: FnOnce(&mut Parser<'i, 't>) -> Result<T, E>,
+    {
         let start = self.state();
         let result = thing(self);
         if result.is_err() {
@@ -543,8 +561,8 @@ impl<'i: 't, 't> Parser<'i, 't> {
         loop {
             match self.next_including_whitespace_and_comments() {
                 Err(e) => return Err(e),
-                Ok(&Token::Comment(_)) => {},
-                _ => break
+                Ok(&Token::Comment(_)) => {}
+                _ => break,
             }
         }
         Ok(self.input.cached_token_ref())
@@ -556,39 +574,47 @@ impl<'i: 't, 't> Parser<'i, 't> {
     /// where comments are preserved.
     /// When parsing higher-level values, per the CSS Syntax specification,
     /// comments should always be ignored between tokens.
-    pub fn next_including_whitespace_and_comments(&mut self) -> Result<&Token<'i>, BasicParseError<'i>> {
+    pub fn next_including_whitespace_and_comments(
+        &mut self,
+    ) -> Result<&Token<'i>, BasicParseError<'i>> {
         if let Some(block_type) = self.at_start_of.take() {
             consume_until_end_of_block(block_type, &mut self.input.tokenizer);
         }
 
         let byte = self.input.tokenizer.next_byte();
         if self.stop_before.contains(Delimiters::from_byte(byte)) {
-            return Err(self.new_basic_error(BasicParseErrorKind::EndOfInput))
+            return Err(self.new_basic_error(BasicParseErrorKind::EndOfInput));
         }
 
         let token_start_position = self.input.tokenizer.position();
-        let token;
-        match self.input.cached_token {
-            Some(ref cached_token)
-            if cached_token.start_position == token_start_position => {
-                self.input.tokenizer.reset(&cached_token.end_state);
-                match cached_token.token {
-                    Token::Function(ref name) => self.input.tokenizer.see_function(name),
-                    _ => {}
-                }
-                token = &cached_token.token
+        let using_cached_token = self
+            .input
+            .cached_token
+            .as_ref()
+            .map_or(false, |cached_token| {
+                cached_token.start_position == token_start_position
+            });
+        let token = if using_cached_token {
+            let cached_token = self.input.cached_token.as_ref().unwrap();
+            self.input.tokenizer.reset(&cached_token.end_state);
+            match cached_token.token {
+                Token::Function(ref name) => self.input.tokenizer.see_function(name),
+                _ => {}
             }
-            _ => {
-                let new_token = self.input.tokenizer.next()
-                    .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
-                self.input.cached_token = Some(CachedToken {
-                    token: new_token,
-                    start_position: token_start_position,
-                    end_state: self.input.tokenizer.state(),
-                });
-                token = self.input.cached_token_ref()
-            }
-        }
+            &cached_token.token
+        } else {
+            let new_token = self
+                .input
+                .tokenizer
+                .next()
+                .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
+            self.input.cached_token = Some(CachedToken {
+                token: new_token,
+                start_position: token_start_position,
+                end_state: self.input.tokenizer.state(),
+            });
+            self.input.cached_token_ref()
+        };
 
         if let Some(block_type) = BlockType::opening(token) {
             self.at_start_of = Some(block_type);
@@ -602,7 +628,9 @@ impl<'i: 't, 't> Parser<'i, 't> {
     /// This can help tell e.g. `color: green;` from `color: green 4px;`
     #[inline]
     pub fn parse_entirely<F, T, E>(&mut self, parse: F) -> Result<T, ParseError<'i, E>>
-    where F: FnOnce(&mut Parser<'i, 't>) -> Result<T, ParseError<'i, E>> {
+    where
+        F: FnOnce(&mut Parser<'i, 't>) -> Result<T, ParseError<'i, E>>,
+    {
         let result = parse(self)?;
         self.expect_exhausted()?;
         Ok(result)
@@ -619,15 +647,20 @@ impl<'i: 't, 't> Parser<'i, 't> {
     /// This method retuns `Err(())` the first time that a closure call does,
     /// or if a closure call leaves some input before the next comma or the end of the input.
     #[inline]
-    pub fn parse_comma_separated<F, T, E>(&mut self, mut parse_one: F) -> Result<Vec<T>, ParseError<'i, E>>
-    where F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>> {
+    pub fn parse_comma_separated<F, T, E>(
+        &mut self,
+        mut parse_one: F,
+    ) -> Result<Vec<T>, ParseError<'i, E>>
+    where
+        F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
+    {
         // Vec grows from 0 to 4 by default on first push().  So allocate with
         // capacity 1, so in the somewhat common case of only one item we don't
         // way overallocate.  Note that we always push at least one item if
         // parsing succeeds.
         let mut values = Vec::with_capacity(1);
         loop {
-            self.skip_whitespace();  // Unnecessary for correctness, but may help try() in parse_one rewind less.
+            self.skip_whitespace(); // Unnecessary for correctness, but may help try() in parse_one rewind less.
             values.push(self.parse_until_before(Delimiter::Comma, &mut parse_one)?);
             match self.next() {
                 Err(_) => return Ok(values),
@@ -649,8 +682,10 @@ impl<'i: 't, 't> Parser<'i, 't> {
     ///
     /// The result is overridden to `Err(())` if the closure leaves some input before that point.
     #[inline]
-    pub fn parse_nested_block<F, T, E>(&mut self, parse: F) -> Result <T, ParseError<'i, E>>
-    where F: for<'tt> FnOnce(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>> {
+    pub fn parse_nested_block<F, T, E>(&mut self, parse: F) -> Result<T, ParseError<'i, E>>
+    where
+        F: for<'tt> FnOnce(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
+    {
         parse_nested_block(self, parse)
     }
 
@@ -663,9 +698,14 @@ impl<'i: 't, 't> Parser<'i, 't> {
     ///
     /// The result is overridden to `Err(())` if the closure leaves some input before that point.
     #[inline]
-    pub fn parse_until_before<F, T, E>(&mut self, delimiters: Delimiters, parse: F)
-                                    -> Result <T, ParseError<'i, E>>
-    where F: for<'tt> FnOnce(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>> {
+    pub fn parse_until_before<F, T, E>(
+        &mut self,
+        delimiters: Delimiters,
+        parse: F,
+    ) -> Result<T, ParseError<'i, E>>
+    where
+        F: for<'tt> FnOnce(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
+    {
         parse_until_before(self, delimiters, parse)
     }
 
@@ -675,9 +715,14 @@ impl<'i: 't, 't> Parser<'i, 't> {
     /// (e.g. if these is only one in the given set)
     /// or if it was there at all (as opposed to reaching the end of the input).
     #[inline]
-    pub fn parse_until_after<F, T, E>(&mut self, delimiters: Delimiters, parse: F)
-                                   -> Result <T, ParseError<'i, E>>
-    where F: for<'tt> FnOnce(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>> {
+    pub fn parse_until_after<F, T, E>(
+        &mut self,
+        delimiters: Delimiters,
+        parse: F,
+    ) -> Result<T, ParseError<'i, E>>
+    where
+        F: for<'tt> FnOnce(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
+    {
         parse_until_after(self, delimiters, parse)
     }
 
@@ -687,7 +732,7 @@ impl<'i: 't, 't> Parser<'i, 't> {
         let start_location = self.current_source_location();
         match *self.next_including_whitespace()? {
             Token::WhiteSpace(value) => Ok(value),
-            ref t => Err(start_location.new_basic_unexpected_token_error(t.clone()))
+            ref t => Err(start_location.new_basic_unexpected_token_error(t.clone())),
         }
     }
 
@@ -707,7 +752,10 @@ impl<'i: 't, 't> Parser<'i, 't> {
 
     /// Parse a <ident-token> whose unescaped value is an ASCII-insensitive match for the given value.
     #[inline]
-    pub fn expect_ident_matching(&mut self, expected_value: &str) -> Result<(), BasicParseError<'i>> {
+    pub fn expect_ident_matching(
+        &mut self,
+        expected_value: &str,
+    ) -> Result<(), BasicParseError<'i>> {
         expect! {self,
             Token::Ident(ref value) if value.eq_ignore_ascii_case(expected_value) => Ok(()),
         }
@@ -744,8 +792,10 @@ impl<'i: 't, 't> Parser<'i, 't> {
             Token::UnquotedUrl(ref value) => return Ok(value.clone()),
             Token::Function(ref name) if name.eq_ignore_ascii_case("url") => {}
         }
-        self.parse_nested_block(|input| input.expect_string().map_err(Into::into).map(|s| s.clone()))
-            .map_err(ParseError::<()>::basic)
+        self.parse_nested_block(|input| {
+            input.expect_string().map_err(Into::into).map(|s| s.clone())
+        })
+        .map_err(ParseError::<()>::basic)
     }
 
     /// Parse either a <url-token> or a <string-token>, and return the unescaped value.
@@ -757,8 +807,10 @@ impl<'i: 't, 't> Parser<'i, 't> {
             Token::QuotedString(ref value) => return Ok(value.clone()),
             Token::Function(ref name) if name.eq_ignore_ascii_case("url") => {}
         }
-        self.parse_nested_block(|input| input.expect_string().map_err(Into::into).map(|s| s.clone()))
-            .map_err(ParseError::<()>::basic)
+        self.parse_nested_block(|input| {
+            input.expect_string().map_err(Into::into).map(|s| s.clone())
+        })
+        .map_err(ParseError::<()>::basic)
     }
 
     /// Parse a <number-token> and return the integer value.
@@ -862,7 +914,10 @@ impl<'i: 't, 't> Parser<'i, 't> {
     ///
     /// If the result is `Ok`, you can then call the `Parser::parse_nested_block` method.
     #[inline]
-    pub fn expect_function_matching(&mut self, expected_name: &str) -> Result<(), BasicParseError<'i>> {
+    pub fn expect_function_matching(
+        &mut self,
+        expected_name: &str,
+    ) -> Result<(), BasicParseError<'i>> {
         expect! {self,
             Token::Function(ref name) if name.eq_ignore_ascii_case(expected_name) => Ok(()),
         }
@@ -877,21 +932,22 @@ impl<'i: 't, 't> Parser<'i, 't> {
         let token;
         loop {
             match self.next_including_whitespace_and_comments() {
-                Ok(&Token::Function(_)) |
-                Ok(&Token::ParenthesisBlock) |
-                Ok(&Token::SquareBracketBlock) |
-                Ok(&Token::CurlyBracketBlock) => {}
+                Ok(&Token::Function(_))
+                | Ok(&Token::ParenthesisBlock)
+                | Ok(&Token::SquareBracketBlock)
+                | Ok(&Token::CurlyBracketBlock) => {}
                 Ok(t) => {
                     if t.is_parse_error() {
                         token = t.clone();
-                        break
+                        break;
                     }
-                    continue
+                    continue;
                 }
-                Err(_) => return Ok(())
+                Err(_) => return Ok(()),
             }
-            let result = self.parse_nested_block(|input| input.expect_no_error_token()
-                                                 .map_err(|e| Into::into(e)));
+            let result = self.parse_nested_block(|input| {
+                input.expect_no_error_token().map_err(|e| Into::into(e))
+            });
             result.map_err(ParseError::<()>::basic)?
         }
         // FIXME: maybe these should be separate variants of BasicParseError instead?
@@ -899,11 +955,14 @@ impl<'i: 't, 't> Parser<'i, 't> {
     }
 }
 
-pub fn parse_until_before<'i: 't, 't, F, T, E>(parser: &mut Parser<'i, 't>,
-                                               delimiters: Delimiters,
-                                               parse: F)
-                                               -> Result <T, ParseError<'i, E>>
-    where F: for<'tt> FnOnce(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>> {
+pub fn parse_until_before<'i: 't, 't, F, T, E>(
+    parser: &mut Parser<'i, 't>,
+    delimiters: Delimiters,
+    parse: F,
+) -> Result<T, ParseError<'i, E>>
+where
+    F: for<'tt> FnOnce(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
+{
     let delimiters = parser.stop_before | delimiters;
     let result;
     // Introduce a new scope to limit duration of nested_parser’s borrow
@@ -921,27 +980,34 @@ pub fn parse_until_before<'i: 't, 't, F, T, E>(parser: &mut Parser<'i, 't>,
     // FIXME: have a special-purpose tokenizer method for this that does less work.
     loop {
         if delimiters.contains(Delimiters::from_byte(parser.input.tokenizer.next_byte())) {
-            break
+            break;
         }
         if let Ok(token) = parser.input.tokenizer.next() {
             if let Some(block_type) = BlockType::opening(&token) {
                 consume_until_end_of_block(block_type, &mut parser.input.tokenizer);
             }
         } else {
-            break
+            break;
         }
     }
     result
 }
 
-pub fn parse_until_after<'i: 't, 't, F, T, E>(parser: &mut Parser<'i, 't>,
-                                              delimiters: Delimiters,
-                                              parse: F)
-                                              -> Result <T, ParseError<'i, E>>
-    where F: for<'tt> FnOnce(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>> {
+pub fn parse_until_after<'i: 't, 't, F, T, E>(
+    parser: &mut Parser<'i, 't>,
+    delimiters: Delimiters,
+    parse: F,
+) -> Result<T, ParseError<'i, E>>
+where
+    F: for<'tt> FnOnce(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
+{
     let result = parser.parse_until_before(delimiters, parse);
     let next_byte = parser.input.tokenizer.next_byte();
-    if next_byte.is_some() && !parser.stop_before.contains(Delimiters::from_byte(next_byte)) {
+    if next_byte.is_some()
+        && !parser
+            .stop_before
+            .contains(Delimiters::from_byte(next_byte))
+    {
         debug_assert!(delimiters.contains(Delimiters::from_byte(next_byte)));
         // We know this byte is ASCII.
         parser.input.tokenizer.advance(1);
@@ -952,14 +1018,20 @@ pub fn parse_until_after<'i: 't, 't, F, T, E>(parser: &mut Parser<'i, 't>,
     result
 }
 
-pub fn parse_nested_block<'i: 't, 't, F, T, E>(parser: &mut Parser<'i, 't>, parse: F)
-                                               -> Result <T, ParseError<'i, E>>
-    where F: for<'tt> FnOnce(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>> {
-    let block_type = parser.at_start_of.take().expect("\
-        A nested parser can only be created when a Function, \
-        ParenthesisBlock, SquareBracketBlock, or CurlyBracketBlock \
-        token was just consumed.\
-        ");
+pub fn parse_nested_block<'i: 't, 't, F, T, E>(
+    parser: &mut Parser<'i, 't>,
+    parse: F,
+) -> Result<T, ParseError<'i, E>>
+where
+    F: for<'tt> FnOnce(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
+{
+    let block_type = parser.at_start_of.take().expect(
+        "\
+         A nested parser can only be created when a Function, \
+         ParenthesisBlock, SquareBracketBlock, or CurlyBracketBlock \
+         token was just consumed.\
+         ",
+    );
     let closing_delimiter = match block_type {
         BlockType::CurlyBracket => ClosingDelimiter::CloseCurlyBracket,
         BlockType::SquareBracket => ClosingDelimiter::CloseSquareBracket,
diff --git a/third_party/rust/cssparser/src/rules_and_declarations.rs b/third_party/rust/cssparser/src/rules_and_declarations.rs
index b8bc1c88969c..230f2d341897 100644
--- a/third_party/rust/cssparser/src/rules_and_declarations.rs
+++ b/third_party/rust/cssparser/src/rules_and_declarations.rs
@@ -4,15 +4,14 @@
 
 // https://drafts.csswg.org/css-syntax/#parsing
 
-use cow_rc_str::CowRcStr;
-use parser::{parse_until_before, parse_until_after, parse_nested_block, ParserState};
-#[allow(unused_imports)] use std::ascii::AsciiExt;
 use super::{BasicParseError, BasicParseErrorKind, Delimiter};
 use super::{ParseError, Parser, SourceLocation, Token};
+use cow_rc_str::CowRcStr;
+use parser::{parse_nested_block, parse_until_after, parse_until_before, ParserState};
 
 /// Parse `!important`.
 ///
-/// Typical usage is `input.try(parse_important).is_ok()`
+/// Typical usage is `input.try_parse(parse_important).is_ok()`
 /// at the end of a `DeclarationParser::parse_value` implementation.
 pub fn parse_important<'i, 't>(input: &mut Parser<'i, 't>) -> Result<(), BasicParseError<'i>> {
     input.expect_delim('!')?;
@@ -61,10 +60,13 @@ pub trait DeclarationParser<'i> {
     /// (In declaration lists, before the next semicolon or end of the current block.)
     ///
     /// If `!important` can be used in a given context,
-    /// `input.try(parse_important).is_ok()` should be used at the end
+    /// `input.try_parse(parse_important).is_ok()` should be used at the end
     /// of the implementation of this method and the result should be part of the return value.
-    fn parse_value<'t>(&mut self, name: CowRcStr<'i>, input: &mut Parser<'i, 't>)
-                       -> Result<Self::Declaration, ParseError<'i, Self::Error>>;
+    fn parse_value<'t>(
+        &mut self,
+        name: CowRcStr<'i>,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<Self::Declaration, ParseError<'i, Self::Error>>;
 }
 
 /// A trait to provide various parsing of at-rules.
@@ -106,9 +108,12 @@ pub trait AtRuleParser<'i> {
     /// The given `input` is a "delimited" parser
     /// that ends wherever the prelude should end.
     /// (Before the next semicolon, the next `{`, or the end of the current block.)
-    fn parse_prelude<'t>(&mut self, name: CowRcStr<'i>, input: &mut Parser<'i, 't>)
-                     -> Result<AtRuleType<Self::PreludeNoBlock, Self::PreludeBlock>,
-                               ParseError<'i, Self::Error>> {
+    fn parse_prelude<'t>(
+        &mut self,
+        name: CowRcStr<'i>,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<AtRuleType<Self::PreludeNoBlock, Self::PreludeBlock>, ParseError<'i, Self::Error>>
+    {
         let _ = name;
         let _ = input;
         Err(input.new_error(BasicParseErrorKind::AtRuleInvalid(name)))
@@ -129,8 +134,10 @@ pub trait AtRuleParser<'i> {
     ) -> Self::AtRule {
         let _ = prelude;
         let _ = location;
-        panic!("The `AtRuleParser::rule_without_block` method must be overriden \
-                if `AtRuleParser::parse_prelude` ever returns `AtRuleType::WithoutBlock`.")
+        panic!(
+            "The `AtRuleParser::rule_without_block` method must be overriden \
+             if `AtRuleParser::parse_prelude` ever returns `AtRuleType::WithoutBlock`."
+        )
     }
 
     /// Parse the content of a `{ /* ... */ }` block for the body of the at-rule.
@@ -185,8 +192,10 @@ pub trait QualifiedRuleParser<'i> {
     ///
     /// The given `input` is a "delimited" parser
     /// that ends where the prelude should end (before the next `{`).
-    fn parse_prelude<'t>(&mut self, input: &mut Parser<'i, 't>)
-                         -> Result<Self::Prelude, ParseError<'i, Self::Error>> {
+    fn parse_prelude<'t>(
+        &mut self,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<Self::Prelude, ParseError<'i, Self::Error>> {
         let _ = input;
         Err(input.new_error(BasicParseErrorKind::QualifiedRuleInvalid))
     }
@@ -211,7 +220,6 @@ pub trait QualifiedRuleParser<'i> {
     }
 }
 
-
 /// Provides an iterator for declaration list parsing.
 pub struct DeclarationListParser<'i: 't, 't: 'a, 'a, P> {
     /// The input given to `DeclarationListParser::new`
@@ -221,10 +229,10 @@ pub struct DeclarationListParser<'i: 't, 't: 'a, 'a, P> {
     pub parser: P,
 }
 
-
 impl<'i: 't, 't: 'a, 'a, I, P, E: 'i> DeclarationListParser<'i, 't, 'a, P>
-where P: DeclarationParser<'i, Declaration = I, Error = E> +
-         AtRuleParser<'i, AtRule = I, Error = E> {
+where
+    P: DeclarationParser<'i, Declaration = I, Error = E> + AtRuleParser<'i, AtRule = I, Error = E>,
+{
     /// Create a new `DeclarationListParser` for the given `input` and `parser`.
     ///
     /// Note that all CSS declaration lists can on principle contain at-rules.
@@ -250,8 +258,9 @@ where P: DeclarationParser<'i, Declaration = I, Error = E> +
 /// `DeclarationListParser` is an iterator that yields `Ok(_)` for a valid declaration or at-rule
 /// or `Err(())` for an invalid one.
 impl<'i: 't, 't: 'a, 'a, I, P, E: 'i> Iterator for DeclarationListParser<'i, 't, 'a, P>
-where P: DeclarationParser<'i, Declaration = I, Error = E> +
-         AtRuleParser<'i, AtRule = I, Error = E> {
+where
+    P: DeclarationParser<'i, Declaration = I, Error = E> + AtRuleParser<'i, AtRule = I, Error = E>,
+{
     type Item = Result<I, (ParseError<'i, E>, &'i str)>;
 
     fn next(&mut self) -> Option<Self::Item> {
@@ -259,7 +268,9 @@ where P: DeclarationParser<'i, Declaration = I, Error = E> +
             let start = self.input.state();
             // FIXME: remove intermediate variable when lifetimes are non-lexical
             let ident = match self.input.next_including_whitespace_and_comments() {
-                Ok(&Token::WhiteSpace(_)) | Ok(&Token::Comment(_)) | Ok(&Token::Semicolon) => continue,
+                Ok(&Token::WhiteSpace(_)) | Ok(&Token::Comment(_)) | Ok(&Token::Semicolon) => {
+                    continue
+                }
                 Ok(&Token::Ident(ref name)) => Ok(Ok(name.clone())),
                 Ok(&Token::AtKeyword(ref name)) => Ok(Err(name.clone())),
                 Ok(token) => Err(token.clone()),
@@ -271,29 +282,34 @@ where P: DeclarationParser<'i, Declaration = I, Error = E> +
                     let result = {
                         let parser = &mut self.parser;
                         // FIXME: https://github.com/rust-lang/rust/issues/42508
-                        parse_until_after::<'i, 't, _, _, _>(self.input, Delimiter::Semicolon, |input| {
-                            input.expect_colon()?;
-                            parser.parse_value(name, input)
-                        })
+                        parse_until_after::<'i, 't, _, _, _>(
+                            self.input,
+                            Delimiter::Semicolon,
+                            |input| {
+                                input.expect_colon()?;
+                                parser.parse_value(name, input)
+                            },
+                        )
                     };
-                    return Some(result.map_err(|e| (e, self.input.slice_from(start.position()))))
+                    return Some(result.map_err(|e| (e, self.input.slice_from(start.position()))));
                 }
                 Ok(Err(name)) => {
                     // At-keyword
-                    return Some(parse_at_rule(&start, name, self.input, &mut self.parser))
+                    return Some(parse_at_rule(&start, name, self.input, &mut self.parser));
                 }
                 Err(token) => {
                     let result = self.input.parse_until_after(Delimiter::Semicolon, |_| {
-                        Err(start.source_location().new_unexpected_token_error(token.clone()))
+                        Err(start
+                            .source_location()
+                            .new_unexpected_token_error(token.clone()))
                     });
-                    return Some(result.map_err(|e| (e, self.input.slice_from(start.position()))))
+                    return Some(result.map_err(|e| (e, self.input.slice_from(start.position()))));
                 }
             }
         }
     }
 }
 
-
 /// Provides an iterator for rule list parsing.
 pub struct RuleListParser<'i: 't, 't: 'a, 'a, P> {
     /// The input given to `RuleListParser::new`
@@ -306,10 +322,11 @@ pub struct RuleListParser<'i: 't, 't: 'a, 'a, P> {
     any_rule_so_far: bool,
 }
 
-
 impl<'i: 't, 't: 'a, 'a, R, P, E: 'i> RuleListParser<'i, 't, 'a, P>
-where P: QualifiedRuleParser<'i, QualifiedRule = R, Error = E> +
-         AtRuleParser<'i, AtRule = R, Error = E> {
+where
+    P: QualifiedRuleParser<'i, QualifiedRule = R, Error = E>
+        + AtRuleParser<'i, AtRule = R, Error = E>,
+{
     /// Create a new `RuleListParser` for the given `input` at the top-level of a stylesheet
     /// and the given `parser`.
     ///
@@ -345,12 +362,12 @@ where P: QualifiedRuleParser<'i, QualifiedRule = R, Error = E> +
     }
 }
 
-
-
 /// `RuleListParser` is an iterator that yields `Ok(_)` for a rule or `Err(())` for an invalid one.
 impl<'i: 't, 't: 'a, 'a, R, P, E: 'i> Iterator for RuleListParser<'i, 't, 'a, P>
-where P: QualifiedRuleParser<'i, QualifiedRule = R, Error = E> +
-         AtRuleParser<'i, AtRule = R, Error = E> {
+where
+    P: QualifiedRuleParser<'i, QualifiedRule = R, Error = E>
+        + AtRuleParser<'i, AtRule = R, Error = E>,
+{
     type Item = Result<R, (ParseError<'i, E>, &'i str)>;
 
     fn next(&mut self) -> Option<Self::Item> {
@@ -375,7 +392,7 @@ where P: QualifiedRuleParser<'i, QualifiedRule = R, Error = E> +
                     }
                 }
                 Some(_) => at_keyword = None,
-                None => return None
+                None => return None,
             }
 
             if let Some(name) = at_keyword {
@@ -383,40 +400,52 @@ where P: QualifiedRuleParser<'i, QualifiedRule = R, Error = E> +
                 self.any_rule_so_far = true;
                 if first_stylesheet_rule && name.eq_ignore_ascii_case("charset") {
                     let delimiters = Delimiter::Semicolon | Delimiter::CurlyBracketBlock;
-                    let _: Result<(), ParseError<()>> = self.input.parse_until_after(delimiters, |_| Ok(()));
+                    let _: Result<(), ParseError<()>> =
+                        self.input.parse_until_after(delimiters, |_| Ok(()));
                 } else {
-                    return Some(parse_at_rule(&start, name.clone(), self.input, &mut self.parser))
+                    return Some(parse_at_rule(
+                        &start,
+                        name.clone(),
+                        self.input,
+                        &mut self.parser,
+                    ));
                 }
             } else {
                 self.any_rule_so_far = true;
                 let result = parse_qualified_rule(self.input, &mut self.parser);
-                return Some(result.map_err(|e| (e, self.input.slice_from(start.position()))))
+                return Some(result.map_err(|e| (e, self.input.slice_from(start.position()))));
             }
         }
     }
 }
 
-
 /// Parse a single declaration, such as an `( /* ... */ )` parenthesis in an `@supports` prelude.
-pub fn parse_one_declaration<'i, 't, P, E>(input: &mut Parser<'i, 't>, parser: &mut P)
-                                           -> Result<<P as DeclarationParser<'i>>::Declaration,
-                                                     (ParseError<'i, E>, &'i str)>
-                                           where P: DeclarationParser<'i, Error = E> {
+pub fn parse_one_declaration<'i, 't, P, E>(
+    input: &mut Parser<'i, 't>,
+    parser: &mut P,
+) -> Result<<P as DeclarationParser<'i>>::Declaration, (ParseError<'i, E>, &'i str)>
+where
+    P: DeclarationParser<'i, Error = E>,
+{
     let start_position = input.position();
-    input.parse_entirely(|input| {
-        let name = input.expect_ident()?.clone();
-        input.expect_colon()?;
-        parser.parse_value(name, input)
-    })
-    .map_err(|e| (e, input.slice_from(start_position)))
+    input
+        .parse_entirely(|input| {
+            let name = input.expect_ident()?.clone();
+            input.expect_colon()?;
+            parser.parse_value(name, input)
+        })
+        .map_err(|e| (e, input.slice_from(start_position)))
 }
 
-
 /// Parse a single rule, such as for CSSOM’s `CSSStyleSheet.insertRule`.
-pub fn parse_one_rule<'i, 't, R, P, E>(input: &mut Parser<'i, 't>, parser: &mut P)
-                                       -> Result<R, ParseError<'i, E>>
-where P: QualifiedRuleParser<'i, QualifiedRule = R, Error = E> +
-         AtRuleParser<'i, AtRule = R, Error = E> {
+pub fn parse_one_rule<'i, 't, R, P, E>(
+    input: &mut Parser<'i, 't>,
+    parser: &mut P,
+) -> Result<R, ParseError<'i, E>>
+where
+    P: QualifiedRuleParser<'i, QualifiedRule = R, Error = E>
+        + AtRuleParser<'i, AtRule = R, Error = E>,
+{
     input.parse_entirely(|input| {
         input.skip_whitespace();
         let start = input.state();
@@ -450,7 +479,7 @@ fn parse_at_rule<'i: 't, 't, P, E>(
     parser: &mut P,
 ) -> Result<<P as AtRuleParser<'i>>::AtRule, (ParseError<'i, E>, &'i str)>
 where
-    P: AtRuleParser<'i, Error = E>
+    P: AtRuleParser<'i, Error = E>,
 {
     let location = input.current_source_location();
     let delimiters = Delimiter::Semicolon | Delimiter::CurlyBracketBlock;
@@ -459,67 +488,64 @@ where
         parser.parse_prelude(name, input)
     });
     match result {
-        Ok(AtRuleType::WithoutBlock(prelude)) => {
-            match input.next() {
-                Ok(&Token::Semicolon) | Err(_) => Ok(parser.rule_without_block(prelude, location)),
-                Ok(&Token::CurlyBracketBlock) => Err((
-                    input.new_unexpected_token_error(Token::CurlyBracketBlock),
-                    input.slice_from(start.position()),
-                )),
-                Ok(_) => unreachable!()
-            }
-        }
+        Ok(AtRuleType::WithoutBlock(prelude)) => match input.next() {
+            Ok(&Token::Semicolon) | Err(_) => Ok(parser.rule_without_block(prelude, location)),
+            Ok(&Token::CurlyBracketBlock) => Err((
+                input.new_unexpected_token_error(Token::CurlyBracketBlock),
+                input.slice_from(start.position()),
+            )),
+            Ok(_) => unreachable!(),
+        },
         Ok(AtRuleType::WithBlock(prelude)) => {
             match input.next() {
                 Ok(&Token::CurlyBracketBlock) => {
                     // FIXME: https://github.com/rust-lang/rust/issues/42508
-                    parse_nested_block::<'i, 't, _, _, _>(
-                        input,
-                        move |input| parser.parse_block(prelude, location, input)
-                    ).map_err(|e| (e, input.slice_from(start.position())))
+                    parse_nested_block::<'i, 't, _, _, _>(input, move |input| {
+                        parser.parse_block(prelude, location, input)
+                    })
+                    .map_err(|e| (e, input.slice_from(start.position())))
                 }
                 Ok(&Token::Semicolon) => Err((
                     input.new_unexpected_token_error(Token::Semicolon),
                     input.slice_from(start.position()),
                 )),
                 Err(e) => Err((e.into(), input.slice_from(start.position()))),
-                Ok(_) => unreachable!()
+                Ok(_) => unreachable!(),
             }
         }
         Err(error) => {
             let end_position = input.position();
             match input.next() {
-                Ok(&Token::CurlyBracketBlock) | Ok(&Token::Semicolon) | Err(_) => {},
-                _ => unreachable!()
+                Ok(&Token::CurlyBracketBlock) | Ok(&Token::Semicolon) | Err(_) => {}
+                _ => unreachable!(),
             };
             Err((error, input.slice(start.position()..end_position)))
         }
     }
 }
 
-
 fn parse_qualified_rule<'i, 't, P, E>(
     input: &mut Parser<'i, 't>,
     parser: &mut P,
 ) -> Result<<P as QualifiedRuleParser<'i>>::QualifiedRule, ParseError<'i, E>>
 where
-    P: QualifiedRuleParser<'i, Error = E>
+    P: QualifiedRuleParser<'i, Error = E>,
 {
     let location = input.current_source_location();
     // FIXME: https://github.com/rust-lang/rust/issues/42508
-    let prelude = parse_until_before::<'i, 't, _, _, _>(input, Delimiter::CurlyBracketBlock, |input| {
-        parser.parse_prelude(input)
-    });
+    let prelude =
+        parse_until_before::<'i, 't, _, _, _>(input, Delimiter::CurlyBracketBlock, |input| {
+            parser.parse_prelude(input)
+        });
     match *input.next()? {
         Token::CurlyBracketBlock => {
             // Do this here so that we consume the `{` even if the prelude is `Err`.
             let prelude = prelude?;
             // FIXME: https://github.com/rust-lang/rust/issues/42508
-            parse_nested_block::<'i, 't, _, _, _>(
-                input,
-                move |input| parser.parse_block(prelude, location, input),
-            )
+            parse_nested_block::<'i, 't, _, _, _>(input, move |input| {
+                parser.parse_block(prelude, location, input)
+            })
         }
-        _ => unreachable!()
+        _ => unreachable!(),
     }
 }
diff --git a/third_party/rust/cssparser/src/serializer.rs b/third_party/rust/cssparser/src/serializer.rs
index 34f5569d0bdb..0ae7ef406bae 100644
--- a/third_party/rust/cssparser/src/serializer.rs
+++ b/third_party/rust/cssparser/src/serializer.rs
@@ -4,18 +4,18 @@
 
 use dtoa_short::{self, Notation};
 use itoa;
-#[allow(unused_imports)] use std::ascii::AsciiExt;
 use std::fmt::{self, Write};
 use std::io;
 use std::str;
 
 use super::Token;
 
-
 /// Trait for things the can serialize themselves in CSS syntax.
 pub trait ToCss {
     /// Serialize `self` in CSS syntax, writing to `dest`.
-    fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write;
+    fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+    where
+        W: fmt::Write;
 
     /// Serialize `self` in CSS syntax and return a string.
     ///
@@ -29,8 +29,10 @@ pub trait ToCss {
 }
 
 #[inline]
-fn write_numeric<W>(value: f32, int_value: Option<i32>, has_sign: bool, dest: &mut W)
-                    -> fmt::Result where W: fmt::Write {
+fn write_numeric<W>(value: f32, int_value: Option<i32>, has_sign: bool, dest: &mut W) -> fmt::Result
+where
+    W: fmt::Write,
+{
     // `value.value >= 0` is true for negative 0.
     if has_sign && value.is_sign_positive() {
         dest.write_str("+")?;
@@ -39,7 +41,10 @@ fn write_numeric<W>(value: f32, int_value: Option<i32>, has_sign: bool, dest: &m
     let notation = if value == 0.0 && value.is_sign_negative() {
         // Negative zero. Work around #20596.
         dest.write_str("-0")?;
-        Notation { decimal_point: false, scientific: false }
+        Notation {
+            decimal_point: false,
+            scientific: false,
+        }
     } else {
         dtoa_short::write(dest, value)?
     };
@@ -52,19 +57,21 @@ fn write_numeric<W>(value: f32, int_value: Option<i32>, has_sign: bool, dest: &m
     Ok(())
 }
 
-
 impl<'a> ToCss for Token<'a> {
-    fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
+    fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+    where
+        W: fmt::Write,
+    {
         match *self {
             Token::Ident(ref value) => serialize_identifier(&**value, dest)?,
             Token::AtKeyword(ref value) => {
                 dest.write_str("@")?;
                 serialize_identifier(&**value, dest)?;
-            },
+            }
             Token::Hash(ref value) => {
                 dest.write_str("#")?;
                 serialize_name(value, dest)?;
-            },
+            }
             Token::IDHash(ref value) => {
                 dest.write_str("#")?;
                 serialize_identifier(&**value, dest)?;
@@ -74,17 +81,28 @@ impl<'a> ToCss for Token<'a> {
                 dest.write_str("url(")?;
                 serialize_unquoted_url(&**value, dest)?;
                 dest.write_str(")")?;
-            },
+            }
             Token::Delim(value) => dest.write_char(value)?,
 
-            Token::Number { value, int_value, has_sign } => {
-                write_numeric(value, int_value, has_sign, dest)?
-            }
-            Token::Percentage { unit_value, int_value, has_sign } => {
+            Token::Number {
+                value,
+                int_value,
+                has_sign,
+            } => write_numeric(value, int_value, has_sign, dest)?,
+            Token::Percentage {
+                unit_value,
+                int_value,
+                has_sign,
+            } => {
                 write_numeric(unit_value * 100., int_value, has_sign, dest)?;
                 dest.write_str("%")?;
-            },
-            Token::Dimension { value, int_value, has_sign, ref unit } => {
+            }
+            Token::Dimension {
+                value,
+                int_value,
+                has_sign,
+                ref unit,
+            } => {
                 write_numeric(value, int_value, has_sign, dest)?;
                 // Disambiguate with scientific notation.
                 let unit = &**unit;
@@ -94,7 +112,7 @@ impl<'a> ToCss for Token<'a> {
                 } else {
                     serialize_identifier(unit, dest)?;
                 }
-            },
+            }
 
             Token::WhiteSpace(content) => dest.write_str(content)?,
             Token::Comment(content) => {
@@ -116,7 +134,7 @@ impl<'a> ToCss for Token<'a> {
             Token::Function(ref name) => {
                 serialize_identifier(&**name, dest)?;
                 dest.write_str("(")?;
-            },
+            }
             Token::ParenthesisBlock => dest.write_str("(")?,
             Token::SquareBracketBlock => dest.write_str("[")?,
             Token::CurlyBracketBlock => dest.write_str("{")?,
@@ -134,7 +152,7 @@ impl<'a> ToCss for Token<'a> {
                 // and therefore does not have a closing quote.
                 dest.write_char('"')?;
                 CssStringWriter::new(dest).write_str(value)?;
-            },
+            }
             Token::CloseParenthesis => dest.write_str(")")?,
             Token::CloseSquareBracket => dest.write_str("]")?,
             Token::CloseCurlyBracket => dest.write_str("}")?,
@@ -143,7 +161,10 @@ impl<'a> ToCss for Token<'a> {
     }
 }
 
-fn hex_escape<W>(ascii_byte: u8, dest: &mut W) -> fmt::Result where W:fmt::Write {
+fn hex_escape<W>(ascii_byte: u8, dest: &mut W) -> fmt::Result
+where
+    W: fmt::Write,
+{
     static HEX_DIGITS: &'static [u8; 16] = b"0123456789abcdef";
     let b3;
     let b4;
@@ -159,15 +180,21 @@ fn hex_escape<W>(ascii_byte: u8, dest: &mut W) -> fmt::Result where W:fmt::Write
     dest.write_str(unsafe { str::from_utf8_unchecked(&bytes) })
 }
 
-fn char_escape<W>(ascii_byte: u8, dest: &mut W) -> fmt::Result where W:fmt::Write {
+fn char_escape<W>(ascii_byte: u8, dest: &mut W) -> fmt::Result
+where
+    W: fmt::Write,
+{
     let bytes = [b'\\', ascii_byte];
     dest.write_str(unsafe { str::from_utf8_unchecked(&bytes) })
 }
 
 /// Write a CSS identifier, escaping characters as necessary.
-pub fn serialize_identifier<W>(mut value: &str, dest: &mut W) -> fmt::Result where W:fmt::Write {
+pub fn serialize_identifier<W>(mut value: &str, dest: &mut W) -> fmt::Result
+where
+    W: fmt::Write,
+{
     if value.is_empty() {
-        return Ok(())
+        return Ok(());
     }
 
     if value.starts_with("--") {
@@ -192,7 +219,10 @@ pub fn serialize_identifier<W>(mut value: &str, dest: &mut W) -> fmt::Result whe
 ///
 /// You should only use this when you know what you're doing, when in doubt,
 /// consider using `serialize_identifier`.
-pub fn serialize_name<W>(value: &str, dest: &mut W) -> fmt::Result where W:fmt::Write {
+pub fn serialize_name<W>(value: &str, dest: &mut W) -> fmt::Result
+where
+    W: fmt::Write,
+{
     let mut chunk_start = 0;
     for (i, b) in value.bytes().enumerate() {
         let escaped = match b {
@@ -214,14 +244,16 @@ pub fn serialize_name<W>(value: &str, dest: &mut W) -> fmt::Result where W:fmt::
     dest.write_str(&value[chunk_start..])
 }
 
-
-fn serialize_unquoted_url<W>(value: &str, dest: &mut W) -> fmt::Result where W:fmt::Write {
+fn serialize_unquoted_url<W>(value: &str, dest: &mut W) -> fmt::Result
+where
+    W: fmt::Write,
+{
     let mut chunk_start = 0;
     for (i, b) in value.bytes().enumerate() {
         let hex = match b {
-            b'\0' ... b' ' | b'\x7F' => true,
+            b'\0'...b' ' | b'\x7F' => true,
             b'(' | b')' | b'"' | b'\'' | b'\\' => false,
-            _ => continue
+            _ => continue,
         };
         dest.write_str(&value[chunk_start..i])?;
         if hex {
@@ -234,16 +266,17 @@ fn serialize_unquoted_url<W>(value: &str, dest: &mut W) -> fmt::Result where W:f
     dest.write_str(&value[chunk_start..])
 }
 
-
 /// Write a double-quoted CSS string token, escaping content as necessary.
-pub fn serialize_string<W>(value: &str, dest: &mut W) -> fmt::Result where W: fmt::Write {
+pub fn serialize_string<W>(value: &str, dest: &mut W) -> fmt::Result
+where
+    W: fmt::Write,
+{
     dest.write_str("\"")?;
     CssStringWriter::new(dest).write_str(value)?;
     dest.write_str("\"")?;
     Ok(())
 }
 
-
 /// A `fmt::Write` adapter that escapes text for writing as a double-quoted CSS string.
 /// Quotes are not included.
 ///
@@ -251,12 +284,12 @@ pub fn serialize_string<W>(value: &str, dest: &mut W) -> fmt::Result where W: fm
 ///
 /// ```{rust,ignore}
 /// fn write_foo<W>(foo: &Foo, dest: &mut W) -> fmt::Result where W: fmt::Write {
-///     try!(dest.write_str("\""));
+///     dest.write_str("\"")?;
 ///     {
 ///         let mut string_dest = CssStringWriter::new(dest);
 ///         // Write into string_dest...
 ///     }
-///     try!(dest.write_str("\""));
+///     dest.write_str("\"")?;
 ///     Ok(())
 /// }
 /// ```
@@ -264,14 +297,20 @@ pub struct CssStringWriter<'a, W: 'a> {
     inner: &'a mut W,
 }
 
-impl<'a, W> CssStringWriter<'a, W> where W: fmt::Write {
+impl<'a, W> CssStringWriter<'a, W>
+where
+    W: fmt::Write,
+{
     /// Wrap a text writer to create a `CssStringWriter`.
     pub fn new(inner: &'a mut W) -> CssStringWriter<'a, W> {
         CssStringWriter { inner: inner }
     }
 }
 
-impl<'a, W> fmt::Write for CssStringWriter<'a, W> where W: fmt::Write {
+impl<'a, W> fmt::Write for CssStringWriter<'a, W>
+where
+    W: fmt::Write,
+{
     fn write_str(&mut self, s: &str) -> fmt::Result {
         let mut chunk_start = 0;
         for (i, b) in s.bytes().enumerate() {
@@ -293,11 +332,13 @@ impl<'a, W> fmt::Write for CssStringWriter<'a, W> where W: fmt::Write {
     }
 }
 
-
 macro_rules! impl_tocss_for_int {
     ($T: ty) => {
         impl<'a> ToCss for $T {
-            fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
+            fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+            where
+                W: fmt::Write,
+            {
                 struct AssumeUtf8<W: fmt::Write>(W);
 
                 impl<W: fmt::Write> io::Write for AssumeUtf8<W> {
@@ -305,7 +346,8 @@ macro_rules! impl_tocss_for_int {
                     fn write_all(&mut self, buf: &[u8]) -> io::Result<()> {
                         // Safety: itoa only emits ASCII, which is also well-formed UTF-8.
                         debug_assert!(buf.is_ascii());
-                        self.0.write_str(unsafe { str::from_utf8_unchecked(buf) })
+                        self.0
+                            .write_str(unsafe { str::from_utf8_unchecked(buf) })
                             .map_err(|_| io::ErrorKind::Other.into())
                     }
 
@@ -323,11 +365,11 @@ macro_rules! impl_tocss_for_int {
 
                 match itoa::write(AssumeUtf8(dest), *self) {
                     Ok(_) => Ok(()),
-                    Err(_) => Err(fmt::Error)
+                    Err(_) => Err(fmt::Error),
                 }
             }
         }
-    }
+    };
 }
 
 impl_tocss_for_int!(i8);
@@ -342,11 +384,14 @@ impl_tocss_for_int!(u64);
 macro_rules! impl_tocss_for_float {
     ($T: ty) => {
         impl<'a> ToCss for $T {
-            fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
+            fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+            where
+                W: fmt::Write,
+            {
                 dtoa_short::write(dest, *self).map(|_| ())
             }
         }
-    }
+    };
 }
 
 impl_tocss_for_float!(f32);
@@ -381,22 +426,33 @@ impl TokenSerializationType {
     pub fn needs_separator_when_before(self, other: TokenSerializationType) -> bool {
         use self::TokenSerializationTypeVariants::*;
         match self.0 {
-            Ident => matches!(other.0,
-                Ident | Function | UrlOrBadUrl | DelimMinus | Number | Percentage | Dimension |
-                CDC | OpenParen),
-            AtKeywordOrHash | Dimension => matches!(other.0,
-                Ident | Function | UrlOrBadUrl | DelimMinus | Number | Percentage | Dimension |
-                CDC),
-            DelimHash | DelimMinus | Number => matches!(other.0,
-                Ident | Function | UrlOrBadUrl | DelimMinus | Number | Percentage | Dimension),
-            DelimAt => matches!(other.0,
-                Ident | Function | UrlOrBadUrl | DelimMinus),
+            Ident => matches!(
+                other.0,
+                Ident
+                    | Function
+                    | UrlOrBadUrl
+                    | DelimMinus
+                    | Number
+                    | Percentage
+                    | Dimension
+                    | CDC
+                    | OpenParen
+            ),
+            AtKeywordOrHash | Dimension => matches!(
+                other.0,
+                Ident | Function | UrlOrBadUrl | DelimMinus | Number | Percentage | Dimension | CDC
+            ),
+            DelimHash | DelimMinus | Number => matches!(
+                other.0,
+                Ident | Function | UrlOrBadUrl | DelimMinus | Number | Percentage | Dimension
+            ),
+            DelimAt => matches!(other.0, Ident | Function | UrlOrBadUrl | DelimMinus),
             DelimDotOrPlus => matches!(other.0, Number | Percentage | Dimension),
             DelimAssorted | DelimAsterisk => matches!(other.0, DelimEquals),
             DelimBar => matches!(other.0, DelimEquals | DelimBar | DashMatch),
             DelimSlash => matches!(other.0, DelimAsterisk | SubstringMatch),
-            Nothing | WhiteSpace | Percentage | UrlOrBadUrl | Function | CDC | OpenParen |
-            DashMatch | SubstringMatch | DelimQuestion | DelimEquals | Other => false,
+            Nothing | WhiteSpace | Percentage | UrlOrBadUrl | Function | CDC | OpenParen
+            | DashMatch | SubstringMatch | DelimQuestion | DelimEquals | Other => false,
         }
     }
 }
@@ -415,18 +471,18 @@ enum TokenSerializationTypeVariants {
     CDC,
     DashMatch,
     SubstringMatch,
-    OpenParen,         // '('
-    DelimHash,         // '#'
-    DelimAt,           // '@'
-    DelimDotOrPlus,    // '.', '+'
-    DelimMinus,        // '-'
-    DelimQuestion,     // '?'
-    DelimAssorted,     // '$', '^', '~'
-    DelimEquals,       // '='
-    DelimBar,          // '|'
-    DelimSlash,        // '/'
-    DelimAsterisk,     // '*'
-    Other,             // anything else
+    OpenParen,      // '('
+    DelimHash,      // '#'
+    DelimAt,        // '@'
+    DelimDotOrPlus, // '.', '+'
+    DelimMinus,     // '-'
+    DelimQuestion,  // '?'
+    DelimAssorted,  // '$', '^', '~'
+    DelimEquals,    // '='
+    DelimBar,       // '|'
+    DelimSlash,     // '/'
+    DelimAsterisk,  // '*'
+    Other,          // anything else
 }
 
 impl<'a> Token<'a> {
@@ -460,12 +516,21 @@ impl<'a> Token<'a> {
             Token::CDC => CDC,
             Token::Function(_) => Function,
             Token::ParenthesisBlock => OpenParen,
-            Token::SquareBracketBlock | Token::CurlyBracketBlock |
-            Token::CloseParenthesis | Token::CloseSquareBracket | Token::CloseCurlyBracket |
-            Token::QuotedString(_) | Token::BadString(_) |
-            Token::Delim(_) | Token::Colon | Token::Semicolon | Token::Comma | Token::CDO |
-            Token::IncludeMatch | Token::PrefixMatch | Token::SuffixMatch
-            => Other,
+            Token::SquareBracketBlock
+            | Token::CurlyBracketBlock
+            | Token::CloseParenthesis
+            | Token::CloseSquareBracket
+            | Token::CloseCurlyBracket
+            | Token::QuotedString(_)
+            | Token::BadString(_)
+            | Token::Delim(_)
+            | Token::Colon
+            | Token::Semicolon
+            | Token::Comma
+            | Token::CDO
+            | Token::IncludeMatch
+            | Token::PrefixMatch
+            | Token::SuffixMatch => Other,
         })
     }
 }
diff --git a/third_party/rust/cssparser/src/size_of_tests.rs b/third_party/rust/cssparser/src/size_of_tests.rs
index e59e9498cfc0..6a1ee32878f1 100644
--- a/third_party/rust/cssparser/src/size_of_tests.rs
+++ b/third_party/rust/cssparser/src/size_of_tests.rs
@@ -16,18 +16,24 @@ macro_rules! size_of_test {
                 panic!(
                     "Your changes have decreased the stack size of {} from {} to {}. \
                      Good work! Please update the expected size in {}.",
-                    stringify!($t), old, new, file!()
+                    stringify!($t),
+                    old,
+                    new,
+                    file!()
                 )
             } else if new > old {
                 panic!(
                     "Your changes have increased the stack size of {} from {} to {}. \
                      Please consider choosing a design which avoids this increase. \
                      If you feel that the increase is necessary, update the size in {}.",
-                    stringify!($t), old, new, file!()
+                    stringify!($t),
+                    old,
+                    new,
+                    file!()
                 )
             }
         }
-    }
+    };
 }
 
 // Some of these assume 64-bit
@@ -36,10 +42,18 @@ size_of_test!(std_cow_str, Cow<'static, str>, 32);
 size_of_test!(cow_rc_str, CowRcStr, 16);
 
 size_of_test!(tokenizer, ::tokenizer::Tokenizer, 72);
-size_of_test!(parser_input, ::parser::ParserInput, if cfg!(rustc_has_pr45225) { 136 } else { 144 });
+size_of_test!(
+    parser_input,
+    ::parser::ParserInput,
+    if cfg!(rustc_has_pr45225) { 136 } else { 144 }
+);
 size_of_test!(parser, ::parser::Parser, 16);
 size_of_test!(source_position, ::SourcePosition, 8);
 size_of_test!(parser_state, ::ParserState, 24);
 
 size_of_test!(basic_parse_error, ::BasicParseError, 48);
-size_of_test!(parse_error_lower_bound, ::ParseError<()>, if cfg!(rustc_has_pr45225) { 48 } else { 56 });
+size_of_test!(
+    parse_error_lower_bound,
+    ::ParseError<()>,
+    if cfg!(rustc_has_pr45225) { 48 } else { 56 }
+);
diff --git a/third_party/rust/cssparser/src/tests.rs b/third_party/rust/cssparser/src/tests.rs
index 926713e854f7..39e86219b6a4 100644
--- a/third_party/rust/cssparser/src/tests.rs
+++ b/third_party/rust/cssparser/src/tests.rs
@@ -11,14 +11,13 @@ use rustc_serialize::json::{self, Json, ToJson};
 #[cfg(feature = "bench")]
 use self::test::Bencher;
 
-use super::{Parser, Delimiter, Token, SourceLocation,
-            ParseError, ParseErrorKind, BasicParseError, BasicParseErrorKind,
-            DeclarationListParser, DeclarationParser, RuleListParser,
-            AtRuleType, AtRuleParser, QualifiedRuleParser, ParserInput,
-            parse_one_declaration, parse_one_rule, parse_important,
-            stylesheet_encoding, EncodingSupport,
-            TokenSerializationType, CowRcStr,
-            Color, RGBA, parse_nth, UnicodeRange, ToCss};
+use super::{
+    parse_important, parse_nth, parse_one_declaration, parse_one_rule, stylesheet_encoding,
+    AtRuleParser, AtRuleType, BasicParseError, BasicParseErrorKind, Color, CowRcStr,
+    DeclarationListParser, DeclarationParser, Delimiter, EncodingSupport, ParseError,
+    ParseErrorKind, Parser, ParserInput, QualifiedRuleParser, RuleListParser, SourceLocation,
+    ToCss, Token, TokenSerializationType, UnicodeRange, RGBA,
+};
 
 macro_rules! JArray {
     ($($e: expr,)*) => { JArray![ $( $e ),* ] };
@@ -37,9 +36,11 @@ fn almost_equals(a: &Json, b: &Json) -> bool {
         (&Json::Boolean(a), &Json::Boolean(b)) => a == b,
         (&Json::String(ref a), &Json::String(ref b)) => a == b,
         (&Json::Array(ref a), &Json::Array(ref b)) => {
-            a.len() == b.len() &&
-            a.iter().zip(b.iter()).all(|(ref a, ref b)| almost_equals(*a, *b))
-        },
+            a.len() == b.len()
+                && a.iter()
+                    .zip(b.iter())
+                    .all(|(ref a, ref b)| almost_equals(*a, *b))
+        }
         (&Json::Object(_), &Json::Object(_)) => panic!("Not implemented"),
         (&Json::Null, &Json::Null) => true,
         _ => false,
@@ -65,11 +66,14 @@ fn normalize(json: &mut Json) {
 fn assert_json_eq(results: json::Json, mut expected: json::Json, message: &str) {
     normalize(&mut expected);
     if !almost_equals(&results, &expected) {
-        println!("{}", ::difference::Changeset::new(
-            &results.pretty().to_string(),
-            &expected.pretty().to_string(),
-            "\n",
-        ));
+        println!(
+            "{}",
+            ::difference::Changeset::new(
+                &results.pretty().to_string(),
+                &expected.pretty().to_string(),
+                "\n",
+            )
+        );
         panic!("{}", message)
     }
 }
@@ -77,7 +81,7 @@ fn assert_json_eq(results: json::Json, mut expected: json::Json, message: &str)
 fn run_raw_json_tests<F: Fn(Json, Json) -> ()>(json_data: &str, run: F) {
     let items = match Json::from_str(json_data) {
         Ok(Json::Array(items)) => items,
-        _ => panic!("Invalid JSON")
+        _ => panic!("Invalid JSON"),
     };
     assert!(items.len() % 2 == 0);
     let mut input = None;
@@ -87,83 +91,89 @@ fn run_raw_json_tests<F: Fn(Json, Json) -> ()>(json_data: &str, run: F) {
             (&Some(_), expected) => {
                 let input = input.take().unwrap();
                 run(input, expected)
-            },
+            }
         };
     }
 }
 
-
 fn run_json_tests<F: Fn(&mut Parser) -> Json>(json_data: &str, parse: F) {
-    run_raw_json_tests(json_data, |input, expected| {
-        match input {
-            Json::String(input) => {
-                let mut parse_input = ParserInput::new(&input);
-                let result = parse(&mut Parser::new(&mut parse_input));
-                assert_json_eq(result, expected, &input);
-            },
-            _ => panic!("Unexpected JSON")
+    run_raw_json_tests(json_data, |input, expected| match input {
+        Json::String(input) => {
+            let mut parse_input = ParserInput::new(&input);
+            let result = parse(&mut Parser::new(&mut parse_input));
+            assert_json_eq(result, expected, &input);
         }
+        _ => panic!("Unexpected JSON"),
     });
 }
 
-
 #[test]
 fn component_value_list() {
-    run_json_tests(include_str!("css-parsing-tests/component_value_list.json"), |input| {
-        Json::Array(component_values_to_json(input))
-    });
+    run_json_tests(
+        include_str!("css-parsing-tests/component_value_list.json"),
+        |input| Json::Array(component_values_to_json(input)),
+    );
 }
 
-
 #[test]
 fn one_component_value() {
-    run_json_tests(include_str!("css-parsing-tests/one_component_value.json"), |input| {
-        let result: Result<Json, ParseError<()>> = input.parse_entirely(|input| {
-            Ok(one_component_value_to_json(input.next()?.clone(), input))
-        });
-        result.unwrap_or(JArray!["error", "invalid"])
-    });
+    run_json_tests(
+        include_str!("css-parsing-tests/one_component_value.json"),
+        |input| {
+            let result: Result<Json, ParseError<()>> = input.parse_entirely(|input| {
+                Ok(one_component_value_to_json(input.next()?.clone(), input))
+            });
+            result.unwrap_or(JArray!["error", "invalid"])
+        },
+    );
 }
 
-
 #[test]
 fn declaration_list() {
-    run_json_tests(include_str!("css-parsing-tests/declaration_list.json"), |input| {
-        Json::Array(DeclarationListParser::new(input, JsonParser).map(|result| {
-            result.unwrap_or(JArray!["error", "invalid"])
-        }).collect())
-    });
+    run_json_tests(
+        include_str!("css-parsing-tests/declaration_list.json"),
+        |input| {
+            Json::Array(
+                DeclarationListParser::new(input, JsonParser)
+                    .map(|result| result.unwrap_or(JArray!["error", "invalid"]))
+                    .collect(),
+            )
+        },
+    );
 }
 
-
 #[test]
 fn one_declaration() {
-    run_json_tests(include_str!("css-parsing-tests/one_declaration.json"), |input| {
-        parse_one_declaration(input, &mut JsonParser).unwrap_or(JArray!["error", "invalid"])
-    });
+    run_json_tests(
+        include_str!("css-parsing-tests/one_declaration.json"),
+        |input| {
+            parse_one_declaration(input, &mut JsonParser).unwrap_or(JArray!["error", "invalid"])
+        },
+    );
 }
 
-
 #[test]
 fn rule_list() {
     run_json_tests(include_str!("css-parsing-tests/rule_list.json"), |input| {
-        Json::Array(RuleListParser::new_for_nested_rule(input, JsonParser).map(|result| {
-            result.unwrap_or(JArray!["error", "invalid"])
-        }).collect())
+        Json::Array(
+            RuleListParser::new_for_nested_rule(input, JsonParser)
+                .map(|result| result.unwrap_or(JArray!["error", "invalid"]))
+                .collect(),
+        )
     });
 }
 
-
 #[test]
 fn stylesheet() {
     run_json_tests(include_str!("css-parsing-tests/stylesheet.json"), |input| {
-        Json::Array(RuleListParser::new_for_stylesheet(input, JsonParser).map(|result| {
-            result.unwrap_or(JArray!["error", "invalid"])
-        }).collect())
+        Json::Array(
+            RuleListParser::new_for_stylesheet(input, JsonParser)
+                .map(|result| result.unwrap_or(JArray!["error", "invalid"]))
+                .collect(),
+        )
     });
 }
 
-
 #[test]
 fn one_rule() {
     run_json_tests(include_str!("css-parsing-tests/one_rule.json"), |input| {
@@ -171,7 +181,6 @@ fn one_rule() {
     });
 }
 
-
 #[test]
 fn stylesheet_from_bytes() {
     pub struct EncodingRs;
@@ -184,8 +193,7 @@ fn stylesheet_from_bytes() {
         }
 
         fn is_utf16_be_or_le(encoding: &Self::Encoding) -> bool {
-            *encoding == encoding_rs::UTF_16LE ||
-            *encoding == encoding_rs::UTF_16BE
+            *encoding == encoding_rs::UTF_16LE || *encoding == encoding_rs::UTF_16BE
         }
 
         fn from_label(ascii_label: &[u8]) -> Option<Self::Encoding> {
@@ -193,37 +201,45 @@ fn stylesheet_from_bytes() {
         }
     }
 
+    run_raw_json_tests(
+        include_str!("css-parsing-tests/stylesheet_bytes.json"),
+        |input, expected| {
+            let map = match input {
+                Json::Object(map) => map,
+                _ => panic!("Unexpected JSON"),
+            };
 
-    run_raw_json_tests(include_str!("css-parsing-tests/stylesheet_bytes.json"),
-                       |input, expected| {
-        let map = match input {
-            Json::Object(map) => map,
-            _ => panic!("Unexpected JSON")
-        };
+            let result = {
+                let css = get_string(&map, "css_bytes")
+                    .unwrap()
+                    .chars()
+                    .map(|c| {
+                        assert!(c as u32 <= 0xFF);
+                        c as u8
+                    })
+                    .collect::<Vec<u8>>();
+                let protocol_encoding_label =
+                    get_string(&map, "protocol_encoding").map(|s| s.as_bytes());
+                let environment_encoding = get_string(&map, "environment_encoding")
+                    .map(|s| s.as_bytes())
+                    .and_then(EncodingRs::from_label);
 
-        let result = {
-            let css = get_string(&map, "css_bytes").unwrap().chars().map(|c| {
-                assert!(c as u32 <= 0xFF);
-                c as u8
-            }).collect::<Vec<u8>>();
-            let protocol_encoding_label = get_string(&map, "protocol_encoding")
-                .map(|s| s.as_bytes());
-            let environment_encoding = get_string(&map, "environment_encoding")
-                .map(|s| s.as_bytes())
-                .and_then(EncodingRs::from_label);
-
-            let encoding = stylesheet_encoding::<EncodingRs>(
-                &css, protocol_encoding_label, environment_encoding);
-            let (css_unicode, used_encoding, _) = encoding.decode(&css);
-            let mut input = ParserInput::new(&css_unicode);
-            let input = &mut Parser::new(&mut input);
-            let rules = RuleListParser::new_for_stylesheet(input, JsonParser)
-                        .map(|result| result.unwrap_or(JArray!["error", "invalid"]))
-                        .collect::<Vec<_>>();
-            JArray![rules, used_encoding.name().to_lowercase()]
-        };
-        assert_json_eq(result, expected, &Json::Object(map).to_string());
-    });
+                let encoding = stylesheet_encoding::<EncodingRs>(
+                    &css,
+                    protocol_encoding_label,
+                    environment_encoding,
+                );
+                let (css_unicode, used_encoding, _) = encoding.decode(&css);
+                let mut input = ParserInput::new(&css_unicode);
+                let input = &mut Parser::new(&mut input);
+                let rules = RuleListParser::new_for_stylesheet(input, JsonParser)
+                    .map(|result| result.unwrap_or(JArray!["error", "invalid"]))
+                    .collect::<Vec<_>>();
+                JArray![rules, used_encoding.name().to_lowercase()]
+            };
+            assert_json_eq(result, expected, &Json::Object(map).to_string());
+        },
+    );
 
     fn get_string<'a>(map: &'a json::Object, key: &str) -> Option<&'a str> {
         match map.get(key) {
@@ -235,7 +251,6 @@ fn stylesheet_from_bytes() {
     }
 }
 
-
 #[test]
 fn expect_no_error_token() {
     let mut input = ParserInput::new("foo 4px ( / { !bar }");
@@ -256,16 +271,17 @@ fn expect_no_error_token() {
     assert!(Parser::new(&mut input).expect_no_error_token().is_err());
 }
 
-
 /// https://github.com/servo/rust-cssparser/issues/71
 #[test]
 fn outer_block_end_consumed() {
     let mut input = ParserInput::new("(calc(true))");
     let mut input = Parser::new(&mut input);
     assert!(input.expect_parenthesis_block().is_ok());
-    assert!(input.parse_nested_block(|input| {
-        input.expect_function_matching("calc").map_err(Into::<ParseError<()>>::into)
-    }).is_ok());
+    assert!(input
+        .parse_nested_block(|input| input
+            .expect_function_matching("calc")
+            .map_err(Into::<ParseError<()>>::into))
+        .is_ok());
     println!("{:?}", input.position());
     assert!(input.next().is_err());
 }
@@ -275,7 +291,7 @@ fn outer_block_end_consumed() {
 fn bad_url_slice_out_of_bounds() {
     let mut input = ParserInput::new("url(\u{1}\\");
     let mut parser = Parser::new(&mut input);
-    let result = parser.next_including_whitespace_and_comments();  // This used to panic
+    let result = parser.next_including_whitespace_and_comments(); // This used to panic
     assert_eq!(result, Ok(&Token::BadUrl("\u{1}\\".into())));
 }
 
@@ -284,27 +300,33 @@ fn bad_url_slice_out_of_bounds() {
 fn bad_url_slice_not_at_char_boundary() {
     let mut input = ParserInput::new("url(9\n۰");
     let mut parser = Parser::new(&mut input);
-    let result = parser.next_including_whitespace_and_comments();  // This used to panic
+    let result = parser.next_including_whitespace_and_comments(); // This used to panic
     assert_eq!(result, Ok(&Token::BadUrl("9\n۰".into())));
 }
 
 #[test]
 fn unquoted_url_escaping() {
-    let token = Token::UnquotedUrl("\
-        \x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\
-        \x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f \
-        !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]\
-        ^_`abcdefghijklmnopqrstuvwxyz{|}~\x7fé\
-    ".into());
+    let token = Token::UnquotedUrl(
+        "\
+         \x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\
+         \x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f \
+         !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]\
+         ^_`abcdefghijklmnopqrstuvwxyz{|}~\x7fé\
+         "
+        .into(),
+    );
     let serialized = token.to_css_string();
-    assert_eq!(serialized, "\
-        url(\
-            \\1 \\2 \\3 \\4 \\5 \\6 \\7 \\8 \\9 \\a \\b \\c \\d \\e \\f \\10 \
-            \\11 \\12 \\13 \\14 \\15 \\16 \\17 \\18 \\19 \\1a \\1b \\1c \\1d \\1e \\1f \\20 \
-            !\\\"#$%&\\'\\(\\)*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\]\
-            ^_`abcdefghijklmnopqrstuvwxyz{|}~\\7f é\
-        )\
-        ");
+    assert_eq!(
+        serialized,
+        "\
+         url(\
+         \\1 \\2 \\3 \\4 \\5 \\6 \\7 \\8 \\9 \\a \\b \\c \\d \\e \\f \\10 \
+         \\11 \\12 \\13 \\14 \\15 \\16 \\17 \\18 \\19 \\1a \\1b \\1c \\1d \\1e \\1f \\20 \
+         !\\\"#$%&\\'\\(\\)*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\]\
+         ^_`abcdefghijklmnopqrstuvwxyz{|}~\\7f é\
+         )\
+         "
+    );
     let mut input = ParserInput::new(&serialized);
     assert_eq!(Parser::new(&mut input).next(), Ok(&token));
 }
@@ -332,43 +354,47 @@ fn test_expect_url() {
     assert!(parse(&mut input).is_err());
 }
 
-
 fn run_color_tests<F: Fn(Result<Color, ()>) -> Json>(json_data: &str, to_json: F) {
     run_json_tests(json_data, |input| {
-        let result: Result<_, ParseError<()>> = input.parse_entirely(|i| {
-            Color::parse(i).map_err(Into::into)
-        });
+        let result: Result<_, ParseError<()>> =
+            input.parse_entirely(|i| Color::parse(i).map_err(Into::into));
         to_json(result.map_err(|_| ()))
     });
 }
 
-
 #[test]
 fn color3() {
-    run_color_tests(include_str!("css-parsing-tests/color3.json"), |c| c.ok().to_json())
+    run_color_tests(include_str!("css-parsing-tests/color3.json"), |c| {
+        c.ok().to_json()
+    })
 }
 
-
 #[test]
 fn color3_hsl() {
-    run_color_tests(include_str!("css-parsing-tests/color3_hsl.json"), |c| c.ok().to_json())
+    run_color_tests(include_str!("css-parsing-tests/color3_hsl.json"), |c| {
+        c.ok().to_json()
+    })
 }
 
-
 /// color3_keywords.json is different: R, G and B are in 0..255 rather than 0..1
 #[test]
 fn color3_keywords() {
-    run_color_tests(include_str!("css-parsing-tests/color3_keywords.json"), |c| c.ok().to_json())
+    run_color_tests(
+        include_str!("css-parsing-tests/color3_keywords.json"),
+        |c| c.ok().to_json(),
+    )
 }
 
-
 #[test]
 fn nth() {
     run_json_tests(include_str!("css-parsing-tests/An+B.json"), |input| {
-        input.parse_entirely(|i| {
-            let result: Result<_, ParseError<()>> = parse_nth(i).map_err(Into::into);
-            result
-        }).ok().to_json()
+        input
+            .parse_entirely(|i| {
+                let result: Result<_, ParseError<()>> = parse_nth(i).map_err(Into::into);
+                result
+            })
+            .ok()
+            .to_json()
     });
 }
 
@@ -388,7 +414,6 @@ fn unicode_range() {
     });
 }
 
-
 #[test]
 fn serializer_not_preserving_comments() {
     serializer(false)
@@ -400,44 +425,59 @@ fn serializer_preserving_comments() {
 }
 
 fn serializer(preserve_comments: bool) {
-    run_json_tests(include_str!("css-parsing-tests/component_value_list.json"), |input| {
-        fn write_to(mut previous_token: TokenSerializationType,
-                    input: &mut Parser,
-                    string: &mut String,
-                    preserve_comments: bool) {
-            while let Ok(token) = if preserve_comments {
-                input.next_including_whitespace_and_comments().map(|t| t.clone())
-            } else {
-                input.next_including_whitespace().map(|t| t.clone())
-            } {
-                let token_type = token.serialization_type();
-                if !preserve_comments && previous_token.needs_separator_when_before(token_type) {
-                    string.push_str("/**/")
-                }
-                previous_token = token_type;
-                token.to_css(string).unwrap();
-                let closing_token = match token {
-                    Token::Function(_) | Token::ParenthesisBlock => Some(Token::CloseParenthesis),
-                    Token::SquareBracketBlock => Some(Token::CloseSquareBracket),
-                    Token::CurlyBracketBlock => Some(Token::CloseCurlyBracket),
-                    _ => None
-                };
-                if let Some(closing_token) = closing_token {
-                    let result: Result<_, ParseError<()>> = input.parse_nested_block(|input| {
-                        write_to(previous_token, input, string, preserve_comments);
-                        Ok(())
-                    });
-                    result.unwrap();
-                    closing_token.to_css(string).unwrap();
+    run_json_tests(
+        include_str!("css-parsing-tests/component_value_list.json"),
+        |input| {
+            fn write_to(
+                mut previous_token: TokenSerializationType,
+                input: &mut Parser,
+                string: &mut String,
+                preserve_comments: bool,
+            ) {
+                while let Ok(token) = if preserve_comments {
+                    input
+                        .next_including_whitespace_and_comments()
+                        .map(|t| t.clone())
+                } else {
+                    input.next_including_whitespace().map(|t| t.clone())
+                } {
+                    let token_type = token.serialization_type();
+                    if !preserve_comments && previous_token.needs_separator_when_before(token_type)
+                    {
+                        string.push_str("/**/")
+                    }
+                    previous_token = token_type;
+                    token.to_css(string).unwrap();
+                    let closing_token = match token {
+                        Token::Function(_) | Token::ParenthesisBlock => {
+                            Some(Token::CloseParenthesis)
+                        }
+                        Token::SquareBracketBlock => Some(Token::CloseSquareBracket),
+                        Token::CurlyBracketBlock => Some(Token::CloseCurlyBracket),
+                        _ => None,
+                    };
+                    if let Some(closing_token) = closing_token {
+                        let result: Result<_, ParseError<()>> = input.parse_nested_block(|input| {
+                            write_to(previous_token, input, string, preserve_comments);
+                            Ok(())
+                        });
+                        result.unwrap();
+                        closing_token.to_css(string).unwrap();
+                    }
                 }
             }
-        }
-        let mut serialized = String::new();
-        write_to(TokenSerializationType::nothing(), input, &mut serialized, preserve_comments);
-        let mut input = ParserInput::new(&serialized);
-        let parser = &mut Parser::new(&mut input);
-        Json::Array(component_values_to_json(parser))
-    });
+            let mut serialized = String::new();
+            write_to(
+                TokenSerializationType::nothing(),
+                input,
+                &mut serialized,
+                preserve_comments,
+            );
+            let mut input = ParserInput::new(&serialized);
+            let parser = &mut Parser::new(&mut input);
+            Json::Array(component_values_to_json(parser))
+        },
+    );
 }
 
 #[test]
@@ -497,36 +537,90 @@ fn line_numbers() {
         "b\""
     ));
     let mut input = Parser::new(&mut input);
-    assert_eq!(input.current_source_location(), SourceLocation { line: 0, column: 1 });
-    assert_eq!(input.next_including_whitespace(), Ok(&Token::Ident("fo00o".into())));
-    assert_eq!(input.current_source_location(), SourceLocation { line: 1, column: 3 });
-    assert_eq!(input.next_including_whitespace(), Ok(&Token::WhiteSpace(" ")));
-    assert_eq!(input.current_source_location(), SourceLocation { line: 1, column: 4 });
-    assert_eq!(input.next_including_whitespace(), Ok(&Token::Ident("bar".into())));
-    assert_eq!(input.current_source_location(), SourceLocation { line: 1, column: 7 });
-    assert_eq!(input.next_including_whitespace_and_comments(), Ok(&Token::Comment("\n")));
-    assert_eq!(input.current_source_location(), SourceLocation { line: 2, column: 3 });
-    assert_eq!(input.next_including_whitespace(), Ok(&Token::Ident("baz".into())));
-    assert_eq!(input.current_source_location(), SourceLocation { line: 2, column: 6 });
+    assert_eq!(
+        input.current_source_location(),
+        SourceLocation { line: 0, column: 1 }
+    );
+    assert_eq!(
+        input.next_including_whitespace(),
+        Ok(&Token::Ident("fo00o".into()))
+    );
+    assert_eq!(
+        input.current_source_location(),
+        SourceLocation { line: 1, column: 3 }
+    );
+    assert_eq!(
+        input.next_including_whitespace(),
+        Ok(&Token::WhiteSpace(" "))
+    );
+    assert_eq!(
+        input.current_source_location(),
+        SourceLocation { line: 1, column: 4 }
+    );
+    assert_eq!(
+        input.next_including_whitespace(),
+        Ok(&Token::Ident("bar".into()))
+    );
+    assert_eq!(
+        input.current_source_location(),
+        SourceLocation { line: 1, column: 7 }
+    );
+    assert_eq!(
+        input.next_including_whitespace_and_comments(),
+        Ok(&Token::Comment("\n"))
+    );
+    assert_eq!(
+        input.current_source_location(),
+        SourceLocation { line: 2, column: 3 }
+    );
+    assert_eq!(
+        input.next_including_whitespace(),
+        Ok(&Token::Ident("baz".into()))
+    );
+    assert_eq!(
+        input.current_source_location(),
+        SourceLocation { line: 2, column: 6 }
+    );
     let state = input.state();
 
-    assert_eq!(input.next_including_whitespace(), Ok(&Token::WhiteSpace("\r\n\n")));
-    assert_eq!(input.current_source_location(), SourceLocation { line: 4, column: 1 });
+    assert_eq!(
+        input.next_including_whitespace(),
+        Ok(&Token::WhiteSpace("\r\n\n"))
+    );
+    assert_eq!(
+        input.current_source_location(),
+        SourceLocation { line: 4, column: 1 }
+    );
 
-    assert_eq!(state.source_location(), SourceLocation { line: 2, column: 6 });
+    assert_eq!(
+        state.source_location(),
+        SourceLocation { line: 2, column: 6 }
+    );
 
-    assert_eq!(input.next_including_whitespace(), Ok(&Token::UnquotedUrl("u".into())));
-    assert_eq!(input.current_source_location(), SourceLocation { line: 6, column: 2 });
+    assert_eq!(
+        input.next_including_whitespace(),
+        Ok(&Token::UnquotedUrl("u".into()))
+    );
+    assert_eq!(
+        input.current_source_location(),
+        SourceLocation { line: 6, column: 2 }
+    );
 
-    assert_eq!(input.next_including_whitespace(), Ok(&Token::QuotedString("ab".into())));
-    assert_eq!(input.current_source_location(), SourceLocation { line: 7, column: 3 });
+    assert_eq!(
+        input.next_including_whitespace(),
+        Ok(&Token::QuotedString("ab".into()))
+    );
+    assert_eq!(
+        input.current_source_location(),
+        SourceLocation { line: 7, column: 3 }
+    );
     assert!(input.next_including_whitespace().is_err());
 }
 
 #[test]
 fn overflow() {
-    use std::iter::repeat;
     use std::f32;
+    use std::iter::repeat;
 
     let css = r"
          2147483646
@@ -551,7 +645,8 @@ fn overflow() {
          -3.40282347e+38
          -3.402824e+38
 
-    ".replace("{309 zeros}", &repeat('0').take(309).collect::<String>());
+    "
+    .replace("{309 zeros}", &repeat('0').take(309).collect::<String>());
     let mut input = ParserInput::new(&css);
     let mut input = Parser::new(&mut input);
 
@@ -586,9 +681,11 @@ fn line_delimited() {
     let mut input = Parser::new(&mut input);
     assert_eq!(input.next(), Ok(&Token::CurlyBracketBlock));
     assert!({
-        let result: Result<_, ParseError<()>> = input.parse_until_after(Delimiter::Semicolon, |_| Ok(42));
+        let result: Result<_, ParseError<()>> =
+            input.parse_until_after(Delimiter::Semicolon, |_| Ok(42));
         result
-    }.is_err());
+    }
+    .is_err());
     assert_eq!(input.next(), Ok(&Token::Comma));
     assert!(input.next().is_err());
 }
@@ -603,9 +700,18 @@ fn identifier_serialization() {
 
     // Replacement character
     assert_eq!(Token::Ident("\u{FFFD}".into()).to_css_string(), "\u{FFFD}");
-    assert_eq!(Token::Ident("a\u{FFFD}".into()).to_css_string(), "a\u{FFFD}");
-    assert_eq!(Token::Ident("\u{FFFD}b".into()).to_css_string(), "\u{FFFD}b");
-    assert_eq!(Token::Ident("a\u{FFFD}b".into()).to_css_string(), "a\u{FFFD}b");
+    assert_eq!(
+        Token::Ident("a\u{FFFD}".into()).to_css_string(),
+        "a\u{FFFD}"
+    );
+    assert_eq!(
+        Token::Ident("\u{FFFD}b".into()).to_css_string(),
+        "\u{FFFD}b"
+    );
+    assert_eq!(
+        Token::Ident("a\u{FFFD}b".into()).to_css_string(),
+        "a\u{FFFD}b"
+    );
 
     // Number prefix
     assert_eq!(Token::Ident("0a".into()).to_css_string(), "\\30 a");
@@ -647,30 +753,52 @@ fn identifier_serialization() {
     assert_eq!(Token::Ident("--a".into()).to_css_string(), "--a");
 
     // Various tests
-    assert_eq!(Token::Ident("\x01\x02\x1E\x1F".into()).to_css_string(), "\\1 \\2 \\1e \\1f ");
-    assert_eq!(Token::Ident("\u{0080}\x2D\x5F\u{00A9}".into()).to_css_string(), "\u{0080}\x2D\x5F\u{00A9}");
+    assert_eq!(
+        Token::Ident("\x01\x02\x1E\x1F".into()).to_css_string(),
+        "\\1 \\2 \\1e \\1f "
+    );
+    assert_eq!(
+        Token::Ident("\u{0080}\x2D\x5F\u{00A9}".into()).to_css_string(),
+        "\u{0080}\x2D\x5F\u{00A9}"
+    );
     assert_eq!(Token::Ident("\x7F\u{0080}\u{0081}\u{0082}\u{0083}\u{0084}\u{0085}\u{0086}\u{0087}\u{0088}\u{0089}\
         \u{008A}\u{008B}\u{008C}\u{008D}\u{008E}\u{008F}\u{0090}\u{0091}\u{0092}\u{0093}\u{0094}\u{0095}\u{0096}\
         \u{0097}\u{0098}\u{0099}\u{009A}\u{009B}\u{009C}\u{009D}\u{009E}\u{009F}".into()).to_css_string(),
         "\\7f \u{0080}\u{0081}\u{0082}\u{0083}\u{0084}\u{0085}\u{0086}\u{0087}\u{0088}\u{0089}\u{008A}\u{008B}\u{008C}\
         \u{008D}\u{008E}\u{008F}\u{0090}\u{0091}\u{0092}\u{0093}\u{0094}\u{0095}\u{0096}\u{0097}\u{0098}\u{0099}\
         \u{009A}\u{009B}\u{009C}\u{009D}\u{009E}\u{009F}");
-    assert_eq!(Token::Ident("\u{00A0}\u{00A1}\u{00A2}".into()).to_css_string(), "\u{00A0}\u{00A1}\u{00A2}");
-    assert_eq!(Token::Ident("a0123456789b".into()).to_css_string(), "a0123456789b");
-    assert_eq!(Token::Ident("abcdefghijklmnopqrstuvwxyz".into()).to_css_string(), "abcdefghijklmnopqrstuvwxyz");
-    assert_eq!(Token::Ident("ABCDEFGHIJKLMNOPQRSTUVWXYZ".into()).to_css_string(), "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
-    assert_eq!(Token::Ident("\x20\x21\x78\x79".into()).to_css_string(), "\\ \\!xy");
+    assert_eq!(
+        Token::Ident("\u{00A0}\u{00A1}\u{00A2}".into()).to_css_string(),
+        "\u{00A0}\u{00A1}\u{00A2}"
+    );
+    assert_eq!(
+        Token::Ident("a0123456789b".into()).to_css_string(),
+        "a0123456789b"
+    );
+    assert_eq!(
+        Token::Ident("abcdefghijklmnopqrstuvwxyz".into()).to_css_string(),
+        "abcdefghijklmnopqrstuvwxyz"
+    );
+    assert_eq!(
+        Token::Ident("ABCDEFGHIJKLMNOPQRSTUVWXYZ".into()).to_css_string(),
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    );
+    assert_eq!(
+        Token::Ident("\x20\x21\x78\x79".into()).to_css_string(),
+        "\\ \\!xy"
+    );
 
     // astral symbol (U+1D306 TETRAGRAM FOR CENTRE)
-    assert_eq!(Token::Ident("\u{1D306}".into()).to_css_string(), "\u{1D306}");
+    assert_eq!(
+        Token::Ident("\u{1D306}".into()).to_css_string(),
+        "\u{1D306}"
+    );
 }
 
 impl ToJson for Color {
     fn to_json(&self) -> json::Json {
         match *self {
-            Color::RGBA(ref rgba) => {
-                [rgba.red, rgba.green, rgba.blue, rgba.alpha].to_json()
-            },
+            Color::RGBA(ref rgba) => [rgba.red, rgba.green, rgba.blue, rgba.alpha].to_json(),
             Color::CurrentColor => "currentcolor".to_json(),
         }
     }
@@ -687,7 +815,7 @@ fn unquoted_url(b: &mut Bencher) {
         let mut input = Parser::new(&mut input);
         input.look_for_var_or_env_functions();
 
-        let result = input.try(|input| input.expect_url());
+        let result = input.try_parse(|input| input.expect_url());
 
         assert!(result.is_ok());
 
@@ -696,7 +824,6 @@ fn unquoted_url(b: &mut Bencher) {
     })
 }
 
-
 #[cfg(feature = "bench")]
 #[bench]
 fn numeric(b: &mut Bencher) {
@@ -720,15 +847,18 @@ fn no_stack_overflow_multiple_nested_blocks() {
     }
     let mut input = ParserInput::new(&input);
     let mut input = Parser::new(&mut input);
-    while let Ok(..) = input.next() { }
+    while let Ok(..) = input.next() {}
 }
 
 impl<'i> DeclarationParser<'i> for JsonParser {
     type Declaration = Json;
     type Error = ();
 
-    fn parse_value<'t>(&mut self, name: CowRcStr<'i>, input: &mut Parser<'i, 't>)
-                       -> Result<Json, ParseError<'i, ()>> {
+    fn parse_value<'t>(
+        &mut self,
+        name: CowRcStr<'i>,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<Json, ParseError<'i, ()>> {
         let mut value = vec![];
         let mut important = false;
         loop {
@@ -743,7 +873,7 @@ impl<'i> DeclarationParser<'i> for JsonParser {
                     if parse_important(input).is_ok() {
                         if input.is_exhausted() {
                             important = true;
-                            break
+                            break;
                         }
                     }
                     input.reset(&start);
@@ -751,15 +881,10 @@ impl<'i> DeclarationParser<'i> for JsonParser {
                 }
                 value.push(one_component_value_to_json(token, input));
             } else {
-                break
+                break;
             }
         }
-        Ok(JArray![
-            "declaration",
-            name,
-            value,
-            important,
-        ])
+        Ok(JArray!["declaration", name, value, important,])
     }
 }
 
@@ -769,8 +894,11 @@ impl<'i> AtRuleParser<'i> for JsonParser {
     type AtRule = Json;
     type Error = ();
 
-    fn parse_prelude<'t>(&mut self, name: CowRcStr<'i>, input: &mut Parser<'i, 't>)
-                         -> Result<AtRuleType<Vec<Json>, Vec<Json>>, ParseError<'i, ()>> {
+    fn parse_prelude<'t>(
+        &mut self,
+        name: CowRcStr<'i>,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<AtRuleType<Vec<Json>, Vec<Json>>, ParseError<'i, ()>> {
         let prelude = vec![
             "at-rule".to_json(),
             name.to_json(),
@@ -785,11 +913,7 @@ impl<'i> AtRuleParser<'i> for JsonParser {
         }
     }
 
-    fn rule_without_block(
-        &mut self,
-        mut prelude: Vec<Json>,
-        _location: SourceLocation,
-    ) -> Json {
+    fn rule_without_block(&mut self, mut prelude: Vec<Json>, _location: SourceLocation) -> Json {
         prelude.push(Json::Null);
         Json::Array(prelude)
     }
@@ -810,7 +934,10 @@ impl<'i> QualifiedRuleParser<'i> for JsonParser {
     type QualifiedRule = Json;
     type Error = ();
 
-    fn parse_prelude<'t>(&mut self, input: &mut Parser<'i, 't>) -> Result<Vec<Json>, ParseError<'i, ()>> {
+    fn parse_prelude<'t>(
+        &mut self,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<Vec<Json>, ParseError<'i, ()>> {
         Ok(component_values_to_json(input))
     }
 
@@ -843,16 +970,24 @@ fn one_component_value_to_json(token: Token, input: &mut Parser) -> Json {
                 value: value,
                 int_value: int_value,
                 has_sign: has_sign,
-            }.to_css_string().to_json(),
-            match int_value { Some(i) => i.to_json(), None => value.to_json() },
-            match int_value { Some(_) => "integer", None => "number" }.to_json()
+            }
+            .to_css_string()
+            .to_json(),
+            match int_value {
+                Some(i) => i.to_json(),
+                None => value.to_json(),
+            },
+            match int_value {
+                Some(_) => "integer",
+                None => "number",
+            }
+            .to_json(),
         ]
     }
 
     fn nested(input: &mut Parser) -> Vec<Json> {
-        let result: Result<_, ParseError<()>> = input.parse_nested_block(|input| {
-            Ok(component_values_to_json(input))
-        });
+        let result: Result<_, ParseError<()>> =
+            input.parse_nested_block(|input| Ok(component_values_to_json(input)));
         result.unwrap()
     }
 
@@ -866,17 +1001,30 @@ fn one_component_value_to_json(token: Token, input: &mut Parser) -> Json {
         Token::Delim('\\') => "\\".to_json(),
         Token::Delim(value) => value.to_string().to_json(),
 
-        Token::Number { value, int_value, has_sign } => Json::Array({
+        Token::Number {
+            value,
+            int_value,
+            has_sign,
+        } => Json::Array({
             let mut v = vec!["number".to_json()];
             v.extend(numeric(value, int_value, has_sign));
             v
         }),
-        Token::Percentage { unit_value, int_value, has_sign } => Json::Array({
+        Token::Percentage {
+            unit_value,
+            int_value,
+            has_sign,
+        } => Json::Array({
             let mut v = vec!["percentage".to_json()];
             v.extend(numeric(unit_value * 100., int_value, has_sign));
             v
         }),
-        Token::Dimension { value, int_value, has_sign, unit } => Json::Array({
+        Token::Dimension {
+            value,
+            int_value,
+            has_sign,
+            unit,
+        } => Json::Array({
             let mut v = vec!["dimension".to_json()];
             v.extend(numeric(value, int_value, has_sign));
             v.push(unit.to_json());
@@ -955,12 +1103,13 @@ fn parse_until_before_stops_at_delimiter_or_end_of_input() {
     // For all j and k, inputs[i].1[j] should parse the same as inputs[i].1[k]
     // when we use delimiters inputs[i].0.
     let inputs = vec![
-        (Delimiter::Bang | Delimiter::Semicolon,
-         // Note that the ';extra' is fine, because the ';' acts the same as
-         // the end of input.
-         vec!["token stream;extra", "token stream!", "token stream"]),
-        (Delimiter::Bang | Delimiter::Semicolon,
-         vec![";", "!", ""]),
+        (
+            Delimiter::Bang | Delimiter::Semicolon,
+            // Note that the ';extra' is fine, because the ';' acts the same as
+            // the end of input.
+            vec!["token stream;extra", "token stream!", "token stream"],
+        ),
+        (Delimiter::Bang | Delimiter::Semicolon, vec![";", "!", ""]),
     ];
     for equivalent in inputs {
         for (j, x) in equivalent.1.iter().enumerate() {
@@ -978,7 +1127,7 @@ fn parse_until_before_stops_at_delimiter_or_end_of_input() {
                             let oy = iy.next();
                             assert_eq!(ox, oy);
                             if let Err(_) = ox {
-                                break
+                                break;
                             }
                         }
                         Ok(())
@@ -1012,14 +1161,46 @@ fn parser_maintains_current_line() {
 fn parser_with_line_number_offset() {
     let mut input = ParserInput::new_with_line_number_offset("ident\nident", 72);
     let mut parser = Parser::new(&mut input);
-    assert_eq!(parser.current_source_location(), SourceLocation { line: 72, column: 1 });
-    assert_eq!(parser.next_including_whitespace_and_comments(), Ok(&Token::Ident("ident".into())));
-    assert_eq!(parser.current_source_location(), SourceLocation { line: 72, column: 6 });
-    assert_eq!(parser.next_including_whitespace_and_comments(),
-               Ok(&Token::WhiteSpace("\n".into())));
-    assert_eq!(parser.current_source_location(), SourceLocation { line: 73, column: 1 });
-    assert_eq!(parser.next_including_whitespace_and_comments(), Ok(&Token::Ident("ident".into())));
-    assert_eq!(parser.current_source_location(), SourceLocation { line: 73, column: 6 });
+    assert_eq!(
+        parser.current_source_location(),
+        SourceLocation {
+            line: 72,
+            column: 1
+        }
+    );
+    assert_eq!(
+        parser.next_including_whitespace_and_comments(),
+        Ok(&Token::Ident("ident".into()))
+    );
+    assert_eq!(
+        parser.current_source_location(),
+        SourceLocation {
+            line: 72,
+            column: 6
+        }
+    );
+    assert_eq!(
+        parser.next_including_whitespace_and_comments(),
+        Ok(&Token::WhiteSpace("\n".into()))
+    );
+    assert_eq!(
+        parser.current_source_location(),
+        SourceLocation {
+            line: 73,
+            column: 1
+        }
+    );
+    assert_eq!(
+        parser.next_including_whitespace_and_comments(),
+        Ok(&Token::Ident("ident".into()))
+    );
+    assert_eq!(
+        parser.current_source_location(),
+        SourceLocation {
+            line: 73,
+            column: 6
+        }
+    );
 }
 
 #[test]
@@ -1028,23 +1209,31 @@ fn cdc_regression_test() {
     let mut parser = Parser::new(&mut input);
     parser.skip_cdc_and_cdo();
     assert_eq!(parser.next(), Ok(&Token::Ident("x".into())));
-    assert_eq!(parser.next(), Err(BasicParseError {
-        kind: BasicParseErrorKind::EndOfInput,
-        location: SourceLocation { line: 0, column: 5 }
-    }));
+    assert_eq!(
+        parser.next(),
+        Err(BasicParseError {
+            kind: BasicParseErrorKind::EndOfInput,
+            location: SourceLocation { line: 0, column: 5 }
+        })
+    );
 }
 
 #[test]
 fn parse_entirely_reports_first_error() {
     #[derive(PartialEq, Debug)]
-    enum E { Foo }
+    enum E {
+        Foo,
+    }
     let mut input = ParserInput::new("ident");
     let mut parser = Parser::new(&mut input);
     let result: Result<(), _> = parser.parse_entirely(|p| Err(p.new_custom_error(E::Foo)));
-    assert_eq!(result, Err(ParseError {
-        kind: ParseErrorKind::Custom(E::Foo),
-        location: SourceLocation { line: 0, column: 1 },
-    }));
+    assert_eq!(
+        result,
+        Err(ParseError {
+            kind: ParseErrorKind::Custom(E::Foo),
+            location: SourceLocation { line: 0, column: 1 },
+        })
+    );
 }
 
 #[test]
@@ -1053,21 +1242,23 @@ fn parse_sourcemapping_comments() {
         ("/*# sourceMappingURL=here*/", Some("here")),
         ("/*# sourceMappingURL=here  */", Some("here")),
         ("/*@ sourceMappingURL=here*/", Some("here")),
-        ("/*@ sourceMappingURL=there*/ /*# sourceMappingURL=here*/", Some("here")),
+        (
+            "/*@ sourceMappingURL=there*/ /*# sourceMappingURL=here*/",
+            Some("here"),
+        ),
         ("/*# sourceMappingURL=here there  */", Some("here")),
         ("/*# sourceMappingURL=  here  */", Some("")),
         ("/*# sourceMappingURL=*/", Some("")),
         ("/*# sourceMappingUR=here  */", None),
         ("/*! sourceMappingURL=here  */", None),
         ("/*# sourceMappingURL = here  */", None),
-        ("/*   # sourceMappingURL=here   */", None)
+        ("/*   # sourceMappingURL=here   */", None),
     ];
 
     for test in tests {
         let mut input = ParserInput::new(test.0);
         let mut parser = Parser::new(&mut input);
-        while let Ok(_) = parser.next_including_whitespace() {
-        }
+        while let Ok(_) = parser.next_including_whitespace() {}
         assert_eq!(parser.current_source_map_url(), test.1);
     }
 }
@@ -1085,14 +1276,13 @@ fn parse_sourceurl_comments() {
         ("/*# sourceMappingUR=here  */", None),
         ("/*! sourceURL=here  */", None),
         ("/*# sourceURL = here  */", None),
-        ("/*   # sourceURL=here   */", None)
+        ("/*   # sourceURL=here   */", None),
     ];
 
     for test in tests {
         let mut input = ParserInput::new(test.0);
         let mut parser = Parser::new(&mut input);
-        while let Ok(_) = parser.next_including_whitespace() {
-        }
+        while let Ok(_) = parser.next_including_whitespace() {}
         assert_eq!(parser.current_source_url(), test.1);
     }
 }
@@ -1158,8 +1348,15 @@ fn utf16_columns() {
         // Read all tokens.
         loop {
             match parser.next() {
-                Err(BasicParseError { kind: BasicParseErrorKind::EndOfInput, .. }) => { break; }
-                Err(_) => { assert!(false); }
+                Err(BasicParseError {
+                    kind: BasicParseErrorKind::EndOfInput,
+                    ..
+                }) => {
+                    break;
+                }
+                Err(_) => {
+                    assert!(false);
+                }
                 Ok(_) => {}
             };
         }
diff --git a/third_party/rust/cssparser/src/tokenizer.rs b/third_party/rust/cssparser/src/tokenizer.rs
index 61c4fd80c0a6..00f0c933adc9 100644
--- a/third_party/rust/cssparser/src/tokenizer.rs
+++ b/third_party/rust/cssparser/src/tokenizer.rs
@@ -4,15 +4,13 @@
 
 // https://drafts.csswg.org/css-syntax/#tokenization
 
-use std::ops::Range;
 use std::char;
-#[allow(unused_imports)] use std::ascii::AsciiExt;
 use std::i32;
+use std::ops::Range;
 
-use parser::ParserState;
-use cow_rc_str::CowRcStr;
 use self::Token::*;
-
+use cow_rc_str::CowRcStr;
+use parser::ParserState;
 
 /// One of the pieces the CSS input is broken into.
 ///
@@ -20,7 +18,6 @@ use self::Token::*;
 /// and avoid allocating/copying when possible.
 #[derive(PartialEq, Debug, Clone)]
 pub enum Token<'a> {
-
     /// A [`<ident-token>`](https://drafts.csswg.org/css-syntax/#ident-token-diagram)
     Ident(CowRcStr<'a>),
 
@@ -37,7 +34,7 @@ pub enum Token<'a> {
     /// A [`<hash-token>`](https://drafts.csswg.org/css-syntax/#hash-token-diagram) with the type flag set to "id"
     ///
     /// The value does not include the `#` marker.
-    IDHash(CowRcStr<'a>),  // Hash that is a valid ID selector.
+    IDHash(CowRcStr<'a>), // Hash that is a valid ID selector.
 
     /// A [`<string-token>`](https://drafts.csswg.org/css-syntax/#string-token-diagram)
     ///
@@ -94,7 +91,7 @@ pub enum Token<'a> {
         int_value: Option<i32>,
 
         /// The unit, e.g. "px" in `12px`
-        unit: CowRcStr<'a>
+        unit: CowRcStr<'a>,
     },
 
     /// A [`<whitespace-token>`](https://drafts.csswg.org/css-syntax/#whitespace-token-diagram)
@@ -109,13 +106,13 @@ pub enum Token<'a> {
     Comment(&'a str),
 
     /// A `:` `<colon-token>`
-    Colon,  // :
+    Colon, // :
 
     /// A `;` `<semicolon-token>`
-    Semicolon,  // ;
+    Semicolon, // ;
 
     /// A `,` `<comma-token>`
-    Comma,  // ,
+    Comma, // ,
 
     /// A `~=` [`<include-match-token>`](https://drafts.csswg.org/css-syntax/#include-match-token-diagram)
     IncludeMatch,
@@ -181,7 +178,6 @@ pub enum Token<'a> {
     CloseCurlyBracket,
 }
 
-
 impl<'a> Token<'a> {
     /// Return whether this token represents a parse error.
     ///
@@ -197,7 +193,6 @@ impl<'a> Token<'a> {
     }
 }
 
-
 #[derive(Clone)]
 pub struct Tokenizer<'a> {
     input: &'a str,
@@ -220,7 +215,6 @@ enum SeenStatus {
     SeenAtLeastOne,
 }
 
-
 impl<'a> Tokenizer<'a> {
     #[inline]
     pub fn new(input: &str) -> Tokenizer {
@@ -255,9 +249,7 @@ impl<'a> Tokenizer<'a> {
     #[inline]
     pub fn see_function(&mut self, name: &str) {
         if self.var_or_env_functions == SeenStatus::LookingForThem {
-            if name.eq_ignore_ascii_case("var") ||
-                name.eq_ignore_ascii_case("env")
-            {
+            if name.eq_ignore_ascii_case("var") || name.eq_ignore_ascii_case("env") {
                 self.var_or_env_functions = SeenStatus::SeenAtLeastOne;
             }
         }
@@ -340,12 +332,16 @@ impl<'a> Tokenizer<'a> {
 
     // If false, `tokenizer.next_char()` will not panic.
     #[inline]
-    fn is_eof(&self) -> bool { !self.has_at_least(0) }
+    fn is_eof(&self) -> bool {
+        !self.has_at_least(0)
+    }
 
     // If true, the input has at least `n` bytes left *after* the current one.
     // That is, `tokenizer.char_at(n)` will not panic.
     #[inline]
-    fn has_at_least(&self, n: usize) -> bool { self.position + n < self.input.len() }
+    fn has_at_least(&self, n: usize) -> bool {
+        self.position + n < self.input.len()
+    }
 
     // Advance over N bytes in the input.  This function can advance
     // over ASCII bytes (excluding newlines), or UTF-8 sequence
@@ -367,7 +363,9 @@ impl<'a> Tokenizer<'a> {
 
     // Assumes non-EOF
     #[inline]
-    fn next_byte_unchecked(&self) -> u8 { self.byte_at(0) }
+    fn next_byte_unchecked(&self) -> u8 {
+        self.byte_at(0)
+    }
 
     #[inline]
     fn byte_at(&self, offset: usize) -> u8 {
@@ -435,8 +433,8 @@ impl<'a> Tokenizer<'a> {
 
     #[inline]
     fn has_newline_at(&self, offset: usize) -> bool {
-        self.position + offset < self.input.len() &&
-        matches!(self.byte_at(offset), b'\n' | b'\r' | b'\x0C')
+        self.position + offset < self.input.len()
+            && matches!(self.byte_at(offset), b'\n' | b'\r' | b'\x0C')
     }
 
     #[inline]
@@ -446,7 +444,9 @@ impl<'a> Tokenizer<'a> {
         self.position += len_utf8;
         // Note that due to the special case for the 4-byte sequence
         // intro, we must use wrapping add here.
-        self.current_line_start_position = self.current_line_start_position.wrapping_add(len_utf8 - c.len_utf16());
+        self.current_line_start_position = self
+            .current_line_start_position
+            .wrapping_add(len_utf8 - c.len_utf16());
         c
     }
 
@@ -520,7 +520,6 @@ impl<'a> Tokenizer<'a> {
 #[derive(PartialEq, Eq, PartialOrd, Ord, Debug, Clone, Copy)]
 pub struct SourcePosition(pub(crate) usize);
 
-
 /// The line and column number for a given position within the input.
 #[derive(PartialEq, Eq, Debug, Clone, Copy)]
 pub struct SourceLocation {
@@ -532,10 +531,9 @@ pub struct SourceLocation {
     pub column: u32,
 }
 
-
 fn next_token<'a>(tokenizer: &mut Tokenizer<'a>) -> Result<Token<'a>, ()> {
     if tokenizer.is_eof() {
-        return Err(())
+        return Err(());
     }
     let b = tokenizer.next_byte_unchecked();
     let token = match_byte! { b,
@@ -671,7 +669,6 @@ fn next_token<'a>(tokenizer: &mut Tokenizer<'a>) -> Result<Token<'a>, ()> {
     Ok(token)
 }
 
-
 fn consume_whitespace<'a>(tokenizer: &mut Tokenizer<'a>, newline: bool) -> Token<'a> {
     let start_position = tokenizer.position();
     if newline {
@@ -696,7 +693,6 @@ fn consume_whitespace<'a>(tokenizer: &mut Tokenizer<'a>, newline: bool) -> Token
     WhiteSpace(tokenizer.slice_from(start_position))
 }
 
-
 // Check for sourceMappingURL or sourceURL comments and update the
 // tokenizer appropriately.
 fn check_for_source_map<'a>(tokenizer: &mut Tokenizer<'a>, contents: &'a str) {
@@ -706,9 +702,9 @@ fn check_for_source_map<'a>(tokenizer: &mut Tokenizer<'a>, contents: &'a str) {
     // If there is a source map directive, extract the URL.
     if contents.starts_with(directive) || contents.starts_with(directive_old) {
         let contents = &contents[directive.len()..];
-        tokenizer.source_map_url = contents.split(|c| {
-            c == ' ' || c == '\t' || c == '\x0C' || c == '\r' || c == '\n'
-        }).next()
+        tokenizer.source_map_url = contents
+            .split(|c| c == ' ' || c == '\t' || c == '\x0C' || c == '\r' || c == '\n')
+            .next()
     }
 
     let directive = "# sourceURL=";
@@ -717,14 +713,14 @@ fn check_for_source_map<'a>(tokenizer: &mut Tokenizer<'a>, contents: &'a str) {
     // If there is a source map directive, extract the URL.
     if contents.starts_with(directive) || contents.starts_with(directive_old) {
         let contents = &contents[directive.len()..];
-        tokenizer.source_url = contents.split(|c| {
-            c == ' ' || c == '\t' || c == '\x0C' || c == '\r' || c == '\n'
-        }).next()
+        tokenizer.source_url = contents
+            .split(|c| c == ' ' || c == '\t' || c == '\x0C' || c == '\r' || c == '\n')
+            .next()
     }
 }
 
 fn consume_comment<'a>(tokenizer: &mut Tokenizer<'a>) -> &'a str {
-    tokenizer.advance(2);  // consume "/*"
+    tokenizer.advance(2); // consume "/*"
     let start_position = tokenizer.position();
     while !tokenizer.is_eof() {
         match_byte! { tokenizer.next_byte_unchecked(),
@@ -757,21 +753,22 @@ fn consume_comment<'a>(tokenizer: &mut Tokenizer<'a>) -> &'a str {
 fn consume_string<'a>(tokenizer: &mut Tokenizer<'a>, single_quote: bool) -> Token<'a> {
     match consume_quoted_string(tokenizer, single_quote) {
         Ok(value) => QuotedString(value),
-        Err(value) => BadString(value)
+        Err(value) => BadString(value),
     }
 }
 
-
 /// Return `Err(())` on syntax error (ie. unescaped newline)
-fn consume_quoted_string<'a>(tokenizer: &mut Tokenizer<'a>, single_quote: bool)
-                             -> Result<CowRcStr<'a>, CowRcStr<'a>> {
-    tokenizer.advance(1);  // Skip the initial quote
-    // start_pos is at code point boundary, after " or '
+fn consume_quoted_string<'a>(
+    tokenizer: &mut Tokenizer<'a>,
+    single_quote: bool,
+) -> Result<CowRcStr<'a>, CowRcStr<'a>> {
+    tokenizer.advance(1); // Skip the initial quote
+                          // start_pos is at code point boundary, after " or '
     let start_pos = tokenizer.position();
     let mut string_bytes;
     loop {
         if tokenizer.is_eof() {
-            return Ok(tokenizer.slice_from(start_pos).into())
+            return Ok(tokenizer.slice_from(start_pos).into());
         }
         match_byte! { tokenizer.next_byte_unchecked(),
             b'"' => {
@@ -869,30 +866,29 @@ fn consume_quoted_string<'a>(tokenizer: &mut Tokenizer<'a>, single_quote: bool)
 
     Ok(
         // string_bytes is well-formed UTF-8, see other comments.
-        unsafe { from_utf8_release_unchecked(string_bytes) }.into()
+        unsafe { from_utf8_release_unchecked(string_bytes) }.into(),
     )
 }
 
-
 #[inline]
 fn is_ident_start(tokenizer: &mut Tokenizer) -> bool {
-    !tokenizer.is_eof() && match_byte! { tokenizer.next_byte_unchecked(),
-        b'a'...b'z' | b'A'...b'Z' | b'_' | b'\0' => { true },
-        b'-' => {
-            tokenizer.has_at_least(1) && match_byte! { tokenizer.byte_at(1),
-                b'a'...b'z' | b'A'...b'Z' | b'-' | b'_' | b'\0' => {
-                    true
+    !tokenizer.is_eof()
+        && match_byte! { tokenizer.next_byte_unchecked(),
+            b'a'...b'z' | b'A'...b'Z' | b'_' | b'\0' => { true },
+            b'-' => {
+                tokenizer.has_at_least(1) && match_byte! { tokenizer.byte_at(1),
+                    b'a'...b'z' | b'A'...b'Z' | b'-' | b'_' | b'\0' => {
+                        true
+                    }
+                    b'\\' => { !tokenizer.has_newline_at(1) }
+                    b => { !b.is_ascii() },
                 }
-                b'\\' => { !tokenizer.has_newline_at(1) }
-                b => { !b.is_ascii() },
-            }
-        },
-        b'\\' => { !tokenizer.has_newline_at(1) },
-        b => { !b.is_ascii() },
-    }
+            },
+            b'\\' => { !tokenizer.has_newline_at(1) },
+            b => { !b.is_ascii() },
+        }
 }
 
-
 fn consume_ident_like<'a>(tokenizer: &mut Tokenizer<'a>) -> Token<'a> {
     let value = consume_name(tokenizer);
     if !tokenizer.is_eof() && tokenizer.next_byte_unchecked() == b'(' {
@@ -914,7 +910,7 @@ fn consume_name<'a>(tokenizer: &mut Tokenizer<'a>) -> CowRcStr<'a> {
     let mut value_bytes;
     loop {
         if tokenizer.is_eof() {
-            return tokenizer.slice_from(start_pos).into()
+            return tokenizer.slice_from(start_pos).into();
         }
         match_byte! { tokenizer.next_byte_unchecked(),
             b'a'...b'z' | b'A'...b'Z' | b'0'...b'9' | b'_' | b'-' => { tokenizer.advance(1) },
@@ -1019,37 +1015,37 @@ fn consume_numeric<'a>(tokenizer: &mut Tokenizer<'a>) -> Token<'a> {
         integral_part = integral_part * 10. + digit as f64;
         tokenizer.advance(1);
         if tokenizer.is_eof() {
-            break
+            break;
         }
     }
 
     let mut is_integer = true;
 
     let mut fractional_part: f64 = 0.;
-    if tokenizer.has_at_least(1) && tokenizer.next_byte_unchecked() == b'.'
-            && matches!(tokenizer.byte_at(1), b'0'...b'9') {
+    if tokenizer.has_at_least(1)
+        && tokenizer.next_byte_unchecked() == b'.'
+        && matches!(tokenizer.byte_at(1), b'0'...b'9')
+    {
         is_integer = false;
-        tokenizer.advance(1);  // Consume '.'
+        tokenizer.advance(1); // Consume '.'
         let mut factor = 0.1;
         while let Some(digit) = byte_to_decimal_digit(tokenizer.next_byte_unchecked()) {
             fractional_part += digit as f64 * factor;
             factor *= 0.1;
             tokenizer.advance(1);
             if tokenizer.is_eof() {
-                break
+                break;
             }
         }
     }
 
     let mut value = sign * (integral_part + fractional_part);
 
-    if tokenizer.has_at_least(1)
-       && matches!(tokenizer.next_byte_unchecked(), b'e' | b'E') {
-
-        if matches!(tokenizer.byte_at(1), b'0'...b'9') ||
-           (tokenizer.has_at_least(2)
-            && matches!(tokenizer.byte_at(1), b'+' | b'-')
-            && matches!(tokenizer.byte_at(2), b'0'...b'9'))
+    if tokenizer.has_at_least(1) && matches!(tokenizer.next_byte_unchecked(), b'e' | b'E') {
+        if matches!(tokenizer.byte_at(1), b'0'...b'9')
+            || (tokenizer.has_at_least(2)
+                && matches!(tokenizer.byte_at(1), b'+' | b'-')
+                && matches!(tokenizer.byte_at(2), b'0'...b'9'))
         {
             is_integer = false;
             tokenizer.advance(1);
@@ -1066,7 +1062,7 @@ fn consume_numeric<'a>(tokenizer: &mut Tokenizer<'a>) -> Token<'a> {
                 exponent = exponent * 10. + digit as f64;
                 tokenizer.advance(1);
                 if tokenizer.is_eof() {
-                    break
+                    break;
                 }
             }
             value *= f64::powf(10., sign * exponent);
@@ -1091,7 +1087,7 @@ fn consume_numeric<'a>(tokenizer: &mut Tokenizer<'a>) -> Token<'a> {
             unit_value: (value / 100.) as f32,
             int_value: int_value,
             has_sign: has_sign,
-        }
+        };
     }
     let value = value as f32;
     if is_ident_start(tokenizer) {
@@ -1111,7 +1107,6 @@ fn consume_numeric<'a>(tokenizer: &mut Tokenizer<'a>) -> Token<'a> {
     }
 }
 
-
 #[inline]
 unsafe fn from_utf8_release_unchecked(string_bytes: Vec<u8>) -> String {
     if cfg!(debug_assertions) {
@@ -1134,7 +1129,7 @@ fn consume_unquoted_url<'a>(tokenizer: &mut Tokenizer<'a>) -> Result<Token<'a>,
             Some(item) => item,
             None => {
                 tokenizer.position = tokenizer.input.len();
-                break
+                break;
             }
         };
         match_byte! { b,
@@ -1176,9 +1171,9 @@ fn consume_unquoted_url<'a>(tokenizer: &mut Tokenizer<'a>) -> Result<Token<'a>,
     if found_printable_char {
         // This function only consumed ASCII (whitespace) bytes,
         // so the current position is a code point boundary.
-        return Ok(consume_unquoted_url_internal(tokenizer))
+        return Ok(consume_unquoted_url_internal(tokenizer));
     } else {
-        return Ok(UnquotedUrl("".into()))
+        return Ok(UnquotedUrl("".into()));
     }
 
     fn consume_unquoted_url_internal<'a>(tokenizer: &mut Tokenizer<'a>) -> Token<'a> {
@@ -1187,7 +1182,7 @@ fn consume_unquoted_url<'a>(tokenizer: &mut Tokenizer<'a>) -> Result<Token<'a>,
         let mut string_bytes: Vec<u8>;
         loop {
             if tokenizer.is_eof() {
-                return UnquotedUrl(tokenizer.slice_from(start_pos).into())
+                return UnquotedUrl(tokenizer.slice_from(start_pos).into());
             }
             match_byte! { tokenizer.next_byte_unchecked(),
                 b' ' | b'\t' | b'\n' | b'\r' | b'\x0C' => {
@@ -1274,14 +1269,15 @@ fn consume_unquoted_url<'a>(tokenizer: &mut Tokenizer<'a>) -> Result<Token<'a>,
         }
         UnquotedUrl(
             // string_bytes is well-formed UTF-8, see other comments.
-            unsafe { from_utf8_release_unchecked(string_bytes) }.into()
+            unsafe { from_utf8_release_unchecked(string_bytes) }.into(),
         )
     }
 
-    fn consume_url_end<'a>(tokenizer: &mut Tokenizer<'a>,
-                           start_pos: SourcePosition,
-                           string: CowRcStr<'a>)
-                           -> Token<'a> {
+    fn consume_url_end<'a>(
+        tokenizer: &mut Tokenizer<'a>,
+        start_pos: SourcePosition,
+        string: CowRcStr<'a>,
+    ) -> Token<'a> {
         while !tokenizer.is_eof() {
             match_byte! { tokenizer.next_byte_unchecked(),
                 b')' => {
@@ -1339,24 +1335,29 @@ fn consume_hex_digits<'a>(tokenizer: &mut Tokenizer<'a>) -> (u32, u32) {
                 digits += 1;
                 tokenizer.advance(1);
             }
-            None => break
+            None => break,
         }
     }
     (value, digits)
 }
 
-
 // Same constraints as consume_escape except it writes into `bytes` the result
 // instead of returning it.
 fn consume_escape_and_write(tokenizer: &mut Tokenizer, bytes: &mut Vec<u8>) {
-    bytes.extend(consume_escape(tokenizer).encode_utf8(&mut [0; 4]).as_bytes())
+    bytes.extend(
+        consume_escape(tokenizer)
+            .encode_utf8(&mut [0; 4])
+            .as_bytes(),
+    )
 }
 
 // Assumes that the U+005C REVERSE SOLIDUS (\) has already been consumed
 // and that the next input character has already been verified
 // to not be a newline.
 fn consume_escape(tokenizer: &mut Tokenizer) -> char {
-    if tokenizer.is_eof() { return '\u{FFFD}' }  // Escaped EOF
+    if tokenizer.is_eof() {
+        return '\u{FFFD}';
+    } // Escaped EOF
     match_byte! { tokenizer.next_byte_unchecked(),
         b'0'...b'9' | b'A'...b'F' | b'a'...b'f' => {
             let (c, _) = consume_hex_digits(tokenizer);
diff --git a/third_party/rust/cssparser/src/unicode_range.rs b/third_party/rust/cssparser/src/unicode_range.rs
index 7b24d69672c1..f5325a0c9b99 100644
--- a/third_party/rust/cssparser/src/unicode_range.rs
+++ b/third_party/rust/cssparser/src/unicode_range.rs
@@ -4,10 +4,10 @@
 
 //! https://drafts.csswg.org/css-syntax/#urange
 
-use {Parser, ToCss, BasicParseError};
 use std::char;
 use std::fmt;
 use tokenizer::Token;
+use {BasicParseError, Parser, ToCss};
 
 /// One contiguous range of code points.
 ///
@@ -44,7 +44,10 @@ impl UnicodeRange {
 
         let range = match parse_concatenated(concatenated_tokens.as_bytes()) {
             Ok(range) => range,
-            Err(()) => return Err(input.new_basic_unexpected_token_error(Token::Ident(concatenated_tokens.into()))),
+            Err(()) => {
+                return Err(input
+                    .new_basic_unexpected_token_error(Token::Ident(concatenated_tokens.into())))
+            }
         };
         if range.end > char::MAX as u32 || range.start > range.end {
             Err(input.new_basic_unexpected_token_error(Token::Ident(concatenated_tokens.into())))
@@ -61,23 +64,21 @@ fn parse_tokens<'i, 't>(input: &mut Parser<'i, 't>) -> Result<(), BasicParseErro
             match input.next_including_whitespace()?.clone() {
                 Token::Ident(_) => {}
                 Token::Delim('?') => {}
-                t => return Err(input.new_basic_unexpected_token_error(t))
+                t => return Err(input.new_basic_unexpected_token_error(t)),
             }
             parse_question_marks(input)
         }
-        Token::Dimension { .. } => {
-            parse_question_marks(input)
-        }
+        Token::Dimension { .. } => parse_question_marks(input),
         Token::Number { .. } => {
             let after_number = input.state();
             match input.next_including_whitespace() {
                 Ok(&Token::Delim('?')) => parse_question_marks(input),
                 Ok(&Token::Dimension { .. }) => {}
                 Ok(&Token::Number { .. }) => {}
-                _ => input.reset(&after_number)
+                _ => input.reset(&after_number),
             }
         }
-        t => return Err(input.new_basic_unexpected_token_error(t))
+        t => return Err(input.new_basic_unexpected_token_error(t)),
     }
     Ok(())
 }
@@ -90,7 +91,7 @@ fn parse_question_marks(input: &mut Parser) {
             Ok(&Token::Delim('?')) => {}
             _ => {
                 input.reset(&start);
-                return
+                return;
             }
         }
     }
@@ -99,13 +100,13 @@ fn parse_question_marks(input: &mut Parser) {
 fn parse_concatenated(text: &[u8]) -> Result<UnicodeRange, ()> {
     let mut text = match text.split_first() {
         Some((&b'+', text)) => text,
-        _ => return Err(())
+        _ => return Err(()),
     };
     let (first_hex_value, hex_digit_count) = consume_hex(&mut text);
     let question_marks = consume_question_marks(&mut text);
     let consumed = hex_digit_count + question_marks;
     if consumed == 0 || consumed > 6 {
-        return Err(())
+        return Err(());
     }
 
     if question_marks > 0 {
@@ -113,13 +114,13 @@ fn parse_concatenated(text: &[u8]) -> Result<UnicodeRange, ()> {
             return Ok(UnicodeRange {
                 start: first_hex_value << (question_marks * 4),
                 end: ((first_hex_value + 1) << (question_marks * 4)) - 1,
-            })
+            });
         }
     } else if text.is_empty() {
         return Ok(UnicodeRange {
             start: first_hex_value,
             end: first_hex_value,
-        })
+        });
     } else {
         if let Some((&b'-', mut text)) = text.split_first() {
             let (second_hex_value, hex_digit_count) = consume_hex(&mut text);
@@ -127,7 +128,7 @@ fn parse_concatenated(text: &[u8]) -> Result<UnicodeRange, ()> {
                 return Ok(UnicodeRange {
                     start: first_hex_value,
                     end: second_hex_value,
-                })
+                });
             }
         }
     }
@@ -143,7 +144,7 @@ fn consume_hex(text: &mut &[u8]) -> (u32, usize) {
             digits += 1;
             *text = rest
         } else {
-            break
+            break;
         }
     }
     (value, digits)
@@ -165,7 +166,10 @@ impl fmt::Debug for UnicodeRange {
 }
 
 impl ToCss for UnicodeRange {
-    fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
+    fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+    where
+        W: fmt::Write,
+    {
         write!(dest, "U+{:X}", self.start)?;
         if self.end != self.start {
             write!(dest, "-{:X}", self.end)?;
diff --git a/third_party/rust/cstr-macros/.cargo-checksum.json b/third_party/rust/cstr-macros/.cargo-checksum.json
index f068dc386f7e..1f403a06046c 100644
--- a/third_party/rust/cstr-macros/.cargo-checksum.json
+++ b/third_party/rust/cstr-macros/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"517c9ae719b876cf67d9bd8dfec71d0b7a35ffe6e68668c35e21e2f6c3dfdc05","LICENSE":"2c6fc9268c3b765da5bf34fe4909425437f61be05674c2516c7f8cf1251c20aa","src/lib.rs":"71e7248b21b5e603e31060ecf241cf204efdfea5a0b400d084601f6c8bdfe11c"},"package":"0472c17c83d3ec1af32fb6ee2b3ad56ae0b6e69355d63d1d30602055c34324a8"}
\ No newline at end of file
+{"files":{"Cargo.toml":"ffb2762fc243053d72de4951cc9b0a10b3730bdd10dd14071d222caef198be0f","LICENSE":"2c6fc9268c3b765da5bf34fe4909425437f61be05674c2516c7f8cf1251c20aa","src/lib.rs":"b1de1d679338b008dd22e4aea5384f89d7a9424d65102b4fa536d8d9eaa56e22"},"package":"0f12dd847ec773fc98d75edba5394cb87d0f35e7ee548a4c81849ca6374b3d48"}
\ No newline at end of file
diff --git a/third_party/rust/cstr-macros/Cargo.toml b/third_party/rust/cstr-macros/Cargo.toml
index e61ef2528afb..d0dc36b9a659 100644
--- a/third_party/rust/cstr-macros/Cargo.toml
+++ b/third_party/rust/cstr-macros/Cargo.toml
@@ -12,7 +12,7 @@
 
 [package]
 name = "cstr-macros"
-version = "0.1.3"
+version = "0.1.5"
 authors = ["Xidorn Quan <me@upsuper.org>"]
 description = "Procedural macros for cstr"
 license = "MIT"
@@ -24,8 +24,8 @@ proc-macro = true
 version = "0.1"
 
 [dependencies.syn]
-version = "0.13"
+version = "0.15"
 features = ["derive", "parsing"]
 default-features = false
 [dev-dependencies.quote]
-version = "0.5"
+version = "0.6"
diff --git a/third_party/rust/cstr-macros/src/lib.rs b/third_party/rust/cstr-macros/src/lib.rs
index 9674a52d1eac..1c69f2f7b0d4 100644
--- a/third_party/rust/cstr-macros/src/lib.rs
+++ b/third_party/rust/cstr-macros/src/lib.rs
@@ -17,12 +17,19 @@ define_proc_macros! {
     }
 }
 
+fn input_to_string(input: &str) -> String {
+    if let Ok(s) = syn::parse_str::<syn::LitStr>(input) {
+        return s.value();
+    }
+    if let Ok(i) = syn::parse_str::<syn::Ident>(input) {
+        return i.to_string();
+    }
+    panic!("expected a string literal or an identifier, got {}", input)
+}
+
 fn build_bytes(input: &str) -> String {
-    let s = match syn::parse_str::<syn::LitStr>(input) {
-        Ok(s) => s,
-        _ => panic!("expected a string literal, got {}", input)
-    };
-    let cstr = match CString::new(s.value()) {
+    let s = input_to_string(input);
+    let cstr = match CString::new(s.as_bytes()) {
         Ok(s) => s,
         _ => panic!("literal must not contain NUL byte")
     };
@@ -54,6 +61,7 @@ mod tests {
         assert_eq!(build_bytes!("\t\n\r\"\\'"), result!(b"\t\n\r\"\\\'\0"));
         assert_eq!(build_bytes!("\x01\x02 \x7f"), result!(b"\x01\x02 \x7f\0"));
         assert_eq!(build_bytes!("你好"), result!(b"\xe4\xbd\xa0\xe5\xa5\xbd\0"));
+        assert_eq!(build_bytes!(foobar), result!(b"foobar\0"));
     }
 
     #[test]
diff --git a/third_party/rust/num-derive/.cargo-checksum.json b/third_party/rust/num-derive/.cargo-checksum.json
index 7748337cbf39..0f4ca6828888 100644
--- a/third_party/rust/num-derive/.cargo-checksum.json
+++ b/third_party/rust/num-derive/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"57dcf7e06d8a81aba6d207476e9d98b67ae1c626b42455d560ff4722bce331e9","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"5c81631711af54d31e40841cd0153a95d9e505d8eba7503d114789ffb5e232c6","RELEASES.md":"ddb394449b049aace6f20cab3d6ab1de0c82f100a0c778e9790817c544590df5","bors.toml":"1c81ede536a37edd30fe4e622ff0531b25372403ac9475a5d6c50f14156565a2","ci/rustup.sh":"8f58c563be0c200447d528c3b9db296db16ce198e26e872aee210174d4daf518","ci/test_full.sh":"aa3c9fd125f4befddbd109698a0bb3e078e37c092e3fd52029aadb036bd58d3f","src/lib.rs":"9e525516c4bdca62c486fe8d0ef5960e35ec2d7b49a8f2b7e12b9e0383909191","tests/empty_enum.rs":"1b2312ec2fc9866fce7172e71e0aa2efcc3cb9d7659d0b633eb352bb1e080d53","tests/issue-6.rs":"e8eaa07255f00d420eeb5fb64ebd872ba58235d1af6b1f806a6784e6de316459","tests/issue-9.rs":"f64454c4411b73f9257974caeb4561ccf7850d097d0b0177d841c88bb05eaa02","tests/num_derive_without_num.rs":"3ce528221a2cb752859e20c5423c4b474fec714b41d8c1b62f5614b165d7262b","tests/trivial.rs":"31eac2d8c99e3846cca072015e255c72fea4f80a6f5f235f9c7fd76e122656ce","tests/with_custom_values.rs":"3d692c9c5d570ccb2b8d79ce848812bd72fe01db6f564beedcc69176900ca804"},"package":"0d2c31b75c36a993d30c7a13d70513cb93f02acafdd5b7ba250f9b0e18615de7"}
\ No newline at end of file
+{"files":{"Cargo.toml":"24357f38521e03dbc562a42d44139d615a922406fb2bb122e17df29bc9bbb586","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"5c81631711af54d31e40841cd0153a95d9e505d8eba7503d114789ffb5e232c6","RELEASES.md":"62d6fef92273d9ee0e520ba611562b744e775318f5f6ae8e042ed94a3e19b2d6","build.rs":"16de2aa57e754fc1526d0400b5d87a3f771296705fca54601aa598b6f74ded8f","src/lib.rs":"5860c6007ea74b7b58033c15beae7c9e0859205e3ca1b76af9dc3e82914e08a2","tests/empty_enum.rs":"1b2312ec2fc9866fce7172e71e0aa2efcc3cb9d7659d0b633eb352bb1e080d53","tests/issue-6.rs":"b03b7382de854f30b84fd39d11b2c09aa97c136408942841cfc2c30c31b3f1a7","tests/issue-9.rs":"1aa7353078321a964c70986ceb071569290509b70faa9825e8b584165865ea7e","tests/newtype.rs":"1b60f13afbed8f18e94fe37141543d0c8d265419e1c2447b84ce14ac82af48e8","tests/num_derive_without_num.rs":"3ce528221a2cb752859e20c5423c4b474fec714b41d8c1b62f5614b165d7262b","tests/trivial.rs":"a6b0faab04527f6835f43cd72317a00065a7a6cf4c506d04e77f898134f7a59b","tests/with_custom_values.rs":"81ed60b50726555ee840ca773335aae68ac425d5af9ebbcbb3c6d6834358c73c"},"package":"eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2"}
\ No newline at end of file
diff --git a/third_party/rust/num-derive/Cargo.toml b/third_party/rust/num-derive/Cargo.toml
index 352e95d5feeb..f7c68ad2b3eb 100644
--- a/third_party/rust/num-derive/Cargo.toml
+++ b/third_party/rust/num-derive/Cargo.toml
@@ -3,7 +3,7 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
@@ -12,8 +12,10 @@
 
 [package]
 name = "num-derive"
-version = "0.2.2"
+version = "0.2.5"
 authors = ["The Rust Project Developers"]
+build = "build.rs"
+exclude = ["/ci/*", "/.travis.yml", "/bors.toml"]
 description = "Numeric syntax extensions"
 homepage = "https://github.com/rust-num/num-derive"
 documentation = "https://docs.rs/num-derive"
@@ -27,9 +29,6 @@ repository = "https://github.com/rust-num/num-derive"
 name = "num_derive"
 test = false
 proc-macro = true
-[dependencies.num-traits]
-version = "0.2"
-
 [dependencies.proc-macro2]
 version = "0.4.2"
 
@@ -37,9 +36,12 @@ version = "0.4.2"
 version = "0.6"
 
 [dependencies.syn]
-version = "0.14"
+version = "0.15"
 [dev-dependencies.num]
-version = "0.1"
+version = "0.2"
+
+[dev-dependencies.num-traits]
+version = "0.2"
 
 [features]
 full-syntax = ["syn/full"]
diff --git a/third_party/rust/num-derive/RELEASES.md b/third_party/rust/num-derive/RELEASES.md
index a2b371ec9afa..151548eb68ac 100644
--- a/third_party/rust/num-derive/RELEASES.md
+++ b/third_party/rust/num-derive/RELEASES.md
@@ -1,16 +1,36 @@
-# Release 0.2.2
+# Release 0.2.5 (2019-04-23)
+
+- [Improved the masking of lints in derived code][23].
+
+[23]: https://github.com/rust-num/num-derive/pull/23
+
+# Release 0.2.4 (2019-01-25)
+
+- [Adjusted dependencies to allow no-std targets][22].
+
+[22]: https://github.com/rust-num/num-derive/pull/22
+
+# Release 0.2.3 (2018-10-03)
+
+- [Added newtype deriving][17] for `FromPrimitive`, `ToPrimitive`,
+  `NumOps<Self, Self>`, `NumCast`, `Zero`, `One`, `Num`, and `Float`.
+  Thanks @asayers!
+
+[17]: https://github.com/rust-num/num-derive/pull/17
+
+# Release 0.2.2 (2018-05-22)
 
 - [Updated dependencies][14].
 
 [14]: https://github.com/rust-num/num-derive/pull/14
 
-# Release 0.2.1
+# Release 0.2.1 (2018-05-09)
 
 - [Updated dependencies][12] -- thanks @spearman!
 
 [12]: https://github.com/rust-num/num-derive/pull/12
 
-# Release 0.2.0
+# Release 0.2.0 (2018-02-21)
 
 - [Discriminant matching is now simplified][10], casting values directly by
   name, rather than trying to compute offsets from known values manually.
@@ -22,7 +42,7 @@
 [11]: https://github.com/rust-num/num-derive/pull/11
 
 
-# Release 0.1.44
+# Release 0.1.44 (2018-01-26)
 
 - [The derived code now explicitly allows `unused_qualifications`][9], so users
   that globally deny that lint don't encounter an error.
@@ -30,7 +50,7 @@
 [9]: https://github.com/rust-num/num-derive/pull/9
 
 
-# Release 0.1.43
+# Release 0.1.43 (2018-01-23)
 
 - [The derived code now explicitly allows `trivial_numeric_casts`][7], so users
   that globally deny that lint don't encounter an error.
@@ -38,7 +58,7 @@
 [7]: https://github.com/rust-num/num-derive/pull/7
 
 
-# Release 0.1.42
+# Release 0.1.42 (2018-01-22)
 
 - [num-derive now has its own source repository][num-356] at [rust-num/num-derive][home].
 - [The derivation macros have been updated][3] to using `syn` 0.12.  Support for complex
diff --git a/third_party/rust/num-derive/bors.toml b/third_party/rust/num-derive/bors.toml
deleted file mode 100644
index ca08e818bf3e..000000000000
--- a/third_party/rust/num-derive/bors.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-status = [
-  "continuous-integration/travis-ci/push",
-]
diff --git a/third_party/rust/num-derive/build.rs b/third_party/rust/num-derive/build.rs
new file mode 100644
index 000000000000..fd60866558c3
--- /dev/null
+++ b/third_party/rust/num-derive/build.rs
@@ -0,0 +1,35 @@
+use std::env;
+use std::io::Write;
+use std::process::{Command, Stdio};
+
+fn main() {
+    if probe("fn main() { 0i128; }") {
+        println!("cargo:rustc-cfg=has_i128");
+    } else if env::var_os("CARGO_FEATURE_I128").is_some() {
+        panic!("i128 support was not detected!");
+    }
+}
+
+/// Test if a code snippet can be compiled
+fn probe(code: &str) -> bool {
+    let rustc = env::var_os("RUSTC").unwrap_or_else(|| "rustc".into());
+    let out_dir = env::var_os("OUT_DIR").expect("environment variable OUT_DIR");
+
+    let mut child = Command::new(rustc)
+        .arg("--out-dir")
+        .arg(out_dir)
+        .arg("--emit=obj")
+        .arg("-")
+        .stdin(Stdio::piped())
+        .spawn()
+        .expect("rustc probe");
+
+    child
+        .stdin
+        .as_mut()
+        .expect("rustc stdin")
+        .write_all(code.as_bytes())
+        .expect("write rustc stdin");
+
+    child.wait().expect("rustc probe").success()
+}
diff --git a/third_party/rust/num-derive/ci/rustup.sh b/third_party/rust/num-derive/ci/rustup.sh
deleted file mode 100755
index dc1aa141b0ed..000000000000
--- a/third_party/rust/num-derive/ci/rustup.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# Use rustup to locally run the same suite of tests as .travis.yml.
-# (You should first install/update 1.15.0, stable, beta, and nightly.)
-
-set -ex
-
-export TRAVIS_RUST_VERSION
-for TRAVIS_RUST_VERSION in 1.15.0 stable beta nightly; do
-    run="rustup run $TRAVIS_RUST_VERSION"
-    $run cargo build --verbose
-    $run $PWD/ci/test_full.sh
-done
diff --git a/third_party/rust/num-derive/ci/test_full.sh b/third_party/rust/num-derive/ci/test_full.sh
deleted file mode 100755
index 32b6c5f65c4d..000000000000
--- a/third_party/rust/num-derive/ci/test_full.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-echo Testing num-derive on rustc ${TRAVIS_RUST_VERSION}
-
-# num-derive should build and test everywhere.
-cargo build --verbose --features="$FEATURES"
-cargo test --verbose --features="$FEATURES"
diff --git a/third_party/rust/num-derive/src/lib.rs b/third_party/rust/num-derive/src/lib.rs
index 0d56fe3386e2..ea53b70c5695 100644
--- a/third_party/rust/num-derive/src/lib.rs
+++ b/third_party/rust/num-derive/src/lib.rs
@@ -10,6 +10,7 @@
 
 #![crate_type = "proc-macro"]
 #![doc(html_root_url = "https://docs.rs/num-derive/0.2")]
+#![recursion_limit = "512"]
 
 //! Procedural macros to derive numeric traits in Rust.
 //!
@@ -50,7 +51,79 @@ use proc_macro2::Span;
 
 use syn::{Data, Fields, Ident};
 
-/// Derives [`num_traits::FromPrimitive`][from] for simple enums.
+// Within `exp`, you can bring things into scope with `extern crate`.
+//
+// We don't want to assume that `num_traits::` is in scope - the user may have imported it under a
+// different name, or may have imported it in a non-toplevel module (common when putting impls
+// behind a feature gate).
+//
+// Solution: let's just generate `extern crate num_traits as _num_traits` and then refer to
+// `_num_traits` in the derived code.  However, macros are not allowed to produce `extern crate`
+// statements at the toplevel.
+//
+// Solution: let's generate `mod _impl_foo` and import num_traits within that.  However, now we
+// lose access to private members of the surrounding module.  This is a problem if, for example,
+// we're deriving for a newtype, where the inner type is defined in the same module, but not
+// exported.
+//
+// Solution: use the dummy const trick.  For some reason, `extern crate` statements are allowed
+// here, but everything from the surrounding module is in scope.  This trick is taken from serde.
+fn dummy_const_trick<T: quote::ToTokens>(
+    trait_: &str,
+    name: &proc_macro2::Ident,
+    exp: T,
+) -> proc_macro2::TokenStream {
+    let dummy_const = Ident::new(
+        &format!("_IMPL_NUM_{}_FOR_{}", trait_, unraw(name)),
+        Span::call_site(),
+    );
+    quote! {
+        #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
+        const #dummy_const: () = {
+            #[allow(unknown_lints)]
+            #[cfg_attr(feature = "cargo-clippy", allow(useless_attribute))]
+            #[allow(rust_2018_idioms)]
+            extern crate num_traits as _num_traits;
+            #exp
+        };
+    }
+}
+
+#[allow(deprecated)]
+fn unraw(ident: &proc_macro2::Ident) -> String {
+    // str::trim_start_matches was added in 1.30, trim_left_matches deprecated
+    // in 1.33. We currently support rustc back to 1.15 so we need to continue
+    // to use the deprecated one.
+    ident.to_string().trim_left_matches("r#").to_owned()
+}
+
+// If `data` is a newtype, return the type it's wrapping.
+fn newtype_inner(data: &syn::Data) -> Option<syn::Type> {
+    match *data {
+        Data::Struct(ref s) => {
+            match s.fields {
+                Fields::Unnamed(ref fs) => {
+                    if fs.unnamed.len() == 1 {
+                        Some(fs.unnamed[0].ty.clone())
+                    } else {
+                        None
+                    }
+                }
+                Fields::Named(ref fs) => {
+                    if fs.named.len() == 1 {
+                        panic!("num-derive doesn't know how to handle newtypes with named fields yet. \
+                           Please use a tuple-style newtype, or submit a PR!");
+                    }
+                    None
+                }
+                _ => None,
+            }
+        }
+        _ => None,
+    }
+}
+
+/// Derives [`num_traits::FromPrimitive`][from] for simple enums and newtypes.
 ///
 /// [from]: https://docs.rs/num-traits/0.2/num_traits/cast/trait.FromPrimitive.html
 ///
@@ -102,40 +175,100 @@ use syn::{Data, Fields, Ident};
 pub fn from_primitive(input: TokenStream) -> TokenStream {
     let ast: syn::DeriveInput = syn::parse(input).unwrap();
     let name = &ast.ident;
-    let dummy_const = Ident::new(&format!("_IMPL_NUM_FROM_PRIMITIVE_FOR_{}", name), Span::call_site());
-
-    let variants = match ast.data {
-        Data::Enum(ref data_enum) => &data_enum.variants,
-        _ => panic!("`FromPrimitive` can be applied only to the enums, {} is not an enum", name)
-    };
-
-    let from_i64_var = quote! { n };
-    let clauses: Vec<_> = variants.iter()
-        .map(|variant| {
-            let ident = &variant.ident;
-            match variant.fields {
-                Fields::Unit => (),
-                _ => {
-                    panic!("`FromPrimitive` can be applied only to unitary enums, {}::{} is either struct or tuple", name, ident)
-                },
-            }
 
+    let impl_ = if let Some(inner_ty) = newtype_inner(&ast.data) {
+        let i128_fns = if cfg!(has_i128) {
             quote! {
-                if #from_i64_var == #name::#ident as i64 {
-                    Some(#name::#ident)
+                fn from_i128(n: i128) -> Option<Self> {
+                    <#inner_ty as _num_traits::FromPrimitive>::from_i128(n).map(#name)
+                }
+                fn from_u128(n: u128) -> Option<Self> {
+                    <#inner_ty as _num_traits::FromPrimitive>::from_u128(n).map(#name)
                 }
             }
-        })
-        .collect();
+        } else {
+            quote! {}
+        };
 
-    let from_i64_var = if clauses.is_empty() { quote!(_) } else { from_i64_var };
+        quote! {
+            impl _num_traits::FromPrimitive for #name {
+                fn from_i64(n: i64) -> Option<Self> {
+                    <#inner_ty as _num_traits::FromPrimitive>::from_i64(n).map(#name)
+                }
+                fn from_u64(n: u64) -> Option<Self> {
+                    <#inner_ty as _num_traits::FromPrimitive>::from_u64(n).map(#name)
+                }
+                fn from_isize(n: isize) -> Option<Self> {
+                    <#inner_ty as _num_traits::FromPrimitive>::from_isize(n).map(#name)
+                }
+                fn from_i8(n: i8) -> Option<Self> {
+                    <#inner_ty as _num_traits::FromPrimitive>::from_i8(n).map(#name)
+                }
+                fn from_i16(n: i16) -> Option<Self> {
+                    <#inner_ty as _num_traits::FromPrimitive>::from_i16(n).map(#name)
+                }
+                fn from_i32(n: i32) -> Option<Self> {
+                    <#inner_ty as _num_traits::FromPrimitive>::from_i32(n).map(#name)
+                }
+                fn from_usize(n: usize) -> Option<Self> {
+                    <#inner_ty as _num_traits::FromPrimitive>::from_usize(n).map(#name)
+                }
+                fn from_u8(n: u8) -> Option<Self> {
+                    <#inner_ty as _num_traits::FromPrimitive>::from_u8(n).map(#name)
+                }
+                fn from_u16(n: u16) -> Option<Self> {
+                    <#inner_ty as _num_traits::FromPrimitive>::from_u16(n).map(#name)
+                }
+                fn from_u32(n: u32) -> Option<Self> {
+                    <#inner_ty as _num_traits::FromPrimitive>::from_u32(n).map(#name)
+                }
+                fn from_f32(n: f32) -> Option<Self> {
+                    <#inner_ty as _num_traits::FromPrimitive>::from_f32(n).map(#name)
+                }
+                fn from_f64(n: f64) -> Option<Self> {
+                    <#inner_ty as _num_traits::FromPrimitive>::from_f64(n).map(#name)
+                }
+                #i128_fns
+            }
+        }
+    } else {
+        let variants = match ast.data {
+            Data::Enum(ref data_enum) => &data_enum.variants,
+            _ => panic!(
+                "`FromPrimitive` can be applied only to enums and newtypes, {} is neither",
+                name
+            ),
+        };
 
-    let res = quote! {
-        #[allow(non_upper_case_globals)]
-        #[allow(unused_qualifications)]
-        const #dummy_const: () = {
-            extern crate num_traits as _num_traits;
+        let from_i64_var = quote! { n };
+        let clauses: Vec<_> = variants
+            .iter()
+            .map(|variant| {
+                let ident = &variant.ident;
+                match variant.fields {
+                    Fields::Unit => (),
+                    _ => panic!(
+                        "`FromPrimitive` can be applied only to unitary enums and newtypes, \
+                         {}::{} is either struct or tuple",
+                        name, ident
+                    ),
+                }
 
+                quote! {
+                    if #from_i64_var == #name::#ident as i64 {
+                        Some(#name::#ident)
+                    }
+                }
+            })
+            .collect();
+
+        let from_i64_var = if clauses.is_empty() {
+            quote!(_)
+        } else {
+            from_i64_var
+        };
+
+        quote! {
             impl _num_traits::FromPrimitive for #name {
                 #[allow(trivial_numeric_casts)]
                 fn from_i64(#from_i64_var: i64) -> Option<Self> {
@@ -148,13 +281,13 @@ pub fn from_primitive(input: TokenStream) -> TokenStream {
                     Self::from_i64(n as i64)
                 }
             }
-        };
+        }
     };
 
-    res.into()
+    dummy_const_trick("FromPrimitive", &name, impl_).into()
 }
 
-/// Derives [`num_traits::ToPrimitive`][to] for simple enums.
+/// Derives [`num_traits::ToPrimitive`][to] for simple enums and newtypes.
 ///
 /// [to]: https://docs.rs/num-traits/0.2/num_traits/cast/trait.ToPrimitive.html
 ///
@@ -206,49 +339,103 @@ pub fn from_primitive(input: TokenStream) -> TokenStream {
 pub fn to_primitive(input: TokenStream) -> TokenStream {
     let ast: syn::DeriveInput = syn::parse(input).unwrap();
     let name = &ast.ident;
-    let dummy_const = Ident::new(&format!("_IMPL_NUM_TO_PRIMITIVE_FOR_{}", name), Span::call_site());
 
-    let variants = match ast.data {
-        Data::Enum(ref data_enum) => &data_enum.variants,
-        _ => panic!("`ToPrimitive` can be applied only to the enums, {} is not an enum", name)
-    };
-
-    let variants: Vec<_> = variants.iter()
-        .map(|variant| {
-            let ident = &variant.ident;
-            match variant.fields {
-                Fields::Unit => (),
-                _ => {
-                    panic!("`ToPrimitive` can be applied only to unitary enums, {}::{} is either struct or tuple", name, ident)
-                },
+    let impl_ = if let Some(inner_ty) = newtype_inner(&ast.data) {
+        let i128_fns = if cfg!(has_i128) {
+            quote! {
+                fn to_i128(&self) -> Option<i128> {
+                    <#inner_ty as _num_traits::ToPrimitive>::to_i128(&self.0)
+                }
+                fn to_u128(&self) -> Option<u128> {
+                    <#inner_ty as _num_traits::ToPrimitive>::to_u128(&self.0)
+                }
             }
+        } else {
+            quote! {}
+        };
 
-            // NB: We have to check each variant individually, because we'll only have `&self`
-            // for the input.  We can't move from that, and it might not be `Clone` or `Copy`.
-            // (Otherwise we could just do `*self as i64` without a `match` at all.)
-            quote!(#name::#ident => #name::#ident as i64)
-        })
-        .collect();
-
-    let match_expr = if variants.is_empty() {
-        // No variants found, so do not use Some to not to trigger `unreachable_code` lint
         quote! {
-            match *self {}
+            impl _num_traits::ToPrimitive for #name {
+                fn to_i64(&self) -> Option<i64> {
+                    <#inner_ty as _num_traits::ToPrimitive>::to_i64(&self.0)
+                }
+                fn to_u64(&self) -> Option<u64> {
+                    <#inner_ty as _num_traits::ToPrimitive>::to_u64(&self.0)
+                }
+                fn to_isize(&self) -> Option<isize> {
+                    <#inner_ty as _num_traits::ToPrimitive>::to_isize(&self.0)
+                }
+                fn to_i8(&self) -> Option<i8> {
+                    <#inner_ty as _num_traits::ToPrimitive>::to_i8(&self.0)
+                }
+                fn to_i16(&self) -> Option<i16> {
+                    <#inner_ty as _num_traits::ToPrimitive>::to_i16(&self.0)
+                }
+                fn to_i32(&self) -> Option<i32> {
+                    <#inner_ty as _num_traits::ToPrimitive>::to_i32(&self.0)
+                }
+                fn to_usize(&self) -> Option<usize> {
+                    <#inner_ty as _num_traits::ToPrimitive>::to_usize(&self.0)
+                }
+                fn to_u8(&self) -> Option<u8> {
+                    <#inner_ty as _num_traits::ToPrimitive>::to_u8(&self.0)
+                }
+                fn to_u16(&self) -> Option<u16> {
+                    <#inner_ty as _num_traits::ToPrimitive>::to_u16(&self.0)
+                }
+                fn to_u32(&self) -> Option<u32> {
+                    <#inner_ty as _num_traits::ToPrimitive>::to_u32(&self.0)
+                }
+                fn to_f32(&self) -> Option<f32> {
+                    <#inner_ty as _num_traits::ToPrimitive>::to_f32(&self.0)
+                }
+                fn to_f64(&self) -> Option<f64> {
+                    <#inner_ty as _num_traits::ToPrimitive>::to_f64(&self.0)
+                }
+                #i128_fns
+            }
         }
     } else {
-        quote! {
-            Some(match *self {
-                #(#variants,)*
+        let variants = match ast.data {
+            Data::Enum(ref data_enum) => &data_enum.variants,
+            _ => panic!(
+                "`ToPrimitive` can be applied only to enums and newtypes, {} is neither",
+                name
+            ),
+        };
+
+        let variants: Vec<_> = variants
+            .iter()
+            .map(|variant| {
+                let ident = &variant.ident;
+                match variant.fields {
+                    Fields::Unit => (),
+                    _ => {
+                        panic!("`ToPrimitive` can be applied only to unitary enums and newtypes, {}::{} is either struct or tuple", name, ident)
+                    },
+                }
+
+                // NB: We have to check each variant individually, because we'll only have `&self`
+                // for the input.  We can't move from that, and it might not be `Clone` or `Copy`.
+                // (Otherwise we could just do `*self as i64` without a `match` at all.)
+                quote!(#name::#ident => #name::#ident as i64)
             })
-        }
-    };
+            .collect();
 
-    let res = quote! {
-        #[allow(non_upper_case_globals)]
-        #[allow(unused_qualifications)]
-        const #dummy_const: () = {
-            extern crate num_traits as _num_traits;
+        let match_expr = if variants.is_empty() {
+            // No variants found, so do not use Some to not to trigger `unreachable_code` lint
+            quote! {
+                match *self {}
+            }
+        } else {
+            quote! {
+                Some(match *self {
+                    #(#variants,)*
+                })
+            }
+        };
 
+        quote! {
             impl _num_traits::ToPrimitive for #name {
                 #[allow(trivial_numeric_casts)]
                 fn to_i64(&self) -> Option<i64> {
@@ -259,8 +446,352 @@ pub fn to_primitive(input: TokenStream) -> TokenStream {
                     self.to_i64().map(|x| x as u64)
                 }
             }
-        };
+        }
     };
 
-    res.into()
+    dummy_const_trick("ToPrimitive", &name, impl_).into()
+}
+
+#[allow(renamed_and_removed_lints)]
+#[cfg_attr(feature = "cargo-clippy", allow(const_static_lifetime))]
+const NEWTYPE_ONLY: &'static str = "This trait can only be derived for newtypes";
+
+/// Derives [`num_traits::NumOps`][num_ops] for newtypes.  The inner type must already implement
+/// `NumOps`.
+///
+/// [num_ops]: https://docs.rs/num-traits/0.2/num_traits/trait.NumOps.html
+///
+/// Note that, since `NumOps` is really a trait alias for `Add + Sub + Mul + Div + Rem`, this macro
+/// generates impls for _those_ traits.  Furthermore, in all generated impls, `RHS=Self` and
+/// `Output=Self`.
+#[proc_macro_derive(NumOps)]
+pub fn num_ops(input: TokenStream) -> TokenStream {
+    let ast: syn::DeriveInput = syn::parse(input).unwrap();
+    let name = &ast.ident;
+    let inner_ty = newtype_inner(&ast.data).expect(NEWTYPE_ONLY);
+    dummy_const_trick(
+        "NumOps",
+        &name,
+        quote! {
+            impl ::std::ops::Add for #name {
+                type Output = Self;
+                fn add(self, other: Self) -> Self {
+                    #name(<#inner_ty as ::std::ops::Add>::add(self.0, other.0))
+                }
+            }
+            impl ::std::ops::Sub for #name {
+                type Output = Self;
+                fn sub(self, other: Self) -> Self {
+                    #name(<#inner_ty as ::std::ops::Sub>::sub(self.0, other.0))
+                }
+            }
+            impl ::std::ops::Mul for #name {
+                type Output = Self;
+                fn mul(self, other: Self) -> Self {
+                    #name(<#inner_ty as ::std::ops::Mul>::mul(self.0, other.0))
+                }
+            }
+            impl ::std::ops::Div for #name {
+                type Output = Self;
+                fn div(self, other: Self) -> Self {
+                    #name(<#inner_ty as ::std::ops::Div>::div(self.0, other.0))
+                }
+            }
+            impl ::std::ops::Rem for #name {
+                type Output = Self;
+                fn rem(self, other: Self) -> Self {
+                    #name(<#inner_ty as ::std::ops::Rem>::rem(self.0, other.0))
+                }
+            }
+        },
+    )
+    .into()
+}
+
+/// Derives [`num_traits::NumCast`][num_cast] for newtypes.  The inner type must already implement
+/// `NumCast`.
+///
+/// [num_cast]: https://docs.rs/num-traits/0.2/num_traits/cast/trait.NumCast.html
+#[proc_macro_derive(NumCast)]
+pub fn num_cast(input: TokenStream) -> TokenStream {
+    let ast: syn::DeriveInput = syn::parse(input).unwrap();
+    let name = &ast.ident;
+    let inner_ty = newtype_inner(&ast.data).expect(NEWTYPE_ONLY);
+    dummy_const_trick(
+        "NumCast",
+        &name,
+        quote! {
+            impl _num_traits::NumCast for #name {
+                fn from<T: _num_traits::ToPrimitive>(n: T) -> Option<Self> {
+                    <#inner_ty as _num_traits::NumCast>::from(n).map(#name)
+                }
+            }
+        },
+    )
+    .into()
+}
+
+/// Derives [`num_traits::Zero`][zero] for newtypes.  The inner type must already implement `Zero`.
+///
+/// [zero]: https://docs.rs/num-traits/0.2/num_traits/identities/trait.Zero.html
+#[proc_macro_derive(Zero)]
+pub fn zero(input: TokenStream) -> TokenStream {
+    let ast: syn::DeriveInput = syn::parse(input).unwrap();
+    let name = &ast.ident;
+    let inner_ty = newtype_inner(&ast.data).expect(NEWTYPE_ONLY);
+    dummy_const_trick(
+        "Zero",
+        &name,
+        quote! {
+            impl _num_traits::Zero for #name {
+                fn zero() -> Self {
+                    #name(<#inner_ty as _num_traits::Zero>::zero())
+                }
+                fn is_zero(&self) -> bool {
+                    <#inner_ty as _num_traits::Zero>::is_zero(&self.0)
+                }
+            }
+        },
+    )
+    .into()
+}
+
+/// Derives [`num_traits::One`][one] for newtypes.  The inner type must already implement `One`.
+///
+/// [one]: https://docs.rs/num-traits/0.2/num_traits/identities/trait.One.html
+#[proc_macro_derive(One)]
+pub fn one(input: TokenStream) -> TokenStream {
+    let ast: syn::DeriveInput = syn::parse(input).unwrap();
+    let name = &ast.ident;
+    let inner_ty = newtype_inner(&ast.data).expect(NEWTYPE_ONLY);
+    dummy_const_trick(
+        "One",
+        &name,
+        quote! {
+            impl _num_traits::One for #name {
+                fn one() -> Self {
+                    #name(<#inner_ty as _num_traits::One>::one())
+                }
+                fn is_one(&self) -> bool {
+                    <#inner_ty as _num_traits::One>::is_one(&self.0)
+                }
+            }
+        },
+    )
+    .into()
+}
+
+/// Derives [`num_traits::Num`][num] for newtypes.  The inner type must already implement `Num`.
+///
+/// [num]: https://docs.rs/num-traits/0.2/num_traits/trait.Num.html
+#[proc_macro_derive(Num)]
+pub fn num(input: TokenStream) -> TokenStream {
+    let ast: syn::DeriveInput = syn::parse(input).unwrap();
+    let name = &ast.ident;
+    let inner_ty = newtype_inner(&ast.data).expect(NEWTYPE_ONLY);
+    dummy_const_trick(
+        "Num",
+        &name,
+        quote! {
+            impl _num_traits::Num for #name {
+                type FromStrRadixErr = <#inner_ty as _num_traits::Num>::FromStrRadixErr;
+                fn from_str_radix(s: &str, radix: u32) -> Result<Self, Self::FromStrRadixErr> {
+                    <#inner_ty as _num_traits::Num>::from_str_radix(s, radix).map(#name)
+                }
+            }
+        },
+    )
+    .into()
+}
+
+/// Derives [`num_traits::Float`][float] for newtypes.  The inner type must already implement
+/// `Float`.
+///
+/// [float]: https://docs.rs/num-traits/0.2/num_traits/float/trait.Float.html
+#[proc_macro_derive(Float)]
+pub fn float(input: TokenStream) -> TokenStream {
+    let ast: syn::DeriveInput = syn::parse(input).unwrap();
+    let name = &ast.ident;
+    let inner_ty = newtype_inner(&ast.data).expect(NEWTYPE_ONLY);
+    dummy_const_trick(
+        "Float",
+        &name,
+        quote! {
+            impl _num_traits::Float for #name {
+                fn nan() -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::nan())
+                }
+                fn infinity() -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::infinity())
+                }
+                fn neg_infinity() -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::neg_infinity())
+                }
+                fn neg_zero() -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::neg_zero())
+                }
+                fn min_value() -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::min_value())
+                }
+                fn min_positive_value() -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::min_positive_value())
+                }
+                fn max_value() -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::max_value())
+                }
+                fn is_nan(self) -> bool {
+                    <#inner_ty as _num_traits::Float>::is_nan(self.0)
+                }
+                fn is_infinite(self) -> bool {
+                    <#inner_ty as _num_traits::Float>::is_infinite(self.0)
+                }
+                fn is_finite(self) -> bool {
+                    <#inner_ty as _num_traits::Float>::is_finite(self.0)
+                }
+                fn is_normal(self) -> bool {
+                    <#inner_ty as _num_traits::Float>::is_normal(self.0)
+                }
+                fn classify(self) -> ::std::num::FpCategory {
+                    <#inner_ty as _num_traits::Float>::classify(self.0)
+                }
+                fn floor(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::floor(self.0))
+                }
+                fn ceil(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::ceil(self.0))
+                }
+                fn round(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::round(self.0))
+                }
+                fn trunc(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::trunc(self.0))
+                }
+                fn fract(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::fract(self.0))
+                }
+                fn abs(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::abs(self.0))
+                }
+                fn signum(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::signum(self.0))
+                }
+                fn is_sign_positive(self) -> bool {
+                    <#inner_ty as _num_traits::Float>::is_sign_positive(self.0)
+                }
+                fn is_sign_negative(self) -> bool {
+                    <#inner_ty as _num_traits::Float>::is_sign_negative(self.0)
+                }
+                fn mul_add(self, a: Self, b: Self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::mul_add(self.0, a.0, b.0))
+                }
+                fn recip(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::recip(self.0))
+                }
+                fn powi(self, n: i32) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::powi(self.0, n))
+                }
+                fn powf(self, n: Self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::powf(self.0, n.0))
+                }
+                fn sqrt(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::sqrt(self.0))
+                }
+                fn exp(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::exp(self.0))
+                }
+                fn exp2(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::exp2(self.0))
+                }
+                fn ln(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::ln(self.0))
+                }
+                fn log(self, base: Self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::log(self.0, base.0))
+                }
+                fn log2(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::log2(self.0))
+                }
+                fn log10(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::log10(self.0))
+                }
+                fn max(self, other: Self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::max(self.0, other.0))
+                }
+                fn min(self, other: Self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::min(self.0, other.0))
+                }
+                fn abs_sub(self, other: Self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::abs_sub(self.0, other.0))
+                }
+                fn cbrt(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::cbrt(self.0))
+                }
+                fn hypot(self, other: Self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::hypot(self.0, other.0))
+                }
+                fn sin(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::sin(self.0))
+                }
+                fn cos(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::cos(self.0))
+                }
+                fn tan(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::tan(self.0))
+                }
+                fn asin(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::asin(self.0))
+                }
+                fn acos(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::acos(self.0))
+                }
+                fn atan(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::atan(self.0))
+                }
+                fn atan2(self, other: Self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::atan2(self.0, other.0))
+                }
+                fn sin_cos(self) -> (Self, Self) {
+                    let (x, y) = <#inner_ty as _num_traits::Float>::sin_cos(self.0);
+                    (#name(x), #name(y))
+                }
+                fn exp_m1(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::exp_m1(self.0))
+                }
+                fn ln_1p(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::ln_1p(self.0))
+                }
+                fn sinh(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::sinh(self.0))
+                }
+                fn cosh(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::cosh(self.0))
+                }
+                fn tanh(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::tanh(self.0))
+                }
+                fn asinh(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::asinh(self.0))
+                }
+                fn acosh(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::acosh(self.0))
+                }
+                fn atanh(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::atanh(self.0))
+                }
+                fn integer_decode(self) -> (u64, i16, i8) {
+                    <#inner_ty as _num_traits::Float>::integer_decode(self.0)
+                }
+                fn epsilon() -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::epsilon())
+                }
+                fn to_degrees(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::to_degrees(self.0))
+                }
+                fn to_radians(self) -> Self {
+                    #name(<#inner_ty as _num_traits::Float>::to_radians(self.0))
+                }
+            }
+        },
+    )
+    .into()
 }
diff --git a/third_party/rust/num-derive/tests/issue-6.rs b/third_party/rust/num-derive/tests/issue-6.rs
index 7c94f60be7bf..b2503de8a76d 100644
--- a/third_party/rust/num-derive/tests/issue-6.rs
+++ b/third_party/rust/num-derive/tests/issue-6.rs
@@ -5,7 +5,7 @@ extern crate num_derive;
 
 #[derive(FromPrimitive, ToPrimitive)]
 pub enum SomeEnum {
-    A = 1
+    A = 1,
 }
 
 #[test]
diff --git a/third_party/rust/num-derive/tests/issue-9.rs b/third_party/rust/num-derive/tests/issue-9.rs
index c3494745597a..06038a4be0c7 100644
--- a/third_party/rust/num-derive/tests/issue-9.rs
+++ b/third_party/rust/num-derive/tests/issue-9.rs
@@ -7,7 +7,7 @@ use num::ToPrimitive;
 
 #[derive(FromPrimitive, ToPrimitive)]
 pub enum SomeEnum {
-    A = 1
+    A = 1,
 }
 
 #[test]
diff --git a/third_party/rust/num-derive/tests/newtype.rs b/third_party/rust/num-derive/tests/newtype.rs
new file mode 100644
index 000000000000..b80eaa1c7f98
--- /dev/null
+++ b/third_party/rust/num-derive/tests/newtype.rs
@@ -0,0 +1,91 @@
+extern crate num as num_renamed;
+#[macro_use]
+extern crate num_derive;
+
+use num_renamed::{Float, FromPrimitive, Num, NumCast, One, ToPrimitive, Zero};
+use std::ops::Neg;
+
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    PartialEq,
+    PartialOrd,
+    ToPrimitive,
+    FromPrimitive,
+    NumOps,
+    NumCast,
+    One,
+    Zero,
+    Num,
+    Float,
+)]
+struct MyFloat(f64);
+
+impl Neg for MyFloat {
+    type Output = MyFloat;
+    fn neg(self) -> Self {
+        MyFloat(self.0.neg())
+    }
+}
+
+#[test]
+fn test_from_primitive() {
+    assert_eq!(MyFloat::from_u32(25), Some(MyFloat(25.0)));
+}
+
+#[test]
+#[cfg(has_i128)]
+fn test_from_primitive_128() {
+    assert_eq!(
+        MyFloat::from_i128(std::i128::MIN),
+        Some(MyFloat((-2.0).powi(127)))
+    );
+}
+
+#[test]
+fn test_to_primitive() {
+    assert_eq!(MyFloat(25.0).to_u32(), Some(25));
+}
+
+#[test]
+#[cfg(has_i128)]
+fn test_to_primitive_128() {
+    let f = MyFloat::from_f32(std::f32::MAX).unwrap();
+    assert_eq!(f.to_i128(), None);
+    assert_eq!(f.to_u128(), Some(0xffff_ff00_0000_0000_0000_0000_0000_0000));
+}
+
+#[test]
+fn test_num_ops() {
+    assert_eq!(MyFloat(25.0) + MyFloat(10.0), MyFloat(35.0));
+    assert_eq!(MyFloat(25.0) - MyFloat(10.0), MyFloat(15.0));
+    assert_eq!(MyFloat(25.0) * MyFloat(2.0), MyFloat(50.0));
+    assert_eq!(MyFloat(25.0) / MyFloat(10.0), MyFloat(2.5));
+    assert_eq!(MyFloat(25.0) % MyFloat(10.0), MyFloat(5.0));
+}
+
+#[test]
+fn test_num_cast() {
+    assert_eq!(<MyFloat as NumCast>::from(25u8), Some(MyFloat(25.0)));
+}
+
+#[test]
+fn test_zero() {
+    assert_eq!(MyFloat::zero(), MyFloat(0.0));
+}
+
+#[test]
+fn test_one() {
+    assert_eq!(MyFloat::one(), MyFloat(1.0));
+}
+
+#[test]
+fn test_num() {
+    assert_eq!(MyFloat::from_str_radix("25", 10).ok(), Some(MyFloat(25.0)));
+}
+
+#[test]
+fn test_float() {
+    assert_eq!(MyFloat(4.0).log(MyFloat(2.0)), MyFloat(2.0));
+}
diff --git a/third_party/rust/num-derive/tests/trivial.rs b/third_party/rust/num-derive/tests/trivial.rs
index 6be38f97a69d..d3b56b6a25b5 100644
--- a/third_party/rust/num-derive/tests/trivial.rs
+++ b/third_party/rust/num-derive/tests/trivial.rs
@@ -21,20 +21,31 @@ enum Color {
 
 #[test]
 fn test_from_primitive_for_trivial_case() {
-    let v: [Option<Color>; 4] = [num_renamed::FromPrimitive::from_u64(0),
-                                 num_renamed::FromPrimitive::from_u64(1),
-                                 num_renamed::FromPrimitive::from_u64(2),
-                                 num_renamed::FromPrimitive::from_u64(3)];
+    let v: [Option<Color>; 4] = [
+        num_renamed::FromPrimitive::from_u64(0),
+        num_renamed::FromPrimitive::from_u64(1),
+        num_renamed::FromPrimitive::from_u64(2),
+        num_renamed::FromPrimitive::from_u64(3),
+    ];
 
-    assert_eq!(v,
-               [Some(Color::Red), Some(Color::Blue), Some(Color::Green), None]);
+    assert_eq!(
+        v,
+        [
+            Some(Color::Red),
+            Some(Color::Blue),
+            Some(Color::Green),
+            None
+        ]
+    );
 }
 
 #[test]
 fn test_to_primitive_for_trivial_case() {
-    let v: [Option<u64>; 3] = [num_renamed::ToPrimitive::to_u64(&Color::Red),
-                               num_renamed::ToPrimitive::to_u64(&Color::Blue),
-                               num_renamed::ToPrimitive::to_u64(&Color::Green)];
+    let v: [Option<u64>; 3] = [
+        num_renamed::ToPrimitive::to_u64(&Color::Red),
+        num_renamed::ToPrimitive::to_u64(&Color::Blue),
+        num_renamed::ToPrimitive::to_u64(&Color::Green),
+    ];
 
     assert_eq!(v, [Some(0), Some(1), Some(2)]);
 }
@@ -42,11 +53,12 @@ fn test_to_primitive_for_trivial_case() {
 #[test]
 fn test_reflexive_for_trivial_case() {
     let before: [u64; 3] = [0, 1, 2];
-    let after: Vec<Option<u64>> = before.iter()
+    let after: Vec<Option<u64>> = before
+        .iter()
         .map(|&x| -> Option<Color> { num_renamed::FromPrimitive::from_u64(x) })
         .map(|x| x.and_then(|x| num_renamed::ToPrimitive::to_u64(&x)))
         .collect();
-    let before = before.into_iter().cloned().map(Some).collect::<Vec<_>>();
+    let before = before.iter().cloned().map(Some).collect::<Vec<_>>();
 
     assert_eq!(before, after);
 }
diff --git a/third_party/rust/num-derive/tests/with_custom_values.rs b/third_party/rust/num-derive/tests/with_custom_values.rs
index ae6f39a84010..7ff3c0906cf7 100644
--- a/third_party/rust/num-derive/tests/with_custom_values.rs
+++ b/third_party/rust/num-derive/tests/with_custom_values.rs
@@ -24,22 +24,34 @@ enum Color {
 
 #[test]
 fn test_from_primitive_for_enum_with_custom_value() {
-    let v: [Option<Color>; 5] = [num_renamed::FromPrimitive::from_u64(0),
-                                 num_renamed::FromPrimitive::from_u64(5),
-                                 num_renamed::FromPrimitive::from_u64(6),
-                                 num_renamed::FromPrimitive::from_u64(-8isize as u64),
-                                 num_renamed::FromPrimitive::from_u64(3)];
+    let v: [Option<Color>; 5] = [
+        num_renamed::FromPrimitive::from_u64(0),
+        num_renamed::FromPrimitive::from_u64(5),
+        num_renamed::FromPrimitive::from_u64(6),
+        num_renamed::FromPrimitive::from_u64(-8isize as u64),
+        num_renamed::FromPrimitive::from_u64(3),
+    ];
 
-    assert_eq!(v,
-               [Some(Color::Red), Some(Color::Blue), Some(Color::Green), Some(Color::Alpha), None]);
+    assert_eq!(
+        v,
+        [
+            Some(Color::Red),
+            Some(Color::Blue),
+            Some(Color::Green),
+            Some(Color::Alpha),
+            None
+        ]
+    );
 }
 
 #[test]
 fn test_to_primitive_for_enum_with_custom_value() {
-    let v: [Option<u64>; 4] = [num_renamed::ToPrimitive::to_u64(&Color::Red),
-                               num_renamed::ToPrimitive::to_u64(&Color::Blue),
-                               num_renamed::ToPrimitive::to_u64(&Color::Green),
-                               num_renamed::ToPrimitive::to_u64(&Color::Alpha)];
+    let v: [Option<u64>; 4] = [
+        num_renamed::ToPrimitive::to_u64(&Color::Red),
+        num_renamed::ToPrimitive::to_u64(&Color::Blue),
+        num_renamed::ToPrimitive::to_u64(&Color::Green),
+        num_renamed::ToPrimitive::to_u64(&Color::Alpha),
+    ];
 
     assert_eq!(v, [Some(0), Some(5), Some(6), Some(-8isize as u64)]);
 }
@@ -47,7 +59,8 @@ fn test_to_primitive_for_enum_with_custom_value() {
 #[test]
 fn test_reflexive_for_enum_with_custom_value() {
     let before: [u64; 3] = [0, 5, 6];
-    let after: Vec<Option<u64>> = before.iter()
+    let after: Vec<Option<u64>> = before
+        .iter()
         .map(|&x| -> Option<Color> { num_renamed::FromPrimitive::from_u64(x) })
         .map(|x| x.and_then(|x| num_renamed::ToPrimitive::to_u64(&x)))
         .collect();
diff --git a/third_party/rust/proc-macro2-0.3.5/.cargo-checksum.json b/third_party/rust/proc-macro2-0.3.5/.cargo-checksum.json
deleted file mode 100644
index 42c3596e0eb7..000000000000
--- a/third_party/rust/proc-macro2-0.3.5/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{".travis.yml":"872a0d195dcb1e84f28aa994f301c7139f70360bb42dee3954df5ee965efea15","Cargo.toml":"e71f764696d6998512da00a9ac309f2717d103707aeef81164f906c1588ede63","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"ce05336717e1e90724491a2f54487c41c752fa2d32396639439f7c6d0f1e6776","src/lib.rs":"3280d7e0b6043d8472f418aa5c8458c97aa2b5a572f9156a251b5672828468c2","src/stable.rs":"4b5a65bd5dc174dd027b9ee951844c3765450f9d45961a8d6cd7d5f85b4c25c8","src/strnom.rs":"129fe22f0b50e5a64fca82e731c959135381c910e19f3305ef35420e0aadde08","src/unstable.rs":"b43c713ac16d9de0ba0fa1b9bebe390122b4ad60ef2fc75408f721305fdcd46b","tests/test.rs":"b06713fd8bd93ab9f0156bd25152e08f68a71b35e064c53b584f7f7dbb9b60b8"},"package":"77997c53ae6edd6d187fec07ec41b207063b5ee6f33680e9fa86d405cdd313d4"}
\ No newline at end of file
diff --git a/third_party/rust/proc-macro2-0.3.5/.travis.yml b/third_party/rust/proc-macro2-0.3.5/.travis.yml
deleted file mode 100644
index 78942c4061d6..000000000000
--- a/third_party/rust/proc-macro2-0.3.5/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-language: rust
-sudo: false
-
-matrix:
-  include:
-    - rust: 1.15.0
-    - rust: stable
-    - rust: beta
-    - rust: nightly
-      before_script:
-        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-      script:
-        - cargo test
-        - cargo build --features nightly
-        - cargo build --no-default-features
-        - RUSTFLAGS='--cfg procmacro2_semver_exempt' cargo test
-        - RUSTFLAGS='--cfg procmacro2_semver_exempt' cargo build --features nightly
-        - RUSTFLAGS='--cfg procmacro2_semver_exempt' cargo doc --no-deps
-      after_success:
-        - travis-cargo --only nightly doc-upload
-
-script:
-  - cargo test
-  - RUSTFLAGS='--cfg procmacro2_semver_exempt' cargo test
-env:
-  global:
-    - TRAVIS_CARGO_NIGHTLY_FEATURE=""
-    - secure: "NAsZghAVTAksrm4WP4I66VmD2wW0eRbwB+ZKHUQfvbgUaCRvVdp4WBbWXGU/f/yHgDFWZwljWR4iPMiBwAK8nZsQFRuLFdHrOOHqbkj639LLdT9A07s1zLMB1GfR1fDttzrGhm903pbT2yxSyqqpahGYM7TaGDYYmKYIk4XyVNA5F5Sk7RI+rCecKraoYDeUEFbjWWYtU2FkEXsELEKj0emX5reWkR+wja3QokFcRZ25+Zd2dRC0K8W5QcY2UokLzKncBMCTC5q70H616S3r/9qW67Si1njsJ7RzP0NlZQUNQ/VCvwr4LCr9w+AD9i1SZtXxuux77tWEWSJvBzUc82dDMUv/floJuF7HTulSxxQoRm+fbzpXj9mgaJNiUHXru6ZRTCRVRUSXpcAco94bVoy/jnjrTe3jgAIZK5w14zA8yLw1Jxof31DlbcWORxgF+6fnY2nKPRN2oiQ50+jm1AuGDZX59/wMiu1QlkjOBHtikHp+u+7mp3SkkM04DvuQ/tWODQQnOOtrA0EB3i5H1zeTSnUcmbJufUljWWOvF1QYII08MccqwfG1KWbpobvdu+cV2iVhkq/lNCEL3Ai101CnmSCnMz+9oK/XxYOrx2TnaD9ootOKgnk7XWxF19GZecQx6O2hHTouxvB/0KcRPGWmMWl0H88f3T/Obql8bG8="
-
-notifications:
-  email:
-    on_success: never
diff --git a/third_party/rust/proc-macro2-0.3.5/Cargo.toml b/third_party/rust/proc-macro2-0.3.5/Cargo.toml
deleted file mode 100644
index 95dec5e89b65..000000000000
--- a/third_party/rust/proc-macro2-0.3.5/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "proc-macro2"
-version = "0.3.5"
-authors = ["Alex Crichton <alex@alexcrichton.com>"]
-description = "A stable implementation of the upcoming new `proc_macro` API. Comes with an\noption, off by default, to also reimplement itself in terms of the upstream\nunstable API.\n"
-homepage = "https://github.com/alexcrichton/proc-macro2"
-documentation = "https://docs.rs/proc-macro2"
-readme = "README.md"
-keywords = ["macros"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/alexcrichton/proc-macro2"
-
-[lib]
-doctest = false
-[dependencies.unicode-xid]
-version = "0.1"
-
-[features]
-default = ["proc-macro"]
-nightly = ["proc-macro"]
-proc-macro = []
diff --git a/third_party/rust/proc-macro2-0.3.5/LICENSE-APACHE b/third_party/rust/proc-macro2-0.3.5/LICENSE-APACHE
deleted file mode 100644
index 16fe87b06e80..000000000000
--- a/third_party/rust/proc-macro2-0.3.5/LICENSE-APACHE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/third_party/rust/proc-macro2-0.3.5/LICENSE-MIT b/third_party/rust/proc-macro2-0.3.5/LICENSE-MIT
deleted file mode 100644
index 39e0ed660215..000000000000
--- a/third_party/rust/proc-macro2-0.3.5/LICENSE-MIT
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2014 Alex Crichton
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/third_party/rust/proc-macro2-0.3.5/README.md b/third_party/rust/proc-macro2-0.3.5/README.md
deleted file mode 100644
index 6a9153f86e69..000000000000
--- a/third_party/rust/proc-macro2-0.3.5/README.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# proc-macro2
-
-[![Build Status](https://api.travis-ci.org/alexcrichton/proc-macro2.svg?branch=master)](https://travis-ci.org/alexcrichton/proc-macro2)
-[![Latest Version](https://img.shields.io/crates/v/proc-macro2.svg)](https://crates.io/crates/proc-macro2)
-[![Rust Documentation](https://img.shields.io/badge/api-rustdoc-blue.svg)](https://docs.rs/proc-macro2)
-
-A small shim over the `proc_macro` crate in the compiler intended to multiplex
-the current stable interface (as of 2017-07-05) and the [upcoming richer
-interface][upcoming].
-
-[upcoming]: https://github.com/rust-lang/rust/pull/40939
-
-The upcoming support has features like:
-
-* Span information on tokens
-* No need to go in/out through strings
-* Structured input/output
-
-The hope is that libraries ported to `proc_macro2` will be trivial to port to
-the real `proc_macro` crate once the support on nightly is stabilize.
-
-## Usage
-
-This crate by default compiles on the stable version of the compiler. It only
-uses the stable surface area of the `proc_macro` crate upstream in the compiler
-itself. Usage is done via:
-
-```toml
-[dependencies]
-proc-macro2 = "0.3"
-```
-
-followed by
-
-```rust
-extern crate proc_macro;
-extern crate proc_macro2;
-
-#[proc_macro_derive(MyDerive)]
-pub fn my_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let input: proc_macro2::TokenStream = input.into();
-
-    let output: proc_macro2::TokenStream = {
-        /* transform input */
-    };
-
-    output.into()
-}
-```
-
-If you'd like you can enable the `nightly` feature in this crate. This will
-cause it to compile against the **unstable and nightly-only** features of the
-`proc_macro` crate. This in turn requires a nightly compiler. This should help
-preserve span information, however, coming in from the compiler itself.
-
-You can enable this feature via:
-
-```toml
-[dependencies]
-proc-macro2 = { version = "0.3", features = ["nightly"] }
-```
-
-
-## Unstable Features
-
-`proc-macro2` supports exporting some methods from `proc_macro` which are
-currently highly unstable, and may not be stabilized in the first pass of
-`proc_macro` stabilizations. These features are not exported by default. Minor
-versions of `proc-macro2` may make breaking changes to them at any time.
-
-To enable these features, the `procmacro2_semver_exempt` config flag must be
-passed to rustc.
-
-```
-RUSTFLAGS='--cfg procmacro2_semver_exempt' cargo build
-```
-
-Note that this must not only be done for your crate, but for any crate that
-depends on your crate. This infectious nature is intentional, as it serves as a
-reminder that you are outside of the normal semver guarantees.
-
-
-# License
-
-This project is licensed under either of
-
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
-   http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or
-   http://opensource.org/licenses/MIT)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be
-dual licensed as above, without any additional terms or conditions.
diff --git a/third_party/rust/proc-macro2-0.3.5/src/lib.rs b/third_party/rust/proc-macro2-0.3.5/src/lib.rs
deleted file mode 100644
index 4db9f0384fc9..000000000000
--- a/third_party/rust/proc-macro2-0.3.5/src/lib.rs
+++ /dev/null
@@ -1,590 +0,0 @@
-//! A "shim crate" intended to multiplex the [`proc_macro`] API on to stable
-//! Rust.
-//!
-//! Procedural macros in Rust operate over the upstream
-//! [`proc_macro::TokenStream`][ts] type. This type currently is quite
-//! conservative and exposed no internal implementation details. Nightly
-//! compilers, however, contain a much richer interface. This richer interface
-//! allows fine-grained inspection of the token stream which avoids
-//! stringification/re-lexing and also preserves span information.
-//!
-//! The upcoming APIs added to [`proc_macro`] upstream are the foundation for
-//! productive procedural macros in the ecosystem. To help prepare the ecosystem
-//! for using them this crate serves to both compile on stable and nightly and
-//! mirrors the API-to-be. The intention is that procedural macros which switch
-//! to use this crate will be trivially able to switch to the upstream
-//! `proc_macro` crate once its API stabilizes.
-//!
-//! In the meantime this crate also has a `nightly` Cargo feature which
-//! enables it to reimplement itself with the unstable API of [`proc_macro`].
-//! This'll allow immediate usage of the beneficial upstream API, particularly
-//! around preserving span information.
-//!
-//! [`proc_macro`]: https://doc.rust-lang.org/proc_macro/
-//! [ts]: https://doc.rust-lang.org/proc_macro/struct.TokenStream.html
-
-// Proc-macro2 types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/proc-macro2/0.3.5")]
-#![cfg_attr(feature = "nightly", feature(proc_macro))]
-
-#[cfg(feature = "proc-macro")]
-extern crate proc_macro;
-
-#[cfg(not(feature = "nightly"))]
-extern crate unicode_xid;
-
-use std::fmt;
-use std::iter::FromIterator;
-use std::marker;
-use std::rc::Rc;
-use std::str::FromStr;
-
-#[macro_use]
-#[cfg(not(feature = "nightly"))]
-mod strnom;
-
-#[path = "stable.rs"]
-#[cfg(not(feature = "nightly"))]
-mod imp;
-#[path = "unstable.rs"]
-#[cfg(feature = "nightly")]
-mod imp;
-
-#[derive(Clone)]
-pub struct TokenStream {
-    inner: imp::TokenStream,
-    _marker: marker::PhantomData<Rc<()>>,
-}
-
-pub struct LexError {
-    inner: imp::LexError,
-    _marker: marker::PhantomData<Rc<()>>,
-}
-
-impl TokenStream {
-    fn _new(inner: imp::TokenStream) -> TokenStream {
-        TokenStream {
-            inner: inner,
-            _marker: marker::PhantomData,
-        }
-    }
-
-    pub fn empty() -> TokenStream {
-        TokenStream::_new(imp::TokenStream::empty())
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.inner.is_empty()
-    }
-}
-
-impl FromStr for TokenStream {
-    type Err = LexError;
-
-    fn from_str(src: &str) -> Result<TokenStream, LexError> {
-        let e = src.parse().map_err(|e| LexError {
-            inner: e,
-            _marker: marker::PhantomData,
-        })?;
-        Ok(TokenStream::_new(e))
-    }
-}
-
-#[cfg(feature = "proc-macro")]
-impl From<proc_macro::TokenStream> for TokenStream {
-    fn from(inner: proc_macro::TokenStream) -> TokenStream {
-        TokenStream::_new(inner.into())
-    }
-}
-
-#[cfg(feature = "proc-macro")]
-impl From<TokenStream> for proc_macro::TokenStream {
-    fn from(inner: TokenStream) -> proc_macro::TokenStream {
-        inner.inner.into()
-    }
-}
-
-impl FromIterator<TokenTree> for TokenStream {
-    fn from_iter<I: IntoIterator<Item = TokenTree>>(streams: I) -> Self {
-        TokenStream::_new(streams.into_iter().collect())
-    }
-}
-
-impl fmt::Display for TokenStream {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.inner.fmt(f)
-    }
-}
-
-impl fmt::Debug for TokenStream {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.inner.fmt(f)
-    }
-}
-
-impl fmt::Debug for LexError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.inner.fmt(f)
-    }
-}
-
-// Returned by reference, so we can't easily wrap it.
-#[cfg(procmacro2_semver_exempt)]
-pub use imp::FileName;
-
-#[cfg(procmacro2_semver_exempt)]
-#[derive(Clone, PartialEq, Eq)]
-pub struct SourceFile(imp::SourceFile);
-
-#[cfg(procmacro2_semver_exempt)]
-impl SourceFile {
-    /// Get the path to this source file as a string.
-    pub fn path(&self) -> &FileName {
-        self.0.path()
-    }
-
-    pub fn is_real(&self) -> bool {
-        self.0.is_real()
-    }
-}
-
-#[cfg(procmacro2_semver_exempt)]
-impl AsRef<FileName> for SourceFile {
-    fn as_ref(&self) -> &FileName {
-        self.0.path()
-    }
-}
-
-#[cfg(procmacro2_semver_exempt)]
-impl fmt::Debug for SourceFile {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-#[cfg(procmacro2_semver_exempt)]
-pub struct LineColumn {
-    pub line: usize,
-    pub column: usize,
-}
-
-#[derive(Copy, Clone)]
-pub struct Span {
-    inner: imp::Span,
-    _marker: marker::PhantomData<Rc<()>>,
-}
-
-impl Span {
-    fn _new(inner: imp::Span) -> Span {
-        Span {
-            inner: inner,
-            _marker: marker::PhantomData,
-        }
-    }
-
-    pub fn call_site() -> Span {
-        Span::_new(imp::Span::call_site())
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn def_site() -> Span {
-        Span::_new(imp::Span::def_site())
-    }
-
-    /// Creates a new span with the same line/column information as `self` but
-    /// that resolves symbols as though it were at `other`.
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn resolved_at(&self, other: Span) -> Span {
-        Span::_new(self.inner.resolved_at(other.inner))
-    }
-
-    /// Creates a new span with the same name resolution behavior as `self` but
-    /// with the line/column information of `other`.
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn located_at(&self, other: Span) -> Span {
-        Span::_new(self.inner.located_at(other.inner))
-    }
-
-    /// This method is only available when the `"nightly"` feature is enabled.
-    #[cfg(all(feature = "nightly", feature = "proc-macro"))]
-    pub fn unstable(self) -> proc_macro::Span {
-        self.inner.unstable()
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn source_file(&self) -> SourceFile {
-        SourceFile(self.inner.source_file())
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn start(&self) -> LineColumn {
-        let imp::LineColumn { line, column } = self.inner.start();
-        LineColumn {
-            line: line,
-            column: column,
-        }
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn end(&self) -> LineColumn {
-        let imp::LineColumn { line, column } = self.inner.end();
-        LineColumn {
-            line: line,
-            column: column,
-        }
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn join(&self, other: Span) -> Option<Span> {
-        self.inner.join(other.inner).map(Span::_new)
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn eq(&self, other: &Span) -> bool {
-        self.inner.eq(&other.inner)
-    }
-}
-
-impl fmt::Debug for Span {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.inner.fmt(f)
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum TokenTree {
-    Group(Group),
-    Term(Term),
-    Op(Op),
-    Literal(Literal),
-}
-
-impl TokenTree {
-    pub fn span(&self) -> Span {
-        match *self {
-            TokenTree::Group(ref t) => t.span(),
-            TokenTree::Term(ref t) => t.span(),
-            TokenTree::Op(ref t) => t.span(),
-            TokenTree::Literal(ref t) => t.span(),
-        }
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        match *self {
-            TokenTree::Group(ref mut t) => t.set_span(span),
-            TokenTree::Term(ref mut t) => t.set_span(span),
-            TokenTree::Op(ref mut t) => t.set_span(span),
-            TokenTree::Literal(ref mut t) => t.set_span(span),
-        }
-    }
-}
-
-impl From<Group> for TokenTree {
-    fn from(g: Group) -> TokenTree {
-        TokenTree::Group(g)
-    }
-}
-
-impl From<Term> for TokenTree {
-    fn from(g: Term) -> TokenTree {
-        TokenTree::Term(g)
-    }
-}
-
-impl From<Op> for TokenTree {
-    fn from(g: Op) -> TokenTree {
-        TokenTree::Op(g)
-    }
-}
-
-impl From<Literal> for TokenTree {
-    fn from(g: Literal) -> TokenTree {
-        TokenTree::Literal(g)
-    }
-}
-
-impl fmt::Display for TokenTree {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            TokenTree::Group(ref t) => t.fmt(f),
-            TokenTree::Term(ref t) => t.fmt(f),
-            TokenTree::Op(ref t) => t.fmt(f),
-            TokenTree::Literal(ref t) => t.fmt(f),
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct Group {
-    delimiter: Delimiter,
-    stream: TokenStream,
-    span: Span,
-}
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
-pub enum Delimiter {
-    Parenthesis,
-    Brace,
-    Bracket,
-    None,
-}
-
-impl Group {
-    pub fn new(delimiter: Delimiter, stream: TokenStream) -> Group {
-        Group {
-            delimiter: delimiter,
-            stream: stream,
-            span: Span::call_site(),
-        }
-    }
-
-    pub fn delimiter(&self) -> Delimiter {
-        self.delimiter
-    }
-
-    pub fn stream(&self) -> TokenStream {
-        self.stream.clone()
-    }
-
-    pub fn span(&self) -> Span {
-        self.span
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
-
-impl fmt::Display for Group {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.stream.fmt(f)
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-pub struct Op {
-    op: char,
-    spacing: Spacing,
-    span: Span,
-}
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
-pub enum Spacing {
-    Alone,
-    Joint,
-}
-
-impl Op {
-    pub fn new(op: char, spacing: Spacing) -> Op {
-        Op {
-            op: op,
-            spacing: spacing,
-            span: Span::call_site(),
-        }
-    }
-
-    pub fn op(&self) -> char {
-        self.op
-    }
-
-    pub fn spacing(&self) -> Spacing {
-        self.spacing
-    }
-
-    pub fn span(&self) -> Span {
-        self.span
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
-
-impl fmt::Display for Op {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.op.fmt(f)
-    }
-}
-
-#[derive(Copy, Clone)]
-pub struct Term {
-    inner: imp::Term,
-    _marker: marker::PhantomData<Rc<()>>,
-}
-
-impl Term {
-    fn _new(inner: imp::Term) -> Term {
-        Term {
-            inner: inner,
-            _marker: marker::PhantomData,
-        }
-    }
-
-    pub fn new(string: &str, span: Span) -> Term {
-        Term::_new(imp::Term::new(string, span.inner))
-    }
-
-    pub fn as_str(&self) -> &str {
-        self.inner.as_str()
-    }
-
-    pub fn span(&self) -> Span {
-        Span::_new(self.inner.span())
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.inner.set_span(span.inner);
-    }
-}
-
-impl fmt::Display for Term {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.as_str().fmt(f)
-    }
-}
-
-impl fmt::Debug for Term {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.inner.fmt(f)
-    }
-}
-
-#[derive(Clone)]
-pub struct Literal {
-    inner: imp::Literal,
-    _marker: marker::PhantomData<Rc<()>>,
-}
-
-macro_rules! int_literals {
-    ($($name:ident => $kind:ident,)*) => ($(
-        pub fn $name(n: $kind) -> Literal {
-            Literal::_new(imp::Literal::$name(n))
-        }
-    )*)
-}
-
-impl Literal {
-    fn _new(inner: imp::Literal) -> Literal {
-        Literal {
-            inner: inner,
-            _marker: marker::PhantomData,
-        }
-    }
-
-    int_literals! {
-        u8_suffixed => u8,
-        u16_suffixed => u16,
-        u32_suffixed => u32,
-        u64_suffixed => u64,
-        usize_suffixed => usize,
-        i8_suffixed => i8,
-        i16_suffixed => i16,
-        i32_suffixed => i32,
-        i64_suffixed => i64,
-        isize_suffixed => isize,
-
-        u8_unsuffixed => u8,
-        u16_unsuffixed => u16,
-        u32_unsuffixed => u32,
-        u64_unsuffixed => u64,
-        usize_unsuffixed => usize,
-        i8_unsuffixed => i8,
-        i16_unsuffixed => i16,
-        i32_unsuffixed => i32,
-        i64_unsuffixed => i64,
-        isize_unsuffixed => isize,
-    }
-
-    pub fn f64_unsuffixed(f: f64) -> Literal {
-        assert!(f.is_finite());
-        Literal::_new(imp::Literal::f64_unsuffixed(f))
-    }
-
-    pub fn f64_suffixed(f: f64) -> Literal {
-        assert!(f.is_finite());
-        Literal::_new(imp::Literal::f64_suffixed(f))
-    }
-
-    pub fn f32_unsuffixed(f: f32) -> Literal {
-        assert!(f.is_finite());
-        Literal::_new(imp::Literal::f32_unsuffixed(f))
-    }
-
-    pub fn f32_suffixed(f: f32) -> Literal {
-        assert!(f.is_finite());
-        Literal::_new(imp::Literal::f32_suffixed(f))
-    }
-
-    pub fn string(string: &str) -> Literal {
-        Literal::_new(imp::Literal::string(string))
-    }
-
-    pub fn character(ch: char) -> Literal {
-        Literal::_new(imp::Literal::character(ch))
-    }
-
-    pub fn byte_string(s: &[u8]) -> Literal {
-        Literal::_new(imp::Literal::byte_string(s))
-    }
-
-    pub fn span(&self) -> Span {
-        Span::_new(self.inner.span())
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.inner.set_span(span.inner);
-    }
-}
-
-impl fmt::Debug for Literal {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.inner.fmt(f)
-    }
-}
-
-impl fmt::Display for Literal {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.inner.fmt(f)
-    }
-}
-
-pub mod token_stream {
-    use std::fmt;
-    use std::marker;
-    use std::rc::Rc;
-
-    pub use TokenStream;
-    use TokenTree;
-    use imp;
-
-    pub struct IntoIter {
-        inner: imp::TokenTreeIter,
-        _marker: marker::PhantomData<Rc<()>>,
-    }
-
-    impl Iterator for IntoIter {
-        type Item = TokenTree;
-
-        fn next(&mut self) -> Option<TokenTree> {
-            self.inner.next()
-        }
-    }
-
-    impl fmt::Debug for IntoIter {
-        fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-            self.inner.fmt(f)
-        }
-    }
-
-    impl IntoIterator for TokenStream {
-        type Item = TokenTree;
-        type IntoIter = IntoIter;
-
-        fn into_iter(self) -> IntoIter {
-            IntoIter {
-                inner: self.inner.into_iter(),
-                _marker: marker::PhantomData,
-            }
-        }
-    }
-}
diff --git a/third_party/rust/proc-macro2-0.3.5/src/stable.rs b/third_party/rust/proc-macro2-0.3.5/src/stable.rs
deleted file mode 100644
index abfeab36951c..000000000000
--- a/third_party/rust/proc-macro2-0.3.5/src/stable.rs
+++ /dev/null
@@ -1,1227 +0,0 @@
-#![cfg_attr(not(procmacro2_semver_exempt), allow(dead_code))]
-
-use std::borrow::Borrow;
-use std::cell::RefCell;
-#[cfg(procmacro2_semver_exempt)]
-use std::cmp;
-use std::collections::HashMap;
-use std::fmt;
-use std::iter;
-use std::rc::Rc;
-use std::str::FromStr;
-use std::vec;
-
-use strnom::{block_comment, skip_whitespace, whitespace, word_break, Cursor, PResult};
-use unicode_xid::UnicodeXID;
-
-use {Delimiter, Group, Op, Spacing, TokenTree};
-
-#[derive(Clone, Debug)]
-pub struct TokenStream {
-    inner: Vec<TokenTree>,
-}
-
-#[derive(Debug)]
-pub struct LexError;
-
-impl TokenStream {
-    pub fn empty() -> TokenStream {
-        TokenStream { inner: Vec::new() }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.inner.len() == 0
-    }
-}
-
-#[cfg(procmacro2_semver_exempt)]
-fn get_cursor(src: &str) -> Cursor {
-    // Create a dummy file & add it to the codemap
-    CODEMAP.with(|cm| {
-        let mut cm = cm.borrow_mut();
-        let name = format!("<parsed string {}>", cm.files.len());
-        let span = cm.add_file(&name, src);
-        Cursor {
-            rest: src,
-            off: span.lo,
-        }
-    })
-}
-
-#[cfg(not(procmacro2_semver_exempt))]
-fn get_cursor(src: &str) -> Cursor {
-    Cursor { rest: src }
-}
-
-impl FromStr for TokenStream {
-    type Err = LexError;
-
-    fn from_str(src: &str) -> Result<TokenStream, LexError> {
-        // Create a dummy file & add it to the codemap
-        let cursor = get_cursor(src);
-
-        match token_stream(cursor) {
-            Ok((input, output)) => {
-                if skip_whitespace(input).len() != 0 {
-                    Err(LexError)
-                } else {
-                    Ok(output.inner)
-                }
-            }
-            Err(LexError) => Err(LexError),
-        }
-    }
-}
-
-impl fmt::Display for TokenStream {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let mut joint = false;
-        for (i, tt) in self.inner.iter().enumerate() {
-            if i != 0 && !joint {
-                write!(f, " ")?;
-            }
-            joint = false;
-            match *tt {
-                TokenTree::Group(ref tt) => {
-                    let (start, end) = match tt.delimiter() {
-                        Delimiter::Parenthesis => ("(", ")"),
-                        Delimiter::Brace => ("{", "}"),
-                        Delimiter::Bracket => ("[", "]"),
-                        Delimiter::None => ("", ""),
-                    };
-                    if tt.stream().inner.inner.len() == 0 {
-                        write!(f, "{} {}", start, end)?
-                    } else {
-                        write!(f, "{} {} {}", start, tt.stream(), end)?
-                    }
-                }
-                TokenTree::Term(ref tt) => write!(f, "{}", tt.as_str())?,
-                TokenTree::Op(ref tt) => {
-                    write!(f, "{}", tt.op())?;
-                    match tt.spacing() {
-                        Spacing::Alone => {}
-                        Spacing::Joint => joint = true,
-                    }
-                }
-                TokenTree::Literal(ref tt) => write!(f, "{}", tt)?,
-            }
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(feature = "proc-macro")]
-impl From<::proc_macro::TokenStream> for TokenStream {
-    fn from(inner: ::proc_macro::TokenStream) -> TokenStream {
-        inner
-            .to_string()
-            .parse()
-            .expect("compiler token stream parse failed")
-    }
-}
-
-#[cfg(feature = "proc-macro")]
-impl From<TokenStream> for ::proc_macro::TokenStream {
-    fn from(inner: TokenStream) -> ::proc_macro::TokenStream {
-        inner
-            .to_string()
-            .parse()
-            .expect("failed to parse to compiler tokens")
-    }
-}
-
-impl From<TokenTree> for TokenStream {
-    fn from(tree: TokenTree) -> TokenStream {
-        TokenStream { inner: vec![tree] }
-    }
-}
-
-impl iter::FromIterator<TokenTree> for TokenStream {
-    fn from_iter<I: IntoIterator<Item = TokenTree>>(streams: I) -> Self {
-        let mut v = Vec::new();
-
-        for token in streams.into_iter() {
-            v.push(token);
-        }
-
-        TokenStream { inner: v }
-    }
-}
-
-pub type TokenTreeIter = vec::IntoIter<TokenTree>;
-
-impl IntoIterator for TokenStream {
-    type Item = TokenTree;
-    type IntoIter = TokenTreeIter;
-
-    fn into_iter(self) -> TokenTreeIter {
-        self.inner.into_iter()
-    }
-}
-
-#[cfg(procmacro2_semver_exempt)]
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub struct FileName(String);
-
-#[cfg(procmacro2_semver_exempt)]
-impl fmt::Display for FileName {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-#[cfg(procmacro2_semver_exempt)]
-#[derive(Clone, PartialEq, Eq)]
-pub struct SourceFile {
-    name: FileName,
-}
-
-#[cfg(procmacro2_semver_exempt)]
-impl SourceFile {
-    /// Get the path to this source file as a string.
-    pub fn path(&self) -> &FileName {
-        &self.name
-    }
-
-    pub fn is_real(&self) -> bool {
-        // XXX(nika): Support real files in the future?
-        false
-    }
-}
-
-#[cfg(procmacro2_semver_exempt)]
-impl AsRef<FileName> for SourceFile {
-    fn as_ref(&self) -> &FileName {
-        self.path()
-    }
-}
-
-#[cfg(procmacro2_semver_exempt)]
-impl fmt::Debug for SourceFile {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("SourceFile")
-            .field("path", &self.path())
-            .field("is_real", &self.is_real())
-            .finish()
-    }
-}
-
-#[cfg(procmacro2_semver_exempt)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct LineColumn {
-    pub line: usize,
-    pub column: usize,
-}
-
-#[cfg(procmacro2_semver_exempt)]
-thread_local! {
-    static CODEMAP: RefCell<Codemap> = RefCell::new(Codemap {
-        // NOTE: We start with a single dummy file which all call_site() and
-        // def_site() spans reference.
-        files: vec![FileInfo {
-            name: "<unspecified>".to_owned(),
-            span: Span { lo: 0, hi: 0 },
-            lines: vec![0],
-        }],
-    });
-}
-
-#[cfg(procmacro2_semver_exempt)]
-struct FileInfo {
-    name: String,
-    span: Span,
-    lines: Vec<usize>,
-}
-
-#[cfg(procmacro2_semver_exempt)]
-impl FileInfo {
-    fn offset_line_column(&self, offset: usize) -> LineColumn {
-        assert!(self.span_within(Span {
-            lo: offset as u32,
-            hi: offset as u32
-        }));
-        let offset = offset - self.span.lo as usize;
-        match self.lines.binary_search(&offset) {
-            Ok(found) => LineColumn {
-                line: found + 1,
-                column: 0,
-            },
-            Err(idx) => LineColumn {
-                line: idx,
-                column: offset - self.lines[idx - 1],
-            },
-        }
-    }
-
-    fn span_within(&self, span: Span) -> bool {
-        span.lo >= self.span.lo && span.hi <= self.span.hi
-    }
-}
-
-/// Computesthe offsets of each line in the given source string.
-#[cfg(procmacro2_semver_exempt)]
-fn lines_offsets(s: &str) -> Vec<usize> {
-    let mut lines = vec![0];
-    let mut prev = 0;
-    while let Some(len) = s[prev..].find('\n') {
-        prev += len + 1;
-        lines.push(prev);
-    }
-    lines
-}
-
-#[cfg(procmacro2_semver_exempt)]
-struct Codemap {
-    files: Vec<FileInfo>,
-}
-
-#[cfg(procmacro2_semver_exempt)]
-impl Codemap {
-    fn next_start_pos(&self) -> u32 {
-        // Add 1 so there's always space between files.
-        //
-        // We'll always have at least 1 file, as we initialize our files list
-        // with a dummy file.
-        self.files.last().unwrap().span.hi + 1
-    }
-
-    fn add_file(&mut self, name: &str, src: &str) -> Span {
-        let lines = lines_offsets(src);
-        let lo = self.next_start_pos();
-        // XXX(nika): Shouild we bother doing a checked cast or checked add here?
-        let span = Span {
-            lo: lo,
-            hi: lo + (src.len() as u32),
-        };
-
-        self.files.push(FileInfo {
-            name: name.to_owned(),
-            span: span,
-            lines: lines,
-        });
-
-        span
-    }
-
-    fn fileinfo(&self, span: Span) -> &FileInfo {
-        for file in &self.files {
-            if file.span_within(span) {
-                return file;
-            }
-        }
-        panic!("Invalid span with no related FileInfo!");
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct Span {
-    #[cfg(procmacro2_semver_exempt)]
-    lo: u32,
-    #[cfg(procmacro2_semver_exempt)]
-    hi: u32,
-}
-
-impl Span {
-    #[cfg(not(procmacro2_semver_exempt))]
-    pub fn call_site() -> Span {
-        Span {}
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn call_site() -> Span {
-        Span { lo: 0, hi: 0 }
-    }
-
-    pub fn def_site() -> Span {
-        Span::call_site()
-    }
-
-    pub fn resolved_at(&self, _other: Span) -> Span {
-        // Stable spans consist only of line/column information, so
-        // `resolved_at` and `located_at` only select which span the
-        // caller wants line/column information from.
-        *self
-    }
-
-    pub fn located_at(&self, other: Span) -> Span {
-        other
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn source_file(&self) -> SourceFile {
-        CODEMAP.with(|cm| {
-            let cm = cm.borrow();
-            let fi = cm.fileinfo(*self);
-            SourceFile {
-                name: FileName(fi.name.clone()),
-            }
-        })
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn start(&self) -> LineColumn {
-        CODEMAP.with(|cm| {
-            let cm = cm.borrow();
-            let fi = cm.fileinfo(*self);
-            fi.offset_line_column(self.lo as usize)
-        })
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn end(&self) -> LineColumn {
-        CODEMAP.with(|cm| {
-            let cm = cm.borrow();
-            let fi = cm.fileinfo(*self);
-            fi.offset_line_column(self.hi as usize)
-        })
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn join(&self, other: Span) -> Option<Span> {
-        CODEMAP.with(|cm| {
-            let cm = cm.borrow();
-            // If `other` is not within the same FileInfo as us, return None.
-            if !cm.fileinfo(*self).span_within(other) {
-                return None;
-            }
-            Some(Span {
-                lo: cmp::min(self.lo, other.lo),
-                hi: cmp::max(self.hi, other.hi),
-            })
-        })
-    }
-}
-
-#[derive(Copy, Clone)]
-pub struct Term {
-    intern: usize,
-    span: Span,
-}
-
-thread_local!(static SYMBOLS: RefCell<Interner> = RefCell::new(Interner::new()));
-
-impl Term {
-    pub fn new(string: &str, span: Span) -> Term {
-        Term {
-            intern: SYMBOLS.with(|s| s.borrow_mut().intern(string)),
-            span: span,
-        }
-    }
-
-    pub fn as_str(&self) -> &str {
-        SYMBOLS.with(|interner| {
-            let interner = interner.borrow();
-            let s = interner.get(self.intern);
-            unsafe { &*(s as *const str) }
-        })
-    }
-
-    pub fn span(&self) -> Span {
-        self.span
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
-
-impl fmt::Debug for Term {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_tuple("Term").field(&self.as_str()).finish()
-    }
-}
-
-struct Interner {
-    string_to_index: HashMap<MyRc, usize>,
-    index_to_string: Vec<Rc<String>>,
-}
-
-#[derive(Hash, Eq, PartialEq)]
-struct MyRc(Rc<String>);
-
-impl Borrow<str> for MyRc {
-    fn borrow(&self) -> &str {
-        &self.0
-    }
-}
-
-impl Interner {
-    fn new() -> Interner {
-        Interner {
-            string_to_index: HashMap::new(),
-            index_to_string: Vec::new(),
-        }
-    }
-
-    fn intern(&mut self, s: &str) -> usize {
-        if let Some(&idx) = self.string_to_index.get(s) {
-            return idx;
-        }
-        let s = Rc::new(s.to_string());
-        self.index_to_string.push(s.clone());
-        self.string_to_index
-            .insert(MyRc(s), self.index_to_string.len() - 1);
-        self.index_to_string.len() - 1
-    }
-
-    fn get(&self, idx: usize) -> &str {
-        &self.index_to_string[idx]
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct Literal {
-    text: String,
-    span: Span,
-}
-
-macro_rules! suffixed_numbers {
-    ($($name:ident => $kind:ident,)*) => ($(
-        pub fn $name(n: $kind) -> Literal {
-            Literal::_new(format!(concat!("{}", stringify!($kind)), n))
-        }
-    )*)
-}
-
-macro_rules! unsuffixed_numbers {
-    ($($name:ident => $kind:ident,)*) => ($(
-        pub fn $name(n: $kind) -> Literal {
-            Literal::_new(n.to_string())
-        }
-    )*)
-}
-
-impl Literal {
-    fn _new(text: String) -> Literal {
-        Literal {
-            text: text,
-            span: Span::call_site(),
-        }
-    }
-
-    suffixed_numbers! {
-        u8_suffixed => u8,
-        u16_suffixed => u16,
-        u32_suffixed => u32,
-        u64_suffixed => u64,
-        usize_suffixed => usize,
-        i8_suffixed => i8,
-        i16_suffixed => i16,
-        i32_suffixed => i32,
-        i64_suffixed => i64,
-        isize_suffixed => isize,
-
-        f32_suffixed => f32,
-        f64_suffixed => f64,
-    }
-
-    unsuffixed_numbers! {
-        u8_unsuffixed => u8,
-        u16_unsuffixed => u16,
-        u32_unsuffixed => u32,
-        u64_unsuffixed => u64,
-        usize_unsuffixed => usize,
-        i8_unsuffixed => i8,
-        i16_unsuffixed => i16,
-        i32_unsuffixed => i32,
-        i64_unsuffixed => i64,
-        isize_unsuffixed => isize,
-    }
-
-    pub fn f32_unsuffixed(f: f32) -> Literal {
-        let mut s = f.to_string();
-        if !s.contains(".") {
-            s.push_str(".0");
-        }
-        Literal::_new(s)
-    }
-
-    pub fn f64_unsuffixed(f: f64) -> Literal {
-        let mut s = f.to_string();
-        if !s.contains(".") {
-            s.push_str(".0");
-        }
-        Literal::_new(s)
-    }
-
-    pub fn string(t: &str) -> Literal {
-        let mut s = t.chars()
-            .flat_map(|c| c.escape_default())
-            .collect::<String>();
-        s.push('"');
-        s.insert(0, '"');
-        Literal::_new(s)
-    }
-
-    pub fn character(t: char) -> Literal {
-        Literal::_new(format!("'{}'", t.escape_default().collect::<String>()))
-    }
-
-    pub fn byte_string(bytes: &[u8]) -> Literal {
-        let mut escaped = "b\"".to_string();
-        for b in bytes {
-            match *b {
-                b'\0' => escaped.push_str(r"\0"),
-                b'\t' => escaped.push_str(r"\t"),
-                b'\n' => escaped.push_str(r"\n"),
-                b'\r' => escaped.push_str(r"\r"),
-                b'"' => escaped.push_str("\\\""),
-                b'\\' => escaped.push_str("\\\\"),
-                b'\x20'...b'\x7E' => escaped.push(*b as char),
-                _ => escaped.push_str(&format!("\\x{:02X}", b)),
-            }
-        }
-        escaped.push('"');
-        Literal::_new(escaped)
-    }
-
-    pub fn span(&self) -> Span {
-        self.span
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
-
-impl fmt::Display for Literal {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.text.fmt(f)
-    }
-}
-
-fn token_stream(mut input: Cursor) -> PResult<::TokenStream> {
-    let mut trees = Vec::new();
-    loop {
-        let input_no_ws = skip_whitespace(input);
-        if input_no_ws.rest.len() == 0 {
-            break
-        }
-        if let Ok((a, tokens)) = doc_comment(input_no_ws) {
-            input = a;
-            trees.extend(tokens);
-            continue
-        }
-
-        let (a, tt) = match token_tree(input_no_ws) {
-            Ok(p) => p,
-            Err(_) => break,
-        };
-        trees.push(tt);
-        input = a;
-    }
-    Ok((input, ::TokenStream::_new(TokenStream { inner: trees })))
-}
-
-#[cfg(not(procmacro2_semver_exempt))]
-fn spanned<'a, T>(
-    input: Cursor<'a>,
-    f: fn(Cursor<'a>) -> PResult<'a, T>,
-) -> PResult<'a, (T, ::Span)> {
-    let (a, b) = f(skip_whitespace(input))?;
-    Ok((a, ((b, ::Span::_new(Span { })))))
-}
-
-#[cfg(procmacro2_semver_exempt)]
-fn spanned<'a, T>(
-    input: Cursor<'a>,
-    f: fn(Cursor<'a>) -> PResult<'a, T>,
-) -> PResult<'a, (T, ::Span)> {
-    let input = skip_whitespace(input);
-    let lo = input.off;
-    let (a, b) = f(input)?;
-    let hi = a.off;
-    let span = ::Span::_new(Span { lo: lo, hi: hi });
-    Ok((a, (b, span)))
-}
-
-fn token_tree(input: Cursor) -> PResult<TokenTree> {
-    let (rest, (mut tt, span)) = spanned(input, token_kind)?;
-    tt.set_span(span);
-    Ok((rest, tt))
-}
-
-named!(token_kind -> TokenTree, alt!(
-    map!(group, TokenTree::Group)
-    |
-    map!(literal, TokenTree::Literal) // must be before symbol
-    |
-    symbol
-    |
-    map!(op, TokenTree::Op)
-));
-
-named!(group -> Group, alt!(
-    delimited!(
-        punct!("("),
-        token_stream,
-        punct!(")")
-    ) => { |ts| Group::new(Delimiter::Parenthesis, ts) }
-    |
-    delimited!(
-        punct!("["),
-        token_stream,
-        punct!("]")
-    ) => { |ts| Group::new(Delimiter::Bracket, ts) }
-    |
-    delimited!(
-        punct!("{"),
-        token_stream,
-        punct!("}")
-    ) => { |ts| Group::new(Delimiter::Brace, ts) }
-));
-
-fn symbol(mut input: Cursor) -> PResult<TokenTree> {
-    input = skip_whitespace(input);
-
-    let mut chars = input.char_indices();
-
-    let lifetime = input.starts_with("'");
-    if lifetime {
-        chars.next();
-    }
-
-    let raw = !lifetime && input.starts_with("r#");
-    if raw {
-        chars.next();
-        chars.next();
-    }
-
-    match chars.next() {
-        Some((_, ch)) if UnicodeXID::is_xid_start(ch) || ch == '_' => {}
-        _ => return Err(LexError),
-    }
-
-    let mut end = input.len();
-    for (i, ch) in chars {
-        if !UnicodeXID::is_xid_continue(ch) {
-            end = i;
-            break;
-        }
-    }
-
-    let a = &input.rest[..end];
-    if a == "r#_" || lifetime && a != "'static" && KEYWORDS.contains(&&a[1..]) {
-        Err(LexError)
-    } else if a == "_" {
-        Ok((input.advance(end), Op::new('_', Spacing::Alone).into()))
-    } else {
-        Ok((
-            input.advance(end),
-            ::Term::new(a, ::Span::call_site()).into(),
-        ))
-    }
-}
-
-// From https://github.com/rust-lang/rust/blob/master/src/libsyntax_pos/symbol.rs
-static KEYWORDS: &'static [&'static str] = &[
-    "abstract", "alignof", "as", "become", "box", "break", "const", "continue", "crate", "do",
-    "else", "enum", "extern", "false", "final", "fn", "for", "if", "impl", "in", "let", "loop",
-    "macro", "match", "mod", "move", "mut", "offsetof", "override", "priv", "proc", "pub", "pure",
-    "ref", "return", "self", "Self", "sizeof", "static", "struct", "super", "trait", "true",
-    "type", "typeof", "unsafe", "unsized", "use", "virtual", "where", "while", "yield",
-];
-
-fn literal(input: Cursor) -> PResult<::Literal> {
-    let input_no_ws = skip_whitespace(input);
-
-    match literal_nocapture(input_no_ws) {
-        Ok((a, ())) => {
-            let start = input.len() - input_no_ws.len();
-            let len = input_no_ws.len() - a.len();
-            let end = start + len;
-            Ok((
-                a,
-                ::Literal::_new(Literal::_new(input.rest[start..end].to_string())),
-            ))
-        }
-        Err(LexError) => Err(LexError),
-    }
-}
-
-named!(literal_nocapture -> (), alt!(
-    string
-    |
-    byte_string
-    |
-    byte
-    |
-    character
-    |
-    float
-    |
-    int
-));
-
-named!(string -> (), alt!(
-    quoted_string
-    |
-    preceded!(
-        punct!("r"),
-        raw_string
-    ) => { |_| () }
-));
-
-named!(quoted_string -> (), delimited!(
-    punct!("\""),
-    cooked_string,
-    tag!("\"")
-));
-
-fn cooked_string(input: Cursor) -> PResult<()> {
-    let mut chars = input.char_indices().peekable();
-    while let Some((byte_offset, ch)) = chars.next() {
-        match ch {
-            '"' => {
-                return Ok((input.advance(byte_offset), ()));
-            }
-            '\r' => {
-                if let Some((_, '\n')) = chars.next() {
-                    // ...
-                } else {
-                    break;
-                }
-            }
-            '\\' => match chars.next() {
-                Some((_, 'x')) => {
-                    if !backslash_x_char(&mut chars) {
-                        break;
-                    }
-                }
-                Some((_, 'n')) | Some((_, 'r')) | Some((_, 't')) | Some((_, '\\'))
-                | Some((_, '\'')) | Some((_, '"')) | Some((_, '0')) => {}
-                Some((_, 'u')) => {
-                    if !backslash_u(&mut chars) {
-                        break;
-                    }
-                }
-                Some((_, '\n')) | Some((_, '\r')) => {
-                    while let Some(&(_, ch)) = chars.peek() {
-                        if ch.is_whitespace() {
-                            chars.next();
-                        } else {
-                            break;
-                        }
-                    }
-                }
-                _ => break,
-            },
-            _ch => {}
-        }
-    }
-    Err(LexError)
-}
-
-named!(byte_string -> (), alt!(
-    delimited!(
-        punct!("b\""),
-        cooked_byte_string,
-        tag!("\"")
-    ) => { |_| () }
-    |
-    preceded!(
-        punct!("br"),
-        raw_string
-    ) => { |_| () }
-));
-
-fn cooked_byte_string(mut input: Cursor) -> PResult<()> {
-    let mut bytes = input.bytes().enumerate();
-    'outer: while let Some((offset, b)) = bytes.next() {
-        match b {
-            b'"' => {
-                return Ok((input.advance(offset), ()));
-            }
-            b'\r' => {
-                if let Some((_, b'\n')) = bytes.next() {
-                    // ...
-                } else {
-                    break;
-                }
-            }
-            b'\\' => match bytes.next() {
-                Some((_, b'x')) => {
-                    if !backslash_x_byte(&mut bytes) {
-                        break;
-                    }
-                }
-                Some((_, b'n')) | Some((_, b'r')) | Some((_, b't')) | Some((_, b'\\'))
-                | Some((_, b'0')) | Some((_, b'\'')) | Some((_, b'"')) => {}
-                Some((newline, b'\n')) | Some((newline, b'\r')) => {
-                    let rest = input.advance(newline + 1);
-                    for (offset, ch) in rest.char_indices() {
-                        if !ch.is_whitespace() {
-                            input = rest.advance(offset);
-                            bytes = input.bytes().enumerate();
-                            continue 'outer;
-                        }
-                    }
-                    break;
-                }
-                _ => break,
-            },
-            b if b < 0x80 => {}
-            _ => break,
-        }
-    }
-    Err(LexError)
-}
-
-fn raw_string(input: Cursor) -> PResult<()> {
-    let mut chars = input.char_indices();
-    let mut n = 0;
-    while let Some((byte_offset, ch)) = chars.next() {
-        match ch {
-            '"' => {
-                n = byte_offset;
-                break;
-            }
-            '#' => {}
-            _ => return Err(LexError),
-        }
-    }
-    for (byte_offset, ch) in chars {
-        match ch {
-            '"' if input.advance(byte_offset + 1).starts_with(&input.rest[..n]) => {
-                let rest = input.advance(byte_offset + 1 + n);
-                return Ok((rest, ()));
-            }
-            '\r' => {}
-            _ => {}
-        }
-    }
-    Err(LexError)
-}
-
-named!(byte -> (), do_parse!(
-    punct!("b") >>
-    tag!("'") >>
-    cooked_byte >>
-    tag!("'") >>
-    (())
-));
-
-fn cooked_byte(input: Cursor) -> PResult<()> {
-    let mut bytes = input.bytes().enumerate();
-    let ok = match bytes.next().map(|(_, b)| b) {
-        Some(b'\\') => match bytes.next().map(|(_, b)| b) {
-            Some(b'x') => backslash_x_byte(&mut bytes),
-            Some(b'n') | Some(b'r') | Some(b't') | Some(b'\\') | Some(b'0') | Some(b'\'')
-            | Some(b'"') => true,
-            _ => false,
-        },
-        b => b.is_some(),
-    };
-    if ok {
-        match bytes.next() {
-            Some((offset, _)) => {
-                if input.chars().as_str().is_char_boundary(offset) {
-                    Ok((input.advance(offset), ()))
-                } else {
-                    Err(LexError)
-                }
-            }
-            None => Ok((input.advance(input.len()), ())),
-        }
-    } else {
-        Err(LexError)
-    }
-}
-
-named!(character -> (), do_parse!(
-    punct!("'") >>
-    cooked_char >>
-    tag!("'") >>
-    (())
-));
-
-fn cooked_char(input: Cursor) -> PResult<()> {
-    let mut chars = input.char_indices();
-    let ok = match chars.next().map(|(_, ch)| ch) {
-        Some('\\') => match chars.next().map(|(_, ch)| ch) {
-            Some('x') => backslash_x_char(&mut chars),
-            Some('u') => backslash_u(&mut chars),
-            Some('n') | Some('r') | Some('t') | Some('\\') | Some('0') | Some('\'') | Some('"') => {
-                true
-            }
-            _ => false,
-        },
-        ch => ch.is_some(),
-    };
-    if ok {
-        match chars.next() {
-            Some((idx, _)) => Ok((input.advance(idx), ())),
-            None => Ok((input.advance(input.len()), ())),
-        }
-    } else {
-        Err(LexError)
-    }
-}
-
-macro_rules! next_ch {
-    ($chars:ident @ $pat:pat $(| $rest:pat)*) => {
-        match $chars.next() {
-            Some((_, ch)) => match ch {
-                $pat $(| $rest)*  => ch,
-                _ => return false,
-            },
-            None => return false
-        }
-    };
-}
-
-fn backslash_x_char<I>(chars: &mut I) -> bool
-where
-    I: Iterator<Item = (usize, char)>,
-{
-    next_ch!(chars @ '0'...'7');
-    next_ch!(chars @ '0'...'9' | 'a'...'f' | 'A'...'F');
-    true
-}
-
-fn backslash_x_byte<I>(chars: &mut I) -> bool
-where
-    I: Iterator<Item = (usize, u8)>,
-{
-    next_ch!(chars @ b'0'...b'9' | b'a'...b'f' | b'A'...b'F');
-    next_ch!(chars @ b'0'...b'9' | b'a'...b'f' | b'A'...b'F');
-    true
-}
-
-fn backslash_u<I>(chars: &mut I) -> bool
-where
-    I: Iterator<Item = (usize, char)>,
-{
-    next_ch!(chars @ '{');
-    next_ch!(chars @ '0'...'9' | 'a'...'f' | 'A'...'F');
-    loop {
-        let c = next_ch!(chars @ '0'...'9' | 'a'...'f' | 'A'...'F' | '_' | '}');
-        if c == '}' {
-            return true;
-        }
-    }
-}
-
-fn float(input: Cursor) -> PResult<()> {
-    let (rest, ()) = float_digits(input)?;
-    for suffix in &["f32", "f64"] {
-        if rest.starts_with(suffix) {
-            return word_break(rest.advance(suffix.len()));
-        }
-    }
-    word_break(rest)
-}
-
-fn float_digits(input: Cursor) -> PResult<()> {
-    let mut chars = input.chars().peekable();
-    match chars.next() {
-        Some(ch) if ch >= '0' && ch <= '9' => {}
-        _ => return Err(LexError),
-    }
-
-    let mut len = 1;
-    let mut has_dot = false;
-    let mut has_exp = false;
-    while let Some(&ch) = chars.peek() {
-        match ch {
-            '0'...'9' | '_' => {
-                chars.next();
-                len += 1;
-            }
-            '.' => {
-                if has_dot {
-                    break;
-                }
-                chars.next();
-                if chars
-                    .peek()
-                    .map(|&ch| ch == '.' || UnicodeXID::is_xid_start(ch))
-                    .unwrap_or(false)
-                {
-                    return Err(LexError);
-                }
-                len += 1;
-                has_dot = true;
-            }
-            'e' | 'E' => {
-                chars.next();
-                len += 1;
-                has_exp = true;
-                break;
-            }
-            _ => break,
-        }
-    }
-
-    let rest = input.advance(len);
-    if !(has_dot || has_exp || rest.starts_with("f32") || rest.starts_with("f64")) {
-        return Err(LexError);
-    }
-
-    if has_exp {
-        let mut has_exp_value = false;
-        while let Some(&ch) = chars.peek() {
-            match ch {
-                '+' | '-' => {
-                    if has_exp_value {
-                        break;
-                    }
-                    chars.next();
-                    len += 1;
-                }
-                '0'...'9' => {
-                    chars.next();
-                    len += 1;
-                    has_exp_value = true;
-                }
-                '_' => {
-                    chars.next();
-                    len += 1;
-                }
-                _ => break,
-            }
-        }
-        if !has_exp_value {
-            return Err(LexError);
-        }
-    }
-
-    Ok((input.advance(len), ()))
-}
-
-fn int(input: Cursor) -> PResult<()> {
-    let (rest, ()) = digits(input)?;
-    for suffix in &[
-        "isize", "i8", "i16", "i32", "i64", "i128", "usize", "u8", "u16", "u32", "u64", "u128"
-    ] {
-        if rest.starts_with(suffix) {
-            return word_break(rest.advance(suffix.len()));
-        }
-    }
-    word_break(rest)
-}
-
-fn digits(mut input: Cursor) -> PResult<()> {
-    let base = if input.starts_with("0x") {
-        input = input.advance(2);
-        16
-    } else if input.starts_with("0o") {
-        input = input.advance(2);
-        8
-    } else if input.starts_with("0b") {
-        input = input.advance(2);
-        2
-    } else {
-        10
-    };
-
-    let mut len = 0;
-    let mut empty = true;
-    for b in input.bytes() {
-        let digit = match b {
-            b'0'...b'9' => (b - b'0') as u64,
-            b'a'...b'f' => 10 + (b - b'a') as u64,
-            b'A'...b'F' => 10 + (b - b'A') as u64,
-            b'_' => {
-                if empty && base == 10 {
-                    return Err(LexError);
-                }
-                len += 1;
-                continue;
-            }
-            _ => break,
-        };
-        if digit >= base {
-            return Err(LexError);
-        }
-        len += 1;
-        empty = false;
-    }
-    if empty {
-        Err(LexError)
-    } else {
-        Ok((input.advance(len), ()))
-    }
-}
-
-fn op(input: Cursor) -> PResult<Op> {
-    let input = skip_whitespace(input);
-    match op_char(input) {
-        Ok((rest, ch)) => {
-            let kind = match op_char(rest) {
-                Ok(_) => Spacing::Joint,
-                Err(LexError) => Spacing::Alone,
-            };
-            Ok((rest, Op::new(ch, kind)))
-        }
-        Err(LexError) => Err(LexError),
-    }
-}
-
-fn op_char(input: Cursor) -> PResult<char> {
-    let mut chars = input.chars();
-    let first = match chars.next() {
-        Some(ch) => ch,
-        None => {
-            return Err(LexError);
-        }
-    };
-    let recognized = "~!@#$%^&*-=+|;:,<.>/?";
-    if recognized.contains(first) {
-        Ok((input.advance(first.len_utf8()), first))
-    } else {
-        Err(LexError)
-    }
-}
-
-fn doc_comment(input: Cursor) -> PResult<Vec<TokenTree>> {
-    let mut trees = Vec::new();
-    let (rest, ((comment, inner), span)) = spanned(input, doc_comment_contents)?;
-    trees.push(TokenTree::Op(Op::new('#', Spacing::Alone)));
-    if inner {
-        trees.push(Op::new('!', Spacing::Alone).into());
-    }
-    let mut stream = vec![
-        TokenTree::Term(::Term::new("doc", span)),
-        TokenTree::Op(Op::new('=', Spacing::Alone)),
-        TokenTree::Literal(::Literal::string(comment)),
-    ];
-    for tt in stream.iter_mut() {
-        tt.set_span(span);
-    }
-    trees.push(Group::new(Delimiter::Bracket, stream.into_iter().collect()).into());
-    for tt in trees.iter_mut() {
-        tt.set_span(span);
-    }
-    Ok((rest, trees))
-}
-
-named!(doc_comment_contents -> (&str, bool), alt!(
-    do_parse!(
-        punct!("//!") >>
-        s: take_until_newline_or_eof!() >>
-        ((s, true))
-    )
-    |
-    do_parse!(
-        option!(whitespace) >>
-        peek!(tag!("/*!")) >>
-        s: block_comment >>
-        ((s, true))
-    )
-    |
-    do_parse!(
-        punct!("///") >>
-        not!(tag!("/")) >>
-        s: take_until_newline_or_eof!() >>
-        ((s, false))
-    )
-    |
-    do_parse!(
-        option!(whitespace) >>
-        peek!(tuple!(tag!("/**"), not!(tag!("*")))) >>
-        s: block_comment >>
-        ((s, false))
-    )
-));
diff --git a/third_party/rust/proc-macro2-0.3.5/src/strnom.rs b/third_party/rust/proc-macro2-0.3.5/src/strnom.rs
deleted file mode 100644
index f5dd1456e632..000000000000
--- a/third_party/rust/proc-macro2-0.3.5/src/strnom.rs
+++ /dev/null
@@ -1,391 +0,0 @@
-//! Adapted from [`nom`](https://github.com/Geal/nom).
-
-use std::str::{Bytes, CharIndices, Chars};
-
-use unicode_xid::UnicodeXID;
-
-use imp::LexError;
-
-#[derive(Copy, Clone, Eq, PartialEq)]
-pub struct Cursor<'a> {
-    pub rest: &'a str,
-    #[cfg(procmacro2_semver_exempt)]
-    pub off: u32,
-}
-
-impl<'a> Cursor<'a> {
-    #[cfg(not(procmacro2_semver_exempt))]
-    pub fn advance(&self, amt: usize) -> Cursor<'a> {
-        Cursor {
-            rest: &self.rest[amt..],
-        }
-    }
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn advance(&self, amt: usize) -> Cursor<'a> {
-        Cursor {
-            rest: &self.rest[amt..],
-            off: self.off + (amt as u32),
-        }
-    }
-
-    pub fn find(&self, p: char) -> Option<usize> {
-        self.rest.find(p)
-    }
-
-    pub fn starts_with(&self, s: &str) -> bool {
-        self.rest.starts_with(s)
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.rest.is_empty()
-    }
-
-    pub fn len(&self) -> usize {
-        self.rest.len()
-    }
-
-    pub fn as_bytes(&self) -> &'a [u8] {
-        self.rest.as_bytes()
-    }
-
-    pub fn bytes(&self) -> Bytes<'a> {
-        self.rest.bytes()
-    }
-
-    pub fn chars(&self) -> Chars<'a> {
-        self.rest.chars()
-    }
-
-    pub fn char_indices(&self) -> CharIndices<'a> {
-        self.rest.char_indices()
-    }
-}
-
-pub type PResult<'a, O> = Result<(Cursor<'a>, O), LexError>;
-
-pub fn whitespace(input: Cursor) -> PResult<()> {
-    if input.is_empty() {
-        return Err(LexError);
-    }
-
-    let bytes = input.as_bytes();
-    let mut i = 0;
-    while i < bytes.len() {
-        let s = input.advance(i);
-        if bytes[i] == b'/' {
-            if s.starts_with("//") && (!s.starts_with("///") || s.starts_with("////"))
-                && !s.starts_with("//!")
-            {
-                if let Some(len) = s.find('\n') {
-                    i += len + 1;
-                    continue;
-                }
-                break;
-            } else if s.starts_with("/**/") {
-                i += 4;
-                continue;
-            } else if s.starts_with("/*") && (!s.starts_with("/**") || s.starts_with("/***"))
-                && !s.starts_with("/*!")
-            {
-                let (_, com) = block_comment(s)?;
-                i += com.len();
-                continue;
-            }
-        }
-        match bytes[i] {
-            b' ' | 0x09...0x0d => {
-                i += 1;
-                continue;
-            }
-            b if b <= 0x7f => {}
-            _ => {
-                let ch = s.chars().next().unwrap();
-                if is_whitespace(ch) {
-                    i += ch.len_utf8();
-                    continue;
-                }
-            }
-        }
-        return if i > 0 { Ok((s, ())) } else { Err(LexError) };
-    }
-    Ok((input.advance(input.len()), ()))
-}
-
-pub fn block_comment(input: Cursor) -> PResult<&str> {
-    if !input.starts_with("/*") {
-        return Err(LexError);
-    }
-
-    let mut depth = 0;
-    let bytes = input.as_bytes();
-    let mut i = 0;
-    let upper = bytes.len() - 1;
-    while i < upper {
-        if bytes[i] == b'/' && bytes[i + 1] == b'*' {
-            depth += 1;
-            i += 1; // eat '*'
-        } else if bytes[i] == b'*' && bytes[i + 1] == b'/' {
-            depth -= 1;
-            if depth == 0 {
-                return Ok((input.advance(i + 2), &input.rest[..i + 2]));
-            }
-            i += 1; // eat '/'
-        }
-        i += 1;
-    }
-    Err(LexError)
-}
-
-pub fn skip_whitespace(input: Cursor) -> Cursor {
-    match whitespace(input) {
-        Ok((rest, _)) => rest,
-        Err(LexError) => input,
-    }
-}
-
-fn is_whitespace(ch: char) -> bool {
-    // Rust treats left-to-right mark and right-to-left mark as whitespace
-    ch.is_whitespace() || ch == '\u{200e}' || ch == '\u{200f}'
-}
-
-pub fn word_break(input: Cursor) -> PResult<()> {
-    match input.chars().next() {
-        Some(ch) if UnicodeXID::is_xid_continue(ch) => Err(LexError),
-        Some(_) | None => Ok((input, ())),
-    }
-}
-
-macro_rules! named {
-    ($name:ident -> $o:ty, $submac:ident!( $($args:tt)* )) => {
-        fn $name<'a>(i: Cursor<'a>) -> $crate::strnom::PResult<'a, $o> {
-            $submac!(i, $($args)*)
-        }
-    };
-}
-
-macro_rules! alt {
-    ($i:expr, $e:ident | $($rest:tt)*) => {
-        alt!($i, call!($e) | $($rest)*)
-    };
-
-    ($i:expr, $subrule:ident!( $($args:tt)*) | $($rest:tt)*) => {
-        match $subrule!($i, $($args)*) {
-            res @ Ok(_) => res,
-            _ => alt!($i, $($rest)*)
-        }
-    };
-
-    ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr } | $($rest:tt)+) => {
-        match $subrule!($i, $($args)*) {
-            Ok((i, o)) => Ok((i, $gen(o))),
-            Err(LexError) => alt!($i, $($rest)*)
-        }
-    };
-
-    ($i:expr, $e:ident => { $gen:expr } | $($rest:tt)*) => {
-        alt!($i, call!($e) => { $gen } | $($rest)*)
-    };
-
-    ($i:expr, $e:ident => { $gen:expr }) => {
-        alt!($i, call!($e) => { $gen })
-    };
-
-    ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr }) => {
-        match $subrule!($i, $($args)*) {
-            Ok((i, o)) => Ok((i, $gen(o))),
-            Err(LexError) => Err(LexError),
-        }
-    };
-
-    ($i:expr, $e:ident) => {
-        alt!($i, call!($e))
-    };
-
-    ($i:expr, $subrule:ident!( $($args:tt)*)) => {
-        $subrule!($i, $($args)*)
-    };
-}
-
-macro_rules! do_parse {
-    ($i:expr, ( $($rest:expr),* )) => {
-        Ok(($i, ( $($rest),* )))
-    };
-
-    ($i:expr, $e:ident >> $($rest:tt)*) => {
-        do_parse!($i, call!($e) >> $($rest)*)
-    };
-
-    ($i:expr, $submac:ident!( $($args:tt)* ) >> $($rest:tt)*) => {
-        match $submac!($i, $($args)*) {
-            Err(LexError) => Err(LexError),
-            Ok((i, _)) => do_parse!(i, $($rest)*),
-        }
-    };
-
-    ($i:expr, $field:ident : $e:ident >> $($rest:tt)*) => {
-        do_parse!($i, $field: call!($e) >> $($rest)*)
-    };
-
-    ($i:expr, $field:ident : $submac:ident!( $($args:tt)* ) >> $($rest:tt)*) => {
-        match $submac!($i, $($args)*) {
-            Err(LexError) => Err(LexError),
-            Ok((i, o)) => {
-                let $field = o;
-                do_parse!(i, $($rest)*)
-            },
-        }
-    };
-}
-
-macro_rules! peek {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {
-        match $submac!($i, $($args)*) {
-            Ok((_, o)) => Ok(($i, o)),
-            Err(LexError) => Err(LexError),
-        }
-    };
-}
-
-macro_rules! call {
-    ($i:expr, $fun:expr $(, $args:expr)*) => {
-        $fun($i $(, $args)*)
-    };
-}
-
-macro_rules! option {
-    ($i:expr, $f:expr) => {
-        match $f($i) {
-            Ok((i, o)) => Ok((i, Some(o))),
-            Err(LexError) => Ok(($i, None)),
-        }
-    };
-}
-
-macro_rules! take_until_newline_or_eof {
-    ($i:expr,) => {{
-        if $i.len() == 0 {
-            Ok(($i, ""))
-        } else {
-            match $i.find('\n') {
-                Some(i) => Ok(($i.advance(i), &$i.rest[..i])),
-                None => Ok(($i.advance($i.len()), &$i.rest[..$i.len()])),
-            }
-        }
-    }};
-}
-
-macro_rules! tuple {
-    ($i:expr, $($rest:tt)*) => {
-        tuple_parser!($i, (), $($rest)*)
-    };
-}
-
-/// Do not use directly. Use `tuple!`.
-macro_rules! tuple_parser {
-    ($i:expr, ($($parsed:tt),*), $e:ident, $($rest:tt)*) => {
-        tuple_parser!($i, ($($parsed),*), call!($e), $($rest)*)
-    };
-
-    ($i:expr, (), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => {
-        match $submac!($i, $($args)*) {
-            Err(LexError) => Err(LexError),
-            Ok((i, o)) => tuple_parser!(i, (o), $($rest)*),
-        }
-    };
-
-    ($i:expr, ($($parsed:tt)*), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => {
-        match $submac!($i, $($args)*) {
-            Err(LexError) => Err(LexError),
-            Ok((i, o)) => tuple_parser!(i, ($($parsed)* , o), $($rest)*),
-        }
-    };
-
-    ($i:expr, ($($parsed:tt),*), $e:ident) => {
-        tuple_parser!($i, ($($parsed),*), call!($e))
-    };
-
-    ($i:expr, (), $submac:ident!( $($args:tt)* )) => {
-        $submac!($i, $($args)*)
-    };
-
-    ($i:expr, ($($parsed:expr),*), $submac:ident!( $($args:tt)* )) => {
-        match $submac!($i, $($args)*) {
-            Err(LexError) => Err(LexError),
-            Ok((i, o)) => Ok((i, ($($parsed),*, o)))
-        }
-    };
-
-    ($i:expr, ($($parsed:expr),*)) => {
-        Ok(($i, ($($parsed),*)))
-    };
-}
-
-macro_rules! not {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {
-        match $submac!($i, $($args)*) {
-            Ok((_, _)) => Err(LexError),
-            Err(LexError) => Ok(($i, ())),
-        }
-    };
-}
-
-macro_rules! tag {
-    ($i:expr, $tag:expr) => {
-        if $i.starts_with($tag) {
-            Ok(($i.advance($tag.len()), &$i.rest[..$tag.len()]))
-        } else {
-            Err(LexError)
-        }
-    };
-}
-
-macro_rules! punct {
-    ($i:expr, $punct:expr) => {
-        $crate::strnom::punct($i, $punct)
-    };
-}
-
-/// Do not use directly. Use `punct!`.
-pub fn punct<'a>(input: Cursor<'a>, token: &'static str) -> PResult<'a, &'a str> {
-    let input = skip_whitespace(input);
-    if input.starts_with(token) {
-        Ok((input.advance(token.len()), token))
-    } else {
-        Err(LexError)
-    }
-}
-
-macro_rules! preceded {
-    ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => {
-        match tuple!($i, $submac!($($args)*), $submac2!($($args2)*)) {
-            Ok((remaining, (_, o))) => Ok((remaining, o)),
-            Err(LexError) => Err(LexError),
-        }
-    };
-
-    ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => {
-        preceded!($i, $submac!($($args)*), call!($g))
-    };
-}
-
-macro_rules! delimited {
-    ($i:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)+) => {
-        match tuple_parser!($i, (), $submac!($($args)*), $($rest)*) {
-            Err(LexError) => Err(LexError),
-            Ok((i1, (_, o, _))) => Ok((i1, o))
-        }
-    };
-}
-
-macro_rules! map {
-    ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => {
-        match $submac!($i, $($args)*) {
-            Err(LexError) => Err(LexError),
-            Ok((i, o)) => Ok((i, call!(o, $g)))
-        }
-    };
-
-    ($i:expr, $f:expr, $g:expr) => {
-        map!($i, call!($f), $g)
-    };
-}
diff --git a/third_party/rust/proc-macro2-0.3.5/src/unstable.rs b/third_party/rust/proc-macro2-0.3.5/src/unstable.rs
deleted file mode 100644
index d913df48c94a..000000000000
--- a/third_party/rust/proc-macro2-0.3.5/src/unstable.rs
+++ /dev/null
@@ -1,399 +0,0 @@
-#![cfg_attr(not(procmacro2_semver_exempt), allow(dead_code))]
-
-use std::fmt;
-use std::iter;
-use std::str::FromStr;
-
-use proc_macro;
-
-use {Delimiter, Group, Op, Spacing, TokenTree};
-
-#[derive(Clone)]
-pub struct TokenStream(proc_macro::TokenStream);
-
-pub struct LexError(proc_macro::LexError);
-
-impl TokenStream {
-    pub fn empty() -> TokenStream {
-        TokenStream(proc_macro::TokenStream::empty())
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-}
-
-impl FromStr for TokenStream {
-    type Err = LexError;
-
-    fn from_str(src: &str) -> Result<TokenStream, LexError> {
-        Ok(TokenStream(src.parse().map_err(LexError)?))
-    }
-}
-
-impl fmt::Display for TokenStream {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl From<proc_macro::TokenStream> for TokenStream {
-    fn from(inner: proc_macro::TokenStream) -> TokenStream {
-        TokenStream(inner)
-    }
-}
-
-impl From<TokenStream> for proc_macro::TokenStream {
-    fn from(inner: TokenStream) -> proc_macro::TokenStream {
-        inner.0
-    }
-}
-
-impl From<TokenTree> for TokenStream {
-    fn from(token: TokenTree) -> TokenStream {
-        let tt: proc_macro::TokenTree = match token {
-            TokenTree::Group(tt) => {
-                let delim = match tt.delimiter() {
-                    Delimiter::Parenthesis => proc_macro::Delimiter::Parenthesis,
-                    Delimiter::Bracket => proc_macro::Delimiter::Bracket,
-                    Delimiter::Brace => proc_macro::Delimiter::Brace,
-                    Delimiter::None => proc_macro::Delimiter::None,
-                };
-                let span = tt.span();
-                let mut group = proc_macro::Group::new(delim, tt.stream.inner.0);
-                group.set_span(span.inner.0);
-                group.into()
-            }
-            TokenTree::Op(tt) => {
-                let spacing = match tt.spacing() {
-                    Spacing::Joint => proc_macro::Spacing::Joint,
-                    Spacing::Alone => proc_macro::Spacing::Alone,
-                };
-                let mut op = proc_macro::Op::new(tt.op(), spacing);
-                op.set_span(tt.span().inner.0);
-                op.into()
-            }
-            TokenTree::Term(tt) => tt.inner.term.into(),
-            TokenTree::Literal(tt) => tt.inner.lit.into(),
-        };
-        TokenStream(tt.into())
-    }
-}
-
-impl iter::FromIterator<TokenTree> for TokenStream {
-    fn from_iter<I: IntoIterator<Item = TokenTree>>(streams: I) -> Self {
-        let streams = streams.into_iter().map(TokenStream::from)
-            .flat_map(|t| t.0);
-        TokenStream(streams.collect::<proc_macro::TokenStream>())
-    }
-}
-
-impl fmt::Debug for TokenStream {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl fmt::Debug for LexError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-pub struct TokenTreeIter(proc_macro::token_stream::IntoIter);
-
-impl IntoIterator for TokenStream {
-    type Item = TokenTree;
-    type IntoIter = TokenTreeIter;
-
-    fn into_iter(self) -> TokenTreeIter {
-        TokenTreeIter(self.0.into_iter())
-    }
-}
-
-impl Iterator for TokenTreeIter {
-    type Item = TokenTree;
-
-    fn next(&mut self) -> Option<TokenTree> {
-        let token = self.0.next()?;
-        Some(match token {
-            proc_macro::TokenTree::Group(tt) => {
-                let delim = match tt.delimiter() {
-                    proc_macro::Delimiter::Parenthesis => Delimiter::Parenthesis,
-                    proc_macro::Delimiter::Bracket => Delimiter::Bracket,
-                    proc_macro::Delimiter::Brace => Delimiter::Brace,
-                    proc_macro::Delimiter::None => Delimiter::None,
-                };
-                let stream = ::TokenStream::_new(TokenStream(tt.stream()));
-                let mut g = Group::new(delim, stream);
-                g.set_span(::Span::_new(Span(tt.span())));
-                g.into()
-            }
-            proc_macro::TokenTree::Op(tt) => {
-                let spacing = match tt.spacing() {
-                    proc_macro::Spacing::Joint => Spacing::Joint,
-                    proc_macro::Spacing::Alone => Spacing::Alone,
-                };
-                let mut o = Op::new(tt.op(), spacing);
-                o.set_span(::Span::_new(Span(tt.span())));
-                o.into()
-            }
-            proc_macro::TokenTree::Term(s) => {
-                ::Term::_new(Term {
-                    term: s,
-                }).into()
-            }
-            proc_macro::TokenTree::Literal(l) => {
-                ::Literal::_new(Literal {
-                    lit: l,
-                }).into()
-            }
-        })
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.0.size_hint()
-    }
-}
-
-impl fmt::Debug for TokenTreeIter {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("TokenTreeIter").finish()
-    }
-}
-
-#[derive(Clone, PartialEq, Eq)]
-pub struct FileName(String);
-
-impl fmt::Display for FileName {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-// NOTE: We have to generate our own filename object here because we can't wrap
-// the one provided by proc_macro.
-#[derive(Clone, PartialEq, Eq)]
-pub struct SourceFile(proc_macro::SourceFile, FileName);
-
-impl SourceFile {
-    fn new(sf: proc_macro::SourceFile) -> Self {
-        let filename = FileName(sf.path().to_string());
-        SourceFile(sf, filename)
-    }
-
-    /// Get the path to this source file as a string.
-    pub fn path(&self) -> &FileName {
-        &self.1
-    }
-
-    pub fn is_real(&self) -> bool {
-        self.0.is_real()
-    }
-}
-
-impl AsRef<FileName> for SourceFile {
-    fn as_ref(&self) -> &FileName {
-        self.path()
-    }
-}
-
-impl fmt::Debug for SourceFile {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-pub struct LineColumn {
-    pub line: usize,
-    pub column: usize,
-}
-
-#[derive(Copy, Clone)]
-pub struct Span(proc_macro::Span);
-
-impl From<proc_macro::Span> for ::Span {
-    fn from(proc_span: proc_macro::Span) -> ::Span {
-        ::Span::_new(Span(proc_span))
-    }
-}
-
-impl Span {
-    pub fn call_site() -> Span {
-        Span(proc_macro::Span::call_site())
-    }
-
-    pub fn def_site() -> Span {
-        Span(proc_macro::Span::def_site())
-    }
-
-    pub fn resolved_at(&self, other: Span) -> Span {
-        Span(self.0.resolved_at(other.0))
-    }
-
-    pub fn located_at(&self, other: Span) -> Span {
-        Span(self.0.located_at(other.0))
-    }
-
-    pub fn unstable(self) -> proc_macro::Span {
-        self.0
-    }
-
-    pub fn source_file(&self) -> SourceFile {
-        SourceFile::new(self.0.source_file())
-    }
-
-    pub fn start(&self) -> LineColumn {
-        let proc_macro::LineColumn { line, column } = self.0.start();
-        LineColumn { line, column }
-    }
-
-    pub fn end(&self) -> LineColumn {
-        let proc_macro::LineColumn { line, column } = self.0.end();
-        LineColumn { line, column }
-    }
-
-    pub fn join(&self, other: Span) -> Option<Span> {
-        self.0.join(other.0).map(Span)
-    }
-
-    pub fn eq(&self, other: &Span) -> bool {
-        self.0.eq(&other.0)
-    }
-}
-
-impl fmt::Debug for Span {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-#[derive(Copy, Clone)]
-pub struct Term {
-    term: proc_macro::Term,
-}
-
-impl Term {
-    pub fn new(string: &str, span: Span) -> Term {
-        Term {
-            term: proc_macro::Term::new(string, span.0),
-        }
-    }
-
-    pub fn as_str(&self) -> &str {
-        self.term.as_str()
-    }
-
-    pub fn span(&self) -> Span {
-        Span(self.term.span())
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.term.set_span(span.0);
-    }
-}
-
-impl fmt::Debug for Term {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.term.fmt(f)
-    }
-}
-
-#[derive(Clone)]
-pub struct Literal {
-    lit: proc_macro::Literal,
-}
-
-macro_rules! suffixed_numbers {
-    ($($name:ident => $kind:ident,)*) => ($(
-        pub fn $name(n: $kind) -> Literal {
-            Literal::_new(proc_macro::Literal::$name(n))
-        }
-    )*)
-}
-
-macro_rules! unsuffixed_integers {
-    ($($name:ident => $kind:ident,)*) => ($(
-        pub fn $name(n: $kind) -> Literal {
-            Literal::_new(proc_macro::Literal::$name(n))
-        }
-    )*)
-}
-
-impl Literal {
-    fn _new(lit: proc_macro::Literal) -> Literal {
-        Literal {
-            lit,
-        }
-    }
-
-    suffixed_numbers! {
-        u8_suffixed => u8,
-        u16_suffixed => u16,
-        u32_suffixed => u32,
-        u64_suffixed => u64,
-        usize_suffixed => usize,
-        i8_suffixed => i8,
-        i16_suffixed => i16,
-        i32_suffixed => i32,
-        i64_suffixed => i64,
-        isize_suffixed => isize,
-
-        f32_suffixed => f32,
-        f64_suffixed => f64,
-    }
-
-    unsuffixed_integers! {
-        u8_unsuffixed => u8,
-        u16_unsuffixed => u16,
-        u32_unsuffixed => u32,
-        u64_unsuffixed => u64,
-        usize_unsuffixed => usize,
-        i8_unsuffixed => i8,
-        i16_unsuffixed => i16,
-        i32_unsuffixed => i32,
-        i64_unsuffixed => i64,
-        isize_unsuffixed => isize,
-    }
-
-    pub fn f32_unsuffixed(f: f32) -> Literal {
-        Literal::_new(proc_macro::Literal::f32_unsuffixed(f))
-    }
-
-    pub fn f64_unsuffixed(f: f64) -> Literal {
-        Literal::_new(proc_macro::Literal::f64_unsuffixed(f))
-    }
-
-
-    pub fn string(t: &str) -> Literal {
-        Literal::_new(proc_macro::Literal::string(t))
-    }
-
-    pub fn character(t: char) -> Literal {
-        Literal::_new(proc_macro::Literal::character(t))
-    }
-
-    pub fn byte_string(bytes: &[u8]) -> Literal {
-        Literal::_new(proc_macro::Literal::byte_string(bytes))
-    }
-
-    pub fn span(&self) -> Span {
-        Span(self.lit.span())
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.lit.set_span(span.0);
-    }
-}
-
-impl fmt::Display for Literal {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.lit.fmt(f)
-    }
-}
-
-impl fmt::Debug for Literal {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.lit.fmt(f)
-    }
-}
diff --git a/third_party/rust/proc-macro2-0.3.5/tests/test.rs b/third_party/rust/proc-macro2-0.3.5/tests/test.rs
deleted file mode 100644
index 7699d53d1d8e..000000000000
--- a/third_party/rust/proc-macro2-0.3.5/tests/test.rs
+++ /dev/null
@@ -1,235 +0,0 @@
-extern crate proc_macro2;
-
-use std::str::{self, FromStr};
-
-use proc_macro2::{Literal, Span, Term, TokenStream, TokenTree};
-
-#[test]
-fn symbols() {
-    assert_eq!(Term::new("foo", Span::call_site()).as_str(), "foo");
-    assert_eq!(Term::new("bar", Span::call_site()).as_str(), "bar");
-}
-
-#[test]
-fn literals() {
-    assert_eq!(Literal::string("foo").to_string(), "\"foo\"");
-    assert_eq!(Literal::string("\"").to_string(), "\"\\\"\"");
-    assert_eq!(Literal::f32_unsuffixed(10.0).to_string(), "10.0");
-}
-
-#[test]
-fn roundtrip() {
-    fn roundtrip(p: &str) {
-        println!("parse: {}", p);
-        let s = p.parse::<TokenStream>().unwrap().to_string();
-        println!("first: {}", s);
-        let s2 = s.to_string().parse::<TokenStream>().unwrap().to_string();
-        assert_eq!(s, s2);
-    }
-    roundtrip("a");
-    roundtrip("<<");
-    roundtrip("<<=");
-    roundtrip(
-        "
-        1
-        1.0
-        1f32
-        2f64
-        1usize
-        4isize
-        4e10
-        1_000
-        1_0i32
-        8u8
-        9
-        0
-        0xffffffffffffffffffffffffffffffff
-    ",
-    );
-    roundtrip("'a");
-    roundtrip("'static");
-    roundtrip("'\\u{10__FFFF}'");
-    roundtrip("\"\\u{10_F0FF__}foo\\u{1_0_0_0__}\"");
-}
-
-#[test]
-fn fail() {
-    fn fail(p: &str) {
-        if p.parse::<TokenStream>().is_ok() {
-            panic!("should have failed to parse: {}", p);
-        }
-    }
-    fail("1x");
-    fail("1u80");
-    fail("1f320");
-    fail("' static");
-    fail("'mut");
-    fail("r#1");
-    fail("r#_");
-}
-
-#[cfg(procmacro2_semver_exempt)]
-#[test]
-fn span_test() {
-    use proc_macro2::TokenTree;
-
-    fn check_spans(p: &str, mut lines: &[(usize, usize, usize, usize)]) {
-        let ts = p.parse::<TokenStream>().unwrap();
-        check_spans_internal(ts, &mut lines);
-    }
-
-    fn check_spans_internal(ts: TokenStream, lines: &mut &[(usize, usize, usize, usize)]) {
-        for i in ts {
-            if let Some((&(sline, scol, eline, ecol), rest)) = lines.split_first() {
-                *lines = rest;
-
-                let start = i.span().start();
-                assert_eq!(start.line, sline, "sline did not match for {}", i);
-                assert_eq!(start.column, scol, "scol did not match for {}", i);
-
-                let end = i.span().end();
-                assert_eq!(end.line, eline, "eline did not match for {}", i);
-                assert_eq!(end.column, ecol, "ecol did not match for {}", i);
-
-                match i {
-                    TokenTree::Group(ref g) => {
-                        check_spans_internal(g.stream().clone(), lines);
-                    }
-                    _ => {}
-                }
-            }
-        }
-    }
-
-    check_spans(
-        "\
-/// This is a document comment
-testing 123
-{
-  testing 234
-}",
-        &[
-            (1, 0, 1, 30),  // #
-            (1, 0, 1, 30),  // [ ... ]
-            (1, 0, 1, 30),  // doc
-            (1, 0, 1, 30),  // =
-            (1, 0, 1, 30),  // "This is..."
-            (2, 0, 2, 7),   // testing
-            (2, 8, 2, 11),  // 123
-            (3, 0, 5, 1),   // { ... }
-            (4, 2, 4, 9),   // testing
-            (4, 10, 4, 13), // 234
-        ],
-    );
-}
-
-#[cfg(procmacro2_semver_exempt)]
-#[cfg(not(feature = "nightly"))]
-#[test]
-fn default_span() {
-    let start = Span::call_site().start();
-    assert_eq!(start.line, 1);
-    assert_eq!(start.column, 0);
-    let end = Span::call_site().end();
-    assert_eq!(end.line, 1);
-    assert_eq!(end.column, 0);
-    let source_file = Span::call_site().source_file();
-    assert_eq!(source_file.path().to_string(), "<unspecified>");
-    assert!(!source_file.is_real());
-}
-
-#[cfg(procmacro2_semver_exempt)]
-#[test]
-fn span_join() {
-    let source1 = "aaa\nbbb"
-        .parse::<TokenStream>()
-        .unwrap()
-        .into_iter()
-        .collect::<Vec<_>>();
-    let source2 = "ccc\nddd"
-        .parse::<TokenStream>()
-        .unwrap()
-        .into_iter()
-        .collect::<Vec<_>>();
-
-    assert!(source1[0].span().source_file() != source2[0].span().source_file());
-    assert_eq!(
-        source1[0].span().source_file(),
-        source1[1].span().source_file()
-    );
-
-    let joined1 = source1[0].span().join(source1[1].span());
-    let joined2 = source1[0].span().join(source2[0].span());
-    assert!(joined1.is_some());
-    assert!(joined2.is_none());
-
-    let start = joined1.unwrap().start();
-    let end = joined1.unwrap().end();
-    assert_eq!(start.line, 1);
-    assert_eq!(start.column, 0);
-    assert_eq!(end.line, 2);
-    assert_eq!(end.column, 3);
-
-    assert_eq!(
-        joined1.unwrap().source_file(),
-        source1[0].span().source_file()
-    );
-}
-
-#[test]
-fn no_panic() {
-    let s = str::from_utf8(b"b\'\xc2\x86  \x00\x00\x00^\"").unwrap();
-    assert!(s.parse::<proc_macro2::TokenStream>().is_err());
-}
-
-#[test]
-fn tricky_doc_comment() {
-    let stream = "/**/".parse::<proc_macro2::TokenStream>().unwrap();
-    let tokens = stream.into_iter().collect::<Vec<_>>();
-    assert!(tokens.is_empty(), "not empty -- {:?}", tokens);
-
-    let stream = "/// doc".parse::<proc_macro2::TokenStream>().unwrap();
-    let tokens = stream.into_iter().collect::<Vec<_>>();
-    assert!(tokens.len() == 2, "not length 2 -- {:?}", tokens);
-    match tokens[0] {
-        proc_macro2::TokenTree::Op(ref tt) => assert_eq!(tt.op(), '#'),
-        _ => panic!("wrong token {:?}", tokens[0]),
-    }
-    let mut tokens = match tokens[1] {
-        proc_macro2::TokenTree::Group(ref tt) => {
-            assert_eq!(tt.delimiter(), proc_macro2::Delimiter::Bracket);
-            tt.stream().into_iter()
-        }
-        _ => panic!("wrong token {:?}", tokens[0]),
-    };
-
-    match tokens.next().unwrap() {
-        proc_macro2::TokenTree::Term(ref tt) => assert_eq!(tt.as_str(), "doc"),
-        t => panic!("wrong token {:?}", t),
-    }
-    match tokens.next().unwrap() {
-        proc_macro2::TokenTree::Op(ref tt) => assert_eq!(tt.op(), '='),
-        t => panic!("wrong token {:?}", t),
-    }
-    match tokens.next().unwrap() {
-        proc_macro2::TokenTree::Literal(ref tt) => {
-            assert_eq!(tt.to_string(), "\" doc\"");
-        }
-        t => panic!("wrong token {:?}", t),
-    }
-    assert!(tokens.next().is_none());
-
-    let stream = "//! doc".parse::<proc_macro2::TokenStream>().unwrap();
-    let tokens = stream.into_iter().collect::<Vec<_>>();
-    assert!(tokens.len() == 3, "not length 3 -- {:?}", tokens);
-}
-
-#[test]
-fn raw_identifier() {
-    let mut tts = TokenStream::from_str("r#dyn").unwrap().into_iter();
-    match tts.next().unwrap() {
-        TokenTree::Term(raw) => assert_eq!("r#dyn", raw.as_str()),
-        wrong => panic!("wrong token {:?}", wrong),
-    }
-    assert!(tts.next().is_none());
-}
diff --git a/third_party/rust/quote-0.5.2/.cargo-checksum.json b/third_party/rust/quote-0.5.2/.cargo-checksum.json
deleted file mode 100644
index 01b9be2bcadf..000000000000
--- a/third_party/rust/quote-0.5.2/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"8078663280ca2bbda17459a3c2629b84aee2b9904a83f83b87f1bf60e096692f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"bdb5b5375e8cd37b75b4e0269b8fa9fb22776df9762c1df11ec88eb4cd2dc097","src/lib.rs":"7f72accca88679bc49cc8aedf7d96c922288e66a3d63bf1d06f5da262f02a4ad","src/to_tokens.rs":"6eb18c100701d1f9556cd21b1f2faca3316e85029345274dcfe7691e7ffa254d","src/tokens.rs":"a4939fc092d6466d5a2e75474886152e880586b12e057c0d7bf7b3f22428b2de","tests/test.rs":"35bac59a637a8dc3919df51bfa0957b6f964f408cc63c7a81a3e759ab8557f55"},"package":"9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"}
\ No newline at end of file
diff --git a/third_party/rust/quote-0.5.2/Cargo.toml b/third_party/rust/quote-0.5.2/Cargo.toml
deleted file mode 100644
index d565c45bba2f..000000000000
--- a/third_party/rust/quote-0.5.2/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "quote"
-version = "0.5.2"
-authors = ["David Tolnay <dtolnay@gmail.com>"]
-include = ["Cargo.toml", "src/**/*.rs", "tests/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
-description = "Quasi-quoting macro quote!(...)"
-documentation = "https://docs.rs/quote/"
-readme = "README.md"
-keywords = ["syn"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/dtolnay/quote"
-[dependencies.proc-macro2]
-version = "0.3"
-default-features = false
-
-[features]
-default = ["proc-macro"]
-proc-macro = ["proc-macro2/proc-macro"]
diff --git a/third_party/rust/quote-0.5.2/LICENSE-APACHE b/third_party/rust/quote-0.5.2/LICENSE-APACHE
deleted file mode 100644
index 16fe87b06e80..000000000000
--- a/third_party/rust/quote-0.5.2/LICENSE-APACHE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/third_party/rust/quote-0.5.2/LICENSE-MIT b/third_party/rust/quote-0.5.2/LICENSE-MIT
deleted file mode 100644
index 40b8817a47be..000000000000
--- a/third_party/rust/quote-0.5.2/LICENSE-MIT
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2016 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/third_party/rust/quote-0.5.2/README.md b/third_party/rust/quote-0.5.2/README.md
deleted file mode 100644
index e38319cb5459..000000000000
--- a/third_party/rust/quote-0.5.2/README.md
+++ /dev/null
@@ -1,135 +0,0 @@
-Rust Quasi-Quoting
-==================
-
-[![Build Status](https://api.travis-ci.org/dtolnay/quote.svg?branch=master)](https://travis-ci.org/dtolnay/quote)
-[![Latest Version](https://img.shields.io/crates/v/quote.svg)](https://crates.io/crates/quote)
-[![Rust Documentation](https://img.shields.io/badge/api-rustdoc-blue.svg)](https://docs.rs/quote/)
-
-This crate provides the [`quote!`] macro for turning Rust syntax tree data
-structures into tokens of source code.
-
-[`quote!`]: https://docs.rs/quote/0.5/quote/macro.quote.html
-
-Procedural macros in Rust receive a stream of tokens as input, execute arbitrary
-Rust code to determine how to manipulate those tokens, and produce a stream of
-tokens to hand back to the compiler to compile into the caller's crate.
-Quasi-quoting is a solution to one piece of that -- producing tokens to return
-to the compiler.
-
-The idea of quasi-quoting is that we write *code* that we treat as *data*.
-Within the `quote!` macro, we can write what looks like code to our text editor
-or IDE. We get all the benefits of the editor's brace matching, syntax
-highlighting, indentation, and maybe autocompletion. But rather than compiling
-that as code into the current crate, we can treat it as data, pass it around,
-mutate it, and eventually hand it back to the compiler as tokens to compile into
-the macro caller's crate.
-
-This crate is motivated by the procedural macro use case, but is a
-general-purpose Rust quasi-quoting library and is not specific to procedural
-macros.
-
-*Version requirement: Quote supports any compiler version back to Rust's very
-first support for procedural macros in Rust 1.15.0.*
-
-```toml
-[dependencies]
-quote = "0.5"
-```
-
-```rust
-#[macro_use]
-extern crate quote;
-```
-
-## Syntax
-
-The quote crate provides a [`quote!`] macro within which you can write Rust code
-that gets packaged into a [`quote::Tokens`] and can be treated as data. You
-should think of `Tokens` as representing a fragment of Rust source code. Call
-`to_string()` on a `Tokens` to get back the fragment of source code as a string,
-or call `into()` to stream them as a `TokenStream` back to the compiler in a
-procedural macro.
-
-[`quote::Tokens`]: https://docs.rs/quote/0.5/quote/struct.Tokens.html
-
-Within the `quote!` macro, interpolation is done with `#var`. Any type
-implementing the [`quote::ToTokens`] trait can be interpolated. This includes
-most Rust primitive types as well as most of the syntax tree types from [`syn`].
-
-[`quote::ToTokens`]: https://docs.rs/quote/0.5/quote/trait.ToTokens.html
-[`syn`]: https://github.com/dtolnay/syn
-
-```rust
-let tokens = quote! {
-    struct SerializeWith #generics #where_clause {
-        value: &'a #field_ty,
-        phantom: ::std::marker::PhantomData<#item_ty>,
-    }
-
-    impl #generics serde::Serialize for SerializeWith #generics #where_clause {
-        fn serialize<S>(&self, s: &mut S) -> Result<(), S::Error>
-            where S: serde::Serializer
-        {
-            #path(self.value, s)
-        }
-    }
-
-    SerializeWith {
-        value: #value,
-        phantom: ::std::marker::PhantomData::<#item_ty>,
-    }
-};
-```
-
-## Repetition
-
-Repetition is done using `#(...)*` or `#(...),*` similar to `macro_rules!`. This
-iterates through the elements of any variable interpolated within the repetition
-and inserts a copy of the repetition body for each one. The variables in an
-interpolation may be anything that implements `IntoIterator`, including `Vec` or
-a pre-existing iterator.
-
-- `#(#var)*` — no separators
-- `#(#var),*` — the character before the asterisk is used as a separator
-- `#( struct #var; )*` — the repetition can contain other things
-- `#( #k => println!("{}", #v), )*` — even multiple interpolations
-
-Note that there is a difference between `#(#var ,)*` and `#(#var),*`—the latter
-does not produce a trailing comma. This matches the behavior of delimiters in
-`macro_rules!`.
-
-## Hygiene
-
-Any interpolated tokens preserve the `Span` information provided by their
-`ToTokens` implementation. Tokens that originate within a `quote!` invocation
-are spanned with [`Span::def_site()`].
-
-[`Span::def_site()`]: https://docs.rs/proc-macro2/0.2/proc_macro2/struct.Span.html#method.def_site
-
-A different span can be provided explicitly through the [`quote_spanned!`]
-macro.
-
-[`quote_spanned!`]: https://docs.rs/quote/0.5/quote/macro.quote_spanned.html
-
-### Recursion limit
-
-The `quote!` macro relies on deep recursion so some large invocations may fail
-with "recursion limit reached" when you compile. If it fails, bump up the
-recursion limit by adding `#![recursion_limit = "128"]` to your crate. An even
-higher limit may be necessary for especially large invocations. You don't need
-this unless the compiler tells you that you need it.
-
-## License
-
-Licensed under either of
-
- * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in this crate by you, as defined in the Apache-2.0 license, shall
-be dual licensed as above, without any additional terms or conditions.
diff --git a/third_party/rust/quote-0.5.2/src/lib.rs b/third_party/rust/quote-0.5.2/src/lib.rs
deleted file mode 100644
index 492186bdb322..000000000000
--- a/third_party/rust/quote-0.5.2/src/lib.rs
+++ /dev/null
@@ -1,511 +0,0 @@
-//! This crate provides the [`quote!`] macro for turning Rust syntax tree data
-//! structures into tokens of source code.
-//!
-//! [`quote!`]: macro.quote.html
-//!
-//! Procedural macros in Rust receive a stream of tokens as input, execute
-//! arbitrary Rust code to determine how to manipulate those tokens, and produce
-//! a stream of tokens to hand back to the compiler to compile into the caller's
-//! crate. Quasi-quoting is a solution to one piece of that -- producing tokens
-//! to return to the compiler.
-//!
-//! The idea of quasi-quoting is that we write *code* that we treat as *data*.
-//! Within the `quote!` macro, we can write what looks like code to our text
-//! editor or IDE. We get all the benefits of the editor's brace matching,
-//! syntax highlighting, indentation, and maybe autocompletion. But rather than
-//! compiling that as code into the current crate, we can treat it as data, pass
-//! it around, mutate it, and eventually hand it back to the compiler as tokens
-//! to compile into the macro caller's crate.
-//!
-//! This crate is motivated by the procedural macro use case, but is a
-//! general-purpose Rust quasi-quoting library and is not specific to procedural
-//! macros.
-//!
-//! *Version requirement: Quote supports any compiler version back to Rust's
-//! very first support for procedural macros in Rust 1.15.0.*
-//!
-//! ```toml
-//! [dependencies]
-//! quote = "0.5"
-//! ```
-//!
-//! ```
-//! #[macro_use]
-//! extern crate quote;
-//! #
-//! # fn main() {}
-//! ```
-//!
-//! # Example
-//!
-//! The following quasi-quoted block of code is something you might find in [a]
-//! procedural macro having to do with data structure serialization. The `#var`
-//! syntax performs interpolation of runtime variables into the quoted tokens.
-//! Check out the documentation of the [`quote!`] macro for more detail about
-//! the syntax. See also the [`quote_spanned!`] macro which is important for
-//! implementing hygienic procedural macros.
-//!
-//! [a]: https://serde.rs/
-//! [`quote_spanned!`]: macro.quote_spanned.html
-//!
-//! ```
-//! # #[macro_use]
-//! # extern crate quote;
-//! #
-//! # fn main() {
-//! #     let generics = "";
-//! #     let where_clause = "";
-//! #     let field_ty = "";
-//! #     let item_ty = "";
-//! #     let path = "";
-//! #     let value = "";
-//! #
-//! let tokens = quote! {
-//!     struct SerializeWith #generics #where_clause {
-//!         value: &'a #field_ty,
-//!         phantom: ::std::marker::PhantomData<#item_ty>,
-//!     }
-//!
-//!     impl #generics serde::Serialize for SerializeWith #generics #where_clause {
-//!         fn serialize<S>(&self, s: &mut S) -> Result<(), S::Error>
-//!             where S: serde::Serializer
-//!         {
-//!             #path(self.value, s)
-//!         }
-//!     }
-//!
-//!     SerializeWith {
-//!         value: #value,
-//!         phantom: ::std::marker::PhantomData::<#item_ty>,
-//!     }
-//! };
-//! #
-//! # }
-//! ```
-//!
-//! ## Recursion limit
-//!
-//! The `quote!` macro relies on deep recursion so some large invocations may
-//! fail with "recursion limit reached" when you compile. If it fails, bump up
-//! the recursion limit by adding `#![recursion_limit = "128"]` to your crate.
-//! An even higher limit may be necessary for especially large invocations.
-
-// Quote types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/quote/0.5.2")]
-
-#[cfg(feature = "proc-macro")]
-extern crate proc_macro;
-extern crate proc_macro2;
-
-mod tokens;
-pub use tokens::Tokens;
-
-mod to_tokens;
-pub use to_tokens::ToTokens;
-
-// Not public API.
-#[doc(hidden)]
-pub mod __rt {
-    // Not public API.
-    pub use proc_macro2::*;
-
-    // Not public API.
-    pub fn parse(tokens: &mut ::Tokens, span: Span, s: &str) {
-        let s: TokenStream = s.parse().expect("invalid token stream");
-        tokens.append_all(s.into_iter().map(|mut t| {
-            t.set_span(span);
-            t
-        }));
-    }
-}
-
-/// The whole point.
-///
-/// Performs variable interpolation against the input and produces it as
-/// [`Tokens`]. For returning tokens to the compiler in a procedural macro, use
-/// `into()` to build a `TokenStream`.
-///
-/// [`Tokens`]: struct.Tokens.html
-///
-/// # Interpolation
-///
-/// Variable interpolation is done with `#var` (similar to `$var` in
-/// `macro_rules!` macros). This grabs the `var` variable that is currently in
-/// scope and inserts it in that location in the output tokens. The variable
-/// must implement the [`ToTokens`] trait.
-///
-/// [`ToTokens`]: trait.ToTokens.html
-///
-/// Repetition is done using `#(...)*` or `#(...),*` again similar to
-/// `macro_rules!`. This iterates through the elements of any variable
-/// interpolated within the repetition and inserts a copy of the repetition body
-/// for each one. The variables in an interpolation may be anything that
-/// implements `IntoIterator`, including `Vec` or a pre-existing iterator.
-///
-/// - `#(#var)*` — no separators
-/// - `#(#var),*` — the character before the asterisk is used as a separator
-/// - `#( struct #var; )*` — the repetition can contain other tokens
-/// - `#( #k => println!("{}", #v), )*` — even multiple interpolations
-///
-/// # Hygiene
-///
-/// Any interpolated tokens preserve the `Span` information provided by their
-/// `ToTokens` implementation. Tokens that originate within the `quote!`
-/// invocation are spanned with [`Span::call_site()`].
-///
-/// [`Span::call_site()`]: https://docs.rs/proc-macro2/0.2/proc_macro2/struct.Span.html#method.call_site
-///
-/// A different span can be provided through the [`quote_spanned!`] macro.
-///
-/// [`quote_spanned!`]: macro.quote_spanned.html
-///
-/// # Example
-///
-/// ```
-/// # #[cfg(feature = "proc-macro")]
-/// extern crate proc_macro;
-/// # #[cfg(not(feature = "proc-macro"))]
-/// # extern crate proc_macro2 as proc_macro;
-///
-/// #[macro_use]
-/// extern crate quote;
-///
-/// use proc_macro::TokenStream;
-///
-/// # const IGNORE_TOKENS: &'static str = stringify! {
-/// #[proc_macro_derive(HeapSize)]
-/// # };
-/// pub fn derive_heap_size(input: TokenStream) -> TokenStream {
-///     // Parse the input and figure out what implementation to generate...
-///     # const IGNORE_TOKENS: &'static str = stringify! {
-///     let name = /* ... */;
-///     let expr = /* ... */;
-///     # };
-///     #
-///     # let name = 0;
-///     # let expr = 0;
-///
-///     let expanded = quote! {
-///         // The generated impl.
-///         impl ::heapsize::HeapSize for #name {
-///             fn heap_size_of_children(&self) -> usize {
-///                 #expr
-///             }
-///         }
-///     };
-///
-///     // Hand the output tokens back to the compiler.
-///     expanded.into()
-/// }
-/// #
-/// # fn main() {}
-/// ```
-#[macro_export]
-macro_rules! quote {
-    ($($tt:tt)*) => (quote_spanned!($crate::__rt::Span::call_site()=> $($tt)*));
-}
-
-/// Same as `quote!`, but applies a given span to all tokens originating within
-/// the macro invocation.
-///
-/// # Syntax
-///
-/// A span expression of type [`Span`], followed by `=>`, followed by the tokens
-/// to quote. The span expression should be brief -- use a variable for anything
-/// more than a few characters. There should be no space before the `=>` token.
-///
-/// [`Span`]: https://docs.rs/proc-macro2/0.2/proc_macro2/struct.Span.html
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate quote;
-/// # extern crate proc_macro2;
-/// #
-/// # use proc_macro2::Span;
-/// #
-/// # fn main() {
-/// # const IGNORE_TOKENS: &'static str = stringify! {
-/// let span = /* ... */;
-/// # };
-/// # let span = Span::call_site();
-/// # let init = 0;
-///
-/// // On one line, use parentheses.
-/// let tokens = quote_spanned!(span=> Box::into_raw(Box::new(#init)));
-///
-/// // On multiple lines, place the span at the top and use braces.
-/// let tokens = quote_spanned! {span=>
-///     Box::into_raw(Box::new(#init))
-/// };
-/// # }
-/// ```
-///
-/// The lack of space before the `=>` should look jarring to Rust programmers
-/// and this is intentional. The formatting is designed to be visibly
-/// off-balance and draw the eye a particular way, due to the span expression
-/// being evaluated in the context of the procedural macro and the remaining
-/// tokens being evaluated in the generated code.
-///
-/// # Hygiene
-///
-/// Any interpolated tokens preserve the `Span` information provided by their
-/// `ToTokens` implementation. Tokens that originate within the `quote_spanned!`
-/// invocation are spanned with the given span argument.
-///
-/// # Example
-///
-/// The following procedural macro code uses `quote_spanned!` to assert that a
-/// particular Rust type implements the [`Sync`] trait so that references can be
-/// safely shared between threads.
-///
-/// [`Sync`]: https://doc.rust-lang.org/std/marker/trait.Sync.html
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate quote;
-/// # extern crate proc_macro2;
-/// #
-/// # use quote::{Tokens, ToTokens};
-/// # use proc_macro2::Span;
-/// #
-/// # struct Type;
-/// #
-/// # impl Type {
-/// #     fn span(&self) -> Span {
-/// #         Span::call_site()
-/// #     }
-/// # }
-/// #
-/// # impl ToTokens for Type {
-/// #     fn to_tokens(&self, _tokens: &mut Tokens) {}
-/// # }
-/// #
-/// # fn main() {
-/// # let ty = Type;
-/// # let call_site = Span::call_site();
-/// #
-/// let ty_span = ty.span();
-/// let assert_sync = quote_spanned! {ty_span=>
-///     struct _AssertSync where #ty: Sync;
-/// };
-/// # }
-/// ```
-///
-/// If the assertion fails, the user will see an error like the following. The
-/// input span of their type is hightlighted in the error.
-///
-/// ```text
-/// error[E0277]: the trait bound `*const (): std::marker::Sync` is not satisfied
-///   --> src/main.rs:10:21
-///    |
-/// 10 |     static ref PTR: *const () = &();
-///    |                     ^^^^^^^^^ `*const ()` cannot be shared between threads safely
-/// ```
-///
-/// In this example it is important for the where-clause to be spanned with the
-/// line/column information of the user's input type so that error messages are
-/// placed appropriately by the compiler. But it is also incredibly important
-/// that `Sync` resolves at the macro definition site and not the macro call
-/// site. If we resolve `Sync` at the same span that the user's type is going to
-/// be resolved, then they could bypass our check by defining their own trait
-/// named `Sync` that is implemented for their type.
-#[macro_export]
-macro_rules! quote_spanned {
-    ($span:expr=> $($tt:tt)*) => {
-        {
-            let mut _s = $crate::Tokens::new();
-            let _span = $span;
-            quote_each_token!(_s _span $($tt)*);
-            _s
-        }
-    };
-}
-
-// Extract the names of all #metavariables and pass them to the $finish macro.
-//
-// in:   pounded_var_names!(then () a #b c #( #d )* #e)
-// out:  then!(() b d e)
-#[macro_export]
-#[doc(hidden)]
-macro_rules! pounded_var_names {
-    ($finish:ident ($($found:ident)*) # ( $($inner:tt)* ) $($rest:tt)*) => {
-        pounded_var_names!($finish ($($found)*) $($inner)* $($rest)*)
-    };
-
-    ($finish:ident ($($found:ident)*) # [ $($inner:tt)* ] $($rest:tt)*) => {
-        pounded_var_names!($finish ($($found)*) $($inner)* $($rest)*)
-    };
-
-    ($finish:ident ($($found:ident)*) # { $($inner:tt)* } $($rest:tt)*) => {
-        pounded_var_names!($finish ($($found)*) $($inner)* $($rest)*)
-    };
-
-    ($finish:ident ($($found:ident)*) # $first:ident $($rest:tt)*) => {
-        pounded_var_names!($finish ($($found)* $first) $($rest)*)
-    };
-
-    ($finish:ident ($($found:ident)*) ( $($inner:tt)* ) $($rest:tt)*) => {
-        pounded_var_names!($finish ($($found)*) $($inner)* $($rest)*)
-    };
-
-    ($finish:ident ($($found:ident)*) [ $($inner:tt)* ] $($rest:tt)*) => {
-        pounded_var_names!($finish ($($found)*) $($inner)* $($rest)*)
-    };
-
-    ($finish:ident ($($found:ident)*) { $($inner:tt)* } $($rest:tt)*) => {
-        pounded_var_names!($finish ($($found)*) $($inner)* $($rest)*)
-    };
-
-    ($finish:ident ($($found:ident)*) $ignore:tt $($rest:tt)*) => {
-        pounded_var_names!($finish ($($found)*) $($rest)*)
-    };
-
-    ($finish:ident ($($found:ident)*)) => {
-        $finish!(() $($found)*)
-    };
-}
-
-// in:   nested_tuples_pat!(() a b c d e)
-// out:  ((((a b) c) d) e)
-//
-// in:   nested_tuples_pat!(() a)
-// out:  a
-#[macro_export]
-#[doc(hidden)]
-macro_rules! nested_tuples_pat {
-    (()) => {
-        &()
-    };
-
-    (() $first:ident $($rest:ident)*) => {
-        nested_tuples_pat!(($first) $($rest)*)
-    };
-
-    (($pat:pat) $first:ident $($rest:ident)*) => {
-        nested_tuples_pat!((($pat, $first)) $($rest)*)
-    };
-
-    (($done:pat)) => {
-        $done
-    };
-}
-
-// in:   multi_zip_expr!(() a b c d e)
-// out:  a.into_iter().zip(b).zip(c).zip(d).zip(e)
-//
-// in:   multi_zip_iter!(() a)
-// out:  a
-#[macro_export]
-#[doc(hidden)]
-macro_rules! multi_zip_expr {
-    (()) => {
-        &[]
-    };
-
-    (() $single:ident) => {
-        $single
-    };
-
-    (() $first:ident $($rest:ident)*) => {
-        multi_zip_expr!(($first.into_iter()) $($rest)*)
-    };
-
-    (($zips:expr) $first:ident $($rest:ident)*) => {
-        multi_zip_expr!(($zips.zip($first)) $($rest)*)
-    };
-
-    (($done:expr)) => {
-        $done
-    };
-}
-
-#[macro_export]
-#[doc(hidden)]
-macro_rules! quote_each_token {
-    ($tokens:ident $span:ident) => {};
-
-    ($tokens:ident $span:ident # ! $($rest:tt)*) => {
-        quote_each_token!($tokens $span #);
-        quote_each_token!($tokens $span !);
-        quote_each_token!($tokens $span $($rest)*);
-    };
-
-    ($tokens:ident $span:ident # ( $($inner:tt)* ) * $($rest:tt)*) => {
-        for pounded_var_names!(nested_tuples_pat () $($inner)*)
-        in pounded_var_names!(multi_zip_expr () $($inner)*) {
-            quote_each_token!($tokens $span $($inner)*);
-        }
-        quote_each_token!($tokens $span $($rest)*);
-    };
-
-    ($tokens:ident $span:ident # ( $($inner:tt)* ) $sep:tt * $($rest:tt)*) => {
-        for (_i, pounded_var_names!(nested_tuples_pat () $($inner)*))
-        in pounded_var_names!(multi_zip_expr () $($inner)*).into_iter().enumerate() {
-            if _i > 0 {
-                quote_each_token!($tokens $span $sep);
-            }
-            quote_each_token!($tokens $span $($inner)*);
-        }
-        quote_each_token!($tokens $span $($rest)*);
-    };
-
-    ($tokens:ident $span:ident # [ $($inner:tt)* ] $($rest:tt)*) => {
-        quote_each_token!($tokens $span #);
-        $tokens.append({
-            let mut g = $crate::__rt::Group::new(
-                $crate::__rt::Delimiter::Bracket,
-                quote_spanned!($span=> $($inner)*).into(),
-            );
-            g.set_span($span);
-            g
-        });
-        quote_each_token!($tokens $span $($rest)*);
-    };
-
-    ($tokens:ident $span:ident # $first:ident $($rest:tt)*) => {
-        $crate::ToTokens::to_tokens(&$first, &mut $tokens);
-        quote_each_token!($tokens $span $($rest)*);
-    };
-
-    ($tokens:ident $span:ident ( $($first:tt)* ) $($rest:tt)*) => {
-        $tokens.append({
-            let mut g = $crate::__rt::Group::new(
-                $crate::__rt::Delimiter::Parenthesis,
-                quote_spanned!($span=> $($first)*).into(),
-            );
-            g.set_span($span);
-            g
-        });
-        quote_each_token!($tokens $span $($rest)*);
-    };
-
-    ($tokens:ident $span:ident [ $($first:tt)* ] $($rest:tt)*) => {
-        $tokens.append({
-            let mut g = $crate::__rt::Group::new(
-                $crate::__rt::Delimiter::Bracket,
-                quote_spanned!($span=> $($first)*).into(),
-            );
-            g.set_span($span);
-            g
-        });
-        quote_each_token!($tokens $span $($rest)*);
-    };
-
-    ($tokens:ident $span:ident { $($first:tt)* } $($rest:tt)*) => {
-        $tokens.append({
-            let mut g = $crate::__rt::Group::new(
-                $crate::__rt::Delimiter::Brace,
-                quote_spanned!($span=> $($first)*).into(),
-            );
-            g.set_span($span);
-            g
-        });
-        quote_each_token!($tokens $span $($rest)*);
-    };
-
-    ($tokens:ident $span:ident $first:tt $($rest:tt)*) => {
-        // TODO: this seems slow... special case some `:tt` arguments?
-        $crate::__rt::parse(&mut $tokens, $span, stringify!($first));
-        quote_each_token!($tokens $span $($rest)*);
-    };
-}
diff --git a/third_party/rust/quote-0.5.2/src/to_tokens.rs b/third_party/rust/quote-0.5.2/src/to_tokens.rs
deleted file mode 100644
index 029fde5fd4d1..000000000000
--- a/third_party/rust/quote-0.5.2/src/to_tokens.rs
+++ /dev/null
@@ -1,179 +0,0 @@
-use super::Tokens;
-
-use std::borrow::Cow;
-
-use proc_macro2::{Group, Literal, Op, Span, Term, TokenStream, TokenTree};
-
-/// Types that can be interpolated inside a [`quote!`] invocation.
-///
-/// [`quote!`]: macro.quote.html
-pub trait ToTokens {
-    /// Write `self` to the given `Tokens`.
-    ///
-    /// Example implementation for a struct representing Rust paths like
-    /// `std::cmp::PartialEq`:
-    ///
-    /// ```
-    /// extern crate quote;
-    /// use quote::{Tokens, ToTokens};
-    ///
-    /// extern crate proc_macro2;
-    /// use proc_macro2::{TokenTree, Spacing, Span, Op};
-    ///
-    /// pub struct Path {
-    ///     pub global: bool,
-    ///     pub segments: Vec<PathSegment>,
-    /// }
-    ///
-    /// impl ToTokens for Path {
-    ///     fn to_tokens(&self, tokens: &mut Tokens) {
-    ///         for (i, segment) in self.segments.iter().enumerate() {
-    ///             if i > 0 || self.global {
-    ///                 // Double colon `::`
-    ///                 tokens.append(Op::new(':', Spacing::Joint));
-    ///                 tokens.append(Op::new(':', Spacing::Alone));
-    ///             }
-    ///             segment.to_tokens(tokens);
-    ///         }
-    ///     }
-    /// }
-    /// #
-    /// # pub struct PathSegment;
-    /// #
-    /// # impl ToTokens for PathSegment {
-    /// #     fn to_tokens(&self, tokens: &mut Tokens) {
-    /// #         unimplemented!()
-    /// #     }
-    /// # }
-    /// #
-    /// # fn main() {}
-    /// ```
-    fn to_tokens(&self, tokens: &mut Tokens);
-
-    /// Convert `self` directly into a `Tokens` object.
-    ///
-    /// This method is implicitly implemented using `to_tokens`, and acts as a
-    /// convenience method for consumers of the `ToTokens` trait.
-    fn into_tokens(self) -> Tokens
-    where
-        Self: Sized,
-    {
-        let mut tokens = Tokens::new();
-        self.to_tokens(&mut tokens);
-        tokens
-    }
-}
-
-impl<'a, T: ?Sized + ToTokens> ToTokens for &'a T {
-    fn to_tokens(&self, tokens: &mut Tokens) {
-        (**self).to_tokens(tokens);
-    }
-}
-
-impl<'a, T: ?Sized + ToOwned + ToTokens> ToTokens for Cow<'a, T> {
-    fn to_tokens(&self, tokens: &mut Tokens) {
-        (**self).to_tokens(tokens);
-    }
-}
-
-impl<T: ?Sized + ToTokens> ToTokens for Box<T> {
-    fn to_tokens(&self, tokens: &mut Tokens) {
-        (**self).to_tokens(tokens);
-    }
-}
-
-impl<T: ToTokens> ToTokens for Option<T> {
-    fn to_tokens(&self, tokens: &mut Tokens) {
-        if let Some(ref t) = *self {
-            t.to_tokens(tokens);
-        }
-    }
-}
-
-impl ToTokens for str {
-    fn to_tokens(&self, tokens: &mut Tokens) {
-        tokens.append(Literal::string(self));
-    }
-}
-
-impl ToTokens for String {
-    fn to_tokens(&self, tokens: &mut Tokens) {
-        self.as_str().to_tokens(tokens);
-    }
-}
-
-macro_rules! primitive {
-    ($($t:ident => $name:ident)*) => ($(
-        impl ToTokens for $t {
-            fn to_tokens(&self, tokens: &mut Tokens) {
-                tokens.append(Literal::$name(*self));
-            }
-        }
-    )*)
-}
-
-primitive! {
-    i8 => i8_suffixed
-    i16 => i16_suffixed
-    i32 => i32_suffixed
-    i64 => i64_suffixed
-    isize => isize_suffixed
-
-    u8 => u8_suffixed
-    u16 => u16_suffixed
-    u32 => u32_suffixed
-    u64 => u64_suffixed
-    usize => usize_suffixed
-
-    f32 => f32_suffixed
-    f64 => f64_suffixed
-}
-
-impl ToTokens for char {
-    fn to_tokens(&self, tokens: &mut Tokens) {
-        tokens.append(Literal::character(*self));
-    }
-}
-
-impl ToTokens for bool {
-    fn to_tokens(&self, tokens: &mut Tokens) {
-        let word = if *self { "true" } else { "false" };
-        tokens.append(Term::new(word, Span::call_site()));
-    }
-}
-
-impl ToTokens for Group {
-    fn to_tokens(&self, tokens: &mut Tokens) {
-        tokens.append(self.clone());
-    }
-}
-
-impl ToTokens for Term {
-    fn to_tokens(&self, tokens: &mut Tokens) {
-        tokens.append(self.clone());
-    }
-}
-
-impl ToTokens for Op {
-    fn to_tokens(&self, tokens: &mut Tokens) {
-        tokens.append(self.clone());
-    }
-}
-
-impl ToTokens for Literal {
-    fn to_tokens(&self, tokens: &mut Tokens) {
-        tokens.append(self.clone());
-    }
-}
-
-impl ToTokens for TokenTree {
-    fn to_tokens(&self, dst: &mut Tokens) {
-        dst.append(self.clone());
-    }
-}
-
-impl ToTokens for TokenStream {
-    fn to_tokens(&self, dst: &mut Tokens) {
-        dst.append_all(self.clone().into_iter());
-    }
-}
diff --git a/third_party/rust/quote-0.5.2/src/tokens.rs b/third_party/rust/quote-0.5.2/src/tokens.rs
deleted file mode 100644
index ff4d76809298..000000000000
--- a/third_party/rust/quote-0.5.2/src/tokens.rs
+++ /dev/null
@@ -1,266 +0,0 @@
-use super::ToTokens;
-use std::fmt::{self, Debug, Display};
-use std::hash::{Hash, Hasher};
-
-#[cfg(feature = "proc-macro")]
-use proc_macro;
-use proc_macro2::{TokenStream, TokenTree};
-
-/// Tokens produced by a [`quote!`] invocation.
-///
-/// [`quote!`]: macro.quote.html
-#[derive(Clone, Default)]
-pub struct Tokens {
-    tts: Vec<TokenTree>,
-}
-
-impl Tokens {
-    /// Empty tokens.
-    pub fn new() -> Self {
-        Tokens { tts: Vec::new() }
-    }
-
-    /// For use by `ToTokens` implementations.
-    ///
-    /// Appends the token specified to this list of tokens.
-    pub fn append<U>(&mut self, token: U)
-    where
-        U: Into<TokenTree>,
-    {
-        self.tts.push(token.into());
-    }
-
-    /// For use by `ToTokens` implementations.
-    ///
-    /// ```
-    /// # #[macro_use] extern crate quote;
-    /// # use quote::{Tokens, ToTokens};
-    /// # fn main() {
-    /// struct X;
-    ///
-    /// impl ToTokens for X {
-    ///     fn to_tokens(&self, tokens: &mut Tokens) {
-    ///         tokens.append_all(&[true, false]);
-    ///     }
-    /// }
-    ///
-    /// let tokens = quote!(#X);
-    /// assert_eq!(tokens.to_string(), "true false");
-    /// # }
-    /// ```
-    pub fn append_all<T, I>(&mut self, iter: I)
-    where
-        T: ToTokens,
-        I: IntoIterator<Item = T>,
-    {
-        for token in iter {
-            token.to_tokens(self);
-        }
-    }
-
-    /// For use by `ToTokens` implementations.
-    ///
-    /// Appends all of the items in the iterator `I`, separated by the tokens
-    /// `U`.
-    pub fn append_separated<T, I, U>(&mut self, iter: I, op: U)
-    where
-        T: ToTokens,
-        I: IntoIterator<Item = T>,
-        U: ToTokens,
-    {
-        for (i, token) in iter.into_iter().enumerate() {
-            if i > 0 {
-                op.to_tokens(self);
-            }
-            token.to_tokens(self);
-        }
-    }
-
-    /// For use by `ToTokens` implementations.
-    ///
-    /// Appends all tokens in the iterator `I`, appending `U` after each
-    /// element, including after the last element of the iterator.
-    pub fn append_terminated<T, I, U>(&mut self, iter: I, term: U)
-    where
-        T: ToTokens,
-        I: IntoIterator<Item = T>,
-        U: ToTokens,
-    {
-        for token in iter {
-            token.to_tokens(self);
-            term.to_tokens(self);
-        }
-    }
-}
-
-impl ToTokens for Tokens {
-    fn to_tokens(&self, dst: &mut Tokens) {
-        dst.tts.extend(self.tts.iter().cloned());
-    }
-
-    fn into_tokens(self) -> Tokens {
-        self
-    }
-}
-
-impl From<Tokens> for TokenStream {
-    fn from(tokens: Tokens) -> TokenStream {
-        tokens.tts.into_iter().collect()
-    }
-}
-
-#[cfg(feature = "proc-macro")]
-impl From<Tokens> for proc_macro::TokenStream {
-    fn from(tokens: Tokens) -> proc_macro::TokenStream {
-        TokenStream::from(tokens).into()
-    }
-}
-
-/// Allows a `Tokens` to be passed to `Tokens::append_all`.
-impl IntoIterator for Tokens {
-    type Item = TokenTree;
-    type IntoIter = private::IntoIter;
-
-    fn into_iter(self) -> Self::IntoIter {
-        private::into_iter(self.tts.into_iter())
-    }
-}
-
-mod private {
-    use proc_macro2::TokenTree;
-    use std::vec;
-
-    pub struct IntoIter(vec::IntoIter<TokenTree>);
-
-    pub fn into_iter(tts: vec::IntoIter<TokenTree>) -> IntoIter {
-        IntoIter(tts)
-    }
-
-    impl Iterator for IntoIter {
-        type Item = TokenTree;
-
-        fn next(&mut self) -> Option<Self::Item> {
-            self.0.next()
-        }
-    }
-}
-
-impl Display for Tokens {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        Display::fmt(&TokenStream::from(self.clone()), formatter)
-    }
-}
-
-impl Debug for Tokens {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        struct DebugAsDisplay<'a, T: 'a>(&'a T);
-
-        impl<'a, T> Debug for DebugAsDisplay<'a, T>
-        where
-            T: Display,
-        {
-            fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                Display::fmt(self.0, formatter)
-            }
-        }
-
-        formatter
-            .debug_tuple("Tokens")
-            .field(&DebugAsDisplay(self))
-            .finish()
-    }
-}
-
-fn tt_eq(a: &TokenTree, b: &TokenTree) -> bool {
-    use proc_macro2::{Delimiter, Spacing};
-
-    match (a, b) {
-        (&TokenTree::Group(ref s1), &TokenTree::Group(ref s2)) => {
-            match (s1.delimiter(), s2.delimiter()) {
-                (Delimiter::Parenthesis, Delimiter::Parenthesis)
-                | (Delimiter::Brace, Delimiter::Brace)
-                | (Delimiter::Bracket, Delimiter::Bracket)
-                | (Delimiter::None, Delimiter::None) => {}
-                _ => return false,
-            }
-
-            let s1 = s1.stream().clone().into_iter();
-            let mut s2 = s2.stream().clone().into_iter();
-
-            for item1 in s1 {
-                let item2 = match s2.next() {
-                    Some(item) => item,
-                    None => return false,
-                };
-                if !tt_eq(&item1, &item2) {
-                    return false;
-                }
-            }
-            s2.next().is_none()
-        }
-        (&TokenTree::Op(ref o1), &TokenTree::Op(ref o2)) => {
-            o1.op() == o2.op() && match (o1.spacing(), o2.spacing()) {
-                (Spacing::Alone, Spacing::Alone) | (Spacing::Joint, Spacing::Joint) => true,
-                _ => false,
-            }
-        }
-        (&TokenTree::Literal(ref l1), &TokenTree::Literal(ref l2)) => {
-            l1.to_string() == l2.to_string()
-        }
-        (&TokenTree::Term(ref s1), &TokenTree::Term(ref s2)) => s1.as_str() == s2.as_str(),
-        _ => false,
-    }
-}
-
-impl PartialEq for Tokens {
-    fn eq(&self, other: &Self) -> bool {
-        if self.tts.len() != other.tts.len() {
-            return false;
-        }
-
-        self.tts
-            .iter()
-            .zip(other.tts.iter())
-            .all(|(a, b)| tt_eq(a, b))
-    }
-}
-
-fn tt_hash<H: Hasher>(tt: &TokenTree, h: &mut H) {
-    use proc_macro2::{Delimiter, Spacing};
-
-    match *tt {
-        TokenTree::Group(ref g) => {
-            0u8.hash(h);
-            match g.delimiter() {
-                Delimiter::Parenthesis => 0u8.hash(h),
-                Delimiter::Brace => 1u8.hash(h),
-                Delimiter::Bracket => 2u8.hash(h),
-                Delimiter::None => 3u8.hash(h),
-            }
-
-            for item in g.stream().clone() {
-                tt_hash(&item, h);
-            }
-            0xffu8.hash(h); // terminator w/ a variant we don't normally hash
-        }
-        TokenTree::Op(ref t) => {
-            1u8.hash(h);
-            t.op().hash(h);
-            match t.spacing() {
-                Spacing::Alone => 0u8.hash(h),
-                Spacing::Joint => 1u8.hash(h),
-            }
-        }
-        TokenTree::Literal(ref lit) => (2u8, lit.to_string()).hash(h),
-        TokenTree::Term(ref word) => (3u8, word.as_str()).hash(h),
-    }
-}
-
-impl<'a> Hash for Tokens {
-    fn hash<H: Hasher>(&self, h: &mut H) {
-        self.tts.len().hash(h);
-        for tt in &self.tts {
-            tt_hash(&tt, h);
-        }
-    }
-}
diff --git a/third_party/rust/quote-0.5.2/tests/test.rs b/third_party/rust/quote-0.5.2/tests/test.rs
deleted file mode 100644
index df5f897e895c..000000000000
--- a/third_party/rust/quote-0.5.2/tests/test.rs
+++ /dev/null
@@ -1,289 +0,0 @@
-#![cfg_attr(feature = "cargo-clippy", allow(blacklisted_name))]
-
-use std::borrow::Cow;
-
-extern crate proc_macro2;
-#[macro_use]
-extern crate quote;
-
-use proc_macro2::{Span, Term};
-
-struct X;
-
-impl quote::ToTokens for X {
-    fn to_tokens(&self, tokens: &mut quote::Tokens) {
-        tokens.append(Term::new("X", Span::call_site()));
-    }
-}
-
-#[test]
-fn test_quote_impl() {
-    let tokens = quote! {
-        impl<'a, T: ToTokens> ToTokens for &'a T {
-            fn to_tokens(&self, tokens: &mut Tokens) {
-                (**self).to_tokens(tokens)
-            }
-        }
-    };
-
-    let expected = concat!(
-        "impl < 'a , T : ToTokens > ToTokens for & 'a T { ",
-        "fn to_tokens ( & self , tokens : & mut Tokens ) { ",
-        "( * * self ) . to_tokens ( tokens ) ",
-        "} ",
-        "}"
-    );
-
-    assert_eq!(expected, tokens.to_string());
-}
-
-#[test]
-fn test_substitution() {
-    let x = X;
-    let tokens = quote!(#x <#x> (#x) [#x] {#x});
-
-    let expected = "X < X > ( X ) [ X ] { X }";
-
-    assert_eq!(expected, tokens.to_string());
-}
-
-#[test]
-fn test_iter() {
-    let primes = &[X, X, X, X];
-
-    assert_eq!("X X X X", quote!(#(#primes)*).to_string());
-
-    assert_eq!("X , X , X , X ,", quote!(#(#primes,)*).to_string());
-
-    assert_eq!("X , X , X , X", quote!(#(#primes),*).to_string());
-}
-
-#[test]
-fn test_advanced() {
-    let generics = quote!( <'a, T> );
-
-    let where_clause = quote!( where T: Serialize );
-
-    let field_ty = quote!(String);
-
-    let item_ty = quote!(Cow<'a, str>);
-
-    let path = quote!(SomeTrait::serialize_with);
-
-    let value = quote!(self.x);
-
-    let tokens = quote! {
-        struct SerializeWith #generics #where_clause {
-            value: &'a #field_ty,
-            phantom: ::std::marker::PhantomData<#item_ty>,
-        }
-
-        impl #generics ::serde::Serialize for SerializeWith #generics #where_clause {
-            fn serialize<S>(&self, s: &mut S) -> Result<(), S::Error>
-                where S: ::serde::Serializer
-            {
-                #path(self.value, s)
-            }
-        }
-
-        SerializeWith {
-            value: #value,
-            phantom: ::std::marker::PhantomData::<#item_ty>,
-        }
-    };
-
-    let expected = concat!(
-        "struct SerializeWith < 'a , T > where T : Serialize { ",
-        "value : & 'a String , ",
-        "phantom : :: std :: marker :: PhantomData < Cow < 'a , str > > , ",
-        "} ",
-        "impl < 'a , T > :: serde :: Serialize for SerializeWith < 'a , T > where T : Serialize { ",
-        "fn serialize < S > ( & self , s : & mut S ) -> Result < ( ) , S :: Error > ",
-        "where S : :: serde :: Serializer ",
-        "{ ",
-        "SomeTrait :: serialize_with ( self . value , s ) ",
-        "} ",
-        "} ",
-        "SerializeWith { ",
-        "value : self . x , ",
-        "phantom : :: std :: marker :: PhantomData :: < Cow < 'a , str > > , ",
-        "}"
-    );
-
-    assert_eq!(expected, tokens.to_string());
-}
-
-#[test]
-fn test_integer() {
-    let ii8 = -1i8;
-    let ii16 = -1i16;
-    let ii32 = -1i32;
-    let ii64 = -1i64;
-    let iisize = -1isize;
-    let uu8 = 1u8;
-    let uu16 = 1u16;
-    let uu32 = 1u32;
-    let uu64 = 1u64;
-    let uusize = 1usize;
-
-    let tokens = quote! {
-        #ii8 #ii16 #ii32 #ii64 #iisize
-        #uu8 #uu16 #uu32 #uu64 #uusize
-    };
-    let expected = "-1i8 -1i16 -1i32 -1i64 -1isize 1u8 1u16 1u32 1u64 1usize";
-    assert_eq!(expected, tokens.to_string());
-}
-
-#[test]
-fn test_floating() {
-    let e32 = 2.345f32;
-
-    let e64 = 2.345f64;
-
-    let tokens = quote! {
-        #e32
-        #e64
-    };
-    let expected = concat!("2.345f32 2.345f64");
-    assert_eq!(expected, tokens.to_string());
-}
-
-#[test]
-fn test_char() {
-    let zero = '\0';
-    let pound = '#';
-    let quote = '"';
-    let apost = '\'';
-    let newline = '\n';
-    let heart = '\u{2764}';
-
-    let tokens = quote! {
-        #zero #pound #quote #apost #newline #heart
-    };
-    let expected = "'\\u{0}' '#' '\\\"' '\\'' '\\n' '\\u{2764}'";
-    assert_eq!(expected, tokens.to_string());
-}
-
-#[test]
-fn test_str() {
-    let s = "\0 a 'b \" c";
-    let tokens = quote!(#s);
-    let expected = "\"\\u{0} a \\'b \\\" c\"";
-    assert_eq!(expected, tokens.to_string());
-}
-
-#[test]
-fn test_string() {
-    let s = "\0 a 'b \" c".to_string();
-    let tokens = quote!(#s);
-    let expected = "\"\\u{0} a \\'b \\\" c\"";
-    assert_eq!(expected, tokens.to_string());
-}
-
-#[test]
-fn test_ident() {
-    let foo = Term::new("Foo", Span::call_site());
-    let bar = Term::new(&format!("Bar{}", 7), Span::call_site());
-    let tokens = quote!(struct #foo; enum #bar {});
-    let expected = "struct Foo ; enum Bar7 { }";
-    assert_eq!(expected, tokens.to_string());
-}
-
-#[test]
-fn test_duplicate() {
-    let ch = 'x';
-
-    let tokens = quote!(#ch #ch);
-
-    let expected = "'x' 'x'";
-    assert_eq!(expected, tokens.to_string());
-}
-
-#[test]
-fn test_fancy_repetition() {
-    let foo = vec!["a", "b"];
-    let bar = vec![true, false];
-
-    let tokens = quote! {
-        #(#foo: #bar),*
-    };
-
-    let expected = r#""a" : true , "b" : false"#;
-    assert_eq!(expected, tokens.to_string());
-}
-
-#[test]
-fn test_nested_fancy_repetition() {
-    let nested = vec![vec!['a', 'b', 'c'], vec!['x', 'y', 'z']];
-
-    let tokens = quote! {
-        #(
-            #(#nested)*
-        ),*
-    };
-
-    let expected = "'a' 'b' 'c' , 'x' 'y' 'z'";
-    assert_eq!(expected, tokens.to_string());
-}
-
-#[test]
-fn test_empty_repetition() {
-    let tokens = quote!(#(a b)* #(c d),*);
-    assert_eq!("", tokens.to_string());
-}
-
-#[test]
-fn test_variable_name_conflict() {
-    // The implementation of `#(...),*` uses the variable `_i` but it should be
-    // fine, if a little confusing when debugging.
-    let _i = vec!['a', 'b'];
-    let tokens = quote! { #(#_i),* };
-    let expected = "'a' , 'b'";
-    assert_eq!(expected, tokens.to_string());
-}
-
-#[test]
-fn test_empty_quote() {
-    let tokens = quote!();
-    assert_eq!("", tokens.to_string());
-}
-
-#[test]
-fn test_box_str() {
-    let b = "str".to_owned().into_boxed_str();
-    let tokens = quote! { #b };
-    assert_eq!("\"str\"", tokens.to_string());
-}
-
-#[test]
-fn test_cow() {
-    let owned: Cow<Term> = Cow::Owned(Term::new("owned", Span::call_site()));
-
-    let ident = Term::new("borrowed", Span::call_site());
-    let borrowed = Cow::Borrowed(&ident);
-
-    let tokens = quote! { #owned #borrowed };
-    assert_eq!("owned borrowed", tokens.to_string());
-}
-
-#[test]
-fn test_closure() {
-    fn field_i(i: usize) -> Term {
-        Term::new(&format!("__field{}", i), Span::call_site())
-    }
-
-    let fields = (0usize..3)
-        .map(field_i as fn(_) -> _)
-        .map(|var| quote! { #var });
-
-    let tokens = quote! { #(#fields)* };
-    assert_eq!("__field0 __field1 __field2", tokens.to_string());
-}
-
-#[test]
-fn test_append_tokens() {
-    let mut a = quote!(a);
-    let b = quote!(b);
-    a.append_all(b);
-    assert_eq!("a b", a.to_string());
-}
diff --git a/third_party/rust/syn-0.13.1/.cargo-checksum.json b/third_party/rust/syn-0.13.1/.cargo-checksum.json
deleted file mode 100644
index 14edc51b4cd2..000000000000
--- a/third_party/rust/syn-0.13.1/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"6e30a2a0b1f654eb5baee4a35dd6acc7ba672a9dd390fcc96be14141f3c46957","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"f033c371492a4769d377a8bf1a139adc7bf94ea00595b867a3e234eeab994c8c","README.md":"95ff123a7ebc2968ad9eb5b3bb0f9f2d3d3dca15f32a28432088f9af763cf88f","src/attr.rs":"38e85d2c4e1d7bcf081297d10c6ad6adfd0b15c29285eb01ab71f50cbd19e3a5","src/buffer.rs":"15d2d687102a05dd09cfd1a4bd8c0bf9752dc865606070326ef001e536469233","src/data.rs":"d6514cb3c8f30f72c89abf7118903dfa35887a13e46969de9b170a9661f123a7","src/derive.rs":"eed8e88cd763e852782b10d2366a81e52d3ec0777676eaa94827ea3b46151134","src/error.rs":"db9f0648e7399cfcaef9c431b452b5012a6056e75c586212e2cfdb1e18b8c69a","src/expr.rs":"60d76c1828292b8eacd67dd3aed9d6fbdb696e31ed77390c7224b01bae6d51a4","src/file.rs":"43d5b12828a5c2a0bbef7baa56b0b9638575d73d84e0babaf0e85cdc2d573f16","src/gen/fold.rs":"7bcf7814e6d34b5b7420cb865643f955766448b7e045d16a5188f605d52d6203","src/gen/visit.rs":"a58990558ad865a7cbdd758c35641bd072409e59b743f9fd0fdfd68b995be4f2","src/gen/visit_mut.rs":"68a40b4c34c9968303b43db4bb1cbb2bc6fccf0a36156639f40c1dd2af4f23a2","src/gen_helper.rs":"2be46ff201fd53908350bde4d6c8b7dc427dbd156fa538869a9ccbdf6279af04","src/generics.rs":"2202ba51ba65532af42cbfe70be23a91fb134be433fa21ed129f862832a709a0","src/ident.rs":"8d20690df5778a100c43df0f02d8aec974ac63562e9c7928de0e1954ed83e2e5","src/item.rs":"a42b3316e56fdb7c5cdaf1a839e22a6e7aa29d7cc73e153144c75935fe336cb3","src/lib.rs":"59ee133804c9cccfa35448b421350e30b7a12437476920ddadac9e6664dcb5e7","src/lifetime.rs":"a893013506d23418fbbc1bffcc5d85066de4c5766d693b9451f4a609a70888ba","src/lit.rs":"7b6b4e23dd1a8151a2202bbdd1eda37d0844c065cbb40f4a385c51a627273a7a","src/mac.rs":"ec945e4926de028c153c87f1643e8910e53738d8a4b519b74254479e61acabec","src/macros.rs":"b975b110f9b904e5d82bd0222f7cd0398825fcde146c2b98b581daccf2eb8341","src/op.rs":"b9f9ff8027fc65403858d8fed7d0ac3c919d70f97f830fd7532fb22e1dea993b","src/parse_quote.rs":"b0221332823786d664de3e4976cdd3962ca5fa3c1558bb57f9c8810348ded0b0","src/parsers.rs":"9ef1c5e7760a7a4132fe6834dda5871ff9b6513f51243008f710ee4fe973529d","src/path.rs":"01455551da12e8782b4c97ccb8c670d81ea1db1264393a73577535141d5266a8","src/punctuated.rs":"332277f8867f6ca306e645e440d3582c04e0926f7aa65661c51fb49579530f10","src/spanned.rs":"2624bfac35a6bbe7e628af362772e5cc8d98b9462ec9a8369cf459e431d7ecb4","src/synom.rs":"833d59768e2018706ebe95e3c89c5b6044c5f6306262fe4dc591d59d69058b84","src/token.rs":"af717ca5a0bc404b3351456daa532894697f0f7609f9c0e3d995eeef3f5ff9af","src/tt.rs":"48ec67f4bba2d35c4dd113bb3dc577d34866a72a778bc60bb5f1750ca9b67f0a","src/ty.rs":"9b61ed1b97175036af79eb64b4423c7def2769ed32dc17da16179c0c1393b054"},"package":"91b52877572087400e83d24b9178488541e3d535259e04ff17a63df1e5ceff59"}
\ No newline at end of file
diff --git a/third_party/rust/syn-0.13.1/Cargo.toml b/third_party/rust/syn-0.13.1/Cargo.toml
deleted file mode 100644
index 735901ca0309..000000000000
--- a/third_party/rust/syn-0.13.1/Cargo.toml
+++ /dev/null
@@ -1,59 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "syn"
-version = "0.13.1"
-authors = ["David Tolnay <dtolnay@gmail.com>"]
-include = ["/Cargo.toml", "/src/**/*.rs", "/README.md", "/LICENSE-APACHE", "/LICENSE-MIT"]
-description = "Nom parser for Rust source code"
-documentation = "https://docs.rs/syn"
-readme = "README.md"
-categories = ["development-tools::procedural-macro-helpers"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/dtolnay/syn"
-[package.metadata.docs.rs]
-all-features = true
-
-[[example]]
-name = "dump-syntax"
-path = "examples/dump-syntax/main.rs"
-required-features = ["full", "parsing", "extra-traits"]
-[dependencies.proc-macro2]
-version = "0.3"
-default-features = false
-
-[dependencies.quote]
-version = "0.5"
-optional = true
-default-features = false
-
-[dependencies.unicode-xid]
-version = "0.1"
-[dev-dependencies.rayon]
-version = "1.0.0"
-
-[dev-dependencies.walkdir]
-version = "2"
-
-[features]
-clone-impls = []
-default = ["derive", "parsing", "printing", "clone-impls", "proc-macro"]
-derive = []
-extra-traits = []
-fold = []
-full = []
-parsing = []
-printing = ["quote"]
-proc-macro = ["proc-macro2/proc-macro", "quote/proc-macro"]
-visit = []
-visit-mut = []
diff --git a/third_party/rust/syn-0.13.1/LICENSE-APACHE b/third_party/rust/syn-0.13.1/LICENSE-APACHE
deleted file mode 100644
index 16fe87b06e80..000000000000
--- a/third_party/rust/syn-0.13.1/LICENSE-APACHE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/third_party/rust/syn-0.13.1/LICENSE-MIT b/third_party/rust/syn-0.13.1/LICENSE-MIT
deleted file mode 100644
index 5767dea4b109..000000000000
--- a/third_party/rust/syn-0.13.1/LICENSE-MIT
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2018 Syn Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/third_party/rust/syn-0.13.1/README.md b/third_party/rust/syn-0.13.1/README.md
deleted file mode 100644
index a6c718bf2520..000000000000
--- a/third_party/rust/syn-0.13.1/README.md
+++ /dev/null
@@ -1,278 +0,0 @@
-Nom parser for Rust source code
-===============================
-
-[![Build Status](https://api.travis-ci.org/dtolnay/syn.svg?branch=master)](https://travis-ci.org/dtolnay/syn)
-[![Latest Version](https://img.shields.io/crates/v/syn.svg)](https://crates.io/crates/syn)
-[![Rust Documentation](https://img.shields.io/badge/api-rustdoc-blue.svg)](https://docs.rs/syn/0.13/syn/)
-[![Rustc Version 1.15+](https://img.shields.io/badge/rustc-1.15+-lightgray.svg)](https://blog.rust-lang.org/2017/02/02/Rust-1.15.html)
-
-Syn is a parsing library for parsing a stream of Rust tokens into a syntax tree
-of Rust source code.
-
-Currently this library is geared toward the [custom derive] use case but
-contains some APIs that may be useful for Rust procedural macros more generally.
-
-[custom derive]: https://github.com/rust-lang/rfcs/blob/master/text/1681-macros-1.1.md
-
-- **Data structures** — Syn provides a complete syntax tree that can represent
-  any valid Rust source code. The syntax tree is rooted at [`syn::File`] which
-  represents a full source file, but there are other entry points that may be
-  useful to procedural macros including [`syn::Item`], [`syn::Expr`] and
-  [`syn::Type`].
-
-- **Custom derives** — Of particular interest to custom derives is
-  [`syn::DeriveInput`] which is any of the three legal input items to a derive
-  macro. An example below shows using this type in a library that can derive
-  implementations of a trait of your own.
-
-- **Parser combinators** — Parsing in Syn is built on a suite of public parser
-  combinator macros that you can use for parsing any token-based syntax you
-  dream up within a `functionlike!(...)` procedural macro. Every syntax tree
-  node defined by Syn is individually parsable and may be used as a building
-  block for custom syntaxes, or you may do it all yourself working from the most
-  primitive tokens.
-
-- **Location information** — Every token parsed by Syn is associated with a
-  `Span` that tracks line and column information back to the source of that
-  token. These spans allow a procedural macro to display detailed error messages
-  pointing to all the right places in the user's code. There is an example of
-  this below.
-
-- **Feature flags** — Functionality is aggressively feature gated so your
-  procedural macros enable only what they need, and do not pay in compile time
-  for all the rest.
-
-[`syn::File`]: https://docs.rs/syn/0.13/syn/struct.File.html
-[`syn::Item`]: https://docs.rs/syn/0.13/syn/enum.Item.html
-[`syn::Expr`]: https://docs.rs/syn/0.13/syn/enum.Expr.html
-[`syn::Type`]: https://docs.rs/syn/0.13/syn/enum.Type.html
-[`syn::DeriveInput`]: https://docs.rs/syn/0.13/syn/struct.DeriveInput.html
-
-If you get stuck with anything involving procedural macros in Rust I am happy to
-provide help even if the issue is not related to Syn. Please file a ticket in
-this repo.
-
-*Version requirement: Syn supports any compiler version back to Rust's very
-first support for procedural macros in Rust 1.15.0. Some features especially
-around error reporting are only available in newer compilers or on the nightly
-channel.*
-
-## Example of a custom derive
-
-The canonical custom derive using Syn looks like this. We write an ordinary Rust
-function tagged with a `proc_macro_derive` attribute and the name of the trait
-we are deriving. Any time that derive appears in the user's code, the Rust
-compiler passes their data structure as tokens into our macro. We get to execute
-arbitrary Rust code to figure out what to do with those tokens, then hand some
-tokens back to the compiler to compile into the user's crate.
-
-[`TokenStream`]: https://doc.rust-lang.org/proc_macro/struct.TokenStream.html
-
-```toml
-[dependencies]
-syn = "0.13"
-quote = "0.5"
-
-[lib]
-proc-macro = true
-```
-
-```rust
-extern crate proc_macro;
-extern crate syn;
-
-#[macro_use]
-extern crate quote;
-
-use proc_macro::TokenStream;
-use syn::DeriveInput;
-
-#[proc_macro_derive(MyMacro)]
-pub fn my_macro(input: TokenStream) -> TokenStream {
-    // Parse the input tokens into a syntax tree
-    let input: DeriveInput = syn::parse(input).unwrap();
-
-    // Build the output, possibly using quasi-quotation
-    let expanded = quote! {
-        // ...
-    };
-
-    // Hand the output tokens back to the compiler
-    expanded.into()
-}
-```
-
-The [`heapsize`] example directory shows a complete working Macros 1.1
-implementation of a custom derive. It works on any Rust compiler \>=1.15.0. The
-example derives a `HeapSize` trait which computes an estimate of the amount of
-heap memory owned by a value.
-
-[`heapsize`]: examples/heapsize
-
-```rust
-pub trait HeapSize {
-    /// Total number of bytes of heap memory owned by `self`.
-    fn heap_size_of_children(&self) -> usize;
-}
-```
-
-The custom derive allows users to write `#[derive(HeapSize)]` on data structures
-in their program.
-
-```rust
-#[derive(HeapSize)]
-struct Demo<'a, T: ?Sized> {
-    a: Box<T>,
-    b: u8,
-    c: &'a str,
-    d: String,
-}
-```
-
-## Spans and error reporting
-
-The [`heapsize2`] example directory is an extension of the `heapsize` example
-that demonstrates some of the hygiene and error reporting properties of Macros
-2.0. This example currently requires a nightly Rust compiler \>=1.24.0-nightly
-but we are working to stabilize all of the APIs involved.
-
-[`heapsize2`]: examples/heapsize2
-
-The token-based procedural macro API provides great control over where the
-compiler's error messages are displayed in user code. Consider the error the
-user sees if one of their field types does not implement `HeapSize`.
-
-```rust
-#[derive(HeapSize)]
-struct Broken {
-    ok: String,
-    bad: std::thread::Thread,
-}
-```
-
-In the Macros 1.1 string-based procedural macro world, the resulting error would
-point unhelpfully to the invocation of the derive macro and not to the actual
-problematic field.
-
-```
-error[E0599]: no method named `heap_size_of_children` found for type `std::thread::Thread` in the current scope
- --> src/main.rs:4:10
-  |
-4 | #[derive(HeapSize)]
-  |          ^^^^^^^^
-```
-
-By tracking span information all the way through the expansion of a procedural
-macro as shown in the `heapsize2` example, token-based macros in Syn are able to
-trigger errors that directly pinpoint the source of the problem.
-
-```
-error[E0277]: the trait bound `std::thread::Thread: HeapSize` is not satisfied
- --> src/main.rs:7:5
-  |
-7 |     bad: std::thread::Thread,
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `HeapSize` is not implemented for `std::thread::Thread`
-```
-
-## Parsing a custom syntax using combinators
-
-The [`lazy-static`] example directory shows the implementation of a
-`functionlike!(...)` procedural macro in which the input tokens are parsed using
-[`nom`]-style parser combinators.
-
-[`lazy-static`]: examples/lazy-static
-[`nom`]: https://github.com/Geal/nom
-
-The example reimplements the popular `lazy_static` crate from crates.io as a
-procedural macro.
-
-```
-lazy_static! {
-    static ref USERNAME: Regex = Regex::new("^[a-z0-9_-]{3,16}$").unwrap();
-}
-```
-
-The implementation shows how to trigger custom warnings and error messages on
-the macro input.
-
-```
-warning: come on, pick a more creative name
-  --> src/main.rs:10:16
-   |
-10 |     static ref FOO: String = "lazy_static".to_owned();
-   |                ^^^
-```
-
-## Debugging
-
-When developing a procedural macro it can be helpful to look at what the
-generated code looks like. Use `cargo rustc -- -Zunstable-options
---pretty=expanded` or the [`cargo expand`] subcommand.
-
-[`cargo expand`]: https://github.com/dtolnay/cargo-expand
-
-To show the expanded code for some crate that uses your procedural macro, run
-`cargo expand` from that crate. To show the expanded code for one of your own
-test cases, run `cargo expand --test the_test_case` where the last argument is
-the name of the test file without the `.rs` extension.
-
-This write-up by Brandon W Maister discusses debugging in more detail:
-[Debugging Rust's new Custom Derive system][debugging].
-
-[debugging]: https://quodlibetor.github.io/posts/debugging-rusts-new-custom-derive-system/
-
-## Optional features
-
-Syn puts a lot of functionality behind optional features in order to optimize
-compile time for the most common use cases. The following features are
-available.
-
-- **`derive`** *(enabled by default)* — Data structures for representing the
-  possible input to a custom derive, including structs and enums and types.
-- **`full`** — Data structures for representing the syntax tree of all valid
-  Rust source code, including items and expressions.
-- **`parsing`** *(enabled by default)* — Ability to parse input tokens into a
-  syntax tree node of a chosen type.
-- **`printing`** *(enabled by default)* — Ability to print a syntax tree node as
-  tokens of Rust source code.
-- **`visit`** — Trait for traversing a syntax tree.
-- **`visit-mut`** — Trait for traversing and mutating in place a syntax tree.
-- **`fold`** — Trait for transforming an owned syntax tree.
-- **`clone-impls`** *(enabled by default)* — Clone impls for all syntax tree
-  types.
-- **`extra-traits`** — Debug, Eq, PartialEq, Hash impls for all syntax tree
-  types.
-
-## Nightly features
-
-By default Syn uses the [`proc-macro2`] crate to emulate the nightly compiler's
-procedural macro API in a stable way that works all the way back to Rust 1.15.0.
-This shim makes it possible to write code without regard for whether the current
-compiler version supports the features we use.
-
-[`proc-macro2`]: https://github.com/alexcrichton/proc-macro2
-
-On a nightly compiler, to eliminate the stable shim and use the compiler's
-`proc-macro` directly, add `proc-macro2` to your Cargo.toml and set its
-`"nightly"` feature which bypasses the stable shim.
-
-```toml
-[dependencies]
-syn = "0.13"
-proc-macro2 = { version = "0.3", features = ["nightly"] }
-```
-
-## License
-
-Licensed under either of
-
- * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in this crate by you, as defined in the Apache-2.0 license, shall
-be dual licensed as above, without any additional terms or conditions.
diff --git a/third_party/rust/syn-0.13.1/src/attr.rs b/third_party/rust/syn-0.13.1/src/attr.rs
deleted file mode 100644
index 600302ffff92..000000000000
--- a/third_party/rust/syn-0.13.1/src/attr.rs
+++ /dev/null
@@ -1,556 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use punctuated::Punctuated;
-
-use std::iter;
-
-use proc_macro2::{Delimiter, Spacing, TokenStream, TokenTree};
-
-#[cfg(feature = "extra-traits")]
-use std::hash::{Hash, Hasher};
-#[cfg(feature = "extra-traits")]
-use tt::TokenStreamHelper;
-
-ast_struct! {
-    /// An attribute like `#[repr(transparent)]`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax
-    ///
-    /// Rust has six types of attributes.
-    ///
-    /// - Outer attributes like `#[repr(transparent)]`. These appear outside or
-    ///   in front of the item they describe.
-    /// - Inner attributes like `#![feature(proc_macro)]`. These appear inside
-    ///   of the item they describe, usually a module.
-    /// - Outer doc comments like `/// # Example`.
-    /// - Inner doc comments like `//! Please file an issue`.
-    /// - Outer block comments `/** # Example */`.
-    /// - Inner block comments `/*! Please file an issue */`.
-    ///
-    /// The `style` field of type `AttrStyle` distinguishes whether an attribute
-    /// is outer or inner. Doc comments and block comments are promoted to
-    /// attributes that have `is_sugared_doc` set to true, as this is how they
-    /// are processed by the compiler and by `macro_rules!` macros.
-    ///
-    /// The `path` field gives the possibly colon-delimited path against which
-    /// the attribute is resolved. It is equal to `"doc"` for desugared doc
-    /// comments. The `tts` field contains the rest of the attribute body as
-    /// tokens.
-    ///
-    /// ```text
-    /// #[derive(Copy)]      #[crate::precondition x < 5]
-    ///   ^^^^^^~~~~~~         ^^^^^^^^^^^^^^^^^^^ ~~~~~
-    ///    path  tts                   path         tts
-    /// ```
-    ///
-    /// Use the [`interpret_meta`] method to try parsing the tokens of an
-    /// attribute into the structured representation that is used by convention
-    /// across most Rust libraries.
-    ///
-    /// [`interpret_meta`]: #method.interpret_meta
-    pub struct Attribute #manual_extra_traits {
-        pub pound_token: Token![#],
-        pub style: AttrStyle,
-        pub bracket_token: token::Bracket,
-        pub path: Path,
-        pub tts: TokenStream,
-        pub is_sugared_doc: bool,
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for Attribute {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for Attribute {
-    fn eq(&self, other: &Self) -> bool {
-        self.style == other.style && self.pound_token == other.pound_token
-            && self.bracket_token == other.bracket_token && self.path == other.path
-            && TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-            && self.is_sugared_doc == other.is_sugared_doc
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for Attribute {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        self.style.hash(state);
-        self.pound_token.hash(state);
-        self.bracket_token.hash(state);
-        self.path.hash(state);
-        TokenStreamHelper(&self.tts).hash(state);
-        self.is_sugared_doc.hash(state);
-    }
-}
-
-impl Attribute {
-    /// Parses the tokens after the path as a [`Meta`](enum.Meta.html) if
-    /// possible.
-    pub fn interpret_meta(&self) -> Option<Meta> {
-        let name = if self.path.segments.len() == 1 {
-            &self.path.segments.first().unwrap().value().ident
-        } else {
-            return None;
-        };
-
-        if self.tts.is_empty() {
-            return Some(Meta::Word(*name));
-        }
-
-        let tts = self.tts.clone().into_iter().collect::<Vec<_>>();
-
-        if tts.len() == 1 {
-            if let Some(meta) = Attribute::extract_meta_list(*name, &tts[0]) {
-                return Some(meta);
-            }
-        }
-
-        if tts.len() == 2 {
-            if let Some(meta) = Attribute::extract_name_value(*name, &tts[0], &tts[1]) {
-                return Some(meta);
-            }
-        }
-
-        None
-    }
-
-    fn extract_meta_list(ident: Ident, tt: &TokenTree) -> Option<Meta> {
-        let g = match *tt {
-            TokenTree::Group(ref g) => g,
-            _ => return None,
-        };
-        if g.delimiter() != Delimiter::Parenthesis {
-            return None
-        }
-        let tokens = g.stream().clone().into_iter().collect::<Vec<_>>();
-        let nested = match list_of_nested_meta_items_from_tokens(&tokens) {
-            Some(n) => n,
-            None => return None,
-        };
-        Some(Meta::List(MetaList {
-            paren_token: token::Paren(g.span()),
-            ident: ident,
-            nested: nested,
-        }))
-    }
-
-    fn extract_name_value(ident: Ident, a: &TokenTree, b: &TokenTree) -> Option<Meta> {
-        let a = match *a {
-            TokenTree::Op(ref o) => o,
-            _ => return None,
-        };
-        if a.spacing() != Spacing::Alone {
-            return None
-        }
-        if a.op() != '=' {
-            return None
-        }
-
-        match *b {
-            TokenTree::Literal(ref l) if !l.to_string().starts_with('/') => {
-                Some(Meta::NameValue(MetaNameValue {
-                    ident: ident,
-                    eq_token: Token![=]([a.span()]),
-                    lit: Lit::new(l.clone()),
-                }))
-            }
-            TokenTree::Term(ref term) => {
-                match term.as_str() {
-                    v @ "true" | v @ "false" => {
-                        Some(Meta::NameValue(MetaNameValue {
-                            ident: ident,
-                            eq_token: Token![=]([a.span()]),
-                            lit: Lit::Bool(LitBool {
-                                value: v == "true",
-                                span: b.span(),
-                            }),
-                        }))
-                    },
-                    _ => None ,
-                }
-            }
-            _ => None,
-        }
-    }
-}
-
-fn nested_meta_item_from_tokens(tts: &[TokenTree]) -> Option<(NestedMeta, &[TokenTree])> {
-    assert!(!tts.is_empty());
-
-    match tts[0] {
-        TokenTree::Literal(ref lit) => {
-            if lit.to_string().starts_with('/') {
-                None
-            } else {
-                let lit = Lit::new(lit.clone());
-                Some((NestedMeta::Literal(lit), &tts[1..]))
-            }
-        }
-
-        TokenTree::Term(sym) => {
-            let ident = Ident::new(sym.as_str(), sym.span());
-            if tts.len() >= 3 {
-                if let Some(meta) = Attribute::extract_name_value(ident, &tts[1], &tts[2]) {
-                    return Some((NestedMeta::Meta(meta), &tts[3..]))
-                }
-            }
-
-            if tts.len() >= 2 {
-                if let Some(meta) = Attribute::extract_meta_list(ident, &tts[1]) {
-                    return Some((NestedMeta::Meta(meta), &tts[2..]))
-                }
-            }
-
-            Some((Meta::Word(ident).into(), &tts[1..]))
-        }
-
-        _ => None,
-    }
-}
-
-fn list_of_nested_meta_items_from_tokens(
-    mut tts: &[TokenTree],
-) -> Option<Punctuated<NestedMeta, Token![,]>> {
-    let mut nested_meta_items = Punctuated::new();
-    let mut first = true;
-
-    while !tts.is_empty() {
-        let prev_comma = if first {
-            first = false;
-            None
-        } else if let TokenTree::Op(ref op) = tts[0] {
-            if op.spacing() != Spacing::Alone {
-                return None
-            }
-            if op.op() != ',' {
-                return None
-            }
-            let tok = Token![,]([op.span()]);
-            tts = &tts[1..];
-            if tts.is_empty() {
-                break;
-            }
-            Some(tok)
-        } else {
-            return None;
-        };
-        let (nested, rest) = match nested_meta_item_from_tokens(tts) {
-            Some(pair) => pair,
-            None => return None,
-        };
-        if let Some(comma) = prev_comma {
-            nested_meta_items.push_punct(comma);
-        }
-        nested_meta_items.push_value(nested);
-        tts = rest;
-    }
-
-    Some(nested_meta_items)
-}
-
-ast_enum! {
-    /// Distinguishes between attributes that decorate an item and attributes
-    /// that are contained within an item.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Outer attributes
-    ///
-    /// - `#[repr(transparent)]`
-    /// - `/// # Example`
-    /// - `/** Please file an issue */`
-    ///
-    /// # Inner attributes
-    ///
-    /// - `#![feature(proc_macro)]`
-    /// - `//! # Example`
-    /// - `/*! Please file an issue */`
-    #[cfg_attr(feature = "clone-impls", derive(Copy))]
-    pub enum AttrStyle {
-        Outer,
-        Inner(Token![!]),
-    }
-}
-
-ast_enum_of_structs! {
-    /// Content of a compile-time structured attribute.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// ## Word
-    ///
-    /// A meta word is like the `test` in `#[test]`.
-    ///
-    /// ## List
-    ///
-    /// A meta list is like the `derive(Copy)` in `#[derive(Copy)]`.
-    ///
-    /// ## NameValue
-    ///
-    /// A name-value meta is like the `path = "..."` in `#[path =
-    /// "sys/windows.rs"]`.
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum Meta {
-        pub Word(Ident),
-        /// A structured list within an attribute, like `derive(Copy, Clone)`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub List(MetaList {
-            pub ident: Ident,
-            pub paren_token: token::Paren,
-            pub nested: Punctuated<NestedMeta, Token![,]>,
-        }),
-        /// A name-value pair within an attribute, like `feature = "nightly"`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub NameValue(MetaNameValue {
-            pub ident: Ident,
-            pub eq_token: Token![=],
-            pub lit: Lit,
-        }),
-    }
-}
-
-impl Meta {
-    /// Returns the identifier that begins this structured meta item.
-    ///
-    /// For example this would return the `test` in `#[test]`, the `derive` in
-    /// `#[derive(Copy)]`, and the `path` in `#[path = "sys/windows.rs"]`.
-    pub fn name(&self) -> Ident {
-        match *self {
-            Meta::Word(ref meta) => *meta,
-            Meta::List(ref meta) => meta.ident,
-            Meta::NameValue(ref meta) => meta.ident,
-        }
-    }
-}
-
-ast_enum_of_structs! {
-    /// Element of a compile-time attribute list.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum NestedMeta {
-        /// A structured meta item, like the `Copy` in `#[derive(Copy)]` which
-        /// would be a nested `Meta::Word`.
-        pub Meta(Meta),
-
-        /// A Rust literal, like the `"new_name"` in `#[rename("new_name")]`.
-        pub Literal(Lit),
-    }
-}
-
-pub trait FilterAttrs<'a> {
-    type Ret: Iterator<Item = &'a Attribute>;
-
-    fn outer(self) -> Self::Ret;
-    fn inner(self) -> Self::Ret;
-}
-
-impl<'a, T> FilterAttrs<'a> for T
-where
-    T: IntoIterator<Item = &'a Attribute>,
-{
-    type Ret = iter::Filter<T::IntoIter, fn(&&Attribute) -> bool>;
-
-    fn outer(self) -> Self::Ret {
-        fn is_outer(attr: &&Attribute) -> bool {
-            match attr.style {
-                AttrStyle::Outer => true,
-                _ => false,
-            }
-        }
-        self.into_iter().filter(is_outer)
-    }
-
-    fn inner(self) -> Self::Ret {
-        fn is_inner(attr: &&Attribute) -> bool {
-            match attr.style {
-                AttrStyle::Inner(_) => true,
-                _ => false,
-            }
-        }
-        self.into_iter().filter(is_inner)
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use buffer::Cursor;
-    use parse_error;
-    use synom::PResult;
-    use proc_macro2::{Literal, Spacing, Span, TokenTree, Op};
-
-    fn eq(span: Span) -> TokenTree {
-        let mut op = Op::new('=', Spacing::Alone);
-        op.set_span(span);
-        op.into()
-    }
-
-    impl Attribute {
-        named!(pub parse_inner -> Self, alt!(
-            do_parse!(
-                pound: punct!(#) >>
-                bang: punct!(!) >>
-                path_and_tts: brackets!(tuple!(
-                    call!(Path::parse_mod_style),
-                    syn!(TokenStream)
-                )) >>
-                ({
-                    let (bracket, (path, tts)) = path_and_tts;
-
-                    Attribute {
-                        style: AttrStyle::Inner(bang),
-                        path: path,
-                        tts: tts,
-                        is_sugared_doc: false,
-                        pound_token: pound,
-                        bracket_token: bracket,
-                    }
-                })
-            )
-            |
-            map!(
-                call!(lit_doc_comment, Comment::Inner),
-                |lit| {
-                    let span = lit.span();
-                    Attribute {
-                        style: AttrStyle::Inner(<Token![!]>::new(span)),
-                        path: Ident::new("doc", span).into(),
-                        tts: vec![
-                            eq(span),
-                            lit,
-                        ].into_iter().collect(),
-                        is_sugared_doc: true,
-                        pound_token: <Token![#]>::new(span),
-                        bracket_token: token::Bracket(span),
-                    }
-                }
-            )
-        ));
-
-        named!(pub parse_outer -> Self, alt!(
-            do_parse!(
-                pound: punct!(#) >>
-                path_and_tts: brackets!(tuple!(
-                    call!(Path::parse_mod_style),
-                    syn!(TokenStream)
-                )) >>
-                ({
-                    let (bracket, (path, tts)) = path_and_tts;
-
-                    Attribute {
-                        style: AttrStyle::Outer,
-                        path: path,
-                        tts: tts,
-                        is_sugared_doc: false,
-                        pound_token: pound,
-                        bracket_token: bracket,
-                    }
-                })
-            )
-            |
-            map!(
-                call!(lit_doc_comment, Comment::Outer),
-                |lit| {
-                    let span = lit.span();
-                    Attribute {
-                        style: AttrStyle::Outer,
-                        path: Ident::new("doc", span).into(),
-                        tts: vec![
-                            eq(span),
-                            lit,
-                        ].into_iter().collect(),
-                        is_sugared_doc: true,
-                        pound_token: <Token![#]>::new(span),
-                        bracket_token: token::Bracket(span),
-                    }
-                }
-            )
-        ));
-    }
-
-    enum Comment {
-        Inner,
-        Outer,
-    }
-
-    fn lit_doc_comment(input: Cursor, style: Comment) -> PResult<TokenTree> {
-        match input.literal() {
-            Some((lit, rest)) => {
-                let string = lit.to_string();
-                let ok = match style {
-                    Comment::Inner => string.starts_with("//!") || string.starts_with("/*!"),
-                    Comment::Outer => string.starts_with("///") || string.starts_with("/**"),
-                };
-                if ok {
-                    let mut new = Literal::string(&string);
-                    new.set_span(lit.span());
-                    Ok((new.into(), rest))
-                } else {
-                    parse_error()
-                }
-            }
-            _ => parse_error(),
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use quote::{ToTokens, Tokens};
-
-    impl ToTokens for Attribute {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.pound_token.to_tokens(tokens);
-            if let AttrStyle::Inner(ref b) = self.style {
-                b.to_tokens(tokens);
-            }
-            self.bracket_token.surround(tokens, |tokens| {
-                self.path.to_tokens(tokens);
-                self.tts.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for MetaList {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.ident.to_tokens(tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                self.nested.to_tokens(tokens);
-            })
-        }
-    }
-
-    impl ToTokens for MetaNameValue {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.ident.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.lit.to_tokens(tokens);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/buffer.rs b/third_party/rust/syn-0.13.1/src/buffer.rs
deleted file mode 100644
index d92a7a66013e..000000000000
--- a/third_party/rust/syn-0.13.1/src/buffer.rs
+++ /dev/null
@@ -1,460 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! A stably addressed token buffer supporting efficient traversal based on a
-//! cheaply copyable cursor.
-//!
-//! The [`Synom`] trait is implemented for syntax tree types that can be parsed
-//! from one of these token cursors.
-//!
-//! [`Synom`]: ../synom/trait.Synom.html
-//!
-//! *This module is available if Syn is built with the `"parsing"` feature.*
-//!
-//! # Example
-//!
-//! This example shows a basic token parser for parsing a token stream without
-//! using Syn's parser combinator macros.
-//!
-//! ```
-//! #![feature(proc_macro)]
-//!
-//! extern crate syn;
-//! extern crate proc_macro;
-//!
-//! #[macro_use]
-//! extern crate quote;
-//!
-//! use syn::{token, ExprTuple};
-//! use syn::buffer::{Cursor, TokenBuffer};
-//! use syn::spanned::Spanned;
-//! use syn::synom::Synom;
-//! use proc_macro::{Diagnostic, Span, TokenStream};
-//!
-//! /// A basic token parser for parsing a token stream without using Syn's
-//! /// parser combinator macros.
-//! pub struct Parser<'a> {
-//!     cursor: Cursor<'a>,
-//! }
-//!
-//! impl<'a> Parser<'a> {
-//!     pub fn new(cursor: Cursor<'a>) -> Self {
-//!         Parser { cursor }
-//!     }
-//!
-//!     pub fn current_span(&self) -> Span {
-//!         self.cursor.span().unstable()
-//!     }
-//!
-//!     pub fn parse<T: Synom>(&mut self) -> Result<T, Diagnostic> {
-//!         let (val, rest) = T::parse(self.cursor)
-//!             .map_err(|e| match T::description() {
-//!                 Some(desc) => {
-//!                     self.current_span().error(format!("{}: expected {}", e, desc))
-//!                 }
-//!                 None => {
-//!                     self.current_span().error(e.to_string())
-//!                 }
-//!             })?;
-//!
-//!         self.cursor = rest;
-//!         Ok(val)
-//!     }
-//!
-//!     pub fn expect_eof(&mut self) -> Result<(), Diagnostic> {
-//!         if !self.cursor.eof() {
-//!             return Err(self.current_span().error("trailing characters; expected eof"));
-//!         }
-//!
-//!         Ok(())
-//!     }
-//! }
-//!
-//! fn eval(input: TokenStream) -> Result<TokenStream, Diagnostic> {
-//!     let buffer = TokenBuffer::new(input);
-//!     let mut parser = Parser::new(buffer.begin());
-//!
-//!     // Parse some syntax tree types out of the input tokens. In this case we
-//!     // expect something like:
-//!     //
-//!     //     (a, b, c) = (1, 2, 3)
-//!     let a = parser.parse::<ExprTuple>()?;
-//!     parser.parse::<token::Eq>()?;
-//!     let b = parser.parse::<ExprTuple>()?;
-//!     parser.expect_eof()?;
-//!
-//!     // Perform some validation and report errors.
-//!     let (a_len, b_len) = (a.elems.len(), b.elems.len());
-//!     if a_len != b_len {
-//!         let diag = b.span().unstable()
-//!             .error(format!("expected {} element(s), got {}", a_len, b_len))
-//!             .span_note(a.span().unstable(), "because of this");
-//!
-//!         return Err(diag);
-//!     }
-//!
-//!     // Build the output tokens.
-//!     let out = quote! {
-//!         println!("All good! Received two tuples of size {}", #a_len);
-//!     };
-//!
-//!     Ok(out.into())
-//! }
-//! #
-//! # extern crate proc_macro2;
-//! #
-//! # // This method exists on proc_macro2::Span but is behind the "nightly"
-//! # // feature.
-//! # trait ToUnstableSpan {
-//! #     fn unstable(&self) -> Span;
-//! # }
-//! #
-//! # impl ToUnstableSpan for proc_macro2::Span {
-//! #     fn unstable(&self) -> Span {
-//! #         unimplemented!()
-//! #     }
-//! # }
-//! #
-//! # fn main() {}
-//! ```
-
-// This module is heavily commented as it contains the only unsafe code in Syn,
-// and caution should be used when editing it. The public-facing interface is
-// 100% safe but the implementation is fragile internally.
-
-#[cfg(feature = "proc-macro")]
-use proc_macro as pm;
-use proc_macro2::{Delimiter, Literal, Span, Term, TokenStream};
-use proc_macro2::{Group, TokenTree, Op};
-
-use std::ptr;
-use std::marker::PhantomData;
-
-#[cfg(synom_verbose_trace)]
-use std::fmt::{self, Debug};
-
-/// Internal type which is used instead of `TokenTree` to represent a token tree
-/// within a `TokenBuffer`.
-enum Entry {
-    // Mimicking types from proc-macro.
-    Group(Span, Delimiter, TokenBuffer),
-    Term(Term),
-    Op(Op),
-    Literal(Literal),
-    // End entries contain a raw pointer to the entry from the containing
-    // token tree, or null if this is the outermost level.
-    End(*const Entry),
-}
-
-/// A buffer that can be efficiently traversed multiple times, unlike
-/// `TokenStream` which requires a deep copy in order to traverse more than
-/// once.
-///
-/// See the [module documentation] for an example of `TokenBuffer` in action.
-///
-/// [module documentation]: index.html
-///
-/// *This type is available if Syn is built with the `"parsing"` feature.*
-pub struct TokenBuffer {
-    // NOTE: Do not derive clone on this - there are raw pointers inside which
-    // will be messed up. Moving the `TokenBuffer` itself is safe as the actual
-    // backing slices won't be moved.
-    data: Box<[Entry]>,
-}
-
-impl TokenBuffer {
-    // NOTE: DO NOT MUTATE THE `Vec` RETURNED FROM THIS FUNCTION ONCE IT
-    // RETURNS, THE ADDRESS OF ITS BACKING MEMORY MUST REMAIN STABLE.
-    fn inner_new(stream: TokenStream, up: *const Entry) -> TokenBuffer {
-        // Build up the entries list, recording the locations of any Groups
-        // in the list to be processed later.
-        let mut entries = Vec::new();
-        let mut seqs = Vec::new();
-        for tt in stream {
-            match tt {
-                TokenTree::Term(sym) => {
-                    entries.push(Entry::Term(sym));
-                }
-                TokenTree::Op(op) => {
-                    entries.push(Entry::Op(op));
-                }
-                TokenTree::Literal(l) => {
-                    entries.push(Entry::Literal(l));
-                }
-                TokenTree::Group(g) => {
-                    // Record the index of the interesting entry, and store an
-                    // `End(null)` there temporarially.
-                    seqs.push((entries.len(), g.span(), g.delimiter(), g.stream().clone()));
-                    entries.push(Entry::End(ptr::null()));
-                }
-            }
-        }
-        // Add an `End` entry to the end with a reference to the enclosing token
-        // stream which was passed in.
-        entries.push(Entry::End(up));
-
-        // NOTE: This is done to ensure that we don't accidentally modify the
-        // length of the backing buffer. The backing buffer must remain at a
-        // constant address after this point, as we are going to store a raw
-        // pointer into it.
-        let mut entries = entries.into_boxed_slice();
-        for (idx, span, delim, seq_stream) in seqs {
-            // We know that this index refers to one of the temporary
-            // `End(null)` entries, and we know that the last entry is
-            // `End(up)`, so the next index is also valid.
-            let seq_up = &entries[idx + 1] as *const Entry;
-
-            // The end entry stored at the end of this Entry::Group should
-            // point to the Entry which follows the Group in the list.
-            let inner = Self::inner_new(seq_stream, seq_up);
-            entries[idx] = Entry::Group(span, delim, inner);
-        }
-
-        TokenBuffer { data: entries }
-    }
-
-    /// Creates a `TokenBuffer` containing all the tokens from the input
-    /// `TokenStream`.
-    #[cfg(feature = "proc-macro")]
-    pub fn new(stream: pm::TokenStream) -> TokenBuffer {
-        Self::new2(stream.into())
-    }
-
-    /// Creates a `TokenBuffer` containing all the tokens from the input
-    /// `TokenStream`.
-    pub fn new2(stream: TokenStream) -> TokenBuffer {
-        Self::inner_new(stream, ptr::null())
-    }
-
-    /// Creates a cursor referencing the first token in the buffer and able to
-    /// traverse until the end of the buffer.
-    pub fn begin(&self) -> Cursor {
-        unsafe { Cursor::create(&self.data[0], &self.data[self.data.len() - 1]) }
-    }
-}
-
-/// A cheaply copyable cursor into a `TokenBuffer`.
-///
-/// This cursor holds a shared reference into the immutable data which is used
-/// internally to represent a `TokenStream`, and can be efficiently manipulated
-/// and copied around.
-///
-/// An empty `Cursor` can be created directly, or one may create a `TokenBuffer`
-/// object and get a cursor to its first token with `begin()`.
-///
-/// Two cursors are equal if they have the same location in the same input
-/// stream, and have the same scope.
-///
-/// See the [module documentation] for an example of a `Cursor` in action.
-///
-/// [module documentation]: index.html
-///
-/// *This type is available if Syn is built with the `"parsing"` feature.*
-#[derive(Copy, Clone, Eq, PartialEq)]
-pub struct Cursor<'a> {
-    /// The current entry which the `Cursor` is pointing at.
-    ptr: *const Entry,
-    /// This is the only `Entry::End(..)` object which this cursor is allowed to
-    /// point at. All other `End` objects are skipped over in `Cursor::create`.
-    scope: *const Entry,
-    /// This uses the &'a reference which guarantees that these pointers are
-    /// still valid.
-    marker: PhantomData<&'a Entry>,
-}
-
-impl<'a> Cursor<'a> {
-    /// Creates a cursor referencing a static empty TokenStream.
-    pub fn empty() -> Self {
-        // It's safe in this situation for us to put an `Entry` object in global
-        // storage, despite it not actually being safe to send across threads
-        // (`Term` is a reference into a thread-local table). This is because
-        // this entry never includes a `Term` object.
-        //
-        // This wrapper struct allows us to break the rules and put a `Sync`
-        // object in global storage.
-        struct UnsafeSyncEntry(Entry);
-        unsafe impl Sync for UnsafeSyncEntry {}
-        static EMPTY_ENTRY: UnsafeSyncEntry = UnsafeSyncEntry(Entry::End(0 as *const Entry));
-
-        Cursor {
-            ptr: &EMPTY_ENTRY.0,
-            scope: &EMPTY_ENTRY.0,
-            marker: PhantomData,
-        }
-    }
-
-    /// This create method intelligently exits non-explicitly-entered
-    /// `None`-delimited scopes when the cursor reaches the end of them,
-    /// allowing for them to be treated transparently.
-    unsafe fn create(mut ptr: *const Entry, scope: *const Entry) -> Self {
-        // NOTE: If we're looking at a `End(..)`, we want to advance the cursor
-        // past it, unless `ptr == scope`, which means that we're at the edge of
-        // our cursor's scope. We should only have `ptr != scope` at the exit
-        // from None-delimited groups entered with `ignore_none`.
-        while let Entry::End(exit) = *ptr {
-            if ptr == scope {
-                break;
-            }
-            ptr = exit;
-        }
-
-        Cursor {
-            ptr: ptr,
-            scope: scope,
-            marker: PhantomData,
-        }
-    }
-
-    /// Get the current entry.
-    fn entry(self) -> &'a Entry {
-        unsafe { &*self.ptr }
-    }
-
-    /// Bump the cursor to point at the next token after the current one. This
-    /// is undefined behavior if the cursor is currently looking at an
-    /// `Entry::End`.
-    unsafe fn bump(self) -> Cursor<'a> {
-        Cursor::create(self.ptr.offset(1), self.scope)
-    }
-
-    /// If the cursor is looking at a `None`-delimited group, move it to look at
-    /// the first token inside instead. If the group is empty, this will move
-    /// the cursor past the `None`-delimited group.
-    ///
-    /// WARNING: This mutates its argument.
-    fn ignore_none(&mut self) {
-        if let Entry::Group(_, Delimiter::None, ref buf) = *self.entry() {
-            // NOTE: We call `Cursor::create` here to make sure that situations
-            // where we should immediately exit the span after entering it are
-            // handled correctly.
-            unsafe {
-                *self = Cursor::create(&buf.data[0], self.scope);
-            }
-        }
-    }
-
-    /// Checks whether the cursor is currently pointing at the end of its valid
-    /// scope.
-    #[inline]
-    pub fn eof(self) -> bool {
-        // We're at eof if we're at the end of our scope.
-        self.ptr == self.scope
-    }
-
-    /// If the cursor is pointing at a `Group` with the given delimiter, returns
-    /// a cursor into that group and one pointing to the next `TokenTree`.
-    pub fn group(mut self, delim: Delimiter) -> Option<(Cursor<'a>, Span, Cursor<'a>)> {
-        // If we're not trying to enter a none-delimited group, we want to
-        // ignore them. We have to make sure to _not_ ignore them when we want
-        // to enter them, of course. For obvious reasons.
-        if delim != Delimiter::None {
-            self.ignore_none();
-        }
-
-        if let Entry::Group(span, group_delim, ref buf) = *self.entry() {
-            if group_delim == delim {
-                return Some((buf.begin(), span, unsafe { self.bump() }));
-            }
-        }
-
-        None
-    }
-
-    /// If the cursor is pointing at a `Term`, returns it along with a cursor
-    /// pointing at the next `TokenTree`.
-    pub fn term(mut self) -> Option<(Term, Cursor<'a>)> {
-        self.ignore_none();
-        match *self.entry() {
-            Entry::Term(term) => Some((term, unsafe { self.bump() })),
-            _ => None,
-        }
-    }
-
-    /// If the cursor is pointing at an `Op`, returns it along with a cursor
-    /// pointing at the next `TokenTree`.
-    pub fn op(mut self) -> Option<(Op, Cursor<'a>)> {
-        self.ignore_none();
-        match *self.entry() {
-            Entry::Op(op) => Some((op, unsafe { self.bump() })),
-            _ => None,
-        }
-    }
-
-    /// If the cursor is pointing at a `Literal`, return it along with a cursor
-    /// pointing at the next `TokenTree`.
-    pub fn literal(mut self) -> Option<(Literal, Cursor<'a>)> {
-        self.ignore_none();
-        match *self.entry() {
-            Entry::Literal(ref lit) => Some((lit.clone(), unsafe { self.bump() })),
-            _ => None,
-        }
-    }
-
-    /// Copies all remaining tokens visible from this cursor into a
-    /// `TokenStream`.
-    pub fn token_stream(self) -> TokenStream {
-        let mut tts = Vec::new();
-        let mut cursor = self;
-        while let Some((tt, rest)) = cursor.token_tree() {
-            tts.push(tt);
-            cursor = rest;
-        }
-        tts.into_iter().collect()
-    }
-
-    /// If the cursor is pointing at a `TokenTree`, returns it along with a
-    /// cursor pointing at the next `TokenTree`.
-    ///
-    /// Returns `None` if the cursor has reached the end of its stream.
-    ///
-    /// This method does not treat `None`-delimited groups as transparent, and
-    /// will return a `Group(None, ..)` if the cursor is looking at one.
-    pub fn token_tree(self) -> Option<(TokenTree, Cursor<'a>)> {
-        let tree = match *self.entry() {
-            Entry::Group(span, delim, ref buf) => {
-                let stream = buf.begin().token_stream();
-                let mut g = Group::new(delim, stream);
-                g.set_span(span);
-                TokenTree::from(g)
-            }
-            Entry::Literal(ref lit) => lit.clone().into(),
-            Entry::Term(term) => term.into(),
-            Entry::Op(op) => op.into(),
-            Entry::End(..) => {
-                return None;
-            }
-        };
-
-        Some((tree, unsafe { self.bump() }))
-    }
-
-    /// Returns the `Span` of the current token, or `Span::call_site()` if this
-    /// cursor points to eof.
-    pub fn span(self) -> Span {
-        match *self.entry() {
-            Entry::Group(span, ..) => span,
-            Entry::Literal(ref l) => l.span(),
-            Entry::Term(t) => t.span(),
-            Entry::Op(o) => o.span(),
-            Entry::End(..) => Span::call_site(),
-        }
-    }
-}
-
-// We do a custom implementation for `Debug` as the default implementation is
-// pretty useless.
-#[cfg(synom_verbose_trace)]
-impl<'a> Debug for Cursor<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        // Print what the cursor is currently looking at.
-        // This will look like Cursor("some remaining tokens here")
-        f.debug_tuple("Cursor")
-            .field(&self.token_stream().to_string())
-            .finish()
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/data.rs b/third_party/rust/syn-0.13.1/src/data.rs
deleted file mode 100644
index 31eb1d13a578..000000000000
--- a/third_party/rust/syn-0.13.1/src/data.rs
+++ /dev/null
@@ -1,390 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use punctuated::Punctuated;
-
-ast_struct! {
-    /// An enum variant.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct Variant {
-        /// Attributes tagged on the variant.
-        pub attrs: Vec<Attribute>,
-
-        /// Name of the variant.
-        pub ident: Ident,
-
-        /// Content stored in the variant.
-        pub fields: Fields,
-
-        /// Explicit discriminant: `Variant = 1`
-        pub discriminant: Option<(Token![=], Expr)>,
-    }
-}
-
-ast_enum_of_structs! {
-    /// Data stored within an enum variant or struct.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum Fields {
-        /// Named fields of a struct or struct variant such as `Point { x: f64,
-        /// y: f64 }`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Named(FieldsNamed {
-            pub brace_token: token::Brace,
-            pub named: Punctuated<Field, Token![,]>,
-        }),
-
-        /// Unnamed fields of a tuple struct or tuple variant such as `Some(T)`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Unnamed(FieldsUnnamed {
-            pub paren_token: token::Paren,
-            pub unnamed: Punctuated<Field, Token![,]>,
-        }),
-
-        /// Unit struct or unit variant such as `None`.
-        pub Unit,
-    }
-}
-
-impl Fields {
-    /// Get an iterator over the [`Field`] items in this object. This iterator
-    /// can be used to iterate over a named or unnamed struct or variant's
-    /// fields uniformly.
-    ///
-    /// [`Field`]: struct.Field.html
-    pub fn iter(&self) -> punctuated::Iter<Field> {
-        match *self {
-            Fields::Unit => punctuated::Iter::private_empty(),
-            Fields::Named(ref f) => f.named.iter(),
-            Fields::Unnamed(ref f) => f.unnamed.iter(),
-        }
-    }
-}
-
-impl<'a> IntoIterator for &'a Fields {
-    type Item = &'a Field;
-    type IntoIter = punctuated::Iter<'a, Field>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.iter()
-    }
-}
-
-ast_struct! {
-    /// A field of a struct or enum variant.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct Field {
-        /// Attributes tagged on the field.
-        pub attrs: Vec<Attribute>,
-
-        /// Visibility of the field.
-        pub vis: Visibility,
-
-        /// Name of the field, if any.
-        ///
-        /// Fields of tuple structs have no names.
-        pub ident: Option<Ident>,
-
-        pub colon_token: Option<Token![:]>,
-
-        /// Type of the field.
-        pub ty: Type,
-    }
-}
-
-ast_enum_of_structs! {
-    /// The visibility level of an item: inherited or `pub` or
-    /// `pub(restricted)`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum Visibility {
-        /// A public visibility level: `pub`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Public(VisPublic {
-            pub pub_token: Token![pub],
-        }),
-
-        /// A crate-level visibility: `crate`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Crate(VisCrate {
-            pub crate_token: Token![crate],
-        }),
-
-        /// A visibility level restricted to some path: `pub(self)` or
-        /// `pub(super)` or `pub(crate)` or `pub(in some::module)`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Restricted(VisRestricted {
-            pub pub_token: Token![pub],
-            pub paren_token: token::Paren,
-            pub in_token: Option<Token![in]>,
-            pub path: Box<Path>,
-        }),
-
-        /// An inherited visibility, which usually means private.
-        pub Inherited,
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-
-    use synom::Synom;
-
-    impl Synom for Variant {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            id: syn!(Ident) >>
-            fields: alt!(
-                syn!(FieldsNamed) => { Fields::Named }
-                |
-                syn!(FieldsUnnamed) => { Fields::Unnamed }
-                |
-                epsilon!() => { |_| Fields::Unit }
-            ) >>
-            disr: option!(tuple!(punct!(=), syn!(Expr))) >>
-            (Variant {
-                ident: id,
-                attrs: attrs,
-                fields: fields,
-                discriminant: disr,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("enum variant")
-        }
-    }
-
-    impl Synom for FieldsNamed {
-        named!(parse -> Self, map!(
-            braces!(call!(Punctuated::parse_terminated_with, Field::parse_named)),
-            |(brace, fields)| FieldsNamed {
-                brace_token: brace,
-                named: fields,
-            }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("named fields in a struct or struct variant")
-        }
-    }
-
-    impl Synom for FieldsUnnamed {
-        named!(parse -> Self, map!(
-            parens!(call!(Punctuated::parse_terminated_with, Field::parse_unnamed)),
-            |(paren, fields)| FieldsUnnamed {
-                paren_token: paren,
-                unnamed: fields,
-            }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("unnamed fields in a tuple struct or tuple variant")
-        }
-    }
-
-    impl Field {
-        named!(pub parse_named -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            vis: syn!(Visibility) >>
-            id: syn!(Ident) >>
-            colon: punct!(:) >>
-            ty: syn!(Type) >>
-            (Field {
-                ident: Some(id),
-                vis: vis,
-                attrs: attrs,
-                ty: ty,
-                colon_token: Some(colon),
-            })
-        ));
-
-        named!(pub parse_unnamed -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            vis: syn!(Visibility) >>
-            ty: syn!(Type) >>
-            (Field {
-                ident: None,
-                colon_token: None,
-                vis: vis,
-                attrs: attrs,
-                ty: ty,
-            })
-        ));
-    }
-
-    impl Synom for Visibility {
-        named!(parse -> Self, alt!(
-            do_parse!(
-                pub_token: keyword!(pub) >>
-                other: parens!(keyword!(crate)) >>
-                (Visibility::Restricted(VisRestricted {
-                    pub_token: pub_token,
-                    paren_token: other.0,
-                    in_token: None,
-                    path: Box::new(other.1.into()),
-                }))
-            )
-            |
-            keyword!(crate) => { |tok| {
-                Visibility::Crate(VisCrate {
-                    crate_token: tok,
-                })
-            } }
-            |
-            do_parse!(
-                pub_token: keyword!(pub) >>
-                other: parens!(keyword!(self)) >>
-                (Visibility::Restricted(VisRestricted {
-                    pub_token: pub_token,
-                    paren_token: other.0,
-                    in_token: None,
-                    path: Box::new(other.1.into()),
-                }))
-            )
-            |
-            do_parse!(
-                pub_token: keyword!(pub) >>
-                other: parens!(keyword!(super)) >>
-                (Visibility::Restricted(VisRestricted {
-                    pub_token: pub_token,
-                    paren_token: other.0,
-                    in_token: None,
-                    path: Box::new(other.1.into()),
-                }))
-            )
-            |
-            do_parse!(
-                pub_token: keyword!(pub) >>
-                other: parens!(do_parse!(
-                    in_tok: keyword!(in) >>
-                    restricted: call!(Path::parse_mod_style) >>
-                    (in_tok, restricted)
-                )) >>
-                (Visibility::Restricted(VisRestricted {
-                    pub_token: pub_token,
-                    paren_token: other.0,
-                    in_token: Some((other.1).0),
-                    path: Box::new((other.1).1),
-                }))
-            )
-            |
-            keyword!(pub) => { |tok| {
-                Visibility::Public(VisPublic {
-                    pub_token: tok,
-                })
-            } }
-            |
-            epsilon!() => { |_| Visibility::Inherited }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("visibility qualifier such as `pub`")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use quote::{ToTokens, Tokens};
-
-    impl ToTokens for Variant {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(&self.attrs);
-            self.ident.to_tokens(tokens);
-            self.fields.to_tokens(tokens);
-            if let Some((ref eq_token, ref disc)) = self.discriminant {
-                eq_token.to_tokens(tokens);
-                disc.to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for FieldsNamed {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.brace_token.surround(tokens, |tokens| {
-                self.named.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for FieldsUnnamed {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.paren_token.surround(tokens, |tokens| {
-                self.unnamed.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for Field {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(&self.attrs);
-            self.vis.to_tokens(tokens);
-            if let Some(ref ident) = self.ident {
-                ident.to_tokens(tokens);
-                TokensOrDefault(&self.colon_token).to_tokens(tokens);
-            }
-            self.ty.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for VisPublic {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.pub_token.to_tokens(tokens)
-        }
-    }
-
-    impl ToTokens for VisCrate {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.crate_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for VisRestricted {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.pub_token.to_tokens(tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                // XXX: If we have a path which is not "self" or "super" or
-                // "crate", automatically add the "in" token.
-                self.in_token.to_tokens(tokens);
-                self.path.to_tokens(tokens);
-            });
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/derive.rs b/third_party/rust/syn-0.13.1/src/derive.rs
deleted file mode 100644
index 3ad893d8bb39..000000000000
--- a/third_party/rust/syn-0.13.1/src/derive.rs
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use punctuated::Punctuated;
-
-ast_struct! {
-    /// Data structure sent to a `proc_macro_derive` macro.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` feature.*
-    pub struct DeriveInput {
-        /// Attributes tagged on the whole struct or enum.
-        pub attrs: Vec<Attribute>,
-
-        /// Visibility of the struct or enum.
-        pub vis: Visibility,
-
-        /// Name of the struct or enum.
-        pub ident: Ident,
-
-        /// Generics required to complete the definition.
-        pub generics: Generics,
-
-        /// Data within the struct or enum.
-        pub data: Data,
-    }
-}
-
-ast_enum_of_structs! {
-    /// The storage of a struct, enum or union data structure.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum Data {
-        /// A struct input to a `proc_macro_derive` macro.
-        ///
-        /// *This type is available if Syn is built with the `"derive"`
-        /// feature.*
-        pub Struct(DataStruct {
-            pub struct_token: Token![struct],
-            pub fields: Fields,
-            pub semi_token: Option<Token![;]>,
-        }),
-
-        /// An enum input to a `proc_macro_derive` macro.
-        ///
-        /// *This type is available if Syn is built with the `"derive"`
-        /// feature.*
-        pub Enum(DataEnum {
-            pub enum_token: Token![enum],
-            pub brace_token: token::Brace,
-            pub variants: Punctuated<Variant, Token![,]>,
-        }),
-
-        /// A tagged union input to a `proc_macro_derive` macro.
-        ///
-        /// *This type is available if Syn is built with the `"derive"`
-        /// feature.*
-        pub Union(DataUnion {
-            pub union_token: Token![union],
-            pub fields: FieldsNamed,
-        }),
-    }
-
-    do_not_generate_to_tokens
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-
-    use synom::Synom;
-
-    impl Synom for DeriveInput {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            vis: syn!(Visibility) >>
-            which: alt!(
-                keyword!(struct) => { Ok }
-                |
-                keyword!(enum) => { Err }
-            ) >>
-            id: syn!(Ident) >>
-            generics: syn!(Generics) >>
-            item: switch!(value!(which),
-                Ok(s) => map!(data_struct, move |(wh, fields, semi)| DeriveInput {
-                    ident: id,
-                    vis: vis,
-                    attrs: attrs,
-                    generics: Generics {
-                        where_clause: wh,
-                        .. generics
-                    },
-                    data: Data::Struct(DataStruct {
-                        struct_token: s,
-                        fields: fields,
-                        semi_token: semi,
-                    }),
-                })
-                |
-                Err(e) => map!(data_enum, move |(wh, brace, variants)| DeriveInput {
-                    ident: id,
-                    vis: vis,
-                    attrs: attrs,
-                    generics: Generics {
-                        where_clause: wh,
-                        .. generics
-                    },
-                    data: Data::Enum(DataEnum {
-                        variants: variants,
-                        brace_token: brace,
-                        enum_token: e,
-                    }),
-                })
-            ) >>
-            (item)
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("derive input")
-        }
-    }
-
-    named!(data_struct -> (Option<WhereClause>, Fields, Option<Token![;]>), alt!(
-        do_parse!(
-            wh: option!(syn!(WhereClause)) >>
-            fields: syn!(FieldsNamed) >>
-            (wh, Fields::Named(fields), None)
-        )
-        |
-        do_parse!(
-            fields: syn!(FieldsUnnamed) >>
-            wh: option!(syn!(WhereClause)) >>
-            semi: punct!(;) >>
-            (wh, Fields::Unnamed(fields), Some(semi))
-        )
-        |
-        do_parse!(
-            wh: option!(syn!(WhereClause)) >>
-            semi: punct!(;) >>
-            (wh, Fields::Unit, Some(semi))
-        )
-    ));
-
-    named!(data_enum -> (Option<WhereClause>, token::Brace, Punctuated<Variant, Token![,]>), do_parse!(
-        wh: option!(syn!(WhereClause)) >>
-        data: braces!(Punctuated::parse_terminated) >>
-        (wh, data.0, data.1)
-    ));
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use attr::FilterAttrs;
-    use quote::{ToTokens, Tokens};
-
-    impl ToTokens for DeriveInput {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            for attr in self.attrs.outer() {
-                attr.to_tokens(tokens);
-            }
-            self.vis.to_tokens(tokens);
-            match self.data {
-                Data::Struct(ref d) => d.struct_token.to_tokens(tokens),
-                Data::Enum(ref d) => d.enum_token.to_tokens(tokens),
-                Data::Union(ref d) => d.union_token.to_tokens(tokens),
-            }
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            match self.data {
-                Data::Struct(ref data) => match data.fields {
-                    Fields::Named(ref fields) => {
-                        self.generics.where_clause.to_tokens(tokens);
-                        fields.to_tokens(tokens);
-                    }
-                    Fields::Unnamed(ref fields) => {
-                        fields.to_tokens(tokens);
-                        self.generics.where_clause.to_tokens(tokens);
-                        TokensOrDefault(&data.semi_token).to_tokens(tokens);
-                    }
-                    Fields::Unit => {
-                        self.generics.where_clause.to_tokens(tokens);
-                        TokensOrDefault(&data.semi_token).to_tokens(tokens);
-                    }
-                },
-                Data::Enum(ref data) => {
-                    self.generics.where_clause.to_tokens(tokens);
-                    data.brace_token.surround(tokens, |tokens| {
-                        data.variants.to_tokens(tokens);
-                    });
-                }
-                Data::Union(ref data) => {
-                    self.generics.where_clause.to_tokens(tokens);
-                    data.fields.to_tokens(tokens);
-                }
-            }
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/error.rs b/third_party/rust/syn-0.13.1/src/error.rs
deleted file mode 100644
index 23d2a1aa0821..000000000000
--- a/third_party/rust/syn-0.13.1/src/error.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::error::Error;
-use buffer::Cursor;
-use std::fmt::{self, Display};
-
-/// The result of a `Synom` parser.
-///
-/// Refer to the [module documentation] for details about parsing in Syn.
-///
-/// [module documentation]: index.html
-///
-/// *This type is available if Syn is built with the `"parsing"` feature.*
-pub type PResult<'a, O> = Result<(O, Cursor<'a>), ParseError>;
-
-/// An error with a default error message.
-///
-/// NOTE: We should provide better error messages in the future.
-pub fn parse_error<O>() -> PResult<'static, O> {
-    Err(ParseError(None))
-}
-
-/// Error returned when a `Synom` parser cannot parse the input tokens.
-///
-/// Refer to the [module documentation] for details about parsing in Syn.
-///
-/// [module documentation]: index.html
-///
-/// *This type is available if Syn is built with the `"parsing"` feature.*
-#[derive(Debug)]
-pub struct ParseError(Option<String>);
-
-impl Error for ParseError {
-    fn description(&self) -> &str {
-        match self.0 {
-            Some(ref desc) => desc,
-            None => "failed to parse",
-        }
-    }
-}
-
-impl Display for ParseError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        Display::fmt(self.description(), f)
-    }
-}
-
-impl ParseError {
-    // For syn use only. Not public API.
-    #[doc(hidden)]
-    pub fn new<T: Into<String>>(msg: T) -> Self {
-        ParseError(Some(msg.into()))
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/expr.rs b/third_party/rust/syn-0.13.1/src/expr.rs
deleted file mode 100644
index e770fde0e955..000000000000
--- a/third_party/rust/syn-0.13.1/src/expr.rs
+++ /dev/null
@@ -1,3580 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use punctuated::Punctuated;
-use proc_macro2::{Span, TokenStream};
-#[cfg(feature = "extra-traits")]
-use std::hash::{Hash, Hasher};
-#[cfg(feature = "extra-traits")]
-use tt::TokenStreamHelper;
-#[cfg(feature = "full")]
-use std::mem;
-
-ast_enum_of_structs! {
-    /// A Rust expression.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax tree enums
-    ///
-    /// This type is a syntax tree enum. In Syn this and other syntax tree enums
-    /// are designed to be traversed using the following rebinding idiom.
-    ///
-    /// ```
-    /// # use syn::Expr;
-    /// #
-    /// # fn example(expr: Expr) {
-    /// # const IGNORE: &str = stringify! {
-    /// let expr: Expr = /* ... */;
-    /// # };
-    /// match expr {
-    ///     Expr::MethodCall(expr) => {
-    ///         /* ... */
-    ///     }
-    ///     Expr::Cast(expr) => {
-    ///         /* ... */
-    ///     }
-    ///     Expr::IfLet(expr) => {
-    ///         /* ... */
-    ///     }
-    ///     /* ... */
-    ///     # _ => {}
-    /// }
-    /// # }
-    /// ```
-    ///
-    /// We begin with a variable `expr` of type `Expr` that has no fields
-    /// (because it is an enum), and by matching on it and rebinding a variable
-    /// with the same name `expr` we effectively imbue our variable with all of
-    /// the data fields provided by the variant that it turned out to be. So for
-    /// example above if we ended up in the `MethodCall` case then we get to use
-    /// `expr.receiver`, `expr.args` etc; if we ended up in the `IfLet` case we
-    /// get to use `expr.pat`, `expr.then_branch`, `expr.else_branch`.
-    ///
-    /// The pattern is similar if the input expression is borrowed:
-    ///
-    /// ```
-    /// # use syn::Expr;
-    /// #
-    /// # fn example(expr: &Expr) {
-    /// match *expr {
-    ///     Expr::MethodCall(ref expr) => {
-    /// #   }
-    /// #   _ => {}
-    /// # }
-    /// # }
-    /// ```
-    ///
-    /// This approach avoids repeating the variant names twice on every line.
-    ///
-    /// ```
-    /// # use syn::{Expr, ExprMethodCall};
-    /// #
-    /// # fn example(expr: Expr) {
-    /// # match expr {
-    /// Expr::MethodCall(ExprMethodCall { method, args, .. }) => { // repetitive
-    /// # }
-    /// # _ => {}
-    /// # }
-    /// # }
-    /// ```
-    ///
-    /// In general, the name to which a syntax tree enum variant is bound should
-    /// be a suitable name for the complete syntax tree enum type.
-    ///
-    /// ```
-    /// # use syn::{Expr, ExprField};
-    /// #
-    /// # fn example(discriminant: &ExprField) {
-    /// // Binding is called `base` which is the name I would use if I were
-    /// // assigning `*discriminant.base` without an `if let`.
-    /// if let Expr::Tuple(ref base) = *discriminant.base {
-    /// # }
-    /// # }
-    /// ```
-    ///
-    /// A sign that you may not be choosing the right variable names is if you
-    /// see names getting repeated in your code, like accessing
-    /// `receiver.receiver` or `pat.pat` or `cond.cond`.
-    pub enum Expr {
-        /// A box expression: `box f`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Box(ExprBox #full {
-            pub attrs: Vec<Attribute>,
-            pub box_token: Token![box],
-            pub expr: Box<Expr>,
-        }),
-
-        /// A placement expression: `place <- value`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub InPlace(ExprInPlace #full {
-            pub attrs: Vec<Attribute>,
-            pub place: Box<Expr>,
-            pub arrow_token: Token![<-],
-            pub value: Box<Expr>,
-        }),
-
-        /// A slice literal expression: `[a, b, c, d]`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Array(ExprArray #full {
-            pub attrs: Vec<Attribute>,
-            pub bracket_token: token::Bracket,
-            pub elems: Punctuated<Expr, Token![,]>,
-        }),
-
-        /// A function call expression: `invoke(a, b)`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Call(ExprCall {
-            pub attrs: Vec<Attribute>,
-            pub func: Box<Expr>,
-            pub paren_token: token::Paren,
-            pub args: Punctuated<Expr, Token![,]>,
-        }),
-
-        /// A method call expression: `x.foo::<T>(a, b)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub MethodCall(ExprMethodCall #full {
-            pub attrs: Vec<Attribute>,
-            pub receiver: Box<Expr>,
-            pub dot_token: Token![.],
-            pub method: Ident,
-            pub turbofish: Option<MethodTurbofish>,
-            pub paren_token: token::Paren,
-            pub args: Punctuated<Expr, Token![,]>,
-        }),
-
-        /// A tuple expression: `(a, b, c, d)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Tuple(ExprTuple #full {
-            pub attrs: Vec<Attribute>,
-            pub paren_token: token::Paren,
-            pub elems: Punctuated<Expr, Token![,]>,
-        }),
-
-        /// A binary operation: `a + b`, `a * b`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Binary(ExprBinary {
-            pub attrs: Vec<Attribute>,
-            pub left: Box<Expr>,
-            pub op: BinOp,
-            pub right: Box<Expr>,
-        }),
-
-        /// A unary operation: `!x`, `*x`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Unary(ExprUnary {
-            pub attrs: Vec<Attribute>,
-            pub op: UnOp,
-            pub expr: Box<Expr>,
-        }),
-
-        /// A literal in place of an expression: `1`, `"foo"`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Lit(ExprLit {
-            pub attrs: Vec<Attribute>,
-            pub lit: Lit,
-        }),
-
-        /// A cast expression: `foo as f64`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Cast(ExprCast {
-            pub attrs: Vec<Attribute>,
-            pub expr: Box<Expr>,
-            pub as_token: Token![as],
-            pub ty: Box<Type>,
-        }),
-
-        /// A type ascription expression: `foo: f64`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Type(ExprType #full {
-            pub attrs: Vec<Attribute>,
-            pub expr: Box<Expr>,
-            pub colon_token: Token![:],
-            pub ty: Box<Type>,
-        }),
-
-        /// An `if` expression with an optional `else` block: `if expr { ... }
-        /// else { ... }`.
-        ///
-        /// The `else` branch expression may only be an `If`, `IfLet`, or
-        /// `Block` expression, not any of the other types of expression.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub If(ExprIf #full {
-            pub attrs: Vec<Attribute>,
-            pub if_token: Token![if],
-            pub cond: Box<Expr>,
-            pub then_branch: Block,
-            pub else_branch: Option<(Token![else], Box<Expr>)>,
-        }),
-
-        /// An `if let` expression with an optional `else` block: `if let pat =
-        /// expr { ... } else { ... }`.
-        ///
-        /// The `else` branch expression may only be an `If`, `IfLet`, or
-        /// `Block` expression, not any of the other types of expression.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub IfLet(ExprIfLet #full {
-            pub attrs: Vec<Attribute>,
-            pub if_token: Token![if],
-            pub let_token: Token![let],
-            pub pats: Punctuated<Pat, Token![|]>,
-            pub eq_token: Token![=],
-            pub expr: Box<Expr>,
-            pub then_branch: Block,
-            pub else_branch: Option<(Token![else], Box<Expr>)>,
-        }),
-
-        /// A while loop: `while expr { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub While(ExprWhile #full {
-            pub attrs: Vec<Attribute>,
-            pub label: Option<Label>,
-            pub while_token: Token![while],
-            pub cond: Box<Expr>,
-            pub body: Block,
-        }),
-
-        /// A while-let loop: `while let pat = expr { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub WhileLet(ExprWhileLet #full {
-            pub attrs: Vec<Attribute>,
-            pub label: Option<Label>,
-            pub while_token: Token![while],
-            pub let_token: Token![let],
-            pub pats: Punctuated<Pat, Token![|]>,
-            pub eq_token: Token![=],
-            pub expr: Box<Expr>,
-            pub body: Block,
-        }),
-
-        /// A for loop: `for pat in expr { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub ForLoop(ExprForLoop #full {
-            pub attrs: Vec<Attribute>,
-            pub label: Option<Label>,
-            pub for_token: Token![for],
-            pub pat: Box<Pat>,
-            pub in_token: Token![in],
-            pub expr: Box<Expr>,
-            pub body: Block,
-        }),
-
-        /// Conditionless loop: `loop { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Loop(ExprLoop #full {
-            pub attrs: Vec<Attribute>,
-            pub label: Option<Label>,
-            pub loop_token: Token![loop],
-            pub body: Block,
-        }),
-
-        /// A `match` expression: `match n { Some(n) => {}, None => {} }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Match(ExprMatch #full {
-            pub attrs: Vec<Attribute>,
-            pub match_token: Token![match],
-            pub expr: Box<Expr>,
-            pub brace_token: token::Brace,
-            pub arms: Vec<Arm>,
-        }),
-
-        /// A closure expression: `|a, b| a + b`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Closure(ExprClosure #full {
-            pub attrs: Vec<Attribute>,
-            pub movability: Option<Token![static]>,
-            pub capture: Option<Token![move]>,
-            pub or1_token: Token![|],
-            pub inputs: Punctuated<FnArg, Token![,]>,
-            pub or2_token: Token![|],
-            pub output: ReturnType,
-            pub body: Box<Expr>,
-        }),
-
-        /// An unsafe block: `unsafe { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Unsafe(ExprUnsafe #full {
-            pub attrs: Vec<Attribute>,
-            pub unsafe_token: Token![unsafe],
-            pub block: Block,
-        }),
-
-        /// A blocked scope: `{ ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Block(ExprBlock #full {
-            pub attrs: Vec<Attribute>,
-            pub block: Block,
-        }),
-
-        /// An assignment expression: `a = compute()`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Assign(ExprAssign #full {
-            pub attrs: Vec<Attribute>,
-            pub left: Box<Expr>,
-            pub eq_token: Token![=],
-            pub right: Box<Expr>,
-        }),
-
-        /// A compound assignment expression: `counter += 1`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub AssignOp(ExprAssignOp #full {
-            pub attrs: Vec<Attribute>,
-            pub left: Box<Expr>,
-            pub op: BinOp,
-            pub right: Box<Expr>,
-        }),
-
-        /// Access of a named struct field (`obj.k`) or unnamed tuple struct
-        /// field (`obj.0`).
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Field(ExprField #full {
-            pub attrs: Vec<Attribute>,
-            pub base: Box<Expr>,
-            pub dot_token: Token![.],
-            pub member: Member,
-        }),
-
-        /// A square bracketed indexing expression: `vector[2]`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Index(ExprIndex {
-            pub attrs: Vec<Attribute>,
-            pub expr: Box<Expr>,
-            pub bracket_token: token::Bracket,
-            pub index: Box<Expr>,
-        }),
-
-        /// A range expression: `1..2`, `1..`, `..2`, `1..=2`, `..=2`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Range(ExprRange #full {
-            pub attrs: Vec<Attribute>,
-            pub from: Option<Box<Expr>>,
-            pub limits: RangeLimits,
-            pub to: Option<Box<Expr>>,
-        }),
-
-        /// A path like `std::mem::replace` possibly containing generic
-        /// parameters and a qualified self-type.
-        ///
-        /// A plain identifier like `x` is a path of length 1.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Path(ExprPath {
-            pub attrs: Vec<Attribute>,
-            pub qself: Option<QSelf>,
-            pub path: Path,
-        }),
-
-        /// A referencing operation: `&a` or `&mut a`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Reference(ExprReference #full {
-            pub attrs: Vec<Attribute>,
-            pub and_token: Token![&],
-            pub mutability: Option<Token![mut]>,
-            pub expr: Box<Expr>,
-        }),
-
-        /// A `break`, with an optional label to break and an optional
-        /// expression.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Break(ExprBreak #full {
-            pub attrs: Vec<Attribute>,
-            pub break_token: Token![break],
-            pub label: Option<Lifetime>,
-            pub expr: Option<Box<Expr>>,
-        }),
-
-        /// A `continue`, with an optional label.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Continue(ExprContinue #full {
-            pub attrs: Vec<Attribute>,
-            pub continue_token: Token![continue],
-            pub label: Option<Lifetime>,
-        }),
-
-        /// A `return`, with an optional value to be returned.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Return(ExprReturn #full {
-            pub attrs: Vec<Attribute>,
-            pub return_token: Token![return],
-            pub expr: Option<Box<Expr>>,
-        }),
-
-        /// A macro invocation expression: `format!("{}", q)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Macro(ExprMacro #full {
-            pub attrs: Vec<Attribute>,
-            pub mac: Macro,
-        }),
-
-        /// A struct literal expression: `Point { x: 1, y: 1 }`.
-        ///
-        /// The `rest` provides the value of the remaining fields as in `S { a:
-        /// 1, b: 1, ..rest }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Struct(ExprStruct #full {
-            pub attrs: Vec<Attribute>,
-            pub path: Path,
-            pub brace_token: token::Brace,
-            pub fields: Punctuated<FieldValue, Token![,]>,
-            pub dot2_token: Option<Token![..]>,
-            pub rest: Option<Box<Expr>>,
-        }),
-
-        /// An array literal constructed from one repeated element: `[0u8; N]`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Repeat(ExprRepeat #full {
-            pub attrs: Vec<Attribute>,
-            pub bracket_token: token::Bracket,
-            pub expr: Box<Expr>,
-            pub semi_token: Token![;],
-            pub len: Box<Expr>,
-        }),
-
-        /// A parenthesized expression: `(a + b)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Paren(ExprParen {
-            pub attrs: Vec<Attribute>,
-            pub paren_token: token::Paren,
-            pub expr: Box<Expr>,
-        }),
-
-        /// An expression contained within invisible delimiters.
-        ///
-        /// This variant is important for faithfully representing the precedence
-        /// of expressions and is related to `None`-delimited spans in a
-        /// `TokenStream`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Group(ExprGroup #full {
-            pub attrs: Vec<Attribute>,
-            pub group_token: token::Group,
-            pub expr: Box<Expr>,
-        }),
-
-        /// A try-expression: `expr?`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Try(ExprTry #full {
-            pub attrs: Vec<Attribute>,
-            pub expr: Box<Expr>,
-            pub question_token: Token![?],
-        }),
-
-        /// A catch expression: `do catch { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Catch(ExprCatch #full {
-            pub attrs: Vec<Attribute>,
-            pub do_token: Token![do],
-            pub catch_token: Token![catch],
-            pub block: Block,
-        }),
-
-        /// A yield expression: `yield expr`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Yield(ExprYield #full {
-            pub attrs: Vec<Attribute>,
-            pub yield_token: Token![yield],
-            pub expr: Option<Box<Expr>>,
-        }),
-
-        /// Tokens in expression position not interpreted by Syn.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Verbatim(ExprVerbatim #manual_extra_traits {
-            pub tts: TokenStream,
-        }),
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for ExprVerbatim {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for ExprVerbatim {
-    fn eq(&self, other: &Self) -> bool {
-        TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for ExprVerbatim {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-impl Expr {
-    // Not public API.
-    #[doc(hidden)]
-    #[cfg(feature = "full")]
-    pub fn replace_attrs(&mut self, new: Vec<Attribute>) -> Vec<Attribute> {
-        match *self {
-            Expr::Box(ExprBox { ref mut attrs, .. })
-            | Expr::InPlace(ExprInPlace { ref mut attrs, .. })
-            | Expr::Array(ExprArray { ref mut attrs, .. })
-            | Expr::Call(ExprCall { ref mut attrs, .. })
-            | Expr::MethodCall(ExprMethodCall { ref mut attrs, .. })
-            | Expr::Tuple(ExprTuple { ref mut attrs, .. })
-            | Expr::Binary(ExprBinary { ref mut attrs, .. })
-            | Expr::Unary(ExprUnary { ref mut attrs, .. })
-            | Expr::Lit(ExprLit { ref mut attrs, .. })
-            | Expr::Cast(ExprCast { ref mut attrs, .. })
-            | Expr::Type(ExprType { ref mut attrs, .. })
-            | Expr::If(ExprIf { ref mut attrs, .. })
-            | Expr::IfLet(ExprIfLet { ref mut attrs, .. })
-            | Expr::While(ExprWhile { ref mut attrs, .. })
-            | Expr::WhileLet(ExprWhileLet { ref mut attrs, .. })
-            | Expr::ForLoop(ExprForLoop { ref mut attrs, .. })
-            | Expr::Loop(ExprLoop { ref mut attrs, .. })
-            | Expr::Match(ExprMatch { ref mut attrs, .. })
-            | Expr::Closure(ExprClosure { ref mut attrs, .. })
-            | Expr::Unsafe(ExprUnsafe { ref mut attrs, .. })
-            | Expr::Block(ExprBlock { ref mut attrs, .. })
-            | Expr::Assign(ExprAssign { ref mut attrs, .. })
-            | Expr::AssignOp(ExprAssignOp { ref mut attrs, .. })
-            | Expr::Field(ExprField { ref mut attrs, .. })
-            | Expr::Index(ExprIndex { ref mut attrs, .. })
-            | Expr::Range(ExprRange { ref mut attrs, .. })
-            | Expr::Path(ExprPath { ref mut attrs, .. })
-            | Expr::Reference(ExprReference { ref mut attrs, .. })
-            | Expr::Break(ExprBreak { ref mut attrs, .. })
-            | Expr::Continue(ExprContinue { ref mut attrs, .. })
-            | Expr::Return(ExprReturn { ref mut attrs, .. })
-            | Expr::Macro(ExprMacro { ref mut attrs, .. })
-            | Expr::Struct(ExprStruct { ref mut attrs, .. })
-            | Expr::Repeat(ExprRepeat { ref mut attrs, .. })
-            | Expr::Paren(ExprParen { ref mut attrs, .. })
-            | Expr::Group(ExprGroup { ref mut attrs, .. })
-            | Expr::Try(ExprTry { ref mut attrs, .. })
-            | Expr::Catch(ExprCatch { ref mut attrs, .. })
-            | Expr::Yield(ExprYield { ref mut attrs, .. }) => mem::replace(attrs, new),
-            Expr::Verbatim(_) => {
-                // TODO
-                Vec::new()
-            }
-        }
-    }
-}
-
-ast_enum! {
-    /// A struct or tuple struct field accessed in a struct literal or field
-    /// expression.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum Member {
-        /// A named field like `self.x`.
-        Named(Ident),
-        /// An unnamed field like `self.0`.
-        Unnamed(Index),
-    }
-}
-
-ast_struct! {
-    /// The index of an unnamed tuple struct field.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct Index #manual_extra_traits {
-        pub index: u32,
-        pub span: Span,
-    }
-}
-
-impl From<usize> for Index {
-    fn from(index: usize) -> Index {
-        assert!(index < std::u32::MAX as usize);
-        Index {
-            index: index as u32,
-            span: Span::call_site(),
-        }
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for Index {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for Index {
-    fn eq(&self, other: &Self) -> bool {
-        self.index == other.index
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for Index {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.index.hash(state);
-    }
-}
-
-#[cfg(feature = "full")]
-ast_struct! {
-    /// The `::<>` explicit type parameters passed to a method call:
-    /// `parse::<u64>()`.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct MethodTurbofish {
-        pub colon2_token: Token![::],
-        pub lt_token: Token![<],
-        pub args: Punctuated<GenericMethodArgument, Token![,]>,
-        pub gt_token: Token![>],
-    }
-}
-
-#[cfg(feature = "full")]
-ast_enum! {
-    /// An individual generic argument to a method, like `T`.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub enum GenericMethodArgument {
-        /// A type argument.
-        Type(Type),
-        /// A const expression. Must be inside of a block.
-        ///
-        /// NOTE: Identity expressions are represented as Type arguments, as
-        /// they are indistinguishable syntactically.
-        Const(Expr),
-    }
-}
-
-#[cfg(feature = "full")]
-ast_struct! {
-    /// A field-value pair in a struct literal.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct FieldValue {
-        /// Attributes tagged on the field.
-        pub attrs: Vec<Attribute>,
-
-        /// Name or index of the field.
-        pub member: Member,
-
-        /// The colon in `Struct { x: x }`. If written in shorthand like
-        /// `Struct { x }`, there is no colon.
-        pub colon_token: Option<Token![:]>,
-
-        /// Value of the field.
-        pub expr: Expr,
-    }
-}
-
-#[cfg(feature = "full")]
-ast_struct! {
-    /// A lifetime labeling a `for`, `while`, or `loop`.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct Label {
-        pub name: Lifetime,
-        pub colon_token: Token![:],
-    }
-}
-
-#[cfg(feature = "full")]
-ast_struct! {
-    /// A braced block containing Rust statements.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct Block {
-        pub brace_token: token::Brace,
-        /// Statements in a block
-        pub stmts: Vec<Stmt>,
-    }
-}
-
-#[cfg(feature = "full")]
-ast_enum! {
-    /// A statement, usually ending in a semicolon.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub enum Stmt {
-        /// A local (let) binding.
-        Local(Local),
-
-        /// An item definition.
-        Item(Item),
-
-        /// Expr without trailing semicolon.
-        Expr(Expr),
-
-        /// Expression with trailing semicolon.
-        Semi(Expr, Token![;]),
-    }
-}
-
-#[cfg(feature = "full")]
-ast_struct! {
-    /// A local `let` binding: `let x: u64 = s.parse()?`.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct Local {
-        pub attrs: Vec<Attribute>,
-        pub let_token: Token![let],
-        pub pats: Punctuated<Pat, Token![|]>,
-        pub ty: Option<(Token![:], Box<Type>)>,
-        pub init: Option<(Token![=], Box<Expr>)>,
-        pub semi_token: Token![;],
-    }
-}
-
-#[cfg(feature = "full")]
-ast_enum_of_structs! {
-    /// A pattern in a local binding, function signature, match expression, or
-    /// various other places.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    // Clippy false positive
-    // https://github.com/Manishearth/rust-clippy/issues/1241
-    #[cfg_attr(feature = "cargo-clippy", allow(enum_variant_names))]
-    pub enum Pat {
-        /// A pattern that matches any value: `_`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Wild(PatWild {
-            pub underscore_token: Token![_],
-        }),
-
-        /// A pattern that binds a new variable: `ref mut binding @ SUBPATTERN`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Ident(PatIdent {
-            pub by_ref: Option<Token![ref]>,
-            pub mutability: Option<Token![mut]>,
-            pub ident: Ident,
-            pub subpat: Option<(Token![@], Box<Pat>)>,
-        }),
-
-        /// A struct or struct variant pattern: `Variant { x, y, .. }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Struct(PatStruct {
-            pub path: Path,
-            pub brace_token: token::Brace,
-            pub fields: Punctuated<FieldPat, Token![,]>,
-            pub dot2_token: Option<Token![..]>,
-        }),
-
-        /// A tuple struct or tuple variant pattern: `Variant(x, y, .., z)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub TupleStruct(PatTupleStruct {
-            pub path: Path,
-            pub pat: PatTuple,
-        }),
-
-        /// A path pattern like `Color::Red`, optionally qualified with a
-        /// self-type.
-        ///
-        /// Unquailfied path patterns can legally refer to variants, structs,
-        /// constants or associated constants. Quailfied path patterns like
-        /// `<A>::B::C` and `<A as Trait>::B::C` can only legally refer to
-        /// associated constants.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Path(PatPath {
-            pub qself: Option<QSelf>,
-            pub path: Path,
-        }),
-
-        /// A tuple pattern: `(a, b)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Tuple(PatTuple {
-            pub paren_token: token::Paren,
-            pub front: Punctuated<Pat, Token![,]>,
-            pub dot2_token: Option<Token![..]>,
-            pub comma_token: Option<Token![,]>,
-            pub back: Punctuated<Pat, Token![,]>,
-        }),
-
-        /// A box pattern: `box v`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Box(PatBox {
-            pub box_token: Token![box],
-            pub pat: Box<Pat>,
-        }),
-
-        /// A reference pattern: `&mut (first, second)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Ref(PatRef {
-            pub and_token: Token![&],
-            pub mutability: Option<Token![mut]>,
-            pub pat: Box<Pat>,
-        }),
-
-        /// A literal pattern: `0`.
-        ///
-        /// This holds an `Expr` rather than a `Lit` because negative numbers
-        /// are represented as an `Expr::Unary`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Lit(PatLit {
-            pub expr: Box<Expr>,
-        }),
-
-        /// A range pattern: `1..=2`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Range(PatRange {
-            pub lo: Box<Expr>,
-            pub limits: RangeLimits,
-            pub hi: Box<Expr>,
-        }),
-
-        /// A dynamically sized slice pattern: `[a, b, i.., y, z]`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Slice(PatSlice {
-            pub bracket_token: token::Bracket,
-            pub front: Punctuated<Pat, Token![,]>,
-            pub middle: Option<Box<Pat>>,
-            pub dot2_token: Option<Token![..]>,
-            pub comma_token: Option<Token![,]>,
-            pub back: Punctuated<Pat, Token![,]>,
-        }),
-
-        /// A macro in expression position.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Macro(PatMacro {
-            pub mac: Macro,
-        }),
-
-        /// Tokens in pattern position not interpreted by Syn.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Verbatim(PatVerbatim #manual_extra_traits {
-            pub tts: TokenStream,
-        }),
-    }
-}
-
-#[cfg(all(feature = "full", feature = "extra-traits"))]
-impl Eq for PatVerbatim {}
-
-#[cfg(all(feature = "full", feature = "extra-traits"))]
-impl PartialEq for PatVerbatim {
-    fn eq(&self, other: &Self) -> bool {
-        TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(all(feature = "full", feature = "extra-traits"))]
-impl Hash for PatVerbatim {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-#[cfg(feature = "full")]
-ast_struct! {
-    /// One arm of a `match` expression: `0...10 => { return true; }`.
-    ///
-    /// As in:
-    ///
-    /// ```rust
-    /// # fn f() -> bool {
-    /// #     let n = 0;
-    /// match n {
-    ///     0...10 => {
-    ///         return true;
-    ///     }
-    ///     // ...
-    ///     # _ => {}
-    /// }
-    /// #   false
-    /// # }
-    /// ```
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct Arm {
-        pub attrs: Vec<Attribute>,
-        pub leading_vert: Option<Token![|]>,
-        pub pats: Punctuated<Pat, Token![|]>,
-        pub guard: Option<(Token![if], Box<Expr>)>,
-        pub fat_arrow_token: Token![=>],
-        pub body: Box<Expr>,
-        pub comma: Option<Token![,]>,
-    }
-}
-
-#[cfg(feature = "full")]
-ast_enum! {
-    /// Limit types of a range, inclusive or exclusive.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    #[cfg_attr(feature = "clone-impls", derive(Copy))]
-    pub enum RangeLimits {
-        /// Inclusive at the beginning, exclusive at the end.
-        HalfOpen(Token![..]),
-        /// Inclusive at the beginning and end.
-        Closed(Token![..=]),
-    }
-}
-
-#[cfg(feature = "full")]
-ast_struct! {
-    /// A single field in a struct pattern.
-    ///
-    /// Patterns like the fields of Foo `{ x, ref y, ref mut z }` are treated
-    /// the same as `x: x, y: ref y, z: ref mut z` but there is no colon token.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct FieldPat {
-        pub attrs: Vec<Attribute>,
-        pub member: Member,
-        pub colon_token: Option<Token![:]>,
-        pub pat: Box<Pat>,
-    }
-}
-
-#[cfg(any(feature = "parsing", feature = "printing"))]
-#[cfg(feature = "full")]
-fn arm_expr_requires_comma(expr: &Expr) -> bool {
-    // see https://github.com/rust-lang/rust/blob/eb8f2586e
-    //                       /src/libsyntax/parse/classify.rs#L17-L37
-    match *expr {
-        Expr::Unsafe(..)
-        | Expr::Block(..)
-        | Expr::If(..)
-        | Expr::IfLet(..)
-        | Expr::Match(..)
-        | Expr::While(..)
-        | Expr::WhileLet(..)
-        | Expr::Loop(..)
-        | Expr::ForLoop(..)
-        | Expr::Catch(..) => false,
-        _ => true,
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use path::parsing::qpath;
-    #[cfg(feature = "full")]
-    use path::parsing::ty_no_eq_after;
-
-    #[cfg(feature = "full")]
-    use proc_macro2::TokenStream;
-    use synom::Synom;
-    use buffer::Cursor;
-    #[cfg(feature = "full")]
-    use parse_error;
-    use synom::PResult;
-
-    // When we're parsing expressions which occur before blocks, like in an if
-    // statement's condition, we cannot parse a struct literal.
-    //
-    // Struct literals are ambiguous in certain positions
-    // https://github.com/rust-lang/rfcs/pull/92
-    macro_rules! ambiguous_expr {
-        ($i:expr, $allow_struct:ident) => {
-            ambiguous_expr($i, $allow_struct, true)
-        };
-    }
-
-    // When we are parsing an optional suffix expression, we cannot allow blocks
-    // if structs are not allowed.
-    //
-    // Example:
-    //
-    //     if break {} {}
-    //
-    // is ambiguous between:
-    //
-    //     if (break {}) {}
-    //     if (break) {} {}
-    #[cfg(feature = "full")]
-    macro_rules! opt_ambiguous_expr {
-        ($i:expr, $allow_struct:ident) => {
-            option!($i, call!(ambiguous_expr, $allow_struct, $allow_struct))
-        };
-    }
-
-    impl Synom for Expr {
-        named!(parse -> Self, ambiguous_expr!(true));
-
-        fn description() -> Option<&'static str> {
-            Some("expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(expr_no_struct -> Expr, ambiguous_expr!(false));
-
-    // Parse an arbitrary expression.
-    #[cfg(feature = "full")]
-    fn ambiguous_expr(i: Cursor, allow_struct: bool, allow_block: bool) -> PResult<Expr> {
-        call!(i, assign_expr, allow_struct, allow_block)
-    }
-
-    #[cfg(not(feature = "full"))]
-    fn ambiguous_expr(i: Cursor, allow_struct: bool, allow_block: bool) -> PResult<Expr> {
-        // NOTE: We intentionally skip assign_expr, placement_expr, and
-        // range_expr, as they are not parsed in non-full mode.
-        call!(i, or_expr, allow_struct, allow_block)
-    }
-
-    // Parse a left-associative binary operator.
-    macro_rules! binop {
-        (
-            $name: ident,
-            $next: ident,
-            $submac: ident!( $($args:tt)* )
-        ) => {
-            named!($name(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-                mut e: call!($next, allow_struct, allow_block) >>
-                many0!(do_parse!(
-                    op: $submac!($($args)*) >>
-                    rhs: call!($next, allow_struct, true) >>
-                    ({
-                        e = ExprBinary {
-                            attrs: Vec::new(),
-                            left: Box::new(e.into()),
-                            op: op,
-                            right: Box::new(rhs.into()),
-                        }.into();
-                    })
-                )) >>
-                (e)
-            ));
-        }
-    }
-
-    // <placement> = <placement> ..
-    // <placement> += <placement> ..
-    // <placement> -= <placement> ..
-    // <placement> *= <placement> ..
-    // <placement> /= <placement> ..
-    // <placement> %= <placement> ..
-    // <placement> ^= <placement> ..
-    // <placement> &= <placement> ..
-    // <placement> |= <placement> ..
-    // <placement> <<= <placement> ..
-    // <placement> >>= <placement> ..
-    //
-    // NOTE: This operator is right-associative.
-    #[cfg(feature = "full")]
-    named!(assign_expr(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-        mut e: call!(placement_expr, allow_struct, allow_block) >>
-        alt!(
-            do_parse!(
-                eq: punct!(=) >>
-                // Recurse into self to parse right-associative operator.
-                rhs: call!(assign_expr, allow_struct, true) >>
-                ({
-                    e = ExprAssign {
-                        attrs: Vec::new(),
-                        left: Box::new(e),
-                        eq_token: eq,
-                        right: Box::new(rhs),
-                    }.into();
-                })
-            )
-            |
-            do_parse!(
-                op: call!(BinOp::parse_assign_op) >>
-                // Recurse into self to parse right-associative operator.
-                rhs: call!(assign_expr, allow_struct, true) >>
-                ({
-                    e = ExprAssignOp {
-                        attrs: Vec::new(),
-                        left: Box::new(e),
-                        op: op,
-                        right: Box::new(rhs),
-                    }.into();
-                })
-            )
-            |
-            epsilon!()
-        ) >>
-        (e)
-    ));
-
-    // <range> <- <range> ..
-    //
-    // NOTE: The `in place { expr }` version of this syntax is parsed in
-    // `atom_expr`, not here.
-    //
-    // NOTE: This operator is right-associative.
-    #[cfg(feature = "full")]
-    named!(placement_expr(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-        mut e: call!(range_expr, allow_struct, allow_block) >>
-        alt!(
-            do_parse!(
-                arrow: punct!(<-) >>
-                // Recurse into self to parse right-associative operator.
-                rhs: call!(placement_expr, allow_struct, true) >>
-                ({
-                    e = ExprInPlace {
-                        attrs: Vec::new(),
-                        // op: BinOp::Place(larrow),
-                        place: Box::new(e),
-                        arrow_token: arrow,
-                        value: Box::new(rhs),
-                    }.into();
-                })
-            )
-            |
-            epsilon!()
-        ) >>
-        (e)
-    ));
-
-    // <or> ... <or> ..
-    // <or> .. <or> ..
-    // <or> ..
-    //
-    // NOTE: This is currently parsed oddly - I'm not sure of what the exact
-    // rules are for parsing these expressions are, but this is not correct.
-    // For example, `a .. b .. c` is not a legal expression. It should not
-    // be parsed as either `(a .. b) .. c` or `a .. (b .. c)` apparently.
-    //
-    // NOTE: The form of ranges which don't include a preceding expression are
-    // parsed by `atom_expr`, rather than by this function.
-    #[cfg(feature = "full")]
-    named!(range_expr(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-        mut e: call!(or_expr, allow_struct, allow_block) >>
-        many0!(do_parse!(
-            limits: syn!(RangeLimits) >>
-            // We don't want to allow blocks here if we don't allow structs. See
-            // the reasoning for `opt_ambiguous_expr!` above.
-            hi: option!(call!(or_expr, allow_struct, allow_struct)) >>
-            ({
-                e = ExprRange {
-                    attrs: Vec::new(),
-                    from: Some(Box::new(e)),
-                    limits: limits,
-                    to: hi.map(|e| Box::new(e)),
-                }.into();
-            })
-        )) >>
-        (e)
-    ));
-
-    // <and> || <and> ...
-    binop!(or_expr, and_expr, map!(punct!(||), BinOp::Or));
-
-    // <compare> && <compare> ...
-    binop!(and_expr, compare_expr, map!(punct!(&&), BinOp::And));
-
-    // <bitor> == <bitor> ...
-    // <bitor> != <bitor> ...
-    // <bitor> >= <bitor> ...
-    // <bitor> <= <bitor> ...
-    // <bitor> > <bitor> ...
-    // <bitor> < <bitor> ...
-    //
-    // NOTE: This operator appears to be parsed as left-associative, but errors
-    // if it is used in a non-associative manner.
-    binop!(
-        compare_expr,
-        bitor_expr,
-        alt!(
-        punct!(==) => { BinOp::Eq }
-        |
-        punct!(!=) => { BinOp::Ne }
-        |
-        // must be above Lt
-        punct!(<=) => { BinOp::Le }
-        |
-        // must be above Gt
-        punct!(>=) => { BinOp::Ge }
-        |
-        do_parse!(
-            // Make sure that we don't eat the < part of a <- operator
-            not!(punct!(<-)) >>
-            t: punct!(<) >>
-            (BinOp::Lt(t))
-        )
-        |
-        punct!(>) => { BinOp::Gt }
-    )
-    );
-
-    // <bitxor> | <bitxor> ...
-    binop!(
-        bitor_expr,
-        bitxor_expr,
-        do_parse!(not!(punct!(||)) >> not!(punct!(|=)) >> t: punct!(|) >> (BinOp::BitOr(t)))
-    );
-
-    // <bitand> ^ <bitand> ...
-    binop!(
-        bitxor_expr,
-        bitand_expr,
-        do_parse!(
-            // NOTE: Make sure we aren't looking at ^=.
-            not!(punct!(^=)) >> t: punct!(^) >> (BinOp::BitXor(t))
-        )
-    );
-
-    // <shift> & <shift> ...
-    binop!(
-        bitand_expr,
-        shift_expr,
-        do_parse!(
-            // NOTE: Make sure we aren't looking at && or &=.
-            not!(punct!(&&)) >> not!(punct!(&=)) >> t: punct!(&) >> (BinOp::BitAnd(t))
-        )
-    );
-
-    // <arith> << <arith> ...
-    // <arith> >> <arith> ...
-    binop!(
-        shift_expr,
-        arith_expr,
-        alt!(
-        punct!(<<) => { BinOp::Shl }
-        |
-        punct!(>>) => { BinOp::Shr }
-    )
-    );
-
-    // <term> + <term> ...
-    // <term> - <term> ...
-    binop!(
-        arith_expr,
-        term_expr,
-        alt!(
-        punct!(+) => { BinOp::Add }
-        |
-        punct!(-) => { BinOp::Sub }
-    )
-    );
-
-    // <cast> * <cast> ...
-    // <cast> / <cast> ...
-    // <cast> % <cast> ...
-    binop!(
-        term_expr,
-        cast_expr,
-        alt!(
-        punct!(*) => { BinOp::Mul }
-        |
-        punct!(/) => { BinOp::Div }
-        |
-        punct!(%) => { BinOp::Rem }
-    )
-    );
-
-    // <unary> as <ty>
-    // <unary> : <ty>
-    #[cfg(feature = "full")]
-    named!(cast_expr(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-        mut e: call!(unary_expr, allow_struct, allow_block) >>
-        many0!(alt!(
-            do_parse!(
-                as_: keyword!(as) >>
-                // We can't accept `A + B` in cast expressions, as it's
-                // ambiguous with the + expression.
-                ty: call!(Type::without_plus) >>
-                ({
-                    e = ExprCast {
-                        attrs: Vec::new(),
-                        expr: Box::new(e),
-                        as_token: as_,
-                        ty: Box::new(ty),
-                    }.into();
-                })
-            )
-            |
-            do_parse!(
-                colon: punct!(:) >>
-                // We can't accept `A + B` in cast expressions, as it's
-                // ambiguous with the + expression.
-                ty: call!(Type::without_plus) >>
-                ({
-                    e = ExprType {
-                        attrs: Vec::new(),
-                        expr: Box::new(e),
-                        colon_token: colon,
-                        ty: Box::new(ty),
-                    }.into();
-                })
-            )
-        )) >>
-        (e)
-    ));
-
-    // <unary> as <ty>
-    #[cfg(not(feature = "full"))]
-    named!(cast_expr(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-        mut e: call!(unary_expr, allow_struct, allow_block) >>
-        many0!(do_parse!(
-            as_: keyword!(as) >>
-            // We can't accept `A + B` in cast expressions, as it's
-            // ambiguous with the + expression.
-            ty: call!(Type::without_plus) >>
-            ({
-                e = ExprCast {
-                    attrs: Vec::new(),
-                    expr: Box::new(e),
-                    as_token: as_,
-                    ty: Box::new(ty),
-                }.into();
-            })
-        )) >>
-        (e)
-    ));
-
-    // <UnOp> <trailer>
-    // & <trailer>
-    // &mut <trailer>
-    // box <trailer>
-    #[cfg(feature = "full")]
-    named!(unary_expr(allow_struct: bool, allow_block: bool) -> Expr, alt!(
-        do_parse!(
-            op: syn!(UnOp) >>
-            expr: call!(unary_expr, allow_struct, true) >>
-            (ExprUnary {
-                attrs: Vec::new(),
-                op: op,
-                expr: Box::new(expr),
-            }.into())
-        )
-        |
-        do_parse!(
-            and: punct!(&) >>
-            mutability: option!(keyword!(mut)) >>
-            expr: call!(unary_expr, allow_struct, true) >>
-            (ExprReference {
-                attrs: Vec::new(),
-                and_token: and,
-                mutability: mutability,
-                expr: Box::new(expr),
-            }.into())
-        )
-        |
-        do_parse!(
-            box_: keyword!(box) >>
-            expr: call!(unary_expr, allow_struct, true) >>
-            (ExprBox {
-                attrs: Vec::new(),
-                box_token: box_,
-                expr: Box::new(expr),
-            }.into())
-        )
-        |
-        call!(trailer_expr, allow_struct, allow_block)
-    ));
-
-    // XXX: This duplication is ugly
-    #[cfg(not(feature = "full"))]
-    named!(unary_expr(allow_struct: bool, allow_block: bool) -> Expr, alt!(
-        do_parse!(
-            op: syn!(UnOp) >>
-            expr: call!(unary_expr, allow_struct, true) >>
-            (ExprUnary {
-                attrs: Vec::new(),
-                op: op,
-                expr: Box::new(expr),
-            }.into())
-        )
-        |
-        call!(trailer_expr, allow_struct, allow_block)
-    ));
-
-    // <atom> (..<args>) ...
-    // <atom> . <ident> (..<args>) ...
-    // <atom> . <ident> ...
-    // <atom> . <lit> ...
-    // <atom> [ <expr> ] ...
-    // <atom> ? ...
-    #[cfg(feature = "full")]
-    named!(trailer_expr(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-        mut e: call!(atom_expr, allow_struct, allow_block) >>
-        many0!(alt!(
-            tap!(args: and_call => {
-                let (paren, args) = args;
-                e = ExprCall {
-                    attrs: Vec::new(),
-                    func: Box::new(e),
-                    args: args,
-                    paren_token: paren,
-                }.into();
-            })
-            |
-            tap!(more: and_method_call => {
-                let mut call = more;
-                call.receiver = Box::new(e);
-                e = call.into();
-            })
-            |
-            tap!(field: and_field => {
-                let (token, member) = field;
-                e = ExprField {
-                    attrs: Vec::new(),
-                    base: Box::new(e),
-                    dot_token: token,
-                    member: member,
-                }.into();
-            })
-            |
-            tap!(i: and_index => {
-                let (bracket, i) = i;
-                e = ExprIndex {
-                    attrs: Vec::new(),
-                    expr: Box::new(e),
-                    bracket_token: bracket,
-                    index: Box::new(i),
-                }.into();
-            })
-            |
-            tap!(question: punct!(?) => {
-                e = ExprTry {
-                    attrs: Vec::new(),
-                    expr: Box::new(e),
-                    question_token: question,
-                }.into();
-            })
-        )) >>
-        (e)
-    ));
-
-    // XXX: Duplication == ugly
-    #[cfg(not(feature = "full"))]
-    named!(trailer_expr(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-        mut e: call!(atom_expr, allow_struct, allow_block) >>
-        many0!(alt!(
-            tap!(args: and_call => {
-                e = ExprCall {
-                    attrs: Vec::new(),
-                    func: Box::new(e),
-                    paren_token: args.0,
-                    args: args.1,
-                }.into();
-            })
-            |
-            tap!(i: and_index => {
-                e = ExprIndex {
-                    attrs: Vec::new(),
-                    expr: Box::new(e),
-                    bracket_token: i.0,
-                    index: Box::new(i.1),
-                }.into();
-            })
-        )) >>
-        (e)
-    ));
-
-    // Parse all atomic expressions which don't have to worry about precedence
-    // interactions, as they are fully contained.
-    #[cfg(feature = "full")]
-    named!(atom_expr(allow_struct: bool, allow_block: bool) -> Expr, alt!(
-        syn!(ExprGroup) => { Expr::Group } // must be placed first
-        |
-        syn!(ExprLit) => { Expr::Lit } // must be before expr_struct
-        |
-        // must be before expr_path
-        cond_reduce!(allow_struct, syn!(ExprStruct)) => { Expr::Struct }
-        |
-        syn!(ExprParen) => { Expr::Paren } // must be before expr_tup
-        |
-        syn!(ExprMacro) => { Expr::Macro } // must be before expr_path
-        |
-        call!(expr_break, allow_struct) // must be before expr_path
-        |
-        syn!(ExprContinue) => { Expr::Continue } // must be before expr_path
-        |
-        call!(expr_ret, allow_struct) // must be before expr_path
-        |
-        syn!(ExprArray) => { Expr::Array }
-        |
-        syn!(ExprTuple) => { Expr::Tuple }
-        |
-        syn!(ExprIf) => { Expr::If }
-        |
-        syn!(ExprIfLet) => { Expr::IfLet }
-        |
-        syn!(ExprWhile) => { Expr::While }
-        |
-        syn!(ExprWhileLet) => { Expr::WhileLet }
-        |
-        syn!(ExprForLoop) => { Expr::ForLoop }
-        |
-        syn!(ExprLoop) => { Expr::Loop }
-        |
-        syn!(ExprMatch) => { Expr::Match }
-        |
-        syn!(ExprCatch) => { Expr::Catch }
-        |
-        syn!(ExprYield) => { Expr::Yield }
-        |
-        syn!(ExprUnsafe) => { Expr::Unsafe }
-        |
-        call!(expr_closure, allow_struct)
-        |
-        cond_reduce!(allow_block, syn!(ExprBlock)) => { Expr::Block }
-        |
-        // NOTE: This is the prefix-form of range
-        call!(expr_range, allow_struct)
-        |
-        syn!(ExprPath) => { Expr::Path }
-        |
-        syn!(ExprRepeat) => { Expr::Repeat }
-    ));
-
-    #[cfg(not(feature = "full"))]
-    named!(atom_expr(_allow_struct: bool, _allow_block: bool) -> Expr, alt!(
-        syn!(ExprLit) => { Expr::Lit }
-        |
-        syn!(ExprParen) => { Expr::Paren }
-        |
-        syn!(ExprPath) => { Expr::Path }
-    ));
-
-    #[cfg(feature = "full")]
-    named!(expr_nosemi -> Expr, map!(alt!(
-        syn!(ExprIf) => { Expr::If }
-        |
-        syn!(ExprIfLet) => { Expr::IfLet }
-        |
-        syn!(ExprWhile) => { Expr::While }
-        |
-        syn!(ExprWhileLet) => { Expr::WhileLet }
-        |
-        syn!(ExprForLoop) => { Expr::ForLoop }
-        |
-        syn!(ExprLoop) => { Expr::Loop }
-        |
-        syn!(ExprMatch) => { Expr::Match }
-        |
-        syn!(ExprCatch) => { Expr::Catch }
-        |
-        syn!(ExprYield) => { Expr::Yield }
-        |
-        syn!(ExprUnsafe) => { Expr::Unsafe }
-        |
-        syn!(ExprBlock) => { Expr::Block }
-    ), Expr::from));
-
-    impl Synom for ExprLit {
-        named!(parse -> Self, do_parse!(
-            lit: syn!(Lit) >>
-            (ExprLit {
-                attrs: Vec::new(),
-                lit: lit,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("literal")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprMacro {
-        named!(parse -> Self, do_parse!(
-            mac: syn!(Macro) >>
-            (ExprMacro {
-                attrs: Vec::new(),
-                mac: mac,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("macro invocation expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprGroup {
-        named!(parse -> Self, do_parse!(
-            e: grouped!(syn!(Expr)) >>
-            (ExprGroup {
-                attrs: Vec::new(),
-                expr: Box::new(e.1),
-                group_token: e.0,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("expression surrounded by invisible delimiters")
-        }
-    }
-
-    impl Synom for ExprParen {
-        named!(parse -> Self, do_parse!(
-            e: parens!(syn!(Expr)) >>
-            (ExprParen {
-                attrs: Vec::new(),
-                paren_token: e.0,
-                expr: Box::new(e.1),
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("parenthesized expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprArray {
-        named!(parse -> Self, do_parse!(
-            elems: brackets!(Punctuated::parse_terminated) >>
-            (ExprArray {
-                attrs: Vec::new(),
-                bracket_token: elems.0,
-                elems: elems.1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("array expression")
-        }
-    }
-
-    named!(and_call -> (token::Paren, Punctuated<Expr, Token![,]>),
-           parens!(Punctuated::parse_terminated));
-
-    #[cfg(feature = "full")]
-    named!(and_method_call -> ExprMethodCall, do_parse!(
-        dot: punct!(.) >>
-        method: syn!(Ident) >>
-        turbofish: option!(tuple!(
-            punct!(::),
-            punct!(<),
-            call!(Punctuated::parse_terminated),
-            punct!(>)
-        )) >>
-        args: parens!(Punctuated::parse_terminated) >>
-        ({
-            ExprMethodCall {
-                attrs: Vec::new(),
-                // this expr will get overwritten after being returned
-                receiver: Box::new(Expr::Verbatim(ExprVerbatim {
-                    tts: TokenStream::empty(),
-                })),
-
-                method: method,
-                turbofish: turbofish.map(|fish| MethodTurbofish {
-                    colon2_token: fish.0,
-                    lt_token: fish.1,
-                    args: fish.2,
-                    gt_token: fish.3,
-                }),
-                args: args.1,
-                paren_token: args.0,
-                dot_token: dot,
-            }
-        })
-    ));
-
-    #[cfg(feature = "full")]
-    impl Synom for GenericMethodArgument {
-        // TODO parse const generics as well
-        named!(parse -> Self, map!(ty_no_eq_after, GenericMethodArgument::Type));
-
-        fn description() -> Option<&'static str> {
-            Some("generic method argument")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprTuple {
-        named!(parse -> Self, do_parse!(
-            elems: parens!(Punctuated::parse_terminated) >>
-            (ExprTuple {
-                attrs: Vec::new(),
-                elems: elems.1,
-                paren_token: elems.0,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("tuple")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprIfLet {
-        named!(parse -> Self, do_parse!(
-            if_: keyword!(if) >>
-            let_: keyword!(let) >>
-            pats: call!(Punctuated::parse_separated_nonempty) >>
-            eq: punct!(=) >>
-            cond: expr_no_struct >>
-            then_block: braces!(Block::parse_within) >>
-            else_block: option!(else_block) >>
-            (ExprIfLet {
-                attrs: Vec::new(),
-                pats: pats,
-                let_token: let_,
-                eq_token: eq,
-                expr: Box::new(cond),
-                then_branch: Block {
-                    brace_token: then_block.0,
-                    stmts: then_block.1,
-                },
-                if_token: if_,
-                else_branch: else_block,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`if let` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprIf {
-        named!(parse -> Self, do_parse!(
-            if_: keyword!(if) >>
-            cond: expr_no_struct >>
-            then_block: braces!(Block::parse_within) >>
-            else_block: option!(else_block) >>
-            (ExprIf {
-                attrs: Vec::new(),
-                cond: Box::new(cond),
-                then_branch: Block {
-                    brace_token: then_block.0,
-                    stmts: then_block.1,
-                },
-                if_token: if_,
-                else_branch: else_block,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`if` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(else_block -> (Token![else], Box<Expr>), do_parse!(
-        else_: keyword!(else) >>
-        expr: alt!(
-            syn!(ExprIf) => { Expr::If }
-            |
-            syn!(ExprIfLet) => { Expr::IfLet }
-            |
-            do_parse!(
-                else_block: braces!(Block::parse_within) >>
-                (Expr::Block(ExprBlock {
-                    attrs: Vec::new(),
-                    block: Block {
-                        brace_token: else_block.0,
-                        stmts: else_block.1,
-                    },
-                }))
-            )
-        ) >>
-        (else_, Box::new(expr))
-    ));
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprForLoop {
-        named!(parse -> Self, do_parse!(
-            label: option!(syn!(Label)) >>
-            for_: keyword!(for) >>
-            pat: syn!(Pat) >>
-            in_: keyword!(in) >>
-            expr: expr_no_struct >>
-            loop_block: syn!(Block) >>
-            (ExprForLoop {
-                attrs: Vec::new(),
-                for_token: for_,
-                in_token: in_,
-                pat: Box::new(pat),
-                expr: Box::new(expr),
-                body: loop_block,
-                label: label,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`for` loop")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprLoop {
-        named!(parse -> Self, do_parse!(
-            label: option!(syn!(Label)) >>
-            loop_: keyword!(loop) >>
-            loop_block: syn!(Block) >>
-            (ExprLoop {
-                attrs: Vec::new(),
-                loop_token: loop_,
-                body: loop_block,
-                label: label,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`loop`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprMatch {
-        named!(parse -> Self, do_parse!(
-            match_: keyword!(match) >>
-            obj: expr_no_struct >>
-            res: braces!(many0!(Arm::parse)) >>
-            (ExprMatch {
-                attrs: Vec::new(),
-                expr: Box::new(obj),
-                match_token: match_,
-                brace_token: res.0,
-                arms: res.1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`match` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprCatch {
-        named!(parse -> Self, do_parse!(
-            do_: keyword!(do) >>
-            catch_: keyword!(catch) >>
-            catch_block: syn!(Block) >>
-            (ExprCatch {
-                attrs: Vec::new(),
-                block: catch_block,
-                do_token: do_,
-                catch_token: catch_,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`catch` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprYield {
-        named!(parse -> Self, do_parse!(
-            yield_: keyword!(yield) >>
-            expr: option!(syn!(Expr)) >>
-            (ExprYield {
-                attrs: Vec::new(),
-                yield_token: yield_,
-                expr: expr.map(Box::new),
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`yield` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for Arm {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            leading_vert: option!(punct!(|)) >>
-            pats: call!(Punctuated::parse_separated_nonempty) >>
-            guard: option!(tuple!(keyword!(if), syn!(Expr))) >>
-            fat_arrow: punct!(=>) >>
-            body: do_parse!(
-                expr: alt!(expr_nosemi | syn!(Expr)) >>
-                comma: switch!(value!(arm_expr_requires_comma(&expr)),
-                    true => alt!(
-                        input_end!() => { |_| None }
-                        |
-                        punct!(,) => { Some }
-                    )
-                    |
-                    false => option!(punct!(,))
-                ) >>
-                (expr, comma)
-            ) >>
-            (Arm {
-                fat_arrow_token: fat_arrow,
-                attrs: attrs,
-                leading_vert: leading_vert,
-                pats: pats,
-                guard: guard.map(|(if_, guard)| (if_, Box::new(guard))),
-                body: Box::new(body.0),
-                comma: body.1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`match` arm")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(expr_closure(allow_struct: bool) -> Expr, do_parse!(
-        movability: option!(keyword!(static)) >>
-        capture: option!(keyword!(move)) >>
-        or1: punct!(|) >>
-        inputs: call!(Punctuated::parse_terminated_with, fn_arg) >>
-        or2: punct!(|) >>
-        ret_and_body: alt!(
-            do_parse!(
-                arrow: punct!(->) >>
-                ty: syn!(Type) >>
-                body: syn!(Block) >>
-                (ReturnType::Type(arrow, Box::new(ty)),
-                 Expr::Block(ExprBlock {
-                     attrs: Vec::new(),
-                    block: body,
-                }))
-            )
-            |
-            map!(ambiguous_expr!(allow_struct), |e| (ReturnType::Default, e))
-        ) >>
-        (ExprClosure {
-            attrs: Vec::new(),
-            movability: movability,
-            capture: capture,
-            or1_token: or1,
-            inputs: inputs,
-            or2_token: or2,
-            output: ret_and_body.0,
-            body: Box::new(ret_and_body.1),
-        }.into())
-    ));
-
-    #[cfg(feature = "full")]
-    named!(fn_arg -> FnArg, do_parse!(
-        pat: syn!(Pat) >>
-        ty: option!(tuple!(punct!(:), syn!(Type))) >>
-        ({
-            if let Some((colon, ty)) = ty {
-                FnArg::Captured(ArgCaptured {
-                    pat: pat,
-                    colon_token: colon,
-                    ty: ty,
-                })
-            } else {
-                FnArg::Inferred(pat)
-            }
-        })
-    ));
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprWhile {
-        named!(parse -> Self, do_parse!(
-            label: option!(syn!(Label)) >>
-            while_: keyword!(while) >>
-            cond: expr_no_struct >>
-            while_block: syn!(Block) >>
-            (ExprWhile {
-                attrs: Vec::new(),
-                while_token: while_,
-                cond: Box::new(cond),
-                body: while_block,
-                label: label,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`while` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprWhileLet {
-        named!(parse -> Self, do_parse!(
-            label: option!(syn!(Label)) >>
-            while_: keyword!(while) >>
-            let_: keyword!(let) >>
-            pats: call!(Punctuated::parse_separated_nonempty) >>
-            eq: punct!(=) >>
-            value: expr_no_struct >>
-            while_block: syn!(Block) >>
-            (ExprWhileLet {
-                attrs: Vec::new(),
-                eq_token: eq,
-                let_token: let_,
-                while_token: while_,
-                pats: pats,
-                expr: Box::new(value),
-                body: while_block,
-                label: label,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`while let` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for Label {
-        named!(parse -> Self, do_parse!(
-            name: syn!(Lifetime) >>
-            colon: punct!(:) >>
-            (Label {
-                name: name,
-                colon_token: colon,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`while let` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprContinue {
-        named!(parse -> Self, do_parse!(
-            cont: keyword!(continue) >>
-            label: option!(syn!(Lifetime)) >>
-            (ExprContinue {
-                attrs: Vec::new(),
-                continue_token: cont,
-                label: label,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`continue`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(expr_break(allow_struct: bool) -> Expr, do_parse!(
-        break_: keyword!(break) >>
-        label: option!(syn!(Lifetime)) >>
-        // We can't allow blocks after a `break` expression when we wouldn't
-        // allow structs, as this expression is ambiguous.
-        val: opt_ambiguous_expr!(allow_struct) >>
-        (ExprBreak {
-            attrs: Vec::new(),
-            label: label,
-            expr: val.map(Box::new),
-            break_token: break_,
-        }.into())
-    ));
-
-    #[cfg(feature = "full")]
-    named!(expr_ret(allow_struct: bool) -> Expr, do_parse!(
-        return_: keyword!(return) >>
-        // NOTE: return is greedy and eats blocks after it even when in a
-        // position where structs are not allowed, such as in if statement
-        // conditions. For example:
-        //
-        // if return { println!("A") } {} // Prints "A"
-        ret_value: option!(ambiguous_expr!(allow_struct)) >>
-        (ExprReturn {
-            attrs: Vec::new(),
-            expr: ret_value.map(Box::new),
-            return_token: return_,
-        }.into())
-    ));
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprStruct {
-        named!(parse -> Self, do_parse!(
-            path: syn!(Path) >>
-            data: braces!(do_parse!(
-                fields: call!(Punctuated::parse_terminated) >>
-                base: option!(cond!(fields.empty_or_trailing(), do_parse!(
-                    dots: punct!(..) >>
-                    base: syn!(Expr) >>
-                    (dots, base)
-                ))) >>
-                (fields, base)
-            )) >>
-            ({
-                let (brace, (fields, base)) = data;
-                let (dots, rest) = match base.and_then(|b| b) {
-                    Some((dots, base)) => (Some(dots), Some(base)),
-                    None => (None, None),
-                };
-                ExprStruct {
-                    attrs: Vec::new(),
-                    brace_token: brace,
-                    path: path,
-                    fields: fields,
-                    dot2_token: dots,
-                    rest: rest.map(Box::new),
-                }
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("struct literal expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for FieldValue {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            field_value: alt!(
-                tuple!(syn!(Member), map!(punct!(:), Some), syn!(Expr))
-                |
-                map!(syn!(Ident), |name| (
-                    Member::Named(name),
-                    None,
-                    Expr::Path(ExprPath {
-                        attrs: Vec::new(),
-                        qself: None,
-                        path: name.into(),
-                    }),
-                ))
-            ) >>
-            (FieldValue {
-                attrs: attrs,
-                member: field_value.0,
-                colon_token: field_value.1,
-                expr: field_value.2,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("field-value pair: `field: value`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprRepeat {
-        named!(parse -> Self, do_parse!(
-            data: brackets!(do_parse!(
-                value: syn!(Expr) >>
-                semi: punct!(;) >>
-                times: syn!(Expr) >>
-                (value, semi, times)
-            )) >>
-            (ExprRepeat {
-                attrs: Vec::new(),
-                expr: Box::new((data.1).0),
-                len: Box::new((data.1).2),
-                bracket_token: data.0,
-                semi_token: (data.1).1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("repeated array literal: `[val; N]`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprUnsafe {
-        named!(parse -> Self, do_parse!(
-            unsafe_: keyword!(unsafe) >>
-            b: syn!(Block) >>
-            (ExprUnsafe {
-                attrs: Vec::new(),
-                unsafe_token: unsafe_,
-                block: b,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("unsafe block: `unsafe { .. }`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprBlock {
-        named!(parse -> Self, do_parse!(
-            b: syn!(Block) >>
-            (ExprBlock {
-                attrs: Vec::new(),
-                block: b,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("block: `{ .. }`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(expr_range(allow_struct: bool) -> Expr, do_parse!(
-        limits: syn!(RangeLimits) >>
-        hi: opt_ambiguous_expr!(allow_struct) >>
-        (ExprRange {
-            attrs: Vec::new(),
-            from: None,
-            to: hi.map(Box::new),
-            limits: limits,
-        }.into())
-    ));
-
-    #[cfg(feature = "full")]
-    impl Synom for RangeLimits {
-        named!(parse -> Self, alt!(
-            // Must come before Dot2
-            punct!(..=) => { RangeLimits::Closed }
-            |
-            // Must come before Dot2
-            punct!(...) => { |dot3| RangeLimits::Closed(Token![..=](dot3.0)) }
-            |
-            punct!(..) => { RangeLimits::HalfOpen }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("range limit: `..`, `...` or `..=`")
-        }
-    }
-
-    impl Synom for ExprPath {
-        named!(parse -> Self, do_parse!(
-            pair: qpath >>
-            (ExprPath {
-                attrs: Vec::new(),
-                qself: pair.0,
-                path: pair.1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("path: `a::b::c`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(and_field -> (Token![.], Member), tuple!(punct!(.), syn!(Member)));
-
-    named!(and_index -> (token::Bracket, Expr), brackets!(syn!(Expr)));
-
-    #[cfg(feature = "full")]
-    impl Synom for Block {
-        named!(parse -> Self, do_parse!(
-            stmts: braces!(Block::parse_within) >>
-            (Block {
-                brace_token: stmts.0,
-                stmts: stmts.1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("block: `{ .. }`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Block {
-        named!(pub parse_within -> Vec<Stmt>, do_parse!(
-            many0!(punct!(;)) >>
-            mut standalone: many0!(do_parse!(
-                stmt: syn!(Stmt) >>
-                many0!(punct!(;)) >>
-                (stmt)
-            )) >>
-            last: option!(do_parse!(
-                attrs: many0!(Attribute::parse_outer) >>
-                mut e: syn!(Expr) >>
-                ({
-                    e.replace_attrs(attrs);
-                    Stmt::Expr(e)
-                })
-            )) >>
-            (match last {
-                None => standalone,
-                Some(last) => {
-                    standalone.push(last);
-                    standalone
-                }
-            })
-        ));
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for Stmt {
-        named!(parse -> Self, alt!(
-            stmt_mac
-            |
-            stmt_local
-            |
-            stmt_item
-            |
-            stmt_blockexpr
-            |
-            stmt_expr
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("statement")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(stmt_mac -> Stmt, do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        what: call!(Path::parse_mod_style) >>
-        bang: punct!(!) >>
-    // Only parse braces here; paren and bracket will get parsed as
-    // expression statements
-        data: braces!(syn!(TokenStream)) >>
-        semi: option!(punct!(;)) >>
-        (Stmt::Item(Item::Macro(ItemMacro {
-            attrs: attrs,
-            ident: None,
-            mac: Macro {
-                path: what,
-                bang_token: bang,
-                delimiter: MacroDelimiter::Brace(data.0),
-                tts: data.1,
-            },
-            semi_token: semi,
-        })))
-    ));
-
-    #[cfg(feature = "full")]
-    named!(stmt_local -> Stmt, do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        let_: keyword!(let) >>
-        pats: call!(Punctuated::parse_separated_nonempty) >>
-        ty: option!(tuple!(punct!(:), syn!(Type))) >>
-        init: option!(tuple!(punct!(=), syn!(Expr))) >>
-        semi: punct!(;) >>
-        (Stmt::Local(Local {
-            attrs: attrs,
-            let_token: let_,
-            pats: pats,
-            ty: ty.map(|(colon, ty)| (colon, Box::new(ty))),
-            init: init.map(|(eq, expr)| (eq, Box::new(expr))),
-            semi_token: semi,
-        }))
-    ));
-
-    #[cfg(feature = "full")]
-    named!(stmt_item -> Stmt, map!(syn!(Item), |i| Stmt::Item(i)));
-
-    #[cfg(feature = "full")]
-    named!(stmt_blockexpr -> Stmt, do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        mut e: expr_nosemi >>
-        // If the next token is a `.` or a `?` it is special-cased to parse as
-        // an expression instead of a blockexpression.
-        not!(punct!(.)) >>
-        not!(punct!(?)) >>
-        semi: option!(punct!(;)) >>
-        ({
-            e.replace_attrs(attrs);
-            if let Some(semi) = semi {
-                Stmt::Semi(e, semi)
-            } else {
-                Stmt::Expr(e)
-            }
-        })
-    ));
-
-    #[cfg(feature = "full")]
-    named!(stmt_expr -> Stmt, do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        mut e: syn!(Expr) >>
-        semi: punct!(;) >>
-        ({
-            e.replace_attrs(attrs);
-            Stmt::Semi(e, semi)
-        })
-    ));
-
-    #[cfg(feature = "full")]
-    impl Synom for Pat {
-        named!(parse -> Self, alt!(
-            syn!(PatWild) => { Pat::Wild } // must be before pat_ident
-            |
-            syn!(PatBox) => { Pat::Box }  // must be before pat_ident
-            |
-            syn!(PatRange) => { Pat::Range } // must be before pat_lit
-            |
-            syn!(PatTupleStruct) => { Pat::TupleStruct }  // must be before pat_ident
-            |
-            syn!(PatStruct) => { Pat::Struct } // must be before pat_ident
-            |
-            syn!(PatMacro) => { Pat::Macro } // must be before pat_ident
-            |
-            syn!(PatLit) => { Pat::Lit } // must be before pat_ident
-            |
-            syn!(PatIdent) => { Pat::Ident } // must be before pat_path
-            |
-            syn!(PatPath) => { Pat::Path }
-            |
-            syn!(PatTuple) => { Pat::Tuple }
-            |
-            syn!(PatRef) => { Pat::Ref }
-            |
-            syn!(PatSlice) => { Pat::Slice }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatWild {
-        named!(parse -> Self, map!(
-            punct!(_),
-            |u| PatWild { underscore_token: u }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("wild pattern: `_`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatBox {
-        named!(parse -> Self, do_parse!(
-            boxed: keyword!(box) >>
-            pat: syn!(Pat) >>
-            (PatBox {
-                pat: Box::new(pat),
-                box_token: boxed,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("box pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatIdent {
-        named!(parse -> Self, do_parse!(
-            by_ref: option!(keyword!(ref)) >>
-            mutability: option!(keyword!(mut)) >>
-            name: alt!(
-                syn!(Ident)
-                |
-                keyword!(self) => { Into::into }
-            ) >>
-            not!(punct!(<)) >>
-            not!(punct!(::)) >>
-            subpat: option!(tuple!(punct!(@), syn!(Pat))) >>
-            (PatIdent {
-                by_ref: by_ref,
-                mutability: mutability,
-                ident: name,
-                subpat: subpat.map(|(at, pat)| (at, Box::new(pat))),
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("pattern identifier binding")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatTupleStruct {
-        named!(parse -> Self, do_parse!(
-            path: syn!(Path) >>
-            tuple: syn!(PatTuple) >>
-            (PatTupleStruct {
-                path: path,
-                pat: tuple,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("tuple struct pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatStruct {
-        named!(parse -> Self, do_parse!(
-            path: syn!(Path) >>
-            data: braces!(do_parse!(
-                fields: call!(Punctuated::parse_terminated) >>
-                base: option!(cond!(fields.empty_or_trailing(), punct!(..))) >>
-                (fields, base)
-            )) >>
-            (PatStruct {
-                path: path,
-                fields: (data.1).0,
-                brace_token: data.0,
-                dot2_token: (data.1).1.and_then(|m| m),
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("struct pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for FieldPat {
-        named!(parse -> Self, alt!(
-            do_parse!(
-                member: syn!(Member) >>
-                colon: punct!(:) >>
-                pat: syn!(Pat) >>
-                (FieldPat {
-                    member: member,
-                    pat: Box::new(pat),
-                    attrs: Vec::new(),
-                    colon_token: Some(colon),
-                })
-            )
-            |
-            do_parse!(
-                boxed: option!(keyword!(box)) >>
-                by_ref: option!(keyword!(ref)) >>
-                mutability: option!(keyword!(mut)) >>
-                ident: syn!(Ident) >>
-                ({
-                    let mut pat: Pat = PatIdent {
-                        by_ref: by_ref,
-                        mutability: mutability,
-                        ident: ident,
-                        subpat: None,
-                    }.into();
-                    if let Some(boxed) = boxed {
-                        pat = PatBox {
-                            pat: Box::new(pat),
-                            box_token: boxed,
-                        }.into();
-                    }
-                    FieldPat {
-                        member: Member::Named(ident),
-                        pat: Box::new(pat),
-                        attrs: Vec::new(),
-                        colon_token: None,
-                    }
-                })
-            )
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("field pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for Member {
-        named!(parse -> Self, alt!(
-            syn!(Ident) => { Member::Named }
-            |
-            syn!(Index) => { Member::Unnamed }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("field member")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for Index {
-        named!(parse -> Self, do_parse!(
-            lit: syn!(LitInt) >>
-            ({
-                if let IntSuffix::None = lit.suffix() {
-                    Index { index: lit.value() as u32, span: lit.span() }
-                } else {
-                    return parse_error();
-                }
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("field index")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatPath {
-        named!(parse -> Self, map!(
-            syn!(ExprPath),
-            |p| PatPath { qself: p.qself, path: p.path }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("path pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatTuple {
-        named!(parse -> Self, do_parse!(
-            data: parens!(do_parse!(
-                front: call!(Punctuated::parse_terminated) >>
-                dotdot: option!(cond_reduce!(front.empty_or_trailing(),
-                    tuple!(punct!(..), option!(punct!(,)))
-                )) >>
-                back: cond!(match dotdot {
-                                Some((_, Some(_))) => true,
-                                _ => false,
-                            },
-                            Punctuated::parse_terminated) >>
-                (front, dotdot, back)
-            )) >>
-            ({
-                let (parens, (front, dotdot, back)) = data;
-                let (dotdot, trailing) = match dotdot {
-                    Some((a, b)) => (Some(a), Some(b)),
-                    None => (None, None),
-                };
-                PatTuple {
-                    paren_token: parens,
-                    front: front,
-                    dot2_token: dotdot,
-                    comma_token: trailing.unwrap_or_default(),
-                    back: back.unwrap_or_default(),
-                }
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("tuple pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatRef {
-        named!(parse -> Self, do_parse!(
-            and: punct!(&) >>
-            mutability: option!(keyword!(mut)) >>
-            pat: syn!(Pat) >>
-            (PatRef {
-                pat: Box::new(pat),
-                mutability: mutability,
-                and_token: and,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("reference pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatLit {
-        named!(parse -> Self, do_parse!(
-            lit: pat_lit_expr >>
-            (if let Expr::Path(_) = lit {
-                return parse_error(); // these need to be parsed by pat_path
-            } else {
-                PatLit {
-                    expr: Box::new(lit),
-                }
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("literal pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatRange {
-        named!(parse -> Self, do_parse!(
-            lo: pat_lit_expr >>
-            limits: syn!(RangeLimits) >>
-            hi: pat_lit_expr >>
-            (PatRange {
-                lo: Box::new(lo),
-                hi: Box::new(hi),
-                limits: limits,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("range pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(pat_lit_expr -> Expr, do_parse!(
-        neg: option!(punct!(-)) >>
-        v: alt!(
-            syn!(ExprLit) => { Expr::Lit }
-            |
-            syn!(ExprPath) => { Expr::Path }
-        ) >>
-        (if let Some(neg) = neg {
-            Expr::Unary(ExprUnary {
-                attrs: Vec::new(),
-                op: UnOp::Neg(neg),
-                expr: Box::new(v)
-            })
-        } else {
-            v
-        })
-    ));
-
-    #[cfg(feature = "full")]
-    impl Synom for PatSlice {
-        named!(parse -> Self, map!(
-            brackets!(do_parse!(
-                before: call!(Punctuated::parse_terminated) >>
-                middle: option!(do_parse!(
-                    dots: punct!(..) >>
-                    trailing: option!(punct!(,)) >>
-                    (dots, trailing)
-                )) >>
-                after: cond!(
-                    match middle {
-                        Some((_, ref trailing)) => trailing.is_some(),
-                        _ => false,
-                    },
-                    Punctuated::parse_terminated
-                ) >>
-                (before, middle, after)
-            )),
-            |(brackets, (before, middle, after))| {
-                let mut before: Punctuated<Pat, Token![,]> = before;
-                let after: Option<Punctuated<Pat, Token![,]>> = after;
-                let middle: Option<(Token![..], Option<Token![,]>)> = middle;
-                PatSlice {
-                    dot2_token: middle.as_ref().map(|m| Token![..]((m.0).0)),
-                    comma_token: middle.as_ref().and_then(|m| {
-                        m.1.as_ref().map(|m| Token![,](m.0))
-                    }),
-                    bracket_token: brackets,
-                    middle: middle.and_then(|_| {
-                        if before.empty_or_trailing() {
-                            None
-                        } else {
-                            Some(Box::new(before.pop().unwrap().into_value()))
-                        }
-                    }),
-                    front: before,
-                    back: after.unwrap_or_default(),
-                }
-            }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("slice pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatMacro {
-        named!(parse -> Self, map!(syn!(Macro), |mac| PatMacro { mac: mac }));
-
-        fn description() -> Option<&'static str> {
-            Some("macro pattern")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    #[cfg(feature = "full")]
-    use attr::FilterAttrs;
-    use quote::{ToTokens, Tokens};
-    use proc_macro2::Literal;
-
-    // If the given expression is a bare `ExprStruct`, wraps it in parenthesis
-    // before appending it to `Tokens`.
-    #[cfg(feature = "full")]
-    fn wrap_bare_struct(tokens: &mut Tokens, e: &Expr) {
-        if let Expr::Struct(_) = *e {
-            token::Paren::default().surround(tokens, |tokens| {
-                e.to_tokens(tokens);
-            });
-        } else {
-            e.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    fn attrs_to_tokens(attrs: &[Attribute], tokens: &mut Tokens) {
-        tokens.append_all(attrs.outer());
-    }
-
-    #[cfg(not(feature = "full"))]
-    fn attrs_to_tokens(_attrs: &[Attribute], _tokens: &mut Tokens) {}
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprBox {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.box_token.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprInPlace {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.place.to_tokens(tokens);
-            self.arrow_token.to_tokens(tokens);
-            self.value.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprArray {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.bracket_token.surround(tokens, |tokens| {
-                self.elems.to_tokens(tokens);
-            })
-        }
-    }
-
-    impl ToTokens for ExprCall {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            attrs_to_tokens(&self.attrs, tokens);
-            self.func.to_tokens(tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                self.args.to_tokens(tokens);
-            })
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprMethodCall {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.receiver.to_tokens(tokens);
-            self.dot_token.to_tokens(tokens);
-            self.method.to_tokens(tokens);
-            self.turbofish.to_tokens(tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                self.args.to_tokens(tokens);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for MethodTurbofish {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.colon2_token.to_tokens(tokens);
-            self.lt_token.to_tokens(tokens);
-            self.args.to_tokens(tokens);
-            self.gt_token.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for GenericMethodArgument {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            match *self {
-                GenericMethodArgument::Type(ref t) => t.to_tokens(tokens),
-                GenericMethodArgument::Const(ref c) => c.to_tokens(tokens),
-            }
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprTuple {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.paren_token.surround(tokens, |tokens| {
-                self.elems.to_tokens(tokens);
-                // If we only have one argument, we need a trailing comma to
-                // distinguish ExprTuple from ExprParen.
-                if self.elems.len() == 1 && !self.elems.trailing_punct() {
-                    <Token![,]>::default().to_tokens(tokens);
-                }
-            })
-        }
-    }
-
-    impl ToTokens for ExprBinary {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            attrs_to_tokens(&self.attrs, tokens);
-            self.left.to_tokens(tokens);
-            self.op.to_tokens(tokens);
-            self.right.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ExprUnary {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            attrs_to_tokens(&self.attrs, tokens);
-            self.op.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ExprLit {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            attrs_to_tokens(&self.attrs, tokens);
-            self.lit.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ExprCast {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            attrs_to_tokens(&self.attrs, tokens);
-            self.expr.to_tokens(tokens);
-            self.as_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprType {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            attrs_to_tokens(&self.attrs, tokens);
-            self.expr.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    fn maybe_wrap_else(tokens: &mut Tokens, else_: &Option<(Token![else], Box<Expr>)>) {
-        if let Some((ref else_token, ref else_)) = *else_ {
-            else_token.to_tokens(tokens);
-
-            // If we are not one of the valid expressions to exist in an else
-            // clause, wrap ourselves in a block.
-            match **else_ {
-                Expr::If(_) | Expr::IfLet(_) | Expr::Block(_) => {
-                    else_.to_tokens(tokens);
-                }
-                _ => {
-                    token::Brace::default().surround(tokens, |tokens| {
-                        else_.to_tokens(tokens);
-                    });
-                }
-            }
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprIf {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.if_token.to_tokens(tokens);
-            wrap_bare_struct(tokens, &self.cond);
-            self.then_branch.to_tokens(tokens);
-            maybe_wrap_else(tokens, &self.else_branch);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprIfLet {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.if_token.to_tokens(tokens);
-            self.let_token.to_tokens(tokens);
-            self.pats.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            wrap_bare_struct(tokens, &self.expr);
-            self.then_branch.to_tokens(tokens);
-            maybe_wrap_else(tokens, &self.else_branch);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprWhile {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.label.to_tokens(tokens);
-            self.while_token.to_tokens(tokens);
-            wrap_bare_struct(tokens, &self.cond);
-            self.body.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprWhileLet {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.label.to_tokens(tokens);
-            self.while_token.to_tokens(tokens);
-            self.let_token.to_tokens(tokens);
-            self.pats.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            wrap_bare_struct(tokens, &self.expr);
-            self.body.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprForLoop {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.label.to_tokens(tokens);
-            self.for_token.to_tokens(tokens);
-            self.pat.to_tokens(tokens);
-            self.in_token.to_tokens(tokens);
-            wrap_bare_struct(tokens, &self.expr);
-            self.body.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprLoop {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.label.to_tokens(tokens);
-            self.loop_token.to_tokens(tokens);
-            self.body.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprMatch {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.match_token.to_tokens(tokens);
-            wrap_bare_struct(tokens, &self.expr);
-            self.brace_token.surround(tokens, |tokens| {
-                for (i, arm) in self.arms.iter().enumerate() {
-                    arm.to_tokens(tokens);
-                    // Ensure that we have a comma after a non-block arm, except
-                    // for the last one.
-                    let is_last = i == self.arms.len() - 1;
-                    if !is_last && arm_expr_requires_comma(&arm.body) && arm.comma.is_none() {
-                        <Token![,]>::default().to_tokens(tokens);
-                    }
-                }
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprCatch {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.do_token.to_tokens(tokens);
-            self.catch_token.to_tokens(tokens);
-            self.block.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprYield {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.yield_token.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprClosure {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.movability.to_tokens(tokens);
-            self.capture.to_tokens(tokens);
-            self.or1_token.to_tokens(tokens);
-            for input in self.inputs.pairs() {
-                match **input.value() {
-                    FnArg::Captured(ArgCaptured {
-                        ref pat,
-                        ty: Type::Infer(_),
-                        ..
-                    }) => {
-                        pat.to_tokens(tokens);
-                    }
-                    _ => input.value().to_tokens(tokens),
-                }
-                input.punct().to_tokens(tokens);
-            }
-            self.or2_token.to_tokens(tokens);
-            self.output.to_tokens(tokens);
-            self.body.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprUnsafe {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.unsafe_token.to_tokens(tokens);
-            self.block.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprBlock {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.block.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprAssign {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.left.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.right.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprAssignOp {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.left.to_tokens(tokens);
-            self.op.to_tokens(tokens);
-            self.right.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprField {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.base.to_tokens(tokens);
-            self.dot_token.to_tokens(tokens);
-            self.member.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for Member {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            match *self {
-                Member::Named(ident) => ident.to_tokens(tokens),
-                Member::Unnamed(ref index) => index.to_tokens(tokens),
-            }
-        }
-    }
-
-    impl ToTokens for Index {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            let mut lit = Literal::i64_unsuffixed(i64::from(self.index));
-            lit.set_span(self.span);
-            tokens.append(lit);
-        }
-    }
-
-    impl ToTokens for ExprIndex {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            attrs_to_tokens(&self.attrs, tokens);
-            self.expr.to_tokens(tokens);
-            self.bracket_token.surround(tokens, |tokens| {
-                self.index.to_tokens(tokens);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprRange {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.from.to_tokens(tokens);
-            match self.limits {
-                RangeLimits::HalfOpen(ref t) => t.to_tokens(tokens),
-                RangeLimits::Closed(ref t) => t.to_tokens(tokens),
-            }
-            self.to.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ExprPath {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            attrs_to_tokens(&self.attrs, tokens);
-            ::PathTokens(&self.qself, &self.path).to_tokens(tokens)
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprReference {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.and_token.to_tokens(tokens);
-            self.mutability.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprBreak {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.break_token.to_tokens(tokens);
-            self.label.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprContinue {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.continue_token.to_tokens(tokens);
-            self.label.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprReturn {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.return_token.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprMacro {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.mac.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprStruct {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.path.to_tokens(tokens);
-            self.brace_token.surround(tokens, |tokens| {
-                self.fields.to_tokens(tokens);
-                if self.rest.is_some() {
-                    TokensOrDefault(&self.dot2_token).to_tokens(tokens);
-                    self.rest.to_tokens(tokens);
-                }
-            })
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprRepeat {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.bracket_token.surround(tokens, |tokens| {
-                self.expr.to_tokens(tokens);
-                self.semi_token.to_tokens(tokens);
-                self.len.to_tokens(tokens);
-            })
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprGroup {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            attrs_to_tokens(&self.attrs, tokens);
-            self.group_token.surround(tokens, |tokens| {
-                self.expr.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for ExprParen {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            attrs_to_tokens(&self.attrs, tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                self.expr.to_tokens(tokens);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprTry {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.expr.to_tokens(tokens);
-            self.question_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ExprVerbatim {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.tts.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for Label {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.name.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for FieldValue {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.member.to_tokens(tokens);
-            if let Some(ref colon_token) = self.colon_token {
-                colon_token.to_tokens(tokens);
-                self.expr.to_tokens(tokens);
-            }
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for Arm {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(&self.attrs);
-            self.leading_vert.to_tokens(tokens);
-            self.pats.to_tokens(tokens);
-            if let Some((ref if_token, ref guard)) = self.guard {
-                if_token.to_tokens(tokens);
-                guard.to_tokens(tokens);
-            }
-            self.fat_arrow_token.to_tokens(tokens);
-            self.body.to_tokens(tokens);
-            self.comma.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatWild {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.underscore_token.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatIdent {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.by_ref.to_tokens(tokens);
-            self.mutability.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            if let Some((ref at_token, ref subpat)) = self.subpat {
-                at_token.to_tokens(tokens);
-                subpat.to_tokens(tokens);
-            }
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatStruct {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.path.to_tokens(tokens);
-            self.brace_token.surround(tokens, |tokens| {
-                self.fields.to_tokens(tokens);
-                // NOTE: We need a comma before the dot2 token if it is present.
-                if !self.fields.empty_or_trailing() && self.dot2_token.is_some() {
-                    <Token![,]>::default().to_tokens(tokens);
-                }
-                self.dot2_token.to_tokens(tokens);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatTupleStruct {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.path.to_tokens(tokens);
-            self.pat.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatPath {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            ::PathTokens(&self.qself, &self.path).to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatTuple {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.paren_token.surround(tokens, |tokens| {
-                self.front.to_tokens(tokens);
-                if let Some(ref dot2_token) = self.dot2_token {
-                    if !self.front.empty_or_trailing() {
-                        // Ensure there is a comma before the .. token.
-                        <Token![,]>::default().to_tokens(tokens);
-                    }
-                    dot2_token.to_tokens(tokens);
-                    self.comma_token.to_tokens(tokens);
-                    if self.comma_token.is_none() && !self.back.is_empty() {
-                        // Ensure there is a comma after the .. token.
-                        <Token![,]>::default().to_tokens(tokens);
-                    }
-                }
-                self.back.to_tokens(tokens);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatBox {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.box_token.to_tokens(tokens);
-            self.pat.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatRef {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.and_token.to_tokens(tokens);
-            self.mutability.to_tokens(tokens);
-            self.pat.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatLit {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.expr.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatRange {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.lo.to_tokens(tokens);
-            match self.limits {
-                RangeLimits::HalfOpen(ref t) => t.to_tokens(tokens),
-                RangeLimits::Closed(ref t) => Token![...](t.0).to_tokens(tokens),
-            }
-            self.hi.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatSlice {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            // XXX: This is a mess, and it will be so easy to screw it up. How
-            // do we make this correct itself better?
-            self.bracket_token.surround(tokens, |tokens| {
-                self.front.to_tokens(tokens);
-
-                // If we need a comma before the middle or standalone .. token,
-                // then make sure it's present.
-                if !self.front.empty_or_trailing()
-                    && (self.middle.is_some() || self.dot2_token.is_some())
-                {
-                    <Token![,]>::default().to_tokens(tokens);
-                }
-
-                // If we have an identifier, we always need a .. token.
-                if self.middle.is_some() {
-                    self.middle.to_tokens(tokens);
-                    TokensOrDefault(&self.dot2_token).to_tokens(tokens);
-                } else if self.dot2_token.is_some() {
-                    self.dot2_token.to_tokens(tokens);
-                }
-
-                // Make sure we have a comma before the back half.
-                if !self.back.is_empty() {
-                    TokensOrDefault(&self.comma_token).to_tokens(tokens);
-                    self.back.to_tokens(tokens);
-                } else {
-                    self.comma_token.to_tokens(tokens);
-                }
-            })
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatMacro {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.mac.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatVerbatim {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.tts.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for FieldPat {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            if let Some(ref colon_token) = self.colon_token {
-                self.member.to_tokens(tokens);
-                colon_token.to_tokens(tokens);
-            }
-            self.pat.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for Block {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.brace_token.surround(tokens, |tokens| {
-                tokens.append_all(&self.stmts);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for Stmt {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            match *self {
-                Stmt::Local(ref local) => local.to_tokens(tokens),
-                Stmt::Item(ref item) => item.to_tokens(tokens),
-                Stmt::Expr(ref expr) => expr.to_tokens(tokens),
-                Stmt::Semi(ref expr, ref semi) => {
-                    expr.to_tokens(tokens);
-                    semi.to_tokens(tokens);
-                }
-            }
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for Local {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.let_token.to_tokens(tokens);
-            self.pats.to_tokens(tokens);
-            if let Some((ref colon_token, ref ty)) = self.ty {
-                colon_token.to_tokens(tokens);
-                ty.to_tokens(tokens);
-            }
-            if let Some((ref eq_token, ref init)) = self.init {
-                eq_token.to_tokens(tokens);
-                init.to_tokens(tokens);
-            }
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/file.rs b/third_party/rust/syn-0.13.1/src/file.rs
deleted file mode 100644
index 17ea8ff2a8c7..000000000000
--- a/third_party/rust/syn-0.13.1/src/file.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-
-ast_struct! {
-    /// A complete file of Rust source code.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Example
-    ///
-    /// Parse a Rust source file into a `syn::File` and print out a debug
-    /// representation of the syntax tree.
-    ///
-    /// ```
-    /// extern crate syn;
-    ///
-    /// use std::env;
-    /// use std::fs::File;
-    /// use std::io::Read;
-    /// use std::process;
-    ///
-    /// fn main() {
-    /// # }
-    /// #
-    /// # fn fake_main() {
-    ///     let mut args = env::args();
-    ///     let _ = args.next(); // executable name
-    ///
-    ///     let filename = match (args.next(), args.next()) {
-    ///         (Some(filename), None) => filename,
-    ///         _ => {
-    ///             eprintln!("Usage: dump-syntax path/to/filename.rs");
-    ///             process::exit(1);
-    ///         }
-    ///     };
-    ///
-    ///     let mut file = File::open(&filename).expect("Unable to open file");
-    ///
-    ///     let mut src = String::new();
-    ///     file.read_to_string(&mut src).expect("Unable to read file");
-    ///
-    ///     let syntax = syn::parse_file(&src).expect("Unable to parse file");
-    ///     println!("{:#?}", syntax);
-    /// }
-    /// ```
-    ///
-    /// Running with its own source code as input, this program prints output
-    /// that begins with:
-    ///
-    /// ```text
-    /// File {
-    ///     shebang: None,
-    ///     attrs: [],
-    ///     items: [
-    ///         ExternCrate(
-    ///             ItemExternCrate {
-    ///                 attrs: [],
-    ///                 vis: Inherited,
-    ///                 extern_token: Extern,
-    ///                 crate_token: Crate,
-    ///                 ident: Ident {
-    ///                     term: Term(
-    ///                         "syn"
-    ///                     ),
-    ///                     span: Span
-    ///                 },
-    ///                 rename: None,
-    ///                 semi_token: Semi
-    ///             }
-    ///         ),
-    /// ...
-    /// ```
-    pub struct File {
-        pub shebang: Option<String>,
-        pub attrs: Vec<Attribute>,
-        pub items: Vec<Item>,
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-
-    use synom::Synom;
-
-    impl Synom for File {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_inner) >>
-            items: many0!(Item::parse) >>
-            (File {
-                shebang: None,
-                attrs: attrs,
-                items: items,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("crate")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use attr::FilterAttrs;
-    use quote::{ToTokens, Tokens};
-
-    impl ToTokens for File {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.inner());
-            tokens.append_all(&self.items);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/gen/fold.rs b/third_party/rust/syn-0.13.1/src/gen/fold.rs
deleted file mode 100644
index b5b67b3f6b87..000000000000
--- a/third_party/rust/syn-0.13.1/src/gen/fold.rs
+++ /dev/null
@@ -1,2972 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
-// Unreachable code is generated sometimes without the full feature.
-#![allow(unreachable_code)]
-#![cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
-
-use *;
-#[cfg(any(feature = "full", feature = "derive"))]
-use token::{Brace, Bracket, Paren, Group};
-use proc_macro2::Span;
-#[cfg(any(feature = "full", feature = "derive"))]
-use gen::helper::fold::*;
-
-
-#[cfg(feature = "full")]
-macro_rules! full {
-    ($e:expr) => { $e }
-}
-
-#[cfg(all(feature = "derive", not(feature = "full")))]
-macro_rules! full {
-    ($e:expr) => { unreachable!() }
-}
-
-
-/// Syntax tree traversal to transform the nodes of an owned syntax tree.
-///
-/// See the [module documentation] for details.
-///
-/// [module documentation]: index.html
-///
-/// *This trait is available if Syn is built with the `"fold"` feature.*
-pub trait Fold {
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_abi(&mut self, i: Abi) -> Abi { fold_abi(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_angle_bracketed_generic_arguments(&mut self, i: AngleBracketedGenericArguments) -> AngleBracketedGenericArguments { fold_angle_bracketed_generic_arguments(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_arg_captured(&mut self, i: ArgCaptured) -> ArgCaptured { fold_arg_captured(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_arg_self(&mut self, i: ArgSelf) -> ArgSelf { fold_arg_self(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_arg_self_ref(&mut self, i: ArgSelfRef) -> ArgSelfRef { fold_arg_self_ref(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_arm(&mut self, i: Arm) -> Arm { fold_arm(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_attr_style(&mut self, i: AttrStyle) -> AttrStyle { fold_attr_style(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_attribute(&mut self, i: Attribute) -> Attribute { fold_attribute(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_bare_fn_arg(&mut self, i: BareFnArg) -> BareFnArg { fold_bare_fn_arg(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_bare_fn_arg_name(&mut self, i: BareFnArgName) -> BareFnArgName { fold_bare_fn_arg_name(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_bin_op(&mut self, i: BinOp) -> BinOp { fold_bin_op(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_binding(&mut self, i: Binding) -> Binding { fold_binding(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_block(&mut self, i: Block) -> Block { fold_block(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_bound_lifetimes(&mut self, i: BoundLifetimes) -> BoundLifetimes { fold_bound_lifetimes(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_const_param(&mut self, i: ConstParam) -> ConstParam { fold_const_param(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn fold_data(&mut self, i: Data) -> Data { fold_data(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn fold_data_enum(&mut self, i: DataEnum) -> DataEnum { fold_data_enum(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn fold_data_struct(&mut self, i: DataStruct) -> DataStruct { fold_data_struct(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn fold_data_union(&mut self, i: DataUnion) -> DataUnion { fold_data_union(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn fold_derive_input(&mut self, i: DeriveInput) -> DeriveInput { fold_derive_input(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr(&mut self, i: Expr) -> Expr { fold_expr(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_array(&mut self, i: ExprArray) -> ExprArray { fold_expr_array(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_assign(&mut self, i: ExprAssign) -> ExprAssign { fold_expr_assign(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_assign_op(&mut self, i: ExprAssignOp) -> ExprAssignOp { fold_expr_assign_op(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_binary(&mut self, i: ExprBinary) -> ExprBinary { fold_expr_binary(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_block(&mut self, i: ExprBlock) -> ExprBlock { fold_expr_block(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_box(&mut self, i: ExprBox) -> ExprBox { fold_expr_box(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_break(&mut self, i: ExprBreak) -> ExprBreak { fold_expr_break(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_call(&mut self, i: ExprCall) -> ExprCall { fold_expr_call(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_cast(&mut self, i: ExprCast) -> ExprCast { fold_expr_cast(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_catch(&mut self, i: ExprCatch) -> ExprCatch { fold_expr_catch(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_closure(&mut self, i: ExprClosure) -> ExprClosure { fold_expr_closure(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_continue(&mut self, i: ExprContinue) -> ExprContinue { fold_expr_continue(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_field(&mut self, i: ExprField) -> ExprField { fold_expr_field(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_for_loop(&mut self, i: ExprForLoop) -> ExprForLoop { fold_expr_for_loop(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_group(&mut self, i: ExprGroup) -> ExprGroup { fold_expr_group(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_if(&mut self, i: ExprIf) -> ExprIf { fold_expr_if(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_if_let(&mut self, i: ExprIfLet) -> ExprIfLet { fold_expr_if_let(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_in_place(&mut self, i: ExprInPlace) -> ExprInPlace { fold_expr_in_place(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_index(&mut self, i: ExprIndex) -> ExprIndex { fold_expr_index(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_lit(&mut self, i: ExprLit) -> ExprLit { fold_expr_lit(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_loop(&mut self, i: ExprLoop) -> ExprLoop { fold_expr_loop(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_macro(&mut self, i: ExprMacro) -> ExprMacro { fold_expr_macro(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_match(&mut self, i: ExprMatch) -> ExprMatch { fold_expr_match(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_method_call(&mut self, i: ExprMethodCall) -> ExprMethodCall { fold_expr_method_call(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_paren(&mut self, i: ExprParen) -> ExprParen { fold_expr_paren(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_path(&mut self, i: ExprPath) -> ExprPath { fold_expr_path(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_range(&mut self, i: ExprRange) -> ExprRange { fold_expr_range(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_reference(&mut self, i: ExprReference) -> ExprReference { fold_expr_reference(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_repeat(&mut self, i: ExprRepeat) -> ExprRepeat { fold_expr_repeat(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_return(&mut self, i: ExprReturn) -> ExprReturn { fold_expr_return(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_struct(&mut self, i: ExprStruct) -> ExprStruct { fold_expr_struct(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_try(&mut self, i: ExprTry) -> ExprTry { fold_expr_try(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_tuple(&mut self, i: ExprTuple) -> ExprTuple { fold_expr_tuple(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_type(&mut self, i: ExprType) -> ExprType { fold_expr_type(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_unary(&mut self, i: ExprUnary) -> ExprUnary { fold_expr_unary(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_unsafe(&mut self, i: ExprUnsafe) -> ExprUnsafe { fold_expr_unsafe(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_verbatim(&mut self, i: ExprVerbatim) -> ExprVerbatim { fold_expr_verbatim(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_while(&mut self, i: ExprWhile) -> ExprWhile { fold_expr_while(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_while_let(&mut self, i: ExprWhileLet) -> ExprWhileLet { fold_expr_while_let(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_expr_yield(&mut self, i: ExprYield) -> ExprYield { fold_expr_yield(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_field(&mut self, i: Field) -> Field { fold_field(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_field_pat(&mut self, i: FieldPat) -> FieldPat { fold_field_pat(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_field_value(&mut self, i: FieldValue) -> FieldValue { fold_field_value(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_fields(&mut self, i: Fields) -> Fields { fold_fields(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_fields_named(&mut self, i: FieldsNamed) -> FieldsNamed { fold_fields_named(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_fields_unnamed(&mut self, i: FieldsUnnamed) -> FieldsUnnamed { fold_fields_unnamed(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_file(&mut self, i: File) -> File { fold_file(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_fn_arg(&mut self, i: FnArg) -> FnArg { fold_fn_arg(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_fn_decl(&mut self, i: FnDecl) -> FnDecl { fold_fn_decl(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_foreign_item(&mut self, i: ForeignItem) -> ForeignItem { fold_foreign_item(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_foreign_item_fn(&mut self, i: ForeignItemFn) -> ForeignItemFn { fold_foreign_item_fn(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_foreign_item_static(&mut self, i: ForeignItemStatic) -> ForeignItemStatic { fold_foreign_item_static(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_foreign_item_type(&mut self, i: ForeignItemType) -> ForeignItemType { fold_foreign_item_type(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_foreign_item_verbatim(&mut self, i: ForeignItemVerbatim) -> ForeignItemVerbatim { fold_foreign_item_verbatim(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_generic_argument(&mut self, i: GenericArgument) -> GenericArgument { fold_generic_argument(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_generic_method_argument(&mut self, i: GenericMethodArgument) -> GenericMethodArgument { fold_generic_method_argument(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_generic_param(&mut self, i: GenericParam) -> GenericParam { fold_generic_param(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_generics(&mut self, i: Generics) -> Generics { fold_generics(self, i) }
-
-fn fold_ident(&mut self, i: Ident) -> Ident { fold_ident(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_impl_item(&mut self, i: ImplItem) -> ImplItem { fold_impl_item(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_impl_item_const(&mut self, i: ImplItemConst) -> ImplItemConst { fold_impl_item_const(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_impl_item_macro(&mut self, i: ImplItemMacro) -> ImplItemMacro { fold_impl_item_macro(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_impl_item_method(&mut self, i: ImplItemMethod) -> ImplItemMethod { fold_impl_item_method(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_impl_item_type(&mut self, i: ImplItemType) -> ImplItemType { fold_impl_item_type(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_impl_item_verbatim(&mut self, i: ImplItemVerbatim) -> ImplItemVerbatim { fold_impl_item_verbatim(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_index(&mut self, i: Index) -> Index { fold_index(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item(&mut self, i: Item) -> Item { fold_item(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_const(&mut self, i: ItemConst) -> ItemConst { fold_item_const(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_enum(&mut self, i: ItemEnum) -> ItemEnum { fold_item_enum(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_extern_crate(&mut self, i: ItemExternCrate) -> ItemExternCrate { fold_item_extern_crate(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_fn(&mut self, i: ItemFn) -> ItemFn { fold_item_fn(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_foreign_mod(&mut self, i: ItemForeignMod) -> ItemForeignMod { fold_item_foreign_mod(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_impl(&mut self, i: ItemImpl) -> ItemImpl { fold_item_impl(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_macro(&mut self, i: ItemMacro) -> ItemMacro { fold_item_macro(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_macro2(&mut self, i: ItemMacro2) -> ItemMacro2 { fold_item_macro2(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_mod(&mut self, i: ItemMod) -> ItemMod { fold_item_mod(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_static(&mut self, i: ItemStatic) -> ItemStatic { fold_item_static(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_struct(&mut self, i: ItemStruct) -> ItemStruct { fold_item_struct(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_trait(&mut self, i: ItemTrait) -> ItemTrait { fold_item_trait(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_type(&mut self, i: ItemType) -> ItemType { fold_item_type(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_union(&mut self, i: ItemUnion) -> ItemUnion { fold_item_union(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_use(&mut self, i: ItemUse) -> ItemUse { fold_item_use(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_item_verbatim(&mut self, i: ItemVerbatim) -> ItemVerbatim { fold_item_verbatim(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_label(&mut self, i: Label) -> Label { fold_label(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_lifetime(&mut self, i: Lifetime) -> Lifetime { fold_lifetime(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_lifetime_def(&mut self, i: LifetimeDef) -> LifetimeDef { fold_lifetime_def(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_lit(&mut self, i: Lit) -> Lit { fold_lit(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_lit_bool(&mut self, i: LitBool) -> LitBool { fold_lit_bool(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_lit_byte(&mut self, i: LitByte) -> LitByte { fold_lit_byte(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_lit_byte_str(&mut self, i: LitByteStr) -> LitByteStr { fold_lit_byte_str(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_lit_char(&mut self, i: LitChar) -> LitChar { fold_lit_char(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_lit_float(&mut self, i: LitFloat) -> LitFloat { fold_lit_float(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_lit_int(&mut self, i: LitInt) -> LitInt { fold_lit_int(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_lit_str(&mut self, i: LitStr) -> LitStr { fold_lit_str(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_lit_verbatim(&mut self, i: LitVerbatim) -> LitVerbatim { fold_lit_verbatim(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_local(&mut self, i: Local) -> Local { fold_local(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_macro(&mut self, i: Macro) -> Macro { fold_macro(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_macro_delimiter(&mut self, i: MacroDelimiter) -> MacroDelimiter { fold_macro_delimiter(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_member(&mut self, i: Member) -> Member { fold_member(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_meta(&mut self, i: Meta) -> Meta { fold_meta(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_meta_list(&mut self, i: MetaList) -> MetaList { fold_meta_list(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_meta_name_value(&mut self, i: MetaNameValue) -> MetaNameValue { fold_meta_name_value(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_method_sig(&mut self, i: MethodSig) -> MethodSig { fold_method_sig(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_method_turbofish(&mut self, i: MethodTurbofish) -> MethodTurbofish { fold_method_turbofish(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_nested_meta(&mut self, i: NestedMeta) -> NestedMeta { fold_nested_meta(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_parenthesized_generic_arguments(&mut self, i: ParenthesizedGenericArguments) -> ParenthesizedGenericArguments { fold_parenthesized_generic_arguments(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_pat(&mut self, i: Pat) -> Pat { fold_pat(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_pat_box(&mut self, i: PatBox) -> PatBox { fold_pat_box(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_pat_ident(&mut self, i: PatIdent) -> PatIdent { fold_pat_ident(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_pat_lit(&mut self, i: PatLit) -> PatLit { fold_pat_lit(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_pat_macro(&mut self, i: PatMacro) -> PatMacro { fold_pat_macro(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_pat_path(&mut self, i: PatPath) -> PatPath { fold_pat_path(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_pat_range(&mut self, i: PatRange) -> PatRange { fold_pat_range(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_pat_ref(&mut self, i: PatRef) -> PatRef { fold_pat_ref(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_pat_slice(&mut self, i: PatSlice) -> PatSlice { fold_pat_slice(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_pat_struct(&mut self, i: PatStruct) -> PatStruct { fold_pat_struct(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_pat_tuple(&mut self, i: PatTuple) -> PatTuple { fold_pat_tuple(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_pat_tuple_struct(&mut self, i: PatTupleStruct) -> PatTupleStruct { fold_pat_tuple_struct(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_pat_verbatim(&mut self, i: PatVerbatim) -> PatVerbatim { fold_pat_verbatim(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_pat_wild(&mut self, i: PatWild) -> PatWild { fold_pat_wild(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_path(&mut self, i: Path) -> Path { fold_path(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_path_arguments(&mut self, i: PathArguments) -> PathArguments { fold_path_arguments(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_path_segment(&mut self, i: PathSegment) -> PathSegment { fold_path_segment(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_predicate_eq(&mut self, i: PredicateEq) -> PredicateEq { fold_predicate_eq(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_predicate_lifetime(&mut self, i: PredicateLifetime) -> PredicateLifetime { fold_predicate_lifetime(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_predicate_type(&mut self, i: PredicateType) -> PredicateType { fold_predicate_type(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_qself(&mut self, i: QSelf) -> QSelf { fold_qself(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_range_limits(&mut self, i: RangeLimits) -> RangeLimits { fold_range_limits(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_return_type(&mut self, i: ReturnType) -> ReturnType { fold_return_type(self, i) }
-
-fn fold_span(&mut self, i: Span) -> Span { fold_span(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn fold_stmt(&mut self, i: Stmt) -> Stmt { fold_stmt(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_trait_bound(&mut self, i: TraitBound) -> TraitBound { fold_trait_bound(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_trait_bound_modifier(&mut self, i: TraitBoundModifier) -> TraitBoundModifier { fold_trait_bound_modifier(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_trait_item(&mut self, i: TraitItem) -> TraitItem { fold_trait_item(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_trait_item_const(&mut self, i: TraitItemConst) -> TraitItemConst { fold_trait_item_const(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_trait_item_macro(&mut self, i: TraitItemMacro) -> TraitItemMacro { fold_trait_item_macro(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_trait_item_method(&mut self, i: TraitItemMethod) -> TraitItemMethod { fold_trait_item_method(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_trait_item_type(&mut self, i: TraitItemType) -> TraitItemType { fold_trait_item_type(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_trait_item_verbatim(&mut self, i: TraitItemVerbatim) -> TraitItemVerbatim { fold_trait_item_verbatim(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type(&mut self, i: Type) -> Type { fold_type(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_array(&mut self, i: TypeArray) -> TypeArray { fold_type_array(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_bare_fn(&mut self, i: TypeBareFn) -> TypeBareFn { fold_type_bare_fn(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_group(&mut self, i: TypeGroup) -> TypeGroup { fold_type_group(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_impl_trait(&mut self, i: TypeImplTrait) -> TypeImplTrait { fold_type_impl_trait(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_infer(&mut self, i: TypeInfer) -> TypeInfer { fold_type_infer(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_macro(&mut self, i: TypeMacro) -> TypeMacro { fold_type_macro(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_never(&mut self, i: TypeNever) -> TypeNever { fold_type_never(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_param(&mut self, i: TypeParam) -> TypeParam { fold_type_param(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_param_bound(&mut self, i: TypeParamBound) -> TypeParamBound { fold_type_param_bound(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_paren(&mut self, i: TypeParen) -> TypeParen { fold_type_paren(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_path(&mut self, i: TypePath) -> TypePath { fold_type_path(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_ptr(&mut self, i: TypePtr) -> TypePtr { fold_type_ptr(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_reference(&mut self, i: TypeReference) -> TypeReference { fold_type_reference(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_slice(&mut self, i: TypeSlice) -> TypeSlice { fold_type_slice(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_trait_object(&mut self, i: TypeTraitObject) -> TypeTraitObject { fold_type_trait_object(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_tuple(&mut self, i: TypeTuple) -> TypeTuple { fold_type_tuple(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_type_verbatim(&mut self, i: TypeVerbatim) -> TypeVerbatim { fold_type_verbatim(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_un_op(&mut self, i: UnOp) -> UnOp { fold_un_op(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_use_glob(&mut self, i: UseGlob) -> UseGlob { fold_use_glob(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_use_group(&mut self, i: UseGroup) -> UseGroup { fold_use_group(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_use_name(&mut self, i: UseName) -> UseName { fold_use_name(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_use_path(&mut self, i: UsePath) -> UsePath { fold_use_path(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_use_rename(&mut self, i: UseRename) -> UseRename { fold_use_rename(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn fold_use_tree(&mut self, i: UseTree) -> UseTree { fold_use_tree(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_variant(&mut self, i: Variant) -> Variant { fold_variant(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_vis_crate(&mut self, i: VisCrate) -> VisCrate { fold_vis_crate(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_vis_public(&mut self, i: VisPublic) -> VisPublic { fold_vis_public(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_vis_restricted(&mut self, i: VisRestricted) -> VisRestricted { fold_vis_restricted(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_visibility(&mut self, i: Visibility) -> Visibility { fold_visibility(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_where_clause(&mut self, i: WhereClause) -> WhereClause { fold_where_clause(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn fold_where_predicate(&mut self, i: WherePredicate) -> WherePredicate { fold_where_predicate(self, i) }
-
-}
-
-macro_rules! fold_span_only {
-    ($f:ident : $t:ident) => {
-        pub fn $f<V: Fold + ?Sized>(_visitor: &mut V, mut _i: $t) -> $t {
-            let span = _visitor.fold_span(_i.span());
-            _i.set_span(span);
-            _i
-        }
-    }
-}
-
-fold_span_only!(fold_ident: Ident);
-#[cfg(any(feature = "full", feature = "derive"))]
-fold_span_only!(fold_lifetime: Lifetime);
-#[cfg(any(feature = "full", feature = "derive"))]
-fold_span_only!(fold_lit_byte: LitByte);
-#[cfg(any(feature = "full", feature = "derive"))]
-fold_span_only!(fold_lit_byte_str: LitByteStr);
-#[cfg(any(feature = "full", feature = "derive"))]
-fold_span_only!(fold_lit_char: LitChar);
-#[cfg(any(feature = "full", feature = "derive"))]
-fold_span_only!(fold_lit_float: LitFloat);
-#[cfg(any(feature = "full", feature = "derive"))]
-fold_span_only!(fold_lit_int: LitInt);
-#[cfg(any(feature = "full", feature = "derive"))]
-fold_span_only!(fold_lit_str: LitStr);
-
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_abi<V: Fold + ?Sized>(_visitor: &mut V, _i: Abi) -> Abi {
-    Abi {
-        extern_token: Token ! [ extern ](tokens_helper(_visitor, &(_i . extern_token).0)),
-        name: (_i . name).map(|it| { _visitor.fold_lit_str(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_angle_bracketed_generic_arguments<V: Fold + ?Sized>(_visitor: &mut V, _i: AngleBracketedGenericArguments) -> AngleBracketedGenericArguments {
-    AngleBracketedGenericArguments {
-        colon2_token: (_i . colon2_token).map(|it| { Token ! [ :: ](tokens_helper(_visitor, &(it).0)) }),
-        lt_token: Token ! [ < ](tokens_helper(_visitor, &(_i . lt_token).0)),
-        args: FoldHelper::lift(_i . args, |it| { _visitor.fold_generic_argument(it) }),
-        gt_token: Token ! [ > ](tokens_helper(_visitor, &(_i . gt_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_arg_captured<V: Fold + ?Sized>(_visitor: &mut V, _i: ArgCaptured) -> ArgCaptured {
-    ArgCaptured {
-        pat: _visitor.fold_pat(_i . pat),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i . colon_token).0)),
-        ty: _visitor.fold_type(_i . ty),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_arg_self<V: Fold + ?Sized>(_visitor: &mut V, _i: ArgSelf) -> ArgSelf {
-    ArgSelf {
-        mutability: (_i . mutability).map(|it| { Token ! [ mut ](tokens_helper(_visitor, &(it).0)) }),
-        self_token: Token ! [ self ](tokens_helper(_visitor, &(_i . self_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_arg_self_ref<V: Fold + ?Sized>(_visitor: &mut V, _i: ArgSelfRef) -> ArgSelfRef {
-    ArgSelfRef {
-        and_token: Token ! [ & ](tokens_helper(_visitor, &(_i . and_token).0)),
-        lifetime: (_i . lifetime).map(|it| { _visitor.fold_lifetime(it) }),
-        mutability: (_i . mutability).map(|it| { Token ! [ mut ](tokens_helper(_visitor, &(it).0)) }),
-        self_token: Token ! [ self ](tokens_helper(_visitor, &(_i . self_token).0)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_arm<V: Fold + ?Sized>(_visitor: &mut V, _i: Arm) -> Arm {
-    Arm {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        leading_vert: (_i . leading_vert).map(|it| { Token ! [ | ](tokens_helper(_visitor, &(it).0)) }),
-        pats: FoldHelper::lift(_i . pats, |it| { _visitor.fold_pat(it) }),
-        guard: (_i . guard).map(|it| { (
-            Token ! [ if ](tokens_helper(_visitor, &(( it ) . 0).0)),
-            Box::new(_visitor.fold_expr(* ( it ) . 1)),
-        ) }),
-        fat_arrow_token: Token ! [ => ](tokens_helper(_visitor, &(_i . fat_arrow_token).0)),
-        body: Box::new(_visitor.fold_expr(* _i . body)),
-        comma: (_i . comma).map(|it| { Token ! [ , ](tokens_helper(_visitor, &(it).0)) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_attr_style<V: Fold + ?Sized>(_visitor: &mut V, _i: AttrStyle) -> AttrStyle {
-    match _i {
-        AttrStyle::Outer => { AttrStyle::Outer }
-        AttrStyle::Inner(_binding_0, ) => {
-            AttrStyle::Inner (
-                Token ! [ ! ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_attribute<V: Fold + ?Sized>(_visitor: &mut V, _i: Attribute) -> Attribute {
-    Attribute {
-        pound_token: Token ! [ # ](tokens_helper(_visitor, &(_i . pound_token).0)),
-        style: _visitor.fold_attr_style(_i . style),
-        bracket_token: Bracket(tokens_helper(_visitor, &(_i . bracket_token).0)),
-        path: _visitor.fold_path(_i . path),
-        tts: _i . tts,
-        is_sugared_doc: _i . is_sugared_doc,
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_bare_fn_arg<V: Fold + ?Sized>(_visitor: &mut V, _i: BareFnArg) -> BareFnArg {
-    BareFnArg {
-        name: (_i . name).map(|it| { (
-            _visitor.fold_bare_fn_arg_name(( it ) . 0),
-            Token ! [ : ](tokens_helper(_visitor, &(( it ) . 1).0)),
-        ) }),
-        ty: _visitor.fold_type(_i . ty),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_bare_fn_arg_name<V: Fold + ?Sized>(_visitor: &mut V, _i: BareFnArgName) -> BareFnArgName {
-    match _i {
-        BareFnArgName::Named(_binding_0, ) => {
-            BareFnArgName::Named (
-                _visitor.fold_ident(_binding_0),
-            )
-        }
-        BareFnArgName::Wild(_binding_0, ) => {
-            BareFnArgName::Wild (
-                Token ! [ _ ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_bin_op<V: Fold + ?Sized>(_visitor: &mut V, _i: BinOp) -> BinOp {
-    match _i {
-        BinOp::Add(_binding_0, ) => {
-            BinOp::Add (
-                Token ! [ + ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::Sub(_binding_0, ) => {
-            BinOp::Sub (
-                Token ! [ - ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::Mul(_binding_0, ) => {
-            BinOp::Mul (
-                Token ! [ * ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::Div(_binding_0, ) => {
-            BinOp::Div (
-                Token ! [ / ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::Rem(_binding_0, ) => {
-            BinOp::Rem (
-                Token ! [ % ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::And(_binding_0, ) => {
-            BinOp::And (
-                Token ! [ && ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::Or(_binding_0, ) => {
-            BinOp::Or (
-                Token ! [ || ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::BitXor(_binding_0, ) => {
-            BinOp::BitXor (
-                Token ! [ ^ ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::BitAnd(_binding_0, ) => {
-            BinOp::BitAnd (
-                Token ! [ & ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::BitOr(_binding_0, ) => {
-            BinOp::BitOr (
-                Token ! [ | ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::Shl(_binding_0, ) => {
-            BinOp::Shl (
-                Token ! [ << ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::Shr(_binding_0, ) => {
-            BinOp::Shr (
-                Token ! [ >> ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::Eq(_binding_0, ) => {
-            BinOp::Eq (
-                Token ! [ == ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::Lt(_binding_0, ) => {
-            BinOp::Lt (
-                Token ! [ < ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::Le(_binding_0, ) => {
-            BinOp::Le (
-                Token ! [ <= ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::Ne(_binding_0, ) => {
-            BinOp::Ne (
-                Token ! [ != ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::Ge(_binding_0, ) => {
-            BinOp::Ge (
-                Token ! [ >= ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::Gt(_binding_0, ) => {
-            BinOp::Gt (
-                Token ! [ > ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::AddEq(_binding_0, ) => {
-            BinOp::AddEq (
-                Token ! [ += ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::SubEq(_binding_0, ) => {
-            BinOp::SubEq (
-                Token ! [ -= ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::MulEq(_binding_0, ) => {
-            BinOp::MulEq (
-                Token ! [ *= ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::DivEq(_binding_0, ) => {
-            BinOp::DivEq (
-                Token ! [ /= ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::RemEq(_binding_0, ) => {
-            BinOp::RemEq (
-                Token ! [ %= ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::BitXorEq(_binding_0, ) => {
-            BinOp::BitXorEq (
-                Token ! [ ^= ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::BitAndEq(_binding_0, ) => {
-            BinOp::BitAndEq (
-                Token ! [ &= ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::BitOrEq(_binding_0, ) => {
-            BinOp::BitOrEq (
-                Token ! [ |= ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::ShlEq(_binding_0, ) => {
-            BinOp::ShlEq (
-                Token ! [ <<= ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        BinOp::ShrEq(_binding_0, ) => {
-            BinOp::ShrEq (
-                Token ! [ >>= ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_binding<V: Fold + ?Sized>(_visitor: &mut V, _i: Binding) -> Binding {
-    Binding {
-        ident: _visitor.fold_ident(_i . ident),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i . eq_token).0)),
-        ty: _visitor.fold_type(_i . ty),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_block<V: Fold + ?Sized>(_visitor: &mut V, _i: Block) -> Block {
-    Block {
-        brace_token: Brace(tokens_helper(_visitor, &(_i . brace_token).0)),
-        stmts: FoldHelper::lift(_i . stmts, |it| { _visitor.fold_stmt(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_bound_lifetimes<V: Fold + ?Sized>(_visitor: &mut V, _i: BoundLifetimes) -> BoundLifetimes {
-    BoundLifetimes {
-        for_token: Token ! [ for ](tokens_helper(_visitor, &(_i . for_token).0)),
-        lt_token: Token ! [ < ](tokens_helper(_visitor, &(_i . lt_token).0)),
-        lifetimes: FoldHelper::lift(_i . lifetimes, |it| { _visitor.fold_lifetime_def(it) }),
-        gt_token: Token ! [ > ](tokens_helper(_visitor, &(_i . gt_token).0)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_const_param<V: Fold + ?Sized>(_visitor: &mut V, _i: ConstParam) -> ConstParam {
-    ConstParam {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        const_token: Token ! [ const ](tokens_helper(_visitor, &(_i . const_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i . colon_token).0)),
-        ty: _visitor.fold_type(_i . ty),
-        eq_token: (_i . eq_token).map(|it| { Token ! [ = ](tokens_helper(_visitor, &(it).0)) }),
-        default: (_i . default).map(|it| { _visitor.fold_expr(it) }),
-    }
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn fold_data<V: Fold + ?Sized>(_visitor: &mut V, _i: Data) -> Data {
-    match _i {
-        Data::Struct(_binding_0, ) => {
-            Data::Struct (
-                _visitor.fold_data_struct(_binding_0),
-            )
-        }
-        Data::Enum(_binding_0, ) => {
-            Data::Enum (
-                _visitor.fold_data_enum(_binding_0),
-            )
-        }
-        Data::Union(_binding_0, ) => {
-            Data::Union (
-                _visitor.fold_data_union(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn fold_data_enum<V: Fold + ?Sized>(_visitor: &mut V, _i: DataEnum) -> DataEnum {
-    DataEnum {
-        enum_token: Token ! [ enum ](tokens_helper(_visitor, &(_i . enum_token).0)),
-        brace_token: Brace(tokens_helper(_visitor, &(_i . brace_token).0)),
-        variants: FoldHelper::lift(_i . variants, |it| { _visitor.fold_variant(it) }),
-    }
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn fold_data_struct<V: Fold + ?Sized>(_visitor: &mut V, _i: DataStruct) -> DataStruct {
-    DataStruct {
-        struct_token: Token ! [ struct ](tokens_helper(_visitor, &(_i . struct_token).0)),
-        fields: _visitor.fold_fields(_i . fields),
-        semi_token: (_i . semi_token).map(|it| { Token ! [ ; ](tokens_helper(_visitor, &(it).0)) }),
-    }
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn fold_data_union<V: Fold + ?Sized>(_visitor: &mut V, _i: DataUnion) -> DataUnion {
-    DataUnion {
-        union_token: Token ! [ union ](tokens_helper(_visitor, &(_i . union_token).0)),
-        fields: _visitor.fold_fields_named(_i . fields),
-    }
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn fold_derive_input<V: Fold + ?Sized>(_visitor: &mut V, _i: DeriveInput) -> DeriveInput {
-    DeriveInput {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        ident: _visitor.fold_ident(_i . ident),
-        generics: _visitor.fold_generics(_i . generics),
-        data: _visitor.fold_data(_i . data),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr<V: Fold + ?Sized>(_visitor: &mut V, _i: Expr) -> Expr {
-    match _i {
-        Expr::Box(_binding_0, ) => {
-            Expr::Box (
-                full!(_visitor.fold_expr_box(_binding_0)),
-            )
-        }
-        Expr::InPlace(_binding_0, ) => {
-            Expr::InPlace (
-                full!(_visitor.fold_expr_in_place(_binding_0)),
-            )
-        }
-        Expr::Array(_binding_0, ) => {
-            Expr::Array (
-                full!(_visitor.fold_expr_array(_binding_0)),
-            )
-        }
-        Expr::Call(_binding_0, ) => {
-            Expr::Call (
-                _visitor.fold_expr_call(_binding_0),
-            )
-        }
-        Expr::MethodCall(_binding_0, ) => {
-            Expr::MethodCall (
-                full!(_visitor.fold_expr_method_call(_binding_0)),
-            )
-        }
-        Expr::Tuple(_binding_0, ) => {
-            Expr::Tuple (
-                full!(_visitor.fold_expr_tuple(_binding_0)),
-            )
-        }
-        Expr::Binary(_binding_0, ) => {
-            Expr::Binary (
-                _visitor.fold_expr_binary(_binding_0),
-            )
-        }
-        Expr::Unary(_binding_0, ) => {
-            Expr::Unary (
-                _visitor.fold_expr_unary(_binding_0),
-            )
-        }
-        Expr::Lit(_binding_0, ) => {
-            Expr::Lit (
-                _visitor.fold_expr_lit(_binding_0),
-            )
-        }
-        Expr::Cast(_binding_0, ) => {
-            Expr::Cast (
-                _visitor.fold_expr_cast(_binding_0),
-            )
-        }
-        Expr::Type(_binding_0, ) => {
-            Expr::Type (
-                full!(_visitor.fold_expr_type(_binding_0)),
-            )
-        }
-        Expr::If(_binding_0, ) => {
-            Expr::If (
-                full!(_visitor.fold_expr_if(_binding_0)),
-            )
-        }
-        Expr::IfLet(_binding_0, ) => {
-            Expr::IfLet (
-                full!(_visitor.fold_expr_if_let(_binding_0)),
-            )
-        }
-        Expr::While(_binding_0, ) => {
-            Expr::While (
-                full!(_visitor.fold_expr_while(_binding_0)),
-            )
-        }
-        Expr::WhileLet(_binding_0, ) => {
-            Expr::WhileLet (
-                full!(_visitor.fold_expr_while_let(_binding_0)),
-            )
-        }
-        Expr::ForLoop(_binding_0, ) => {
-            Expr::ForLoop (
-                full!(_visitor.fold_expr_for_loop(_binding_0)),
-            )
-        }
-        Expr::Loop(_binding_0, ) => {
-            Expr::Loop (
-                full!(_visitor.fold_expr_loop(_binding_0)),
-            )
-        }
-        Expr::Match(_binding_0, ) => {
-            Expr::Match (
-                full!(_visitor.fold_expr_match(_binding_0)),
-            )
-        }
-        Expr::Closure(_binding_0, ) => {
-            Expr::Closure (
-                full!(_visitor.fold_expr_closure(_binding_0)),
-            )
-        }
-        Expr::Unsafe(_binding_0, ) => {
-            Expr::Unsafe (
-                full!(_visitor.fold_expr_unsafe(_binding_0)),
-            )
-        }
-        Expr::Block(_binding_0, ) => {
-            Expr::Block (
-                full!(_visitor.fold_expr_block(_binding_0)),
-            )
-        }
-        Expr::Assign(_binding_0, ) => {
-            Expr::Assign (
-                full!(_visitor.fold_expr_assign(_binding_0)),
-            )
-        }
-        Expr::AssignOp(_binding_0, ) => {
-            Expr::AssignOp (
-                full!(_visitor.fold_expr_assign_op(_binding_0)),
-            )
-        }
-        Expr::Field(_binding_0, ) => {
-            Expr::Field (
-                full!(_visitor.fold_expr_field(_binding_0)),
-            )
-        }
-        Expr::Index(_binding_0, ) => {
-            Expr::Index (
-                _visitor.fold_expr_index(_binding_0),
-            )
-        }
-        Expr::Range(_binding_0, ) => {
-            Expr::Range (
-                full!(_visitor.fold_expr_range(_binding_0)),
-            )
-        }
-        Expr::Path(_binding_0, ) => {
-            Expr::Path (
-                _visitor.fold_expr_path(_binding_0),
-            )
-        }
-        Expr::Reference(_binding_0, ) => {
-            Expr::Reference (
-                full!(_visitor.fold_expr_reference(_binding_0)),
-            )
-        }
-        Expr::Break(_binding_0, ) => {
-            Expr::Break (
-                full!(_visitor.fold_expr_break(_binding_0)),
-            )
-        }
-        Expr::Continue(_binding_0, ) => {
-            Expr::Continue (
-                full!(_visitor.fold_expr_continue(_binding_0)),
-            )
-        }
-        Expr::Return(_binding_0, ) => {
-            Expr::Return (
-                full!(_visitor.fold_expr_return(_binding_0)),
-            )
-        }
-        Expr::Macro(_binding_0, ) => {
-            Expr::Macro (
-                full!(_visitor.fold_expr_macro(_binding_0)),
-            )
-        }
-        Expr::Struct(_binding_0, ) => {
-            Expr::Struct (
-                full!(_visitor.fold_expr_struct(_binding_0)),
-            )
-        }
-        Expr::Repeat(_binding_0, ) => {
-            Expr::Repeat (
-                full!(_visitor.fold_expr_repeat(_binding_0)),
-            )
-        }
-        Expr::Paren(_binding_0, ) => {
-            Expr::Paren (
-                _visitor.fold_expr_paren(_binding_0),
-            )
-        }
-        Expr::Group(_binding_0, ) => {
-            Expr::Group (
-                full!(_visitor.fold_expr_group(_binding_0)),
-            )
-        }
-        Expr::Try(_binding_0, ) => {
-            Expr::Try (
-                full!(_visitor.fold_expr_try(_binding_0)),
-            )
-        }
-        Expr::Catch(_binding_0, ) => {
-            Expr::Catch (
-                full!(_visitor.fold_expr_catch(_binding_0)),
-            )
-        }
-        Expr::Yield(_binding_0, ) => {
-            Expr::Yield (
-                full!(_visitor.fold_expr_yield(_binding_0)),
-            )
-        }
-        Expr::Verbatim(_binding_0, ) => {
-            Expr::Verbatim (
-                _visitor.fold_expr_verbatim(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_array<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprArray) -> ExprArray {
-    ExprArray {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        bracket_token: Bracket(tokens_helper(_visitor, &(_i . bracket_token).0)),
-        elems: FoldHelper::lift(_i . elems, |it| { _visitor.fold_expr(it) }),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_assign<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprAssign) -> ExprAssign {
-    ExprAssign {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        left: Box::new(_visitor.fold_expr(* _i . left)),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i . eq_token).0)),
-        right: Box::new(_visitor.fold_expr(* _i . right)),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_assign_op<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprAssignOp) -> ExprAssignOp {
-    ExprAssignOp {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        left: Box::new(_visitor.fold_expr(* _i . left)),
-        op: _visitor.fold_bin_op(_i . op),
-        right: Box::new(_visitor.fold_expr(* _i . right)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_binary<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprBinary) -> ExprBinary {
-    ExprBinary {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        left: Box::new(_visitor.fold_expr(* _i . left)),
-        op: _visitor.fold_bin_op(_i . op),
-        right: Box::new(_visitor.fold_expr(* _i . right)),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_block<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprBlock) -> ExprBlock {
-    ExprBlock {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        block: _visitor.fold_block(_i . block),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_box<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprBox) -> ExprBox {
-    ExprBox {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        box_token: Token ! [ box ](tokens_helper(_visitor, &(_i . box_token).0)),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_break<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprBreak) -> ExprBreak {
-    ExprBreak {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        break_token: Token ! [ break ](tokens_helper(_visitor, &(_i . break_token).0)),
-        label: (_i . label).map(|it| { _visitor.fold_lifetime(it) }),
-        expr: (_i . expr).map(|it| { Box::new(_visitor.fold_expr(* it)) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_call<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprCall) -> ExprCall {
-    ExprCall {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        func: Box::new(_visitor.fold_expr(* _i . func)),
-        paren_token: Paren(tokens_helper(_visitor, &(_i . paren_token).0)),
-        args: FoldHelper::lift(_i . args, |it| { _visitor.fold_expr(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_cast<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprCast) -> ExprCast {
-    ExprCast {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-        as_token: Token ! [ as ](tokens_helper(_visitor, &(_i . as_token).0)),
-        ty: Box::new(_visitor.fold_type(* _i . ty)),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_catch<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprCatch) -> ExprCatch {
-    ExprCatch {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        do_token: Token ! [ do ](tokens_helper(_visitor, &(_i . do_token).0)),
-        catch_token: Token ! [ catch ](tokens_helper(_visitor, &(_i . catch_token).0)),
-        block: _visitor.fold_block(_i . block),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_closure<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprClosure) -> ExprClosure {
-    ExprClosure {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        movability: (_i . movability).map(|it| { Token ! [ static ](tokens_helper(_visitor, &(it).0)) }),
-        capture: (_i . capture).map(|it| { Token ! [ move ](tokens_helper(_visitor, &(it).0)) }),
-        or1_token: Token ! [ | ](tokens_helper(_visitor, &(_i . or1_token).0)),
-        inputs: FoldHelper::lift(_i . inputs, |it| { _visitor.fold_fn_arg(it) }),
-        or2_token: Token ! [ | ](tokens_helper(_visitor, &(_i . or2_token).0)),
-        output: _visitor.fold_return_type(_i . output),
-        body: Box::new(_visitor.fold_expr(* _i . body)),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_continue<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprContinue) -> ExprContinue {
-    ExprContinue {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        continue_token: Token ! [ continue ](tokens_helper(_visitor, &(_i . continue_token).0)),
-        label: (_i . label).map(|it| { _visitor.fold_lifetime(it) }),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_field<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprField) -> ExprField {
-    ExprField {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        base: Box::new(_visitor.fold_expr(* _i . base)),
-        dot_token: Token ! [ . ](tokens_helper(_visitor, &(_i . dot_token).0)),
-        member: _visitor.fold_member(_i . member),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_for_loop<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprForLoop) -> ExprForLoop {
-    ExprForLoop {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        label: (_i . label).map(|it| { _visitor.fold_label(it) }),
-        for_token: Token ! [ for ](tokens_helper(_visitor, &(_i . for_token).0)),
-        pat: Box::new(_visitor.fold_pat(* _i . pat)),
-        in_token: Token ! [ in ](tokens_helper(_visitor, &(_i . in_token).0)),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-        body: _visitor.fold_block(_i . body),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_group<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprGroup) -> ExprGroup {
-    ExprGroup {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        group_token: Group(tokens_helper(_visitor, &(_i . group_token).0)),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_if<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprIf) -> ExprIf {
-    ExprIf {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        if_token: Token ! [ if ](tokens_helper(_visitor, &(_i . if_token).0)),
-        cond: Box::new(_visitor.fold_expr(* _i . cond)),
-        then_branch: _visitor.fold_block(_i . then_branch),
-        else_branch: (_i . else_branch).map(|it| { (
-            Token ! [ else ](tokens_helper(_visitor, &(( it ) . 0).0)),
-            Box::new(_visitor.fold_expr(* ( it ) . 1)),
-        ) }),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_if_let<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprIfLet) -> ExprIfLet {
-    ExprIfLet {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        if_token: Token ! [ if ](tokens_helper(_visitor, &(_i . if_token).0)),
-        let_token: Token ! [ let ](tokens_helper(_visitor, &(_i . let_token).0)),
-        pats: FoldHelper::lift(_i . pats, |it| { _visitor.fold_pat(it) }),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i . eq_token).0)),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-        then_branch: _visitor.fold_block(_i . then_branch),
-        else_branch: (_i . else_branch).map(|it| { (
-            Token ! [ else ](tokens_helper(_visitor, &(( it ) . 0).0)),
-            Box::new(_visitor.fold_expr(* ( it ) . 1)),
-        ) }),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_in_place<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprInPlace) -> ExprInPlace {
-    ExprInPlace {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        place: Box::new(_visitor.fold_expr(* _i . place)),
-        arrow_token: Token ! [ <- ](tokens_helper(_visitor, &(_i . arrow_token).0)),
-        value: Box::new(_visitor.fold_expr(* _i . value)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_index<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprIndex) -> ExprIndex {
-    ExprIndex {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-        bracket_token: Bracket(tokens_helper(_visitor, &(_i . bracket_token).0)),
-        index: Box::new(_visitor.fold_expr(* _i . index)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_lit<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprLit) -> ExprLit {
-    ExprLit {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        lit: _visitor.fold_lit(_i . lit),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_loop<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprLoop) -> ExprLoop {
-    ExprLoop {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        label: (_i . label).map(|it| { _visitor.fold_label(it) }),
-        loop_token: Token ! [ loop ](tokens_helper(_visitor, &(_i . loop_token).0)),
-        body: _visitor.fold_block(_i . body),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_macro<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprMacro) -> ExprMacro {
-    ExprMacro {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        mac: _visitor.fold_macro(_i . mac),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_match<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprMatch) -> ExprMatch {
-    ExprMatch {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        match_token: Token ! [ match ](tokens_helper(_visitor, &(_i . match_token).0)),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-        brace_token: Brace(tokens_helper(_visitor, &(_i . brace_token).0)),
-        arms: FoldHelper::lift(_i . arms, |it| { _visitor.fold_arm(it) }),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_method_call<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprMethodCall) -> ExprMethodCall {
-    ExprMethodCall {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        receiver: Box::new(_visitor.fold_expr(* _i . receiver)),
-        dot_token: Token ! [ . ](tokens_helper(_visitor, &(_i . dot_token).0)),
-        method: _visitor.fold_ident(_i . method),
-        turbofish: (_i . turbofish).map(|it| { _visitor.fold_method_turbofish(it) }),
-        paren_token: Paren(tokens_helper(_visitor, &(_i . paren_token).0)),
-        args: FoldHelper::lift(_i . args, |it| { _visitor.fold_expr(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_paren<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprParen) -> ExprParen {
-    ExprParen {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        paren_token: Paren(tokens_helper(_visitor, &(_i . paren_token).0)),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_path<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprPath) -> ExprPath {
-    ExprPath {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        qself: (_i . qself).map(|it| { _visitor.fold_qself(it) }),
-        path: _visitor.fold_path(_i . path),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_range<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprRange) -> ExprRange {
-    ExprRange {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        from: (_i . from).map(|it| { Box::new(_visitor.fold_expr(* it)) }),
-        limits: _visitor.fold_range_limits(_i . limits),
-        to: (_i . to).map(|it| { Box::new(_visitor.fold_expr(* it)) }),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_reference<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprReference) -> ExprReference {
-    ExprReference {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        and_token: Token ! [ & ](tokens_helper(_visitor, &(_i . and_token).0)),
-        mutability: (_i . mutability).map(|it| { Token ! [ mut ](tokens_helper(_visitor, &(it).0)) }),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_repeat<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprRepeat) -> ExprRepeat {
-    ExprRepeat {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        bracket_token: Bracket(tokens_helper(_visitor, &(_i . bracket_token).0)),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-        len: Box::new(_visitor.fold_expr(* _i . len)),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_return<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprReturn) -> ExprReturn {
-    ExprReturn {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        return_token: Token ! [ return ](tokens_helper(_visitor, &(_i . return_token).0)),
-        expr: (_i . expr).map(|it| { Box::new(_visitor.fold_expr(* it)) }),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_struct<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprStruct) -> ExprStruct {
-    ExprStruct {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        path: _visitor.fold_path(_i . path),
-        brace_token: Brace(tokens_helper(_visitor, &(_i . brace_token).0)),
-        fields: FoldHelper::lift(_i . fields, |it| { _visitor.fold_field_value(it) }),
-        dot2_token: (_i . dot2_token).map(|it| { Token ! [ .. ](tokens_helper(_visitor, &(it).0)) }),
-        rest: (_i . rest).map(|it| { Box::new(_visitor.fold_expr(* it)) }),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_try<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprTry) -> ExprTry {
-    ExprTry {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-        question_token: Token ! [ ? ](tokens_helper(_visitor, &(_i . question_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_tuple<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprTuple) -> ExprTuple {
-    ExprTuple {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        paren_token: Paren(tokens_helper(_visitor, &(_i . paren_token).0)),
-        elems: FoldHelper::lift(_i . elems, |it| { _visitor.fold_expr(it) }),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_type<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprType) -> ExprType {
-    ExprType {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i . colon_token).0)),
-        ty: Box::new(_visitor.fold_type(* _i . ty)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_unary<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprUnary) -> ExprUnary {
-    ExprUnary {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        op: _visitor.fold_un_op(_i . op),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_unsafe<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprUnsafe) -> ExprUnsafe {
-    ExprUnsafe {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        unsafe_token: Token ! [ unsafe ](tokens_helper(_visitor, &(_i . unsafe_token).0)),
-        block: _visitor.fold_block(_i . block),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_verbatim<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprVerbatim) -> ExprVerbatim {
-    ExprVerbatim {
-        tts: _i . tts,
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_while<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprWhile) -> ExprWhile {
-    ExprWhile {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        label: (_i . label).map(|it| { _visitor.fold_label(it) }),
-        while_token: Token ! [ while ](tokens_helper(_visitor, &(_i . while_token).0)),
-        cond: Box::new(_visitor.fold_expr(* _i . cond)),
-        body: _visitor.fold_block(_i . body),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_while_let<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprWhileLet) -> ExprWhileLet {
-    ExprWhileLet {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        label: (_i . label).map(|it| { _visitor.fold_label(it) }),
-        while_token: Token ! [ while ](tokens_helper(_visitor, &(_i . while_token).0)),
-        let_token: Token ! [ let ](tokens_helper(_visitor, &(_i . let_token).0)),
-        pats: FoldHelper::lift(_i . pats, |it| { _visitor.fold_pat(it) }),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i . eq_token).0)),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-        body: _visitor.fold_block(_i . body),
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_expr_yield<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprYield) -> ExprYield {
-    ExprYield {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        yield_token: Token ! [ yield ](tokens_helper(_visitor, &(_i . yield_token).0)),
-        expr: (_i . expr).map(|it| { Box::new(_visitor.fold_expr(* it)) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_field<V: Fold + ?Sized>(_visitor: &mut V, _i: Field) -> Field {
-    Field {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        ident: (_i . ident).map(|it| { _visitor.fold_ident(it) }),
-        colon_token: (_i . colon_token).map(|it| { Token ! [ : ](tokens_helper(_visitor, &(it).0)) }),
-        ty: _visitor.fold_type(_i . ty),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_field_pat<V: Fold + ?Sized>(_visitor: &mut V, _i: FieldPat) -> FieldPat {
-    FieldPat {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        member: _visitor.fold_member(_i . member),
-        colon_token: (_i . colon_token).map(|it| { Token ! [ : ](tokens_helper(_visitor, &(it).0)) }),
-        pat: Box::new(_visitor.fold_pat(* _i . pat)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_field_value<V: Fold + ?Sized>(_visitor: &mut V, _i: FieldValue) -> FieldValue {
-    FieldValue {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        member: _visitor.fold_member(_i . member),
-        colon_token: (_i . colon_token).map(|it| { Token ! [ : ](tokens_helper(_visitor, &(it).0)) }),
-        expr: _visitor.fold_expr(_i . expr),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_fields<V: Fold + ?Sized>(_visitor: &mut V, _i: Fields) -> Fields {
-    match _i {
-        Fields::Named(_binding_0, ) => {
-            Fields::Named (
-                _visitor.fold_fields_named(_binding_0),
-            )
-        }
-        Fields::Unnamed(_binding_0, ) => {
-            Fields::Unnamed (
-                _visitor.fold_fields_unnamed(_binding_0),
-            )
-        }
-        Fields::Unit => { Fields::Unit }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_fields_named<V: Fold + ?Sized>(_visitor: &mut V, _i: FieldsNamed) -> FieldsNamed {
-    FieldsNamed {
-        brace_token: Brace(tokens_helper(_visitor, &(_i . brace_token).0)),
-        named: FoldHelper::lift(_i . named, |it| { _visitor.fold_field(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_fields_unnamed<V: Fold + ?Sized>(_visitor: &mut V, _i: FieldsUnnamed) -> FieldsUnnamed {
-    FieldsUnnamed {
-        paren_token: Paren(tokens_helper(_visitor, &(_i . paren_token).0)),
-        unnamed: FoldHelper::lift(_i . unnamed, |it| { _visitor.fold_field(it) }),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_file<V: Fold + ?Sized>(_visitor: &mut V, _i: File) -> File {
-    File {
-        shebang: _i . shebang,
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        items: FoldHelper::lift(_i . items, |it| { _visitor.fold_item(it) }),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_fn_arg<V: Fold + ?Sized>(_visitor: &mut V, _i: FnArg) -> FnArg {
-    match _i {
-        FnArg::SelfRef(_binding_0, ) => {
-            FnArg::SelfRef (
-                _visitor.fold_arg_self_ref(_binding_0),
-            )
-        }
-        FnArg::SelfValue(_binding_0, ) => {
-            FnArg::SelfValue (
-                _visitor.fold_arg_self(_binding_0),
-            )
-        }
-        FnArg::Captured(_binding_0, ) => {
-            FnArg::Captured (
-                _visitor.fold_arg_captured(_binding_0),
-            )
-        }
-        FnArg::Inferred(_binding_0, ) => {
-            FnArg::Inferred (
-                _visitor.fold_pat(_binding_0),
-            )
-        }
-        FnArg::Ignored(_binding_0, ) => {
-            FnArg::Ignored (
-                _visitor.fold_type(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_fn_decl<V: Fold + ?Sized>(_visitor: &mut V, _i: FnDecl) -> FnDecl {
-    FnDecl {
-        fn_token: Token ! [ fn ](tokens_helper(_visitor, &(_i . fn_token).0)),
-        generics: _visitor.fold_generics(_i . generics),
-        paren_token: Paren(tokens_helper(_visitor, &(_i . paren_token).0)),
-        inputs: FoldHelper::lift(_i . inputs, |it| { _visitor.fold_fn_arg(it) }),
-        variadic: (_i . variadic).map(|it| { Token ! [ ... ](tokens_helper(_visitor, &(it).0)) }),
-        output: _visitor.fold_return_type(_i . output),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_foreign_item<V: Fold + ?Sized>(_visitor: &mut V, _i: ForeignItem) -> ForeignItem {
-    match _i {
-        ForeignItem::Fn(_binding_0, ) => {
-            ForeignItem::Fn (
-                _visitor.fold_foreign_item_fn(_binding_0),
-            )
-        }
-        ForeignItem::Static(_binding_0, ) => {
-            ForeignItem::Static (
-                _visitor.fold_foreign_item_static(_binding_0),
-            )
-        }
-        ForeignItem::Type(_binding_0, ) => {
-            ForeignItem::Type (
-                _visitor.fold_foreign_item_type(_binding_0),
-            )
-        }
-        ForeignItem::Verbatim(_binding_0, ) => {
-            ForeignItem::Verbatim (
-                _visitor.fold_foreign_item_verbatim(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_foreign_item_fn<V: Fold + ?Sized>(_visitor: &mut V, _i: ForeignItemFn) -> ForeignItemFn {
-    ForeignItemFn {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        ident: _visitor.fold_ident(_i . ident),
-        decl: Box::new(_visitor.fold_fn_decl(* _i . decl)),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_foreign_item_static<V: Fold + ?Sized>(_visitor: &mut V, _i: ForeignItemStatic) -> ForeignItemStatic {
-    ForeignItemStatic {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        static_token: Token ! [ static ](tokens_helper(_visitor, &(_i . static_token).0)),
-        mutability: (_i . mutability).map(|it| { Token ! [ mut ](tokens_helper(_visitor, &(it).0)) }),
-        ident: _visitor.fold_ident(_i . ident),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i . colon_token).0)),
-        ty: Box::new(_visitor.fold_type(* _i . ty)),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_foreign_item_type<V: Fold + ?Sized>(_visitor: &mut V, _i: ForeignItemType) -> ForeignItemType {
-    ForeignItemType {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        type_token: Token ! [ type ](tokens_helper(_visitor, &(_i . type_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_foreign_item_verbatim<V: Fold + ?Sized>(_visitor: &mut V, _i: ForeignItemVerbatim) -> ForeignItemVerbatim {
-    ForeignItemVerbatim {
-        tts: _i . tts,
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_generic_argument<V: Fold + ?Sized>(_visitor: &mut V, _i: GenericArgument) -> GenericArgument {
-    match _i {
-        GenericArgument::Lifetime(_binding_0, ) => {
-            GenericArgument::Lifetime (
-                _visitor.fold_lifetime(_binding_0),
-            )
-        }
-        GenericArgument::Type(_binding_0, ) => {
-            GenericArgument::Type (
-                _visitor.fold_type(_binding_0),
-            )
-        }
-        GenericArgument::Binding(_binding_0, ) => {
-            GenericArgument::Binding (
-                _visitor.fold_binding(_binding_0),
-            )
-        }
-        GenericArgument::Const(_binding_0, ) => {
-            GenericArgument::Const (
-                _visitor.fold_expr(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_generic_method_argument<V: Fold + ?Sized>(_visitor: &mut V, _i: GenericMethodArgument) -> GenericMethodArgument {
-    match _i {
-        GenericMethodArgument::Type(_binding_0, ) => {
-            GenericMethodArgument::Type (
-                _visitor.fold_type(_binding_0),
-            )
-        }
-        GenericMethodArgument::Const(_binding_0, ) => {
-            GenericMethodArgument::Const (
-                _visitor.fold_expr(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_generic_param<V: Fold + ?Sized>(_visitor: &mut V, _i: GenericParam) -> GenericParam {
-    match _i {
-        GenericParam::Type(_binding_0, ) => {
-            GenericParam::Type (
-                _visitor.fold_type_param(_binding_0),
-            )
-        }
-        GenericParam::Lifetime(_binding_0, ) => {
-            GenericParam::Lifetime (
-                _visitor.fold_lifetime_def(_binding_0),
-            )
-        }
-        GenericParam::Const(_binding_0, ) => {
-            GenericParam::Const (
-                _visitor.fold_const_param(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_generics<V: Fold + ?Sized>(_visitor: &mut V, _i: Generics) -> Generics {
-    Generics {
-        lt_token: (_i . lt_token).map(|it| { Token ! [ < ](tokens_helper(_visitor, &(it).0)) }),
-        params: FoldHelper::lift(_i . params, |it| { _visitor.fold_generic_param(it) }),
-        gt_token: (_i . gt_token).map(|it| { Token ! [ > ](tokens_helper(_visitor, &(it).0)) }),
-        where_clause: (_i . where_clause).map(|it| { _visitor.fold_where_clause(it) }),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_impl_item<V: Fold + ?Sized>(_visitor: &mut V, _i: ImplItem) -> ImplItem {
-    match _i {
-        ImplItem::Const(_binding_0, ) => {
-            ImplItem::Const (
-                _visitor.fold_impl_item_const(_binding_0),
-            )
-        }
-        ImplItem::Method(_binding_0, ) => {
-            ImplItem::Method (
-                _visitor.fold_impl_item_method(_binding_0),
-            )
-        }
-        ImplItem::Type(_binding_0, ) => {
-            ImplItem::Type (
-                _visitor.fold_impl_item_type(_binding_0),
-            )
-        }
-        ImplItem::Macro(_binding_0, ) => {
-            ImplItem::Macro (
-                _visitor.fold_impl_item_macro(_binding_0),
-            )
-        }
-        ImplItem::Verbatim(_binding_0, ) => {
-            ImplItem::Verbatim (
-                _visitor.fold_impl_item_verbatim(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_impl_item_const<V: Fold + ?Sized>(_visitor: &mut V, _i: ImplItemConst) -> ImplItemConst {
-    ImplItemConst {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        defaultness: (_i . defaultness).map(|it| { Token ! [ default ](tokens_helper(_visitor, &(it).0)) }),
-        const_token: Token ! [ const ](tokens_helper(_visitor, &(_i . const_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i . colon_token).0)),
-        ty: _visitor.fold_type(_i . ty),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i . eq_token).0)),
-        expr: _visitor.fold_expr(_i . expr),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_impl_item_macro<V: Fold + ?Sized>(_visitor: &mut V, _i: ImplItemMacro) -> ImplItemMacro {
-    ImplItemMacro {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        mac: _visitor.fold_macro(_i . mac),
-        semi_token: (_i . semi_token).map(|it| { Token ! [ ; ](tokens_helper(_visitor, &(it).0)) }),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_impl_item_method<V: Fold + ?Sized>(_visitor: &mut V, _i: ImplItemMethod) -> ImplItemMethod {
-    ImplItemMethod {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        defaultness: (_i . defaultness).map(|it| { Token ! [ default ](tokens_helper(_visitor, &(it).0)) }),
-        sig: _visitor.fold_method_sig(_i . sig),
-        block: _visitor.fold_block(_i . block),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_impl_item_type<V: Fold + ?Sized>(_visitor: &mut V, _i: ImplItemType) -> ImplItemType {
-    ImplItemType {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        defaultness: (_i . defaultness).map(|it| { Token ! [ default ](tokens_helper(_visitor, &(it).0)) }),
-        type_token: Token ! [ type ](tokens_helper(_visitor, &(_i . type_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        generics: _visitor.fold_generics(_i . generics),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i . eq_token).0)),
-        ty: _visitor.fold_type(_i . ty),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_impl_item_verbatim<V: Fold + ?Sized>(_visitor: &mut V, _i: ImplItemVerbatim) -> ImplItemVerbatim {
-    ImplItemVerbatim {
-        tts: _i . tts,
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_index<V: Fold + ?Sized>(_visitor: &mut V, _i: Index) -> Index {
-    Index {
-        index: _i . index,
-        span: _visitor.fold_span(_i . span),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item<V: Fold + ?Sized>(_visitor: &mut V, _i: Item) -> Item {
-    match _i {
-        Item::ExternCrate(_binding_0, ) => {
-            Item::ExternCrate (
-                _visitor.fold_item_extern_crate(_binding_0),
-            )
-        }
-        Item::Use(_binding_0, ) => {
-            Item::Use (
-                _visitor.fold_item_use(_binding_0),
-            )
-        }
-        Item::Static(_binding_0, ) => {
-            Item::Static (
-                _visitor.fold_item_static(_binding_0),
-            )
-        }
-        Item::Const(_binding_0, ) => {
-            Item::Const (
-                _visitor.fold_item_const(_binding_0),
-            )
-        }
-        Item::Fn(_binding_0, ) => {
-            Item::Fn (
-                _visitor.fold_item_fn(_binding_0),
-            )
-        }
-        Item::Mod(_binding_0, ) => {
-            Item::Mod (
-                _visitor.fold_item_mod(_binding_0),
-            )
-        }
-        Item::ForeignMod(_binding_0, ) => {
-            Item::ForeignMod (
-                _visitor.fold_item_foreign_mod(_binding_0),
-            )
-        }
-        Item::Type(_binding_0, ) => {
-            Item::Type (
-                _visitor.fold_item_type(_binding_0),
-            )
-        }
-        Item::Struct(_binding_0, ) => {
-            Item::Struct (
-                _visitor.fold_item_struct(_binding_0),
-            )
-        }
-        Item::Enum(_binding_0, ) => {
-            Item::Enum (
-                _visitor.fold_item_enum(_binding_0),
-            )
-        }
-        Item::Union(_binding_0, ) => {
-            Item::Union (
-                _visitor.fold_item_union(_binding_0),
-            )
-        }
-        Item::Trait(_binding_0, ) => {
-            Item::Trait (
-                _visitor.fold_item_trait(_binding_0),
-            )
-        }
-        Item::Impl(_binding_0, ) => {
-            Item::Impl (
-                _visitor.fold_item_impl(_binding_0),
-            )
-        }
-        Item::Macro(_binding_0, ) => {
-            Item::Macro (
-                _visitor.fold_item_macro(_binding_0),
-            )
-        }
-        Item::Macro2(_binding_0, ) => {
-            Item::Macro2 (
-                _visitor.fold_item_macro2(_binding_0),
-            )
-        }
-        Item::Verbatim(_binding_0, ) => {
-            Item::Verbatim (
-                _visitor.fold_item_verbatim(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_const<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemConst) -> ItemConst {
-    ItemConst {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        const_token: Token ! [ const ](tokens_helper(_visitor, &(_i . const_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i . colon_token).0)),
-        ty: Box::new(_visitor.fold_type(* _i . ty)),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i . eq_token).0)),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_enum<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemEnum) -> ItemEnum {
-    ItemEnum {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        enum_token: Token ! [ enum ](tokens_helper(_visitor, &(_i . enum_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        generics: _visitor.fold_generics(_i . generics),
-        brace_token: Brace(tokens_helper(_visitor, &(_i . brace_token).0)),
-        variants: FoldHelper::lift(_i . variants, |it| { _visitor.fold_variant(it) }),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_extern_crate<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemExternCrate) -> ItemExternCrate {
-    ItemExternCrate {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        extern_token: Token ! [ extern ](tokens_helper(_visitor, &(_i . extern_token).0)),
-        crate_token: Token ! [ crate ](tokens_helper(_visitor, &(_i . crate_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        rename: (_i . rename).map(|it| { (
-            Token ! [ as ](tokens_helper(_visitor, &(( it ) . 0).0)),
-            _visitor.fold_ident(( it ) . 1),
-        ) }),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_fn<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemFn) -> ItemFn {
-    ItemFn {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        constness: (_i . constness).map(|it| { Token ! [ const ](tokens_helper(_visitor, &(it).0)) }),
-        unsafety: (_i . unsafety).map(|it| { Token ! [ unsafe ](tokens_helper(_visitor, &(it).0)) }),
-        abi: (_i . abi).map(|it| { _visitor.fold_abi(it) }),
-        ident: _visitor.fold_ident(_i . ident),
-        decl: Box::new(_visitor.fold_fn_decl(* _i . decl)),
-        block: Box::new(_visitor.fold_block(* _i . block)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_foreign_mod<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemForeignMod) -> ItemForeignMod {
-    ItemForeignMod {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        abi: _visitor.fold_abi(_i . abi),
-        brace_token: Brace(tokens_helper(_visitor, &(_i . brace_token).0)),
-        items: FoldHelper::lift(_i . items, |it| { _visitor.fold_foreign_item(it) }),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_impl<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemImpl) -> ItemImpl {
-    ItemImpl {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        defaultness: (_i . defaultness).map(|it| { Token ! [ default ](tokens_helper(_visitor, &(it).0)) }),
-        unsafety: (_i . unsafety).map(|it| { Token ! [ unsafe ](tokens_helper(_visitor, &(it).0)) }),
-        impl_token: Token ! [ impl ](tokens_helper(_visitor, &(_i . impl_token).0)),
-        generics: _visitor.fold_generics(_i . generics),
-        trait_: (_i . trait_).map(|it| { (
-            (( it ) . 0).map(|it| { Token ! [ ! ](tokens_helper(_visitor, &(it).0)) }),
-            _visitor.fold_path(( it ) . 1),
-            Token ! [ for ](tokens_helper(_visitor, &(( it ) . 2).0)),
-        ) }),
-        self_ty: Box::new(_visitor.fold_type(* _i . self_ty)),
-        brace_token: Brace(tokens_helper(_visitor, &(_i . brace_token).0)),
-        items: FoldHelper::lift(_i . items, |it| { _visitor.fold_impl_item(it) }),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_macro<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemMacro) -> ItemMacro {
-    ItemMacro {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        ident: (_i . ident).map(|it| { _visitor.fold_ident(it) }),
-        mac: _visitor.fold_macro(_i . mac),
-        semi_token: (_i . semi_token).map(|it| { Token ! [ ; ](tokens_helper(_visitor, &(it).0)) }),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_macro2<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemMacro2) -> ItemMacro2 {
-    ItemMacro2 {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        macro_token: Token ! [ macro ](tokens_helper(_visitor, &(_i . macro_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        paren_token: Paren(tokens_helper(_visitor, &(_i . paren_token).0)),
-        args: _i . args,
-        brace_token: Brace(tokens_helper(_visitor, &(_i . brace_token).0)),
-        body: _i . body,
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_mod<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemMod) -> ItemMod {
-    ItemMod {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        mod_token: Token ! [ mod ](tokens_helper(_visitor, &(_i . mod_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        content: (_i . content).map(|it| { (
-            Brace(tokens_helper(_visitor, &(( it ) . 0).0)),
-            FoldHelper::lift(( it ) . 1, |it| { _visitor.fold_item(it) }),
-        ) }),
-        semi: (_i . semi).map(|it| { Token ! [ ; ](tokens_helper(_visitor, &(it).0)) }),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_static<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemStatic) -> ItemStatic {
-    ItemStatic {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        static_token: Token ! [ static ](tokens_helper(_visitor, &(_i . static_token).0)),
-        mutability: (_i . mutability).map(|it| { Token ! [ mut ](tokens_helper(_visitor, &(it).0)) }),
-        ident: _visitor.fold_ident(_i . ident),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i . colon_token).0)),
-        ty: Box::new(_visitor.fold_type(* _i . ty)),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i . eq_token).0)),
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_struct<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemStruct) -> ItemStruct {
-    ItemStruct {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        struct_token: Token ! [ struct ](tokens_helper(_visitor, &(_i . struct_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        generics: _visitor.fold_generics(_i . generics),
-        fields: _visitor.fold_fields(_i . fields),
-        semi_token: (_i . semi_token).map(|it| { Token ! [ ; ](tokens_helper(_visitor, &(it).0)) }),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_trait<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemTrait) -> ItemTrait {
-    ItemTrait {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        unsafety: (_i . unsafety).map(|it| { Token ! [ unsafe ](tokens_helper(_visitor, &(it).0)) }),
-        auto_token: (_i . auto_token).map(|it| { Token ! [ auto ](tokens_helper(_visitor, &(it).0)) }),
-        trait_token: Token ! [ trait ](tokens_helper(_visitor, &(_i . trait_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        generics: _visitor.fold_generics(_i . generics),
-        colon_token: (_i . colon_token).map(|it| { Token ! [ : ](tokens_helper(_visitor, &(it).0)) }),
-        supertraits: FoldHelper::lift(_i . supertraits, |it| { _visitor.fold_type_param_bound(it) }),
-        brace_token: Brace(tokens_helper(_visitor, &(_i . brace_token).0)),
-        items: FoldHelper::lift(_i . items, |it| { _visitor.fold_trait_item(it) }),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_type<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemType) -> ItemType {
-    ItemType {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        type_token: Token ! [ type ](tokens_helper(_visitor, &(_i . type_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        generics: _visitor.fold_generics(_i . generics),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i . eq_token).0)),
-        ty: Box::new(_visitor.fold_type(* _i . ty)),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_union<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemUnion) -> ItemUnion {
-    ItemUnion {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        union_token: Token ! [ union ](tokens_helper(_visitor, &(_i . union_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        generics: _visitor.fold_generics(_i . generics),
-        fields: _visitor.fold_fields_named(_i . fields),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_use<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemUse) -> ItemUse {
-    ItemUse {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        vis: _visitor.fold_visibility(_i . vis),
-        use_token: Token ! [ use ](tokens_helper(_visitor, &(_i . use_token).0)),
-        leading_colon: (_i . leading_colon).map(|it| { Token ! [ :: ](tokens_helper(_visitor, &(it).0)) }),
-        tree: _visitor.fold_use_tree(_i . tree),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_item_verbatim<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemVerbatim) -> ItemVerbatim {
-    ItemVerbatim {
-        tts: _i . tts,
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_label<V: Fold + ?Sized>(_visitor: &mut V, _i: Label) -> Label {
-    Label {
-        name: _visitor.fold_lifetime(_i . name),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i . colon_token).0)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_lifetime_def<V: Fold + ?Sized>(_visitor: &mut V, _i: LifetimeDef) -> LifetimeDef {
-    LifetimeDef {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        lifetime: _visitor.fold_lifetime(_i . lifetime),
-        colon_token: (_i . colon_token).map(|it| { Token ! [ : ](tokens_helper(_visitor, &(it).0)) }),
-        bounds: FoldHelper::lift(_i . bounds, |it| { _visitor.fold_lifetime(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_lit<V: Fold + ?Sized>(_visitor: &mut V, _i: Lit) -> Lit {
-    match _i {
-        Lit::Str(_binding_0, ) => {
-            Lit::Str (
-                _visitor.fold_lit_str(_binding_0),
-            )
-        }
-        Lit::ByteStr(_binding_0, ) => {
-            Lit::ByteStr (
-                _visitor.fold_lit_byte_str(_binding_0),
-            )
-        }
-        Lit::Byte(_binding_0, ) => {
-            Lit::Byte (
-                _visitor.fold_lit_byte(_binding_0),
-            )
-        }
-        Lit::Char(_binding_0, ) => {
-            Lit::Char (
-                _visitor.fold_lit_char(_binding_0),
-            )
-        }
-        Lit::Int(_binding_0, ) => {
-            Lit::Int (
-                _visitor.fold_lit_int(_binding_0),
-            )
-        }
-        Lit::Float(_binding_0, ) => {
-            Lit::Float (
-                _visitor.fold_lit_float(_binding_0),
-            )
-        }
-        Lit::Bool(_binding_0, ) => {
-            Lit::Bool (
-                _visitor.fold_lit_bool(_binding_0),
-            )
-        }
-        Lit::Verbatim(_binding_0, ) => {
-            Lit::Verbatim (
-                _visitor.fold_lit_verbatim(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_lit_bool<V: Fold + ?Sized>(_visitor: &mut V, _i: LitBool) -> LitBool {
-    LitBool {
-        value: _i . value,
-        span: _visitor.fold_span(_i . span),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_lit_verbatim<V: Fold + ?Sized>(_visitor: &mut V, _i: LitVerbatim) -> LitVerbatim {
-    LitVerbatim {
-        token: _i . token,
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_local<V: Fold + ?Sized>(_visitor: &mut V, _i: Local) -> Local {
-    Local {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        let_token: Token ! [ let ](tokens_helper(_visitor, &(_i . let_token).0)),
-        pats: FoldHelper::lift(_i . pats, |it| { _visitor.fold_pat(it) }),
-        ty: (_i . ty).map(|it| { (
-            Token ! [ : ](tokens_helper(_visitor, &(( it ) . 0).0)),
-            Box::new(_visitor.fold_type(* ( it ) . 1)),
-        ) }),
-        init: (_i . init).map(|it| { (
-            Token ! [ = ](tokens_helper(_visitor, &(( it ) . 0).0)),
-            Box::new(_visitor.fold_expr(* ( it ) . 1)),
-        ) }),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_macro<V: Fold + ?Sized>(_visitor: &mut V, _i: Macro) -> Macro {
-    Macro {
-        path: _visitor.fold_path(_i . path),
-        bang_token: Token ! [ ! ](tokens_helper(_visitor, &(_i . bang_token).0)),
-        delimiter: _visitor.fold_macro_delimiter(_i . delimiter),
-        tts: _i . tts,
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_macro_delimiter<V: Fold + ?Sized>(_visitor: &mut V, _i: MacroDelimiter) -> MacroDelimiter {
-    match _i {
-        MacroDelimiter::Paren(_binding_0, ) => {
-            MacroDelimiter::Paren (
-                Paren(tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        MacroDelimiter::Brace(_binding_0, ) => {
-            MacroDelimiter::Brace (
-                Brace(tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        MacroDelimiter::Bracket(_binding_0, ) => {
-            MacroDelimiter::Bracket (
-                Bracket(tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_member<V: Fold + ?Sized>(_visitor: &mut V, _i: Member) -> Member {
-    match _i {
-        Member::Named(_binding_0, ) => {
-            Member::Named (
-                _visitor.fold_ident(_binding_0),
-            )
-        }
-        Member::Unnamed(_binding_0, ) => {
-            Member::Unnamed (
-                _visitor.fold_index(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_meta<V: Fold + ?Sized>(_visitor: &mut V, _i: Meta) -> Meta {
-    match _i {
-        Meta::Word(_binding_0, ) => {
-            Meta::Word (
-                _visitor.fold_ident(_binding_0),
-            )
-        }
-        Meta::List(_binding_0, ) => {
-            Meta::List (
-                _visitor.fold_meta_list(_binding_0),
-            )
-        }
-        Meta::NameValue(_binding_0, ) => {
-            Meta::NameValue (
-                _visitor.fold_meta_name_value(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_meta_list<V: Fold + ?Sized>(_visitor: &mut V, _i: MetaList) -> MetaList {
-    MetaList {
-        ident: _visitor.fold_ident(_i . ident),
-        paren_token: Paren(tokens_helper(_visitor, &(_i . paren_token).0)),
-        nested: FoldHelper::lift(_i . nested, |it| { _visitor.fold_nested_meta(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_meta_name_value<V: Fold + ?Sized>(_visitor: &mut V, _i: MetaNameValue) -> MetaNameValue {
-    MetaNameValue {
-        ident: _visitor.fold_ident(_i . ident),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i . eq_token).0)),
-        lit: _visitor.fold_lit(_i . lit),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_method_sig<V: Fold + ?Sized>(_visitor: &mut V, _i: MethodSig) -> MethodSig {
-    MethodSig {
-        constness: (_i . constness).map(|it| { Token ! [ const ](tokens_helper(_visitor, &(it).0)) }),
-        unsafety: (_i . unsafety).map(|it| { Token ! [ unsafe ](tokens_helper(_visitor, &(it).0)) }),
-        abi: (_i . abi).map(|it| { _visitor.fold_abi(it) }),
-        ident: _visitor.fold_ident(_i . ident),
-        decl: _visitor.fold_fn_decl(_i . decl),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_method_turbofish<V: Fold + ?Sized>(_visitor: &mut V, _i: MethodTurbofish) -> MethodTurbofish {
-    MethodTurbofish {
-        colon2_token: Token ! [ :: ](tokens_helper(_visitor, &(_i . colon2_token).0)),
-        lt_token: Token ! [ < ](tokens_helper(_visitor, &(_i . lt_token).0)),
-        args: FoldHelper::lift(_i . args, |it| { _visitor.fold_generic_method_argument(it) }),
-        gt_token: Token ! [ > ](tokens_helper(_visitor, &(_i . gt_token).0)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_nested_meta<V: Fold + ?Sized>(_visitor: &mut V, _i: NestedMeta) -> NestedMeta {
-    match _i {
-        NestedMeta::Meta(_binding_0, ) => {
-            NestedMeta::Meta (
-                _visitor.fold_meta(_binding_0),
-            )
-        }
-        NestedMeta::Literal(_binding_0, ) => {
-            NestedMeta::Literal (
-                _visitor.fold_lit(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_parenthesized_generic_arguments<V: Fold + ?Sized>(_visitor: &mut V, _i: ParenthesizedGenericArguments) -> ParenthesizedGenericArguments {
-    ParenthesizedGenericArguments {
-        paren_token: Paren(tokens_helper(_visitor, &(_i . paren_token).0)),
-        inputs: FoldHelper::lift(_i . inputs, |it| { _visitor.fold_type(it) }),
-        output: _visitor.fold_return_type(_i . output),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_pat<V: Fold + ?Sized>(_visitor: &mut V, _i: Pat) -> Pat {
-    match _i {
-        Pat::Wild(_binding_0, ) => {
-            Pat::Wild (
-                _visitor.fold_pat_wild(_binding_0),
-            )
-        }
-        Pat::Ident(_binding_0, ) => {
-            Pat::Ident (
-                _visitor.fold_pat_ident(_binding_0),
-            )
-        }
-        Pat::Struct(_binding_0, ) => {
-            Pat::Struct (
-                _visitor.fold_pat_struct(_binding_0),
-            )
-        }
-        Pat::TupleStruct(_binding_0, ) => {
-            Pat::TupleStruct (
-                _visitor.fold_pat_tuple_struct(_binding_0),
-            )
-        }
-        Pat::Path(_binding_0, ) => {
-            Pat::Path (
-                _visitor.fold_pat_path(_binding_0),
-            )
-        }
-        Pat::Tuple(_binding_0, ) => {
-            Pat::Tuple (
-                _visitor.fold_pat_tuple(_binding_0),
-            )
-        }
-        Pat::Box(_binding_0, ) => {
-            Pat::Box (
-                _visitor.fold_pat_box(_binding_0),
-            )
-        }
-        Pat::Ref(_binding_0, ) => {
-            Pat::Ref (
-                _visitor.fold_pat_ref(_binding_0),
-            )
-        }
-        Pat::Lit(_binding_0, ) => {
-            Pat::Lit (
-                _visitor.fold_pat_lit(_binding_0),
-            )
-        }
-        Pat::Range(_binding_0, ) => {
-            Pat::Range (
-                _visitor.fold_pat_range(_binding_0),
-            )
-        }
-        Pat::Slice(_binding_0, ) => {
-            Pat::Slice (
-                _visitor.fold_pat_slice(_binding_0),
-            )
-        }
-        Pat::Macro(_binding_0, ) => {
-            Pat::Macro (
-                _visitor.fold_pat_macro(_binding_0),
-            )
-        }
-        Pat::Verbatim(_binding_0, ) => {
-            Pat::Verbatim (
-                _visitor.fold_pat_verbatim(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_pat_box<V: Fold + ?Sized>(_visitor: &mut V, _i: PatBox) -> PatBox {
-    PatBox {
-        box_token: Token ! [ box ](tokens_helper(_visitor, &(_i . box_token).0)),
-        pat: Box::new(_visitor.fold_pat(* _i . pat)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_pat_ident<V: Fold + ?Sized>(_visitor: &mut V, _i: PatIdent) -> PatIdent {
-    PatIdent {
-        by_ref: (_i . by_ref).map(|it| { Token ! [ ref ](tokens_helper(_visitor, &(it).0)) }),
-        mutability: (_i . mutability).map(|it| { Token ! [ mut ](tokens_helper(_visitor, &(it).0)) }),
-        ident: _visitor.fold_ident(_i . ident),
-        subpat: (_i . subpat).map(|it| { (
-            Token ! [ @ ](tokens_helper(_visitor, &(( it ) . 0).0)),
-            Box::new(_visitor.fold_pat(* ( it ) . 1)),
-        ) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_pat_lit<V: Fold + ?Sized>(_visitor: &mut V, _i: PatLit) -> PatLit {
-    PatLit {
-        expr: Box::new(_visitor.fold_expr(* _i . expr)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_pat_macro<V: Fold + ?Sized>(_visitor: &mut V, _i: PatMacro) -> PatMacro {
-    PatMacro {
-        mac: _visitor.fold_macro(_i . mac),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_pat_path<V: Fold + ?Sized>(_visitor: &mut V, _i: PatPath) -> PatPath {
-    PatPath {
-        qself: (_i . qself).map(|it| { _visitor.fold_qself(it) }),
-        path: _visitor.fold_path(_i . path),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_pat_range<V: Fold + ?Sized>(_visitor: &mut V, _i: PatRange) -> PatRange {
-    PatRange {
-        lo: Box::new(_visitor.fold_expr(* _i . lo)),
-        limits: _visitor.fold_range_limits(_i . limits),
-        hi: Box::new(_visitor.fold_expr(* _i . hi)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_pat_ref<V: Fold + ?Sized>(_visitor: &mut V, _i: PatRef) -> PatRef {
-    PatRef {
-        and_token: Token ! [ & ](tokens_helper(_visitor, &(_i . and_token).0)),
-        mutability: (_i . mutability).map(|it| { Token ! [ mut ](tokens_helper(_visitor, &(it).0)) }),
-        pat: Box::new(_visitor.fold_pat(* _i . pat)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_pat_slice<V: Fold + ?Sized>(_visitor: &mut V, _i: PatSlice) -> PatSlice {
-    PatSlice {
-        bracket_token: Bracket(tokens_helper(_visitor, &(_i . bracket_token).0)),
-        front: FoldHelper::lift(_i . front, |it| { _visitor.fold_pat(it) }),
-        middle: (_i . middle).map(|it| { Box::new(_visitor.fold_pat(* it)) }),
-        dot2_token: (_i . dot2_token).map(|it| { Token ! [ .. ](tokens_helper(_visitor, &(it).0)) }),
-        comma_token: (_i . comma_token).map(|it| { Token ! [ , ](tokens_helper(_visitor, &(it).0)) }),
-        back: FoldHelper::lift(_i . back, |it| { _visitor.fold_pat(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_pat_struct<V: Fold + ?Sized>(_visitor: &mut V, _i: PatStruct) -> PatStruct {
-    PatStruct {
-        path: _visitor.fold_path(_i . path),
-        brace_token: Brace(tokens_helper(_visitor, &(_i . brace_token).0)),
-        fields: FoldHelper::lift(_i . fields, |it| { _visitor.fold_field_pat(it) }),
-        dot2_token: (_i . dot2_token).map(|it| { Token ! [ .. ](tokens_helper(_visitor, &(it).0)) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_pat_tuple<V: Fold + ?Sized>(_visitor: &mut V, _i: PatTuple) -> PatTuple {
-    PatTuple {
-        paren_token: Paren(tokens_helper(_visitor, &(_i . paren_token).0)),
-        front: FoldHelper::lift(_i . front, |it| { _visitor.fold_pat(it) }),
-        dot2_token: (_i . dot2_token).map(|it| { Token ! [ .. ](tokens_helper(_visitor, &(it).0)) }),
-        comma_token: (_i . comma_token).map(|it| { Token ! [ , ](tokens_helper(_visitor, &(it).0)) }),
-        back: FoldHelper::lift(_i . back, |it| { _visitor.fold_pat(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_pat_tuple_struct<V: Fold + ?Sized>(_visitor: &mut V, _i: PatTupleStruct) -> PatTupleStruct {
-    PatTupleStruct {
-        path: _visitor.fold_path(_i . path),
-        pat: _visitor.fold_pat_tuple(_i . pat),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_pat_verbatim<V: Fold + ?Sized>(_visitor: &mut V, _i: PatVerbatim) -> PatVerbatim {
-    PatVerbatim {
-        tts: _i . tts,
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_pat_wild<V: Fold + ?Sized>(_visitor: &mut V, _i: PatWild) -> PatWild {
-    PatWild {
-        underscore_token: Token ! [ _ ](tokens_helper(_visitor, &(_i . underscore_token).0)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_path<V: Fold + ?Sized>(_visitor: &mut V, _i: Path) -> Path {
-    Path {
-        leading_colon: (_i . leading_colon).map(|it| { Token ! [ :: ](tokens_helper(_visitor, &(it).0)) }),
-        segments: FoldHelper::lift(_i . segments, |it| { _visitor.fold_path_segment(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_path_arguments<V: Fold + ?Sized>(_visitor: &mut V, _i: PathArguments) -> PathArguments {
-    match _i {
-        PathArguments::None => { PathArguments::None }
-        PathArguments::AngleBracketed(_binding_0, ) => {
-            PathArguments::AngleBracketed (
-                _visitor.fold_angle_bracketed_generic_arguments(_binding_0),
-            )
-        }
-        PathArguments::Parenthesized(_binding_0, ) => {
-            PathArguments::Parenthesized (
-                _visitor.fold_parenthesized_generic_arguments(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_path_segment<V: Fold + ?Sized>(_visitor: &mut V, _i: PathSegment) -> PathSegment {
-    PathSegment {
-        ident: _visitor.fold_ident(_i . ident),
-        arguments: _visitor.fold_path_arguments(_i . arguments),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_predicate_eq<V: Fold + ?Sized>(_visitor: &mut V, _i: PredicateEq) -> PredicateEq {
-    PredicateEq {
-        lhs_ty: _visitor.fold_type(_i . lhs_ty),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i . eq_token).0)),
-        rhs_ty: _visitor.fold_type(_i . rhs_ty),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_predicate_lifetime<V: Fold + ?Sized>(_visitor: &mut V, _i: PredicateLifetime) -> PredicateLifetime {
-    PredicateLifetime {
-        lifetime: _visitor.fold_lifetime(_i . lifetime),
-        colon_token: (_i . colon_token).map(|it| { Token ! [ : ](tokens_helper(_visitor, &(it).0)) }),
-        bounds: FoldHelper::lift(_i . bounds, |it| { _visitor.fold_lifetime(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_predicate_type<V: Fold + ?Sized>(_visitor: &mut V, _i: PredicateType) -> PredicateType {
-    PredicateType {
-        lifetimes: (_i . lifetimes).map(|it| { _visitor.fold_bound_lifetimes(it) }),
-        bounded_ty: _visitor.fold_type(_i . bounded_ty),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i . colon_token).0)),
-        bounds: FoldHelper::lift(_i . bounds, |it| { _visitor.fold_type_param_bound(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_qself<V: Fold + ?Sized>(_visitor: &mut V, _i: QSelf) -> QSelf {
-    QSelf {
-        lt_token: Token ! [ < ](tokens_helper(_visitor, &(_i . lt_token).0)),
-        ty: Box::new(_visitor.fold_type(* _i . ty)),
-        position: _i . position,
-        as_token: (_i . as_token).map(|it| { Token ! [ as ](tokens_helper(_visitor, &(it).0)) }),
-        gt_token: Token ! [ > ](tokens_helper(_visitor, &(_i . gt_token).0)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_range_limits<V: Fold + ?Sized>(_visitor: &mut V, _i: RangeLimits) -> RangeLimits {
-    match _i {
-        RangeLimits::HalfOpen(_binding_0, ) => {
-            RangeLimits::HalfOpen (
-                Token ! [ .. ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        RangeLimits::Closed(_binding_0, ) => {
-            RangeLimits::Closed (
-                Token ! [ ..= ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_return_type<V: Fold + ?Sized>(_visitor: &mut V, _i: ReturnType) -> ReturnType {
-    match _i {
-        ReturnType::Default => { ReturnType::Default }
-        ReturnType::Type(_binding_0, _binding_1, ) => {
-            ReturnType::Type (
-                Token ! [ -> ](tokens_helper(_visitor, &(_binding_0).0)),
-                Box::new(_visitor.fold_type(* _binding_1)),
-            )
-        }
-    }
-}
-
-pub fn fold_span<V: Fold + ?Sized>(_visitor: &mut V, _i: Span) -> Span {
-    _i
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn fold_stmt<V: Fold + ?Sized>(_visitor: &mut V, _i: Stmt) -> Stmt {
-    match _i {
-        Stmt::Local(_binding_0, ) => {
-            Stmt::Local (
-                _visitor.fold_local(_binding_0),
-            )
-        }
-        Stmt::Item(_binding_0, ) => {
-            Stmt::Item (
-                _visitor.fold_item(_binding_0),
-            )
-        }
-        Stmt::Expr(_binding_0, ) => {
-            Stmt::Expr (
-                _visitor.fold_expr(_binding_0),
-            )
-        }
-        Stmt::Semi(_binding_0, _binding_1, ) => {
-            Stmt::Semi (
-                _visitor.fold_expr(_binding_0),
-                Token ! [ ; ](tokens_helper(_visitor, &(_binding_1).0)),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_trait_bound<V: Fold + ?Sized>(_visitor: &mut V, _i: TraitBound) -> TraitBound {
-    TraitBound {
-        paren_token: (_i . paren_token).map(|it| { Paren(tokens_helper(_visitor, &(it).0)) }),
-        modifier: _visitor.fold_trait_bound_modifier(_i . modifier),
-        lifetimes: (_i . lifetimes).map(|it| { _visitor.fold_bound_lifetimes(it) }),
-        path: _visitor.fold_path(_i . path),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_trait_bound_modifier<V: Fold + ?Sized>(_visitor: &mut V, _i: TraitBoundModifier) -> TraitBoundModifier {
-    match _i {
-        TraitBoundModifier::None => { TraitBoundModifier::None }
-        TraitBoundModifier::Maybe(_binding_0, ) => {
-            TraitBoundModifier::Maybe (
-                Token ! [ ? ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_trait_item<V: Fold + ?Sized>(_visitor: &mut V, _i: TraitItem) -> TraitItem {
-    match _i {
-        TraitItem::Const(_binding_0, ) => {
-            TraitItem::Const (
-                _visitor.fold_trait_item_const(_binding_0),
-            )
-        }
-        TraitItem::Method(_binding_0, ) => {
-            TraitItem::Method (
-                _visitor.fold_trait_item_method(_binding_0),
-            )
-        }
-        TraitItem::Type(_binding_0, ) => {
-            TraitItem::Type (
-                _visitor.fold_trait_item_type(_binding_0),
-            )
-        }
-        TraitItem::Macro(_binding_0, ) => {
-            TraitItem::Macro (
-                _visitor.fold_trait_item_macro(_binding_0),
-            )
-        }
-        TraitItem::Verbatim(_binding_0, ) => {
-            TraitItem::Verbatim (
-                _visitor.fold_trait_item_verbatim(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_trait_item_const<V: Fold + ?Sized>(_visitor: &mut V, _i: TraitItemConst) -> TraitItemConst {
-    TraitItemConst {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        const_token: Token ! [ const ](tokens_helper(_visitor, &(_i . const_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i . colon_token).0)),
-        ty: _visitor.fold_type(_i . ty),
-        default: (_i . default).map(|it| { (
-            Token ! [ = ](tokens_helper(_visitor, &(( it ) . 0).0)),
-            _visitor.fold_expr(( it ) . 1),
-        ) }),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_trait_item_macro<V: Fold + ?Sized>(_visitor: &mut V, _i: TraitItemMacro) -> TraitItemMacro {
-    TraitItemMacro {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        mac: _visitor.fold_macro(_i . mac),
-        semi_token: (_i . semi_token).map(|it| { Token ! [ ; ](tokens_helper(_visitor, &(it).0)) }),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_trait_item_method<V: Fold + ?Sized>(_visitor: &mut V, _i: TraitItemMethod) -> TraitItemMethod {
-    TraitItemMethod {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        sig: _visitor.fold_method_sig(_i . sig),
-        default: (_i . default).map(|it| { _visitor.fold_block(it) }),
-        semi_token: (_i . semi_token).map(|it| { Token ! [ ; ](tokens_helper(_visitor, &(it).0)) }),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_trait_item_type<V: Fold + ?Sized>(_visitor: &mut V, _i: TraitItemType) -> TraitItemType {
-    TraitItemType {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        type_token: Token ! [ type ](tokens_helper(_visitor, &(_i . type_token).0)),
-        ident: _visitor.fold_ident(_i . ident),
-        generics: _visitor.fold_generics(_i . generics),
-        colon_token: (_i . colon_token).map(|it| { Token ! [ : ](tokens_helper(_visitor, &(it).0)) }),
-        bounds: FoldHelper::lift(_i . bounds, |it| { _visitor.fold_type_param_bound(it) }),
-        default: (_i . default).map(|it| { (
-            Token ! [ = ](tokens_helper(_visitor, &(( it ) . 0).0)),
-            _visitor.fold_type(( it ) . 1),
-        ) }),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_trait_item_verbatim<V: Fold + ?Sized>(_visitor: &mut V, _i: TraitItemVerbatim) -> TraitItemVerbatim {
-    TraitItemVerbatim {
-        tts: _i . tts,
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type<V: Fold + ?Sized>(_visitor: &mut V, _i: Type) -> Type {
-    match _i {
-        Type::Slice(_binding_0, ) => {
-            Type::Slice (
-                _visitor.fold_type_slice(_binding_0),
-            )
-        }
-        Type::Array(_binding_0, ) => {
-            Type::Array (
-                _visitor.fold_type_array(_binding_0),
-            )
-        }
-        Type::Ptr(_binding_0, ) => {
-            Type::Ptr (
-                _visitor.fold_type_ptr(_binding_0),
-            )
-        }
-        Type::Reference(_binding_0, ) => {
-            Type::Reference (
-                _visitor.fold_type_reference(_binding_0),
-            )
-        }
-        Type::BareFn(_binding_0, ) => {
-            Type::BareFn (
-                _visitor.fold_type_bare_fn(_binding_0),
-            )
-        }
-        Type::Never(_binding_0, ) => {
-            Type::Never (
-                _visitor.fold_type_never(_binding_0),
-            )
-        }
-        Type::Tuple(_binding_0, ) => {
-            Type::Tuple (
-                _visitor.fold_type_tuple(_binding_0),
-            )
-        }
-        Type::Path(_binding_0, ) => {
-            Type::Path (
-                _visitor.fold_type_path(_binding_0),
-            )
-        }
-        Type::TraitObject(_binding_0, ) => {
-            Type::TraitObject (
-                _visitor.fold_type_trait_object(_binding_0),
-            )
-        }
-        Type::ImplTrait(_binding_0, ) => {
-            Type::ImplTrait (
-                _visitor.fold_type_impl_trait(_binding_0),
-            )
-        }
-        Type::Paren(_binding_0, ) => {
-            Type::Paren (
-                _visitor.fold_type_paren(_binding_0),
-            )
-        }
-        Type::Group(_binding_0, ) => {
-            Type::Group (
-                _visitor.fold_type_group(_binding_0),
-            )
-        }
-        Type::Infer(_binding_0, ) => {
-            Type::Infer (
-                _visitor.fold_type_infer(_binding_0),
-            )
-        }
-        Type::Macro(_binding_0, ) => {
-            Type::Macro (
-                _visitor.fold_type_macro(_binding_0),
-            )
-        }
-        Type::Verbatim(_binding_0, ) => {
-            Type::Verbatim (
-                _visitor.fold_type_verbatim(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_array<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeArray) -> TypeArray {
-    TypeArray {
-        bracket_token: Bracket(tokens_helper(_visitor, &(_i . bracket_token).0)),
-        elem: Box::new(_visitor.fold_type(* _i . elem)),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i . semi_token).0)),
-        len: _visitor.fold_expr(_i . len),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_bare_fn<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeBareFn) -> TypeBareFn {
-    TypeBareFn {
-        unsafety: (_i . unsafety).map(|it| { Token ! [ unsafe ](tokens_helper(_visitor, &(it).0)) }),
-        abi: (_i . abi).map(|it| { _visitor.fold_abi(it) }),
-        fn_token: Token ! [ fn ](tokens_helper(_visitor, &(_i . fn_token).0)),
-        lifetimes: (_i . lifetimes).map(|it| { _visitor.fold_bound_lifetimes(it) }),
-        paren_token: Paren(tokens_helper(_visitor, &(_i . paren_token).0)),
-        inputs: FoldHelper::lift(_i . inputs, |it| { _visitor.fold_bare_fn_arg(it) }),
-        variadic: (_i . variadic).map(|it| { Token ! [ ... ](tokens_helper(_visitor, &(it).0)) }),
-        output: _visitor.fold_return_type(_i . output),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_group<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeGroup) -> TypeGroup {
-    TypeGroup {
-        group_token: Group(tokens_helper(_visitor, &(_i . group_token).0)),
-        elem: Box::new(_visitor.fold_type(* _i . elem)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_impl_trait<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeImplTrait) -> TypeImplTrait {
-    TypeImplTrait {
-        impl_token: Token ! [ impl ](tokens_helper(_visitor, &(_i . impl_token).0)),
-        bounds: FoldHelper::lift(_i . bounds, |it| { _visitor.fold_type_param_bound(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_infer<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeInfer) -> TypeInfer {
-    TypeInfer {
-        underscore_token: Token ! [ _ ](tokens_helper(_visitor, &(_i . underscore_token).0)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_macro<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeMacro) -> TypeMacro {
-    TypeMacro {
-        mac: _visitor.fold_macro(_i . mac),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_never<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeNever) -> TypeNever {
-    TypeNever {
-        bang_token: Token ! [ ! ](tokens_helper(_visitor, &(_i . bang_token).0)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_param<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeParam) -> TypeParam {
-    TypeParam {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        ident: _visitor.fold_ident(_i . ident),
-        colon_token: (_i . colon_token).map(|it| { Token ! [ : ](tokens_helper(_visitor, &(it).0)) }),
-        bounds: FoldHelper::lift(_i . bounds, |it| { _visitor.fold_type_param_bound(it) }),
-        eq_token: (_i . eq_token).map(|it| { Token ! [ = ](tokens_helper(_visitor, &(it).0)) }),
-        default: (_i . default).map(|it| { _visitor.fold_type(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_param_bound<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeParamBound) -> TypeParamBound {
-    match _i {
-        TypeParamBound::Trait(_binding_0, ) => {
-            TypeParamBound::Trait (
-                _visitor.fold_trait_bound(_binding_0),
-            )
-        }
-        TypeParamBound::Lifetime(_binding_0, ) => {
-            TypeParamBound::Lifetime (
-                _visitor.fold_lifetime(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_paren<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeParen) -> TypeParen {
-    TypeParen {
-        paren_token: Paren(tokens_helper(_visitor, &(_i . paren_token).0)),
-        elem: Box::new(_visitor.fold_type(* _i . elem)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_path<V: Fold + ?Sized>(_visitor: &mut V, _i: TypePath) -> TypePath {
-    TypePath {
-        qself: (_i . qself).map(|it| { _visitor.fold_qself(it) }),
-        path: _visitor.fold_path(_i . path),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_ptr<V: Fold + ?Sized>(_visitor: &mut V, _i: TypePtr) -> TypePtr {
-    TypePtr {
-        star_token: Token ! [ * ](tokens_helper(_visitor, &(_i . star_token).0)),
-        const_token: (_i . const_token).map(|it| { Token ! [ const ](tokens_helper(_visitor, &(it).0)) }),
-        mutability: (_i . mutability).map(|it| { Token ! [ mut ](tokens_helper(_visitor, &(it).0)) }),
-        elem: Box::new(_visitor.fold_type(* _i . elem)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_reference<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeReference) -> TypeReference {
-    TypeReference {
-        and_token: Token ! [ & ](tokens_helper(_visitor, &(_i . and_token).0)),
-        lifetime: (_i . lifetime).map(|it| { _visitor.fold_lifetime(it) }),
-        mutability: (_i . mutability).map(|it| { Token ! [ mut ](tokens_helper(_visitor, &(it).0)) }),
-        elem: Box::new(_visitor.fold_type(* _i . elem)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_slice<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeSlice) -> TypeSlice {
-    TypeSlice {
-        bracket_token: Bracket(tokens_helper(_visitor, &(_i . bracket_token).0)),
-        elem: Box::new(_visitor.fold_type(* _i . elem)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_trait_object<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeTraitObject) -> TypeTraitObject {
-    TypeTraitObject {
-        dyn_token: (_i . dyn_token).map(|it| { Token ! [ dyn ](tokens_helper(_visitor, &(it).0)) }),
-        bounds: FoldHelper::lift(_i . bounds, |it| { _visitor.fold_type_param_bound(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_tuple<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeTuple) -> TypeTuple {
-    TypeTuple {
-        paren_token: Paren(tokens_helper(_visitor, &(_i . paren_token).0)),
-        elems: FoldHelper::lift(_i . elems, |it| { _visitor.fold_type(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_type_verbatim<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeVerbatim) -> TypeVerbatim {
-    TypeVerbatim {
-        tts: _i . tts,
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_un_op<V: Fold + ?Sized>(_visitor: &mut V, _i: UnOp) -> UnOp {
-    match _i {
-        UnOp::Deref(_binding_0, ) => {
-            UnOp::Deref (
-                Token ! [ * ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        UnOp::Not(_binding_0, ) => {
-            UnOp::Not (
-                Token ! [ ! ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-        UnOp::Neg(_binding_0, ) => {
-            UnOp::Neg (
-                Token ! [ - ](tokens_helper(_visitor, &(_binding_0).0)),
-            )
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_use_glob<V: Fold + ?Sized>(_visitor: &mut V, _i: UseGlob) -> UseGlob {
-    UseGlob {
-        star_token: Token ! [ * ](tokens_helper(_visitor, &(_i . star_token).0)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_use_group<V: Fold + ?Sized>(_visitor: &mut V, _i: UseGroup) -> UseGroup {
-    UseGroup {
-        brace_token: Brace(tokens_helper(_visitor, &(_i . brace_token).0)),
-        items: FoldHelper::lift(_i . items, |it| { _visitor.fold_use_tree(it) }),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_use_name<V: Fold + ?Sized>(_visitor: &mut V, _i: UseName) -> UseName {
-    UseName {
-        ident: _visitor.fold_ident(_i . ident),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_use_path<V: Fold + ?Sized>(_visitor: &mut V, _i: UsePath) -> UsePath {
-    UsePath {
-        ident: _visitor.fold_ident(_i . ident),
-        colon2_token: Token ! [ :: ](tokens_helper(_visitor, &(_i . colon2_token).0)),
-        tree: Box::new(_visitor.fold_use_tree(* _i . tree)),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_use_rename<V: Fold + ?Sized>(_visitor: &mut V, _i: UseRename) -> UseRename {
-    UseRename {
-        ident: _visitor.fold_ident(_i . ident),
-        as_token: Token ! [ as ](tokens_helper(_visitor, &(_i . as_token).0)),
-        rename: _visitor.fold_ident(_i . rename),
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn fold_use_tree<V: Fold + ?Sized>(_visitor: &mut V, _i: UseTree) -> UseTree {
-    match _i {
-        UseTree::Path(_binding_0, ) => {
-            UseTree::Path (
-                _visitor.fold_use_path(_binding_0),
-            )
-        }
-        UseTree::Name(_binding_0, ) => {
-            UseTree::Name (
-                _visitor.fold_use_name(_binding_0),
-            )
-        }
-        UseTree::Rename(_binding_0, ) => {
-            UseTree::Rename (
-                _visitor.fold_use_rename(_binding_0),
-            )
-        }
-        UseTree::Glob(_binding_0, ) => {
-            UseTree::Glob (
-                _visitor.fold_use_glob(_binding_0),
-            )
-        }
-        UseTree::Group(_binding_0, ) => {
-            UseTree::Group (
-                _visitor.fold_use_group(_binding_0),
-            )
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_variant<V: Fold + ?Sized>(_visitor: &mut V, _i: Variant) -> Variant {
-    Variant {
-        attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
-        ident: _visitor.fold_ident(_i . ident),
-        fields: _visitor.fold_fields(_i . fields),
-        discriminant: (_i . discriminant).map(|it| { (
-            Token ! [ = ](tokens_helper(_visitor, &(( it ) . 0).0)),
-            _visitor.fold_expr(( it ) . 1),
-        ) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_vis_crate<V: Fold + ?Sized>(_visitor: &mut V, _i: VisCrate) -> VisCrate {
-    VisCrate {
-        crate_token: Token ! [ crate ](tokens_helper(_visitor, &(_i . crate_token).0)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_vis_public<V: Fold + ?Sized>(_visitor: &mut V, _i: VisPublic) -> VisPublic {
-    VisPublic {
-        pub_token: Token ! [ pub ](tokens_helper(_visitor, &(_i . pub_token).0)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_vis_restricted<V: Fold + ?Sized>(_visitor: &mut V, _i: VisRestricted) -> VisRestricted {
-    VisRestricted {
-        pub_token: Token ! [ pub ](tokens_helper(_visitor, &(_i . pub_token).0)),
-        paren_token: Paren(tokens_helper(_visitor, &(_i . paren_token).0)),
-        in_token: (_i . in_token).map(|it| { Token ! [ in ](tokens_helper(_visitor, &(it).0)) }),
-        path: Box::new(_visitor.fold_path(* _i . path)),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_visibility<V: Fold + ?Sized>(_visitor: &mut V, _i: Visibility) -> Visibility {
-    match _i {
-        Visibility::Public(_binding_0, ) => {
-            Visibility::Public (
-                _visitor.fold_vis_public(_binding_0),
-            )
-        }
-        Visibility::Crate(_binding_0, ) => {
-            Visibility::Crate (
-                _visitor.fold_vis_crate(_binding_0),
-            )
-        }
-        Visibility::Restricted(_binding_0, ) => {
-            Visibility::Restricted (
-                _visitor.fold_vis_restricted(_binding_0),
-            )
-        }
-        Visibility::Inherited => { Visibility::Inherited }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_where_clause<V: Fold + ?Sized>(_visitor: &mut V, _i: WhereClause) -> WhereClause {
-    WhereClause {
-        where_token: Token ! [ where ](tokens_helper(_visitor, &(_i . where_token).0)),
-        predicates: FoldHelper::lift(_i . predicates, |it| { _visitor.fold_where_predicate(it) }),
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn fold_where_predicate<V: Fold + ?Sized>(_visitor: &mut V, _i: WherePredicate) -> WherePredicate {
-    match _i {
-        WherePredicate::Type(_binding_0, ) => {
-            WherePredicate::Type (
-                _visitor.fold_predicate_type(_binding_0),
-            )
-        }
-        WherePredicate::Lifetime(_binding_0, ) => {
-            WherePredicate::Lifetime (
-                _visitor.fold_predicate_lifetime(_binding_0),
-            )
-        }
-        WherePredicate::Eq(_binding_0, ) => {
-            WherePredicate::Eq (
-                _visitor.fold_predicate_eq(_binding_0),
-            )
-        }
-    }
-}
-
diff --git a/third_party/rust/syn-0.13.1/src/gen/visit.rs b/third_party/rust/syn-0.13.1/src/gen/visit.rs
deleted file mode 100644
index 6a38d1d717d5..000000000000
--- a/third_party/rust/syn-0.13.1/src/gen/visit.rs
+++ /dev/null
@@ -1,2287 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
-#![cfg_attr(feature = "cargo-clippy", allow(match_same_arms))]
-
-use *;
-#[cfg(any(feature = "full", feature = "derive"))]
-use punctuated::Punctuated;
-use proc_macro2::Span;
-#[cfg(any(feature = "full", feature = "derive"))]
-use gen::helper::visit::*;
-
-
-#[cfg(feature = "full")]
-macro_rules! full {
-    ($e:expr) => { $e }
-}
-
-#[cfg(all(feature = "derive", not(feature = "full")))]
-macro_rules! full {
-    ($e:expr) => { unreachable!() }
-}
-
-
-/// Syntax tree traversal to walk a shared borrow of a syntax tree.
-///
-/// See the [module documentation] for details.
-///
-/// [module documentation]: index.html
-///
-/// *This trait is available if Syn is built with the `"visit"` feature.*
-pub trait Visit<'ast> {
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_abi(&mut self, i: &'ast Abi) { visit_abi(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_angle_bracketed_generic_arguments(&mut self, i: &'ast AngleBracketedGenericArguments) { visit_angle_bracketed_generic_arguments(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_arg_captured(&mut self, i: &'ast ArgCaptured) { visit_arg_captured(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_arg_self(&mut self, i: &'ast ArgSelf) { visit_arg_self(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_arg_self_ref(&mut self, i: &'ast ArgSelfRef) { visit_arg_self_ref(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_arm(&mut self, i: &'ast Arm) { visit_arm(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_attr_style(&mut self, i: &'ast AttrStyle) { visit_attr_style(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_attribute(&mut self, i: &'ast Attribute) { visit_attribute(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_bare_fn_arg(&mut self, i: &'ast BareFnArg) { visit_bare_fn_arg(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_bare_fn_arg_name(&mut self, i: &'ast BareFnArgName) { visit_bare_fn_arg_name(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_bin_op(&mut self, i: &'ast BinOp) { visit_bin_op(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_binding(&mut self, i: &'ast Binding) { visit_binding(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_block(&mut self, i: &'ast Block) { visit_block(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_bound_lifetimes(&mut self, i: &'ast BoundLifetimes) { visit_bound_lifetimes(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_const_param(&mut self, i: &'ast ConstParam) { visit_const_param(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn visit_data(&mut self, i: &'ast Data) { visit_data(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn visit_data_enum(&mut self, i: &'ast DataEnum) { visit_data_enum(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn visit_data_struct(&mut self, i: &'ast DataStruct) { visit_data_struct(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn visit_data_union(&mut self, i: &'ast DataUnion) { visit_data_union(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn visit_derive_input(&mut self, i: &'ast DeriveInput) { visit_derive_input(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr(&mut self, i: &'ast Expr) { visit_expr(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_array(&mut self, i: &'ast ExprArray) { visit_expr_array(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_assign(&mut self, i: &'ast ExprAssign) { visit_expr_assign(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_assign_op(&mut self, i: &'ast ExprAssignOp) { visit_expr_assign_op(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_binary(&mut self, i: &'ast ExprBinary) { visit_expr_binary(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_block(&mut self, i: &'ast ExprBlock) { visit_expr_block(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_box(&mut self, i: &'ast ExprBox) { visit_expr_box(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_break(&mut self, i: &'ast ExprBreak) { visit_expr_break(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_call(&mut self, i: &'ast ExprCall) { visit_expr_call(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_cast(&mut self, i: &'ast ExprCast) { visit_expr_cast(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_catch(&mut self, i: &'ast ExprCatch) { visit_expr_catch(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_closure(&mut self, i: &'ast ExprClosure) { visit_expr_closure(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_continue(&mut self, i: &'ast ExprContinue) { visit_expr_continue(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_field(&mut self, i: &'ast ExprField) { visit_expr_field(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_for_loop(&mut self, i: &'ast ExprForLoop) { visit_expr_for_loop(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_group(&mut self, i: &'ast ExprGroup) { visit_expr_group(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_if(&mut self, i: &'ast ExprIf) { visit_expr_if(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_if_let(&mut self, i: &'ast ExprIfLet) { visit_expr_if_let(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_in_place(&mut self, i: &'ast ExprInPlace) { visit_expr_in_place(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_index(&mut self, i: &'ast ExprIndex) { visit_expr_index(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_lit(&mut self, i: &'ast ExprLit) { visit_expr_lit(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_loop(&mut self, i: &'ast ExprLoop) { visit_expr_loop(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_macro(&mut self, i: &'ast ExprMacro) { visit_expr_macro(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_match(&mut self, i: &'ast ExprMatch) { visit_expr_match(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_method_call(&mut self, i: &'ast ExprMethodCall) { visit_expr_method_call(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_paren(&mut self, i: &'ast ExprParen) { visit_expr_paren(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_path(&mut self, i: &'ast ExprPath) { visit_expr_path(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_range(&mut self, i: &'ast ExprRange) { visit_expr_range(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_reference(&mut self, i: &'ast ExprReference) { visit_expr_reference(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_repeat(&mut self, i: &'ast ExprRepeat) { visit_expr_repeat(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_return(&mut self, i: &'ast ExprReturn) { visit_expr_return(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_struct(&mut self, i: &'ast ExprStruct) { visit_expr_struct(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_try(&mut self, i: &'ast ExprTry) { visit_expr_try(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_tuple(&mut self, i: &'ast ExprTuple) { visit_expr_tuple(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_type(&mut self, i: &'ast ExprType) { visit_expr_type(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_unary(&mut self, i: &'ast ExprUnary) { visit_expr_unary(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_unsafe(&mut self, i: &'ast ExprUnsafe) { visit_expr_unsafe(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_verbatim(&mut self, i: &'ast ExprVerbatim) { visit_expr_verbatim(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_while(&mut self, i: &'ast ExprWhile) { visit_expr_while(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_while_let(&mut self, i: &'ast ExprWhileLet) { visit_expr_while_let(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_yield(&mut self, i: &'ast ExprYield) { visit_expr_yield(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_field(&mut self, i: &'ast Field) { visit_field(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_field_pat(&mut self, i: &'ast FieldPat) { visit_field_pat(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_field_value(&mut self, i: &'ast FieldValue) { visit_field_value(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_fields(&mut self, i: &'ast Fields) { visit_fields(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_fields_named(&mut self, i: &'ast FieldsNamed) { visit_fields_named(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_fields_unnamed(&mut self, i: &'ast FieldsUnnamed) { visit_fields_unnamed(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_file(&mut self, i: &'ast File) { visit_file(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_fn_arg(&mut self, i: &'ast FnArg) { visit_fn_arg(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_fn_decl(&mut self, i: &'ast FnDecl) { visit_fn_decl(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_foreign_item(&mut self, i: &'ast ForeignItem) { visit_foreign_item(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_foreign_item_fn(&mut self, i: &'ast ForeignItemFn) { visit_foreign_item_fn(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_foreign_item_static(&mut self, i: &'ast ForeignItemStatic) { visit_foreign_item_static(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_foreign_item_type(&mut self, i: &'ast ForeignItemType) { visit_foreign_item_type(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_foreign_item_verbatim(&mut self, i: &'ast ForeignItemVerbatim) { visit_foreign_item_verbatim(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_generic_argument(&mut self, i: &'ast GenericArgument) { visit_generic_argument(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_generic_method_argument(&mut self, i: &'ast GenericMethodArgument) { visit_generic_method_argument(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_generic_param(&mut self, i: &'ast GenericParam) { visit_generic_param(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_generics(&mut self, i: &'ast Generics) { visit_generics(self, i) }
-
-fn visit_ident(&mut self, i: &'ast Ident) { visit_ident(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_impl_item(&mut self, i: &'ast ImplItem) { visit_impl_item(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_impl_item_const(&mut self, i: &'ast ImplItemConst) { visit_impl_item_const(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_impl_item_macro(&mut self, i: &'ast ImplItemMacro) { visit_impl_item_macro(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_impl_item_method(&mut self, i: &'ast ImplItemMethod) { visit_impl_item_method(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_impl_item_type(&mut self, i: &'ast ImplItemType) { visit_impl_item_type(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_impl_item_verbatim(&mut self, i: &'ast ImplItemVerbatim) { visit_impl_item_verbatim(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_index(&mut self, i: &'ast Index) { visit_index(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item(&mut self, i: &'ast Item) { visit_item(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_const(&mut self, i: &'ast ItemConst) { visit_item_const(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_enum(&mut self, i: &'ast ItemEnum) { visit_item_enum(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_extern_crate(&mut self, i: &'ast ItemExternCrate) { visit_item_extern_crate(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_fn(&mut self, i: &'ast ItemFn) { visit_item_fn(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_foreign_mod(&mut self, i: &'ast ItemForeignMod) { visit_item_foreign_mod(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_impl(&mut self, i: &'ast ItemImpl) { visit_item_impl(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_macro(&mut self, i: &'ast ItemMacro) { visit_item_macro(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_macro2(&mut self, i: &'ast ItemMacro2) { visit_item_macro2(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_mod(&mut self, i: &'ast ItemMod) { visit_item_mod(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_static(&mut self, i: &'ast ItemStatic) { visit_item_static(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_struct(&mut self, i: &'ast ItemStruct) { visit_item_struct(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_trait(&mut self, i: &'ast ItemTrait) { visit_item_trait(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_type(&mut self, i: &'ast ItemType) { visit_item_type(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_union(&mut self, i: &'ast ItemUnion) { visit_item_union(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_use(&mut self, i: &'ast ItemUse) { visit_item_use(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_verbatim(&mut self, i: &'ast ItemVerbatim) { visit_item_verbatim(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_label(&mut self, i: &'ast Label) { visit_label(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lifetime(&mut self, i: &'ast Lifetime) { visit_lifetime(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lifetime_def(&mut self, i: &'ast LifetimeDef) { visit_lifetime_def(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit(&mut self, i: &'ast Lit) { visit_lit(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_bool(&mut self, i: &'ast LitBool) { visit_lit_bool(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_byte(&mut self, i: &'ast LitByte) { visit_lit_byte(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_byte_str(&mut self, i: &'ast LitByteStr) { visit_lit_byte_str(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_char(&mut self, i: &'ast LitChar) { visit_lit_char(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_float(&mut self, i: &'ast LitFloat) { visit_lit_float(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_int(&mut self, i: &'ast LitInt) { visit_lit_int(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_str(&mut self, i: &'ast LitStr) { visit_lit_str(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_verbatim(&mut self, i: &'ast LitVerbatim) { visit_lit_verbatim(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_local(&mut self, i: &'ast Local) { visit_local(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_macro(&mut self, i: &'ast Macro) { visit_macro(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_macro_delimiter(&mut self, i: &'ast MacroDelimiter) { visit_macro_delimiter(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_member(&mut self, i: &'ast Member) { visit_member(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_meta(&mut self, i: &'ast Meta) { visit_meta(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_meta_list(&mut self, i: &'ast MetaList) { visit_meta_list(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_meta_name_value(&mut self, i: &'ast MetaNameValue) { visit_meta_name_value(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_method_sig(&mut self, i: &'ast MethodSig) { visit_method_sig(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_method_turbofish(&mut self, i: &'ast MethodTurbofish) { visit_method_turbofish(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_nested_meta(&mut self, i: &'ast NestedMeta) { visit_nested_meta(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_parenthesized_generic_arguments(&mut self, i: &'ast ParenthesizedGenericArguments) { visit_parenthesized_generic_arguments(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat(&mut self, i: &'ast Pat) { visit_pat(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_box(&mut self, i: &'ast PatBox) { visit_pat_box(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_ident(&mut self, i: &'ast PatIdent) { visit_pat_ident(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_lit(&mut self, i: &'ast PatLit) { visit_pat_lit(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_macro(&mut self, i: &'ast PatMacro) { visit_pat_macro(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_path(&mut self, i: &'ast PatPath) { visit_pat_path(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_range(&mut self, i: &'ast PatRange) { visit_pat_range(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_ref(&mut self, i: &'ast PatRef) { visit_pat_ref(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_slice(&mut self, i: &'ast PatSlice) { visit_pat_slice(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_struct(&mut self, i: &'ast PatStruct) { visit_pat_struct(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_tuple(&mut self, i: &'ast PatTuple) { visit_pat_tuple(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_tuple_struct(&mut self, i: &'ast PatTupleStruct) { visit_pat_tuple_struct(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_verbatim(&mut self, i: &'ast PatVerbatim) { visit_pat_verbatim(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_wild(&mut self, i: &'ast PatWild) { visit_pat_wild(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_path(&mut self, i: &'ast Path) { visit_path(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_path_arguments(&mut self, i: &'ast PathArguments) { visit_path_arguments(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_path_segment(&mut self, i: &'ast PathSegment) { visit_path_segment(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_predicate_eq(&mut self, i: &'ast PredicateEq) { visit_predicate_eq(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_predicate_lifetime(&mut self, i: &'ast PredicateLifetime) { visit_predicate_lifetime(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_predicate_type(&mut self, i: &'ast PredicateType) { visit_predicate_type(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_qself(&mut self, i: &'ast QSelf) { visit_qself(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_range_limits(&mut self, i: &'ast RangeLimits) { visit_range_limits(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_return_type(&mut self, i: &'ast ReturnType) { visit_return_type(self, i) }
-
-fn visit_span(&mut self, i: &'ast Span) { visit_span(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_stmt(&mut self, i: &'ast Stmt) { visit_stmt(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_trait_bound(&mut self, i: &'ast TraitBound) { visit_trait_bound(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_trait_bound_modifier(&mut self, i: &'ast TraitBoundModifier) { visit_trait_bound_modifier(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_trait_item(&mut self, i: &'ast TraitItem) { visit_trait_item(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_trait_item_const(&mut self, i: &'ast TraitItemConst) { visit_trait_item_const(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_trait_item_macro(&mut self, i: &'ast TraitItemMacro) { visit_trait_item_macro(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_trait_item_method(&mut self, i: &'ast TraitItemMethod) { visit_trait_item_method(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_trait_item_type(&mut self, i: &'ast TraitItemType) { visit_trait_item_type(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_trait_item_verbatim(&mut self, i: &'ast TraitItemVerbatim) { visit_trait_item_verbatim(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type(&mut self, i: &'ast Type) { visit_type(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_array(&mut self, i: &'ast TypeArray) { visit_type_array(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_bare_fn(&mut self, i: &'ast TypeBareFn) { visit_type_bare_fn(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_group(&mut self, i: &'ast TypeGroup) { visit_type_group(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_impl_trait(&mut self, i: &'ast TypeImplTrait) { visit_type_impl_trait(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_infer(&mut self, i: &'ast TypeInfer) { visit_type_infer(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_macro(&mut self, i: &'ast TypeMacro) { visit_type_macro(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_never(&mut self, i: &'ast TypeNever) { visit_type_never(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_param(&mut self, i: &'ast TypeParam) { visit_type_param(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_param_bound(&mut self, i: &'ast TypeParamBound) { visit_type_param_bound(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_paren(&mut self, i: &'ast TypeParen) { visit_type_paren(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_path(&mut self, i: &'ast TypePath) { visit_type_path(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_ptr(&mut self, i: &'ast TypePtr) { visit_type_ptr(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_reference(&mut self, i: &'ast TypeReference) { visit_type_reference(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_slice(&mut self, i: &'ast TypeSlice) { visit_type_slice(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_trait_object(&mut self, i: &'ast TypeTraitObject) { visit_type_trait_object(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_tuple(&mut self, i: &'ast TypeTuple) { visit_type_tuple(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_verbatim(&mut self, i: &'ast TypeVerbatim) { visit_type_verbatim(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_un_op(&mut self, i: &'ast UnOp) { visit_un_op(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_use_glob(&mut self, i: &'ast UseGlob) { visit_use_glob(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_use_group(&mut self, i: &'ast UseGroup) { visit_use_group(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_use_name(&mut self, i: &'ast UseName) { visit_use_name(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_use_path(&mut self, i: &'ast UsePath) { visit_use_path(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_use_rename(&mut self, i: &'ast UseRename) { visit_use_rename(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_use_tree(&mut self, i: &'ast UseTree) { visit_use_tree(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_variant(&mut self, i: &'ast Variant) { visit_variant(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_vis_crate(&mut self, i: &'ast VisCrate) { visit_vis_crate(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_vis_public(&mut self, i: &'ast VisPublic) { visit_vis_public(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_vis_restricted(&mut self, i: &'ast VisRestricted) { visit_vis_restricted(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_visibility(&mut self, i: &'ast Visibility) { visit_visibility(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_where_clause(&mut self, i: &'ast WhereClause) { visit_where_clause(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_where_predicate(&mut self, i: &'ast WherePredicate) { visit_where_predicate(self, i) }
-
-}
-
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_abi<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Abi) {
-    tokens_helper(_visitor, &(& _i . extern_token).0);
-    if let Some(ref it) = _i . name { _visitor.visit_lit_str(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_angle_bracketed_generic_arguments<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast AngleBracketedGenericArguments) {
-    if let Some(ref it) = _i . colon2_token { tokens_helper(_visitor, &(it).0) };
-    tokens_helper(_visitor, &(& _i . lt_token).0);
-    for el in Punctuated::pairs(& _i . args) { let it = el.value(); _visitor.visit_generic_argument(it) };
-    tokens_helper(_visitor, &(& _i . gt_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_arg_captured<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ArgCaptured) {
-    _visitor.visit_pat(& _i . pat);
-    tokens_helper(_visitor, &(& _i . colon_token).0);
-    _visitor.visit_type(& _i . ty);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_arg_self<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ArgSelf) {
-    if let Some(ref it) = _i . mutability { tokens_helper(_visitor, &(it).0) };
-    tokens_helper(_visitor, &(& _i . self_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_arg_self_ref<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ArgSelfRef) {
-    tokens_helper(_visitor, &(& _i . and_token).0);
-    if let Some(ref it) = _i . lifetime { _visitor.visit_lifetime(it) };
-    if let Some(ref it) = _i . mutability { tokens_helper(_visitor, &(it).0) };
-    tokens_helper(_visitor, &(& _i . self_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_arm<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Arm) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    if let Some(ref it) = _i . leading_vert { tokens_helper(_visitor, &(it).0) };
-    for el in Punctuated::pairs(& _i . pats) { let it = el.value(); _visitor.visit_pat(it) };
-    if let Some(ref it) = _i . guard { 
-            tokens_helper(_visitor, &(& ( it ) . 0).0);
-            _visitor.visit_expr(& * ( it ) . 1);
-         };
-    tokens_helper(_visitor, &(& _i . fat_arrow_token).0);
-    _visitor.visit_expr(& * _i . body);
-    if let Some(ref it) = _i . comma { tokens_helper(_visitor, &(it).0) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_attr_style<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast AttrStyle) {
-    match *_i {
-        AttrStyle::Outer => { }
-        AttrStyle::Inner(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_attribute<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Attribute) {
-    tokens_helper(_visitor, &(& _i . pound_token).0);
-    _visitor.visit_attr_style(& _i . style);
-    tokens_helper(_visitor, &(& _i . bracket_token).0);
-    _visitor.visit_path(& _i . path);
-    // Skipped field _i . tts;
-    // Skipped field _i . is_sugared_doc;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_bare_fn_arg<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast BareFnArg) {
-    if let Some(ref it) = _i . name { 
-            _visitor.visit_bare_fn_arg_name(& ( it ) . 0);
-            tokens_helper(_visitor, &(& ( it ) . 1).0);
-         };
-    _visitor.visit_type(& _i . ty);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_bare_fn_arg_name<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast BareFnArgName) {
-    match *_i {
-        BareFnArgName::Named(ref _binding_0, ) => {
-            _visitor.visit_ident(_binding_0);
-        }
-        BareFnArgName::Wild(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_bin_op<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast BinOp) {
-    match *_i {
-        BinOp::Add(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Sub(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Mul(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Div(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Rem(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::And(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Or(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::BitXor(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::BitAnd(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::BitOr(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Shl(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Shr(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Eq(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Lt(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Le(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Ne(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Ge(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Gt(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::AddEq(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::SubEq(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::MulEq(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::DivEq(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::RemEq(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::BitXorEq(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::BitAndEq(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::BitOrEq(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::ShlEq(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::ShrEq(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_binding<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Binding) {
-    _visitor.visit_ident(& _i . ident);
-    tokens_helper(_visitor, &(& _i . eq_token).0);
-    _visitor.visit_type(& _i . ty);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_block<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Block) {
-    tokens_helper(_visitor, &(& _i . brace_token).0);
-    for it in & _i . stmts { _visitor.visit_stmt(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_bound_lifetimes<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast BoundLifetimes) {
-    tokens_helper(_visitor, &(& _i . for_token).0);
-    tokens_helper(_visitor, &(& _i . lt_token).0);
-    for el in Punctuated::pairs(& _i . lifetimes) { let it = el.value(); _visitor.visit_lifetime_def(it) };
-    tokens_helper(_visitor, &(& _i . gt_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_const_param<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ConstParam) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . const_token).0);
-    _visitor.visit_ident(& _i . ident);
-    tokens_helper(_visitor, &(& _i . colon_token).0);
-    _visitor.visit_type(& _i . ty);
-    if let Some(ref it) = _i . eq_token { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . default { _visitor.visit_expr(it) };
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn visit_data<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Data) {
-    match *_i {
-        Data::Struct(ref _binding_0, ) => {
-            _visitor.visit_data_struct(_binding_0);
-        }
-        Data::Enum(ref _binding_0, ) => {
-            _visitor.visit_data_enum(_binding_0);
-        }
-        Data::Union(ref _binding_0, ) => {
-            _visitor.visit_data_union(_binding_0);
-        }
-    }
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn visit_data_enum<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast DataEnum) {
-    tokens_helper(_visitor, &(& _i . enum_token).0);
-    tokens_helper(_visitor, &(& _i . brace_token).0);
-    for el in Punctuated::pairs(& _i . variants) { let it = el.value(); _visitor.visit_variant(it) };
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn visit_data_struct<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast DataStruct) {
-    tokens_helper(_visitor, &(& _i . struct_token).0);
-    _visitor.visit_fields(& _i . fields);
-    if let Some(ref it) = _i . semi_token { tokens_helper(_visitor, &(it).0) };
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn visit_data_union<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast DataUnion) {
-    tokens_helper(_visitor, &(& _i . union_token).0);
-    _visitor.visit_fields_named(& _i . fields);
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn visit_derive_input<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast DeriveInput) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    _visitor.visit_ident(& _i . ident);
-    _visitor.visit_generics(& _i . generics);
-    _visitor.visit_data(& _i . data);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Expr) {
-    match *_i {
-        Expr::Box(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_box(_binding_0));
-        }
-        Expr::InPlace(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_in_place(_binding_0));
-        }
-        Expr::Array(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_array(_binding_0));
-        }
-        Expr::Call(ref _binding_0, ) => {
-            _visitor.visit_expr_call(_binding_0);
-        }
-        Expr::MethodCall(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_method_call(_binding_0));
-        }
-        Expr::Tuple(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_tuple(_binding_0));
-        }
-        Expr::Binary(ref _binding_0, ) => {
-            _visitor.visit_expr_binary(_binding_0);
-        }
-        Expr::Unary(ref _binding_0, ) => {
-            _visitor.visit_expr_unary(_binding_0);
-        }
-        Expr::Lit(ref _binding_0, ) => {
-            _visitor.visit_expr_lit(_binding_0);
-        }
-        Expr::Cast(ref _binding_0, ) => {
-            _visitor.visit_expr_cast(_binding_0);
-        }
-        Expr::Type(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_type(_binding_0));
-        }
-        Expr::If(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_if(_binding_0));
-        }
-        Expr::IfLet(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_if_let(_binding_0));
-        }
-        Expr::While(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_while(_binding_0));
-        }
-        Expr::WhileLet(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_while_let(_binding_0));
-        }
-        Expr::ForLoop(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_for_loop(_binding_0));
-        }
-        Expr::Loop(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_loop(_binding_0));
-        }
-        Expr::Match(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_match(_binding_0));
-        }
-        Expr::Closure(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_closure(_binding_0));
-        }
-        Expr::Unsafe(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_unsafe(_binding_0));
-        }
-        Expr::Block(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_block(_binding_0));
-        }
-        Expr::Assign(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_assign(_binding_0));
-        }
-        Expr::AssignOp(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_assign_op(_binding_0));
-        }
-        Expr::Field(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_field(_binding_0));
-        }
-        Expr::Index(ref _binding_0, ) => {
-            _visitor.visit_expr_index(_binding_0);
-        }
-        Expr::Range(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_range(_binding_0));
-        }
-        Expr::Path(ref _binding_0, ) => {
-            _visitor.visit_expr_path(_binding_0);
-        }
-        Expr::Reference(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_reference(_binding_0));
-        }
-        Expr::Break(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_break(_binding_0));
-        }
-        Expr::Continue(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_continue(_binding_0));
-        }
-        Expr::Return(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_return(_binding_0));
-        }
-        Expr::Macro(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_macro(_binding_0));
-        }
-        Expr::Struct(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_struct(_binding_0));
-        }
-        Expr::Repeat(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_repeat(_binding_0));
-        }
-        Expr::Paren(ref _binding_0, ) => {
-            _visitor.visit_expr_paren(_binding_0);
-        }
-        Expr::Group(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_group(_binding_0));
-        }
-        Expr::Try(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_try(_binding_0));
-        }
-        Expr::Catch(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_catch(_binding_0));
-        }
-        Expr::Yield(ref _binding_0, ) => {
-            full!(_visitor.visit_expr_yield(_binding_0));
-        }
-        Expr::Verbatim(ref _binding_0, ) => {
-            _visitor.visit_expr_verbatim(_binding_0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_array<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprArray) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . bracket_token).0);
-    for el in Punctuated::pairs(& _i . elems) { let it = el.value(); _visitor.visit_expr(it) };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_assign<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprAssign) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_expr(& * _i . left);
-    tokens_helper(_visitor, &(& _i . eq_token).0);
-    _visitor.visit_expr(& * _i . right);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_assign_op<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprAssignOp) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_expr(& * _i . left);
-    _visitor.visit_bin_op(& _i . op);
-    _visitor.visit_expr(& * _i . right);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_binary<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprBinary) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_expr(& * _i . left);
-    _visitor.visit_bin_op(& _i . op);
-    _visitor.visit_expr(& * _i . right);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_block<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprBlock) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_block(& _i . block);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_box<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprBox) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . box_token).0);
-    _visitor.visit_expr(& * _i . expr);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_break<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprBreak) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . break_token).0);
-    if let Some(ref it) = _i . label { _visitor.visit_lifetime(it) };
-    if let Some(ref it) = _i . expr { _visitor.visit_expr(& * * it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_call<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprCall) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_expr(& * _i . func);
-    tokens_helper(_visitor, &(& _i . paren_token).0);
-    for el in Punctuated::pairs(& _i . args) { let it = el.value(); _visitor.visit_expr(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_cast<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprCast) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_expr(& * _i . expr);
-    tokens_helper(_visitor, &(& _i . as_token).0);
-    _visitor.visit_type(& * _i . ty);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_catch<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprCatch) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . do_token).0);
-    tokens_helper(_visitor, &(& _i . catch_token).0);
-    _visitor.visit_block(& _i . block);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_closure<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprClosure) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    if let Some(ref it) = _i . movability { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . capture { tokens_helper(_visitor, &(it).0) };
-    tokens_helper(_visitor, &(& _i . or1_token).0);
-    for el in Punctuated::pairs(& _i . inputs) { let it = el.value(); _visitor.visit_fn_arg(it) };
-    tokens_helper(_visitor, &(& _i . or2_token).0);
-    _visitor.visit_return_type(& _i . output);
-    _visitor.visit_expr(& * _i . body);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_continue<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprContinue) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . continue_token).0);
-    if let Some(ref it) = _i . label { _visitor.visit_lifetime(it) };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_field<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprField) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_expr(& * _i . base);
-    tokens_helper(_visitor, &(& _i . dot_token).0);
-    _visitor.visit_member(& _i . member);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_for_loop<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprForLoop) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    if let Some(ref it) = _i . label { _visitor.visit_label(it) };
-    tokens_helper(_visitor, &(& _i . for_token).0);
-    _visitor.visit_pat(& * _i . pat);
-    tokens_helper(_visitor, &(& _i . in_token).0);
-    _visitor.visit_expr(& * _i . expr);
-    _visitor.visit_block(& _i . body);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_group<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprGroup) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . group_token).0);
-    _visitor.visit_expr(& * _i . expr);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_if<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprIf) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . if_token).0);
-    _visitor.visit_expr(& * _i . cond);
-    _visitor.visit_block(& _i . then_branch);
-    if let Some(ref it) = _i . else_branch { 
-            tokens_helper(_visitor, &(& ( it ) . 0).0);
-            _visitor.visit_expr(& * ( it ) . 1);
-         };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_if_let<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprIfLet) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . if_token).0);
-    tokens_helper(_visitor, &(& _i . let_token).0);
-    for el in Punctuated::pairs(& _i . pats) { let it = el.value(); _visitor.visit_pat(it) };
-    tokens_helper(_visitor, &(& _i . eq_token).0);
-    _visitor.visit_expr(& * _i . expr);
-    _visitor.visit_block(& _i . then_branch);
-    if let Some(ref it) = _i . else_branch { 
-            tokens_helper(_visitor, &(& ( it ) . 0).0);
-            _visitor.visit_expr(& * ( it ) . 1);
-         };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_in_place<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprInPlace) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_expr(& * _i . place);
-    tokens_helper(_visitor, &(& _i . arrow_token).0);
-    _visitor.visit_expr(& * _i . value);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_index<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprIndex) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_expr(& * _i . expr);
-    tokens_helper(_visitor, &(& _i . bracket_token).0);
-    _visitor.visit_expr(& * _i . index);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_lit<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprLit) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_lit(& _i . lit);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_loop<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprLoop) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    if let Some(ref it) = _i . label { _visitor.visit_label(it) };
-    tokens_helper(_visitor, &(& _i . loop_token).0);
-    _visitor.visit_block(& _i . body);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_macro<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprMacro) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_macro(& _i . mac);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_match<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprMatch) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . match_token).0);
-    _visitor.visit_expr(& * _i . expr);
-    tokens_helper(_visitor, &(& _i . brace_token).0);
-    for it in & _i . arms { _visitor.visit_arm(it) };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_method_call<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprMethodCall) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_expr(& * _i . receiver);
-    tokens_helper(_visitor, &(& _i . dot_token).0);
-    _visitor.visit_ident(& _i . method);
-    if let Some(ref it) = _i . turbofish { _visitor.visit_method_turbofish(it) };
-    tokens_helper(_visitor, &(& _i . paren_token).0);
-    for el in Punctuated::pairs(& _i . args) { let it = el.value(); _visitor.visit_expr(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_paren<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprParen) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . paren_token).0);
-    _visitor.visit_expr(& * _i . expr);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_path<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprPath) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    if let Some(ref it) = _i . qself { _visitor.visit_qself(it) };
-    _visitor.visit_path(& _i . path);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_range<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprRange) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    if let Some(ref it) = _i . from { _visitor.visit_expr(& * * it) };
-    _visitor.visit_range_limits(& _i . limits);
-    if let Some(ref it) = _i . to { _visitor.visit_expr(& * * it) };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_reference<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprReference) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . and_token).0);
-    if let Some(ref it) = _i . mutability { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_expr(& * _i . expr);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_repeat<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprRepeat) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . bracket_token).0);
-    _visitor.visit_expr(& * _i . expr);
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-    _visitor.visit_expr(& * _i . len);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_return<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprReturn) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . return_token).0);
-    if let Some(ref it) = _i . expr { _visitor.visit_expr(& * * it) };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_struct<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprStruct) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_path(& _i . path);
-    tokens_helper(_visitor, &(& _i . brace_token).0);
-    for el in Punctuated::pairs(& _i . fields) { let it = el.value(); _visitor.visit_field_value(it) };
-    if let Some(ref it) = _i . dot2_token { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . rest { _visitor.visit_expr(& * * it) };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_try<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprTry) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_expr(& * _i . expr);
-    tokens_helper(_visitor, &(& _i . question_token).0);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_tuple<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprTuple) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . paren_token).0);
-    for el in Punctuated::pairs(& _i . elems) { let it = el.value(); _visitor.visit_expr(it) };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_type<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprType) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_expr(& * _i . expr);
-    tokens_helper(_visitor, &(& _i . colon_token).0);
-    _visitor.visit_type(& * _i . ty);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_unary<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprUnary) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_un_op(& _i . op);
-    _visitor.visit_expr(& * _i . expr);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_unsafe<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprUnsafe) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . unsafe_token).0);
-    _visitor.visit_block(& _i . block);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_verbatim<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprVerbatim) {
-    // Skipped field _i . tts;
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_while<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprWhile) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    if let Some(ref it) = _i . label { _visitor.visit_label(it) };
-    tokens_helper(_visitor, &(& _i . while_token).0);
-    _visitor.visit_expr(& * _i . cond);
-    _visitor.visit_block(& _i . body);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_while_let<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprWhileLet) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    if let Some(ref it) = _i . label { _visitor.visit_label(it) };
-    tokens_helper(_visitor, &(& _i . while_token).0);
-    tokens_helper(_visitor, &(& _i . let_token).0);
-    for el in Punctuated::pairs(& _i . pats) { let it = el.value(); _visitor.visit_pat(it) };
-    tokens_helper(_visitor, &(& _i . eq_token).0);
-    _visitor.visit_expr(& * _i . expr);
-    _visitor.visit_block(& _i . body);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_yield<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprYield) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . yield_token).0);
-    if let Some(ref it) = _i . expr { _visitor.visit_expr(& * * it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_field<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Field) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    if let Some(ref it) = _i . ident { _visitor.visit_ident(it) };
-    if let Some(ref it) = _i . colon_token { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_type(& _i . ty);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_field_pat<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast FieldPat) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_member(& _i . member);
-    if let Some(ref it) = _i . colon_token { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_pat(& * _i . pat);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_field_value<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast FieldValue) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_member(& _i . member);
-    if let Some(ref it) = _i . colon_token { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_expr(& _i . expr);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_fields<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Fields) {
-    match *_i {
-        Fields::Named(ref _binding_0, ) => {
-            _visitor.visit_fields_named(_binding_0);
-        }
-        Fields::Unnamed(ref _binding_0, ) => {
-            _visitor.visit_fields_unnamed(_binding_0);
-        }
-        Fields::Unit => { }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_fields_named<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast FieldsNamed) {
-    tokens_helper(_visitor, &(& _i . brace_token).0);
-    for el in Punctuated::pairs(& _i . named) { let it = el.value(); _visitor.visit_field(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_fields_unnamed<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast FieldsUnnamed) {
-    tokens_helper(_visitor, &(& _i . paren_token).0);
-    for el in Punctuated::pairs(& _i . unnamed) { let it = el.value(); _visitor.visit_field(it) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_file<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast File) {
-    // Skipped field _i . shebang;
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    for it in & _i . items { _visitor.visit_item(it) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_fn_arg<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast FnArg) {
-    match *_i {
-        FnArg::SelfRef(ref _binding_0, ) => {
-            _visitor.visit_arg_self_ref(_binding_0);
-        }
-        FnArg::SelfValue(ref _binding_0, ) => {
-            _visitor.visit_arg_self(_binding_0);
-        }
-        FnArg::Captured(ref _binding_0, ) => {
-            _visitor.visit_arg_captured(_binding_0);
-        }
-        FnArg::Inferred(ref _binding_0, ) => {
-            _visitor.visit_pat(_binding_0);
-        }
-        FnArg::Ignored(ref _binding_0, ) => {
-            _visitor.visit_type(_binding_0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_fn_decl<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast FnDecl) {
-    tokens_helper(_visitor, &(& _i . fn_token).0);
-    _visitor.visit_generics(& _i . generics);
-    tokens_helper(_visitor, &(& _i . paren_token).0);
-    for el in Punctuated::pairs(& _i . inputs) { let it = el.value(); _visitor.visit_fn_arg(it) };
-    if let Some(ref it) = _i . variadic { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_return_type(& _i . output);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_foreign_item<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ForeignItem) {
-    match *_i {
-        ForeignItem::Fn(ref _binding_0, ) => {
-            _visitor.visit_foreign_item_fn(_binding_0);
-        }
-        ForeignItem::Static(ref _binding_0, ) => {
-            _visitor.visit_foreign_item_static(_binding_0);
-        }
-        ForeignItem::Type(ref _binding_0, ) => {
-            _visitor.visit_foreign_item_type(_binding_0);
-        }
-        ForeignItem::Verbatim(ref _binding_0, ) => {
-            _visitor.visit_foreign_item_verbatim(_binding_0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_foreign_item_fn<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ForeignItemFn) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    _visitor.visit_ident(& _i . ident);
-    _visitor.visit_fn_decl(& * _i . decl);
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_foreign_item_static<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ForeignItemStatic) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    tokens_helper(_visitor, &(& _i . static_token).0);
-    if let Some(ref it) = _i . mutability { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_ident(& _i . ident);
-    tokens_helper(_visitor, &(& _i . colon_token).0);
-    _visitor.visit_type(& * _i . ty);
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_foreign_item_type<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ForeignItemType) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    tokens_helper(_visitor, &(& _i . type_token).0);
-    _visitor.visit_ident(& _i . ident);
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_foreign_item_verbatim<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ForeignItemVerbatim) {
-    // Skipped field _i . tts;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_generic_argument<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast GenericArgument) {
-    match *_i {
-        GenericArgument::Lifetime(ref _binding_0, ) => {
-            _visitor.visit_lifetime(_binding_0);
-        }
-        GenericArgument::Type(ref _binding_0, ) => {
-            _visitor.visit_type(_binding_0);
-        }
-        GenericArgument::Binding(ref _binding_0, ) => {
-            _visitor.visit_binding(_binding_0);
-        }
-        GenericArgument::Const(ref _binding_0, ) => {
-            _visitor.visit_expr(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_generic_method_argument<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast GenericMethodArgument) {
-    match *_i {
-        GenericMethodArgument::Type(ref _binding_0, ) => {
-            _visitor.visit_type(_binding_0);
-        }
-        GenericMethodArgument::Const(ref _binding_0, ) => {
-            _visitor.visit_expr(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_generic_param<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast GenericParam) {
-    match *_i {
-        GenericParam::Type(ref _binding_0, ) => {
-            _visitor.visit_type_param(_binding_0);
-        }
-        GenericParam::Lifetime(ref _binding_0, ) => {
-            _visitor.visit_lifetime_def(_binding_0);
-        }
-        GenericParam::Const(ref _binding_0, ) => {
-            _visitor.visit_const_param(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_generics<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Generics) {
-    if let Some(ref it) = _i . lt_token { tokens_helper(_visitor, &(it).0) };
-    for el in Punctuated::pairs(& _i . params) { let it = el.value(); _visitor.visit_generic_param(it) };
-    if let Some(ref it) = _i . gt_token { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . where_clause { _visitor.visit_where_clause(it) };
-}
-
-pub fn visit_ident<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Ident) {
-    // Skipped field _i . term;
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_impl_item<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ImplItem) {
-    match *_i {
-        ImplItem::Const(ref _binding_0, ) => {
-            _visitor.visit_impl_item_const(_binding_0);
-        }
-        ImplItem::Method(ref _binding_0, ) => {
-            _visitor.visit_impl_item_method(_binding_0);
-        }
-        ImplItem::Type(ref _binding_0, ) => {
-            _visitor.visit_impl_item_type(_binding_0);
-        }
-        ImplItem::Macro(ref _binding_0, ) => {
-            _visitor.visit_impl_item_macro(_binding_0);
-        }
-        ImplItem::Verbatim(ref _binding_0, ) => {
-            _visitor.visit_impl_item_verbatim(_binding_0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_impl_item_const<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ImplItemConst) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    if let Some(ref it) = _i . defaultness { tokens_helper(_visitor, &(it).0) };
-    tokens_helper(_visitor, &(& _i . const_token).0);
-    _visitor.visit_ident(& _i . ident);
-    tokens_helper(_visitor, &(& _i . colon_token).0);
-    _visitor.visit_type(& _i . ty);
-    tokens_helper(_visitor, &(& _i . eq_token).0);
-    _visitor.visit_expr(& _i . expr);
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_impl_item_macro<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ImplItemMacro) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_macro(& _i . mac);
-    if let Some(ref it) = _i . semi_token { tokens_helper(_visitor, &(it).0) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_impl_item_method<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ImplItemMethod) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    if let Some(ref it) = _i . defaultness { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_method_sig(& _i . sig);
-    _visitor.visit_block(& _i . block);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_impl_item_type<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ImplItemType) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    if let Some(ref it) = _i . defaultness { tokens_helper(_visitor, &(it).0) };
-    tokens_helper(_visitor, &(& _i . type_token).0);
-    _visitor.visit_ident(& _i . ident);
-    _visitor.visit_generics(& _i . generics);
-    tokens_helper(_visitor, &(& _i . eq_token).0);
-    _visitor.visit_type(& _i . ty);
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_impl_item_verbatim<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ImplItemVerbatim) {
-    // Skipped field _i . tts;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_index<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Index) {
-    // Skipped field _i . index;
-    _visitor.visit_span(& _i . span);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Item) {
-    match *_i {
-        Item::ExternCrate(ref _binding_0, ) => {
-            _visitor.visit_item_extern_crate(_binding_0);
-        }
-        Item::Use(ref _binding_0, ) => {
-            _visitor.visit_item_use(_binding_0);
-        }
-        Item::Static(ref _binding_0, ) => {
-            _visitor.visit_item_static(_binding_0);
-        }
-        Item::Const(ref _binding_0, ) => {
-            _visitor.visit_item_const(_binding_0);
-        }
-        Item::Fn(ref _binding_0, ) => {
-            _visitor.visit_item_fn(_binding_0);
-        }
-        Item::Mod(ref _binding_0, ) => {
-            _visitor.visit_item_mod(_binding_0);
-        }
-        Item::ForeignMod(ref _binding_0, ) => {
-            _visitor.visit_item_foreign_mod(_binding_0);
-        }
-        Item::Type(ref _binding_0, ) => {
-            _visitor.visit_item_type(_binding_0);
-        }
-        Item::Struct(ref _binding_0, ) => {
-            _visitor.visit_item_struct(_binding_0);
-        }
-        Item::Enum(ref _binding_0, ) => {
-            _visitor.visit_item_enum(_binding_0);
-        }
-        Item::Union(ref _binding_0, ) => {
-            _visitor.visit_item_union(_binding_0);
-        }
-        Item::Trait(ref _binding_0, ) => {
-            _visitor.visit_item_trait(_binding_0);
-        }
-        Item::Impl(ref _binding_0, ) => {
-            _visitor.visit_item_impl(_binding_0);
-        }
-        Item::Macro(ref _binding_0, ) => {
-            _visitor.visit_item_macro(_binding_0);
-        }
-        Item::Macro2(ref _binding_0, ) => {
-            _visitor.visit_item_macro2(_binding_0);
-        }
-        Item::Verbatim(ref _binding_0, ) => {
-            _visitor.visit_item_verbatim(_binding_0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_const<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemConst) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    tokens_helper(_visitor, &(& _i . const_token).0);
-    _visitor.visit_ident(& _i . ident);
-    tokens_helper(_visitor, &(& _i . colon_token).0);
-    _visitor.visit_type(& * _i . ty);
-    tokens_helper(_visitor, &(& _i . eq_token).0);
-    _visitor.visit_expr(& * _i . expr);
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_enum<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemEnum) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    tokens_helper(_visitor, &(& _i . enum_token).0);
-    _visitor.visit_ident(& _i . ident);
-    _visitor.visit_generics(& _i . generics);
-    tokens_helper(_visitor, &(& _i . brace_token).0);
-    for el in Punctuated::pairs(& _i . variants) { let it = el.value(); _visitor.visit_variant(it) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_extern_crate<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemExternCrate) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    tokens_helper(_visitor, &(& _i . extern_token).0);
-    tokens_helper(_visitor, &(& _i . crate_token).0);
-    _visitor.visit_ident(& _i . ident);
-    if let Some(ref it) = _i . rename { 
-            tokens_helper(_visitor, &(& ( it ) . 0).0);
-            _visitor.visit_ident(& ( it ) . 1);
-         };
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_fn<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemFn) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    if let Some(ref it) = _i . constness { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . unsafety { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . abi { _visitor.visit_abi(it) };
-    _visitor.visit_ident(& _i . ident);
-    _visitor.visit_fn_decl(& * _i . decl);
-    _visitor.visit_block(& * _i . block);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_foreign_mod<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemForeignMod) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_abi(& _i . abi);
-    tokens_helper(_visitor, &(& _i . brace_token).0);
-    for it in & _i . items { _visitor.visit_foreign_item(it) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_impl<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemImpl) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    if let Some(ref it) = _i . defaultness { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . unsafety { tokens_helper(_visitor, &(it).0) };
-    tokens_helper(_visitor, &(& _i . impl_token).0);
-    _visitor.visit_generics(& _i . generics);
-    if let Some(ref it) = _i . trait_ { 
-            if let Some(ref it) = ( it ) . 0 { tokens_helper(_visitor, &(it).0) };
-            _visitor.visit_path(& ( it ) . 1);
-            tokens_helper(_visitor, &(& ( it ) . 2).0);
-         };
-    _visitor.visit_type(& * _i . self_ty);
-    tokens_helper(_visitor, &(& _i . brace_token).0);
-    for it in & _i . items { _visitor.visit_impl_item(it) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_macro<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemMacro) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    if let Some(ref it) = _i . ident { _visitor.visit_ident(it) };
-    _visitor.visit_macro(& _i . mac);
-    if let Some(ref it) = _i . semi_token { tokens_helper(_visitor, &(it).0) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_macro2<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemMacro2) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    tokens_helper(_visitor, &(& _i . macro_token).0);
-    _visitor.visit_ident(& _i . ident);
-    tokens_helper(_visitor, &(& _i . paren_token).0);
-    // Skipped field _i . args;
-    tokens_helper(_visitor, &(& _i . brace_token).0);
-    // Skipped field _i . body;
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_mod<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemMod) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    tokens_helper(_visitor, &(& _i . mod_token).0);
-    _visitor.visit_ident(& _i . ident);
-    if let Some(ref it) = _i . content { 
-            tokens_helper(_visitor, &(& ( it ) . 0).0);
-            for it in & ( it ) . 1 { _visitor.visit_item(it) };
-         };
-    if let Some(ref it) = _i . semi { tokens_helper(_visitor, &(it).0) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_static<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemStatic) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    tokens_helper(_visitor, &(& _i . static_token).0);
-    if let Some(ref it) = _i . mutability { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_ident(& _i . ident);
-    tokens_helper(_visitor, &(& _i . colon_token).0);
-    _visitor.visit_type(& * _i . ty);
-    tokens_helper(_visitor, &(& _i . eq_token).0);
-    _visitor.visit_expr(& * _i . expr);
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_struct<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemStruct) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    tokens_helper(_visitor, &(& _i . struct_token).0);
-    _visitor.visit_ident(& _i . ident);
-    _visitor.visit_generics(& _i . generics);
-    _visitor.visit_fields(& _i . fields);
-    if let Some(ref it) = _i . semi_token { tokens_helper(_visitor, &(it).0) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_trait<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemTrait) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    if let Some(ref it) = _i . unsafety { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . auto_token { tokens_helper(_visitor, &(it).0) };
-    tokens_helper(_visitor, &(& _i . trait_token).0);
-    _visitor.visit_ident(& _i . ident);
-    _visitor.visit_generics(& _i . generics);
-    if let Some(ref it) = _i . colon_token { tokens_helper(_visitor, &(it).0) };
-    for el in Punctuated::pairs(& _i . supertraits) { let it = el.value(); _visitor.visit_type_param_bound(it) };
-    tokens_helper(_visitor, &(& _i . brace_token).0);
-    for it in & _i . items { _visitor.visit_trait_item(it) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_type<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemType) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    tokens_helper(_visitor, &(& _i . type_token).0);
-    _visitor.visit_ident(& _i . ident);
-    _visitor.visit_generics(& _i . generics);
-    tokens_helper(_visitor, &(& _i . eq_token).0);
-    _visitor.visit_type(& * _i . ty);
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_union<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemUnion) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    tokens_helper(_visitor, &(& _i . union_token).0);
-    _visitor.visit_ident(& _i . ident);
-    _visitor.visit_generics(& _i . generics);
-    _visitor.visit_fields_named(& _i . fields);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_use<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemUse) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_visibility(& _i . vis);
-    tokens_helper(_visitor, &(& _i . use_token).0);
-    if let Some(ref it) = _i . leading_colon { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_use_tree(& _i . tree);
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_verbatim<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemVerbatim) {
-    // Skipped field _i . tts;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_label<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Label) {
-    _visitor.visit_lifetime(& _i . name);
-    tokens_helper(_visitor, &(& _i . colon_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lifetime<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Lifetime) {
-    // Skipped field _i . term;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lifetime_def<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LifetimeDef) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_lifetime(& _i . lifetime);
-    if let Some(ref it) = _i . colon_token { tokens_helper(_visitor, &(it).0) };
-    for el in Punctuated::pairs(& _i . bounds) { let it = el.value(); _visitor.visit_lifetime(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Lit) {
-    match *_i {
-        Lit::Str(ref _binding_0, ) => {
-            _visitor.visit_lit_str(_binding_0);
-        }
-        Lit::ByteStr(ref _binding_0, ) => {
-            _visitor.visit_lit_byte_str(_binding_0);
-        }
-        Lit::Byte(ref _binding_0, ) => {
-            _visitor.visit_lit_byte(_binding_0);
-        }
-        Lit::Char(ref _binding_0, ) => {
-            _visitor.visit_lit_char(_binding_0);
-        }
-        Lit::Int(ref _binding_0, ) => {
-            _visitor.visit_lit_int(_binding_0);
-        }
-        Lit::Float(ref _binding_0, ) => {
-            _visitor.visit_lit_float(_binding_0);
-        }
-        Lit::Bool(ref _binding_0, ) => {
-            _visitor.visit_lit_bool(_binding_0);
-        }
-        Lit::Verbatim(ref _binding_0, ) => {
-            _visitor.visit_lit_verbatim(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_bool<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitBool) {
-    // Skipped field _i . value;
-    _visitor.visit_span(& _i . span);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_byte<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitByte) {
-    // Skipped field _i . token;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_byte_str<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitByteStr) {
-    // Skipped field _i . token;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_char<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitChar) {
-    // Skipped field _i . token;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_float<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitFloat) {
-    // Skipped field _i . token;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_int<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitInt) {
-    // Skipped field _i . token;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_str<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitStr) {
-    // Skipped field _i . token;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_verbatim<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitVerbatim) {
-    // Skipped field _i . token;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_local<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Local) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . let_token).0);
-    for el in Punctuated::pairs(& _i . pats) { let it = el.value(); _visitor.visit_pat(it) };
-    if let Some(ref it) = _i . ty { 
-            tokens_helper(_visitor, &(& ( it ) . 0).0);
-            _visitor.visit_type(& * ( it ) . 1);
-         };
-    if let Some(ref it) = _i . init { 
-            tokens_helper(_visitor, &(& ( it ) . 0).0);
-            _visitor.visit_expr(& * ( it ) . 1);
-         };
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_macro<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Macro) {
-    _visitor.visit_path(& _i . path);
-    tokens_helper(_visitor, &(& _i . bang_token).0);
-    _visitor.visit_macro_delimiter(& _i . delimiter);
-    // Skipped field _i . tts;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_macro_delimiter<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast MacroDelimiter) {
-    match *_i {
-        MacroDelimiter::Paren(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        MacroDelimiter::Brace(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        MacroDelimiter::Bracket(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_member<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Member) {
-    match *_i {
-        Member::Named(ref _binding_0, ) => {
-            _visitor.visit_ident(_binding_0);
-        }
-        Member::Unnamed(ref _binding_0, ) => {
-            _visitor.visit_index(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_meta<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Meta) {
-    match *_i {
-        Meta::Word(ref _binding_0, ) => {
-            _visitor.visit_ident(_binding_0);
-        }
-        Meta::List(ref _binding_0, ) => {
-            _visitor.visit_meta_list(_binding_0);
-        }
-        Meta::NameValue(ref _binding_0, ) => {
-            _visitor.visit_meta_name_value(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_meta_list<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast MetaList) {
-    _visitor.visit_ident(& _i . ident);
-    tokens_helper(_visitor, &(& _i . paren_token).0);
-    for el in Punctuated::pairs(& _i . nested) { let it = el.value(); _visitor.visit_nested_meta(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_meta_name_value<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast MetaNameValue) {
-    _visitor.visit_ident(& _i . ident);
-    tokens_helper(_visitor, &(& _i . eq_token).0);
-    _visitor.visit_lit(& _i . lit);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_method_sig<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast MethodSig) {
-    if let Some(ref it) = _i . constness { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . unsafety { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . abi { _visitor.visit_abi(it) };
-    _visitor.visit_ident(& _i . ident);
-    _visitor.visit_fn_decl(& _i . decl);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_method_turbofish<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast MethodTurbofish) {
-    tokens_helper(_visitor, &(& _i . colon2_token).0);
-    tokens_helper(_visitor, &(& _i . lt_token).0);
-    for el in Punctuated::pairs(& _i . args) { let it = el.value(); _visitor.visit_generic_method_argument(it) };
-    tokens_helper(_visitor, &(& _i . gt_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_nested_meta<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast NestedMeta) {
-    match *_i {
-        NestedMeta::Meta(ref _binding_0, ) => {
-            _visitor.visit_meta(_binding_0);
-        }
-        NestedMeta::Literal(ref _binding_0, ) => {
-            _visitor.visit_lit(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_parenthesized_generic_arguments<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ParenthesizedGenericArguments) {
-    tokens_helper(_visitor, &(& _i . paren_token).0);
-    for el in Punctuated::pairs(& _i . inputs) { let it = el.value(); _visitor.visit_type(it) };
-    _visitor.visit_return_type(& _i . output);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Pat) {
-    match *_i {
-        Pat::Wild(ref _binding_0, ) => {
-            _visitor.visit_pat_wild(_binding_0);
-        }
-        Pat::Ident(ref _binding_0, ) => {
-            _visitor.visit_pat_ident(_binding_0);
-        }
-        Pat::Struct(ref _binding_0, ) => {
-            _visitor.visit_pat_struct(_binding_0);
-        }
-        Pat::TupleStruct(ref _binding_0, ) => {
-            _visitor.visit_pat_tuple_struct(_binding_0);
-        }
-        Pat::Path(ref _binding_0, ) => {
-            _visitor.visit_pat_path(_binding_0);
-        }
-        Pat::Tuple(ref _binding_0, ) => {
-            _visitor.visit_pat_tuple(_binding_0);
-        }
-        Pat::Box(ref _binding_0, ) => {
-            _visitor.visit_pat_box(_binding_0);
-        }
-        Pat::Ref(ref _binding_0, ) => {
-            _visitor.visit_pat_ref(_binding_0);
-        }
-        Pat::Lit(ref _binding_0, ) => {
-            _visitor.visit_pat_lit(_binding_0);
-        }
-        Pat::Range(ref _binding_0, ) => {
-            _visitor.visit_pat_range(_binding_0);
-        }
-        Pat::Slice(ref _binding_0, ) => {
-            _visitor.visit_pat_slice(_binding_0);
-        }
-        Pat::Macro(ref _binding_0, ) => {
-            _visitor.visit_pat_macro(_binding_0);
-        }
-        Pat::Verbatim(ref _binding_0, ) => {
-            _visitor.visit_pat_verbatim(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_box<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatBox) {
-    tokens_helper(_visitor, &(& _i . box_token).0);
-    _visitor.visit_pat(& * _i . pat);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_ident<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatIdent) {
-    if let Some(ref it) = _i . by_ref { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . mutability { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_ident(& _i . ident);
-    if let Some(ref it) = _i . subpat { 
-            tokens_helper(_visitor, &(& ( it ) . 0).0);
-            _visitor.visit_pat(& * ( it ) . 1);
-         };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_lit<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatLit) {
-    _visitor.visit_expr(& * _i . expr);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_macro<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatMacro) {
-    _visitor.visit_macro(& _i . mac);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_path<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatPath) {
-    if let Some(ref it) = _i . qself { _visitor.visit_qself(it) };
-    _visitor.visit_path(& _i . path);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_range<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatRange) {
-    _visitor.visit_expr(& * _i . lo);
-    _visitor.visit_range_limits(& _i . limits);
-    _visitor.visit_expr(& * _i . hi);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_ref<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatRef) {
-    tokens_helper(_visitor, &(& _i . and_token).0);
-    if let Some(ref it) = _i . mutability { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_pat(& * _i . pat);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_slice<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatSlice) {
-    tokens_helper(_visitor, &(& _i . bracket_token).0);
-    for el in Punctuated::pairs(& _i . front) { let it = el.value(); _visitor.visit_pat(it) };
-    if let Some(ref it) = _i . middle { _visitor.visit_pat(& * * it) };
-    if let Some(ref it) = _i . dot2_token { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . comma_token { tokens_helper(_visitor, &(it).0) };
-    for el in Punctuated::pairs(& _i . back) { let it = el.value(); _visitor.visit_pat(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_struct<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatStruct) {
-    _visitor.visit_path(& _i . path);
-    tokens_helper(_visitor, &(& _i . brace_token).0);
-    for el in Punctuated::pairs(& _i . fields) { let it = el.value(); _visitor.visit_field_pat(it) };
-    if let Some(ref it) = _i . dot2_token { tokens_helper(_visitor, &(it).0) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_tuple<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatTuple) {
-    tokens_helper(_visitor, &(& _i . paren_token).0);
-    for el in Punctuated::pairs(& _i . front) { let it = el.value(); _visitor.visit_pat(it) };
-    if let Some(ref it) = _i . dot2_token { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . comma_token { tokens_helper(_visitor, &(it).0) };
-    for el in Punctuated::pairs(& _i . back) { let it = el.value(); _visitor.visit_pat(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_tuple_struct<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatTupleStruct) {
-    _visitor.visit_path(& _i . path);
-    _visitor.visit_pat_tuple(& _i . pat);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_verbatim<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatVerbatim) {
-    // Skipped field _i . tts;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_wild<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatWild) {
-    tokens_helper(_visitor, &(& _i . underscore_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_path<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Path) {
-    if let Some(ref it) = _i . leading_colon { tokens_helper(_visitor, &(it).0) };
-    for el in Punctuated::pairs(& _i . segments) { let it = el.value(); _visitor.visit_path_segment(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_path_arguments<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PathArguments) {
-    match *_i {
-        PathArguments::None => { }
-        PathArguments::AngleBracketed(ref _binding_0, ) => {
-            _visitor.visit_angle_bracketed_generic_arguments(_binding_0);
-        }
-        PathArguments::Parenthesized(ref _binding_0, ) => {
-            _visitor.visit_parenthesized_generic_arguments(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_path_segment<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PathSegment) {
-    _visitor.visit_ident(& _i . ident);
-    _visitor.visit_path_arguments(& _i . arguments);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_predicate_eq<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PredicateEq) {
-    _visitor.visit_type(& _i . lhs_ty);
-    tokens_helper(_visitor, &(& _i . eq_token).0);
-    _visitor.visit_type(& _i . rhs_ty);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_predicate_lifetime<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PredicateLifetime) {
-    _visitor.visit_lifetime(& _i . lifetime);
-    if let Some(ref it) = _i . colon_token { tokens_helper(_visitor, &(it).0) };
-    for el in Punctuated::pairs(& _i . bounds) { let it = el.value(); _visitor.visit_lifetime(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_predicate_type<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PredicateType) {
-    if let Some(ref it) = _i . lifetimes { _visitor.visit_bound_lifetimes(it) };
-    _visitor.visit_type(& _i . bounded_ty);
-    tokens_helper(_visitor, &(& _i . colon_token).0);
-    for el in Punctuated::pairs(& _i . bounds) { let it = el.value(); _visitor.visit_type_param_bound(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_qself<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast QSelf) {
-    tokens_helper(_visitor, &(& _i . lt_token).0);
-    _visitor.visit_type(& * _i . ty);
-    // Skipped field _i . position;
-    if let Some(ref it) = _i . as_token { tokens_helper(_visitor, &(it).0) };
-    tokens_helper(_visitor, &(& _i . gt_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_range_limits<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast RangeLimits) {
-    match *_i {
-        RangeLimits::HalfOpen(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        RangeLimits::Closed(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_return_type<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ReturnType) {
-    match *_i {
-        ReturnType::Default => { }
-        ReturnType::Type(ref _binding_0, ref _binding_1, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-            _visitor.visit_type(& * * _binding_1);
-        }
-    }
-}
-
-pub fn visit_span<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Span) {
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_stmt<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Stmt) {
-    match *_i {
-        Stmt::Local(ref _binding_0, ) => {
-            _visitor.visit_local(_binding_0);
-        }
-        Stmt::Item(ref _binding_0, ) => {
-            _visitor.visit_item(_binding_0);
-        }
-        Stmt::Expr(ref _binding_0, ) => {
-            _visitor.visit_expr(_binding_0);
-        }
-        Stmt::Semi(ref _binding_0, ref _binding_1, ) => {
-            _visitor.visit_expr(_binding_0);
-            tokens_helper(_visitor, &(_binding_1).0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_trait_bound<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TraitBound) {
-    if let Some(ref it) = _i . paren_token { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_trait_bound_modifier(& _i . modifier);
-    if let Some(ref it) = _i . lifetimes { _visitor.visit_bound_lifetimes(it) };
-    _visitor.visit_path(& _i . path);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_trait_bound_modifier<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TraitBoundModifier) {
-    match *_i {
-        TraitBoundModifier::None => { }
-        TraitBoundModifier::Maybe(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_trait_item<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TraitItem) {
-    match *_i {
-        TraitItem::Const(ref _binding_0, ) => {
-            _visitor.visit_trait_item_const(_binding_0);
-        }
-        TraitItem::Method(ref _binding_0, ) => {
-            _visitor.visit_trait_item_method(_binding_0);
-        }
-        TraitItem::Type(ref _binding_0, ) => {
-            _visitor.visit_trait_item_type(_binding_0);
-        }
-        TraitItem::Macro(ref _binding_0, ) => {
-            _visitor.visit_trait_item_macro(_binding_0);
-        }
-        TraitItem::Verbatim(ref _binding_0, ) => {
-            _visitor.visit_trait_item_verbatim(_binding_0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_trait_item_const<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TraitItemConst) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . const_token).0);
-    _visitor.visit_ident(& _i . ident);
-    tokens_helper(_visitor, &(& _i . colon_token).0);
-    _visitor.visit_type(& _i . ty);
-    if let Some(ref it) = _i . default { 
-            tokens_helper(_visitor, &(& ( it ) . 0).0);
-            _visitor.visit_expr(& ( it ) . 1);
-         };
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_trait_item_macro<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TraitItemMacro) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_macro(& _i . mac);
-    if let Some(ref it) = _i . semi_token { tokens_helper(_visitor, &(it).0) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_trait_item_method<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TraitItemMethod) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_method_sig(& _i . sig);
-    if let Some(ref it) = _i . default { _visitor.visit_block(it) };
-    if let Some(ref it) = _i . semi_token { tokens_helper(_visitor, &(it).0) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_trait_item_type<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TraitItemType) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    tokens_helper(_visitor, &(& _i . type_token).0);
-    _visitor.visit_ident(& _i . ident);
-    _visitor.visit_generics(& _i . generics);
-    if let Some(ref it) = _i . colon_token { tokens_helper(_visitor, &(it).0) };
-    for el in Punctuated::pairs(& _i . bounds) { let it = el.value(); _visitor.visit_type_param_bound(it) };
-    if let Some(ref it) = _i . default { 
-            tokens_helper(_visitor, &(& ( it ) . 0).0);
-            _visitor.visit_type(& ( it ) . 1);
-         };
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_trait_item_verbatim<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TraitItemVerbatim) {
-    // Skipped field _i . tts;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Type) {
-    match *_i {
-        Type::Slice(ref _binding_0, ) => {
-            _visitor.visit_type_slice(_binding_0);
-        }
-        Type::Array(ref _binding_0, ) => {
-            _visitor.visit_type_array(_binding_0);
-        }
-        Type::Ptr(ref _binding_0, ) => {
-            _visitor.visit_type_ptr(_binding_0);
-        }
-        Type::Reference(ref _binding_0, ) => {
-            _visitor.visit_type_reference(_binding_0);
-        }
-        Type::BareFn(ref _binding_0, ) => {
-            _visitor.visit_type_bare_fn(_binding_0);
-        }
-        Type::Never(ref _binding_0, ) => {
-            _visitor.visit_type_never(_binding_0);
-        }
-        Type::Tuple(ref _binding_0, ) => {
-            _visitor.visit_type_tuple(_binding_0);
-        }
-        Type::Path(ref _binding_0, ) => {
-            _visitor.visit_type_path(_binding_0);
-        }
-        Type::TraitObject(ref _binding_0, ) => {
-            _visitor.visit_type_trait_object(_binding_0);
-        }
-        Type::ImplTrait(ref _binding_0, ) => {
-            _visitor.visit_type_impl_trait(_binding_0);
-        }
-        Type::Paren(ref _binding_0, ) => {
-            _visitor.visit_type_paren(_binding_0);
-        }
-        Type::Group(ref _binding_0, ) => {
-            _visitor.visit_type_group(_binding_0);
-        }
-        Type::Infer(ref _binding_0, ) => {
-            _visitor.visit_type_infer(_binding_0);
-        }
-        Type::Macro(ref _binding_0, ) => {
-            _visitor.visit_type_macro(_binding_0);
-        }
-        Type::Verbatim(ref _binding_0, ) => {
-            _visitor.visit_type_verbatim(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_array<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeArray) {
-    tokens_helper(_visitor, &(& _i . bracket_token).0);
-    _visitor.visit_type(& * _i . elem);
-    tokens_helper(_visitor, &(& _i . semi_token).0);
-    _visitor.visit_expr(& _i . len);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_bare_fn<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeBareFn) {
-    if let Some(ref it) = _i . unsafety { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . abi { _visitor.visit_abi(it) };
-    tokens_helper(_visitor, &(& _i . fn_token).0);
-    if let Some(ref it) = _i . lifetimes { _visitor.visit_bound_lifetimes(it) };
-    tokens_helper(_visitor, &(& _i . paren_token).0);
-    for el in Punctuated::pairs(& _i . inputs) { let it = el.value(); _visitor.visit_bare_fn_arg(it) };
-    if let Some(ref it) = _i . variadic { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_return_type(& _i . output);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_group<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeGroup) {
-    tokens_helper(_visitor, &(& _i . group_token).0);
-    _visitor.visit_type(& * _i . elem);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_impl_trait<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeImplTrait) {
-    tokens_helper(_visitor, &(& _i . impl_token).0);
-    for el in Punctuated::pairs(& _i . bounds) { let it = el.value(); _visitor.visit_type_param_bound(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_infer<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeInfer) {
-    tokens_helper(_visitor, &(& _i . underscore_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_macro<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeMacro) {
-    _visitor.visit_macro(& _i . mac);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_never<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeNever) {
-    tokens_helper(_visitor, &(& _i . bang_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_param<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeParam) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_ident(& _i . ident);
-    if let Some(ref it) = _i . colon_token { tokens_helper(_visitor, &(it).0) };
-    for el in Punctuated::pairs(& _i . bounds) { let it = el.value(); _visitor.visit_type_param_bound(it) };
-    if let Some(ref it) = _i . eq_token { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . default { _visitor.visit_type(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_param_bound<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeParamBound) {
-    match *_i {
-        TypeParamBound::Trait(ref _binding_0, ) => {
-            _visitor.visit_trait_bound(_binding_0);
-        }
-        TypeParamBound::Lifetime(ref _binding_0, ) => {
-            _visitor.visit_lifetime(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_paren<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeParen) {
-    tokens_helper(_visitor, &(& _i . paren_token).0);
-    _visitor.visit_type(& * _i . elem);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_path<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypePath) {
-    if let Some(ref it) = _i . qself { _visitor.visit_qself(it) };
-    _visitor.visit_path(& _i . path);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_ptr<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypePtr) {
-    tokens_helper(_visitor, &(& _i . star_token).0);
-    if let Some(ref it) = _i . const_token { tokens_helper(_visitor, &(it).0) };
-    if let Some(ref it) = _i . mutability { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_type(& * _i . elem);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_reference<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeReference) {
-    tokens_helper(_visitor, &(& _i . and_token).0);
-    if let Some(ref it) = _i . lifetime { _visitor.visit_lifetime(it) };
-    if let Some(ref it) = _i . mutability { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_type(& * _i . elem);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_slice<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeSlice) {
-    tokens_helper(_visitor, &(& _i . bracket_token).0);
-    _visitor.visit_type(& * _i . elem);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_trait_object<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeTraitObject) {
-    if let Some(ref it) = _i . dyn_token { tokens_helper(_visitor, &(it).0) };
-    for el in Punctuated::pairs(& _i . bounds) { let it = el.value(); _visitor.visit_type_param_bound(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_tuple<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeTuple) {
-    tokens_helper(_visitor, &(& _i . paren_token).0);
-    for el in Punctuated::pairs(& _i . elems) { let it = el.value(); _visitor.visit_type(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_verbatim<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeVerbatim) {
-    // Skipped field _i . tts;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_un_op<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast UnOp) {
-    match *_i {
-        UnOp::Deref(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        UnOp::Not(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        UnOp::Neg(ref _binding_0, ) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_use_glob<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast UseGlob) {
-    tokens_helper(_visitor, &(& _i . star_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_use_group<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast UseGroup) {
-    tokens_helper(_visitor, &(& _i . brace_token).0);
-    for el in Punctuated::pairs(& _i . items) { let it = el.value(); _visitor.visit_use_tree(it) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_use_name<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast UseName) {
-    _visitor.visit_ident(& _i . ident);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_use_path<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast UsePath) {
-    _visitor.visit_ident(& _i . ident);
-    tokens_helper(_visitor, &(& _i . colon2_token).0);
-    _visitor.visit_use_tree(& * _i . tree);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_use_rename<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast UseRename) {
-    _visitor.visit_ident(& _i . ident);
-    tokens_helper(_visitor, &(& _i . as_token).0);
-    _visitor.visit_ident(& _i . rename);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_use_tree<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast UseTree) {
-    match *_i {
-        UseTree::Path(ref _binding_0, ) => {
-            _visitor.visit_use_path(_binding_0);
-        }
-        UseTree::Name(ref _binding_0, ) => {
-            _visitor.visit_use_name(_binding_0);
-        }
-        UseTree::Rename(ref _binding_0, ) => {
-            _visitor.visit_use_rename(_binding_0);
-        }
-        UseTree::Glob(ref _binding_0, ) => {
-            _visitor.visit_use_glob(_binding_0);
-        }
-        UseTree::Group(ref _binding_0, ) => {
-            _visitor.visit_use_group(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_variant<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Variant) {
-    for it in & _i . attrs { _visitor.visit_attribute(it) };
-    _visitor.visit_ident(& _i . ident);
-    _visitor.visit_fields(& _i . fields);
-    if let Some(ref it) = _i . discriminant { 
-            tokens_helper(_visitor, &(& ( it ) . 0).0);
-            _visitor.visit_expr(& ( it ) . 1);
-         };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_vis_crate<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast VisCrate) {
-    tokens_helper(_visitor, &(& _i . crate_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_vis_public<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast VisPublic) {
-    tokens_helper(_visitor, &(& _i . pub_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_vis_restricted<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast VisRestricted) {
-    tokens_helper(_visitor, &(& _i . pub_token).0);
-    tokens_helper(_visitor, &(& _i . paren_token).0);
-    if let Some(ref it) = _i . in_token { tokens_helper(_visitor, &(it).0) };
-    _visitor.visit_path(& * _i . path);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_visibility<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Visibility) {
-    match *_i {
-        Visibility::Public(ref _binding_0, ) => {
-            _visitor.visit_vis_public(_binding_0);
-        }
-        Visibility::Crate(ref _binding_0, ) => {
-            _visitor.visit_vis_crate(_binding_0);
-        }
-        Visibility::Restricted(ref _binding_0, ) => {
-            _visitor.visit_vis_restricted(_binding_0);
-        }
-        Visibility::Inherited => { }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_where_clause<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast WhereClause) {
-    tokens_helper(_visitor, &(& _i . where_token).0);
-    for el in Punctuated::pairs(& _i . predicates) { let it = el.value(); _visitor.visit_where_predicate(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_where_predicate<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast WherePredicate) {
-    match *_i {
-        WherePredicate::Type(ref _binding_0, ) => {
-            _visitor.visit_predicate_type(_binding_0);
-        }
-        WherePredicate::Lifetime(ref _binding_0, ) => {
-            _visitor.visit_predicate_lifetime(_binding_0);
-        }
-        WherePredicate::Eq(ref _binding_0, ) => {
-            _visitor.visit_predicate_eq(_binding_0);
-        }
-    }
-}
-
diff --git a/third_party/rust/syn-0.13.1/src/gen/visit_mut.rs b/third_party/rust/syn-0.13.1/src/gen/visit_mut.rs
deleted file mode 100644
index 2a86a0c89997..000000000000
--- a/third_party/rust/syn-0.13.1/src/gen/visit_mut.rs
+++ /dev/null
@@ -1,2288 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
-#![cfg_attr(feature = "cargo-clippy", allow(match_same_arms))]
-
-use *;
-#[cfg(any(feature = "full", feature = "derive"))]
-use punctuated::Punctuated;
-use proc_macro2::Span;
-#[cfg(any(feature = "full", feature = "derive"))]
-use gen::helper::visit_mut::*;
-
-
-#[cfg(feature = "full")]
-macro_rules! full {
-    ($e:expr) => { $e }
-}
-
-#[cfg(all(feature = "derive", not(feature = "full")))]
-macro_rules! full {
-    ($e:expr) => { unreachable!() }
-}
-
-
-/// Syntax tree traversal to mutate an exclusive borrow of a syntax tree in
-/// place.
-///
-/// See the [module documentation] for details.
-///
-/// [module documentation]: index.html
-///
-/// *This trait is available if Syn is built with the `"visit-mut"` feature.*
-pub trait VisitMut {
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_abi_mut(&mut self, i: &mut Abi) { visit_abi_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_angle_bracketed_generic_arguments_mut(&mut self, i: &mut AngleBracketedGenericArguments) { visit_angle_bracketed_generic_arguments_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_arg_captured_mut(&mut self, i: &mut ArgCaptured) { visit_arg_captured_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_arg_self_mut(&mut self, i: &mut ArgSelf) { visit_arg_self_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_arg_self_ref_mut(&mut self, i: &mut ArgSelfRef) { visit_arg_self_ref_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_arm_mut(&mut self, i: &mut Arm) { visit_arm_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_attr_style_mut(&mut self, i: &mut AttrStyle) { visit_attr_style_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_attribute_mut(&mut self, i: &mut Attribute) { visit_attribute_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_bare_fn_arg_mut(&mut self, i: &mut BareFnArg) { visit_bare_fn_arg_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_bare_fn_arg_name_mut(&mut self, i: &mut BareFnArgName) { visit_bare_fn_arg_name_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_bin_op_mut(&mut self, i: &mut BinOp) { visit_bin_op_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_binding_mut(&mut self, i: &mut Binding) { visit_binding_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_block_mut(&mut self, i: &mut Block) { visit_block_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_bound_lifetimes_mut(&mut self, i: &mut BoundLifetimes) { visit_bound_lifetimes_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_const_param_mut(&mut self, i: &mut ConstParam) { visit_const_param_mut(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn visit_data_mut(&mut self, i: &mut Data) { visit_data_mut(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn visit_data_enum_mut(&mut self, i: &mut DataEnum) { visit_data_enum_mut(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn visit_data_struct_mut(&mut self, i: &mut DataStruct) { visit_data_struct_mut(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn visit_data_union_mut(&mut self, i: &mut DataUnion) { visit_data_union_mut(self, i) }
-# [ cfg ( feature = "derive" ) ]
-fn visit_derive_input_mut(&mut self, i: &mut DeriveInput) { visit_derive_input_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_mut(&mut self, i: &mut Expr) { visit_expr_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_array_mut(&mut self, i: &mut ExprArray) { visit_expr_array_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_assign_mut(&mut self, i: &mut ExprAssign) { visit_expr_assign_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_assign_op_mut(&mut self, i: &mut ExprAssignOp) { visit_expr_assign_op_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_binary_mut(&mut self, i: &mut ExprBinary) { visit_expr_binary_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_block_mut(&mut self, i: &mut ExprBlock) { visit_expr_block_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_box_mut(&mut self, i: &mut ExprBox) { visit_expr_box_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_break_mut(&mut self, i: &mut ExprBreak) { visit_expr_break_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_call_mut(&mut self, i: &mut ExprCall) { visit_expr_call_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_cast_mut(&mut self, i: &mut ExprCast) { visit_expr_cast_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_catch_mut(&mut self, i: &mut ExprCatch) { visit_expr_catch_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_closure_mut(&mut self, i: &mut ExprClosure) { visit_expr_closure_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_continue_mut(&mut self, i: &mut ExprContinue) { visit_expr_continue_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_field_mut(&mut self, i: &mut ExprField) { visit_expr_field_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_for_loop_mut(&mut self, i: &mut ExprForLoop) { visit_expr_for_loop_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_group_mut(&mut self, i: &mut ExprGroup) { visit_expr_group_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_if_mut(&mut self, i: &mut ExprIf) { visit_expr_if_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_if_let_mut(&mut self, i: &mut ExprIfLet) { visit_expr_if_let_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_in_place_mut(&mut self, i: &mut ExprInPlace) { visit_expr_in_place_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_index_mut(&mut self, i: &mut ExprIndex) { visit_expr_index_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_lit_mut(&mut self, i: &mut ExprLit) { visit_expr_lit_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_loop_mut(&mut self, i: &mut ExprLoop) { visit_expr_loop_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_macro_mut(&mut self, i: &mut ExprMacro) { visit_expr_macro_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_match_mut(&mut self, i: &mut ExprMatch) { visit_expr_match_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_method_call_mut(&mut self, i: &mut ExprMethodCall) { visit_expr_method_call_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_paren_mut(&mut self, i: &mut ExprParen) { visit_expr_paren_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_path_mut(&mut self, i: &mut ExprPath) { visit_expr_path_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_range_mut(&mut self, i: &mut ExprRange) { visit_expr_range_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_reference_mut(&mut self, i: &mut ExprReference) { visit_expr_reference_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_repeat_mut(&mut self, i: &mut ExprRepeat) { visit_expr_repeat_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_return_mut(&mut self, i: &mut ExprReturn) { visit_expr_return_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_struct_mut(&mut self, i: &mut ExprStruct) { visit_expr_struct_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_try_mut(&mut self, i: &mut ExprTry) { visit_expr_try_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_tuple_mut(&mut self, i: &mut ExprTuple) { visit_expr_tuple_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_type_mut(&mut self, i: &mut ExprType) { visit_expr_type_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_unary_mut(&mut self, i: &mut ExprUnary) { visit_expr_unary_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_unsafe_mut(&mut self, i: &mut ExprUnsafe) { visit_expr_unsafe_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_verbatim_mut(&mut self, i: &mut ExprVerbatim) { visit_expr_verbatim_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_while_mut(&mut self, i: &mut ExprWhile) { visit_expr_while_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_while_let_mut(&mut self, i: &mut ExprWhileLet) { visit_expr_while_let_mut(self, i) }
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_expr_yield_mut(&mut self, i: &mut ExprYield) { visit_expr_yield_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_field_mut(&mut self, i: &mut Field) { visit_field_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_field_pat_mut(&mut self, i: &mut FieldPat) { visit_field_pat_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_field_value_mut(&mut self, i: &mut FieldValue) { visit_field_value_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_fields_mut(&mut self, i: &mut Fields) { visit_fields_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_fields_named_mut(&mut self, i: &mut FieldsNamed) { visit_fields_named_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_fields_unnamed_mut(&mut self, i: &mut FieldsUnnamed) { visit_fields_unnamed_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_file_mut(&mut self, i: &mut File) { visit_file_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_fn_arg_mut(&mut self, i: &mut FnArg) { visit_fn_arg_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_fn_decl_mut(&mut self, i: &mut FnDecl) { visit_fn_decl_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_foreign_item_mut(&mut self, i: &mut ForeignItem) { visit_foreign_item_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_foreign_item_fn_mut(&mut self, i: &mut ForeignItemFn) { visit_foreign_item_fn_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_foreign_item_static_mut(&mut self, i: &mut ForeignItemStatic) { visit_foreign_item_static_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_foreign_item_type_mut(&mut self, i: &mut ForeignItemType) { visit_foreign_item_type_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_foreign_item_verbatim_mut(&mut self, i: &mut ForeignItemVerbatim) { visit_foreign_item_verbatim_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_generic_argument_mut(&mut self, i: &mut GenericArgument) { visit_generic_argument_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_generic_method_argument_mut(&mut self, i: &mut GenericMethodArgument) { visit_generic_method_argument_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_generic_param_mut(&mut self, i: &mut GenericParam) { visit_generic_param_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_generics_mut(&mut self, i: &mut Generics) { visit_generics_mut(self, i) }
-
-fn visit_ident_mut(&mut self, i: &mut Ident) { visit_ident_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_impl_item_mut(&mut self, i: &mut ImplItem) { visit_impl_item_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_impl_item_const_mut(&mut self, i: &mut ImplItemConst) { visit_impl_item_const_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_impl_item_macro_mut(&mut self, i: &mut ImplItemMacro) { visit_impl_item_macro_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_impl_item_method_mut(&mut self, i: &mut ImplItemMethod) { visit_impl_item_method_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_impl_item_type_mut(&mut self, i: &mut ImplItemType) { visit_impl_item_type_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_impl_item_verbatim_mut(&mut self, i: &mut ImplItemVerbatim) { visit_impl_item_verbatim_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_index_mut(&mut self, i: &mut Index) { visit_index_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_mut(&mut self, i: &mut Item) { visit_item_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_const_mut(&mut self, i: &mut ItemConst) { visit_item_const_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_enum_mut(&mut self, i: &mut ItemEnum) { visit_item_enum_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_extern_crate_mut(&mut self, i: &mut ItemExternCrate) { visit_item_extern_crate_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_fn_mut(&mut self, i: &mut ItemFn) { visit_item_fn_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_foreign_mod_mut(&mut self, i: &mut ItemForeignMod) { visit_item_foreign_mod_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_impl_mut(&mut self, i: &mut ItemImpl) { visit_item_impl_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_macro_mut(&mut self, i: &mut ItemMacro) { visit_item_macro_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_macro2_mut(&mut self, i: &mut ItemMacro2) { visit_item_macro2_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_mod_mut(&mut self, i: &mut ItemMod) { visit_item_mod_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_static_mut(&mut self, i: &mut ItemStatic) { visit_item_static_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_struct_mut(&mut self, i: &mut ItemStruct) { visit_item_struct_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_trait_mut(&mut self, i: &mut ItemTrait) { visit_item_trait_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_type_mut(&mut self, i: &mut ItemType) { visit_item_type_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_union_mut(&mut self, i: &mut ItemUnion) { visit_item_union_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_use_mut(&mut self, i: &mut ItemUse) { visit_item_use_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_item_verbatim_mut(&mut self, i: &mut ItemVerbatim) { visit_item_verbatim_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_label_mut(&mut self, i: &mut Label) { visit_label_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lifetime_mut(&mut self, i: &mut Lifetime) { visit_lifetime_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lifetime_def_mut(&mut self, i: &mut LifetimeDef) { visit_lifetime_def_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_mut(&mut self, i: &mut Lit) { visit_lit_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_bool_mut(&mut self, i: &mut LitBool) { visit_lit_bool_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_byte_mut(&mut self, i: &mut LitByte) { visit_lit_byte_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_byte_str_mut(&mut self, i: &mut LitByteStr) { visit_lit_byte_str_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_char_mut(&mut self, i: &mut LitChar) { visit_lit_char_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_float_mut(&mut self, i: &mut LitFloat) { visit_lit_float_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_int_mut(&mut self, i: &mut LitInt) { visit_lit_int_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_str_mut(&mut self, i: &mut LitStr) { visit_lit_str_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_lit_verbatim_mut(&mut self, i: &mut LitVerbatim) { visit_lit_verbatim_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_local_mut(&mut self, i: &mut Local) { visit_local_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_macro_mut(&mut self, i: &mut Macro) { visit_macro_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_macro_delimiter_mut(&mut self, i: &mut MacroDelimiter) { visit_macro_delimiter_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_member_mut(&mut self, i: &mut Member) { visit_member_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_meta_mut(&mut self, i: &mut Meta) { visit_meta_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_meta_list_mut(&mut self, i: &mut MetaList) { visit_meta_list_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_meta_name_value_mut(&mut self, i: &mut MetaNameValue) { visit_meta_name_value_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_method_sig_mut(&mut self, i: &mut MethodSig) { visit_method_sig_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_method_turbofish_mut(&mut self, i: &mut MethodTurbofish) { visit_method_turbofish_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_nested_meta_mut(&mut self, i: &mut NestedMeta) { visit_nested_meta_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_parenthesized_generic_arguments_mut(&mut self, i: &mut ParenthesizedGenericArguments) { visit_parenthesized_generic_arguments_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_mut(&mut self, i: &mut Pat) { visit_pat_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_box_mut(&mut self, i: &mut PatBox) { visit_pat_box_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_ident_mut(&mut self, i: &mut PatIdent) { visit_pat_ident_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_lit_mut(&mut self, i: &mut PatLit) { visit_pat_lit_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_macro_mut(&mut self, i: &mut PatMacro) { visit_pat_macro_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_path_mut(&mut self, i: &mut PatPath) { visit_pat_path_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_range_mut(&mut self, i: &mut PatRange) { visit_pat_range_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_ref_mut(&mut self, i: &mut PatRef) { visit_pat_ref_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_slice_mut(&mut self, i: &mut PatSlice) { visit_pat_slice_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_struct_mut(&mut self, i: &mut PatStruct) { visit_pat_struct_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_tuple_mut(&mut self, i: &mut PatTuple) { visit_pat_tuple_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_tuple_struct_mut(&mut self, i: &mut PatTupleStruct) { visit_pat_tuple_struct_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_verbatim_mut(&mut self, i: &mut PatVerbatim) { visit_pat_verbatim_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_pat_wild_mut(&mut self, i: &mut PatWild) { visit_pat_wild_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_path_mut(&mut self, i: &mut Path) { visit_path_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_path_arguments_mut(&mut self, i: &mut PathArguments) { visit_path_arguments_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_path_segment_mut(&mut self, i: &mut PathSegment) { visit_path_segment_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_predicate_eq_mut(&mut self, i: &mut PredicateEq) { visit_predicate_eq_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_predicate_lifetime_mut(&mut self, i: &mut PredicateLifetime) { visit_predicate_lifetime_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_predicate_type_mut(&mut self, i: &mut PredicateType) { visit_predicate_type_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_qself_mut(&mut self, i: &mut QSelf) { visit_qself_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_range_limits_mut(&mut self, i: &mut RangeLimits) { visit_range_limits_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_return_type_mut(&mut self, i: &mut ReturnType) { visit_return_type_mut(self, i) }
-
-fn visit_span_mut(&mut self, i: &mut Span) { visit_span_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-fn visit_stmt_mut(&mut self, i: &mut Stmt) { visit_stmt_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_trait_bound_mut(&mut self, i: &mut TraitBound) { visit_trait_bound_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_trait_bound_modifier_mut(&mut self, i: &mut TraitBoundModifier) { visit_trait_bound_modifier_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_trait_item_mut(&mut self, i: &mut TraitItem) { visit_trait_item_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_trait_item_const_mut(&mut self, i: &mut TraitItemConst) { visit_trait_item_const_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_trait_item_macro_mut(&mut self, i: &mut TraitItemMacro) { visit_trait_item_macro_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_trait_item_method_mut(&mut self, i: &mut TraitItemMethod) { visit_trait_item_method_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_trait_item_type_mut(&mut self, i: &mut TraitItemType) { visit_trait_item_type_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_trait_item_verbatim_mut(&mut self, i: &mut TraitItemVerbatim) { visit_trait_item_verbatim_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_mut(&mut self, i: &mut Type) { visit_type_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_array_mut(&mut self, i: &mut TypeArray) { visit_type_array_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_bare_fn_mut(&mut self, i: &mut TypeBareFn) { visit_type_bare_fn_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_group_mut(&mut self, i: &mut TypeGroup) { visit_type_group_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_impl_trait_mut(&mut self, i: &mut TypeImplTrait) { visit_type_impl_trait_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_infer_mut(&mut self, i: &mut TypeInfer) { visit_type_infer_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_macro_mut(&mut self, i: &mut TypeMacro) { visit_type_macro_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_never_mut(&mut self, i: &mut TypeNever) { visit_type_never_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_param_mut(&mut self, i: &mut TypeParam) { visit_type_param_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_param_bound_mut(&mut self, i: &mut TypeParamBound) { visit_type_param_bound_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_paren_mut(&mut self, i: &mut TypeParen) { visit_type_paren_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_path_mut(&mut self, i: &mut TypePath) { visit_type_path_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_ptr_mut(&mut self, i: &mut TypePtr) { visit_type_ptr_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_reference_mut(&mut self, i: &mut TypeReference) { visit_type_reference_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_slice_mut(&mut self, i: &mut TypeSlice) { visit_type_slice_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_trait_object_mut(&mut self, i: &mut TypeTraitObject) { visit_type_trait_object_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_tuple_mut(&mut self, i: &mut TypeTuple) { visit_type_tuple_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_type_verbatim_mut(&mut self, i: &mut TypeVerbatim) { visit_type_verbatim_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_un_op_mut(&mut self, i: &mut UnOp) { visit_un_op_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_use_glob_mut(&mut self, i: &mut UseGlob) { visit_use_glob_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_use_group_mut(&mut self, i: &mut UseGroup) { visit_use_group_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_use_name_mut(&mut self, i: &mut UseName) { visit_use_name_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_use_path_mut(&mut self, i: &mut UsePath) { visit_use_path_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_use_rename_mut(&mut self, i: &mut UseRename) { visit_use_rename_mut(self, i) }
-# [ cfg ( feature = "full" ) ]
-fn visit_use_tree_mut(&mut self, i: &mut UseTree) { visit_use_tree_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_variant_mut(&mut self, i: &mut Variant) { visit_variant_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_vis_crate_mut(&mut self, i: &mut VisCrate) { visit_vis_crate_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_vis_public_mut(&mut self, i: &mut VisPublic) { visit_vis_public_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_vis_restricted_mut(&mut self, i: &mut VisRestricted) { visit_vis_restricted_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_visibility_mut(&mut self, i: &mut Visibility) { visit_visibility_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_where_clause_mut(&mut self, i: &mut WhereClause) { visit_where_clause_mut(self, i) }
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-fn visit_where_predicate_mut(&mut self, i: &mut WherePredicate) { visit_where_predicate_mut(self, i) }
-
-}
-
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_abi_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Abi) {
-    tokens_helper(_visitor, &mut (& mut _i . extern_token).0);
-    if let Some(ref mut it) = _i . name { _visitor.visit_lit_str_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_angle_bracketed_generic_arguments_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut AngleBracketedGenericArguments) {
-    if let Some(ref mut it) = _i . colon2_token { tokens_helper(_visitor, &mut (it).0) };
-    tokens_helper(_visitor, &mut (& mut _i . lt_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . args) { let it = el.value_mut(); _visitor.visit_generic_argument_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . gt_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_arg_captured_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ArgCaptured) {
-    _visitor.visit_pat_mut(& mut _i . pat);
-    tokens_helper(_visitor, &mut (& mut _i . colon_token).0);
-    _visitor.visit_type_mut(& mut _i . ty);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_arg_self_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ArgSelf) {
-    if let Some(ref mut it) = _i . mutability { tokens_helper(_visitor, &mut (it).0) };
-    tokens_helper(_visitor, &mut (& mut _i . self_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_arg_self_ref_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ArgSelfRef) {
-    tokens_helper(_visitor, &mut (& mut _i . and_token).0);
-    if let Some(ref mut it) = _i . lifetime { _visitor.visit_lifetime_mut(it) };
-    if let Some(ref mut it) = _i . mutability { tokens_helper(_visitor, &mut (it).0) };
-    tokens_helper(_visitor, &mut (& mut _i . self_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_arm_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Arm) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    if let Some(ref mut it) = _i . leading_vert { tokens_helper(_visitor, &mut (it).0) };
-    for mut el in Punctuated::pairs_mut(& mut _i . pats) { let it = el.value_mut(); _visitor.visit_pat_mut(it) };
-    if let Some(ref mut it) = _i . guard { 
-            tokens_helper(_visitor, &mut (& mut ( it ) . 0).0);
-            _visitor.visit_expr_mut(& mut * ( it ) . 1);
-         };
-    tokens_helper(_visitor, &mut (& mut _i . fat_arrow_token).0);
-    _visitor.visit_expr_mut(& mut * _i . body);
-    if let Some(ref mut it) = _i . comma { tokens_helper(_visitor, &mut (it).0) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_attr_style_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut AttrStyle) {
-    match *_i {
-        AttrStyle::Outer => { }
-        AttrStyle::Inner(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_attribute_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Attribute) {
-    tokens_helper(_visitor, &mut (& mut _i . pound_token).0);
-    _visitor.visit_attr_style_mut(& mut _i . style);
-    tokens_helper(_visitor, &mut (& mut _i . bracket_token).0);
-    _visitor.visit_path_mut(& mut _i . path);
-    // Skipped field _i . tts;
-    // Skipped field _i . is_sugared_doc;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_bare_fn_arg_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut BareFnArg) {
-    if let Some(ref mut it) = _i . name { 
-            _visitor.visit_bare_fn_arg_name_mut(& mut ( it ) . 0);
-            tokens_helper(_visitor, &mut (& mut ( it ) . 1).0);
-         };
-    _visitor.visit_type_mut(& mut _i . ty);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_bare_fn_arg_name_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut BareFnArgName) {
-    match *_i {
-        BareFnArgName::Named(ref mut _binding_0, ) => {
-            _visitor.visit_ident_mut(_binding_0);
-        }
-        BareFnArgName::Wild(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_bin_op_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut BinOp) {
-    match *_i {
-        BinOp::Add(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Sub(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Mul(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Div(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Rem(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::And(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Or(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::BitXor(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::BitAnd(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::BitOr(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Shl(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Shr(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Eq(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Lt(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Le(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Ne(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Ge(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Gt(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::AddEq(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::SubEq(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::MulEq(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::DivEq(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::RemEq(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::BitXorEq(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::BitAndEq(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::BitOrEq(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::ShlEq(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::ShrEq(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_binding_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Binding) {
-    _visitor.visit_ident_mut(& mut _i . ident);
-    tokens_helper(_visitor, &mut (& mut _i . eq_token).0);
-    _visitor.visit_type_mut(& mut _i . ty);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_block_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Block) {
-    tokens_helper(_visitor, &mut (& mut _i . brace_token).0);
-    for it in & mut _i . stmts { _visitor.visit_stmt_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_bound_lifetimes_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut BoundLifetimes) {
-    tokens_helper(_visitor, &mut (& mut _i . for_token).0);
-    tokens_helper(_visitor, &mut (& mut _i . lt_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . lifetimes) { let it = el.value_mut(); _visitor.visit_lifetime_def_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . gt_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_const_param_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ConstParam) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . const_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    tokens_helper(_visitor, &mut (& mut _i . colon_token).0);
-    _visitor.visit_type_mut(& mut _i . ty);
-    if let Some(ref mut it) = _i . eq_token { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . default { _visitor.visit_expr_mut(it) };
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn visit_data_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Data) {
-    match *_i {
-        Data::Struct(ref mut _binding_0, ) => {
-            _visitor.visit_data_struct_mut(_binding_0);
-        }
-        Data::Enum(ref mut _binding_0, ) => {
-            _visitor.visit_data_enum_mut(_binding_0);
-        }
-        Data::Union(ref mut _binding_0, ) => {
-            _visitor.visit_data_union_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn visit_data_enum_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut DataEnum) {
-    tokens_helper(_visitor, &mut (& mut _i . enum_token).0);
-    tokens_helper(_visitor, &mut (& mut _i . brace_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . variants) { let it = el.value_mut(); _visitor.visit_variant_mut(it) };
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn visit_data_struct_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut DataStruct) {
-    tokens_helper(_visitor, &mut (& mut _i . struct_token).0);
-    _visitor.visit_fields_mut(& mut _i . fields);
-    if let Some(ref mut it) = _i . semi_token { tokens_helper(_visitor, &mut (it).0) };
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn visit_data_union_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut DataUnion) {
-    tokens_helper(_visitor, &mut (& mut _i . union_token).0);
-    _visitor.visit_fields_named_mut(& mut _i . fields);
-}
-# [ cfg ( feature = "derive" ) ]
-pub fn visit_derive_input_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut DeriveInput) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    _visitor.visit_generics_mut(& mut _i . generics);
-    _visitor.visit_data_mut(& mut _i . data);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Expr) {
-    match *_i {
-        Expr::Box(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_box_mut(_binding_0));
-        }
-        Expr::InPlace(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_in_place_mut(_binding_0));
-        }
-        Expr::Array(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_array_mut(_binding_0));
-        }
-        Expr::Call(ref mut _binding_0, ) => {
-            _visitor.visit_expr_call_mut(_binding_0);
-        }
-        Expr::MethodCall(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_method_call_mut(_binding_0));
-        }
-        Expr::Tuple(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_tuple_mut(_binding_0));
-        }
-        Expr::Binary(ref mut _binding_0, ) => {
-            _visitor.visit_expr_binary_mut(_binding_0);
-        }
-        Expr::Unary(ref mut _binding_0, ) => {
-            _visitor.visit_expr_unary_mut(_binding_0);
-        }
-        Expr::Lit(ref mut _binding_0, ) => {
-            _visitor.visit_expr_lit_mut(_binding_0);
-        }
-        Expr::Cast(ref mut _binding_0, ) => {
-            _visitor.visit_expr_cast_mut(_binding_0);
-        }
-        Expr::Type(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_type_mut(_binding_0));
-        }
-        Expr::If(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_if_mut(_binding_0));
-        }
-        Expr::IfLet(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_if_let_mut(_binding_0));
-        }
-        Expr::While(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_while_mut(_binding_0));
-        }
-        Expr::WhileLet(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_while_let_mut(_binding_0));
-        }
-        Expr::ForLoop(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_for_loop_mut(_binding_0));
-        }
-        Expr::Loop(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_loop_mut(_binding_0));
-        }
-        Expr::Match(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_match_mut(_binding_0));
-        }
-        Expr::Closure(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_closure_mut(_binding_0));
-        }
-        Expr::Unsafe(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_unsafe_mut(_binding_0));
-        }
-        Expr::Block(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_block_mut(_binding_0));
-        }
-        Expr::Assign(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_assign_mut(_binding_0));
-        }
-        Expr::AssignOp(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_assign_op_mut(_binding_0));
-        }
-        Expr::Field(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_field_mut(_binding_0));
-        }
-        Expr::Index(ref mut _binding_0, ) => {
-            _visitor.visit_expr_index_mut(_binding_0);
-        }
-        Expr::Range(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_range_mut(_binding_0));
-        }
-        Expr::Path(ref mut _binding_0, ) => {
-            _visitor.visit_expr_path_mut(_binding_0);
-        }
-        Expr::Reference(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_reference_mut(_binding_0));
-        }
-        Expr::Break(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_break_mut(_binding_0));
-        }
-        Expr::Continue(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_continue_mut(_binding_0));
-        }
-        Expr::Return(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_return_mut(_binding_0));
-        }
-        Expr::Macro(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_macro_mut(_binding_0));
-        }
-        Expr::Struct(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_struct_mut(_binding_0));
-        }
-        Expr::Repeat(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_repeat_mut(_binding_0));
-        }
-        Expr::Paren(ref mut _binding_0, ) => {
-            _visitor.visit_expr_paren_mut(_binding_0);
-        }
-        Expr::Group(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_group_mut(_binding_0));
-        }
-        Expr::Try(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_try_mut(_binding_0));
-        }
-        Expr::Catch(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_catch_mut(_binding_0));
-        }
-        Expr::Yield(ref mut _binding_0, ) => {
-            full!(_visitor.visit_expr_yield_mut(_binding_0));
-        }
-        Expr::Verbatim(ref mut _binding_0, ) => {
-            _visitor.visit_expr_verbatim_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_array_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprArray) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . bracket_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . elems) { let it = el.value_mut(); _visitor.visit_expr_mut(it) };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_assign_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprAssign) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_expr_mut(& mut * _i . left);
-    tokens_helper(_visitor, &mut (& mut _i . eq_token).0);
-    _visitor.visit_expr_mut(& mut * _i . right);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_assign_op_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprAssignOp) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_expr_mut(& mut * _i . left);
-    _visitor.visit_bin_op_mut(& mut _i . op);
-    _visitor.visit_expr_mut(& mut * _i . right);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_binary_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprBinary) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_expr_mut(& mut * _i . left);
-    _visitor.visit_bin_op_mut(& mut _i . op);
-    _visitor.visit_expr_mut(& mut * _i . right);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_block_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprBlock) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_block_mut(& mut _i . block);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_box_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprBox) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . box_token).0);
-    _visitor.visit_expr_mut(& mut * _i . expr);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_break_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprBreak) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . break_token).0);
-    if let Some(ref mut it) = _i . label { _visitor.visit_lifetime_mut(it) };
-    if let Some(ref mut it) = _i . expr { _visitor.visit_expr_mut(& mut * * it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_call_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprCall) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_expr_mut(& mut * _i . func);
-    tokens_helper(_visitor, &mut (& mut _i . paren_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . args) { let it = el.value_mut(); _visitor.visit_expr_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_cast_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprCast) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_expr_mut(& mut * _i . expr);
-    tokens_helper(_visitor, &mut (& mut _i . as_token).0);
-    _visitor.visit_type_mut(& mut * _i . ty);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_catch_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprCatch) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . do_token).0);
-    tokens_helper(_visitor, &mut (& mut _i . catch_token).0);
-    _visitor.visit_block_mut(& mut _i . block);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_closure_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprClosure) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    if let Some(ref mut it) = _i . movability { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . capture { tokens_helper(_visitor, &mut (it).0) };
-    tokens_helper(_visitor, &mut (& mut _i . or1_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . inputs) { let it = el.value_mut(); _visitor.visit_fn_arg_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . or2_token).0);
-    _visitor.visit_return_type_mut(& mut _i . output);
-    _visitor.visit_expr_mut(& mut * _i . body);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_continue_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprContinue) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . continue_token).0);
-    if let Some(ref mut it) = _i . label { _visitor.visit_lifetime_mut(it) };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_field_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprField) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_expr_mut(& mut * _i . base);
-    tokens_helper(_visitor, &mut (& mut _i . dot_token).0);
-    _visitor.visit_member_mut(& mut _i . member);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_for_loop_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprForLoop) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    if let Some(ref mut it) = _i . label { _visitor.visit_label_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . for_token).0);
-    _visitor.visit_pat_mut(& mut * _i . pat);
-    tokens_helper(_visitor, &mut (& mut _i . in_token).0);
-    _visitor.visit_expr_mut(& mut * _i . expr);
-    _visitor.visit_block_mut(& mut _i . body);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_group_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprGroup) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . group_token).0);
-    _visitor.visit_expr_mut(& mut * _i . expr);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_if_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprIf) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . if_token).0);
-    _visitor.visit_expr_mut(& mut * _i . cond);
-    _visitor.visit_block_mut(& mut _i . then_branch);
-    if let Some(ref mut it) = _i . else_branch { 
-            tokens_helper(_visitor, &mut (& mut ( it ) . 0).0);
-            _visitor.visit_expr_mut(& mut * ( it ) . 1);
-         };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_if_let_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprIfLet) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . if_token).0);
-    tokens_helper(_visitor, &mut (& mut _i . let_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . pats) { let it = el.value_mut(); _visitor.visit_pat_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . eq_token).0);
-    _visitor.visit_expr_mut(& mut * _i . expr);
-    _visitor.visit_block_mut(& mut _i . then_branch);
-    if let Some(ref mut it) = _i . else_branch { 
-            tokens_helper(_visitor, &mut (& mut ( it ) . 0).0);
-            _visitor.visit_expr_mut(& mut * ( it ) . 1);
-         };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_in_place_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprInPlace) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_expr_mut(& mut * _i . place);
-    tokens_helper(_visitor, &mut (& mut _i . arrow_token).0);
-    _visitor.visit_expr_mut(& mut * _i . value);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_index_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprIndex) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_expr_mut(& mut * _i . expr);
-    tokens_helper(_visitor, &mut (& mut _i . bracket_token).0);
-    _visitor.visit_expr_mut(& mut * _i . index);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_lit_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprLit) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_lit_mut(& mut _i . lit);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_loop_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprLoop) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    if let Some(ref mut it) = _i . label { _visitor.visit_label_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . loop_token).0);
-    _visitor.visit_block_mut(& mut _i . body);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_macro_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprMacro) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_macro_mut(& mut _i . mac);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_match_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprMatch) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . match_token).0);
-    _visitor.visit_expr_mut(& mut * _i . expr);
-    tokens_helper(_visitor, &mut (& mut _i . brace_token).0);
-    for it in & mut _i . arms { _visitor.visit_arm_mut(it) };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_method_call_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprMethodCall) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_expr_mut(& mut * _i . receiver);
-    tokens_helper(_visitor, &mut (& mut _i . dot_token).0);
-    _visitor.visit_ident_mut(& mut _i . method);
-    if let Some(ref mut it) = _i . turbofish { _visitor.visit_method_turbofish_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . paren_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . args) { let it = el.value_mut(); _visitor.visit_expr_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_paren_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprParen) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . paren_token).0);
-    _visitor.visit_expr_mut(& mut * _i . expr);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_path_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprPath) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    if let Some(ref mut it) = _i . qself { _visitor.visit_qself_mut(it) };
-    _visitor.visit_path_mut(& mut _i . path);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_range_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprRange) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    if let Some(ref mut it) = _i . from { _visitor.visit_expr_mut(& mut * * it) };
-    _visitor.visit_range_limits_mut(& mut _i . limits);
-    if let Some(ref mut it) = _i . to { _visitor.visit_expr_mut(& mut * * it) };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_reference_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprReference) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . and_token).0);
-    if let Some(ref mut it) = _i . mutability { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_expr_mut(& mut * _i . expr);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_repeat_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprRepeat) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . bracket_token).0);
-    _visitor.visit_expr_mut(& mut * _i . expr);
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-    _visitor.visit_expr_mut(& mut * _i . len);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_return_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprReturn) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . return_token).0);
-    if let Some(ref mut it) = _i . expr { _visitor.visit_expr_mut(& mut * * it) };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_struct_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprStruct) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_path_mut(& mut _i . path);
-    tokens_helper(_visitor, &mut (& mut _i . brace_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . fields) { let it = el.value_mut(); _visitor.visit_field_value_mut(it) };
-    if let Some(ref mut it) = _i . dot2_token { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . rest { _visitor.visit_expr_mut(& mut * * it) };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_try_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprTry) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_expr_mut(& mut * _i . expr);
-    tokens_helper(_visitor, &mut (& mut _i . question_token).0);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_tuple_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprTuple) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . paren_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . elems) { let it = el.value_mut(); _visitor.visit_expr_mut(it) };
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprType) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_expr_mut(& mut * _i . expr);
-    tokens_helper(_visitor, &mut (& mut _i . colon_token).0);
-    _visitor.visit_type_mut(& mut * _i . ty);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_unary_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprUnary) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_un_op_mut(& mut _i . op);
-    _visitor.visit_expr_mut(& mut * _i . expr);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_unsafe_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprUnsafe) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . unsafe_token).0);
-    _visitor.visit_block_mut(& mut _i . block);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_verbatim_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprVerbatim) {
-    // Skipped field _i . tts;
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_while_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprWhile) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    if let Some(ref mut it) = _i . label { _visitor.visit_label_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . while_token).0);
-    _visitor.visit_expr_mut(& mut * _i . cond);
-    _visitor.visit_block_mut(& mut _i . body);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_while_let_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprWhileLet) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    if let Some(ref mut it) = _i . label { _visitor.visit_label_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . while_token).0);
-    tokens_helper(_visitor, &mut (& mut _i . let_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . pats) { let it = el.value_mut(); _visitor.visit_pat_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . eq_token).0);
-    _visitor.visit_expr_mut(& mut * _i . expr);
-    _visitor.visit_block_mut(& mut _i . body);
-}
-# [ cfg ( feature = "full" ) ] # [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_expr_yield_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprYield) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . yield_token).0);
-    if let Some(ref mut it) = _i . expr { _visitor.visit_expr_mut(& mut * * it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_field_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Field) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    if let Some(ref mut it) = _i . ident { _visitor.visit_ident_mut(it) };
-    if let Some(ref mut it) = _i . colon_token { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_type_mut(& mut _i . ty);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_field_pat_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut FieldPat) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_member_mut(& mut _i . member);
-    if let Some(ref mut it) = _i . colon_token { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_pat_mut(& mut * _i . pat);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_field_value_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut FieldValue) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_member_mut(& mut _i . member);
-    if let Some(ref mut it) = _i . colon_token { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_expr_mut(& mut _i . expr);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_fields_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Fields) {
-    match *_i {
-        Fields::Named(ref mut _binding_0, ) => {
-            _visitor.visit_fields_named_mut(_binding_0);
-        }
-        Fields::Unnamed(ref mut _binding_0, ) => {
-            _visitor.visit_fields_unnamed_mut(_binding_0);
-        }
-        Fields::Unit => { }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_fields_named_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut FieldsNamed) {
-    tokens_helper(_visitor, &mut (& mut _i . brace_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . named) { let it = el.value_mut(); _visitor.visit_field_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_fields_unnamed_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut FieldsUnnamed) {
-    tokens_helper(_visitor, &mut (& mut _i . paren_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . unnamed) { let it = el.value_mut(); _visitor.visit_field_mut(it) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_file_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut File) {
-    // Skipped field _i . shebang;
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    for it in & mut _i . items { _visitor.visit_item_mut(it) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_fn_arg_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut FnArg) {
-    match *_i {
-        FnArg::SelfRef(ref mut _binding_0, ) => {
-            _visitor.visit_arg_self_ref_mut(_binding_0);
-        }
-        FnArg::SelfValue(ref mut _binding_0, ) => {
-            _visitor.visit_arg_self_mut(_binding_0);
-        }
-        FnArg::Captured(ref mut _binding_0, ) => {
-            _visitor.visit_arg_captured_mut(_binding_0);
-        }
-        FnArg::Inferred(ref mut _binding_0, ) => {
-            _visitor.visit_pat_mut(_binding_0);
-        }
-        FnArg::Ignored(ref mut _binding_0, ) => {
-            _visitor.visit_type_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_fn_decl_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut FnDecl) {
-    tokens_helper(_visitor, &mut (& mut _i . fn_token).0);
-    _visitor.visit_generics_mut(& mut _i . generics);
-    tokens_helper(_visitor, &mut (& mut _i . paren_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . inputs) { let it = el.value_mut(); _visitor.visit_fn_arg_mut(it) };
-    if let Some(ref mut it) = _i . variadic { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_return_type_mut(& mut _i . output);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_foreign_item_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ForeignItem) {
-    match *_i {
-        ForeignItem::Fn(ref mut _binding_0, ) => {
-            _visitor.visit_foreign_item_fn_mut(_binding_0);
-        }
-        ForeignItem::Static(ref mut _binding_0, ) => {
-            _visitor.visit_foreign_item_static_mut(_binding_0);
-        }
-        ForeignItem::Type(ref mut _binding_0, ) => {
-            _visitor.visit_foreign_item_type_mut(_binding_0);
-        }
-        ForeignItem::Verbatim(ref mut _binding_0, ) => {
-            _visitor.visit_foreign_item_verbatim_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_foreign_item_fn_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ForeignItemFn) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    _visitor.visit_fn_decl_mut(& mut * _i . decl);
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_foreign_item_static_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ForeignItemStatic) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    tokens_helper(_visitor, &mut (& mut _i . static_token).0);
-    if let Some(ref mut it) = _i . mutability { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_ident_mut(& mut _i . ident);
-    tokens_helper(_visitor, &mut (& mut _i . colon_token).0);
-    _visitor.visit_type_mut(& mut * _i . ty);
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_foreign_item_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ForeignItemType) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    tokens_helper(_visitor, &mut (& mut _i . type_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_foreign_item_verbatim_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ForeignItemVerbatim) {
-    // Skipped field _i . tts;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_generic_argument_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut GenericArgument) {
-    match *_i {
-        GenericArgument::Lifetime(ref mut _binding_0, ) => {
-            _visitor.visit_lifetime_mut(_binding_0);
-        }
-        GenericArgument::Type(ref mut _binding_0, ) => {
-            _visitor.visit_type_mut(_binding_0);
-        }
-        GenericArgument::Binding(ref mut _binding_0, ) => {
-            _visitor.visit_binding_mut(_binding_0);
-        }
-        GenericArgument::Const(ref mut _binding_0, ) => {
-            _visitor.visit_expr_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_generic_method_argument_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut GenericMethodArgument) {
-    match *_i {
-        GenericMethodArgument::Type(ref mut _binding_0, ) => {
-            _visitor.visit_type_mut(_binding_0);
-        }
-        GenericMethodArgument::Const(ref mut _binding_0, ) => {
-            _visitor.visit_expr_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_generic_param_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut GenericParam) {
-    match *_i {
-        GenericParam::Type(ref mut _binding_0, ) => {
-            _visitor.visit_type_param_mut(_binding_0);
-        }
-        GenericParam::Lifetime(ref mut _binding_0, ) => {
-            _visitor.visit_lifetime_def_mut(_binding_0);
-        }
-        GenericParam::Const(ref mut _binding_0, ) => {
-            _visitor.visit_const_param_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_generics_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Generics) {
-    if let Some(ref mut it) = _i . lt_token { tokens_helper(_visitor, &mut (it).0) };
-    for mut el in Punctuated::pairs_mut(& mut _i . params) { let it = el.value_mut(); _visitor.visit_generic_param_mut(it) };
-    if let Some(ref mut it) = _i . gt_token { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . where_clause { _visitor.visit_where_clause_mut(it) };
-}
-
-pub fn visit_ident_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Ident) {
-    // Skipped field _i . term;
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_impl_item_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ImplItem) {
-    match *_i {
-        ImplItem::Const(ref mut _binding_0, ) => {
-            _visitor.visit_impl_item_const_mut(_binding_0);
-        }
-        ImplItem::Method(ref mut _binding_0, ) => {
-            _visitor.visit_impl_item_method_mut(_binding_0);
-        }
-        ImplItem::Type(ref mut _binding_0, ) => {
-            _visitor.visit_impl_item_type_mut(_binding_0);
-        }
-        ImplItem::Macro(ref mut _binding_0, ) => {
-            _visitor.visit_impl_item_macro_mut(_binding_0);
-        }
-        ImplItem::Verbatim(ref mut _binding_0, ) => {
-            _visitor.visit_impl_item_verbatim_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_impl_item_const_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ImplItemConst) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    if let Some(ref mut it) = _i . defaultness { tokens_helper(_visitor, &mut (it).0) };
-    tokens_helper(_visitor, &mut (& mut _i . const_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    tokens_helper(_visitor, &mut (& mut _i . colon_token).0);
-    _visitor.visit_type_mut(& mut _i . ty);
-    tokens_helper(_visitor, &mut (& mut _i . eq_token).0);
-    _visitor.visit_expr_mut(& mut _i . expr);
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_impl_item_macro_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ImplItemMacro) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_macro_mut(& mut _i . mac);
-    if let Some(ref mut it) = _i . semi_token { tokens_helper(_visitor, &mut (it).0) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_impl_item_method_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ImplItemMethod) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    if let Some(ref mut it) = _i . defaultness { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_method_sig_mut(& mut _i . sig);
-    _visitor.visit_block_mut(& mut _i . block);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_impl_item_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ImplItemType) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    if let Some(ref mut it) = _i . defaultness { tokens_helper(_visitor, &mut (it).0) };
-    tokens_helper(_visitor, &mut (& mut _i . type_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    _visitor.visit_generics_mut(& mut _i . generics);
-    tokens_helper(_visitor, &mut (& mut _i . eq_token).0);
-    _visitor.visit_type_mut(& mut _i . ty);
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_impl_item_verbatim_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ImplItemVerbatim) {
-    // Skipped field _i . tts;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_index_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Index) {
-    // Skipped field _i . index;
-    _visitor.visit_span_mut(& mut _i . span);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Item) {
-    match *_i {
-        Item::ExternCrate(ref mut _binding_0, ) => {
-            _visitor.visit_item_extern_crate_mut(_binding_0);
-        }
-        Item::Use(ref mut _binding_0, ) => {
-            _visitor.visit_item_use_mut(_binding_0);
-        }
-        Item::Static(ref mut _binding_0, ) => {
-            _visitor.visit_item_static_mut(_binding_0);
-        }
-        Item::Const(ref mut _binding_0, ) => {
-            _visitor.visit_item_const_mut(_binding_0);
-        }
-        Item::Fn(ref mut _binding_0, ) => {
-            _visitor.visit_item_fn_mut(_binding_0);
-        }
-        Item::Mod(ref mut _binding_0, ) => {
-            _visitor.visit_item_mod_mut(_binding_0);
-        }
-        Item::ForeignMod(ref mut _binding_0, ) => {
-            _visitor.visit_item_foreign_mod_mut(_binding_0);
-        }
-        Item::Type(ref mut _binding_0, ) => {
-            _visitor.visit_item_type_mut(_binding_0);
-        }
-        Item::Struct(ref mut _binding_0, ) => {
-            _visitor.visit_item_struct_mut(_binding_0);
-        }
-        Item::Enum(ref mut _binding_0, ) => {
-            _visitor.visit_item_enum_mut(_binding_0);
-        }
-        Item::Union(ref mut _binding_0, ) => {
-            _visitor.visit_item_union_mut(_binding_0);
-        }
-        Item::Trait(ref mut _binding_0, ) => {
-            _visitor.visit_item_trait_mut(_binding_0);
-        }
-        Item::Impl(ref mut _binding_0, ) => {
-            _visitor.visit_item_impl_mut(_binding_0);
-        }
-        Item::Macro(ref mut _binding_0, ) => {
-            _visitor.visit_item_macro_mut(_binding_0);
-        }
-        Item::Macro2(ref mut _binding_0, ) => {
-            _visitor.visit_item_macro2_mut(_binding_0);
-        }
-        Item::Verbatim(ref mut _binding_0, ) => {
-            _visitor.visit_item_verbatim_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_const_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemConst) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    tokens_helper(_visitor, &mut (& mut _i . const_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    tokens_helper(_visitor, &mut (& mut _i . colon_token).0);
-    _visitor.visit_type_mut(& mut * _i . ty);
-    tokens_helper(_visitor, &mut (& mut _i . eq_token).0);
-    _visitor.visit_expr_mut(& mut * _i . expr);
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_enum_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemEnum) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    tokens_helper(_visitor, &mut (& mut _i . enum_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    _visitor.visit_generics_mut(& mut _i . generics);
-    tokens_helper(_visitor, &mut (& mut _i . brace_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . variants) { let it = el.value_mut(); _visitor.visit_variant_mut(it) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_extern_crate_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemExternCrate) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    tokens_helper(_visitor, &mut (& mut _i . extern_token).0);
-    tokens_helper(_visitor, &mut (& mut _i . crate_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    if let Some(ref mut it) = _i . rename { 
-            tokens_helper(_visitor, &mut (& mut ( it ) . 0).0);
-            _visitor.visit_ident_mut(& mut ( it ) . 1);
-         };
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_fn_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemFn) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    if let Some(ref mut it) = _i . constness { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . unsafety { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . abi { _visitor.visit_abi_mut(it) };
-    _visitor.visit_ident_mut(& mut _i . ident);
-    _visitor.visit_fn_decl_mut(& mut * _i . decl);
-    _visitor.visit_block_mut(& mut * _i . block);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_foreign_mod_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemForeignMod) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_abi_mut(& mut _i . abi);
-    tokens_helper(_visitor, &mut (& mut _i . brace_token).0);
-    for it in & mut _i . items { _visitor.visit_foreign_item_mut(it) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_impl_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemImpl) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    if let Some(ref mut it) = _i . defaultness { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . unsafety { tokens_helper(_visitor, &mut (it).0) };
-    tokens_helper(_visitor, &mut (& mut _i . impl_token).0);
-    _visitor.visit_generics_mut(& mut _i . generics);
-    if let Some(ref mut it) = _i . trait_ { 
-            if let Some(ref mut it) = ( it ) . 0 { tokens_helper(_visitor, &mut (it).0) };
-            _visitor.visit_path_mut(& mut ( it ) . 1);
-            tokens_helper(_visitor, &mut (& mut ( it ) . 2).0);
-         };
-    _visitor.visit_type_mut(& mut * _i . self_ty);
-    tokens_helper(_visitor, &mut (& mut _i . brace_token).0);
-    for it in & mut _i . items { _visitor.visit_impl_item_mut(it) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_macro_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemMacro) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    if let Some(ref mut it) = _i . ident { _visitor.visit_ident_mut(it) };
-    _visitor.visit_macro_mut(& mut _i . mac);
-    if let Some(ref mut it) = _i . semi_token { tokens_helper(_visitor, &mut (it).0) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_macro2_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemMacro2) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    tokens_helper(_visitor, &mut (& mut _i . macro_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    tokens_helper(_visitor, &mut (& mut _i . paren_token).0);
-    // Skipped field _i . args;
-    tokens_helper(_visitor, &mut (& mut _i . brace_token).0);
-    // Skipped field _i . body;
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_mod_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemMod) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    tokens_helper(_visitor, &mut (& mut _i . mod_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    if let Some(ref mut it) = _i . content { 
-            tokens_helper(_visitor, &mut (& mut ( it ) . 0).0);
-            for it in & mut ( it ) . 1 { _visitor.visit_item_mut(it) };
-         };
-    if let Some(ref mut it) = _i . semi { tokens_helper(_visitor, &mut (it).0) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_static_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemStatic) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    tokens_helper(_visitor, &mut (& mut _i . static_token).0);
-    if let Some(ref mut it) = _i . mutability { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_ident_mut(& mut _i . ident);
-    tokens_helper(_visitor, &mut (& mut _i . colon_token).0);
-    _visitor.visit_type_mut(& mut * _i . ty);
-    tokens_helper(_visitor, &mut (& mut _i . eq_token).0);
-    _visitor.visit_expr_mut(& mut * _i . expr);
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_struct_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemStruct) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    tokens_helper(_visitor, &mut (& mut _i . struct_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    _visitor.visit_generics_mut(& mut _i . generics);
-    _visitor.visit_fields_mut(& mut _i . fields);
-    if let Some(ref mut it) = _i . semi_token { tokens_helper(_visitor, &mut (it).0) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_trait_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemTrait) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    if let Some(ref mut it) = _i . unsafety { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . auto_token { tokens_helper(_visitor, &mut (it).0) };
-    tokens_helper(_visitor, &mut (& mut _i . trait_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    _visitor.visit_generics_mut(& mut _i . generics);
-    if let Some(ref mut it) = _i . colon_token { tokens_helper(_visitor, &mut (it).0) };
-    for mut el in Punctuated::pairs_mut(& mut _i . supertraits) { let it = el.value_mut(); _visitor.visit_type_param_bound_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . brace_token).0);
-    for it in & mut _i . items { _visitor.visit_trait_item_mut(it) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemType) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    tokens_helper(_visitor, &mut (& mut _i . type_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    _visitor.visit_generics_mut(& mut _i . generics);
-    tokens_helper(_visitor, &mut (& mut _i . eq_token).0);
-    _visitor.visit_type_mut(& mut * _i . ty);
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_union_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemUnion) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    tokens_helper(_visitor, &mut (& mut _i . union_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    _visitor.visit_generics_mut(& mut _i . generics);
-    _visitor.visit_fields_named_mut(& mut _i . fields);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_use_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemUse) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_visibility_mut(& mut _i . vis);
-    tokens_helper(_visitor, &mut (& mut _i . use_token).0);
-    if let Some(ref mut it) = _i . leading_colon { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_use_tree_mut(& mut _i . tree);
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_item_verbatim_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemVerbatim) {
-    // Skipped field _i . tts;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_label_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Label) {
-    _visitor.visit_lifetime_mut(& mut _i . name);
-    tokens_helper(_visitor, &mut (& mut _i . colon_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lifetime_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Lifetime) {
-    // Skipped field _i . term;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lifetime_def_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LifetimeDef) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_lifetime_mut(& mut _i . lifetime);
-    if let Some(ref mut it) = _i . colon_token { tokens_helper(_visitor, &mut (it).0) };
-    for mut el in Punctuated::pairs_mut(& mut _i . bounds) { let it = el.value_mut(); _visitor.visit_lifetime_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Lit) {
-    match *_i {
-        Lit::Str(ref mut _binding_0, ) => {
-            _visitor.visit_lit_str_mut(_binding_0);
-        }
-        Lit::ByteStr(ref mut _binding_0, ) => {
-            _visitor.visit_lit_byte_str_mut(_binding_0);
-        }
-        Lit::Byte(ref mut _binding_0, ) => {
-            _visitor.visit_lit_byte_mut(_binding_0);
-        }
-        Lit::Char(ref mut _binding_0, ) => {
-            _visitor.visit_lit_char_mut(_binding_0);
-        }
-        Lit::Int(ref mut _binding_0, ) => {
-            _visitor.visit_lit_int_mut(_binding_0);
-        }
-        Lit::Float(ref mut _binding_0, ) => {
-            _visitor.visit_lit_float_mut(_binding_0);
-        }
-        Lit::Bool(ref mut _binding_0, ) => {
-            _visitor.visit_lit_bool_mut(_binding_0);
-        }
-        Lit::Verbatim(ref mut _binding_0, ) => {
-            _visitor.visit_lit_verbatim_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_bool_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitBool) {
-    // Skipped field _i . value;
-    _visitor.visit_span_mut(& mut _i . span);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_byte_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitByte) {
-    // Skipped field _i . token;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_byte_str_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitByteStr) {
-    // Skipped field _i . token;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_char_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitChar) {
-    // Skipped field _i . token;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_float_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitFloat) {
-    // Skipped field _i . token;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_int_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitInt) {
-    // Skipped field _i . token;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_str_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitStr) {
-    // Skipped field _i . token;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_lit_verbatim_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitVerbatim) {
-    // Skipped field _i . token;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_local_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Local) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . let_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . pats) { let it = el.value_mut(); _visitor.visit_pat_mut(it) };
-    if let Some(ref mut it) = _i . ty { 
-            tokens_helper(_visitor, &mut (& mut ( it ) . 0).0);
-            _visitor.visit_type_mut(& mut * ( it ) . 1);
-         };
-    if let Some(ref mut it) = _i . init { 
-            tokens_helper(_visitor, &mut (& mut ( it ) . 0).0);
-            _visitor.visit_expr_mut(& mut * ( it ) . 1);
-         };
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_macro_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Macro) {
-    _visitor.visit_path_mut(& mut _i . path);
-    tokens_helper(_visitor, &mut (& mut _i . bang_token).0);
-    _visitor.visit_macro_delimiter_mut(& mut _i . delimiter);
-    // Skipped field _i . tts;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_macro_delimiter_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut MacroDelimiter) {
-    match *_i {
-        MacroDelimiter::Paren(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        MacroDelimiter::Brace(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        MacroDelimiter::Bracket(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_member_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Member) {
-    match *_i {
-        Member::Named(ref mut _binding_0, ) => {
-            _visitor.visit_ident_mut(_binding_0);
-        }
-        Member::Unnamed(ref mut _binding_0, ) => {
-            _visitor.visit_index_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_meta_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Meta) {
-    match *_i {
-        Meta::Word(ref mut _binding_0, ) => {
-            _visitor.visit_ident_mut(_binding_0);
-        }
-        Meta::List(ref mut _binding_0, ) => {
-            _visitor.visit_meta_list_mut(_binding_0);
-        }
-        Meta::NameValue(ref mut _binding_0, ) => {
-            _visitor.visit_meta_name_value_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_meta_list_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut MetaList) {
-    _visitor.visit_ident_mut(& mut _i . ident);
-    tokens_helper(_visitor, &mut (& mut _i . paren_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . nested) { let it = el.value_mut(); _visitor.visit_nested_meta_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_meta_name_value_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut MetaNameValue) {
-    _visitor.visit_ident_mut(& mut _i . ident);
-    tokens_helper(_visitor, &mut (& mut _i . eq_token).0);
-    _visitor.visit_lit_mut(& mut _i . lit);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_method_sig_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut MethodSig) {
-    if let Some(ref mut it) = _i . constness { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . unsafety { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . abi { _visitor.visit_abi_mut(it) };
-    _visitor.visit_ident_mut(& mut _i . ident);
-    _visitor.visit_fn_decl_mut(& mut _i . decl);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_method_turbofish_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut MethodTurbofish) {
-    tokens_helper(_visitor, &mut (& mut _i . colon2_token).0);
-    tokens_helper(_visitor, &mut (& mut _i . lt_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . args) { let it = el.value_mut(); _visitor.visit_generic_method_argument_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . gt_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_nested_meta_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut NestedMeta) {
-    match *_i {
-        NestedMeta::Meta(ref mut _binding_0, ) => {
-            _visitor.visit_meta_mut(_binding_0);
-        }
-        NestedMeta::Literal(ref mut _binding_0, ) => {
-            _visitor.visit_lit_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_parenthesized_generic_arguments_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ParenthesizedGenericArguments) {
-    tokens_helper(_visitor, &mut (& mut _i . paren_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . inputs) { let it = el.value_mut(); _visitor.visit_type_mut(it) };
-    _visitor.visit_return_type_mut(& mut _i . output);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Pat) {
-    match *_i {
-        Pat::Wild(ref mut _binding_0, ) => {
-            _visitor.visit_pat_wild_mut(_binding_0);
-        }
-        Pat::Ident(ref mut _binding_0, ) => {
-            _visitor.visit_pat_ident_mut(_binding_0);
-        }
-        Pat::Struct(ref mut _binding_0, ) => {
-            _visitor.visit_pat_struct_mut(_binding_0);
-        }
-        Pat::TupleStruct(ref mut _binding_0, ) => {
-            _visitor.visit_pat_tuple_struct_mut(_binding_0);
-        }
-        Pat::Path(ref mut _binding_0, ) => {
-            _visitor.visit_pat_path_mut(_binding_0);
-        }
-        Pat::Tuple(ref mut _binding_0, ) => {
-            _visitor.visit_pat_tuple_mut(_binding_0);
-        }
-        Pat::Box(ref mut _binding_0, ) => {
-            _visitor.visit_pat_box_mut(_binding_0);
-        }
-        Pat::Ref(ref mut _binding_0, ) => {
-            _visitor.visit_pat_ref_mut(_binding_0);
-        }
-        Pat::Lit(ref mut _binding_0, ) => {
-            _visitor.visit_pat_lit_mut(_binding_0);
-        }
-        Pat::Range(ref mut _binding_0, ) => {
-            _visitor.visit_pat_range_mut(_binding_0);
-        }
-        Pat::Slice(ref mut _binding_0, ) => {
-            _visitor.visit_pat_slice_mut(_binding_0);
-        }
-        Pat::Macro(ref mut _binding_0, ) => {
-            _visitor.visit_pat_macro_mut(_binding_0);
-        }
-        Pat::Verbatim(ref mut _binding_0, ) => {
-            _visitor.visit_pat_verbatim_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_box_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatBox) {
-    tokens_helper(_visitor, &mut (& mut _i . box_token).0);
-    _visitor.visit_pat_mut(& mut * _i . pat);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_ident_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatIdent) {
-    if let Some(ref mut it) = _i . by_ref { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . mutability { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_ident_mut(& mut _i . ident);
-    if let Some(ref mut it) = _i . subpat { 
-            tokens_helper(_visitor, &mut (& mut ( it ) . 0).0);
-            _visitor.visit_pat_mut(& mut * ( it ) . 1);
-         };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_lit_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatLit) {
-    _visitor.visit_expr_mut(& mut * _i . expr);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_macro_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatMacro) {
-    _visitor.visit_macro_mut(& mut _i . mac);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_path_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatPath) {
-    if let Some(ref mut it) = _i . qself { _visitor.visit_qself_mut(it) };
-    _visitor.visit_path_mut(& mut _i . path);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_range_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatRange) {
-    _visitor.visit_expr_mut(& mut * _i . lo);
-    _visitor.visit_range_limits_mut(& mut _i . limits);
-    _visitor.visit_expr_mut(& mut * _i . hi);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_ref_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatRef) {
-    tokens_helper(_visitor, &mut (& mut _i . and_token).0);
-    if let Some(ref mut it) = _i . mutability { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_pat_mut(& mut * _i . pat);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_slice_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatSlice) {
-    tokens_helper(_visitor, &mut (& mut _i . bracket_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . front) { let it = el.value_mut(); _visitor.visit_pat_mut(it) };
-    if let Some(ref mut it) = _i . middle { _visitor.visit_pat_mut(& mut * * it) };
-    if let Some(ref mut it) = _i . dot2_token { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . comma_token { tokens_helper(_visitor, &mut (it).0) };
-    for mut el in Punctuated::pairs_mut(& mut _i . back) { let it = el.value_mut(); _visitor.visit_pat_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_struct_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatStruct) {
-    _visitor.visit_path_mut(& mut _i . path);
-    tokens_helper(_visitor, &mut (& mut _i . brace_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . fields) { let it = el.value_mut(); _visitor.visit_field_pat_mut(it) };
-    if let Some(ref mut it) = _i . dot2_token { tokens_helper(_visitor, &mut (it).0) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_tuple_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatTuple) {
-    tokens_helper(_visitor, &mut (& mut _i . paren_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . front) { let it = el.value_mut(); _visitor.visit_pat_mut(it) };
-    if let Some(ref mut it) = _i . dot2_token { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . comma_token { tokens_helper(_visitor, &mut (it).0) };
-    for mut el in Punctuated::pairs_mut(& mut _i . back) { let it = el.value_mut(); _visitor.visit_pat_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_tuple_struct_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatTupleStruct) {
-    _visitor.visit_path_mut(& mut _i . path);
-    _visitor.visit_pat_tuple_mut(& mut _i . pat);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_verbatim_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatVerbatim) {
-    // Skipped field _i . tts;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_pat_wild_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatWild) {
-    tokens_helper(_visitor, &mut (& mut _i . underscore_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_path_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Path) {
-    if let Some(ref mut it) = _i . leading_colon { tokens_helper(_visitor, &mut (it).0) };
-    for mut el in Punctuated::pairs_mut(& mut _i . segments) { let it = el.value_mut(); _visitor.visit_path_segment_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_path_arguments_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PathArguments) {
-    match *_i {
-        PathArguments::None => { }
-        PathArguments::AngleBracketed(ref mut _binding_0, ) => {
-            _visitor.visit_angle_bracketed_generic_arguments_mut(_binding_0);
-        }
-        PathArguments::Parenthesized(ref mut _binding_0, ) => {
-            _visitor.visit_parenthesized_generic_arguments_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_path_segment_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PathSegment) {
-    _visitor.visit_ident_mut(& mut _i . ident);
-    _visitor.visit_path_arguments_mut(& mut _i . arguments);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_predicate_eq_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PredicateEq) {
-    _visitor.visit_type_mut(& mut _i . lhs_ty);
-    tokens_helper(_visitor, &mut (& mut _i . eq_token).0);
-    _visitor.visit_type_mut(& mut _i . rhs_ty);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_predicate_lifetime_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PredicateLifetime) {
-    _visitor.visit_lifetime_mut(& mut _i . lifetime);
-    if let Some(ref mut it) = _i . colon_token { tokens_helper(_visitor, &mut (it).0) };
-    for mut el in Punctuated::pairs_mut(& mut _i . bounds) { let it = el.value_mut(); _visitor.visit_lifetime_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_predicate_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PredicateType) {
-    if let Some(ref mut it) = _i . lifetimes { _visitor.visit_bound_lifetimes_mut(it) };
-    _visitor.visit_type_mut(& mut _i . bounded_ty);
-    tokens_helper(_visitor, &mut (& mut _i . colon_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . bounds) { let it = el.value_mut(); _visitor.visit_type_param_bound_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_qself_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut QSelf) {
-    tokens_helper(_visitor, &mut (& mut _i . lt_token).0);
-    _visitor.visit_type_mut(& mut * _i . ty);
-    // Skipped field _i . position;
-    if let Some(ref mut it) = _i . as_token { tokens_helper(_visitor, &mut (it).0) };
-    tokens_helper(_visitor, &mut (& mut _i . gt_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_range_limits_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut RangeLimits) {
-    match *_i {
-        RangeLimits::HalfOpen(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        RangeLimits::Closed(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_return_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ReturnType) {
-    match *_i {
-        ReturnType::Default => { }
-        ReturnType::Type(ref mut _binding_0, ref mut _binding_1, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-            _visitor.visit_type_mut(& mut * * _binding_1);
-        }
-    }
-}
-
-pub fn visit_span_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Span) {
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ] # [ cfg ( feature = "full" ) ]
-pub fn visit_stmt_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Stmt) {
-    match *_i {
-        Stmt::Local(ref mut _binding_0, ) => {
-            _visitor.visit_local_mut(_binding_0);
-        }
-        Stmt::Item(ref mut _binding_0, ) => {
-            _visitor.visit_item_mut(_binding_0);
-        }
-        Stmt::Expr(ref mut _binding_0, ) => {
-            _visitor.visit_expr_mut(_binding_0);
-        }
-        Stmt::Semi(ref mut _binding_0, ref mut _binding_1, ) => {
-            _visitor.visit_expr_mut(_binding_0);
-            tokens_helper(_visitor, &mut (_binding_1).0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_trait_bound_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TraitBound) {
-    if let Some(ref mut it) = _i . paren_token { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_trait_bound_modifier_mut(& mut _i . modifier);
-    if let Some(ref mut it) = _i . lifetimes { _visitor.visit_bound_lifetimes_mut(it) };
-    _visitor.visit_path_mut(& mut _i . path);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_trait_bound_modifier_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TraitBoundModifier) {
-    match *_i {
-        TraitBoundModifier::None => { }
-        TraitBoundModifier::Maybe(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_trait_item_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TraitItem) {
-    match *_i {
-        TraitItem::Const(ref mut _binding_0, ) => {
-            _visitor.visit_trait_item_const_mut(_binding_0);
-        }
-        TraitItem::Method(ref mut _binding_0, ) => {
-            _visitor.visit_trait_item_method_mut(_binding_0);
-        }
-        TraitItem::Type(ref mut _binding_0, ) => {
-            _visitor.visit_trait_item_type_mut(_binding_0);
-        }
-        TraitItem::Macro(ref mut _binding_0, ) => {
-            _visitor.visit_trait_item_macro_mut(_binding_0);
-        }
-        TraitItem::Verbatim(ref mut _binding_0, ) => {
-            _visitor.visit_trait_item_verbatim_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_trait_item_const_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TraitItemConst) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . const_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    tokens_helper(_visitor, &mut (& mut _i . colon_token).0);
-    _visitor.visit_type_mut(& mut _i . ty);
-    if let Some(ref mut it) = _i . default { 
-            tokens_helper(_visitor, &mut (& mut ( it ) . 0).0);
-            _visitor.visit_expr_mut(& mut ( it ) . 1);
-         };
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_trait_item_macro_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TraitItemMacro) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_macro_mut(& mut _i . mac);
-    if let Some(ref mut it) = _i . semi_token { tokens_helper(_visitor, &mut (it).0) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_trait_item_method_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TraitItemMethod) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_method_sig_mut(& mut _i . sig);
-    if let Some(ref mut it) = _i . default { _visitor.visit_block_mut(it) };
-    if let Some(ref mut it) = _i . semi_token { tokens_helper(_visitor, &mut (it).0) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_trait_item_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TraitItemType) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . type_token).0);
-    _visitor.visit_ident_mut(& mut _i . ident);
-    _visitor.visit_generics_mut(& mut _i . generics);
-    if let Some(ref mut it) = _i . colon_token { tokens_helper(_visitor, &mut (it).0) };
-    for mut el in Punctuated::pairs_mut(& mut _i . bounds) { let it = el.value_mut(); _visitor.visit_type_param_bound_mut(it) };
-    if let Some(ref mut it) = _i . default { 
-            tokens_helper(_visitor, &mut (& mut ( it ) . 0).0);
-            _visitor.visit_type_mut(& mut ( it ) . 1);
-         };
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_trait_item_verbatim_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TraitItemVerbatim) {
-    // Skipped field _i . tts;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Type) {
-    match *_i {
-        Type::Slice(ref mut _binding_0, ) => {
-            _visitor.visit_type_slice_mut(_binding_0);
-        }
-        Type::Array(ref mut _binding_0, ) => {
-            _visitor.visit_type_array_mut(_binding_0);
-        }
-        Type::Ptr(ref mut _binding_0, ) => {
-            _visitor.visit_type_ptr_mut(_binding_0);
-        }
-        Type::Reference(ref mut _binding_0, ) => {
-            _visitor.visit_type_reference_mut(_binding_0);
-        }
-        Type::BareFn(ref mut _binding_0, ) => {
-            _visitor.visit_type_bare_fn_mut(_binding_0);
-        }
-        Type::Never(ref mut _binding_0, ) => {
-            _visitor.visit_type_never_mut(_binding_0);
-        }
-        Type::Tuple(ref mut _binding_0, ) => {
-            _visitor.visit_type_tuple_mut(_binding_0);
-        }
-        Type::Path(ref mut _binding_0, ) => {
-            _visitor.visit_type_path_mut(_binding_0);
-        }
-        Type::TraitObject(ref mut _binding_0, ) => {
-            _visitor.visit_type_trait_object_mut(_binding_0);
-        }
-        Type::ImplTrait(ref mut _binding_0, ) => {
-            _visitor.visit_type_impl_trait_mut(_binding_0);
-        }
-        Type::Paren(ref mut _binding_0, ) => {
-            _visitor.visit_type_paren_mut(_binding_0);
-        }
-        Type::Group(ref mut _binding_0, ) => {
-            _visitor.visit_type_group_mut(_binding_0);
-        }
-        Type::Infer(ref mut _binding_0, ) => {
-            _visitor.visit_type_infer_mut(_binding_0);
-        }
-        Type::Macro(ref mut _binding_0, ) => {
-            _visitor.visit_type_macro_mut(_binding_0);
-        }
-        Type::Verbatim(ref mut _binding_0, ) => {
-            _visitor.visit_type_verbatim_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_array_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeArray) {
-    tokens_helper(_visitor, &mut (& mut _i . bracket_token).0);
-    _visitor.visit_type_mut(& mut * _i . elem);
-    tokens_helper(_visitor, &mut (& mut _i . semi_token).0);
-    _visitor.visit_expr_mut(& mut _i . len);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_bare_fn_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeBareFn) {
-    if let Some(ref mut it) = _i . unsafety { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . abi { _visitor.visit_abi_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . fn_token).0);
-    if let Some(ref mut it) = _i . lifetimes { _visitor.visit_bound_lifetimes_mut(it) };
-    tokens_helper(_visitor, &mut (& mut _i . paren_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . inputs) { let it = el.value_mut(); _visitor.visit_bare_fn_arg_mut(it) };
-    if let Some(ref mut it) = _i . variadic { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_return_type_mut(& mut _i . output);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_group_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeGroup) {
-    tokens_helper(_visitor, &mut (& mut _i . group_token).0);
-    _visitor.visit_type_mut(& mut * _i . elem);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_impl_trait_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeImplTrait) {
-    tokens_helper(_visitor, &mut (& mut _i . impl_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . bounds) { let it = el.value_mut(); _visitor.visit_type_param_bound_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_infer_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeInfer) {
-    tokens_helper(_visitor, &mut (& mut _i . underscore_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_macro_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeMacro) {
-    _visitor.visit_macro_mut(& mut _i . mac);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_never_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeNever) {
-    tokens_helper(_visitor, &mut (& mut _i . bang_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_param_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeParam) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_ident_mut(& mut _i . ident);
-    if let Some(ref mut it) = _i . colon_token { tokens_helper(_visitor, &mut (it).0) };
-    for mut el in Punctuated::pairs_mut(& mut _i . bounds) { let it = el.value_mut(); _visitor.visit_type_param_bound_mut(it) };
-    if let Some(ref mut it) = _i . eq_token { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . default { _visitor.visit_type_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_param_bound_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeParamBound) {
-    match *_i {
-        TypeParamBound::Trait(ref mut _binding_0, ) => {
-            _visitor.visit_trait_bound_mut(_binding_0);
-        }
-        TypeParamBound::Lifetime(ref mut _binding_0, ) => {
-            _visitor.visit_lifetime_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_paren_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeParen) {
-    tokens_helper(_visitor, &mut (& mut _i . paren_token).0);
-    _visitor.visit_type_mut(& mut * _i . elem);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_path_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypePath) {
-    if let Some(ref mut it) = _i . qself { _visitor.visit_qself_mut(it) };
-    _visitor.visit_path_mut(& mut _i . path);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_ptr_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypePtr) {
-    tokens_helper(_visitor, &mut (& mut _i . star_token).0);
-    if let Some(ref mut it) = _i . const_token { tokens_helper(_visitor, &mut (it).0) };
-    if let Some(ref mut it) = _i . mutability { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_type_mut(& mut * _i . elem);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_reference_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeReference) {
-    tokens_helper(_visitor, &mut (& mut _i . and_token).0);
-    if let Some(ref mut it) = _i . lifetime { _visitor.visit_lifetime_mut(it) };
-    if let Some(ref mut it) = _i . mutability { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_type_mut(& mut * _i . elem);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_slice_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeSlice) {
-    tokens_helper(_visitor, &mut (& mut _i . bracket_token).0);
-    _visitor.visit_type_mut(& mut * _i . elem);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_trait_object_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeTraitObject) {
-    if let Some(ref mut it) = _i . dyn_token { tokens_helper(_visitor, &mut (it).0) };
-    for mut el in Punctuated::pairs_mut(& mut _i . bounds) { let it = el.value_mut(); _visitor.visit_type_param_bound_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_tuple_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeTuple) {
-    tokens_helper(_visitor, &mut (& mut _i . paren_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . elems) { let it = el.value_mut(); _visitor.visit_type_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_type_verbatim_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeVerbatim) {
-    // Skipped field _i . tts;
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_un_op_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut UnOp) {
-    match *_i {
-        UnOp::Deref(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        UnOp::Not(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        UnOp::Neg(ref mut _binding_0, ) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-    }
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_use_glob_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut UseGlob) {
-    tokens_helper(_visitor, &mut (& mut _i . star_token).0);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_use_group_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut UseGroup) {
-    tokens_helper(_visitor, &mut (& mut _i . brace_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . items) { let it = el.value_mut(); _visitor.visit_use_tree_mut(it) };
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_use_name_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut UseName) {
-    _visitor.visit_ident_mut(& mut _i . ident);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_use_path_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut UsePath) {
-    _visitor.visit_ident_mut(& mut _i . ident);
-    tokens_helper(_visitor, &mut (& mut _i . colon2_token).0);
-    _visitor.visit_use_tree_mut(& mut * _i . tree);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_use_rename_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut UseRename) {
-    _visitor.visit_ident_mut(& mut _i . ident);
-    tokens_helper(_visitor, &mut (& mut _i . as_token).0);
-    _visitor.visit_ident_mut(& mut _i . rename);
-}
-# [ cfg ( feature = "full" ) ]
-pub fn visit_use_tree_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut UseTree) {
-    match *_i {
-        UseTree::Path(ref mut _binding_0, ) => {
-            _visitor.visit_use_path_mut(_binding_0);
-        }
-        UseTree::Name(ref mut _binding_0, ) => {
-            _visitor.visit_use_name_mut(_binding_0);
-        }
-        UseTree::Rename(ref mut _binding_0, ) => {
-            _visitor.visit_use_rename_mut(_binding_0);
-        }
-        UseTree::Glob(ref mut _binding_0, ) => {
-            _visitor.visit_use_glob_mut(_binding_0);
-        }
-        UseTree::Group(ref mut _binding_0, ) => {
-            _visitor.visit_use_group_mut(_binding_0);
-        }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_variant_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Variant) {
-    for it in & mut _i . attrs { _visitor.visit_attribute_mut(it) };
-    _visitor.visit_ident_mut(& mut _i . ident);
-    _visitor.visit_fields_mut(& mut _i . fields);
-    if let Some(ref mut it) = _i . discriminant { 
-            tokens_helper(_visitor, &mut (& mut ( it ) . 0).0);
-            _visitor.visit_expr_mut(& mut ( it ) . 1);
-         };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_vis_crate_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut VisCrate) {
-    tokens_helper(_visitor, &mut (& mut _i . crate_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_vis_public_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut VisPublic) {
-    tokens_helper(_visitor, &mut (& mut _i . pub_token).0);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_vis_restricted_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut VisRestricted) {
-    tokens_helper(_visitor, &mut (& mut _i . pub_token).0);
-    tokens_helper(_visitor, &mut (& mut _i . paren_token).0);
-    if let Some(ref mut it) = _i . in_token { tokens_helper(_visitor, &mut (it).0) };
-    _visitor.visit_path_mut(& mut * _i . path);
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_visibility_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Visibility) {
-    match *_i {
-        Visibility::Public(ref mut _binding_0, ) => {
-            _visitor.visit_vis_public_mut(_binding_0);
-        }
-        Visibility::Crate(ref mut _binding_0, ) => {
-            _visitor.visit_vis_crate_mut(_binding_0);
-        }
-        Visibility::Restricted(ref mut _binding_0, ) => {
-            _visitor.visit_vis_restricted_mut(_binding_0);
-        }
-        Visibility::Inherited => { }
-    }
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_where_clause_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut WhereClause) {
-    tokens_helper(_visitor, &mut (& mut _i . where_token).0);
-    for mut el in Punctuated::pairs_mut(& mut _i . predicates) { let it = el.value_mut(); _visitor.visit_where_predicate_mut(it) };
-}
-# [ cfg ( any ( feature = "full" , feature = "derive" ) ) ]
-pub fn visit_where_predicate_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut WherePredicate) {
-    match *_i {
-        WherePredicate::Type(ref mut _binding_0, ) => {
-            _visitor.visit_predicate_type_mut(_binding_0);
-        }
-        WherePredicate::Lifetime(ref mut _binding_0, ) => {
-            _visitor.visit_predicate_lifetime_mut(_binding_0);
-        }
-        WherePredicate::Eq(ref mut _binding_0, ) => {
-            _visitor.visit_predicate_eq_mut(_binding_0);
-        }
-    }
-}
-
diff --git a/third_party/rust/syn-0.13.1/src/gen_helper.rs b/third_party/rust/syn-0.13.1/src/gen_helper.rs
deleted file mode 100644
index f7f64a949dba..000000000000
--- a/third_party/rust/syn-0.13.1/src/gen_helper.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[cfg(feature = "fold")]
-pub mod fold {
-    use punctuated::{Pair, Punctuated};
-    use fold::Fold;
-    use proc_macro2::Span;
-
-    pub trait FoldHelper {
-        type Item;
-        fn lift<F>(self, f: F) -> Self
-        where
-            F: FnMut(Self::Item) -> Self::Item;
-    }
-
-    impl<T> FoldHelper for Vec<T> {
-        type Item = T;
-        fn lift<F>(self, f: F) -> Self
-        where
-            F: FnMut(Self::Item) -> Self::Item,
-        {
-            self.into_iter().map(f).collect()
-        }
-    }
-
-    impl<T, U> FoldHelper for Punctuated<T, U> {
-        type Item = T;
-        fn lift<F>(self, mut f: F) -> Self
-        where
-            F: FnMut(Self::Item) -> Self::Item,
-        {
-            self.into_pairs()
-                .map(Pair::into_tuple)
-                .map(|(t, u)| Pair::new(f(t), u))
-                .collect()
-        }
-    }
-
-    pub fn tokens_helper<F: Fold + ?Sized, S: Spans>(folder: &mut F, spans: &S) -> S {
-        spans.fold(folder)
-    }
-
-    pub trait Spans {
-        fn fold<F: Fold + ?Sized>(&self, folder: &mut F) -> Self;
-    }
-
-    impl Spans for Span {
-        fn fold<F: Fold + ?Sized>(&self, folder: &mut F) -> Self {
-            folder.fold_span(*self)
-        }
-    }
-
-    impl Spans for [Span; 1] {
-        fn fold<F: Fold + ?Sized>(&self, folder: &mut F) -> Self {
-            [folder.fold_span(self[0])]
-        }
-    }
-
-    impl Spans for [Span; 2] {
-        fn fold<F: Fold + ?Sized>(&self, folder: &mut F) -> Self {
-            [folder.fold_span(self[0]), folder.fold_span(self[1])]
-        }
-    }
-
-    impl Spans for [Span; 3] {
-        fn fold<F: Fold + ?Sized>(&self, folder: &mut F) -> Self {
-            [
-                folder.fold_span(self[0]),
-                folder.fold_span(self[1]),
-                folder.fold_span(self[2]),
-            ]
-        }
-    }
-}
-
-#[cfg(feature = "visit")]
-pub mod visit {
-    use proc_macro2::Span;
-    use visit::Visit;
-
-    pub fn tokens_helper<'ast, V: Visit<'ast> + ?Sized, S: Spans>(
-        visitor: &mut V,
-        spans: &'ast S,
-    ) {
-        spans.visit(visitor);
-    }
-
-    pub trait Spans {
-        fn visit<'ast, V: Visit<'ast> + ?Sized>(&'ast self, visitor: &mut V);
-    }
-
-    impl Spans for Span {
-        fn visit<'ast, V: Visit<'ast> + ?Sized>(&'ast self, visitor: &mut V) {
-            visitor.visit_span(self);
-        }
-    }
-
-    impl Spans for [Span; 1] {
-        fn visit<'ast, V: Visit<'ast> + ?Sized>(&'ast self, visitor: &mut V) {
-            visitor.visit_span(&self[0]);
-        }
-    }
-
-    impl Spans for [Span; 2] {
-        fn visit<'ast, V: Visit<'ast> + ?Sized>(&'ast self, visitor: &mut V) {
-            visitor.visit_span(&self[0]);
-            visitor.visit_span(&self[1]);
-        }
-    }
-
-    impl Spans for [Span; 3] {
-        fn visit<'ast, V: Visit<'ast> + ?Sized>(&'ast self, visitor: &mut V) {
-            visitor.visit_span(&self[0]);
-            visitor.visit_span(&self[1]);
-            visitor.visit_span(&self[2]);
-        }
-    }
-}
-
-#[cfg(feature = "visit-mut")]
-pub mod visit_mut {
-    use proc_macro2::Span;
-    use visit_mut::VisitMut;
-
-    pub fn tokens_helper<V: VisitMut + ?Sized, S: Spans>(visitor: &mut V, spans: &mut S) {
-        spans.visit_mut(visitor);
-    }
-
-    pub trait Spans {
-        fn visit_mut<V: VisitMut + ?Sized>(&mut self, visitor: &mut V);
-    }
-
-    impl Spans for Span {
-        fn visit_mut<V: VisitMut + ?Sized>(&mut self, visitor: &mut V) {
-            visitor.visit_span_mut(self);
-        }
-    }
-
-    impl Spans for [Span; 1] {
-        fn visit_mut<V: VisitMut + ?Sized>(&mut self, visitor: &mut V) {
-            visitor.visit_span_mut(&mut self[0]);
-        }
-    }
-
-    impl Spans for [Span; 2] {
-        fn visit_mut<V: VisitMut + ?Sized>(&mut self, visitor: &mut V) {
-            visitor.visit_span_mut(&mut self[0]);
-            visitor.visit_span_mut(&mut self[1]);
-        }
-    }
-
-    impl Spans for [Span; 3] {
-        fn visit_mut<V: VisitMut + ?Sized>(&mut self, visitor: &mut V) {
-            visitor.visit_span_mut(&mut self[0]);
-            visitor.visit_span_mut(&mut self[1]);
-            visitor.visit_span_mut(&mut self[2]);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/generics.rs b/third_party/rust/syn-0.13.1/src/generics.rs
deleted file mode 100644
index 23c6958d3693..000000000000
--- a/third_party/rust/syn-0.13.1/src/generics.rs
+++ /dev/null
@@ -1,1012 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use punctuated::{Iter, IterMut, Punctuated};
-
-ast_struct! {
-    /// Lifetimes and type parameters attached to a declaration of a function,
-    /// enum, trait, etc.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    #[derive(Default)]
-    pub struct Generics {
-        pub lt_token: Option<Token![<]>,
-        pub params: Punctuated<GenericParam, Token![,]>,
-        pub gt_token: Option<Token![>]>,
-        pub where_clause: Option<WhereClause>,
-    }
-}
-
-ast_enum_of_structs! {
-    /// A generic type parameter, lifetime, or const generic: `T: Into<String>`,
-    /// `'a: 'b`, `const LEN: usize`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum GenericParam {
-        /// A generic type parameter: `T: Into<String>`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Type(TypeParam {
-            pub attrs: Vec<Attribute>,
-            pub ident: Ident,
-            pub colon_token: Option<Token![:]>,
-            pub bounds: Punctuated<TypeParamBound, Token![+]>,
-            pub eq_token: Option<Token![=]>,
-            pub default: Option<Type>,
-        }),
-
-        /// A lifetime definition: `'a: 'b + 'c + 'd`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Lifetime(LifetimeDef {
-            pub attrs: Vec<Attribute>,
-            pub lifetime: Lifetime,
-            pub colon_token: Option<Token![:]>,
-            pub bounds: Punctuated<Lifetime, Token![+]>,
-        }),
-
-        /// A const generic parameter: `const LENGTH: usize`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Const(ConstParam {
-            pub attrs: Vec<Attribute>,
-            pub const_token: Token![const],
-            pub ident: Ident,
-            pub colon_token: Token![:],
-            pub ty: Type,
-            pub eq_token: Option<Token![=]>,
-            pub default: Option<Expr>,
-        }),
-    }
-}
-
-impl Generics {
-    /// Returns an
-    /// <code
-    ///   style="padding-right:0;">Iterator&lt;Item = &amp;</code><a
-    ///   href="struct.TypeParam.html"><code
-    ///   style="padding-left:0;padding-right:0;">TypeParam</code></a><code
-    ///   style="padding-left:0;">&gt;</code>
-    /// over the type parameters in `self.params`.
-    pub fn type_params(&self) -> TypeParams {
-        TypeParams(self.params.iter())
-    }
-
-    /// Returns an
-    /// <code
-    ///   style="padding-right:0;">Iterator&lt;Item = &amp;mut </code><a
-    ///   href="struct.TypeParam.html"><code
-    ///   style="padding-left:0;padding-right:0;">TypeParam</code></a><code
-    ///   style="padding-left:0;">&gt;</code>
-    /// over the type parameters in `self.params`.
-    pub fn type_params_mut(&mut self) -> TypeParamsMut {
-        TypeParamsMut(self.params.iter_mut())
-    }
-
-    /// Returns an
-    /// <code
-    ///   style="padding-right:0;">Iterator&lt;Item = &amp;</code><a
-    ///   href="struct.LifetimeDef.html"><code
-    ///   style="padding-left:0;padding-right:0;">LifetimeDef</code></a><code
-    ///   style="padding-left:0;">&gt;</code>
-    /// over the lifetime parameters in `self.params`.
-    pub fn lifetimes(&self) -> Lifetimes {
-        Lifetimes(self.params.iter())
-    }
-
-    /// Returns an
-    /// <code
-    ///   style="padding-right:0;">Iterator&lt;Item = &amp;mut </code><a
-    ///   href="struct.LifetimeDef.html"><code
-    ///   style="padding-left:0;padding-right:0;">LifetimeDef</code></a><code
-    ///   style="padding-left:0;">&gt;</code>
-    /// over the lifetime parameters in `self.params`.
-    pub fn lifetimes_mut(&mut self) -> LifetimesMut {
-        LifetimesMut(self.params.iter_mut())
-    }
-
-    /// Returns an
-    /// <code
-    ///   style="padding-right:0;">Iterator&lt;Item = &amp;</code><a
-    ///   href="struct.ConstParam.html"><code
-    ///   style="padding-left:0;padding-right:0;">ConstParam</code></a><code
-    ///   style="padding-left:0;">&gt;</code>
-    /// over the constant parameters in `self.params`.
-    pub fn const_params(&self) -> ConstParams {
-        ConstParams(self.params.iter())
-    }
-
-    /// Returns an
-    /// <code
-    ///   style="padding-right:0;">Iterator&lt;Item = &amp;mut </code><a
-    ///   href="struct.ConstParam.html"><code
-    ///   style="padding-left:0;padding-right:0;">ConstParam</code></a><code
-    ///   style="padding-left:0;">&gt;</code>
-    /// over the constant parameters in `self.params`.
-    pub fn const_params_mut(&mut self) -> ConstParamsMut {
-        ConstParamsMut(self.params.iter_mut())
-    }
-
-    /// Initializes an empty `where`-clause if there is not one present already.
-    pub fn make_where_clause(&mut self) -> &mut WhereClause {
-        // This is Option::get_or_insert_with in Rust 1.20.
-        if self.where_clause.is_none() {
-            self.where_clause = Some(WhereClause {
-                where_token: Default::default(),
-                predicates: Punctuated::new(),
-            });
-        }
-        match self.where_clause {
-            Some(ref mut where_clause) => where_clause,
-            None => unreachable!(),
-        }
-    }
-}
-
-pub struct TypeParams<'a>(Iter<'a, GenericParam>);
-
-impl<'a> Iterator for TypeParams<'a> {
-    type Item = &'a TypeParam;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // FIXME: Remove this when ? on Option is stable
-        let next = match self.0.next() {
-            Some(item) => item,
-            None => return None,
-        };
-        if let GenericParam::Type(ref type_param) = *next {
-            Some(type_param)
-        } else {
-            self.next()
-        }
-    }
-}
-
-pub struct TypeParamsMut<'a>(IterMut<'a, GenericParam>);
-
-impl<'a> Iterator for TypeParamsMut<'a> {
-    type Item = &'a mut TypeParam;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // FIXME: Remove this when ? on Option is stable
-        let next = match self.0.next() {
-            Some(item) => item,
-            None => return None,
-        };
-        if let GenericParam::Type(ref mut type_param) = *next {
-            Some(type_param)
-        } else {
-            self.next()
-        }
-    }
-}
-
-pub struct Lifetimes<'a>(Iter<'a, GenericParam>);
-
-impl<'a> Iterator for Lifetimes<'a> {
-    type Item = &'a LifetimeDef;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // FIXME: Remove this when ? on Option is stable
-        let next = match self.0.next() {
-            Some(item) => item,
-            None => return None,
-        };
-        if let GenericParam::Lifetime(ref lifetime) = *next {
-            Some(lifetime)
-        } else {
-            self.next()
-        }
-    }
-}
-
-pub struct LifetimesMut<'a>(IterMut<'a, GenericParam>);
-
-impl<'a> Iterator for LifetimesMut<'a> {
-    type Item = &'a mut LifetimeDef;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // FIXME: Remove this when ? on Option is stable
-        let next = match self.0.next() {
-            Some(item) => item,
-            None => return None,
-        };
-        if let GenericParam::Lifetime(ref mut lifetime) = *next {
-            Some(lifetime)
-        } else {
-            self.next()
-        }
-    }
-}
-
-pub struct ConstParams<'a>(Iter<'a, GenericParam>);
-
-impl<'a> Iterator for ConstParams<'a> {
-    type Item = &'a ConstParam;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // FIXME: Remove this when ? on Option is stable
-        let next = match self.0.next() {
-            Some(item) => item,
-            None => return None,
-        };
-        if let GenericParam::Const(ref const_param) = *next {
-            Some(const_param)
-        } else {
-            self.next()
-        }
-    }
-}
-
-pub struct ConstParamsMut<'a>(IterMut<'a, GenericParam>);
-
-impl<'a> Iterator for ConstParamsMut<'a> {
-    type Item = &'a mut ConstParam;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // FIXME: Remove this when ? on Option is stable
-        let next = match self.0.next() {
-            Some(item) => item,
-            None => return None,
-        };
-        if let GenericParam::Const(ref mut const_param) = *next {
-            Some(const_param)
-        } else {
-            self.next()
-        }
-    }
-}
-
-/// Returned by `Generics::split_for_impl`.
-///
-/// *This type is available if Syn is built with the `"derive"` or `"full"`
-/// feature and the `"printing"` feature.*
-#[cfg(feature = "printing")]
-#[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-#[cfg_attr(feature = "clone-impls", derive(Clone))]
-pub struct ImplGenerics<'a>(&'a Generics);
-
-/// Returned by `Generics::split_for_impl`.
-///
-/// *This type is available if Syn is built with the `"derive"` or `"full"`
-/// feature and the `"printing"` feature.*
-#[cfg(feature = "printing")]
-#[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-#[cfg_attr(feature = "clone-impls", derive(Clone))]
-pub struct TypeGenerics<'a>(&'a Generics);
-
-/// Returned by `TypeGenerics::as_turbofish`.
-///
-/// *This type is available if Syn is built with the `"derive"` or `"full"`
-/// feature and the `"printing"` feature.*
-#[cfg(feature = "printing")]
-#[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-#[cfg_attr(feature = "clone-impls", derive(Clone))]
-pub struct Turbofish<'a>(&'a Generics);
-
-#[cfg(feature = "printing")]
-impl Generics {
-    /// Split a type's generics into the pieces required for impl'ing a trait
-    /// for that type.
-    ///
-    /// ```
-    /// # extern crate syn;
-    /// # #[macro_use]
-    /// # extern crate quote;
-    /// # fn main() {
-    /// # let generics: syn::Generics = Default::default();
-    /// # let name = syn::Ident::from("MyType");
-    /// let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
-    /// quote! {
-    ///     impl #impl_generics MyTrait for #name #ty_generics #where_clause {
-    ///         // ...
-    ///     }
-    /// }
-    /// # ;
-    /// # }
-    /// ```
-    ///
-    /// *This method is available if Syn is built with the `"derive"` or
-    /// `"full"` feature and the `"printing"` feature.*
-    pub fn split_for_impl(&self) -> (ImplGenerics, TypeGenerics, Option<&WhereClause>) {
-        (
-            ImplGenerics(self),
-            TypeGenerics(self),
-            self.where_clause.as_ref(),
-        )
-    }
-}
-
-#[cfg(feature = "printing")]
-impl<'a> TypeGenerics<'a> {
-    /// Turn a type's generics like `<X, Y>` into a turbofish like `::<X, Y>`.
-    ///
-    /// *This method is available if Syn is built with the `"derive"` or
-    /// `"full"` feature and the `"printing"` feature.*
-    pub fn as_turbofish(&self) -> Turbofish {
-        Turbofish(self.0)
-    }
-}
-
-ast_struct! {
-    /// A set of bound lifetimes: `for<'a, 'b, 'c>`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    #[derive(Default)]
-    pub struct BoundLifetimes {
-        pub for_token: Token![for],
-        pub lt_token: Token![<],
-        pub lifetimes: Punctuated<LifetimeDef, Token![,]>,
-        pub gt_token: Token![>],
-    }
-}
-
-impl LifetimeDef {
-    pub fn new(lifetime: Lifetime) -> Self {
-        LifetimeDef {
-            attrs: Vec::new(),
-            lifetime: lifetime,
-            colon_token: None,
-            bounds: Punctuated::new(),
-        }
-    }
-}
-
-impl From<Ident> for TypeParam {
-    fn from(ident: Ident) -> Self {
-        TypeParam {
-            attrs: vec![],
-            ident: ident,
-            colon_token: None,
-            bounds: Punctuated::new(),
-            eq_token: None,
-            default: None,
-        }
-    }
-}
-
-ast_enum_of_structs! {
-    /// A trait or lifetime used as a bound on a type parameter.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum TypeParamBound {
-        pub Trait(TraitBound),
-        pub Lifetime(Lifetime),
-    }
-}
-
-ast_struct! {
-    /// A trait used as a bound on a type parameter.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct TraitBound {
-        pub paren_token: Option<token::Paren>,
-        pub modifier: TraitBoundModifier,
-        /// The `for<'a>` in `for<'a> Foo<&'a T>`
-        pub lifetimes: Option<BoundLifetimes>,
-        /// The `Foo<&'a T>` in `for<'a> Foo<&'a T>`
-        pub path: Path,
-    }
-}
-
-ast_enum! {
-    /// A modifier on a trait bound, currently only used for the `?` in
-    /// `?Sized`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    #[cfg_attr(feature = "clone-impls", derive(Copy))]
-    pub enum TraitBoundModifier {
-        None,
-        Maybe(Token![?]),
-    }
-}
-
-ast_struct! {
-    /// A `where` clause in a definition: `where T: Deserialize<'de>, D:
-    /// 'static`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct WhereClause {
-        pub where_token: Token![where],
-        pub predicates: Punctuated<WherePredicate, Token![,]>,
-    }
-}
-
-ast_enum_of_structs! {
-    /// A single predicate in a `where` clause: `T: Deserialize<'de>`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum WherePredicate {
-        /// A type predicate in a `where` clause: `for<'c> Foo<'c>: Trait<'c>`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Type(PredicateType {
-            /// Any lifetimes from a `for` binding
-            pub lifetimes: Option<BoundLifetimes>,
-            /// The type being bounded
-            pub bounded_ty: Type,
-            pub colon_token: Token![:],
-            /// Trait and lifetime bounds (`Clone+Send+'static`)
-            pub bounds: Punctuated<TypeParamBound, Token![+]>,
-        }),
-
-        /// A lifetime predicate in a `where` clause: `'a: 'b + 'c`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Lifetime(PredicateLifetime {
-            pub lifetime: Lifetime,
-            pub colon_token: Option<Token![:]>,
-            pub bounds: Punctuated<Lifetime, Token![+]>,
-        }),
-
-        /// An equality predicate in a `where` clause (unsupported).
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Eq(PredicateEq {
-            pub lhs_ty: Type,
-            pub eq_token: Token![=],
-            pub rhs_ty: Type,
-        }),
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-
-    use synom::Synom;
-    use punctuated::Pair;
-
-    impl Synom for Generics {
-        named!(parse -> Self, map!(
-            alt!(
-                do_parse!(
-                    lt: punct!(<) >>
-                    lifetimes: call!(Punctuated::<LifetimeDef, Token![,]>::parse_terminated) >>
-                    ty_params: cond!(
-                        lifetimes.empty_or_trailing(),
-                        Punctuated::<TypeParam, Token![,]>::parse_terminated
-                    ) >>
-                    gt: punct!(>) >>
-                    (lifetimes, ty_params, Some(lt), Some(gt))
-                )
-                |
-                epsilon!() => { |_| (Punctuated::new(), None, None, None) }
-            ),
-            |(lifetimes, ty_params, lt, gt)| Generics {
-                lt_token: lt,
-                params: lifetimes.into_pairs()
-                    .map(Pair::into_tuple)
-                    .map(|(life, comma)| Pair::new(GenericParam::Lifetime(life), comma))
-                    .chain(ty_params.unwrap_or_default()
-                        .into_pairs()
-                        .map(Pair::into_tuple)
-                        .map(|(ty, comma)| Pair::new(GenericParam::Type(ty), comma)))
-                    .collect(),
-                gt_token: gt,
-                where_clause: None,
-            }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("generic parameters in declaration")
-        }
-    }
-
-    impl Synom for GenericParam {
-        named!(parse -> Self, alt!(
-            syn!(TypeParam) => { GenericParam::Type }
-            |
-            syn!(LifetimeDef) => { GenericParam::Lifetime }
-            |
-            syn!(ConstParam) => { GenericParam::Const }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("generic parameter")
-        }
-    }
-
-    impl Synom for LifetimeDef {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            life: syn!(Lifetime) >>
-            colon: option!(punct!(:)) >>
-            bounds: cond!(
-                colon.is_some(),
-                Punctuated::parse_separated_nonempty
-            ) >>
-            (LifetimeDef {
-                attrs: attrs,
-                lifetime: life,
-                bounds: bounds.unwrap_or_default(),
-                colon_token: colon,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("lifetime definition")
-        }
-    }
-
-    impl Synom for BoundLifetimes {
-        named!(parse -> Self, do_parse!(
-            for_: keyword!(for) >>
-            lt: punct!(<) >>
-            lifetimes: call!(Punctuated::parse_terminated) >>
-            gt: punct!(>) >>
-            (BoundLifetimes {
-                for_token: for_,
-                lt_token: lt,
-                gt_token: gt,
-                lifetimes: lifetimes,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("bound lifetimes")
-        }
-    }
-
-    impl Synom for TypeParam {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            id: syn!(Ident) >>
-            colon: option!(punct!(:)) >>
-            bounds: cond!(
-                colon.is_some(),
-                Punctuated::parse_separated_nonempty
-            ) >>
-            default: option!(do_parse!(
-                eq: punct!(=) >>
-                ty: syn!(Type) >>
-                (eq, ty)
-            )) >>
-            (TypeParam {
-                attrs: attrs,
-                ident: id,
-                bounds: bounds.unwrap_or_default(),
-                colon_token: colon,
-                eq_token: default.as_ref().map(|d| Token![=]((d.0).0)),
-                default: default.map(|d| d.1),
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("type parameter")
-        }
-    }
-
-    impl Synom for TypeParamBound {
-        named!(parse -> Self, alt!(
-            syn!(Lifetime) => { TypeParamBound::Lifetime }
-            |
-            syn!(TraitBound) => { TypeParamBound::Trait }
-            |
-            parens!(syn!(TraitBound)) => {|(parens, mut bound)| {
-                bound.paren_token = Some(parens);
-                TypeParamBound::Trait(bound)
-            }}
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("type parameter bound")
-        }
-    }
-
-    impl Synom for TraitBound {
-        named!(parse -> Self, do_parse!(
-            modifier: syn!(TraitBoundModifier) >>
-            lifetimes: option!(syn!(BoundLifetimes)) >>
-            mut path: syn!(Path) >>
-            parenthesized: option!(cond_reduce!(
-                path.segments.last().unwrap().value().arguments.is_empty(),
-                syn!(ParenthesizedGenericArguments)
-            )) >>
-            ({
-                if let Some(parenthesized) = parenthesized {
-                    let parenthesized = PathArguments::Parenthesized(parenthesized);
-                    path.segments.last_mut().unwrap().value_mut().arguments = parenthesized;
-                }
-                TraitBound {
-                    paren_token: None,
-                    modifier: modifier,
-                    lifetimes: lifetimes,
-                    path: path,
-                }
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("trait bound")
-        }
-    }
-
-    impl Synom for TraitBoundModifier {
-        named!(parse -> Self, alt!(
-            punct!(?) => { TraitBoundModifier::Maybe }
-            |
-            epsilon!() => { |_| TraitBoundModifier::None }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("trait bound modifier")
-        }
-    }
-
-    impl Synom for ConstParam {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            const_: keyword!(const) >>
-            ident: syn!(Ident) >>
-            colon: punct!(:) >>
-            ty: syn!(Type) >>
-            eq_def: option!(tuple!(punct!(=), syn!(Expr))) >>
-            ({
-                let (eq_token, default) = match eq_def {
-                    Some((eq_token, default)) => (Some(eq_token), Some(default)),
-                    None => (None, None),
-                };
-                ConstParam {
-                    attrs: attrs,
-                    const_token: const_,
-                    ident: ident,
-                    colon_token: colon,
-                    ty: ty,
-                    eq_token: eq_token,
-                    default: default,
-                }
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("generic `const` parameter")
-        }
-    }
-
-    impl Synom for WhereClause {
-        named!(parse -> Self, do_parse!(
-            where_: keyword!(where) >>
-            predicates: call!(Punctuated::parse_terminated) >>
-            (WhereClause {
-                predicates: predicates,
-                where_token: where_,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("where clause")
-        }
-    }
-
-    impl Synom for WherePredicate {
-        named!(parse -> Self, alt!(
-            do_parse!(
-                ident: syn!(Lifetime) >>
-                colon: option!(punct!(:)) >>
-                bounds: cond!(
-                    colon.is_some(),
-                    Punctuated::parse_separated
-                ) >>
-                (WherePredicate::Lifetime(PredicateLifetime {
-                    lifetime: ident,
-                    bounds: bounds.unwrap_or_default(),
-                    colon_token: colon,
-                }))
-            )
-            |
-            do_parse!(
-                lifetimes: option!(syn!(BoundLifetimes)) >>
-                bounded_ty: syn!(Type) >>
-                colon: punct!(:) >>
-                bounds: call!(Punctuated::parse_separated_nonempty) >>
-                (WherePredicate::Type(PredicateType {
-                    lifetimes: lifetimes,
-                    bounded_ty: bounded_ty,
-                    bounds: bounds,
-                    colon_token: colon,
-                }))
-            )
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("predicate in where clause")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use attr::FilterAttrs;
-    use quote::{ToTokens, Tokens};
-
-    impl ToTokens for Generics {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            if self.params.is_empty() {
-                return;
-            }
-
-            TokensOrDefault(&self.lt_token).to_tokens(tokens);
-
-            // Print lifetimes before types and consts, regardless of their
-            // order in self.params.
-            //
-            // TODO: ordering rules for const parameters vs type parameters have
-            // not been settled yet. https://github.com/rust-lang/rust/issues/44580
-            let mut trailing_or_empty = true;
-            for param in self.params.pairs() {
-                if let GenericParam::Lifetime(_) = **param.value() {
-                    param.to_tokens(tokens);
-                    trailing_or_empty = param.punct().is_some();
-                }
-            }
-            for param in self.params.pairs() {
-                match **param.value() {
-                    GenericParam::Type(_) | GenericParam::Const(_) => {
-                        if !trailing_or_empty {
-                            <Token![,]>::default().to_tokens(tokens);
-                            trailing_or_empty = true;
-                        }
-                        param.to_tokens(tokens);
-                    }
-                    GenericParam::Lifetime(_) => {}
-                }
-            }
-
-            TokensOrDefault(&self.gt_token).to_tokens(tokens);
-        }
-    }
-
-    impl<'a> ToTokens for ImplGenerics<'a> {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            if self.0.params.is_empty() {
-                return;
-            }
-
-            TokensOrDefault(&self.0.lt_token).to_tokens(tokens);
-
-            // Print lifetimes before types and consts, regardless of their
-            // order in self.params.
-            //
-            // TODO: ordering rules for const parameters vs type parameters have
-            // not been settled yet. https://github.com/rust-lang/rust/issues/44580
-            let mut trailing_or_empty = true;
-            for param in self.0.params.pairs() {
-                if let GenericParam::Lifetime(_) = **param.value() {
-                    param.to_tokens(tokens);
-                    trailing_or_empty = param.punct().is_some();
-                }
-            }
-            for param in self.0.params.pairs() {
-                if let GenericParam::Lifetime(_) = **param.value() {
-                    continue;
-                }
-                if !trailing_or_empty {
-                    <Token![,]>::default().to_tokens(tokens);
-                    trailing_or_empty = true;
-                }
-                match **param.value() {
-                    GenericParam::Lifetime(_) => unreachable!(),
-                    GenericParam::Type(ref param) => {
-                        // Leave off the type parameter defaults
-                        tokens.append_all(param.attrs.outer());
-                        param.ident.to_tokens(tokens);
-                        if !param.bounds.is_empty() {
-                            TokensOrDefault(&param.colon_token).to_tokens(tokens);
-                            param.bounds.to_tokens(tokens);
-                        }
-                    }
-                    GenericParam::Const(ref param) => {
-                        // Leave off the const parameter defaults
-                        tokens.append_all(param.attrs.outer());
-                        param.const_token.to_tokens(tokens);
-                        param.ident.to_tokens(tokens);
-                        param.colon_token.to_tokens(tokens);
-                        param.ty.to_tokens(tokens);
-                    }
-                }
-                param.punct().to_tokens(tokens);
-            }
-
-            TokensOrDefault(&self.0.gt_token).to_tokens(tokens);
-        }
-    }
-
-    impl<'a> ToTokens for TypeGenerics<'a> {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            if self.0.params.is_empty() {
-                return;
-            }
-
-            TokensOrDefault(&self.0.lt_token).to_tokens(tokens);
-
-            // Print lifetimes before types and consts, regardless of their
-            // order in self.params.
-            //
-            // TODO: ordering rules for const parameters vs type parameters have
-            // not been settled yet. https://github.com/rust-lang/rust/issues/44580
-            let mut trailing_or_empty = true;
-            for param in self.0.params.pairs() {
-                if let GenericParam::Lifetime(ref def) = **param.value() {
-                    // Leave off the lifetime bounds and attributes
-                    def.lifetime.to_tokens(tokens);
-                    param.punct().to_tokens(tokens);
-                    trailing_or_empty = param.punct().is_some();
-                }
-            }
-            for param in self.0.params.pairs() {
-                if let GenericParam::Lifetime(_) = **param.value() {
-                    continue;
-                }
-                if !trailing_or_empty {
-                    <Token![,]>::default().to_tokens(tokens);
-                    trailing_or_empty = true;
-                }
-                match **param.value() {
-                    GenericParam::Lifetime(_) => unreachable!(),
-                    GenericParam::Type(ref param) => {
-                        // Leave off the type parameter defaults
-                        param.ident.to_tokens(tokens);
-                    }
-                    GenericParam::Const(ref param) => {
-                        // Leave off the const parameter defaults
-                        param.ident.to_tokens(tokens);
-                    }
-                }
-                param.punct().to_tokens(tokens);
-            }
-
-            TokensOrDefault(&self.0.gt_token).to_tokens(tokens);
-        }
-    }
-
-    impl<'a> ToTokens for Turbofish<'a> {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            if !self.0.params.is_empty() {
-                <Token![::]>::default().to_tokens(tokens);
-                TypeGenerics(self.0).to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for BoundLifetimes {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.for_token.to_tokens(tokens);
-            self.lt_token.to_tokens(tokens);
-            self.lifetimes.to_tokens(tokens);
-            self.gt_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for LifetimeDef {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.lifetime.to_tokens(tokens);
-            if !self.bounds.is_empty() {
-                TokensOrDefault(&self.colon_token).to_tokens(tokens);
-                self.bounds.to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for TypeParam {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.ident.to_tokens(tokens);
-            if !self.bounds.is_empty() {
-                TokensOrDefault(&self.colon_token).to_tokens(tokens);
-                self.bounds.to_tokens(tokens);
-            }
-            if self.default.is_some() {
-                TokensOrDefault(&self.eq_token).to_tokens(tokens);
-                self.default.to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for TraitBound {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            let to_tokens = |tokens: &mut Tokens| {
-                self.modifier.to_tokens(tokens);
-                self.lifetimes.to_tokens(tokens);
-                self.path.to_tokens(tokens);
-            };
-            match self.paren_token {
-                Some(ref paren) => paren.surround(tokens, to_tokens),
-                None => to_tokens(tokens),
-            }
-        }
-    }
-
-    impl ToTokens for TraitBoundModifier {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            match *self {
-                TraitBoundModifier::None => {}
-                TraitBoundModifier::Maybe(ref t) => t.to_tokens(tokens),
-            }
-        }
-    }
-
-    impl ToTokens for ConstParam {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.const_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            if self.default.is_some() {
-                TokensOrDefault(&self.eq_token).to_tokens(tokens);
-                self.default.to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for WhereClause {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            if !self.predicates.is_empty() {
-                self.where_token.to_tokens(tokens);
-                self.predicates.to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for PredicateType {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.lifetimes.to_tokens(tokens);
-            self.bounded_ty.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.bounds.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for PredicateLifetime {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.lifetime.to_tokens(tokens);
-            if !self.bounds.is_empty() {
-                TokensOrDefault(&self.colon_token).to_tokens(tokens);
-                self.bounds.to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for PredicateEq {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.lhs_ty.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.rhs_ty.to_tokens(tokens);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/ident.rs b/third_party/rust/syn-0.13.1/src/ident.rs
deleted file mode 100644
index 7b0e53284038..000000000000
--- a/third_party/rust/syn-0.13.1/src/ident.rs
+++ /dev/null
@@ -1,296 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::borrow::Cow;
-use std::cmp::Ordering;
-use std::fmt::{self, Display};
-use std::hash::{Hash, Hasher};
-
-use proc_macro2::Term;
-use unicode_xid::UnicodeXID;
-
-use proc_macro2::Span;
-
-/// A word of Rust code, which may be a keyword or legal variable name.
-///
-/// An identifier consists of at least one Unicode code point, the first of
-/// which has the XID_Start property and the rest of which have the XID_Continue
-/// property. An underscore may be used as the first character as long as it is
-/// not the only character.
-///
-/// - The empty string is not an identifier. Use `Option<Ident>`.
-/// - An underscore by itself is not an identifier. Use
-///   `Token![_]` instead.
-/// - A lifetime is not an identifier. Use `syn::Lifetime` instead.
-///
-/// An identifier constructed with `Ident::new` is permitted to be a Rust
-/// keyword, though parsing one through its [`Synom`] implementation rejects
-/// Rust keywords.
-///
-/// [`Synom`]: synom/trait.Synom.html
-///
-/// # Examples
-///
-/// A new ident can be created from a string using the `Ident::from` function.
-/// Idents produced by `Ident::from` are set to resolve at the procedural macro
-/// *def site* by default. A different span can be provided explicitly by using
-/// `Ident::new`.
-///
-/// ```rust
-/// extern crate syn;
-/// extern crate proc_macro2;
-///
-/// use syn::Ident;
-/// use proc_macro2::Span;
-///
-/// fn main() {
-///     let def_ident = Ident::from("definitely");
-///     let call_ident = Ident::new("calligraphy", Span::call_site());
-///
-///     println!("{} {}", def_ident, call_ident);
-/// }
-/// ```
-///
-/// An ident can be interpolated into a token stream using the `quote!` macro.
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate quote;
-///
-/// extern crate syn;
-/// use syn::Ident;
-///
-/// fn main() {
-///     let ident = Ident::from("demo");
-///
-///     // Create a variable binding whose name is this ident.
-///     let expanded = quote! { let #ident = 10; };
-///
-///     // Create a variable binding with a slightly different name.
-///     let temp_ident = Ident::from(format!("new_{}", ident));
-///     let expanded = quote! { let #temp_ident = 10; };
-/// }
-/// ```
-///
-/// A string representation of the ident is available through the `as_ref()` and
-/// `to_string()` methods.
-///
-/// ```rust
-/// # use syn::Ident;
-/// # let ident = Ident::from("another_identifier");
-/// #
-/// // Examine the ident as a &str.
-/// let ident_str = ident.as_ref();
-/// if ident_str.len() > 60 {
-///     println!("Very long identifier: {}", ident_str)
-/// }
-///
-/// // Create a String from the ident.
-/// let ident_string = ident.to_string();
-/// give_away(ident_string);
-///
-/// fn give_away(s: String) { /* ... */ }
-/// ```
-#[derive(Copy, Clone, Debug)]
-pub struct Ident {
-    term: Term,
-}
-
-impl Ident {
-    /// Creates an ident with the given string representation.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the input string is neither a keyword nor a legal variable
-    /// name.
-    pub fn new(s: &str, span: Span) -> Self {
-        if s.is_empty() {
-            panic!("ident is not allowed to be empty; use Option<Ident>");
-        }
-
-        if s.starts_with('\'') {
-            panic!("ident is not allowed to be a lifetime; use syn::Lifetime");
-        }
-
-        if s == "_" {
-            panic!("`_` is not a valid ident; use syn::token::Underscore");
-        }
-
-        if s.bytes().all(|digit| digit >= b'0' && digit <= b'9') {
-            panic!("ident cannot be a number, use syn::Index instead");
-        }
-
-        fn xid_ok(s: &str) -> bool {
-            let mut chars = s.chars();
-            let first = chars.next().unwrap();
-            if !(UnicodeXID::is_xid_start(first) || first == '_') {
-                return false;
-            }
-            for ch in chars {
-                if !UnicodeXID::is_xid_continue(ch) {
-                    return false;
-                }
-            }
-            true
-        }
-
-        if !xid_ok(s) {
-            panic!("{:?} is not a valid ident", s);
-        }
-
-        Ident {
-            term: Term::new(s, span),
-        }
-    }
-
-    pub fn span(&self) -> Span {
-        self.term.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.term.set_span(span);
-    }
-}
-
-impl<'a> From<&'a str> for Ident {
-    fn from(s: &str) -> Self {
-        Ident::new(s, Span::call_site())
-    }
-}
-
-impl From<Token![self]> for Ident {
-    fn from(tok: Token![self]) -> Self {
-        Ident::new("self", tok.0)
-    }
-}
-
-impl From<Token![Self]> for Ident {
-    fn from(tok: Token![Self]) -> Self {
-        Ident::new("Self", tok.0)
-    }
-}
-
-impl From<Token![super]> for Ident {
-    fn from(tok: Token![super]) -> Self {
-        Ident::new("super", tok.0)
-    }
-}
-
-impl From<Token![crate]> for Ident {
-    fn from(tok: Token![crate]) -> Self {
-        Ident::new("crate", tok.0)
-    }
-}
-
-impl<'a> From<Cow<'a, str>> for Ident {
-    fn from(s: Cow<'a, str>) -> Self {
-        Ident::new(&s, Span::call_site())
-    }
-}
-
-impl From<String> for Ident {
-    fn from(s: String) -> Self {
-        Ident::new(&s, Span::call_site())
-    }
-}
-
-impl AsRef<str> for Ident {
-    fn as_ref(&self) -> &str {
-        self.term.as_str()
-    }
-}
-
-impl Display for Ident {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        self.term.as_str().fmt(formatter)
-    }
-}
-
-impl<T: ?Sized> PartialEq<T> for Ident
-where
-    T: AsRef<str>,
-{
-    fn eq(&self, other: &T) -> bool {
-        self.as_ref() == other.as_ref()
-    }
-}
-
-impl Eq for Ident {}
-
-impl PartialOrd for Ident {
-    fn partial_cmp(&self, other: &Ident) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for Ident {
-    fn cmp(&self, other: &Ident) -> Ordering {
-        self.as_ref().cmp(other.as_ref())
-    }
-}
-
-impl Hash for Ident {
-    fn hash<H: Hasher>(&self, h: &mut H) {
-        self.as_ref().hash(h);
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use synom::Synom;
-    use buffer::Cursor;
-    use parse_error;
-    use synom::PResult;
-
-    impl Synom for Ident {
-        fn parse(input: Cursor) -> PResult<Self> {
-            let (term, rest) = match input.term() {
-                Some(term) => term,
-                _ => return parse_error(),
-            };
-            if term.as_str().starts_with('\'') {
-                return parse_error();
-            }
-            match term.as_str() {
-                // From https://doc.rust-lang.org/grammar.html#keywords
-                "abstract" | "alignof" | "as" | "become" | "box" | "break" | "const"
-                | "continue" | "crate" | "do" | "else" | "enum" | "extern" | "false" | "final"
-                | "fn" | "for" | "if" | "impl" | "in" | "let" | "loop" | "macro" | "match"
-                | "mod" | "move" | "mut" | "offsetof" | "override" | "priv" | "proc" | "pub"
-                | "pure" | "ref" | "return" | "Self" | "self" | "sizeof" | "static" | "struct"
-                | "super" | "trait" | "true" | "type" | "typeof" | "unsafe" | "unsized" | "use"
-                | "virtual" | "where" | "while" | "yield" => return parse_error(),
-                _ => {}
-            }
-
-            Ok((
-                Ident {
-                    term: term,
-                },
-                rest,
-            ))
-        }
-
-        fn description() -> Option<&'static str> {
-            Some("identifier")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use quote::{ToTokens, Tokens};
-
-    impl ToTokens for Ident {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append(self.term);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/item.rs b/third_party/rust/syn-0.13.1/src/item.rs
deleted file mode 100644
index 5e0f2344f258..000000000000
--- a/third_party/rust/syn-0.13.1/src/item.rs
+++ /dev/null
@@ -1,2033 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use derive::{Data, DeriveInput};
-use punctuated::Punctuated;
-use proc_macro2::TokenStream;
-use token::{Brace, Paren};
-
-#[cfg(feature = "extra-traits")]
-use tt::TokenStreamHelper;
-#[cfg(feature = "extra-traits")]
-use std::hash::{Hash, Hasher};
-
-ast_enum_of_structs! {
-    /// Things that can appear directly inside of a module or scope.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum Item {
-        /// An `extern crate` item: `extern crate serde`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub ExternCrate(ItemExternCrate {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub extern_token: Token![extern],
-            pub crate_token: Token![crate],
-            pub ident: Ident,
-            pub rename: Option<(Token![as], Ident)>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A use declaration: `use std::collections::HashMap`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Use(ItemUse {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub use_token: Token![use],
-            pub leading_colon: Option<Token![::]>,
-            pub tree: UseTree,
-            pub semi_token: Token![;],
-        }),
-
-        /// A static item: `static BIKE: Shed = Shed(42)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Static(ItemStatic {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub static_token: Token![static],
-            pub mutability: Option<Token![mut]>,
-            pub ident: Ident,
-            pub colon_token: Token![:],
-            pub ty: Box<Type>,
-            pub eq_token: Token![=],
-            pub expr: Box<Expr>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A constant item: `const MAX: u16 = 65535`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Const(ItemConst {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub const_token: Token![const],
-            pub ident: Ident,
-            pub colon_token: Token![:],
-            pub ty: Box<Type>,
-            pub eq_token: Token![=],
-            pub expr: Box<Expr>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A free-standing function: `fn process(n: usize) -> Result<()> { ...
-        /// }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Fn(ItemFn {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub constness: Option<Token![const]>,
-            pub unsafety: Option<Token![unsafe]>,
-            pub abi: Option<Abi>,
-            pub ident: Ident,
-            pub decl: Box<FnDecl>,
-            pub block: Box<Block>,
-        }),
-
-        /// A module or module declaration: `mod m` or `mod m { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Mod(ItemMod {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub mod_token: Token![mod],
-            pub ident: Ident,
-            pub content: Option<(token::Brace, Vec<Item>)>,
-            pub semi: Option<Token![;]>,
-        }),
-
-        /// A block of foreign items: `extern "C" { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub ForeignMod(ItemForeignMod {
-            pub attrs: Vec<Attribute>,
-            pub abi: Abi,
-            pub brace_token: token::Brace,
-            pub items: Vec<ForeignItem>,
-        }),
-
-        /// A type alias: `type Result<T> = std::result::Result<T, MyError>`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Type(ItemType {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub type_token: Token![type],
-            pub ident: Ident,
-            pub generics: Generics,
-            pub eq_token: Token![=],
-            pub ty: Box<Type>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A struct definition: `struct Foo<A> { x: A }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Struct(ItemStruct {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub struct_token: Token![struct],
-            pub ident: Ident,
-            pub generics: Generics,
-            pub fields: Fields,
-            pub semi_token: Option<Token![;]>,
-        }),
-
-        /// An enum definition: `enum Foo<A, B> { C<A>, D<B> }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Enum(ItemEnum {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub enum_token: Token![enum],
-            pub ident: Ident,
-            pub generics: Generics,
-            pub brace_token: token::Brace,
-            pub variants: Punctuated<Variant, Token![,]>,
-        }),
-
-        /// A union definition: `union Foo<A, B> { x: A, y: B }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Union(ItemUnion {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub union_token: Token![union],
-            pub ident: Ident,
-            pub generics: Generics,
-            pub fields: FieldsNamed,
-        }),
-
-        /// A trait definition: `pub trait Iterator { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Trait(ItemTrait {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub unsafety: Option<Token![unsafe]>,
-            pub auto_token: Option<Token![auto]>,
-            pub trait_token: Token![trait],
-            pub ident: Ident,
-            pub generics: Generics,
-            pub colon_token: Option<Token![:]>,
-            pub supertraits: Punctuated<TypeParamBound, Token![+]>,
-            pub brace_token: token::Brace,
-            pub items: Vec<TraitItem>,
-        }),
-
-        /// An impl block providing trait or associated items: `impl<A> Trait
-        /// for Data<A> { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Impl(ItemImpl {
-            pub attrs: Vec<Attribute>,
-            pub defaultness: Option<Token![default]>,
-            pub unsafety: Option<Token![unsafe]>,
-            pub impl_token: Token![impl],
-            pub generics: Generics,
-            /// Trait this impl implements.
-            pub trait_: Option<(Option<Token![!]>, Path, Token![for])>,
-            /// The Self type of the impl.
-            pub self_ty: Box<Type>,
-            pub brace_token: token::Brace,
-            pub items: Vec<ImplItem>,
-        }),
-
-        /// A macro invocation, which includes `macro_rules!` definitions.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Macro(ItemMacro {
-            pub attrs: Vec<Attribute>,
-            /// The `example` in `macro_rules! example { ... }`.
-            pub ident: Option<Ident>,
-            pub mac: Macro,
-            pub semi_token: Option<Token![;]>,
-        }),
-
-        /// A 2.0-style declarative macro introduced by the `macro` keyword.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Macro2(ItemMacro2 #manual_extra_traits {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub macro_token: Token![macro],
-            pub ident: Ident,
-            pub paren_token: Paren,
-            pub args: TokenStream,
-            pub brace_token: Brace,
-            pub body: TokenStream,
-        }),
-
-        /// Tokens forming an item not interpreted by Syn.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Verbatim(ItemVerbatim #manual_extra_traits {
-            pub tts: TokenStream,
-        }),
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for ItemMacro2 {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for ItemMacro2 {
-    fn eq(&self, other: &Self) -> bool {
-        self.attrs == other.attrs && self.vis == other.vis && self.macro_token == other.macro_token
-            && self.ident == other.ident && self.paren_token == other.paren_token
-            && TokenStreamHelper(&self.args) == TokenStreamHelper(&other.args)
-            && self.brace_token == other.brace_token
-            && TokenStreamHelper(&self.body) == TokenStreamHelper(&other.body)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for ItemMacro2 {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        self.attrs.hash(state);
-        self.vis.hash(state);
-        self.macro_token.hash(state);
-        self.ident.hash(state);
-        self.paren_token.hash(state);
-        TokenStreamHelper(&self.args).hash(state);
-        self.brace_token.hash(state);
-        TokenStreamHelper(&self.body).hash(state);
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for ItemVerbatim {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for ItemVerbatim {
-    fn eq(&self, other: &Self) -> bool {
-        TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for ItemVerbatim {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-impl From<DeriveInput> for Item {
-    fn from(input: DeriveInput) -> Item {
-        match input.data {
-            Data::Struct(data) => Item::Struct(ItemStruct {
-                attrs: input.attrs,
-                vis: input.vis,
-                struct_token: data.struct_token,
-                ident: input.ident,
-                generics: input.generics,
-                fields: data.fields,
-                semi_token: data.semi_token,
-            }),
-            Data::Enum(data) => Item::Enum(ItemEnum {
-                attrs: input.attrs,
-                vis: input.vis,
-                enum_token: data.enum_token,
-                ident: input.ident,
-                generics: input.generics,
-                brace_token: data.brace_token,
-                variants: data.variants,
-            }),
-            Data::Union(data) => Item::Union(ItemUnion {
-                attrs: input.attrs,
-                vis: input.vis,
-                union_token: data.union_token,
-                ident: input.ident,
-                generics: input.generics,
-                fields: data.fields,
-            }),
-        }
-    }
-}
-
-ast_enum_of_structs! {
-    /// A suffix of an import tree in a `use` item: `Type as Renamed` or `*`.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum UseTree {
-        /// A path prefix of imports in a `use` item: `std::...`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Path(UsePath {
-            pub ident: Ident,
-            pub colon2_token: Token![::],
-            pub tree: Box<UseTree>,
-        }),
-
-        /// An identifier imported by a `use` item: `HashMap`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Name(UseName {
-            pub ident: Ident,
-        }),
-
-        /// An renamed identifier imported by a `use` item: `HashMap as Map`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Rename(UseRename {
-            pub ident: Ident,
-            pub as_token: Token![as],
-            pub rename: Ident,
-        }),
-
-        /// A glob import in a `use` item: `*`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Glob(UseGlob {
-            pub star_token: Token![*],
-        }),
-
-        /// A braced group of imports in a `use` item: `{A, B, C}`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Group(UseGroup {
-            pub brace_token: token::Brace,
-            pub items: Punctuated<UseTree, Token![,]>,
-        }),
-    }
-}
-
-ast_enum_of_structs! {
-    /// An item within an `extern` block.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum ForeignItem {
-        /// A foreign function in an `extern` block.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Fn(ForeignItemFn {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub ident: Ident,
-            pub decl: Box<FnDecl>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A foreign static item in an `extern` block: `static ext: u8`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Static(ForeignItemStatic {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub static_token: Token![static],
-            pub mutability: Option<Token![mut]>,
-            pub ident: Ident,
-            pub colon_token: Token![:],
-            pub ty: Box<Type>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A foreign type in an `extern` block: `type void`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Type(ForeignItemType {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub type_token: Token![type],
-            pub ident: Ident,
-            pub semi_token: Token![;],
-        }),
-
-        /// Tokens in an `extern` block not interpreted by Syn.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Verbatim(ForeignItemVerbatim #manual_extra_traits {
-            pub tts: TokenStream,
-        }),
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for ForeignItemVerbatim {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for ForeignItemVerbatim {
-    fn eq(&self, other: &Self) -> bool {
-        TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for ForeignItemVerbatim {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-ast_enum_of_structs! {
-    /// An item declaration within the definition of a trait.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum TraitItem {
-        /// An associated constant within the definition of a trait.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Const(TraitItemConst {
-            pub attrs: Vec<Attribute>,
-            pub const_token: Token![const],
-            pub ident: Ident,
-            pub colon_token: Token![:],
-            pub ty: Type,
-            pub default: Option<(Token![=], Expr)>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A trait method within the definition of a trait.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Method(TraitItemMethod {
-            pub attrs: Vec<Attribute>,
-            pub sig: MethodSig,
-            pub default: Option<Block>,
-            pub semi_token: Option<Token![;]>,
-        }),
-
-        /// An associated type within the definition of a trait.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Type(TraitItemType {
-            pub attrs: Vec<Attribute>,
-            pub type_token: Token![type],
-            pub ident: Ident,
-            pub generics: Generics,
-            pub colon_token: Option<Token![:]>,
-            pub bounds: Punctuated<TypeParamBound, Token![+]>,
-            pub default: Option<(Token![=], Type)>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A macro invocation within the definition of a trait.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Macro(TraitItemMacro {
-            pub attrs: Vec<Attribute>,
-            pub mac: Macro,
-            pub semi_token: Option<Token![;]>,
-        }),
-
-        /// Tokens within the definition of a trait not interpreted by Syn.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Verbatim(TraitItemVerbatim #manual_extra_traits {
-            pub tts: TokenStream,
-        }),
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for TraitItemVerbatim {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for TraitItemVerbatim {
-    fn eq(&self, other: &Self) -> bool {
-        TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for TraitItemVerbatim {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-ast_enum_of_structs! {
-    /// An item within an impl block.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum ImplItem {
-        /// An associated constant within an impl block.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Const(ImplItemConst {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub defaultness: Option<Token![default]>,
-            pub const_token: Token![const],
-            pub ident: Ident,
-            pub colon_token: Token![:],
-            pub ty: Type,
-            pub eq_token: Token![=],
-            pub expr: Expr,
-            pub semi_token: Token![;],
-        }),
-
-        /// A method within an impl block.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Method(ImplItemMethod {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub defaultness: Option<Token![default]>,
-            pub sig: MethodSig,
-            pub block: Block,
-        }),
-
-        /// An associated type within an impl block.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Type(ImplItemType {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub defaultness: Option<Token![default]>,
-            pub type_token: Token![type],
-            pub ident: Ident,
-            pub generics: Generics,
-            pub eq_token: Token![=],
-            pub ty: Type,
-            pub semi_token: Token![;],
-        }),
-
-        /// A macro invocation within an impl block.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Macro(ImplItemMacro {
-            pub attrs: Vec<Attribute>,
-            pub mac: Macro,
-            pub semi_token: Option<Token![;]>,
-        }),
-
-        /// Tokens within an impl block not interpreted by Syn.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Verbatim(ImplItemVerbatim #manual_extra_traits {
-            pub tts: TokenStream,
-        }),
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for ImplItemVerbatim {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for ImplItemVerbatim {
-    fn eq(&self, other: &Self) -> bool {
-        TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for ImplItemVerbatim {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-ast_struct! {
-    /// A method's signature in a trait or implementation: `unsafe fn
-    /// initialize(&self)`.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct MethodSig {
-        pub constness: Option<Token![const]>,
-        pub unsafety: Option<Token![unsafe]>,
-        pub abi: Option<Abi>,
-        pub ident: Ident,
-        pub decl: FnDecl,
-    }
-}
-
-ast_struct! {
-    /// Header of a function declaration, without including the body.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct FnDecl {
-        pub fn_token: Token![fn],
-        pub generics: Generics,
-        pub paren_token: token::Paren,
-        pub inputs: Punctuated<FnArg, Token![,]>,
-        pub variadic: Option<Token![...]>,
-        pub output: ReturnType,
-    }
-}
-
-ast_enum_of_structs! {
-    /// An argument in a function signature: the `n: usize` in `fn f(n: usize)`.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum FnArg {
-        /// Self captured by reference in a function signature: `&self` or `&mut
-        /// self`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub SelfRef(ArgSelfRef {
-            pub and_token: Token![&],
-            pub lifetime: Option<Lifetime>,
-            pub mutability: Option<Token![mut]>,
-            pub self_token: Token![self],
-        }),
-
-        /// Self captured by value in a function signature: `self` or `mut
-        /// self`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub SelfValue(ArgSelf {
-            pub mutability: Option<Token![mut]>,
-            pub self_token: Token![self],
-        }),
-
-        /// An explicitly typed pattern captured by a function signature.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Captured(ArgCaptured {
-            pub pat: Pat,
-            pub colon_token: Token![:],
-            pub ty: Type,
-        }),
-
-        /// A pattern whose type is inferred captured by a function signature.
-        pub Inferred(Pat),
-        /// A type not bound to any pattern in a function signature.
-        pub Ignored(Type),
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-
-    use synom::Synom;
-
-    impl_synom!(Item "item" alt!(
-        syn!(ItemExternCrate) => { Item::ExternCrate }
-        |
-        syn!(ItemUse) => { Item::Use }
-        |
-        syn!(ItemStatic) => { Item::Static }
-        |
-        syn!(ItemConst) => { Item::Const }
-        |
-        syn!(ItemFn) => { Item::Fn }
-        |
-        syn!(ItemMod) => { Item::Mod }
-        |
-        syn!(ItemForeignMod) => { Item::ForeignMod }
-        |
-        syn!(ItemType) => { Item::Type }
-        |
-        syn!(ItemStruct) => { Item::Struct }
-        |
-        syn!(ItemEnum) => { Item::Enum }
-        |
-        syn!(ItemUnion) => { Item::Union }
-        |
-        syn!(ItemTrait) => { Item::Trait }
-        |
-        syn!(ItemImpl) => { Item::Impl }
-        |
-        syn!(ItemMacro) => { Item::Macro }
-        |
-        syn!(ItemMacro2) => { Item::Macro2 }
-    ));
-
-    impl_synom!(ItemMacro "macro item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        what: call!(Path::parse_mod_style) >>
-        bang: punct!(!) >>
-        ident: option!(syn!(Ident)) >>
-        body: call!(tt::delimited) >>
-        semi: cond!(!is_brace(&body.0), punct!(;)) >>
-        (ItemMacro {
-            attrs: attrs,
-            ident: ident,
-            mac: Macro {
-                path: what,
-                bang_token: bang,
-                delimiter: body.0,
-                tts: body.1,
-            },
-            semi_token: semi,
-        })
-    ));
-
-    // TODO: figure out the actual grammar; is body required to be braced?
-    impl_synom!(ItemMacro2 "macro2 item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        macro_: keyword!(macro) >>
-        ident: syn!(Ident) >>
-        args: call!(tt::parenthesized) >>
-        body: call!(tt::braced) >>
-        (ItemMacro2 {
-            attrs: attrs,
-            vis: vis,
-            macro_token: macro_,
-            ident: ident,
-            paren_token: args.0,
-            args: args.1,
-            brace_token: body.0,
-            body: body.1,
-        })
-    ));
-
-    impl_synom!(ItemExternCrate "extern crate item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        extern_: keyword!(extern) >>
-        crate_: keyword!(crate) >>
-        ident: syn!(Ident) >>
-        rename: option!(tuple!(keyword!(as), syn!(Ident))) >>
-        semi: punct!(;) >>
-        (ItemExternCrate {
-            attrs: attrs,
-            vis: vis,
-            extern_token: extern_,
-            crate_token: crate_,
-            ident: ident,
-            rename: rename,
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ItemUse "use item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        use_: keyword!(use) >>
-        leading_colon: option!(punct!(::)) >>
-        tree: syn!(UseTree) >>
-        semi: punct!(;) >>
-        (ItemUse {
-            attrs: attrs,
-            vis: vis,
-            use_token: use_,
-            leading_colon: leading_colon,
-            tree: tree,
-            semi_token: semi,
-        })
-    ));
-
-    named!(use_element -> Ident, alt!(
-        syn!(Ident)
-        |
-        keyword!(self) => { Into::into }
-        |
-        keyword!(super) => { Into::into }
-        |
-        keyword!(crate) => { Into::into }
-    ));
-
-    impl_synom!(UseTree "use tree" alt!(
-        syn!(UseRename) => { UseTree::Rename }
-        |
-        syn!(UsePath) => { UseTree::Path }
-        |
-        syn!(UseName) => { UseTree::Name }
-        |
-        syn!(UseGlob) => { UseTree::Glob }
-        |
-        syn!(UseGroup) => { UseTree::Group }
-    ));
-
-    impl_synom!(UsePath "use path" do_parse!(
-        ident: call!(use_element) >>
-        colon2_token: punct!(::) >>
-        tree: syn!(UseTree) >>
-        (UsePath {
-            ident: ident,
-            colon2_token: colon2_token,
-            tree: Box::new(tree),
-        })
-    ));
-
-    impl_synom!(UseName "use name" do_parse!(
-        ident: call!(use_element) >>
-        (UseName {
-            ident: ident,
-        })
-    ));
-
-    impl_synom!(UseRename "use rename" do_parse!(
-        ident: call!(use_element) >>
-        as_token: keyword!(as) >>
-        rename: syn!(Ident) >>
-        (UseRename {
-            ident: ident,
-            as_token: as_token,
-            rename: rename,
-        })
-    ));
-
-    impl_synom!(UseGlob "use glob" do_parse!(
-        star: punct!(*) >>
-        (UseGlob {
-            star_token: star,
-        })
-    ));
-
-    impl_synom!(UseGroup "use group" do_parse!(
-        list: braces!(Punctuated::parse_terminated) >>
-        (UseGroup {
-            brace_token: list.0,
-            items: list.1,
-        })
-    ));
-
-    impl_synom!(ItemStatic "static item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        static_: keyword!(static) >>
-        mutability: option!(keyword!(mut)) >>
-        ident: syn!(Ident) >>
-        colon: punct!(:) >>
-        ty: syn!(Type) >>
-        eq: punct!(=) >>
-        value: syn!(Expr) >>
-        semi: punct!(;) >>
-        (ItemStatic {
-            attrs: attrs,
-            vis: vis,
-            static_token: static_,
-            mutability: mutability,
-            ident: ident,
-            colon_token: colon,
-            ty: Box::new(ty),
-            eq_token: eq,
-            expr: Box::new(value),
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ItemConst "const item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        const_: keyword!(const) >>
-        ident: syn!(Ident) >>
-        colon: punct!(:) >>
-        ty: syn!(Type) >>
-        eq: punct!(=) >>
-        value: syn!(Expr) >>
-        semi: punct!(;) >>
-        (ItemConst {
-            attrs: attrs,
-            vis: vis,
-            const_token: const_,
-            ident: ident,
-            colon_token: colon,
-            ty: Box::new(ty),
-            eq_token: eq,
-            expr: Box::new(value),
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ItemFn "fn item" do_parse!(
-        outer_attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        constness: option!(keyword!(const)) >>
-        unsafety: option!(keyword!(unsafe)) >>
-        abi: option!(syn!(Abi)) >>
-        fn_: keyword!(fn) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        inputs: parens!(Punctuated::parse_terminated) >>
-        ret: syn!(ReturnType) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        inner_attrs_stmts: braces!(tuple!(
-            many0!(Attribute::parse_inner),
-            call!(Block::parse_within)
-        )) >>
-        (ItemFn {
-            attrs: {
-                let mut attrs = outer_attrs;
-                attrs.extend((inner_attrs_stmts.1).0);
-                attrs
-            },
-            vis: vis,
-            constness: constness,
-            unsafety: unsafety,
-            abi: abi,
-            decl: Box::new(FnDecl {
-                fn_token: fn_,
-                paren_token: inputs.0,
-                inputs: inputs.1,
-                output: ret,
-                variadic: None,
-                generics: Generics {
-                    where_clause: where_clause,
-                    .. generics
-                },
-            }),
-            ident: ident,
-            block: Box::new(Block {
-                brace_token: inner_attrs_stmts.0,
-                stmts: (inner_attrs_stmts.1).1,
-            }),
-        })
-    ));
-
-    impl Synom for FnArg {
-        named!(parse -> Self, alt!(
-            do_parse!(
-                and: punct!(&) >>
-                lt: option!(syn!(Lifetime)) >>
-                mutability: option!(keyword!(mut)) >>
-                self_: keyword!(self) >>
-                not!(punct!(:)) >>
-                (ArgSelfRef {
-                    lifetime: lt,
-                    mutability: mutability,
-                    and_token: and,
-                    self_token: self_,
-                }.into())
-            )
-            |
-            do_parse!(
-                mutability: option!(keyword!(mut)) >>
-                self_: keyword!(self) >>
-                not!(punct!(:)) >>
-                (ArgSelf {
-                    mutability: mutability,
-                    self_token: self_,
-                }.into())
-            )
-            |
-            do_parse!(
-                pat: syn!(Pat) >>
-                colon: punct!(:) >>
-                ty: syn!(Type) >>
-                (ArgCaptured {
-                    pat: pat,
-                    ty: ty,
-                    colon_token: colon,
-                }.into())
-            )
-            |
-            syn!(Type) => { FnArg::Ignored }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("function argument")
-        }
-    }
-
-    impl_synom!(ItemMod "mod item" do_parse!(
-        outer_attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        mod_: keyword!(mod) >>
-        ident: syn!(Ident) >>
-        content_semi: alt!(
-            punct!(;) => {|semi| (
-                Vec::new(),
-                None,
-                Some(semi),
-            )}
-            |
-            braces!(
-                tuple!(
-                    many0!(Attribute::parse_inner),
-                    many0!(Item::parse)
-                )
-            ) => {|(brace, (inner_attrs, items))| (
-                inner_attrs,
-                Some((brace, items)),
-                None,
-            )}
-        ) >>
-        (ItemMod {
-            attrs: {
-                let mut attrs = outer_attrs;
-                attrs.extend(content_semi.0);
-                attrs
-            },
-            vis: vis,
-            mod_token: mod_,
-            ident: ident,
-            content: content_semi.1,
-            semi: content_semi.2,
-        })
-    ));
-
-    impl_synom!(ItemForeignMod "foreign mod item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        abi: syn!(Abi) >>
-        items: braces!(many0!(ForeignItem::parse)) >>
-        (ItemForeignMod {
-            attrs: attrs,
-            abi: abi,
-            brace_token: items.0,
-            items: items.1,
-        })
-    ));
-
-    impl_synom!(ForeignItem "foreign item" alt!(
-        syn!(ForeignItemFn) => { ForeignItem::Fn }
-        |
-        syn!(ForeignItemStatic) => { ForeignItem::Static }
-        |
-        syn!(ForeignItemType) => { ForeignItem::Type }
-    ));
-
-    impl_synom!(ForeignItemFn "foreign function" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        fn_: keyword!(fn) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        inputs: parens!(do_parse!(
-            args: call!(Punctuated::parse_terminated) >>
-            variadic: option!(cond_reduce!(args.empty_or_trailing(), punct!(...))) >>
-            (args, variadic)
-        )) >>
-        ret: syn!(ReturnType) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        semi: punct!(;) >>
-        ({
-            let (parens, (inputs, variadic)) = inputs;
-            ForeignItemFn {
-                ident: ident,
-                attrs: attrs,
-                semi_token: semi,
-                decl: Box::new(FnDecl {
-                    fn_token: fn_,
-                    paren_token: parens,
-                    inputs: inputs,
-                    variadic: variadic,
-                    output: ret,
-                    generics: Generics {
-                        where_clause: where_clause,
-                        .. generics
-                    },
-                }),
-                vis: vis,
-            }
-        })
-    ));
-
-    impl_synom!(ForeignItemStatic "foreign static" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        static_: keyword!(static) >>
-        mutability: option!(keyword!(mut)) >>
-        ident: syn!(Ident) >>
-        colon: punct!(:) >>
-        ty: syn!(Type) >>
-        semi: punct!(;) >>
-        (ForeignItemStatic {
-            ident: ident,
-            attrs: attrs,
-            semi_token: semi,
-            ty: Box::new(ty),
-            mutability: mutability,
-            static_token: static_,
-            colon_token: colon,
-            vis: vis,
-        })
-    ));
-
-    impl_synom!(ForeignItemType "foreign type" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        type_: keyword!(type) >>
-        ident: syn!(Ident) >>
-        semi: punct!(;) >>
-        (ForeignItemType {
-            attrs: attrs,
-            vis: vis,
-            type_token: type_,
-            ident: ident,
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ItemType "type item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        type_: keyword!(type) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        eq: punct!(=) >>
-        ty: syn!(Type) >>
-        semi: punct!(;) >>
-        (ItemType {
-            attrs: attrs,
-            vis: vis,
-            type_token: type_,
-            ident: ident,
-            generics: Generics {
-                where_clause: where_clause,
-                ..generics
-            },
-            eq_token: eq,
-            ty: Box::new(ty),
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ItemStruct "struct item" switch!(
-        map!(syn!(DeriveInput), Into::into),
-        Item::Struct(item) => value!(item)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(ItemEnum "enum item" switch!(
-        map!(syn!(DeriveInput), Into::into),
-        Item::Enum(item) => value!(item)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(ItemUnion "union item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        union_: keyword!(union) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        fields: syn!(FieldsNamed) >>
-        (ItemUnion {
-            attrs: attrs,
-            vis: vis,
-            union_token: union_,
-            ident: ident,
-            generics: Generics {
-                where_clause: where_clause,
-                .. generics
-            },
-            fields: fields,
-        })
-    ));
-
-    impl_synom!(ItemTrait "trait item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        unsafety: option!(keyword!(unsafe)) >>
-        auto_: option!(keyword!(auto)) >>
-        trait_: keyword!(trait) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        colon: option!(punct!(:)) >>
-        bounds: cond!(colon.is_some(), Punctuated::parse_separated_nonempty) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        body: braces!(many0!(TraitItem::parse)) >>
-        (ItemTrait {
-            attrs: attrs,
-            vis: vis,
-            unsafety: unsafety,
-            auto_token: auto_,
-            trait_token: trait_,
-            ident: ident,
-            generics: Generics {
-                where_clause: where_clause,
-                .. generics
-            },
-            colon_token: colon,
-            supertraits: bounds.unwrap_or_default(),
-            brace_token: body.0,
-            items: body.1,
-        })
-    ));
-
-    impl_synom!(TraitItem "trait item" alt!(
-        syn!(TraitItemConst) => { TraitItem::Const }
-        |
-        syn!(TraitItemMethod) => { TraitItem::Method }
-        |
-        syn!(TraitItemType) => { TraitItem::Type }
-        |
-        syn!(TraitItemMacro) => { TraitItem::Macro }
-    ));
-
-    impl_synom!(TraitItemConst "const trait item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        const_: keyword!(const) >>
-        ident: syn!(Ident) >>
-        colon: punct!(:) >>
-        ty: syn!(Type) >>
-        default: option!(tuple!(punct!(=), syn!(Expr))) >>
-        semi: punct!(;) >>
-        (TraitItemConst {
-            attrs: attrs,
-            const_token: const_,
-            ident: ident,
-            colon_token: colon,
-            ty: ty,
-            default: default,
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(TraitItemMethod "method trait item" do_parse!(
-        outer_attrs: many0!(Attribute::parse_outer) >>
-        constness: option!(keyword!(const)) >>
-        unsafety: option!(keyword!(unsafe)) >>
-        abi: option!(syn!(Abi)) >>
-        fn_: keyword!(fn) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        inputs: parens!(Punctuated::parse_terminated) >>
-        ret: syn!(ReturnType) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        body: option!(braces!(
-            tuple!(many0!(Attribute::parse_inner),
-                   call!(Block::parse_within))
-        )) >>
-        semi: cond!(body.is_none(), punct!(;)) >>
-        ({
-            let (inner_attrs, stmts) = match body {
-                Some((b, (inner_attrs, stmts))) => (inner_attrs, Some((stmts, b))),
-                None => (Vec::new(), None),
-            };
-            TraitItemMethod {
-                attrs: {
-                    let mut attrs = outer_attrs;
-                    attrs.extend(inner_attrs);
-                    attrs
-                },
-                sig: MethodSig {
-                    constness: constness,
-                    unsafety: unsafety,
-                    abi: abi,
-                    ident: ident,
-                    decl: FnDecl {
-                        inputs: inputs.1,
-                        output: ret,
-                        fn_token: fn_,
-                        paren_token: inputs.0,
-                        variadic: None,
-                        generics: Generics {
-                            where_clause: where_clause,
-                            .. generics
-                        },
-                    },
-                },
-                default: stmts.map(|stmts| {
-                    Block {
-                        stmts: stmts.0,
-                        brace_token: stmts.1,
-                    }
-                }),
-                semi_token: semi,
-            }
-        })
-    ));
-
-    impl_synom!(TraitItemType "trait item type" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        type_: keyword!(type) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        colon: option!(punct!(:)) >>
-        bounds: cond!(colon.is_some(), Punctuated::parse_separated_nonempty) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        default: option!(tuple!(punct!(=), syn!(Type))) >>
-        semi: punct!(;) >>
-        (TraitItemType {
-            attrs: attrs,
-            type_token: type_,
-            ident: ident,
-            generics: Generics {
-                where_clause: where_clause,
-                .. generics
-            },
-            colon_token: colon,
-            bounds: bounds.unwrap_or_default(),
-            default: default,
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(TraitItemMacro "trait item macro" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        mac: syn!(Macro) >>
-        semi: cond!(!is_brace(&mac.delimiter), punct!(;)) >>
-        (TraitItemMacro {
-            attrs: attrs,
-            mac: mac,
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ItemImpl "impl item" do_parse!(
-        outer_attrs: many0!(Attribute::parse_outer) >>
-        defaultness: option!(keyword!(default)) >>
-        unsafety: option!(keyword!(unsafe)) >>
-        impl_: keyword!(impl) >>
-        generics: syn!(Generics) >>
-        polarity_path: alt!(
-            do_parse!(
-                polarity: option!(punct!(!)) >>
-                path: syn!(Path) >>
-                for_: keyword!(for) >>
-                (Some((polarity, path, for_)))
-            )
-            |
-            epsilon!() => { |_| None }
-        ) >>
-        self_ty: syn!(Type) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        inner: braces!(tuple!(
-            many0!(Attribute::parse_inner),
-            many0!(ImplItem::parse)
-        )) >>
-        (ItemImpl {
-            attrs: {
-                let mut attrs = outer_attrs;
-                attrs.extend((inner.1).0);
-                attrs
-            },
-            defaultness: defaultness,
-            unsafety: unsafety,
-            impl_token: impl_,
-            generics: Generics {
-                where_clause: where_clause,
-                .. generics
-            },
-            trait_: polarity_path,
-            self_ty: Box::new(self_ty),
-            brace_token: inner.0,
-            items: (inner.1).1,
-        })
-    ));
-
-    impl_synom!(ImplItem "item in impl block" alt!(
-        syn!(ImplItemConst) => { ImplItem::Const }
-        |
-        syn!(ImplItemMethod) => { ImplItem::Method }
-        |
-        syn!(ImplItemType) => { ImplItem::Type }
-        |
-        syn!(ImplItemMacro) => { ImplItem::Macro }
-    ));
-
-    impl_synom!(ImplItemConst "const item in impl block" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        defaultness: option!(keyword!(default)) >>
-        const_: keyword!(const) >>
-        ident: syn!(Ident) >>
-        colon: punct!(:) >>
-        ty: syn!(Type) >>
-        eq: punct!(=) >>
-        value: syn!(Expr) >>
-        semi: punct!(;) >>
-        (ImplItemConst {
-            attrs: attrs,
-            vis: vis,
-            defaultness: defaultness,
-            const_token: const_,
-            ident: ident,
-            colon_token: colon,
-            ty: ty,
-            eq_token: eq,
-            expr: value,
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ImplItemMethod "method in impl block" do_parse!(
-        outer_attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        defaultness: option!(keyword!(default)) >>
-        constness: option!(keyword!(const)) >>
-        unsafety: option!(keyword!(unsafe)) >>
-        abi: option!(syn!(Abi)) >>
-        fn_: keyword!(fn) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        inputs: parens!(Punctuated::parse_terminated) >>
-        ret: syn!(ReturnType) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        inner_attrs_stmts: braces!(tuple!(
-            many0!(Attribute::parse_inner),
-            call!(Block::parse_within)
-        )) >>
-        (ImplItemMethod {
-            attrs: {
-                let mut attrs = outer_attrs;
-                attrs.extend((inner_attrs_stmts.1).0);
-                attrs
-            },
-            vis: vis,
-            defaultness: defaultness,
-            sig: MethodSig {
-                constness: constness,
-                unsafety: unsafety,
-                abi: abi,
-                ident: ident,
-                decl: FnDecl {
-                    fn_token: fn_,
-                    paren_token: inputs.0,
-                    inputs: inputs.1,
-                    output: ret,
-                    generics: Generics {
-                        where_clause: where_clause,
-                        .. generics
-                    },
-                    variadic: None,
-                },
-            },
-            block: Block {
-                brace_token: inner_attrs_stmts.0,
-                stmts: (inner_attrs_stmts.1).1,
-            },
-        })
-    ));
-
-    impl_synom!(ImplItemType "type in impl block" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        defaultness: option!(keyword!(default)) >>
-        type_: keyword!(type) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        eq: punct!(=) >>
-        ty: syn!(Type) >>
-        semi: punct!(;) >>
-        (ImplItemType {
-            attrs: attrs,
-            vis: vis,
-            defaultness: defaultness,
-            type_token: type_,
-            ident: ident,
-            generics: generics,
-            eq_token: eq,
-            ty: ty,
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ImplItemMacro "macro in impl block" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        mac: syn!(Macro) >>
-        semi: cond!(!is_brace(&mac.delimiter), punct!(;)) >>
-        (ImplItemMacro {
-            attrs: attrs,
-            mac: mac,
-            semi_token: semi,
-        })
-    ));
-
-    fn is_brace(delimiter: &MacroDelimiter) -> bool {
-        match *delimiter {
-            MacroDelimiter::Brace(_) => true,
-            MacroDelimiter::Paren(_) | MacroDelimiter::Bracket(_) => false,
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use attr::FilterAttrs;
-    use quote::{ToTokens, Tokens};
-
-    impl ToTokens for ItemExternCrate {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.extern_token.to_tokens(tokens);
-            self.crate_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            if let Some((ref as_token, ref rename)) = self.rename {
-                as_token.to_tokens(tokens);
-                rename.to_tokens(tokens);
-            }
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ItemUse {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.use_token.to_tokens(tokens);
-            self.leading_colon.to_tokens(tokens);
-            self.tree.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ItemStatic {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.static_token.to_tokens(tokens);
-            self.mutability.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ItemConst {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.const_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ItemFn {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.constness.to_tokens(tokens);
-            self.unsafety.to_tokens(tokens);
-            self.abi.to_tokens(tokens);
-            NamedDecl(&self.decl, self.ident).to_tokens(tokens);
-            self.block.brace_token.surround(tokens, |tokens| {
-                tokens.append_all(self.attrs.inner());
-                tokens.append_all(&self.block.stmts);
-            });
-        }
-    }
-
-    impl ToTokens for ItemMod {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.mod_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            if let Some((ref brace, ref items)) = self.content {
-                brace.surround(tokens, |tokens| {
-                    tokens.append_all(self.attrs.inner());
-                    tokens.append_all(items);
-                });
-            } else {
-                TokensOrDefault(&self.semi).to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for ItemForeignMod {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.abi.to_tokens(tokens);
-            self.brace_token.surround(tokens, |tokens| {
-                tokens.append_all(&self.items);
-            });
-        }
-    }
-
-    impl ToTokens for ItemType {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.type_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            self.generics.where_clause.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ItemEnum {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.enum_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            self.generics.where_clause.to_tokens(tokens);
-            self.brace_token.surround(tokens, |tokens| {
-                self.variants.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for ItemStruct {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.struct_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            match self.fields {
-                Fields::Named(ref fields) => {
-                    self.generics.where_clause.to_tokens(tokens);
-                    fields.to_tokens(tokens);
-                }
-                Fields::Unnamed(ref fields) => {
-                    fields.to_tokens(tokens);
-                    self.generics.where_clause.to_tokens(tokens);
-                    TokensOrDefault(&self.semi_token).to_tokens(tokens);
-                }
-                Fields::Unit => {
-                    self.generics.where_clause.to_tokens(tokens);
-                    TokensOrDefault(&self.semi_token).to_tokens(tokens);
-                }
-            }
-        }
-    }
-
-    impl ToTokens for ItemUnion {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.union_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            self.generics.where_clause.to_tokens(tokens);
-            self.fields.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ItemTrait {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.unsafety.to_tokens(tokens);
-            self.auto_token.to_tokens(tokens);
-            self.trait_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            if !self.supertraits.is_empty() {
-                TokensOrDefault(&self.colon_token).to_tokens(tokens);
-                self.supertraits.to_tokens(tokens);
-            }
-            self.generics.where_clause.to_tokens(tokens);
-            self.brace_token.surround(tokens, |tokens| {
-                tokens.append_all(&self.items);
-            });
-        }
-    }
-
-    impl ToTokens for ItemImpl {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.defaultness.to_tokens(tokens);
-            self.unsafety.to_tokens(tokens);
-            self.impl_token.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            if let Some((ref polarity, ref path, ref for_token)) = self.trait_ {
-                polarity.to_tokens(tokens);
-                path.to_tokens(tokens);
-                for_token.to_tokens(tokens);
-            }
-            self.self_ty.to_tokens(tokens);
-            self.generics.where_clause.to_tokens(tokens);
-            self.brace_token.surround(tokens, |tokens| {
-                tokens.append_all(self.attrs.inner());
-                tokens.append_all(&self.items);
-            });
-        }
-    }
-
-    impl ToTokens for ItemMacro {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.mac.path.to_tokens(tokens);
-            self.mac.bang_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            match self.mac.delimiter {
-                MacroDelimiter::Paren(ref paren) => {
-                    paren.surround(tokens, |tokens| self.mac.tts.to_tokens(tokens));
-                }
-                MacroDelimiter::Brace(ref brace) => {
-                    brace.surround(tokens, |tokens| self.mac.tts.to_tokens(tokens));
-                }
-                MacroDelimiter::Bracket(ref bracket) => {
-                    bracket.surround(tokens, |tokens| self.mac.tts.to_tokens(tokens));
-                }
-            }
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ItemMacro2 {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.macro_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                self.args.to_tokens(tokens);
-            });
-            self.brace_token.surround(tokens, |tokens| {
-                self.body.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for ItemVerbatim {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.tts.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for UsePath {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.ident.to_tokens(tokens);
-            self.colon2_token.to_tokens(tokens);
-            self.tree.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for UseName {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.ident.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for UseRename {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.ident.to_tokens(tokens);
-            self.as_token.to_tokens(tokens);
-            self.rename.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for UseGlob {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.star_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for UseGroup {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.brace_token.surround(tokens, |tokens| {
-                self.items.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for TraitItemConst {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.const_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            if let Some((ref eq_token, ref default)) = self.default {
-                eq_token.to_tokens(tokens);
-                default.to_tokens(tokens);
-            }
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TraitItemMethod {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.sig.to_tokens(tokens);
-            match self.default {
-                Some(ref block) => {
-                    block.brace_token.surround(tokens, |tokens| {
-                        tokens.append_all(self.attrs.inner());
-                        tokens.append_all(&block.stmts);
-                    });
-                }
-                None => {
-                    TokensOrDefault(&self.semi_token).to_tokens(tokens);
-                }
-            }
-        }
-    }
-
-    impl ToTokens for TraitItemType {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.type_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            if !self.bounds.is_empty() {
-                TokensOrDefault(&self.colon_token).to_tokens(tokens);
-                self.bounds.to_tokens(tokens);
-            }
-            self.generics.where_clause.to_tokens(tokens);
-            if let Some((ref eq_token, ref default)) = self.default {
-                eq_token.to_tokens(tokens);
-                default.to_tokens(tokens);
-            }
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TraitItemMacro {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.mac.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TraitItemVerbatim {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.tts.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ImplItemConst {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.defaultness.to_tokens(tokens);
-            self.const_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ImplItemMethod {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.defaultness.to_tokens(tokens);
-            self.sig.to_tokens(tokens);
-            self.block.brace_token.surround(tokens, |tokens| {
-                tokens.append_all(self.attrs.inner());
-                tokens.append_all(&self.block.stmts);
-            });
-        }
-    }
-
-    impl ToTokens for ImplItemType {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.defaultness.to_tokens(tokens);
-            self.type_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ImplItemMacro {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.mac.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ImplItemVerbatim {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.tts.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ForeignItemFn {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            NamedDecl(&self.decl, self.ident).to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ForeignItemStatic {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.static_token.to_tokens(tokens);
-            self.mutability.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ForeignItemType {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.type_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ForeignItemVerbatim {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.tts.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for MethodSig {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.constness.to_tokens(tokens);
-            self.unsafety.to_tokens(tokens);
-            self.abi.to_tokens(tokens);
-            NamedDecl(&self.decl, self.ident).to_tokens(tokens);
-        }
-    }
-
-    struct NamedDecl<'a>(&'a FnDecl, Ident);
-
-    impl<'a> ToTokens for NamedDecl<'a> {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.0.fn_token.to_tokens(tokens);
-            self.1.to_tokens(tokens);
-            self.0.generics.to_tokens(tokens);
-            self.0.paren_token.surround(tokens, |tokens| {
-                self.0.inputs.to_tokens(tokens);
-                if self.0.variadic.is_some() && !self.0.inputs.empty_or_trailing() {
-                    <Token![,]>::default().to_tokens(tokens);
-                }
-                self.0.variadic.to_tokens(tokens);
-            });
-            self.0.output.to_tokens(tokens);
-            self.0.generics.where_clause.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ArgSelfRef {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.and_token.to_tokens(tokens);
-            self.lifetime.to_tokens(tokens);
-            self.mutability.to_tokens(tokens);
-            self.self_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ArgSelf {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.mutability.to_tokens(tokens);
-            self.self_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ArgCaptured {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.pat.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/lib.rs b/third_party/rust/syn-0.13.1/src/lib.rs
deleted file mode 100644
index d0e291dcb4fc..000000000000
--- a/third_party/rust/syn-0.13.1/src/lib.rs
+++ /dev/null
@@ -1,724 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Syn is a parsing library for parsing a stream of Rust tokens into a syntax
-//! tree of Rust source code.
-//!
-//! Currently this library is geared toward the [custom derive] use case but
-//! contains some APIs that may be useful for Rust procedural macros more
-//! generally.
-//!
-//! [custom derive]: https://github.com/rust-lang/rfcs/blob/master/text/1681-macros-1.1.md
-//!
-//! - **Data structures** — Syn provides a complete syntax tree that can
-//!   represent any valid Rust source code. The syntax tree is rooted at
-//!   [`syn::File`] which represents a full source file, but there are other
-//!   entry points that may be useful to procedural macros including
-//!   [`syn::Item`], [`syn::Expr`] and [`syn::Type`].
-//!
-//! - **Custom derives** — Of particular interest to custom derives is
-//!   [`syn::DeriveInput`] which is any of the three legal input items to a
-//!   derive macro. An example below shows using this type in a library that can
-//!   derive implementations of a trait of your own.
-//!
-//! - **Parser combinators** — Parsing in Syn is built on a suite of public
-//!   parser combinator macros that you can use for parsing any token-based
-//!   syntax you dream up within a `functionlike!(...)` procedural macro. Every
-//!   syntax tree node defined by Syn is individually parsable and may be used
-//!   as a building block for custom syntaxes, or you may do it all yourself
-//!   working from the most primitive tokens.
-//!
-//! - **Location information** — Every token parsed by Syn is associated with a
-//!   `Span` that tracks line and column information back to the source of that
-//!   token. These spans allow a procedural macro to display detailed error
-//!   messages pointing to all the right places in the user's code. There is an
-//!   example of this below.
-//!
-//! - **Feature flags** — Functionality is aggressively feature gated so your
-//!   procedural macros enable only what they need, and do not pay in compile
-//!   time for all the rest.
-//!
-//! [`syn::File`]: struct.File.html
-//! [`syn::Item`]: enum.Item.html
-//! [`syn::Expr`]: enum.Expr.html
-//! [`syn::Type`]: enum.Type.html
-//! [`syn::DeriveInput`]: struct.DeriveInput.html
-//!
-//! *Version requirement: Syn supports any compiler version back to Rust's very
-//! first support for procedural macros in Rust 1.15.0. Some features especially
-//! around error reporting are only available in newer compilers or on the
-//! nightly channel.*
-//!
-//! ## Example of a custom derive
-//!
-//! The canonical custom derive using Syn looks like this. We write an ordinary
-//! Rust function tagged with a `proc_macro_derive` attribute and the name of
-//! the trait we are deriving. Any time that derive appears in the user's code,
-//! the Rust compiler passes their data structure as tokens into our macro. We
-//! get to execute arbitrary Rust code to figure out what to do with those
-//! tokens, then hand some tokens back to the compiler to compile into the
-//! user's crate.
-//!
-//! [`TokenStream`]: https://doc.rust-lang.org/proc_macro/struct.TokenStream.html
-//!
-//! ```toml
-//! [dependencies]
-//! syn = "0.13"
-//! quote = "0.5"
-//!
-//! [lib]
-//! proc-macro = true
-//! ```
-//!
-//! ```rust
-//! extern crate proc_macro;
-//! extern crate syn;
-//!
-//! #[macro_use]
-//! extern crate quote;
-//!
-//! use proc_macro::TokenStream;
-//! use syn::DeriveInput;
-//!
-//! # const IGNORE_TOKENS: &str = stringify! {
-//! #[proc_macro_derive(MyMacro)]
-//! # };
-//! pub fn my_macro(input: TokenStream) -> TokenStream {
-//!     // Parse the input tokens into a syntax tree
-//!     let input: DeriveInput = syn::parse(input).unwrap();
-//!
-//!     // Build the output, possibly using quasi-quotation
-//!     let expanded = quote! {
-//!         // ...
-//!     };
-//!
-//!     // Hand the output tokens back to the compiler
-//!     expanded.into()
-//! }
-//! #
-//! # fn main() {}
-//! ```
-//!
-//! The [`heapsize`] example directory shows a complete working Macros 1.1
-//! implementation of a custom derive. It works on any Rust compiler \>=1.15.0.
-//! The example derives a `HeapSize` trait which computes an estimate of the
-//! amount of heap memory owned by a value.
-//!
-//! [`heapsize`]: https://github.com/dtolnay/syn/tree/master/examples/heapsize
-//!
-//! ```rust
-//! pub trait HeapSize {
-//!     /// Total number of bytes of heap memory owned by `self`.
-//!     fn heap_size_of_children(&self) -> usize;
-//! }
-//! ```
-//!
-//! The custom derive allows users to write `#[derive(HeapSize)]` on data
-//! structures in their program.
-//!
-//! ```rust
-//! # const IGNORE_TOKENS: &str = stringify! {
-//! #[derive(HeapSize)]
-//! # };
-//! struct Demo<'a, T: ?Sized> {
-//!     a: Box<T>,
-//!     b: u8,
-//!     c: &'a str,
-//!     d: String,
-//! }
-//! ```
-//!
-//! ## Spans and error reporting
-//!
-//! The [`heapsize2`] example directory is an extension of the `heapsize`
-//! example that demonstrates some of the hygiene and error reporting properties
-//! of Macros 2.0. This example currently requires a nightly Rust compiler
-//! \>=1.24.0-nightly but we are working to stabilize all of the APIs involved.
-//!
-//! [`heapsize2`]: https://github.com/dtolnay/syn/tree/master/examples/heapsize2
-//!
-//! The token-based procedural macro API provides great control over where the
-//! compiler's error messages are displayed in user code. Consider the error the
-//! user sees if one of their field types does not implement `HeapSize`.
-//!
-//! ```rust
-//! # const IGNORE_TOKENS: &str = stringify! {
-//! #[derive(HeapSize)]
-//! # };
-//! struct Broken {
-//!     ok: String,
-//!     bad: std::thread::Thread,
-//! }
-//! ```
-//!
-//! In the Macros 1.1 string-based procedural macro world, the resulting error
-//! would point unhelpfully to the invocation of the derive macro and not to the
-//! actual problematic field.
-//!
-//! ```text
-//! error[E0599]: no method named `heap_size_of_children` found for type `std::thread::Thread` in the current scope
-//!  --> src/main.rs:4:10
-//!   |
-//! 4 | #[derive(HeapSize)]
-//!   |          ^^^^^^^^
-//! ```
-//!
-//! By tracking span information all the way through the expansion of a
-//! procedural macro as shown in the `heapsize2` example, token-based macros in
-//! Syn are able to trigger errors that directly pinpoint the source of the
-//! problem.
-//!
-//! ```text
-//! error[E0277]: the trait bound `std::thread::Thread: HeapSize` is not satisfied
-//!  --> src/main.rs:7:5
-//!   |
-//! 7 |     bad: std::thread::Thread,
-//!   |     ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `HeapSize` is not implemented for `Thread`
-//! ```
-//!
-//! ## Parsing a custom syntax using combinators
-//!
-//! The [`lazy-static`] example directory shows the implementation of a
-//! `functionlike!(...)` procedural macro in which the input tokens are parsed
-//! using [`nom`]-style parser combinators.
-//!
-//! [`lazy-static`]: https://github.com/dtolnay/syn/tree/master/examples/lazy-static
-//! [`nom`]: https://github.com/Geal/nom
-//!
-//! The example reimplements the popular `lazy_static` crate from crates.io as a
-//! procedural macro.
-//!
-//! ```
-//! # macro_rules! lazy_static {
-//! #     ($($tt:tt)*) => {}
-//! # }
-//! #
-//! lazy_static! {
-//!     static ref USERNAME: Regex = Regex::new("^[a-z0-9_-]{3,16}$").unwrap();
-//! }
-//! ```
-//!
-//! The implementation shows how to trigger custom warnings and error messages
-//! on the macro input.
-//!
-//! ```text
-//! warning: come on, pick a more creative name
-//!   --> src/main.rs:10:16
-//!    |
-//! 10 |     static ref FOO: String = "lazy_static".to_owned();
-//!    |                ^^^
-//! ```
-//!
-//! ## Debugging
-//!
-//! When developing a procedural macro it can be helpful to look at what the
-//! generated code looks like. Use `cargo rustc -- -Zunstable-options
-//! --pretty=expanded` or the [`cargo expand`] subcommand.
-//!
-//! [`cargo expand`]: https://github.com/dtolnay/cargo-expand
-//!
-//! To show the expanded code for some crate that uses your procedural macro,
-//! run `cargo expand` from that crate. To show the expanded code for one of
-//! your own test cases, run `cargo expand --test the_test_case` where the last
-//! argument is the name of the test file without the `.rs` extension.
-//!
-//! This write-up by Brandon W Maister discusses debugging in more detail:
-//! [Debugging Rust's new Custom Derive system][debugging].
-//!
-//! [debugging]: https://quodlibetor.github.io/posts/debugging-rusts-new-custom-derive-system/
-//!
-//! ## Optional features
-//!
-//! Syn puts a lot of functionality behind optional features in order to
-//! optimize compile time for the most common use cases. The following features
-//! are available.
-//!
-//! - **`derive`** *(enabled by default)* — Data structures for representing the
-//!   possible input to a custom derive, including structs and enums and types.
-//! - **`full`** — Data structures for representing the syntax tree of all valid
-//!   Rust source code, including items and expressions.
-//! - **`parsing`** *(enabled by default)* — Ability to parse input tokens into
-//!   a syntax tree node of a chosen type.
-//! - **`printing`** *(enabled by default)* — Ability to print a syntax tree
-//!   node as tokens of Rust source code.
-//! - **`visit`** — Trait for traversing a syntax tree.
-//! - **`visit-mut`** — Trait for traversing and mutating in place a syntax
-//!   tree.
-//! - **`fold`** — Trait for transforming an owned syntax tree.
-//! - **`clone-impls`** *(enabled by default)* — Clone impls for all syntax tree
-//!   types.
-//! - **`extra-traits`** — Debug, Eq, PartialEq, Hash impls for all syntax tree
-//!   types.
-
-// Syn types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/syn/0.13.1")]
-#![cfg_attr(feature = "cargo-clippy",
-            allow(const_static_lifetime, doc_markdown, large_enum_variant, match_bool,
-                  redundant_closure, needless_pass_by_value, redundant_field_names))]
-
-extern crate proc_macro2;
-#[cfg(feature = "proc-macro")]
-extern crate proc_macro;
-extern crate unicode_xid;
-
-#[cfg(feature = "printing")]
-extern crate quote;
-
-#[cfg(feature = "parsing")]
-#[macro_use]
-#[doc(hidden)]
-pub mod parsers;
-
-#[macro_use]
-mod macros;
-
-#[macro_use]
-pub mod token;
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod attr;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use attr::{AttrStyle, Attribute, Meta, MetaList, MetaNameValue, NestedMeta};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod data;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use data::{Field, Fields, FieldsNamed, FieldsUnnamed, Variant, VisCrate, VisPublic,
-               VisRestricted, Visibility};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod expr;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use expr::{Expr, ExprReference, ExprArray, ExprAssign, ExprAssignOp, ExprBinary, ExprBlock,
-               ExprBox, ExprBreak, ExprCall, ExprCast, ExprCatch, ExprClosure, ExprContinue,
-               ExprField, ExprForLoop, ExprGroup, ExprIf, ExprIfLet, ExprInPlace, ExprIndex,
-               ExprLit, ExprLoop, ExprMacro, ExprMatch, ExprMethodCall, ExprParen, ExprPath,
-               ExprRange, ExprRepeat, ExprReturn, ExprStruct, ExprTry, ExprTuple, ExprType,
-               ExprUnary, ExprUnsafe, ExprVerbatim, ExprWhile, ExprWhileLet, ExprYield, Index,
-               Member};
-
-#[cfg(feature = "full")]
-pub use expr::{Arm, Block, FieldPat, FieldValue, GenericMethodArgument, Label, Local,
-               MethodTurbofish, Pat, PatBox, PatIdent, PatLit, PatMacro, PatPath, PatRange,
-               PatRef, PatSlice, PatStruct, PatTuple, PatTupleStruct, PatVerbatim, PatWild,
-               RangeLimits, Stmt};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod generics;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use generics::{BoundLifetimes, ConstParam, GenericParam, Generics, LifetimeDef, PredicateEq,
-                   PredicateLifetime, PredicateType, TraitBound, TraitBoundModifier, TypeParam,
-                   TypeParamBound, WhereClause, WherePredicate};
-#[cfg(all(any(feature = "full", feature = "derive"), feature = "printing"))]
-pub use generics::{ImplGenerics, Turbofish, TypeGenerics};
-
-mod ident;
-pub use ident::Ident;
-
-#[cfg(feature = "full")]
-mod item;
-#[cfg(feature = "full")]
-pub use item::{ArgCaptured, ArgSelf, ArgSelfRef, FnArg, FnDecl, ForeignItem, ForeignItemFn,
-               ForeignItemStatic, ForeignItemType, ForeignItemVerbatim, ImplItem, ImplItemConst,
-               ImplItemMacro, ImplItemMethod, ImplItemType, ImplItemVerbatim, Item, ItemConst,
-               ItemEnum, ItemExternCrate, ItemFn, ItemForeignMod, ItemImpl, ItemMacro, ItemMacro2,
-               ItemMod, ItemStatic, ItemStruct, ItemTrait, ItemType, ItemUnion, ItemUse,
-               ItemVerbatim, MethodSig, TraitItem, TraitItemConst, TraitItemMacro,
-               TraitItemMethod, TraitItemType, TraitItemVerbatim, UseGlob, UseGroup, UseName,
-               UsePath, UseRename, UseTree};
-
-#[cfg(feature = "full")]
-mod file;
-#[cfg(feature = "full")]
-pub use file::File;
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod lifetime;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use lifetime::Lifetime;
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod lit;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use lit::{FloatSuffix, IntSuffix, Lit, LitBool, LitByte, LitByteStr, LitChar, LitFloat,
-              LitInt, LitStr, LitVerbatim, StrStyle};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod mac;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use mac::{Macro, MacroDelimiter};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod derive;
-#[cfg(feature = "derive")]
-pub use derive::{Data, DataEnum, DataStruct, DataUnion, DeriveInput};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod op;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use op::{BinOp, UnOp};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod ty;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use ty::{Abi, BareFnArg, BareFnArgName, ReturnType, Type, TypeArray, TypeBareFn, TypeGroup,
-             TypeImplTrait, TypeInfer, TypeMacro, TypeNever, TypeParen, TypePath, TypePtr,
-             TypeReference, TypeSlice, TypeTraitObject, TypeTuple, TypeVerbatim};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod path;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use path::{AngleBracketedGenericArguments, Binding, GenericArgument,
-               ParenthesizedGenericArguments, Path, PathArguments, PathSegment, QSelf};
-#[cfg(all(any(feature = "full", feature = "derive"), feature = "printing"))]
-pub use path::PathTokens;
-
-#[cfg(feature = "parsing")]
-pub mod buffer;
-#[cfg(feature = "parsing")]
-pub mod synom;
-pub mod punctuated;
-#[cfg(any(feature = "full", feature = "derive"))]
-mod tt;
-
-// Not public API except the `parse_quote!` macro.
-#[cfg(feature = "parsing")]
-#[doc(hidden)]
-pub mod parse_quote;
-
-#[cfg(all(feature = "parsing", feature = "printing"))]
-pub mod spanned;
-
-mod gen {
-    /// Syntax tree traversal to walk a shared borrow of a syntax tree.
-    ///
-    /// Each method of the [`Visit`] trait is a hook that can be overridden to
-    /// customize the behavior when visiting the corresponding type of node. By
-    /// default, every method recursively visits the substructure of the input
-    /// by invoking the right visitor method of each of its fields.
-    ///
-    /// [`Visit`]: trait.Visit.html
-    ///
-    /// ```rust
-    /// # use syn::{Attribute, BinOp, Expr, ExprBinary};
-    /// #
-    /// pub trait Visit<'ast> {
-    ///     /* ... */
-    ///
-    ///     fn visit_expr_binary(&mut self, node: &'ast ExprBinary) {
-    ///         for attr in &node.attrs {
-    ///             self.visit_attribute(attr);
-    ///         }
-    ///         self.visit_expr(&*node.left);
-    ///         self.visit_bin_op(&node.op);
-    ///         self.visit_expr(&*node.right);
-    ///     }
-    ///
-    ///     /* ... */
-    ///     # fn visit_attribute(&mut self, node: &'ast Attribute);
-    ///     # fn visit_expr(&mut self, node: &'ast Expr);
-    ///     # fn visit_bin_op(&mut self, node: &'ast BinOp);
-    /// }
-    /// ```
-    ///
-    /// *This module is available if Syn is built with the `"visit"` feature.*
-    #[cfg(feature = "visit")]
-    pub mod visit;
-
-
-    /// Syntax tree traversal to mutate an exclusive borrow of a syntax tree in
-    /// place.
-    ///
-    /// Each method of the [`VisitMut`] trait is a hook that can be overridden
-    /// to customize the behavior when mutating the corresponding type of node.
-    /// By default, every method recursively visits the substructure of the
-    /// input by invoking the right visitor method of each of its fields.
-    ///
-    /// [`VisitMut`]: trait.VisitMut.html
-    ///
-    /// ```rust
-    /// # use syn::{Attribute, BinOp, Expr, ExprBinary};
-    /// #
-    /// pub trait VisitMut {
-    ///     /* ... */
-    ///
-    ///     fn visit_expr_binary_mut(&mut self, node: &mut ExprBinary) {
-    ///         for attr in &mut node.attrs {
-    ///             self.visit_attribute_mut(attr);
-    ///         }
-    ///         self.visit_expr_mut(&mut *node.left);
-    ///         self.visit_bin_op_mut(&mut node.op);
-    ///         self.visit_expr_mut(&mut *node.right);
-    ///     }
-    ///
-    ///     /* ... */
-    ///     # fn visit_attribute_mut(&mut self, node: &mut Attribute);
-    ///     # fn visit_expr_mut(&mut self, node: &mut Expr);
-    ///     # fn visit_bin_op_mut(&mut self, node: &mut BinOp);
-    /// }
-    /// ```
-    ///
-    /// *This module is available if Syn is built with the `"visit-mut"`
-    /// feature.*
-    #[cfg(feature = "visit-mut")]
-    pub mod visit_mut;
-
-    /// Syntax tree traversal to transform the nodes of an owned syntax tree.
-    ///
-    /// Each method of the [`Fold`] trait is a hook that can be overridden to
-    /// customize the behavior when transforming the corresponding type of node.
-    /// By default, every method recursively visits the substructure of the
-    /// input by invoking the right visitor method of each of its fields.
-    ///
-    /// [`Fold`]: trait.Fold.html
-    ///
-    /// ```rust
-    /// # use syn::{Attribute, BinOp, Expr, ExprBinary};
-    /// #
-    /// pub trait Fold {
-    ///     /* ... */
-    ///
-    ///     fn fold_expr_binary(&mut self, node: ExprBinary) -> ExprBinary {
-    ///         ExprBinary {
-    ///             attrs: node.attrs
-    ///                        .into_iter()
-    ///                        .map(|attr| self.fold_attribute(attr))
-    ///                        .collect(),
-    ///             left: Box::new(self.fold_expr(*node.left)),
-    ///             op: self.fold_bin_op(node.op),
-    ///             right: Box::new(self.fold_expr(*node.right)),
-    ///         }
-    ///     }
-    ///
-    ///     /* ... */
-    ///     # fn fold_attribute(&mut self, node: Attribute) -> Attribute;
-    ///     # fn fold_expr(&mut self, node: Expr) -> Expr;
-    ///     # fn fold_bin_op(&mut self, node: BinOp) -> BinOp;
-    /// }
-    /// ```
-    ///
-    /// *This module is available if Syn is built with the `"fold"` feature.*
-    #[cfg(feature = "fold")]
-    pub mod fold;
-
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[path = "../gen_helper.rs"]
-    mod helper;
-}
-pub use gen::*;
-
-////////////////////////////////////////////////////////////////////////////////
-
-#[cfg(feature = "parsing")]
-use synom::{Synom, Parser};
-
-#[cfg(feature = "parsing")]
-mod error;
-#[cfg(feature = "parsing")]
-use error::ParseError;
-
-// Not public API.
-#[cfg(feature = "parsing")]
-#[doc(hidden)]
-pub use error::parse_error;
-
-/// Parse tokens of source code into the chosen syntax tree node.
-///
-/// This is preferred over parsing a string because tokens are able to preserve
-/// information about where in the user's code they were originally written (the
-/// "span" of the token), possibly allowing the compiler to produce better error
-/// messages.
-///
-/// This function parses a `proc_macro::TokenStream` which is the type used for
-/// interop with the compiler in a procedural macro. To parse a
-/// `proc_macro2::TokenStream`, use [`syn::parse2`] instead.
-///
-/// [`syn::parse2`]: fn.parse2.html
-///
-/// *This function is available if Syn is built with the `"parsing"` feature.*
-///
-/// # Examples
-///
-/// ```rust
-/// extern crate proc_macro;
-/// use proc_macro::TokenStream;
-///
-/// extern crate syn;
-///
-/// #[macro_use]
-/// extern crate quote;
-///
-/// use syn::DeriveInput;
-///
-/// # const IGNORE_TOKENS: &str = stringify! {
-/// #[proc_macro_derive(MyMacro)]
-/// # };
-/// pub fn my_macro(input: TokenStream) -> TokenStream {
-///     // Parse the tokens into a syntax tree
-///     let ast: DeriveInput = syn::parse(input).unwrap();
-///
-///     // Build the output, possibly using quasi-quotation
-///     let expanded = quote! {
-///         /* ... */
-///     };
-///
-///     // Convert into a token stream and return it
-///     expanded.into()
-/// }
-/// #
-/// # fn main() {}
-/// ```
-#[cfg(all(feature = "parsing", feature = "proc-macro"))]
-pub fn parse<T>(tokens: proc_macro::TokenStream) -> Result<T, ParseError>
-where
-    T: Synom,
-{
-    parse2(tokens.into())
-}
-
-/// Parse a proc-macro2 token stream into the chosen syntax tree node.
-///
-/// This function parses a `proc_macro2::TokenStream` which is commonly useful
-/// when the input comes from a node of the Syn syntax tree, for example the tts
-/// of a [`Macro`] node. When in a procedural macro parsing the
-/// `proc_macro::TokenStream` provided by the compiler, use [`syn::parse`]
-/// instead.
-///
-/// [`Macro`]: struct.Macro.html
-/// [`syn::parse`]: fn.parse.html
-///
-/// *This function is available if Syn is built with the `"parsing"` feature.*
-#[cfg(feature = "parsing")]
-pub fn parse2<T>(tokens: proc_macro2::TokenStream) -> Result<T, ParseError>
-where
-    T: Synom,
-{
-    let parser = T::parse;
-    parser.parse2(tokens).map_err(|err| {
-        match T::description() {
-            Some(s) => ParseError::new(format!("failed to parse {}: {}", s, err)),
-            None => err,
-        }
-    })
-}
-
-/// Parse a string of Rust code into the chosen syntax tree node.
-///
-/// *This function is available if Syn is built with the `"parsing"` feature.*
-///
-/// # Hygiene
-///
-/// Every span in the resulting syntax tree will be set to resolve at the macro
-/// call site.
-///
-/// # Examples
-///
-/// ```rust
-/// extern crate syn;
-/// #
-/// #
-/// # type Result<T> = std::result::Result<T, Box<std::error::Error>>;
-///
-/// use syn::Expr;
-///
-/// fn run() -> Result<()> {
-///     let code = "assert_eq!(u8::max_value(), 255)";
-///     let expr = syn::parse_str::<Expr>(code)?;
-///     println!("{:#?}", expr);
-///     Ok(())
-/// }
-/// #
-/// # fn main() { run().unwrap() }
-/// ```
-#[cfg(feature = "parsing")]
-pub fn parse_str<T: Synom>(s: &str) -> Result<T, ParseError> {
-    match s.parse() {
-        Ok(tts) => parse2(tts),
-        Err(_) => Err(ParseError::new("error while lexing input string")),
-    }
-}
-
-// FIXME the name parse_file makes it sound like you might pass in a path to a
-// file, rather than the content.
-/// Parse the content of a file of Rust code.
-///
-/// This is different from `syn::parse_str::<File>(content)` in two ways:
-///
-/// - It discards a leading byte order mark `\u{FEFF}` if the file has one.
-/// - It preserves the shebang line of the file, such as `#!/usr/bin/env rustx`.
-///
-/// If present, either of these would be an error using `from_str`.
-///
-/// *This function is available if Syn is built with the `"parsing"` and `"full"` features.*
-///
-/// # Examples
-///
-/// ```rust,no_run
-/// extern crate syn;
-/// #
-/// #
-/// # type Result<T> = std::result::Result<T, Box<std::error::Error>>;
-///
-/// use std::fs::File;
-/// use std::io::Read;
-///
-/// fn run() -> Result<()> {
-///     let mut file = File::open("path/to/code.rs")?;
-///     let mut content = String::new();
-///     file.read_to_string(&mut content)?;
-///
-///     let ast = syn::parse_file(&content)?;
-///     if let Some(shebang) = ast.shebang {
-///         println!("{}", shebang);
-///     }
-///     println!("{} items", ast.items.len());
-///
-///     Ok(())
-/// }
-/// #
-/// # fn main() { run().unwrap() }
-/// ```
-#[cfg(all(feature = "parsing", feature = "full"))]
-pub fn parse_file(mut content: &str) -> Result<File, ParseError> {
-    // Strip the BOM if it is present
-    const BOM: &'static str = "\u{feff}";
-    if content.starts_with(BOM) {
-        content = &content[BOM.len()..];
-    }
-
-    let mut shebang = None;
-    if content.starts_with("#!") && !content.starts_with("#![") {
-        if let Some(idx) = content.find('\n') {
-            shebang = Some(content[..idx].to_string());
-            content = &content[idx..];
-        } else {
-            shebang = Some(content.to_string());
-            content = "";
-        }
-    }
-
-    let mut file: File = parse_str(content)?;
-    file.shebang = shebang;
-    Ok(file)
-}
-
-#[cfg(all(any(feature = "full", feature = "derive"), feature = "printing"))]
-struct TokensOrDefault<'a, T: 'a>(&'a Option<T>);
-
-#[cfg(all(any(feature = "full", feature = "derive"), feature = "printing"))]
-impl<'a, T> quote::ToTokens for TokensOrDefault<'a, T>
-where
-    T: quote::ToTokens + Default,
-{
-    fn to_tokens(&self, tokens: &mut quote::Tokens) {
-        match *self.0 {
-            Some(ref t) => t.to_tokens(tokens),
-            None => T::default().to_tokens(tokens),
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/lifetime.rs b/third_party/rust/syn-0.13.1/src/lifetime.rs
deleted file mode 100644
index 276e2d58fbe3..000000000000
--- a/third_party/rust/syn-0.13.1/src/lifetime.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::cmp::Ordering;
-use std::fmt::{self, Display};
-use std::hash::{Hash, Hasher};
-
-use proc_macro2::{Span, Term};
-use unicode_xid::UnicodeXID;
-
-/// A Rust lifetime: `'a`.
-///
-/// Lifetime names must conform to the following rules:
-///
-/// - Must start with an apostrophe.
-/// - Must not consist of just an apostrophe: `'`.
-/// - Character after the apostrophe must be `_` or a Unicode code point with
-///   the XID_Start property.
-/// - All following characters must be Unicode code points with the XID_Continue
-///   property.
-///
-/// *This type is available if Syn is built with the `"derive"` or `"full"`
-/// feature.*
-#[cfg_attr(feature = "extra-traits", derive(Debug))]
-#[derive(Copy, Clone)]
-pub struct Lifetime {
-    term: Term,
-}
-
-impl Lifetime {
-    pub fn new(s: &str, span: Span) -> Self {
-        if !s.starts_with('\'') {
-            panic!(
-                "lifetime name must start with apostrophe as in \"'a\", \
-                 got {:?}",
-                s
-            );
-        }
-
-        if s == "'" {
-            panic!("lifetime name must not be empty");
-        }
-
-        fn xid_ok(s: &str) -> bool {
-            let mut chars = s.chars();
-            let first = chars.next().unwrap();
-            if !(UnicodeXID::is_xid_start(first) || first == '_') {
-                return false;
-            }
-            for ch in chars {
-                if !UnicodeXID::is_xid_continue(ch) {
-                    return false;
-                }
-            }
-            true
-        }
-
-        if !xid_ok(&s[1..]) {
-            panic!("{:?} is not a valid lifetime name", s);
-        }
-
-        Lifetime {
-            term: Term::new(s, span),
-        }
-    }
-
-    pub fn span(&self) -> Span {
-        self.term.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.term.set_span(span);
-    }
-}
-
-impl Display for Lifetime {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        self.term.as_str().fmt(formatter)
-    }
-}
-
-impl PartialEq for Lifetime {
-    fn eq(&self, other: &Lifetime) -> bool {
-        self.term.as_str() == other.term.as_str()
-    }
-}
-
-impl Eq for Lifetime {}
-
-impl PartialOrd for Lifetime {
-    fn partial_cmp(&self, other: &Lifetime) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for Lifetime {
-    fn cmp(&self, other: &Lifetime) -> Ordering {
-        self.term.as_str().cmp(other.term.as_str())
-    }
-}
-
-impl Hash for Lifetime {
-    fn hash<H: Hasher>(&self, h: &mut H) {
-        self.term.as_str().hash(h)
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use synom::Synom;
-    use buffer::Cursor;
-    use parse_error;
-    use synom::PResult;
-
-    impl Synom for Lifetime {
-        fn parse(input: Cursor) -> PResult<Self> {
-            let (term, rest) = match input.term() {
-                Some(term) => term,
-                _ => return parse_error(),
-            };
-            if !term.as_str().starts_with('\'') {
-                return parse_error();
-            }
-
-            Ok((
-                Lifetime {
-                    term: term,
-                },
-                rest,
-            ))
-        }
-
-        fn description() -> Option<&'static str> {
-            Some("lifetime")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use quote::{ToTokens, Tokens};
-
-    impl ToTokens for Lifetime {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.term.to_tokens(tokens);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/lit.rs b/third_party/rust/syn-0.13.1/src/lit.rs
deleted file mode 100644
index b49fa11e8d4c..000000000000
--- a/third_party/rust/syn-0.13.1/src/lit.rs
+++ /dev/null
@@ -1,1047 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use proc_macro2::{Literal, Span};
-use std::str;
-
-#[cfg(feature = "printing")]
-use proc_macro2::Term;
-
-#[cfg(feature = "parsing")]
-use proc_macro2::TokenStream;
-#[cfg(feature = "parsing")]
-use {ParseError, Synom};
-
-#[cfg(any(feature = "printing", feature = "parsing", feature = "derive"))]
-use proc_macro2::TokenTree;
-
-#[cfg(feature = "extra-traits")]
-use std::hash::{Hash, Hasher};
-
-ast_enum_of_structs! {
-    /// A Rust literal such as a string or integer or boolean.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum Lit {
-        /// A UTF-8 string literal: `"foo"`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Str(LitStr #manual_extra_traits {
-            token: Literal,
-        }),
-
-        /// A byte string literal: `b"foo"`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub ByteStr(LitByteStr #manual_extra_traits {
-            token: Literal,
-        }),
-
-        /// A byte literal: `b'f'`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Byte(LitByte #manual_extra_traits {
-            token: Literal,
-        }),
-
-        /// A character literal: `'a'`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Char(LitChar #manual_extra_traits {
-            token: Literal,
-        }),
-
-        /// An integer literal: `1` or `1u16`.
-        ///
-        /// Holds up to 64 bits of data. Use `LitVerbatim` for any larger
-        /// integer literal.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Int(LitInt #manual_extra_traits {
-            token: Literal,
-        }),
-
-        /// A floating point literal: `1f64` or `1.0e10f64`.
-        ///
-        /// Must be finite. May not be infinte or NaN.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Float(LitFloat #manual_extra_traits {
-            token: Literal,
-        }),
-
-        /// A boolean literal: `true` or `false`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Bool(LitBool #manual_extra_traits {
-            pub value: bool,
-            pub span: Span,
-        }),
-
-        /// A raw token literal not interpreted by Syn, possibly because it
-        /// represents an integer larger than 64 bits.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Verbatim(LitVerbatim #manual_extra_traits {
-            pub token: Literal,
-        }),
-    }
-}
-
-impl LitStr {
-    pub fn new(value: &str, span: Span) -> Self {
-        let mut lit = Literal::string(value);
-        lit.set_span(span);
-        LitStr {
-            token: lit,
-        }
-    }
-
-    pub fn value(&self) -> String {
-        value::parse_lit_str(&self.token.to_string())
-    }
-
-    /// Parse a syntax tree node from the content of this string literal.
-    ///
-    /// All spans in the syntax tree will point to the span of this `LitStr`.
-    #[cfg(feature = "parsing")]
-    pub fn parse<T: Synom>(&self) -> Result<T, ParseError> {
-        use proc_macro2::Group;
-
-        // Parse string literal into a token stream with every span equal to the
-        // original literal's span.
-        fn spanned_tokens(s: &LitStr) -> Result<TokenStream, ParseError> {
-            let stream = ::parse_str(&s.value())?;
-            Ok(respan_token_stream(stream, s.span()))
-        }
-
-        // Token stream with every span replaced by the given one.
-        fn respan_token_stream(stream: TokenStream, span: Span) -> TokenStream {
-            stream.into_iter().map(|token| respan_token_tree(token, span)).collect()
-        }
-
-        // Token tree with every span replaced by the given one.
-        fn respan_token_tree(mut token: TokenTree, span: Span) -> TokenTree {
-            match token {
-                TokenTree::Group(ref mut g) => {
-                    let stream = respan_token_stream(g.stream().clone(), span);
-                    *g = Group::new(g.delimiter(), stream);
-                    g.set_span(span);
-                }
-                ref mut other => other.set_span(span),
-            }
-            token
-        }
-
-        spanned_tokens(self).and_then(::parse2)
-    }
-
-    pub fn span(&self) -> Span {
-        self.token.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.token.set_span(span)
-    }
-}
-
-impl LitByteStr {
-    pub fn new(value: &[u8], span: Span) -> Self {
-        let mut token = Literal::byte_string(value);
-        token.set_span(span);
-        LitByteStr { token: token }
-    }
-
-    pub fn value(&self) -> Vec<u8> {
-        value::parse_lit_byte_str(&self.token.to_string())
-    }
-
-    pub fn span(&self) -> Span {
-        self.token.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.token.set_span(span)
-    }
-}
-
-impl LitByte {
-    pub fn new(value: u8, span: Span) -> Self {
-        let mut token = Literal::u8_suffixed(value);
-        token.set_span(span);
-        LitByte { token: token }
-    }
-
-    pub fn value(&self) -> u8 {
-        value::parse_lit_byte(&self.token.to_string())
-    }
-
-    pub fn span(&self) -> Span {
-        self.token.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.token.set_span(span)
-    }
-}
-
-impl LitChar {
-    pub fn new(value: char, span: Span) -> Self {
-        let mut token = Literal::character(value);
-        token.set_span(span);
-        LitChar { token: token }
-    }
-
-    pub fn value(&self) -> char {
-        value::parse_lit_char(&self.token.to_string())
-    }
-
-    pub fn span(&self) -> Span {
-        self.token.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.token.set_span(span)
-    }
-}
-
-impl LitInt {
-    pub fn new(value: u64, suffix: IntSuffix, span: Span) -> Self {
-        let mut token = match suffix {
-            IntSuffix::Isize => Literal::isize_suffixed(value as isize),
-            IntSuffix::I8 => Literal::i8_suffixed(value as i8),
-            IntSuffix::I16 => Literal::i16_suffixed(value as i16),
-            IntSuffix::I32 => Literal::i32_suffixed(value as i32),
-            IntSuffix::I64 => Literal::i64_suffixed(value as i64),
-            IntSuffix::I128 => value::to_literal(&format!("{}i128", value)),
-            IntSuffix::Usize => Literal::usize_suffixed(value as usize),
-            IntSuffix::U8 => Literal::u8_suffixed(value as u8),
-            IntSuffix::U16 => Literal::u16_suffixed(value as u16),
-            IntSuffix::U32 => Literal::u32_suffixed(value as u32),
-            IntSuffix::U64 => Literal::u64_suffixed(value),
-            IntSuffix::U128 => value::to_literal(&format!("{}u128", value)),
-            IntSuffix::None => Literal::u64_unsuffixed(value),
-        };
-        token.set_span(span);
-        LitInt { token: token }
-    }
-
-    pub fn value(&self) -> u64 {
-        value::parse_lit_int(&self.token.to_string()).unwrap()
-    }
-
-    pub fn suffix(&self) -> IntSuffix {
-        let value = self.token.to_string();
-        for (s, suffix) in vec![
-            ("i8", IntSuffix::I8),
-            ("i16", IntSuffix::I16),
-            ("i32", IntSuffix::I32),
-            ("i64", IntSuffix::I64),
-            ("i128", IntSuffix::I128),
-            ("isize", IntSuffix::Isize),
-            ("u8", IntSuffix::U8),
-            ("u16", IntSuffix::U16),
-            ("u32", IntSuffix::U32),
-            ("u64", IntSuffix::U64),
-            ("u128", IntSuffix::U128),
-            ("usize", IntSuffix::Usize),
-        ] {
-            if value.ends_with(s) {
-                return suffix;
-            }
-        }
-        IntSuffix::None
-    }
-
-    pub fn span(&self) -> Span {
-        self.token.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.token.set_span(span)
-    }
-}
-
-impl LitFloat {
-    pub fn new(value: f64, suffix: FloatSuffix, span: Span) -> Self {
-        let mut token = match suffix {
-            FloatSuffix::F32 => Literal::f32_suffixed(value as f32),
-            FloatSuffix::F64 => Literal::f64_suffixed(value),
-            FloatSuffix::None => Literal::f64_unsuffixed(value),
-        };
-        token.set_span(span);
-        LitFloat { token: token }
-    }
-
-    pub fn value(&self) -> f64 {
-        value::parse_lit_float(&self.token.to_string())
-    }
-
-    pub fn suffix(&self) -> FloatSuffix {
-        let value = self.token.to_string();
-        for (s, suffix) in vec![("f32", FloatSuffix::F32), ("f64", FloatSuffix::F64)] {
-            if value.ends_with(s) {
-                return suffix;
-            }
-        }
-        FloatSuffix::None
-    }
-
-    pub fn span(&self) -> Span {
-        self.token.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.token.set_span(span)
-    }
-}
-
-macro_rules! lit_extra_traits {
-    ($ty:ident, $field:ident) => {
-        #[cfg(feature = "extra-traits")]
-        impl Eq for $ty {}
-
-        #[cfg(feature = "extra-traits")]
-        impl PartialEq for $ty {
-            fn eq(&self, other: &Self) -> bool {
-                self.$field.to_string() == other.$field.to_string()
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl Hash for $ty {
-            fn hash<H>(&self, state: &mut H)
-            where
-                H: Hasher,
-            {
-                self.$field.to_string().hash(state);
-            }
-        }
-    }
-}
-
-impl LitVerbatim {
-    pub fn span(&self) -> Span {
-        self.token.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.token.set_span(span)
-    }
-}
-
-lit_extra_traits!(LitStr, token);
-lit_extra_traits!(LitByteStr, token);
-lit_extra_traits!(LitByte, token);
-lit_extra_traits!(LitChar, token);
-lit_extra_traits!(LitInt, token);
-lit_extra_traits!(LitFloat, token);
-lit_extra_traits!(LitBool, value);
-lit_extra_traits!(LitVerbatim, token);
-
-ast_enum! {
-    /// The style of a string literal, either plain quoted or a raw string like
-    /// `r##"data"##`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum StrStyle #no_visit {
-        /// An ordinary string like `"data"`.
-        Cooked,
-        /// A raw string like `r##"data"##`.
-        ///
-        /// The unsigned integer is the number of `#` symbols used.
-        Raw(usize),
-    }
-}
-
-ast_enum! {
-    /// The suffix on an integer literal if any, like the `u8` in `127u8`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum IntSuffix #no_visit {
-        I8,
-        I16,
-        I32,
-        I64,
-        I128,
-        Isize,
-        U8,
-        U16,
-        U32,
-        U64,
-        U128,
-        Usize,
-        None,
-    }
-}
-
-ast_enum! {
-    /// The suffix on a floating point literal if any, like the `f32` in
-    /// `1.0f32`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum FloatSuffix #no_visit {
-        F32,
-        F64,
-        None,
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use synom::Synom;
-    use buffer::Cursor;
-    use parse_error;
-    use synom::PResult;
-
-    impl Synom for Lit {
-        fn parse(input: Cursor) -> PResult<Self> {
-            match input.literal() {
-                Some((lit, rest)) => {
-                    if lit.to_string().starts_with('/') {
-                        // Doc comment literal which is not a Syn literal
-                        parse_error()
-                    } else {
-                        Ok((Lit::new(lit), rest))
-                    }
-                }
-                _ => match input.term() {
-                    Some((term, rest)) => Ok((
-                        Lit::Bool(LitBool {
-                            value: if term.as_str() == "true" {
-                                true
-                            } else if term.as_str() == "false" {
-                                false
-                            } else {
-                                return parse_error();
-                            },
-                            span: term.span(),
-                        }),
-                        rest,
-                    )),
-                    _ => parse_error(),
-                },
-            }
-        }
-
-        fn description() -> Option<&'static str> {
-            Some("literal")
-        }
-    }
-
-    impl_synom!(LitStr "string literal" switch!(
-        syn!(Lit),
-        Lit::Str(lit) => value!(lit)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(LitByteStr "byte string literal" switch!(
-        syn!(Lit),
-        Lit::ByteStr(lit) => value!(lit)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(LitByte "byte literal" switch!(
-        syn!(Lit),
-        Lit::Byte(lit) => value!(lit)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(LitChar "character literal" switch!(
-        syn!(Lit),
-        Lit::Char(lit) => value!(lit)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(LitInt "integer literal" switch!(
-        syn!(Lit),
-        Lit::Int(lit) => value!(lit)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(LitFloat "floating point literal" switch!(
-        syn!(Lit),
-        Lit::Float(lit) => value!(lit)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(LitBool "boolean literal" switch!(
-        syn!(Lit),
-        Lit::Bool(lit) => value!(lit)
-        |
-        _ => reject!()
-    ));
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use quote::{ToTokens, Tokens};
-
-    impl ToTokens for LitStr {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for LitByteStr {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for LitByte {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for LitChar {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for LitInt {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for LitFloat {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for LitBool {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            let s = if self.value { "true" } else { "false" };
-            tokens.append(Term::new(s, self.span));
-        }
-    }
-
-    impl ToTokens for LitVerbatim {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.token.to_tokens(tokens);
-        }
-    }
-}
-
-mod value {
-    use super::*;
-    use std::char;
-    use std::ops::{Index, RangeFrom};
-    use proc_macro2::TokenStream;
-
-    impl Lit {
-        /// Interpret a Syn literal from a proc-macro2 literal.
-        ///
-        /// Not all proc-macro2 literals are valid Syn literals. In particular,
-        /// doc comments are considered by proc-macro2 to be literals but in Syn
-        /// they are [`Attribute`].
-        ///
-        /// [`Attribute`]: struct.Attribute.html
-        ///
-        /// # Panics
-        ///
-        /// Panics if the input is a doc comment literal.
-        pub fn new(token: Literal) -> Self {
-            let value = token.to_string();
-
-            match value::byte(&value, 0) {
-                b'"' | b'r' => {
-                    return Lit::Str(LitStr {
-                        token: token,
-                    })
-                }
-                b'b' => match value::byte(&value, 1) {
-                    b'"' | b'r' => {
-                        return Lit::ByteStr(LitByteStr {
-                            token: token,
-                        })
-                    }
-                    b'\'' => {
-                        return Lit::Byte(LitByte {
-                            token: token,
-                        })
-                    }
-                    _ => {}
-                },
-                b'\'' => {
-                    return Lit::Char(LitChar {
-                        token: token,
-                    })
-                }
-                b'0'...b'9' => if number_is_int(&value) {
-                    return Lit::Int(LitInt {
-                        token: token,
-                    });
-                } else if number_is_float(&value) {
-                    return Lit::Float(LitFloat {
-                        token: token,
-                    });
-                } else {
-                    // number overflow
-                    return Lit::Verbatim(LitVerbatim {
-                        token: token,
-                    });
-                },
-                _ => if value == "true" || value == "false" {
-                    return Lit::Bool(LitBool {
-                        value: value == "true",
-                        span: token.span(),
-                    });
-                },
-            }
-
-            panic!("Unrecognized literal: {}", value);
-        }
-    }
-
-    fn number_is_int(value: &str) -> bool {
-        if number_is_float(value) {
-            false
-        } else {
-            value::parse_lit_int(value).is_some()
-        }
-    }
-
-    fn number_is_float(value: &str) -> bool {
-        if value.contains('.') {
-            true
-        } else if value.starts_with("0x") || value.ends_with("size") {
-            false
-        } else {
-            value.contains('e') || value.contains('E')
-        }
-    }
-
-    /// Get the byte at offset idx, or a default of `b'\0'` if we're looking
-    /// past the end of the input buffer.
-    pub fn byte<S: AsRef<[u8]> + ?Sized>(s: &S, idx: usize) -> u8 {
-        let s = s.as_ref();
-        if idx < s.len() {
-            s[idx]
-        } else {
-            0
-        }
-    }
-
-    fn next_chr(s: &str) -> char {
-        s.chars().next().unwrap_or('\0')
-    }
-
-    pub fn parse_lit_str(s: &str) -> String {
-        match byte(s, 0) {
-            b'"' => parse_lit_str_cooked(s),
-            b'r' => parse_lit_str_raw(s),
-            _ => unreachable!(),
-        }
-    }
-
-    // Clippy false positive
-    // https://github.com/rust-lang-nursery/rust-clippy/issues/2329
-    #[cfg_attr(feature = "cargo-clippy", allow(needless_continue))]
-    fn parse_lit_str_cooked(mut s: &str) -> String {
-        assert_eq!(byte(s, 0), b'"');
-        s = &s[1..];
-
-        let mut out = String::new();
-        'outer: loop {
-            let ch = match byte(s, 0) {
-                b'"' => break,
-                b'\\' => {
-                    let b = byte(s, 1);
-                    s = &s[2..];
-                    match b {
-                        b'x' => {
-                            let (byte, rest) = backslash_x(s);
-                            s = rest;
-                            assert!(byte <= 0x80, "Invalid \\x byte in string literal");
-                            char::from_u32(u32::from(byte)).unwrap()
-                        }
-                        b'u' => {
-                            let (chr, rest) = backslash_u(s);
-                            s = rest;
-                            chr
-                        }
-                        b'n' => '\n',
-                        b'r' => '\r',
-                        b't' => '\t',
-                        b'\\' => '\\',
-                        b'0' => '\0',
-                        b'\'' => '\'',
-                        b'"' => '"',
-                        b'\r' | b'\n' => loop {
-                            let ch = next_chr(s);
-                            if ch.is_whitespace() {
-                                s = &s[ch.len_utf8()..];
-                            } else {
-                                continue 'outer;
-                            }
-                        },
-                        b => panic!("unexpected byte {:?} after \\ character in byte literal", b),
-                    }
-                }
-                b'\r' => {
-                    assert_eq!(byte(s, 1), b'\n', "Bare CR not allowed in string");
-                    s = &s[2..];
-                    '\n'
-                }
-                _ => {
-                    let ch = next_chr(s);
-                    s = &s[ch.len_utf8()..];
-                    ch
-                }
-            };
-            out.push(ch);
-        }
-
-        assert_eq!(s, "\"");
-        out
-    }
-
-    fn parse_lit_str_raw(mut s: &str) -> String {
-        assert_eq!(byte(s, 0), b'r');
-        s = &s[1..];
-
-        let mut pounds = 0;
-        while byte(s, pounds) == b'#' {
-            pounds += 1;
-        }
-        assert_eq!(byte(s, pounds), b'"');
-        assert_eq!(byte(s, s.len() - pounds - 1), b'"');
-        for end in s[s.len() - pounds..].bytes() {
-            assert_eq!(end, b'#');
-        }
-
-        s[pounds + 1..s.len() - pounds - 1].to_owned()
-    }
-
-    pub fn parse_lit_byte_str(s: &str) -> Vec<u8> {
-        assert_eq!(byte(s, 0), b'b');
-        match byte(s, 1) {
-            b'"' => parse_lit_byte_str_cooked(s),
-            b'r' => parse_lit_byte_str_raw(s),
-            _ => unreachable!(),
-        }
-    }
-
-    // Clippy false positive
-    // https://github.com/rust-lang-nursery/rust-clippy/issues/2329
-    #[cfg_attr(feature = "cargo-clippy", allow(needless_continue))]
-    fn parse_lit_byte_str_cooked(mut s: &str) -> Vec<u8> {
-        assert_eq!(byte(s, 0), b'b');
-        assert_eq!(byte(s, 1), b'"');
-        s = &s[2..];
-
-        // We're going to want to have slices which don't respect codepoint boundaries.
-        let mut s = s.as_bytes();
-
-        let mut out = Vec::new();
-        'outer: loop {
-            let byte = match byte(s, 0) {
-                b'"' => break,
-                b'\\' => {
-                    let b = byte(s, 1);
-                    s = &s[2..];
-                    match b {
-                        b'x' => {
-                            let (b, rest) = backslash_x(s);
-                            s = rest;
-                            b
-                        }
-                        b'n' => b'\n',
-                        b'r' => b'\r',
-                        b't' => b'\t',
-                        b'\\' => b'\\',
-                        b'0' => b'\0',
-                        b'\'' => b'\'',
-                        b'"' => b'"',
-                        b'\r' | b'\n' => loop {
-                            let byte = byte(s, 0);
-                            let ch = char::from_u32(u32::from(byte)).unwrap();
-                            if ch.is_whitespace() {
-                                s = &s[1..];
-                            } else {
-                                continue 'outer;
-                            }
-                        },
-                        b => panic!("unexpected byte {:?} after \\ character in byte literal", b),
-                    }
-                }
-                b'\r' => {
-                    assert_eq!(byte(s, 1), b'\n', "Bare CR not allowed in string");
-                    s = &s[2..];
-                    b'\n'
-                }
-                b => {
-                    s = &s[1..];
-                    b
-                }
-            };
-            out.push(byte);
-        }
-
-        assert_eq!(s, b"\"");
-        out
-    }
-
-    fn parse_lit_byte_str_raw(s: &str) -> Vec<u8> {
-        assert_eq!(byte(s, 0), b'b');
-        parse_lit_str_raw(&s[1..]).into_bytes()
-    }
-
-    pub fn parse_lit_byte(s: &str) -> u8 {
-        assert_eq!(byte(s, 0), b'b');
-        assert_eq!(byte(s, 1), b'\'');
-
-        // We're going to want to have slices which don't respect codepoint boundaries.
-        let mut s = s[2..].as_bytes();
-
-        let b = match byte(s, 0) {
-            b'\\' => {
-                let b = byte(s, 1);
-                s = &s[2..];
-                match b {
-                    b'x' => {
-                        let (b, rest) = backslash_x(s);
-                        s = rest;
-                        b
-                    }
-                    b'n' => b'\n',
-                    b'r' => b'\r',
-                    b't' => b'\t',
-                    b'\\' => b'\\',
-                    b'0' => b'\0',
-                    b'\'' => b'\'',
-                    b'"' => b'"',
-                    b => panic!("unexpected byte {:?} after \\ character in byte literal", b),
-                }
-            }
-            b => {
-                s = &s[1..];
-                b
-            }
-        };
-
-        assert_eq!(byte(s, 0), b'\'');
-        b
-    }
-
-    pub fn parse_lit_char(mut s: &str) -> char {
-        assert_eq!(byte(s, 0), b'\'');
-        s = &s[1..];
-
-        let ch = match byte(s, 0) {
-            b'\\' => {
-                let b = byte(s, 1);
-                s = &s[2..];
-                match b {
-                    b'x' => {
-                        let (byte, rest) = backslash_x(s);
-                        s = rest;
-                        assert!(byte <= 0x80, "Invalid \\x byte in string literal");
-                        char::from_u32(u32::from(byte)).unwrap()
-                    }
-                    b'u' => {
-                        let (chr, rest) = backslash_u(s);
-                        s = rest;
-                        chr
-                    }
-                    b'n' => '\n',
-                    b'r' => '\r',
-                    b't' => '\t',
-                    b'\\' => '\\',
-                    b'0' => '\0',
-                    b'\'' => '\'',
-                    b'"' => '"',
-                    b => panic!("unexpected byte {:?} after \\ character in byte literal", b),
-                }
-            }
-            _ => {
-                let ch = next_chr(s);
-                s = &s[ch.len_utf8()..];
-                ch
-            }
-        };
-        assert_eq!(s, "\'", "Expected end of char literal");
-        ch
-    }
-
-    fn backslash_x<S>(s: &S) -> (u8, &S)
-    where
-        S: Index<RangeFrom<usize>, Output = S> + AsRef<[u8]> + ?Sized,
-    {
-        let mut ch = 0;
-        let b0 = byte(s, 0);
-        let b1 = byte(s, 1);
-        ch += 0x10 * match b0 {
-            b'0'...b'9' => b0 - b'0',
-            b'a'...b'f' => 10 + (b0 - b'a'),
-            b'A'...b'F' => 10 + (b0 - b'A'),
-            _ => panic!("unexpected non-hex character after \\x"),
-        };
-        ch += match b1 {
-            b'0'...b'9' => b1 - b'0',
-            b'a'...b'f' => 10 + (b1 - b'a'),
-            b'A'...b'F' => 10 + (b1 - b'A'),
-            _ => panic!("unexpected non-hex character after \\x"),
-        };
-        (ch, &s[2..])
-    }
-
-    fn backslash_u(mut s: &str) -> (char, &str) {
-        if byte(s, 0) != b'{' {
-            panic!("expected {{ after \\u");
-        }
-        s = &s[1..];
-
-        let mut ch = 0;
-        for _ in 0..6 {
-            let b = byte(s, 0);
-            match b {
-                b'0'...b'9' => {
-                    ch *= 0x10;
-                    ch += u32::from(b - b'0');
-                    s = &s[1..];
-                }
-                b'a'...b'f' => {
-                    ch *= 0x10;
-                    ch += u32::from(10 + b - b'a');
-                    s = &s[1..];
-                }
-                b'A'...b'F' => {
-                    ch *= 0x10;
-                    ch += u32::from(10 + b - b'A');
-                    s = &s[1..];
-                }
-                b'}' => break,
-                _ => panic!("unexpected non-hex character after \\u"),
-            }
-        }
-        assert!(byte(s, 0) == b'}');
-        s = &s[1..];
-
-        if let Some(ch) = char::from_u32(ch) {
-            (ch, s)
-        } else {
-            panic!("character code {:x} is not a valid unicode character", ch);
-        }
-    }
-
-    pub fn parse_lit_int(mut s: &str) -> Option<u64> {
-        let base = match (byte(s, 0), byte(s, 1)) {
-            (b'0', b'x') => {
-                s = &s[2..];
-                16
-            }
-            (b'0', b'o') => {
-                s = &s[2..];
-                8
-            }
-            (b'0', b'b') => {
-                s = &s[2..];
-                2
-            }
-            (b'0'...b'9', _) => 10,
-            _ => unreachable!(),
-        };
-
-        let mut value = 0u64;
-        loop {
-            let b = byte(s, 0);
-            let digit = match b {
-                b'0'...b'9' => u64::from(b - b'0'),
-                b'a'...b'f' if base > 10 => 10 + u64::from(b - b'a'),
-                b'A'...b'F' if base > 10 => 10 + u64::from(b - b'A'),
-                b'_' => {
-                    s = &s[1..];
-                    continue;
-                }
-                // NOTE: Looking at a floating point literal, we don't want to
-                // consider these integers.
-                b'.' if base == 10 => return None,
-                b'e' | b'E' if base == 10 => return None,
-                _ => break,
-            };
-
-            if digit >= base {
-                panic!("Unexpected digit {:x} out of base range", digit);
-            }
-
-            value = match value.checked_mul(base) {
-                Some(value) => value,
-                None => return None,
-            };
-            value = match value.checked_add(digit) {
-                Some(value) => value,
-                None => return None,
-            };
-            s = &s[1..];
-        }
-
-        Some(value)
-    }
-
-    pub fn parse_lit_float(input: &str) -> f64 {
-        // Rust's floating point literals are very similar to the ones parsed by
-        // the standard library, except that rust's literals can contain
-        // ignorable underscores. Let's remove those underscores.
-        let mut bytes = input.to_owned().into_bytes();
-        let mut write = 0;
-        for read in 0..bytes.len() {
-            if bytes[read] == b'_' {
-                continue; // Don't increase write
-            }
-            if write != read {
-                let x = bytes[read];
-                bytes[write] = x;
-            }
-            write += 1;
-        }
-        bytes.truncate(write);
-        let input = String::from_utf8(bytes).unwrap();
-        let end = input.find('f').unwrap_or_else(|| input.len());
-        input[..end].parse().unwrap()
-    }
-
-    pub fn to_literal(s: &str) -> Literal {
-        let stream = s.parse::<TokenStream>().unwrap();
-        match stream.into_iter().next().unwrap() {
-            TokenTree::Literal(l) => l,
-            _ => unreachable!(),
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/mac.rs b/third_party/rust/syn-0.13.1/src/mac.rs
deleted file mode 100644
index 2ccc8c943272..000000000000
--- a/third_party/rust/syn-0.13.1/src/mac.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use proc_macro2::TokenStream;
-use token::{Brace, Bracket, Paren};
-
-#[cfg(feature = "extra-traits")]
-use std::hash::{Hash, Hasher};
-#[cfg(feature = "extra-traits")]
-use tt::TokenStreamHelper;
-
-ast_struct! {
-    /// A macro invocation: `println!("{}", mac)`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct Macro #manual_extra_traits {
-        pub path: Path,
-        pub bang_token: Token![!],
-        pub delimiter: MacroDelimiter,
-        pub tts: TokenStream,
-    }
-}
-
-ast_enum! {
-    /// A grouping token that surrounds a macro body: `m!(...)` or `m!{...}` or `m![...]`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum MacroDelimiter {
-        Paren(Paren),
-        Brace(Brace),
-        Bracket(Bracket),
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for Macro {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for Macro {
-    fn eq(&self, other: &Self) -> bool {
-        self.path == other.path && self.bang_token == other.bang_token
-            && self.delimiter == other.delimiter
-            && TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for Macro {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        self.path.hash(state);
-        self.bang_token.hash(state);
-        self.delimiter.hash(state);
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-
-    use synom::Synom;
-
-    impl Synom for Macro {
-        named!(parse -> Self, do_parse!(
-            what: call!(Path::parse_mod_style) >>
-            bang: punct!(!) >>
-            body: call!(tt::delimited) >>
-            (Macro {
-                path: what,
-                bang_token: bang,
-                delimiter: body.0,
-                tts: body.1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("macro invocation")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use quote::{ToTokens, Tokens};
-
-    impl ToTokens for Macro {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.path.to_tokens(tokens);
-            self.bang_token.to_tokens(tokens);
-            match self.delimiter {
-                MacroDelimiter::Paren(ref paren) => {
-                    paren.surround(tokens, |tokens| self.tts.to_tokens(tokens));
-                }
-                MacroDelimiter::Brace(ref brace) => {
-                    brace.surround(tokens, |tokens| self.tts.to_tokens(tokens));
-                }
-                MacroDelimiter::Bracket(ref bracket) => {
-                    bracket.surround(tokens, |tokens| self.tts.to_tokens(tokens));
-                }
-            }
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/macros.rs b/third_party/rust/syn-0.13.1/src/macros.rs
deleted file mode 100644
index 667c5baf324b..000000000000
--- a/third_party/rust/syn-0.13.1/src/macros.rs
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[cfg(any(feature = "full", feature = "derive"))]
-macro_rules! ast_struct {
-    (
-        $(#[$attr:meta])*
-        pub struct $name:ident #full $($rest:tt)*
-    ) => {
-        #[cfg(feature = "full")]
-        $(#[$attr])*
-        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
-        pub struct $name $($rest)*
-
-        #[cfg(not(feature = "full"))]
-        $(#[$attr])*
-        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
-        pub struct $name {
-            _noconstruct: (),
-        }
-    };
-
-    (
-        $(#[$attr:meta])*
-        pub struct $name:ident #manual_extra_traits $($rest:tt)*
-    ) => {
-        $(#[$attr])*
-        #[cfg_attr(feature = "extra-traits", derive(Debug))]
-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
-        pub struct $name $($rest)*
-    };
-
-    (
-        $(#[$attr:meta])*
-        pub struct $name:ident $($rest:tt)*
-    ) => {
-        $(#[$attr])*
-        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
-        pub struct $name $($rest)*
-    };
-}
-
-#[cfg(any(feature = "full", feature = "derive"))]
-macro_rules! ast_enum {
-    (
-        $(#[$enum_attr:meta])*
-        pub enum $name:ident $(# $tags:ident)* { $($variants:tt)* }
-    ) => (
-        $(#[$enum_attr])*
-        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
-        pub enum $name {
-            $($variants)*
-        }
-    )
-}
-
-#[cfg(any(feature = "full", feature = "derive"))]
-macro_rules! ast_enum_of_structs {
-    (
-        $(#[$enum_attr:meta])*
-        pub enum $name:ident {
-            $(
-                $(#[$variant_attr:meta])*
-                pub $variant:ident $( ($member:ident $($rest:tt)*) )*,
-            )*
-        }
-
-        $($remaining:tt)*
-    ) => (
-        ast_enum! {
-            $(#[$enum_attr])*
-            pub enum $name {
-                $(
-                    $(#[$variant_attr])*
-                    $variant $( ($member) )*,
-                )*
-            }
-        }
-
-        $(
-            maybe_ast_struct! {
-                $(#[$variant_attr])*
-                $(
-                    pub struct $member $($rest)*
-                )*
-            }
-
-            $(
-                impl From<$member> for $name {
-                    fn from(e: $member) -> $name {
-                        $name::$variant(e)
-                    }
-                }
-            )*
-        )*
-
-        #[cfg(feature = "printing")]
-        generate_to_tokens! {
-            $($remaining)*
-            ()
-            tokens
-            $name { $($variant $( [$($rest)*] )*,)* }
-        }
-    )
-}
-
-#[cfg(all(feature = "printing", any(feature = "full", feature = "derive")))]
-macro_rules! generate_to_tokens {
-    (do_not_generate_to_tokens $($foo:tt)*) => ();
-
-    (($($arms:tt)*) $tokens:ident $name:ident { $variant:ident, $($next:tt)*}) => {
-        generate_to_tokens!(
-            ($($arms)* $name::$variant => {})
-            $tokens $name { $($next)* }
-        );
-    };
-
-    (($($arms:tt)*) $tokens:ident $name:ident { $variant:ident [$($rest:tt)*], $($next:tt)*}) => {
-        generate_to_tokens!(
-            ($($arms)* $name::$variant(ref _e) => to_tokens_call!(_e, $tokens, $($rest)*),)
-            $tokens $name { $($next)* }
-        );
-    };
-
-    (($($arms:tt)*) $tokens:ident $name:ident {}) => {
-        impl ::quote::ToTokens for $name {
-            fn to_tokens(&self, $tokens: &mut ::quote::Tokens) {
-                match *self {
-                    $($arms)*
-                }
-            }
-        }
-    };
-}
-
-#[cfg(all(feature = "printing", feature = "full"))]
-macro_rules! to_tokens_call {
-    ($e:ident, $tokens:ident, $($rest:tt)*) => {
-        $e.to_tokens($tokens)
-    };
-}
-
-#[cfg(all(feature = "printing", feature = "derive", not(feature = "full")))]
-macro_rules! to_tokens_call {
-    // If the variant is marked as #full, don't auto-generate to-tokens for it.
-    ($e:ident, $tokens:ident, #full $($rest:tt)*) => {
-        unreachable!()
-    };
-    ($e:ident, $tokens:ident, $($rest:tt)*) => {
-        $e.to_tokens($tokens)
-    };
-}
-
-#[cfg(any(feature = "full", feature = "derive"))]
-macro_rules! maybe_ast_struct {
-    (
-        $(#[$attr:meta])*
-        $(
-            pub struct $name:ident
-        )*
-    ) => ();
-
-    ($($rest:tt)*) => (ast_struct! { $($rest)* });
-}
-
-#[cfg(all(feature = "parsing", any(feature = "full", feature = "derive")))]
-macro_rules! impl_synom {
-    ($t:ident $description:tt $($parser:tt)+) => {
-        impl Synom for $t {
-            named!(parse -> Self, $($parser)+);
-
-            fn description() -> Option<&'static str> {
-                Some($description)
-            }
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/op.rs b/third_party/rust/syn-0.13.1/src/op.rs
deleted file mode 100644
index b9a8ef7f908a..000000000000
--- a/third_party/rust/syn-0.13.1/src/op.rs
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-ast_enum! {
-    /// A binary operator: `+`, `+=`, `&`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    #[cfg_attr(feature = "clone-impls", derive(Copy))]
-    pub enum BinOp {
-        /// The `+` operator (addition)
-        Add(Token![+]),
-        /// The `-` operator (subtraction)
-        Sub(Token![-]),
-        /// The `*` operator (multiplication)
-        Mul(Token![*]),
-        /// The `/` operator (division)
-        Div(Token![/]),
-        /// The `%` operator (modulus)
-        Rem(Token![%]),
-        /// The `&&` operator (logical and)
-        And(Token![&&]),
-        /// The `||` operator (logical or)
-        Or(Token![||]),
-        /// The `^` operator (bitwise xor)
-        BitXor(Token![^]),
-        /// The `&` operator (bitwise and)
-        BitAnd(Token![&]),
-        /// The `|` operator (bitwise or)
-        BitOr(Token![|]),
-        /// The `<<` operator (shift left)
-        Shl(Token![<<]),
-        /// The `>>` operator (shift right)
-        Shr(Token![>>]),
-        /// The `==` operator (equality)
-        Eq(Token![==]),
-        /// The `<` operator (less than)
-        Lt(Token![<]),
-        /// The `<=` operator (less than or equal to)
-        Le(Token![<=]),
-        /// The `!=` operator (not equal to)
-        Ne(Token![!=]),
-        /// The `>=` operator (greater than or equal to)
-        Ge(Token![>=]),
-        /// The `>` operator (greater than)
-        Gt(Token![>]),
-        /// The `+=` operator
-        AddEq(Token![+=]),
-        /// The `-=` operator
-        SubEq(Token![-=]),
-        /// The `*=` operator
-        MulEq(Token![*=]),
-        /// The `/=` operator
-        DivEq(Token![/=]),
-        /// The `%=` operator
-        RemEq(Token![%=]),
-        /// The `^=` operator
-        BitXorEq(Token![^=]),
-        /// The `&=` operator
-        BitAndEq(Token![&=]),
-        /// The `|=` operator
-        BitOrEq(Token![|=]),
-        /// The `<<=` operator
-        ShlEq(Token![<<=]),
-        /// The `>>=` operator
-        ShrEq(Token![>>=]),
-    }
-}
-
-ast_enum! {
-    /// A unary operator: `*`, `!`, `-`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    #[cfg_attr(feature = "clone-impls", derive(Copy))]
-    pub enum UnOp {
-        /// The `*` operator for dereferencing
-        Deref(Token![*]),
-        /// The `!` operator for logical inversion
-        Not(Token![!]),
-        /// The `-` operator for negation
-        Neg(Token![-]),
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use synom::Synom;
-
-    impl BinOp {
-        named!(pub parse_binop -> Self, alt!(
-            punct!(&&) => { BinOp::And }
-            |
-            punct!(||) => { BinOp::Or }
-            |
-            punct!(<<) => { BinOp::Shl }
-            |
-            punct!(>>) => { BinOp::Shr }
-            |
-            punct!(==) => { BinOp::Eq }
-            |
-            punct!(<=) => { BinOp::Le }
-            |
-            punct!(!=) => { BinOp::Ne }
-            |
-            punct!(>=) => { BinOp::Ge }
-            |
-            punct!(+) => { BinOp::Add }
-            |
-            punct!(-) => { BinOp::Sub }
-            |
-            punct!(*) => { BinOp::Mul }
-            |
-            punct!(/) => { BinOp::Div }
-            |
-            punct!(%) => { BinOp::Rem }
-            |
-            punct!(^) => { BinOp::BitXor }
-            |
-            punct!(&) => { BinOp::BitAnd }
-            |
-            punct!(|) => { BinOp::BitOr }
-            |
-            punct!(<) => { BinOp::Lt }
-            |
-            punct!(>) => { BinOp::Gt }
-        ));
-
-        #[cfg(feature = "full")]
-        named!(pub parse_assign_op -> Self, alt!(
-            punct!(+=) => { BinOp::AddEq }
-            |
-            punct!(-=) => { BinOp::SubEq }
-            |
-            punct!(*=) => { BinOp::MulEq }
-            |
-            punct!(/=) => { BinOp::DivEq }
-            |
-            punct!(%=) => { BinOp::RemEq }
-            |
-            punct!(^=) => { BinOp::BitXorEq }
-            |
-            punct!(&=) => { BinOp::BitAndEq }
-            |
-            punct!(|=) => { BinOp::BitOrEq }
-            |
-            punct!(<<=) => { BinOp::ShlEq }
-            |
-            punct!(>>=) => { BinOp::ShrEq }
-        ));
-    }
-
-    impl Synom for UnOp {
-        named!(parse -> Self, alt!(
-            punct!(*) => { UnOp::Deref }
-            |
-            punct!(!) => { UnOp::Not }
-            |
-            punct!(-) => { UnOp::Neg }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("unary operator: `*`, `!`, or `-`")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use quote::{ToTokens, Tokens};
-
-    impl ToTokens for BinOp {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            match *self {
-                BinOp::Add(ref t) => t.to_tokens(tokens),
-                BinOp::Sub(ref t) => t.to_tokens(tokens),
-                BinOp::Mul(ref t) => t.to_tokens(tokens),
-                BinOp::Div(ref t) => t.to_tokens(tokens),
-                BinOp::Rem(ref t) => t.to_tokens(tokens),
-                BinOp::And(ref t) => t.to_tokens(tokens),
-                BinOp::Or(ref t) => t.to_tokens(tokens),
-                BinOp::BitXor(ref t) => t.to_tokens(tokens),
-                BinOp::BitAnd(ref t) => t.to_tokens(tokens),
-                BinOp::BitOr(ref t) => t.to_tokens(tokens),
-                BinOp::Shl(ref t) => t.to_tokens(tokens),
-                BinOp::Shr(ref t) => t.to_tokens(tokens),
-                BinOp::Eq(ref t) => t.to_tokens(tokens),
-                BinOp::Lt(ref t) => t.to_tokens(tokens),
-                BinOp::Le(ref t) => t.to_tokens(tokens),
-                BinOp::Ne(ref t) => t.to_tokens(tokens),
-                BinOp::Ge(ref t) => t.to_tokens(tokens),
-                BinOp::Gt(ref t) => t.to_tokens(tokens),
-                BinOp::AddEq(ref t) => t.to_tokens(tokens),
-                BinOp::SubEq(ref t) => t.to_tokens(tokens),
-                BinOp::MulEq(ref t) => t.to_tokens(tokens),
-                BinOp::DivEq(ref t) => t.to_tokens(tokens),
-                BinOp::RemEq(ref t) => t.to_tokens(tokens),
-                BinOp::BitXorEq(ref t) => t.to_tokens(tokens),
-                BinOp::BitAndEq(ref t) => t.to_tokens(tokens),
-                BinOp::BitOrEq(ref t) => t.to_tokens(tokens),
-                BinOp::ShlEq(ref t) => t.to_tokens(tokens),
-                BinOp::ShrEq(ref t) => t.to_tokens(tokens),
-            }
-        }
-    }
-
-    impl ToTokens for UnOp {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            match *self {
-                UnOp::Deref(ref t) => t.to_tokens(tokens),
-                UnOp::Not(ref t) => t.to_tokens(tokens),
-                UnOp::Neg(ref t) => t.to_tokens(tokens),
-            }
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/parse_quote.rs b/third_party/rust/syn-0.13.1/src/parse_quote.rs
deleted file mode 100644
index 9fe7ef48a732..000000000000
--- a/third_party/rust/syn-0.13.1/src/parse_quote.rs
+++ /dev/null
@@ -1,160 +0,0 @@
-/// Quasi-quotation macro that accepts input like the [`quote!`] macro but uses
-/// type inference to figure out a return type for those tokens.
-///
-/// [`quote!`]: https://docs.rs/quote/0.4/quote/index.html
-///
-/// The return type can be any syntax tree node that implements the [`Synom`]
-/// trait.
-///
-/// [`Synom`]: synom/trait.Synom.html
-///
-/// ```
-/// #[macro_use]
-/// extern crate syn;
-///
-/// #[macro_use]
-/// extern crate quote;
-///
-/// use syn::Stmt;
-///
-/// fn main() {
-///     let name = quote!(v);
-///     let ty = quote!(u8);
-///
-///     let stmt: Stmt = parse_quote! {
-///         let #name: #ty = Default::default();
-///     };
-///
-///     println!("{:#?}", stmt);
-/// }
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature,
-/// although interpolation of syntax tree nodes into the quoted tokens is only
-/// supported if Syn is built with the `"printing"` feature as well.*
-///
-/// # Example
-///
-/// The following helper function adds a bound `T: HeapSize` to every type
-/// parameter `T` in the input generics.
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate syn;
-/// #
-/// # #[macro_use]
-/// # extern crate quote;
-/// #
-/// # use syn::{Generics, GenericParam};
-/// #
-/// // Add a bound `T: HeapSize` to every type parameter T.
-/// fn add_trait_bounds(mut generics: Generics) -> Generics {
-///     for param in &mut generics.params {
-///         if let GenericParam::Type(ref mut type_param) = *param {
-///             type_param.bounds.push(parse_quote!(HeapSize));
-///         }
-///     }
-///     generics
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// # Special cases
-///
-/// This macro can parse the following additional types as a special case even
-/// though they do not implement the `Synom` trait.
-///
-/// - [`Attribute`] — parses one attribute, allowing either outer like `#[...]`
-///   or inner like `#![...]`
-/// - [`Punctuated<T, P>`] — parses zero or more `T` separated by punctuation
-///   `P` with optional trailing punctuation
-///
-/// [`Attribute`]: struct.Attribute.html
-/// [`Punctuated<T, P>`]: punctuated/struct.Punctuated.html
-///
-/// # Panics
-///
-/// Panics if the tokens fail to parse as the expected syntax tree type. The
-/// caller is responsible for ensuring that the input tokens are syntactically
-/// valid.
-#[macro_export]
-macro_rules! parse_quote {
-    ($($tt:tt)*) => {
-        $crate::parse_quote::parse($crate::parse_quote::From::from(quote!($($tt)*)))
-    };
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Can parse any type that implements Synom.
-
-use synom::{Synom, Parser, PResult};
-use buffer::Cursor;
-use proc_macro2::TokenStream;
-
-// Not public API.
-#[doc(hidden)]
-pub use std::convert::From;
-
-// Not public API.
-#[doc(hidden)]
-pub fn parse<T: ParseQuote>(token_stream: TokenStream) -> T {
-    let parser = T::parse;
-    match parser.parse2(token_stream) {
-        Ok(t) => t,
-        Err(err) => match T::description() {
-            Some(s) => panic!("failed to parse {}: {}", s, err),
-            None => panic!("{}", err),
-        }
-    }
-}
-
-// Not public API.
-#[doc(hidden)]
-pub trait ParseQuote: Sized {
-    fn parse(input: Cursor) -> PResult<Self>;
-    fn description() -> Option<&'static str>;
-}
-
-impl<T> ParseQuote for T where T: Synom {
-    fn parse(input: Cursor) -> PResult<Self> {
-        <T as Synom>::parse(input)
-    }
-
-    fn description() -> Option<&'static str> {
-        <T as Synom>::description()
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Any other types that we want `parse_quote!` to be able to parse.
-
-use punctuated::Punctuated;
-
-#[cfg(any(feature = "full", feature = "derive"))]
-use Attribute;
-
-impl<T, P> ParseQuote for Punctuated<T, P>
-where
-    T: Synom,
-    P: Synom,
-{
-    named!(parse -> Self, call!(Punctuated::parse_terminated));
-
-    fn description() -> Option<&'static str> {
-        Some("punctuated sequence")
-    }
-}
-
-#[cfg(any(feature = "full", feature = "derive"))]
-impl ParseQuote for Attribute {
-    named!(parse -> Self, alt!(
-        call!(Attribute::parse_outer)
-        |
-        call!(Attribute::parse_inner)
-    ));
-
-    fn description() -> Option<&'static str> {
-        Some("attribute")
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/parsers.rs b/third_party/rust/syn-0.13.1/src/parsers.rs
deleted file mode 100644
index 47385025cc83..000000000000
--- a/third_party/rust/syn-0.13.1/src/parsers.rs
+++ /dev/null
@@ -1,1384 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use buffer::Cursor;
-use parse_error;
-use synom::PResult;
-
-/// Define a parser function with the signature expected by syn parser
-/// combinators.
-///
-/// The function may be the `parse` function of the [`Synom`] trait, or it may
-/// be a free-standing function with an arbitrary name. When implementing the
-/// `Synom` trait, the function name is `parse` and the return type is `Self`.
-///
-/// [`Synom`]: synom/trait.Synom.html
-///
-/// - **Syntax:** `named!(NAME -> TYPE, PARSER)` or `named!(pub NAME -> TYPE, PARSER)`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Type;
-/// use syn::punctuated::Punctuated;
-/// use syn::synom::Synom;
-///
-/// /// Parses one or more Rust types separated by commas.
-/// ///
-/// /// Example: `String, Vec<T>, [u8; LEN + 1]`
-/// named!(pub comma_separated_types -> Punctuated<Type, Token![,]>,
-///     call!(Punctuated::parse_separated_nonempty)
-/// );
-///
-/// /// The same function as a `Synom` implementation.
-/// struct CommaSeparatedTypes {
-///     types: Punctuated<Type, Token![,]>,
-/// }
-///
-/// impl Synom for CommaSeparatedTypes {
-///     /// As the default behavior, we want there to be at least 1 type.
-///     named!(parse -> Self, do_parse!(
-///         types: call!(Punctuated::parse_separated_nonempty) >>
-///         (CommaSeparatedTypes { types })
-///     ));
-/// }
-///
-/// impl CommaSeparatedTypes {
-///     /// A separate parser that the user can invoke explicitly which allows
-///     /// for parsing 0 or more types, rather than the default 1 or more.
-///     named!(pub parse0 -> Self, do_parse!(
-///         types: call!(Punctuated::parse_separated) >>
-///         (CommaSeparatedTypes { types })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! named {
-    ($name:ident -> $o:ty, $submac:ident!( $($args:tt)* )) => {
-        fn $name(i: $crate::buffer::Cursor) -> $crate::synom::PResult<$o> {
-            $submac!(i, $($args)*)
-        }
-    };
-
-    (pub $name:ident -> $o:ty, $submac:ident!( $($args:tt)* )) => {
-        pub fn $name(i: $crate::buffer::Cursor) -> $crate::synom::PResult<$o> {
-            $submac!(i, $($args)*)
-        }
-    };
-
-    // These two variants are for defining named parsers which have custom
-    // arguments, and are called with `call!()`
-    ($name:ident($($params:tt)*) -> $o:ty, $submac:ident!( $($args:tt)* )) => {
-        fn $name(i: $crate::buffer::Cursor, $($params)*) -> $crate::synom::PResult<$o> {
-            $submac!(i, $($args)*)
-        }
-    };
-
-    (pub $name:ident($($params:tt)*) -> $o:ty, $submac:ident!( $($args:tt)* )) => {
-        pub fn $name(i: $crate::buffer::Cursor, $($params)*) -> $crate::synom::PResult<$o> {
-            $submac!(i, $($args)*)
-        }
-    };
-}
-
-#[cfg(synom_verbose_trace)]
-#[macro_export]
-macro_rules! call {
-    ($i:expr, $fun:expr $(, $args:expr)*) => {{
-        let i = $i;
-        eprintln!(concat!(" -> ", stringify!($fun), " @ {:?}"), i);
-        let r = $fun(i $(, $args)*);
-        match r {
-            Ok((_, i)) => eprintln!(concat!("OK  ", stringify!($fun), " @ {:?}"), i),
-            Err(_) => eprintln!(concat!("ERR ", stringify!($fun), " @ {:?}"), i),
-        }
-        r
-    }};
-}
-
-/// Invoke the given parser function with zero or more arguments.
-///
-/// - **Syntax:** `call!(FN, ARGS...)`
-///
-///   where the signature of the function is `fn(Cursor, ARGS...) -> PResult<T>`
-///
-/// - **Output:** `T`, the result of invoking the function `FN`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Type;
-/// use syn::punctuated::Punctuated;
-/// use syn::synom::Synom;
-///
-/// /// Parses one or more Rust types separated by commas.
-/// ///
-/// /// Example: `String, Vec<T>, [u8; LEN + 1]`
-/// struct CommaSeparatedTypes {
-///     types: Punctuated<Type, Token![,]>,
-/// }
-///
-/// impl Synom for CommaSeparatedTypes {
-///     named!(parse -> Self, do_parse!(
-///         types: call!(Punctuated::parse_separated_nonempty) >>
-///         (CommaSeparatedTypes { types })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[cfg(not(synom_verbose_trace))]
-#[macro_export]
-macro_rules! call {
-    ($i:expr, $fun:expr $(, $args:expr)*) => {
-        $fun($i $(, $args)*)
-    };
-}
-
-/// Transform the result of a parser by applying a function or closure.
-///
-/// - **Syntax:** `map!(THING, FN)`
-/// - **Output:** the return type of function FN applied to THING
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{Expr, ExprIf};
-///
-/// /// Extracts the branch condition of an `if`-expression.
-/// fn get_cond(if_: ExprIf) -> Expr {
-///     *if_.cond
-/// }
-///
-/// /// Parses a full `if`-expression but returns the condition part only.
-/// ///
-/// /// Example: `if x > 0xFF { "big" } else { "small" }`
-/// /// The return would be the expression `x > 0xFF`.
-/// named!(if_condition -> Expr,
-///     map!(syn!(ExprIf), get_cond)
-/// );
-///
-/// /// Equivalent using a closure.
-/// named!(if_condition2 -> Expr,
-///     map!(syn!(ExprIf), |if_| *if_.cond)
-/// );
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! map {
-    ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((o, i)) =>
-                ::std::result::Result::Ok(($crate::parsers::invoke($g, o), i)),
-        }
-    };
-
-    ($i:expr, $f:expr, $g:expr) => {
-        map!($i, call!($f), $g)
-    };
-}
-
-// Somehow this helps with type inference in `map!` and `alt!`.
-//
-// Not public API.
-#[doc(hidden)]
-pub fn invoke<T, R, F: FnOnce(T) -> R>(f: F, t: T) -> R {
-    f(t)
-}
-
-/// Invert the result of a parser by parsing successfully if the given parser
-/// fails to parse and vice versa.
-///
-/// Does not consume any of the input.
-///
-/// - **Syntax:** `not!(THING)`
-/// - **Output:** `()`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{Expr, Ident};
-///
-/// /// Parses any expression that does not begin with a `-` minus sign.
-/// named!(not_negative_expr -> Expr, do_parse!(
-///     not!(punct!(-)) >>
-///     e: syn!(Expr) >>
-///     (e)
-/// ));
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! not {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Ok(_) => $crate::parse_error(),
-            ::std::result::Result::Err(_) =>
-                ::std::result::Result::Ok(((), $i)),
-        }
-    };
-}
-
-/// Execute a parser only if a condition is met, otherwise return None.
-///
-/// If you are familiar with nom, this is nom's `cond_with_error` parser.
-///
-/// - **Syntax:** `cond!(CONDITION, THING)`
-/// - **Output:** `Some(THING)` if the condition is true, else `None`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{Ident, MacroDelimiter};
-/// use syn::token::{Paren, Bracket, Brace};
-/// use syn::synom::Synom;
-///
-/// /// Parses a macro call with empty input. If the macro is written with
-/// /// parentheses or brackets, a trailing semicolon is required.
-/// ///
-/// /// Example: `my_macro!{}` or `my_macro!();` or `my_macro![];`
-/// struct EmptyMacroCall {
-///     name: Ident,
-///     bang_token: Token![!],
-///     empty_body: MacroDelimiter,
-///     semi_token: Option<Token![;]>,
-/// }
-///
-/// fn requires_semi(delimiter: &MacroDelimiter) -> bool {
-///     match *delimiter {
-///         MacroDelimiter::Paren(_) | MacroDelimiter::Bracket(_) => true,
-///         MacroDelimiter::Brace(_) => false,
-///     }
-/// }
-///
-/// impl Synom for EmptyMacroCall {
-///     named!(parse -> Self, do_parse!(
-///         name: syn!(Ident) >>
-///         bang_token: punct!(!) >>
-///         empty_body: alt!(
-///             parens!(epsilon!()) => { |d| MacroDelimiter::Paren(d.0) }
-///             |
-///             brackets!(epsilon!()) => { |d| MacroDelimiter::Bracket(d.0) }
-///             |
-///             braces!(epsilon!()) => { |d| MacroDelimiter::Brace(d.0) }
-///         ) >>
-///         semi_token: cond!(requires_semi(&empty_body), punct!(;)) >>
-///         (EmptyMacroCall {
-///             name,
-///             bang_token,
-///             empty_body,
-///             semi_token,
-///         })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! cond {
-    ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => {
-        if $cond {
-            match $submac!($i, $($args)*) {
-                ::std::result::Result::Ok((o, i)) =>
-                    ::std::result::Result::Ok((::std::option::Option::Some(o), i)),
-                ::std::result::Result::Err(x) => ::std::result::Result::Err(x),
-            }
-        } else {
-            ::std::result::Result::Ok((::std::option::Option::None, $i))
-        }
-    };
-
-    ($i:expr, $cond:expr, $f:expr) => {
-        cond!($i, $cond, call!($f))
-    };
-}
-
-/// Execute a parser only if a condition is met, otherwise fail to parse.
-///
-/// This is typically used inside of [`option!`] or [`alt!`].
-///
-/// [`option!`]: macro.option.html
-/// [`alt!`]: macro.alt.html
-///
-/// - **Syntax:** `cond_reduce!(CONDITION, THING)`
-/// - **Output:** `THING`
-///
-/// The subparser may be omitted in which case it defaults to [`epsilon!`].
-///
-/// [`epsilon!`]: macro.epsilon.html
-///
-/// - **Syntax:** `cond_reduce!(CONDITION)`
-/// - **Output:** `()`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Type;
-/// use syn::token::Paren;
-/// use syn::punctuated::Punctuated;
-/// use syn::synom::Synom;
-///
-/// /// Parses a possibly variadic function signature.
-/// ///
-/// /// Example: `fn(A) or `fn(A, B, C, ...)` or `fn(...)`
-/// /// Rejected: `fn(A, B...)`
-/// struct VariadicFn {
-///     fn_token: Token![fn],
-///     paren_token: Paren,
-///     types: Punctuated<Type, Token![,]>,
-///     variadic: Option<Token![...]>,
-/// }
-///
-/// // Example of using `cond_reduce!` inside of `option!`.
-/// impl Synom for VariadicFn {
-///     named!(parse -> Self, do_parse!(
-///         fn_token: keyword!(fn) >>
-///         params: parens!(do_parse!(
-///             types: call!(Punctuated::parse_terminated) >>
-///             // Allow, but do not require, an ending `...` but only if the
-///             // preceding list of types is empty or ends with a trailing comma.
-///             variadic: option!(cond_reduce!(types.empty_or_trailing(), punct!(...))) >>
-///             (types, variadic)
-///         )) >>
-///         ({
-///             let (paren_token, (types, variadic)) = params;
-///             VariadicFn {
-///                 fn_token,
-///                 paren_token,
-///                 types,
-///                 variadic,
-///             }
-///         })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! cond_reduce {
-    ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => {
-        if $cond {
-            $submac!($i, $($args)*)
-        } else {
-            $crate::parse_error()
-        }
-    };
-
-    ($i:expr, $cond:expr) => {
-        cond_reduce!($i, $cond, epsilon!())
-    };
-
-    ($i:expr, $cond:expr, $f:expr) => {
-        cond_reduce!($i, $cond, call!($f))
-    };
-}
-
-/// Parse zero or more values using the given parser.
-///
-/// - **Syntax:** `many0!(THING)`
-/// - **Output:** `Vec<THING>`
-///
-/// You may also be looking for:
-///
-/// - `call!(Punctuated::parse_separated)` - zero or more values with separator
-/// - `call!(Punctuated::parse_separated_nonempty)` - one or more values
-/// - `call!(Punctuated::parse_terminated)` - zero or more, allows trailing separator
-/// - `call!(Punctuated::parse_terminated_nonempty)` - one or more
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{Ident, Item};
-/// use syn::token::Brace;
-/// use syn::synom::Synom;
-///
-/// /// Parses a module containing zero or more Rust items.
-/// ///
-/// /// Example: `mod m { type Result<T> = ::std::result::Result<T, MyError>; }`
-/// struct SimpleMod {
-///     mod_token: Token![mod],
-///     name: Ident,
-///     brace_token: Brace,
-///     items: Vec<Item>,
-/// }
-///
-/// impl Synom for SimpleMod {
-///     named!(parse -> Self, do_parse!(
-///         mod_token: keyword!(mod) >>
-///         name: syn!(Ident) >>
-///         body: braces!(many0!(syn!(Item))) >>
-///         (SimpleMod {
-///             mod_token,
-///             name,
-///             brace_token: body.0,
-///             items: body.1,
-///         })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! many0 {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {{
-        let ret;
-        let mut res   = ::std::vec::Vec::new();
-        let mut input = $i;
-
-        loop {
-            if input.eof() {
-                ret = ::std::result::Result::Ok((res, input));
-                break;
-            }
-
-            match $submac!(input, $($args)*) {
-                ::std::result::Result::Err(_) => {
-                    ret = ::std::result::Result::Ok((res, input));
-                    break;
-                }
-                ::std::result::Result::Ok((o, i)) => {
-                    // loop trip must always consume (otherwise infinite loops)
-                    if i == input {
-                        ret = $crate::parse_error();
-                        break;
-                    }
-
-                    res.push(o);
-                    input = i;
-                }
-            }
-        }
-
-        ret
-    }};
-
-    ($i:expr, $f:expr) => {
-        $crate::parsers::many0($i, $f)
-    };
-}
-
-// Improve compile time by compiling this loop only once per type it is used
-// with.
-//
-// Not public API.
-#[doc(hidden)]
-pub fn many0<T>(mut input: Cursor, f: fn(Cursor) -> PResult<T>) -> PResult<Vec<T>> {
-    let mut res = Vec::new();
-
-    loop {
-        if input.eof() {
-            return Ok((res, input));
-        }
-
-        match f(input) {
-            Err(_) => {
-                return Ok((res, input));
-            }
-            Ok((o, i)) => {
-                // loop trip must always consume (otherwise infinite loops)
-                if i == input {
-                    return parse_error();
-                }
-
-                res.push(o);
-                input = i;
-            }
-        }
-    }
-}
-
-/// Pattern-match the result of a parser to select which other parser to run.
-///
-/// - **Syntax:** `switch!(TARGET, PAT1 => THEN1 | PAT2 => THEN2 | ...)`
-/// - **Output:** `T`, the return type of `THEN1` and `THEN2` and ...
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Ident;
-/// use syn::token::Brace;
-/// use syn::synom::Synom;
-///
-/// /// Parse a unit struct or enum: either `struct S;` or `enum E { V }`.
-/// enum UnitType {
-///     Struct {
-///         struct_token: Token![struct],
-///         name: Ident,
-///         semi_token: Token![;],
-///     },
-///     Enum {
-///         enum_token: Token![enum],
-///         name: Ident,
-///         brace_token: Brace,
-///         variant: Ident,
-///     },
-/// }
-///
-/// enum StructOrEnum {
-///     Struct(Token![struct]),
-///     Enum(Token![enum]),
-/// }
-///
-/// impl Synom for StructOrEnum {
-///     named!(parse -> Self, alt!(
-///         keyword!(struct) => { StructOrEnum::Struct }
-///         |
-///         keyword!(enum) => { StructOrEnum::Enum }
-///     ));
-/// }
-///
-/// impl Synom for UnitType {
-///     named!(parse -> Self, do_parse!(
-///         which: syn!(StructOrEnum) >>
-///         name: syn!(Ident) >>
-///         item: switch!(value!(which),
-///             StructOrEnum::Struct(struct_token) => map!(
-///                 punct!(;),
-///                 |semi_token| UnitType::Struct {
-///                     struct_token,
-///                     name,
-///                     semi_token,
-///                 }
-///             )
-///             |
-///             StructOrEnum::Enum(enum_token) => map!(
-///                 braces!(syn!(Ident)),
-///                 |(brace_token, variant)| UnitType::Enum {
-///                     enum_token,
-///                     name,
-///                     brace_token,
-///                     variant,
-///                 }
-///             )
-///         ) >>
-///         (item)
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! switch {
-    ($i:expr, $submac:ident!( $($args:tt)* ), $($p:pat => $subrule:ident!( $($args2:tt)* ))|* ) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) => ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((o, i)) => match o {
-                $(
-                    $p => $subrule!(i, $($args2)*),
-                )*
-            }
-        }
-    };
-}
-
-/// Produce the given value without parsing anything.
-///
-/// This can be needed where you have an existing parsed value but a parser
-/// macro's syntax expects you to provide a submacro, such as in the first
-/// argument of [`switch!`] or one of the branches of [`alt!`].
-///
-/// [`switch!`]: macro.switch.html
-/// [`alt!`]: macro.alt.html
-///
-/// - **Syntax:** `value!(VALUE)`
-/// - **Output:** `VALUE`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Ident;
-/// use syn::token::Brace;
-/// use syn::synom::Synom;
-///
-/// /// Parse a unit struct or enum: either `struct S;` or `enum E { V }`.
-/// enum UnitType {
-///     Struct {
-///         struct_token: Token![struct],
-///         name: Ident,
-///         semi_token: Token![;],
-///     },
-///     Enum {
-///         enum_token: Token![enum],
-///         name: Ident,
-///         brace_token: Brace,
-///         variant: Ident,
-///     },
-/// }
-///
-/// enum StructOrEnum {
-///     Struct(Token![struct]),
-///     Enum(Token![enum]),
-/// }
-///
-/// impl Synom for StructOrEnum {
-///     named!(parse -> Self, alt!(
-///         keyword!(struct) => { StructOrEnum::Struct }
-///         |
-///         keyword!(enum) => { StructOrEnum::Enum }
-///     ));
-/// }
-///
-/// impl Synom for UnitType {
-///     named!(parse -> Self, do_parse!(
-///         which: syn!(StructOrEnum) >>
-///         name: syn!(Ident) >>
-///         item: switch!(value!(which),
-///             StructOrEnum::Struct(struct_token) => map!(
-///                 punct!(;),
-///                 |semi_token| UnitType::Struct {
-///                     struct_token,
-///                     name,
-///                     semi_token,
-///                 }
-///             )
-///             |
-///             StructOrEnum::Enum(enum_token) => map!(
-///                 braces!(syn!(Ident)),
-///                 |(brace_token, variant)| UnitType::Enum {
-///                     enum_token,
-///                     name,
-///                     brace_token,
-///                     variant,
-///                 }
-///             )
-///         ) >>
-///         (item)
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! value {
-    ($i:expr, $res:expr) => {
-        ::std::result::Result::Ok(($res, $i))
-    };
-}
-
-/// Unconditionally fail to parse anything.
-///
-/// This may be useful in rejecting some arms of a `switch!` parser.
-///
-/// - **Syntax:** `reject!()`
-/// - **Output:** never succeeds
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Item;
-///
-/// // Parse any item, except for a module.
-/// named!(almost_any_item -> Item,
-///     switch!(syn!(Item),
-///         Item::Mod(_) => reject!()
-///         |
-///         ok => value!(ok)
-///     )
-/// );
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! reject {
-    ($i:expr,) => {{
-        let _ = $i;
-        $crate::parse_error()
-    }}
-}
-
-/// Run a series of parsers and produce all of the results in a tuple.
-///
-/// - **Syntax:** `tuple!(A, B, C, ...)`
-/// - **Output:** `(A, B, C, ...)`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Type;
-///
-/// named!(two_types -> (Type, Type), tuple!(syn!(Type), syn!(Type)));
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! tuple {
-    ($i:expr, $($rest:tt)*) => {
-        tuple_parser!($i, (), $($rest)*)
-    };
-}
-
-// Internal parser, do not use directly.
-#[doc(hidden)]
-#[macro_export]
-macro_rules! tuple_parser {
-    ($i:expr, ($($parsed:tt),*), $e:ident, $($rest:tt)*) => {
-        tuple_parser!($i, ($($parsed),*), call!($e), $($rest)*)
-    };
-
-    ($i:expr, (), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((o, i)) =>
-                tuple_parser!(i, (o), $($rest)*),
-        }
-    };
-
-    ($i:expr, ($($parsed:tt)*), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((o, i)) =>
-                tuple_parser!(i, ($($parsed)* , o), $($rest)*),
-        }
-    };
-
-    ($i:expr, ($($parsed:tt),*), $e:ident) => {
-        tuple_parser!($i, ($($parsed),*), call!($e))
-    };
-
-    ($i:expr, (), $submac:ident!( $($args:tt)* )) => {
-        $submac!($i, $($args)*)
-    };
-
-    ($i:expr, ($($parsed:expr),*), $submac:ident!( $($args:tt)* )) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((o, i)) =>
-                ::std::result::Result::Ok((($($parsed),*, o), i)),
-        }
-    };
-
-    ($i:expr, ($($parsed:expr),*)) => {
-        ::std::result::Result::Ok((($($parsed),*), $i))
-    };
-}
-
-/// Run a series of parsers, returning the result of the first one which
-/// succeeds.
-///
-/// Optionally allows for the result to be transformed.
-///
-/// - **Syntax:** `alt!(THING1 | THING2 => { FUNC } | ...)`
-/// - **Output:** `T`, the return type of `THING1` and `FUNC(THING2)` and ...
-///
-/// # Example
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Ident;
-///
-/// // Parse any identifier token, or the `!` token in which case the
-/// // identifier is treated as `"BANG"`.
-/// named!(ident_or_bang -> Ident, alt!(
-///     syn!(Ident)
-///     |
-///     punct!(!) => { |_| "BANG".into() }
-/// ));
-/// #
-/// # fn main() {}
-/// ```
-///
-/// The `alt!` macro is most commonly seen when parsing a syntax tree enum such
-/// as the [`Item`] enum.
-///
-/// [`Item`]: enum.Item.html
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate syn;
-/// #
-/// # use syn::synom::Synom;
-/// #
-/// # struct Item;
-/// #
-/// impl Synom for Item {
-///     named!(parse -> Self, alt!(
-/// #       epsilon!() => { |_| unimplemented!() }
-/// #   ));
-/// # }
-/// #
-/// # mod example {
-/// #   use syn::*;
-/// #
-/// #   named!(parse -> Item, alt!(
-///         syn!(ItemExternCrate) => { Item::ExternCrate }
-///         |
-///         syn!(ItemUse) => { Item::Use }
-///         |
-///         syn!(ItemStatic) => { Item::Static }
-///         |
-///         syn!(ItemConst) => { Item::Const }
-///         |
-///         /* ... */
-/// #       syn!(ItemFn) => { Item::Fn }
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! alt {
-    ($i:expr, $e:ident | $($rest:tt)*) => {
-        alt!($i, call!($e) | $($rest)*)
-    };
-
-    ($i:expr, $subrule:ident!( $($args:tt)*) | $($rest:tt)*) => {
-        match $subrule!($i, $($args)*) {
-            res @ ::std::result::Result::Ok(_) => res,
-            _ => alt!($i, $($rest)*)
-        }
-    };
-
-    ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr } | $($rest:tt)+) => {
-        match $subrule!($i, $($args)*) {
-            ::std::result::Result::Ok((o, i)) =>
-                ::std::result::Result::Ok(($crate::parsers::invoke($gen, o), i)),
-            ::std::result::Result::Err(_) => alt!($i, $($rest)*),
-        }
-    };
-
-    ($i:expr, $e:ident => { $gen:expr } | $($rest:tt)*) => {
-        alt!($i, call!($e) => { $gen } | $($rest)*)
-    };
-
-    ($i:expr, $e:ident => { $gen:expr }) => {
-        alt!($i, call!($e) => { $gen })
-    };
-
-    ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr }) => {
-        match $subrule!($i, $($args)*) {
-            ::std::result::Result::Ok((o, i)) =>
-                ::std::result::Result::Ok(($crate::parsers::invoke($gen, o), i)),
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-        }
-    };
-
-    ($i:expr, $e:ident) => {
-        alt!($i, call!($e))
-    };
-
-    ($i:expr, $subrule:ident!( $($args:tt)*)) => {
-        $subrule!($i, $($args)*)
-    };
-}
-
-/// Run a series of parsers, optionally naming each intermediate result,
-/// followed by a step to combine the intermediate results.
-///
-/// Produces the result of evaluating the final expression in parentheses with
-/// all of the previously named results bound.
-///
-/// - **Syntax:** `do_parse!(name: THING1 >> THING2 >> (RESULT))`
-/// - **Output:** `RESULT`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-/// extern crate proc_macro2;
-///
-/// use syn::Ident;
-/// use syn::token::Paren;
-/// use syn::synom::Synom;
-/// use proc_macro2::TokenStream;
-///
-/// /// Parse a macro invocation that uses `(` `)` parentheses.
-/// ///
-/// /// Example: `stringify!($args)`.
-/// struct Macro {
-///     name: Ident,
-///     bang_token: Token![!],
-///     paren_token: Paren,
-///     tts: TokenStream,
-/// }
-///
-/// impl Synom for Macro {
-///     named!(parse -> Self, do_parse!(
-///         name: syn!(Ident) >>
-///         bang_token: punct!(!) >>
-///         body: parens!(syn!(TokenStream)) >>
-///         (Macro {
-///             name,
-///             bang_token,
-///             paren_token: body.0,
-///             tts: body.1,
-///         })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! do_parse {
-    ($i:expr, ( $($rest:expr),* )) => {
-        ::std::result::Result::Ok((( $($rest),* ), $i))
-    };
-
-    ($i:expr, $e:ident >> $($rest:tt)*) => {
-        do_parse!($i, call!($e) >> $($rest)*)
-    };
-
-    ($i:expr, $submac:ident!( $($args:tt)* ) >> $($rest:tt)*) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((_, i)) =>
-                do_parse!(i, $($rest)*),
-        }
-    };
-
-    ($i:expr, $field:ident : $e:ident >> $($rest:tt)*) => {
-        do_parse!($i, $field: call!($e) >> $($rest)*)
-    };
-
-    ($i:expr, $field:ident : $submac:ident!( $($args:tt)* ) >> $($rest:tt)*) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((o, i)) => {
-                let $field = o;
-                do_parse!(i, $($rest)*)
-            },
-        }
-    };
-
-    ($i:expr, mut $field:ident : $e:ident >> $($rest:tt)*) => {
-        do_parse!($i, mut $field: call!($e) >> $($rest)*)
-    };
-
-    ($i:expr, mut $field:ident : $submac:ident!( $($args:tt)* ) >> $($rest:tt)*) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((o, i)) => {
-                let mut $field = o;
-                do_parse!(i, $($rest)*)
-            },
-        }
-    };
-}
-
-/// Parse nothing and succeed only if the end of the enclosing block has been
-/// reached.
-///
-/// The enclosing block may be the full input if we are parsing at the top
-/// level, or the surrounding parenthesis/bracket/brace if we are parsing within
-/// those.
-///
-/// - **Syntax:** `input_end!()`
-/// - **Output:** `()`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Expr;
-/// use syn::synom::Synom;
-///
-/// /// Parses any Rust expression followed either by a semicolon or by the end
-/// /// of the input.
-/// ///
-/// /// For example `many0!(syn!(TerminatedExpr))` would successfully parse the
-/// /// following input into three expressions.
-/// ///
-/// ///     1 + 1; second.two(); third!()
-/// ///
-/// /// Similarly within a block, `braced!(many0!(syn!(TerminatedExpr)))` would
-/// /// successfully parse three expressions.
-/// ///
-/// ///     { 1 + 1; second.two(); third!() }
-/// struct TerminatedExpr {
-///     expr: Expr,
-///     semi_token: Option<Token![;]>,
-/// }
-///
-/// impl Synom for TerminatedExpr {
-///     named!(parse -> Self, do_parse!(
-///         expr: syn!(Expr) >>
-///         semi_token: alt!(
-///             input_end!() => { |_| None }
-///             |
-///             punct!(;) => { Some }
-///         ) >>
-///         (TerminatedExpr {
-///             expr,
-///             semi_token,
-///         })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! input_end {
-    ($i:expr,) => {
-        $crate::parsers::input_end($i)
-    };
-}
-
-// Not a public API
-#[doc(hidden)]
-pub fn input_end(input: Cursor) -> PResult<'static, ()> {
-    if input.eof() {
-        Ok(((), Cursor::empty()))
-    } else {
-        parse_error()
-    }
-}
-
-/// Turn a failed parse into `None` and a successful parse into `Some`.
-///
-/// A failed parse consumes none of the input.
-///
-/// - **Syntax:** `option!(THING)`
-/// - **Output:** `Option<THING>`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{Label, Block};
-/// use syn::synom::Synom;
-///
-/// /// Parses a Rust loop. Equivalent to syn::ExprLoop.
-/// ///
-/// /// Examples:
-/// ///     loop { println!("y"); }
-/// ///     'x: loop { break 'x; }
-/// struct ExprLoop {
-///     label: Option<Label>,
-///     loop_token: Token![loop],
-///     body: Block,
-/// }
-///
-/// impl Synom for ExprLoop {
-///     named!(parse -> Self, do_parse!(
-///         // Loop may or may not have a label.
-///         label: option!(syn!(Label)) >>
-///         loop_token: keyword!(loop) >>
-///         body: syn!(Block) >>
-///         (ExprLoop {
-///             label,
-///             loop_token,
-///             body,
-///         })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! option {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Ok((o, i)) =>
-                ::std::result::Result::Ok((Some(o), i)),
-            ::std::result::Result::Err(_) =>
-                ::std::result::Result::Ok((None, $i)),
-        }
-    };
-
-    ($i:expr, $f:expr) => {
-        option!($i, call!($f));
-    };
-}
-
-/// Parses nothing and always succeeds.
-///
-/// This can be useful as a fallthrough case in [`alt!`], as shown below. Also
-/// useful for parsing empty delimiters using [`parens!`] or [`brackets!`] or
-/// [`braces!`] by parsing for example `braces!(epsilon!())` for an empty `{}`.
-///
-/// [`alt!`]: macro.alt.html
-/// [`parens!`]: macro.parens.html
-/// [`brackets!`]: macro.brackets.html
-/// [`braces!`]: macro.braces.html
-///
-/// - **Syntax:** `epsilon!()`
-/// - **Output:** `()`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::synom::Synom;
-///
-/// enum Mutability {
-///     Mutable(Token![mut]),
-///     Immutable,
-/// }
-///
-/// impl Synom for Mutability {
-///     named!(parse -> Self, alt!(
-///         keyword!(mut) => { Mutability::Mutable }
-///         |
-///         epsilon!() => { |_| Mutability::Immutable }
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! epsilon {
-    ($i:expr,) => {
-        ::std::result::Result::Ok(((), $i))
-    };
-}
-
-/// Run a parser, binding the result to a name, and then evaluating an
-/// expression.
-///
-/// Discards the result of the expression and parser.
-///
-/// - **Syntax:** `tap!(NAME : THING => EXPR)`
-/// - **Output:** `()`
-#[doc(hidden)]
-#[macro_export]
-macro_rules! tap {
-    ($i:expr, $name:ident : $submac:ident!( $($args:tt)* ) => $e:expr) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Ok((o, i)) => {
-                let $name = o;
-                $e;
-                ::std::result::Result::Ok(((), i))
-            }
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-        }
-    };
-
-    ($i:expr, $name:ident : $f:expr => $e:expr) => {
-        tap!($i, $name: call!($f) => $e);
-    };
-}
-
-/// Parse any type that implements the `Synom` trait.
-///
-/// Any type implementing [`Synom`] can be used with this parser, whether the
-/// implementation is provided by Syn or is one that you write.
-///
-/// [`Synom`]: synom/trait.Synom.html
-///
-/// - **Syntax:** `syn!(TYPE)`
-/// - **Output:** `TYPE`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{Ident, Item};
-/// use syn::token::Brace;
-/// use syn::synom::Synom;
-///
-/// /// Parses a module containing zero or more Rust items.
-/// ///
-/// /// Example: `mod m { type Result<T> = ::std::result::Result<T, MyError>; }`
-/// struct SimpleMod {
-///     mod_token: Token![mod],
-///     name: Ident,
-///     brace_token: Brace,
-///     items: Vec<Item>,
-/// }
-///
-/// impl Synom for SimpleMod {
-///     named!(parse -> Self, do_parse!(
-///         mod_token: keyword!(mod) >>
-///         name: syn!(Ident) >>
-///         body: braces!(many0!(syn!(Item))) >>
-///         (SimpleMod {
-///             mod_token,
-///             name,
-///             brace_token: body.0,
-///             items: body.1,
-///         })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! syn {
-    ($i:expr, $t:ty) => {
-        <$t as $crate::synom::Synom>::parse($i)
-    };
-}
-
-/// Parse inside of `(` `)` parentheses.
-///
-/// This macro parses a set of balanced parentheses and invokes a sub-parser on
-/// the content inside. The sub-parser is required to consume all tokens within
-/// the parentheses in order for this parser to return successfully.
-///
-/// - **Syntax:** `parens!(CONTENT)`
-/// - **Output:** `(token::Paren, CONTENT)`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Expr;
-/// use syn::token::Paren;
-///
-/// /// Parses an expression inside of parentheses.
-/// ///
-/// /// Example: `(1 + 1)`
-/// named!(expr_paren -> (Paren, Expr), parens!(syn!(Expr)));
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! parens {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {
-        $crate::token::Paren::parse($i, |i| $submac!(i, $($args)*))
-    };
-
-    ($i:expr, $f:expr) => {
-        parens!($i, call!($f));
-    };
-}
-
-/// Parse inside of `[` `]` square brackets.
-///
-/// This macro parses a set of balanced brackets and invokes a sub-parser on the
-/// content inside. The sub-parser is required to consume all tokens within the
-/// brackets in order for this parser to return successfully.
-///
-/// - **Syntax:** `brackets!(CONTENT)`
-/// - **Output:** `(token::Bracket, CONTENT)`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Expr;
-/// use syn::token::Bracket;
-///
-/// /// Parses an expression inside of brackets.
-/// ///
-/// /// Example: `[1 + 1]`
-/// named!(expr_paren -> (Bracket, Expr), brackets!(syn!(Expr)));
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! brackets {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {
-        $crate::token::Bracket::parse($i, |i| $submac!(i, $($args)*))
-    };
-
-    ($i:expr, $f:expr) => {
-        brackets!($i, call!($f));
-    };
-}
-
-/// Parse inside of `{` `}` curly braces.
-///
-/// This macro parses a set of balanced braces and invokes a sub-parser on the
-/// content inside. The sub-parser is required to consume all tokens within the
-/// braces in order for this parser to return successfully.
-///
-/// - **Syntax:** `braces!(CONTENT)`
-/// - **Output:** `(token::Brace, CONTENT)`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Expr;
-/// use syn::token::Brace;
-///
-/// /// Parses an expression inside of braces.
-/// ///
-/// /// Example: `{1 + 1}`
-/// named!(expr_paren -> (Brace, Expr), braces!(syn!(Expr)));
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! braces {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {
-        $crate::token::Brace::parse($i, |i| $submac!(i, $($args)*))
-    };
-
-    ($i:expr, $f:expr) => {
-        braces!($i, call!($f));
-    };
-}
-
-// Not public API.
-#[doc(hidden)]
-#[macro_export]
-macro_rules! grouped {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {
-        $crate::token::Group::parse($i, |i| $submac!(i, $($args)*))
-    };
-
-    ($i:expr, $f:expr) => {
-        grouped!($i, call!($f));
-    };
-}
diff --git a/third_party/rust/syn-0.13.1/src/path.rs b/third_party/rust/syn-0.13.1/src/path.rs
deleted file mode 100644
index d5b72380bb61..000000000000
--- a/third_party/rust/syn-0.13.1/src/path.rs
+++ /dev/null
@@ -1,572 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use punctuated::Punctuated;
-use super::*;
-
-ast_struct! {
-    /// A path at which a named item is exported: `std::collections::HashMap`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct Path {
-        pub leading_colon: Option<Token![::]>,
-        pub segments: Punctuated<PathSegment, Token![::]>,
-    }
-}
-
-impl Path {
-    pub fn global(&self) -> bool {
-        self.leading_colon.is_some()
-    }
-}
-
-/// A helper for printing a self-type qualified path as tokens.
-///
-/// ```rust
-/// extern crate syn;
-/// extern crate quote;
-///
-/// use syn::{QSelf, Path, PathTokens};
-/// use quote::{Tokens, ToTokens};
-///
-/// struct MyNode {
-///     qself: Option<QSelf>,
-///     path: Path,
-/// }
-///
-/// impl ToTokens for MyNode {
-///     fn to_tokens(&self, tokens: &mut Tokens) {
-///         PathTokens(&self.qself, &self.path).to_tokens(tokens);
-///     }
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This type is available if Syn is built with the `"derive"` or `"full"`
-/// feature and the `"printing"` feature.*
-#[cfg(feature = "printing")]
-#[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-#[cfg_attr(feature = "clone-impls", derive(Clone))]
-pub struct PathTokens<'a>(pub &'a Option<QSelf>, pub &'a Path);
-
-impl<T> From<T> for Path
-where
-    T: Into<PathSegment>,
-{
-    fn from(segment: T) -> Self {
-        let mut path = Path {
-            leading_colon: None,
-            segments: Punctuated::new(),
-        };
-        path.segments.push_value(segment.into());
-        path
-    }
-}
-
-ast_struct! {
-    /// A segment of a path together with any path arguments on that segment.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct PathSegment {
-        pub ident: Ident,
-        pub arguments: PathArguments,
-    }
-}
-
-impl<T> From<T> for PathSegment
-where
-    T: Into<Ident>,
-{
-    fn from(ident: T) -> Self {
-        PathSegment {
-            ident: ident.into(),
-            arguments: PathArguments::None,
-        }
-    }
-}
-
-ast_enum! {
-    /// Angle bracketed or parenthesized arguments of a path segment.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// ## Angle bracketed
-    ///
-    /// The `<'a, T>` in `std::slice::iter<'a, T>`.
-    ///
-    /// ## Parenthesized
-    ///
-    /// The `(A, B) -> C` in `Fn(A, B) -> C`.
-    pub enum PathArguments {
-        None,
-        /// The `<'a, T>` in `std::slice::iter<'a, T>`.
-        AngleBracketed(AngleBracketedGenericArguments),
-        /// The `(A, B) -> C` in `Fn(A, B) -> C`.
-        Parenthesized(ParenthesizedGenericArguments),
-    }
-}
-
-impl Default for PathArguments {
-    fn default() -> Self {
-        PathArguments::None
-    }
-}
-
-impl PathArguments {
-    pub fn is_empty(&self) -> bool {
-        match *self {
-            PathArguments::None => true,
-            PathArguments::AngleBracketed(ref bracketed) => bracketed.args.is_empty(),
-            PathArguments::Parenthesized(_) => false,
-        }
-    }
-}
-
-ast_enum! {
-    /// An individual generic argument, like `'a`, `T`, or `Item = T`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum GenericArgument {
-        /// A lifetime argument.
-        Lifetime(Lifetime),
-        /// A type argument.
-        Type(Type),
-        /// A binding (equality constraint) on an associated type: the `Item =
-        /// u8` in `Iterator<Item = u8>`.
-        Binding(Binding),
-        /// A const expression. Must be inside of a block.
-        ///
-        /// NOTE: Identity expressions are represented as Type arguments, as
-        /// they are indistinguishable syntactically.
-        Const(Expr),
-    }
-}
-
-ast_struct! {
-    /// Angle bracketed arguments of a path segment: the `<K, V>` in `HashMap<K,
-    /// V>`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct AngleBracketedGenericArguments {
-        pub colon2_token: Option<Token![::]>,
-        pub lt_token: Token![<],
-        pub args: Punctuated<GenericArgument, Token![,]>,
-        pub gt_token: Token![>],
-    }
-}
-
-ast_struct! {
-    /// A binding (equality constraint) on an associated type: `Item = u8`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct Binding {
-        pub ident: Ident,
-        pub eq_token: Token![=],
-        pub ty: Type,
-    }
-}
-
-ast_struct! {
-    /// Arguments of a function path segment: the `(A, B) -> C` in `Fn(A,B) ->
-    /// C`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct ParenthesizedGenericArguments {
-        pub paren_token: token::Paren,
-        /// `(A, B)`
-        pub inputs: Punctuated<Type, Token![,]>,
-        /// `C`
-        pub output: ReturnType,
-    }
-}
-
-ast_struct! {
-    /// The explicit Self type in a qualified path: the `T` in `<T as
-    /// Display>::fmt`.
-    ///
-    /// The actual path, including the trait and the associated item, is stored
-    /// separately. The `position` field represents the index of the associated
-    /// item qualified with this Self type.
-    ///
-    /// ```text
-    /// <Vec<T> as a::b::Trait>::AssociatedItem
-    ///  ^~~~~~    ~~~~~~~~~~~~~~^
-    ///  ty        position = 3
-    ///
-    /// <Vec<T>>::AssociatedItem
-    ///  ^~~~~~   ^
-    ///  ty       position = 0
-    /// ```
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct QSelf {
-        pub lt_token: Token![<],
-        pub ty: Box<Type>,
-        pub position: usize,
-        pub as_token: Option<Token![as]>,
-        pub gt_token: Token![>],
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use synom::Synom;
-
-    impl Synom for Path {
-        named!(parse -> Self, do_parse!(
-            colon: option!(punct!(::)) >>
-            segments: call!(Punctuated::<PathSegment, Token![::]>::parse_separated_nonempty) >>
-            cond_reduce!(segments.first().map_or(true, |seg| seg.value().ident != "dyn")) >>
-            (Path {
-                leading_colon: colon,
-                segments: segments,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("path")
-        }
-    }
-
-    #[cfg(not(feature = "full"))]
-    impl Synom for GenericArgument {
-        named!(parse -> Self, alt!(
-            call!(ty_no_eq_after) => { GenericArgument::Type }
-            |
-            syn!(Lifetime) => { GenericArgument::Lifetime }
-            |
-            syn!(Binding) => { GenericArgument::Binding }
-        ));
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for GenericArgument {
-        named!(parse -> Self, alt!(
-            call!(ty_no_eq_after) => { GenericArgument::Type }
-            |
-            syn!(Lifetime) => { GenericArgument::Lifetime }
-            |
-            syn!(Binding) => { GenericArgument::Binding }
-            |
-            syn!(ExprLit) => { |l| GenericArgument::Const(Expr::Lit(l)) }
-            |
-            syn!(ExprBlock) => { |b| GenericArgument::Const(Expr::Block(b)) }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("generic argument")
-        }
-    }
-
-    impl Synom for AngleBracketedGenericArguments {
-        named!(parse -> Self, do_parse!(
-            colon2: option!(punct!(::)) >>
-            lt: punct!(<) >>
-            args: call!(Punctuated::parse_terminated) >>
-            gt: punct!(>) >>
-            (AngleBracketedGenericArguments {
-                colon2_token: colon2,
-                lt_token: lt,
-                args: args,
-                gt_token: gt,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("angle bracketed generic arguments")
-        }
-    }
-
-    impl Synom for ParenthesizedGenericArguments {
-        named!(parse -> Self, do_parse!(
-            data: parens!(Punctuated::parse_terminated) >>
-            output: syn!(ReturnType) >>
-            (ParenthesizedGenericArguments {
-                paren_token: data.0,
-                inputs: data.1,
-                output: output,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("parenthesized generic arguments: `Foo(A, B, ..) -> T`")
-        }
-    }
-
-    impl Synom for PathSegment {
-        named!(parse -> Self, alt!(
-            do_parse!(
-                ident: syn!(Ident) >>
-                arguments: syn!(AngleBracketedGenericArguments) >>
-                (PathSegment {
-                    ident: ident,
-                    arguments: PathArguments::AngleBracketed(arguments),
-                })
-            )
-            |
-            mod_style_path_segment
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("path segment")
-        }
-    }
-
-    impl Synom for Binding {
-        named!(parse -> Self, do_parse!(
-            id: syn!(Ident) >>
-            eq: punct!(=) >>
-            ty: syn!(Type) >>
-            (Binding {
-                ident: id,
-                eq_token: eq,
-                ty: ty,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("associated type binding")
-        }
-    }
-
-    impl Path {
-        named!(pub parse_mod_style -> Self, do_parse!(
-            colon: option!(punct!(::)) >>
-            segments: call!(Punctuated::parse_separated_nonempty_with,
-                            mod_style_path_segment) >>
-            (Path {
-                leading_colon: colon,
-                segments: segments,
-            })
-        ));
-    }
-
-    named!(mod_style_path_segment -> PathSegment, alt!(
-        syn!(Ident) => { Into::into }
-        |
-        keyword!(super) => { Into::into }
-        |
-        keyword!(self) => { Into::into }
-        |
-        keyword!(Self) => { Into::into }
-        |
-        keyword!(crate) => { Into::into }
-    ));
-
-    named!(pub qpath -> (Option<QSelf>, Path), alt!(
-        map!(syn!(Path), |p| (None, p))
-        |
-        do_parse!(
-            lt: punct!(<) >>
-            this: syn!(Type) >>
-            path: option!(tuple!(keyword!(as), syn!(Path))) >>
-            gt: punct!(>) >>
-            colon2: punct!(::) >>
-            rest: call!(Punctuated::parse_separated_nonempty) >>
-            ({
-                let (pos, as_, path) = match path {
-                    Some((as_, mut path)) => {
-                        let pos = path.segments.len();
-                        path.segments.push_punct(colon2);
-                        path.segments.extend(rest.into_pairs());
-                        (pos, Some(as_), path)
-                    }
-                    None => {
-                        (0, None, Path {
-                            leading_colon: Some(colon2),
-                            segments: rest,
-                        })
-                    }
-                };
-                (Some(QSelf {
-                    lt_token: lt,
-                    ty: Box::new(this),
-                    position: pos,
-                    as_token: as_,
-                    gt_token: gt,
-                }), path)
-            })
-        )
-        |
-        map!(keyword!(self), |s| (None, s.into()))
-    ));
-
-    named!(pub ty_no_eq_after -> Type, do_parse!(
-        ty: syn!(Type) >>
-        not!(punct!(=)) >>
-        (ty)
-    ));
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use quote::{ToTokens, Tokens};
-
-    impl ToTokens for Path {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.leading_colon.to_tokens(tokens);
-            self.segments.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for PathSegment {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.ident.to_tokens(tokens);
-            self.arguments.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for PathArguments {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            match *self {
-                PathArguments::None => {}
-                PathArguments::AngleBracketed(ref arguments) => {
-                    arguments.to_tokens(tokens);
-                }
-                PathArguments::Parenthesized(ref arguments) => {
-                    arguments.to_tokens(tokens);
-                }
-            }
-        }
-    }
-
-    impl ToTokens for GenericArgument {
-        #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))]
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            match *self {
-                GenericArgument::Lifetime(ref lt) => lt.to_tokens(tokens),
-                GenericArgument::Type(ref ty) => ty.to_tokens(tokens),
-                GenericArgument::Binding(ref tb) => tb.to_tokens(tokens),
-                GenericArgument::Const(ref e) => match *e {
-                    Expr::Lit(_) => e.to_tokens(tokens),
-
-                    // NOTE: We should probably support parsing blocks with only
-                    // expressions in them without the full feature for const
-                    // generics.
-                    #[cfg(feature = "full")]
-                    Expr::Block(_) => e.to_tokens(tokens),
-
-                    // ERROR CORRECTION: Add braces to make sure that the
-                    // generated code is valid.
-                    _ => token::Brace::default().surround(tokens, |tokens| {
-                        e.to_tokens(tokens);
-                    }),
-                },
-            }
-        }
-    }
-
-    impl ToTokens for AngleBracketedGenericArguments {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.colon2_token.to_tokens(tokens);
-            self.lt_token.to_tokens(tokens);
-
-            // Print lifetimes before types and consts, all before bindings,
-            // regardless of their order in self.args.
-            //
-            // TODO: ordering rules for const arguments vs type arguments have
-            // not been settled yet. https://github.com/rust-lang/rust/issues/44580
-            let mut trailing_or_empty = true;
-            for param in self.args.pairs() {
-                if let GenericArgument::Lifetime(_) = **param.value() {
-                    param.to_tokens(tokens);
-                    trailing_or_empty = param.punct().is_some();
-                }
-            }
-            for param in self.args.pairs() {
-                match **param.value() {
-                    GenericArgument::Type(_) | GenericArgument::Const(_) => {
-                        if !trailing_or_empty {
-                            <Token![,]>::default().to_tokens(tokens);
-                        }
-                        param.to_tokens(tokens);
-                        trailing_or_empty = param.punct().is_some();
-                    }
-                    GenericArgument::Lifetime(_) | GenericArgument::Binding(_) => {}
-                }
-            }
-            for param in self.args.pairs() {
-                if let GenericArgument::Binding(_) = **param.value() {
-                    if !trailing_or_empty {
-                        <Token![,]>::default().to_tokens(tokens);
-                        trailing_or_empty = true;
-                    }
-                    param.to_tokens(tokens);
-                }
-            }
-
-            self.gt_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for Binding {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.ident.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ParenthesizedGenericArguments {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.paren_token.surround(tokens, |tokens| {
-                self.inputs.to_tokens(tokens);
-            });
-            self.output.to_tokens(tokens);
-        }
-    }
-
-    impl<'a> ToTokens for PathTokens<'a> {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            let qself = match *self.0 {
-                Some(ref qself) => qself,
-                None => return self.1.to_tokens(tokens),
-            };
-            qself.lt_token.to_tokens(tokens);
-            qself.ty.to_tokens(tokens);
-
-            // XXX: Gross.
-            let pos = if qself.position > 0 && qself.position >= self.1.segments.len() {
-                self.1.segments.len() - 1
-            } else {
-                qself.position
-            };
-            let mut segments = self.1.segments.pairs();
-            if pos > 0 {
-                TokensOrDefault(&qself.as_token).to_tokens(tokens);
-                self.1.leading_colon.to_tokens(tokens);
-                for (i, segment) in segments.by_ref().take(pos).enumerate() {
-                    if i + 1 == pos {
-                        segment.value().to_tokens(tokens);
-                        qself.gt_token.to_tokens(tokens);
-                        segment.punct().to_tokens(tokens);
-                    } else {
-                        segment.to_tokens(tokens);
-                    }
-                }
-            } else {
-                qself.gt_token.to_tokens(tokens);
-                self.1.leading_colon.to_tokens(tokens);
-            }
-            for segment in segments {
-                segment.to_tokens(tokens);
-            }
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/punctuated.rs b/third_party/rust/syn-0.13.1/src/punctuated.rs
deleted file mode 100644
index 63d289e04606..000000000000
--- a/third_party/rust/syn-0.13.1/src/punctuated.rs
+++ /dev/null
@@ -1,699 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! A punctuated sequence of syntax tree nodes separated by punctuation.
-//!
-//! Lots of things in Rust are punctuated sequences.
-//!
-//! - The fields of a struct are `Punctuated<Field, Token![,]>`.
-//! - The segments of a path are `Punctuated<PathSegment, Token![::]>`.
-//! - The bounds on a generic parameter are `Punctuated<TypeParamBound, Token![+]>`.
-//! - The arguments to a function call are `Punctuated<Expr, Token![,]>`.
-//!
-//! This module provides a common representation for these punctuated sequences
-//! in the form of the [`Punctuated<T, P>`] type. We store a vector of pairs of
-//! syntax tree node + punctuation, where every node in the sequence is followed
-//! by punctuation except for possibly the final one.
-//!
-//! [`Punctuated<T, P>`]: struct.Punctuated.html
-//!
-//! ```text
-//! a_function_call(arg1, arg2, arg3);
-//!                 ^^^^^ ~~~~~ ^^^^
-//! ```
-
-#[cfg(any(feature = "full", feature = "derive"))]
-use std::iter;
-use std::iter::FromIterator;
-use std::ops::{Index, IndexMut};
-use std::slice;
-use std::vec;
-#[cfg(feature = "extra-traits")]
-use std::fmt::{self, Debug};
-
-#[cfg(feature = "parsing")]
-use synom::{Synom, PResult};
-#[cfg(feature = "parsing")]
-use buffer::Cursor;
-#[cfg(feature = "parsing")]
-use parse_error;
-
-/// A punctuated sequence of syntax tree nodes of type `T` separated by
-/// punctuation of type `P`.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-#[cfg_attr(feature = "extra-traits", derive(Eq, PartialEq, Hash))]
-#[cfg_attr(feature = "clone-impls", derive(Clone))]
-pub struct Punctuated<T, P> {
-    inner: Vec<(T, Option<P>)>,
-}
-
-impl<T, P> Punctuated<T, P> {
-    /// Creates an empty punctuated sequence.
-    pub fn new() -> Punctuated<T, P> {
-        Punctuated { inner: Vec::new() }
-    }
-
-    /// Determines whether this punctuated sequence is empty, meaning it
-    /// contains no syntax tree nodes or punctuation.
-    pub fn is_empty(&self) -> bool {
-        self.inner.len() == 0
-    }
-
-    /// Returns the number of syntax tree nodes in this punctuated sequence.
-    ///
-    /// This is the number of nodes of type `T`, not counting the punctuation of
-    /// type `P`.
-    pub fn len(&self) -> usize {
-        self.inner.len()
-    }
-
-    /// Borrows the first punctuated pair in this sequence.
-    pub fn first(&self) -> Option<Pair<&T, &P>> {
-        self.inner.first().map(|&(ref t, ref d)| match *d {
-            Some(ref d) => Pair::Punctuated(t, d),
-            None => Pair::End(t),
-        })
-    }
-
-    /// Borrows the last punctuated pair in this sequence.
-    pub fn last(&self) -> Option<Pair<&T, &P>> {
-        self.inner.last().map(|&(ref t, ref d)| match *d {
-            Some(ref d) => Pair::Punctuated(t, d),
-            None => Pair::End(t),
-        })
-    }
-
-    /// Mutably borrows the last punctuated pair in this sequence.
-    pub fn last_mut(&mut self) -> Option<Pair<&mut T, &mut P>> {
-        self.inner
-            .last_mut()
-            .map(|&mut (ref mut t, ref mut d)| match *d {
-                Some(ref mut d) => Pair::Punctuated(t, d),
-                None => Pair::End(t),
-            })
-    }
-
-    /// Returns an iterator over borrowed syntax tree nodes of type `&T`.
-    pub fn iter(&self) -> Iter<T> {
-        Iter {
-            inner: Box::new(PrivateIter {
-                inner: self.inner.iter(),
-            }),
-        }
-    }
-
-    /// Returns an iterator over mutably borrowed syntax tree nodes of type
-    /// `&mut T`.
-    pub fn iter_mut(&mut self) -> IterMut<T> {
-        IterMut {
-            inner: Box::new(PrivateIterMut {
-                inner: self.inner.iter_mut(),
-            }),
-        }
-    }
-
-    /// Returns an iterator over the contents of this sequence as borrowed
-    /// punctuated pairs.
-    pub fn pairs(&self) -> Pairs<T, P> {
-        Pairs {
-            inner: self.inner.iter(),
-        }
-    }
-
-    /// Returns an iterator over the contents of this sequence as mutably
-    /// borrowed punctuated pairs.
-    pub fn pairs_mut(&mut self) -> PairsMut<T, P> {
-        PairsMut {
-            inner: self.inner.iter_mut(),
-        }
-    }
-
-    /// Returns an iterator over the contents of this sequence as owned
-    /// punctuated pairs.
-    pub fn into_pairs(self) -> IntoPairs<T, P> {
-        IntoPairs {
-            inner: self.inner.into_iter(),
-        }
-    }
-
-    /// Appends a syntax tree node onto the end of this punctuated sequence. The
-    /// sequence must previously have a trailing punctuation.
-    ///
-    /// Use [`push`] instead if the punctuated sequence may or may not already
-    /// have trailing punctuation.
-    ///
-    /// [`push`]: #method.push
-    ///
-    /// # Panics
-    ///
-    /// Panics if the sequence does not already have a trailing punctuation when
-    /// this method is called.
-    pub fn push_value(&mut self, value: T) {
-        assert!(self.empty_or_trailing());
-        self.inner.push((value, None));
-    }
-
-    /// Appends a trailing punctuation onto the end of this punctuated sequence.
-    /// The sequence must be non-empty and must not already have trailing
-    /// punctuation.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the sequence is empty or already has a trailing punctuation.
-    pub fn push_punct(&mut self, punctuation: P) {
-        assert!(!self.is_empty());
-        let last = self.inner.last_mut().unwrap();
-        assert!(last.1.is_none());
-        last.1 = Some(punctuation);
-    }
-
-    /// Removes the last punctuated pair from this sequence, or `None` if the
-    /// sequence is empty.
-    pub fn pop(&mut self) -> Option<Pair<T, P>> {
-        self.inner.pop().map(|(t, d)| Pair::new(t, d))
-    }
-
-    /// Determines whether this punctuated sequence ends with a trailing
-    /// punctuation.
-    pub fn trailing_punct(&self) -> bool {
-        self.inner
-            .last()
-            .map(|last| last.1.is_some())
-            .unwrap_or(false)
-    }
-
-    /// Returns true if either this `Punctuated` is empty, or it has a trailing
-    /// punctuation.
-    ///
-    /// Equivalent to `punctuated.is_empty() || punctuated.trailing_punct()`.
-    pub fn empty_or_trailing(&self) -> bool {
-        self.inner
-            .last()
-            .map(|last| last.1.is_some())
-            .unwrap_or(true)
-    }
-}
-
-impl<T, P> Punctuated<T, P>
-where
-    P: Default,
-{
-    /// Appends a syntax tree node onto the end of this punctuated sequence.
-    ///
-    /// If there is not a trailing punctuation in this sequence when this method
-    /// is called, the default value of punctuation type `P` is inserted before
-    /// the given value of type `T`.
-    pub fn push(&mut self, value: T) {
-        if !self.empty_or_trailing() {
-            self.push_punct(Default::default());
-        }
-        self.push_value(value);
-    }
-
-    /// Inserts an element at position `index`.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `index` is greater than the number of elements previously in
-    /// this punctuated sequence.
-    pub fn insert(&mut self, index: usize, value: T) {
-        assert!(index <= self.len());
-
-        if index == self.len() {
-            self.push(value);
-        } else {
-            self.inner.insert(index, (value, Some(Default::default())));
-        }
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl<T: Debug, P: Debug> Debug for Punctuated<T, P> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.inner.fmt(f)
-    }
-}
-
-impl<T, P> FromIterator<T> for Punctuated<T, P>
-where
-    P: Default,
-{
-    fn from_iter<I: IntoIterator<Item = T>>(i: I) -> Self {
-        let mut ret = Punctuated::new();
-        ret.extend(i);
-        ret
-    }
-}
-
-impl<T, P> Extend<T> for Punctuated<T, P>
-where
-    P: Default,
-{
-    fn extend<I: IntoIterator<Item = T>>(&mut self, i: I) {
-        for value in i {
-            self.push(value);
-        }
-    }
-}
-
-impl<T, P> FromIterator<Pair<T, P>> for Punctuated<T, P> {
-    fn from_iter<I: IntoIterator<Item = Pair<T, P>>>(i: I) -> Self {
-        let mut ret = Punctuated::new();
-        ret.extend(i);
-        ret
-    }
-}
-
-impl<T, P> Extend<Pair<T, P>> for Punctuated<T, P> {
-    fn extend<I: IntoIterator<Item = Pair<T, P>>>(&mut self, i: I) {
-        for pair in i {
-            match pair {
-                Pair::Punctuated(a, b) => self.inner.push((a, Some(b))),
-                Pair::End(a) => self.inner.push((a, None)),
-            }
-        }
-    }
-}
-
-impl<T, P> IntoIterator for Punctuated<T, P> {
-    type Item = T;
-    type IntoIter = IntoIter<T, P>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        IntoIter {
-            inner: self.inner.into_iter(),
-        }
-    }
-}
-
-impl<'a, T, P> IntoIterator for &'a Punctuated<T, P> {
-    type Item = &'a T;
-    type IntoIter = Iter<'a, T>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        Punctuated::iter(self)
-    }
-}
-
-impl<'a, T, P> IntoIterator for &'a mut Punctuated<T, P> {
-    type Item = &'a mut T;
-    type IntoIter = IterMut<'a, T>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        Punctuated::iter_mut(self)
-    }
-}
-
-impl<T, P> Default for Punctuated<T, P> {
-    fn default() -> Self {
-        Punctuated::new()
-    }
-}
-
-/// An iterator over borrowed pairs of type `Pair<&T, &P>`.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-pub struct Pairs<'a, T: 'a, P: 'a> {
-    inner: slice::Iter<'a, (T, Option<P>)>,
-}
-
-impl<'a, T, P> Iterator for Pairs<'a, T, P> {
-    type Item = Pair<&'a T, &'a P>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next().map(|pair| match pair.1 {
-            Some(ref p) => Pair::Punctuated(&pair.0, p),
-            None => Pair::End(&pair.0),
-        })
-    }
-}
-
-/// An iterator over mutably borrowed pairs of type `Pair<&mut T, &mut P>`.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-pub struct PairsMut<'a, T: 'a, P: 'a> {
-    inner: slice::IterMut<'a, (T, Option<P>)>,
-}
-
-impl<'a, T, P> Iterator for PairsMut<'a, T, P> {
-    type Item = Pair<&'a mut T, &'a mut P>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next().map(|pair| match pair.1 {
-            Some(ref mut p) => Pair::Punctuated(&mut pair.0, p),
-            None => Pair::End(&mut pair.0),
-        })
-    }
-}
-
-/// An iterator over owned pairs of type `Pair<T, P>`.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-pub struct IntoPairs<T, P> {
-    inner: vec::IntoIter<(T, Option<P>)>,
-}
-
-impl<T, P> Iterator for IntoPairs<T, P> {
-    type Item = Pair<T, P>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next().map(|pair| match pair.1 {
-            Some(p) => Pair::Punctuated(pair.0, p),
-            None => Pair::End(pair.0),
-        })
-    }
-}
-
-/// An iterator over owned values of type `T`.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-pub struct IntoIter<T, P> {
-    inner: vec::IntoIter<(T, Option<P>)>,
-}
-
-impl<T, P> Iterator for IntoIter<T, P> {
-    type Item = T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next().map(|pair| pair.0)
-    }
-}
-
-/// An iterator over borrowed values of type `&T`.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-pub struct Iter<'a, T: 'a> {
-    inner: Box<Iterator<Item = &'a T> + 'a>,
-}
-
-struct PrivateIter<'a, T: 'a, P: 'a> {
-    inner: slice::Iter<'a, (T, Option<P>)>,
-}
-
-#[cfg(any(feature = "full", feature = "derive"))]
-impl<'a, T> Iter<'a, T> {
-    // Not public API.
-    #[doc(hidden)]
-    pub fn private_empty() -> Self {
-        Iter {
-            inner: Box::new(iter::empty()),
-        }
-    }
-}
-
-impl<'a, T> Iterator for Iter<'a, T> {
-    type Item = &'a T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next()
-    }
-}
-
-impl<'a, T, P> Iterator for PrivateIter<'a, T, P> {
-    type Item = &'a T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next().map(|pair| &pair.0)
-    }
-}
-
-/// An iterator over mutably borrowed values of type `&mut T`.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-pub struct IterMut<'a, T: 'a> {
-    inner: Box<Iterator<Item = &'a mut T> + 'a>,
-}
-
-struct PrivateIterMut<'a, T: 'a, P: 'a> {
-    inner: slice::IterMut<'a, (T, Option<P>)>,
-}
-
-impl<'a, T> Iterator for IterMut<'a, T> {
-    type Item = &'a mut T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next()
-    }
-}
-
-impl<'a, T, P> Iterator for PrivateIterMut<'a, T, P> {
-    type Item = &'a mut T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next().map(|pair| &mut pair.0)
-    }
-}
-
-/// A single syntax tree node of type `T` followed by its trailing punctuation
-/// of type `P` if any.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-pub enum Pair<T, P> {
-    Punctuated(T, P),
-    End(T),
-}
-
-impl<T, P> Pair<T, P> {
-    /// Extracts the syntax tree node from this punctuated pair, discarding the
-    /// following punctuation.
-    pub fn into_value(self) -> T {
-        match self {
-            Pair::Punctuated(t, _) | Pair::End(t) => t,
-        }
-    }
-
-    /// Borrows the syntax tree node from this punctuated pair.
-    pub fn value(&self) -> &T {
-        match *self {
-            Pair::Punctuated(ref t, _) | Pair::End(ref t) => t,
-        }
-    }
-
-    /// Mutably borrows the syntax tree node from this punctuated pair.
-    pub fn value_mut(&mut self) -> &mut T {
-        match *self {
-            Pair::Punctuated(ref mut t, _) | Pair::End(ref mut t) => t,
-        }
-    }
-
-    /// Borrows the punctuation from this punctuated pair, unless this pair is
-    /// the final one and there is no trailing punctuation.
-    pub fn punct(&self) -> Option<&P> {
-        match *self {
-            Pair::Punctuated(_, ref d) => Some(d),
-            Pair::End(_) => None,
-        }
-    }
-
-    /// Creates a punctuated pair out of a syntax tree node and an optional
-    /// following punctuation.
-    pub fn new(t: T, d: Option<P>) -> Self {
-        match d {
-            Some(d) => Pair::Punctuated(t, d),
-            None => Pair::End(t),
-        }
-    }
-
-    /// Produces this punctuated pair as a tuple of syntax tree node and
-    /// optional following punctuation.
-    pub fn into_tuple(self) -> (T, Option<P>) {
-        match self {
-            Pair::Punctuated(t, d) => (t, Some(d)),
-            Pair::End(t) => (t, None),
-        }
-    }
-}
-
-impl<T, P> Index<usize> for Punctuated<T, P> {
-    type Output = T;
-
-    fn index(&self, index: usize) -> &Self::Output {
-        &self.inner[index].0
-    }
-}
-
-impl<T, P> IndexMut<usize> for Punctuated<T, P> {
-    fn index_mut(&mut self, index: usize) -> &mut Self::Output {
-        &mut self.inner[index].0
-    }
-}
-
-#[cfg(feature = "parsing")]
-impl<T, P> Punctuated<T, P>
-where
-    T: Synom,
-    P: Synom,
-{
-    /// Parse **zero or more** syntax tree nodes with punctuation in between and
-    /// **no trailing** punctuation.
-    pub fn parse_separated(input: Cursor) -> PResult<Self> {
-        Self::parse_separated_with(input, T::parse)
-    }
-
-    /// Parse **one or more** syntax tree nodes with punctuation in bewteen and
-    /// **no trailing** punctuation.
-    /// allowing trailing punctuation.
-    pub fn parse_separated_nonempty(input: Cursor) -> PResult<Self> {
-        Self::parse_separated_nonempty_with(input, T::parse)
-    }
-
-    /// Parse **zero or more** syntax tree nodes with punctuation in between and
-    /// **optional trailing** punctuation.
-    pub fn parse_terminated(input: Cursor) -> PResult<Self> {
-        Self::parse_terminated_with(input, T::parse)
-    }
-
-    /// Parse **one or more** syntax tree nodes with punctuation in between and
-    /// **optional trailing** punctuation.
-    pub fn parse_terminated_nonempty(input: Cursor) -> PResult<Self> {
-        Self::parse_terminated_nonempty_with(input, T::parse)
-    }
-}
-
-#[cfg(feature = "parsing")]
-impl<T, P> Punctuated<T, P>
-where
-    P: Synom,
-{
-    /// Parse **zero or more** syntax tree nodes using the given parser with
-    /// punctuation in between and **no trailing** punctuation.
-    pub fn parse_separated_with(
-        input: Cursor,
-        parse: fn(Cursor) -> PResult<T>,
-    ) -> PResult<Self> {
-        Self::parse(input, parse, false)
-    }
-
-    /// Parse **one or more** syntax tree nodes using the given parser with
-    /// punctuation in between and **no trailing** punctuation.
-    pub fn parse_separated_nonempty_with(
-        input: Cursor,
-        parse: fn(Cursor) -> PResult<T>,
-    ) -> PResult<Self> {
-        match Self::parse(input, parse, false) {
-            Ok((ref b, _)) if b.is_empty() => parse_error(),
-            other => other,
-        }
-    }
-
-    /// Parse **zero or more** syntax tree nodes using the given parser with
-    /// punctuation in between and **optional trailing** punctuation.
-    pub fn parse_terminated_with(
-        input: Cursor,
-        parse: fn(Cursor) -> PResult<T>,
-    ) -> PResult<Self> {
-        Self::parse(input, parse, true)
-    }
-
-    /// Parse **one or more** syntax tree nodes using the given parser with
-    /// punctuation in between and **optional trailing** punctuation.
-    pub fn parse_terminated_nonempty_with(
-        input: Cursor,
-        parse: fn(Cursor) -> PResult<T>,
-    ) -> PResult<Self> {
-        match Self::parse(input, parse, true) {
-            Ok((ref b, _)) if b.is_empty() => parse_error(),
-            other => other,
-        }
-    }
-
-    fn parse(
-        mut input: Cursor,
-        parse: fn(Cursor) -> PResult<T>,
-        terminated: bool,
-    ) -> PResult<Self> {
-        let mut res = Punctuated::new();
-
-        // get the first element
-        match parse(input) {
-            Err(_) => Ok((res, input)),
-            Ok((o, i)) => {
-                if i == input {
-                    return parse_error();
-                }
-                input = i;
-                res.push_value(o);
-
-                // get the separator first
-                while let Ok((s, i2)) = P::parse(input) {
-                    if i2 == input {
-                        break;
-                    }
-
-                    // get the element next
-                    if let Ok((o3, i3)) = parse(i2) {
-                        if i3 == i2 {
-                            break;
-                        }
-                        res.push_punct(s);
-                        res.push_value(o3);
-                        input = i3;
-                    } else {
-                        break;
-                    }
-                }
-                if terminated {
-                    if let Ok((sep, after)) = P::parse(input) {
-                        res.push_punct(sep);
-                        input = after;
-                    }
-                }
-                Ok((res, input))
-            }
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use quote::{ToTokens, Tokens};
-
-    impl<T, P> ToTokens for Punctuated<T, P>
-    where
-        T: ToTokens,
-        P: ToTokens,
-    {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append_all(self.pairs())
-        }
-    }
-
-    impl<T, P> ToTokens for Pair<T, P>
-    where
-        T: ToTokens,
-        P: ToTokens,
-    {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            match *self {
-                Pair::Punctuated(ref a, ref b) => {
-                    a.to_tokens(tokens);
-                    b.to_tokens(tokens);
-                }
-                Pair::End(ref a) => a.to_tokens(tokens),
-            }
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/spanned.rs b/third_party/rust/syn-0.13.1/src/spanned.rs
deleted file mode 100644
index 2f96581d9f25..000000000000
--- a/third_party/rust/syn-0.13.1/src/spanned.rs
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! A trait that can provide the `Span` of the complete contents of a syntax
-//! tree node.
-//!
-//! *This module is available if Syn is built with both the `"parsing"` and
-//! `"printing"` features.*
-//!
-//! # Example
-//!
-//! Suppose in a procedural macro we have a [`Type`] that we want to assert
-//! implements the [`Sync`] trait. Maybe this is the type of one of the fields
-//! of a struct for which we are deriving a trait implementation, and we need to
-//! be able to pass a reference to one of those fields across threads.
-//!
-//! [`Type`]: ../enum.Type.html
-//! [`Sync`]: https://doc.rust-lang.org/std/marker/trait.Sync.html
-//!
-//! If the field type does *not* implement `Sync` as required, we want the
-//! compiler to report an error pointing out exactly which type it was.
-//!
-//! The following macro code takes a variable `ty` of type `Type` and produces a
-//! static assertion that `Sync` is implemented for that type.
-//!
-//! ```
-//! #[macro_use]
-//! extern crate quote;
-//!
-//! extern crate syn;
-//! extern crate proc_macro;
-//! extern crate proc_macro2;
-//!
-//! use syn::Type;
-//! use syn::spanned::Spanned;
-//! use proc_macro::TokenStream;
-//! use proc_macro2::Span;
-//!
-//! # const IGNORE_TOKENS: &str = stringify! {
-//! #[proc_macro_derive(MyMacro)]
-//! # };
-//! pub fn my_macro(input: TokenStream) -> TokenStream {
-//!     # let ty = get_a_type();
-//!     /* ... */
-//!
-//!     let assert_sync = quote_spanned! {ty.span()=>
-//!         struct _AssertSync where #ty: Sync;
-//!     };
-//!
-//!     /* ... */
-//!     # input
-//! }
-//! #
-//! # fn get_a_type() -> Type {
-//! #     unimplemented!()
-//! # }
-//! #
-//! # fn main() {}
-//! ```
-//!
-//! By inserting this `assert_sync` fragment into the output code generated by
-//! our macro, the user's code will fail to compile if `ty` does not implement
-//! `Sync`. The errors they would see look like the following.
-//!
-//! ```text
-//! error[E0277]: the trait bound `*const i32: std::marker::Sync` is not satisfied
-//!   --> src/main.rs:10:21
-//!    |
-//! 10 |     bad_field: *const i32,
-//!    |                ^^^^^^^^^^ `*const i32` cannot be shared between threads safely
-//! ```
-//!
-//! In this technique, using the `Type`'s span for the error message makes the
-//! error appear in the correct place underlining the right type.
-
-use proc_macro2::{Span, TokenStream};
-use quote::{ToTokens, Tokens};
-
-/// A trait that can provide the `Span` of the complete contents of a syntax
-/// tree node.
-///
-/// This trait is automatically implemented for all types that implement
-/// [`ToTokens`] from the `quote` crate.
-///
-/// [`ToTokens`]: https://docs.rs/quote/0.4/quote/trait.ToTokens.html
-///
-/// See the [module documentation] for an example.
-///
-/// [module documentation]: index.html
-///
-/// *This trait is available if Syn is built with both the `"parsing"` and
-/// `"printing"` features.*
-pub trait Spanned {
-    /// Returns a `Span` covering the complete contents of this syntax tree
-    /// node, or [`Span::call_site()`] if this node is empty.
-    ///
-    /// [`Span::call_site()`]: https://docs.rs/proc-macro2/0.2/proc_macro2/struct.Span.html#method.call_site
-    fn span(&self) -> Span;
-}
-
-impl<T> Spanned for T
-where
-    T: ToTokens,
-{
-    #[cfg(procmacro2_semver_exempt)]
-    fn span(&self) -> Span {
-        let mut tokens = Tokens::new();
-        self.to_tokens(&mut tokens);
-        let token_stream = TokenStream::from(tokens);
-        let mut iter = token_stream.into_iter();
-        let mut span = match iter.next() {
-            Some(tt) => tt.span(),
-            None => {
-                return Span::call_site();
-            }
-        };
-        for tt in iter {
-            if let Some(joined) = span.join(tt.span()) {
-                span = joined;
-            }
-        }
-        span
-    }
-
-    #[cfg(not(procmacro2_semver_exempt))]
-    fn span(&self) -> Span {
-        let mut tokens = Tokens::new();
-        self.to_tokens(&mut tokens);
-        let token_stream = TokenStream::from(tokens);
-        let mut iter = token_stream.into_iter();
-
-        // We can't join spans without procmacro2_semver_exempt so just grab the
-        // first one.
-        match iter.next() {
-            Some(tt) => tt.span(),
-            None => Span::call_site(),
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/synom.rs b/third_party/rust/syn-0.13.1/src/synom.rs
deleted file mode 100644
index 935b7a8ea71d..000000000000
--- a/third_party/rust/syn-0.13.1/src/synom.rs
+++ /dev/null
@@ -1,263 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Parsing interface for parsing a token stream into a syntax tree node.
-//!
-//! Parsing in Syn is built on parser functions that take in a [`Cursor`] and
-//! produce a [`PResult<T>`] where `T` is some syntax tree node. `Cursor` is a
-//! cheaply copyable cursor over a range of tokens in a token stream, and
-//! `PResult` is a result that packages together a parsed syntax tree node `T`
-//! with a stream of remaining unparsed tokens after `T` represented as another
-//! `Cursor`, or a [`ParseError`] if parsing failed.
-//!
-//! [`Cursor`]: ../buffer/index.html
-//! [`PResult<T>`]: type.PResult.html
-//! [`ParseError`]: struct.ParseError.html
-//!
-//! This `Cursor`- and `PResult`-based interface is convenient for parser
-//! combinators and parser implementations, but not necessarily when you just
-//! have some tokens that you want to parse. For that we expose the following
-//! two entry points.
-//!
-//! ## The `syn::parse*` functions
-//!
-//! The [`syn::parse`], [`syn::parse2`], and [`syn::parse_str`] functions serve
-//! as an entry point for parsing syntax tree nodes that can be parsed in an
-//! obvious default way. These functions can return any syntax tree node that
-//! implements the [`Synom`] trait, which includes most types in Syn.
-//!
-//! [`syn::parse`]: ../fn.parse.html
-//! [`syn::parse2`]: ../fn.parse2.html
-//! [`syn::parse_str`]: ../fn.parse_str.html
-//! [`Synom`]: trait.Synom.html
-//!
-//! ```
-//! use syn::Type;
-//!
-//! # fn run_parser() -> Result<(), syn::synom::ParseError> {
-//! let t: Type = syn::parse_str("std::collections::HashMap<String, Value>")?;
-//! #     Ok(())
-//! # }
-//! #
-//! # fn main() {
-//! #     run_parser().unwrap();
-//! # }
-//! ```
-//!
-//! The [`parse_quote!`] macro also uses this approach.
-//!
-//! [`parse_quote!`]: ../macro.parse_quote.html
-//!
-//! ## The `Parser` trait
-//!
-//! Some types can be parsed in several ways depending on context. For example
-//! an [`Attribute`] can be either "outer" like `#[...]` or "inner" like
-//! `#![...]` and parsing the wrong one would be a bug. Similarly [`Punctuated`]
-//! may or may not allow trailing punctuation, and parsing it the wrong way
-//! would either reject valid input or accept invalid input.
-//!
-//! [`Attribute`]: ../struct.Attribute.html
-//! [`Punctuated`]: ../punctuated/index.html
-//!
-//! The `Synom` trait is not implemented in these cases because there is no good
-//! behavior to consider the default.
-//!
-//! ```ignore
-//! // Can't parse `Punctuated` without knowing whether trailing punctuation
-//! // should be allowed in this context.
-//! let path: Punctuated<PathSegment, Token![::]> = syn::parse(tokens)?;
-//! ```
-//!
-//! In these cases the types provide a choice of parser functions rather than a
-//! single `Synom` implementation, and those parser functions can be invoked
-//! through the [`Parser`] trait.
-//!
-//! [`Parser`]: trait.Parser.html
-//!
-//! ```
-//! # #[macro_use]
-//! # extern crate syn;
-//! #
-//! # extern crate proc_macro2;
-//! # use proc_macro2::TokenStream;
-//! #
-//! use syn::synom::Parser;
-//! use syn::punctuated::Punctuated;
-//! use syn::{PathSegment, Expr, Attribute};
-//!
-//! # fn run_parsers() -> Result<(), syn::synom::ParseError> {
-//! #     let tokens = TokenStream::empty().into();
-//! // Parse a nonempty sequence of path segments separated by `::` punctuation
-//! // with no trailing punctuation.
-//! let parser = Punctuated::<PathSegment, Token![::]>::parse_separated_nonempty;
-//! let path = parser.parse(tokens)?;
-//!
-//! #     let tokens = TokenStream::empty().into();
-//! // Parse a possibly empty sequence of expressions terminated by commas with
-//! // an optional trailing punctuation.
-//! let parser = Punctuated::<Expr, Token![,]>::parse_terminated;
-//! let args = parser.parse(tokens)?;
-//!
-//! #     let tokens = TokenStream::empty().into();
-//! // Parse zero or more outer attributes but not inner attributes.
-//! named!(outer_attrs -> Vec<Attribute>, many0!(Attribute::parse_outer));
-//! let attrs = outer_attrs.parse(tokens)?;
-//! #
-//! #     Ok(())
-//! # }
-//! #
-//! # fn main() {}
-//! ```
-//!
-//! # Implementing a parser function
-//!
-//! Parser functions are usually implemented using the [`nom`]-style parser
-//! combinator macros provided by Syn, but may also be implemented without
-//! macros be using the low-level [`Cursor`] API directly.
-//!
-//! [`nom`]: https://github.com/Geal/nom
-//!
-//! The following parser combinator macros are available and a `Synom` parsing
-//! example is provided for each one.
-//!
-//! - [`alt!`](../macro.alt.html)
-//! - [`braces!`](../macro.braces.html)
-//! - [`brackets!`](../macro.brackets.html)
-//! - [`call!`](../macro.call.html)
-//! - [`cond!`](../macro.cond.html)
-//! - [`cond_reduce!`](../macro.cond_reduce.html)
-//! - [`do_parse!`](../macro.do_parse.html)
-//! - [`epsilon!`](../macro.epsilon.html)
-//! - [`input_end!`](../macro.input_end.html)
-//! - [`keyword!`](../macro.keyword.html)
-//! - [`many0!`](../macro.many0.html)
-//! - [`map!`](../macro.map.html)
-//! - [`not!`](../macro.not.html)
-//! - [`option!`](../macro.option.html)
-//! - [`parens!`](../macro.parens.html)
-//! - [`punct!`](../macro.punct.html)
-//! - [`reject!`](../macro.reject.html)
-//! - [`switch!`](../macro.switch.html)
-//! - [`syn!`](../macro.syn.html)
-//! - [`tuple!`](../macro.tuple.html)
-//! - [`value!`](../macro.value.html)
-//!
-//! *This module is available if Syn is built with the `"parsing"` feature.*
-
-#[cfg(feature = "proc-macro")]
-use proc_macro;
-use proc_macro2;
-
-pub use error::{PResult, ParseError};
-
-use buffer::{Cursor, TokenBuffer};
-
-/// Parsing interface implemented by all types that can be parsed in a default
-/// way from a token stream.
-///
-/// Refer to the [module documentation] for details about parsing in Syn.
-///
-/// [module documentation]: index.html
-///
-/// *This trait is available if Syn is built with the `"parsing"` feature.*
-pub trait Synom: Sized {
-    fn parse(input: Cursor) -> PResult<Self>;
-
-    /// A short name of the type being parsed.
-    ///
-    /// The description should only be used for a simple name.  It should not
-    /// contain newlines or sentence-ending punctuation, to facilitate embedding in
-    /// larger user-facing strings.  Syn will use this description when building
-    /// error messages about parse failures.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use syn::buffer::Cursor;
-    /// # use syn::synom::{Synom, PResult};
-    /// #
-    /// struct ExprMacro {
-    ///     // ...
-    /// }
-    ///
-    /// impl Synom for ExprMacro {
-    /// #   fn parse(input: Cursor) -> PResult<Self> { unimplemented!() }
-    ///     // fn parse(...) -> ... { ... }
-    ///
-    ///     fn description() -> Option<&'static str> {
-    ///         // Will result in messages like
-    ///         //
-    ///         //     "failed to parse macro invocation expression: $reason"
-    ///         Some("macro invocation expression")
-    ///     }
-    /// }
-    /// ```
-    fn description() -> Option<&'static str> {
-        None
-    }
-}
-
-impl Synom for proc_macro2::TokenStream {
-    fn parse(input: Cursor) -> PResult<Self> {
-        Ok((input.token_stream(), Cursor::empty()))
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("arbitrary token stream")
-    }
-}
-
-/// Parser that can parse Rust tokens into a particular syntax tree node.
-///
-/// Refer to the [module documentation] for details about parsing in Syn.
-///
-/// [module documentation]: index.html
-///
-/// *This trait is available if Syn is built with the `"parsing"` feature.*
-pub trait Parser: Sized {
-    type Output;
-
-    /// Parse a proc-macro2 token stream into the chosen syntax tree node.
-    fn parse2(self, tokens: proc_macro2::TokenStream) -> Result<Self::Output, ParseError>;
-
-    /// Parse tokens of source code into the chosen syntax tree node.
-    #[cfg(feature = "proc-macro")]
-    fn parse(self, tokens: proc_macro::TokenStream) -> Result<Self::Output, ParseError> {
-        self.parse2(tokens.into())
-    }
-
-    /// Parse a string of Rust code into the chosen syntax tree node.
-    ///
-    /// # Hygiene
-    ///
-    /// Every span in the resulting syntax tree will be set to resolve at the
-    /// macro call site.
-    fn parse_str(self, s: &str) -> Result<Self::Output, ParseError> {
-        match s.parse() {
-            Ok(tts) => self.parse2(tts),
-            Err(_) => Err(ParseError::new("error while lexing input string")),
-        }
-    }
-}
-
-impl<F, T> Parser for F where F: FnOnce(Cursor) -> PResult<T> {
-    type Output = T;
-
-    fn parse2(self, tokens: proc_macro2::TokenStream) -> Result<T, ParseError> {
-        let buf = TokenBuffer::new2(tokens);
-        let (t, rest) = self(buf.begin())?;
-        if rest.eof() {
-            Ok(t)
-        } else if rest == buf.begin() {
-            // parsed nothing
-            Err(ParseError::new("failed to parse anything"))
-        } else {
-            Err(ParseError::new("failed to parse all tokens"))
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/token.rs b/third_party/rust/syn-0.13.1/src/token.rs
deleted file mode 100644
index 8079bc64fadd..000000000000
--- a/third_party/rust/syn-0.13.1/src/token.rs
+++ /dev/null
@@ -1,773 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Tokens representing Rust punctuation, keywords, and delimiters.
-//!
-//! The type names in this module can be difficult to keep straight, so we
-//! prefer to use the [`Token!`] macro instead. This is a type-macro that
-//! expands to the token type of the given token.
-//!
-//! [`Token!`]: ../macro.Token.html
-//!
-//! # Example
-//!
-//! The [`ItemStatic`] syntax tree node is defined like this.
-//!
-//! [`ItemStatic`]: ../struct.ItemStatic.html
-//!
-//! ```
-//! # #[macro_use]
-//! # extern crate syn;
-//! #
-//! # use syn::{Attribute, Visibility, Ident, Type, Expr};
-//! #
-//! pub struct ItemStatic {
-//!     pub attrs: Vec<Attribute>,
-//!     pub vis: Visibility,
-//!     pub static_token: Token![static],
-//!     pub mutability: Option<Token![mut]>,
-//!     pub ident: Ident,
-//!     pub colon_token: Token![:],
-//!     pub ty: Box<Type>,
-//!     pub eq_token: Token![=],
-//!     pub expr: Box<Expr>,
-//!     pub semi_token: Token![;],
-//! }
-//! #
-//! # fn main() {}
-//! ```
-//!
-//! # Parsing
-//!
-//! These tokens can be parsed using the [`Synom`] trait and the parser
-//! combinator macros [`punct!`], [`keyword!`], [`parens!`], [`braces!`], and
-//! [`brackets!`].
-//!
-//! [`Synom`]: ../synom/trait.Synom.html
-//! [`punct!`]: ../macro.punct.html
-//! [`keyword!`]: ../macro.keyword.html
-//! [`parens!`]: ../macro.parens.html
-//! [`braces!`]: ../macro.braces.html
-//! [`brackets!`]: ../macro.brackets.html
-//!
-//! ```
-//! #[macro_use]
-//! extern crate syn;
-//!
-//! use syn::synom::Synom;
-//! use syn::{Attribute, Visibility, Ident, Type, Expr};
-//! #
-//! # struct ItemStatic;
-//! # use syn::ItemStatic as SynItemStatic;
-//!
-//! // Parse the ItemStatic struct shown above.
-//! impl Synom for ItemStatic {
-//!     named!(parse -> Self, do_parse!(
-//! #       (ItemStatic)
-//! #   ));
-//! # }
-//! #
-//! # mod example {
-//! #   use super::*;
-//! #   use super::SynItemStatic as ItemStatic;
-//! #
-//! #   named!(parse -> ItemStatic, do_parse!(
-//!         attrs: many0!(Attribute::parse_outer) >>
-//!         vis: syn!(Visibility) >>
-//!         static_token: keyword!(static) >>
-//!         mutability: option!(keyword!(mut)) >>
-//!         ident: syn!(Ident) >>
-//!         colon_token: punct!(:) >>
-//!         ty: syn!(Type) >>
-//!         eq_token: punct!(=) >>
-//!         expr: syn!(Expr) >>
-//!         semi_token: punct!(;) >>
-//!         (ItemStatic {
-//!             attrs, vis, static_token, mutability, ident, colon_token,
-//!             ty: Box::new(ty), eq_token, expr: Box::new(expr), semi_token,
-//!         })
-//!     ));
-//! }
-//! #
-//! # fn main() {}
-//! ```
-
-use proc_macro2::Span;
-
-macro_rules! tokens {
-    (
-        punct: {
-            $($punct:tt pub struct $punct_name:ident/$len:tt #[$punct_doc:meta])*
-        }
-        delimiter: {
-            $($delimiter:tt pub struct $delimiter_name:ident #[$delimiter_doc:meta])*
-        }
-        keyword: {
-            $($keyword:tt pub struct $keyword_name:ident #[$keyword_doc:meta])*
-        }
-    ) => (
-        $(token_punct! { #[$punct_doc] $punct pub struct $punct_name/$len })*
-        $(token_delimiter! { #[$delimiter_doc] $delimiter pub struct $delimiter_name })*
-        $(token_keyword! { #[$keyword_doc] $keyword pub struct $keyword_name })*
-    )
-}
-
-macro_rules! token_punct {
-    (#[$doc:meta] $s:tt pub struct $name:ident/$len:tt) => {
-        #[cfg_attr(feature = "clone-impls", derive(Copy, Clone))]
-        #[$doc]
-        ///
-        /// Don't try to remember the name of this type -- use the [`Token!`]
-        /// macro instead.
-        ///
-        /// [`Token!`]: index.html
-        pub struct $name(pub [Span; $len]);
-
-        impl $name {
-            pub fn new(span: Span) -> Self {
-                $name([span; $len])
-            }
-        }
-
-        impl ::std::default::Default for $name {
-            fn default() -> Self {
-                $name([Span::call_site(); $len])
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::fmt::Debug for $name {
-            fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-                f.write_str(stringify!($name))
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::cmp::Eq for $name {}
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::cmp::PartialEq for $name {
-            fn eq(&self, _other: &$name) -> bool {
-                true
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::hash::Hash for $name {
-            fn hash<H>(&self, _state: &mut H)
-                where H: ::std::hash::Hasher
-            {}
-        }
-
-        #[cfg(feature = "printing")]
-        impl ::quote::ToTokens for $name {
-            fn to_tokens(&self, tokens: &mut ::quote::Tokens) {
-                printing::punct($s, &self.0, tokens);
-            }
-        }
-
-        #[cfg(feature = "parsing")]
-        impl ::Synom for $name {
-            fn parse(tokens: $crate::buffer::Cursor) -> $crate::synom::PResult<$name> {
-                parsing::punct($s, tokens, $name)
-            }
-
-            fn description() -> Option<&'static str> {
-                Some(concat!("`", $s, "`"))
-            }
-        }
-
-        impl From<Span> for $name {
-            fn from(span: Span) -> Self {
-                $name([span; $len])
-            }
-        }
-    }
-}
-
-macro_rules! token_keyword {
-    (#[$doc:meta] $s:tt pub struct $name:ident) => {
-        #[cfg_attr(feature = "clone-impls", derive(Copy, Clone))]
-        #[$doc]
-        ///
-        /// Don't try to remember the name of this type -- use the [`Token!`]
-        /// macro instead.
-        ///
-        /// [`Token!`]: index.html
-        pub struct $name(pub Span);
-
-        impl ::std::default::Default for $name {
-            fn default() -> Self {
-                $name(Span::call_site())
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::fmt::Debug for $name {
-            fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-                f.write_str(stringify!($name))
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::cmp::Eq for $name {}
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::cmp::PartialEq for $name {
-            fn eq(&self, _other: &$name) -> bool {
-                true
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::hash::Hash for $name {
-            fn hash<H>(&self, _state: &mut H)
-                where H: ::std::hash::Hasher
-            {}
-        }
-
-        #[cfg(feature = "printing")]
-        impl ::quote::ToTokens for $name {
-            fn to_tokens(&self, tokens: &mut ::quote::Tokens) {
-                printing::keyword($s, &self.0, tokens);
-            }
-        }
-
-        #[cfg(feature = "parsing")]
-        impl ::Synom for $name {
-            fn parse(tokens: $crate::buffer::Cursor) -> $crate::synom::PResult<$name> {
-                parsing::keyword($s, tokens, $name)
-            }
-
-            fn description() -> Option<&'static str> {
-                Some(concat!("`", $s, "`"))
-            }
-        }
-
-        impl From<Span> for $name {
-            fn from(span: Span) -> Self {
-                $name(span)
-            }
-        }
-    }
-}
-
-macro_rules! token_delimiter {
-    (#[$doc:meta] $s:tt pub struct $name:ident) => {
-        #[cfg_attr(feature = "clone-impls", derive(Copy, Clone))]
-        #[$doc]
-        pub struct $name(pub Span);
-
-        impl ::std::default::Default for $name {
-            fn default() -> Self {
-                $name(Span::call_site())
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::fmt::Debug for $name {
-            fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-                f.write_str(stringify!($name))
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::cmp::Eq for $name {}
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::cmp::PartialEq for $name {
-            fn eq(&self, _other: &$name) -> bool {
-                true
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::hash::Hash for $name {
-            fn hash<H>(&self, _state: &mut H)
-                where H: ::std::hash::Hasher
-            {}
-        }
-
-        impl $name {
-            #[cfg(feature = "printing")]
-            pub fn surround<F>(&self,
-                               tokens: &mut ::quote::Tokens,
-                               f: F)
-                where F: FnOnce(&mut ::quote::Tokens)
-            {
-                printing::delim($s, &self.0, tokens, f);
-            }
-
-            #[cfg(feature = "parsing")]
-            pub fn parse<F, R>(tokens: $crate::buffer::Cursor, f: F) -> $crate::synom::PResult<($name, R)>
-                where F: FnOnce($crate::buffer::Cursor) -> $crate::synom::PResult<R>
-            {
-                parsing::delim($s, tokens, $name, f)
-            }
-        }
-
-        impl From<Span> for $name {
-            fn from(span: Span) -> Self {
-                $name(span)
-            }
-        }
-    }
-}
-
-tokens! {
-    punct: {
-        "+"        pub struct Add/1        /// `+`
-        "+="       pub struct AddEq/2      /// `+=`
-        "&"        pub struct And/1        /// `&`
-        "&&"       pub struct AndAnd/2     /// `&&`
-        "&="       pub struct AndEq/2      /// `&=`
-        "@"        pub struct At/1         /// `@`
-        "!"        pub struct Bang/1       /// `!`
-        "^"        pub struct Caret/1      /// `^`
-        "^="       pub struct CaretEq/2    /// `^=`
-        ":"        pub struct Colon/1      /// `:`
-        "::"       pub struct Colon2/2     /// `::`
-        ","        pub struct Comma/1      /// `,`
-        "/"        pub struct Div/1        /// `/`
-        "/="       pub struct DivEq/2      /// `/=`
-        "."        pub struct Dot/1        /// `.`
-        ".."       pub struct Dot2/2       /// `..`
-        "..."      pub struct Dot3/3       /// `...`
-        "..="      pub struct DotDotEq/3   /// `..=`
-        "="        pub struct Eq/1         /// `=`
-        "=="       pub struct EqEq/2       /// `==`
-        ">="       pub struct Ge/2         /// `>=`
-        ">"        pub struct Gt/1         /// `>`
-        "<="       pub struct Le/2         /// `<=`
-        "<"        pub struct Lt/1         /// `<`
-        "*="       pub struct MulEq/2      /// `*=`
-        "!="       pub struct Ne/2         /// `!=`
-        "|"        pub struct Or/1         /// `|`
-        "|="       pub struct OrEq/2       /// `|=`
-        "||"       pub struct OrOr/2       /// `||`
-        "#"        pub struct Pound/1      /// `#`
-        "?"        pub struct Question/1   /// `?`
-        "->"       pub struct RArrow/2     /// `->`
-        "<-"       pub struct LArrow/2     /// `<-`
-        "%"        pub struct Rem/1        /// `%`
-        "%="       pub struct RemEq/2      /// `%=`
-        "=>"       pub struct FatArrow/2   /// `=>`
-        ";"        pub struct Semi/1       /// `;`
-        "<<"       pub struct Shl/2        /// `<<`
-        "<<="      pub struct ShlEq/3      /// `<<=`
-        ">>"       pub struct Shr/2        /// `>>`
-        ">>="      pub struct ShrEq/3      /// `>>=`
-        "*"        pub struct Star/1       /// `*`
-        "-"        pub struct Sub/1        /// `-`
-        "-="       pub struct SubEq/2      /// `-=`
-        "_"        pub struct Underscore/1 /// `_`
-    }
-    delimiter: {
-        "{"        pub struct Brace        /// `{...}`
-        "["        pub struct Bracket      /// `[...]`
-        "("        pub struct Paren        /// `(...)`
-        " "        pub struct Group        /// None-delimited group
-    }
-    keyword: {
-        "as"       pub struct As           /// `as`
-        "auto"     pub struct Auto         /// `auto`
-        "box"      pub struct Box          /// `box`
-        "break"    pub struct Break        /// `break`
-        "Self"     pub struct CapSelf      /// `Self`
-        "catch"    pub struct Catch        /// `catch`
-        "const"    pub struct Const        /// `const`
-        "continue" pub struct Continue     /// `continue`
-        "crate"    pub struct Crate        /// `crate`
-        "default"  pub struct Default      /// `default`
-        "do"       pub struct Do           /// `do`
-        "dyn"      pub struct Dyn          /// `dyn`
-        "else"     pub struct Else         /// `else`
-        "enum"     pub struct Enum         /// `enum`
-        "extern"   pub struct Extern       /// `extern`
-        "fn"       pub struct Fn           /// `fn`
-        "for"      pub struct For          /// `for`
-        "if"       pub struct If           /// `if`
-        "impl"     pub struct Impl         /// `impl`
-        "in"       pub struct In           /// `in`
-        "let"      pub struct Let          /// `let`
-        "loop"     pub struct Loop         /// `loop`
-        "macro"    pub struct Macro        /// `macro`
-        "match"    pub struct Match        /// `match`
-        "mod"      pub struct Mod          /// `mod`
-        "move"     pub struct Move         /// `move`
-        "mut"      pub struct Mut          /// `mut`
-        "pub"      pub struct Pub          /// `pub`
-        "ref"      pub struct Ref          /// `ref`
-        "return"   pub struct Return       /// `return`
-        "self"     pub struct Self_        /// `self`
-        "static"   pub struct Static       /// `static`
-        "struct"   pub struct Struct       /// `struct`
-        "super"    pub struct Super        /// `super`
-        "trait"    pub struct Trait        /// `trait`
-        "type"     pub struct Type         /// `type`
-        "union"    pub struct Union        /// `union`
-        "unsafe"   pub struct Unsafe       /// `unsafe`
-        "use"      pub struct Use          /// `use`
-        "where"    pub struct Where        /// `where`
-        "while"    pub struct While        /// `while`
-        "yield"    pub struct Yield        /// `yield`
-    }
-}
-
-/// A type-macro that expands to the name of the Rust type representation of a
-/// given token.
-///
-/// See the [token module] documentation for details and examples.
-///
-/// [token module]: token/index.html
-// Unfortunate duplication due to a rustdoc bug.
-// https://github.com/rust-lang/rust/issues/45939
-#[macro_export]
-macro_rules! Token {
-    (+)        => { $crate::token::Add };
-    (+=)       => { $crate::token::AddEq };
-    (&)        => { $crate::token::And };
-    (&&)       => { $crate::token::AndAnd };
-    (&=)       => { $crate::token::AndEq };
-    (@)        => { $crate::token::At };
-    (!)        => { $crate::token::Bang };
-    (^)        => { $crate::token::Caret };
-    (^=)       => { $crate::token::CaretEq };
-    (:)        => { $crate::token::Colon };
-    (::)       => { $crate::token::Colon2 };
-    (,)        => { $crate::token::Comma };
-    (/)        => { $crate::token::Div };
-    (/=)       => { $crate::token::DivEq };
-    (.)        => { $crate::token::Dot };
-    (..)       => { $crate::token::Dot2 };
-    (...)      => { $crate::token::Dot3 };
-    (..=)      => { $crate::token::DotDotEq };
-    (=)        => { $crate::token::Eq };
-    (==)       => { $crate::token::EqEq };
-    (>=)       => { $crate::token::Ge };
-    (>)        => { $crate::token::Gt };
-    (<=)       => { $crate::token::Le };
-    (<)        => { $crate::token::Lt };
-    (*=)       => { $crate::token::MulEq };
-    (!=)       => { $crate::token::Ne };
-    (|)        => { $crate::token::Or };
-    (|=)       => { $crate::token::OrEq };
-    (||)       => { $crate::token::OrOr };
-    (#)        => { $crate::token::Pound };
-    (?)        => { $crate::token::Question };
-    (->)       => { $crate::token::RArrow };
-    (<-)       => { $crate::token::LArrow };
-    (%)        => { $crate::token::Rem };
-    (%=)       => { $crate::token::RemEq };
-    (=>)       => { $crate::token::FatArrow };
-    (;)        => { $crate::token::Semi };
-    (<<)       => { $crate::token::Shl };
-    (<<=)      => { $crate::token::ShlEq };
-    (>>)       => { $crate::token::Shr };
-    (>>=)      => { $crate::token::ShrEq };
-    (*)        => { $crate::token::Star };
-    (-)        => { $crate::token::Sub };
-    (-=)       => { $crate::token::SubEq };
-    (_)        => { $crate::token::Underscore };
-    (as)       => { $crate::token::As };
-    (auto)     => { $crate::token::Auto };
-    (box)      => { $crate::token::Box };
-    (break)    => { $crate::token::Break };
-    (Self)     => { $crate::token::CapSelf };
-    (catch)    => { $crate::token::Catch };
-    (const)    => { $crate::token::Const };
-    (continue) => { $crate::token::Continue };
-    (crate)    => { $crate::token::Crate };
-    (default)  => { $crate::token::Default };
-    (do)       => { $crate::token::Do };
-    (dyn)      => { $crate::token::Dyn };
-    (else)     => { $crate::token::Else };
-    (enum)     => { $crate::token::Enum };
-    (extern)   => { $crate::token::Extern };
-    (fn)       => { $crate::token::Fn };
-    (for)      => { $crate::token::For };
-    (if)       => { $crate::token::If };
-    (impl)     => { $crate::token::Impl };
-    (in)       => { $crate::token::In };
-    (let)      => { $crate::token::Let };
-    (loop)     => { $crate::token::Loop };
-    (macro)    => { $crate::token::Macro };
-    (match)    => { $crate::token::Match };
-    (mod)      => { $crate::token::Mod };
-    (move)     => { $crate::token::Move };
-    (mut)      => { $crate::token::Mut };
-    (pub)      => { $crate::token::Pub };
-    (ref)      => { $crate::token::Ref };
-    (return)   => { $crate::token::Return };
-    (self)     => { $crate::token::Self_ };
-    (static)   => { $crate::token::Static };
-    (struct)   => { $crate::token::Struct };
-    (super)    => { $crate::token::Super };
-    (trait)    => { $crate::token::Trait };
-    (type)     => { $crate::token::Type };
-    (union)    => { $crate::token::Union };
-    (unsafe)   => { $crate::token::Unsafe };
-    (use)      => { $crate::token::Use };
-    (where)    => { $crate::token::Where };
-    (while)    => { $crate::token::While };
-    (yield)    => { $crate::token::Yield };
-}
-
-/// Parse a single Rust punctuation token.
-///
-/// See the [token module] documentation for details and examples.
-///
-/// [token module]: token/index.html
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[cfg(feature = "parsing")]
-#[macro_export]
-macro_rules! punct {
-    ($i:expr, +)   => { call!($i, <$crate::token::Add as $crate::synom::Synom>::parse) };
-    ($i:expr, +=)  => { call!($i, <$crate::token::AddEq as $crate::synom::Synom>::parse) };
-    ($i:expr, &)   => { call!($i, <$crate::token::And as $crate::synom::Synom>::parse) };
-    ($i:expr, &&)  => { call!($i, <$crate::token::AndAnd as $crate::synom::Synom>::parse) };
-    ($i:expr, &=)  => { call!($i, <$crate::token::AndEq as $crate::synom::Synom>::parse) };
-    ($i:expr, @)   => { call!($i, <$crate::token::At as $crate::synom::Synom>::parse) };
-    ($i:expr, !)   => { call!($i, <$crate::token::Bang as $crate::synom::Synom>::parse) };
-    ($i:expr, ^)   => { call!($i, <$crate::token::Caret as $crate::synom::Synom>::parse) };
-    ($i:expr, ^=)  => { call!($i, <$crate::token::CaretEq as $crate::synom::Synom>::parse) };
-    ($i:expr, :)   => { call!($i, <$crate::token::Colon as $crate::synom::Synom>::parse) };
-    ($i:expr, ::)  => { call!($i, <$crate::token::Colon2 as $crate::synom::Synom>::parse) };
-    ($i:expr, ,)   => { call!($i, <$crate::token::Comma as $crate::synom::Synom>::parse) };
-    ($i:expr, /)   => { call!($i, <$crate::token::Div as $crate::synom::Synom>::parse) };
-    ($i:expr, /=)  => { call!($i, <$crate::token::DivEq as $crate::synom::Synom>::parse) };
-    ($i:expr, .)   => { call!($i, <$crate::token::Dot as $crate::synom::Synom>::parse) };
-    ($i:expr, ..)  => { call!($i, <$crate::token::Dot2 as $crate::synom::Synom>::parse) };
-    ($i:expr, ...) => { call!($i, <$crate::token::Dot3 as $crate::synom::Synom>::parse) };
-    ($i:expr, ..=) => { call!($i, <$crate::token::DotDotEq as $crate::synom::Synom>::parse) };
-    ($i:expr, =)   => { call!($i, <$crate::token::Eq as $crate::synom::Synom>::parse) };
-    ($i:expr, ==)  => { call!($i, <$crate::token::EqEq as $crate::synom::Synom>::parse) };
-    ($i:expr, >=)  => { call!($i, <$crate::token::Ge as $crate::synom::Synom>::parse) };
-    ($i:expr, >)   => { call!($i, <$crate::token::Gt as $crate::synom::Synom>::parse) };
-    ($i:expr, <=)  => { call!($i, <$crate::token::Le as $crate::synom::Synom>::parse) };
-    ($i:expr, <)   => { call!($i, <$crate::token::Lt as $crate::synom::Synom>::parse) };
-    ($i:expr, *=)  => { call!($i, <$crate::token::MulEq as $crate::synom::Synom>::parse) };
-    ($i:expr, !=)  => { call!($i, <$crate::token::Ne as $crate::synom::Synom>::parse) };
-    ($i:expr, |)   => { call!($i, <$crate::token::Or as $crate::synom::Synom>::parse) };
-    ($i:expr, |=)  => { call!($i, <$crate::token::OrEq as $crate::synom::Synom>::parse) };
-    ($i:expr, ||)  => { call!($i, <$crate::token::OrOr as $crate::synom::Synom>::parse) };
-    ($i:expr, #)   => { call!($i, <$crate::token::Pound as $crate::synom::Synom>::parse) };
-    ($i:expr, ?)   => { call!($i, <$crate::token::Question as $crate::synom::Synom>::parse) };
-    ($i:expr, ->)  => { call!($i, <$crate::token::RArrow as $crate::synom::Synom>::parse) };
-    ($i:expr, <-)  => { call!($i, <$crate::token::LArrow as $crate::synom::Synom>::parse) };
-    ($i:expr, %)   => { call!($i, <$crate::token::Rem as $crate::synom::Synom>::parse) };
-    ($i:expr, %=)  => { call!($i, <$crate::token::RemEq as $crate::synom::Synom>::parse) };
-    ($i:expr, =>)  => { call!($i, <$crate::token::FatArrow as $crate::synom::Synom>::parse) };
-    ($i:expr, ;)   => { call!($i, <$crate::token::Semi as $crate::synom::Synom>::parse) };
-    ($i:expr, <<)  => { call!($i, <$crate::token::Shl as $crate::synom::Synom>::parse) };
-    ($i:expr, <<=) => { call!($i, <$crate::token::ShlEq as $crate::synom::Synom>::parse) };
-    ($i:expr, >>)  => { call!($i, <$crate::token::Shr as $crate::synom::Synom>::parse) };
-    ($i:expr, >>=) => { call!($i, <$crate::token::ShrEq as $crate::synom::Synom>::parse) };
-    ($i:expr, *)   => { call!($i, <$crate::token::Star as $crate::synom::Synom>::parse) };
-    ($i:expr, -)   => { call!($i, <$crate::token::Sub as $crate::synom::Synom>::parse) };
-    ($i:expr, -=)  => { call!($i, <$crate::token::SubEq as $crate::synom::Synom>::parse) };
-    ($i:expr, _)   => { call!($i, <$crate::token::Underscore as $crate::synom::Synom>::parse) };
-}
-
-/// Parse a single Rust keyword token.
-///
-/// See the [token module] documentation for details and examples.
-///
-/// [token module]: token/index.html
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[cfg(feature = "parsing")]
-#[macro_export]
-macro_rules! keyword {
-    ($i:expr, as)       => { call!($i, <$crate::token::As as $crate::synom::Synom>::parse) };
-    ($i:expr, auto)     => { call!($i, <$crate::token::Auto as $crate::synom::Synom>::parse) };
-    ($i:expr, box)      => { call!($i, <$crate::token::Box as $crate::synom::Synom>::parse) };
-    ($i:expr, break)    => { call!($i, <$crate::token::Break as $crate::synom::Synom>::parse) };
-    ($i:expr, Self)     => { call!($i, <$crate::token::CapSelf as $crate::synom::Synom>::parse) };
-    ($i:expr, catch)    => { call!($i, <$crate::token::Catch as $crate::synom::Synom>::parse) };
-    ($i:expr, const)    => { call!($i, <$crate::token::Const as $crate::synom::Synom>::parse) };
-    ($i:expr, continue) => { call!($i, <$crate::token::Continue as $crate::synom::Synom>::parse) };
-    ($i:expr, crate)    => { call!($i, <$crate::token::Crate as $crate::synom::Synom>::parse) };
-    ($i:expr, default)  => { call!($i, <$crate::token::Default as $crate::synom::Synom>::parse) };
-    ($i:expr, do)       => { call!($i, <$crate::token::Do as $crate::synom::Synom>::parse) };
-    ($i:expr, dyn)      => { call!($i, <$crate::token::Dyn as $crate::synom::Synom>::parse) };
-    ($i:expr, else)     => { call!($i, <$crate::token::Else as $crate::synom::Synom>::parse) };
-    ($i:expr, enum)     => { call!($i, <$crate::token::Enum as $crate::synom::Synom>::parse) };
-    ($i:expr, extern)   => { call!($i, <$crate::token::Extern as $crate::synom::Synom>::parse) };
-    ($i:expr, fn)       => { call!($i, <$crate::token::Fn as $crate::synom::Synom>::parse) };
-    ($i:expr, for)      => { call!($i, <$crate::token::For as $crate::synom::Synom>::parse) };
-    ($i:expr, if)       => { call!($i, <$crate::token::If as $crate::synom::Synom>::parse) };
-    ($i:expr, impl)     => { call!($i, <$crate::token::Impl as $crate::synom::Synom>::parse) };
-    ($i:expr, in)       => { call!($i, <$crate::token::In as $crate::synom::Synom>::parse) };
-    ($i:expr, let)      => { call!($i, <$crate::token::Let as $crate::synom::Synom>::parse) };
-    ($i:expr, loop)     => { call!($i, <$crate::token::Loop as $crate::synom::Synom>::parse) };
-    ($i:expr, macro)    => { call!($i, <$crate::token::Macro as $crate::synom::Synom>::parse) };
-    ($i:expr, match)    => { call!($i, <$crate::token::Match as $crate::synom::Synom>::parse) };
-    ($i:expr, mod)      => { call!($i, <$crate::token::Mod as $crate::synom::Synom>::parse) };
-    ($i:expr, move)     => { call!($i, <$crate::token::Move as $crate::synom::Synom>::parse) };
-    ($i:expr, mut)      => { call!($i, <$crate::token::Mut as $crate::synom::Synom>::parse) };
-    ($i:expr, pub)      => { call!($i, <$crate::token::Pub as $crate::synom::Synom>::parse) };
-    ($i:expr, ref)      => { call!($i, <$crate::token::Ref as $crate::synom::Synom>::parse) };
-    ($i:expr, return)   => { call!($i, <$crate::token::Return as $crate::synom::Synom>::parse) };
-    ($i:expr, self)     => { call!($i, <$crate::token::Self_ as $crate::synom::Synom>::parse) };
-    ($i:expr, static)   => { call!($i, <$crate::token::Static as $crate::synom::Synom>::parse) };
-    ($i:expr, struct)   => { call!($i, <$crate::token::Struct as $crate::synom::Synom>::parse) };
-    ($i:expr, super)    => { call!($i, <$crate::token::Super as $crate::synom::Synom>::parse) };
-    ($i:expr, trait)    => { call!($i, <$crate::token::Trait as $crate::synom::Synom>::parse) };
-    ($i:expr, type)     => { call!($i, <$crate::token::Type as $crate::synom::Synom>::parse) };
-    ($i:expr, union)    => { call!($i, <$crate::token::Union as $crate::synom::Synom>::parse) };
-    ($i:expr, unsafe)   => { call!($i, <$crate::token::Unsafe as $crate::synom::Synom>::parse) };
-    ($i:expr, use)      => { call!($i, <$crate::token::Use as $crate::synom::Synom>::parse) };
-    ($i:expr, where)    => { call!($i, <$crate::token::Where as $crate::synom::Synom>::parse) };
-    ($i:expr, while)    => { call!($i, <$crate::token::While as $crate::synom::Synom>::parse) };
-    ($i:expr, yield)    => { call!($i, <$crate::token::Yield as $crate::synom::Synom>::parse) };
-}
-
-#[cfg(feature = "parsing")]
-mod parsing {
-    use proc_macro2::{Delimiter, Spacing, Span};
-
-    use buffer::Cursor;
-    use parse_error;
-    use synom::PResult;
-
-    pub trait FromSpans: Sized {
-        fn from_spans(spans: &[Span]) -> Self;
-    }
-
-    impl FromSpans for [Span; 1] {
-        fn from_spans(spans: &[Span]) -> Self {
-            [spans[0]]
-        }
-    }
-
-    impl FromSpans for [Span; 2] {
-        fn from_spans(spans: &[Span]) -> Self {
-            [spans[0], spans[1]]
-        }
-    }
-
-    impl FromSpans for [Span; 3] {
-        fn from_spans(spans: &[Span]) -> Self {
-            [spans[0], spans[1], spans[2]]
-        }
-    }
-
-    pub fn punct<'a, T, R>(s: &str, mut tokens: Cursor<'a>, new: fn(T) -> R) -> PResult<'a, R>
-    where
-        T: FromSpans,
-    {
-        let mut spans = [Span::call_site(); 3];
-        assert!(s.len() <= spans.len());
-        let chars = s.chars();
-
-        for (i, (ch, slot)) in chars.zip(&mut spans).enumerate() {
-            match tokens.op() {
-                Some((op, rest)) if op.op() == ch => {
-                    if i != s.len() - 1 {
-                        match op.spacing() {
-                            Spacing::Joint => {}
-                            _ => return parse_error(),
-                        }
-                    }
-                    *slot = op.span();
-                    tokens = rest;
-                }
-                _ => return parse_error(),
-            }
-        }
-        Ok((new(T::from_spans(&spans)), tokens))
-    }
-
-    pub fn keyword<'a, T>(keyword: &str, tokens: Cursor<'a>, new: fn(Span) -> T) -> PResult<'a, T> {
-        if let Some((term, rest)) = tokens.term() {
-            if term.as_str() == keyword {
-                return Ok((new(term.span()), rest));
-            }
-        }
-        parse_error()
-    }
-
-    pub fn delim<'a, F, R, T>(
-        delim: &str,
-        tokens: Cursor<'a>,
-        new: fn(Span) -> T,
-        f: F,
-    ) -> PResult<'a, (T, R)>
-    where
-        F: FnOnce(Cursor) -> PResult<R>,
-    {
-        // NOTE: We should support none-delimited sequences here.
-        let delim = match delim {
-            "(" => Delimiter::Parenthesis,
-            "{" => Delimiter::Brace,
-            "[" => Delimiter::Bracket,
-            " " => Delimiter::None,
-            _ => panic!("unknown delimiter: {}", delim),
-        };
-
-        if let Some((inside, span, rest)) = tokens.group(delim) {
-            match f(inside) {
-                Ok((ret, remaining)) => {
-                    if remaining.eof() {
-                        return Ok(((new(span), ret), rest));
-                    }
-                }
-                Err(err) => return Err(err),
-            }
-        }
-        parse_error()
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use proc_macro2::{Delimiter, Spacing, Span, Term, Op, Group};
-    use quote::Tokens;
-
-    pub fn punct(s: &str, spans: &[Span], tokens: &mut Tokens) {
-        assert_eq!(s.len(), spans.len());
-
-        let mut chars = s.chars();
-        let mut spans = spans.iter();
-        let ch = chars.next_back().unwrap();
-        let span = spans.next_back().unwrap();
-        for (ch, span) in chars.zip(spans) {
-            let mut op = Op::new(ch, Spacing::Joint);
-            op.set_span(*span);
-            tokens.append(op);
-        }
-
-        let mut op = Op::new(ch, Spacing::Alone);
-        op.set_span(*span);
-        tokens.append(op);
-    }
-
-    pub fn keyword(s: &str, span: &Span, tokens: &mut Tokens) {
-        tokens.append(Term::new(s, *span));
-    }
-
-    pub fn delim<F>(s: &str, span: &Span, tokens: &mut Tokens, f: F)
-    where
-        F: FnOnce(&mut Tokens),
-    {
-        let delim = match s {
-            "(" => Delimiter::Parenthesis,
-            "[" => Delimiter::Bracket,
-            "{" => Delimiter::Brace,
-            " " => Delimiter::None,
-            _ => panic!("unknown delimiter: {}", s),
-        };
-        let mut inner = Tokens::new();
-        f(&mut inner);
-        let mut g = Group::new(delim, inner.into());
-        g.set_span(*span);
-        tokens.append(g);
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/tt.rs b/third_party/rust/syn-0.13.1/src/tt.rs
deleted file mode 100644
index 5fb95bafa338..000000000000
--- a/third_party/rust/syn-0.13.1/src/tt.rs
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[cfg(feature = "parsing")]
-use buffer::Cursor;
-#[cfg(feature = "parsing")]
-use synom::PResult;
-#[cfg(feature = "parsing")]
-use token::{Brace, Bracket, Paren};
-#[cfg(feature = "parsing")]
-use {parse_error, MacroDelimiter};
-
-#[cfg(feature = "extra-traits")]
-use std::hash::{Hash, Hasher};
-
-#[cfg(any(feature = "parsing", feature = "extra-traits"))]
-use proc_macro2::{Delimiter, TokenStream, TokenTree};
-
-#[cfg(feature = "parsing")]
-pub fn delimited(input: Cursor) -> PResult<(MacroDelimiter, TokenStream)> {
-    if let Some((TokenTree::Group(g), rest)) = input.token_tree() {
-        let span = g.span();
-        let delimiter = match g.delimiter() {
-            Delimiter::Parenthesis => MacroDelimiter::Paren(Paren(span)),
-            Delimiter::Brace => MacroDelimiter::Brace(Brace(span)),
-            Delimiter::Bracket => MacroDelimiter::Bracket(Bracket(span)),
-            Delimiter::None => return parse_error(),
-        };
-
-        return Ok(((delimiter, g.stream().clone()), rest))
-    }
-    parse_error()
-}
-
-#[cfg(all(feature = "full", feature = "parsing"))]
-pub fn braced(input: Cursor) -> PResult<(Brace, TokenStream)> {
-    if let Some((TokenTree::Group(g), rest)) = input.token_tree() {
-        if g.delimiter() == Delimiter::Brace {
-            return Ok(((Brace(g.span()), g.stream().clone()), rest))
-        }
-    }
-    parse_error()
-}
-
-#[cfg(all(feature = "full", feature = "parsing"))]
-pub fn parenthesized(input: Cursor) -> PResult<(Paren, TokenStream)> {
-    if let Some((TokenTree::Group(g), rest)) = input.token_tree() {
-        if g.delimiter() == Delimiter::Parenthesis {
-            return Ok(((Paren(g.span()), g.stream().clone()), rest))
-        }
-    }
-    parse_error()
-}
-
-#[cfg(feature = "extra-traits")]
-pub struct TokenTreeHelper<'a>(pub &'a TokenTree);
-
-#[cfg(feature = "extra-traits")]
-impl<'a> PartialEq for TokenTreeHelper<'a> {
-    fn eq(&self, other: &Self) -> bool {
-        use proc_macro2::Spacing;
-
-        match (self.0, other.0) {
-            (&TokenTree::Group(ref g1), &TokenTree::Group(ref g2)) => {
-                match (g1.delimiter(), g2.delimiter()) {
-                    (Delimiter::Parenthesis, Delimiter::Parenthesis)
-                    | (Delimiter::Brace, Delimiter::Brace)
-                    | (Delimiter::Bracket, Delimiter::Bracket)
-                    | (Delimiter::None, Delimiter::None) => {}
-                    _ => return false,
-                }
-
-                let s1 = g1.stream().clone().into_iter();
-                let mut s2 = g2.stream().clone().into_iter();
-
-                for item1 in s1 {
-                    let item2 = match s2.next() {
-                        Some(item) => item,
-                        None => return false,
-                    };
-                    if TokenTreeHelper(&item1) != TokenTreeHelper(&item2) {
-                        return false;
-                    }
-                }
-                s2.next().is_none()
-            }
-            (&TokenTree::Op(ref o1), &TokenTree::Op(ref o2)) => {
-                o1.op() == o2.op() && match (o1.spacing(), o2.spacing()) {
-                    (Spacing::Alone, Spacing::Alone) | (Spacing::Joint, Spacing::Joint) => true,
-                    _ => false,
-                }
-            }
-            (&TokenTree::Literal(ref l1), &TokenTree::Literal(ref l2)) => {
-                l1.to_string() == l2.to_string()
-            }
-            (&TokenTree::Term(ref s1), &TokenTree::Term(ref s2)) => s1.as_str() == s2.as_str(),
-            _ => false,
-        }
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl<'a> Hash for TokenTreeHelper<'a> {
-    fn hash<H: Hasher>(&self, h: &mut H) {
-        use proc_macro2::Spacing;
-
-        match *self.0 {
-            TokenTree::Group(ref g) => {
-                0u8.hash(h);
-                match g.delimiter() {
-                    Delimiter::Parenthesis => 0u8.hash(h),
-                    Delimiter::Brace => 1u8.hash(h),
-                    Delimiter::Bracket => 2u8.hash(h),
-                    Delimiter::None => 3u8.hash(h),
-                }
-
-                for item in g.stream().clone() {
-                    TokenTreeHelper(&item).hash(h);
-                }
-                0xffu8.hash(h); // terminator w/ a variant we don't normally hash
-            }
-            TokenTree::Op(ref op) => {
-                1u8.hash(h);
-                op.op().hash(h);
-                match op.spacing() {
-                    Spacing::Alone => 0u8.hash(h),
-                    Spacing::Joint => 1u8.hash(h),
-                }
-            }
-            TokenTree::Literal(ref lit) => (2u8, lit.to_string()).hash(h),
-            TokenTree::Term(ref word) => (3u8, word.as_str()).hash(h),
-        }
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-pub struct TokenStreamHelper<'a>(pub &'a TokenStream);
-
-#[cfg(feature = "extra-traits")]
-impl<'a> PartialEq for TokenStreamHelper<'a> {
-    fn eq(&self, other: &Self) -> bool {
-        let left = self.0.clone().into_iter().collect::<Vec<_>>();
-        let right = other.0.clone().into_iter().collect::<Vec<_>>();
-        if left.len() != right.len() {
-            return false;
-        }
-        for (a, b) in left.into_iter().zip(right) {
-            if TokenTreeHelper(&a) != TokenTreeHelper(&b) {
-                return false;
-            }
-        }
-        true
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl<'a> Hash for TokenStreamHelper<'a> {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        let tts = self.0.clone().into_iter().collect::<Vec<_>>();
-        tts.len().hash(state);
-        for tt in tts {
-            TokenTreeHelper(&tt).hash(state);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.13.1/src/ty.rs b/third_party/rust/syn-0.13.1/src/ty.rs
deleted file mode 100644
index 1809a65aedb4..000000000000
--- a/third_party/rust/syn-0.13.1/src/ty.rs
+++ /dev/null
@@ -1,811 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use punctuated::Punctuated;
-use super::*;
-use proc_macro2::TokenStream;
-#[cfg(feature = "extra-traits")]
-use std::hash::{Hash, Hasher};
-#[cfg(feature = "extra-traits")]
-use tt::TokenStreamHelper;
-
-ast_enum_of_structs! {
-    /// The possible types that a Rust value could have.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum Type {
-        /// A dynamically sized slice type: `[T]`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Slice(TypeSlice {
-            pub bracket_token: token::Bracket,
-            pub elem: Box<Type>,
-        }),
-
-        /// A fixed size array type: `[T; n]`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Array(TypeArray {
-            pub bracket_token: token::Bracket,
-            pub elem: Box<Type>,
-            pub semi_token: Token![;],
-            pub len: Expr,
-        }),
-
-        /// A raw pointer type: `*const T` or `*mut T`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Ptr(TypePtr {
-            pub star_token: Token![*],
-            pub const_token: Option<Token![const]>,
-            pub mutability: Option<Token![mut]>,
-            pub elem: Box<Type>,
-        }),
-
-        /// A reference type: `&'a T` or `&'a mut T`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Reference(TypeReference {
-            pub and_token: Token![&],
-            pub lifetime: Option<Lifetime>,
-            pub mutability: Option<Token![mut]>,
-            pub elem: Box<Type>,
-        }),
-
-        /// A bare function type: `fn(usize) -> bool`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub BareFn(TypeBareFn {
-            pub unsafety: Option<Token![unsafe]>,
-            pub abi: Option<Abi>,
-            pub fn_token: Token![fn],
-            pub lifetimes: Option<BoundLifetimes>,
-            pub paren_token: token::Paren,
-            pub inputs: Punctuated<BareFnArg, Token![,]>,
-            pub variadic: Option<Token![...]>,
-            pub output: ReturnType,
-        }),
-
-        /// The never type: `!`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Never(TypeNever {
-            pub bang_token: Token![!],
-        }),
-
-        /// A tuple type: `(A, B, C, String)`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Tuple(TypeTuple {
-            pub paren_token: token::Paren,
-            pub elems: Punctuated<Type, Token![,]>,
-        }),
-
-        /// A path like `std::slice::Iter`, optionally qualified with a
-        /// self-type as in `<Vec<T> as SomeTrait>::Associated`.
-        ///
-        /// Type arguments are stored in the Path itself.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Path(TypePath {
-            pub qself: Option<QSelf>,
-            pub path: Path,
-        }),
-
-        /// A trait object type `Bound1 + Bound2 + Bound3` where `Bound` is a
-        /// trait or a lifetime.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub TraitObject(TypeTraitObject {
-            pub dyn_token: Option<Token![dyn]>,
-            pub bounds: Punctuated<TypeParamBound, Token![+]>,
-        }),
-
-        /// An `impl Bound1 + Bound2 + Bound3` type where `Bound` is a trait or
-        /// a lifetime.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub ImplTrait(TypeImplTrait {
-            pub impl_token: Token![impl],
-            pub bounds: Punctuated<TypeParamBound, Token![+]>,
-        }),
-
-        /// A parenthesized type equivalent to the inner type.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Paren(TypeParen {
-            pub paren_token: token::Paren,
-            pub elem: Box<Type>,
-        }),
-
-        /// A type contained within invisible delimiters.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Group(TypeGroup {
-            pub group_token: token::Group,
-            pub elem: Box<Type>,
-        }),
-
-        /// Indication that a type should be inferred by the compiler: `_`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Infer(TypeInfer {
-            pub underscore_token: Token![_],
-        }),
-
-        /// A macro in the type position.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Macro(TypeMacro {
-            pub mac: Macro,
-        }),
-
-        /// Tokens in type position not interpreted by Syn.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Verbatim(TypeVerbatim #manual_extra_traits {
-            pub tts: TokenStream,
-        }),
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for TypeVerbatim {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for TypeVerbatim {
-    fn eq(&self, other: &Self) -> bool {
-        TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for TypeVerbatim {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-ast_struct! {
-    /// The binary interface of a function: `extern "C"`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct Abi {
-        pub extern_token: Token![extern],
-        pub name: Option<LitStr>,
-    }
-}
-
-ast_struct! {
-    /// An argument in a function type: the `usize` in `fn(usize) -> bool`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct BareFnArg {
-        pub name: Option<(BareFnArgName, Token![:])>,
-        pub ty: Type,
-    }
-}
-
-ast_enum! {
-    /// Name of an argument in a function type: the `n` in `fn(n: usize)`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum BareFnArgName {
-        /// Argument given a name.
-        Named(Ident),
-        /// Argument not given a name, matched with `_`.
-        Wild(Token![_]),
-    }
-}
-
-ast_enum! {
-    /// Return type of a function signature.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum ReturnType {
-        /// Return type is not specified.
-        ///
-        /// Functions default to `()` and closures default to type inference.
-        Default,
-        /// A particular type is returned.
-        Type(Token![->], Box<Type>),
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use synom::Synom;
-    use path::parsing::qpath;
-
-    impl Synom for Type {
-        named!(parse -> Self, call!(ambig_ty, true));
-
-        fn description() -> Option<&'static str> {
-            Some("type")
-        }
-    }
-
-    impl Type {
-        /// In some positions, types may not contain the `+` character, to
-        /// disambiguate them. For example in the expression `1 as T`, T may not
-        /// contain a `+` character.
-        ///
-        /// This parser does not allow a `+`, while the default parser does.
-        named!(pub without_plus -> Self, call!(ambig_ty, false));
-    }
-
-    named!(ambig_ty(allow_plus: bool) -> Type, alt!(
-        syn!(TypeGroup) => { Type::Group }
-        |
-        // must be before TypeTuple
-        call!(TypeParen::parse, allow_plus) => { Type::Paren }
-        |
-        // must be before TypePath
-        syn!(TypeMacro) => { Type::Macro }
-        |
-        // must be before TypeTraitObject
-        call!(TypePath::parse, allow_plus) => { Type::Path }
-        |
-        // Don't try parsing more than one trait bound if we aren't allowing it.
-        // must be before TypeTuple
-        call!(TypeTraitObject::parse, allow_plus) => { Type::TraitObject }
-        |
-        syn!(TypeSlice) => { Type::Slice }
-        |
-        syn!(TypeArray) => { Type::Array }
-        |
-        syn!(TypePtr) => { Type::Ptr }
-        |
-        syn!(TypeReference) => { Type::Reference }
-        |
-        syn!(TypeBareFn) => { Type::BareFn }
-        |
-        syn!(TypeNever) => { Type::Never }
-        |
-        syn!(TypeTuple) => { Type::Tuple }
-        |
-        syn!(TypeImplTrait) => { Type::ImplTrait }
-        |
-        syn!(TypeInfer) => { Type::Infer }
-    ));
-
-    impl Synom for TypeSlice {
-        named!(parse -> Self, map!(
-            brackets!(syn!(Type)),
-            |(b, ty)| TypeSlice {
-                elem: Box::new(ty),
-                bracket_token: b,
-            }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("slice type")
-        }
-    }
-
-    impl Synom for TypeArray {
-        named!(parse -> Self, map!(
-            brackets!(do_parse!(
-                elem: syn!(Type) >>
-                    semi: punct!(;) >>
-                    len: syn!(Expr) >>
-                    (elem, semi, len)
-            )),
-            |(brackets, (elem, semi, len))| {
-                TypeArray {
-                    elem: Box::new(elem),
-                    len: len,
-                    bracket_token: brackets,
-                    semi_token: semi,
-                }
-            }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("array type")
-        }
-    }
-
-    impl Synom for TypePtr {
-        named!(parse -> Self, do_parse!(
-            star: punct!(*) >>
-            mutability: alt!(
-                keyword!(const) => { |c| (None, Some(c)) }
-                |
-                keyword!(mut) => { |m| (Some(m), None) }
-            ) >>
-            target: call!(Type::without_plus) >>
-            (TypePtr {
-                const_token: mutability.1,
-                star_token: star,
-                mutability: mutability.0,
-                elem: Box::new(target),
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("raw pointer type")
-        }
-    }
-
-    impl Synom for TypeReference {
-        named!(parse -> Self, do_parse!(
-            amp: punct!(&) >>
-            life: option!(syn!(Lifetime)) >>
-            mutability: option!(keyword!(mut)) >>
-            // & binds tighter than +, so we don't allow + here.
-            target: call!(Type::without_plus) >>
-            (TypeReference {
-                lifetime: life,
-                mutability: mutability,
-                elem: Box::new(target),
-                and_token: amp,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("reference type")
-        }
-    }
-
-    impl Synom for TypeBareFn {
-        named!(parse -> Self, do_parse!(
-            lifetimes: option!(syn!(BoundLifetimes)) >>
-            unsafety: option!(keyword!(unsafe)) >>
-            abi: option!(syn!(Abi)) >>
-            fn_: keyword!(fn) >>
-            parens: parens!(do_parse!(
-                inputs: call!(Punctuated::parse_terminated) >>
-                variadic: option!(cond_reduce!(inputs.empty_or_trailing(), punct!(...))) >>
-                (inputs, variadic)
-            )) >>
-            output: syn!(ReturnType) >>
-            (TypeBareFn {
-                unsafety: unsafety,
-                abi: abi,
-                lifetimes: lifetimes,
-                output: output,
-                variadic: (parens.1).1,
-                fn_token: fn_,
-                paren_token: parens.0,
-                inputs: (parens.1).0,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`fn` type")
-        }
-    }
-
-    impl Synom for TypeNever {
-        named!(parse -> Self, map!(
-            punct!(!),
-            |b| TypeNever { bang_token: b }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("never type: `!`")
-        }
-    }
-
-    impl Synom for TypeInfer {
-        named!(parse -> Self, map!(
-            punct!(_),
-            |u| TypeInfer { underscore_token: u }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("inferred type: `_`")
-        }
-    }
-
-    impl Synom for TypeTuple {
-        named!(parse -> Self, do_parse!(
-            data: parens!(Punctuated::parse_terminated) >>
-            (TypeTuple {
-                paren_token: data.0,
-                elems: data.1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("tuple type")
-        }
-    }
-
-    impl Synom for TypeMacro {
-        named!(parse -> Self, map!(syn!(Macro), |mac| TypeMacro { mac: mac }));
-
-        fn description() -> Option<&'static str> {
-            Some("macro invocation")
-        }
-    }
-
-    impl Synom for TypePath {
-        named!(parse -> Self, call!(Self::parse, false));
-
-        fn description() -> Option<&'static str> {
-            Some("type path")
-        }
-    }
-
-    impl TypePath {
-        named!(parse(allow_plus: bool) -> Self, do_parse!(
-            qpath: qpath >>
-            parenthesized: option!(cond_reduce!(
-                qpath.1.segments.last().unwrap().value().arguments.is_empty(),
-                syn!(ParenthesizedGenericArguments)
-            )) >>
-            cond!(allow_plus, not!(punct!(+))) >>
-            ({
-                let (qself, mut path) = qpath;
-                if let Some(parenthesized) = parenthesized {
-                    let parenthesized = PathArguments::Parenthesized(parenthesized);
-                    path.segments.last_mut().unwrap().value_mut().arguments = parenthesized;
-                }
-                TypePath { qself: qself, path: path }
-            })
-        ));
-    }
-
-    impl Synom for ReturnType {
-        named!(parse -> Self, alt!(
-            do_parse!(
-                arrow: punct!(->) >>
-                ty: syn!(Type) >>
-                (ReturnType::Type(arrow, Box::new(ty)))
-            )
-            |
-            epsilon!() => { |_| ReturnType::Default }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("return type")
-        }
-    }
-
-    impl Synom for TypeTraitObject {
-        named!(parse -> Self, call!(Self::parse, true));
-
-        fn description() -> Option<&'static str> {
-            Some("trait object type")
-        }
-    }
-
-    fn at_least_one_type(bounds: &Punctuated<TypeParamBound, Token![+]>) -> bool {
-        for bound in bounds {
-            if let TypeParamBound::Trait(_) = *bound {
-                return true;
-            }
-        }
-        false
-    }
-
-    impl TypeTraitObject {
-        named!(pub without_plus -> Self, call!(Self::parse, false));
-
-        // Only allow multiple trait references if allow_plus is true.
-        named!(parse(allow_plus: bool) -> Self, do_parse!(
-            dyn_token: option!(keyword!(dyn)) >>
-            bounds: alt!(
-                cond_reduce!(allow_plus, Punctuated::parse_terminated_nonempty)
-                |
-                syn!(TypeParamBound) => {|x| {
-                    let mut bounds = Punctuated::new();
-                    bounds.push_value(x);
-                    bounds
-                }}
-            ) >>
-            // Just lifetimes like `'a + 'b` is not a TraitObject.
-            cond_reduce!(at_least_one_type(&bounds)) >>
-            (TypeTraitObject {
-                dyn_token: dyn_token,
-                bounds: bounds,
-            })
-        ));
-    }
-
-    impl Synom for TypeImplTrait {
-        named!(parse -> Self, do_parse!(
-            impl_: keyword!(impl) >>
-            // NOTE: rust-lang/rust#34511 includes discussion about whether or
-            // not + should be allowed in ImplTrait directly without ().
-            elem: call!(Punctuated::parse_terminated_nonempty) >>
-            (TypeImplTrait {
-                impl_token: impl_,
-                bounds: elem,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`impl Trait` type")
-        }
-    }
-
-    impl Synom for TypeGroup {
-        named!(parse -> Self, do_parse!(
-            data: grouped!(syn!(Type)) >>
-            (TypeGroup {
-                group_token: data.0,
-                elem: Box::new(data.1),
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("type surrounded by invisible delimiters")
-        }
-    }
-
-    impl Synom for TypeParen {
-        named!(parse -> Self, call!(Self::parse, false));
-
-        fn description() -> Option<&'static str> {
-            Some("parenthesized type")
-        }
-    }
-
-    impl TypeParen {
-        named!(parse(allow_plus: bool) -> Self, do_parse!(
-            data: parens!(syn!(Type)) >>
-            cond!(allow_plus, not!(punct!(+))) >>
-            (TypeParen {
-                paren_token: data.0,
-                elem: Box::new(data.1),
-            })
-        ));
-    }
-
-    impl Synom for BareFnArg {
-        named!(parse -> Self, do_parse!(
-            name: option!(do_parse!(
-                name: syn!(BareFnArgName) >>
-                not!(punct!(::)) >>
-                colon: punct!(:) >>
-                (name, colon)
-            )) >>
-            ty: syn!(Type) >>
-            (BareFnArg {
-                name: name,
-                ty: ty,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("function type argument")
-        }
-    }
-
-    impl Synom for BareFnArgName {
-        named!(parse -> Self, alt!(
-            map!(syn!(Ident), BareFnArgName::Named)
-            |
-            map!(punct!(_), BareFnArgName::Wild)
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("function argument name")
-        }
-    }
-
-    impl Synom for Abi {
-        named!(parse -> Self, do_parse!(
-            extern_: keyword!(extern) >>
-            name: option!(syn!(LitStr)) >>
-            (Abi {
-                extern_token: extern_,
-                name: name,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`extern` ABI qualifier")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use quote::{ToTokens, Tokens};
-
-    impl ToTokens for TypeSlice {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.bracket_token.surround(tokens, |tokens| {
-                self.elem.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for TypeArray {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.bracket_token.surround(tokens, |tokens| {
-                self.elem.to_tokens(tokens);
-                self.semi_token.to_tokens(tokens);
-                self.len.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for TypePtr {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.star_token.to_tokens(tokens);
-            match self.mutability {
-                Some(ref tok) => tok.to_tokens(tokens),
-                None => {
-                    TokensOrDefault(&self.const_token).to_tokens(tokens);
-                }
-            }
-            self.elem.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeReference {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.and_token.to_tokens(tokens);
-            self.lifetime.to_tokens(tokens);
-            self.mutability.to_tokens(tokens);
-            self.elem.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeBareFn {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.lifetimes.to_tokens(tokens);
-            self.unsafety.to_tokens(tokens);
-            self.abi.to_tokens(tokens);
-            self.fn_token.to_tokens(tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                self.inputs.to_tokens(tokens);
-                if let Some(ref variadic) = self.variadic {
-                    if !self.inputs.empty_or_trailing() {
-                        let span = variadic.0[0];
-                        <Token![,]>::new(span).to_tokens(tokens);
-                    }
-                    variadic.to_tokens(tokens);
-                }
-            });
-            self.output.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeNever {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.bang_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeTuple {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.paren_token.surround(tokens, |tokens| {
-                self.elems.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for TypePath {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            PathTokens(&self.qself, &self.path).to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeTraitObject {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.dyn_token.to_tokens(tokens);
-            self.bounds.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeImplTrait {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.impl_token.to_tokens(tokens);
-            self.bounds.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeGroup {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.group_token.surround(tokens, |tokens| {
-                self.elem.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for TypeParen {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.paren_token.surround(tokens, |tokens| {
-                self.elem.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for TypeInfer {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.underscore_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeMacro {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.mac.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeVerbatim {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.tts.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ReturnType {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            match *self {
-                ReturnType::Default => {}
-                ReturnType::Type(ref arrow, ref ty) => {
-                    arrow.to_tokens(tokens);
-                    ty.to_tokens(tokens);
-                }
-            }
-        }
-    }
-
-    impl ToTokens for BareFnArg {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            if let Some((ref name, ref colon)) = self.name {
-                name.to_tokens(tokens);
-                colon.to_tokens(tokens);
-            }
-            self.ty.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for BareFnArgName {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            match *self {
-                BareFnArgName::Named(ref t) => t.to_tokens(tokens),
-                BareFnArgName::Wild(ref t) => t.to_tokens(tokens),
-            }
-        }
-    }
-
-    impl ToTokens for Abi {
-        fn to_tokens(&self, tokens: &mut Tokens) {
-            self.extern_token.to_tokens(tokens);
-            self.name.to_tokens(tokens);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/.cargo-checksum.json b/third_party/rust/syn-0.14.6/.cargo-checksum.json
deleted file mode 100644
index 3432ee457349..000000000000
--- a/third_party/rust/syn-0.14.6/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"8c6ff3b931bab561eae7f26dcbeb68ffaf91d45e5cad5c7ac0651c8c2db792b8","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"f033c371492a4769d377a8bf1a139adc7bf94ea00595b867a3e234eeab994c8c","README.md":"43062927a3e318771d5c2218e5066147b10cdd51cdeb240b06352506cfb7a72c","src/attr.rs":"4796108202ed2c89a2144039a145f20037465dd3cb9a8f8c712709082b889a5a","src/buffer.rs":"62477ac857b5c5c6fe3e45416f1f2df81ef3e9880274ec2da99fa60c99ecc78e","src/data.rs":"31014b197f6be0fac18fc7492047dc30ae729c66ccb9113bd8cdeb51a1b7546c","src/derive.rs":"42a52cd1dea50473f3160c6515139bcaaf57c99962517eb2ac57abb04cd03688","src/error.rs":"aa215e0a8a98d85b970a9003565746be9fcdeb24a594b322e591d0ce74ed310b","src/expr.rs":"d0be324be2e4a4ba0e44173c8c4e0188c9ffff474f8cea5fab76e957e4b1e6cf","src/file.rs":"b1ae5b48a1937c475d57de8630d0a99326021e22b107a428342cf8b824330fbc","src/gen/fold.rs":"235db3b5027dfc236d20c87d5d86d7c669057c72338322ce7b4629a9b91b5a31","src/gen/visit.rs":"a6254cfe3d6c11919650fab58f9083756baf53d4b3a503d1bcfe3c51c7a99baf","src/gen/visit_mut.rs":"d01984e229f48bf82d0b88dd96c0223ed40d5690d1af3a5437edbe666195ab23","src/gen_helper.rs":"d128fbd24fadfc5634976bdb9188c649f9905718c9c987a2839c3e6134b155a2","src/generics.rs":"0daf222a841f1965a25703855bbe17401b3edb0eb512ee96840f32940801551b","src/item.rs":"5c4f1cd7a80e7c6dc21e812946e7146223a020fa8cf5c1c75d8fbd04892132d7","src/lib.rs":"6e77de8d65d0906810ae2ff566e2db1dd8b9dc151ffa132807c4111ee76bf903","src/lifetime.rs":"383cd564a452540f043858c636f19ed5b316a8c2752d83e53aacb5730307a754","src/lit.rs":"7ccdd679878c324ad47b0c29e76eb8d9e5d9b00e53cd3767060563bf7048eee9","src/mac.rs":"07c5aab9af440087315d58edeea733dda80bef0240463bf4d324c1ba1e2a272c","src/macros.rs":"219f9cf3ed4258848d4d7054acbbb3dd4f5599919633d3584d5ad1963e654fea","src/op.rs":"7f20c79ac0ccc8cb129b550a305d8c57e58fdc2dd241f5fc1d1634450c26c32b","src/parse_quote.rs":"a3fbe5ad2cbeb967fbb8677f925431baa5303445a128c5284254b453284f21ab","src/parsers.rs":"ce324ac0882771b7ba24b110e55fbc2874be19cb7eb93fef7abcfb848d9c3a74","src/path.rs":"102ca22184ecfbfb21f9d82b49d0bc2d0d06fb792895a025dee1a435f9efee6e","src/punctuated.rs":"441cb7ef2416b58af480c6ea179f3662ed016ddd4742f0df735f39a101b3edd2","src/spanned.rs":"70e8c7d953e76b1ce5330c73d7c0103c02a9b56e8dd8299c621fe0c91c615e23","src/synom.rs":"132d361d8e6b12e9238ec4eea39e02fed662ce0649048e6fbd28a4d8092a9c48","src/token.rs":"20b25a6d572225f7e718a13b6e753b138ab9b8d840d31b6bfce5ed764eaaff8c","src/tt.rs":"e0541709fc8038a58156ef590f4449969a752aa96d7722beb41c097a83db5d21","src/ty.rs":"6888b6001c6f5908571684e90c73f43302d9e3a4186971caa8bbd72220d6c611","src/verbatim.rs":"40476ed104ae4cd16517c220becfc008b8ff0a0727d3be6001374d993b3f4b25"},"package":"4e4b5274d4a0a3d2749d5c158dc64d3403e60554dc61194648787ada5212473d"}
\ No newline at end of file
diff --git a/third_party/rust/syn-0.14.6/Cargo.toml b/third_party/rust/syn-0.14.6/Cargo.toml
deleted file mode 100644
index 297c206cb527..000000000000
--- a/third_party/rust/syn-0.14.6/Cargo.toml
+++ /dev/null
@@ -1,62 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "syn"
-version = "0.14.6"
-authors = ["David Tolnay <dtolnay@gmail.com>"]
-include = ["/Cargo.toml", "/src/**/*.rs", "/README.md", "/LICENSE-APACHE", "/LICENSE-MIT"]
-description = "Nom parser for Rust source code"
-documentation = "https://docs.rs/syn"
-readme = "README.md"
-categories = ["development-tools::procedural-macro-helpers"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/dtolnay/syn"
-[package.metadata.docs.rs]
-all-features = true
-
-[package.metadata.playground]
-all-features = true
-
-[[example]]
-name = "dump-syntax"
-path = "examples/dump-syntax/main.rs"
-required-features = ["full", "parsing", "extra-traits"]
-[dependencies.proc-macro2]
-version = "0.4.4"
-default-features = false
-
-[dependencies.quote]
-version = "0.6"
-optional = true
-default-features = false
-
-[dependencies.unicode-xid]
-version = "0.1"
-[dev-dependencies.rayon]
-version = "1.0"
-
-[dev-dependencies.walkdir]
-version = "2.1"
-
-[features]
-clone-impls = []
-default = ["derive", "parsing", "printing", "clone-impls", "proc-macro"]
-derive = []
-extra-traits = []
-fold = []
-full = []
-parsing = []
-printing = ["quote"]
-proc-macro = ["proc-macro2/proc-macro", "quote/proc-macro"]
-visit = []
-visit-mut = []
diff --git a/third_party/rust/syn-0.14.6/LICENSE-APACHE b/third_party/rust/syn-0.14.6/LICENSE-APACHE
deleted file mode 100644
index 16fe87b06e80..000000000000
--- a/third_party/rust/syn-0.14.6/LICENSE-APACHE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/third_party/rust/syn-0.14.6/LICENSE-MIT b/third_party/rust/syn-0.14.6/LICENSE-MIT
deleted file mode 100644
index 5767dea4b109..000000000000
--- a/third_party/rust/syn-0.14.6/LICENSE-MIT
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2018 Syn Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/third_party/rust/syn-0.14.6/README.md b/third_party/rust/syn-0.14.6/README.md
deleted file mode 100644
index e7a51abc6f0a..000000000000
--- a/third_party/rust/syn-0.14.6/README.md
+++ /dev/null
@@ -1,282 +0,0 @@
-Nom parser for Rust source code
-===============================
-
-[![Build Status](https://api.travis-ci.org/dtolnay/syn.svg?branch=master)](https://travis-ci.org/dtolnay/syn)
-[![Latest Version](https://img.shields.io/crates/v/syn.svg)](https://crates.io/crates/syn)
-[![Rust Documentation](https://img.shields.io/badge/api-rustdoc-blue.svg)](https://docs.rs/syn/0.14/syn/)
-[![Rustc Version 1.15+](https://img.shields.io/badge/rustc-1.15+-lightgray.svg)](https://blog.rust-lang.org/2017/02/02/Rust-1.15.html)
-
-Syn is a parsing library for parsing a stream of Rust tokens into a syntax tree
-of Rust source code.
-
-Currently this library is geared toward the [custom derive] use case but
-contains some APIs that may be useful for Rust procedural macros more generally.
-
-[custom derive]: https://github.com/rust-lang/rfcs/blob/master/text/1681-macros-1.1.md
-
-- **Data structures** — Syn provides a complete syntax tree that can represent
-  any valid Rust source code. The syntax tree is rooted at [`syn::File`] which
-  represents a full source file, but there are other entry points that may be
-  useful to procedural macros including [`syn::Item`], [`syn::Expr`] and
-  [`syn::Type`].
-
-- **Custom derives** — Of particular interest to custom derives is
-  [`syn::DeriveInput`] which is any of the three legal input items to a derive
-  macro. An example below shows using this type in a library that can derive
-  implementations of a trait of your own.
-
-- **Parser combinators** — Parsing in Syn is built on a suite of public parser
-  combinator macros that you can use for parsing any token-based syntax you
-  dream up within a `functionlike!(...)` procedural macro. Every syntax tree
-  node defined by Syn is individually parsable and may be used as a building
-  block for custom syntaxes, or you may do it all yourself working from the most
-  primitive tokens.
-
-- **Location information** — Every token parsed by Syn is associated with a
-  `Span` that tracks line and column information back to the source of that
-  token. These spans allow a procedural macro to display detailed error messages
-  pointing to all the right places in the user's code. There is an example of
-  this below.
-
-- **Feature flags** — Functionality is aggressively feature gated so your
-  procedural macros enable only what they need, and do not pay in compile time
-  for all the rest.
-
-[`syn::File`]: https://docs.rs/syn/0.14/syn/struct.File.html
-[`syn::Item`]: https://docs.rs/syn/0.14/syn/enum.Item.html
-[`syn::Expr`]: https://docs.rs/syn/0.14/syn/enum.Expr.html
-[`syn::Type`]: https://docs.rs/syn/0.14/syn/enum.Type.html
-[`syn::DeriveInput`]: https://docs.rs/syn/0.14/syn/struct.DeriveInput.html
-
-If you get stuck with anything involving procedural macros in Rust I am happy to
-provide help even if the issue is not related to Syn. Please file a ticket in
-this repo.
-
-*Version requirement: Syn supports any compiler version back to Rust's very
-first support for procedural macros in Rust 1.15.0. Some features especially
-around error reporting are only available in newer compilers or on the nightly
-channel.*
-
-[*Release notes*](https://github.com/dtolnay/syn/releases)
-
-## Example of a custom derive
-
-The canonical custom derive using Syn looks like this. We write an ordinary Rust
-function tagged with a `proc_macro_derive` attribute and the name of the trait
-we are deriving. Any time that derive appears in the user's code, the Rust
-compiler passes their data structure as tokens into our macro. We get to execute
-arbitrary Rust code to figure out what to do with those tokens, then hand some
-tokens back to the compiler to compile into the user's crate.
-
-[`TokenStream`]: https://doc.rust-lang.org/proc_macro/struct.TokenStream.html
-
-```toml
-[dependencies]
-syn = "0.14"
-quote = "0.6"
-
-[lib]
-proc-macro = true
-```
-
-```rust
-extern crate proc_macro;
-extern crate syn;
-
-#[macro_use]
-extern crate quote;
-
-use proc_macro::TokenStream;
-use syn::DeriveInput;
-
-#[proc_macro_derive(MyMacro)]
-pub fn my_macro(input: TokenStream) -> TokenStream {
-    // Parse the input tokens into a syntax tree
-    let input: DeriveInput = syn::parse(input).unwrap();
-
-    // Build the output, possibly using quasi-quotation
-    let expanded = quote! {
-        // ...
-    };
-
-    // Hand the output tokens back to the compiler
-    expanded.into()
-}
-```
-
-The [`heapsize`] example directory shows a complete working Macros 1.1
-implementation of a custom derive. It works on any Rust compiler \>=1.15.0. The
-example derives a `HeapSize` trait which computes an estimate of the amount of
-heap memory owned by a value.
-
-[`heapsize`]: examples/heapsize
-
-```rust
-pub trait HeapSize {
-    /// Total number of bytes of heap memory owned by `self`.
-    fn heap_size_of_children(&self) -> usize;
-}
-```
-
-The custom derive allows users to write `#[derive(HeapSize)]` on data structures
-in their program.
-
-```rust
-#[derive(HeapSize)]
-struct Demo<'a, T: ?Sized> {
-    a: Box<T>,
-    b: u8,
-    c: &'a str,
-    d: String,
-}
-```
-
-## Spans and error reporting
-
-The [`heapsize2`] example directory is an extension of the `heapsize` example
-that demonstrates some of the hygiene and error reporting properties of Macros
-2.0. This example currently requires a nightly Rust compiler \>=1.24.0-nightly
-but we are working to stabilize all of the APIs involved.
-
-[`heapsize2`]: examples/heapsize2
-
-The token-based procedural macro API provides great control over where the
-compiler's error messages are displayed in user code. Consider the error the
-user sees if one of their field types does not implement `HeapSize`.
-
-```rust
-#[derive(HeapSize)]
-struct Broken {
-    ok: String,
-    bad: std::thread::Thread,
-}
-```
-
-In the Macros 1.1 string-based procedural macro world, the resulting error would
-point unhelpfully to the invocation of the derive macro and not to the actual
-problematic field.
-
-```
-error[E0599]: no method named `heap_size_of_children` found for type `std::thread::Thread` in the current scope
- --> src/main.rs:4:10
-  |
-4 | #[derive(HeapSize)]
-  |          ^^^^^^^^
-```
-
-By tracking span information all the way through the expansion of a procedural
-macro as shown in the `heapsize2` example, token-based macros in Syn are able to
-trigger errors that directly pinpoint the source of the problem.
-
-```
-error[E0277]: the trait bound `std::thread::Thread: HeapSize` is not satisfied
- --> src/main.rs:7:5
-  |
-7 |     bad: std::thread::Thread,
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `HeapSize` is not implemented for `std::thread::Thread`
-```
-
-## Parsing a custom syntax using combinators
-
-The [`lazy-static`] example directory shows the implementation of a
-`functionlike!(...)` procedural macro in which the input tokens are parsed using
-[`nom`]-style parser combinators.
-
-[`lazy-static`]: examples/lazy-static
-[`nom`]: https://github.com/Geal/nom
-
-The example reimplements the popular `lazy_static` crate from crates.io as a
-procedural macro.
-
-```
-lazy_static! {
-    static ref USERNAME: Regex = Regex::new("^[a-z0-9_-]{3,16}$").unwrap();
-}
-```
-
-The implementation shows how to trigger custom warnings and error messages on
-the macro input.
-
-```
-warning: come on, pick a more creative name
-  --> src/main.rs:10:16
-   |
-10 |     static ref FOO: String = "lazy_static".to_owned();
-   |                ^^^
-```
-
-## Debugging
-
-When developing a procedural macro it can be helpful to look at what the
-generated code looks like. Use `cargo rustc -- -Zunstable-options
---pretty=expanded` or the [`cargo expand`] subcommand.
-
-[`cargo expand`]: https://github.com/dtolnay/cargo-expand
-
-To show the expanded code for some crate that uses your procedural macro, run
-`cargo expand` from that crate. To show the expanded code for one of your own
-test cases, run `cargo expand --test the_test_case` where the last argument is
-the name of the test file without the `.rs` extension.
-
-This write-up by Brandon W Maister discusses debugging in more detail:
-[Debugging Rust's new Custom Derive system][debugging].
-
-[debugging]: https://quodlibetor.github.io/posts/debugging-rusts-new-custom-derive-system/
-
-## Optional features
-
-Syn puts a lot of functionality behind optional features in order to optimize
-compile time for the most common use cases. The following features are
-available.
-
-- **`derive`** *(enabled by default)* — Data structures for representing the
-  possible input to a custom derive, including structs and enums and types.
-- **`full`** — Data structures for representing the syntax tree of all valid
-  Rust source code, including items and expressions.
-- **`parsing`** *(enabled by default)* — Ability to parse input tokens into a
-  syntax tree node of a chosen type.
-- **`printing`** *(enabled by default)* — Ability to print a syntax tree node as
-  tokens of Rust source code.
-- **`visit`** — Trait for traversing a syntax tree.
-- **`visit-mut`** — Trait for traversing and mutating in place a syntax tree.
-- **`fold`** — Trait for transforming an owned syntax tree.
-- **`clone-impls`** *(enabled by default)* — Clone impls for all syntax tree
-  types.
-- **`extra-traits`** — Debug, Eq, PartialEq, Hash impls for all syntax tree
-  types.
-- **`proc-macro`** *(enabled by default)* — Runtime dependency on the dynamic
-  library libproc_macro from rustc toolchain.
-
-## Nightly features
-
-By default Syn uses the [`proc-macro2`] crate to emulate the nightly compiler's
-procedural macro API in a stable way that works all the way back to Rust 1.15.0.
-This shim makes it possible to write code without regard for whether the current
-compiler version supports the features we use.
-
-[`proc-macro2`]: https://github.com/alexcrichton/proc-macro2
-
-On a nightly compiler, to eliminate the stable shim and use the compiler's
-`proc-macro` directly, add `proc-macro2` to your Cargo.toml and set its
-`"nightly"` feature which bypasses the stable shim.
-
-```toml
-[dependencies]
-syn = "0.14"
-proc-macro2 = { version = "0.4", features = ["nightly"] }
-```
-
-## License
-
-Licensed under either of
-
- * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in this crate by you, as defined in the Apache-2.0 license, shall
-be dual licensed as above, without any additional terms or conditions.
diff --git a/third_party/rust/syn-0.14.6/src/attr.rs b/third_party/rust/syn-0.14.6/src/attr.rs
deleted file mode 100644
index d818b4f1c83e..000000000000
--- a/third_party/rust/syn-0.14.6/src/attr.rs
+++ /dev/null
@@ -1,554 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use punctuated::Punctuated;
-
-use std::iter;
-
-use proc_macro2::{Delimiter, Spacing, TokenStream, TokenTree};
-
-#[cfg(feature = "extra-traits")]
-use std::hash::{Hash, Hasher};
-#[cfg(feature = "extra-traits")]
-use tt::TokenStreamHelper;
-
-ast_struct! {
-    /// An attribute like `#[repr(transparent)]`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax
-    ///
-    /// Rust has six types of attributes.
-    ///
-    /// - Outer attributes like `#[repr(transparent)]`. These appear outside or
-    ///   in front of the item they describe.
-    /// - Inner attributes like `#![feature(proc_macro)]`. These appear inside
-    ///   of the item they describe, usually a module.
-    /// - Outer doc comments like `/// # Example`.
-    /// - Inner doc comments like `//! Please file an issue`.
-    /// - Outer block comments `/** # Example */`.
-    /// - Inner block comments `/*! Please file an issue */`.
-    ///
-    /// The `style` field of type `AttrStyle` distinguishes whether an attribute
-    /// is outer or inner. Doc comments and block comments are promoted to
-    /// attributes that have `is_sugared_doc` set to true, as this is how they
-    /// are processed by the compiler and by `macro_rules!` macros.
-    ///
-    /// The `path` field gives the possibly colon-delimited path against which
-    /// the attribute is resolved. It is equal to `"doc"` for desugared doc
-    /// comments. The `tts` field contains the rest of the attribute body as
-    /// tokens.
-    ///
-    /// ```text
-    /// #[derive(Copy)]      #[crate::precondition x < 5]
-    ///   ^^^^^^~~~~~~         ^^^^^^^^^^^^^^^^^^^ ~~~~~
-    ///    path  tts                   path         tts
-    /// ```
-    ///
-    /// Use the [`interpret_meta`] method to try parsing the tokens of an
-    /// attribute into the structured representation that is used by convention
-    /// across most Rust libraries.
-    ///
-    /// [`interpret_meta`]: #method.interpret_meta
-    pub struct Attribute #manual_extra_traits {
-        pub pound_token: Token![#],
-        pub style: AttrStyle,
-        pub bracket_token: token::Bracket,
-        pub path: Path,
-        pub tts: TokenStream,
-        pub is_sugared_doc: bool,
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for Attribute {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for Attribute {
-    fn eq(&self, other: &Self) -> bool {
-        self.style == other.style
-            && self.pound_token == other.pound_token
-            && self.bracket_token == other.bracket_token
-            && self.path == other.path
-            && TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-            && self.is_sugared_doc == other.is_sugared_doc
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for Attribute {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        self.style.hash(state);
-        self.pound_token.hash(state);
-        self.bracket_token.hash(state);
-        self.path.hash(state);
-        TokenStreamHelper(&self.tts).hash(state);
-        self.is_sugared_doc.hash(state);
-    }
-}
-
-impl Attribute {
-    /// Parses the tokens after the path as a [`Meta`](enum.Meta.html) if
-    /// possible.
-    pub fn interpret_meta(&self) -> Option<Meta> {
-        let name = if self.path.segments.len() == 1 {
-            &self.path.segments.first().unwrap().value().ident
-        } else {
-            return None;
-        };
-
-        if self.tts.is_empty() {
-            return Some(Meta::Word(name.clone()));
-        }
-
-        let tts = self.tts.clone().into_iter().collect::<Vec<_>>();
-
-        if tts.len() == 1 {
-            if let Some(meta) = Attribute::extract_meta_list(name.clone(), &tts[0]) {
-                return Some(meta);
-            }
-        }
-
-        if tts.len() == 2 {
-            if let Some(meta) = Attribute::extract_name_value(name.clone(), &tts[0], &tts[1]) {
-                return Some(meta);
-            }
-        }
-
-        None
-    }
-
-    fn extract_meta_list(ident: Ident, tt: &TokenTree) -> Option<Meta> {
-        let g = match *tt {
-            TokenTree::Group(ref g) => g,
-            _ => return None,
-        };
-        if g.delimiter() != Delimiter::Parenthesis {
-            return None;
-        }
-        let tokens = g.stream().clone().into_iter().collect::<Vec<_>>();
-        let nested = match list_of_nested_meta_items_from_tokens(&tokens) {
-            Some(n) => n,
-            None => return None,
-        };
-        Some(Meta::List(MetaList {
-            paren_token: token::Paren(g.span()),
-            ident: ident,
-            nested: nested,
-        }))
-    }
-
-    fn extract_name_value(ident: Ident, a: &TokenTree, b: &TokenTree) -> Option<Meta> {
-        let a = match *a {
-            TokenTree::Punct(ref o) => o,
-            _ => return None,
-        };
-        if a.spacing() != Spacing::Alone {
-            return None;
-        }
-        if a.as_char() != '=' {
-            return None;
-        }
-
-        match *b {
-            TokenTree::Literal(ref l) if !l.to_string().starts_with('/') => {
-                Some(Meta::NameValue(MetaNameValue {
-                    ident: ident,
-                    eq_token: Token![=]([a.span()]),
-                    lit: Lit::new(l.clone()),
-                }))
-            }
-            TokenTree::Ident(ref v) => match &v.to_string()[..] {
-                v @ "true" | v @ "false" => Some(Meta::NameValue(MetaNameValue {
-                    ident: ident,
-                    eq_token: Token![=]([a.span()]),
-                    lit: Lit::Bool(LitBool {
-                        value: v == "true",
-                        span: b.span(),
-                    }),
-                })),
-                _ => None,
-            },
-            _ => None,
-        }
-    }
-}
-
-fn nested_meta_item_from_tokens(tts: &[TokenTree]) -> Option<(NestedMeta, &[TokenTree])> {
-    assert!(!tts.is_empty());
-
-    match tts[0] {
-        TokenTree::Literal(ref lit) => {
-            if lit.to_string().starts_with('/') {
-                None
-            } else {
-                let lit = Lit::new(lit.clone());
-                Some((NestedMeta::Literal(lit), &tts[1..]))
-            }
-        }
-
-        TokenTree::Ident(ref ident) => {
-            if tts.len() >= 3 {
-                if let Some(meta) = Attribute::extract_name_value(ident.clone(), &tts[1], &tts[2]) {
-                    return Some((NestedMeta::Meta(meta), &tts[3..]));
-                }
-            }
-
-            if tts.len() >= 2 {
-                if let Some(meta) = Attribute::extract_meta_list(ident.clone(), &tts[1]) {
-                    return Some((NestedMeta::Meta(meta), &tts[2..]));
-                }
-            }
-
-            Some((Meta::Word(ident.clone()).into(), &tts[1..]))
-        }
-
-        _ => None,
-    }
-}
-
-fn list_of_nested_meta_items_from_tokens(
-    mut tts: &[TokenTree],
-) -> Option<Punctuated<NestedMeta, Token![,]>> {
-    let mut nested_meta_items = Punctuated::new();
-    let mut first = true;
-
-    while !tts.is_empty() {
-        let prev_comma = if first {
-            first = false;
-            None
-        } else if let TokenTree::Punct(ref op) = tts[0] {
-            if op.spacing() != Spacing::Alone {
-                return None;
-            }
-            if op.as_char() != ',' {
-                return None;
-            }
-            let tok = Token![,]([op.span()]);
-            tts = &tts[1..];
-            if tts.is_empty() {
-                break;
-            }
-            Some(tok)
-        } else {
-            return None;
-        };
-        let (nested, rest) = match nested_meta_item_from_tokens(tts) {
-            Some(pair) => pair,
-            None => return None,
-        };
-        if let Some(comma) = prev_comma {
-            nested_meta_items.push_punct(comma);
-        }
-        nested_meta_items.push_value(nested);
-        tts = rest;
-    }
-
-    Some(nested_meta_items)
-}
-
-ast_enum! {
-    /// Distinguishes between attributes that decorate an item and attributes
-    /// that are contained within an item.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Outer attributes
-    ///
-    /// - `#[repr(transparent)]`
-    /// - `/// # Example`
-    /// - `/** Please file an issue */`
-    ///
-    /// # Inner attributes
-    ///
-    /// - `#![feature(proc_macro)]`
-    /// - `//! # Example`
-    /// - `/*! Please file an issue */`
-    #[cfg_attr(feature = "clone-impls", derive(Copy))]
-    pub enum AttrStyle {
-        Outer,
-        Inner(Token![!]),
-    }
-}
-
-ast_enum_of_structs! {
-    /// Content of a compile-time structured attribute.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// ## Word
-    ///
-    /// A meta word is like the `test` in `#[test]`.
-    ///
-    /// ## List
-    ///
-    /// A meta list is like the `derive(Copy)` in `#[derive(Copy)]`.
-    ///
-    /// ## NameValue
-    ///
-    /// A name-value meta is like the `path = "..."` in `#[path =
-    /// "sys/windows.rs"]`.
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum Meta {
-        pub Word(Ident),
-        /// A structured list within an attribute, like `derive(Copy, Clone)`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub List(MetaList {
-            pub ident: Ident,
-            pub paren_token: token::Paren,
-            pub nested: Punctuated<NestedMeta, Token![,]>,
-        }),
-        /// A name-value pair within an attribute, like `feature = "nightly"`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub NameValue(MetaNameValue {
-            pub ident: Ident,
-            pub eq_token: Token![=],
-            pub lit: Lit,
-        }),
-    }
-}
-
-impl Meta {
-    /// Returns the identifier that begins this structured meta item.
-    ///
-    /// For example this would return the `test` in `#[test]`, the `derive` in
-    /// `#[derive(Copy)]`, and the `path` in `#[path = "sys/windows.rs"]`.
-    pub fn name(&self) -> Ident {
-        match *self {
-            Meta::Word(ref meta) => meta.clone(),
-            Meta::List(ref meta) => meta.ident.clone(),
-            Meta::NameValue(ref meta) => meta.ident.clone(),
-        }
-    }
-}
-
-ast_enum_of_structs! {
-    /// Element of a compile-time attribute list.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum NestedMeta {
-        /// A structured meta item, like the `Copy` in `#[derive(Copy)]` which
-        /// would be a nested `Meta::Word`.
-        pub Meta(Meta),
-
-        /// A Rust literal, like the `"new_name"` in `#[rename("new_name")]`.
-        pub Literal(Lit),
-    }
-}
-
-pub trait FilterAttrs<'a> {
-    type Ret: Iterator<Item = &'a Attribute>;
-
-    fn outer(self) -> Self::Ret;
-    fn inner(self) -> Self::Ret;
-}
-
-impl<'a, T> FilterAttrs<'a> for T
-where
-    T: IntoIterator<Item = &'a Attribute>,
-{
-    type Ret = iter::Filter<T::IntoIter, fn(&&Attribute) -> bool>;
-
-    fn outer(self) -> Self::Ret {
-        fn is_outer(attr: &&Attribute) -> bool {
-            match attr.style {
-                AttrStyle::Outer => true,
-                _ => false,
-            }
-        }
-        self.into_iter().filter(is_outer)
-    }
-
-    fn inner(self) -> Self::Ret {
-        fn is_inner(attr: &&Attribute) -> bool {
-            match attr.style {
-                AttrStyle::Inner(_) => true,
-                _ => false,
-            }
-        }
-        self.into_iter().filter(is_inner)
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use buffer::Cursor;
-    use parse_error;
-    use proc_macro2::{Literal, Punct, Spacing, Span, TokenTree};
-    use synom::PResult;
-
-    fn eq(span: Span) -> TokenTree {
-        let mut op = Punct::new('=', Spacing::Alone);
-        op.set_span(span);
-        op.into()
-    }
-
-    impl Attribute {
-        named!(pub parse_inner -> Self, alt!(
-            do_parse!(
-                pound: punct!(#) >>
-                bang: punct!(!) >>
-                path_and_tts: brackets!(tuple!(
-                    call!(Path::parse_mod_style),
-                    syn!(TokenStream),
-                )) >>
-                ({
-                    let (bracket, (path, tts)) = path_and_tts;
-
-                    Attribute {
-                        style: AttrStyle::Inner(bang),
-                        path: path,
-                        tts: tts,
-                        is_sugared_doc: false,
-                        pound_token: pound,
-                        bracket_token: bracket,
-                    }
-                })
-            )
-            |
-            map!(
-                call!(lit_doc_comment, Comment::Inner),
-                |lit| {
-                    let span = lit.span();
-                    Attribute {
-                        style: AttrStyle::Inner(<Token![!]>::new(span)),
-                        path: Ident::new("doc", span).into(),
-                        tts: vec![
-                            eq(span),
-                            lit,
-                        ].into_iter().collect(),
-                        is_sugared_doc: true,
-                        pound_token: <Token![#]>::new(span),
-                        bracket_token: token::Bracket(span),
-                    }
-                }
-            )
-        ));
-
-        named!(pub parse_outer -> Self, alt!(
-            do_parse!(
-                pound: punct!(#) >>
-                path_and_tts: brackets!(tuple!(
-                    call!(Path::parse_mod_style),
-                    syn!(TokenStream),
-                )) >>
-                ({
-                    let (bracket, (path, tts)) = path_and_tts;
-
-                    Attribute {
-                        style: AttrStyle::Outer,
-                        path: path,
-                        tts: tts,
-                        is_sugared_doc: false,
-                        pound_token: pound,
-                        bracket_token: bracket,
-                    }
-                })
-            )
-            |
-            map!(
-                call!(lit_doc_comment, Comment::Outer),
-                |lit| {
-                    let span = lit.span();
-                    Attribute {
-                        style: AttrStyle::Outer,
-                        path: Ident::new("doc", span).into(),
-                        tts: vec![
-                            eq(span),
-                            lit,
-                        ].into_iter().collect(),
-                        is_sugared_doc: true,
-                        pound_token: <Token![#]>::new(span),
-                        bracket_token: token::Bracket(span),
-                    }
-                }
-            )
-        ));
-    }
-
-    enum Comment {
-        Inner,
-        Outer,
-    }
-
-    fn lit_doc_comment(input: Cursor, style: Comment) -> PResult<TokenTree> {
-        match input.literal() {
-            Some((lit, rest)) => {
-                let string = lit.to_string();
-                let ok = match style {
-                    Comment::Inner => string.starts_with("//!") || string.starts_with("/*!"),
-                    Comment::Outer => string.starts_with("///") || string.starts_with("/**"),
-                };
-                if ok {
-                    let mut new = Literal::string(&string);
-                    new.set_span(lit.span());
-                    Ok((new.into(), rest))
-                } else {
-                    parse_error()
-                }
-            }
-            _ => parse_error(),
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use proc_macro2::TokenStream;
-    use quote::ToTokens;
-
-    impl ToTokens for Attribute {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.pound_token.to_tokens(tokens);
-            if let AttrStyle::Inner(ref b) = self.style {
-                b.to_tokens(tokens);
-            }
-            self.bracket_token.surround(tokens, |tokens| {
-                self.path.to_tokens(tokens);
-                self.tts.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for MetaList {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.ident.to_tokens(tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                self.nested.to_tokens(tokens);
-            })
-        }
-    }
-
-    impl ToTokens for MetaNameValue {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.ident.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.lit.to_tokens(tokens);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/buffer.rs b/third_party/rust/syn-0.14.6/src/buffer.rs
deleted file mode 100644
index cc054859604f..000000000000
--- a/third_party/rust/syn-0.14.6/src/buffer.rs
+++ /dev/null
@@ -1,463 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! A stably addressed token buffer supporting efficient traversal based on a
-//! cheaply copyable cursor.
-//!
-//! The [`Synom`] trait is implemented for syntax tree types that can be parsed
-//! from one of these token cursors.
-//!
-//! [`Synom`]: ../synom/trait.Synom.html
-//!
-//! *This module is available if Syn is built with the `"parsing"` feature.*
-//!
-//! # Example
-//!
-//! This example shows a basic token parser for parsing a token stream without
-//! using Syn's parser combinator macros.
-//!
-//! ```
-//! #![feature(proc_macro_diagnostic)]
-//!
-//! extern crate syn;
-//! extern crate proc_macro;
-//!
-//! #[macro_use]
-//! extern crate quote;
-//!
-//! use syn::{token, ExprTuple};
-//! use syn::buffer::{Cursor, TokenBuffer};
-//! use syn::spanned::Spanned;
-//! use syn::synom::Synom;
-//! use proc_macro::{Diagnostic, Span, TokenStream};
-//!
-//! /// A basic token parser for parsing a token stream without using Syn's
-//! /// parser combinator macros.
-//! pub struct Parser<'a> {
-//!     cursor: Cursor<'a>,
-//! }
-//!
-//! impl<'a> Parser<'a> {
-//!     pub fn new(cursor: Cursor<'a>) -> Self {
-//!         Parser { cursor }
-//!     }
-//!
-//!     pub fn current_span(&self) -> Span {
-//!         self.cursor.span().unstable()
-//!     }
-//!
-//!     pub fn parse<T: Synom>(&mut self) -> Result<T, Diagnostic> {
-//!         let (val, rest) = T::parse(self.cursor)
-//!             .map_err(|e| match T::description() {
-//!                 Some(desc) => {
-//!                     self.current_span().error(format!("{}: expected {}", e, desc))
-//!                 }
-//!                 None => {
-//!                     self.current_span().error(e.to_string())
-//!                 }
-//!             })?;
-//!
-//!         self.cursor = rest;
-//!         Ok(val)
-//!     }
-//!
-//!     pub fn expect_eof(&mut self) -> Result<(), Diagnostic> {
-//!         if !self.cursor.eof() {
-//!             return Err(self.current_span().error("trailing characters; expected eof"));
-//!         }
-//!
-//!         Ok(())
-//!     }
-//! }
-//!
-//! fn eval(input: TokenStream) -> Result<TokenStream, Diagnostic> {
-//!     let buffer = TokenBuffer::new(input);
-//!     let mut parser = Parser::new(buffer.begin());
-//!
-//!     // Parse some syntax tree types out of the input tokens. In this case we
-//!     // expect something like:
-//!     //
-//!     //     (a, b, c) = (1, 2, 3)
-//!     let a = parser.parse::<ExprTuple>()?;
-//!     parser.parse::<token::Eq>()?;
-//!     let b = parser.parse::<ExprTuple>()?;
-//!     parser.expect_eof()?;
-//!
-//!     // Perform some validation and report errors.
-//!     let (a_len, b_len) = (a.elems.len(), b.elems.len());
-//!     if a_len != b_len {
-//!         let diag = b.span().unstable()
-//!             .error(format!("expected {} element(s), got {}", a_len, b_len))
-//!             .span_note(a.span().unstable(), "because of this");
-//!
-//!         return Err(diag);
-//!     }
-//!
-//!     // Build the output tokens.
-//!     let out = quote! {
-//!         println!("All good! Received two tuples of size {}", #a_len);
-//!     };
-//!
-//!     Ok(out.into())
-//! }
-//! #
-//! # extern crate proc_macro2;
-//! #
-//! # // This method exists on proc_macro2::Span but is behind the "nightly"
-//! # // feature.
-//! # trait ToUnstableSpan {
-//! #     fn unstable(&self) -> Span;
-//! # }
-//! #
-//! # impl ToUnstableSpan for proc_macro2::Span {
-//! #     fn unstable(&self) -> Span {
-//! #         unimplemented!()
-//! #     }
-//! # }
-//! #
-//! # fn main() {}
-//! ```
-
-// This module is heavily commented as it contains the only unsafe code in Syn,
-// and caution should be used when editing it. The public-facing interface is
-// 100% safe but the implementation is fragile internally.
-
-#[cfg(feature = "proc-macro")]
-use proc_macro as pm;
-use proc_macro2::{Delimiter, Ident, Literal, Span, TokenStream};
-use proc_macro2::{Group, Punct, TokenTree};
-
-use std::marker::PhantomData;
-use std::ptr;
-
-#[cfg(synom_verbose_trace)]
-use std::fmt::{self, Debug};
-
-/// Internal type which is used instead of `TokenTree` to represent a token tree
-/// within a `TokenBuffer`.
-enum Entry {
-    // Mimicking types from proc-macro.
-    Group(Span, Delimiter, TokenBuffer),
-    Ident(Ident),
-    Punct(Punct),
-    Literal(Literal),
-    // End entries contain a raw pointer to the entry from the containing
-    // token tree, or null if this is the outermost level.
-    End(*const Entry),
-}
-
-/// A buffer that can be efficiently traversed multiple times, unlike
-/// `TokenStream` which requires a deep copy in order to traverse more than
-/// once.
-///
-/// See the [module documentation] for an example of `TokenBuffer` in action.
-///
-/// [module documentation]: index.html
-///
-/// *This type is available if Syn is built with the `"parsing"` feature.*
-pub struct TokenBuffer {
-    // NOTE: Do not derive clone on this - there are raw pointers inside which
-    // will be messed up. Moving the `TokenBuffer` itself is safe as the actual
-    // backing slices won't be moved.
-    data: Box<[Entry]>,
-}
-
-impl TokenBuffer {
-    // NOTE: DO NOT MUTATE THE `Vec` RETURNED FROM THIS FUNCTION ONCE IT
-    // RETURNS, THE ADDRESS OF ITS BACKING MEMORY MUST REMAIN STABLE.
-    fn inner_new(stream: TokenStream, up: *const Entry) -> TokenBuffer {
-        // Build up the entries list, recording the locations of any Groups
-        // in the list to be processed later.
-        let mut entries = Vec::new();
-        let mut seqs = Vec::new();
-        for tt in stream {
-            match tt {
-                TokenTree::Ident(sym) => {
-                    entries.push(Entry::Ident(sym));
-                }
-                TokenTree::Punct(op) => {
-                    entries.push(Entry::Punct(op));
-                }
-                TokenTree::Literal(l) => {
-                    entries.push(Entry::Literal(l));
-                }
-                TokenTree::Group(g) => {
-                    // Record the index of the interesting entry, and store an
-                    // `End(null)` there temporarially.
-                    seqs.push((entries.len(), g.span(), g.delimiter(), g.stream().clone()));
-                    entries.push(Entry::End(ptr::null()));
-                }
-            }
-        }
-        // Add an `End` entry to the end with a reference to the enclosing token
-        // stream which was passed in.
-        entries.push(Entry::End(up));
-
-        // NOTE: This is done to ensure that we don't accidentally modify the
-        // length of the backing buffer. The backing buffer must remain at a
-        // constant address after this point, as we are going to store a raw
-        // pointer into it.
-        let mut entries = entries.into_boxed_slice();
-        for (idx, span, delim, seq_stream) in seqs {
-            // We know that this index refers to one of the temporary
-            // `End(null)` entries, and we know that the last entry is
-            // `End(up)`, so the next index is also valid.
-            let seq_up = &entries[idx + 1] as *const Entry;
-
-            // The end entry stored at the end of this Entry::Group should
-            // point to the Entry which follows the Group in the list.
-            let inner = Self::inner_new(seq_stream, seq_up);
-            entries[idx] = Entry::Group(span, delim, inner);
-        }
-
-        TokenBuffer { data: entries }
-    }
-
-    /// Creates a `TokenBuffer` containing all the tokens from the input
-    /// `TokenStream`.
-    ///
-    /// *This method is available if Syn is built with both the `"parsing"` and
-    /// `"proc-macro"` features.*
-    #[cfg(feature = "proc-macro")]
-    pub fn new(stream: pm::TokenStream) -> TokenBuffer {
-        Self::new2(stream.into())
-    }
-
-    /// Creates a `TokenBuffer` containing all the tokens from the input
-    /// `TokenStream`.
-    pub fn new2(stream: TokenStream) -> TokenBuffer {
-        Self::inner_new(stream, ptr::null())
-    }
-
-    /// Creates a cursor referencing the first token in the buffer and able to
-    /// traverse until the end of the buffer.
-    pub fn begin(&self) -> Cursor {
-        unsafe { Cursor::create(&self.data[0], &self.data[self.data.len() - 1]) }
-    }
-}
-
-/// A cheaply copyable cursor into a `TokenBuffer`.
-///
-/// This cursor holds a shared reference into the immutable data which is used
-/// internally to represent a `TokenStream`, and can be efficiently manipulated
-/// and copied around.
-///
-/// An empty `Cursor` can be created directly, or one may create a `TokenBuffer`
-/// object and get a cursor to its first token with `begin()`.
-///
-/// Two cursors are equal if they have the same location in the same input
-/// stream, and have the same scope.
-///
-/// See the [module documentation] for an example of a `Cursor` in action.
-///
-/// [module documentation]: index.html
-///
-/// *This type is available if Syn is built with the `"parsing"` feature.*
-#[derive(Copy, Clone, Eq, PartialEq)]
-pub struct Cursor<'a> {
-    /// The current entry which the `Cursor` is pointing at.
-    ptr: *const Entry,
-    /// This is the only `Entry::End(..)` object which this cursor is allowed to
-    /// point at. All other `End` objects are skipped over in `Cursor::create`.
-    scope: *const Entry,
-    /// This uses the &'a reference which guarantees that these pointers are
-    /// still valid.
-    marker: PhantomData<&'a Entry>,
-}
-
-impl<'a> Cursor<'a> {
-    /// Creates a cursor referencing a static empty TokenStream.
-    pub fn empty() -> Self {
-        // It's safe in this situation for us to put an `Entry` object in global
-        // storage, despite it not actually being safe to send across threads
-        // (`Ident` is a reference into a thread-local table). This is because
-        // this entry never includes a `Ident` object.
-        //
-        // This wrapper struct allows us to break the rules and put a `Sync`
-        // object in global storage.
-        struct UnsafeSyncEntry(Entry);
-        unsafe impl Sync for UnsafeSyncEntry {}
-        static EMPTY_ENTRY: UnsafeSyncEntry = UnsafeSyncEntry(Entry::End(0 as *const Entry));
-
-        Cursor {
-            ptr: &EMPTY_ENTRY.0,
-            scope: &EMPTY_ENTRY.0,
-            marker: PhantomData,
-        }
-    }
-
-    /// This create method intelligently exits non-explicitly-entered
-    /// `None`-delimited scopes when the cursor reaches the end of them,
-    /// allowing for them to be treated transparently.
-    unsafe fn create(mut ptr: *const Entry, scope: *const Entry) -> Self {
-        // NOTE: If we're looking at a `End(..)`, we want to advance the cursor
-        // past it, unless `ptr == scope`, which means that we're at the edge of
-        // our cursor's scope. We should only have `ptr != scope` at the exit
-        // from None-delimited groups entered with `ignore_none`.
-        while let Entry::End(exit) = *ptr {
-            if ptr == scope {
-                break;
-            }
-            ptr = exit;
-        }
-
-        Cursor {
-            ptr: ptr,
-            scope: scope,
-            marker: PhantomData,
-        }
-    }
-
-    /// Get the current entry.
-    fn entry(self) -> &'a Entry {
-        unsafe { &*self.ptr }
-    }
-
-    /// Bump the cursor to point at the next token after the current one. This
-    /// is undefined behavior if the cursor is currently looking at an
-    /// `Entry::End`.
-    unsafe fn bump(self) -> Cursor<'a> {
-        Cursor::create(self.ptr.offset(1), self.scope)
-    }
-
-    /// If the cursor is looking at a `None`-delimited group, move it to look at
-    /// the first token inside instead. If the group is empty, this will move
-    /// the cursor past the `None`-delimited group.
-    ///
-    /// WARNING: This mutates its argument.
-    fn ignore_none(&mut self) {
-        if let Entry::Group(_, Delimiter::None, ref buf) = *self.entry() {
-            // NOTE: We call `Cursor::create` here to make sure that situations
-            // where we should immediately exit the span after entering it are
-            // handled correctly.
-            unsafe {
-                *self = Cursor::create(&buf.data[0], self.scope);
-            }
-        }
-    }
-
-    /// Checks whether the cursor is currently pointing at the end of its valid
-    /// scope.
-    #[inline]
-    pub fn eof(self) -> bool {
-        // We're at eof if we're at the end of our scope.
-        self.ptr == self.scope
-    }
-
-    /// If the cursor is pointing at a `Group` with the given delimiter, returns
-    /// a cursor into that group and one pointing to the next `TokenTree`.
-    pub fn group(mut self, delim: Delimiter) -> Option<(Cursor<'a>, Span, Cursor<'a>)> {
-        // If we're not trying to enter a none-delimited group, we want to
-        // ignore them. We have to make sure to _not_ ignore them when we want
-        // to enter them, of course. For obvious reasons.
-        if delim != Delimiter::None {
-            self.ignore_none();
-        }
-
-        if let Entry::Group(span, group_delim, ref buf) = *self.entry() {
-            if group_delim == delim {
-                return Some((buf.begin(), span, unsafe { self.bump() }));
-            }
-        }
-
-        None
-    }
-
-    /// If the cursor is pointing at a `Ident`, returns it along with a cursor
-    /// pointing at the next `TokenTree`.
-    pub fn ident(mut self) -> Option<(Ident, Cursor<'a>)> {
-        self.ignore_none();
-        match *self.entry() {
-            Entry::Ident(ref ident) => Some((ident.clone(), unsafe { self.bump() })),
-            _ => None,
-        }
-    }
-
-    /// If the cursor is pointing at an `Punct`, returns it along with a cursor
-    /// pointing at the next `TokenTree`.
-    pub fn punct(mut self) -> Option<(Punct, Cursor<'a>)> {
-        self.ignore_none();
-        match *self.entry() {
-            Entry::Punct(ref op) => Some((op.clone(), unsafe { self.bump() })),
-            _ => None,
-        }
-    }
-
-    /// If the cursor is pointing at a `Literal`, return it along with a cursor
-    /// pointing at the next `TokenTree`.
-    pub fn literal(mut self) -> Option<(Literal, Cursor<'a>)> {
-        self.ignore_none();
-        match *self.entry() {
-            Entry::Literal(ref lit) => Some((lit.clone(), unsafe { self.bump() })),
-            _ => None,
-        }
-    }
-
-    /// Copies all remaining tokens visible from this cursor into a
-    /// `TokenStream`.
-    pub fn token_stream(self) -> TokenStream {
-        let mut tts = Vec::new();
-        let mut cursor = self;
-        while let Some((tt, rest)) = cursor.token_tree() {
-            tts.push(tt);
-            cursor = rest;
-        }
-        tts.into_iter().collect()
-    }
-
-    /// If the cursor is pointing at a `TokenTree`, returns it along with a
-    /// cursor pointing at the next `TokenTree`.
-    ///
-    /// Returns `None` if the cursor has reached the end of its stream.
-    ///
-    /// This method does not treat `None`-delimited groups as transparent, and
-    /// will return a `Group(None, ..)` if the cursor is looking at one.
-    pub fn token_tree(self) -> Option<(TokenTree, Cursor<'a>)> {
-        let tree = match *self.entry() {
-            Entry::Group(span, delim, ref buf) => {
-                let stream = buf.begin().token_stream();
-                let mut g = Group::new(delim, stream);
-                g.set_span(span);
-                TokenTree::from(g)
-            }
-            Entry::Literal(ref lit) => lit.clone().into(),
-            Entry::Ident(ref ident) => ident.clone().into(),
-            Entry::Punct(ref op) => op.clone().into(),
-            Entry::End(..) => {
-                return None;
-            }
-        };
-
-        Some((tree, unsafe { self.bump() }))
-    }
-
-    /// Returns the `Span` of the current token, or `Span::call_site()` if this
-    /// cursor points to eof.
-    pub fn span(self) -> Span {
-        match *self.entry() {
-            Entry::Group(span, ..) => span,
-            Entry::Literal(ref l) => l.span(),
-            Entry::Ident(ref t) => t.span(),
-            Entry::Punct(ref o) => o.span(),
-            Entry::End(..) => Span::call_site(),
-        }
-    }
-}
-
-// We do a custom implementation for `Debug` as the default implementation is
-// pretty useless.
-#[cfg(synom_verbose_trace)]
-impl<'a> Debug for Cursor<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        // Print what the cursor is currently looking at.
-        // This will look like Cursor("some remaining tokens here")
-        f.debug_tuple("Cursor")
-            .field(&self.token_stream().to_string())
-            .finish()
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/data.rs b/third_party/rust/syn-0.14.6/src/data.rs
deleted file mode 100644
index 3d1924ad74b1..000000000000
--- a/third_party/rust/syn-0.14.6/src/data.rs
+++ /dev/null
@@ -1,393 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use punctuated::Punctuated;
-
-ast_struct! {
-    /// An enum variant.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct Variant {
-        /// Attributes tagged on the variant.
-        pub attrs: Vec<Attribute>,
-
-        /// Name of the variant.
-        pub ident: Ident,
-
-        /// Content stored in the variant.
-        pub fields: Fields,
-
-        /// Explicit discriminant: `Variant = 1`
-        pub discriminant: Option<(Token![=], Expr)>,
-    }
-}
-
-ast_enum_of_structs! {
-    /// Data stored within an enum variant or struct.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum Fields {
-        /// Named fields of a struct or struct variant such as `Point { x: f64,
-        /// y: f64 }`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Named(FieldsNamed {
-            pub brace_token: token::Brace,
-            pub named: Punctuated<Field, Token![,]>,
-        }),
-
-        /// Unnamed fields of a tuple struct or tuple variant such as `Some(T)`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Unnamed(FieldsUnnamed {
-            pub paren_token: token::Paren,
-            pub unnamed: Punctuated<Field, Token![,]>,
-        }),
-
-        /// Unit struct or unit variant such as `None`.
-        pub Unit,
-    }
-}
-
-impl Fields {
-    /// Get an iterator over the [`Field`] items in this object. This iterator
-    /// can be used to iterate over a named or unnamed struct or variant's
-    /// fields uniformly.
-    ///
-    /// [`Field`]: struct.Field.html
-    pub fn iter(&self) -> punctuated::Iter<Field> {
-        match *self {
-            Fields::Unit => punctuated::Iter::private_empty(),
-            Fields::Named(ref f) => f.named.iter(),
-            Fields::Unnamed(ref f) => f.unnamed.iter(),
-        }
-    }
-}
-
-impl<'a> IntoIterator for &'a Fields {
-    type Item = &'a Field;
-    type IntoIter = punctuated::Iter<'a, Field>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.iter()
-    }
-}
-
-ast_struct! {
-    /// A field of a struct or enum variant.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct Field {
-        /// Attributes tagged on the field.
-        pub attrs: Vec<Attribute>,
-
-        /// Visibility of the field.
-        pub vis: Visibility,
-
-        /// Name of the field, if any.
-        ///
-        /// Fields of tuple structs have no names.
-        pub ident: Option<Ident>,
-
-        pub colon_token: Option<Token![:]>,
-
-        /// Type of the field.
-        pub ty: Type,
-    }
-}
-
-ast_enum_of_structs! {
-    /// The visibility level of an item: inherited or `pub` or
-    /// `pub(restricted)`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum Visibility {
-        /// A public visibility level: `pub`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Public(VisPublic {
-            pub pub_token: Token![pub],
-        }),
-
-        /// A crate-level visibility: `crate`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Crate(VisCrate {
-            pub crate_token: Token![crate],
-        }),
-
-        /// A visibility level restricted to some path: `pub(self)` or
-        /// `pub(super)` or `pub(crate)` or `pub(in some::module)`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Restricted(VisRestricted {
-            pub pub_token: Token![pub],
-            pub paren_token: token::Paren,
-            pub in_token: Option<Token![in]>,
-            pub path: Box<Path>,
-        }),
-
-        /// An inherited visibility, which usually means private.
-        pub Inherited,
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-
-    use synom::Synom;
-
-    impl Synom for Variant {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            id: syn!(Ident) >>
-            fields: alt!(
-                syn!(FieldsNamed) => { Fields::Named }
-                |
-                syn!(FieldsUnnamed) => { Fields::Unnamed }
-                |
-                epsilon!() => { |_| Fields::Unit }
-            ) >>
-            disr: option!(tuple!(punct!(=), syn!(Expr))) >>
-            (Variant {
-                ident: id,
-                attrs: attrs,
-                fields: fields,
-                discriminant: disr,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("enum variant")
-        }
-    }
-
-    impl Synom for FieldsNamed {
-        named!(parse -> Self, map!(
-            braces!(call!(Punctuated::parse_terminated_with, Field::parse_named)),
-            |(brace, fields)| FieldsNamed {
-                brace_token: brace,
-                named: fields,
-            }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("named fields in a struct or struct variant")
-        }
-    }
-
-    impl Synom for FieldsUnnamed {
-        named!(parse -> Self, map!(
-            parens!(call!(Punctuated::parse_terminated_with, Field::parse_unnamed)),
-            |(paren, fields)| FieldsUnnamed {
-                paren_token: paren,
-                unnamed: fields,
-            }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("unnamed fields in a tuple struct or tuple variant")
-        }
-    }
-
-    impl Field {
-        named!(pub parse_named -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            vis: syn!(Visibility) >>
-            id: syn!(Ident) >>
-            colon: punct!(:) >>
-            ty: syn!(Type) >>
-            (Field {
-                ident: Some(id),
-                vis: vis,
-                attrs: attrs,
-                ty: ty,
-                colon_token: Some(colon),
-            })
-        ));
-
-        named!(pub parse_unnamed -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            vis: syn!(Visibility) >>
-            ty: syn!(Type) >>
-            (Field {
-                ident: None,
-                colon_token: None,
-                vis: vis,
-                attrs: attrs,
-                ty: ty,
-            })
-        ));
-    }
-
-    impl Synom for Visibility {
-        named!(parse -> Self, alt!(
-            do_parse!(
-                pub_token: keyword!(pub) >>
-                other: parens!(keyword!(crate)) >>
-                (Visibility::Restricted(VisRestricted {
-                    pub_token: pub_token,
-                    paren_token: other.0,
-                    in_token: None,
-                    path: Box::new(other.1.into()),
-                }))
-            )
-            |
-            do_parse!(
-                crate_token: keyword!(crate) >>
-                not!(punct!(::)) >>
-                (Visibility::Crate(VisCrate {
-                    crate_token: crate_token,
-                }))
-            )
-            |
-            do_parse!(
-                pub_token: keyword!(pub) >>
-                other: parens!(keyword!(self)) >>
-                (Visibility::Restricted(VisRestricted {
-                    pub_token: pub_token,
-                    paren_token: other.0,
-                    in_token: None,
-                    path: Box::new(other.1.into()),
-                }))
-            )
-            |
-            do_parse!(
-                pub_token: keyword!(pub) >>
-                other: parens!(keyword!(super)) >>
-                (Visibility::Restricted(VisRestricted {
-                    pub_token: pub_token,
-                    paren_token: other.0,
-                    in_token: None,
-                    path: Box::new(other.1.into()),
-                }))
-            )
-            |
-            do_parse!(
-                pub_token: keyword!(pub) >>
-                other: parens!(do_parse!(
-                    in_tok: keyword!(in) >>
-                    restricted: call!(Path::parse_mod_style) >>
-                    (in_tok, restricted)
-                )) >>
-                (Visibility::Restricted(VisRestricted {
-                    pub_token: pub_token,
-                    paren_token: other.0,
-                    in_token: Some((other.1).0),
-                    path: Box::new((other.1).1),
-                }))
-            )
-            |
-            keyword!(pub) => { |tok| {
-                Visibility::Public(VisPublic {
-                    pub_token: tok,
-                })
-            } }
-            |
-            epsilon!() => { |_| Visibility::Inherited }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("visibility qualifier such as `pub`")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use proc_macro2::TokenStream;
-    use quote::{ToTokens, TokenStreamExt};
-
-    impl ToTokens for Variant {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(&self.attrs);
-            self.ident.to_tokens(tokens);
-            self.fields.to_tokens(tokens);
-            if let Some((ref eq_token, ref disc)) = self.discriminant {
-                eq_token.to_tokens(tokens);
-                disc.to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for FieldsNamed {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.brace_token.surround(tokens, |tokens| {
-                self.named.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for FieldsUnnamed {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.paren_token.surround(tokens, |tokens| {
-                self.unnamed.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for Field {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(&self.attrs);
-            self.vis.to_tokens(tokens);
-            if let Some(ref ident) = self.ident {
-                ident.to_tokens(tokens);
-                TokensOrDefault(&self.colon_token).to_tokens(tokens);
-            }
-            self.ty.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for VisPublic {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.pub_token.to_tokens(tokens)
-        }
-    }
-
-    impl ToTokens for VisCrate {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.crate_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for VisRestricted {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.pub_token.to_tokens(tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                // XXX: If we have a path which is not "self" or "super" or
-                // "crate", automatically add the "in" token.
-                self.in_token.to_tokens(tokens);
-                self.path.to_tokens(tokens);
-            });
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/derive.rs b/third_party/rust/syn-0.14.6/src/derive.rs
deleted file mode 100644
index ecef7762c8bb..000000000000
--- a/third_party/rust/syn-0.14.6/src/derive.rs
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use punctuated::Punctuated;
-
-ast_struct! {
-    /// Data structure sent to a `proc_macro_derive` macro.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` feature.*
-    pub struct DeriveInput {
-        /// Attributes tagged on the whole struct or enum.
-        pub attrs: Vec<Attribute>,
-
-        /// Visibility of the struct or enum.
-        pub vis: Visibility,
-
-        /// Name of the struct or enum.
-        pub ident: Ident,
-
-        /// Generics required to complete the definition.
-        pub generics: Generics,
-
-        /// Data within the struct or enum.
-        pub data: Data,
-    }
-}
-
-ast_enum_of_structs! {
-    /// The storage of a struct, enum or union data structure.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum Data {
-        /// A struct input to a `proc_macro_derive` macro.
-        ///
-        /// *This type is available if Syn is built with the `"derive"`
-        /// feature.*
-        pub Struct(DataStruct {
-            pub struct_token: Token![struct],
-            pub fields: Fields,
-            pub semi_token: Option<Token![;]>,
-        }),
-
-        /// An enum input to a `proc_macro_derive` macro.
-        ///
-        /// *This type is available if Syn is built with the `"derive"`
-        /// feature.*
-        pub Enum(DataEnum {
-            pub enum_token: Token![enum],
-            pub brace_token: token::Brace,
-            pub variants: Punctuated<Variant, Token![,]>,
-        }),
-
-        /// A tagged union input to a `proc_macro_derive` macro.
-        ///
-        /// *This type is available if Syn is built with the `"derive"`
-        /// feature.*
-        pub Union(DataUnion {
-            pub union_token: Token![union],
-            pub fields: FieldsNamed,
-        }),
-    }
-
-    do_not_generate_to_tokens
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-
-    use synom::Synom;
-
-    enum DeriveInputKind {
-        Struct(Token![struct]),
-        Enum(Token![enum]),
-        Union(Token![union]),
-    }
-
-    impl Synom for DeriveInputKind {
-        named!(parse -> Self, alt!(
-            keyword!(struct) => { DeriveInputKind::Struct }
-            |
-            keyword!(enum) => { DeriveInputKind::Enum }
-            |
-            keyword!(union) => { DeriveInputKind::Union }
-        ));
-    }
-
-    impl Synom for DeriveInput {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            vis: syn!(Visibility) >>
-            which: syn!(DeriveInputKind) >>
-            id: syn!(Ident) >>
-            generics: syn!(Generics) >>
-            item: switch!(value!(which),
-                DeriveInputKind::Struct(s) => map!(data_struct, move |(wh, fields, semi)| DeriveInput {
-                    ident: id,
-                    vis: vis,
-                    attrs: attrs,
-                    generics: Generics {
-                        where_clause: wh,
-                        ..generics
-                    },
-                    data: Data::Struct(DataStruct {
-                        struct_token: s,
-                        fields: fields,
-                        semi_token: semi,
-                    }),
-                })
-                |
-                DeriveInputKind::Enum(e) => map!(data_enum, move |(wh, brace, variants)| DeriveInput {
-                    ident: id,
-                    vis: vis,
-                    attrs: attrs,
-                    generics: Generics {
-                        where_clause: wh,
-                        ..generics
-                    },
-                    data: Data::Enum(DataEnum {
-                        variants: variants,
-                        brace_token: brace,
-                        enum_token: e,
-                    }),
-                })
-                |
-                DeriveInputKind::Union(u) => map!(data_union, move |(wh, fields)| DeriveInput {
-                    ident: id,
-                    vis: vis,
-                    attrs: attrs,
-                    generics: Generics {
-                        where_clause: wh,
-                        ..generics
-                    },
-                    data: Data::Union(DataUnion {
-                        union_token: u,
-                        fields: fields,
-                    }),
-                })
-            ) >>
-            (item)
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("derive input")
-        }
-    }
-
-    named!(data_struct -> (Option<WhereClause>, Fields, Option<Token![;]>), alt!(
-        do_parse!(
-            wh: option!(syn!(WhereClause)) >>
-            fields: syn!(FieldsNamed) >>
-            (wh, Fields::Named(fields), None)
-        )
-        |
-        do_parse!(
-            fields: syn!(FieldsUnnamed) >>
-            wh: option!(syn!(WhereClause)) >>
-            semi: punct!(;) >>
-            (wh, Fields::Unnamed(fields), Some(semi))
-        )
-        |
-        do_parse!(
-            wh: option!(syn!(WhereClause)) >>
-            semi: punct!(;) >>
-            (wh, Fields::Unit, Some(semi))
-        )
-    ));
-
-    named!(data_enum -> (Option<WhereClause>, token::Brace, Punctuated<Variant, Token![,]>), do_parse!(
-        wh: option!(syn!(WhereClause)) >>
-        data: braces!(Punctuated::parse_terminated) >>
-        (wh, data.0, data.1)
-    ));
-
-    named!(data_union -> (Option<WhereClause>, FieldsNamed), tuple!(
-        option!(syn!(WhereClause)),
-        syn!(FieldsNamed),
-    ));
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use attr::FilterAttrs;
-    use proc_macro2::TokenStream;
-    use quote::ToTokens;
-
-    impl ToTokens for DeriveInput {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            for attr in self.attrs.outer() {
-                attr.to_tokens(tokens);
-            }
-            self.vis.to_tokens(tokens);
-            match self.data {
-                Data::Struct(ref d) => d.struct_token.to_tokens(tokens),
-                Data::Enum(ref d) => d.enum_token.to_tokens(tokens),
-                Data::Union(ref d) => d.union_token.to_tokens(tokens),
-            }
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            match self.data {
-                Data::Struct(ref data) => match data.fields {
-                    Fields::Named(ref fields) => {
-                        self.generics.where_clause.to_tokens(tokens);
-                        fields.to_tokens(tokens);
-                    }
-                    Fields::Unnamed(ref fields) => {
-                        fields.to_tokens(tokens);
-                        self.generics.where_clause.to_tokens(tokens);
-                        TokensOrDefault(&data.semi_token).to_tokens(tokens);
-                    }
-                    Fields::Unit => {
-                        self.generics.where_clause.to_tokens(tokens);
-                        TokensOrDefault(&data.semi_token).to_tokens(tokens);
-                    }
-                },
-                Data::Enum(ref data) => {
-                    self.generics.where_clause.to_tokens(tokens);
-                    data.brace_token.surround(tokens, |tokens| {
-                        data.variants.to_tokens(tokens);
-                    });
-                }
-                Data::Union(ref data) => {
-                    self.generics.where_clause.to_tokens(tokens);
-                    data.fields.to_tokens(tokens);
-                }
-            }
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/error.rs b/third_party/rust/syn-0.14.6/src/error.rs
deleted file mode 100644
index 6673aa3d923e..000000000000
--- a/third_party/rust/syn-0.14.6/src/error.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use buffer::Cursor;
-use std::error::Error;
-use std::fmt::{self, Display};
-
-/// The result of a `Synom` parser.
-///
-/// Refer to the [module documentation] for details about parsing in Syn.
-///
-/// [module documentation]: index.html
-///
-/// *This type is available if Syn is built with the `"parsing"` feature.*
-pub type PResult<'a, O> = Result<(O, Cursor<'a>), ParseError>;
-
-/// An error with a default error message.
-///
-/// NOTE: We should provide better error messages in the future.
-pub fn parse_error<'a, O>() -> PResult<'a, O> {
-    Err(ParseError(None))
-}
-
-/// Error returned when a `Synom` parser cannot parse the input tokens.
-///
-/// Refer to the [module documentation] for details about parsing in Syn.
-///
-/// [module documentation]: index.html
-///
-/// *This type is available if Syn is built with the `"parsing"` feature.*
-#[derive(Debug)]
-pub struct ParseError(Option<String>);
-
-impl Error for ParseError {
-    fn description(&self) -> &str {
-        match self.0 {
-            Some(ref desc) => desc,
-            None => "failed to parse",
-        }
-    }
-}
-
-impl Display for ParseError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        Display::fmt(self.description(), f)
-    }
-}
-
-impl ParseError {
-    // For syn use only. Not public API.
-    #[doc(hidden)]
-    pub fn new<T: Into<String>>(msg: T) -> Self {
-        ParseError(Some(msg.into()))
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/expr.rs b/third_party/rust/syn-0.14.6/src/expr.rs
deleted file mode 100644
index 979de7191b1a..000000000000
--- a/third_party/rust/syn-0.14.6/src/expr.rs
+++ /dev/null
@@ -1,3836 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use proc_macro2::{Span, TokenStream};
-use punctuated::Punctuated;
-#[cfg(feature = "extra-traits")]
-use std::hash::{Hash, Hasher};
-#[cfg(feature = "full")]
-use std::mem;
-#[cfg(feature = "extra-traits")]
-use tt::TokenStreamHelper;
-
-ast_enum_of_structs! {
-    /// A Rust expression.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax tree enums
-    ///
-    /// This type is a syntax tree enum. In Syn this and other syntax tree enums
-    /// are designed to be traversed using the following rebinding idiom.
-    ///
-    /// ```
-    /// # use syn::Expr;
-    /// #
-    /// # fn example(expr: Expr) {
-    /// # const IGNORE: &str = stringify! {
-    /// let expr: Expr = /* ... */;
-    /// # };
-    /// match expr {
-    ///     Expr::MethodCall(expr) => {
-    ///         /* ... */
-    ///     }
-    ///     Expr::Cast(expr) => {
-    ///         /* ... */
-    ///     }
-    ///     Expr::IfLet(expr) => {
-    ///         /* ... */
-    ///     }
-    ///     /* ... */
-    ///     # _ => {}
-    /// }
-    /// # }
-    /// ```
-    ///
-    /// We begin with a variable `expr` of type `Expr` that has no fields
-    /// (because it is an enum), and by matching on it and rebinding a variable
-    /// with the same name `expr` we effectively imbue our variable with all of
-    /// the data fields provided by the variant that it turned out to be. So for
-    /// example above if we ended up in the `MethodCall` case then we get to use
-    /// `expr.receiver`, `expr.args` etc; if we ended up in the `IfLet` case we
-    /// get to use `expr.pat`, `expr.then_branch`, `expr.else_branch`.
-    ///
-    /// The pattern is similar if the input expression is borrowed:
-    ///
-    /// ```
-    /// # use syn::Expr;
-    /// #
-    /// # fn example(expr: &Expr) {
-    /// match *expr {
-    ///     Expr::MethodCall(ref expr) => {
-    /// #   }
-    /// #   _ => {}
-    /// # }
-    /// # }
-    /// ```
-    ///
-    /// This approach avoids repeating the variant names twice on every line.
-    ///
-    /// ```
-    /// # use syn::{Expr, ExprMethodCall};
-    /// #
-    /// # fn example(expr: Expr) {
-    /// # match expr {
-    /// Expr::MethodCall(ExprMethodCall { method, args, .. }) => { // repetitive
-    /// # }
-    /// # _ => {}
-    /// # }
-    /// # }
-    /// ```
-    ///
-    /// In general, the name to which a syntax tree enum variant is bound should
-    /// be a suitable name for the complete syntax tree enum type.
-    ///
-    /// ```
-    /// # use syn::{Expr, ExprField};
-    /// #
-    /// # fn example(discriminant: &ExprField) {
-    /// // Binding is called `base` which is the name I would use if I were
-    /// // assigning `*discriminant.base` without an `if let`.
-    /// if let Expr::Tuple(ref base) = *discriminant.base {
-    /// # }
-    /// # }
-    /// ```
-    ///
-    /// A sign that you may not be choosing the right variable names is if you
-    /// see names getting repeated in your code, like accessing
-    /// `receiver.receiver` or `pat.pat` or `cond.cond`.
-    pub enum Expr {
-        /// A box expression: `box f`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Box(ExprBox #full {
-            pub attrs: Vec<Attribute>,
-            pub box_token: Token![box],
-            pub expr: Box<Expr>,
-        }),
-
-        /// A placement expression: `place <- value`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub InPlace(ExprInPlace #full {
-            pub attrs: Vec<Attribute>,
-            pub place: Box<Expr>,
-            pub arrow_token: Token![<-],
-            pub value: Box<Expr>,
-        }),
-
-        /// A slice literal expression: `[a, b, c, d]`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Array(ExprArray #full {
-            pub attrs: Vec<Attribute>,
-            pub bracket_token: token::Bracket,
-            pub elems: Punctuated<Expr, Token![,]>,
-        }),
-
-        /// A function call expression: `invoke(a, b)`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Call(ExprCall {
-            pub attrs: Vec<Attribute>,
-            pub func: Box<Expr>,
-            pub paren_token: token::Paren,
-            pub args: Punctuated<Expr, Token![,]>,
-        }),
-
-        /// A method call expression: `x.foo::<T>(a, b)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub MethodCall(ExprMethodCall #full {
-            pub attrs: Vec<Attribute>,
-            pub receiver: Box<Expr>,
-            pub dot_token: Token![.],
-            pub method: Ident,
-            pub turbofish: Option<MethodTurbofish>,
-            pub paren_token: token::Paren,
-            pub args: Punctuated<Expr, Token![,]>,
-        }),
-
-        /// A tuple expression: `(a, b, c, d)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Tuple(ExprTuple #full {
-            pub attrs: Vec<Attribute>,
-            pub paren_token: token::Paren,
-            pub elems: Punctuated<Expr, Token![,]>,
-        }),
-
-        /// A binary operation: `a + b`, `a * b`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Binary(ExprBinary {
-            pub attrs: Vec<Attribute>,
-            pub left: Box<Expr>,
-            pub op: BinOp,
-            pub right: Box<Expr>,
-        }),
-
-        /// A unary operation: `!x`, `*x`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Unary(ExprUnary {
-            pub attrs: Vec<Attribute>,
-            pub op: UnOp,
-            pub expr: Box<Expr>,
-        }),
-
-        /// A literal in place of an expression: `1`, `"foo"`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Lit(ExprLit {
-            pub attrs: Vec<Attribute>,
-            pub lit: Lit,
-        }),
-
-        /// A cast expression: `foo as f64`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Cast(ExprCast {
-            pub attrs: Vec<Attribute>,
-            pub expr: Box<Expr>,
-            pub as_token: Token![as],
-            pub ty: Box<Type>,
-        }),
-
-        /// A type ascription expression: `foo: f64`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Type(ExprType #full {
-            pub attrs: Vec<Attribute>,
-            pub expr: Box<Expr>,
-            pub colon_token: Token![:],
-            pub ty: Box<Type>,
-        }),
-
-        /// An `if` expression with an optional `else` block: `if expr { ... }
-        /// else { ... }`.
-        ///
-        /// The `else` branch expression may only be an `If`, `IfLet`, or
-        /// `Block` expression, not any of the other types of expression.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub If(ExprIf #full {
-            pub attrs: Vec<Attribute>,
-            pub if_token: Token![if],
-            pub cond: Box<Expr>,
-            pub then_branch: Block,
-            pub else_branch: Option<(Token![else], Box<Expr>)>,
-        }),
-
-        /// An `if let` expression with an optional `else` block: `if let pat =
-        /// expr { ... } else { ... }`.
-        ///
-        /// The `else` branch expression may only be an `If`, `IfLet`, or
-        /// `Block` expression, not any of the other types of expression.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub IfLet(ExprIfLet #full {
-            pub attrs: Vec<Attribute>,
-            pub if_token: Token![if],
-            pub let_token: Token![let],
-            pub pats: Punctuated<Pat, Token![|]>,
-            pub eq_token: Token![=],
-            pub expr: Box<Expr>,
-            pub then_branch: Block,
-            pub else_branch: Option<(Token![else], Box<Expr>)>,
-        }),
-
-        /// A while loop: `while expr { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub While(ExprWhile #full {
-            pub attrs: Vec<Attribute>,
-            pub label: Option<Label>,
-            pub while_token: Token![while],
-            pub cond: Box<Expr>,
-            pub body: Block,
-        }),
-
-        /// A while-let loop: `while let pat = expr { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub WhileLet(ExprWhileLet #full {
-            pub attrs: Vec<Attribute>,
-            pub label: Option<Label>,
-            pub while_token: Token![while],
-            pub let_token: Token![let],
-            pub pats: Punctuated<Pat, Token![|]>,
-            pub eq_token: Token![=],
-            pub expr: Box<Expr>,
-            pub body: Block,
-        }),
-
-        /// A for loop: `for pat in expr { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub ForLoop(ExprForLoop #full {
-            pub attrs: Vec<Attribute>,
-            pub label: Option<Label>,
-            pub for_token: Token![for],
-            pub pat: Box<Pat>,
-            pub in_token: Token![in],
-            pub expr: Box<Expr>,
-            pub body: Block,
-        }),
-
-        /// Conditionless loop: `loop { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Loop(ExprLoop #full {
-            pub attrs: Vec<Attribute>,
-            pub label: Option<Label>,
-            pub loop_token: Token![loop],
-            pub body: Block,
-        }),
-
-        /// A `match` expression: `match n { Some(n) => {}, None => {} }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Match(ExprMatch #full {
-            pub attrs: Vec<Attribute>,
-            pub match_token: Token![match],
-            pub expr: Box<Expr>,
-            pub brace_token: token::Brace,
-            pub arms: Vec<Arm>,
-        }),
-
-        /// A closure expression: `|a, b| a + b`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Closure(ExprClosure #full {
-            pub attrs: Vec<Attribute>,
-            pub movability: Option<Token![static]>,
-            pub capture: Option<Token![move]>,
-            pub or1_token: Token![|],
-            pub inputs: Punctuated<FnArg, Token![,]>,
-            pub or2_token: Token![|],
-            pub output: ReturnType,
-            pub body: Box<Expr>,
-        }),
-
-        /// An unsafe block: `unsafe { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Unsafe(ExprUnsafe #full {
-            pub attrs: Vec<Attribute>,
-            pub unsafe_token: Token![unsafe],
-            pub block: Block,
-        }),
-
-        /// A blocked scope: `{ ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Block(ExprBlock #full {
-            pub attrs: Vec<Attribute>,
-            pub block: Block,
-        }),
-
-        /// An assignment expression: `a = compute()`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Assign(ExprAssign #full {
-            pub attrs: Vec<Attribute>,
-            pub left: Box<Expr>,
-            pub eq_token: Token![=],
-            pub right: Box<Expr>,
-        }),
-
-        /// A compound assignment expression: `counter += 1`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub AssignOp(ExprAssignOp #full {
-            pub attrs: Vec<Attribute>,
-            pub left: Box<Expr>,
-            pub op: BinOp,
-            pub right: Box<Expr>,
-        }),
-
-        /// Access of a named struct field (`obj.k`) or unnamed tuple struct
-        /// field (`obj.0`).
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Field(ExprField {
-            pub attrs: Vec<Attribute>,
-            pub base: Box<Expr>,
-            pub dot_token: Token![.],
-            pub member: Member,
-        }),
-
-        /// A square bracketed indexing expression: `vector[2]`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Index(ExprIndex {
-            pub attrs: Vec<Attribute>,
-            pub expr: Box<Expr>,
-            pub bracket_token: token::Bracket,
-            pub index: Box<Expr>,
-        }),
-
-        /// A range expression: `1..2`, `1..`, `..2`, `1..=2`, `..=2`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Range(ExprRange #full {
-            pub attrs: Vec<Attribute>,
-            pub from: Option<Box<Expr>>,
-            pub limits: RangeLimits,
-            pub to: Option<Box<Expr>>,
-        }),
-
-        /// A path like `std::mem::replace` possibly containing generic
-        /// parameters and a qualified self-type.
-        ///
-        /// A plain identifier like `x` is a path of length 1.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Path(ExprPath {
-            pub attrs: Vec<Attribute>,
-            pub qself: Option<QSelf>,
-            pub path: Path,
-        }),
-
-        /// A referencing operation: `&a` or `&mut a`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Reference(ExprReference #full {
-            pub attrs: Vec<Attribute>,
-            pub and_token: Token![&],
-            pub mutability: Option<Token![mut]>,
-            pub expr: Box<Expr>,
-        }),
-
-        /// A `break`, with an optional label to break and an optional
-        /// expression.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Break(ExprBreak #full {
-            pub attrs: Vec<Attribute>,
-            pub break_token: Token![break],
-            pub label: Option<Lifetime>,
-            pub expr: Option<Box<Expr>>,
-        }),
-
-        /// A `continue`, with an optional label.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Continue(ExprContinue #full {
-            pub attrs: Vec<Attribute>,
-            pub continue_token: Token![continue],
-            pub label: Option<Lifetime>,
-        }),
-
-        /// A `return`, with an optional value to be returned.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Return(ExprReturn #full {
-            pub attrs: Vec<Attribute>,
-            pub return_token: Token![return],
-            pub expr: Option<Box<Expr>>,
-        }),
-
-        /// A macro invocation expression: `format!("{}", q)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Macro(ExprMacro #full {
-            pub attrs: Vec<Attribute>,
-            pub mac: Macro,
-        }),
-
-        /// A struct literal expression: `Point { x: 1, y: 1 }`.
-        ///
-        /// The `rest` provides the value of the remaining fields as in `S { a:
-        /// 1, b: 1, ..rest }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Struct(ExprStruct #full {
-            pub attrs: Vec<Attribute>,
-            pub path: Path,
-            pub brace_token: token::Brace,
-            pub fields: Punctuated<FieldValue, Token![,]>,
-            pub dot2_token: Option<Token![..]>,
-            pub rest: Option<Box<Expr>>,
-        }),
-
-        /// An array literal constructed from one repeated element: `[0u8; N]`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Repeat(ExprRepeat #full {
-            pub attrs: Vec<Attribute>,
-            pub bracket_token: token::Bracket,
-            pub expr: Box<Expr>,
-            pub semi_token: Token![;],
-            pub len: Box<Expr>,
-        }),
-
-        /// A parenthesized expression: `(a + b)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Paren(ExprParen {
-            pub attrs: Vec<Attribute>,
-            pub paren_token: token::Paren,
-            pub expr: Box<Expr>,
-        }),
-
-        /// An expression contained within invisible delimiters.
-        ///
-        /// This variant is important for faithfully representing the precedence
-        /// of expressions and is related to `None`-delimited spans in a
-        /// `TokenStream`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Group(ExprGroup #full {
-            pub attrs: Vec<Attribute>,
-            pub group_token: token::Group,
-            pub expr: Box<Expr>,
-        }),
-
-        /// A try-expression: `expr?`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Try(ExprTry #full {
-            pub attrs: Vec<Attribute>,
-            pub expr: Box<Expr>,
-            pub question_token: Token![?],
-        }),
-
-        /// A catch expression: `do catch { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Catch(ExprCatch #full {
-            pub attrs: Vec<Attribute>,
-            pub do_token: Token![do],
-            pub catch_token: Token![catch],
-            pub block: Block,
-        }),
-
-        /// A yield expression: `yield expr`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Yield(ExprYield #full {
-            pub attrs: Vec<Attribute>,
-            pub yield_token: Token![yield],
-            pub expr: Option<Box<Expr>>,
-        }),
-
-        /// Tokens in expression position not interpreted by Syn.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Verbatim(ExprVerbatim #manual_extra_traits {
-            pub tts: TokenStream,
-        }),
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for ExprVerbatim {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for ExprVerbatim {
-    fn eq(&self, other: &Self) -> bool {
-        TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for ExprVerbatim {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-impl Expr {
-    // Not public API.
-    #[doc(hidden)]
-    #[cfg(feature = "full")]
-    pub fn replace_attrs(&mut self, new: Vec<Attribute>) -> Vec<Attribute> {
-        match *self {
-            Expr::Box(ExprBox { ref mut attrs, .. })
-            | Expr::InPlace(ExprInPlace { ref mut attrs, .. })
-            | Expr::Array(ExprArray { ref mut attrs, .. })
-            | Expr::Call(ExprCall { ref mut attrs, .. })
-            | Expr::MethodCall(ExprMethodCall { ref mut attrs, .. })
-            | Expr::Tuple(ExprTuple { ref mut attrs, .. })
-            | Expr::Binary(ExprBinary { ref mut attrs, .. })
-            | Expr::Unary(ExprUnary { ref mut attrs, .. })
-            | Expr::Lit(ExprLit { ref mut attrs, .. })
-            | Expr::Cast(ExprCast { ref mut attrs, .. })
-            | Expr::Type(ExprType { ref mut attrs, .. })
-            | Expr::If(ExprIf { ref mut attrs, .. })
-            | Expr::IfLet(ExprIfLet { ref mut attrs, .. })
-            | Expr::While(ExprWhile { ref mut attrs, .. })
-            | Expr::WhileLet(ExprWhileLet { ref mut attrs, .. })
-            | Expr::ForLoop(ExprForLoop { ref mut attrs, .. })
-            | Expr::Loop(ExprLoop { ref mut attrs, .. })
-            | Expr::Match(ExprMatch { ref mut attrs, .. })
-            | Expr::Closure(ExprClosure { ref mut attrs, .. })
-            | Expr::Unsafe(ExprUnsafe { ref mut attrs, .. })
-            | Expr::Block(ExprBlock { ref mut attrs, .. })
-            | Expr::Assign(ExprAssign { ref mut attrs, .. })
-            | Expr::AssignOp(ExprAssignOp { ref mut attrs, .. })
-            | Expr::Field(ExprField { ref mut attrs, .. })
-            | Expr::Index(ExprIndex { ref mut attrs, .. })
-            | Expr::Range(ExprRange { ref mut attrs, .. })
-            | Expr::Path(ExprPath { ref mut attrs, .. })
-            | Expr::Reference(ExprReference { ref mut attrs, .. })
-            | Expr::Break(ExprBreak { ref mut attrs, .. })
-            | Expr::Continue(ExprContinue { ref mut attrs, .. })
-            | Expr::Return(ExprReturn { ref mut attrs, .. })
-            | Expr::Macro(ExprMacro { ref mut attrs, .. })
-            | Expr::Struct(ExprStruct { ref mut attrs, .. })
-            | Expr::Repeat(ExprRepeat { ref mut attrs, .. })
-            | Expr::Paren(ExprParen { ref mut attrs, .. })
-            | Expr::Group(ExprGroup { ref mut attrs, .. })
-            | Expr::Try(ExprTry { ref mut attrs, .. })
-            | Expr::Catch(ExprCatch { ref mut attrs, .. })
-            | Expr::Yield(ExprYield { ref mut attrs, .. }) => mem::replace(attrs, new),
-            Expr::Verbatim(_) => {
-                // TODO
-                Vec::new()
-            }
-        }
-    }
-}
-
-ast_enum! {
-    /// A struct or tuple struct field accessed in a struct literal or field
-    /// expression.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum Member {
-        /// A named field like `self.x`.
-        Named(Ident),
-        /// An unnamed field like `self.0`.
-        Unnamed(Index),
-    }
-}
-
-ast_struct! {
-    /// The index of an unnamed tuple struct field.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct Index #manual_extra_traits {
-        pub index: u32,
-        pub span: Span,
-    }
-}
-
-impl From<usize> for Index {
-    fn from(index: usize) -> Index {
-        assert!(index < u32::max_value() as usize);
-        Index {
-            index: index as u32,
-            span: Span::call_site(),
-        }
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for Index {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for Index {
-    fn eq(&self, other: &Self) -> bool {
-        self.index == other.index
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for Index {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.index.hash(state);
-    }
-}
-
-#[cfg(feature = "full")]
-ast_struct! {
-    /// The `::<>` explicit type parameters passed to a method call:
-    /// `parse::<u64>()`.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct MethodTurbofish {
-        pub colon2_token: Token![::],
-        pub lt_token: Token![<],
-        pub args: Punctuated<GenericMethodArgument, Token![,]>,
-        pub gt_token: Token![>],
-    }
-}
-
-#[cfg(feature = "full")]
-ast_enum! {
-    /// An individual generic argument to a method, like `T`.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub enum GenericMethodArgument {
-        /// A type argument.
-        Type(Type),
-        /// A const expression. Must be inside of a block.
-        ///
-        /// NOTE: Identity expressions are represented as Type arguments, as
-        /// they are indistinguishable syntactically.
-        Const(Expr),
-    }
-}
-
-#[cfg(feature = "full")]
-ast_struct! {
-    /// A field-value pair in a struct literal.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct FieldValue {
-        /// Attributes tagged on the field.
-        pub attrs: Vec<Attribute>,
-
-        /// Name or index of the field.
-        pub member: Member,
-
-        /// The colon in `Struct { x: x }`. If written in shorthand like
-        /// `Struct { x }`, there is no colon.
-        pub colon_token: Option<Token![:]>,
-
-        /// Value of the field.
-        pub expr: Expr,
-    }
-}
-
-#[cfg(feature = "full")]
-ast_struct! {
-    /// A lifetime labeling a `for`, `while`, or `loop`.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct Label {
-        pub name: Lifetime,
-        pub colon_token: Token![:],
-    }
-}
-
-#[cfg(feature = "full")]
-ast_struct! {
-    /// A braced block containing Rust statements.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct Block {
-        pub brace_token: token::Brace,
-        /// Statements in a block
-        pub stmts: Vec<Stmt>,
-    }
-}
-
-#[cfg(feature = "full")]
-ast_enum! {
-    /// A statement, usually ending in a semicolon.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub enum Stmt {
-        /// A local (let) binding.
-        Local(Local),
-
-        /// An item definition.
-        Item(Item),
-
-        /// Expr without trailing semicolon.
-        Expr(Expr),
-
-        /// Expression with trailing semicolon.
-        Semi(Expr, Token![;]),
-    }
-}
-
-#[cfg(feature = "full")]
-ast_struct! {
-    /// A local `let` binding: `let x: u64 = s.parse()?`.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct Local {
-        pub attrs: Vec<Attribute>,
-        pub let_token: Token![let],
-        pub pats: Punctuated<Pat, Token![|]>,
-        pub ty: Option<(Token![:], Box<Type>)>,
-        pub init: Option<(Token![=], Box<Expr>)>,
-        pub semi_token: Token![;],
-    }
-}
-
-#[cfg(feature = "full")]
-ast_enum_of_structs! {
-    /// A pattern in a local binding, function signature, match expression, or
-    /// various other places.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    // Clippy false positive
-    // https://github.com/Manishearth/rust-clippy/issues/1241
-    #[cfg_attr(feature = "cargo-clippy", allow(enum_variant_names))]
-    pub enum Pat {
-        /// A pattern that matches any value: `_`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Wild(PatWild {
-            pub underscore_token: Token![_],
-        }),
-
-        /// A pattern that binds a new variable: `ref mut binding @ SUBPATTERN`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Ident(PatIdent {
-            pub by_ref: Option<Token![ref]>,
-            pub mutability: Option<Token![mut]>,
-            pub ident: Ident,
-            pub subpat: Option<(Token![@], Box<Pat>)>,
-        }),
-
-        /// A struct or struct variant pattern: `Variant { x, y, .. }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Struct(PatStruct {
-            pub path: Path,
-            pub brace_token: token::Brace,
-            pub fields: Punctuated<FieldPat, Token![,]>,
-            pub dot2_token: Option<Token![..]>,
-        }),
-
-        /// A tuple struct or tuple variant pattern: `Variant(x, y, .., z)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub TupleStruct(PatTupleStruct {
-            pub path: Path,
-            pub pat: PatTuple,
-        }),
-
-        /// A path pattern like `Color::Red`, optionally qualified with a
-        /// self-type.
-        ///
-        /// Unquailfied path patterns can legally refer to variants, structs,
-        /// constants or associated constants. Quailfied path patterns like
-        /// `<A>::B::C` and `<A as Trait>::B::C` can only legally refer to
-        /// associated constants.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Path(PatPath {
-            pub qself: Option<QSelf>,
-            pub path: Path,
-        }),
-
-        /// A tuple pattern: `(a, b)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Tuple(PatTuple {
-            pub paren_token: token::Paren,
-            pub front: Punctuated<Pat, Token![,]>,
-            pub dot2_token: Option<Token![..]>,
-            pub comma_token: Option<Token![,]>,
-            pub back: Punctuated<Pat, Token![,]>,
-        }),
-
-        /// A box pattern: `box v`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Box(PatBox {
-            pub box_token: Token![box],
-            pub pat: Box<Pat>,
-        }),
-
-        /// A reference pattern: `&mut (first, second)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Ref(PatRef {
-            pub and_token: Token![&],
-            pub mutability: Option<Token![mut]>,
-            pub pat: Box<Pat>,
-        }),
-
-        /// A literal pattern: `0`.
-        ///
-        /// This holds an `Expr` rather than a `Lit` because negative numbers
-        /// are represented as an `Expr::Unary`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Lit(PatLit {
-            pub expr: Box<Expr>,
-        }),
-
-        /// A range pattern: `1..=2`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Range(PatRange {
-            pub lo: Box<Expr>,
-            pub limits: RangeLimits,
-            pub hi: Box<Expr>,
-        }),
-
-        /// A dynamically sized slice pattern: `[a, b, i.., y, z]`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Slice(PatSlice {
-            pub bracket_token: token::Bracket,
-            pub front: Punctuated<Pat, Token![,]>,
-            pub middle: Option<Box<Pat>>,
-            pub dot2_token: Option<Token![..]>,
-            pub comma_token: Option<Token![,]>,
-            pub back: Punctuated<Pat, Token![,]>,
-        }),
-
-        /// A macro in expression position.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Macro(PatMacro {
-            pub mac: Macro,
-        }),
-
-        /// Tokens in pattern position not interpreted by Syn.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Verbatim(PatVerbatim #manual_extra_traits {
-            pub tts: TokenStream,
-        }),
-    }
-}
-
-#[cfg(all(feature = "full", feature = "extra-traits"))]
-impl Eq for PatVerbatim {}
-
-#[cfg(all(feature = "full", feature = "extra-traits"))]
-impl PartialEq for PatVerbatim {
-    fn eq(&self, other: &Self) -> bool {
-        TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(all(feature = "full", feature = "extra-traits"))]
-impl Hash for PatVerbatim {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-#[cfg(feature = "full")]
-ast_struct! {
-    /// One arm of a `match` expression: `0...10 => { return true; }`.
-    ///
-    /// As in:
-    ///
-    /// ```rust
-    /// # fn f() -> bool {
-    /// #     let n = 0;
-    /// match n {
-    ///     0...10 => {
-    ///         return true;
-    ///     }
-    ///     // ...
-    ///     # _ => {}
-    /// }
-    /// #   false
-    /// # }
-    /// ```
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct Arm {
-        pub attrs: Vec<Attribute>,
-        pub leading_vert: Option<Token![|]>,
-        pub pats: Punctuated<Pat, Token![|]>,
-        pub guard: Option<(Token![if], Box<Expr>)>,
-        pub fat_arrow_token: Token![=>],
-        pub body: Box<Expr>,
-        pub comma: Option<Token![,]>,
-    }
-}
-
-#[cfg(feature = "full")]
-ast_enum! {
-    /// Limit types of a range, inclusive or exclusive.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    #[cfg_attr(feature = "clone-impls", derive(Copy))]
-    pub enum RangeLimits {
-        /// Inclusive at the beginning, exclusive at the end.
-        HalfOpen(Token![..]),
-        /// Inclusive at the beginning and end.
-        Closed(Token![..=]),
-    }
-}
-
-#[cfg(feature = "full")]
-ast_struct! {
-    /// A single field in a struct pattern.
-    ///
-    /// Patterns like the fields of Foo `{ x, ref y, ref mut z }` are treated
-    /// the same as `x: x, y: ref y, z: ref mut z` but there is no colon token.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct FieldPat {
-        pub attrs: Vec<Attribute>,
-        pub member: Member,
-        pub colon_token: Option<Token![:]>,
-        pub pat: Box<Pat>,
-    }
-}
-
-#[cfg(any(feature = "parsing", feature = "printing"))]
-#[cfg(feature = "full")]
-fn arm_expr_requires_comma(expr: &Expr) -> bool {
-    // see https://github.com/rust-lang/rust/blob/eb8f2586e
-    //                       /src/libsyntax/parse/classify.rs#L17-L37
-    match *expr {
-        Expr::Unsafe(..)
-        | Expr::Block(..)
-        | Expr::If(..)
-        | Expr::IfLet(..)
-        | Expr::Match(..)
-        | Expr::While(..)
-        | Expr::WhileLet(..)
-        | Expr::Loop(..)
-        | Expr::ForLoop(..)
-        | Expr::Catch(..) => false,
-        _ => true,
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use path::parsing::qpath;
-    #[cfg(feature = "full")]
-    use path::parsing::ty_no_eq_after;
-
-    use buffer::Cursor;
-    #[cfg(feature = "full")]
-    use parse_error;
-    #[cfg(feature = "full")]
-    use proc_macro2::TokenStream;
-    use synom::PResult;
-    use synom::Synom;
-
-    // When we're parsing expressions which occur before blocks, like in an if
-    // statement's condition, we cannot parse a struct literal.
-    //
-    // Struct literals are ambiguous in certain positions
-    // https://github.com/rust-lang/rfcs/pull/92
-    macro_rules! ambiguous_expr {
-        ($i:expr, $allow_struct:ident) => {
-            ambiguous_expr($i, $allow_struct, true)
-        };
-    }
-
-    // When we are parsing an optional suffix expression, we cannot allow blocks
-    // if structs are not allowed.
-    //
-    // Example:
-    //
-    //     if break {} {}
-    //
-    // is ambiguous between:
-    //
-    //     if (break {}) {}
-    //     if (break) {} {}
-    #[cfg(feature = "full")]
-    macro_rules! opt_ambiguous_expr {
-        ($i:expr, $allow_struct:ident) => {
-            option!($i, call!(ambiguous_expr, $allow_struct, $allow_struct))
-        };
-    }
-
-    impl Synom for Expr {
-        named!(parse -> Self, ambiguous_expr!(true));
-
-        fn description() -> Option<&'static str> {
-            Some("expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(expr_no_struct -> Expr, ambiguous_expr!(false));
-
-    // Parse an arbitrary expression.
-    #[cfg(feature = "full")]
-    fn ambiguous_expr(i: Cursor, allow_struct: bool, allow_block: bool) -> PResult<Expr> {
-        call!(i, assign_expr, allow_struct, allow_block)
-    }
-
-    #[cfg(not(feature = "full"))]
-    fn ambiguous_expr(i: Cursor, allow_struct: bool, allow_block: bool) -> PResult<Expr> {
-        // NOTE: We intentionally skip assign_expr, placement_expr, and
-        // range_expr, as they are not parsed in non-full mode.
-        call!(i, or_expr, allow_struct, allow_block)
-    }
-
-    // Parse a left-associative binary operator.
-    macro_rules! binop {
-        (
-            $name: ident,
-            $next: ident,
-            $submac: ident!( $($args:tt)* )
-        ) => {
-            named!($name(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-                mut e: call!($next, allow_struct, allow_block) >>
-                many0!(do_parse!(
-                    op: $submac!($($args)*) >>
-                    rhs: call!($next, allow_struct, true) >>
-                    ({
-                        e = ExprBinary {
-                            attrs: Vec::new(),
-                            left: Box::new(e.into()),
-                            op: op,
-                            right: Box::new(rhs.into()),
-                        }.into();
-                    })
-                )) >>
-                (e)
-            ));
-        }
-    }
-
-    // <placement> = <placement> ..
-    // <placement> += <placement> ..
-    // <placement> -= <placement> ..
-    // <placement> *= <placement> ..
-    // <placement> /= <placement> ..
-    // <placement> %= <placement> ..
-    // <placement> ^= <placement> ..
-    // <placement> &= <placement> ..
-    // <placement> |= <placement> ..
-    // <placement> <<= <placement> ..
-    // <placement> >>= <placement> ..
-    //
-    // NOTE: This operator is right-associative.
-    #[cfg(feature = "full")]
-    named!(assign_expr(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-        mut e: call!(placement_expr, allow_struct, allow_block) >>
-        alt!(
-            do_parse!(
-                eq: punct!(=) >>
-                // Recurse into self to parse right-associative operator.
-                rhs: call!(assign_expr, allow_struct, true) >>
-                ({
-                    e = ExprAssign {
-                        attrs: Vec::new(),
-                        left: Box::new(e),
-                        eq_token: eq,
-                        right: Box::new(rhs),
-                    }.into();
-                })
-            )
-            |
-            do_parse!(
-                op: call!(BinOp::parse_assign_op) >>
-                // Recurse into self to parse right-associative operator.
-                rhs: call!(assign_expr, allow_struct, true) >>
-                ({
-                    e = ExprAssignOp {
-                        attrs: Vec::new(),
-                        left: Box::new(e),
-                        op: op,
-                        right: Box::new(rhs),
-                    }.into();
-                })
-            )
-            |
-            epsilon!()
-        ) >>
-        (e)
-    ));
-
-    // <range> <- <range> ..
-    //
-    // NOTE: The `in place { expr }` version of this syntax is parsed in
-    // `atom_expr`, not here.
-    //
-    // NOTE: This operator is right-associative.
-    #[cfg(feature = "full")]
-    named!(placement_expr(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-        mut e: call!(range_expr, allow_struct, allow_block) >>
-        alt!(
-            do_parse!(
-                arrow: punct!(<-) >>
-                // Recurse into self to parse right-associative operator.
-                rhs: call!(placement_expr, allow_struct, true) >>
-                ({
-                    e = ExprInPlace {
-                        attrs: Vec::new(),
-                        // op: BinOp::Place(larrow),
-                        place: Box::new(e),
-                        arrow_token: arrow,
-                        value: Box::new(rhs),
-                    }.into();
-                })
-            )
-            |
-            epsilon!()
-        ) >>
-        (e)
-    ));
-
-    // <or> ... <or> ..
-    // <or> .. <or> ..
-    // <or> ..
-    //
-    // NOTE: This is currently parsed oddly - I'm not sure of what the exact
-    // rules are for parsing these expressions are, but this is not correct.
-    // For example, `a .. b .. c` is not a legal expression. It should not
-    // be parsed as either `(a .. b) .. c` or `a .. (b .. c)` apparently.
-    //
-    // NOTE: The form of ranges which don't include a preceding expression are
-    // parsed by `atom_expr`, rather than by this function.
-    #[cfg(feature = "full")]
-    named!(range_expr(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-        mut e: call!(or_expr, allow_struct, allow_block) >>
-        many0!(do_parse!(
-            limits: syn!(RangeLimits) >>
-            // We don't want to allow blocks here if we don't allow structs. See
-            // the reasoning for `opt_ambiguous_expr!` above.
-            hi: option!(call!(or_expr, allow_struct, allow_struct)) >>
-            ({
-                e = ExprRange {
-                    attrs: Vec::new(),
-                    from: Some(Box::new(e)),
-                    limits: limits,
-                    to: hi.map(|e| Box::new(e)),
-                }.into();
-            })
-        )) >>
-        (e)
-    ));
-
-    // <and> || <and> ...
-    binop!(or_expr, and_expr, map!(punct!(||), BinOp::Or));
-
-    // <compare> && <compare> ...
-    binop!(and_expr, compare_expr, map!(punct!(&&), BinOp::And));
-
-    // <bitor> == <bitor> ...
-    // <bitor> != <bitor> ...
-    // <bitor> >= <bitor> ...
-    // <bitor> <= <bitor> ...
-    // <bitor> > <bitor> ...
-    // <bitor> < <bitor> ...
-    //
-    // NOTE: This operator appears to be parsed as left-associative, but errors
-    // if it is used in a non-associative manner.
-    binop!(
-        compare_expr,
-        bitor_expr,
-        alt!(
-        punct!(==) => { BinOp::Eq }
-        |
-        punct!(!=) => { BinOp::Ne }
-        |
-        // must be above Lt
-        punct!(<=) => { BinOp::Le }
-        |
-        // must be above Gt
-        punct!(>=) => { BinOp::Ge }
-        |
-        do_parse!(
-            // Make sure that we don't eat the < part of a <- operator
-            not!(punct!(<-)) >>
-            t: punct!(<) >>
-            (BinOp::Lt(t))
-        )
-        |
-        punct!(>) => { BinOp::Gt }
-    )
-    );
-
-    // <bitxor> | <bitxor> ...
-    binop!(
-        bitor_expr,
-        bitxor_expr,
-        do_parse!(not!(punct!(||)) >> not!(punct!(|=)) >> t: punct!(|) >> (BinOp::BitOr(t)))
-    );
-
-    // <bitand> ^ <bitand> ...
-    binop!(
-        bitxor_expr,
-        bitand_expr,
-        do_parse!(
-            // NOTE: Make sure we aren't looking at ^=.
-            not!(punct!(^=)) >> t: punct!(^) >> (BinOp::BitXor(t))
-        )
-    );
-
-    // <shift> & <shift> ...
-    binop!(
-        bitand_expr,
-        shift_expr,
-        do_parse!(
-            // NOTE: Make sure we aren't looking at && or &=.
-            not!(punct!(&&)) >> not!(punct!(&=)) >> t: punct!(&) >> (BinOp::BitAnd(t))
-        )
-    );
-
-    // <arith> << <arith> ...
-    // <arith> >> <arith> ...
-    binop!(
-        shift_expr,
-        arith_expr,
-        alt!(
-        punct!(<<) => { BinOp::Shl }
-        |
-        punct!(>>) => { BinOp::Shr }
-    )
-    );
-
-    // <term> + <term> ...
-    // <term> - <term> ...
-    binop!(
-        arith_expr,
-        term_expr,
-        alt!(
-        punct!(+) => { BinOp::Add }
-        |
-        punct!(-) => { BinOp::Sub }
-    )
-    );
-
-    // <cast> * <cast> ...
-    // <cast> / <cast> ...
-    // <cast> % <cast> ...
-    binop!(
-        term_expr,
-        cast_expr,
-        alt!(
-        punct!(*) => { BinOp::Mul }
-        |
-        punct!(/) => { BinOp::Div }
-        |
-        punct!(%) => { BinOp::Rem }
-    )
-    );
-
-    // <unary> as <ty>
-    // <unary> : <ty>
-    #[cfg(feature = "full")]
-    named!(cast_expr(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-        mut e: call!(unary_expr, allow_struct, allow_block) >>
-        many0!(alt!(
-            do_parse!(
-                as_: keyword!(as) >>
-                // We can't accept `A + B` in cast expressions, as it's
-                // ambiguous with the + expression.
-                ty: call!(Type::without_plus) >>
-                ({
-                    e = ExprCast {
-                        attrs: Vec::new(),
-                        expr: Box::new(e),
-                        as_token: as_,
-                        ty: Box::new(ty),
-                    }.into();
-                })
-            )
-            |
-            do_parse!(
-                colon: punct!(:) >>
-                // We can't accept `A + B` in cast expressions, as it's
-                // ambiguous with the + expression.
-                ty: call!(Type::without_plus) >>
-                ({
-                    e = ExprType {
-                        attrs: Vec::new(),
-                        expr: Box::new(e),
-                        colon_token: colon,
-                        ty: Box::new(ty),
-                    }.into();
-                })
-            )
-        )) >>
-        (e)
-    ));
-
-    // <unary> as <ty>
-    #[cfg(not(feature = "full"))]
-    named!(cast_expr(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-        mut e: call!(unary_expr, allow_struct, allow_block) >>
-        many0!(do_parse!(
-            as_: keyword!(as) >>
-            // We can't accept `A + B` in cast expressions, as it's
-            // ambiguous with the + expression.
-            ty: call!(Type::without_plus) >>
-            ({
-                e = ExprCast {
-                    attrs: Vec::new(),
-                    expr: Box::new(e),
-                    as_token: as_,
-                    ty: Box::new(ty),
-                }.into();
-            })
-        )) >>
-        (e)
-    ));
-
-    // <UnOp> <trailer>
-    // & <trailer>
-    // &mut <trailer>
-    // box <trailer>
-    #[cfg(feature = "full")]
-    named!(unary_expr(allow_struct: bool, allow_block: bool) -> Expr, alt!(
-        do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            op: syn!(UnOp) >>
-            expr: call!(unary_expr, allow_struct, true) >>
-            (ExprUnary {
-                attrs: attrs,
-                op: op,
-                expr: Box::new(expr),
-            }.into())
-        )
-        |
-        do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            and: punct!(&) >>
-            mutability: option!(keyword!(mut)) >>
-            expr: call!(unary_expr, allow_struct, true) >>
-            (ExprReference {
-                attrs: attrs,
-                and_token: and,
-                mutability: mutability,
-                expr: Box::new(expr),
-            }.into())
-        )
-        |
-        do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            box_: keyword!(box) >>
-            expr: call!(unary_expr, allow_struct, true) >>
-            (ExprBox {
-                attrs: attrs,
-                box_token: box_,
-                expr: Box::new(expr),
-            }.into())
-        )
-        |
-        call!(trailer_expr, allow_struct, allow_block)
-    ));
-
-    // XXX: This duplication is ugly
-    #[cfg(not(feature = "full"))]
-    named!(unary_expr(allow_struct: bool, allow_block: bool) -> Expr, alt!(
-        do_parse!(
-            op: syn!(UnOp) >>
-            expr: call!(unary_expr, allow_struct, true) >>
-            (ExprUnary {
-                attrs: Vec::new(),
-                op: op,
-                expr: Box::new(expr),
-            }.into())
-        )
-        |
-        call!(trailer_expr, allow_struct, allow_block)
-    ));
-
-    #[cfg(feature = "full")]
-    fn take_outer(attrs: &mut Vec<Attribute>) -> Vec<Attribute> {
-        let mut outer = Vec::new();
-        let mut inner = Vec::new();
-        for attr in mem::replace(attrs, Vec::new()) {
-            match attr.style {
-                AttrStyle::Outer => outer.push(attr),
-                AttrStyle::Inner(_) => inner.push(attr),
-            }
-        }
-        *attrs = inner;
-        outer
-    }
-
-    // <atom> (..<args>) ...
-    // <atom> . <ident> (..<args>) ...
-    // <atom> . <ident> ...
-    // <atom> . <lit> ...
-    // <atom> [ <expr> ] ...
-    // <atom> ? ...
-    #[cfg(feature = "full")]
-    named!(trailer_expr(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-        mut e: call!(atom_expr, allow_struct, allow_block) >>
-        outer_attrs: value!({
-            let mut attrs = e.replace_attrs(Vec::new());
-            let outer_attrs = take_outer(&mut attrs);
-            e.replace_attrs(attrs);
-            outer_attrs
-        }) >>
-        many0!(alt!(
-            tap!(args: and_call => {
-                let (paren, args) = args;
-                e = ExprCall {
-                    attrs: Vec::new(),
-                    func: Box::new(e),
-                    args: args,
-                    paren_token: paren,
-                }.into();
-            })
-            |
-            tap!(more: and_method_call => {
-                let mut call = more;
-                call.receiver = Box::new(e);
-                e = call.into();
-            })
-            |
-            tap!(field: and_field => {
-                let (token, member) = field;
-                e = ExprField {
-                    attrs: Vec::new(),
-                    base: Box::new(e),
-                    dot_token: token,
-                    member: member,
-                }.into();
-            })
-            |
-            tap!(i: and_index => {
-                let (bracket, i) = i;
-                e = ExprIndex {
-                    attrs: Vec::new(),
-                    expr: Box::new(e),
-                    bracket_token: bracket,
-                    index: Box::new(i),
-                }.into();
-            })
-            |
-            tap!(question: punct!(?) => {
-                e = ExprTry {
-                    attrs: Vec::new(),
-                    expr: Box::new(e),
-                    question_token: question,
-                }.into();
-            })
-        )) >>
-        ({
-            let mut attrs = outer_attrs;
-            attrs.extend(e.replace_attrs(Vec::new()));
-            e.replace_attrs(attrs);
-            e
-        })
-    ));
-
-    // XXX: Duplication == ugly
-    #[cfg(not(feature = "full"))]
-    named!(trailer_expr(allow_struct: bool, allow_block: bool) -> Expr, do_parse!(
-        mut e: call!(atom_expr, allow_struct, allow_block) >>
-        many0!(alt!(
-            tap!(args: and_call => {
-                e = ExprCall {
-                    attrs: Vec::new(),
-                    func: Box::new(e),
-                    paren_token: args.0,
-                    args: args.1,
-                }.into();
-            })
-            |
-            tap!(field: and_field => {
-                let (token, member) = field;
-                e = ExprField {
-                    attrs: Vec::new(),
-                    base: Box::new(e),
-                    dot_token: token,
-                    member: member,
-                }.into();
-            })
-            |
-            tap!(i: and_index => {
-                e = ExprIndex {
-                    attrs: Vec::new(),
-                    expr: Box::new(e),
-                    bracket_token: i.0,
-                    index: Box::new(i.1),
-                }.into();
-            })
-        )) >>
-        (e)
-    ));
-
-    // Parse all atomic expressions which don't have to worry about precedence
-    // interactions, as they are fully contained.
-    #[cfg(feature = "full")]
-    named!(atom_expr(allow_struct: bool, allow_block: bool) -> Expr, alt!(
-        syn!(ExprGroup) => { Expr::Group } // must be placed first
-        |
-        syn!(ExprLit) => { Expr::Lit } // must be before expr_struct
-        |
-        // must be before ExprStruct
-        call!(unstable_async_block) => { Expr::Verbatim }
-        |
-        // must be before expr_path
-        cond_reduce!(allow_struct, syn!(ExprStruct)) => { Expr::Struct }
-        |
-        syn!(ExprParen) => { Expr::Paren } // must be before expr_tup
-        |
-        syn!(ExprMacro) => { Expr::Macro } // must be before expr_path
-        |
-        call!(expr_break, allow_struct) // must be before expr_path
-        |
-        syn!(ExprContinue) => { Expr::Continue } // must be before expr_path
-        |
-        call!(expr_ret, allow_struct) // must be before expr_path
-        |
-        syn!(ExprArray) => { Expr::Array }
-        |
-        syn!(ExprTuple) => { Expr::Tuple }
-        |
-        syn!(ExprIf) => { Expr::If }
-        |
-        syn!(ExprIfLet) => { Expr::IfLet }
-        |
-        syn!(ExprWhile) => { Expr::While }
-        |
-        syn!(ExprWhileLet) => { Expr::WhileLet }
-        |
-        syn!(ExprForLoop) => { Expr::ForLoop }
-        |
-        syn!(ExprLoop) => { Expr::Loop }
-        |
-        syn!(ExprMatch) => { Expr::Match }
-        |
-        syn!(ExprCatch) => { Expr::Catch }
-        |
-        syn!(ExprYield) => { Expr::Yield }
-        |
-        syn!(ExprUnsafe) => { Expr::Unsafe }
-        |
-        call!(expr_closure, allow_struct)
-        |
-        cond_reduce!(allow_block, syn!(ExprBlock)) => { Expr::Block }
-        |
-        call!(unstable_labeled_block) => { Expr::Verbatim }
-        |
-        // NOTE: This is the prefix-form of range
-        call!(expr_range, allow_struct)
-        |
-        syn!(ExprPath) => { Expr::Path }
-        |
-        syn!(ExprRepeat) => { Expr::Repeat }
-    ));
-
-    #[cfg(not(feature = "full"))]
-    named!(atom_expr(_allow_struct: bool, _allow_block: bool) -> Expr, alt!(
-        syn!(ExprLit) => { Expr::Lit }
-        |
-        syn!(ExprParen) => { Expr::Paren }
-        |
-        syn!(ExprPath) => { Expr::Path }
-    ));
-
-    #[cfg(feature = "full")]
-    named!(expr_nosemi -> Expr, do_parse!(
-        nosemi: alt!(
-            syn!(ExprIf) => { Expr::If }
-            |
-            syn!(ExprIfLet) => { Expr::IfLet }
-            |
-            syn!(ExprWhile) => { Expr::While }
-            |
-            syn!(ExprWhileLet) => { Expr::WhileLet }
-            |
-            syn!(ExprForLoop) => { Expr::ForLoop }
-            |
-            syn!(ExprLoop) => { Expr::Loop }
-            |
-            syn!(ExprMatch) => { Expr::Match }
-            |
-            syn!(ExprCatch) => { Expr::Catch }
-            |
-            syn!(ExprYield) => { Expr::Yield }
-            |
-            syn!(ExprUnsafe) => { Expr::Unsafe }
-            |
-            syn!(ExprBlock) => { Expr::Block }
-            |
-            call!(unstable_labeled_block) => { Expr::Verbatim }
-        ) >>
-        // If the next token is a `.` or a `?` it is special-cased to parse
-        // as an expression instead of a blockexpression.
-        not!(punct!(.)) >>
-        not!(punct!(?)) >>
-        (nosemi)
-    ));
-
-    impl Synom for ExprLit {
-        #[cfg(not(feature = "full"))]
-        named!(parse -> Self, do_parse!(
-            lit: syn!(Lit) >>
-            (ExprLit {
-                attrs: Vec::new(),
-                lit: lit,
-            })
-        ));
-
-        #[cfg(feature = "full")]
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            lit: syn!(Lit) >>
-            (ExprLit {
-                attrs: attrs,
-                lit: lit,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("literal")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprMacro {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            mac: syn!(Macro) >>
-            (ExprMacro {
-                attrs: attrs,
-                mac: mac,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("macro invocation expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprGroup {
-        named!(parse -> Self, do_parse!(
-            e: grouped!(syn!(Expr)) >>
-            (ExprGroup {
-                attrs: Vec::new(),
-                expr: Box::new(e.1),
-                group_token: e.0,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("expression surrounded by invisible delimiters")
-        }
-    }
-
-    impl Synom for ExprParen {
-        #[cfg(not(feature = "full"))]
-        named!(parse -> Self, do_parse!(
-            e: parens!(syn!(Expr)) >>
-            (ExprParen {
-                attrs: Vec::new(),
-                paren_token: e.0,
-                expr: Box::new(e.1),
-            })
-        ));
-
-        #[cfg(feature = "full")]
-        named!(parse -> Self, do_parse!(
-            outer_attrs: many0!(Attribute::parse_outer) >>
-            e: parens!(tuple!(
-                many0!(Attribute::parse_inner),
-                syn!(Expr),
-            )) >>
-            (ExprParen {
-                attrs: {
-                    let mut attrs = outer_attrs;
-                    attrs.extend((e.1).0);
-                    attrs
-                },
-                paren_token: e.0,
-                expr: Box::new((e.1).1),
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("parenthesized expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprArray {
-        named!(parse -> Self, do_parse!(
-            outer_attrs: many0!(Attribute::parse_outer) >>
-            elems: brackets!(tuple!(
-                many0!(Attribute::parse_inner),
-                call!(Punctuated::parse_terminated),
-            )) >>
-            (ExprArray {
-                attrs: {
-                    let mut attrs = outer_attrs;
-                    attrs.extend((elems.1).0);
-                    attrs
-                },
-                bracket_token: elems.0,
-                elems: (elems.1).1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("array expression")
-        }
-    }
-
-    named!(and_call -> (token::Paren, Punctuated<Expr, Token![,]>),
-        parens!(Punctuated::parse_terminated)
-    );
-
-    #[cfg(feature = "full")]
-    named!(and_method_call -> ExprMethodCall, do_parse!(
-        dot: punct!(.) >>
-        method: syn!(Ident) >>
-        turbofish: option!(tuple!(
-            punct!(::),
-            punct!(<),
-            call!(Punctuated::parse_terminated),
-            punct!(>),
-        )) >>
-        args: parens!(Punctuated::parse_terminated) >>
-        ({
-            ExprMethodCall {
-                attrs: Vec::new(),
-                // this expr will get overwritten after being returned
-                receiver: Box::new(Expr::Verbatim(ExprVerbatim {
-                    tts: TokenStream::new(),
-                })),
-
-                method: method,
-                turbofish: turbofish.map(|fish| MethodTurbofish {
-                    colon2_token: fish.0,
-                    lt_token: fish.1,
-                    args: fish.2,
-                    gt_token: fish.3,
-                }),
-                args: args.1,
-                paren_token: args.0,
-                dot_token: dot,
-            }
-        })
-    ));
-
-    #[cfg(feature = "full")]
-    impl Synom for GenericMethodArgument {
-        // TODO parse const generics as well
-        named!(parse -> Self, map!(ty_no_eq_after, GenericMethodArgument::Type));
-
-        fn description() -> Option<&'static str> {
-            Some("generic method argument")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprTuple {
-        named!(parse -> Self, do_parse!(
-            outer_attrs: many0!(Attribute::parse_outer) >>
-            elems: parens!(tuple!(
-                many0!(Attribute::parse_inner),
-                call!(Punctuated::parse_terminated),
-            )) >>
-            (ExprTuple {
-                attrs: {
-                    let mut attrs = outer_attrs;
-                    attrs.extend((elems.1).0);
-                    attrs
-                },
-                elems: (elems.1).1,
-                paren_token: elems.0,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("tuple")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprIfLet {
-        named!(parse -> Self, do_parse!(
-            if_: keyword!(if) >>
-            let_: keyword!(let) >>
-            pats: call!(Punctuated::parse_separated_nonempty) >>
-            eq: punct!(=) >>
-            cond: expr_no_struct >>
-            then_block: braces!(Block::parse_within) >>
-            else_block: option!(else_block) >>
-            (ExprIfLet {
-                attrs: Vec::new(),
-                pats: pats,
-                let_token: let_,
-                eq_token: eq,
-                expr: Box::new(cond),
-                then_branch: Block {
-                    brace_token: then_block.0,
-                    stmts: then_block.1,
-                },
-                if_token: if_,
-                else_branch: else_block,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`if let` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprIf {
-        named!(parse -> Self, do_parse!(
-            if_: keyword!(if) >>
-            cond: expr_no_struct >>
-            then_block: braces!(Block::parse_within) >>
-            else_block: option!(else_block) >>
-            (ExprIf {
-                attrs: Vec::new(),
-                cond: Box::new(cond),
-                then_branch: Block {
-                    brace_token: then_block.0,
-                    stmts: then_block.1,
-                },
-                if_token: if_,
-                else_branch: else_block,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`if` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(else_block -> (Token![else], Box<Expr>), do_parse!(
-        else_: keyword!(else) >>
-        expr: alt!(
-            syn!(ExprIf) => { Expr::If }
-            |
-            syn!(ExprIfLet) => { Expr::IfLet }
-            |
-            do_parse!(
-                else_block: braces!(Block::parse_within) >>
-                (Expr::Block(ExprBlock {
-                    attrs: Vec::new(),
-                    block: Block {
-                        brace_token: else_block.0,
-                        stmts: else_block.1,
-                    },
-                }))
-            )
-        ) >>
-        (else_, Box::new(expr))
-    ));
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprForLoop {
-        named!(parse -> Self, do_parse!(
-            outer_attrs: many0!(Attribute::parse_outer) >>
-            label: option!(syn!(Label)) >>
-            for_: keyword!(for) >>
-            pat: syn!(Pat) >>
-            in_: keyword!(in) >>
-            expr: expr_no_struct >>
-            block: braces!(tuple!(
-                many0!(Attribute::parse_inner),
-                call!(Block::parse_within),
-            )) >>
-            (ExprForLoop {
-                attrs: {
-                    let mut attrs = outer_attrs;
-                    attrs.extend((block.1).0);
-                    attrs
-                },
-                label: label,
-                for_token: for_,
-                pat: Box::new(pat),
-                in_token: in_,
-                expr: Box::new(expr),
-                body: Block {
-                    brace_token: block.0,
-                    stmts: (block.1).1,
-                },
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`for` loop")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprLoop {
-        named!(parse -> Self, do_parse!(
-            outer_attrs: many0!(Attribute::parse_outer) >>
-            label: option!(syn!(Label)) >>
-            loop_: keyword!(loop) >>
-            block: braces!(tuple!(
-                many0!(Attribute::parse_inner),
-                call!(Block::parse_within),
-            )) >>
-            (ExprLoop {
-                attrs: {
-                    let mut attrs = outer_attrs;
-                    attrs.extend((block.1).0);
-                    attrs
-                },
-                label: label,
-                loop_token: loop_,
-                body: Block {
-                    brace_token: block.0,
-                    stmts: (block.1).1,
-                },
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`loop`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprMatch {
-        named!(parse -> Self, do_parse!(
-            outer_attrs: many0!(Attribute::parse_outer) >>
-            match_: keyword!(match) >>
-            obj: expr_no_struct >>
-            braced_content: braces!(tuple!(
-                many0!(Attribute::parse_inner),
-                many0!(syn!(Arm)),
-            )) >>
-            (ExprMatch {
-                attrs: {
-                    let mut attrs = outer_attrs;
-                    attrs.extend((braced_content.1).0);
-                    attrs
-                },
-                expr: Box::new(obj),
-                match_token: match_,
-                brace_token: braced_content.0,
-                arms: (braced_content.1).1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`match` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprCatch {
-        named!(parse -> Self, do_parse!(
-            do_: keyword!(do) >>
-            catch_: keyword!(catch) >>
-            catch_block: syn!(Block) >>
-            (ExprCatch {
-                attrs: Vec::new(),
-                block: catch_block,
-                do_token: do_,
-                catch_token: catch_,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`catch` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprYield {
-        named!(parse -> Self, do_parse!(
-            yield_: keyword!(yield) >>
-            expr: option!(syn!(Expr)) >>
-            (ExprYield {
-                attrs: Vec::new(),
-                yield_token: yield_,
-                expr: expr.map(Box::new),
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`yield` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for Arm {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            leading_vert: option!(punct!(|)) >>
-            pats: call!(Punctuated::parse_separated_nonempty) >>
-            guard: option!(tuple!(keyword!(if), syn!(Expr))) >>
-            fat_arrow: punct!(=>) >>
-            body: do_parse!(
-                expr: alt!(expr_nosemi | syn!(Expr)) >>
-                comma: switch!(value!(arm_expr_requires_comma(&expr)),
-                    true => alt!(
-                        input_end!() => { |_| None }
-                        |
-                        punct!(,) => { Some }
-                    )
-                    |
-                    false => option!(punct!(,))
-                ) >>
-                (expr, comma)
-            ) >>
-            (Arm {
-                fat_arrow_token: fat_arrow,
-                attrs: attrs,
-                leading_vert: leading_vert,
-                pats: pats,
-                guard: guard.map(|(if_, guard)| (if_, Box::new(guard))),
-                body: Box::new(body.0),
-                comma: body.1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`match` arm")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(expr_closure(allow_struct: bool) -> Expr, do_parse!(
-        begin: call!(verbatim::grab_cursor) >>
-        attrs: many0!(Attribute::parse_outer) >>
-        asyncness: option!(keyword!(async)) >>
-        movability: option!(cond_reduce!(asyncness.is_none(), keyword!(static))) >>
-        capture: option!(keyword!(move)) >>
-        or1: punct!(|) >>
-        inputs: call!(Punctuated::parse_terminated_with, fn_arg) >>
-        or2: punct!(|) >>
-        ret_and_body: alt!(
-            do_parse!(
-                arrow: punct!(->) >>
-                ty: syn!(Type) >>
-                body: syn!(Block) >>
-                (
-                    ReturnType::Type(arrow, Box::new(ty)),
-                    Expr::Block(ExprBlock {
-                        attrs: Vec::new(),
-                        block: body,
-                    },
-                ))
-            )
-            |
-            map!(ambiguous_expr!(allow_struct), |e| (ReturnType::Default, e))
-        ) >>
-        end: call!(verbatim::grab_cursor) >>
-        ({
-            if asyncness.is_some() {
-                // TODO: include asyncness in ExprClosure
-                // https://github.com/dtolnay/syn/issues/396
-                Expr::Verbatim(ExprVerbatim {
-                    tts: verbatim::token_range(begin..end),
-                })
-            } else {
-                Expr::Closure(ExprClosure {
-                    attrs: attrs,
-                    movability: movability,
-                    capture: capture,
-                    or1_token: or1,
-                    inputs: inputs,
-                    or2_token: or2,
-                    output: ret_and_body.0,
-                    body: Box::new(ret_and_body.1),
-                })
-            }
-        })
-    ));
-
-    #[cfg(feature = "full")]
-    named!(unstable_async_block -> ExprVerbatim, do_parse!(
-        begin: call!(verbatim::grab_cursor) >>
-        many0!(Attribute::parse_outer) >>
-        keyword!(async) >>
-        option!(keyword!(move)) >>
-        syn!(Block) >>
-        end: call!(verbatim::grab_cursor) >>
-        (ExprVerbatim {
-            tts: verbatim::token_range(begin..end),
-        })
-    ));
-
-    #[cfg(feature = "full")]
-    named!(fn_arg -> FnArg, do_parse!(
-        pat: syn!(Pat) >>
-        ty: option!(tuple!(punct!(:), syn!(Type))) >>
-        ({
-            if let Some((colon, ty)) = ty {
-                FnArg::Captured(ArgCaptured {
-                    pat: pat,
-                    colon_token: colon,
-                    ty: ty,
-                })
-            } else {
-                FnArg::Inferred(pat)
-            }
-        })
-    ));
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprWhile {
-        named!(parse -> Self, do_parse!(
-            outer_attrs: many0!(Attribute::parse_outer) >>
-            label: option!(syn!(Label)) >>
-            while_: keyword!(while) >>
-            cond: expr_no_struct >>
-            block: braces!(tuple!(
-                many0!(Attribute::parse_inner),
-                call!(Block::parse_within),
-            )) >>
-            (ExprWhile {
-                attrs: {
-                    let mut attrs = outer_attrs;
-                    attrs.extend((block.1).0);
-                    attrs
-                },
-                label: label,
-                while_token: while_,
-                cond: Box::new(cond),
-                body: Block {
-                    brace_token: block.0,
-                    stmts: (block.1).1,
-                },
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`while` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprWhileLet {
-        named!(parse -> Self, do_parse!(
-            outer_attrs: many0!(Attribute::parse_outer) >>
-            label: option!(syn!(Label)) >>
-            while_: keyword!(while) >>
-            let_: keyword!(let) >>
-            pats: call!(Punctuated::parse_separated_nonempty) >>
-            eq: punct!(=) >>
-            value: expr_no_struct >>
-            block: braces!(tuple!(
-                many0!(Attribute::parse_inner),
-                call!(Block::parse_within),
-            )) >>
-            (ExprWhileLet {
-                attrs: {
-                    let mut attrs = outer_attrs;
-                    attrs.extend((block.1).0);
-                    attrs
-                },
-                label: label,
-                while_token: while_,
-                let_token: let_,
-                pats: pats,
-                eq_token: eq,
-                expr: Box::new(value),
-                body: Block {
-                    brace_token: block.0,
-                    stmts: (block.1).1,
-                },
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`while let` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for Label {
-        named!(parse -> Self, do_parse!(
-            name: syn!(Lifetime) >>
-            colon: punct!(:) >>
-            (Label {
-                name: name,
-                colon_token: colon,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`while let` expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprContinue {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            cont: keyword!(continue) >>
-            label: option!(syn!(Lifetime)) >>
-            (ExprContinue {
-                attrs: attrs,
-                continue_token: cont,
-                label: label,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`continue`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(expr_break(allow_struct: bool) -> Expr, do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        break_: keyword!(break) >>
-        label: option!(syn!(Lifetime)) >>
-        // We can't allow blocks after a `break` expression when we wouldn't
-        // allow structs, as this expression is ambiguous.
-        val: opt_ambiguous_expr!(allow_struct) >>
-        (ExprBreak {
-            attrs: attrs,
-            label: label,
-            expr: val.map(Box::new),
-            break_token: break_,
-        }.into())
-    ));
-
-    #[cfg(feature = "full")]
-    named!(expr_ret(allow_struct: bool) -> Expr, do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        return_: keyword!(return) >>
-        // NOTE: return is greedy and eats blocks after it even when in a
-        // position where structs are not allowed, such as in if statement
-        // conditions. For example:
-        //
-        // if return { println!("A") } {} // Prints "A"
-        ret_value: option!(ambiguous_expr!(allow_struct)) >>
-        (ExprReturn {
-            attrs: attrs,
-            expr: ret_value.map(Box::new),
-            return_token: return_,
-        }.into())
-    ));
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprStruct {
-        named!(parse -> Self, do_parse!(
-            outer_attrs: many0!(Attribute::parse_outer) >>
-            path: syn!(Path) >>
-            data: braces!(do_parse!(
-                inner_attrs: many0!(Attribute::parse_inner) >>
-                fields: call!(Punctuated::parse_terminated) >>
-                base: option!(cond!(fields.empty_or_trailing(), do_parse!(
-                    dots: punct!(..) >>
-                    base: syn!(Expr) >>
-                    (dots, base)
-                ))) >>
-                (inner_attrs, fields, base)
-            )) >>
-            ({
-                let (brace, (inner_attrs, fields, base)) = data;
-                let (dots, rest) = match base.and_then(|b| b) {
-                    Some((dots, base)) => (Some(dots), Some(base)),
-                    None => (None, None),
-                };
-                ExprStruct {
-                    attrs: {
-                        let mut attrs = outer_attrs;
-                        attrs.extend(inner_attrs);
-                        attrs
-                    },
-                    brace_token: brace,
-                    path: path,
-                    fields: fields,
-                    dot2_token: dots,
-                    rest: rest.map(Box::new),
-                }
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("struct literal expression")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for FieldValue {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            field_value: alt!(
-                tuple!(syn!(Member), map!(punct!(:), Some), syn!(Expr))
-                |
-                map!(syn!(Ident), |name| (
-                    Member::Named(name.clone()),
-                    None,
-                    Expr::Path(ExprPath {
-                        attrs: Vec::new(),
-                        qself: None,
-                        path: name.into(),
-                    }),
-                ))
-            ) >>
-            (FieldValue {
-                attrs: attrs,
-                member: field_value.0,
-                colon_token: field_value.1,
-                expr: field_value.2,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("field-value pair: `field: value`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprRepeat {
-        named!(parse -> Self, do_parse!(
-            outer_attrs: many0!(Attribute::parse_outer) >>
-            data: brackets!(tuple!(
-                many0!(Attribute::parse_inner),
-                syn!(Expr),
-                punct!(;),
-                syn!(Expr),
-            )) >>
-            (ExprRepeat {
-                attrs: {
-                    let mut attrs = outer_attrs;
-                    attrs.extend((data.1).0);
-                    attrs
-                },
-                expr: Box::new((data.1).1),
-                len: Box::new((data.1).3),
-                bracket_token: data.0,
-                semi_token: (data.1).2,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("repeated array literal: `[val; N]`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprUnsafe {
-        named!(parse -> Self, do_parse!(
-            unsafe_: keyword!(unsafe) >>
-            b: syn!(Block) >>
-            (ExprUnsafe {
-                attrs: Vec::new(),
-                unsafe_token: unsafe_,
-                block: b,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("unsafe block: `unsafe { .. }`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for ExprBlock {
-        named!(parse -> Self, do_parse!(
-            outer_attrs: many0!(Attribute::parse_outer) >>
-            block: braces!(tuple!(
-                many0!(Attribute::parse_inner),
-                call!(Block::parse_within),
-            )) >>
-            (ExprBlock {
-                attrs: {
-                    let mut attrs = outer_attrs;
-                    attrs.extend((block.1).0);
-                    attrs
-                },
-                block: Block {
-                    brace_token: block.0,
-                    stmts: (block.1).1,
-                },
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("block: `{ .. }`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(unstable_labeled_block -> ExprVerbatim, do_parse!(
-        begin: call!(verbatim::grab_cursor) >>
-        many0!(Attribute::parse_outer) >>
-        syn!(Label) >>
-        braces!(tuple!(
-            many0!(Attribute::parse_inner),
-            call!(Block::parse_within),
-        )) >>
-        end: call!(verbatim::grab_cursor) >>
-        (ExprVerbatim {
-            tts: verbatim::token_range(begin..end),
-        })
-    ));
-
-    #[cfg(feature = "full")]
-    named!(expr_range(allow_struct: bool) -> Expr, do_parse!(
-        limits: syn!(RangeLimits) >>
-        hi: opt_ambiguous_expr!(allow_struct) >>
-        (ExprRange {
-            attrs: Vec::new(),
-            from: None,
-            to: hi.map(Box::new),
-            limits: limits,
-        }.into())
-    ));
-
-    #[cfg(feature = "full")]
-    impl Synom for RangeLimits {
-        named!(parse -> Self, alt!(
-            // Must come before Dot2
-            punct!(..=) => { RangeLimits::Closed }
-            |
-            // Must come before Dot2
-            punct!(...) => { |dot3| RangeLimits::Closed(Token![..=](dot3.0)) }
-            |
-            punct!(..) => { RangeLimits::HalfOpen }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("range limit: `..`, `...` or `..=`")
-        }
-    }
-
-    impl Synom for ExprPath {
-        #[cfg(not(feature = "full"))]
-        named!(parse -> Self, do_parse!(
-            pair: qpath >>
-            (ExprPath {
-                attrs: Vec::new(),
-                qself: pair.0,
-                path: pair.1,
-            })
-        ));
-
-        #[cfg(feature = "full")]
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            pair: qpath >>
-            (ExprPath {
-                attrs: attrs,
-                qself: pair.0,
-                path: pair.1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("path: `a::b::c`")
-        }
-    }
-
-    named!(and_field -> (Token![.], Member), tuple!(punct!(.), syn!(Member)));
-
-    named!(and_index -> (token::Bracket, Expr), brackets!(syn!(Expr)));
-
-    #[cfg(feature = "full")]
-    impl Synom for Block {
-        named!(parse -> Self, do_parse!(
-            stmts: braces!(Block::parse_within) >>
-            (Block {
-                brace_token: stmts.0,
-                stmts: stmts.1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("block: `{ .. }`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Block {
-        named!(pub parse_within -> Vec<Stmt>, do_parse!(
-            many0!(punct!(;)) >>
-            mut standalone: many0!(do_parse!(
-                stmt: syn!(Stmt) >>
-                many0!(punct!(;)) >>
-                (stmt)
-            )) >>
-            last: option!(do_parse!(
-                attrs: many0!(Attribute::parse_outer) >>
-                mut e: syn!(Expr) >>
-                ({
-                    e.replace_attrs(attrs);
-                    Stmt::Expr(e)
-                })
-            )) >>
-            (match last {
-                None => standalone,
-                Some(last) => {
-                    standalone.push(last);
-                    standalone
-                }
-            })
-        ));
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for Stmt {
-        named!(parse -> Self, alt!(
-            stmt_mac
-            |
-            stmt_local
-            |
-            stmt_item
-            |
-            stmt_blockexpr
-            |
-            stmt_expr
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("statement")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(stmt_mac -> Stmt, do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        what: call!(Path::parse_mod_style) >>
-        bang: punct!(!) >>
-    // Only parse braces here; paren and bracket will get parsed as
-    // expression statements
-        data: braces!(syn!(TokenStream)) >>
-        semi: option!(punct!(;)) >>
-        (Stmt::Item(Item::Macro(ItemMacro {
-            attrs: attrs,
-            ident: None,
-            mac: Macro {
-                path: what,
-                bang_token: bang,
-                delimiter: MacroDelimiter::Brace(data.0),
-                tts: data.1,
-            },
-            semi_token: semi,
-        })))
-    ));
-
-    #[cfg(feature = "full")]
-    named!(stmt_local -> Stmt, do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        let_: keyword!(let) >>
-        pats: call!(Punctuated::parse_separated_nonempty) >>
-        ty: option!(tuple!(punct!(:), syn!(Type))) >>
-        init: option!(tuple!(punct!(=), syn!(Expr))) >>
-        semi: punct!(;) >>
-        (Stmt::Local(Local {
-            attrs: attrs,
-            let_token: let_,
-            pats: pats,
-            ty: ty.map(|(colon, ty)| (colon, Box::new(ty))),
-            init: init.map(|(eq, expr)| (eq, Box::new(expr))),
-            semi_token: semi,
-        }))
-    ));
-
-    #[cfg(feature = "full")]
-    named!(stmt_item -> Stmt, map!(syn!(Item), |i| Stmt::Item(i)));
-
-    #[cfg(feature = "full")]
-    named!(stmt_blockexpr -> Stmt, do_parse!(
-        mut attrs: many0!(Attribute::parse_outer) >>
-        mut e: expr_nosemi >>
-        semi: option!(punct!(;)) >>
-        ({
-            attrs.extend(e.replace_attrs(Vec::new()));
-            e.replace_attrs(attrs);
-            if let Some(semi) = semi {
-                Stmt::Semi(e, semi)
-            } else {
-                Stmt::Expr(e)
-            }
-        })
-    ));
-
-    #[cfg(feature = "full")]
-    named!(stmt_expr -> Stmt, do_parse!(
-        mut attrs: many0!(Attribute::parse_outer) >>
-        mut e: syn!(Expr) >>
-        semi: punct!(;) >>
-        ({
-            attrs.extend(e.replace_attrs(Vec::new()));
-            e.replace_attrs(attrs);
-            Stmt::Semi(e, semi)
-        })
-    ));
-
-    #[cfg(feature = "full")]
-    impl Synom for Pat {
-        named!(parse -> Self, alt!(
-            syn!(PatWild) => { Pat::Wild } // must be before pat_ident
-            |
-            syn!(PatBox) => { Pat::Box }  // must be before pat_ident
-            |
-            syn!(PatRange) => { Pat::Range } // must be before pat_lit
-            |
-            syn!(PatTupleStruct) => { Pat::TupleStruct }  // must be before pat_ident
-            |
-            syn!(PatStruct) => { Pat::Struct } // must be before pat_ident
-            |
-            syn!(PatMacro) => { Pat::Macro } // must be before pat_ident
-            |
-            syn!(PatLit) => { Pat::Lit } // must be before pat_ident
-            |
-            syn!(PatIdent) => { Pat::Ident } // must be before pat_path
-            |
-            syn!(PatPath) => { Pat::Path }
-            |
-            syn!(PatTuple) => { Pat::Tuple }
-            |
-            syn!(PatRef) => { Pat::Ref }
-            |
-            syn!(PatSlice) => { Pat::Slice }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatWild {
-        named!(parse -> Self, map!(
-            punct!(_),
-            |u| PatWild { underscore_token: u }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("wild pattern: `_`")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatBox {
-        named!(parse -> Self, do_parse!(
-            boxed: keyword!(box) >>
-            pat: syn!(Pat) >>
-            (PatBox {
-                pat: Box::new(pat),
-                box_token: boxed,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("box pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatIdent {
-        named!(parse -> Self, do_parse!(
-            by_ref: option!(keyword!(ref)) >>
-            mutability: option!(keyword!(mut)) >>
-            name: alt!(
-                syn!(Ident)
-                |
-                keyword!(self) => { Into::into }
-            ) >>
-            not!(punct!(<)) >>
-            not!(punct!(::)) >>
-            subpat: option!(tuple!(punct!(@), syn!(Pat))) >>
-            (PatIdent {
-                by_ref: by_ref,
-                mutability: mutability,
-                ident: name,
-                subpat: subpat.map(|(at, pat)| (at, Box::new(pat))),
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("pattern identifier binding")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatTupleStruct {
-        named!(parse -> Self, do_parse!(
-            path: syn!(Path) >>
-            tuple: syn!(PatTuple) >>
-            (PatTupleStruct {
-                path: path,
-                pat: tuple,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("tuple struct pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatStruct {
-        named!(parse -> Self, do_parse!(
-            path: syn!(Path) >>
-            data: braces!(do_parse!(
-                fields: call!(Punctuated::parse_terminated) >>
-                base: option!(cond!(fields.empty_or_trailing(), punct!(..))) >>
-                (fields, base)
-            )) >>
-            (PatStruct {
-                path: path,
-                fields: (data.1).0,
-                brace_token: data.0,
-                dot2_token: (data.1).1.and_then(|m| m),
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("struct pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for FieldPat {
-        named!(parse -> Self, alt!(
-            do_parse!(
-                member: syn!(Member) >>
-                colon: punct!(:) >>
-                pat: syn!(Pat) >>
-                (FieldPat {
-                    member: member,
-                    pat: Box::new(pat),
-                    attrs: Vec::new(),
-                    colon_token: Some(colon),
-                })
-            )
-            |
-            do_parse!(
-                boxed: option!(keyword!(box)) >>
-                by_ref: option!(keyword!(ref)) >>
-                mutability: option!(keyword!(mut)) >>
-                ident: syn!(Ident) >>
-                ({
-                    let mut pat: Pat = PatIdent {
-                        by_ref: by_ref,
-                        mutability: mutability,
-                        ident: ident.clone(),
-                        subpat: None,
-                    }.into();
-                    if let Some(boxed) = boxed {
-                        pat = PatBox {
-                            pat: Box::new(pat),
-                            box_token: boxed,
-                        }.into();
-                    }
-                    FieldPat {
-                        member: Member::Named(ident),
-                        pat: Box::new(pat),
-                        attrs: Vec::new(),
-                        colon_token: None,
-                    }
-                })
-            )
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("field pattern")
-        }
-    }
-
-    impl Synom for Member {
-        named!(parse -> Self, alt!(
-            syn!(Ident) => { Member::Named }
-            |
-            syn!(Index) => { Member::Unnamed }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("field member")
-        }
-    }
-
-    impl Synom for Index {
-        named!(parse -> Self, do_parse!(
-            lit: syn!(LitInt) >>
-            ({
-                if let IntSuffix::None = lit.suffix() {
-                    Index { index: lit.value() as u32, span: lit.span() }
-                } else {
-                    return parse_error();
-                }
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("field index")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatPath {
-        named!(parse -> Self, map!(
-            syn!(ExprPath),
-            |p| PatPath { qself: p.qself, path: p.path }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("path pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatTuple {
-        named!(parse -> Self, do_parse!(
-            data: parens!(do_parse!(
-                front: call!(Punctuated::parse_terminated) >>
-                dotdot: option!(cond_reduce!(front.empty_or_trailing(),
-                    tuple!(punct!(..), option!(punct!(,)))
-                )) >>
-                back: cond!(match dotdot {
-                                Some((_, Some(_))) => true,
-                                _ => false,
-                            },
-                            Punctuated::parse_terminated) >>
-                (front, dotdot, back)
-            )) >>
-            ({
-                let (parens, (front, dotdot, back)) = data;
-                let (dotdot, trailing) = match dotdot {
-                    Some((a, b)) => (Some(a), Some(b)),
-                    None => (None, None),
-                };
-                PatTuple {
-                    paren_token: parens,
-                    front: front,
-                    dot2_token: dotdot,
-                    comma_token: trailing.unwrap_or_default(),
-                    back: back.unwrap_or_default(),
-                }
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("tuple pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatRef {
-        named!(parse -> Self, do_parse!(
-            and: punct!(&) >>
-            mutability: option!(keyword!(mut)) >>
-            pat: syn!(Pat) >>
-            (PatRef {
-                pat: Box::new(pat),
-                mutability: mutability,
-                and_token: and,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("reference pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatLit {
-        named!(parse -> Self, do_parse!(
-            lit: pat_lit_expr >>
-            (if let Expr::Path(_) = lit {
-                return parse_error(); // these need to be parsed by pat_path
-            } else {
-                PatLit {
-                    expr: Box::new(lit),
-                }
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("literal pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatRange {
-        named!(parse -> Self, do_parse!(
-            lo: pat_lit_expr >>
-            limits: syn!(RangeLimits) >>
-            hi: pat_lit_expr >>
-            (PatRange {
-                lo: Box::new(lo),
-                hi: Box::new(hi),
-                limits: limits,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("range pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    named!(pat_lit_expr -> Expr, do_parse!(
-        neg: option!(punct!(-)) >>
-        v: alt!(
-            syn!(ExprLit) => { Expr::Lit }
-            |
-            syn!(ExprPath) => { Expr::Path }
-        ) >>
-        (if let Some(neg) = neg {
-            Expr::Unary(ExprUnary {
-                attrs: Vec::new(),
-                op: UnOp::Neg(neg),
-                expr: Box::new(v)
-            })
-        } else {
-            v
-        })
-    ));
-
-    #[cfg(feature = "full")]
-    impl Synom for PatSlice {
-        named!(parse -> Self, map!(
-            brackets!(do_parse!(
-                before: call!(Punctuated::parse_terminated) >>
-                middle: option!(do_parse!(
-                    dots: punct!(..) >>
-                    trailing: option!(punct!(,)) >>
-                    (dots, trailing)
-                )) >>
-                after: cond!(
-                    match middle {
-                        Some((_, ref trailing)) => trailing.is_some(),
-                        _ => false,
-                    },
-                    Punctuated::parse_terminated
-                ) >>
-                (before, middle, after)
-            )),
-            |(brackets, (before, middle, after))| {
-                let mut before: Punctuated<Pat, Token![,]> = before;
-                let after: Option<Punctuated<Pat, Token![,]>> = after;
-                let middle: Option<(Token![..], Option<Token![,]>)> = middle;
-                PatSlice {
-                    dot2_token: middle.as_ref().map(|m| Token![..]((m.0).0)),
-                    comma_token: middle.as_ref().and_then(|m| {
-                        m.1.as_ref().map(|m| Token![,](m.0))
-                    }),
-                    bracket_token: brackets,
-                    middle: middle.and_then(|_| {
-                        if before.empty_or_trailing() {
-                            None
-                        } else {
-                            Some(Box::new(before.pop().unwrap().into_value()))
-                        }
-                    }),
-                    front: before,
-                    back: after.unwrap_or_default(),
-                }
-            }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("slice pattern")
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for PatMacro {
-        named!(parse -> Self, map!(syn!(Macro), |mac| PatMacro { mac: mac }));
-
-        fn description() -> Option<&'static str> {
-            Some("macro pattern")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    #[cfg(feature = "full")]
-    use attr::FilterAttrs;
-    use proc_macro2::{Literal, TokenStream};
-    use quote::{ToTokens, TokenStreamExt};
-
-    // If the given expression is a bare `ExprStruct`, wraps it in parenthesis
-    // before appending it to `TokenStream`.
-    #[cfg(feature = "full")]
-    fn wrap_bare_struct(tokens: &mut TokenStream, e: &Expr) {
-        if let Expr::Struct(_) = *e {
-            token::Paren::default().surround(tokens, |tokens| {
-                e.to_tokens(tokens);
-            });
-        } else {
-            e.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    fn outer_attrs_to_tokens(attrs: &[Attribute], tokens: &mut TokenStream) {
-        tokens.append_all(attrs.outer());
-    }
-
-    #[cfg(feature = "full")]
-    fn inner_attrs_to_tokens(attrs: &[Attribute], tokens: &mut TokenStream) {
-        tokens.append_all(attrs.inner());
-    }
-
-    #[cfg(not(feature = "full"))]
-    fn outer_attrs_to_tokens(_attrs: &[Attribute], _tokens: &mut TokenStream) {}
-
-    #[cfg(not(feature = "full"))]
-    fn inner_attrs_to_tokens(_attrs: &[Attribute], _tokens: &mut TokenStream) {}
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprBox {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.box_token.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprInPlace {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.place.to_tokens(tokens);
-            self.arrow_token.to_tokens(tokens);
-            self.value.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprArray {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.bracket_token.surround(tokens, |tokens| {
-                inner_attrs_to_tokens(&self.attrs, tokens);
-                self.elems.to_tokens(tokens);
-            })
-        }
-    }
-
-    impl ToTokens for ExprCall {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.func.to_tokens(tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                self.args.to_tokens(tokens);
-            })
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprMethodCall {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.receiver.to_tokens(tokens);
-            self.dot_token.to_tokens(tokens);
-            self.method.to_tokens(tokens);
-            self.turbofish.to_tokens(tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                self.args.to_tokens(tokens);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for MethodTurbofish {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.colon2_token.to_tokens(tokens);
-            self.lt_token.to_tokens(tokens);
-            self.args.to_tokens(tokens);
-            self.gt_token.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for GenericMethodArgument {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            match *self {
-                GenericMethodArgument::Type(ref t) => t.to_tokens(tokens),
-                GenericMethodArgument::Const(ref c) => c.to_tokens(tokens),
-            }
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprTuple {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                inner_attrs_to_tokens(&self.attrs, tokens);
-                self.elems.to_tokens(tokens);
-                // If we only have one argument, we need a trailing comma to
-                // distinguish ExprTuple from ExprParen.
-                if self.elems.len() == 1 && !self.elems.trailing_punct() {
-                    <Token![,]>::default().to_tokens(tokens);
-                }
-            })
-        }
-    }
-
-    impl ToTokens for ExprBinary {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.left.to_tokens(tokens);
-            self.op.to_tokens(tokens);
-            self.right.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ExprUnary {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.op.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ExprLit {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.lit.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ExprCast {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.expr.to_tokens(tokens);
-            self.as_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprType {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.expr.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    fn maybe_wrap_else(tokens: &mut TokenStream, else_: &Option<(Token![else], Box<Expr>)>) {
-        if let Some((ref else_token, ref else_)) = *else_ {
-            else_token.to_tokens(tokens);
-
-            // If we are not one of the valid expressions to exist in an else
-            // clause, wrap ourselves in a block.
-            match **else_ {
-                Expr::If(_) | Expr::IfLet(_) | Expr::Block(_) => {
-                    else_.to_tokens(tokens);
-                }
-                _ => {
-                    token::Brace::default().surround(tokens, |tokens| {
-                        else_.to_tokens(tokens);
-                    });
-                }
-            }
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprIf {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.if_token.to_tokens(tokens);
-            wrap_bare_struct(tokens, &self.cond);
-            self.then_branch.to_tokens(tokens);
-            maybe_wrap_else(tokens, &self.else_branch);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprIfLet {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.if_token.to_tokens(tokens);
-            self.let_token.to_tokens(tokens);
-            self.pats.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            wrap_bare_struct(tokens, &self.expr);
-            self.then_branch.to_tokens(tokens);
-            maybe_wrap_else(tokens, &self.else_branch);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprWhile {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.label.to_tokens(tokens);
-            self.while_token.to_tokens(tokens);
-            wrap_bare_struct(tokens, &self.cond);
-            self.body.brace_token.surround(tokens, |tokens| {
-                inner_attrs_to_tokens(&self.attrs, tokens);
-                tokens.append_all(&self.body.stmts);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprWhileLet {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.label.to_tokens(tokens);
-            self.while_token.to_tokens(tokens);
-            self.let_token.to_tokens(tokens);
-            self.pats.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            wrap_bare_struct(tokens, &self.expr);
-            self.body.brace_token.surround(tokens, |tokens| {
-                inner_attrs_to_tokens(&self.attrs, tokens);
-                tokens.append_all(&self.body.stmts);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprForLoop {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.label.to_tokens(tokens);
-            self.for_token.to_tokens(tokens);
-            self.pat.to_tokens(tokens);
-            self.in_token.to_tokens(tokens);
-            wrap_bare_struct(tokens, &self.expr);
-            self.body.brace_token.surround(tokens, |tokens| {
-                inner_attrs_to_tokens(&self.attrs, tokens);
-                tokens.append_all(&self.body.stmts);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprLoop {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.label.to_tokens(tokens);
-            self.loop_token.to_tokens(tokens);
-            self.body.brace_token.surround(tokens, |tokens| {
-                inner_attrs_to_tokens(&self.attrs, tokens);
-                tokens.append_all(&self.body.stmts);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprMatch {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.match_token.to_tokens(tokens);
-            wrap_bare_struct(tokens, &self.expr);
-            self.brace_token.surround(tokens, |tokens| {
-                inner_attrs_to_tokens(&self.attrs, tokens);
-                for (i, arm) in self.arms.iter().enumerate() {
-                    arm.to_tokens(tokens);
-                    // Ensure that we have a comma after a non-block arm, except
-                    // for the last one.
-                    let is_last = i == self.arms.len() - 1;
-                    if !is_last && arm_expr_requires_comma(&arm.body) && arm.comma.is_none() {
-                        <Token![,]>::default().to_tokens(tokens);
-                    }
-                }
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprCatch {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.do_token.to_tokens(tokens);
-            self.catch_token.to_tokens(tokens);
-            self.block.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprYield {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.yield_token.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprClosure {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.movability.to_tokens(tokens);
-            self.capture.to_tokens(tokens);
-            self.or1_token.to_tokens(tokens);
-            for input in self.inputs.pairs() {
-                match **input.value() {
-                    FnArg::Captured(ArgCaptured {
-                        ref pat,
-                        ty: Type::Infer(_),
-                        ..
-                    }) => {
-                        pat.to_tokens(tokens);
-                    }
-                    _ => input.value().to_tokens(tokens),
-                }
-                input.punct().to_tokens(tokens);
-            }
-            self.or2_token.to_tokens(tokens);
-            self.output.to_tokens(tokens);
-            self.body.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprUnsafe {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.unsafe_token.to_tokens(tokens);
-            self.block.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprBlock {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.block.brace_token.surround(tokens, |tokens| {
-                inner_attrs_to_tokens(&self.attrs, tokens);
-                tokens.append_all(&self.block.stmts);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprAssign {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.left.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.right.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprAssignOp {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.left.to_tokens(tokens);
-            self.op.to_tokens(tokens);
-            self.right.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ExprField {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.base.to_tokens(tokens);
-            self.dot_token.to_tokens(tokens);
-            self.member.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for Member {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            match *self {
-                Member::Named(ref ident) => ident.to_tokens(tokens),
-                Member::Unnamed(ref index) => index.to_tokens(tokens),
-            }
-        }
-    }
-
-    impl ToTokens for Index {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            let mut lit = Literal::i64_unsuffixed(i64::from(self.index));
-            lit.set_span(self.span);
-            tokens.append(lit);
-        }
-    }
-
-    impl ToTokens for ExprIndex {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.expr.to_tokens(tokens);
-            self.bracket_token.surround(tokens, |tokens| {
-                self.index.to_tokens(tokens);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprRange {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.from.to_tokens(tokens);
-            match self.limits {
-                RangeLimits::HalfOpen(ref t) => t.to_tokens(tokens),
-                RangeLimits::Closed(ref t) => t.to_tokens(tokens),
-            }
-            self.to.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ExprPath {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            ::PathTokens(&self.qself, &self.path).to_tokens(tokens)
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprReference {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.and_token.to_tokens(tokens);
-            self.mutability.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprBreak {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.break_token.to_tokens(tokens);
-            self.label.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprContinue {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.continue_token.to_tokens(tokens);
-            self.label.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprReturn {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.return_token.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprMacro {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.mac.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprStruct {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.path.to_tokens(tokens);
-            self.brace_token.surround(tokens, |tokens| {
-                inner_attrs_to_tokens(&self.attrs, tokens);
-                self.fields.to_tokens(tokens);
-                if self.rest.is_some() {
-                    TokensOrDefault(&self.dot2_token).to_tokens(tokens);
-                    self.rest.to_tokens(tokens);
-                }
-            })
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprRepeat {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.bracket_token.surround(tokens, |tokens| {
-                inner_attrs_to_tokens(&self.attrs, tokens);
-                self.expr.to_tokens(tokens);
-                self.semi_token.to_tokens(tokens);
-                self.len.to_tokens(tokens);
-            })
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprGroup {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.group_token.surround(tokens, |tokens| {
-                self.expr.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for ExprParen {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                inner_attrs_to_tokens(&self.attrs, tokens);
-                self.expr.to_tokens(tokens);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for ExprTry {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.expr.to_tokens(tokens);
-            self.question_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ExprVerbatim {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.tts.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for Label {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.name.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for FieldValue {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.member.to_tokens(tokens);
-            if let Some(ref colon_token) = self.colon_token {
-                colon_token.to_tokens(tokens);
-                self.expr.to_tokens(tokens);
-            }
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for Arm {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(&self.attrs);
-            self.leading_vert.to_tokens(tokens);
-            self.pats.to_tokens(tokens);
-            if let Some((ref if_token, ref guard)) = self.guard {
-                if_token.to_tokens(tokens);
-                guard.to_tokens(tokens);
-            }
-            self.fat_arrow_token.to_tokens(tokens);
-            self.body.to_tokens(tokens);
-            self.comma.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatWild {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.underscore_token.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatIdent {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.by_ref.to_tokens(tokens);
-            self.mutability.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            if let Some((ref at_token, ref subpat)) = self.subpat {
-                at_token.to_tokens(tokens);
-                subpat.to_tokens(tokens);
-            }
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatStruct {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.path.to_tokens(tokens);
-            self.brace_token.surround(tokens, |tokens| {
-                self.fields.to_tokens(tokens);
-                // NOTE: We need a comma before the dot2 token if it is present.
-                if !self.fields.empty_or_trailing() && self.dot2_token.is_some() {
-                    <Token![,]>::default().to_tokens(tokens);
-                }
-                self.dot2_token.to_tokens(tokens);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatTupleStruct {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.path.to_tokens(tokens);
-            self.pat.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatPath {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            ::PathTokens(&self.qself, &self.path).to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatTuple {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.paren_token.surround(tokens, |tokens| {
-                self.front.to_tokens(tokens);
-                if let Some(ref dot2_token) = self.dot2_token {
-                    if !self.front.empty_or_trailing() {
-                        // Ensure there is a comma before the .. token.
-                        <Token![,]>::default().to_tokens(tokens);
-                    }
-                    dot2_token.to_tokens(tokens);
-                    self.comma_token.to_tokens(tokens);
-                    if self.comma_token.is_none() && !self.back.is_empty() {
-                        // Ensure there is a comma after the .. token.
-                        <Token![,]>::default().to_tokens(tokens);
-                    }
-                }
-                self.back.to_tokens(tokens);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatBox {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.box_token.to_tokens(tokens);
-            self.pat.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatRef {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.and_token.to_tokens(tokens);
-            self.mutability.to_tokens(tokens);
-            self.pat.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatLit {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.expr.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatRange {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.lo.to_tokens(tokens);
-            match self.limits {
-                RangeLimits::HalfOpen(ref t) => t.to_tokens(tokens),
-                RangeLimits::Closed(ref t) => Token![...](t.0).to_tokens(tokens),
-            }
-            self.hi.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatSlice {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            // XXX: This is a mess, and it will be so easy to screw it up. How
-            // do we make this correct itself better?
-            self.bracket_token.surround(tokens, |tokens| {
-                self.front.to_tokens(tokens);
-
-                // If we need a comma before the middle or standalone .. token,
-                // then make sure it's present.
-                if !self.front.empty_or_trailing()
-                    && (self.middle.is_some() || self.dot2_token.is_some())
-                {
-                    <Token![,]>::default().to_tokens(tokens);
-                }
-
-                // If we have an identifier, we always need a .. token.
-                if self.middle.is_some() {
-                    self.middle.to_tokens(tokens);
-                    TokensOrDefault(&self.dot2_token).to_tokens(tokens);
-                } else if self.dot2_token.is_some() {
-                    self.dot2_token.to_tokens(tokens);
-                }
-
-                // Make sure we have a comma before the back half.
-                if !self.back.is_empty() {
-                    TokensOrDefault(&self.comma_token).to_tokens(tokens);
-                    self.back.to_tokens(tokens);
-                } else {
-                    self.comma_token.to_tokens(tokens);
-                }
-            })
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatMacro {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.mac.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for PatVerbatim {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.tts.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for FieldPat {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            if let Some(ref colon_token) = self.colon_token {
-                self.member.to_tokens(tokens);
-                colon_token.to_tokens(tokens);
-            }
-            self.pat.to_tokens(tokens);
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for Block {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.brace_token.surround(tokens, |tokens| {
-                tokens.append_all(&self.stmts);
-            });
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for Stmt {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            match *self {
-                Stmt::Local(ref local) => local.to_tokens(tokens),
-                Stmt::Item(ref item) => item.to_tokens(tokens),
-                Stmt::Expr(ref expr) => expr.to_tokens(tokens),
-                Stmt::Semi(ref expr, ref semi) => {
-                    expr.to_tokens(tokens);
-                    semi.to_tokens(tokens);
-                }
-            }
-        }
-    }
-
-    #[cfg(feature = "full")]
-    impl ToTokens for Local {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            outer_attrs_to_tokens(&self.attrs, tokens);
-            self.let_token.to_tokens(tokens);
-            self.pats.to_tokens(tokens);
-            if let Some((ref colon_token, ref ty)) = self.ty {
-                colon_token.to_tokens(tokens);
-                ty.to_tokens(tokens);
-            }
-            if let Some((ref eq_token, ref init)) = self.init {
-                eq_token.to_tokens(tokens);
-                init.to_tokens(tokens);
-            }
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/file.rs b/third_party/rust/syn-0.14.6/src/file.rs
deleted file mode 100644
index 9b5b11f22a1d..000000000000
--- a/third_party/rust/syn-0.14.6/src/file.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-
-ast_struct! {
-    /// A complete file of Rust source code.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Example
-    ///
-    /// Parse a Rust source file into a `syn::File` and print out a debug
-    /// representation of the syntax tree.
-    ///
-    /// ```
-    /// extern crate syn;
-    ///
-    /// use std::env;
-    /// use std::fs::File;
-    /// use std::io::Read;
-    /// use std::process;
-    ///
-    /// fn main() {
-    /// # }
-    /// #
-    /// # fn fake_main() {
-    ///     let mut args = env::args();
-    ///     let _ = args.next(); // executable name
-    ///
-    ///     let filename = match (args.next(), args.next()) {
-    ///         (Some(filename), None) => filename,
-    ///         _ => {
-    ///             eprintln!("Usage: dump-syntax path/to/filename.rs");
-    ///             process::exit(1);
-    ///         }
-    ///     };
-    ///
-    ///     let mut file = File::open(&filename).expect("Unable to open file");
-    ///
-    ///     let mut src = String::new();
-    ///     file.read_to_string(&mut src).expect("Unable to read file");
-    ///
-    ///     let syntax = syn::parse_file(&src).expect("Unable to parse file");
-    ///     println!("{:#?}", syntax);
-    /// }
-    /// ```
-    ///
-    /// Running with its own source code as input, this program prints output
-    /// that begins with:
-    ///
-    /// ```text
-    /// File {
-    ///     shebang: None,
-    ///     attrs: [],
-    ///     items: [
-    ///         ExternCrate(
-    ///             ItemExternCrate {
-    ///                 attrs: [],
-    ///                 vis: Inherited,
-    ///                 extern_token: Extern,
-    ///                 crate_token: Crate,
-    ///                 ident: Ident {
-    ///                     term: Term(
-    ///                         "syn"
-    ///                     ),
-    ///                     span: Span
-    ///                 },
-    ///                 rename: None,
-    ///                 semi_token: Semi
-    ///             }
-    ///         ),
-    /// ...
-    /// ```
-    pub struct File {
-        pub shebang: Option<String>,
-        pub attrs: Vec<Attribute>,
-        pub items: Vec<Item>,
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-
-    use synom::Synom;
-
-    impl Synom for File {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_inner) >>
-            items: many0!(Item::parse) >>
-            (File {
-                shebang: None,
-                attrs: attrs,
-                items: items,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("crate")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use attr::FilterAttrs;
-    use proc_macro2::TokenStream;
-    use quote::{ToTokens, TokenStreamExt};
-
-    impl ToTokens for File {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.inner());
-            tokens.append_all(&self.items);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/gen/fold.rs b/third_party/rust/syn-0.14.6/src/gen/fold.rs
deleted file mode 100644
index 198587777c78..000000000000
--- a/third_party/rust/syn-0.14.6/src/gen/fold.rs
+++ /dev/null
@@ -1,2960 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT
-
-// Unreachable code is generated sometimes without the full feature.
-#![allow(unreachable_code)]
-#![cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
-
-#[cfg(any(feature = "full", feature = "derive"))]
-use gen::helper::fold::*;
-use proc_macro2::Span;
-#[cfg(any(feature = "full", feature = "derive"))]
-use token::{Brace, Bracket, Group, Paren};
-use *;
-
-#[cfg(feature = "full")]
-macro_rules! full {
-    ($e:expr) => {
-        $e
-    };
-}
-
-#[cfg(all(feature = "derive", not(feature = "full")))]
-macro_rules! full {
-    ($e:expr) => {
-        unreachable!()
-    };
-}
-
-/// Syntax tree traversal to transform the nodes of an owned syntax tree.
-///
-/// See the [module documentation] for details.
-///
-/// [module documentation]: index.html
-///
-/// *This trait is available if Syn is built with the `"fold"` feature.*
-pub trait Fold {
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_abi(&mut self, i: Abi) -> Abi {
-        fold_abi(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_angle_bracketed_generic_arguments(
-        &mut self,
-        i: AngleBracketedGenericArguments,
-    ) -> AngleBracketedGenericArguments {
-        fold_angle_bracketed_generic_arguments(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_arg_captured(&mut self, i: ArgCaptured) -> ArgCaptured {
-        fold_arg_captured(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_arg_self(&mut self, i: ArgSelf) -> ArgSelf {
-        fold_arg_self(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_arg_self_ref(&mut self, i: ArgSelfRef) -> ArgSelfRef {
-        fold_arg_self_ref(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_arm(&mut self, i: Arm) -> Arm {
-        fold_arm(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_attr_style(&mut self, i: AttrStyle) -> AttrStyle {
-        fold_attr_style(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_attribute(&mut self, i: Attribute) -> Attribute {
-        fold_attribute(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_bare_fn_arg(&mut self, i: BareFnArg) -> BareFnArg {
-        fold_bare_fn_arg(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_bare_fn_arg_name(&mut self, i: BareFnArgName) -> BareFnArgName {
-        fold_bare_fn_arg_name(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_bin_op(&mut self, i: BinOp) -> BinOp {
-        fold_bin_op(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_binding(&mut self, i: Binding) -> Binding {
-        fold_binding(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_block(&mut self, i: Block) -> Block {
-        fold_block(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_bound_lifetimes(&mut self, i: BoundLifetimes) -> BoundLifetimes {
-        fold_bound_lifetimes(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_const_param(&mut self, i: ConstParam) -> ConstParam {
-        fold_const_param(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn fold_data(&mut self, i: Data) -> Data {
-        fold_data(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn fold_data_enum(&mut self, i: DataEnum) -> DataEnum {
-        fold_data_enum(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn fold_data_struct(&mut self, i: DataStruct) -> DataStruct {
-        fold_data_struct(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn fold_data_union(&mut self, i: DataUnion) -> DataUnion {
-        fold_data_union(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn fold_derive_input(&mut self, i: DeriveInput) -> DeriveInput {
-        fold_derive_input(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr(&mut self, i: Expr) -> Expr {
-        fold_expr(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_array(&mut self, i: ExprArray) -> ExprArray {
-        fold_expr_array(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_assign(&mut self, i: ExprAssign) -> ExprAssign {
-        fold_expr_assign(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_assign_op(&mut self, i: ExprAssignOp) -> ExprAssignOp {
-        fold_expr_assign_op(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_binary(&mut self, i: ExprBinary) -> ExprBinary {
-        fold_expr_binary(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_block(&mut self, i: ExprBlock) -> ExprBlock {
-        fold_expr_block(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_box(&mut self, i: ExprBox) -> ExprBox {
-        fold_expr_box(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_break(&mut self, i: ExprBreak) -> ExprBreak {
-        fold_expr_break(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_call(&mut self, i: ExprCall) -> ExprCall {
-        fold_expr_call(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_cast(&mut self, i: ExprCast) -> ExprCast {
-        fold_expr_cast(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_catch(&mut self, i: ExprCatch) -> ExprCatch {
-        fold_expr_catch(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_closure(&mut self, i: ExprClosure) -> ExprClosure {
-        fold_expr_closure(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_continue(&mut self, i: ExprContinue) -> ExprContinue {
-        fold_expr_continue(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_field(&mut self, i: ExprField) -> ExprField {
-        fold_expr_field(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_for_loop(&mut self, i: ExprForLoop) -> ExprForLoop {
-        fold_expr_for_loop(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_group(&mut self, i: ExprGroup) -> ExprGroup {
-        fold_expr_group(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_if(&mut self, i: ExprIf) -> ExprIf {
-        fold_expr_if(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_if_let(&mut self, i: ExprIfLet) -> ExprIfLet {
-        fold_expr_if_let(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_in_place(&mut self, i: ExprInPlace) -> ExprInPlace {
-        fold_expr_in_place(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_index(&mut self, i: ExprIndex) -> ExprIndex {
-        fold_expr_index(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_lit(&mut self, i: ExprLit) -> ExprLit {
-        fold_expr_lit(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_loop(&mut self, i: ExprLoop) -> ExprLoop {
-        fold_expr_loop(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_macro(&mut self, i: ExprMacro) -> ExprMacro {
-        fold_expr_macro(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_match(&mut self, i: ExprMatch) -> ExprMatch {
-        fold_expr_match(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_method_call(&mut self, i: ExprMethodCall) -> ExprMethodCall {
-        fold_expr_method_call(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_paren(&mut self, i: ExprParen) -> ExprParen {
-        fold_expr_paren(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_path(&mut self, i: ExprPath) -> ExprPath {
-        fold_expr_path(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_range(&mut self, i: ExprRange) -> ExprRange {
-        fold_expr_range(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_reference(&mut self, i: ExprReference) -> ExprReference {
-        fold_expr_reference(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_repeat(&mut self, i: ExprRepeat) -> ExprRepeat {
-        fold_expr_repeat(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_return(&mut self, i: ExprReturn) -> ExprReturn {
-        fold_expr_return(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_struct(&mut self, i: ExprStruct) -> ExprStruct {
-        fold_expr_struct(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_try(&mut self, i: ExprTry) -> ExprTry {
-        fold_expr_try(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_tuple(&mut self, i: ExprTuple) -> ExprTuple {
-        fold_expr_tuple(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_type(&mut self, i: ExprType) -> ExprType {
-        fold_expr_type(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_unary(&mut self, i: ExprUnary) -> ExprUnary {
-        fold_expr_unary(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_unsafe(&mut self, i: ExprUnsafe) -> ExprUnsafe {
-        fold_expr_unsafe(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_verbatim(&mut self, i: ExprVerbatim) -> ExprVerbatim {
-        fold_expr_verbatim(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_while(&mut self, i: ExprWhile) -> ExprWhile {
-        fold_expr_while(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_while_let(&mut self, i: ExprWhileLet) -> ExprWhileLet {
-        fold_expr_while_let(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_expr_yield(&mut self, i: ExprYield) -> ExprYield {
-        fold_expr_yield(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_field(&mut self, i: Field) -> Field {
-        fold_field(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_field_pat(&mut self, i: FieldPat) -> FieldPat {
-        fold_field_pat(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_field_value(&mut self, i: FieldValue) -> FieldValue {
-        fold_field_value(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_fields(&mut self, i: Fields) -> Fields {
-        fold_fields(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_fields_named(&mut self, i: FieldsNamed) -> FieldsNamed {
-        fold_fields_named(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_fields_unnamed(&mut self, i: FieldsUnnamed) -> FieldsUnnamed {
-        fold_fields_unnamed(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_file(&mut self, i: File) -> File {
-        fold_file(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_fn_arg(&mut self, i: FnArg) -> FnArg {
-        fold_fn_arg(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_fn_decl(&mut self, i: FnDecl) -> FnDecl {
-        fold_fn_decl(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_foreign_item(&mut self, i: ForeignItem) -> ForeignItem {
-        fold_foreign_item(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_foreign_item_fn(&mut self, i: ForeignItemFn) -> ForeignItemFn {
-        fold_foreign_item_fn(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_foreign_item_static(&mut self, i: ForeignItemStatic) -> ForeignItemStatic {
-        fold_foreign_item_static(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_foreign_item_type(&mut self, i: ForeignItemType) -> ForeignItemType {
-        fold_foreign_item_type(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_foreign_item_verbatim(&mut self, i: ForeignItemVerbatim) -> ForeignItemVerbatim {
-        fold_foreign_item_verbatim(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_generic_argument(&mut self, i: GenericArgument) -> GenericArgument {
-        fold_generic_argument(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_generic_method_argument(&mut self, i: GenericMethodArgument) -> GenericMethodArgument {
-        fold_generic_method_argument(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_generic_param(&mut self, i: GenericParam) -> GenericParam {
-        fold_generic_param(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_generics(&mut self, i: Generics) -> Generics {
-        fold_generics(self, i)
-    }
-
-    fn fold_ident(&mut self, i: Ident) -> Ident {
-        fold_ident(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_impl_item(&mut self, i: ImplItem) -> ImplItem {
-        fold_impl_item(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_impl_item_const(&mut self, i: ImplItemConst) -> ImplItemConst {
-        fold_impl_item_const(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_impl_item_macro(&mut self, i: ImplItemMacro) -> ImplItemMacro {
-        fold_impl_item_macro(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_impl_item_method(&mut self, i: ImplItemMethod) -> ImplItemMethod {
-        fold_impl_item_method(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_impl_item_type(&mut self, i: ImplItemType) -> ImplItemType {
-        fold_impl_item_type(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_impl_item_verbatim(&mut self, i: ImplItemVerbatim) -> ImplItemVerbatim {
-        fold_impl_item_verbatim(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_index(&mut self, i: Index) -> Index {
-        fold_index(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item(&mut self, i: Item) -> Item {
-        fold_item(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_const(&mut self, i: ItemConst) -> ItemConst {
-        fold_item_const(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_enum(&mut self, i: ItemEnum) -> ItemEnum {
-        fold_item_enum(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_extern_crate(&mut self, i: ItemExternCrate) -> ItemExternCrate {
-        fold_item_extern_crate(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_fn(&mut self, i: ItemFn) -> ItemFn {
-        fold_item_fn(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_foreign_mod(&mut self, i: ItemForeignMod) -> ItemForeignMod {
-        fold_item_foreign_mod(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_impl(&mut self, i: ItemImpl) -> ItemImpl {
-        fold_item_impl(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_macro(&mut self, i: ItemMacro) -> ItemMacro {
-        fold_item_macro(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_macro2(&mut self, i: ItemMacro2) -> ItemMacro2 {
-        fold_item_macro2(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_mod(&mut self, i: ItemMod) -> ItemMod {
-        fold_item_mod(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_static(&mut self, i: ItemStatic) -> ItemStatic {
-        fold_item_static(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_struct(&mut self, i: ItemStruct) -> ItemStruct {
-        fold_item_struct(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_trait(&mut self, i: ItemTrait) -> ItemTrait {
-        fold_item_trait(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_type(&mut self, i: ItemType) -> ItemType {
-        fold_item_type(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_union(&mut self, i: ItemUnion) -> ItemUnion {
-        fold_item_union(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_use(&mut self, i: ItemUse) -> ItemUse {
-        fold_item_use(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_item_verbatim(&mut self, i: ItemVerbatim) -> ItemVerbatim {
-        fold_item_verbatim(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_label(&mut self, i: Label) -> Label {
-        fold_label(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_lifetime(&mut self, i: Lifetime) -> Lifetime {
-        fold_lifetime(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_lifetime_def(&mut self, i: LifetimeDef) -> LifetimeDef {
-        fold_lifetime_def(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_lit(&mut self, i: Lit) -> Lit {
-        fold_lit(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_lit_bool(&mut self, i: LitBool) -> LitBool {
-        fold_lit_bool(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_lit_byte(&mut self, i: LitByte) -> LitByte {
-        fold_lit_byte(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_lit_byte_str(&mut self, i: LitByteStr) -> LitByteStr {
-        fold_lit_byte_str(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_lit_char(&mut self, i: LitChar) -> LitChar {
-        fold_lit_char(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_lit_float(&mut self, i: LitFloat) -> LitFloat {
-        fold_lit_float(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_lit_int(&mut self, i: LitInt) -> LitInt {
-        fold_lit_int(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_lit_str(&mut self, i: LitStr) -> LitStr {
-        fold_lit_str(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_lit_verbatim(&mut self, i: LitVerbatim) -> LitVerbatim {
-        fold_lit_verbatim(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_local(&mut self, i: Local) -> Local {
-        fold_local(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_macro(&mut self, i: Macro) -> Macro {
-        fold_macro(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_macro_delimiter(&mut self, i: MacroDelimiter) -> MacroDelimiter {
-        fold_macro_delimiter(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_member(&mut self, i: Member) -> Member {
-        fold_member(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_meta(&mut self, i: Meta) -> Meta {
-        fold_meta(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_meta_list(&mut self, i: MetaList) -> MetaList {
-        fold_meta_list(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_meta_name_value(&mut self, i: MetaNameValue) -> MetaNameValue {
-        fold_meta_name_value(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_method_sig(&mut self, i: MethodSig) -> MethodSig {
-        fold_method_sig(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_method_turbofish(&mut self, i: MethodTurbofish) -> MethodTurbofish {
-        fold_method_turbofish(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_nested_meta(&mut self, i: NestedMeta) -> NestedMeta {
-        fold_nested_meta(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_parenthesized_generic_arguments(
-        &mut self,
-        i: ParenthesizedGenericArguments,
-    ) -> ParenthesizedGenericArguments {
-        fold_parenthesized_generic_arguments(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_pat(&mut self, i: Pat) -> Pat {
-        fold_pat(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_pat_box(&mut self, i: PatBox) -> PatBox {
-        fold_pat_box(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_pat_ident(&mut self, i: PatIdent) -> PatIdent {
-        fold_pat_ident(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_pat_lit(&mut self, i: PatLit) -> PatLit {
-        fold_pat_lit(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_pat_macro(&mut self, i: PatMacro) -> PatMacro {
-        fold_pat_macro(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_pat_path(&mut self, i: PatPath) -> PatPath {
-        fold_pat_path(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_pat_range(&mut self, i: PatRange) -> PatRange {
-        fold_pat_range(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_pat_ref(&mut self, i: PatRef) -> PatRef {
-        fold_pat_ref(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_pat_slice(&mut self, i: PatSlice) -> PatSlice {
-        fold_pat_slice(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_pat_struct(&mut self, i: PatStruct) -> PatStruct {
-        fold_pat_struct(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_pat_tuple(&mut self, i: PatTuple) -> PatTuple {
-        fold_pat_tuple(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_pat_tuple_struct(&mut self, i: PatTupleStruct) -> PatTupleStruct {
-        fold_pat_tuple_struct(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_pat_verbatim(&mut self, i: PatVerbatim) -> PatVerbatim {
-        fold_pat_verbatim(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_pat_wild(&mut self, i: PatWild) -> PatWild {
-        fold_pat_wild(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_path(&mut self, i: Path) -> Path {
-        fold_path(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_path_arguments(&mut self, i: PathArguments) -> PathArguments {
-        fold_path_arguments(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_path_segment(&mut self, i: PathSegment) -> PathSegment {
-        fold_path_segment(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_predicate_eq(&mut self, i: PredicateEq) -> PredicateEq {
-        fold_predicate_eq(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_predicate_lifetime(&mut self, i: PredicateLifetime) -> PredicateLifetime {
-        fold_predicate_lifetime(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_predicate_type(&mut self, i: PredicateType) -> PredicateType {
-        fold_predicate_type(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_qself(&mut self, i: QSelf) -> QSelf {
-        fold_qself(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_range_limits(&mut self, i: RangeLimits) -> RangeLimits {
-        fold_range_limits(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_return_type(&mut self, i: ReturnType) -> ReturnType {
-        fold_return_type(self, i)
-    }
-
-    fn fold_span(&mut self, i: Span) -> Span {
-        fold_span(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn fold_stmt(&mut self, i: Stmt) -> Stmt {
-        fold_stmt(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_trait_bound(&mut self, i: TraitBound) -> TraitBound {
-        fold_trait_bound(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_trait_bound_modifier(&mut self, i: TraitBoundModifier) -> TraitBoundModifier {
-        fold_trait_bound_modifier(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_trait_item(&mut self, i: TraitItem) -> TraitItem {
-        fold_trait_item(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_trait_item_const(&mut self, i: TraitItemConst) -> TraitItemConst {
-        fold_trait_item_const(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_trait_item_macro(&mut self, i: TraitItemMacro) -> TraitItemMacro {
-        fold_trait_item_macro(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_trait_item_method(&mut self, i: TraitItemMethod) -> TraitItemMethod {
-        fold_trait_item_method(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_trait_item_type(&mut self, i: TraitItemType) -> TraitItemType {
-        fold_trait_item_type(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_trait_item_verbatim(&mut self, i: TraitItemVerbatim) -> TraitItemVerbatim {
-        fold_trait_item_verbatim(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type(&mut self, i: Type) -> Type {
-        fold_type(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_array(&mut self, i: TypeArray) -> TypeArray {
-        fold_type_array(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_bare_fn(&mut self, i: TypeBareFn) -> TypeBareFn {
-        fold_type_bare_fn(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_group(&mut self, i: TypeGroup) -> TypeGroup {
-        fold_type_group(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_impl_trait(&mut self, i: TypeImplTrait) -> TypeImplTrait {
-        fold_type_impl_trait(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_infer(&mut self, i: TypeInfer) -> TypeInfer {
-        fold_type_infer(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_macro(&mut self, i: TypeMacro) -> TypeMacro {
-        fold_type_macro(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_never(&mut self, i: TypeNever) -> TypeNever {
-        fold_type_never(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_param(&mut self, i: TypeParam) -> TypeParam {
-        fold_type_param(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_param_bound(&mut self, i: TypeParamBound) -> TypeParamBound {
-        fold_type_param_bound(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_paren(&mut self, i: TypeParen) -> TypeParen {
-        fold_type_paren(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_path(&mut self, i: TypePath) -> TypePath {
-        fold_type_path(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_ptr(&mut self, i: TypePtr) -> TypePtr {
-        fold_type_ptr(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_reference(&mut self, i: TypeReference) -> TypeReference {
-        fold_type_reference(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_slice(&mut self, i: TypeSlice) -> TypeSlice {
-        fold_type_slice(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_trait_object(&mut self, i: TypeTraitObject) -> TypeTraitObject {
-        fold_type_trait_object(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_tuple(&mut self, i: TypeTuple) -> TypeTuple {
-        fold_type_tuple(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_type_verbatim(&mut self, i: TypeVerbatim) -> TypeVerbatim {
-        fold_type_verbatim(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_un_op(&mut self, i: UnOp) -> UnOp {
-        fold_un_op(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_use_glob(&mut self, i: UseGlob) -> UseGlob {
-        fold_use_glob(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_use_group(&mut self, i: UseGroup) -> UseGroup {
-        fold_use_group(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_use_name(&mut self, i: UseName) -> UseName {
-        fold_use_name(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_use_path(&mut self, i: UsePath) -> UsePath {
-        fold_use_path(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_use_rename(&mut self, i: UseRename) -> UseRename {
-        fold_use_rename(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn fold_use_tree(&mut self, i: UseTree) -> UseTree {
-        fold_use_tree(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_variant(&mut self, i: Variant) -> Variant {
-        fold_variant(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_vis_crate(&mut self, i: VisCrate) -> VisCrate {
-        fold_vis_crate(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_vis_public(&mut self, i: VisPublic) -> VisPublic {
-        fold_vis_public(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_vis_restricted(&mut self, i: VisRestricted) -> VisRestricted {
-        fold_vis_restricted(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_visibility(&mut self, i: Visibility) -> Visibility {
-        fold_visibility(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_where_clause(&mut self, i: WhereClause) -> WhereClause {
-        fold_where_clause(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn fold_where_predicate(&mut self, i: WherePredicate) -> WherePredicate {
-        fold_where_predicate(self, i)
-    }
-}
-
-#[cfg(any(feature = "full", feature = "derive"))]
-macro_rules! fold_span_only {
-    ($f:ident : $t:ident) => {
-        pub fn $f<V: Fold + ?Sized>(_visitor: &mut V, mut _i: $t) -> $t {
-            let span = _visitor.fold_span(_i.span());
-            _i.set_span(span);
-            _i
-        }
-    };
-}
-
-#[cfg(any(feature = "full", feature = "derive"))]
-fold_span_only!(fold_lit_byte: LitByte);
-#[cfg(any(feature = "full", feature = "derive"))]
-fold_span_only!(fold_lit_byte_str: LitByteStr);
-#[cfg(any(feature = "full", feature = "derive"))]
-fold_span_only!(fold_lit_char: LitChar);
-#[cfg(any(feature = "full", feature = "derive"))]
-fold_span_only!(fold_lit_float: LitFloat);
-#[cfg(any(feature = "full", feature = "derive"))]
-fold_span_only!(fold_lit_int: LitInt);
-#[cfg(any(feature = "full", feature = "derive"))]
-fold_span_only!(fold_lit_str: LitStr);
-
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_abi<V: Fold + ?Sized>(_visitor: &mut V, _i: Abi) -> Abi {
-    Abi {
-        extern_token: Token![extern](tokens_helper(_visitor, &(_i.extern_token).0)),
-        name: (_i.name).map(|it| _visitor.fold_lit_str(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_angle_bracketed_generic_arguments<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: AngleBracketedGenericArguments,
-) -> AngleBracketedGenericArguments {
-    AngleBracketedGenericArguments {
-        colon2_token: (_i.colon2_token).map(|it| Token ! [ :: ](tokens_helper(_visitor, &(it).0))),
-        lt_token: Token ! [ < ](tokens_helper(_visitor, &(_i.lt_token).0)),
-        args: FoldHelper::lift(_i.args, |it| _visitor.fold_generic_argument(it)),
-        gt_token: Token ! [ > ](tokens_helper(_visitor, &(_i.gt_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_arg_captured<V: Fold + ?Sized>(_visitor: &mut V, _i: ArgCaptured) -> ArgCaptured {
-    ArgCaptured {
-        pat: _visitor.fold_pat(_i.pat),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i.colon_token).0)),
-        ty: _visitor.fold_type(_i.ty),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_arg_self<V: Fold + ?Sized>(_visitor: &mut V, _i: ArgSelf) -> ArgSelf {
-    ArgSelf {
-        mutability: (_i.mutability).map(|it| Token ! [ mut ](tokens_helper(_visitor, &(it).0))),
-        self_token: Token![self](tokens_helper(_visitor, &(_i.self_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_arg_self_ref<V: Fold + ?Sized>(_visitor: &mut V, _i: ArgSelfRef) -> ArgSelfRef {
-    ArgSelfRef {
-        and_token: Token ! [ & ](tokens_helper(_visitor, &(_i.and_token).0)),
-        lifetime: (_i.lifetime).map(|it| _visitor.fold_lifetime(it)),
-        mutability: (_i.mutability).map(|it| Token ! [ mut ](tokens_helper(_visitor, &(it).0))),
-        self_token: Token![self](tokens_helper(_visitor, &(_i.self_token).0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_arm<V: Fold + ?Sized>(_visitor: &mut V, _i: Arm) -> Arm {
-    Arm {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        leading_vert: (_i.leading_vert).map(|it| Token ! [ | ](tokens_helper(_visitor, &(it).0))),
-        pats: FoldHelper::lift(_i.pats, |it| _visitor.fold_pat(it)),
-        guard: (_i.guard).map(|it| {
-            (
-                Token ! [ if ](tokens_helper(_visitor, &((it).0).0)),
-                Box::new(_visitor.fold_expr(*(it).1)),
-            )
-        }),
-        fat_arrow_token: Token ! [ => ](tokens_helper(_visitor, &(_i.fat_arrow_token).0)),
-        body: Box::new(_visitor.fold_expr(*_i.body)),
-        comma: (_i.comma).map(|it| Token ! [ , ](tokens_helper(_visitor, &(it).0))),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_attr_style<V: Fold + ?Sized>(_visitor: &mut V, _i: AttrStyle) -> AttrStyle {
-    match _i {
-        AttrStyle::Outer => AttrStyle::Outer,
-        AttrStyle::Inner(_binding_0) => {
-            AttrStyle::Inner(Token![!](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_attribute<V: Fold + ?Sized>(_visitor: &mut V, _i: Attribute) -> Attribute {
-    Attribute {
-        pound_token: Token ! [ # ](tokens_helper(_visitor, &(_i.pound_token).0)),
-        style: _visitor.fold_attr_style(_i.style),
-        bracket_token: Bracket(tokens_helper(_visitor, &(_i.bracket_token).0)),
-        path: _visitor.fold_path(_i.path),
-        tts: _i.tts,
-        is_sugared_doc: _i.is_sugared_doc,
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_bare_fn_arg<V: Fold + ?Sized>(_visitor: &mut V, _i: BareFnArg) -> BareFnArg {
-    BareFnArg {
-        name: (_i.name).map(|it| {
-            (
-                _visitor.fold_bare_fn_arg_name((it).0),
-                Token ! [ : ](tokens_helper(_visitor, &((it).1).0)),
-            )
-        }),
-        ty: _visitor.fold_type(_i.ty),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_bare_fn_arg_name<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: BareFnArgName,
-) -> BareFnArgName {
-    match _i {
-        BareFnArgName::Named(_binding_0) => BareFnArgName::Named(_visitor.fold_ident(_binding_0)),
-        BareFnArgName::Wild(_binding_0) => {
-            BareFnArgName::Wild(Token![_](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_bin_op<V: Fold + ?Sized>(_visitor: &mut V, _i: BinOp) -> BinOp {
-    match _i {
-        BinOp::Add(_binding_0) => {
-            BinOp::Add(Token ! [ + ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::Sub(_binding_0) => {
-            BinOp::Sub(Token ! [ - ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::Mul(_binding_0) => {
-            BinOp::Mul(Token ! [ * ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::Div(_binding_0) => {
-            BinOp::Div(Token ! [ / ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::Rem(_binding_0) => {
-            BinOp::Rem(Token ! [ % ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::And(_binding_0) => {
-            BinOp::And(Token ! [ && ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::Or(_binding_0) => {
-            BinOp::Or(Token ! [ || ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::BitXor(_binding_0) => {
-            BinOp::BitXor(Token ! [ ^ ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::BitAnd(_binding_0) => {
-            BinOp::BitAnd(Token ! [ & ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::BitOr(_binding_0) => {
-            BinOp::BitOr(Token ! [ | ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::Shl(_binding_0) => {
-            BinOp::Shl(Token ! [ << ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::Shr(_binding_0) => {
-            BinOp::Shr(Token ! [ >> ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::Eq(_binding_0) => {
-            BinOp::Eq(Token ! [ == ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::Lt(_binding_0) => BinOp::Lt(Token ! [ < ](tokens_helper(_visitor, &(_binding_0).0))),
-        BinOp::Le(_binding_0) => {
-            BinOp::Le(Token ! [ <= ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::Ne(_binding_0) => {
-            BinOp::Ne(Token ! [ != ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::Ge(_binding_0) => {
-            BinOp::Ge(Token ! [ >= ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::Gt(_binding_0) => BinOp::Gt(Token ! [ > ](tokens_helper(_visitor, &(_binding_0).0))),
-        BinOp::AddEq(_binding_0) => {
-            BinOp::AddEq(Token ! [ += ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::SubEq(_binding_0) => {
-            BinOp::SubEq(Token ! [ -= ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::MulEq(_binding_0) => {
-            BinOp::MulEq(Token ! [ *= ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::DivEq(_binding_0) => {
-            BinOp::DivEq(Token ! [ /= ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::RemEq(_binding_0) => {
-            BinOp::RemEq(Token ! [ %= ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::BitXorEq(_binding_0) => {
-            BinOp::BitXorEq(Token ! [ ^= ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::BitAndEq(_binding_0) => {
-            BinOp::BitAndEq(Token ! [ &= ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::BitOrEq(_binding_0) => {
-            BinOp::BitOrEq(Token ! [ |= ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::ShlEq(_binding_0) => {
-            BinOp::ShlEq(Token ! [ <<= ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        BinOp::ShrEq(_binding_0) => {
-            BinOp::ShrEq(Token ! [ >>= ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_binding<V: Fold + ?Sized>(_visitor: &mut V, _i: Binding) -> Binding {
-    Binding {
-        ident: _visitor.fold_ident(_i.ident),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i.eq_token).0)),
-        ty: _visitor.fold_type(_i.ty),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_block<V: Fold + ?Sized>(_visitor: &mut V, _i: Block) -> Block {
-    Block {
-        brace_token: Brace(tokens_helper(_visitor, &(_i.brace_token).0)),
-        stmts: FoldHelper::lift(_i.stmts, |it| _visitor.fold_stmt(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_bound_lifetimes<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: BoundLifetimes,
-) -> BoundLifetimes {
-    BoundLifetimes {
-        for_token: Token ! [ for ](tokens_helper(_visitor, &(_i.for_token).0)),
-        lt_token: Token ! [ < ](tokens_helper(_visitor, &(_i.lt_token).0)),
-        lifetimes: FoldHelper::lift(_i.lifetimes, |it| _visitor.fold_lifetime_def(it)),
-        gt_token: Token ! [ > ](tokens_helper(_visitor, &(_i.gt_token).0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_const_param<V: Fold + ?Sized>(_visitor: &mut V, _i: ConstParam) -> ConstParam {
-    ConstParam {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        const_token: Token ! [ const ](tokens_helper(_visitor, &(_i.const_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i.colon_token).0)),
-        ty: _visitor.fold_type(_i.ty),
-        eq_token: (_i.eq_token).map(|it| Token ! [ = ](tokens_helper(_visitor, &(it).0))),
-        default: (_i.default).map(|it| _visitor.fold_expr(it)),
-    }
-}
-#[cfg(feature = "derive")]
-pub fn fold_data<V: Fold + ?Sized>(_visitor: &mut V, _i: Data) -> Data {
-    match _i {
-        Data::Struct(_binding_0) => Data::Struct(_visitor.fold_data_struct(_binding_0)),
-        Data::Enum(_binding_0) => Data::Enum(_visitor.fold_data_enum(_binding_0)),
-        Data::Union(_binding_0) => Data::Union(_visitor.fold_data_union(_binding_0)),
-    }
-}
-#[cfg(feature = "derive")]
-pub fn fold_data_enum<V: Fold + ?Sized>(_visitor: &mut V, _i: DataEnum) -> DataEnum {
-    DataEnum {
-        enum_token: Token ! [ enum ](tokens_helper(_visitor, &(_i.enum_token).0)),
-        brace_token: Brace(tokens_helper(_visitor, &(_i.brace_token).0)),
-        variants: FoldHelper::lift(_i.variants, |it| _visitor.fold_variant(it)),
-    }
-}
-#[cfg(feature = "derive")]
-pub fn fold_data_struct<V: Fold + ?Sized>(_visitor: &mut V, _i: DataStruct) -> DataStruct {
-    DataStruct {
-        struct_token: Token ! [ struct ](tokens_helper(_visitor, &(_i.struct_token).0)),
-        fields: _visitor.fold_fields(_i.fields),
-        semi_token: (_i.semi_token).map(|it| Token ! [ ; ](tokens_helper(_visitor, &(it).0))),
-    }
-}
-#[cfg(feature = "derive")]
-pub fn fold_data_union<V: Fold + ?Sized>(_visitor: &mut V, _i: DataUnion) -> DataUnion {
-    DataUnion {
-        union_token: Token![union](tokens_helper(_visitor, &(_i.union_token).0)),
-        fields: _visitor.fold_fields_named(_i.fields),
-    }
-}
-#[cfg(feature = "derive")]
-pub fn fold_derive_input<V: Fold + ?Sized>(_visitor: &mut V, _i: DeriveInput) -> DeriveInput {
-    DeriveInput {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        ident: _visitor.fold_ident(_i.ident),
-        generics: _visitor.fold_generics(_i.generics),
-        data: _visitor.fold_data(_i.data),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr<V: Fold + ?Sized>(_visitor: &mut V, _i: Expr) -> Expr {
-    match _i {
-        Expr::Box(_binding_0) => Expr::Box(full!(_visitor.fold_expr_box(_binding_0))),
-        Expr::InPlace(_binding_0) => Expr::InPlace(full!(_visitor.fold_expr_in_place(_binding_0))),
-        Expr::Array(_binding_0) => Expr::Array(full!(_visitor.fold_expr_array(_binding_0))),
-        Expr::Call(_binding_0) => Expr::Call(_visitor.fold_expr_call(_binding_0)),
-        Expr::MethodCall(_binding_0) => {
-            Expr::MethodCall(full!(_visitor.fold_expr_method_call(_binding_0)))
-        }
-        Expr::Tuple(_binding_0) => Expr::Tuple(full!(_visitor.fold_expr_tuple(_binding_0))),
-        Expr::Binary(_binding_0) => Expr::Binary(_visitor.fold_expr_binary(_binding_0)),
-        Expr::Unary(_binding_0) => Expr::Unary(_visitor.fold_expr_unary(_binding_0)),
-        Expr::Lit(_binding_0) => Expr::Lit(_visitor.fold_expr_lit(_binding_0)),
-        Expr::Cast(_binding_0) => Expr::Cast(_visitor.fold_expr_cast(_binding_0)),
-        Expr::Type(_binding_0) => Expr::Type(full!(_visitor.fold_expr_type(_binding_0))),
-        Expr::If(_binding_0) => Expr::If(full!(_visitor.fold_expr_if(_binding_0))),
-        Expr::IfLet(_binding_0) => Expr::IfLet(full!(_visitor.fold_expr_if_let(_binding_0))),
-        Expr::While(_binding_0) => Expr::While(full!(_visitor.fold_expr_while(_binding_0))),
-        Expr::WhileLet(_binding_0) => {
-            Expr::WhileLet(full!(_visitor.fold_expr_while_let(_binding_0)))
-        }
-        Expr::ForLoop(_binding_0) => Expr::ForLoop(full!(_visitor.fold_expr_for_loop(_binding_0))),
-        Expr::Loop(_binding_0) => Expr::Loop(full!(_visitor.fold_expr_loop(_binding_0))),
-        Expr::Match(_binding_0) => Expr::Match(full!(_visitor.fold_expr_match(_binding_0))),
-        Expr::Closure(_binding_0) => Expr::Closure(full!(_visitor.fold_expr_closure(_binding_0))),
-        Expr::Unsafe(_binding_0) => Expr::Unsafe(full!(_visitor.fold_expr_unsafe(_binding_0))),
-        Expr::Block(_binding_0) => Expr::Block(full!(_visitor.fold_expr_block(_binding_0))),
-        Expr::Assign(_binding_0) => Expr::Assign(full!(_visitor.fold_expr_assign(_binding_0))),
-        Expr::AssignOp(_binding_0) => {
-            Expr::AssignOp(full!(_visitor.fold_expr_assign_op(_binding_0)))
-        }
-        Expr::Field(_binding_0) => Expr::Field(_visitor.fold_expr_field(_binding_0)),
-        Expr::Index(_binding_0) => Expr::Index(_visitor.fold_expr_index(_binding_0)),
-        Expr::Range(_binding_0) => Expr::Range(full!(_visitor.fold_expr_range(_binding_0))),
-        Expr::Path(_binding_0) => Expr::Path(_visitor.fold_expr_path(_binding_0)),
-        Expr::Reference(_binding_0) => {
-            Expr::Reference(full!(_visitor.fold_expr_reference(_binding_0)))
-        }
-        Expr::Break(_binding_0) => Expr::Break(full!(_visitor.fold_expr_break(_binding_0))),
-        Expr::Continue(_binding_0) => {
-            Expr::Continue(full!(_visitor.fold_expr_continue(_binding_0)))
-        }
-        Expr::Return(_binding_0) => Expr::Return(full!(_visitor.fold_expr_return(_binding_0))),
-        Expr::Macro(_binding_0) => Expr::Macro(full!(_visitor.fold_expr_macro(_binding_0))),
-        Expr::Struct(_binding_0) => Expr::Struct(full!(_visitor.fold_expr_struct(_binding_0))),
-        Expr::Repeat(_binding_0) => Expr::Repeat(full!(_visitor.fold_expr_repeat(_binding_0))),
-        Expr::Paren(_binding_0) => Expr::Paren(_visitor.fold_expr_paren(_binding_0)),
-        Expr::Group(_binding_0) => Expr::Group(full!(_visitor.fold_expr_group(_binding_0))),
-        Expr::Try(_binding_0) => Expr::Try(full!(_visitor.fold_expr_try(_binding_0))),
-        Expr::Catch(_binding_0) => Expr::Catch(full!(_visitor.fold_expr_catch(_binding_0))),
-        Expr::Yield(_binding_0) => Expr::Yield(full!(_visitor.fold_expr_yield(_binding_0))),
-        Expr::Verbatim(_binding_0) => Expr::Verbatim(_visitor.fold_expr_verbatim(_binding_0)),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_array<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprArray) -> ExprArray {
-    ExprArray {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        bracket_token: Bracket(tokens_helper(_visitor, &(_i.bracket_token).0)),
-        elems: FoldHelper::lift(_i.elems, |it| _visitor.fold_expr(it)),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_assign<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprAssign) -> ExprAssign {
-    ExprAssign {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        left: Box::new(_visitor.fold_expr(*_i.left)),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i.eq_token).0)),
-        right: Box::new(_visitor.fold_expr(*_i.right)),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_assign_op<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprAssignOp) -> ExprAssignOp {
-    ExprAssignOp {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        left: Box::new(_visitor.fold_expr(*_i.left)),
-        op: _visitor.fold_bin_op(_i.op),
-        right: Box::new(_visitor.fold_expr(*_i.right)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_binary<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprBinary) -> ExprBinary {
-    ExprBinary {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        left: Box::new(_visitor.fold_expr(*_i.left)),
-        op: _visitor.fold_bin_op(_i.op),
-        right: Box::new(_visitor.fold_expr(*_i.right)),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_block<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprBlock) -> ExprBlock {
-    ExprBlock {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        block: _visitor.fold_block(_i.block),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_box<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprBox) -> ExprBox {
-    ExprBox {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        box_token: Token ! [ box ](tokens_helper(_visitor, &(_i.box_token).0)),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_break<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprBreak) -> ExprBreak {
-    ExprBreak {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        break_token: Token![break](tokens_helper(_visitor, &(_i.break_token).0)),
-        label: (_i.label).map(|it| _visitor.fold_lifetime(it)),
-        expr: (_i.expr).map(|it| Box::new(_visitor.fold_expr(*it))),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_call<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprCall) -> ExprCall {
-    ExprCall {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        func: Box::new(_visitor.fold_expr(*_i.func)),
-        paren_token: Paren(tokens_helper(_visitor, &(_i.paren_token).0)),
-        args: FoldHelper::lift(_i.args, |it| _visitor.fold_expr(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_cast<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprCast) -> ExprCast {
-    ExprCast {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-        as_token: Token ! [ as ](tokens_helper(_visitor, &(_i.as_token).0)),
-        ty: Box::new(_visitor.fold_type(*_i.ty)),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_catch<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprCatch) -> ExprCatch {
-    ExprCatch {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        do_token: Token ! [ do ](tokens_helper(_visitor, &(_i.do_token).0)),
-        catch_token: Token![catch](tokens_helper(_visitor, &(_i.catch_token).0)),
-        block: _visitor.fold_block(_i.block),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_closure<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprClosure) -> ExprClosure {
-    ExprClosure {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        movability: (_i.movability).map(|it| Token ! [ static ](tokens_helper(_visitor, &(it).0))),
-        capture: (_i.capture).map(|it| Token ! [ move ](tokens_helper(_visitor, &(it).0))),
-        or1_token: Token ! [ | ](tokens_helper(_visitor, &(_i.or1_token).0)),
-        inputs: FoldHelper::lift(_i.inputs, |it| _visitor.fold_fn_arg(it)),
-        or2_token: Token ! [ | ](tokens_helper(_visitor, &(_i.or2_token).0)),
-        output: _visitor.fold_return_type(_i.output),
-        body: Box::new(_visitor.fold_expr(*_i.body)),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_continue<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprContinue) -> ExprContinue {
-    ExprContinue {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        continue_token: Token![continue](tokens_helper(_visitor, &(_i.continue_token).0)),
-        label: (_i.label).map(|it| _visitor.fold_lifetime(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_field<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprField) -> ExprField {
-    ExprField {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        base: Box::new(_visitor.fold_expr(*_i.base)),
-        dot_token: Token ! [ . ](tokens_helper(_visitor, &(_i.dot_token).0)),
-        member: _visitor.fold_member(_i.member),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_for_loop<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprForLoop) -> ExprForLoop {
-    ExprForLoop {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        label: (_i.label).map(|it| _visitor.fold_label(it)),
-        for_token: Token ! [ for ](tokens_helper(_visitor, &(_i.for_token).0)),
-        pat: Box::new(_visitor.fold_pat(*_i.pat)),
-        in_token: Token ! [ in ](tokens_helper(_visitor, &(_i.in_token).0)),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-        body: _visitor.fold_block(_i.body),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_group<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprGroup) -> ExprGroup {
-    ExprGroup {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        group_token: Group(tokens_helper(_visitor, &(_i.group_token).0)),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_if<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprIf) -> ExprIf {
-    ExprIf {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        if_token: Token ! [ if ](tokens_helper(_visitor, &(_i.if_token).0)),
-        cond: Box::new(_visitor.fold_expr(*_i.cond)),
-        then_branch: _visitor.fold_block(_i.then_branch),
-        else_branch: (_i.else_branch).map(|it| {
-            (
-                Token ! [ else ](tokens_helper(_visitor, &((it).0).0)),
-                Box::new(_visitor.fold_expr(*(it).1)),
-            )
-        }),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_if_let<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprIfLet) -> ExprIfLet {
-    ExprIfLet {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        if_token: Token ! [ if ](tokens_helper(_visitor, &(_i.if_token).0)),
-        let_token: Token ! [ let ](tokens_helper(_visitor, &(_i.let_token).0)),
-        pats: FoldHelper::lift(_i.pats, |it| _visitor.fold_pat(it)),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i.eq_token).0)),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-        then_branch: _visitor.fold_block(_i.then_branch),
-        else_branch: (_i.else_branch).map(|it| {
-            (
-                Token ! [ else ](tokens_helper(_visitor, &((it).0).0)),
-                Box::new(_visitor.fold_expr(*(it).1)),
-            )
-        }),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_in_place<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprInPlace) -> ExprInPlace {
-    ExprInPlace {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        place: Box::new(_visitor.fold_expr(*_i.place)),
-        arrow_token: Token ! [ <- ](tokens_helper(_visitor, &(_i.arrow_token).0)),
-        value: Box::new(_visitor.fold_expr(*_i.value)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_index<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprIndex) -> ExprIndex {
-    ExprIndex {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-        bracket_token: Bracket(tokens_helper(_visitor, &(_i.bracket_token).0)),
-        index: Box::new(_visitor.fold_expr(*_i.index)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_lit<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprLit) -> ExprLit {
-    ExprLit {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        lit: _visitor.fold_lit(_i.lit),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_loop<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprLoop) -> ExprLoop {
-    ExprLoop {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        label: (_i.label).map(|it| _visitor.fold_label(it)),
-        loop_token: Token ! [ loop ](tokens_helper(_visitor, &(_i.loop_token).0)),
-        body: _visitor.fold_block(_i.body),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_macro<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprMacro) -> ExprMacro {
-    ExprMacro {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        mac: _visitor.fold_macro(_i.mac),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_match<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprMatch) -> ExprMatch {
-    ExprMatch {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        match_token: Token ! [ match ](tokens_helper(_visitor, &(_i.match_token).0)),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-        brace_token: Brace(tokens_helper(_visitor, &(_i.brace_token).0)),
-        arms: FoldHelper::lift(_i.arms, |it| _visitor.fold_arm(it)),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_method_call<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: ExprMethodCall,
-) -> ExprMethodCall {
-    ExprMethodCall {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        receiver: Box::new(_visitor.fold_expr(*_i.receiver)),
-        dot_token: Token ! [ . ](tokens_helper(_visitor, &(_i.dot_token).0)),
-        method: _visitor.fold_ident(_i.method),
-        turbofish: (_i.turbofish).map(|it| _visitor.fold_method_turbofish(it)),
-        paren_token: Paren(tokens_helper(_visitor, &(_i.paren_token).0)),
-        args: FoldHelper::lift(_i.args, |it| _visitor.fold_expr(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_paren<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprParen) -> ExprParen {
-    ExprParen {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        paren_token: Paren(tokens_helper(_visitor, &(_i.paren_token).0)),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_path<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprPath) -> ExprPath {
-    ExprPath {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        qself: (_i.qself).map(|it| _visitor.fold_qself(it)),
-        path: _visitor.fold_path(_i.path),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_range<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprRange) -> ExprRange {
-    ExprRange {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        from: (_i.from).map(|it| Box::new(_visitor.fold_expr(*it))),
-        limits: _visitor.fold_range_limits(_i.limits),
-        to: (_i.to).map(|it| Box::new(_visitor.fold_expr(*it))),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_reference<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprReference) -> ExprReference {
-    ExprReference {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        and_token: Token ! [ & ](tokens_helper(_visitor, &(_i.and_token).0)),
-        mutability: (_i.mutability).map(|it| Token ! [ mut ](tokens_helper(_visitor, &(it).0))),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_repeat<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprRepeat) -> ExprRepeat {
-    ExprRepeat {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        bracket_token: Bracket(tokens_helper(_visitor, &(_i.bracket_token).0)),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-        len: Box::new(_visitor.fold_expr(*_i.len)),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_return<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprReturn) -> ExprReturn {
-    ExprReturn {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        return_token: Token![return](tokens_helper(_visitor, &(_i.return_token).0)),
-        expr: (_i.expr).map(|it| Box::new(_visitor.fold_expr(*it))),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_struct<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprStruct) -> ExprStruct {
-    ExprStruct {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        path: _visitor.fold_path(_i.path),
-        brace_token: Brace(tokens_helper(_visitor, &(_i.brace_token).0)),
-        fields: FoldHelper::lift(_i.fields, |it| _visitor.fold_field_value(it)),
-        dot2_token: (_i.dot2_token).map(|it| Token![..](tokens_helper(_visitor, &(it).0))),
-        rest: (_i.rest).map(|it| Box::new(_visitor.fold_expr(*it))),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_try<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprTry) -> ExprTry {
-    ExprTry {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-        question_token: Token ! [ ? ](tokens_helper(_visitor, &(_i.question_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_tuple<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprTuple) -> ExprTuple {
-    ExprTuple {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        paren_token: Paren(tokens_helper(_visitor, &(_i.paren_token).0)),
-        elems: FoldHelper::lift(_i.elems, |it| _visitor.fold_expr(it)),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_type<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprType) -> ExprType {
-    ExprType {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i.colon_token).0)),
-        ty: Box::new(_visitor.fold_type(*_i.ty)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_unary<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprUnary) -> ExprUnary {
-    ExprUnary {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        op: _visitor.fold_un_op(_i.op),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_unsafe<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprUnsafe) -> ExprUnsafe {
-    ExprUnsafe {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        unsafe_token: Token ! [ unsafe ](tokens_helper(_visitor, &(_i.unsafe_token).0)),
-        block: _visitor.fold_block(_i.block),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_verbatim<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprVerbatim) -> ExprVerbatim {
-    ExprVerbatim { tts: _i.tts }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_while<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprWhile) -> ExprWhile {
-    ExprWhile {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        label: (_i.label).map(|it| _visitor.fold_label(it)),
-        while_token: Token ! [ while ](tokens_helper(_visitor, &(_i.while_token).0)),
-        cond: Box::new(_visitor.fold_expr(*_i.cond)),
-        body: _visitor.fold_block(_i.body),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_while_let<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprWhileLet) -> ExprWhileLet {
-    ExprWhileLet {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        label: (_i.label).map(|it| _visitor.fold_label(it)),
-        while_token: Token ! [ while ](tokens_helper(_visitor, &(_i.while_token).0)),
-        let_token: Token ! [ let ](tokens_helper(_visitor, &(_i.let_token).0)),
-        pats: FoldHelper::lift(_i.pats, |it| _visitor.fold_pat(it)),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i.eq_token).0)),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-        body: _visitor.fold_block(_i.body),
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_expr_yield<V: Fold + ?Sized>(_visitor: &mut V, _i: ExprYield) -> ExprYield {
-    ExprYield {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        yield_token: Token![yield](tokens_helper(_visitor, &(_i.yield_token).0)),
-        expr: (_i.expr).map(|it| Box::new(_visitor.fold_expr(*it))),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_field<V: Fold + ?Sized>(_visitor: &mut V, _i: Field) -> Field {
-    Field {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        ident: (_i.ident).map(|it| _visitor.fold_ident(it)),
-        colon_token: (_i.colon_token).map(|it| Token ! [ : ](tokens_helper(_visitor, &(it).0))),
-        ty: _visitor.fold_type(_i.ty),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_field_pat<V: Fold + ?Sized>(_visitor: &mut V, _i: FieldPat) -> FieldPat {
-    FieldPat {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        member: _visitor.fold_member(_i.member),
-        colon_token: (_i.colon_token).map(|it| Token ! [ : ](tokens_helper(_visitor, &(it).0))),
-        pat: Box::new(_visitor.fold_pat(*_i.pat)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_field_value<V: Fold + ?Sized>(_visitor: &mut V, _i: FieldValue) -> FieldValue {
-    FieldValue {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        member: _visitor.fold_member(_i.member),
-        colon_token: (_i.colon_token).map(|it| Token ! [ : ](tokens_helper(_visitor, &(it).0))),
-        expr: _visitor.fold_expr(_i.expr),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_fields<V: Fold + ?Sized>(_visitor: &mut V, _i: Fields) -> Fields {
-    match _i {
-        Fields::Named(_binding_0) => Fields::Named(_visitor.fold_fields_named(_binding_0)),
-        Fields::Unnamed(_binding_0) => Fields::Unnamed(_visitor.fold_fields_unnamed(_binding_0)),
-        Fields::Unit => Fields::Unit,
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_fields_named<V: Fold + ?Sized>(_visitor: &mut V, _i: FieldsNamed) -> FieldsNamed {
-    FieldsNamed {
-        brace_token: Brace(tokens_helper(_visitor, &(_i.brace_token).0)),
-        named: FoldHelper::lift(_i.named, |it| _visitor.fold_field(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_fields_unnamed<V: Fold + ?Sized>(_visitor: &mut V, _i: FieldsUnnamed) -> FieldsUnnamed {
-    FieldsUnnamed {
-        paren_token: Paren(tokens_helper(_visitor, &(_i.paren_token).0)),
-        unnamed: FoldHelper::lift(_i.unnamed, |it| _visitor.fold_field(it)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_file<V: Fold + ?Sized>(_visitor: &mut V, _i: File) -> File {
-    File {
-        shebang: _i.shebang,
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        items: FoldHelper::lift(_i.items, |it| _visitor.fold_item(it)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_fn_arg<V: Fold + ?Sized>(_visitor: &mut V, _i: FnArg) -> FnArg {
-    match _i {
-        FnArg::SelfRef(_binding_0) => FnArg::SelfRef(_visitor.fold_arg_self_ref(_binding_0)),
-        FnArg::SelfValue(_binding_0) => FnArg::SelfValue(_visitor.fold_arg_self(_binding_0)),
-        FnArg::Captured(_binding_0) => FnArg::Captured(_visitor.fold_arg_captured(_binding_0)),
-        FnArg::Inferred(_binding_0) => FnArg::Inferred(_visitor.fold_pat(_binding_0)),
-        FnArg::Ignored(_binding_0) => FnArg::Ignored(_visitor.fold_type(_binding_0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_fn_decl<V: Fold + ?Sized>(_visitor: &mut V, _i: FnDecl) -> FnDecl {
-    FnDecl {
-        fn_token: Token ! [ fn ](tokens_helper(_visitor, &(_i.fn_token).0)),
-        generics: _visitor.fold_generics(_i.generics),
-        paren_token: Paren(tokens_helper(_visitor, &(_i.paren_token).0)),
-        inputs: FoldHelper::lift(_i.inputs, |it| _visitor.fold_fn_arg(it)),
-        variadic: (_i.variadic).map(|it| Token ! [ ... ](tokens_helper(_visitor, &(it).0))),
-        output: _visitor.fold_return_type(_i.output),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_foreign_item<V: Fold + ?Sized>(_visitor: &mut V, _i: ForeignItem) -> ForeignItem {
-    match _i {
-        ForeignItem::Fn(_binding_0) => ForeignItem::Fn(_visitor.fold_foreign_item_fn(_binding_0)),
-        ForeignItem::Static(_binding_0) => {
-            ForeignItem::Static(_visitor.fold_foreign_item_static(_binding_0))
-        }
-        ForeignItem::Type(_binding_0) => {
-            ForeignItem::Type(_visitor.fold_foreign_item_type(_binding_0))
-        }
-        ForeignItem::Verbatim(_binding_0) => {
-            ForeignItem::Verbatim(_visitor.fold_foreign_item_verbatim(_binding_0))
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_foreign_item_fn<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: ForeignItemFn,
-) -> ForeignItemFn {
-    ForeignItemFn {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        ident: _visitor.fold_ident(_i.ident),
-        decl: Box::new(_visitor.fold_fn_decl(*_i.decl)),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_foreign_item_static<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: ForeignItemStatic,
-) -> ForeignItemStatic {
-    ForeignItemStatic {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        static_token: Token ! [ static ](tokens_helper(_visitor, &(_i.static_token).0)),
-        mutability: (_i.mutability).map(|it| Token ! [ mut ](tokens_helper(_visitor, &(it).0))),
-        ident: _visitor.fold_ident(_i.ident),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i.colon_token).0)),
-        ty: Box::new(_visitor.fold_type(*_i.ty)),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_foreign_item_type<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: ForeignItemType,
-) -> ForeignItemType {
-    ForeignItemType {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        type_token: Token ! [ type ](tokens_helper(_visitor, &(_i.type_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_foreign_item_verbatim<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: ForeignItemVerbatim,
-) -> ForeignItemVerbatim {
-    ForeignItemVerbatim { tts: _i.tts }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_generic_argument<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: GenericArgument,
-) -> GenericArgument {
-    match _i {
-        GenericArgument::Lifetime(_binding_0) => {
-            GenericArgument::Lifetime(_visitor.fold_lifetime(_binding_0))
-        }
-        GenericArgument::Type(_binding_0) => GenericArgument::Type(_visitor.fold_type(_binding_0)),
-        GenericArgument::Binding(_binding_0) => {
-            GenericArgument::Binding(_visitor.fold_binding(_binding_0))
-        }
-        GenericArgument::Const(_binding_0) => {
-            GenericArgument::Const(_visitor.fold_expr(_binding_0))
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_generic_method_argument<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: GenericMethodArgument,
-) -> GenericMethodArgument {
-    match _i {
-        GenericMethodArgument::Type(_binding_0) => {
-            GenericMethodArgument::Type(_visitor.fold_type(_binding_0))
-        }
-        GenericMethodArgument::Const(_binding_0) => {
-            GenericMethodArgument::Const(_visitor.fold_expr(_binding_0))
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_generic_param<V: Fold + ?Sized>(_visitor: &mut V, _i: GenericParam) -> GenericParam {
-    match _i {
-        GenericParam::Type(_binding_0) => GenericParam::Type(_visitor.fold_type_param(_binding_0)),
-        GenericParam::Lifetime(_binding_0) => {
-            GenericParam::Lifetime(_visitor.fold_lifetime_def(_binding_0))
-        }
-        GenericParam::Const(_binding_0) => {
-            GenericParam::Const(_visitor.fold_const_param(_binding_0))
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_generics<V: Fold + ?Sized>(_visitor: &mut V, _i: Generics) -> Generics {
-    Generics {
-        lt_token: (_i.lt_token).map(|it| Token ! [ < ](tokens_helper(_visitor, &(it).0))),
-        params: FoldHelper::lift(_i.params, |it| _visitor.fold_generic_param(it)),
-        gt_token: (_i.gt_token).map(|it| Token ! [ > ](tokens_helper(_visitor, &(it).0))),
-        where_clause: (_i.where_clause).map(|it| _visitor.fold_where_clause(it)),
-    }
-}
-
-pub fn fold_ident<V: Fold + ?Sized>(_visitor: &mut V, _i: Ident) -> Ident {
-    let mut _i = _i;
-    let span = _visitor.fold_span(_i.span());
-    _i.set_span(span);
-    _i
-}
-#[cfg(feature = "full")]
-pub fn fold_impl_item<V: Fold + ?Sized>(_visitor: &mut V, _i: ImplItem) -> ImplItem {
-    match _i {
-        ImplItem::Const(_binding_0) => ImplItem::Const(_visitor.fold_impl_item_const(_binding_0)),
-        ImplItem::Method(_binding_0) => {
-            ImplItem::Method(_visitor.fold_impl_item_method(_binding_0))
-        }
-        ImplItem::Type(_binding_0) => ImplItem::Type(_visitor.fold_impl_item_type(_binding_0)),
-        ImplItem::Macro(_binding_0) => ImplItem::Macro(_visitor.fold_impl_item_macro(_binding_0)),
-        ImplItem::Verbatim(_binding_0) => {
-            ImplItem::Verbatim(_visitor.fold_impl_item_verbatim(_binding_0))
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_impl_item_const<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: ImplItemConst,
-) -> ImplItemConst {
-    ImplItemConst {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        defaultness: (_i.defaultness).map(|it| Token![default](tokens_helper(_visitor, &(it).0))),
-        const_token: Token ! [ const ](tokens_helper(_visitor, &(_i.const_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i.colon_token).0)),
-        ty: _visitor.fold_type(_i.ty),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i.eq_token).0)),
-        expr: _visitor.fold_expr(_i.expr),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_impl_item_macro<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: ImplItemMacro,
-) -> ImplItemMacro {
-    ImplItemMacro {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        mac: _visitor.fold_macro(_i.mac),
-        semi_token: (_i.semi_token).map(|it| Token ! [ ; ](tokens_helper(_visitor, &(it).0))),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_impl_item_method<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: ImplItemMethod,
-) -> ImplItemMethod {
-    ImplItemMethod {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        defaultness: (_i.defaultness).map(|it| Token![default](tokens_helper(_visitor, &(it).0))),
-        sig: _visitor.fold_method_sig(_i.sig),
-        block: _visitor.fold_block(_i.block),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_impl_item_type<V: Fold + ?Sized>(_visitor: &mut V, _i: ImplItemType) -> ImplItemType {
-    ImplItemType {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        defaultness: (_i.defaultness).map(|it| Token![default](tokens_helper(_visitor, &(it).0))),
-        type_token: Token ! [ type ](tokens_helper(_visitor, &(_i.type_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        generics: _visitor.fold_generics(_i.generics),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i.eq_token).0)),
-        ty: _visitor.fold_type(_i.ty),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_impl_item_verbatim<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: ImplItemVerbatim,
-) -> ImplItemVerbatim {
-    ImplItemVerbatim { tts: _i.tts }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_index<V: Fold + ?Sized>(_visitor: &mut V, _i: Index) -> Index {
-    Index {
-        index: _i.index,
-        span: _visitor.fold_span(_i.span),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item<V: Fold + ?Sized>(_visitor: &mut V, _i: Item) -> Item {
-    match _i {
-        Item::ExternCrate(_binding_0) => {
-            Item::ExternCrate(_visitor.fold_item_extern_crate(_binding_0))
-        }
-        Item::Use(_binding_0) => Item::Use(_visitor.fold_item_use(_binding_0)),
-        Item::Static(_binding_0) => Item::Static(_visitor.fold_item_static(_binding_0)),
-        Item::Const(_binding_0) => Item::Const(_visitor.fold_item_const(_binding_0)),
-        Item::Fn(_binding_0) => Item::Fn(_visitor.fold_item_fn(_binding_0)),
-        Item::Mod(_binding_0) => Item::Mod(_visitor.fold_item_mod(_binding_0)),
-        Item::ForeignMod(_binding_0) => {
-            Item::ForeignMod(_visitor.fold_item_foreign_mod(_binding_0))
-        }
-        Item::Type(_binding_0) => Item::Type(_visitor.fold_item_type(_binding_0)),
-        Item::Struct(_binding_0) => Item::Struct(_visitor.fold_item_struct(_binding_0)),
-        Item::Enum(_binding_0) => Item::Enum(_visitor.fold_item_enum(_binding_0)),
-        Item::Union(_binding_0) => Item::Union(_visitor.fold_item_union(_binding_0)),
-        Item::Trait(_binding_0) => Item::Trait(_visitor.fold_item_trait(_binding_0)),
-        Item::Impl(_binding_0) => Item::Impl(_visitor.fold_item_impl(_binding_0)),
-        Item::Macro(_binding_0) => Item::Macro(_visitor.fold_item_macro(_binding_0)),
-        Item::Macro2(_binding_0) => Item::Macro2(_visitor.fold_item_macro2(_binding_0)),
-        Item::Verbatim(_binding_0) => Item::Verbatim(_visitor.fold_item_verbatim(_binding_0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_const<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemConst) -> ItemConst {
-    ItemConst {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        const_token: Token ! [ const ](tokens_helper(_visitor, &(_i.const_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i.colon_token).0)),
-        ty: Box::new(_visitor.fold_type(*_i.ty)),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i.eq_token).0)),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_enum<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemEnum) -> ItemEnum {
-    ItemEnum {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        enum_token: Token ! [ enum ](tokens_helper(_visitor, &(_i.enum_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        generics: _visitor.fold_generics(_i.generics),
-        brace_token: Brace(tokens_helper(_visitor, &(_i.brace_token).0)),
-        variants: FoldHelper::lift(_i.variants, |it| _visitor.fold_variant(it)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_extern_crate<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: ItemExternCrate,
-) -> ItemExternCrate {
-    ItemExternCrate {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        extern_token: Token![extern](tokens_helper(_visitor, &(_i.extern_token).0)),
-        crate_token: Token![crate](tokens_helper(_visitor, &(_i.crate_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        rename: (_i.rename).map(|it| {
-            (
-                Token ! [ as ](tokens_helper(_visitor, &((it).0).0)),
-                _visitor.fold_ident((it).1),
-            )
-        }),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_fn<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemFn) -> ItemFn {
-    ItemFn {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        constness: (_i.constness).map(|it| Token ! [ const ](tokens_helper(_visitor, &(it).0))),
-        unsafety: (_i.unsafety).map(|it| Token ! [ unsafe ](tokens_helper(_visitor, &(it).0))),
-        abi: (_i.abi).map(|it| _visitor.fold_abi(it)),
-        ident: _visitor.fold_ident(_i.ident),
-        decl: Box::new(_visitor.fold_fn_decl(*_i.decl)),
-        block: Box::new(_visitor.fold_block(*_i.block)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_foreign_mod<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: ItemForeignMod,
-) -> ItemForeignMod {
-    ItemForeignMod {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        abi: _visitor.fold_abi(_i.abi),
-        brace_token: Brace(tokens_helper(_visitor, &(_i.brace_token).0)),
-        items: FoldHelper::lift(_i.items, |it| _visitor.fold_foreign_item(it)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_impl<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemImpl) -> ItemImpl {
-    ItemImpl {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        defaultness: (_i.defaultness).map(|it| Token![default](tokens_helper(_visitor, &(it).0))),
-        unsafety: (_i.unsafety).map(|it| Token ! [ unsafe ](tokens_helper(_visitor, &(it).0))),
-        impl_token: Token![impl ](tokens_helper(_visitor, &(_i.impl_token).0)),
-        generics: _visitor.fold_generics(_i.generics),
-        trait_: (_i.trait_).map(|it| {
-            (
-                ((it).0).map(|it| Token![!](tokens_helper(_visitor, &(it).0))),
-                _visitor.fold_path((it).1),
-                Token ! [ for ](tokens_helper(_visitor, &((it).2).0)),
-            )
-        }),
-        self_ty: Box::new(_visitor.fold_type(*_i.self_ty)),
-        brace_token: Brace(tokens_helper(_visitor, &(_i.brace_token).0)),
-        items: FoldHelper::lift(_i.items, |it| _visitor.fold_impl_item(it)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_macro<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemMacro) -> ItemMacro {
-    ItemMacro {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        ident: (_i.ident).map(|it| _visitor.fold_ident(it)),
-        mac: _visitor.fold_macro(_i.mac),
-        semi_token: (_i.semi_token).map(|it| Token ! [ ; ](tokens_helper(_visitor, &(it).0))),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_macro2<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemMacro2) -> ItemMacro2 {
-    ItemMacro2 {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        macro_token: Token ! [ macro ](tokens_helper(_visitor, &(_i.macro_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        paren_token: Paren(tokens_helper(_visitor, &(_i.paren_token).0)),
-        args: _i.args,
-        brace_token: Brace(tokens_helper(_visitor, &(_i.brace_token).0)),
-        body: _i.body,
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_mod<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemMod) -> ItemMod {
-    ItemMod {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        mod_token: Token ! [ mod ](tokens_helper(_visitor, &(_i.mod_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        content: (_i.content).map(|it| {
-            (
-                Brace(tokens_helper(_visitor, &((it).0).0)),
-                FoldHelper::lift((it).1, |it| _visitor.fold_item(it)),
-            )
-        }),
-        semi: (_i.semi).map(|it| Token ! [ ; ](tokens_helper(_visitor, &(it).0))),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_static<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemStatic) -> ItemStatic {
-    ItemStatic {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        static_token: Token ! [ static ](tokens_helper(_visitor, &(_i.static_token).0)),
-        mutability: (_i.mutability).map(|it| Token ! [ mut ](tokens_helper(_visitor, &(it).0))),
-        ident: _visitor.fold_ident(_i.ident),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i.colon_token).0)),
-        ty: Box::new(_visitor.fold_type(*_i.ty)),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i.eq_token).0)),
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_struct<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemStruct) -> ItemStruct {
-    ItemStruct {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        struct_token: Token ! [ struct ](tokens_helper(_visitor, &(_i.struct_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        generics: _visitor.fold_generics(_i.generics),
-        fields: _visitor.fold_fields(_i.fields),
-        semi_token: (_i.semi_token).map(|it| Token ! [ ; ](tokens_helper(_visitor, &(it).0))),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_trait<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemTrait) -> ItemTrait {
-    ItemTrait {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        unsafety: (_i.unsafety).map(|it| Token ! [ unsafe ](tokens_helper(_visitor, &(it).0))),
-        auto_token: (_i.auto_token).map(|it| Token![auto](tokens_helper(_visitor, &(it).0))),
-        trait_token: Token ! [ trait ](tokens_helper(_visitor, &(_i.trait_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        generics: _visitor.fold_generics(_i.generics),
-        colon_token: (_i.colon_token).map(|it| Token ! [ : ](tokens_helper(_visitor, &(it).0))),
-        supertraits: FoldHelper::lift(_i.supertraits, |it| _visitor.fold_type_param_bound(it)),
-        brace_token: Brace(tokens_helper(_visitor, &(_i.brace_token).0)),
-        items: FoldHelper::lift(_i.items, |it| _visitor.fold_trait_item(it)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_type<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemType) -> ItemType {
-    ItemType {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        type_token: Token ! [ type ](tokens_helper(_visitor, &(_i.type_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        generics: _visitor.fold_generics(_i.generics),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i.eq_token).0)),
-        ty: Box::new(_visitor.fold_type(*_i.ty)),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_union<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemUnion) -> ItemUnion {
-    ItemUnion {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        union_token: Token![union](tokens_helper(_visitor, &(_i.union_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        generics: _visitor.fold_generics(_i.generics),
-        fields: _visitor.fold_fields_named(_i.fields),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_use<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemUse) -> ItemUse {
-    ItemUse {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        vis: _visitor.fold_visibility(_i.vis),
-        use_token: Token ! [ use ](tokens_helper(_visitor, &(_i.use_token).0)),
-        leading_colon: (_i.leading_colon)
-            .map(|it| Token ! [ :: ](tokens_helper(_visitor, &(it).0))),
-        tree: _visitor.fold_use_tree(_i.tree),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_item_verbatim<V: Fold + ?Sized>(_visitor: &mut V, _i: ItemVerbatim) -> ItemVerbatim {
-    ItemVerbatim { tts: _i.tts }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_label<V: Fold + ?Sized>(_visitor: &mut V, _i: Label) -> Label {
-    Label {
-        name: _visitor.fold_lifetime(_i.name),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i.colon_token).0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_lifetime<V: Fold + ?Sized>(_visitor: &mut V, _i: Lifetime) -> Lifetime {
-    Lifetime {
-        apostrophe: _i.apostrophe,
-        ident: _visitor.fold_ident(_i.ident),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_lifetime_def<V: Fold + ?Sized>(_visitor: &mut V, _i: LifetimeDef) -> LifetimeDef {
-    LifetimeDef {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        lifetime: _visitor.fold_lifetime(_i.lifetime),
-        colon_token: (_i.colon_token).map(|it| Token ! [ : ](tokens_helper(_visitor, &(it).0))),
-        bounds: FoldHelper::lift(_i.bounds, |it| _visitor.fold_lifetime(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_lit<V: Fold + ?Sized>(_visitor: &mut V, _i: Lit) -> Lit {
-    match _i {
-        Lit::Str(_binding_0) => Lit::Str(_visitor.fold_lit_str(_binding_0)),
-        Lit::ByteStr(_binding_0) => Lit::ByteStr(_visitor.fold_lit_byte_str(_binding_0)),
-        Lit::Byte(_binding_0) => Lit::Byte(_visitor.fold_lit_byte(_binding_0)),
-        Lit::Char(_binding_0) => Lit::Char(_visitor.fold_lit_char(_binding_0)),
-        Lit::Int(_binding_0) => Lit::Int(_visitor.fold_lit_int(_binding_0)),
-        Lit::Float(_binding_0) => Lit::Float(_visitor.fold_lit_float(_binding_0)),
-        Lit::Bool(_binding_0) => Lit::Bool(_visitor.fold_lit_bool(_binding_0)),
-        Lit::Verbatim(_binding_0) => Lit::Verbatim(_visitor.fold_lit_verbatim(_binding_0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_lit_bool<V: Fold + ?Sized>(_visitor: &mut V, _i: LitBool) -> LitBool {
-    LitBool {
-        value: _i.value,
-        span: _visitor.fold_span(_i.span),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_lit_verbatim<V: Fold + ?Sized>(_visitor: &mut V, _i: LitVerbatim) -> LitVerbatim {
-    LitVerbatim { token: _i.token }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_local<V: Fold + ?Sized>(_visitor: &mut V, _i: Local) -> Local {
-    Local {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        let_token: Token ! [ let ](tokens_helper(_visitor, &(_i.let_token).0)),
-        pats: FoldHelper::lift(_i.pats, |it| _visitor.fold_pat(it)),
-        ty: (_i.ty).map(|it| {
-            (
-                Token ! [ : ](tokens_helper(_visitor, &((it).0).0)),
-                Box::new(_visitor.fold_type(*(it).1)),
-            )
-        }),
-        init: (_i.init).map(|it| {
-            (
-                Token ! [ = ](tokens_helper(_visitor, &((it).0).0)),
-                Box::new(_visitor.fold_expr(*(it).1)),
-            )
-        }),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_macro<V: Fold + ?Sized>(_visitor: &mut V, _i: Macro) -> Macro {
-    Macro {
-        path: _visitor.fold_path(_i.path),
-        bang_token: Token![!](tokens_helper(_visitor, &(_i.bang_token).0)),
-        delimiter: _visitor.fold_macro_delimiter(_i.delimiter),
-        tts: _i.tts,
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_macro_delimiter<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: MacroDelimiter,
-) -> MacroDelimiter {
-    match _i {
-        MacroDelimiter::Paren(_binding_0) => {
-            MacroDelimiter::Paren(Paren(tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        MacroDelimiter::Brace(_binding_0) => {
-            MacroDelimiter::Brace(Brace(tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        MacroDelimiter::Bracket(_binding_0) => {
-            MacroDelimiter::Bracket(Bracket(tokens_helper(_visitor, &(_binding_0).0)))
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_member<V: Fold + ?Sized>(_visitor: &mut V, _i: Member) -> Member {
-    match _i {
-        Member::Named(_binding_0) => Member::Named(_visitor.fold_ident(_binding_0)),
-        Member::Unnamed(_binding_0) => Member::Unnamed(_visitor.fold_index(_binding_0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_meta<V: Fold + ?Sized>(_visitor: &mut V, _i: Meta) -> Meta {
-    match _i {
-        Meta::Word(_binding_0) => Meta::Word(_visitor.fold_ident(_binding_0)),
-        Meta::List(_binding_0) => Meta::List(_visitor.fold_meta_list(_binding_0)),
-        Meta::NameValue(_binding_0) => Meta::NameValue(_visitor.fold_meta_name_value(_binding_0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_meta_list<V: Fold + ?Sized>(_visitor: &mut V, _i: MetaList) -> MetaList {
-    MetaList {
-        ident: _visitor.fold_ident(_i.ident),
-        paren_token: Paren(tokens_helper(_visitor, &(_i.paren_token).0)),
-        nested: FoldHelper::lift(_i.nested, |it| _visitor.fold_nested_meta(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_meta_name_value<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: MetaNameValue,
-) -> MetaNameValue {
-    MetaNameValue {
-        ident: _visitor.fold_ident(_i.ident),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i.eq_token).0)),
-        lit: _visitor.fold_lit(_i.lit),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_method_sig<V: Fold + ?Sized>(_visitor: &mut V, _i: MethodSig) -> MethodSig {
-    MethodSig {
-        constness: (_i.constness).map(|it| Token ! [ const ](tokens_helper(_visitor, &(it).0))),
-        unsafety: (_i.unsafety).map(|it| Token ! [ unsafe ](tokens_helper(_visitor, &(it).0))),
-        abi: (_i.abi).map(|it| _visitor.fold_abi(it)),
-        ident: _visitor.fold_ident(_i.ident),
-        decl: _visitor.fold_fn_decl(_i.decl),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_method_turbofish<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: MethodTurbofish,
-) -> MethodTurbofish {
-    MethodTurbofish {
-        colon2_token: Token ! [ :: ](tokens_helper(_visitor, &(_i.colon2_token).0)),
-        lt_token: Token ! [ < ](tokens_helper(_visitor, &(_i.lt_token).0)),
-        args: FoldHelper::lift(_i.args, |it| _visitor.fold_generic_method_argument(it)),
-        gt_token: Token ! [ > ](tokens_helper(_visitor, &(_i.gt_token).0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_nested_meta<V: Fold + ?Sized>(_visitor: &mut V, _i: NestedMeta) -> NestedMeta {
-    match _i {
-        NestedMeta::Meta(_binding_0) => NestedMeta::Meta(_visitor.fold_meta(_binding_0)),
-        NestedMeta::Literal(_binding_0) => NestedMeta::Literal(_visitor.fold_lit(_binding_0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_parenthesized_generic_arguments<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: ParenthesizedGenericArguments,
-) -> ParenthesizedGenericArguments {
-    ParenthesizedGenericArguments {
-        paren_token: Paren(tokens_helper(_visitor, &(_i.paren_token).0)),
-        inputs: FoldHelper::lift(_i.inputs, |it| _visitor.fold_type(it)),
-        output: _visitor.fold_return_type(_i.output),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_pat<V: Fold + ?Sized>(_visitor: &mut V, _i: Pat) -> Pat {
-    match _i {
-        Pat::Wild(_binding_0) => Pat::Wild(_visitor.fold_pat_wild(_binding_0)),
-        Pat::Ident(_binding_0) => Pat::Ident(_visitor.fold_pat_ident(_binding_0)),
-        Pat::Struct(_binding_0) => Pat::Struct(_visitor.fold_pat_struct(_binding_0)),
-        Pat::TupleStruct(_binding_0) => {
-            Pat::TupleStruct(_visitor.fold_pat_tuple_struct(_binding_0))
-        }
-        Pat::Path(_binding_0) => Pat::Path(_visitor.fold_pat_path(_binding_0)),
-        Pat::Tuple(_binding_0) => Pat::Tuple(_visitor.fold_pat_tuple(_binding_0)),
-        Pat::Box(_binding_0) => Pat::Box(_visitor.fold_pat_box(_binding_0)),
-        Pat::Ref(_binding_0) => Pat::Ref(_visitor.fold_pat_ref(_binding_0)),
-        Pat::Lit(_binding_0) => Pat::Lit(_visitor.fold_pat_lit(_binding_0)),
-        Pat::Range(_binding_0) => Pat::Range(_visitor.fold_pat_range(_binding_0)),
-        Pat::Slice(_binding_0) => Pat::Slice(_visitor.fold_pat_slice(_binding_0)),
-        Pat::Macro(_binding_0) => Pat::Macro(_visitor.fold_pat_macro(_binding_0)),
-        Pat::Verbatim(_binding_0) => Pat::Verbatim(_visitor.fold_pat_verbatim(_binding_0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_pat_box<V: Fold + ?Sized>(_visitor: &mut V, _i: PatBox) -> PatBox {
-    PatBox {
-        box_token: Token ! [ box ](tokens_helper(_visitor, &(_i.box_token).0)),
-        pat: Box::new(_visitor.fold_pat(*_i.pat)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_pat_ident<V: Fold + ?Sized>(_visitor: &mut V, _i: PatIdent) -> PatIdent {
-    PatIdent {
-        by_ref: (_i.by_ref).map(|it| Token ! [ ref ](tokens_helper(_visitor, &(it).0))),
-        mutability: (_i.mutability).map(|it| Token ! [ mut ](tokens_helper(_visitor, &(it).0))),
-        ident: _visitor.fold_ident(_i.ident),
-        subpat: (_i.subpat).map(|it| {
-            (
-                Token ! [ @ ](tokens_helper(_visitor, &((it).0).0)),
-                Box::new(_visitor.fold_pat(*(it).1)),
-            )
-        }),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_pat_lit<V: Fold + ?Sized>(_visitor: &mut V, _i: PatLit) -> PatLit {
-    PatLit {
-        expr: Box::new(_visitor.fold_expr(*_i.expr)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_pat_macro<V: Fold + ?Sized>(_visitor: &mut V, _i: PatMacro) -> PatMacro {
-    PatMacro {
-        mac: _visitor.fold_macro(_i.mac),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_pat_path<V: Fold + ?Sized>(_visitor: &mut V, _i: PatPath) -> PatPath {
-    PatPath {
-        qself: (_i.qself).map(|it| _visitor.fold_qself(it)),
-        path: _visitor.fold_path(_i.path),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_pat_range<V: Fold + ?Sized>(_visitor: &mut V, _i: PatRange) -> PatRange {
-    PatRange {
-        lo: Box::new(_visitor.fold_expr(*_i.lo)),
-        limits: _visitor.fold_range_limits(_i.limits),
-        hi: Box::new(_visitor.fold_expr(*_i.hi)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_pat_ref<V: Fold + ?Sized>(_visitor: &mut V, _i: PatRef) -> PatRef {
-    PatRef {
-        and_token: Token ! [ & ](tokens_helper(_visitor, &(_i.and_token).0)),
-        mutability: (_i.mutability).map(|it| Token ! [ mut ](tokens_helper(_visitor, &(it).0))),
-        pat: Box::new(_visitor.fold_pat(*_i.pat)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_pat_slice<V: Fold + ?Sized>(_visitor: &mut V, _i: PatSlice) -> PatSlice {
-    PatSlice {
-        bracket_token: Bracket(tokens_helper(_visitor, &(_i.bracket_token).0)),
-        front: FoldHelper::lift(_i.front, |it| _visitor.fold_pat(it)),
-        middle: (_i.middle).map(|it| Box::new(_visitor.fold_pat(*it))),
-        dot2_token: (_i.dot2_token).map(|it| Token![..](tokens_helper(_visitor, &(it).0))),
-        comma_token: (_i.comma_token).map(|it| Token ! [ , ](tokens_helper(_visitor, &(it).0))),
-        back: FoldHelper::lift(_i.back, |it| _visitor.fold_pat(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_pat_struct<V: Fold + ?Sized>(_visitor: &mut V, _i: PatStruct) -> PatStruct {
-    PatStruct {
-        path: _visitor.fold_path(_i.path),
-        brace_token: Brace(tokens_helper(_visitor, &(_i.brace_token).0)),
-        fields: FoldHelper::lift(_i.fields, |it| _visitor.fold_field_pat(it)),
-        dot2_token: (_i.dot2_token).map(|it| Token![..](tokens_helper(_visitor, &(it).0))),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_pat_tuple<V: Fold + ?Sized>(_visitor: &mut V, _i: PatTuple) -> PatTuple {
-    PatTuple {
-        paren_token: Paren(tokens_helper(_visitor, &(_i.paren_token).0)),
-        front: FoldHelper::lift(_i.front, |it| _visitor.fold_pat(it)),
-        dot2_token: (_i.dot2_token).map(|it| Token![..](tokens_helper(_visitor, &(it).0))),
-        comma_token: (_i.comma_token).map(|it| Token ! [ , ](tokens_helper(_visitor, &(it).0))),
-        back: FoldHelper::lift(_i.back, |it| _visitor.fold_pat(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_pat_tuple_struct<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: PatTupleStruct,
-) -> PatTupleStruct {
-    PatTupleStruct {
-        path: _visitor.fold_path(_i.path),
-        pat: _visitor.fold_pat_tuple(_i.pat),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_pat_verbatim<V: Fold + ?Sized>(_visitor: &mut V, _i: PatVerbatim) -> PatVerbatim {
-    PatVerbatim { tts: _i.tts }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_pat_wild<V: Fold + ?Sized>(_visitor: &mut V, _i: PatWild) -> PatWild {
-    PatWild {
-        underscore_token: Token![_](tokens_helper(_visitor, &(_i.underscore_token).0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_path<V: Fold + ?Sized>(_visitor: &mut V, _i: Path) -> Path {
-    Path {
-        leading_colon: (_i.leading_colon)
-            .map(|it| Token ! [ :: ](tokens_helper(_visitor, &(it).0))),
-        segments: FoldHelper::lift(_i.segments, |it| _visitor.fold_path_segment(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_path_arguments<V: Fold + ?Sized>(_visitor: &mut V, _i: PathArguments) -> PathArguments {
-    match _i {
-        PathArguments::None => PathArguments::None,
-        PathArguments::AngleBracketed(_binding_0) => PathArguments::AngleBracketed(
-            _visitor.fold_angle_bracketed_generic_arguments(_binding_0),
-        ),
-        PathArguments::Parenthesized(_binding_0) => {
-            PathArguments::Parenthesized(_visitor.fold_parenthesized_generic_arguments(_binding_0))
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_path_segment<V: Fold + ?Sized>(_visitor: &mut V, _i: PathSegment) -> PathSegment {
-    PathSegment {
-        ident: _visitor.fold_ident(_i.ident),
-        arguments: _visitor.fold_path_arguments(_i.arguments),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_predicate_eq<V: Fold + ?Sized>(_visitor: &mut V, _i: PredicateEq) -> PredicateEq {
-    PredicateEq {
-        lhs_ty: _visitor.fold_type(_i.lhs_ty),
-        eq_token: Token ! [ = ](tokens_helper(_visitor, &(_i.eq_token).0)),
-        rhs_ty: _visitor.fold_type(_i.rhs_ty),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_predicate_lifetime<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: PredicateLifetime,
-) -> PredicateLifetime {
-    PredicateLifetime {
-        lifetime: _visitor.fold_lifetime(_i.lifetime),
-        colon_token: (_i.colon_token).map(|it| Token ! [ : ](tokens_helper(_visitor, &(it).0))),
-        bounds: FoldHelper::lift(_i.bounds, |it| _visitor.fold_lifetime(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_predicate_type<V: Fold + ?Sized>(_visitor: &mut V, _i: PredicateType) -> PredicateType {
-    PredicateType {
-        lifetimes: (_i.lifetimes).map(|it| _visitor.fold_bound_lifetimes(it)),
-        bounded_ty: _visitor.fold_type(_i.bounded_ty),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i.colon_token).0)),
-        bounds: FoldHelper::lift(_i.bounds, |it| _visitor.fold_type_param_bound(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_qself<V: Fold + ?Sized>(_visitor: &mut V, _i: QSelf) -> QSelf {
-    QSelf {
-        lt_token: Token ! [ < ](tokens_helper(_visitor, &(_i.lt_token).0)),
-        ty: Box::new(_visitor.fold_type(*_i.ty)),
-        position: _i.position,
-        as_token: (_i.as_token).map(|it| Token ! [ as ](tokens_helper(_visitor, &(it).0))),
-        gt_token: Token ! [ > ](tokens_helper(_visitor, &(_i.gt_token).0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_range_limits<V: Fold + ?Sized>(_visitor: &mut V, _i: RangeLimits) -> RangeLimits {
-    match _i {
-        RangeLimits::HalfOpen(_binding_0) => {
-            RangeLimits::HalfOpen(Token![..](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        RangeLimits::Closed(_binding_0) => {
-            RangeLimits::Closed(Token ! [ ..= ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_return_type<V: Fold + ?Sized>(_visitor: &mut V, _i: ReturnType) -> ReturnType {
-    match _i {
-        ReturnType::Default => ReturnType::Default,
-        ReturnType::Type(_binding_0, _binding_1) => ReturnType::Type(
-            Token ! [ -> ](tokens_helper(_visitor, &(_binding_0).0)),
-            Box::new(_visitor.fold_type(*_binding_1)),
-        ),
-    }
-}
-
-pub fn fold_span<V: Fold + ?Sized>(_visitor: &mut V, _i: Span) -> Span {
-    _i
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn fold_stmt<V: Fold + ?Sized>(_visitor: &mut V, _i: Stmt) -> Stmt {
-    match _i {
-        Stmt::Local(_binding_0) => Stmt::Local(_visitor.fold_local(_binding_0)),
-        Stmt::Item(_binding_0) => Stmt::Item(_visitor.fold_item(_binding_0)),
-        Stmt::Expr(_binding_0) => Stmt::Expr(_visitor.fold_expr(_binding_0)),
-        Stmt::Semi(_binding_0, _binding_1) => Stmt::Semi(
-            _visitor.fold_expr(_binding_0),
-            Token ! [ ; ](tokens_helper(_visitor, &(_binding_1).0)),
-        ),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_trait_bound<V: Fold + ?Sized>(_visitor: &mut V, _i: TraitBound) -> TraitBound {
-    TraitBound {
-        paren_token: (_i.paren_token).map(|it| Paren(tokens_helper(_visitor, &(it).0))),
-        modifier: _visitor.fold_trait_bound_modifier(_i.modifier),
-        lifetimes: (_i.lifetimes).map(|it| _visitor.fold_bound_lifetimes(it)),
-        path: _visitor.fold_path(_i.path),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_trait_bound_modifier<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: TraitBoundModifier,
-) -> TraitBoundModifier {
-    match _i {
-        TraitBoundModifier::None => TraitBoundModifier::None,
-        TraitBoundModifier::Maybe(_binding_0) => {
-            TraitBoundModifier::Maybe(Token ! [ ? ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_trait_item<V: Fold + ?Sized>(_visitor: &mut V, _i: TraitItem) -> TraitItem {
-    match _i {
-        TraitItem::Const(_binding_0) => {
-            TraitItem::Const(_visitor.fold_trait_item_const(_binding_0))
-        }
-        TraitItem::Method(_binding_0) => {
-            TraitItem::Method(_visitor.fold_trait_item_method(_binding_0))
-        }
-        TraitItem::Type(_binding_0) => TraitItem::Type(_visitor.fold_trait_item_type(_binding_0)),
-        TraitItem::Macro(_binding_0) => {
-            TraitItem::Macro(_visitor.fold_trait_item_macro(_binding_0))
-        }
-        TraitItem::Verbatim(_binding_0) => {
-            TraitItem::Verbatim(_visitor.fold_trait_item_verbatim(_binding_0))
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_trait_item_const<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: TraitItemConst,
-) -> TraitItemConst {
-    TraitItemConst {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        const_token: Token ! [ const ](tokens_helper(_visitor, &(_i.const_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        colon_token: Token ! [ : ](tokens_helper(_visitor, &(_i.colon_token).0)),
-        ty: _visitor.fold_type(_i.ty),
-        default: (_i.default).map(|it| {
-            (
-                Token ! [ = ](tokens_helper(_visitor, &((it).0).0)),
-                _visitor.fold_expr((it).1),
-            )
-        }),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_trait_item_macro<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: TraitItemMacro,
-) -> TraitItemMacro {
-    TraitItemMacro {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        mac: _visitor.fold_macro(_i.mac),
-        semi_token: (_i.semi_token).map(|it| Token ! [ ; ](tokens_helper(_visitor, &(it).0))),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_trait_item_method<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: TraitItemMethod,
-) -> TraitItemMethod {
-    TraitItemMethod {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        sig: _visitor.fold_method_sig(_i.sig),
-        default: (_i.default).map(|it| _visitor.fold_block(it)),
-        semi_token: (_i.semi_token).map(|it| Token ! [ ; ](tokens_helper(_visitor, &(it).0))),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_trait_item_type<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: TraitItemType,
-) -> TraitItemType {
-    TraitItemType {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        type_token: Token ! [ type ](tokens_helper(_visitor, &(_i.type_token).0)),
-        ident: _visitor.fold_ident(_i.ident),
-        generics: _visitor.fold_generics(_i.generics),
-        colon_token: (_i.colon_token).map(|it| Token ! [ : ](tokens_helper(_visitor, &(it).0))),
-        bounds: FoldHelper::lift(_i.bounds, |it| _visitor.fold_type_param_bound(it)),
-        default: (_i.default).map(|it| {
-            (
-                Token ! [ = ](tokens_helper(_visitor, &((it).0).0)),
-                _visitor.fold_type((it).1),
-            )
-        }),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_trait_item_verbatim<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: TraitItemVerbatim,
-) -> TraitItemVerbatim {
-    TraitItemVerbatim { tts: _i.tts }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type<V: Fold + ?Sized>(_visitor: &mut V, _i: Type) -> Type {
-    match _i {
-        Type::Slice(_binding_0) => Type::Slice(_visitor.fold_type_slice(_binding_0)),
-        Type::Array(_binding_0) => Type::Array(_visitor.fold_type_array(_binding_0)),
-        Type::Ptr(_binding_0) => Type::Ptr(_visitor.fold_type_ptr(_binding_0)),
-        Type::Reference(_binding_0) => Type::Reference(_visitor.fold_type_reference(_binding_0)),
-        Type::BareFn(_binding_0) => Type::BareFn(_visitor.fold_type_bare_fn(_binding_0)),
-        Type::Never(_binding_0) => Type::Never(_visitor.fold_type_never(_binding_0)),
-        Type::Tuple(_binding_0) => Type::Tuple(_visitor.fold_type_tuple(_binding_0)),
-        Type::Path(_binding_0) => Type::Path(_visitor.fold_type_path(_binding_0)),
-        Type::TraitObject(_binding_0) => {
-            Type::TraitObject(_visitor.fold_type_trait_object(_binding_0))
-        }
-        Type::ImplTrait(_binding_0) => Type::ImplTrait(_visitor.fold_type_impl_trait(_binding_0)),
-        Type::Paren(_binding_0) => Type::Paren(_visitor.fold_type_paren(_binding_0)),
-        Type::Group(_binding_0) => Type::Group(_visitor.fold_type_group(_binding_0)),
-        Type::Infer(_binding_0) => Type::Infer(_visitor.fold_type_infer(_binding_0)),
-        Type::Macro(_binding_0) => Type::Macro(_visitor.fold_type_macro(_binding_0)),
-        Type::Verbatim(_binding_0) => Type::Verbatim(_visitor.fold_type_verbatim(_binding_0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_array<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeArray) -> TypeArray {
-    TypeArray {
-        bracket_token: Bracket(tokens_helper(_visitor, &(_i.bracket_token).0)),
-        elem: Box::new(_visitor.fold_type(*_i.elem)),
-        semi_token: Token ! [ ; ](tokens_helper(_visitor, &(_i.semi_token).0)),
-        len: _visitor.fold_expr(_i.len),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_bare_fn<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeBareFn) -> TypeBareFn {
-    TypeBareFn {
-        unsafety: (_i.unsafety).map(|it| Token ! [ unsafe ](tokens_helper(_visitor, &(it).0))),
-        abi: (_i.abi).map(|it| _visitor.fold_abi(it)),
-        fn_token: Token ! [ fn ](tokens_helper(_visitor, &(_i.fn_token).0)),
-        lifetimes: (_i.lifetimes).map(|it| _visitor.fold_bound_lifetimes(it)),
-        paren_token: Paren(tokens_helper(_visitor, &(_i.paren_token).0)),
-        inputs: FoldHelper::lift(_i.inputs, |it| _visitor.fold_bare_fn_arg(it)),
-        variadic: (_i.variadic).map(|it| Token ! [ ... ](tokens_helper(_visitor, &(it).0))),
-        output: _visitor.fold_return_type(_i.output),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_group<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeGroup) -> TypeGroup {
-    TypeGroup {
-        group_token: Group(tokens_helper(_visitor, &(_i.group_token).0)),
-        elem: Box::new(_visitor.fold_type(*_i.elem)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_impl_trait<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: TypeImplTrait,
-) -> TypeImplTrait {
-    TypeImplTrait {
-        impl_token: Token![impl ](tokens_helper(_visitor, &(_i.impl_token).0)),
-        bounds: FoldHelper::lift(_i.bounds, |it| _visitor.fold_type_param_bound(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_infer<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeInfer) -> TypeInfer {
-    TypeInfer {
-        underscore_token: Token![_](tokens_helper(_visitor, &(_i.underscore_token).0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_macro<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeMacro) -> TypeMacro {
-    TypeMacro {
-        mac: _visitor.fold_macro(_i.mac),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_never<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeNever) -> TypeNever {
-    TypeNever {
-        bang_token: Token![!](tokens_helper(_visitor, &(_i.bang_token).0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_param<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeParam) -> TypeParam {
-    TypeParam {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        ident: _visitor.fold_ident(_i.ident),
-        colon_token: (_i.colon_token).map(|it| Token ! [ : ](tokens_helper(_visitor, &(it).0))),
-        bounds: FoldHelper::lift(_i.bounds, |it| _visitor.fold_type_param_bound(it)),
-        eq_token: (_i.eq_token).map(|it| Token ! [ = ](tokens_helper(_visitor, &(it).0))),
-        default: (_i.default).map(|it| _visitor.fold_type(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_param_bound<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: TypeParamBound,
-) -> TypeParamBound {
-    match _i {
-        TypeParamBound::Trait(_binding_0) => {
-            TypeParamBound::Trait(_visitor.fold_trait_bound(_binding_0))
-        }
-        TypeParamBound::Lifetime(_binding_0) => {
-            TypeParamBound::Lifetime(_visitor.fold_lifetime(_binding_0))
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_paren<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeParen) -> TypeParen {
-    TypeParen {
-        paren_token: Paren(tokens_helper(_visitor, &(_i.paren_token).0)),
-        elem: Box::new(_visitor.fold_type(*_i.elem)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_path<V: Fold + ?Sized>(_visitor: &mut V, _i: TypePath) -> TypePath {
-    TypePath {
-        qself: (_i.qself).map(|it| _visitor.fold_qself(it)),
-        path: _visitor.fold_path(_i.path),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_ptr<V: Fold + ?Sized>(_visitor: &mut V, _i: TypePtr) -> TypePtr {
-    TypePtr {
-        star_token: Token ! [ * ](tokens_helper(_visitor, &(_i.star_token).0)),
-        const_token: (_i.const_token).map(|it| Token ! [ const ](tokens_helper(_visitor, &(it).0))),
-        mutability: (_i.mutability).map(|it| Token ! [ mut ](tokens_helper(_visitor, &(it).0))),
-        elem: Box::new(_visitor.fold_type(*_i.elem)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_reference<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeReference) -> TypeReference {
-    TypeReference {
-        and_token: Token ! [ & ](tokens_helper(_visitor, &(_i.and_token).0)),
-        lifetime: (_i.lifetime).map(|it| _visitor.fold_lifetime(it)),
-        mutability: (_i.mutability).map(|it| Token ! [ mut ](tokens_helper(_visitor, &(it).0))),
-        elem: Box::new(_visitor.fold_type(*_i.elem)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_slice<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeSlice) -> TypeSlice {
-    TypeSlice {
-        bracket_token: Bracket(tokens_helper(_visitor, &(_i.bracket_token).0)),
-        elem: Box::new(_visitor.fold_type(*_i.elem)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_trait_object<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: TypeTraitObject,
-) -> TypeTraitObject {
-    TypeTraitObject {
-        dyn_token: (_i.dyn_token).map(|it| Token![dyn](tokens_helper(_visitor, &(it).0))),
-        bounds: FoldHelper::lift(_i.bounds, |it| _visitor.fold_type_param_bound(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_tuple<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeTuple) -> TypeTuple {
-    TypeTuple {
-        paren_token: Paren(tokens_helper(_visitor, &(_i.paren_token).0)),
-        elems: FoldHelper::lift(_i.elems, |it| _visitor.fold_type(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_type_verbatim<V: Fold + ?Sized>(_visitor: &mut V, _i: TypeVerbatim) -> TypeVerbatim {
-    TypeVerbatim { tts: _i.tts }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_un_op<V: Fold + ?Sized>(_visitor: &mut V, _i: UnOp) -> UnOp {
-    match _i {
-        UnOp::Deref(_binding_0) => {
-            UnOp::Deref(Token ! [ * ](tokens_helper(_visitor, &(_binding_0).0)))
-        }
-        UnOp::Not(_binding_0) => UnOp::Not(Token![!](tokens_helper(_visitor, &(_binding_0).0))),
-        UnOp::Neg(_binding_0) => UnOp::Neg(Token ! [ - ](tokens_helper(_visitor, &(_binding_0).0))),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_use_glob<V: Fold + ?Sized>(_visitor: &mut V, _i: UseGlob) -> UseGlob {
-    UseGlob {
-        star_token: Token ! [ * ](tokens_helper(_visitor, &(_i.star_token).0)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_use_group<V: Fold + ?Sized>(_visitor: &mut V, _i: UseGroup) -> UseGroup {
-    UseGroup {
-        brace_token: Brace(tokens_helper(_visitor, &(_i.brace_token).0)),
-        items: FoldHelper::lift(_i.items, |it| _visitor.fold_use_tree(it)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_use_name<V: Fold + ?Sized>(_visitor: &mut V, _i: UseName) -> UseName {
-    UseName {
-        ident: _visitor.fold_ident(_i.ident),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_use_path<V: Fold + ?Sized>(_visitor: &mut V, _i: UsePath) -> UsePath {
-    UsePath {
-        ident: _visitor.fold_ident(_i.ident),
-        colon2_token: Token ! [ :: ](tokens_helper(_visitor, &(_i.colon2_token).0)),
-        tree: Box::new(_visitor.fold_use_tree(*_i.tree)),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_use_rename<V: Fold + ?Sized>(_visitor: &mut V, _i: UseRename) -> UseRename {
-    UseRename {
-        ident: _visitor.fold_ident(_i.ident),
-        as_token: Token ! [ as ](tokens_helper(_visitor, &(_i.as_token).0)),
-        rename: _visitor.fold_ident(_i.rename),
-    }
-}
-#[cfg(feature = "full")]
-pub fn fold_use_tree<V: Fold + ?Sized>(_visitor: &mut V, _i: UseTree) -> UseTree {
-    match _i {
-        UseTree::Path(_binding_0) => UseTree::Path(_visitor.fold_use_path(_binding_0)),
-        UseTree::Name(_binding_0) => UseTree::Name(_visitor.fold_use_name(_binding_0)),
-        UseTree::Rename(_binding_0) => UseTree::Rename(_visitor.fold_use_rename(_binding_0)),
-        UseTree::Glob(_binding_0) => UseTree::Glob(_visitor.fold_use_glob(_binding_0)),
-        UseTree::Group(_binding_0) => UseTree::Group(_visitor.fold_use_group(_binding_0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_variant<V: Fold + ?Sized>(_visitor: &mut V, _i: Variant) -> Variant {
-    Variant {
-        attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
-        ident: _visitor.fold_ident(_i.ident),
-        fields: _visitor.fold_fields(_i.fields),
-        discriminant: (_i.discriminant).map(|it| {
-            (
-                Token ! [ = ](tokens_helper(_visitor, &((it).0).0)),
-                _visitor.fold_expr((it).1),
-            )
-        }),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_vis_crate<V: Fold + ?Sized>(_visitor: &mut V, _i: VisCrate) -> VisCrate {
-    VisCrate {
-        crate_token: Token![crate](tokens_helper(_visitor, &(_i.crate_token).0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_vis_public<V: Fold + ?Sized>(_visitor: &mut V, _i: VisPublic) -> VisPublic {
-    VisPublic {
-        pub_token: Token ! [ pub ](tokens_helper(_visitor, &(_i.pub_token).0)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_vis_restricted<V: Fold + ?Sized>(_visitor: &mut V, _i: VisRestricted) -> VisRestricted {
-    VisRestricted {
-        pub_token: Token ! [ pub ](tokens_helper(_visitor, &(_i.pub_token).0)),
-        paren_token: Paren(tokens_helper(_visitor, &(_i.paren_token).0)),
-        in_token: (_i.in_token).map(|it| Token ! [ in ](tokens_helper(_visitor, &(it).0))),
-        path: Box::new(_visitor.fold_path(*_i.path)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_visibility<V: Fold + ?Sized>(_visitor: &mut V, _i: Visibility) -> Visibility {
-    match _i {
-        Visibility::Public(_binding_0) => Visibility::Public(_visitor.fold_vis_public(_binding_0)),
-        Visibility::Crate(_binding_0) => Visibility::Crate(_visitor.fold_vis_crate(_binding_0)),
-        Visibility::Restricted(_binding_0) => {
-            Visibility::Restricted(_visitor.fold_vis_restricted(_binding_0))
-        }
-        Visibility::Inherited => Visibility::Inherited,
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_where_clause<V: Fold + ?Sized>(_visitor: &mut V, _i: WhereClause) -> WhereClause {
-    WhereClause {
-        where_token: Token ! [ where ](tokens_helper(_visitor, &(_i.where_token).0)),
-        predicates: FoldHelper::lift(_i.predicates, |it| _visitor.fold_where_predicate(it)),
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn fold_where_predicate<V: Fold + ?Sized>(
-    _visitor: &mut V,
-    _i: WherePredicate,
-) -> WherePredicate {
-    match _i {
-        WherePredicate::Type(_binding_0) => {
-            WherePredicate::Type(_visitor.fold_predicate_type(_binding_0))
-        }
-        WherePredicate::Lifetime(_binding_0) => {
-            WherePredicate::Lifetime(_visitor.fold_predicate_lifetime(_binding_0))
-        }
-        WherePredicate::Eq(_binding_0) => {
-            WherePredicate::Eq(_visitor.fold_predicate_eq(_binding_0))
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/gen/visit.rs b/third_party/rust/syn-0.14.6/src/gen/visit.rs
deleted file mode 100644
index 931c4fb2b2f1..000000000000
--- a/third_party/rust/syn-0.14.6/src/gen/visit.rs
+++ /dev/null
@@ -1,3384 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT
-
-#![cfg_attr(feature = "cargo-clippy", allow(match_same_arms))]
-
-#[cfg(any(feature = "full", feature = "derive"))]
-use gen::helper::visit::*;
-use proc_macro2::Span;
-#[cfg(any(feature = "full", feature = "derive"))]
-use punctuated::Punctuated;
-use *;
-
-#[cfg(feature = "full")]
-macro_rules! full {
-    ($e:expr) => {
-        $e
-    };
-}
-
-#[cfg(all(feature = "derive", not(feature = "full")))]
-macro_rules! full {
-    ($e:expr) => {
-        unreachable!()
-    };
-}
-
-/// Syntax tree traversal to walk a shared borrow of a syntax tree.
-///
-/// See the [module documentation] for details.
-///
-/// [module documentation]: index.html
-///
-/// *This trait is available if Syn is built with the `"visit"` feature.*
-pub trait Visit<'ast> {
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_abi(&mut self, i: &'ast Abi) {
-        visit_abi(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_angle_bracketed_generic_arguments(&mut self, i: &'ast AngleBracketedGenericArguments) {
-        visit_angle_bracketed_generic_arguments(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_arg_captured(&mut self, i: &'ast ArgCaptured) {
-        visit_arg_captured(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_arg_self(&mut self, i: &'ast ArgSelf) {
-        visit_arg_self(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_arg_self_ref(&mut self, i: &'ast ArgSelfRef) {
-        visit_arg_self_ref(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_arm(&mut self, i: &'ast Arm) {
-        visit_arm(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_attr_style(&mut self, i: &'ast AttrStyle) {
-        visit_attr_style(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_attribute(&mut self, i: &'ast Attribute) {
-        visit_attribute(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_bare_fn_arg(&mut self, i: &'ast BareFnArg) {
-        visit_bare_fn_arg(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_bare_fn_arg_name(&mut self, i: &'ast BareFnArgName) {
-        visit_bare_fn_arg_name(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_bin_op(&mut self, i: &'ast BinOp) {
-        visit_bin_op(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_binding(&mut self, i: &'ast Binding) {
-        visit_binding(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_block(&mut self, i: &'ast Block) {
-        visit_block(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_bound_lifetimes(&mut self, i: &'ast BoundLifetimes) {
-        visit_bound_lifetimes(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_const_param(&mut self, i: &'ast ConstParam) {
-        visit_const_param(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn visit_data(&mut self, i: &'ast Data) {
-        visit_data(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn visit_data_enum(&mut self, i: &'ast DataEnum) {
-        visit_data_enum(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn visit_data_struct(&mut self, i: &'ast DataStruct) {
-        visit_data_struct(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn visit_data_union(&mut self, i: &'ast DataUnion) {
-        visit_data_union(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn visit_derive_input(&mut self, i: &'ast DeriveInput) {
-        visit_derive_input(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr(&mut self, i: &'ast Expr) {
-        visit_expr(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_array(&mut self, i: &'ast ExprArray) {
-        visit_expr_array(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_assign(&mut self, i: &'ast ExprAssign) {
-        visit_expr_assign(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_assign_op(&mut self, i: &'ast ExprAssignOp) {
-        visit_expr_assign_op(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_binary(&mut self, i: &'ast ExprBinary) {
-        visit_expr_binary(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_block(&mut self, i: &'ast ExprBlock) {
-        visit_expr_block(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_box(&mut self, i: &'ast ExprBox) {
-        visit_expr_box(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_break(&mut self, i: &'ast ExprBreak) {
-        visit_expr_break(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_call(&mut self, i: &'ast ExprCall) {
-        visit_expr_call(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_cast(&mut self, i: &'ast ExprCast) {
-        visit_expr_cast(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_catch(&mut self, i: &'ast ExprCatch) {
-        visit_expr_catch(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_closure(&mut self, i: &'ast ExprClosure) {
-        visit_expr_closure(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_continue(&mut self, i: &'ast ExprContinue) {
-        visit_expr_continue(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_field(&mut self, i: &'ast ExprField) {
-        visit_expr_field(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_for_loop(&mut self, i: &'ast ExprForLoop) {
-        visit_expr_for_loop(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_group(&mut self, i: &'ast ExprGroup) {
-        visit_expr_group(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_if(&mut self, i: &'ast ExprIf) {
-        visit_expr_if(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_if_let(&mut self, i: &'ast ExprIfLet) {
-        visit_expr_if_let(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_in_place(&mut self, i: &'ast ExprInPlace) {
-        visit_expr_in_place(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_index(&mut self, i: &'ast ExprIndex) {
-        visit_expr_index(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_lit(&mut self, i: &'ast ExprLit) {
-        visit_expr_lit(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_loop(&mut self, i: &'ast ExprLoop) {
-        visit_expr_loop(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_macro(&mut self, i: &'ast ExprMacro) {
-        visit_expr_macro(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_match(&mut self, i: &'ast ExprMatch) {
-        visit_expr_match(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_method_call(&mut self, i: &'ast ExprMethodCall) {
-        visit_expr_method_call(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_paren(&mut self, i: &'ast ExprParen) {
-        visit_expr_paren(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_path(&mut self, i: &'ast ExprPath) {
-        visit_expr_path(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_range(&mut self, i: &'ast ExprRange) {
-        visit_expr_range(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_reference(&mut self, i: &'ast ExprReference) {
-        visit_expr_reference(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_repeat(&mut self, i: &'ast ExprRepeat) {
-        visit_expr_repeat(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_return(&mut self, i: &'ast ExprReturn) {
-        visit_expr_return(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_struct(&mut self, i: &'ast ExprStruct) {
-        visit_expr_struct(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_try(&mut self, i: &'ast ExprTry) {
-        visit_expr_try(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_tuple(&mut self, i: &'ast ExprTuple) {
-        visit_expr_tuple(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_type(&mut self, i: &'ast ExprType) {
-        visit_expr_type(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_unary(&mut self, i: &'ast ExprUnary) {
-        visit_expr_unary(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_unsafe(&mut self, i: &'ast ExprUnsafe) {
-        visit_expr_unsafe(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_verbatim(&mut self, i: &'ast ExprVerbatim) {
-        visit_expr_verbatim(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_while(&mut self, i: &'ast ExprWhile) {
-        visit_expr_while(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_while_let(&mut self, i: &'ast ExprWhileLet) {
-        visit_expr_while_let(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_yield(&mut self, i: &'ast ExprYield) {
-        visit_expr_yield(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_field(&mut self, i: &'ast Field) {
-        visit_field(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_field_pat(&mut self, i: &'ast FieldPat) {
-        visit_field_pat(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_field_value(&mut self, i: &'ast FieldValue) {
-        visit_field_value(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_fields(&mut self, i: &'ast Fields) {
-        visit_fields(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_fields_named(&mut self, i: &'ast FieldsNamed) {
-        visit_fields_named(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_fields_unnamed(&mut self, i: &'ast FieldsUnnamed) {
-        visit_fields_unnamed(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_file(&mut self, i: &'ast File) {
-        visit_file(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_fn_arg(&mut self, i: &'ast FnArg) {
-        visit_fn_arg(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_fn_decl(&mut self, i: &'ast FnDecl) {
-        visit_fn_decl(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_foreign_item(&mut self, i: &'ast ForeignItem) {
-        visit_foreign_item(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_foreign_item_fn(&mut self, i: &'ast ForeignItemFn) {
-        visit_foreign_item_fn(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_foreign_item_static(&mut self, i: &'ast ForeignItemStatic) {
-        visit_foreign_item_static(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_foreign_item_type(&mut self, i: &'ast ForeignItemType) {
-        visit_foreign_item_type(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_foreign_item_verbatim(&mut self, i: &'ast ForeignItemVerbatim) {
-        visit_foreign_item_verbatim(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_generic_argument(&mut self, i: &'ast GenericArgument) {
-        visit_generic_argument(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_generic_method_argument(&mut self, i: &'ast GenericMethodArgument) {
-        visit_generic_method_argument(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_generic_param(&mut self, i: &'ast GenericParam) {
-        visit_generic_param(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_generics(&mut self, i: &'ast Generics) {
-        visit_generics(self, i)
-    }
-
-    fn visit_ident(&mut self, i: &'ast Ident) {
-        visit_ident(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_impl_item(&mut self, i: &'ast ImplItem) {
-        visit_impl_item(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_impl_item_const(&mut self, i: &'ast ImplItemConst) {
-        visit_impl_item_const(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_impl_item_macro(&mut self, i: &'ast ImplItemMacro) {
-        visit_impl_item_macro(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_impl_item_method(&mut self, i: &'ast ImplItemMethod) {
-        visit_impl_item_method(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_impl_item_type(&mut self, i: &'ast ImplItemType) {
-        visit_impl_item_type(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_impl_item_verbatim(&mut self, i: &'ast ImplItemVerbatim) {
-        visit_impl_item_verbatim(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_index(&mut self, i: &'ast Index) {
-        visit_index(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item(&mut self, i: &'ast Item) {
-        visit_item(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_const(&mut self, i: &'ast ItemConst) {
-        visit_item_const(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_enum(&mut self, i: &'ast ItemEnum) {
-        visit_item_enum(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_extern_crate(&mut self, i: &'ast ItemExternCrate) {
-        visit_item_extern_crate(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_fn(&mut self, i: &'ast ItemFn) {
-        visit_item_fn(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_foreign_mod(&mut self, i: &'ast ItemForeignMod) {
-        visit_item_foreign_mod(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_impl(&mut self, i: &'ast ItemImpl) {
-        visit_item_impl(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_macro(&mut self, i: &'ast ItemMacro) {
-        visit_item_macro(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_macro2(&mut self, i: &'ast ItemMacro2) {
-        visit_item_macro2(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_mod(&mut self, i: &'ast ItemMod) {
-        visit_item_mod(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_static(&mut self, i: &'ast ItemStatic) {
-        visit_item_static(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_struct(&mut self, i: &'ast ItemStruct) {
-        visit_item_struct(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_trait(&mut self, i: &'ast ItemTrait) {
-        visit_item_trait(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_type(&mut self, i: &'ast ItemType) {
-        visit_item_type(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_union(&mut self, i: &'ast ItemUnion) {
-        visit_item_union(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_use(&mut self, i: &'ast ItemUse) {
-        visit_item_use(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_verbatim(&mut self, i: &'ast ItemVerbatim) {
-        visit_item_verbatim(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_label(&mut self, i: &'ast Label) {
-        visit_label(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lifetime(&mut self, i: &'ast Lifetime) {
-        visit_lifetime(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lifetime_def(&mut self, i: &'ast LifetimeDef) {
-        visit_lifetime_def(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit(&mut self, i: &'ast Lit) {
-        visit_lit(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_bool(&mut self, i: &'ast LitBool) {
-        visit_lit_bool(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_byte(&mut self, i: &'ast LitByte) {
-        visit_lit_byte(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_byte_str(&mut self, i: &'ast LitByteStr) {
-        visit_lit_byte_str(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_char(&mut self, i: &'ast LitChar) {
-        visit_lit_char(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_float(&mut self, i: &'ast LitFloat) {
-        visit_lit_float(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_int(&mut self, i: &'ast LitInt) {
-        visit_lit_int(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_str(&mut self, i: &'ast LitStr) {
-        visit_lit_str(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_verbatim(&mut self, i: &'ast LitVerbatim) {
-        visit_lit_verbatim(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_local(&mut self, i: &'ast Local) {
-        visit_local(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_macro(&mut self, i: &'ast Macro) {
-        visit_macro(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_macro_delimiter(&mut self, i: &'ast MacroDelimiter) {
-        visit_macro_delimiter(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_member(&mut self, i: &'ast Member) {
-        visit_member(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_meta(&mut self, i: &'ast Meta) {
-        visit_meta(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_meta_list(&mut self, i: &'ast MetaList) {
-        visit_meta_list(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_meta_name_value(&mut self, i: &'ast MetaNameValue) {
-        visit_meta_name_value(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_method_sig(&mut self, i: &'ast MethodSig) {
-        visit_method_sig(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_method_turbofish(&mut self, i: &'ast MethodTurbofish) {
-        visit_method_turbofish(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_nested_meta(&mut self, i: &'ast NestedMeta) {
-        visit_nested_meta(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_parenthesized_generic_arguments(&mut self, i: &'ast ParenthesizedGenericArguments) {
-        visit_parenthesized_generic_arguments(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat(&mut self, i: &'ast Pat) {
-        visit_pat(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_box(&mut self, i: &'ast PatBox) {
-        visit_pat_box(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_ident(&mut self, i: &'ast PatIdent) {
-        visit_pat_ident(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_lit(&mut self, i: &'ast PatLit) {
-        visit_pat_lit(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_macro(&mut self, i: &'ast PatMacro) {
-        visit_pat_macro(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_path(&mut self, i: &'ast PatPath) {
-        visit_pat_path(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_range(&mut self, i: &'ast PatRange) {
-        visit_pat_range(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_ref(&mut self, i: &'ast PatRef) {
-        visit_pat_ref(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_slice(&mut self, i: &'ast PatSlice) {
-        visit_pat_slice(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_struct(&mut self, i: &'ast PatStruct) {
-        visit_pat_struct(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_tuple(&mut self, i: &'ast PatTuple) {
-        visit_pat_tuple(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_tuple_struct(&mut self, i: &'ast PatTupleStruct) {
-        visit_pat_tuple_struct(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_verbatim(&mut self, i: &'ast PatVerbatim) {
-        visit_pat_verbatim(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_wild(&mut self, i: &'ast PatWild) {
-        visit_pat_wild(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_path(&mut self, i: &'ast Path) {
-        visit_path(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_path_arguments(&mut self, i: &'ast PathArguments) {
-        visit_path_arguments(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_path_segment(&mut self, i: &'ast PathSegment) {
-        visit_path_segment(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_predicate_eq(&mut self, i: &'ast PredicateEq) {
-        visit_predicate_eq(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_predicate_lifetime(&mut self, i: &'ast PredicateLifetime) {
-        visit_predicate_lifetime(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_predicate_type(&mut self, i: &'ast PredicateType) {
-        visit_predicate_type(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_qself(&mut self, i: &'ast QSelf) {
-        visit_qself(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_range_limits(&mut self, i: &'ast RangeLimits) {
-        visit_range_limits(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_return_type(&mut self, i: &'ast ReturnType) {
-        visit_return_type(self, i)
-    }
-
-    fn visit_span(&mut self, i: &'ast Span) {
-        visit_span(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_stmt(&mut self, i: &'ast Stmt) {
-        visit_stmt(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_trait_bound(&mut self, i: &'ast TraitBound) {
-        visit_trait_bound(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_trait_bound_modifier(&mut self, i: &'ast TraitBoundModifier) {
-        visit_trait_bound_modifier(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_trait_item(&mut self, i: &'ast TraitItem) {
-        visit_trait_item(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_trait_item_const(&mut self, i: &'ast TraitItemConst) {
-        visit_trait_item_const(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_trait_item_macro(&mut self, i: &'ast TraitItemMacro) {
-        visit_trait_item_macro(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_trait_item_method(&mut self, i: &'ast TraitItemMethod) {
-        visit_trait_item_method(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_trait_item_type(&mut self, i: &'ast TraitItemType) {
-        visit_trait_item_type(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_trait_item_verbatim(&mut self, i: &'ast TraitItemVerbatim) {
-        visit_trait_item_verbatim(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type(&mut self, i: &'ast Type) {
-        visit_type(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_array(&mut self, i: &'ast TypeArray) {
-        visit_type_array(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_bare_fn(&mut self, i: &'ast TypeBareFn) {
-        visit_type_bare_fn(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_group(&mut self, i: &'ast TypeGroup) {
-        visit_type_group(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_impl_trait(&mut self, i: &'ast TypeImplTrait) {
-        visit_type_impl_trait(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_infer(&mut self, i: &'ast TypeInfer) {
-        visit_type_infer(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_macro(&mut self, i: &'ast TypeMacro) {
-        visit_type_macro(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_never(&mut self, i: &'ast TypeNever) {
-        visit_type_never(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_param(&mut self, i: &'ast TypeParam) {
-        visit_type_param(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_param_bound(&mut self, i: &'ast TypeParamBound) {
-        visit_type_param_bound(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_paren(&mut self, i: &'ast TypeParen) {
-        visit_type_paren(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_path(&mut self, i: &'ast TypePath) {
-        visit_type_path(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_ptr(&mut self, i: &'ast TypePtr) {
-        visit_type_ptr(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_reference(&mut self, i: &'ast TypeReference) {
-        visit_type_reference(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_slice(&mut self, i: &'ast TypeSlice) {
-        visit_type_slice(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_trait_object(&mut self, i: &'ast TypeTraitObject) {
-        visit_type_trait_object(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_tuple(&mut self, i: &'ast TypeTuple) {
-        visit_type_tuple(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_verbatim(&mut self, i: &'ast TypeVerbatim) {
-        visit_type_verbatim(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_un_op(&mut self, i: &'ast UnOp) {
-        visit_un_op(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_use_glob(&mut self, i: &'ast UseGlob) {
-        visit_use_glob(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_use_group(&mut self, i: &'ast UseGroup) {
-        visit_use_group(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_use_name(&mut self, i: &'ast UseName) {
-        visit_use_name(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_use_path(&mut self, i: &'ast UsePath) {
-        visit_use_path(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_use_rename(&mut self, i: &'ast UseRename) {
-        visit_use_rename(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_use_tree(&mut self, i: &'ast UseTree) {
-        visit_use_tree(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_variant(&mut self, i: &'ast Variant) {
-        visit_variant(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_vis_crate(&mut self, i: &'ast VisCrate) {
-        visit_vis_crate(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_vis_public(&mut self, i: &'ast VisPublic) {
-        visit_vis_public(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_vis_restricted(&mut self, i: &'ast VisRestricted) {
-        visit_vis_restricted(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_visibility(&mut self, i: &'ast Visibility) {
-        visit_visibility(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_where_clause(&mut self, i: &'ast WhereClause) {
-        visit_where_clause(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_where_predicate(&mut self, i: &'ast WherePredicate) {
-        visit_where_predicate(self, i)
-    }
-}
-
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_abi<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Abi) {
-    tokens_helper(_visitor, &(_i.extern_token).0);
-    if let Some(ref it) = _i.name {
-        _visitor.visit_lit_str(it)
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_angle_bracketed_generic_arguments<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast AngleBracketedGenericArguments,
-) {
-    if let Some(ref it) = _i.colon2_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    tokens_helper(_visitor, &(_i.lt_token).0);
-    for el in Punctuated::pairs(&_i.args) {
-        let it = el.value();
-        _visitor.visit_generic_argument(it)
-    }
-    tokens_helper(_visitor, &(_i.gt_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_arg_captured<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ArgCaptured) {
-    _visitor.visit_pat(&_i.pat);
-    tokens_helper(_visitor, &(_i.colon_token).0);
-    _visitor.visit_type(&_i.ty);
-}
-#[cfg(feature = "full")]
-pub fn visit_arg_self<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ArgSelf) {
-    if let Some(ref it) = _i.mutability {
-        tokens_helper(_visitor, &(it).0)
-    };
-    tokens_helper(_visitor, &(_i.self_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_arg_self_ref<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ArgSelfRef) {
-    tokens_helper(_visitor, &(_i.and_token).0);
-    if let Some(ref it) = _i.lifetime {
-        _visitor.visit_lifetime(it)
-    };
-    if let Some(ref it) = _i.mutability {
-        tokens_helper(_visitor, &(it).0)
-    };
-    tokens_helper(_visitor, &(_i.self_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_arm<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Arm) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    if let Some(ref it) = _i.leading_vert {
-        tokens_helper(_visitor, &(it).0)
-    };
-    for el in Punctuated::pairs(&_i.pats) {
-        let it = el.value();
-        _visitor.visit_pat(it)
-    }
-    if let Some(ref it) = _i.guard {
-        tokens_helper(_visitor, &((it).0).0);
-        _visitor.visit_expr(&*(it).1);
-    };
-    tokens_helper(_visitor, &(_i.fat_arrow_token).0);
-    _visitor.visit_expr(&*_i.body);
-    if let Some(ref it) = _i.comma {
-        tokens_helper(_visitor, &(it).0)
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_attr_style<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast AttrStyle) {
-    match *_i {
-        AttrStyle::Outer => {}
-        AttrStyle::Inner(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_attribute<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Attribute) {
-    tokens_helper(_visitor, &(_i.pound_token).0);
-    _visitor.visit_attr_style(&_i.style);
-    tokens_helper(_visitor, &(_i.bracket_token).0);
-    _visitor.visit_path(&_i.path);
-    // Skipped field _i . tts;
-    // Skipped field _i . is_sugared_doc;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_bare_fn_arg<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast BareFnArg) {
-    if let Some(ref it) = _i.name {
-        _visitor.visit_bare_fn_arg_name(&(it).0);
-        tokens_helper(_visitor, &((it).1).0);
-    };
-    _visitor.visit_type(&_i.ty);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_bare_fn_arg_name<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast BareFnArgName,
-) {
-    match *_i {
-        BareFnArgName::Named(ref _binding_0) => {
-            _visitor.visit_ident(_binding_0);
-        }
-        BareFnArgName::Wild(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_bin_op<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast BinOp) {
-    match *_i {
-        BinOp::Add(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Sub(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Mul(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Div(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Rem(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::And(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Or(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::BitXor(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::BitAnd(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::BitOr(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Shl(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Shr(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Eq(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Lt(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Le(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Ne(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Ge(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::Gt(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::AddEq(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::SubEq(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::MulEq(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::DivEq(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::RemEq(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::BitXorEq(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::BitAndEq(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::BitOrEq(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::ShlEq(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        BinOp::ShrEq(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_binding<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Binding) {
-    _visitor.visit_ident(&_i.ident);
-    tokens_helper(_visitor, &(_i.eq_token).0);
-    _visitor.visit_type(&_i.ty);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_block<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Block) {
-    tokens_helper(_visitor, &(_i.brace_token).0);
-    for it in &_i.stmts {
-        _visitor.visit_stmt(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_bound_lifetimes<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast BoundLifetimes,
-) {
-    tokens_helper(_visitor, &(_i.for_token).0);
-    tokens_helper(_visitor, &(_i.lt_token).0);
-    for el in Punctuated::pairs(&_i.lifetimes) {
-        let it = el.value();
-        _visitor.visit_lifetime_def(it)
-    }
-    tokens_helper(_visitor, &(_i.gt_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_const_param<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ConstParam) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.const_token).0);
-    _visitor.visit_ident(&_i.ident);
-    tokens_helper(_visitor, &(_i.colon_token).0);
-    _visitor.visit_type(&_i.ty);
-    if let Some(ref it) = _i.eq_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.default {
-        _visitor.visit_expr(it)
-    };
-}
-#[cfg(feature = "derive")]
-pub fn visit_data<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Data) {
-    match *_i {
-        Data::Struct(ref _binding_0) => {
-            _visitor.visit_data_struct(_binding_0);
-        }
-        Data::Enum(ref _binding_0) => {
-            _visitor.visit_data_enum(_binding_0);
-        }
-        Data::Union(ref _binding_0) => {
-            _visitor.visit_data_union(_binding_0);
-        }
-    }
-}
-#[cfg(feature = "derive")]
-pub fn visit_data_enum<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast DataEnum) {
-    tokens_helper(_visitor, &(_i.enum_token).0);
-    tokens_helper(_visitor, &(_i.brace_token).0);
-    for el in Punctuated::pairs(&_i.variants) {
-        let it = el.value();
-        _visitor.visit_variant(it)
-    }
-}
-#[cfg(feature = "derive")]
-pub fn visit_data_struct<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast DataStruct) {
-    tokens_helper(_visitor, &(_i.struct_token).0);
-    _visitor.visit_fields(&_i.fields);
-    if let Some(ref it) = _i.semi_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-}
-#[cfg(feature = "derive")]
-pub fn visit_data_union<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast DataUnion) {
-    tokens_helper(_visitor, &(_i.union_token).0);
-    _visitor.visit_fields_named(&_i.fields);
-}
-#[cfg(feature = "derive")]
-pub fn visit_derive_input<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast DeriveInput) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    _visitor.visit_ident(&_i.ident);
-    _visitor.visit_generics(&_i.generics);
-    _visitor.visit_data(&_i.data);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Expr) {
-    match *_i {
-        Expr::Box(ref _binding_0) => {
-            full!(_visitor.visit_expr_box(_binding_0));
-        }
-        Expr::InPlace(ref _binding_0) => {
-            full!(_visitor.visit_expr_in_place(_binding_0));
-        }
-        Expr::Array(ref _binding_0) => {
-            full!(_visitor.visit_expr_array(_binding_0));
-        }
-        Expr::Call(ref _binding_0) => {
-            _visitor.visit_expr_call(_binding_0);
-        }
-        Expr::MethodCall(ref _binding_0) => {
-            full!(_visitor.visit_expr_method_call(_binding_0));
-        }
-        Expr::Tuple(ref _binding_0) => {
-            full!(_visitor.visit_expr_tuple(_binding_0));
-        }
-        Expr::Binary(ref _binding_0) => {
-            _visitor.visit_expr_binary(_binding_0);
-        }
-        Expr::Unary(ref _binding_0) => {
-            _visitor.visit_expr_unary(_binding_0);
-        }
-        Expr::Lit(ref _binding_0) => {
-            _visitor.visit_expr_lit(_binding_0);
-        }
-        Expr::Cast(ref _binding_0) => {
-            _visitor.visit_expr_cast(_binding_0);
-        }
-        Expr::Type(ref _binding_0) => {
-            full!(_visitor.visit_expr_type(_binding_0));
-        }
-        Expr::If(ref _binding_0) => {
-            full!(_visitor.visit_expr_if(_binding_0));
-        }
-        Expr::IfLet(ref _binding_0) => {
-            full!(_visitor.visit_expr_if_let(_binding_0));
-        }
-        Expr::While(ref _binding_0) => {
-            full!(_visitor.visit_expr_while(_binding_0));
-        }
-        Expr::WhileLet(ref _binding_0) => {
-            full!(_visitor.visit_expr_while_let(_binding_0));
-        }
-        Expr::ForLoop(ref _binding_0) => {
-            full!(_visitor.visit_expr_for_loop(_binding_0));
-        }
-        Expr::Loop(ref _binding_0) => {
-            full!(_visitor.visit_expr_loop(_binding_0));
-        }
-        Expr::Match(ref _binding_0) => {
-            full!(_visitor.visit_expr_match(_binding_0));
-        }
-        Expr::Closure(ref _binding_0) => {
-            full!(_visitor.visit_expr_closure(_binding_0));
-        }
-        Expr::Unsafe(ref _binding_0) => {
-            full!(_visitor.visit_expr_unsafe(_binding_0));
-        }
-        Expr::Block(ref _binding_0) => {
-            full!(_visitor.visit_expr_block(_binding_0));
-        }
-        Expr::Assign(ref _binding_0) => {
-            full!(_visitor.visit_expr_assign(_binding_0));
-        }
-        Expr::AssignOp(ref _binding_0) => {
-            full!(_visitor.visit_expr_assign_op(_binding_0));
-        }
-        Expr::Field(ref _binding_0) => {
-            _visitor.visit_expr_field(_binding_0);
-        }
-        Expr::Index(ref _binding_0) => {
-            _visitor.visit_expr_index(_binding_0);
-        }
-        Expr::Range(ref _binding_0) => {
-            full!(_visitor.visit_expr_range(_binding_0));
-        }
-        Expr::Path(ref _binding_0) => {
-            _visitor.visit_expr_path(_binding_0);
-        }
-        Expr::Reference(ref _binding_0) => {
-            full!(_visitor.visit_expr_reference(_binding_0));
-        }
-        Expr::Break(ref _binding_0) => {
-            full!(_visitor.visit_expr_break(_binding_0));
-        }
-        Expr::Continue(ref _binding_0) => {
-            full!(_visitor.visit_expr_continue(_binding_0));
-        }
-        Expr::Return(ref _binding_0) => {
-            full!(_visitor.visit_expr_return(_binding_0));
-        }
-        Expr::Macro(ref _binding_0) => {
-            full!(_visitor.visit_expr_macro(_binding_0));
-        }
-        Expr::Struct(ref _binding_0) => {
-            full!(_visitor.visit_expr_struct(_binding_0));
-        }
-        Expr::Repeat(ref _binding_0) => {
-            full!(_visitor.visit_expr_repeat(_binding_0));
-        }
-        Expr::Paren(ref _binding_0) => {
-            _visitor.visit_expr_paren(_binding_0);
-        }
-        Expr::Group(ref _binding_0) => {
-            full!(_visitor.visit_expr_group(_binding_0));
-        }
-        Expr::Try(ref _binding_0) => {
-            full!(_visitor.visit_expr_try(_binding_0));
-        }
-        Expr::Catch(ref _binding_0) => {
-            full!(_visitor.visit_expr_catch(_binding_0));
-        }
-        Expr::Yield(ref _binding_0) => {
-            full!(_visitor.visit_expr_yield(_binding_0));
-        }
-        Expr::Verbatim(ref _binding_0) => {
-            _visitor.visit_expr_verbatim(_binding_0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_array<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprArray) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.bracket_token).0);
-    for el in Punctuated::pairs(&_i.elems) {
-        let it = el.value();
-        _visitor.visit_expr(it)
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_assign<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprAssign) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_expr(&*_i.left);
-    tokens_helper(_visitor, &(_i.eq_token).0);
-    _visitor.visit_expr(&*_i.right);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_assign_op<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ExprAssignOp,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_expr(&*_i.left);
-    _visitor.visit_bin_op(&_i.op);
-    _visitor.visit_expr(&*_i.right);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_binary<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprBinary) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_expr(&*_i.left);
-    _visitor.visit_bin_op(&_i.op);
-    _visitor.visit_expr(&*_i.right);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_block<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprBlock) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_block(&_i.block);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_box<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprBox) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.box_token).0);
-    _visitor.visit_expr(&*_i.expr);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_break<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprBreak) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.break_token).0);
-    if let Some(ref it) = _i.label {
-        _visitor.visit_lifetime(it)
-    };
-    if let Some(ref it) = _i.expr {
-        _visitor.visit_expr(&**it)
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_call<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprCall) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_expr(&*_i.func);
-    tokens_helper(_visitor, &(_i.paren_token).0);
-    for el in Punctuated::pairs(&_i.args) {
-        let it = el.value();
-        _visitor.visit_expr(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_cast<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprCast) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_expr(&*_i.expr);
-    tokens_helper(_visitor, &(_i.as_token).0);
-    _visitor.visit_type(&*_i.ty);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_catch<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprCatch) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.do_token).0);
-    tokens_helper(_visitor, &(_i.catch_token).0);
-    _visitor.visit_block(&_i.block);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_closure<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprClosure) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    if let Some(ref it) = _i.movability {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.capture {
-        tokens_helper(_visitor, &(it).0)
-    };
-    tokens_helper(_visitor, &(_i.or1_token).0);
-    for el in Punctuated::pairs(&_i.inputs) {
-        let it = el.value();
-        _visitor.visit_fn_arg(it)
-    }
-    tokens_helper(_visitor, &(_i.or2_token).0);
-    _visitor.visit_return_type(&_i.output);
-    _visitor.visit_expr(&*_i.body);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_continue<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ExprContinue,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.continue_token).0);
-    if let Some(ref it) = _i.label {
-        _visitor.visit_lifetime(it)
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_field<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprField) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_expr(&*_i.base);
-    tokens_helper(_visitor, &(_i.dot_token).0);
-    _visitor.visit_member(&_i.member);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_for_loop<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprForLoop) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    if let Some(ref it) = _i.label {
-        _visitor.visit_label(it)
-    };
-    tokens_helper(_visitor, &(_i.for_token).0);
-    _visitor.visit_pat(&*_i.pat);
-    tokens_helper(_visitor, &(_i.in_token).0);
-    _visitor.visit_expr(&*_i.expr);
-    _visitor.visit_block(&_i.body);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_group<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprGroup) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.group_token).0);
-    _visitor.visit_expr(&*_i.expr);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_if<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprIf) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.if_token).0);
-    _visitor.visit_expr(&*_i.cond);
-    _visitor.visit_block(&_i.then_branch);
-    if let Some(ref it) = _i.else_branch {
-        tokens_helper(_visitor, &((it).0).0);
-        _visitor.visit_expr(&*(it).1);
-    };
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_if_let<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprIfLet) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.if_token).0);
-    tokens_helper(_visitor, &(_i.let_token).0);
-    for el in Punctuated::pairs(&_i.pats) {
-        let it = el.value();
-        _visitor.visit_pat(it)
-    }
-    tokens_helper(_visitor, &(_i.eq_token).0);
-    _visitor.visit_expr(&*_i.expr);
-    _visitor.visit_block(&_i.then_branch);
-    if let Some(ref it) = _i.else_branch {
-        tokens_helper(_visitor, &((it).0).0);
-        _visitor.visit_expr(&*(it).1);
-    };
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_in_place<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprInPlace) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_expr(&*_i.place);
-    tokens_helper(_visitor, &(_i.arrow_token).0);
-    _visitor.visit_expr(&*_i.value);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_index<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprIndex) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_expr(&*_i.expr);
-    tokens_helper(_visitor, &(_i.bracket_token).0);
-    _visitor.visit_expr(&*_i.index);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_lit<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprLit) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_lit(&_i.lit);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_loop<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprLoop) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    if let Some(ref it) = _i.label {
-        _visitor.visit_label(it)
-    };
-    tokens_helper(_visitor, &(_i.loop_token).0);
-    _visitor.visit_block(&_i.body);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_macro<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprMacro) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_macro(&_i.mac);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_match<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprMatch) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.match_token).0);
-    _visitor.visit_expr(&*_i.expr);
-    tokens_helper(_visitor, &(_i.brace_token).0);
-    for it in &_i.arms {
-        _visitor.visit_arm(it)
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_method_call<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ExprMethodCall,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_expr(&*_i.receiver);
-    tokens_helper(_visitor, &(_i.dot_token).0);
-    _visitor.visit_ident(&_i.method);
-    if let Some(ref it) = _i.turbofish {
-        _visitor.visit_method_turbofish(it)
-    };
-    tokens_helper(_visitor, &(_i.paren_token).0);
-    for el in Punctuated::pairs(&_i.args) {
-        let it = el.value();
-        _visitor.visit_expr(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_paren<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprParen) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.paren_token).0);
-    _visitor.visit_expr(&*_i.expr);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_path<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprPath) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    if let Some(ref it) = _i.qself {
-        _visitor.visit_qself(it)
-    };
-    _visitor.visit_path(&_i.path);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_range<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprRange) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    if let Some(ref it) = _i.from {
-        _visitor.visit_expr(&**it)
-    };
-    _visitor.visit_range_limits(&_i.limits);
-    if let Some(ref it) = _i.to {
-        _visitor.visit_expr(&**it)
-    };
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_reference<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ExprReference,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.and_token).0);
-    if let Some(ref it) = _i.mutability {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_expr(&*_i.expr);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_repeat<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprRepeat) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.bracket_token).0);
-    _visitor.visit_expr(&*_i.expr);
-    tokens_helper(_visitor, &(_i.semi_token).0);
-    _visitor.visit_expr(&*_i.len);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_return<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprReturn) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.return_token).0);
-    if let Some(ref it) = _i.expr {
-        _visitor.visit_expr(&**it)
-    };
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_struct<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprStruct) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_path(&_i.path);
-    tokens_helper(_visitor, &(_i.brace_token).0);
-    for el in Punctuated::pairs(&_i.fields) {
-        let it = el.value();
-        _visitor.visit_field_value(it)
-    }
-    if let Some(ref it) = _i.dot2_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.rest {
-        _visitor.visit_expr(&**it)
-    };
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_try<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprTry) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_expr(&*_i.expr);
-    tokens_helper(_visitor, &(_i.question_token).0);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_tuple<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprTuple) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.paren_token).0);
-    for el in Punctuated::pairs(&_i.elems) {
-        let it = el.value();
-        _visitor.visit_expr(it)
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_type<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprType) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_expr(&*_i.expr);
-    tokens_helper(_visitor, &(_i.colon_token).0);
-    _visitor.visit_type(&*_i.ty);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_unary<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprUnary) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_un_op(&_i.op);
-    _visitor.visit_expr(&*_i.expr);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_unsafe<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprUnsafe) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.unsafe_token).0);
-    _visitor.visit_block(&_i.block);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_verbatim<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ExprVerbatim,
-) {
-    // Skipped field _i . tts;
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_while<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprWhile) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    if let Some(ref it) = _i.label {
-        _visitor.visit_label(it)
-    };
-    tokens_helper(_visitor, &(_i.while_token).0);
-    _visitor.visit_expr(&*_i.cond);
-    _visitor.visit_block(&_i.body);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_while_let<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ExprWhileLet,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    if let Some(ref it) = _i.label {
-        _visitor.visit_label(it)
-    };
-    tokens_helper(_visitor, &(_i.while_token).0);
-    tokens_helper(_visitor, &(_i.let_token).0);
-    for el in Punctuated::pairs(&_i.pats) {
-        let it = el.value();
-        _visitor.visit_pat(it)
-    }
-    tokens_helper(_visitor, &(_i.eq_token).0);
-    _visitor.visit_expr(&*_i.expr);
-    _visitor.visit_block(&_i.body);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_yield<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ExprYield) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.yield_token).0);
-    if let Some(ref it) = _i.expr {
-        _visitor.visit_expr(&**it)
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_field<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Field) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    if let Some(ref it) = _i.ident {
-        _visitor.visit_ident(it)
-    };
-    if let Some(ref it) = _i.colon_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_type(&_i.ty);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_field_pat<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast FieldPat) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_member(&_i.member);
-    if let Some(ref it) = _i.colon_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_pat(&*_i.pat);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_field_value<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast FieldValue) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_member(&_i.member);
-    if let Some(ref it) = _i.colon_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_expr(&_i.expr);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_fields<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Fields) {
-    match *_i {
-        Fields::Named(ref _binding_0) => {
-            _visitor.visit_fields_named(_binding_0);
-        }
-        Fields::Unnamed(ref _binding_0) => {
-            _visitor.visit_fields_unnamed(_binding_0);
-        }
-        Fields::Unit => {}
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_fields_named<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast FieldsNamed) {
-    tokens_helper(_visitor, &(_i.brace_token).0);
-    for el in Punctuated::pairs(&_i.named) {
-        let it = el.value();
-        _visitor.visit_field(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_fields_unnamed<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast FieldsUnnamed,
-) {
-    tokens_helper(_visitor, &(_i.paren_token).0);
-    for el in Punctuated::pairs(&_i.unnamed) {
-        let it = el.value();
-        _visitor.visit_field(it)
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_file<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast File) {
-    // Skipped field _i . shebang;
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    for it in &_i.items {
-        _visitor.visit_item(it)
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_fn_arg<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast FnArg) {
-    match *_i {
-        FnArg::SelfRef(ref _binding_0) => {
-            _visitor.visit_arg_self_ref(_binding_0);
-        }
-        FnArg::SelfValue(ref _binding_0) => {
-            _visitor.visit_arg_self(_binding_0);
-        }
-        FnArg::Captured(ref _binding_0) => {
-            _visitor.visit_arg_captured(_binding_0);
-        }
-        FnArg::Inferred(ref _binding_0) => {
-            _visitor.visit_pat(_binding_0);
-        }
-        FnArg::Ignored(ref _binding_0) => {
-            _visitor.visit_type(_binding_0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_fn_decl<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast FnDecl) {
-    tokens_helper(_visitor, &(_i.fn_token).0);
-    _visitor.visit_generics(&_i.generics);
-    tokens_helper(_visitor, &(_i.paren_token).0);
-    for el in Punctuated::pairs(&_i.inputs) {
-        let it = el.value();
-        _visitor.visit_fn_arg(it)
-    }
-    if let Some(ref it) = _i.variadic {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_return_type(&_i.output);
-}
-#[cfg(feature = "full")]
-pub fn visit_foreign_item<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ForeignItem) {
-    match *_i {
-        ForeignItem::Fn(ref _binding_0) => {
-            _visitor.visit_foreign_item_fn(_binding_0);
-        }
-        ForeignItem::Static(ref _binding_0) => {
-            _visitor.visit_foreign_item_static(_binding_0);
-        }
-        ForeignItem::Type(ref _binding_0) => {
-            _visitor.visit_foreign_item_type(_binding_0);
-        }
-        ForeignItem::Verbatim(ref _binding_0) => {
-            _visitor.visit_foreign_item_verbatim(_binding_0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_foreign_item_fn<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ForeignItemFn,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    _visitor.visit_ident(&_i.ident);
-    _visitor.visit_fn_decl(&*_i.decl);
-    tokens_helper(_visitor, &(_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_foreign_item_static<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ForeignItemStatic,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    tokens_helper(_visitor, &(_i.static_token).0);
-    if let Some(ref it) = _i.mutability {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_ident(&_i.ident);
-    tokens_helper(_visitor, &(_i.colon_token).0);
-    _visitor.visit_type(&*_i.ty);
-    tokens_helper(_visitor, &(_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_foreign_item_type<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ForeignItemType,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    tokens_helper(_visitor, &(_i.type_token).0);
-    _visitor.visit_ident(&_i.ident);
-    tokens_helper(_visitor, &(_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_foreign_item_verbatim<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ForeignItemVerbatim,
-) {
-    // Skipped field _i . tts;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_generic_argument<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast GenericArgument,
-) {
-    match *_i {
-        GenericArgument::Lifetime(ref _binding_0) => {
-            _visitor.visit_lifetime(_binding_0);
-        }
-        GenericArgument::Type(ref _binding_0) => {
-            _visitor.visit_type(_binding_0);
-        }
-        GenericArgument::Binding(ref _binding_0) => {
-            _visitor.visit_binding(_binding_0);
-        }
-        GenericArgument::Const(ref _binding_0) => {
-            _visitor.visit_expr(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_generic_method_argument<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast GenericMethodArgument,
-) {
-    match *_i {
-        GenericMethodArgument::Type(ref _binding_0) => {
-            _visitor.visit_type(_binding_0);
-        }
-        GenericMethodArgument::Const(ref _binding_0) => {
-            _visitor.visit_expr(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_generic_param<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast GenericParam,
-) {
-    match *_i {
-        GenericParam::Type(ref _binding_0) => {
-            _visitor.visit_type_param(_binding_0);
-        }
-        GenericParam::Lifetime(ref _binding_0) => {
-            _visitor.visit_lifetime_def(_binding_0);
-        }
-        GenericParam::Const(ref _binding_0) => {
-            _visitor.visit_const_param(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_generics<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Generics) {
-    if let Some(ref it) = _i.lt_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    for el in Punctuated::pairs(&_i.params) {
-        let it = el.value();
-        _visitor.visit_generic_param(it)
-    }
-    if let Some(ref it) = _i.gt_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.where_clause {
-        _visitor.visit_where_clause(it)
-    };
-}
-
-pub fn visit_ident<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Ident) {}
-#[cfg(feature = "full")]
-pub fn visit_impl_item<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ImplItem) {
-    match *_i {
-        ImplItem::Const(ref _binding_0) => {
-            _visitor.visit_impl_item_const(_binding_0);
-        }
-        ImplItem::Method(ref _binding_0) => {
-            _visitor.visit_impl_item_method(_binding_0);
-        }
-        ImplItem::Type(ref _binding_0) => {
-            _visitor.visit_impl_item_type(_binding_0);
-        }
-        ImplItem::Macro(ref _binding_0) => {
-            _visitor.visit_impl_item_macro(_binding_0);
-        }
-        ImplItem::Verbatim(ref _binding_0) => {
-            _visitor.visit_impl_item_verbatim(_binding_0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_impl_item_const<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ImplItemConst,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    if let Some(ref it) = _i.defaultness {
-        tokens_helper(_visitor, &(it).0)
-    };
-    tokens_helper(_visitor, &(_i.const_token).0);
-    _visitor.visit_ident(&_i.ident);
-    tokens_helper(_visitor, &(_i.colon_token).0);
-    _visitor.visit_type(&_i.ty);
-    tokens_helper(_visitor, &(_i.eq_token).0);
-    _visitor.visit_expr(&_i.expr);
-    tokens_helper(_visitor, &(_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_impl_item_macro<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ImplItemMacro,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_macro(&_i.mac);
-    if let Some(ref it) = _i.semi_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-}
-#[cfg(feature = "full")]
-pub fn visit_impl_item_method<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ImplItemMethod,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    if let Some(ref it) = _i.defaultness {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_method_sig(&_i.sig);
-    _visitor.visit_block(&_i.block);
-}
-#[cfg(feature = "full")]
-pub fn visit_impl_item_type<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ImplItemType,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    if let Some(ref it) = _i.defaultness {
-        tokens_helper(_visitor, &(it).0)
-    };
-    tokens_helper(_visitor, &(_i.type_token).0);
-    _visitor.visit_ident(&_i.ident);
-    _visitor.visit_generics(&_i.generics);
-    tokens_helper(_visitor, &(_i.eq_token).0);
-    _visitor.visit_type(&_i.ty);
-    tokens_helper(_visitor, &(_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_impl_item_verbatim<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ImplItemVerbatim,
-) {
-    // Skipped field _i . tts;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_index<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Index) {
-    // Skipped field _i . index;
-    _visitor.visit_span(&_i.span);
-}
-#[cfg(feature = "full")]
-pub fn visit_item<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Item) {
-    match *_i {
-        Item::ExternCrate(ref _binding_0) => {
-            _visitor.visit_item_extern_crate(_binding_0);
-        }
-        Item::Use(ref _binding_0) => {
-            _visitor.visit_item_use(_binding_0);
-        }
-        Item::Static(ref _binding_0) => {
-            _visitor.visit_item_static(_binding_0);
-        }
-        Item::Const(ref _binding_0) => {
-            _visitor.visit_item_const(_binding_0);
-        }
-        Item::Fn(ref _binding_0) => {
-            _visitor.visit_item_fn(_binding_0);
-        }
-        Item::Mod(ref _binding_0) => {
-            _visitor.visit_item_mod(_binding_0);
-        }
-        Item::ForeignMod(ref _binding_0) => {
-            _visitor.visit_item_foreign_mod(_binding_0);
-        }
-        Item::Type(ref _binding_0) => {
-            _visitor.visit_item_type(_binding_0);
-        }
-        Item::Struct(ref _binding_0) => {
-            _visitor.visit_item_struct(_binding_0);
-        }
-        Item::Enum(ref _binding_0) => {
-            _visitor.visit_item_enum(_binding_0);
-        }
-        Item::Union(ref _binding_0) => {
-            _visitor.visit_item_union(_binding_0);
-        }
-        Item::Trait(ref _binding_0) => {
-            _visitor.visit_item_trait(_binding_0);
-        }
-        Item::Impl(ref _binding_0) => {
-            _visitor.visit_item_impl(_binding_0);
-        }
-        Item::Macro(ref _binding_0) => {
-            _visitor.visit_item_macro(_binding_0);
-        }
-        Item::Macro2(ref _binding_0) => {
-            _visitor.visit_item_macro2(_binding_0);
-        }
-        Item::Verbatim(ref _binding_0) => {
-            _visitor.visit_item_verbatim(_binding_0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_item_const<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemConst) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    tokens_helper(_visitor, &(_i.const_token).0);
-    _visitor.visit_ident(&_i.ident);
-    tokens_helper(_visitor, &(_i.colon_token).0);
-    _visitor.visit_type(&*_i.ty);
-    tokens_helper(_visitor, &(_i.eq_token).0);
-    _visitor.visit_expr(&*_i.expr);
-    tokens_helper(_visitor, &(_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_enum<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemEnum) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    tokens_helper(_visitor, &(_i.enum_token).0);
-    _visitor.visit_ident(&_i.ident);
-    _visitor.visit_generics(&_i.generics);
-    tokens_helper(_visitor, &(_i.brace_token).0);
-    for el in Punctuated::pairs(&_i.variants) {
-        let it = el.value();
-        _visitor.visit_variant(it)
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_item_extern_crate<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ItemExternCrate,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    tokens_helper(_visitor, &(_i.extern_token).0);
-    tokens_helper(_visitor, &(_i.crate_token).0);
-    _visitor.visit_ident(&_i.ident);
-    if let Some(ref it) = _i.rename {
-        tokens_helper(_visitor, &((it).0).0);
-        _visitor.visit_ident(&(it).1);
-    };
-    tokens_helper(_visitor, &(_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_fn<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemFn) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    if let Some(ref it) = _i.constness {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.unsafety {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.abi {
-        _visitor.visit_abi(it)
-    };
-    _visitor.visit_ident(&_i.ident);
-    _visitor.visit_fn_decl(&*_i.decl);
-    _visitor.visit_block(&*_i.block);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_foreign_mod<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ItemForeignMod,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_abi(&_i.abi);
-    tokens_helper(_visitor, &(_i.brace_token).0);
-    for it in &_i.items {
-        _visitor.visit_foreign_item(it)
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_item_impl<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemImpl) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    if let Some(ref it) = _i.defaultness {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.unsafety {
-        tokens_helper(_visitor, &(it).0)
-    };
-    tokens_helper(_visitor, &(_i.impl_token).0);
-    _visitor.visit_generics(&_i.generics);
-    if let Some(ref it) = _i.trait_ {
-        if let Some(ref it) = (it).0 {
-            tokens_helper(_visitor, &(it).0)
-        };
-        _visitor.visit_path(&(it).1);
-        tokens_helper(_visitor, &((it).2).0);
-    };
-    _visitor.visit_type(&*_i.self_ty);
-    tokens_helper(_visitor, &(_i.brace_token).0);
-    for it in &_i.items {
-        _visitor.visit_impl_item(it)
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_item_macro<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemMacro) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    if let Some(ref it) = _i.ident {
-        _visitor.visit_ident(it)
-    };
-    _visitor.visit_macro(&_i.mac);
-    if let Some(ref it) = _i.semi_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-}
-#[cfg(feature = "full")]
-pub fn visit_item_macro2<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemMacro2) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    tokens_helper(_visitor, &(_i.macro_token).0);
-    _visitor.visit_ident(&_i.ident);
-    tokens_helper(_visitor, &(_i.paren_token).0);
-    // Skipped field _i . args;
-    tokens_helper(_visitor, &(_i.brace_token).0);
-    // Skipped field _i . body;
-}
-#[cfg(feature = "full")]
-pub fn visit_item_mod<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemMod) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    tokens_helper(_visitor, &(_i.mod_token).0);
-    _visitor.visit_ident(&_i.ident);
-    if let Some(ref it) = _i.content {
-        tokens_helper(_visitor, &((it).0).0);
-        for it in &(it).1 {
-            _visitor.visit_item(it)
-        }
-    };
-    if let Some(ref it) = _i.semi {
-        tokens_helper(_visitor, &(it).0)
-    };
-}
-#[cfg(feature = "full")]
-pub fn visit_item_static<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemStatic) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    tokens_helper(_visitor, &(_i.static_token).0);
-    if let Some(ref it) = _i.mutability {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_ident(&_i.ident);
-    tokens_helper(_visitor, &(_i.colon_token).0);
-    _visitor.visit_type(&*_i.ty);
-    tokens_helper(_visitor, &(_i.eq_token).0);
-    _visitor.visit_expr(&*_i.expr);
-    tokens_helper(_visitor, &(_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_struct<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemStruct) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    tokens_helper(_visitor, &(_i.struct_token).0);
-    _visitor.visit_ident(&_i.ident);
-    _visitor.visit_generics(&_i.generics);
-    _visitor.visit_fields(&_i.fields);
-    if let Some(ref it) = _i.semi_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-}
-#[cfg(feature = "full")]
-pub fn visit_item_trait<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemTrait) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    if let Some(ref it) = _i.unsafety {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.auto_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    tokens_helper(_visitor, &(_i.trait_token).0);
-    _visitor.visit_ident(&_i.ident);
-    _visitor.visit_generics(&_i.generics);
-    if let Some(ref it) = _i.colon_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    for el in Punctuated::pairs(&_i.supertraits) {
-        let it = el.value();
-        _visitor.visit_type_param_bound(it)
-    }
-    tokens_helper(_visitor, &(_i.brace_token).0);
-    for it in &_i.items {
-        _visitor.visit_trait_item(it)
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_item_type<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemType) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    tokens_helper(_visitor, &(_i.type_token).0);
-    _visitor.visit_ident(&_i.ident);
-    _visitor.visit_generics(&_i.generics);
-    tokens_helper(_visitor, &(_i.eq_token).0);
-    _visitor.visit_type(&*_i.ty);
-    tokens_helper(_visitor, &(_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_union<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemUnion) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    tokens_helper(_visitor, &(_i.union_token).0);
-    _visitor.visit_ident(&_i.ident);
-    _visitor.visit_generics(&_i.generics);
-    _visitor.visit_fields_named(&_i.fields);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_use<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ItemUse) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_visibility(&_i.vis);
-    tokens_helper(_visitor, &(_i.use_token).0);
-    if let Some(ref it) = _i.leading_colon {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_use_tree(&_i.tree);
-    tokens_helper(_visitor, &(_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_verbatim<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ItemVerbatim,
-) {
-    // Skipped field _i . tts;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_label<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Label) {
-    _visitor.visit_lifetime(&_i.name);
-    tokens_helper(_visitor, &(_i.colon_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lifetime<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Lifetime) {
-    // Skipped field _i . apostrophe;
-    _visitor.visit_ident(&_i.ident);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lifetime_def<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LifetimeDef) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_lifetime(&_i.lifetime);
-    if let Some(ref it) = _i.colon_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    for el in Punctuated::pairs(&_i.bounds) {
-        let it = el.value();
-        _visitor.visit_lifetime(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Lit) {
-    match *_i {
-        Lit::Str(ref _binding_0) => {
-            _visitor.visit_lit_str(_binding_0);
-        }
-        Lit::ByteStr(ref _binding_0) => {
-            _visitor.visit_lit_byte_str(_binding_0);
-        }
-        Lit::Byte(ref _binding_0) => {
-            _visitor.visit_lit_byte(_binding_0);
-        }
-        Lit::Char(ref _binding_0) => {
-            _visitor.visit_lit_char(_binding_0);
-        }
-        Lit::Int(ref _binding_0) => {
-            _visitor.visit_lit_int(_binding_0);
-        }
-        Lit::Float(ref _binding_0) => {
-            _visitor.visit_lit_float(_binding_0);
-        }
-        Lit::Bool(ref _binding_0) => {
-            _visitor.visit_lit_bool(_binding_0);
-        }
-        Lit::Verbatim(ref _binding_0) => {
-            _visitor.visit_lit_verbatim(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_bool<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitBool) {
-    // Skipped field _i . value;
-    _visitor.visit_span(&_i.span);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_byte<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitByte) {
-    // Skipped field _i . token;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_byte_str<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitByteStr) {
-    // Skipped field _i . token;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_char<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitChar) {
-    // Skipped field _i . token;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_float<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitFloat) {
-    // Skipped field _i . token;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_int<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitInt) {
-    // Skipped field _i . token;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_str<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitStr) {
-    // Skipped field _i . token;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_verbatim<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast LitVerbatim) {
-    // Skipped field _i . token;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_local<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Local) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.let_token).0);
-    for el in Punctuated::pairs(&_i.pats) {
-        let it = el.value();
-        _visitor.visit_pat(it)
-    }
-    if let Some(ref it) = _i.ty {
-        tokens_helper(_visitor, &((it).0).0);
-        _visitor.visit_type(&*(it).1);
-    };
-    if let Some(ref it) = _i.init {
-        tokens_helper(_visitor, &((it).0).0);
-        _visitor.visit_expr(&*(it).1);
-    };
-    tokens_helper(_visitor, &(_i.semi_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_macro<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Macro) {
-    _visitor.visit_path(&_i.path);
-    tokens_helper(_visitor, &(_i.bang_token).0);
-    _visitor.visit_macro_delimiter(&_i.delimiter);
-    // Skipped field _i . tts;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_macro_delimiter<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast MacroDelimiter,
-) {
-    match *_i {
-        MacroDelimiter::Paren(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        MacroDelimiter::Brace(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        MacroDelimiter::Bracket(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_member<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Member) {
-    match *_i {
-        Member::Named(ref _binding_0) => {
-            _visitor.visit_ident(_binding_0);
-        }
-        Member::Unnamed(ref _binding_0) => {
-            _visitor.visit_index(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_meta<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Meta) {
-    match *_i {
-        Meta::Word(ref _binding_0) => {
-            _visitor.visit_ident(_binding_0);
-        }
-        Meta::List(ref _binding_0) => {
-            _visitor.visit_meta_list(_binding_0);
-        }
-        Meta::NameValue(ref _binding_0) => {
-            _visitor.visit_meta_name_value(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_meta_list<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast MetaList) {
-    _visitor.visit_ident(&_i.ident);
-    tokens_helper(_visitor, &(_i.paren_token).0);
-    for el in Punctuated::pairs(&_i.nested) {
-        let it = el.value();
-        _visitor.visit_nested_meta(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_meta_name_value<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast MetaNameValue,
-) {
-    _visitor.visit_ident(&_i.ident);
-    tokens_helper(_visitor, &(_i.eq_token).0);
-    _visitor.visit_lit(&_i.lit);
-}
-#[cfg(feature = "full")]
-pub fn visit_method_sig<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast MethodSig) {
-    if let Some(ref it) = _i.constness {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.unsafety {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.abi {
-        _visitor.visit_abi(it)
-    };
-    _visitor.visit_ident(&_i.ident);
-    _visitor.visit_fn_decl(&_i.decl);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_method_turbofish<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast MethodTurbofish,
-) {
-    tokens_helper(_visitor, &(_i.colon2_token).0);
-    tokens_helper(_visitor, &(_i.lt_token).0);
-    for el in Punctuated::pairs(&_i.args) {
-        let it = el.value();
-        _visitor.visit_generic_method_argument(it)
-    }
-    tokens_helper(_visitor, &(_i.gt_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_nested_meta<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast NestedMeta) {
-    match *_i {
-        NestedMeta::Meta(ref _binding_0) => {
-            _visitor.visit_meta(_binding_0);
-        }
-        NestedMeta::Literal(ref _binding_0) => {
-            _visitor.visit_lit(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_parenthesized_generic_arguments<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast ParenthesizedGenericArguments,
-) {
-    tokens_helper(_visitor, &(_i.paren_token).0);
-    for el in Punctuated::pairs(&_i.inputs) {
-        let it = el.value();
-        _visitor.visit_type(it)
-    }
-    _visitor.visit_return_type(&_i.output);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Pat) {
-    match *_i {
-        Pat::Wild(ref _binding_0) => {
-            _visitor.visit_pat_wild(_binding_0);
-        }
-        Pat::Ident(ref _binding_0) => {
-            _visitor.visit_pat_ident(_binding_0);
-        }
-        Pat::Struct(ref _binding_0) => {
-            _visitor.visit_pat_struct(_binding_0);
-        }
-        Pat::TupleStruct(ref _binding_0) => {
-            _visitor.visit_pat_tuple_struct(_binding_0);
-        }
-        Pat::Path(ref _binding_0) => {
-            _visitor.visit_pat_path(_binding_0);
-        }
-        Pat::Tuple(ref _binding_0) => {
-            _visitor.visit_pat_tuple(_binding_0);
-        }
-        Pat::Box(ref _binding_0) => {
-            _visitor.visit_pat_box(_binding_0);
-        }
-        Pat::Ref(ref _binding_0) => {
-            _visitor.visit_pat_ref(_binding_0);
-        }
-        Pat::Lit(ref _binding_0) => {
-            _visitor.visit_pat_lit(_binding_0);
-        }
-        Pat::Range(ref _binding_0) => {
-            _visitor.visit_pat_range(_binding_0);
-        }
-        Pat::Slice(ref _binding_0) => {
-            _visitor.visit_pat_slice(_binding_0);
-        }
-        Pat::Macro(ref _binding_0) => {
-            _visitor.visit_pat_macro(_binding_0);
-        }
-        Pat::Verbatim(ref _binding_0) => {
-            _visitor.visit_pat_verbatim(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_box<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatBox) {
-    tokens_helper(_visitor, &(_i.box_token).0);
-    _visitor.visit_pat(&*_i.pat);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_ident<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatIdent) {
-    if let Some(ref it) = _i.by_ref {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.mutability {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_ident(&_i.ident);
-    if let Some(ref it) = _i.subpat {
-        tokens_helper(_visitor, &((it).0).0);
-        _visitor.visit_pat(&*(it).1);
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_lit<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatLit) {
-    _visitor.visit_expr(&*_i.expr);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_macro<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatMacro) {
-    _visitor.visit_macro(&_i.mac);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_path<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatPath) {
-    if let Some(ref it) = _i.qself {
-        _visitor.visit_qself(it)
-    };
-    _visitor.visit_path(&_i.path);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_range<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatRange) {
-    _visitor.visit_expr(&*_i.lo);
-    _visitor.visit_range_limits(&_i.limits);
-    _visitor.visit_expr(&*_i.hi);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_ref<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatRef) {
-    tokens_helper(_visitor, &(_i.and_token).0);
-    if let Some(ref it) = _i.mutability {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_pat(&*_i.pat);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_slice<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatSlice) {
-    tokens_helper(_visitor, &(_i.bracket_token).0);
-    for el in Punctuated::pairs(&_i.front) {
-        let it = el.value();
-        _visitor.visit_pat(it)
-    }
-    if let Some(ref it) = _i.middle {
-        _visitor.visit_pat(&**it)
-    };
-    if let Some(ref it) = _i.dot2_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.comma_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    for el in Punctuated::pairs(&_i.back) {
-        let it = el.value();
-        _visitor.visit_pat(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_struct<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatStruct) {
-    _visitor.visit_path(&_i.path);
-    tokens_helper(_visitor, &(_i.brace_token).0);
-    for el in Punctuated::pairs(&_i.fields) {
-        let it = el.value();
-        _visitor.visit_field_pat(it)
-    }
-    if let Some(ref it) = _i.dot2_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_tuple<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatTuple) {
-    tokens_helper(_visitor, &(_i.paren_token).0);
-    for el in Punctuated::pairs(&_i.front) {
-        let it = el.value();
-        _visitor.visit_pat(it)
-    }
-    if let Some(ref it) = _i.dot2_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.comma_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    for el in Punctuated::pairs(&_i.back) {
-        let it = el.value();
-        _visitor.visit_pat(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_tuple_struct<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast PatTupleStruct,
-) {
-    _visitor.visit_path(&_i.path);
-    _visitor.visit_pat_tuple(&_i.pat);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_verbatim<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatVerbatim) {
-    // Skipped field _i . tts;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_wild<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PatWild) {
-    tokens_helper(_visitor, &(_i.underscore_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_path<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Path) {
-    if let Some(ref it) = _i.leading_colon {
-        tokens_helper(_visitor, &(it).0)
-    };
-    for el in Punctuated::pairs(&_i.segments) {
-        let it = el.value();
-        _visitor.visit_path_segment(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_path_arguments<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast PathArguments,
-) {
-    match *_i {
-        PathArguments::None => {}
-        PathArguments::AngleBracketed(ref _binding_0) => {
-            _visitor.visit_angle_bracketed_generic_arguments(_binding_0);
-        }
-        PathArguments::Parenthesized(ref _binding_0) => {
-            _visitor.visit_parenthesized_generic_arguments(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_path_segment<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PathSegment) {
-    _visitor.visit_ident(&_i.ident);
-    _visitor.visit_path_arguments(&_i.arguments);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_predicate_eq<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast PredicateEq) {
-    _visitor.visit_type(&_i.lhs_ty);
-    tokens_helper(_visitor, &(_i.eq_token).0);
-    _visitor.visit_type(&_i.rhs_ty);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_predicate_lifetime<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast PredicateLifetime,
-) {
-    _visitor.visit_lifetime(&_i.lifetime);
-    if let Some(ref it) = _i.colon_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    for el in Punctuated::pairs(&_i.bounds) {
-        let it = el.value();
-        _visitor.visit_lifetime(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_predicate_type<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast PredicateType,
-) {
-    if let Some(ref it) = _i.lifetimes {
-        _visitor.visit_bound_lifetimes(it)
-    };
-    _visitor.visit_type(&_i.bounded_ty);
-    tokens_helper(_visitor, &(_i.colon_token).0);
-    for el in Punctuated::pairs(&_i.bounds) {
-        let it = el.value();
-        _visitor.visit_type_param_bound(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_qself<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast QSelf) {
-    tokens_helper(_visitor, &(_i.lt_token).0);
-    _visitor.visit_type(&*_i.ty);
-    // Skipped field _i . position;
-    if let Some(ref it) = _i.as_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    tokens_helper(_visitor, &(_i.gt_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_range_limits<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast RangeLimits) {
-    match *_i {
-        RangeLimits::HalfOpen(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        RangeLimits::Closed(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_return_type<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast ReturnType) {
-    match *_i {
-        ReturnType::Default => {}
-        ReturnType::Type(ref _binding_0, ref _binding_1) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-            _visitor.visit_type(&**_binding_1);
-        }
-    }
-}
-
-pub fn visit_span<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Span) {}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_stmt<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Stmt) {
-    match *_i {
-        Stmt::Local(ref _binding_0) => {
-            _visitor.visit_local(_binding_0);
-        }
-        Stmt::Item(ref _binding_0) => {
-            _visitor.visit_item(_binding_0);
-        }
-        Stmt::Expr(ref _binding_0) => {
-            _visitor.visit_expr(_binding_0);
-        }
-        Stmt::Semi(ref _binding_0, ref _binding_1) => {
-            _visitor.visit_expr(_binding_0);
-            tokens_helper(_visitor, &(_binding_1).0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_trait_bound<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TraitBound) {
-    if let Some(ref it) = _i.paren_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_trait_bound_modifier(&_i.modifier);
-    if let Some(ref it) = _i.lifetimes {
-        _visitor.visit_bound_lifetimes(it)
-    };
-    _visitor.visit_path(&_i.path);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_trait_bound_modifier<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast TraitBoundModifier,
-) {
-    match *_i {
-        TraitBoundModifier::None => {}
-        TraitBoundModifier::Maybe(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_trait_item<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TraitItem) {
-    match *_i {
-        TraitItem::Const(ref _binding_0) => {
-            _visitor.visit_trait_item_const(_binding_0);
-        }
-        TraitItem::Method(ref _binding_0) => {
-            _visitor.visit_trait_item_method(_binding_0);
-        }
-        TraitItem::Type(ref _binding_0) => {
-            _visitor.visit_trait_item_type(_binding_0);
-        }
-        TraitItem::Macro(ref _binding_0) => {
-            _visitor.visit_trait_item_macro(_binding_0);
-        }
-        TraitItem::Verbatim(ref _binding_0) => {
-            _visitor.visit_trait_item_verbatim(_binding_0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_trait_item_const<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast TraitItemConst,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.const_token).0);
-    _visitor.visit_ident(&_i.ident);
-    tokens_helper(_visitor, &(_i.colon_token).0);
-    _visitor.visit_type(&_i.ty);
-    if let Some(ref it) = _i.default {
-        tokens_helper(_visitor, &((it).0).0);
-        _visitor.visit_expr(&(it).1);
-    };
-    tokens_helper(_visitor, &(_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_trait_item_macro<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast TraitItemMacro,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_macro(&_i.mac);
-    if let Some(ref it) = _i.semi_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-}
-#[cfg(feature = "full")]
-pub fn visit_trait_item_method<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast TraitItemMethod,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_method_sig(&_i.sig);
-    if let Some(ref it) = _i.default {
-        _visitor.visit_block(it)
-    };
-    if let Some(ref it) = _i.semi_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-}
-#[cfg(feature = "full")]
-pub fn visit_trait_item_type<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast TraitItemType,
-) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    tokens_helper(_visitor, &(_i.type_token).0);
-    _visitor.visit_ident(&_i.ident);
-    _visitor.visit_generics(&_i.generics);
-    if let Some(ref it) = _i.colon_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    for el in Punctuated::pairs(&_i.bounds) {
-        let it = el.value();
-        _visitor.visit_type_param_bound(it)
-    }
-    if let Some(ref it) = _i.default {
-        tokens_helper(_visitor, &((it).0).0);
-        _visitor.visit_type(&(it).1);
-    };
-    tokens_helper(_visitor, &(_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_trait_item_verbatim<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast TraitItemVerbatim,
-) {
-    // Skipped field _i . tts;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Type) {
-    match *_i {
-        Type::Slice(ref _binding_0) => {
-            _visitor.visit_type_slice(_binding_0);
-        }
-        Type::Array(ref _binding_0) => {
-            _visitor.visit_type_array(_binding_0);
-        }
-        Type::Ptr(ref _binding_0) => {
-            _visitor.visit_type_ptr(_binding_0);
-        }
-        Type::Reference(ref _binding_0) => {
-            _visitor.visit_type_reference(_binding_0);
-        }
-        Type::BareFn(ref _binding_0) => {
-            _visitor.visit_type_bare_fn(_binding_0);
-        }
-        Type::Never(ref _binding_0) => {
-            _visitor.visit_type_never(_binding_0);
-        }
-        Type::Tuple(ref _binding_0) => {
-            _visitor.visit_type_tuple(_binding_0);
-        }
-        Type::Path(ref _binding_0) => {
-            _visitor.visit_type_path(_binding_0);
-        }
-        Type::TraitObject(ref _binding_0) => {
-            _visitor.visit_type_trait_object(_binding_0);
-        }
-        Type::ImplTrait(ref _binding_0) => {
-            _visitor.visit_type_impl_trait(_binding_0);
-        }
-        Type::Paren(ref _binding_0) => {
-            _visitor.visit_type_paren(_binding_0);
-        }
-        Type::Group(ref _binding_0) => {
-            _visitor.visit_type_group(_binding_0);
-        }
-        Type::Infer(ref _binding_0) => {
-            _visitor.visit_type_infer(_binding_0);
-        }
-        Type::Macro(ref _binding_0) => {
-            _visitor.visit_type_macro(_binding_0);
-        }
-        Type::Verbatim(ref _binding_0) => {
-            _visitor.visit_type_verbatim(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_array<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeArray) {
-    tokens_helper(_visitor, &(_i.bracket_token).0);
-    _visitor.visit_type(&*_i.elem);
-    tokens_helper(_visitor, &(_i.semi_token).0);
-    _visitor.visit_expr(&_i.len);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_bare_fn<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeBareFn) {
-    if let Some(ref it) = _i.unsafety {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.abi {
-        _visitor.visit_abi(it)
-    };
-    tokens_helper(_visitor, &(_i.fn_token).0);
-    if let Some(ref it) = _i.lifetimes {
-        _visitor.visit_bound_lifetimes(it)
-    };
-    tokens_helper(_visitor, &(_i.paren_token).0);
-    for el in Punctuated::pairs(&_i.inputs) {
-        let it = el.value();
-        _visitor.visit_bare_fn_arg(it)
-    }
-    if let Some(ref it) = _i.variadic {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_return_type(&_i.output);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_group<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeGroup) {
-    tokens_helper(_visitor, &(_i.group_token).0);
-    _visitor.visit_type(&*_i.elem);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_impl_trait<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast TypeImplTrait,
-) {
-    tokens_helper(_visitor, &(_i.impl_token).0);
-    for el in Punctuated::pairs(&_i.bounds) {
-        let it = el.value();
-        _visitor.visit_type_param_bound(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_infer<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeInfer) {
-    tokens_helper(_visitor, &(_i.underscore_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_macro<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeMacro) {
-    _visitor.visit_macro(&_i.mac);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_never<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeNever) {
-    tokens_helper(_visitor, &(_i.bang_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_param<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeParam) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_ident(&_i.ident);
-    if let Some(ref it) = _i.colon_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    for el in Punctuated::pairs(&_i.bounds) {
-        let it = el.value();
-        _visitor.visit_type_param_bound(it)
-    }
-    if let Some(ref it) = _i.eq_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.default {
-        _visitor.visit_type(it)
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_param_bound<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast TypeParamBound,
-) {
-    match *_i {
-        TypeParamBound::Trait(ref _binding_0) => {
-            _visitor.visit_trait_bound(_binding_0);
-        }
-        TypeParamBound::Lifetime(ref _binding_0) => {
-            _visitor.visit_lifetime(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_paren<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeParen) {
-    tokens_helper(_visitor, &(_i.paren_token).0);
-    _visitor.visit_type(&*_i.elem);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_path<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypePath) {
-    if let Some(ref it) = _i.qself {
-        _visitor.visit_qself(it)
-    };
-    _visitor.visit_path(&_i.path);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_ptr<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypePtr) {
-    tokens_helper(_visitor, &(_i.star_token).0);
-    if let Some(ref it) = _i.const_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    if let Some(ref it) = _i.mutability {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_type(&*_i.elem);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_reference<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast TypeReference,
-) {
-    tokens_helper(_visitor, &(_i.and_token).0);
-    if let Some(ref it) = _i.lifetime {
-        _visitor.visit_lifetime(it)
-    };
-    if let Some(ref it) = _i.mutability {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_type(&*_i.elem);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_slice<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeSlice) {
-    tokens_helper(_visitor, &(_i.bracket_token).0);
-    _visitor.visit_type(&*_i.elem);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_trait_object<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast TypeTraitObject,
-) {
-    if let Some(ref it) = _i.dyn_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    for el in Punctuated::pairs(&_i.bounds) {
-        let it = el.value();
-        _visitor.visit_type_param_bound(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_tuple<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast TypeTuple) {
-    tokens_helper(_visitor, &(_i.paren_token).0);
-    for el in Punctuated::pairs(&_i.elems) {
-        let it = el.value();
-        _visitor.visit_type(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_verbatim<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast TypeVerbatim,
-) {
-    // Skipped field _i . tts;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_un_op<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast UnOp) {
-    match *_i {
-        UnOp::Deref(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        UnOp::Not(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-        UnOp::Neg(ref _binding_0) => {
-            tokens_helper(_visitor, &(_binding_0).0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_use_glob<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast UseGlob) {
-    tokens_helper(_visitor, &(_i.star_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_use_group<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast UseGroup) {
-    tokens_helper(_visitor, &(_i.brace_token).0);
-    for el in Punctuated::pairs(&_i.items) {
-        let it = el.value();
-        _visitor.visit_use_tree(it)
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_use_name<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast UseName) {
-    _visitor.visit_ident(&_i.ident);
-}
-#[cfg(feature = "full")]
-pub fn visit_use_path<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast UsePath) {
-    _visitor.visit_ident(&_i.ident);
-    tokens_helper(_visitor, &(_i.colon2_token).0);
-    _visitor.visit_use_tree(&*_i.tree);
-}
-#[cfg(feature = "full")]
-pub fn visit_use_rename<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast UseRename) {
-    _visitor.visit_ident(&_i.ident);
-    tokens_helper(_visitor, &(_i.as_token).0);
-    _visitor.visit_ident(&_i.rename);
-}
-#[cfg(feature = "full")]
-pub fn visit_use_tree<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast UseTree) {
-    match *_i {
-        UseTree::Path(ref _binding_0) => {
-            _visitor.visit_use_path(_binding_0);
-        }
-        UseTree::Name(ref _binding_0) => {
-            _visitor.visit_use_name(_binding_0);
-        }
-        UseTree::Rename(ref _binding_0) => {
-            _visitor.visit_use_rename(_binding_0);
-        }
-        UseTree::Glob(ref _binding_0) => {
-            _visitor.visit_use_glob(_binding_0);
-        }
-        UseTree::Group(ref _binding_0) => {
-            _visitor.visit_use_group(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_variant<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Variant) {
-    for it in &_i.attrs {
-        _visitor.visit_attribute(it)
-    }
-    _visitor.visit_ident(&_i.ident);
-    _visitor.visit_fields(&_i.fields);
-    if let Some(ref it) = _i.discriminant {
-        tokens_helper(_visitor, &((it).0).0);
-        _visitor.visit_expr(&(it).1);
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_vis_crate<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast VisCrate) {
-    tokens_helper(_visitor, &(_i.crate_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_vis_public<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast VisPublic) {
-    tokens_helper(_visitor, &(_i.pub_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_vis_restricted<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast VisRestricted,
-) {
-    tokens_helper(_visitor, &(_i.pub_token).0);
-    tokens_helper(_visitor, &(_i.paren_token).0);
-    if let Some(ref it) = _i.in_token {
-        tokens_helper(_visitor, &(it).0)
-    };
-    _visitor.visit_path(&*_i.path);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_visibility<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast Visibility) {
-    match *_i {
-        Visibility::Public(ref _binding_0) => {
-            _visitor.visit_vis_public(_binding_0);
-        }
-        Visibility::Crate(ref _binding_0) => {
-            _visitor.visit_vis_crate(_binding_0);
-        }
-        Visibility::Restricted(ref _binding_0) => {
-            _visitor.visit_vis_restricted(_binding_0);
-        }
-        Visibility::Inherited => {}
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_where_clause<'ast, V: Visit<'ast> + ?Sized>(_visitor: &mut V, _i: &'ast WhereClause) {
-    tokens_helper(_visitor, &(_i.where_token).0);
-    for el in Punctuated::pairs(&_i.predicates) {
-        let it = el.value();
-        _visitor.visit_where_predicate(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_where_predicate<'ast, V: Visit<'ast> + ?Sized>(
-    _visitor: &mut V,
-    _i: &'ast WherePredicate,
-) {
-    match *_i {
-        WherePredicate::Type(ref _binding_0) => {
-            _visitor.visit_predicate_type(_binding_0);
-        }
-        WherePredicate::Lifetime(ref _binding_0) => {
-            _visitor.visit_predicate_lifetime(_binding_0);
-        }
-        WherePredicate::Eq(ref _binding_0) => {
-            _visitor.visit_predicate_eq(_binding_0);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/gen/visit_mut.rs b/third_party/rust/syn-0.14.6/src/gen/visit_mut.rs
deleted file mode 100644
index f5576411d085..000000000000
--- a/third_party/rust/syn-0.14.6/src/gen/visit_mut.rs
+++ /dev/null
@@ -1,3295 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT
-
-#![cfg_attr(feature = "cargo-clippy", allow(match_same_arms))]
-
-#[cfg(any(feature = "full", feature = "derive"))]
-use gen::helper::visit_mut::*;
-use proc_macro2::Span;
-#[cfg(any(feature = "full", feature = "derive"))]
-use punctuated::Punctuated;
-use *;
-
-#[cfg(feature = "full")]
-macro_rules! full {
-    ($e:expr) => {
-        $e
-    };
-}
-
-#[cfg(all(feature = "derive", not(feature = "full")))]
-macro_rules! full {
-    ($e:expr) => {
-        unreachable!()
-    };
-}
-
-/// Syntax tree traversal to mutate an exclusive borrow of a syntax tree in
-/// place.
-///
-/// See the [module documentation] for details.
-///
-/// [module documentation]: index.html
-///
-/// *This trait is available if Syn is built with the `"visit-mut"` feature.*
-pub trait VisitMut {
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_abi_mut(&mut self, i: &mut Abi) {
-        visit_abi_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_angle_bracketed_generic_arguments_mut(
-        &mut self,
-        i: &mut AngleBracketedGenericArguments,
-    ) {
-        visit_angle_bracketed_generic_arguments_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_arg_captured_mut(&mut self, i: &mut ArgCaptured) {
-        visit_arg_captured_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_arg_self_mut(&mut self, i: &mut ArgSelf) {
-        visit_arg_self_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_arg_self_ref_mut(&mut self, i: &mut ArgSelfRef) {
-        visit_arg_self_ref_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_arm_mut(&mut self, i: &mut Arm) {
-        visit_arm_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_attr_style_mut(&mut self, i: &mut AttrStyle) {
-        visit_attr_style_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_attribute_mut(&mut self, i: &mut Attribute) {
-        visit_attribute_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_bare_fn_arg_mut(&mut self, i: &mut BareFnArg) {
-        visit_bare_fn_arg_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_bare_fn_arg_name_mut(&mut self, i: &mut BareFnArgName) {
-        visit_bare_fn_arg_name_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_bin_op_mut(&mut self, i: &mut BinOp) {
-        visit_bin_op_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_binding_mut(&mut self, i: &mut Binding) {
-        visit_binding_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_block_mut(&mut self, i: &mut Block) {
-        visit_block_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_bound_lifetimes_mut(&mut self, i: &mut BoundLifetimes) {
-        visit_bound_lifetimes_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_const_param_mut(&mut self, i: &mut ConstParam) {
-        visit_const_param_mut(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn visit_data_mut(&mut self, i: &mut Data) {
-        visit_data_mut(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn visit_data_enum_mut(&mut self, i: &mut DataEnum) {
-        visit_data_enum_mut(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn visit_data_struct_mut(&mut self, i: &mut DataStruct) {
-        visit_data_struct_mut(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn visit_data_union_mut(&mut self, i: &mut DataUnion) {
-        visit_data_union_mut(self, i)
-    }
-    #[cfg(feature = "derive")]
-    fn visit_derive_input_mut(&mut self, i: &mut DeriveInput) {
-        visit_derive_input_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_mut(&mut self, i: &mut Expr) {
-        visit_expr_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_array_mut(&mut self, i: &mut ExprArray) {
-        visit_expr_array_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_assign_mut(&mut self, i: &mut ExprAssign) {
-        visit_expr_assign_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_assign_op_mut(&mut self, i: &mut ExprAssignOp) {
-        visit_expr_assign_op_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_binary_mut(&mut self, i: &mut ExprBinary) {
-        visit_expr_binary_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_block_mut(&mut self, i: &mut ExprBlock) {
-        visit_expr_block_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_box_mut(&mut self, i: &mut ExprBox) {
-        visit_expr_box_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_break_mut(&mut self, i: &mut ExprBreak) {
-        visit_expr_break_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_call_mut(&mut self, i: &mut ExprCall) {
-        visit_expr_call_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_cast_mut(&mut self, i: &mut ExprCast) {
-        visit_expr_cast_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_catch_mut(&mut self, i: &mut ExprCatch) {
-        visit_expr_catch_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_closure_mut(&mut self, i: &mut ExprClosure) {
-        visit_expr_closure_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_continue_mut(&mut self, i: &mut ExprContinue) {
-        visit_expr_continue_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_field_mut(&mut self, i: &mut ExprField) {
-        visit_expr_field_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_for_loop_mut(&mut self, i: &mut ExprForLoop) {
-        visit_expr_for_loop_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_group_mut(&mut self, i: &mut ExprGroup) {
-        visit_expr_group_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_if_mut(&mut self, i: &mut ExprIf) {
-        visit_expr_if_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_if_let_mut(&mut self, i: &mut ExprIfLet) {
-        visit_expr_if_let_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_in_place_mut(&mut self, i: &mut ExprInPlace) {
-        visit_expr_in_place_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_index_mut(&mut self, i: &mut ExprIndex) {
-        visit_expr_index_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_lit_mut(&mut self, i: &mut ExprLit) {
-        visit_expr_lit_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_loop_mut(&mut self, i: &mut ExprLoop) {
-        visit_expr_loop_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_macro_mut(&mut self, i: &mut ExprMacro) {
-        visit_expr_macro_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_match_mut(&mut self, i: &mut ExprMatch) {
-        visit_expr_match_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_method_call_mut(&mut self, i: &mut ExprMethodCall) {
-        visit_expr_method_call_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_paren_mut(&mut self, i: &mut ExprParen) {
-        visit_expr_paren_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_path_mut(&mut self, i: &mut ExprPath) {
-        visit_expr_path_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_range_mut(&mut self, i: &mut ExprRange) {
-        visit_expr_range_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_reference_mut(&mut self, i: &mut ExprReference) {
-        visit_expr_reference_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_repeat_mut(&mut self, i: &mut ExprRepeat) {
-        visit_expr_repeat_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_return_mut(&mut self, i: &mut ExprReturn) {
-        visit_expr_return_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_struct_mut(&mut self, i: &mut ExprStruct) {
-        visit_expr_struct_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_try_mut(&mut self, i: &mut ExprTry) {
-        visit_expr_try_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_tuple_mut(&mut self, i: &mut ExprTuple) {
-        visit_expr_tuple_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_type_mut(&mut self, i: &mut ExprType) {
-        visit_expr_type_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_unary_mut(&mut self, i: &mut ExprUnary) {
-        visit_expr_unary_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_unsafe_mut(&mut self, i: &mut ExprUnsafe) {
-        visit_expr_unsafe_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_verbatim_mut(&mut self, i: &mut ExprVerbatim) {
-        visit_expr_verbatim_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_while_mut(&mut self, i: &mut ExprWhile) {
-        visit_expr_while_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_while_let_mut(&mut self, i: &mut ExprWhileLet) {
-        visit_expr_while_let_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_expr_yield_mut(&mut self, i: &mut ExprYield) {
-        visit_expr_yield_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_field_mut(&mut self, i: &mut Field) {
-        visit_field_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_field_pat_mut(&mut self, i: &mut FieldPat) {
-        visit_field_pat_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_field_value_mut(&mut self, i: &mut FieldValue) {
-        visit_field_value_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_fields_mut(&mut self, i: &mut Fields) {
-        visit_fields_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_fields_named_mut(&mut self, i: &mut FieldsNamed) {
-        visit_fields_named_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_fields_unnamed_mut(&mut self, i: &mut FieldsUnnamed) {
-        visit_fields_unnamed_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_file_mut(&mut self, i: &mut File) {
-        visit_file_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_fn_arg_mut(&mut self, i: &mut FnArg) {
-        visit_fn_arg_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_fn_decl_mut(&mut self, i: &mut FnDecl) {
-        visit_fn_decl_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_foreign_item_mut(&mut self, i: &mut ForeignItem) {
-        visit_foreign_item_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_foreign_item_fn_mut(&mut self, i: &mut ForeignItemFn) {
-        visit_foreign_item_fn_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_foreign_item_static_mut(&mut self, i: &mut ForeignItemStatic) {
-        visit_foreign_item_static_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_foreign_item_type_mut(&mut self, i: &mut ForeignItemType) {
-        visit_foreign_item_type_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_foreign_item_verbatim_mut(&mut self, i: &mut ForeignItemVerbatim) {
-        visit_foreign_item_verbatim_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_generic_argument_mut(&mut self, i: &mut GenericArgument) {
-        visit_generic_argument_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_generic_method_argument_mut(&mut self, i: &mut GenericMethodArgument) {
-        visit_generic_method_argument_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_generic_param_mut(&mut self, i: &mut GenericParam) {
-        visit_generic_param_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_generics_mut(&mut self, i: &mut Generics) {
-        visit_generics_mut(self, i)
-    }
-
-    fn visit_ident_mut(&mut self, i: &mut Ident) {
-        visit_ident_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_impl_item_mut(&mut self, i: &mut ImplItem) {
-        visit_impl_item_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_impl_item_const_mut(&mut self, i: &mut ImplItemConst) {
-        visit_impl_item_const_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_impl_item_macro_mut(&mut self, i: &mut ImplItemMacro) {
-        visit_impl_item_macro_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_impl_item_method_mut(&mut self, i: &mut ImplItemMethod) {
-        visit_impl_item_method_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_impl_item_type_mut(&mut self, i: &mut ImplItemType) {
-        visit_impl_item_type_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_impl_item_verbatim_mut(&mut self, i: &mut ImplItemVerbatim) {
-        visit_impl_item_verbatim_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_index_mut(&mut self, i: &mut Index) {
-        visit_index_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_mut(&mut self, i: &mut Item) {
-        visit_item_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_const_mut(&mut self, i: &mut ItemConst) {
-        visit_item_const_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_enum_mut(&mut self, i: &mut ItemEnum) {
-        visit_item_enum_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_extern_crate_mut(&mut self, i: &mut ItemExternCrate) {
-        visit_item_extern_crate_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_fn_mut(&mut self, i: &mut ItemFn) {
-        visit_item_fn_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_foreign_mod_mut(&mut self, i: &mut ItemForeignMod) {
-        visit_item_foreign_mod_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_impl_mut(&mut self, i: &mut ItemImpl) {
-        visit_item_impl_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_macro_mut(&mut self, i: &mut ItemMacro) {
-        visit_item_macro_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_macro2_mut(&mut self, i: &mut ItemMacro2) {
-        visit_item_macro2_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_mod_mut(&mut self, i: &mut ItemMod) {
-        visit_item_mod_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_static_mut(&mut self, i: &mut ItemStatic) {
-        visit_item_static_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_struct_mut(&mut self, i: &mut ItemStruct) {
-        visit_item_struct_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_trait_mut(&mut self, i: &mut ItemTrait) {
-        visit_item_trait_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_type_mut(&mut self, i: &mut ItemType) {
-        visit_item_type_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_union_mut(&mut self, i: &mut ItemUnion) {
-        visit_item_union_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_use_mut(&mut self, i: &mut ItemUse) {
-        visit_item_use_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_item_verbatim_mut(&mut self, i: &mut ItemVerbatim) {
-        visit_item_verbatim_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_label_mut(&mut self, i: &mut Label) {
-        visit_label_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lifetime_mut(&mut self, i: &mut Lifetime) {
-        visit_lifetime_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lifetime_def_mut(&mut self, i: &mut LifetimeDef) {
-        visit_lifetime_def_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_mut(&mut self, i: &mut Lit) {
-        visit_lit_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_bool_mut(&mut self, i: &mut LitBool) {
-        visit_lit_bool_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_byte_mut(&mut self, i: &mut LitByte) {
-        visit_lit_byte_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_byte_str_mut(&mut self, i: &mut LitByteStr) {
-        visit_lit_byte_str_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_char_mut(&mut self, i: &mut LitChar) {
-        visit_lit_char_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_float_mut(&mut self, i: &mut LitFloat) {
-        visit_lit_float_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_int_mut(&mut self, i: &mut LitInt) {
-        visit_lit_int_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_str_mut(&mut self, i: &mut LitStr) {
-        visit_lit_str_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_lit_verbatim_mut(&mut self, i: &mut LitVerbatim) {
-        visit_lit_verbatim_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_local_mut(&mut self, i: &mut Local) {
-        visit_local_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_macro_mut(&mut self, i: &mut Macro) {
-        visit_macro_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_macro_delimiter_mut(&mut self, i: &mut MacroDelimiter) {
-        visit_macro_delimiter_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_member_mut(&mut self, i: &mut Member) {
-        visit_member_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_meta_mut(&mut self, i: &mut Meta) {
-        visit_meta_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_meta_list_mut(&mut self, i: &mut MetaList) {
-        visit_meta_list_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_meta_name_value_mut(&mut self, i: &mut MetaNameValue) {
-        visit_meta_name_value_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_method_sig_mut(&mut self, i: &mut MethodSig) {
-        visit_method_sig_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_method_turbofish_mut(&mut self, i: &mut MethodTurbofish) {
-        visit_method_turbofish_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_nested_meta_mut(&mut self, i: &mut NestedMeta) {
-        visit_nested_meta_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_parenthesized_generic_arguments_mut(&mut self, i: &mut ParenthesizedGenericArguments) {
-        visit_parenthesized_generic_arguments_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_mut(&mut self, i: &mut Pat) {
-        visit_pat_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_box_mut(&mut self, i: &mut PatBox) {
-        visit_pat_box_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_ident_mut(&mut self, i: &mut PatIdent) {
-        visit_pat_ident_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_lit_mut(&mut self, i: &mut PatLit) {
-        visit_pat_lit_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_macro_mut(&mut self, i: &mut PatMacro) {
-        visit_pat_macro_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_path_mut(&mut self, i: &mut PatPath) {
-        visit_pat_path_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_range_mut(&mut self, i: &mut PatRange) {
-        visit_pat_range_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_ref_mut(&mut self, i: &mut PatRef) {
-        visit_pat_ref_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_slice_mut(&mut self, i: &mut PatSlice) {
-        visit_pat_slice_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_struct_mut(&mut self, i: &mut PatStruct) {
-        visit_pat_struct_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_tuple_mut(&mut self, i: &mut PatTuple) {
-        visit_pat_tuple_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_tuple_struct_mut(&mut self, i: &mut PatTupleStruct) {
-        visit_pat_tuple_struct_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_verbatim_mut(&mut self, i: &mut PatVerbatim) {
-        visit_pat_verbatim_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_pat_wild_mut(&mut self, i: &mut PatWild) {
-        visit_pat_wild_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_path_mut(&mut self, i: &mut Path) {
-        visit_path_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_path_arguments_mut(&mut self, i: &mut PathArguments) {
-        visit_path_arguments_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_path_segment_mut(&mut self, i: &mut PathSegment) {
-        visit_path_segment_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_predicate_eq_mut(&mut self, i: &mut PredicateEq) {
-        visit_predicate_eq_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_predicate_lifetime_mut(&mut self, i: &mut PredicateLifetime) {
-        visit_predicate_lifetime_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_predicate_type_mut(&mut self, i: &mut PredicateType) {
-        visit_predicate_type_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_qself_mut(&mut self, i: &mut QSelf) {
-        visit_qself_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_range_limits_mut(&mut self, i: &mut RangeLimits) {
-        visit_range_limits_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_return_type_mut(&mut self, i: &mut ReturnType) {
-        visit_return_type_mut(self, i)
-    }
-
-    fn visit_span_mut(&mut self, i: &mut Span) {
-        visit_span_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[cfg(feature = "full")]
-    fn visit_stmt_mut(&mut self, i: &mut Stmt) {
-        visit_stmt_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_trait_bound_mut(&mut self, i: &mut TraitBound) {
-        visit_trait_bound_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_trait_bound_modifier_mut(&mut self, i: &mut TraitBoundModifier) {
-        visit_trait_bound_modifier_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_trait_item_mut(&mut self, i: &mut TraitItem) {
-        visit_trait_item_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_trait_item_const_mut(&mut self, i: &mut TraitItemConst) {
-        visit_trait_item_const_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_trait_item_macro_mut(&mut self, i: &mut TraitItemMacro) {
-        visit_trait_item_macro_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_trait_item_method_mut(&mut self, i: &mut TraitItemMethod) {
-        visit_trait_item_method_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_trait_item_type_mut(&mut self, i: &mut TraitItemType) {
-        visit_trait_item_type_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_trait_item_verbatim_mut(&mut self, i: &mut TraitItemVerbatim) {
-        visit_trait_item_verbatim_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_mut(&mut self, i: &mut Type) {
-        visit_type_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_array_mut(&mut self, i: &mut TypeArray) {
-        visit_type_array_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_bare_fn_mut(&mut self, i: &mut TypeBareFn) {
-        visit_type_bare_fn_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_group_mut(&mut self, i: &mut TypeGroup) {
-        visit_type_group_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_impl_trait_mut(&mut self, i: &mut TypeImplTrait) {
-        visit_type_impl_trait_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_infer_mut(&mut self, i: &mut TypeInfer) {
-        visit_type_infer_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_macro_mut(&mut self, i: &mut TypeMacro) {
-        visit_type_macro_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_never_mut(&mut self, i: &mut TypeNever) {
-        visit_type_never_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_param_mut(&mut self, i: &mut TypeParam) {
-        visit_type_param_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_param_bound_mut(&mut self, i: &mut TypeParamBound) {
-        visit_type_param_bound_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_paren_mut(&mut self, i: &mut TypeParen) {
-        visit_type_paren_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_path_mut(&mut self, i: &mut TypePath) {
-        visit_type_path_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_ptr_mut(&mut self, i: &mut TypePtr) {
-        visit_type_ptr_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_reference_mut(&mut self, i: &mut TypeReference) {
-        visit_type_reference_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_slice_mut(&mut self, i: &mut TypeSlice) {
-        visit_type_slice_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_trait_object_mut(&mut self, i: &mut TypeTraitObject) {
-        visit_type_trait_object_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_tuple_mut(&mut self, i: &mut TypeTuple) {
-        visit_type_tuple_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_type_verbatim_mut(&mut self, i: &mut TypeVerbatim) {
-        visit_type_verbatim_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_un_op_mut(&mut self, i: &mut UnOp) {
-        visit_un_op_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_use_glob_mut(&mut self, i: &mut UseGlob) {
-        visit_use_glob_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_use_group_mut(&mut self, i: &mut UseGroup) {
-        visit_use_group_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_use_name_mut(&mut self, i: &mut UseName) {
-        visit_use_name_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_use_path_mut(&mut self, i: &mut UsePath) {
-        visit_use_path_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_use_rename_mut(&mut self, i: &mut UseRename) {
-        visit_use_rename_mut(self, i)
-    }
-    #[cfg(feature = "full")]
-    fn visit_use_tree_mut(&mut self, i: &mut UseTree) {
-        visit_use_tree_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_variant_mut(&mut self, i: &mut Variant) {
-        visit_variant_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_vis_crate_mut(&mut self, i: &mut VisCrate) {
-        visit_vis_crate_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_vis_public_mut(&mut self, i: &mut VisPublic) {
-        visit_vis_public_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_vis_restricted_mut(&mut self, i: &mut VisRestricted) {
-        visit_vis_restricted_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_visibility_mut(&mut self, i: &mut Visibility) {
-        visit_visibility_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_where_clause_mut(&mut self, i: &mut WhereClause) {
-        visit_where_clause_mut(self, i)
-    }
-    #[cfg(any(feature = "full", feature = "derive"))]
-    fn visit_where_predicate_mut(&mut self, i: &mut WherePredicate) {
-        visit_where_predicate_mut(self, i)
-    }
-}
-
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_abi_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Abi) {
-    tokens_helper(_visitor, &mut (_i.extern_token).0);
-    if let Some(ref mut it) = _i.name {
-        _visitor.visit_lit_str_mut(it)
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_angle_bracketed_generic_arguments_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut AngleBracketedGenericArguments,
-) {
-    if let Some(ref mut it) = _i.colon2_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    tokens_helper(_visitor, &mut (_i.lt_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.args) {
-        let it = el.value_mut();
-        _visitor.visit_generic_argument_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.gt_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_arg_captured_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ArgCaptured) {
-    _visitor.visit_pat_mut(&mut _i.pat);
-    tokens_helper(_visitor, &mut (_i.colon_token).0);
-    _visitor.visit_type_mut(&mut _i.ty);
-}
-#[cfg(feature = "full")]
-pub fn visit_arg_self_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ArgSelf) {
-    if let Some(ref mut it) = _i.mutability {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    tokens_helper(_visitor, &mut (_i.self_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_arg_self_ref_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ArgSelfRef) {
-    tokens_helper(_visitor, &mut (_i.and_token).0);
-    if let Some(ref mut it) = _i.lifetime {
-        _visitor.visit_lifetime_mut(it)
-    };
-    if let Some(ref mut it) = _i.mutability {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    tokens_helper(_visitor, &mut (_i.self_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_arm_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Arm) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    if let Some(ref mut it) = _i.leading_vert {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    for mut el in Punctuated::pairs_mut(&mut _i.pats) {
-        let it = el.value_mut();
-        _visitor.visit_pat_mut(it)
-    }
-    if let Some(ref mut it) = _i.guard {
-        tokens_helper(_visitor, &mut ((it).0).0);
-        _visitor.visit_expr_mut(&mut *(it).1);
-    };
-    tokens_helper(_visitor, &mut (_i.fat_arrow_token).0);
-    _visitor.visit_expr_mut(&mut *_i.body);
-    if let Some(ref mut it) = _i.comma {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_attr_style_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut AttrStyle) {
-    match *_i {
-        AttrStyle::Outer => {}
-        AttrStyle::Inner(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_attribute_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Attribute) {
-    tokens_helper(_visitor, &mut (_i.pound_token).0);
-    _visitor.visit_attr_style_mut(&mut _i.style);
-    tokens_helper(_visitor, &mut (_i.bracket_token).0);
-    _visitor.visit_path_mut(&mut _i.path);
-    // Skipped field _i . tts;
-    // Skipped field _i . is_sugared_doc;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_bare_fn_arg_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut BareFnArg) {
-    if let Some(ref mut it) = _i.name {
-        _visitor.visit_bare_fn_arg_name_mut(&mut (it).0);
-        tokens_helper(_visitor, &mut ((it).1).0);
-    };
-    _visitor.visit_type_mut(&mut _i.ty);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_bare_fn_arg_name_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut BareFnArgName) {
-    match *_i {
-        BareFnArgName::Named(ref mut _binding_0) => {
-            _visitor.visit_ident_mut(_binding_0);
-        }
-        BareFnArgName::Wild(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_bin_op_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut BinOp) {
-    match *_i {
-        BinOp::Add(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Sub(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Mul(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Div(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Rem(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::And(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Or(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::BitXor(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::BitAnd(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::BitOr(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Shl(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Shr(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Eq(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Lt(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Le(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Ne(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Ge(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::Gt(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::AddEq(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::SubEq(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::MulEq(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::DivEq(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::RemEq(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::BitXorEq(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::BitAndEq(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::BitOrEq(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::ShlEq(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        BinOp::ShrEq(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_binding_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Binding) {
-    _visitor.visit_ident_mut(&mut _i.ident);
-    tokens_helper(_visitor, &mut (_i.eq_token).0);
-    _visitor.visit_type_mut(&mut _i.ty);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_block_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Block) {
-    tokens_helper(_visitor, &mut (_i.brace_token).0);
-    for it in &mut _i.stmts {
-        _visitor.visit_stmt_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_bound_lifetimes_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut BoundLifetimes) {
-    tokens_helper(_visitor, &mut (_i.for_token).0);
-    tokens_helper(_visitor, &mut (_i.lt_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.lifetimes) {
-        let it = el.value_mut();
-        _visitor.visit_lifetime_def_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.gt_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_const_param_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ConstParam) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.const_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    tokens_helper(_visitor, &mut (_i.colon_token).0);
-    _visitor.visit_type_mut(&mut _i.ty);
-    if let Some(ref mut it) = _i.eq_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.default {
-        _visitor.visit_expr_mut(it)
-    };
-}
-#[cfg(feature = "derive")]
-pub fn visit_data_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Data) {
-    match *_i {
-        Data::Struct(ref mut _binding_0) => {
-            _visitor.visit_data_struct_mut(_binding_0);
-        }
-        Data::Enum(ref mut _binding_0) => {
-            _visitor.visit_data_enum_mut(_binding_0);
-        }
-        Data::Union(ref mut _binding_0) => {
-            _visitor.visit_data_union_mut(_binding_0);
-        }
-    }
-}
-#[cfg(feature = "derive")]
-pub fn visit_data_enum_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut DataEnum) {
-    tokens_helper(_visitor, &mut (_i.enum_token).0);
-    tokens_helper(_visitor, &mut (_i.brace_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.variants) {
-        let it = el.value_mut();
-        _visitor.visit_variant_mut(it)
-    }
-}
-#[cfg(feature = "derive")]
-pub fn visit_data_struct_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut DataStruct) {
-    tokens_helper(_visitor, &mut (_i.struct_token).0);
-    _visitor.visit_fields_mut(&mut _i.fields);
-    if let Some(ref mut it) = _i.semi_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-}
-#[cfg(feature = "derive")]
-pub fn visit_data_union_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut DataUnion) {
-    tokens_helper(_visitor, &mut (_i.union_token).0);
-    _visitor.visit_fields_named_mut(&mut _i.fields);
-}
-#[cfg(feature = "derive")]
-pub fn visit_derive_input_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut DeriveInput) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    _visitor.visit_generics_mut(&mut _i.generics);
-    _visitor.visit_data_mut(&mut _i.data);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Expr) {
-    match *_i {
-        Expr::Box(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_box_mut(_binding_0));
-        }
-        Expr::InPlace(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_in_place_mut(_binding_0));
-        }
-        Expr::Array(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_array_mut(_binding_0));
-        }
-        Expr::Call(ref mut _binding_0) => {
-            _visitor.visit_expr_call_mut(_binding_0);
-        }
-        Expr::MethodCall(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_method_call_mut(_binding_0));
-        }
-        Expr::Tuple(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_tuple_mut(_binding_0));
-        }
-        Expr::Binary(ref mut _binding_0) => {
-            _visitor.visit_expr_binary_mut(_binding_0);
-        }
-        Expr::Unary(ref mut _binding_0) => {
-            _visitor.visit_expr_unary_mut(_binding_0);
-        }
-        Expr::Lit(ref mut _binding_0) => {
-            _visitor.visit_expr_lit_mut(_binding_0);
-        }
-        Expr::Cast(ref mut _binding_0) => {
-            _visitor.visit_expr_cast_mut(_binding_0);
-        }
-        Expr::Type(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_type_mut(_binding_0));
-        }
-        Expr::If(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_if_mut(_binding_0));
-        }
-        Expr::IfLet(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_if_let_mut(_binding_0));
-        }
-        Expr::While(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_while_mut(_binding_0));
-        }
-        Expr::WhileLet(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_while_let_mut(_binding_0));
-        }
-        Expr::ForLoop(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_for_loop_mut(_binding_0));
-        }
-        Expr::Loop(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_loop_mut(_binding_0));
-        }
-        Expr::Match(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_match_mut(_binding_0));
-        }
-        Expr::Closure(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_closure_mut(_binding_0));
-        }
-        Expr::Unsafe(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_unsafe_mut(_binding_0));
-        }
-        Expr::Block(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_block_mut(_binding_0));
-        }
-        Expr::Assign(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_assign_mut(_binding_0));
-        }
-        Expr::AssignOp(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_assign_op_mut(_binding_0));
-        }
-        Expr::Field(ref mut _binding_0) => {
-            _visitor.visit_expr_field_mut(_binding_0);
-        }
-        Expr::Index(ref mut _binding_0) => {
-            _visitor.visit_expr_index_mut(_binding_0);
-        }
-        Expr::Range(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_range_mut(_binding_0));
-        }
-        Expr::Path(ref mut _binding_0) => {
-            _visitor.visit_expr_path_mut(_binding_0);
-        }
-        Expr::Reference(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_reference_mut(_binding_0));
-        }
-        Expr::Break(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_break_mut(_binding_0));
-        }
-        Expr::Continue(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_continue_mut(_binding_0));
-        }
-        Expr::Return(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_return_mut(_binding_0));
-        }
-        Expr::Macro(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_macro_mut(_binding_0));
-        }
-        Expr::Struct(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_struct_mut(_binding_0));
-        }
-        Expr::Repeat(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_repeat_mut(_binding_0));
-        }
-        Expr::Paren(ref mut _binding_0) => {
-            _visitor.visit_expr_paren_mut(_binding_0);
-        }
-        Expr::Group(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_group_mut(_binding_0));
-        }
-        Expr::Try(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_try_mut(_binding_0));
-        }
-        Expr::Catch(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_catch_mut(_binding_0));
-        }
-        Expr::Yield(ref mut _binding_0) => {
-            full!(_visitor.visit_expr_yield_mut(_binding_0));
-        }
-        Expr::Verbatim(ref mut _binding_0) => {
-            _visitor.visit_expr_verbatim_mut(_binding_0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_array_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprArray) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.bracket_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.elems) {
-        let it = el.value_mut();
-        _visitor.visit_expr_mut(it)
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_assign_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprAssign) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_expr_mut(&mut *_i.left);
-    tokens_helper(_visitor, &mut (_i.eq_token).0);
-    _visitor.visit_expr_mut(&mut *_i.right);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_assign_op_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprAssignOp) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_expr_mut(&mut *_i.left);
-    _visitor.visit_bin_op_mut(&mut _i.op);
-    _visitor.visit_expr_mut(&mut *_i.right);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_binary_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprBinary) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_expr_mut(&mut *_i.left);
-    _visitor.visit_bin_op_mut(&mut _i.op);
-    _visitor.visit_expr_mut(&mut *_i.right);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_block_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprBlock) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_block_mut(&mut _i.block);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_box_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprBox) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.box_token).0);
-    _visitor.visit_expr_mut(&mut *_i.expr);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_break_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprBreak) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.break_token).0);
-    if let Some(ref mut it) = _i.label {
-        _visitor.visit_lifetime_mut(it)
-    };
-    if let Some(ref mut it) = _i.expr {
-        _visitor.visit_expr_mut(&mut **it)
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_call_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprCall) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_expr_mut(&mut *_i.func);
-    tokens_helper(_visitor, &mut (_i.paren_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.args) {
-        let it = el.value_mut();
-        _visitor.visit_expr_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_cast_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprCast) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_expr_mut(&mut *_i.expr);
-    tokens_helper(_visitor, &mut (_i.as_token).0);
-    _visitor.visit_type_mut(&mut *_i.ty);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_catch_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprCatch) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.do_token).0);
-    tokens_helper(_visitor, &mut (_i.catch_token).0);
-    _visitor.visit_block_mut(&mut _i.block);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_closure_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprClosure) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    if let Some(ref mut it) = _i.movability {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.capture {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    tokens_helper(_visitor, &mut (_i.or1_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.inputs) {
-        let it = el.value_mut();
-        _visitor.visit_fn_arg_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.or2_token).0);
-    _visitor.visit_return_type_mut(&mut _i.output);
-    _visitor.visit_expr_mut(&mut *_i.body);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_continue_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprContinue) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.continue_token).0);
-    if let Some(ref mut it) = _i.label {
-        _visitor.visit_lifetime_mut(it)
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_field_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprField) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_expr_mut(&mut *_i.base);
-    tokens_helper(_visitor, &mut (_i.dot_token).0);
-    _visitor.visit_member_mut(&mut _i.member);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_for_loop_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprForLoop) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    if let Some(ref mut it) = _i.label {
-        _visitor.visit_label_mut(it)
-    };
-    tokens_helper(_visitor, &mut (_i.for_token).0);
-    _visitor.visit_pat_mut(&mut *_i.pat);
-    tokens_helper(_visitor, &mut (_i.in_token).0);
-    _visitor.visit_expr_mut(&mut *_i.expr);
-    _visitor.visit_block_mut(&mut _i.body);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_group_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprGroup) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.group_token).0);
-    _visitor.visit_expr_mut(&mut *_i.expr);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_if_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprIf) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.if_token).0);
-    _visitor.visit_expr_mut(&mut *_i.cond);
-    _visitor.visit_block_mut(&mut _i.then_branch);
-    if let Some(ref mut it) = _i.else_branch {
-        tokens_helper(_visitor, &mut ((it).0).0);
-        _visitor.visit_expr_mut(&mut *(it).1);
-    };
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_if_let_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprIfLet) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.if_token).0);
-    tokens_helper(_visitor, &mut (_i.let_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.pats) {
-        let it = el.value_mut();
-        _visitor.visit_pat_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.eq_token).0);
-    _visitor.visit_expr_mut(&mut *_i.expr);
-    _visitor.visit_block_mut(&mut _i.then_branch);
-    if let Some(ref mut it) = _i.else_branch {
-        tokens_helper(_visitor, &mut ((it).0).0);
-        _visitor.visit_expr_mut(&mut *(it).1);
-    };
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_in_place_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprInPlace) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_expr_mut(&mut *_i.place);
-    tokens_helper(_visitor, &mut (_i.arrow_token).0);
-    _visitor.visit_expr_mut(&mut *_i.value);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_index_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprIndex) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_expr_mut(&mut *_i.expr);
-    tokens_helper(_visitor, &mut (_i.bracket_token).0);
-    _visitor.visit_expr_mut(&mut *_i.index);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_lit_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprLit) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_lit_mut(&mut _i.lit);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_loop_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprLoop) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    if let Some(ref mut it) = _i.label {
-        _visitor.visit_label_mut(it)
-    };
-    tokens_helper(_visitor, &mut (_i.loop_token).0);
-    _visitor.visit_block_mut(&mut _i.body);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_macro_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprMacro) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_macro_mut(&mut _i.mac);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_match_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprMatch) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.match_token).0);
-    _visitor.visit_expr_mut(&mut *_i.expr);
-    tokens_helper(_visitor, &mut (_i.brace_token).0);
-    for it in &mut _i.arms {
-        _visitor.visit_arm_mut(it)
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_method_call_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprMethodCall) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_expr_mut(&mut *_i.receiver);
-    tokens_helper(_visitor, &mut (_i.dot_token).0);
-    _visitor.visit_ident_mut(&mut _i.method);
-    if let Some(ref mut it) = _i.turbofish {
-        _visitor.visit_method_turbofish_mut(it)
-    };
-    tokens_helper(_visitor, &mut (_i.paren_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.args) {
-        let it = el.value_mut();
-        _visitor.visit_expr_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_paren_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprParen) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.paren_token).0);
-    _visitor.visit_expr_mut(&mut *_i.expr);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_path_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprPath) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    if let Some(ref mut it) = _i.qself {
-        _visitor.visit_qself_mut(it)
-    };
-    _visitor.visit_path_mut(&mut _i.path);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_range_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprRange) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    if let Some(ref mut it) = _i.from {
-        _visitor.visit_expr_mut(&mut **it)
-    };
-    _visitor.visit_range_limits_mut(&mut _i.limits);
-    if let Some(ref mut it) = _i.to {
-        _visitor.visit_expr_mut(&mut **it)
-    };
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_reference_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprReference) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.and_token).0);
-    if let Some(ref mut it) = _i.mutability {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_expr_mut(&mut *_i.expr);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_repeat_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprRepeat) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.bracket_token).0);
-    _visitor.visit_expr_mut(&mut *_i.expr);
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-    _visitor.visit_expr_mut(&mut *_i.len);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_return_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprReturn) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.return_token).0);
-    if let Some(ref mut it) = _i.expr {
-        _visitor.visit_expr_mut(&mut **it)
-    };
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_struct_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprStruct) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_path_mut(&mut _i.path);
-    tokens_helper(_visitor, &mut (_i.brace_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.fields) {
-        let it = el.value_mut();
-        _visitor.visit_field_value_mut(it)
-    }
-    if let Some(ref mut it) = _i.dot2_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.rest {
-        _visitor.visit_expr_mut(&mut **it)
-    };
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_try_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprTry) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_expr_mut(&mut *_i.expr);
-    tokens_helper(_visitor, &mut (_i.question_token).0);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_tuple_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprTuple) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.paren_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.elems) {
-        let it = el.value_mut();
-        _visitor.visit_expr_mut(it)
-    }
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprType) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_expr_mut(&mut *_i.expr);
-    tokens_helper(_visitor, &mut (_i.colon_token).0);
-    _visitor.visit_type_mut(&mut *_i.ty);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_unary_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprUnary) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_un_op_mut(&mut _i.op);
-    _visitor.visit_expr_mut(&mut *_i.expr);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_unsafe_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprUnsafe) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.unsafe_token).0);
-    _visitor.visit_block_mut(&mut _i.block);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_verbatim_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprVerbatim) {
-    // Skipped field _i . tts;
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_while_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprWhile) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    if let Some(ref mut it) = _i.label {
-        _visitor.visit_label_mut(it)
-    };
-    tokens_helper(_visitor, &mut (_i.while_token).0);
-    _visitor.visit_expr_mut(&mut *_i.cond);
-    _visitor.visit_block_mut(&mut _i.body);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_while_let_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprWhileLet) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    if let Some(ref mut it) = _i.label {
-        _visitor.visit_label_mut(it)
-    };
-    tokens_helper(_visitor, &mut (_i.while_token).0);
-    tokens_helper(_visitor, &mut (_i.let_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.pats) {
-        let it = el.value_mut();
-        _visitor.visit_pat_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.eq_token).0);
-    _visitor.visit_expr_mut(&mut *_i.expr);
-    _visitor.visit_block_mut(&mut _i.body);
-}
-#[cfg(feature = "full")]
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_expr_yield_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ExprYield) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.yield_token).0);
-    if let Some(ref mut it) = _i.expr {
-        _visitor.visit_expr_mut(&mut **it)
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_field_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Field) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    if let Some(ref mut it) = _i.ident {
-        _visitor.visit_ident_mut(it)
-    };
-    if let Some(ref mut it) = _i.colon_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_type_mut(&mut _i.ty);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_field_pat_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut FieldPat) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_member_mut(&mut _i.member);
-    if let Some(ref mut it) = _i.colon_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_pat_mut(&mut *_i.pat);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_field_value_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut FieldValue) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_member_mut(&mut _i.member);
-    if let Some(ref mut it) = _i.colon_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_expr_mut(&mut _i.expr);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_fields_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Fields) {
-    match *_i {
-        Fields::Named(ref mut _binding_0) => {
-            _visitor.visit_fields_named_mut(_binding_0);
-        }
-        Fields::Unnamed(ref mut _binding_0) => {
-            _visitor.visit_fields_unnamed_mut(_binding_0);
-        }
-        Fields::Unit => {}
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_fields_named_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut FieldsNamed) {
-    tokens_helper(_visitor, &mut (_i.brace_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.named) {
-        let it = el.value_mut();
-        _visitor.visit_field_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_fields_unnamed_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut FieldsUnnamed) {
-    tokens_helper(_visitor, &mut (_i.paren_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.unnamed) {
-        let it = el.value_mut();
-        _visitor.visit_field_mut(it)
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_file_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut File) {
-    // Skipped field _i . shebang;
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    for it in &mut _i.items {
-        _visitor.visit_item_mut(it)
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_fn_arg_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut FnArg) {
-    match *_i {
-        FnArg::SelfRef(ref mut _binding_0) => {
-            _visitor.visit_arg_self_ref_mut(_binding_0);
-        }
-        FnArg::SelfValue(ref mut _binding_0) => {
-            _visitor.visit_arg_self_mut(_binding_0);
-        }
-        FnArg::Captured(ref mut _binding_0) => {
-            _visitor.visit_arg_captured_mut(_binding_0);
-        }
-        FnArg::Inferred(ref mut _binding_0) => {
-            _visitor.visit_pat_mut(_binding_0);
-        }
-        FnArg::Ignored(ref mut _binding_0) => {
-            _visitor.visit_type_mut(_binding_0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_fn_decl_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut FnDecl) {
-    tokens_helper(_visitor, &mut (_i.fn_token).0);
-    _visitor.visit_generics_mut(&mut _i.generics);
-    tokens_helper(_visitor, &mut (_i.paren_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.inputs) {
-        let it = el.value_mut();
-        _visitor.visit_fn_arg_mut(it)
-    }
-    if let Some(ref mut it) = _i.variadic {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_return_type_mut(&mut _i.output);
-}
-#[cfg(feature = "full")]
-pub fn visit_foreign_item_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ForeignItem) {
-    match *_i {
-        ForeignItem::Fn(ref mut _binding_0) => {
-            _visitor.visit_foreign_item_fn_mut(_binding_0);
-        }
-        ForeignItem::Static(ref mut _binding_0) => {
-            _visitor.visit_foreign_item_static_mut(_binding_0);
-        }
-        ForeignItem::Type(ref mut _binding_0) => {
-            _visitor.visit_foreign_item_type_mut(_binding_0);
-        }
-        ForeignItem::Verbatim(ref mut _binding_0) => {
-            _visitor.visit_foreign_item_verbatim_mut(_binding_0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_foreign_item_fn_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ForeignItemFn) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    _visitor.visit_fn_decl_mut(&mut *_i.decl);
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_foreign_item_static_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut ForeignItemStatic,
-) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    tokens_helper(_visitor, &mut (_i.static_token).0);
-    if let Some(ref mut it) = _i.mutability {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_ident_mut(&mut _i.ident);
-    tokens_helper(_visitor, &mut (_i.colon_token).0);
-    _visitor.visit_type_mut(&mut *_i.ty);
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_foreign_item_type_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut ForeignItemType,
-) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    tokens_helper(_visitor, &mut (_i.type_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_foreign_item_verbatim_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut ForeignItemVerbatim,
-) {
-    // Skipped field _i . tts;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_generic_argument_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut GenericArgument,
-) {
-    match *_i {
-        GenericArgument::Lifetime(ref mut _binding_0) => {
-            _visitor.visit_lifetime_mut(_binding_0);
-        }
-        GenericArgument::Type(ref mut _binding_0) => {
-            _visitor.visit_type_mut(_binding_0);
-        }
-        GenericArgument::Binding(ref mut _binding_0) => {
-            _visitor.visit_binding_mut(_binding_0);
-        }
-        GenericArgument::Const(ref mut _binding_0) => {
-            _visitor.visit_expr_mut(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_generic_method_argument_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut GenericMethodArgument,
-) {
-    match *_i {
-        GenericMethodArgument::Type(ref mut _binding_0) => {
-            _visitor.visit_type_mut(_binding_0);
-        }
-        GenericMethodArgument::Const(ref mut _binding_0) => {
-            _visitor.visit_expr_mut(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_generic_param_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut GenericParam) {
-    match *_i {
-        GenericParam::Type(ref mut _binding_0) => {
-            _visitor.visit_type_param_mut(_binding_0);
-        }
-        GenericParam::Lifetime(ref mut _binding_0) => {
-            _visitor.visit_lifetime_def_mut(_binding_0);
-        }
-        GenericParam::Const(ref mut _binding_0) => {
-            _visitor.visit_const_param_mut(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_generics_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Generics) {
-    if let Some(ref mut it) = _i.lt_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    for mut el in Punctuated::pairs_mut(&mut _i.params) {
-        let it = el.value_mut();
-        _visitor.visit_generic_param_mut(it)
-    }
-    if let Some(ref mut it) = _i.gt_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.where_clause {
-        _visitor.visit_where_clause_mut(it)
-    };
-}
-
-pub fn visit_ident_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Ident) {}
-#[cfg(feature = "full")]
-pub fn visit_impl_item_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ImplItem) {
-    match *_i {
-        ImplItem::Const(ref mut _binding_0) => {
-            _visitor.visit_impl_item_const_mut(_binding_0);
-        }
-        ImplItem::Method(ref mut _binding_0) => {
-            _visitor.visit_impl_item_method_mut(_binding_0);
-        }
-        ImplItem::Type(ref mut _binding_0) => {
-            _visitor.visit_impl_item_type_mut(_binding_0);
-        }
-        ImplItem::Macro(ref mut _binding_0) => {
-            _visitor.visit_impl_item_macro_mut(_binding_0);
-        }
-        ImplItem::Verbatim(ref mut _binding_0) => {
-            _visitor.visit_impl_item_verbatim_mut(_binding_0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_impl_item_const_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ImplItemConst) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    if let Some(ref mut it) = _i.defaultness {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    tokens_helper(_visitor, &mut (_i.const_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    tokens_helper(_visitor, &mut (_i.colon_token).0);
-    _visitor.visit_type_mut(&mut _i.ty);
-    tokens_helper(_visitor, &mut (_i.eq_token).0);
-    _visitor.visit_expr_mut(&mut _i.expr);
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_impl_item_macro_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ImplItemMacro) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_macro_mut(&mut _i.mac);
-    if let Some(ref mut it) = _i.semi_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-}
-#[cfg(feature = "full")]
-pub fn visit_impl_item_method_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ImplItemMethod) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    if let Some(ref mut it) = _i.defaultness {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_method_sig_mut(&mut _i.sig);
-    _visitor.visit_block_mut(&mut _i.block);
-}
-#[cfg(feature = "full")]
-pub fn visit_impl_item_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ImplItemType) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    if let Some(ref mut it) = _i.defaultness {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    tokens_helper(_visitor, &mut (_i.type_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    _visitor.visit_generics_mut(&mut _i.generics);
-    tokens_helper(_visitor, &mut (_i.eq_token).0);
-    _visitor.visit_type_mut(&mut _i.ty);
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_impl_item_verbatim_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut ImplItemVerbatim,
-) {
-    // Skipped field _i . tts;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_index_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Index) {
-    // Skipped field _i . index;
-    _visitor.visit_span_mut(&mut _i.span);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Item) {
-    match *_i {
-        Item::ExternCrate(ref mut _binding_0) => {
-            _visitor.visit_item_extern_crate_mut(_binding_0);
-        }
-        Item::Use(ref mut _binding_0) => {
-            _visitor.visit_item_use_mut(_binding_0);
-        }
-        Item::Static(ref mut _binding_0) => {
-            _visitor.visit_item_static_mut(_binding_0);
-        }
-        Item::Const(ref mut _binding_0) => {
-            _visitor.visit_item_const_mut(_binding_0);
-        }
-        Item::Fn(ref mut _binding_0) => {
-            _visitor.visit_item_fn_mut(_binding_0);
-        }
-        Item::Mod(ref mut _binding_0) => {
-            _visitor.visit_item_mod_mut(_binding_0);
-        }
-        Item::ForeignMod(ref mut _binding_0) => {
-            _visitor.visit_item_foreign_mod_mut(_binding_0);
-        }
-        Item::Type(ref mut _binding_0) => {
-            _visitor.visit_item_type_mut(_binding_0);
-        }
-        Item::Struct(ref mut _binding_0) => {
-            _visitor.visit_item_struct_mut(_binding_0);
-        }
-        Item::Enum(ref mut _binding_0) => {
-            _visitor.visit_item_enum_mut(_binding_0);
-        }
-        Item::Union(ref mut _binding_0) => {
-            _visitor.visit_item_union_mut(_binding_0);
-        }
-        Item::Trait(ref mut _binding_0) => {
-            _visitor.visit_item_trait_mut(_binding_0);
-        }
-        Item::Impl(ref mut _binding_0) => {
-            _visitor.visit_item_impl_mut(_binding_0);
-        }
-        Item::Macro(ref mut _binding_0) => {
-            _visitor.visit_item_macro_mut(_binding_0);
-        }
-        Item::Macro2(ref mut _binding_0) => {
-            _visitor.visit_item_macro2_mut(_binding_0);
-        }
-        Item::Verbatim(ref mut _binding_0) => {
-            _visitor.visit_item_verbatim_mut(_binding_0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_item_const_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemConst) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    tokens_helper(_visitor, &mut (_i.const_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    tokens_helper(_visitor, &mut (_i.colon_token).0);
-    _visitor.visit_type_mut(&mut *_i.ty);
-    tokens_helper(_visitor, &mut (_i.eq_token).0);
-    _visitor.visit_expr_mut(&mut *_i.expr);
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_enum_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemEnum) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    tokens_helper(_visitor, &mut (_i.enum_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    _visitor.visit_generics_mut(&mut _i.generics);
-    tokens_helper(_visitor, &mut (_i.brace_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.variants) {
-        let it = el.value_mut();
-        _visitor.visit_variant_mut(it)
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_item_extern_crate_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut ItemExternCrate,
-) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    tokens_helper(_visitor, &mut (_i.extern_token).0);
-    tokens_helper(_visitor, &mut (_i.crate_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    if let Some(ref mut it) = _i.rename {
-        tokens_helper(_visitor, &mut ((it).0).0);
-        _visitor.visit_ident_mut(&mut (it).1);
-    };
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_fn_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemFn) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    if let Some(ref mut it) = _i.constness {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.unsafety {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.abi {
-        _visitor.visit_abi_mut(it)
-    };
-    _visitor.visit_ident_mut(&mut _i.ident);
-    _visitor.visit_fn_decl_mut(&mut *_i.decl);
-    _visitor.visit_block_mut(&mut *_i.block);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_foreign_mod_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemForeignMod) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_abi_mut(&mut _i.abi);
-    tokens_helper(_visitor, &mut (_i.brace_token).0);
-    for it in &mut _i.items {
-        _visitor.visit_foreign_item_mut(it)
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_item_impl_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemImpl) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    if let Some(ref mut it) = _i.defaultness {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.unsafety {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    tokens_helper(_visitor, &mut (_i.impl_token).0);
-    _visitor.visit_generics_mut(&mut _i.generics);
-    if let Some(ref mut it) = _i.trait_ {
-        if let Some(ref mut it) = (it).0 {
-            tokens_helper(_visitor, &mut (it).0)
-        };
-        _visitor.visit_path_mut(&mut (it).1);
-        tokens_helper(_visitor, &mut ((it).2).0);
-    };
-    _visitor.visit_type_mut(&mut *_i.self_ty);
-    tokens_helper(_visitor, &mut (_i.brace_token).0);
-    for it in &mut _i.items {
-        _visitor.visit_impl_item_mut(it)
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_item_macro_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemMacro) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    if let Some(ref mut it) = _i.ident {
-        _visitor.visit_ident_mut(it)
-    };
-    _visitor.visit_macro_mut(&mut _i.mac);
-    if let Some(ref mut it) = _i.semi_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-}
-#[cfg(feature = "full")]
-pub fn visit_item_macro2_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemMacro2) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    tokens_helper(_visitor, &mut (_i.macro_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    tokens_helper(_visitor, &mut (_i.paren_token).0);
-    // Skipped field _i . args;
-    tokens_helper(_visitor, &mut (_i.brace_token).0);
-    // Skipped field _i . body;
-}
-#[cfg(feature = "full")]
-pub fn visit_item_mod_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemMod) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    tokens_helper(_visitor, &mut (_i.mod_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    if let Some(ref mut it) = _i.content {
-        tokens_helper(_visitor, &mut ((it).0).0);
-        for it in &mut (it).1 {
-            _visitor.visit_item_mut(it)
-        }
-    };
-    if let Some(ref mut it) = _i.semi {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-}
-#[cfg(feature = "full")]
-pub fn visit_item_static_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemStatic) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    tokens_helper(_visitor, &mut (_i.static_token).0);
-    if let Some(ref mut it) = _i.mutability {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_ident_mut(&mut _i.ident);
-    tokens_helper(_visitor, &mut (_i.colon_token).0);
-    _visitor.visit_type_mut(&mut *_i.ty);
-    tokens_helper(_visitor, &mut (_i.eq_token).0);
-    _visitor.visit_expr_mut(&mut *_i.expr);
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_struct_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemStruct) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    tokens_helper(_visitor, &mut (_i.struct_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    _visitor.visit_generics_mut(&mut _i.generics);
-    _visitor.visit_fields_mut(&mut _i.fields);
-    if let Some(ref mut it) = _i.semi_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-}
-#[cfg(feature = "full")]
-pub fn visit_item_trait_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemTrait) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    if let Some(ref mut it) = _i.unsafety {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.auto_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    tokens_helper(_visitor, &mut (_i.trait_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    _visitor.visit_generics_mut(&mut _i.generics);
-    if let Some(ref mut it) = _i.colon_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    for mut el in Punctuated::pairs_mut(&mut _i.supertraits) {
-        let it = el.value_mut();
-        _visitor.visit_type_param_bound_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.brace_token).0);
-    for it in &mut _i.items {
-        _visitor.visit_trait_item_mut(it)
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_item_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemType) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    tokens_helper(_visitor, &mut (_i.type_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    _visitor.visit_generics_mut(&mut _i.generics);
-    tokens_helper(_visitor, &mut (_i.eq_token).0);
-    _visitor.visit_type_mut(&mut *_i.ty);
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_union_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemUnion) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    tokens_helper(_visitor, &mut (_i.union_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    _visitor.visit_generics_mut(&mut _i.generics);
-    _visitor.visit_fields_named_mut(&mut _i.fields);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_use_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemUse) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_visibility_mut(&mut _i.vis);
-    tokens_helper(_visitor, &mut (_i.use_token).0);
-    if let Some(ref mut it) = _i.leading_colon {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_use_tree_mut(&mut _i.tree);
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_item_verbatim_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ItemVerbatim) {
-    // Skipped field _i . tts;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_label_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Label) {
-    _visitor.visit_lifetime_mut(&mut _i.name);
-    tokens_helper(_visitor, &mut (_i.colon_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lifetime_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Lifetime) {
-    // Skipped field _i . apostrophe;
-    _visitor.visit_ident_mut(&mut _i.ident);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lifetime_def_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LifetimeDef) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_lifetime_mut(&mut _i.lifetime);
-    if let Some(ref mut it) = _i.colon_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    for mut el in Punctuated::pairs_mut(&mut _i.bounds) {
-        let it = el.value_mut();
-        _visitor.visit_lifetime_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Lit) {
-    match *_i {
-        Lit::Str(ref mut _binding_0) => {
-            _visitor.visit_lit_str_mut(_binding_0);
-        }
-        Lit::ByteStr(ref mut _binding_0) => {
-            _visitor.visit_lit_byte_str_mut(_binding_0);
-        }
-        Lit::Byte(ref mut _binding_0) => {
-            _visitor.visit_lit_byte_mut(_binding_0);
-        }
-        Lit::Char(ref mut _binding_0) => {
-            _visitor.visit_lit_char_mut(_binding_0);
-        }
-        Lit::Int(ref mut _binding_0) => {
-            _visitor.visit_lit_int_mut(_binding_0);
-        }
-        Lit::Float(ref mut _binding_0) => {
-            _visitor.visit_lit_float_mut(_binding_0);
-        }
-        Lit::Bool(ref mut _binding_0) => {
-            _visitor.visit_lit_bool_mut(_binding_0);
-        }
-        Lit::Verbatim(ref mut _binding_0) => {
-            _visitor.visit_lit_verbatim_mut(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_bool_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitBool) {
-    // Skipped field _i . value;
-    _visitor.visit_span_mut(&mut _i.span);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_byte_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitByte) {
-    // Skipped field _i . token;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_byte_str_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitByteStr) {
-    // Skipped field _i . token;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_char_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitChar) {
-    // Skipped field _i . token;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_float_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitFloat) {
-    // Skipped field _i . token;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_int_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitInt) {
-    // Skipped field _i . token;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_str_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitStr) {
-    // Skipped field _i . token;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_lit_verbatim_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut LitVerbatim) {
-    // Skipped field _i . token;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_local_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Local) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.let_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.pats) {
-        let it = el.value_mut();
-        _visitor.visit_pat_mut(it)
-    }
-    if let Some(ref mut it) = _i.ty {
-        tokens_helper(_visitor, &mut ((it).0).0);
-        _visitor.visit_type_mut(&mut *(it).1);
-    };
-    if let Some(ref mut it) = _i.init {
-        tokens_helper(_visitor, &mut ((it).0).0);
-        _visitor.visit_expr_mut(&mut *(it).1);
-    };
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_macro_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Macro) {
-    _visitor.visit_path_mut(&mut _i.path);
-    tokens_helper(_visitor, &mut (_i.bang_token).0);
-    _visitor.visit_macro_delimiter_mut(&mut _i.delimiter);
-    // Skipped field _i . tts;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_macro_delimiter_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut MacroDelimiter) {
-    match *_i {
-        MacroDelimiter::Paren(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        MacroDelimiter::Brace(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        MacroDelimiter::Bracket(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_member_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Member) {
-    match *_i {
-        Member::Named(ref mut _binding_0) => {
-            _visitor.visit_ident_mut(_binding_0);
-        }
-        Member::Unnamed(ref mut _binding_0) => {
-            _visitor.visit_index_mut(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_meta_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Meta) {
-    match *_i {
-        Meta::Word(ref mut _binding_0) => {
-            _visitor.visit_ident_mut(_binding_0);
-        }
-        Meta::List(ref mut _binding_0) => {
-            _visitor.visit_meta_list_mut(_binding_0);
-        }
-        Meta::NameValue(ref mut _binding_0) => {
-            _visitor.visit_meta_name_value_mut(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_meta_list_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut MetaList) {
-    _visitor.visit_ident_mut(&mut _i.ident);
-    tokens_helper(_visitor, &mut (_i.paren_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.nested) {
-        let it = el.value_mut();
-        _visitor.visit_nested_meta_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_meta_name_value_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut MetaNameValue) {
-    _visitor.visit_ident_mut(&mut _i.ident);
-    tokens_helper(_visitor, &mut (_i.eq_token).0);
-    _visitor.visit_lit_mut(&mut _i.lit);
-}
-#[cfg(feature = "full")]
-pub fn visit_method_sig_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut MethodSig) {
-    if let Some(ref mut it) = _i.constness {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.unsafety {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.abi {
-        _visitor.visit_abi_mut(it)
-    };
-    _visitor.visit_ident_mut(&mut _i.ident);
-    _visitor.visit_fn_decl_mut(&mut _i.decl);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_method_turbofish_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut MethodTurbofish,
-) {
-    tokens_helper(_visitor, &mut (_i.colon2_token).0);
-    tokens_helper(_visitor, &mut (_i.lt_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.args) {
-        let it = el.value_mut();
-        _visitor.visit_generic_method_argument_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.gt_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_nested_meta_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut NestedMeta) {
-    match *_i {
-        NestedMeta::Meta(ref mut _binding_0) => {
-            _visitor.visit_meta_mut(_binding_0);
-        }
-        NestedMeta::Literal(ref mut _binding_0) => {
-            _visitor.visit_lit_mut(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_parenthesized_generic_arguments_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut ParenthesizedGenericArguments,
-) {
-    tokens_helper(_visitor, &mut (_i.paren_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.inputs) {
-        let it = el.value_mut();
-        _visitor.visit_type_mut(it)
-    }
-    _visitor.visit_return_type_mut(&mut _i.output);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Pat) {
-    match *_i {
-        Pat::Wild(ref mut _binding_0) => {
-            _visitor.visit_pat_wild_mut(_binding_0);
-        }
-        Pat::Ident(ref mut _binding_0) => {
-            _visitor.visit_pat_ident_mut(_binding_0);
-        }
-        Pat::Struct(ref mut _binding_0) => {
-            _visitor.visit_pat_struct_mut(_binding_0);
-        }
-        Pat::TupleStruct(ref mut _binding_0) => {
-            _visitor.visit_pat_tuple_struct_mut(_binding_0);
-        }
-        Pat::Path(ref mut _binding_0) => {
-            _visitor.visit_pat_path_mut(_binding_0);
-        }
-        Pat::Tuple(ref mut _binding_0) => {
-            _visitor.visit_pat_tuple_mut(_binding_0);
-        }
-        Pat::Box(ref mut _binding_0) => {
-            _visitor.visit_pat_box_mut(_binding_0);
-        }
-        Pat::Ref(ref mut _binding_0) => {
-            _visitor.visit_pat_ref_mut(_binding_0);
-        }
-        Pat::Lit(ref mut _binding_0) => {
-            _visitor.visit_pat_lit_mut(_binding_0);
-        }
-        Pat::Range(ref mut _binding_0) => {
-            _visitor.visit_pat_range_mut(_binding_0);
-        }
-        Pat::Slice(ref mut _binding_0) => {
-            _visitor.visit_pat_slice_mut(_binding_0);
-        }
-        Pat::Macro(ref mut _binding_0) => {
-            _visitor.visit_pat_macro_mut(_binding_0);
-        }
-        Pat::Verbatim(ref mut _binding_0) => {
-            _visitor.visit_pat_verbatim_mut(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_box_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatBox) {
-    tokens_helper(_visitor, &mut (_i.box_token).0);
-    _visitor.visit_pat_mut(&mut *_i.pat);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_ident_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatIdent) {
-    if let Some(ref mut it) = _i.by_ref {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.mutability {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_ident_mut(&mut _i.ident);
-    if let Some(ref mut it) = _i.subpat {
-        tokens_helper(_visitor, &mut ((it).0).0);
-        _visitor.visit_pat_mut(&mut *(it).1);
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_lit_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatLit) {
-    _visitor.visit_expr_mut(&mut *_i.expr);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_macro_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatMacro) {
-    _visitor.visit_macro_mut(&mut _i.mac);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_path_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatPath) {
-    if let Some(ref mut it) = _i.qself {
-        _visitor.visit_qself_mut(it)
-    };
-    _visitor.visit_path_mut(&mut _i.path);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_range_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatRange) {
-    _visitor.visit_expr_mut(&mut *_i.lo);
-    _visitor.visit_range_limits_mut(&mut _i.limits);
-    _visitor.visit_expr_mut(&mut *_i.hi);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_ref_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatRef) {
-    tokens_helper(_visitor, &mut (_i.and_token).0);
-    if let Some(ref mut it) = _i.mutability {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_pat_mut(&mut *_i.pat);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_slice_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatSlice) {
-    tokens_helper(_visitor, &mut (_i.bracket_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.front) {
-        let it = el.value_mut();
-        _visitor.visit_pat_mut(it)
-    }
-    if let Some(ref mut it) = _i.middle {
-        _visitor.visit_pat_mut(&mut **it)
-    };
-    if let Some(ref mut it) = _i.dot2_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.comma_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    for mut el in Punctuated::pairs_mut(&mut _i.back) {
-        let it = el.value_mut();
-        _visitor.visit_pat_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_struct_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatStruct) {
-    _visitor.visit_path_mut(&mut _i.path);
-    tokens_helper(_visitor, &mut (_i.brace_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.fields) {
-        let it = el.value_mut();
-        _visitor.visit_field_pat_mut(it)
-    }
-    if let Some(ref mut it) = _i.dot2_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_tuple_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatTuple) {
-    tokens_helper(_visitor, &mut (_i.paren_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.front) {
-        let it = el.value_mut();
-        _visitor.visit_pat_mut(it)
-    }
-    if let Some(ref mut it) = _i.dot2_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.comma_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    for mut el in Punctuated::pairs_mut(&mut _i.back) {
-        let it = el.value_mut();
-        _visitor.visit_pat_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_tuple_struct_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatTupleStruct) {
-    _visitor.visit_path_mut(&mut _i.path);
-    _visitor.visit_pat_tuple_mut(&mut _i.pat);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_verbatim_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatVerbatim) {
-    // Skipped field _i . tts;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_pat_wild_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PatWild) {
-    tokens_helper(_visitor, &mut (_i.underscore_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_path_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Path) {
-    if let Some(ref mut it) = _i.leading_colon {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    for mut el in Punctuated::pairs_mut(&mut _i.segments) {
-        let it = el.value_mut();
-        _visitor.visit_path_segment_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_path_arguments_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PathArguments) {
-    match *_i {
-        PathArguments::None => {}
-        PathArguments::AngleBracketed(ref mut _binding_0) => {
-            _visitor.visit_angle_bracketed_generic_arguments_mut(_binding_0);
-        }
-        PathArguments::Parenthesized(ref mut _binding_0) => {
-            _visitor.visit_parenthesized_generic_arguments_mut(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_path_segment_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PathSegment) {
-    _visitor.visit_ident_mut(&mut _i.ident);
-    _visitor.visit_path_arguments_mut(&mut _i.arguments);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_predicate_eq_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PredicateEq) {
-    _visitor.visit_type_mut(&mut _i.lhs_ty);
-    tokens_helper(_visitor, &mut (_i.eq_token).0);
-    _visitor.visit_type_mut(&mut _i.rhs_ty);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_predicate_lifetime_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut PredicateLifetime,
-) {
-    _visitor.visit_lifetime_mut(&mut _i.lifetime);
-    if let Some(ref mut it) = _i.colon_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    for mut el in Punctuated::pairs_mut(&mut _i.bounds) {
-        let it = el.value_mut();
-        _visitor.visit_lifetime_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_predicate_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut PredicateType) {
-    if let Some(ref mut it) = _i.lifetimes {
-        _visitor.visit_bound_lifetimes_mut(it)
-    };
-    _visitor.visit_type_mut(&mut _i.bounded_ty);
-    tokens_helper(_visitor, &mut (_i.colon_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.bounds) {
-        let it = el.value_mut();
-        _visitor.visit_type_param_bound_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_qself_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut QSelf) {
-    tokens_helper(_visitor, &mut (_i.lt_token).0);
-    _visitor.visit_type_mut(&mut *_i.ty);
-    // Skipped field _i . position;
-    if let Some(ref mut it) = _i.as_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    tokens_helper(_visitor, &mut (_i.gt_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_range_limits_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut RangeLimits) {
-    match *_i {
-        RangeLimits::HalfOpen(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        RangeLimits::Closed(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_return_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut ReturnType) {
-    match *_i {
-        ReturnType::Default => {}
-        ReturnType::Type(ref mut _binding_0, ref mut _binding_1) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-            _visitor.visit_type_mut(&mut **_binding_1);
-        }
-    }
-}
-
-pub fn visit_span_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Span) {}
-#[cfg(any(feature = "full", feature = "derive"))]
-#[cfg(feature = "full")]
-pub fn visit_stmt_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Stmt) {
-    match *_i {
-        Stmt::Local(ref mut _binding_0) => {
-            _visitor.visit_local_mut(_binding_0);
-        }
-        Stmt::Item(ref mut _binding_0) => {
-            _visitor.visit_item_mut(_binding_0);
-        }
-        Stmt::Expr(ref mut _binding_0) => {
-            _visitor.visit_expr_mut(_binding_0);
-        }
-        Stmt::Semi(ref mut _binding_0, ref mut _binding_1) => {
-            _visitor.visit_expr_mut(_binding_0);
-            tokens_helper(_visitor, &mut (_binding_1).0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_trait_bound_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TraitBound) {
-    if let Some(ref mut it) = _i.paren_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_trait_bound_modifier_mut(&mut _i.modifier);
-    if let Some(ref mut it) = _i.lifetimes {
-        _visitor.visit_bound_lifetimes_mut(it)
-    };
-    _visitor.visit_path_mut(&mut _i.path);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_trait_bound_modifier_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut TraitBoundModifier,
-) {
-    match *_i {
-        TraitBoundModifier::None => {}
-        TraitBoundModifier::Maybe(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_trait_item_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TraitItem) {
-    match *_i {
-        TraitItem::Const(ref mut _binding_0) => {
-            _visitor.visit_trait_item_const_mut(_binding_0);
-        }
-        TraitItem::Method(ref mut _binding_0) => {
-            _visitor.visit_trait_item_method_mut(_binding_0);
-        }
-        TraitItem::Type(ref mut _binding_0) => {
-            _visitor.visit_trait_item_type_mut(_binding_0);
-        }
-        TraitItem::Macro(ref mut _binding_0) => {
-            _visitor.visit_trait_item_macro_mut(_binding_0);
-        }
-        TraitItem::Verbatim(ref mut _binding_0) => {
-            _visitor.visit_trait_item_verbatim_mut(_binding_0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_trait_item_const_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TraitItemConst) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.const_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    tokens_helper(_visitor, &mut (_i.colon_token).0);
-    _visitor.visit_type_mut(&mut _i.ty);
-    if let Some(ref mut it) = _i.default {
-        tokens_helper(_visitor, &mut ((it).0).0);
-        _visitor.visit_expr_mut(&mut (it).1);
-    };
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_trait_item_macro_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TraitItemMacro) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_macro_mut(&mut _i.mac);
-    if let Some(ref mut it) = _i.semi_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-}
-#[cfg(feature = "full")]
-pub fn visit_trait_item_method_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut TraitItemMethod,
-) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_method_sig_mut(&mut _i.sig);
-    if let Some(ref mut it) = _i.default {
-        _visitor.visit_block_mut(it)
-    };
-    if let Some(ref mut it) = _i.semi_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-}
-#[cfg(feature = "full")]
-pub fn visit_trait_item_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TraitItemType) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    tokens_helper(_visitor, &mut (_i.type_token).0);
-    _visitor.visit_ident_mut(&mut _i.ident);
-    _visitor.visit_generics_mut(&mut _i.generics);
-    if let Some(ref mut it) = _i.colon_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    for mut el in Punctuated::pairs_mut(&mut _i.bounds) {
-        let it = el.value_mut();
-        _visitor.visit_type_param_bound_mut(it)
-    }
-    if let Some(ref mut it) = _i.default {
-        tokens_helper(_visitor, &mut ((it).0).0);
-        _visitor.visit_type_mut(&mut (it).1);
-    };
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_trait_item_verbatim_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut TraitItemVerbatim,
-) {
-    // Skipped field _i . tts;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Type) {
-    match *_i {
-        Type::Slice(ref mut _binding_0) => {
-            _visitor.visit_type_slice_mut(_binding_0);
-        }
-        Type::Array(ref mut _binding_0) => {
-            _visitor.visit_type_array_mut(_binding_0);
-        }
-        Type::Ptr(ref mut _binding_0) => {
-            _visitor.visit_type_ptr_mut(_binding_0);
-        }
-        Type::Reference(ref mut _binding_0) => {
-            _visitor.visit_type_reference_mut(_binding_0);
-        }
-        Type::BareFn(ref mut _binding_0) => {
-            _visitor.visit_type_bare_fn_mut(_binding_0);
-        }
-        Type::Never(ref mut _binding_0) => {
-            _visitor.visit_type_never_mut(_binding_0);
-        }
-        Type::Tuple(ref mut _binding_0) => {
-            _visitor.visit_type_tuple_mut(_binding_0);
-        }
-        Type::Path(ref mut _binding_0) => {
-            _visitor.visit_type_path_mut(_binding_0);
-        }
-        Type::TraitObject(ref mut _binding_0) => {
-            _visitor.visit_type_trait_object_mut(_binding_0);
-        }
-        Type::ImplTrait(ref mut _binding_0) => {
-            _visitor.visit_type_impl_trait_mut(_binding_0);
-        }
-        Type::Paren(ref mut _binding_0) => {
-            _visitor.visit_type_paren_mut(_binding_0);
-        }
-        Type::Group(ref mut _binding_0) => {
-            _visitor.visit_type_group_mut(_binding_0);
-        }
-        Type::Infer(ref mut _binding_0) => {
-            _visitor.visit_type_infer_mut(_binding_0);
-        }
-        Type::Macro(ref mut _binding_0) => {
-            _visitor.visit_type_macro_mut(_binding_0);
-        }
-        Type::Verbatim(ref mut _binding_0) => {
-            _visitor.visit_type_verbatim_mut(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_array_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeArray) {
-    tokens_helper(_visitor, &mut (_i.bracket_token).0);
-    _visitor.visit_type_mut(&mut *_i.elem);
-    tokens_helper(_visitor, &mut (_i.semi_token).0);
-    _visitor.visit_expr_mut(&mut _i.len);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_bare_fn_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeBareFn) {
-    if let Some(ref mut it) = _i.unsafety {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.abi {
-        _visitor.visit_abi_mut(it)
-    };
-    tokens_helper(_visitor, &mut (_i.fn_token).0);
-    if let Some(ref mut it) = _i.lifetimes {
-        _visitor.visit_bound_lifetimes_mut(it)
-    };
-    tokens_helper(_visitor, &mut (_i.paren_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.inputs) {
-        let it = el.value_mut();
-        _visitor.visit_bare_fn_arg_mut(it)
-    }
-    if let Some(ref mut it) = _i.variadic {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_return_type_mut(&mut _i.output);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_group_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeGroup) {
-    tokens_helper(_visitor, &mut (_i.group_token).0);
-    _visitor.visit_type_mut(&mut *_i.elem);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_impl_trait_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeImplTrait) {
-    tokens_helper(_visitor, &mut (_i.impl_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.bounds) {
-        let it = el.value_mut();
-        _visitor.visit_type_param_bound_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_infer_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeInfer) {
-    tokens_helper(_visitor, &mut (_i.underscore_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_macro_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeMacro) {
-    _visitor.visit_macro_mut(&mut _i.mac);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_never_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeNever) {
-    tokens_helper(_visitor, &mut (_i.bang_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_param_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeParam) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_ident_mut(&mut _i.ident);
-    if let Some(ref mut it) = _i.colon_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    for mut el in Punctuated::pairs_mut(&mut _i.bounds) {
-        let it = el.value_mut();
-        _visitor.visit_type_param_bound_mut(it)
-    }
-    if let Some(ref mut it) = _i.eq_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.default {
-        _visitor.visit_type_mut(it)
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_param_bound_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeParamBound) {
-    match *_i {
-        TypeParamBound::Trait(ref mut _binding_0) => {
-            _visitor.visit_trait_bound_mut(_binding_0);
-        }
-        TypeParamBound::Lifetime(ref mut _binding_0) => {
-            _visitor.visit_lifetime_mut(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_paren_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeParen) {
-    tokens_helper(_visitor, &mut (_i.paren_token).0);
-    _visitor.visit_type_mut(&mut *_i.elem);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_path_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypePath) {
-    if let Some(ref mut it) = _i.qself {
-        _visitor.visit_qself_mut(it)
-    };
-    _visitor.visit_path_mut(&mut _i.path);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_ptr_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypePtr) {
-    tokens_helper(_visitor, &mut (_i.star_token).0);
-    if let Some(ref mut it) = _i.const_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    if let Some(ref mut it) = _i.mutability {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_type_mut(&mut *_i.elem);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_reference_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeReference) {
-    tokens_helper(_visitor, &mut (_i.and_token).0);
-    if let Some(ref mut it) = _i.lifetime {
-        _visitor.visit_lifetime_mut(it)
-    };
-    if let Some(ref mut it) = _i.mutability {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_type_mut(&mut *_i.elem);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_slice_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeSlice) {
-    tokens_helper(_visitor, &mut (_i.bracket_token).0);
-    _visitor.visit_type_mut(&mut *_i.elem);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_trait_object_mut<V: VisitMut + ?Sized>(
-    _visitor: &mut V,
-    _i: &mut TypeTraitObject,
-) {
-    if let Some(ref mut it) = _i.dyn_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    for mut el in Punctuated::pairs_mut(&mut _i.bounds) {
-        let it = el.value_mut();
-        _visitor.visit_type_param_bound_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_tuple_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeTuple) {
-    tokens_helper(_visitor, &mut (_i.paren_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.elems) {
-        let it = el.value_mut();
-        _visitor.visit_type_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_type_verbatim_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut TypeVerbatim) {
-    // Skipped field _i . tts;
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_un_op_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut UnOp) {
-    match *_i {
-        UnOp::Deref(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        UnOp::Not(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-        UnOp::Neg(ref mut _binding_0) => {
-            tokens_helper(_visitor, &mut (_binding_0).0);
-        }
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_use_glob_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut UseGlob) {
-    tokens_helper(_visitor, &mut (_i.star_token).0);
-}
-#[cfg(feature = "full")]
-pub fn visit_use_group_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut UseGroup) {
-    tokens_helper(_visitor, &mut (_i.brace_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.items) {
-        let it = el.value_mut();
-        _visitor.visit_use_tree_mut(it)
-    }
-}
-#[cfg(feature = "full")]
-pub fn visit_use_name_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut UseName) {
-    _visitor.visit_ident_mut(&mut _i.ident);
-}
-#[cfg(feature = "full")]
-pub fn visit_use_path_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut UsePath) {
-    _visitor.visit_ident_mut(&mut _i.ident);
-    tokens_helper(_visitor, &mut (_i.colon2_token).0);
-    _visitor.visit_use_tree_mut(&mut *_i.tree);
-}
-#[cfg(feature = "full")]
-pub fn visit_use_rename_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut UseRename) {
-    _visitor.visit_ident_mut(&mut _i.ident);
-    tokens_helper(_visitor, &mut (_i.as_token).0);
-    _visitor.visit_ident_mut(&mut _i.rename);
-}
-#[cfg(feature = "full")]
-pub fn visit_use_tree_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut UseTree) {
-    match *_i {
-        UseTree::Path(ref mut _binding_0) => {
-            _visitor.visit_use_path_mut(_binding_0);
-        }
-        UseTree::Name(ref mut _binding_0) => {
-            _visitor.visit_use_name_mut(_binding_0);
-        }
-        UseTree::Rename(ref mut _binding_0) => {
-            _visitor.visit_use_rename_mut(_binding_0);
-        }
-        UseTree::Glob(ref mut _binding_0) => {
-            _visitor.visit_use_glob_mut(_binding_0);
-        }
-        UseTree::Group(ref mut _binding_0) => {
-            _visitor.visit_use_group_mut(_binding_0);
-        }
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_variant_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Variant) {
-    for it in &mut _i.attrs {
-        _visitor.visit_attribute_mut(it)
-    }
-    _visitor.visit_ident_mut(&mut _i.ident);
-    _visitor.visit_fields_mut(&mut _i.fields);
-    if let Some(ref mut it) = _i.discriminant {
-        tokens_helper(_visitor, &mut ((it).0).0);
-        _visitor.visit_expr_mut(&mut (it).1);
-    };
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_vis_crate_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut VisCrate) {
-    tokens_helper(_visitor, &mut (_i.crate_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_vis_public_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut VisPublic) {
-    tokens_helper(_visitor, &mut (_i.pub_token).0);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_vis_restricted_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut VisRestricted) {
-    tokens_helper(_visitor, &mut (_i.pub_token).0);
-    tokens_helper(_visitor, &mut (_i.paren_token).0);
-    if let Some(ref mut it) = _i.in_token {
-        tokens_helper(_visitor, &mut (it).0)
-    };
-    _visitor.visit_path_mut(&mut *_i.path);
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_visibility_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut Visibility) {
-    match *_i {
-        Visibility::Public(ref mut _binding_0) => {
-            _visitor.visit_vis_public_mut(_binding_0);
-        }
-        Visibility::Crate(ref mut _binding_0) => {
-            _visitor.visit_vis_crate_mut(_binding_0);
-        }
-        Visibility::Restricted(ref mut _binding_0) => {
-            _visitor.visit_vis_restricted_mut(_binding_0);
-        }
-        Visibility::Inherited => {}
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_where_clause_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut WhereClause) {
-    tokens_helper(_visitor, &mut (_i.where_token).0);
-    for mut el in Punctuated::pairs_mut(&mut _i.predicates) {
-        let it = el.value_mut();
-        _visitor.visit_where_predicate_mut(it)
-    }
-}
-#[cfg(any(feature = "full", feature = "derive"))]
-pub fn visit_where_predicate_mut<V: VisitMut + ?Sized>(_visitor: &mut V, _i: &mut WherePredicate) {
-    match *_i {
-        WherePredicate::Type(ref mut _binding_0) => {
-            _visitor.visit_predicate_type_mut(_binding_0);
-        }
-        WherePredicate::Lifetime(ref mut _binding_0) => {
-            _visitor.visit_predicate_lifetime_mut(_binding_0);
-        }
-        WherePredicate::Eq(ref mut _binding_0) => {
-            _visitor.visit_predicate_eq_mut(_binding_0);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/gen_helper.rs b/third_party/rust/syn-0.14.6/src/gen_helper.rs
deleted file mode 100644
index fe00c8f78ecc..000000000000
--- a/third_party/rust/syn-0.14.6/src/gen_helper.rs
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[cfg(feature = "fold")]
-pub mod fold {
-    use fold::Fold;
-    use proc_macro2::Span;
-    use punctuated::{Pair, Punctuated};
-
-    pub trait FoldHelper {
-        type Item;
-        fn lift<F>(self, f: F) -> Self
-        where
-            F: FnMut(Self::Item) -> Self::Item;
-    }
-
-    impl<T> FoldHelper for Vec<T> {
-        type Item = T;
-        fn lift<F>(self, f: F) -> Self
-        where
-            F: FnMut(Self::Item) -> Self::Item,
-        {
-            self.into_iter().map(f).collect()
-        }
-    }
-
-    impl<T, U> FoldHelper for Punctuated<T, U> {
-        type Item = T;
-        fn lift<F>(self, mut f: F) -> Self
-        where
-            F: FnMut(Self::Item) -> Self::Item,
-        {
-            self.into_pairs()
-                .map(Pair::into_tuple)
-                .map(|(t, u)| Pair::new(f(t), u))
-                .collect()
-        }
-    }
-
-    pub fn tokens_helper<F: Fold + ?Sized, S: Spans>(folder: &mut F, spans: &S) -> S {
-        spans.fold(folder)
-    }
-
-    pub trait Spans {
-        fn fold<F: Fold + ?Sized>(&self, folder: &mut F) -> Self;
-    }
-
-    impl Spans for Span {
-        fn fold<F: Fold + ?Sized>(&self, folder: &mut F) -> Self {
-            folder.fold_span(*self)
-        }
-    }
-
-    impl Spans for [Span; 1] {
-        fn fold<F: Fold + ?Sized>(&self, folder: &mut F) -> Self {
-            [folder.fold_span(self[0])]
-        }
-    }
-
-    impl Spans for [Span; 2] {
-        fn fold<F: Fold + ?Sized>(&self, folder: &mut F) -> Self {
-            [folder.fold_span(self[0]), folder.fold_span(self[1])]
-        }
-    }
-
-    impl Spans for [Span; 3] {
-        fn fold<F: Fold + ?Sized>(&self, folder: &mut F) -> Self {
-            [
-                folder.fold_span(self[0]),
-                folder.fold_span(self[1]),
-                folder.fold_span(self[2]),
-            ]
-        }
-    }
-}
-
-#[cfg(feature = "visit")]
-pub mod visit {
-    use proc_macro2::Span;
-    use visit::Visit;
-
-    pub fn tokens_helper<'ast, V: Visit<'ast> + ?Sized, S: Spans>(visitor: &mut V, spans: &'ast S) {
-        spans.visit(visitor);
-    }
-
-    pub trait Spans {
-        fn visit<'ast, V: Visit<'ast> + ?Sized>(&'ast self, visitor: &mut V);
-    }
-
-    impl Spans for Span {
-        fn visit<'ast, V: Visit<'ast> + ?Sized>(&'ast self, visitor: &mut V) {
-            visitor.visit_span(self);
-        }
-    }
-
-    impl Spans for [Span; 1] {
-        fn visit<'ast, V: Visit<'ast> + ?Sized>(&'ast self, visitor: &mut V) {
-            visitor.visit_span(&self[0]);
-        }
-    }
-
-    impl Spans for [Span; 2] {
-        fn visit<'ast, V: Visit<'ast> + ?Sized>(&'ast self, visitor: &mut V) {
-            visitor.visit_span(&self[0]);
-            visitor.visit_span(&self[1]);
-        }
-    }
-
-    impl Spans for [Span; 3] {
-        fn visit<'ast, V: Visit<'ast> + ?Sized>(&'ast self, visitor: &mut V) {
-            visitor.visit_span(&self[0]);
-            visitor.visit_span(&self[1]);
-            visitor.visit_span(&self[2]);
-        }
-    }
-}
-
-#[cfg(feature = "visit-mut")]
-pub mod visit_mut {
-    use proc_macro2::Span;
-    use visit_mut::VisitMut;
-
-    pub fn tokens_helper<V: VisitMut + ?Sized, S: Spans>(visitor: &mut V, spans: &mut S) {
-        spans.visit_mut(visitor);
-    }
-
-    pub trait Spans {
-        fn visit_mut<V: VisitMut + ?Sized>(&mut self, visitor: &mut V);
-    }
-
-    impl Spans for Span {
-        fn visit_mut<V: VisitMut + ?Sized>(&mut self, visitor: &mut V) {
-            visitor.visit_span_mut(self);
-        }
-    }
-
-    impl Spans for [Span; 1] {
-        fn visit_mut<V: VisitMut + ?Sized>(&mut self, visitor: &mut V) {
-            visitor.visit_span_mut(&mut self[0]);
-        }
-    }
-
-    impl Spans for [Span; 2] {
-        fn visit_mut<V: VisitMut + ?Sized>(&mut self, visitor: &mut V) {
-            visitor.visit_span_mut(&mut self[0]);
-            visitor.visit_span_mut(&mut self[1]);
-        }
-    }
-
-    impl Spans for [Span; 3] {
-        fn visit_mut<V: VisitMut + ?Sized>(&mut self, visitor: &mut V) {
-            visitor.visit_span_mut(&mut self[0]);
-            visitor.visit_span_mut(&mut self[1]);
-            visitor.visit_span_mut(&mut self[2]);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/generics.rs b/third_party/rust/syn-0.14.6/src/generics.rs
deleted file mode 100644
index d1f4fa22e03f..000000000000
--- a/third_party/rust/syn-0.14.6/src/generics.rs
+++ /dev/null
@@ -1,1015 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use punctuated::{Iter, IterMut, Punctuated};
-
-ast_struct! {
-    /// Lifetimes and type parameters attached to a declaration of a function,
-    /// enum, trait, etc.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    #[derive(Default)]
-    pub struct Generics {
-        pub lt_token: Option<Token![<]>,
-        pub params: Punctuated<GenericParam, Token![,]>,
-        pub gt_token: Option<Token![>]>,
-        pub where_clause: Option<WhereClause>,
-    }
-}
-
-ast_enum_of_structs! {
-    /// A generic type parameter, lifetime, or const generic: `T: Into<String>`,
-    /// `'a: 'b`, `const LEN: usize`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum GenericParam {
-        /// A generic type parameter: `T: Into<String>`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Type(TypeParam {
-            pub attrs: Vec<Attribute>,
-            pub ident: Ident,
-            pub colon_token: Option<Token![:]>,
-            pub bounds: Punctuated<TypeParamBound, Token![+]>,
-            pub eq_token: Option<Token![=]>,
-            pub default: Option<Type>,
-        }),
-
-        /// A lifetime definition: `'a: 'b + 'c + 'd`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Lifetime(LifetimeDef {
-            pub attrs: Vec<Attribute>,
-            pub lifetime: Lifetime,
-            pub colon_token: Option<Token![:]>,
-            pub bounds: Punctuated<Lifetime, Token![+]>,
-        }),
-
-        /// A const generic parameter: `const LENGTH: usize`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Const(ConstParam {
-            pub attrs: Vec<Attribute>,
-            pub const_token: Token![const],
-            pub ident: Ident,
-            pub colon_token: Token![:],
-            pub ty: Type,
-            pub eq_token: Option<Token![=]>,
-            pub default: Option<Expr>,
-        }),
-    }
-}
-
-impl Generics {
-    /// Returns an
-    /// <code
-    ///   style="padding-right:0;">Iterator&lt;Item = &amp;</code><a
-    ///   href="struct.TypeParam.html"><code
-    ///   style="padding-left:0;padding-right:0;">TypeParam</code></a><code
-    ///   style="padding-left:0;">&gt;</code>
-    /// over the type parameters in `self.params`.
-    pub fn type_params(&self) -> TypeParams {
-        TypeParams(self.params.iter())
-    }
-
-    /// Returns an
-    /// <code
-    ///   style="padding-right:0;">Iterator&lt;Item = &amp;mut </code><a
-    ///   href="struct.TypeParam.html"><code
-    ///   style="padding-left:0;padding-right:0;">TypeParam</code></a><code
-    ///   style="padding-left:0;">&gt;</code>
-    /// over the type parameters in `self.params`.
-    pub fn type_params_mut(&mut self) -> TypeParamsMut {
-        TypeParamsMut(self.params.iter_mut())
-    }
-
-    /// Returns an
-    /// <code
-    ///   style="padding-right:0;">Iterator&lt;Item = &amp;</code><a
-    ///   href="struct.LifetimeDef.html"><code
-    ///   style="padding-left:0;padding-right:0;">LifetimeDef</code></a><code
-    ///   style="padding-left:0;">&gt;</code>
-    /// over the lifetime parameters in `self.params`.
-    pub fn lifetimes(&self) -> Lifetimes {
-        Lifetimes(self.params.iter())
-    }
-
-    /// Returns an
-    /// <code
-    ///   style="padding-right:0;">Iterator&lt;Item = &amp;mut </code><a
-    ///   href="struct.LifetimeDef.html"><code
-    ///   style="padding-left:0;padding-right:0;">LifetimeDef</code></a><code
-    ///   style="padding-left:0;">&gt;</code>
-    /// over the lifetime parameters in `self.params`.
-    pub fn lifetimes_mut(&mut self) -> LifetimesMut {
-        LifetimesMut(self.params.iter_mut())
-    }
-
-    /// Returns an
-    /// <code
-    ///   style="padding-right:0;">Iterator&lt;Item = &amp;</code><a
-    ///   href="struct.ConstParam.html"><code
-    ///   style="padding-left:0;padding-right:0;">ConstParam</code></a><code
-    ///   style="padding-left:0;">&gt;</code>
-    /// over the constant parameters in `self.params`.
-    pub fn const_params(&self) -> ConstParams {
-        ConstParams(self.params.iter())
-    }
-
-    /// Returns an
-    /// <code
-    ///   style="padding-right:0;">Iterator&lt;Item = &amp;mut </code><a
-    ///   href="struct.ConstParam.html"><code
-    ///   style="padding-left:0;padding-right:0;">ConstParam</code></a><code
-    ///   style="padding-left:0;">&gt;</code>
-    /// over the constant parameters in `self.params`.
-    pub fn const_params_mut(&mut self) -> ConstParamsMut {
-        ConstParamsMut(self.params.iter_mut())
-    }
-
-    /// Initializes an empty `where`-clause if there is not one present already.
-    pub fn make_where_clause(&mut self) -> &mut WhereClause {
-        // This is Option::get_or_insert_with in Rust 1.20.
-        if self.where_clause.is_none() {
-            self.where_clause = Some(WhereClause {
-                where_token: <Token![where]>::default(),
-                predicates: Punctuated::new(),
-            });
-        }
-        match self.where_clause {
-            Some(ref mut where_clause) => where_clause,
-            None => unreachable!(),
-        }
-    }
-}
-
-pub struct TypeParams<'a>(Iter<'a, GenericParam>);
-
-impl<'a> Iterator for TypeParams<'a> {
-    type Item = &'a TypeParam;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // FIXME: Remove this when ? on Option is stable
-        let next = match self.0.next() {
-            Some(item) => item,
-            None => return None,
-        };
-        if let GenericParam::Type(ref type_param) = *next {
-            Some(type_param)
-        } else {
-            self.next()
-        }
-    }
-}
-
-pub struct TypeParamsMut<'a>(IterMut<'a, GenericParam>);
-
-impl<'a> Iterator for TypeParamsMut<'a> {
-    type Item = &'a mut TypeParam;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // FIXME: Remove this when ? on Option is stable
-        let next = match self.0.next() {
-            Some(item) => item,
-            None => return None,
-        };
-        if let GenericParam::Type(ref mut type_param) = *next {
-            Some(type_param)
-        } else {
-            self.next()
-        }
-    }
-}
-
-pub struct Lifetimes<'a>(Iter<'a, GenericParam>);
-
-impl<'a> Iterator for Lifetimes<'a> {
-    type Item = &'a LifetimeDef;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // FIXME: Remove this when ? on Option is stable
-        let next = match self.0.next() {
-            Some(item) => item,
-            None => return None,
-        };
-        if let GenericParam::Lifetime(ref lifetime) = *next {
-            Some(lifetime)
-        } else {
-            self.next()
-        }
-    }
-}
-
-pub struct LifetimesMut<'a>(IterMut<'a, GenericParam>);
-
-impl<'a> Iterator for LifetimesMut<'a> {
-    type Item = &'a mut LifetimeDef;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // FIXME: Remove this when ? on Option is stable
-        let next = match self.0.next() {
-            Some(item) => item,
-            None => return None,
-        };
-        if let GenericParam::Lifetime(ref mut lifetime) = *next {
-            Some(lifetime)
-        } else {
-            self.next()
-        }
-    }
-}
-
-pub struct ConstParams<'a>(Iter<'a, GenericParam>);
-
-impl<'a> Iterator for ConstParams<'a> {
-    type Item = &'a ConstParam;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // FIXME: Remove this when ? on Option is stable
-        let next = match self.0.next() {
-            Some(item) => item,
-            None => return None,
-        };
-        if let GenericParam::Const(ref const_param) = *next {
-            Some(const_param)
-        } else {
-            self.next()
-        }
-    }
-}
-
-pub struct ConstParamsMut<'a>(IterMut<'a, GenericParam>);
-
-impl<'a> Iterator for ConstParamsMut<'a> {
-    type Item = &'a mut ConstParam;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // FIXME: Remove this when ? on Option is stable
-        let next = match self.0.next() {
-            Some(item) => item,
-            None => return None,
-        };
-        if let GenericParam::Const(ref mut const_param) = *next {
-            Some(const_param)
-        } else {
-            self.next()
-        }
-    }
-}
-
-/// Returned by `Generics::split_for_impl`.
-///
-/// *This type is available if Syn is built with the `"derive"` or `"full"`
-/// feature and the `"printing"` feature.*
-#[cfg(feature = "printing")]
-#[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-#[cfg_attr(feature = "clone-impls", derive(Clone))]
-pub struct ImplGenerics<'a>(&'a Generics);
-
-/// Returned by `Generics::split_for_impl`.
-///
-/// *This type is available if Syn is built with the `"derive"` or `"full"`
-/// feature and the `"printing"` feature.*
-#[cfg(feature = "printing")]
-#[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-#[cfg_attr(feature = "clone-impls", derive(Clone))]
-pub struct TypeGenerics<'a>(&'a Generics);
-
-/// Returned by `TypeGenerics::as_turbofish`.
-///
-/// *This type is available if Syn is built with the `"derive"` or `"full"`
-/// feature and the `"printing"` feature.*
-#[cfg(feature = "printing")]
-#[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-#[cfg_attr(feature = "clone-impls", derive(Clone))]
-pub struct Turbofish<'a>(&'a Generics);
-
-#[cfg(feature = "printing")]
-impl Generics {
-    /// Split a type's generics into the pieces required for impl'ing a trait
-    /// for that type.
-    ///
-    /// ```
-    /// # extern crate proc_macro2;
-    /// # extern crate syn;
-    /// # #[macro_use]
-    /// # extern crate quote;
-    /// # use proc_macro2::{Span, Ident};
-    /// # fn main() {
-    /// # let generics: syn::Generics = Default::default();
-    /// # let name = Ident::new("MyType", Span::call_site());
-    /// let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
-    /// quote! {
-    ///     impl #impl_generics MyTrait for #name #ty_generics #where_clause {
-    ///         // ...
-    ///     }
-    /// }
-    /// # ;
-    /// # }
-    /// ```
-    ///
-    /// *This method is available if Syn is built with the `"derive"` or
-    /// `"full"` feature and the `"printing"` feature.*
-    pub fn split_for_impl(&self) -> (ImplGenerics, TypeGenerics, Option<&WhereClause>) {
-        (
-            ImplGenerics(self),
-            TypeGenerics(self),
-            self.where_clause.as_ref(),
-        )
-    }
-}
-
-#[cfg(feature = "printing")]
-impl<'a> TypeGenerics<'a> {
-    /// Turn a type's generics like `<X, Y>` into a turbofish like `::<X, Y>`.
-    ///
-    /// *This method is available if Syn is built with the `"derive"` or
-    /// `"full"` feature and the `"printing"` feature.*
-    pub fn as_turbofish(&self) -> Turbofish {
-        Turbofish(self.0)
-    }
-}
-
-ast_struct! {
-    /// A set of bound lifetimes: `for<'a, 'b, 'c>`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    #[derive(Default)]
-    pub struct BoundLifetimes {
-        pub for_token: Token![for],
-        pub lt_token: Token![<],
-        pub lifetimes: Punctuated<LifetimeDef, Token![,]>,
-        pub gt_token: Token![>],
-    }
-}
-
-impl LifetimeDef {
-    pub fn new(lifetime: Lifetime) -> Self {
-        LifetimeDef {
-            attrs: Vec::new(),
-            lifetime: lifetime,
-            colon_token: None,
-            bounds: Punctuated::new(),
-        }
-    }
-}
-
-impl From<Ident> for TypeParam {
-    fn from(ident: Ident) -> Self {
-        TypeParam {
-            attrs: vec![],
-            ident: ident,
-            colon_token: None,
-            bounds: Punctuated::new(),
-            eq_token: None,
-            default: None,
-        }
-    }
-}
-
-ast_enum_of_structs! {
-    /// A trait or lifetime used as a bound on a type parameter.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum TypeParamBound {
-        pub Trait(TraitBound),
-        pub Lifetime(Lifetime),
-    }
-}
-
-ast_struct! {
-    /// A trait used as a bound on a type parameter.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct TraitBound {
-        pub paren_token: Option<token::Paren>,
-        pub modifier: TraitBoundModifier,
-        /// The `for<'a>` in `for<'a> Foo<&'a T>`
-        pub lifetimes: Option<BoundLifetimes>,
-        /// The `Foo<&'a T>` in `for<'a> Foo<&'a T>`
-        pub path: Path,
-    }
-}
-
-ast_enum! {
-    /// A modifier on a trait bound, currently only used for the `?` in
-    /// `?Sized`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    #[cfg_attr(feature = "clone-impls", derive(Copy))]
-    pub enum TraitBoundModifier {
-        None,
-        Maybe(Token![?]),
-    }
-}
-
-ast_struct! {
-    /// A `where` clause in a definition: `where T: Deserialize<'de>, D:
-    /// 'static`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct WhereClause {
-        pub where_token: Token![where],
-        pub predicates: Punctuated<WherePredicate, Token![,]>,
-    }
-}
-
-ast_enum_of_structs! {
-    /// A single predicate in a `where` clause: `T: Deserialize<'de>`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum WherePredicate {
-        /// A type predicate in a `where` clause: `for<'c> Foo<'c>: Trait<'c>`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Type(PredicateType {
-            /// Any lifetimes from a `for` binding
-            pub lifetimes: Option<BoundLifetimes>,
-            /// The type being bounded
-            pub bounded_ty: Type,
-            pub colon_token: Token![:],
-            /// Trait and lifetime bounds (`Clone+Send+'static`)
-            pub bounds: Punctuated<TypeParamBound, Token![+]>,
-        }),
-
-        /// A lifetime predicate in a `where` clause: `'a: 'b + 'c`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Lifetime(PredicateLifetime {
-            pub lifetime: Lifetime,
-            pub colon_token: Option<Token![:]>,
-            pub bounds: Punctuated<Lifetime, Token![+]>,
-        }),
-
-        /// An equality predicate in a `where` clause (unsupported).
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Eq(PredicateEq {
-            pub lhs_ty: Type,
-            pub eq_token: Token![=],
-            pub rhs_ty: Type,
-        }),
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-
-    use punctuated::Pair;
-    use synom::Synom;
-
-    impl Synom for Generics {
-        named!(parse -> Self, map!(
-            alt!(
-                do_parse!(
-                    lt: punct!(<) >>
-                    lifetimes: call!(Punctuated::<LifetimeDef, Token![,]>::parse_terminated) >>
-                    ty_params: cond!(
-                        lifetimes.empty_or_trailing(),
-                        Punctuated::<TypeParam, Token![,]>::parse_terminated
-                    ) >>
-                    gt: punct!(>) >>
-                    (lifetimes, ty_params, Some(lt), Some(gt))
-                )
-                |
-                epsilon!() => { |_| (Punctuated::new(), None, None, None) }
-            ),
-            |(lifetimes, ty_params, lt, gt)| Generics {
-                lt_token: lt,
-                params: lifetimes.into_pairs()
-                    .map(Pair::into_tuple)
-                    .map(|(life, comma)| Pair::new(GenericParam::Lifetime(life), comma))
-                    .chain(ty_params.unwrap_or_default()
-                        .into_pairs()
-                        .map(Pair::into_tuple)
-                        .map(|(ty, comma)| Pair::new(GenericParam::Type(ty), comma)))
-                    .collect(),
-                gt_token: gt,
-                where_clause: None,
-            }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("generic parameters in declaration")
-        }
-    }
-
-    impl Synom for GenericParam {
-        named!(parse -> Self, alt!(
-            syn!(TypeParam) => { GenericParam::Type }
-            |
-            syn!(LifetimeDef) => { GenericParam::Lifetime }
-            |
-            syn!(ConstParam) => { GenericParam::Const }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("generic parameter")
-        }
-    }
-
-    impl Synom for LifetimeDef {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            life: syn!(Lifetime) >>
-            colon: option!(punct!(:)) >>
-            bounds: cond!(
-                colon.is_some(),
-                Punctuated::parse_separated_nonempty
-            ) >>
-            (LifetimeDef {
-                attrs: attrs,
-                lifetime: life,
-                bounds: bounds.unwrap_or_default(),
-                colon_token: colon,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("lifetime definition")
-        }
-    }
-
-    impl Synom for BoundLifetimes {
-        named!(parse -> Self, do_parse!(
-            for_: keyword!(for) >>
-            lt: punct!(<) >>
-            lifetimes: call!(Punctuated::parse_terminated) >>
-            gt: punct!(>) >>
-            (BoundLifetimes {
-                for_token: for_,
-                lt_token: lt,
-                gt_token: gt,
-                lifetimes: lifetimes,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("bound lifetimes")
-        }
-    }
-
-    impl Synom for TypeParam {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            id: syn!(Ident) >>
-            colon: option!(punct!(:)) >>
-            bounds: cond!(
-                colon.is_some(),
-                Punctuated::parse_separated_nonempty
-            ) >>
-            default: option!(do_parse!(
-                eq: punct!(=) >>
-                ty: syn!(Type) >>
-                (eq, ty)
-            )) >>
-            (TypeParam {
-                attrs: attrs,
-                ident: id,
-                bounds: bounds.unwrap_or_default(),
-                colon_token: colon,
-                eq_token: default.as_ref().map(|d| Token![=]((d.0).0)),
-                default: default.map(|d| d.1),
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("type parameter")
-        }
-    }
-
-    impl Synom for TypeParamBound {
-        named!(parse -> Self, alt!(
-            syn!(Lifetime) => { TypeParamBound::Lifetime }
-            |
-            syn!(TraitBound) => { TypeParamBound::Trait }
-            |
-            parens!(syn!(TraitBound)) => {|(parens, mut bound)| {
-                bound.paren_token = Some(parens);
-                TypeParamBound::Trait(bound)
-            }}
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("type parameter bound")
-        }
-    }
-
-    impl Synom for TraitBound {
-        named!(parse -> Self, do_parse!(
-            modifier: syn!(TraitBoundModifier) >>
-            lifetimes: option!(syn!(BoundLifetimes)) >>
-            mut path: syn!(Path) >>
-            parenthesized: option!(cond_reduce!(
-                path.segments.last().unwrap().value().arguments.is_empty(),
-                syn!(ParenthesizedGenericArguments)
-            )) >>
-            ({
-                if let Some(parenthesized) = parenthesized {
-                    let parenthesized = PathArguments::Parenthesized(parenthesized);
-                    path.segments.last_mut().unwrap().value_mut().arguments = parenthesized;
-                }
-                TraitBound {
-                    paren_token: None,
-                    modifier: modifier,
-                    lifetimes: lifetimes,
-                    path: path,
-                }
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("trait bound")
-        }
-    }
-
-    impl Synom for TraitBoundModifier {
-        named!(parse -> Self, alt!(
-            punct!(?) => { TraitBoundModifier::Maybe }
-            |
-            epsilon!() => { |_| TraitBoundModifier::None }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("trait bound modifier")
-        }
-    }
-
-    impl Synom for ConstParam {
-        named!(parse -> Self, do_parse!(
-            attrs: many0!(Attribute::parse_outer) >>
-            const_: keyword!(const) >>
-            ident: syn!(Ident) >>
-            colon: punct!(:) >>
-            ty: syn!(Type) >>
-            eq_def: option!(tuple!(punct!(=), syn!(Expr))) >>
-            ({
-                let (eq_token, default) = match eq_def {
-                    Some((eq_token, default)) => (Some(eq_token), Some(default)),
-                    None => (None, None),
-                };
-                ConstParam {
-                    attrs: attrs,
-                    const_token: const_,
-                    ident: ident,
-                    colon_token: colon,
-                    ty: ty,
-                    eq_token: eq_token,
-                    default: default,
-                }
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("generic `const` parameter")
-        }
-    }
-
-    impl Synom for WhereClause {
-        named!(parse -> Self, do_parse!(
-            where_: keyword!(where) >>
-            predicates: call!(Punctuated::parse_terminated) >>
-            (WhereClause {
-                predicates: predicates,
-                where_token: where_,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("where clause")
-        }
-    }
-
-    impl Synom for WherePredicate {
-        named!(parse -> Self, alt!(
-            do_parse!(
-                ident: syn!(Lifetime) >>
-                colon: option!(punct!(:)) >>
-                bounds: cond!(
-                    colon.is_some(),
-                    Punctuated::parse_separated
-                ) >>
-                (WherePredicate::Lifetime(PredicateLifetime {
-                    lifetime: ident,
-                    bounds: bounds.unwrap_or_default(),
-                    colon_token: colon,
-                }))
-            )
-            |
-            do_parse!(
-                lifetimes: option!(syn!(BoundLifetimes)) >>
-                bounded_ty: syn!(Type) >>
-                colon: punct!(:) >>
-                bounds: call!(Punctuated::parse_separated_nonempty) >>
-                (WherePredicate::Type(PredicateType {
-                    lifetimes: lifetimes,
-                    bounded_ty: bounded_ty,
-                    bounds: bounds,
-                    colon_token: colon,
-                }))
-            )
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("predicate in where clause")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use attr::FilterAttrs;
-    use proc_macro2::TokenStream;
-    use quote::{ToTokens, TokenStreamExt};
-
-    impl ToTokens for Generics {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            if self.params.is_empty() {
-                return;
-            }
-
-            TokensOrDefault(&self.lt_token).to_tokens(tokens);
-
-            // Print lifetimes before types and consts, regardless of their
-            // order in self.params.
-            //
-            // TODO: ordering rules for const parameters vs type parameters have
-            // not been settled yet. https://github.com/rust-lang/rust/issues/44580
-            let mut trailing_or_empty = true;
-            for param in self.params.pairs() {
-                if let GenericParam::Lifetime(_) = **param.value() {
-                    param.to_tokens(tokens);
-                    trailing_or_empty = param.punct().is_some();
-                }
-            }
-            for param in self.params.pairs() {
-                match **param.value() {
-                    GenericParam::Type(_) | GenericParam::Const(_) => {
-                        if !trailing_or_empty {
-                            <Token![,]>::default().to_tokens(tokens);
-                            trailing_or_empty = true;
-                        }
-                        param.to_tokens(tokens);
-                    }
-                    GenericParam::Lifetime(_) => {}
-                }
-            }
-
-            TokensOrDefault(&self.gt_token).to_tokens(tokens);
-        }
-    }
-
-    impl<'a> ToTokens for ImplGenerics<'a> {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            if self.0.params.is_empty() {
-                return;
-            }
-
-            TokensOrDefault(&self.0.lt_token).to_tokens(tokens);
-
-            // Print lifetimes before types and consts, regardless of their
-            // order in self.params.
-            //
-            // TODO: ordering rules for const parameters vs type parameters have
-            // not been settled yet. https://github.com/rust-lang/rust/issues/44580
-            let mut trailing_or_empty = true;
-            for param in self.0.params.pairs() {
-                if let GenericParam::Lifetime(_) = **param.value() {
-                    param.to_tokens(tokens);
-                    trailing_or_empty = param.punct().is_some();
-                }
-            }
-            for param in self.0.params.pairs() {
-                if let GenericParam::Lifetime(_) = **param.value() {
-                    continue;
-                }
-                if !trailing_or_empty {
-                    <Token![,]>::default().to_tokens(tokens);
-                    trailing_or_empty = true;
-                }
-                match **param.value() {
-                    GenericParam::Lifetime(_) => unreachable!(),
-                    GenericParam::Type(ref param) => {
-                        // Leave off the type parameter defaults
-                        tokens.append_all(param.attrs.outer());
-                        param.ident.to_tokens(tokens);
-                        if !param.bounds.is_empty() {
-                            TokensOrDefault(&param.colon_token).to_tokens(tokens);
-                            param.bounds.to_tokens(tokens);
-                        }
-                    }
-                    GenericParam::Const(ref param) => {
-                        // Leave off the const parameter defaults
-                        tokens.append_all(param.attrs.outer());
-                        param.const_token.to_tokens(tokens);
-                        param.ident.to_tokens(tokens);
-                        param.colon_token.to_tokens(tokens);
-                        param.ty.to_tokens(tokens);
-                    }
-                }
-                param.punct().to_tokens(tokens);
-            }
-
-            TokensOrDefault(&self.0.gt_token).to_tokens(tokens);
-        }
-    }
-
-    impl<'a> ToTokens for TypeGenerics<'a> {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            if self.0.params.is_empty() {
-                return;
-            }
-
-            TokensOrDefault(&self.0.lt_token).to_tokens(tokens);
-
-            // Print lifetimes before types and consts, regardless of their
-            // order in self.params.
-            //
-            // TODO: ordering rules for const parameters vs type parameters have
-            // not been settled yet. https://github.com/rust-lang/rust/issues/44580
-            let mut trailing_or_empty = true;
-            for param in self.0.params.pairs() {
-                if let GenericParam::Lifetime(ref def) = **param.value() {
-                    // Leave off the lifetime bounds and attributes
-                    def.lifetime.to_tokens(tokens);
-                    param.punct().to_tokens(tokens);
-                    trailing_or_empty = param.punct().is_some();
-                }
-            }
-            for param in self.0.params.pairs() {
-                if let GenericParam::Lifetime(_) = **param.value() {
-                    continue;
-                }
-                if !trailing_or_empty {
-                    <Token![,]>::default().to_tokens(tokens);
-                    trailing_or_empty = true;
-                }
-                match **param.value() {
-                    GenericParam::Lifetime(_) => unreachable!(),
-                    GenericParam::Type(ref param) => {
-                        // Leave off the type parameter defaults
-                        param.ident.to_tokens(tokens);
-                    }
-                    GenericParam::Const(ref param) => {
-                        // Leave off the const parameter defaults
-                        param.ident.to_tokens(tokens);
-                    }
-                }
-                param.punct().to_tokens(tokens);
-            }
-
-            TokensOrDefault(&self.0.gt_token).to_tokens(tokens);
-        }
-    }
-
-    impl<'a> ToTokens for Turbofish<'a> {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            if !self.0.params.is_empty() {
-                <Token![::]>::default().to_tokens(tokens);
-                TypeGenerics(self.0).to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for BoundLifetimes {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.for_token.to_tokens(tokens);
-            self.lt_token.to_tokens(tokens);
-            self.lifetimes.to_tokens(tokens);
-            self.gt_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for LifetimeDef {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.lifetime.to_tokens(tokens);
-            if !self.bounds.is_empty() {
-                TokensOrDefault(&self.colon_token).to_tokens(tokens);
-                self.bounds.to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for TypeParam {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.ident.to_tokens(tokens);
-            if !self.bounds.is_empty() {
-                TokensOrDefault(&self.colon_token).to_tokens(tokens);
-                self.bounds.to_tokens(tokens);
-            }
-            if self.default.is_some() {
-                TokensOrDefault(&self.eq_token).to_tokens(tokens);
-                self.default.to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for TraitBound {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            let to_tokens = |tokens: &mut TokenStream| {
-                self.modifier.to_tokens(tokens);
-                self.lifetimes.to_tokens(tokens);
-                self.path.to_tokens(tokens);
-            };
-            match self.paren_token {
-                Some(ref paren) => paren.surround(tokens, to_tokens),
-                None => to_tokens(tokens),
-            }
-        }
-    }
-
-    impl ToTokens for TraitBoundModifier {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            match *self {
-                TraitBoundModifier::None => {}
-                TraitBoundModifier::Maybe(ref t) => t.to_tokens(tokens),
-            }
-        }
-    }
-
-    impl ToTokens for ConstParam {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.const_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            if self.default.is_some() {
-                TokensOrDefault(&self.eq_token).to_tokens(tokens);
-                self.default.to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for WhereClause {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            if !self.predicates.is_empty() {
-                self.where_token.to_tokens(tokens);
-                self.predicates.to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for PredicateType {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.lifetimes.to_tokens(tokens);
-            self.bounded_ty.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.bounds.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for PredicateLifetime {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.lifetime.to_tokens(tokens);
-            if !self.bounds.is_empty() {
-                TokensOrDefault(&self.colon_token).to_tokens(tokens);
-                self.bounds.to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for PredicateEq {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.lhs_ty.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.rhs_ty.to_tokens(tokens);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/item.rs b/third_party/rust/syn-0.14.6/src/item.rs
deleted file mode 100644
index b4c49f68a0ef..000000000000
--- a/third_party/rust/syn-0.14.6/src/item.rs
+++ /dev/null
@@ -1,2118 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use derive::{Data, DeriveInput};
-use proc_macro2::TokenStream;
-use punctuated::Punctuated;
-use token::{Brace, Paren};
-
-#[cfg(feature = "extra-traits")]
-use std::hash::{Hash, Hasher};
-#[cfg(feature = "extra-traits")]
-use tt::TokenStreamHelper;
-
-ast_enum_of_structs! {
-    /// Things that can appear directly inside of a module or scope.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum Item {
-        /// An `extern crate` item: `extern crate serde`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub ExternCrate(ItemExternCrate {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub extern_token: Token![extern],
-            pub crate_token: Token![crate],
-            pub ident: Ident,
-            pub rename: Option<(Token![as], Ident)>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A use declaration: `use std::collections::HashMap`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Use(ItemUse {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub use_token: Token![use],
-            pub leading_colon: Option<Token![::]>,
-            pub tree: UseTree,
-            pub semi_token: Token![;],
-        }),
-
-        /// A static item: `static BIKE: Shed = Shed(42)`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Static(ItemStatic {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub static_token: Token![static],
-            pub mutability: Option<Token![mut]>,
-            pub ident: Ident,
-            pub colon_token: Token![:],
-            pub ty: Box<Type>,
-            pub eq_token: Token![=],
-            pub expr: Box<Expr>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A constant item: `const MAX: u16 = 65535`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Const(ItemConst {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub const_token: Token![const],
-            pub ident: Ident,
-            pub colon_token: Token![:],
-            pub ty: Box<Type>,
-            pub eq_token: Token![=],
-            pub expr: Box<Expr>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A free-standing function: `fn process(n: usize) -> Result<()> { ...
-        /// }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Fn(ItemFn {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub constness: Option<Token![const]>,
-            pub unsafety: Option<Token![unsafe]>,
-            pub abi: Option<Abi>,
-            pub ident: Ident,
-            pub decl: Box<FnDecl>,
-            pub block: Box<Block>,
-        }),
-
-        /// A module or module declaration: `mod m` or `mod m { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Mod(ItemMod {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub mod_token: Token![mod],
-            pub ident: Ident,
-            pub content: Option<(token::Brace, Vec<Item>)>,
-            pub semi: Option<Token![;]>,
-        }),
-
-        /// A block of foreign items: `extern "C" { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub ForeignMod(ItemForeignMod {
-            pub attrs: Vec<Attribute>,
-            pub abi: Abi,
-            pub brace_token: token::Brace,
-            pub items: Vec<ForeignItem>,
-        }),
-
-        /// A type alias: `type Result<T> = std::result::Result<T, MyError>`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Type(ItemType {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub type_token: Token![type],
-            pub ident: Ident,
-            pub generics: Generics,
-            pub eq_token: Token![=],
-            pub ty: Box<Type>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A struct definition: `struct Foo<A> { x: A }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Struct(ItemStruct {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub struct_token: Token![struct],
-            pub ident: Ident,
-            pub generics: Generics,
-            pub fields: Fields,
-            pub semi_token: Option<Token![;]>,
-        }),
-
-        /// An enum definition: `enum Foo<A, B> { C<A>, D<B> }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Enum(ItemEnum {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub enum_token: Token![enum],
-            pub ident: Ident,
-            pub generics: Generics,
-            pub brace_token: token::Brace,
-            pub variants: Punctuated<Variant, Token![,]>,
-        }),
-
-        /// A union definition: `union Foo<A, B> { x: A, y: B }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Union(ItemUnion {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub union_token: Token![union],
-            pub ident: Ident,
-            pub generics: Generics,
-            pub fields: FieldsNamed,
-        }),
-
-        /// A trait definition: `pub trait Iterator { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Trait(ItemTrait {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub unsafety: Option<Token![unsafe]>,
-            pub auto_token: Option<Token![auto]>,
-            pub trait_token: Token![trait],
-            pub ident: Ident,
-            pub generics: Generics,
-            pub colon_token: Option<Token![:]>,
-            pub supertraits: Punctuated<TypeParamBound, Token![+]>,
-            pub brace_token: token::Brace,
-            pub items: Vec<TraitItem>,
-        }),
-
-        /// An impl block providing trait or associated items: `impl<A> Trait
-        /// for Data<A> { ... }`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Impl(ItemImpl {
-            pub attrs: Vec<Attribute>,
-            pub defaultness: Option<Token![default]>,
-            pub unsafety: Option<Token![unsafe]>,
-            pub impl_token: Token![impl],
-            pub generics: Generics,
-            /// Trait this impl implements.
-            pub trait_: Option<(Option<Token![!]>, Path, Token![for])>,
-            /// The Self type of the impl.
-            pub self_ty: Box<Type>,
-            pub brace_token: token::Brace,
-            pub items: Vec<ImplItem>,
-        }),
-
-        /// A macro invocation, which includes `macro_rules!` definitions.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Macro(ItemMacro {
-            pub attrs: Vec<Attribute>,
-            /// The `example` in `macro_rules! example { ... }`.
-            pub ident: Option<Ident>,
-            pub mac: Macro,
-            pub semi_token: Option<Token![;]>,
-        }),
-
-        /// A 2.0-style declarative macro introduced by the `macro` keyword.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Macro2(ItemMacro2 #manual_extra_traits {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub macro_token: Token![macro],
-            pub ident: Ident,
-            pub paren_token: Paren,
-            pub args: TokenStream,
-            pub brace_token: Brace,
-            pub body: TokenStream,
-        }),
-
-        /// Tokens forming an item not interpreted by Syn.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Verbatim(ItemVerbatim #manual_extra_traits {
-            pub tts: TokenStream,
-        }),
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for ItemMacro2 {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for ItemMacro2 {
-    fn eq(&self, other: &Self) -> bool {
-        self.attrs == other.attrs
-            && self.vis == other.vis
-            && self.macro_token == other.macro_token
-            && self.ident == other.ident
-            && self.paren_token == other.paren_token
-            && TokenStreamHelper(&self.args) == TokenStreamHelper(&other.args)
-            && self.brace_token == other.brace_token
-            && TokenStreamHelper(&self.body) == TokenStreamHelper(&other.body)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for ItemMacro2 {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        self.attrs.hash(state);
-        self.vis.hash(state);
-        self.macro_token.hash(state);
-        self.ident.hash(state);
-        self.paren_token.hash(state);
-        TokenStreamHelper(&self.args).hash(state);
-        self.brace_token.hash(state);
-        TokenStreamHelper(&self.body).hash(state);
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for ItemVerbatim {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for ItemVerbatim {
-    fn eq(&self, other: &Self) -> bool {
-        TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for ItemVerbatim {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-impl From<DeriveInput> for Item {
-    fn from(input: DeriveInput) -> Item {
-        match input.data {
-            Data::Struct(data) => Item::Struct(ItemStruct {
-                attrs: input.attrs,
-                vis: input.vis,
-                struct_token: data.struct_token,
-                ident: input.ident,
-                generics: input.generics,
-                fields: data.fields,
-                semi_token: data.semi_token,
-            }),
-            Data::Enum(data) => Item::Enum(ItemEnum {
-                attrs: input.attrs,
-                vis: input.vis,
-                enum_token: data.enum_token,
-                ident: input.ident,
-                generics: input.generics,
-                brace_token: data.brace_token,
-                variants: data.variants,
-            }),
-            Data::Union(data) => Item::Union(ItemUnion {
-                attrs: input.attrs,
-                vis: input.vis,
-                union_token: data.union_token,
-                ident: input.ident,
-                generics: input.generics,
-                fields: data.fields,
-            }),
-        }
-    }
-}
-
-ast_enum_of_structs! {
-    /// A suffix of an import tree in a `use` item: `Type as Renamed` or `*`.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum UseTree {
-        /// A path prefix of imports in a `use` item: `std::...`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Path(UsePath {
-            pub ident: Ident,
-            pub colon2_token: Token![::],
-            pub tree: Box<UseTree>,
-        }),
-
-        /// An identifier imported by a `use` item: `HashMap`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Name(UseName {
-            pub ident: Ident,
-        }),
-
-        /// An renamed identifier imported by a `use` item: `HashMap as Map`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Rename(UseRename {
-            pub ident: Ident,
-            pub as_token: Token![as],
-            pub rename: Ident,
-        }),
-
-        /// A glob import in a `use` item: `*`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Glob(UseGlob {
-            pub star_token: Token![*],
-        }),
-
-        /// A braced group of imports in a `use` item: `{A, B, C}`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Group(UseGroup {
-            pub brace_token: token::Brace,
-            pub items: Punctuated<UseTree, Token![,]>,
-        }),
-    }
-}
-
-ast_enum_of_structs! {
-    /// An item within an `extern` block.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum ForeignItem {
-        /// A foreign function in an `extern` block.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Fn(ForeignItemFn {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub ident: Ident,
-            pub decl: Box<FnDecl>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A foreign static item in an `extern` block: `static ext: u8`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Static(ForeignItemStatic {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub static_token: Token![static],
-            pub mutability: Option<Token![mut]>,
-            pub ident: Ident,
-            pub colon_token: Token![:],
-            pub ty: Box<Type>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A foreign type in an `extern` block: `type void`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Type(ForeignItemType {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub type_token: Token![type],
-            pub ident: Ident,
-            pub semi_token: Token![;],
-        }),
-
-        /// Tokens in an `extern` block not interpreted by Syn.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Verbatim(ForeignItemVerbatim #manual_extra_traits {
-            pub tts: TokenStream,
-        }),
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for ForeignItemVerbatim {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for ForeignItemVerbatim {
-    fn eq(&self, other: &Self) -> bool {
-        TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for ForeignItemVerbatim {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-ast_enum_of_structs! {
-    /// An item declaration within the definition of a trait.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum TraitItem {
-        /// An associated constant within the definition of a trait.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Const(TraitItemConst {
-            pub attrs: Vec<Attribute>,
-            pub const_token: Token![const],
-            pub ident: Ident,
-            pub colon_token: Token![:],
-            pub ty: Type,
-            pub default: Option<(Token![=], Expr)>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A trait method within the definition of a trait.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Method(TraitItemMethod {
-            pub attrs: Vec<Attribute>,
-            pub sig: MethodSig,
-            pub default: Option<Block>,
-            pub semi_token: Option<Token![;]>,
-        }),
-
-        /// An associated type within the definition of a trait.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Type(TraitItemType {
-            pub attrs: Vec<Attribute>,
-            pub type_token: Token![type],
-            pub ident: Ident,
-            pub generics: Generics,
-            pub colon_token: Option<Token![:]>,
-            pub bounds: Punctuated<TypeParamBound, Token![+]>,
-            pub default: Option<(Token![=], Type)>,
-            pub semi_token: Token![;],
-        }),
-
-        /// A macro invocation within the definition of a trait.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Macro(TraitItemMacro {
-            pub attrs: Vec<Attribute>,
-            pub mac: Macro,
-            pub semi_token: Option<Token![;]>,
-        }),
-
-        /// Tokens within the definition of a trait not interpreted by Syn.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Verbatim(TraitItemVerbatim #manual_extra_traits {
-            pub tts: TokenStream,
-        }),
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for TraitItemVerbatim {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for TraitItemVerbatim {
-    fn eq(&self, other: &Self) -> bool {
-        TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for TraitItemVerbatim {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-ast_enum_of_structs! {
-    /// An item within an impl block.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum ImplItem {
-        /// An associated constant within an impl block.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Const(ImplItemConst {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub defaultness: Option<Token![default]>,
-            pub const_token: Token![const],
-            pub ident: Ident,
-            pub colon_token: Token![:],
-            pub ty: Type,
-            pub eq_token: Token![=],
-            pub expr: Expr,
-            pub semi_token: Token![;],
-        }),
-
-        /// A method within an impl block.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Method(ImplItemMethod {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub defaultness: Option<Token![default]>,
-            pub sig: MethodSig,
-            pub block: Block,
-        }),
-
-        /// An associated type within an impl block.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Type(ImplItemType {
-            pub attrs: Vec<Attribute>,
-            pub vis: Visibility,
-            pub defaultness: Option<Token![default]>,
-            pub type_token: Token![type],
-            pub ident: Ident,
-            pub generics: Generics,
-            pub eq_token: Token![=],
-            pub ty: Type,
-            pub semi_token: Token![;],
-        }),
-
-        /// A macro invocation within an impl block.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Macro(ImplItemMacro {
-            pub attrs: Vec<Attribute>,
-            pub mac: Macro,
-            pub semi_token: Option<Token![;]>,
-        }),
-
-        /// Tokens within an impl block not interpreted by Syn.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Verbatim(ImplItemVerbatim #manual_extra_traits {
-            pub tts: TokenStream,
-        }),
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for ImplItemVerbatim {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for ImplItemVerbatim {
-    fn eq(&self, other: &Self) -> bool {
-        TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for ImplItemVerbatim {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-ast_struct! {
-    /// A method's signature in a trait or implementation: `unsafe fn
-    /// initialize(&self)`.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct MethodSig {
-        pub constness: Option<Token![const]>,
-        pub unsafety: Option<Token![unsafe]>,
-        pub abi: Option<Abi>,
-        pub ident: Ident,
-        pub decl: FnDecl,
-    }
-}
-
-ast_struct! {
-    /// Header of a function declaration, without including the body.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    pub struct FnDecl {
-        pub fn_token: Token![fn],
-        pub generics: Generics,
-        pub paren_token: token::Paren,
-        pub inputs: Punctuated<FnArg, Token![,]>,
-        pub variadic: Option<Token![...]>,
-        pub output: ReturnType,
-    }
-}
-
-ast_enum_of_structs! {
-    /// An argument in a function signature: the `n: usize` in `fn f(n: usize)`.
-    ///
-    /// *This type is available if Syn is built with the `"full"` feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum FnArg {
-        /// Self captured by reference in a function signature: `&self` or `&mut
-        /// self`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub SelfRef(ArgSelfRef {
-            pub and_token: Token![&],
-            pub lifetime: Option<Lifetime>,
-            pub mutability: Option<Token![mut]>,
-            pub self_token: Token![self],
-        }),
-
-        /// Self captured by value in a function signature: `self` or `mut
-        /// self`.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub SelfValue(ArgSelf {
-            pub mutability: Option<Token![mut]>,
-            pub self_token: Token![self],
-        }),
-
-        /// An explicitly typed pattern captured by a function signature.
-        ///
-        /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Captured(ArgCaptured {
-            pub pat: Pat,
-            pub colon_token: Token![:],
-            pub ty: Type,
-        }),
-
-        /// A pattern whose type is inferred captured by a function signature.
-        pub Inferred(Pat),
-        /// A type not bound to any pattern in a function signature.
-        pub Ignored(Type),
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-
-    use synom::Synom;
-
-    impl_synom!(Item "item" alt!(
-        syn!(ItemExternCrate) => { Item::ExternCrate }
-        |
-        syn!(ItemUse) => { Item::Use }
-        |
-        syn!(ItemStatic) => { Item::Static }
-        |
-        syn!(ItemConst) => { Item::Const }
-        |
-        syn!(ItemFn) => { Item::Fn }
-        |
-        call!(unstable_async_fn) => { Item::Verbatim }
-        |
-        syn!(ItemMod) => { Item::Mod }
-        |
-        syn!(ItemForeignMod) => { Item::ForeignMod }
-        |
-        syn!(ItemType) => { Item::Type }
-        |
-        syn!(ItemStruct) => { Item::Struct }
-        |
-        syn!(ItemEnum) => { Item::Enum }
-        |
-        syn!(ItemUnion) => { Item::Union }
-        |
-        syn!(ItemTrait) => { Item::Trait }
-        |
-        syn!(ItemImpl) => { Item::Impl }
-        |
-        syn!(ItemMacro) => { Item::Macro }
-        |
-        syn!(ItemMacro2) => { Item::Macro2 }
-    ));
-
-    impl_synom!(ItemMacro "macro item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        what: call!(Path::parse_mod_style) >>
-        bang: punct!(!) >>
-        ident: option!(syn!(Ident)) >>
-        body: call!(tt::delimited) >>
-        semi: cond!(!is_brace(&body.0), punct!(;)) >>
-        (ItemMacro {
-            attrs: attrs,
-            ident: ident,
-            mac: Macro {
-                path: what,
-                bang_token: bang,
-                delimiter: body.0,
-                tts: body.1,
-            },
-            semi_token: semi,
-        })
-    ));
-
-    // TODO: figure out the actual grammar; is body required to be braced?
-    impl_synom!(ItemMacro2 "macro2 item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        macro_: keyword!(macro) >>
-        ident: syn!(Ident) >>
-        args: call!(tt::parenthesized) >>
-        body: call!(tt::braced) >>
-        (ItemMacro2 {
-            attrs: attrs,
-            vis: vis,
-            macro_token: macro_,
-            ident: ident,
-            paren_token: args.0,
-            args: args.1,
-            brace_token: body.0,
-            body: body.1,
-        })
-    ));
-
-    impl_synom!(ItemExternCrate "extern crate item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        extern_: keyword!(extern) >>
-        crate_: keyword!(crate) >>
-        ident: syn!(Ident) >>
-        rename: option!(tuple!(keyword!(as), syn!(Ident))) >>
-        semi: punct!(;) >>
-        (ItemExternCrate {
-            attrs: attrs,
-            vis: vis,
-            extern_token: extern_,
-            crate_token: crate_,
-            ident: ident,
-            rename: rename,
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ItemUse "use item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        use_: keyword!(use) >>
-        leading_colon: option!(punct!(::)) >>
-        tree: syn!(UseTree) >>
-        semi: punct!(;) >>
-        (ItemUse {
-            attrs: attrs,
-            vis: vis,
-            use_token: use_,
-            leading_colon: leading_colon,
-            tree: tree,
-            semi_token: semi,
-        })
-    ));
-
-    named!(use_element -> Ident, alt!(
-        syn!(Ident)
-        |
-        keyword!(self) => { Into::into }
-        |
-        keyword!(super) => { Into::into }
-        |
-        keyword!(crate) => { Into::into }
-        |
-        keyword!(extern) => { Into::into }
-    ));
-
-    impl_synom!(UseTree "use tree" alt!(
-        syn!(UseRename) => { UseTree::Rename }
-        |
-        syn!(UsePath) => { UseTree::Path }
-        |
-        syn!(UseName) => { UseTree::Name }
-        |
-        syn!(UseGlob) => { UseTree::Glob }
-        |
-        syn!(UseGroup) => { UseTree::Group }
-    ));
-
-    impl_synom!(UsePath "use path" do_parse!(
-        ident: call!(use_element) >>
-        colon2_token: punct!(::) >>
-        tree: syn!(UseTree) >>
-        (UsePath {
-            ident: ident,
-            colon2_token: colon2_token,
-            tree: Box::new(tree),
-        })
-    ));
-
-    impl_synom!(UseName "use name" do_parse!(
-        ident: call!(use_element) >>
-        (UseName {
-            ident: ident,
-        })
-    ));
-
-    impl_synom!(UseRename "use rename" do_parse!(
-        ident: call!(use_element) >>
-        as_token: keyword!(as) >>
-        rename: syn!(Ident) >>
-        (UseRename {
-            ident: ident,
-            as_token: as_token,
-            rename: rename,
-        })
-    ));
-
-    impl_synom!(UseGlob "use glob" do_parse!(
-        star: punct!(*) >>
-        (UseGlob {
-            star_token: star,
-        })
-    ));
-
-    impl_synom!(UseGroup "use group" do_parse!(
-        list: braces!(Punctuated::parse_terminated) >>
-        (UseGroup {
-            brace_token: list.0,
-            items: list.1,
-        })
-    ));
-
-    impl_synom!(ItemStatic "static item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        static_: keyword!(static) >>
-        mutability: option!(keyword!(mut)) >>
-        ident: syn!(Ident) >>
-        colon: punct!(:) >>
-        ty: syn!(Type) >>
-        eq: punct!(=) >>
-        value: syn!(Expr) >>
-        semi: punct!(;) >>
-        (ItemStatic {
-            attrs: attrs,
-            vis: vis,
-            static_token: static_,
-            mutability: mutability,
-            ident: ident,
-            colon_token: colon,
-            ty: Box::new(ty),
-            eq_token: eq,
-            expr: Box::new(value),
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ItemConst "const item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        const_: keyword!(const) >>
-        ident: syn!(Ident) >>
-        colon: punct!(:) >>
-        ty: syn!(Type) >>
-        eq: punct!(=) >>
-        value: syn!(Expr) >>
-        semi: punct!(;) >>
-        (ItemConst {
-            attrs: attrs,
-            vis: vis,
-            const_token: const_,
-            ident: ident,
-            colon_token: colon,
-            ty: Box::new(ty),
-            eq_token: eq,
-            expr: Box::new(value),
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ItemFn "fn item" do_parse!(
-        outer_attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        constness: option!(keyword!(const)) >>
-        unsafety: option!(keyword!(unsafe)) >>
-        abi: option!(syn!(Abi)) >>
-        fn_: keyword!(fn) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        inputs: parens!(Punctuated::parse_terminated) >>
-        ret: syn!(ReturnType) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        inner_attrs_stmts: braces!(tuple!(
-            many0!(Attribute::parse_inner),
-            call!(Block::parse_within),
-        )) >>
-        (ItemFn {
-            attrs: {
-                let mut attrs = outer_attrs;
-                attrs.extend((inner_attrs_stmts.1).0);
-                attrs
-            },
-            vis: vis,
-            constness: constness,
-            unsafety: unsafety,
-            abi: abi,
-            decl: Box::new(FnDecl {
-                fn_token: fn_,
-                paren_token: inputs.0,
-                inputs: inputs.1,
-                output: ret,
-                variadic: None,
-                generics: Generics {
-                    where_clause: where_clause,
-                    ..generics
-                },
-            }),
-            ident: ident,
-            block: Box::new(Block {
-                brace_token: inner_attrs_stmts.0,
-                stmts: (inner_attrs_stmts.1).1,
-            }),
-        })
-    ));
-
-    named!(unstable_async_fn -> ItemVerbatim, do_parse!(
-        begin: call!(verbatim::grab_cursor) >>
-        many0!(Attribute::parse_outer) >>
-        syn!(Visibility) >>
-        option!(keyword!(const)) >>
-        option!(keyword!(unsafe)) >>
-        keyword!(async) >>
-        option!(syn!(Abi)) >>
-        keyword!(fn) >>
-        syn!(Ident) >>
-        syn!(Generics) >>
-        parens!(Punctuated::<FnArg, Token![,]>::parse_terminated) >>
-        syn!(ReturnType) >>
-        option!(syn!(WhereClause)) >>
-        braces!(tuple!(
-            many0!(Attribute::parse_inner),
-            call!(Block::parse_within),
-        )) >>
-        end: call!(verbatim::grab_cursor) >>
-        (ItemVerbatim {
-            tts: verbatim::token_range(begin..end),
-        })
-    ));
-
-    impl Synom for FnArg {
-        named!(parse -> Self, alt!(
-            do_parse!(
-                and: punct!(&) >>
-                lt: option!(syn!(Lifetime)) >>
-                mutability: option!(keyword!(mut)) >>
-                self_: keyword!(self) >>
-                not!(punct!(:)) >>
-                (ArgSelfRef {
-                    lifetime: lt,
-                    mutability: mutability,
-                    and_token: and,
-                    self_token: self_,
-                }.into())
-            )
-            |
-            do_parse!(
-                mutability: option!(keyword!(mut)) >>
-                self_: keyword!(self) >>
-                not!(punct!(:)) >>
-                (ArgSelf {
-                    mutability: mutability,
-                    self_token: self_,
-                }.into())
-            )
-            |
-            do_parse!(
-                pat: syn!(Pat) >>
-                colon: punct!(:) >>
-                ty: syn!(Type) >>
-                (ArgCaptured {
-                    pat: pat,
-                    ty: ty,
-                    colon_token: colon,
-                }.into())
-            )
-            |
-            syn!(Type) => { FnArg::Ignored }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("function argument")
-        }
-    }
-
-    impl_synom!(ItemMod "mod item" do_parse!(
-        outer_attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        mod_: keyword!(mod) >>
-        ident: syn!(Ident) >>
-        content_semi: alt!(
-            punct!(;) => {|semi| (
-                Vec::new(),
-                None,
-                Some(semi),
-            )}
-            |
-            braces!(
-                tuple!(
-                    many0!(Attribute::parse_inner),
-                    many0!(Item::parse),
-                )
-            ) => {|(brace, (inner_attrs, items))| (
-                inner_attrs,
-                Some((brace, items)),
-                None,
-            )}
-        ) >>
-        (ItemMod {
-            attrs: {
-                let mut attrs = outer_attrs;
-                attrs.extend(content_semi.0);
-                attrs
-            },
-            vis: vis,
-            mod_token: mod_,
-            ident: ident,
-            content: content_semi.1,
-            semi: content_semi.2,
-        })
-    ));
-
-    impl_synom!(ItemForeignMod "foreign mod item" do_parse!(
-        outer_attrs: many0!(Attribute::parse_outer) >>
-        abi: syn!(Abi) >>
-        braced_content: braces!(tuple!(
-            many0!(Attribute::parse_inner),
-            many0!(ForeignItem::parse),
-        )) >>
-        (ItemForeignMod {
-            attrs: {
-                let mut attrs = outer_attrs;
-                attrs.extend((braced_content.1).0);
-                attrs
-            },
-            abi: abi,
-            brace_token: braced_content.0,
-            items: (braced_content.1).1,
-        })
-    ));
-
-    impl_synom!(ForeignItem "foreign item" alt!(
-        syn!(ForeignItemFn) => { ForeignItem::Fn }
-        |
-        syn!(ForeignItemStatic) => { ForeignItem::Static }
-        |
-        syn!(ForeignItemType) => { ForeignItem::Type }
-        |
-        call!(foreign_item_macro) => { ForeignItem::Verbatim }
-    ));
-
-    impl_synom!(ForeignItemFn "foreign function" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        fn_: keyword!(fn) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        inputs: parens!(do_parse!(
-            args: call!(Punctuated::parse_terminated) >>
-            variadic: option!(cond_reduce!(args.empty_or_trailing(), punct!(...))) >>
-            (args, variadic)
-        )) >>
-        ret: syn!(ReturnType) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        semi: punct!(;) >>
-        ({
-            let (parens, (inputs, variadic)) = inputs;
-            ForeignItemFn {
-                ident: ident,
-                attrs: attrs,
-                semi_token: semi,
-                decl: Box::new(FnDecl {
-                    fn_token: fn_,
-                    paren_token: parens,
-                    inputs: inputs,
-                    variadic: variadic,
-                    output: ret,
-                    generics: Generics {
-                        where_clause: where_clause,
-                        ..generics
-                    },
-                }),
-                vis: vis,
-            }
-        })
-    ));
-
-    impl_synom!(ForeignItemStatic "foreign static" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        static_: keyword!(static) >>
-        mutability: option!(keyword!(mut)) >>
-        ident: syn!(Ident) >>
-        colon: punct!(:) >>
-        ty: syn!(Type) >>
-        semi: punct!(;) >>
-        (ForeignItemStatic {
-            ident: ident,
-            attrs: attrs,
-            semi_token: semi,
-            ty: Box::new(ty),
-            mutability: mutability,
-            static_token: static_,
-            colon_token: colon,
-            vis: vis,
-        })
-    ));
-
-    impl_synom!(ForeignItemType "foreign type" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        type_: keyword!(type) >>
-        ident: syn!(Ident) >>
-        semi: punct!(;) >>
-        (ForeignItemType {
-            attrs: attrs,
-            vis: vis,
-            type_token: type_,
-            ident: ident,
-            semi_token: semi,
-        })
-    ));
-
-    named!(foreign_item_macro -> ForeignItemVerbatim, do_parse!(
-        begin: call!(verbatim::grab_cursor) >>
-        many0!(Attribute::parse_outer) >>
-        mac: syn!(Macro) >>
-        cond!(!is_brace(&mac.delimiter), punct!(;)) >>
-        end: call!(verbatim::grab_cursor) >>
-        (ForeignItemVerbatim {
-            tts: verbatim::token_range(begin..end),
-        })
-    ));
-
-    impl_synom!(ItemType "type item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        type_: keyword!(type) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        eq: punct!(=) >>
-        ty: syn!(Type) >>
-        semi: punct!(;) >>
-        (ItemType {
-            attrs: attrs,
-            vis: vis,
-            type_token: type_,
-            ident: ident,
-            generics: Generics {
-                where_clause: where_clause,
-                ..generics
-            },
-            eq_token: eq,
-            ty: Box::new(ty),
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ItemStruct "struct item" switch!(
-        map!(syn!(DeriveInput), Into::into),
-        Item::Struct(item) => value!(item)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(ItemEnum "enum item" switch!(
-        map!(syn!(DeriveInput), Into::into),
-        Item::Enum(item) => value!(item)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(ItemUnion "union item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        union_: keyword!(union) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        fields: syn!(FieldsNamed) >>
-        (ItemUnion {
-            attrs: attrs,
-            vis: vis,
-            union_token: union_,
-            ident: ident,
-            generics: Generics {
-                where_clause: where_clause,
-                ..generics
-            },
-            fields: fields,
-        })
-    ));
-
-    impl_synom!(ItemTrait "trait item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        unsafety: option!(keyword!(unsafe)) >>
-        auto_: option!(keyword!(auto)) >>
-        trait_: keyword!(trait) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        colon: option!(punct!(:)) >>
-        bounds: cond!(colon.is_some(), Punctuated::parse_separated_nonempty) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        body: braces!(many0!(TraitItem::parse)) >>
-        (ItemTrait {
-            attrs: attrs,
-            vis: vis,
-            unsafety: unsafety,
-            auto_token: auto_,
-            trait_token: trait_,
-            ident: ident,
-            generics: Generics {
-                where_clause: where_clause,
-                ..generics
-            },
-            colon_token: colon,
-            supertraits: bounds.unwrap_or_default(),
-            brace_token: body.0,
-            items: body.1,
-        })
-    ));
-
-    impl_synom!(TraitItem "trait item" alt!(
-        syn!(TraitItemConst) => { TraitItem::Const }
-        |
-        syn!(TraitItemMethod) => { TraitItem::Method }
-        |
-        syn!(TraitItemType) => { TraitItem::Type }
-        |
-        syn!(TraitItemMacro) => { TraitItem::Macro }
-    ));
-
-    impl_synom!(TraitItemConst "const trait item" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        const_: keyword!(const) >>
-        ident: syn!(Ident) >>
-        colon: punct!(:) >>
-        ty: syn!(Type) >>
-        default: option!(tuple!(punct!(=), syn!(Expr))) >>
-        semi: punct!(;) >>
-        (TraitItemConst {
-            attrs: attrs,
-            const_token: const_,
-            ident: ident,
-            colon_token: colon,
-            ty: ty,
-            default: default,
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(TraitItemMethod "method trait item" do_parse!(
-        outer_attrs: many0!(Attribute::parse_outer) >>
-        constness: option!(keyword!(const)) >>
-        unsafety: option!(keyword!(unsafe)) >>
-        abi: option!(syn!(Abi)) >>
-        fn_: keyword!(fn) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        inputs: parens!(Punctuated::parse_terminated) >>
-        ret: syn!(ReturnType) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        body: option!(braces!(tuple!(
-            many0!(Attribute::parse_inner),
-            call!(Block::parse_within),
-        ))) >>
-        semi: cond!(body.is_none(), punct!(;)) >>
-        ({
-            let (inner_attrs, stmts) = match body {
-                Some((b, (inner_attrs, stmts))) => (inner_attrs, Some((stmts, b))),
-                None => (Vec::new(), None),
-            };
-            TraitItemMethod {
-                attrs: {
-                    let mut attrs = outer_attrs;
-                    attrs.extend(inner_attrs);
-                    attrs
-                },
-                sig: MethodSig {
-                    constness: constness,
-                    unsafety: unsafety,
-                    abi: abi,
-                    ident: ident,
-                    decl: FnDecl {
-                        inputs: inputs.1,
-                        output: ret,
-                        fn_token: fn_,
-                        paren_token: inputs.0,
-                        variadic: None,
-                        generics: Generics {
-                            where_clause: where_clause,
-                            ..generics
-                        },
-                    },
-                },
-                default: stmts.map(|stmts| {
-                    Block {
-                        stmts: stmts.0,
-                        brace_token: stmts.1,
-                    }
-                }),
-                semi_token: semi,
-            }
-        })
-    ));
-
-    impl_synom!(TraitItemType "trait item type" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        type_: keyword!(type) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        colon: option!(punct!(:)) >>
-        bounds: cond!(colon.is_some(), Punctuated::parse_separated_nonempty) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        default: option!(tuple!(punct!(=), syn!(Type))) >>
-        semi: punct!(;) >>
-        (TraitItemType {
-            attrs: attrs,
-            type_token: type_,
-            ident: ident,
-            generics: Generics {
-                where_clause: where_clause,
-                ..generics
-            },
-            colon_token: colon,
-            bounds: bounds.unwrap_or_default(),
-            default: default,
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(TraitItemMacro "trait item macro" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        mac: syn!(Macro) >>
-        semi: cond!(!is_brace(&mac.delimiter), punct!(;)) >>
-        (TraitItemMacro {
-            attrs: attrs,
-            mac: mac,
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ItemImpl "impl item" do_parse!(
-        outer_attrs: many0!(Attribute::parse_outer) >>
-        defaultness: option!(keyword!(default)) >>
-        unsafety: option!(keyword!(unsafe)) >>
-        impl_: keyword!(impl) >>
-        generics: syn!(Generics) >>
-        polarity_path: alt!(
-            do_parse!(
-                polarity: option!(punct!(!)) >>
-                path: syn!(Path) >>
-                for_: keyword!(for) >>
-                (Some((polarity, path, for_)))
-            )
-            |
-            epsilon!() => { |_| None }
-        ) >>
-        self_ty: syn!(Type) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        inner: braces!(tuple!(
-            many0!(Attribute::parse_inner),
-            many0!(ImplItem::parse),
-        )) >>
-        (ItemImpl {
-            attrs: {
-                let mut attrs = outer_attrs;
-                attrs.extend((inner.1).0);
-                attrs
-            },
-            defaultness: defaultness,
-            unsafety: unsafety,
-            impl_token: impl_,
-            generics: Generics {
-                where_clause: where_clause,
-                ..generics
-            },
-            trait_: polarity_path,
-            self_ty: Box::new(self_ty),
-            brace_token: inner.0,
-            items: (inner.1).1,
-        })
-    ));
-
-    impl_synom!(ImplItem "item in impl block" alt!(
-        syn!(ImplItemConst) => { ImplItem::Const }
-        |
-        syn!(ImplItemMethod) => { ImplItem::Method }
-        |
-        call!(unstable_async_method) => { ImplItem::Verbatim }
-        |
-        syn!(ImplItemType) => { ImplItem::Type }
-        |
-        syn!(ImplItemMacro) => { ImplItem::Macro }
-    ));
-
-    impl_synom!(ImplItemConst "const item in impl block" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        defaultness: option!(keyword!(default)) >>
-        const_: keyword!(const) >>
-        ident: syn!(Ident) >>
-        colon: punct!(:) >>
-        ty: syn!(Type) >>
-        eq: punct!(=) >>
-        value: syn!(Expr) >>
-        semi: punct!(;) >>
-        (ImplItemConst {
-            attrs: attrs,
-            vis: vis,
-            defaultness: defaultness,
-            const_token: const_,
-            ident: ident,
-            colon_token: colon,
-            ty: ty,
-            eq_token: eq,
-            expr: value,
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ImplItemMethod "method in impl block" do_parse!(
-        outer_attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        defaultness: option!(keyword!(default)) >>
-        constness: option!(keyword!(const)) >>
-        unsafety: option!(keyword!(unsafe)) >>
-        abi: option!(syn!(Abi)) >>
-        fn_: keyword!(fn) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        inputs: parens!(Punctuated::parse_terminated) >>
-        ret: syn!(ReturnType) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        inner_attrs_stmts: braces!(tuple!(
-            many0!(Attribute::parse_inner),
-            call!(Block::parse_within),
-        )) >>
-        (ImplItemMethod {
-            attrs: {
-                let mut attrs = outer_attrs;
-                attrs.extend((inner_attrs_stmts.1).0);
-                attrs
-            },
-            vis: vis,
-            defaultness: defaultness,
-            sig: MethodSig {
-                constness: constness,
-                unsafety: unsafety,
-                abi: abi,
-                ident: ident,
-                decl: FnDecl {
-                    fn_token: fn_,
-                    paren_token: inputs.0,
-                    inputs: inputs.1,
-                    output: ret,
-                    generics: Generics {
-                        where_clause: where_clause,
-                        ..generics
-                    },
-                    variadic: None,
-                },
-            },
-            block: Block {
-                brace_token: inner_attrs_stmts.0,
-                stmts: (inner_attrs_stmts.1).1,
-            },
-        })
-    ));
-
-    named!(unstable_async_method -> ImplItemVerbatim, do_parse!(
-        begin: call!(verbatim::grab_cursor) >>
-        many0!(Attribute::parse_outer) >>
-        syn!(Visibility) >>
-        option!(keyword!(default)) >>
-        option!(keyword!(const)) >>
-        option!(keyword!(unsafe)) >>
-        keyword!(async) >>
-        option!(syn!(Abi)) >>
-        keyword!(fn) >>
-        syn!(Ident) >>
-        syn!(Generics) >>
-        parens!(Punctuated::<FnArg, Token![,]>::parse_terminated) >>
-        syn!(ReturnType) >>
-        option!(syn!(WhereClause)) >>
-        braces!(tuple!(
-            many0!(Attribute::parse_inner),
-            call!(Block::parse_within),
-        )) >>
-        end: call!(verbatim::grab_cursor) >>
-        (ImplItemVerbatim {
-            tts: verbatim::token_range(begin..end),
-        })
-    ));
-
-    impl_synom!(ImplItemType "type in impl block" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        vis: syn!(Visibility) >>
-        defaultness: option!(keyword!(default)) >>
-        type_: keyword!(type) >>
-        ident: syn!(Ident) >>
-        generics: syn!(Generics) >>
-        where_clause: option!(syn!(WhereClause)) >>
-        eq: punct!(=) >>
-        ty: syn!(Type) >>
-        semi: punct!(;) >>
-        (ImplItemType {
-            attrs: attrs,
-            vis: vis,
-            defaultness: defaultness,
-            type_token: type_,
-            ident: ident,
-            generics: Generics {
-                where_clause: where_clause,
-                ..generics
-            },
-            eq_token: eq,
-            ty: ty,
-            semi_token: semi,
-        })
-    ));
-
-    impl_synom!(ImplItemMacro "macro in impl block" do_parse!(
-        attrs: many0!(Attribute::parse_outer) >>
-        mac: syn!(Macro) >>
-        semi: cond!(!is_brace(&mac.delimiter), punct!(;)) >>
-        (ImplItemMacro {
-            attrs: attrs,
-            mac: mac,
-            semi_token: semi,
-        })
-    ));
-
-    fn is_brace(delimiter: &MacroDelimiter) -> bool {
-        match *delimiter {
-            MacroDelimiter::Brace(_) => true,
-            MacroDelimiter::Paren(_) | MacroDelimiter::Bracket(_) => false,
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use attr::FilterAttrs;
-    use proc_macro2::TokenStream;
-    use quote::{ToTokens, TokenStreamExt};
-
-    impl ToTokens for ItemExternCrate {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.extern_token.to_tokens(tokens);
-            self.crate_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            if let Some((ref as_token, ref rename)) = self.rename {
-                as_token.to_tokens(tokens);
-                rename.to_tokens(tokens);
-            }
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ItemUse {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.use_token.to_tokens(tokens);
-            self.leading_colon.to_tokens(tokens);
-            self.tree.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ItemStatic {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.static_token.to_tokens(tokens);
-            self.mutability.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ItemConst {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.const_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ItemFn {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.constness.to_tokens(tokens);
-            self.unsafety.to_tokens(tokens);
-            self.abi.to_tokens(tokens);
-            NamedDecl(&self.decl, &self.ident).to_tokens(tokens);
-            self.block.brace_token.surround(tokens, |tokens| {
-                tokens.append_all(self.attrs.inner());
-                tokens.append_all(&self.block.stmts);
-            });
-        }
-    }
-
-    impl ToTokens for ItemMod {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.mod_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            if let Some((ref brace, ref items)) = self.content {
-                brace.surround(tokens, |tokens| {
-                    tokens.append_all(self.attrs.inner());
-                    tokens.append_all(items);
-                });
-            } else {
-                TokensOrDefault(&self.semi).to_tokens(tokens);
-            }
-        }
-    }
-
-    impl ToTokens for ItemForeignMod {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.abi.to_tokens(tokens);
-            self.brace_token.surround(tokens, |tokens| {
-                tokens.append_all(self.attrs.inner());
-                tokens.append_all(&self.items);
-            });
-        }
-    }
-
-    impl ToTokens for ItemType {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.type_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            self.generics.where_clause.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ItemEnum {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.enum_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            self.generics.where_clause.to_tokens(tokens);
-            self.brace_token.surround(tokens, |tokens| {
-                self.variants.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for ItemStruct {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.struct_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            match self.fields {
-                Fields::Named(ref fields) => {
-                    self.generics.where_clause.to_tokens(tokens);
-                    fields.to_tokens(tokens);
-                }
-                Fields::Unnamed(ref fields) => {
-                    fields.to_tokens(tokens);
-                    self.generics.where_clause.to_tokens(tokens);
-                    TokensOrDefault(&self.semi_token).to_tokens(tokens);
-                }
-                Fields::Unit => {
-                    self.generics.where_clause.to_tokens(tokens);
-                    TokensOrDefault(&self.semi_token).to_tokens(tokens);
-                }
-            }
-        }
-    }
-
-    impl ToTokens for ItemUnion {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.union_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            self.generics.where_clause.to_tokens(tokens);
-            self.fields.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ItemTrait {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.unsafety.to_tokens(tokens);
-            self.auto_token.to_tokens(tokens);
-            self.trait_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            if !self.supertraits.is_empty() {
-                TokensOrDefault(&self.colon_token).to_tokens(tokens);
-                self.supertraits.to_tokens(tokens);
-            }
-            self.generics.where_clause.to_tokens(tokens);
-            self.brace_token.surround(tokens, |tokens| {
-                tokens.append_all(&self.items);
-            });
-        }
-    }
-
-    impl ToTokens for ItemImpl {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.defaultness.to_tokens(tokens);
-            self.unsafety.to_tokens(tokens);
-            self.impl_token.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            if let Some((ref polarity, ref path, ref for_token)) = self.trait_ {
-                polarity.to_tokens(tokens);
-                path.to_tokens(tokens);
-                for_token.to_tokens(tokens);
-            }
-            self.self_ty.to_tokens(tokens);
-            self.generics.where_clause.to_tokens(tokens);
-            self.brace_token.surround(tokens, |tokens| {
-                tokens.append_all(self.attrs.inner());
-                tokens.append_all(&self.items);
-            });
-        }
-    }
-
-    impl ToTokens for ItemMacro {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.mac.path.to_tokens(tokens);
-            self.mac.bang_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            match self.mac.delimiter {
-                MacroDelimiter::Paren(ref paren) => {
-                    paren.surround(tokens, |tokens| self.mac.tts.to_tokens(tokens));
-                }
-                MacroDelimiter::Brace(ref brace) => {
-                    brace.surround(tokens, |tokens| self.mac.tts.to_tokens(tokens));
-                }
-                MacroDelimiter::Bracket(ref bracket) => {
-                    bracket.surround(tokens, |tokens| self.mac.tts.to_tokens(tokens));
-                }
-            }
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ItemMacro2 {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.macro_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                self.args.to_tokens(tokens);
-            });
-            self.brace_token.surround(tokens, |tokens| {
-                self.body.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for ItemVerbatim {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.tts.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for UsePath {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.ident.to_tokens(tokens);
-            self.colon2_token.to_tokens(tokens);
-            self.tree.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for UseName {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.ident.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for UseRename {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.ident.to_tokens(tokens);
-            self.as_token.to_tokens(tokens);
-            self.rename.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for UseGlob {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.star_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for UseGroup {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.brace_token.surround(tokens, |tokens| {
-                self.items.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for TraitItemConst {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.const_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            if let Some((ref eq_token, ref default)) = self.default {
-                eq_token.to_tokens(tokens);
-                default.to_tokens(tokens);
-            }
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TraitItemMethod {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.sig.to_tokens(tokens);
-            match self.default {
-                Some(ref block) => {
-                    block.brace_token.surround(tokens, |tokens| {
-                        tokens.append_all(self.attrs.inner());
-                        tokens.append_all(&block.stmts);
-                    });
-                }
-                None => {
-                    TokensOrDefault(&self.semi_token).to_tokens(tokens);
-                }
-            }
-        }
-    }
-
-    impl ToTokens for TraitItemType {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.type_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            if !self.bounds.is_empty() {
-                TokensOrDefault(&self.colon_token).to_tokens(tokens);
-                self.bounds.to_tokens(tokens);
-            }
-            self.generics.where_clause.to_tokens(tokens);
-            if let Some((ref eq_token, ref default)) = self.default {
-                eq_token.to_tokens(tokens);
-                default.to_tokens(tokens);
-            }
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TraitItemMacro {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.mac.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TraitItemVerbatim {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.tts.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ImplItemConst {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.defaultness.to_tokens(tokens);
-            self.const_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.expr.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ImplItemMethod {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.defaultness.to_tokens(tokens);
-            self.sig.to_tokens(tokens);
-            self.block.brace_token.surround(tokens, |tokens| {
-                tokens.append_all(self.attrs.inner());
-                tokens.append_all(&self.block.stmts);
-            });
-        }
-    }
-
-    impl ToTokens for ImplItemType {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.defaultness.to_tokens(tokens);
-            self.type_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.generics.to_tokens(tokens);
-            self.generics.where_clause.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ImplItemMacro {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.mac.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ImplItemVerbatim {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.tts.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ForeignItemFn {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            NamedDecl(&self.decl, &self.ident).to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ForeignItemStatic {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.static_token.to_tokens(tokens);
-            self.mutability.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ForeignItemType {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.attrs.outer());
-            self.vis.to_tokens(tokens);
-            self.type_token.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-            self.semi_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ForeignItemVerbatim {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.tts.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for MethodSig {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.constness.to_tokens(tokens);
-            self.unsafety.to_tokens(tokens);
-            self.abi.to_tokens(tokens);
-            NamedDecl(&self.decl, &self.ident).to_tokens(tokens);
-        }
-    }
-
-    struct NamedDecl<'a>(&'a FnDecl, &'a Ident);
-
-    impl<'a> ToTokens for NamedDecl<'a> {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.0.fn_token.to_tokens(tokens);
-            self.1.to_tokens(tokens);
-            self.0.generics.to_tokens(tokens);
-            self.0.paren_token.surround(tokens, |tokens| {
-                self.0.inputs.to_tokens(tokens);
-                if self.0.variadic.is_some() && !self.0.inputs.empty_or_trailing() {
-                    <Token![,]>::default().to_tokens(tokens);
-                }
-                self.0.variadic.to_tokens(tokens);
-            });
-            self.0.output.to_tokens(tokens);
-            self.0.generics.where_clause.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ArgSelfRef {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.and_token.to_tokens(tokens);
-            self.lifetime.to_tokens(tokens);
-            self.mutability.to_tokens(tokens);
-            self.self_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ArgSelf {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.mutability.to_tokens(tokens);
-            self.self_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ArgCaptured {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.pat.to_tokens(tokens);
-            self.colon_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/lib.rs b/third_party/rust/syn-0.14.6/src/lib.rs
deleted file mode 100644
index 192dd9dbb76e..000000000000
--- a/third_party/rust/syn-0.14.6/src/lib.rs
+++ /dev/null
@@ -1,788 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Syn is a parsing library for parsing a stream of Rust tokens into a syntax
-//! tree of Rust source code.
-//!
-//! Currently this library is geared toward the [custom derive] use case but
-//! contains some APIs that may be useful for Rust procedural macros more
-//! generally.
-//!
-//! [custom derive]: https://github.com/rust-lang/rfcs/blob/master/text/1681-macros-1.1.md
-//!
-//! - **Data structures** — Syn provides a complete syntax tree that can
-//!   represent any valid Rust source code. The syntax tree is rooted at
-//!   [`syn::File`] which represents a full source file, but there are other
-//!   entry points that may be useful to procedural macros including
-//!   [`syn::Item`], [`syn::Expr`] and [`syn::Type`].
-//!
-//! - **Custom derives** — Of particular interest to custom derives is
-//!   [`syn::DeriveInput`] which is any of the three legal input items to a
-//!   derive macro. An example below shows using this type in a library that can
-//!   derive implementations of a trait of your own.
-//!
-//! - **Parser combinators** — Parsing in Syn is built on a suite of public
-//!   parser combinator macros that you can use for parsing any token-based
-//!   syntax you dream up within a `functionlike!(...)` procedural macro. Every
-//!   syntax tree node defined by Syn is individually parsable and may be used
-//!   as a building block for custom syntaxes, or you may do it all yourself
-//!   working from the most primitive tokens.
-//!
-//! - **Location information** — Every token parsed by Syn is associated with a
-//!   `Span` that tracks line and column information back to the source of that
-//!   token. These spans allow a procedural macro to display detailed error
-//!   messages pointing to all the right places in the user's code. There is an
-//!   example of this below.
-//!
-//! - **Feature flags** — Functionality is aggressively feature gated so your
-//!   procedural macros enable only what they need, and do not pay in compile
-//!   time for all the rest.
-//!
-//! [`syn::File`]: struct.File.html
-//! [`syn::Item`]: enum.Item.html
-//! [`syn::Expr`]: enum.Expr.html
-//! [`syn::Type`]: enum.Type.html
-//! [`syn::DeriveInput`]: struct.DeriveInput.html
-//!
-//! *Version requirement: Syn supports any compiler version back to Rust's very
-//! first support for procedural macros in Rust 1.15.0. Some features especially
-//! around error reporting are only available in newer compilers or on the
-//! nightly channel.*
-//!
-//! ## Example of a custom derive
-//!
-//! The canonical custom derive using Syn looks like this. We write an ordinary
-//! Rust function tagged with a `proc_macro_derive` attribute and the name of
-//! the trait we are deriving. Any time that derive appears in the user's code,
-//! the Rust compiler passes their data structure as tokens into our macro. We
-//! get to execute arbitrary Rust code to figure out what to do with those
-//! tokens, then hand some tokens back to the compiler to compile into the
-//! user's crate.
-//!
-//! [`TokenStream`]: https://doc.rust-lang.org/proc_macro/struct.TokenStream.html
-//!
-//! ```toml
-//! [dependencies]
-//! syn = "0.14"
-//! quote = "0.6"
-//!
-//! [lib]
-//! proc-macro = true
-//! ```
-//!
-//! ```rust
-//! extern crate proc_macro;
-//! extern crate syn;
-//!
-//! #[macro_use]
-//! extern crate quote;
-//!
-//! use proc_macro::TokenStream;
-//! use syn::DeriveInput;
-//!
-//! # const IGNORE_TOKENS: &str = stringify! {
-//! #[proc_macro_derive(MyMacro)]
-//! # };
-//! pub fn my_macro(input: TokenStream) -> TokenStream {
-//!     // Parse the input tokens into a syntax tree
-//!     let input: DeriveInput = syn::parse(input).unwrap();
-//!
-//!     // Build the output, possibly using quasi-quotation
-//!     let expanded = quote! {
-//!         // ...
-//!     };
-//!
-//!     // Hand the output tokens back to the compiler
-//!     expanded.into()
-//! }
-//! #
-//! # fn main() {}
-//! ```
-//!
-//! The [`heapsize`] example directory shows a complete working Macros 1.1
-//! implementation of a custom derive. It works on any Rust compiler \>=1.15.0.
-//! The example derives a `HeapSize` trait which computes an estimate of the
-//! amount of heap memory owned by a value.
-//!
-//! [`heapsize`]: https://github.com/dtolnay/syn/tree/master/examples/heapsize
-//!
-//! ```rust
-//! pub trait HeapSize {
-//!     /// Total number of bytes of heap memory owned by `self`.
-//!     fn heap_size_of_children(&self) -> usize;
-//! }
-//! ```
-//!
-//! The custom derive allows users to write `#[derive(HeapSize)]` on data
-//! structures in their program.
-//!
-//! ```rust
-//! # const IGNORE_TOKENS: &str = stringify! {
-//! #[derive(HeapSize)]
-//! # };
-//! struct Demo<'a, T: ?Sized> {
-//!     a: Box<T>,
-//!     b: u8,
-//!     c: &'a str,
-//!     d: String,
-//! }
-//! ```
-//!
-//! ## Spans and error reporting
-//!
-//! The [`heapsize2`] example directory is an extension of the `heapsize`
-//! example that demonstrates some of the hygiene and error reporting properties
-//! of Macros 2.0. This example currently requires a nightly Rust compiler
-//! \>=1.24.0-nightly but we are working to stabilize all of the APIs involved.
-//!
-//! [`heapsize2`]: https://github.com/dtolnay/syn/tree/master/examples/heapsize2
-//!
-//! The token-based procedural macro API provides great control over where the
-//! compiler's error messages are displayed in user code. Consider the error the
-//! user sees if one of their field types does not implement `HeapSize`.
-//!
-//! ```rust
-//! # const IGNORE_TOKENS: &str = stringify! {
-//! #[derive(HeapSize)]
-//! # };
-//! struct Broken {
-//!     ok: String,
-//!     bad: std::thread::Thread,
-//! }
-//! ```
-//!
-//! In the Macros 1.1 string-based procedural macro world, the resulting error
-//! would point unhelpfully to the invocation of the derive macro and not to the
-//! actual problematic field.
-//!
-//! ```text
-//! error[E0599]: no method named `heap_size_of_children` found for type `std::thread::Thread` in the current scope
-//!  --> src/main.rs:4:10
-//!   |
-//! 4 | #[derive(HeapSize)]
-//!   |          ^^^^^^^^
-//! ```
-//!
-//! By tracking span information all the way through the expansion of a
-//! procedural macro as shown in the `heapsize2` example, token-based macros in
-//! Syn are able to trigger errors that directly pinpoint the source of the
-//! problem.
-//!
-//! ```text
-//! error[E0277]: the trait bound `std::thread::Thread: HeapSize` is not satisfied
-//!  --> src/main.rs:7:5
-//!   |
-//! 7 |     bad: std::thread::Thread,
-//!   |     ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `HeapSize` is not implemented for `Thread`
-//! ```
-//!
-//! ## Parsing a custom syntax using combinators
-//!
-//! The [`lazy-static`] example directory shows the implementation of a
-//! `functionlike!(...)` procedural macro in which the input tokens are parsed
-//! using [`nom`]-style parser combinators.
-//!
-//! [`lazy-static`]: https://github.com/dtolnay/syn/tree/master/examples/lazy-static
-//! [`nom`]: https://github.com/Geal/nom
-//!
-//! The example reimplements the popular `lazy_static` crate from crates.io as a
-//! procedural macro.
-//!
-//! ```
-//! # macro_rules! lazy_static {
-//! #     ($($tt:tt)*) => {}
-//! # }
-//! #
-//! lazy_static! {
-//!     static ref USERNAME: Regex = Regex::new("^[a-z0-9_-]{3,16}$").unwrap();
-//! }
-//! ```
-//!
-//! The implementation shows how to trigger custom warnings and error messages
-//! on the macro input.
-//!
-//! ```text
-//! warning: come on, pick a more creative name
-//!   --> src/main.rs:10:16
-//!    |
-//! 10 |     static ref FOO: String = "lazy_static".to_owned();
-//!    |                ^^^
-//! ```
-//!
-//! ## Debugging
-//!
-//! When developing a procedural macro it can be helpful to look at what the
-//! generated code looks like. Use `cargo rustc -- -Zunstable-options
-//! --pretty=expanded` or the [`cargo expand`] subcommand.
-//!
-//! [`cargo expand`]: https://github.com/dtolnay/cargo-expand
-//!
-//! To show the expanded code for some crate that uses your procedural macro,
-//! run `cargo expand` from that crate. To show the expanded code for one of
-//! your own test cases, run `cargo expand --test the_test_case` where the last
-//! argument is the name of the test file without the `.rs` extension.
-//!
-//! This write-up by Brandon W Maister discusses debugging in more detail:
-//! [Debugging Rust's new Custom Derive system][debugging].
-//!
-//! [debugging]: https://quodlibetor.github.io/posts/debugging-rusts-new-custom-derive-system/
-//!
-//! ## Optional features
-//!
-//! Syn puts a lot of functionality behind optional features in order to
-//! optimize compile time for the most common use cases. The following features
-//! are available.
-//!
-//! - **`derive`** *(enabled by default)* — Data structures for representing the
-//!   possible input to a custom derive, including structs and enums and types.
-//! - **`full`** — Data structures for representing the syntax tree of all valid
-//!   Rust source code, including items and expressions.
-//! - **`parsing`** *(enabled by default)* — Ability to parse input tokens into
-//!   a syntax tree node of a chosen type.
-//! - **`printing`** *(enabled by default)* — Ability to print a syntax tree
-//!   node as tokens of Rust source code.
-//! - **`visit`** — Trait for traversing a syntax tree.
-//! - **`visit-mut`** — Trait for traversing and mutating in place a syntax
-//!   tree.
-//! - **`fold`** — Trait for transforming an owned syntax tree.
-//! - **`clone-impls`** *(enabled by default)* — Clone impls for all syntax tree
-//!   types.
-//! - **`extra-traits`** — Debug, Eq, PartialEq, Hash impls for all syntax tree
-//!   types.
-//! - **`proc-macro`** *(enabled by default)* — Runtime dependency on the
-//!   dynamic library libproc_macro from rustc toolchain.
-
-// Syn types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/syn/0.14.6")]
-#![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
-// Ignored clippy lints.
-#![cfg_attr(
-    feature = "cargo-clippy",
-    allow(
-        const_static_lifetime,
-        doc_markdown,
-        large_enum_variant,
-        match_bool,
-        redundant_closure,
-        needless_pass_by_value,
-        redundant_field_names,
-        trivially_copy_pass_by_ref
-    )
-)]
-// Ignored clippy_pedantic lints.
-#![cfg_attr(
-    feature = "cargo-clippy",
-    allow(
-        cast_possible_truncation,
-        cast_possible_wrap,
-        if_not_else,
-        indexing_slicing,
-        items_after_statements,
-        similar_names,
-        single_match_else,
-        stutter,
-        unseparated_literal_suffix,
-        use_self,
-        used_underscore_binding
-    )
-)]
-
-#[cfg(feature = "proc-macro")]
-extern crate proc_macro;
-extern crate proc_macro2;
-extern crate unicode_xid;
-
-#[cfg(feature = "printing")]
-extern crate quote;
-
-#[cfg(feature = "parsing")]
-#[macro_use]
-#[doc(hidden)]
-pub mod parsers;
-
-#[macro_use]
-mod macros;
-
-#[macro_use]
-pub mod token;
-
-pub use proc_macro2::Ident;
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod attr;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use attr::{AttrStyle, Attribute, Meta, MetaList, MetaNameValue, NestedMeta};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod data;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use data::{
-    Field, Fields, FieldsNamed, FieldsUnnamed, Variant, VisCrate, VisPublic, VisRestricted,
-    Visibility,
-};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod expr;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use expr::{
-    Expr, ExprArray, ExprAssign, ExprAssignOp, ExprBinary, ExprBlock, ExprBox, ExprBreak, ExprCall,
-    ExprCast, ExprCatch, ExprClosure, ExprContinue, ExprField, ExprForLoop, ExprGroup, ExprIf,
-    ExprIfLet, ExprInPlace, ExprIndex, ExprLit, ExprLoop, ExprMacro, ExprMatch, ExprMethodCall,
-    ExprParen, ExprPath, ExprRange, ExprReference, ExprRepeat, ExprReturn, ExprStruct, ExprTry,
-    ExprTuple, ExprType, ExprUnary, ExprUnsafe, ExprVerbatim, ExprWhile, ExprWhileLet, ExprYield,
-    Index, Member,
-};
-
-#[cfg(feature = "full")]
-pub use expr::{
-    Arm, Block, FieldPat, FieldValue, GenericMethodArgument, Label, Local, MethodTurbofish, Pat,
-    PatBox, PatIdent, PatLit, PatMacro, PatPath, PatRange, PatRef, PatSlice, PatStruct, PatTuple,
-    PatTupleStruct, PatVerbatim, PatWild, RangeLimits, Stmt,
-};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod generics;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use generics::{
-    BoundLifetimes, ConstParam, GenericParam, Generics, LifetimeDef, PredicateEq,
-    PredicateLifetime, PredicateType, TraitBound, TraitBoundModifier, TypeParam, TypeParamBound,
-    WhereClause, WherePredicate,
-};
-#[cfg(
-    all(
-        any(feature = "full", feature = "derive"),
-        feature = "printing"
-    )
-)]
-pub use generics::{ImplGenerics, Turbofish, TypeGenerics};
-
-#[cfg(feature = "full")]
-mod item;
-#[cfg(feature = "full")]
-pub use item::{
-    ArgCaptured, ArgSelf, ArgSelfRef, FnArg, FnDecl, ForeignItem, ForeignItemFn, ForeignItemStatic,
-    ForeignItemType, ForeignItemVerbatim, ImplItem, ImplItemConst, ImplItemMacro, ImplItemMethod,
-    ImplItemType, ImplItemVerbatim, Item, ItemConst, ItemEnum, ItemExternCrate, ItemFn,
-    ItemForeignMod, ItemImpl, ItemMacro, ItemMacro2, ItemMod, ItemStatic, ItemStruct, ItemTrait,
-    ItemType, ItemUnion, ItemUse, ItemVerbatim, MethodSig, TraitItem, TraitItemConst,
-    TraitItemMacro, TraitItemMethod, TraitItemType, TraitItemVerbatim, UseGlob, UseGroup, UseName,
-    UsePath, UseRename, UseTree,
-};
-
-#[cfg(feature = "full")]
-mod file;
-#[cfg(feature = "full")]
-pub use file::File;
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod lifetime;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use lifetime::Lifetime;
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod lit;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use lit::{
-    FloatSuffix, IntSuffix, Lit, LitBool, LitByte, LitByteStr, LitChar, LitFloat, LitInt, LitStr,
-    LitVerbatim, StrStyle,
-};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod mac;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use mac::{Macro, MacroDelimiter};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod derive;
-#[cfg(feature = "derive")]
-pub use derive::{Data, DataEnum, DataStruct, DataUnion, DeriveInput};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod op;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use op::{BinOp, UnOp};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod ty;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use ty::{
-    Abi, BareFnArg, BareFnArgName, ReturnType, Type, TypeArray, TypeBareFn, TypeGroup,
-    TypeImplTrait, TypeInfer, TypeMacro, TypeNever, TypeParen, TypePath, TypePtr, TypeReference,
-    TypeSlice, TypeTraitObject, TypeTuple, TypeVerbatim,
-};
-
-#[cfg(any(feature = "full", feature = "derive"))]
-mod path;
-#[cfg(
-    all(
-        any(feature = "full", feature = "derive"),
-        feature = "printing"
-    )
-)]
-pub use path::PathTokens;
-#[cfg(any(feature = "full", feature = "derive"))]
-pub use path::{
-    AngleBracketedGenericArguments, Binding, GenericArgument, ParenthesizedGenericArguments, Path,
-    PathArguments, PathSegment, QSelf,
-};
-
-#[cfg(feature = "parsing")]
-pub mod buffer;
-pub mod punctuated;
-#[cfg(feature = "parsing")]
-pub mod synom;
-#[cfg(any(feature = "full", feature = "derive"))]
-mod tt;
-
-// Not public API except the `parse_quote!` macro.
-#[cfg(feature = "parsing")]
-#[doc(hidden)]
-pub mod parse_quote;
-
-#[cfg(all(feature = "parsing", feature = "printing"))]
-pub mod spanned;
-
-#[cfg(all(feature = "parsing", feature = "full"))]
-mod verbatim;
-
-mod gen {
-    /// Syntax tree traversal to walk a shared borrow of a syntax tree.
-    ///
-    /// Each method of the [`Visit`] trait is a hook that can be overridden to
-    /// customize the behavior when visiting the corresponding type of node. By
-    /// default, every method recursively visits the substructure of the input
-    /// by invoking the right visitor method of each of its fields.
-    ///
-    /// [`Visit`]: trait.Visit.html
-    ///
-    /// ```rust
-    /// # use syn::{Attribute, BinOp, Expr, ExprBinary};
-    /// #
-    /// pub trait Visit<'ast> {
-    ///     /* ... */
-    ///
-    ///     fn visit_expr_binary(&mut self, node: &'ast ExprBinary) {
-    ///         for attr in &node.attrs {
-    ///             self.visit_attribute(attr);
-    ///         }
-    ///         self.visit_expr(&*node.left);
-    ///         self.visit_bin_op(&node.op);
-    ///         self.visit_expr(&*node.right);
-    ///     }
-    ///
-    ///     /* ... */
-    ///     # fn visit_attribute(&mut self, node: &'ast Attribute);
-    ///     # fn visit_expr(&mut self, node: &'ast Expr);
-    ///     # fn visit_bin_op(&mut self, node: &'ast BinOp);
-    /// }
-    /// ```
-    ///
-    /// *This module is available if Syn is built with the `"visit"` feature.*
-    #[cfg(feature = "visit")]
-    pub mod visit;
-
-    /// Syntax tree traversal to mutate an exclusive borrow of a syntax tree in
-    /// place.
-    ///
-    /// Each method of the [`VisitMut`] trait is a hook that can be overridden
-    /// to customize the behavior when mutating the corresponding type of node.
-    /// By default, every method recursively visits the substructure of the
-    /// input by invoking the right visitor method of each of its fields.
-    ///
-    /// [`VisitMut`]: trait.VisitMut.html
-    ///
-    /// ```rust
-    /// # use syn::{Attribute, BinOp, Expr, ExprBinary};
-    /// #
-    /// pub trait VisitMut {
-    ///     /* ... */
-    ///
-    ///     fn visit_expr_binary_mut(&mut self, node: &mut ExprBinary) {
-    ///         for attr in &mut node.attrs {
-    ///             self.visit_attribute_mut(attr);
-    ///         }
-    ///         self.visit_expr_mut(&mut *node.left);
-    ///         self.visit_bin_op_mut(&mut node.op);
-    ///         self.visit_expr_mut(&mut *node.right);
-    ///     }
-    ///
-    ///     /* ... */
-    ///     # fn visit_attribute_mut(&mut self, node: &mut Attribute);
-    ///     # fn visit_expr_mut(&mut self, node: &mut Expr);
-    ///     # fn visit_bin_op_mut(&mut self, node: &mut BinOp);
-    /// }
-    /// ```
-    ///
-    /// *This module is available if Syn is built with the `"visit-mut"`
-    /// feature.*
-    #[cfg(feature = "visit-mut")]
-    pub mod visit_mut;
-
-    /// Syntax tree traversal to transform the nodes of an owned syntax tree.
-    ///
-    /// Each method of the [`Fold`] trait is a hook that can be overridden to
-    /// customize the behavior when transforming the corresponding type of node.
-    /// By default, every method recursively visits the substructure of the
-    /// input by invoking the right visitor method of each of its fields.
-    ///
-    /// [`Fold`]: trait.Fold.html
-    ///
-    /// ```rust
-    /// # use syn::{Attribute, BinOp, Expr, ExprBinary};
-    /// #
-    /// pub trait Fold {
-    ///     /* ... */
-    ///
-    ///     fn fold_expr_binary(&mut self, node: ExprBinary) -> ExprBinary {
-    ///         ExprBinary {
-    ///             attrs: node.attrs
-    ///                        .into_iter()
-    ///                        .map(|attr| self.fold_attribute(attr))
-    ///                        .collect(),
-    ///             left: Box::new(self.fold_expr(*node.left)),
-    ///             op: self.fold_bin_op(node.op),
-    ///             right: Box::new(self.fold_expr(*node.right)),
-    ///         }
-    ///     }
-    ///
-    ///     /* ... */
-    ///     # fn fold_attribute(&mut self, node: Attribute) -> Attribute;
-    ///     # fn fold_expr(&mut self, node: Expr) -> Expr;
-    ///     # fn fold_bin_op(&mut self, node: BinOp) -> BinOp;
-    /// }
-    /// ```
-    ///
-    /// *This module is available if Syn is built with the `"fold"` feature.*
-    #[cfg(feature = "fold")]
-    pub mod fold;
-
-    #[cfg(any(feature = "full", feature = "derive"))]
-    #[path = "../gen_helper.rs"]
-    mod helper;
-}
-pub use gen::*;
-
-////////////////////////////////////////////////////////////////////////////////
-
-#[cfg(feature = "parsing")]
-use synom::{Parser, Synom};
-
-#[cfg(feature = "parsing")]
-mod error;
-#[cfg(feature = "parsing")]
-use error::ParseError;
-
-// Not public API.
-#[cfg(feature = "parsing")]
-#[doc(hidden)]
-pub use error::parse_error;
-
-/// Parse tokens of source code into the chosen syntax tree node.
-///
-/// This is preferred over parsing a string because tokens are able to preserve
-/// information about where in the user's code they were originally written (the
-/// "span" of the token), possibly allowing the compiler to produce better error
-/// messages.
-///
-/// This function parses a `proc_macro::TokenStream` which is the type used for
-/// interop with the compiler in a procedural macro. To parse a
-/// `proc_macro2::TokenStream`, use [`syn::parse2`] instead.
-///
-/// [`syn::parse2`]: fn.parse2.html
-///
-/// *This function is available if Syn is built with both the `"parsing"` and
-/// `"proc-macro"` features.*
-///
-/// # Examples
-///
-/// ```rust
-/// extern crate proc_macro;
-/// use proc_macro::TokenStream;
-///
-/// extern crate syn;
-///
-/// #[macro_use]
-/// extern crate quote;
-///
-/// use syn::DeriveInput;
-///
-/// # const IGNORE_TOKENS: &str = stringify! {
-/// #[proc_macro_derive(MyMacro)]
-/// # };
-/// pub fn my_macro(input: TokenStream) -> TokenStream {
-///     // Parse the tokens into a syntax tree
-///     let ast: DeriveInput = syn::parse(input).unwrap();
-///
-///     // Build the output, possibly using quasi-quotation
-///     let expanded = quote! {
-///         /* ... */
-///     };
-///
-///     // Convert into a token stream and return it
-///     expanded.into()
-/// }
-/// #
-/// # fn main() {}
-/// ```
-#[cfg(all(feature = "parsing", feature = "proc-macro"))]
-pub fn parse<T>(tokens: proc_macro::TokenStream) -> Result<T, ParseError>
-where
-    T: Synom,
-{
-    parse2(tokens.into())
-}
-
-/// Parse a proc-macro2 token stream into the chosen syntax tree node.
-///
-/// This function parses a `proc_macro2::TokenStream` which is commonly useful
-/// when the input comes from a node of the Syn syntax tree, for example the tts
-/// of a [`Macro`] node. When in a procedural macro parsing the
-/// `proc_macro::TokenStream` provided by the compiler, use [`syn::parse`]
-/// instead.
-///
-/// [`Macro`]: struct.Macro.html
-/// [`syn::parse`]: fn.parse.html
-///
-/// *This function is available if Syn is built with the `"parsing"` feature.*
-#[cfg(feature = "parsing")]
-pub fn parse2<T>(tokens: proc_macro2::TokenStream) -> Result<T, ParseError>
-where
-    T: Synom,
-{
-    let parser = T::parse;
-    parser.parse2(tokens).map_err(|err| match T::description() {
-        Some(s) => ParseError::new(format!("failed to parse {}: {}", s, err)),
-        None => err,
-    })
-}
-
-/// Parse a string of Rust code into the chosen syntax tree node.
-///
-/// *This function is available if Syn is built with the `"parsing"` feature.*
-///
-/// # Hygiene
-///
-/// Every span in the resulting syntax tree will be set to resolve at the macro
-/// call site.
-///
-/// # Examples
-///
-/// ```rust
-/// extern crate syn;
-/// #
-/// #
-/// # type Result<T> = std::result::Result<T, Box<std::error::Error>>;
-///
-/// use syn::Expr;
-///
-/// fn run() -> Result<()> {
-///     let code = "assert_eq!(u8::max_value(), 255)";
-///     let expr = syn::parse_str::<Expr>(code)?;
-///     println!("{:#?}", expr);
-///     Ok(())
-/// }
-/// #
-/// # fn main() { run().unwrap() }
-/// ```
-#[cfg(feature = "parsing")]
-pub fn parse_str<T: Synom>(s: &str) -> Result<T, ParseError> {
-    match s.parse() {
-        Ok(tts) => parse2(tts),
-        Err(_) => Err(ParseError::new("error while lexing input string")),
-    }
-}
-
-// FIXME the name parse_file makes it sound like you might pass in a path to a
-// file, rather than the content.
-/// Parse the content of a file of Rust code.
-///
-/// This is different from `syn::parse_str::<File>(content)` in two ways:
-///
-/// - It discards a leading byte order mark `\u{FEFF}` if the file has one.
-/// - It preserves the shebang line of the file, such as `#!/usr/bin/env rustx`.
-///
-/// If present, either of these would be an error using `from_str`.
-///
-/// *This function is available if Syn is built with the `"parsing"` and `"full"` features.*
-///
-/// # Examples
-///
-/// ```rust,no_run
-/// extern crate syn;
-/// #
-/// #
-/// # type Result<T> = std::result::Result<T, Box<std::error::Error>>;
-///
-/// use std::fs::File;
-/// use std::io::Read;
-///
-/// fn run() -> Result<()> {
-///     let mut file = File::open("path/to/code.rs")?;
-///     let mut content = String::new();
-///     file.read_to_string(&mut content)?;
-///
-///     let ast = syn::parse_file(&content)?;
-///     if let Some(shebang) = ast.shebang {
-///         println!("{}", shebang);
-///     }
-///     println!("{} items", ast.items.len());
-///
-///     Ok(())
-/// }
-/// #
-/// # fn main() { run().unwrap() }
-/// ```
-#[cfg(all(feature = "parsing", feature = "full"))]
-pub fn parse_file(mut content: &str) -> Result<File, ParseError> {
-    // Strip the BOM if it is present
-    const BOM: &'static str = "\u{feff}";
-    if content.starts_with(BOM) {
-        content = &content[BOM.len()..];
-    }
-
-    let mut shebang = None;
-    if content.starts_with("#!") && !content.starts_with("#![") {
-        if let Some(idx) = content.find('\n') {
-            shebang = Some(content[..idx].to_string());
-            content = &content[idx..];
-        } else {
-            shebang = Some(content.to_string());
-            content = "";
-        }
-    }
-
-    let mut file: File = parse_str(content)?;
-    file.shebang = shebang;
-    Ok(file)
-}
-
-#[cfg(
-    all(
-        any(feature = "full", feature = "derive"),
-        feature = "printing"
-    )
-)]
-struct TokensOrDefault<'a, T: 'a>(&'a Option<T>);
-
-#[cfg(
-    all(
-        any(feature = "full", feature = "derive"),
-        feature = "printing"
-    )
-)]
-impl<'a, T> quote::ToTokens for TokensOrDefault<'a, T>
-where
-    T: quote::ToTokens + Default,
-{
-    fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
-        match *self.0 {
-            Some(ref t) => t.to_tokens(tokens),
-            None => T::default().to_tokens(tokens),
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/lifetime.rs b/third_party/rust/syn-0.14.6/src/lifetime.rs
deleted file mode 100644
index 5ca876ff88be..000000000000
--- a/third_party/rust/syn-0.14.6/src/lifetime.rs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::cmp::Ordering;
-use std::fmt::{self, Display};
-use std::hash::{Hash, Hasher};
-
-use proc_macro2::{Ident, Span};
-use unicode_xid::UnicodeXID;
-
-use token::Apostrophe;
-
-/// A Rust lifetime: `'a`.
-///
-/// Lifetime names must conform to the following rules:
-///
-/// - Must start with an apostrophe.
-/// - Must not consist of just an apostrophe: `'`.
-/// - Character after the apostrophe must be `_` or a Unicode code point with
-///   the XID_Start property.
-/// - All following characters must be Unicode code points with the XID_Continue
-///   property.
-///
-/// *This type is available if Syn is built with the `"derive"` or `"full"`
-/// feature.*
-#[cfg_attr(feature = "extra-traits", derive(Debug))]
-#[derive(Clone)]
-pub struct Lifetime {
-    pub apostrophe: Apostrophe,
-    pub ident: Ident,
-}
-
-impl Lifetime {
-    pub fn new(s: &str, span: Span) -> Self {
-        if !s.starts_with('\'') {
-            panic!(
-                "lifetime name must start with apostrophe as in \"'a\", got {:?}",
-                s
-            );
-        }
-
-        if s == "'" {
-            panic!("lifetime name must not be empty");
-        }
-
-        fn xid_ok(s: &str) -> bool {
-            let mut chars = s.chars();
-            let first = chars.next().unwrap();
-            if !(UnicodeXID::is_xid_start(first) || first == '_') {
-                return false;
-            }
-            for ch in chars {
-                if !UnicodeXID::is_xid_continue(ch) {
-                    return false;
-                }
-            }
-            true
-        }
-
-        if !xid_ok(&s[1..]) {
-            panic!("{:?} is not a valid lifetime name", s);
-        }
-
-        Lifetime {
-            apostrophe: Apostrophe::default(),
-            ident: Ident::new(&s[1..], span),
-        }
-    }
-}
-
-impl Display for Lifetime {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        "'".fmt(formatter)?;
-        self.ident.fmt(formatter)
-    }
-}
-
-impl PartialEq for Lifetime {
-    fn eq(&self, other: &Lifetime) -> bool {
-        self.ident.eq(&other.ident)
-    }
-}
-
-impl Eq for Lifetime {}
-
-impl PartialOrd for Lifetime {
-    fn partial_cmp(&self, other: &Lifetime) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for Lifetime {
-    fn cmp(&self, other: &Lifetime) -> Ordering {
-        self.ident.cmp(&other.ident)
-    }
-}
-
-impl Hash for Lifetime {
-    fn hash<H: Hasher>(&self, h: &mut H) {
-        self.ident.hash(h)
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use buffer::Cursor;
-    use parse_error;
-    use synom::PResult;
-    use synom::Synom;
-
-    impl Synom for Lifetime {
-        fn parse(input: Cursor) -> PResult<Self> {
-            let (apostrophe, rest) = Apostrophe::parse(input)?;
-            let (ident, rest) = match rest.ident() {
-                Some(pair) => pair,
-                None => return parse_error(),
-            };
-
-            let ret = Lifetime {
-                ident: ident,
-                apostrophe: apostrophe,
-            };
-            Ok((ret, rest))
-        }
-
-        fn description() -> Option<&'static str> {
-            Some("lifetime")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use proc_macro2::TokenStream;
-    use quote::ToTokens;
-
-    impl ToTokens for Lifetime {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.apostrophe.to_tokens(tokens);
-            self.ident.to_tokens(tokens);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/lit.rs b/third_party/rust/syn-0.14.6/src/lit.rs
deleted file mode 100644
index 47555d436cdf..000000000000
--- a/third_party/rust/syn-0.14.6/src/lit.rs
+++ /dev/null
@@ -1,1026 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use proc_macro2::{Literal, Span};
-use std::str;
-
-#[cfg(feature = "printing")]
-use proc_macro2::Ident;
-
-#[cfg(feature = "parsing")]
-use proc_macro2::TokenStream;
-#[cfg(feature = "parsing")]
-use {ParseError, Synom};
-
-use proc_macro2::TokenTree;
-
-#[cfg(feature = "extra-traits")]
-use std::hash::{Hash, Hasher};
-
-ast_enum_of_structs! {
-    /// A Rust literal such as a string or integer or boolean.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum Lit {
-        /// A UTF-8 string literal: `"foo"`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Str(LitStr #manual_extra_traits {
-            token: Literal,
-        }),
-
-        /// A byte string literal: `b"foo"`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub ByteStr(LitByteStr #manual_extra_traits {
-            token: Literal,
-        }),
-
-        /// A byte literal: `b'f'`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Byte(LitByte #manual_extra_traits {
-            token: Literal,
-        }),
-
-        /// A character literal: `'a'`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Char(LitChar #manual_extra_traits {
-            token: Literal,
-        }),
-
-        /// An integer literal: `1` or `1u16`.
-        ///
-        /// Holds up to 64 bits of data. Use `LitVerbatim` for any larger
-        /// integer literal.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Int(LitInt #manual_extra_traits {
-            token: Literal,
-        }),
-
-        /// A floating point literal: `1f64` or `1.0e10f64`.
-        ///
-        /// Must be finite. May not be infinte or NaN.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Float(LitFloat #manual_extra_traits {
-            token: Literal,
-        }),
-
-        /// A boolean literal: `true` or `false`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Bool(LitBool #manual_extra_traits {
-            pub value: bool,
-            pub span: Span,
-        }),
-
-        /// A raw token literal not interpreted by Syn, possibly because it
-        /// represents an integer larger than 64 bits.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Verbatim(LitVerbatim #manual_extra_traits {
-            pub token: Literal,
-        }),
-    }
-}
-
-impl LitStr {
-    pub fn new(value: &str, span: Span) -> Self {
-        let mut lit = Literal::string(value);
-        lit.set_span(span);
-        LitStr { token: lit }
-    }
-
-    pub fn value(&self) -> String {
-        value::parse_lit_str(&self.token.to_string())
-    }
-
-    /// Parse a syntax tree node from the content of this string literal.
-    ///
-    /// All spans in the syntax tree will point to the span of this `LitStr`.
-    #[cfg(feature = "parsing")]
-    pub fn parse<T: Synom>(&self) -> Result<T, ParseError> {
-        use proc_macro2::Group;
-
-        // Parse string literal into a token stream with every span equal to the
-        // original literal's span.
-        fn spanned_tokens(s: &LitStr) -> Result<TokenStream, ParseError> {
-            let stream = ::parse_str(&s.value())?;
-            Ok(respan_token_stream(stream, s.span()))
-        }
-
-        // Token stream with every span replaced by the given one.
-        fn respan_token_stream(stream: TokenStream, span: Span) -> TokenStream {
-            stream
-                .into_iter()
-                .map(|token| respan_token_tree(token, span))
-                .collect()
-        }
-
-        // Token tree with every span replaced by the given one.
-        fn respan_token_tree(mut token: TokenTree, span: Span) -> TokenTree {
-            match token {
-                TokenTree::Group(ref mut g) => {
-                    let stream = respan_token_stream(g.stream().clone(), span);
-                    *g = Group::new(g.delimiter(), stream);
-                    g.set_span(span);
-                }
-                ref mut other => other.set_span(span),
-            }
-            token
-        }
-
-        spanned_tokens(self).and_then(::parse2)
-    }
-
-    pub fn span(&self) -> Span {
-        self.token.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.token.set_span(span)
-    }
-}
-
-impl LitByteStr {
-    pub fn new(value: &[u8], span: Span) -> Self {
-        let mut token = Literal::byte_string(value);
-        token.set_span(span);
-        LitByteStr { token: token }
-    }
-
-    pub fn value(&self) -> Vec<u8> {
-        value::parse_lit_byte_str(&self.token.to_string())
-    }
-
-    pub fn span(&self) -> Span {
-        self.token.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.token.set_span(span)
-    }
-}
-
-impl LitByte {
-    pub fn new(value: u8, span: Span) -> Self {
-        let mut token = Literal::u8_suffixed(value);
-        token.set_span(span);
-        LitByte { token: token }
-    }
-
-    pub fn value(&self) -> u8 {
-        value::parse_lit_byte(&self.token.to_string())
-    }
-
-    pub fn span(&self) -> Span {
-        self.token.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.token.set_span(span)
-    }
-}
-
-impl LitChar {
-    pub fn new(value: char, span: Span) -> Self {
-        let mut token = Literal::character(value);
-        token.set_span(span);
-        LitChar { token: token }
-    }
-
-    pub fn value(&self) -> char {
-        value::parse_lit_char(&self.token.to_string())
-    }
-
-    pub fn span(&self) -> Span {
-        self.token.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.token.set_span(span)
-    }
-}
-
-impl LitInt {
-    pub fn new(value: u64, suffix: IntSuffix, span: Span) -> Self {
-        let mut token = match suffix {
-            IntSuffix::Isize => Literal::isize_suffixed(value as isize),
-            IntSuffix::I8 => Literal::i8_suffixed(value as i8),
-            IntSuffix::I16 => Literal::i16_suffixed(value as i16),
-            IntSuffix::I32 => Literal::i32_suffixed(value as i32),
-            IntSuffix::I64 => Literal::i64_suffixed(value as i64),
-            IntSuffix::I128 => value::to_literal(&format!("{}i128", value)),
-            IntSuffix::Usize => Literal::usize_suffixed(value as usize),
-            IntSuffix::U8 => Literal::u8_suffixed(value as u8),
-            IntSuffix::U16 => Literal::u16_suffixed(value as u16),
-            IntSuffix::U32 => Literal::u32_suffixed(value as u32),
-            IntSuffix::U64 => Literal::u64_suffixed(value),
-            IntSuffix::U128 => value::to_literal(&format!("{}u128", value)),
-            IntSuffix::None => Literal::u64_unsuffixed(value),
-        };
-        token.set_span(span);
-        LitInt { token: token }
-    }
-
-    pub fn value(&self) -> u64 {
-        value::parse_lit_int(&self.token.to_string()).unwrap()
-    }
-
-    pub fn suffix(&self) -> IntSuffix {
-        let value = self.token.to_string();
-        for (s, suffix) in vec![
-            ("i8", IntSuffix::I8),
-            ("i16", IntSuffix::I16),
-            ("i32", IntSuffix::I32),
-            ("i64", IntSuffix::I64),
-            ("i128", IntSuffix::I128),
-            ("isize", IntSuffix::Isize),
-            ("u8", IntSuffix::U8),
-            ("u16", IntSuffix::U16),
-            ("u32", IntSuffix::U32),
-            ("u64", IntSuffix::U64),
-            ("u128", IntSuffix::U128),
-            ("usize", IntSuffix::Usize),
-        ] {
-            if value.ends_with(s) {
-                return suffix;
-            }
-        }
-        IntSuffix::None
-    }
-
-    pub fn span(&self) -> Span {
-        self.token.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.token.set_span(span)
-    }
-}
-
-impl LitFloat {
-    pub fn new(value: f64, suffix: FloatSuffix, span: Span) -> Self {
-        let mut token = match suffix {
-            FloatSuffix::F32 => Literal::f32_suffixed(value as f32),
-            FloatSuffix::F64 => Literal::f64_suffixed(value),
-            FloatSuffix::None => Literal::f64_unsuffixed(value),
-        };
-        token.set_span(span);
-        LitFloat { token: token }
-    }
-
-    pub fn value(&self) -> f64 {
-        value::parse_lit_float(&self.token.to_string())
-    }
-
-    pub fn suffix(&self) -> FloatSuffix {
-        let value = self.token.to_string();
-        for (s, suffix) in vec![("f32", FloatSuffix::F32), ("f64", FloatSuffix::F64)] {
-            if value.ends_with(s) {
-                return suffix;
-            }
-        }
-        FloatSuffix::None
-    }
-
-    pub fn span(&self) -> Span {
-        self.token.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.token.set_span(span)
-    }
-}
-
-macro_rules! lit_extra_traits {
-    ($ty:ident, $field:ident) => {
-        #[cfg(feature = "extra-traits")]
-        impl Eq for $ty {}
-
-        #[cfg(feature = "extra-traits")]
-        impl PartialEq for $ty {
-            fn eq(&self, other: &Self) -> bool {
-                self.$field.to_string() == other.$field.to_string()
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl Hash for $ty {
-            fn hash<H>(&self, state: &mut H)
-            where
-                H: Hasher,
-            {
-                self.$field.to_string().hash(state);
-            }
-        }
-    };
-}
-
-impl LitVerbatim {
-    pub fn span(&self) -> Span {
-        self.token.span()
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.token.set_span(span)
-    }
-}
-
-lit_extra_traits!(LitStr, token);
-lit_extra_traits!(LitByteStr, token);
-lit_extra_traits!(LitByte, token);
-lit_extra_traits!(LitChar, token);
-lit_extra_traits!(LitInt, token);
-lit_extra_traits!(LitFloat, token);
-lit_extra_traits!(LitBool, value);
-lit_extra_traits!(LitVerbatim, token);
-
-ast_enum! {
-    /// The style of a string literal, either plain quoted or a raw string like
-    /// `r##"data"##`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum StrStyle #no_visit {
-        /// An ordinary string like `"data"`.
-        Cooked,
-        /// A raw string like `r##"data"##`.
-        ///
-        /// The unsigned integer is the number of `#` symbols used.
-        Raw(usize),
-    }
-}
-
-ast_enum! {
-    /// The suffix on an integer literal if any, like the `u8` in `127u8`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum IntSuffix #no_visit {
-        I8,
-        I16,
-        I32,
-        I64,
-        I128,
-        Isize,
-        U8,
-        U16,
-        U32,
-        U64,
-        U128,
-        Usize,
-        None,
-    }
-}
-
-ast_enum! {
-    /// The suffix on a floating point literal if any, like the `f32` in
-    /// `1.0f32`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum FloatSuffix #no_visit {
-        F32,
-        F64,
-        None,
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use buffer::Cursor;
-    use parse_error;
-    use synom::PResult;
-    use synom::Synom;
-
-    impl Synom for Lit {
-        fn parse(input: Cursor) -> PResult<Self> {
-            match input.literal() {
-                Some((lit, rest)) => {
-                    if lit.to_string().starts_with('/') {
-                        // Doc comment literal which is not a Syn literal
-                        parse_error()
-                    } else {
-                        Ok((Lit::new(lit), rest))
-                    }
-                }
-                _ => match input.ident() {
-                    Some((ident, rest)) => Ok((
-                        Lit::Bool(LitBool {
-                            value: if ident == "true" {
-                                true
-                            } else if ident == "false" {
-                                false
-                            } else {
-                                return parse_error();
-                            },
-                            span: ident.span(),
-                        }),
-                        rest,
-                    )),
-                    _ => parse_error(),
-                },
-            }
-        }
-
-        fn description() -> Option<&'static str> {
-            Some("literal")
-        }
-    }
-
-    impl_synom!(LitStr "string literal" switch!(
-        syn!(Lit),
-        Lit::Str(lit) => value!(lit)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(LitByteStr "byte string literal" switch!(
-        syn!(Lit),
-        Lit::ByteStr(lit) => value!(lit)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(LitByte "byte literal" switch!(
-        syn!(Lit),
-        Lit::Byte(lit) => value!(lit)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(LitChar "character literal" switch!(
-        syn!(Lit),
-        Lit::Char(lit) => value!(lit)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(LitInt "integer literal" switch!(
-        syn!(Lit),
-        Lit::Int(lit) => value!(lit)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(LitFloat "floating point literal" switch!(
-        syn!(Lit),
-        Lit::Float(lit) => value!(lit)
-        |
-        _ => reject!()
-    ));
-
-    impl_synom!(LitBool "boolean literal" switch!(
-        syn!(Lit),
-        Lit::Bool(lit) => value!(lit)
-        |
-        _ => reject!()
-    ));
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use proc_macro2::TokenStream;
-    use quote::{ToTokens, TokenStreamExt};
-
-    impl ToTokens for LitStr {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for LitByteStr {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for LitByte {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for LitChar {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for LitInt {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for LitFloat {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for LitBool {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            let s = if self.value { "true" } else { "false" };
-            tokens.append(Ident::new(s, self.span));
-        }
-    }
-
-    impl ToTokens for LitVerbatim {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.token.to_tokens(tokens);
-        }
-    }
-}
-
-mod value {
-    use super::*;
-    use proc_macro2::TokenStream;
-    use std::char;
-    use std::ops::{Index, RangeFrom};
-
-    impl Lit {
-        /// Interpret a Syn literal from a proc-macro2 literal.
-        ///
-        /// Not all proc-macro2 literals are valid Syn literals. In particular,
-        /// doc comments are considered by proc-macro2 to be literals but in Syn
-        /// they are [`Attribute`].
-        ///
-        /// [`Attribute`]: struct.Attribute.html
-        ///
-        /// # Panics
-        ///
-        /// Panics if the input is a doc comment literal.
-        pub fn new(token: Literal) -> Self {
-            let value = token.to_string();
-
-            match value::byte(&value, 0) {
-                b'"' | b'r' => return Lit::Str(LitStr { token: token }),
-                b'b' => match value::byte(&value, 1) {
-                    b'"' | b'r' => return Lit::ByteStr(LitByteStr { token: token }),
-                    b'\'' => return Lit::Byte(LitByte { token: token }),
-                    _ => {}
-                },
-                b'\'' => return Lit::Char(LitChar { token: token }),
-                b'0'...b'9' => if number_is_int(&value) {
-                    return Lit::Int(LitInt { token: token });
-                } else if number_is_float(&value) {
-                    return Lit::Float(LitFloat { token: token });
-                } else {
-                    // number overflow
-                    return Lit::Verbatim(LitVerbatim { token: token });
-                },
-                _ => if value == "true" || value == "false" {
-                    return Lit::Bool(LitBool {
-                        value: value == "true",
-                        span: token.span(),
-                    });
-                },
-            }
-
-            panic!("Unrecognized literal: {}", value);
-        }
-    }
-
-    fn number_is_int(value: &str) -> bool {
-        if number_is_float(value) {
-            false
-        } else {
-            value::parse_lit_int(value).is_some()
-        }
-    }
-
-    fn number_is_float(value: &str) -> bool {
-        if value.contains('.') {
-            true
-        } else if value.starts_with("0x") || value.ends_with("size") {
-            false
-        } else {
-            value.contains('e') || value.contains('E')
-        }
-    }
-
-    /// Get the byte at offset idx, or a default of `b'\0'` if we're looking
-    /// past the end of the input buffer.
-    pub fn byte<S: AsRef<[u8]> + ?Sized>(s: &S, idx: usize) -> u8 {
-        let s = s.as_ref();
-        if idx < s.len() {
-            s[idx]
-        } else {
-            0
-        }
-    }
-
-    fn next_chr(s: &str) -> char {
-        s.chars().next().unwrap_or('\0')
-    }
-
-    pub fn parse_lit_str(s: &str) -> String {
-        match byte(s, 0) {
-            b'"' => parse_lit_str_cooked(s),
-            b'r' => parse_lit_str_raw(s),
-            _ => unreachable!(),
-        }
-    }
-
-    // Clippy false positive
-    // https://github.com/rust-lang-nursery/rust-clippy/issues/2329
-    #[cfg_attr(feature = "cargo-clippy", allow(needless_continue))]
-    fn parse_lit_str_cooked(mut s: &str) -> String {
-        assert_eq!(byte(s, 0), b'"');
-        s = &s[1..];
-
-        let mut out = String::new();
-        'outer: loop {
-            let ch = match byte(s, 0) {
-                b'"' => break,
-                b'\\' => {
-                    let b = byte(s, 1);
-                    s = &s[2..];
-                    match b {
-                        b'x' => {
-                            let (byte, rest) = backslash_x(s);
-                            s = rest;
-                            assert!(byte <= 0x80, "Invalid \\x byte in string literal");
-                            char::from_u32(u32::from(byte)).unwrap()
-                        }
-                        b'u' => {
-                            let (chr, rest) = backslash_u(s);
-                            s = rest;
-                            chr
-                        }
-                        b'n' => '\n',
-                        b'r' => '\r',
-                        b't' => '\t',
-                        b'\\' => '\\',
-                        b'0' => '\0',
-                        b'\'' => '\'',
-                        b'"' => '"',
-                        b'\r' | b'\n' => loop {
-                            let ch = next_chr(s);
-                            if ch.is_whitespace() {
-                                s = &s[ch.len_utf8()..];
-                            } else {
-                                continue 'outer;
-                            }
-                        },
-                        b => panic!("unexpected byte {:?} after \\ character in byte literal", b),
-                    }
-                }
-                b'\r' => {
-                    assert_eq!(byte(s, 1), b'\n', "Bare CR not allowed in string");
-                    s = &s[2..];
-                    '\n'
-                }
-                _ => {
-                    let ch = next_chr(s);
-                    s = &s[ch.len_utf8()..];
-                    ch
-                }
-            };
-            out.push(ch);
-        }
-
-        assert_eq!(s, "\"");
-        out
-    }
-
-    fn parse_lit_str_raw(mut s: &str) -> String {
-        assert_eq!(byte(s, 0), b'r');
-        s = &s[1..];
-
-        let mut pounds = 0;
-        while byte(s, pounds) == b'#' {
-            pounds += 1;
-        }
-        assert_eq!(byte(s, pounds), b'"');
-        assert_eq!(byte(s, s.len() - pounds - 1), b'"');
-        for end in s[s.len() - pounds..].bytes() {
-            assert_eq!(end, b'#');
-        }
-
-        s[pounds + 1..s.len() - pounds - 1].to_owned()
-    }
-
-    pub fn parse_lit_byte_str(s: &str) -> Vec<u8> {
-        assert_eq!(byte(s, 0), b'b');
-        match byte(s, 1) {
-            b'"' => parse_lit_byte_str_cooked(s),
-            b'r' => parse_lit_byte_str_raw(s),
-            _ => unreachable!(),
-        }
-    }
-
-    // Clippy false positive
-    // https://github.com/rust-lang-nursery/rust-clippy/issues/2329
-    #[cfg_attr(feature = "cargo-clippy", allow(needless_continue))]
-    fn parse_lit_byte_str_cooked(mut s: &str) -> Vec<u8> {
-        assert_eq!(byte(s, 0), b'b');
-        assert_eq!(byte(s, 1), b'"');
-        s = &s[2..];
-
-        // We're going to want to have slices which don't respect codepoint boundaries.
-        let mut s = s.as_bytes();
-
-        let mut out = Vec::new();
-        'outer: loop {
-            let byte = match byte(s, 0) {
-                b'"' => break,
-                b'\\' => {
-                    let b = byte(s, 1);
-                    s = &s[2..];
-                    match b {
-                        b'x' => {
-                            let (b, rest) = backslash_x(s);
-                            s = rest;
-                            b
-                        }
-                        b'n' => b'\n',
-                        b'r' => b'\r',
-                        b't' => b'\t',
-                        b'\\' => b'\\',
-                        b'0' => b'\0',
-                        b'\'' => b'\'',
-                        b'"' => b'"',
-                        b'\r' | b'\n' => loop {
-                            let byte = byte(s, 0);
-                            let ch = char::from_u32(u32::from(byte)).unwrap();
-                            if ch.is_whitespace() {
-                                s = &s[1..];
-                            } else {
-                                continue 'outer;
-                            }
-                        },
-                        b => panic!("unexpected byte {:?} after \\ character in byte literal", b),
-                    }
-                }
-                b'\r' => {
-                    assert_eq!(byte(s, 1), b'\n', "Bare CR not allowed in string");
-                    s = &s[2..];
-                    b'\n'
-                }
-                b => {
-                    s = &s[1..];
-                    b
-                }
-            };
-            out.push(byte);
-        }
-
-        assert_eq!(s, b"\"");
-        out
-    }
-
-    fn parse_lit_byte_str_raw(s: &str) -> Vec<u8> {
-        assert_eq!(byte(s, 0), b'b');
-        parse_lit_str_raw(&s[1..]).into_bytes()
-    }
-
-    pub fn parse_lit_byte(s: &str) -> u8 {
-        assert_eq!(byte(s, 0), b'b');
-        assert_eq!(byte(s, 1), b'\'');
-
-        // We're going to want to have slices which don't respect codepoint boundaries.
-        let mut s = s[2..].as_bytes();
-
-        let b = match byte(s, 0) {
-            b'\\' => {
-                let b = byte(s, 1);
-                s = &s[2..];
-                match b {
-                    b'x' => {
-                        let (b, rest) = backslash_x(s);
-                        s = rest;
-                        b
-                    }
-                    b'n' => b'\n',
-                    b'r' => b'\r',
-                    b't' => b'\t',
-                    b'\\' => b'\\',
-                    b'0' => b'\0',
-                    b'\'' => b'\'',
-                    b'"' => b'"',
-                    b => panic!("unexpected byte {:?} after \\ character in byte literal", b),
-                }
-            }
-            b => {
-                s = &s[1..];
-                b
-            }
-        };
-
-        assert_eq!(byte(s, 0), b'\'');
-        b
-    }
-
-    pub fn parse_lit_char(mut s: &str) -> char {
-        assert_eq!(byte(s, 0), b'\'');
-        s = &s[1..];
-
-        let ch = match byte(s, 0) {
-            b'\\' => {
-                let b = byte(s, 1);
-                s = &s[2..];
-                match b {
-                    b'x' => {
-                        let (byte, rest) = backslash_x(s);
-                        s = rest;
-                        assert!(byte <= 0x80, "Invalid \\x byte in string literal");
-                        char::from_u32(u32::from(byte)).unwrap()
-                    }
-                    b'u' => {
-                        let (chr, rest) = backslash_u(s);
-                        s = rest;
-                        chr
-                    }
-                    b'n' => '\n',
-                    b'r' => '\r',
-                    b't' => '\t',
-                    b'\\' => '\\',
-                    b'0' => '\0',
-                    b'\'' => '\'',
-                    b'"' => '"',
-                    b => panic!("unexpected byte {:?} after \\ character in byte literal", b),
-                }
-            }
-            _ => {
-                let ch = next_chr(s);
-                s = &s[ch.len_utf8()..];
-                ch
-            }
-        };
-        assert_eq!(s, "\'", "Expected end of char literal");
-        ch
-    }
-
-    fn backslash_x<S>(s: &S) -> (u8, &S)
-    where
-        S: Index<RangeFrom<usize>, Output = S> + AsRef<[u8]> + ?Sized,
-    {
-        let mut ch = 0;
-        let b0 = byte(s, 0);
-        let b1 = byte(s, 1);
-        ch += 0x10 * match b0 {
-            b'0'...b'9' => b0 - b'0',
-            b'a'...b'f' => 10 + (b0 - b'a'),
-            b'A'...b'F' => 10 + (b0 - b'A'),
-            _ => panic!("unexpected non-hex character after \\x"),
-        };
-        ch += match b1 {
-            b'0'...b'9' => b1 - b'0',
-            b'a'...b'f' => 10 + (b1 - b'a'),
-            b'A'...b'F' => 10 + (b1 - b'A'),
-            _ => panic!("unexpected non-hex character after \\x"),
-        };
-        (ch, &s[2..])
-    }
-
-    fn backslash_u(mut s: &str) -> (char, &str) {
-        if byte(s, 0) != b'{' {
-            panic!("expected {{ after \\u");
-        }
-        s = &s[1..];
-
-        let mut ch = 0;
-        for _ in 0..6 {
-            let b = byte(s, 0);
-            match b {
-                b'0'...b'9' => {
-                    ch *= 0x10;
-                    ch += u32::from(b - b'0');
-                    s = &s[1..];
-                }
-                b'a'...b'f' => {
-                    ch *= 0x10;
-                    ch += u32::from(10 + b - b'a');
-                    s = &s[1..];
-                }
-                b'A'...b'F' => {
-                    ch *= 0x10;
-                    ch += u32::from(10 + b - b'A');
-                    s = &s[1..];
-                }
-                b'}' => break,
-                _ => panic!("unexpected non-hex character after \\u"),
-            }
-        }
-        assert!(byte(s, 0) == b'}');
-        s = &s[1..];
-
-        if let Some(ch) = char::from_u32(ch) {
-            (ch, s)
-        } else {
-            panic!("character code {:x} is not a valid unicode character", ch);
-        }
-    }
-
-    pub fn parse_lit_int(mut s: &str) -> Option<u64> {
-        let base = match (byte(s, 0), byte(s, 1)) {
-            (b'0', b'x') => {
-                s = &s[2..];
-                16
-            }
-            (b'0', b'o') => {
-                s = &s[2..];
-                8
-            }
-            (b'0', b'b') => {
-                s = &s[2..];
-                2
-            }
-            (b'0'...b'9', _) => 10,
-            _ => unreachable!(),
-        };
-
-        let mut value = 0u64;
-        loop {
-            let b = byte(s, 0);
-            let digit = match b {
-                b'0'...b'9' => u64::from(b - b'0'),
-                b'a'...b'f' if base > 10 => 10 + u64::from(b - b'a'),
-                b'A'...b'F' if base > 10 => 10 + u64::from(b - b'A'),
-                b'_' => {
-                    s = &s[1..];
-                    continue;
-                }
-                // NOTE: Looking at a floating point literal, we don't want to
-                // consider these integers.
-                b'.' if base == 10 => return None,
-                b'e' | b'E' if base == 10 => return None,
-                _ => break,
-            };
-
-            if digit >= base {
-                panic!("Unexpected digit {:x} out of base range", digit);
-            }
-
-            value = match value.checked_mul(base) {
-                Some(value) => value,
-                None => return None,
-            };
-            value = match value.checked_add(digit) {
-                Some(value) => value,
-                None => return None,
-            };
-            s = &s[1..];
-        }
-
-        Some(value)
-    }
-
-    pub fn parse_lit_float(input: &str) -> f64 {
-        // Rust's floating point literals are very similar to the ones parsed by
-        // the standard library, except that rust's literals can contain
-        // ignorable underscores. Let's remove those underscores.
-        let mut bytes = input.to_owned().into_bytes();
-        let mut write = 0;
-        for read in 0..bytes.len() {
-            if bytes[read] == b'_' {
-                continue; // Don't increase write
-            }
-            if write != read {
-                let x = bytes[read];
-                bytes[write] = x;
-            }
-            write += 1;
-        }
-        bytes.truncate(write);
-        let input = String::from_utf8(bytes).unwrap();
-        let end = input.find('f').unwrap_or_else(|| input.len());
-        input[..end].parse().unwrap()
-    }
-
-    pub fn to_literal(s: &str) -> Literal {
-        let stream = s.parse::<TokenStream>().unwrap();
-        match stream.into_iter().next().unwrap() {
-            TokenTree::Literal(l) => l,
-            _ => unreachable!(),
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/mac.rs b/third_party/rust/syn-0.14.6/src/mac.rs
deleted file mode 100644
index a9219febddee..000000000000
--- a/third_party/rust/syn-0.14.6/src/mac.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use proc_macro2::TokenStream;
-use token::{Brace, Bracket, Paren};
-
-#[cfg(feature = "extra-traits")]
-use std::hash::{Hash, Hasher};
-#[cfg(feature = "extra-traits")]
-use tt::TokenStreamHelper;
-
-ast_struct! {
-    /// A macro invocation: `println!("{}", mac)`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct Macro #manual_extra_traits {
-        pub path: Path,
-        pub bang_token: Token![!],
-        pub delimiter: MacroDelimiter,
-        pub tts: TokenStream,
-    }
-}
-
-ast_enum! {
-    /// A grouping token that surrounds a macro body: `m!(...)` or `m!{...}` or `m![...]`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum MacroDelimiter {
-        Paren(Paren),
-        Brace(Brace),
-        Bracket(Bracket),
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for Macro {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for Macro {
-    fn eq(&self, other: &Self) -> bool {
-        self.path == other.path
-            && self.bang_token == other.bang_token
-            && self.delimiter == other.delimiter
-            && TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for Macro {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        self.path.hash(state);
-        self.bang_token.hash(state);
-        self.delimiter.hash(state);
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-
-    use synom::Synom;
-
-    impl Synom for Macro {
-        named!(parse -> Self, do_parse!(
-            what: call!(Path::parse_mod_style) >>
-            bang: punct!(!) >>
-            body: call!(tt::delimited) >>
-            (Macro {
-                path: what,
-                bang_token: bang,
-                delimiter: body.0,
-                tts: body.1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("macro invocation")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use proc_macro2::TokenStream;
-    use quote::ToTokens;
-
-    impl ToTokens for Macro {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.path.to_tokens(tokens);
-            self.bang_token.to_tokens(tokens);
-            match self.delimiter {
-                MacroDelimiter::Paren(ref paren) => {
-                    paren.surround(tokens, |tokens| self.tts.to_tokens(tokens));
-                }
-                MacroDelimiter::Brace(ref brace) => {
-                    brace.surround(tokens, |tokens| self.tts.to_tokens(tokens));
-                }
-                MacroDelimiter::Bracket(ref bracket) => {
-                    bracket.surround(tokens, |tokens| self.tts.to_tokens(tokens));
-                }
-            }
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/macros.rs b/third_party/rust/syn-0.14.6/src/macros.rs
deleted file mode 100644
index e9b70346086a..000000000000
--- a/third_party/rust/syn-0.14.6/src/macros.rs
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[cfg(any(feature = "full", feature = "derive"))]
-macro_rules! ast_struct {
-    (
-        $(#[$attr:meta])*
-        pub struct $name:ident #full $($rest:tt)*
-    ) => {
-        #[cfg(feature = "full")]
-        $(#[$attr])*
-        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
-        pub struct $name $($rest)*
-
-        #[cfg(not(feature = "full"))]
-        $(#[$attr])*
-        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
-        pub struct $name {
-            _noconstruct: (),
-        }
-    };
-
-    (
-        $(#[$attr:meta])*
-        pub struct $name:ident #manual_extra_traits $($rest:tt)*
-    ) => {
-        $(#[$attr])*
-        #[cfg_attr(feature = "extra-traits", derive(Debug))]
-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
-        pub struct $name $($rest)*
-    };
-
-    (
-        $(#[$attr:meta])*
-        pub struct $name:ident $($rest:tt)*
-    ) => {
-        $(#[$attr])*
-        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
-        pub struct $name $($rest)*
-    };
-}
-
-#[cfg(any(feature = "full", feature = "derive"))]
-macro_rules! ast_enum {
-    (
-        $(#[$enum_attr:meta])*
-        pub enum $name:ident $(# $tags:ident)* { $($variants:tt)* }
-    ) => (
-        $(#[$enum_attr])*
-        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
-        pub enum $name {
-            $($variants)*
-        }
-    )
-}
-
-#[cfg(any(feature = "full", feature = "derive"))]
-macro_rules! ast_enum_of_structs {
-    (
-        $(#[$enum_attr:meta])*
-        pub enum $name:ident {
-            $(
-                $(#[$variant_attr:meta])*
-                pub $variant:ident $( ($member:ident $($rest:tt)*) )*,
-            )*
-        }
-
-        $($remaining:tt)*
-    ) => (
-        ast_enum! {
-            $(#[$enum_attr])*
-            pub enum $name {
-                $(
-                    $(#[$variant_attr])*
-                    $variant $( ($member) )*,
-                )*
-            }
-        }
-
-        $(
-            maybe_ast_struct! {
-                $(#[$variant_attr])*
-                $(
-                    pub struct $member $($rest)*
-                )*
-            }
-
-            $(
-                impl From<$member> for $name {
-                    fn from(e: $member) -> $name {
-                        $name::$variant(e)
-                    }
-                }
-            )*
-        )*
-
-        #[cfg(feature = "printing")]
-        generate_to_tokens! {
-            $($remaining)*
-            ()
-            tokens
-            $name { $($variant $( [$($rest)*] )*,)* }
-        }
-    )
-}
-
-#[cfg(
-    all(
-        feature = "printing",
-        any(feature = "full", feature = "derive")
-    )
-)]
-macro_rules! generate_to_tokens {
-    (do_not_generate_to_tokens $($foo:tt)*) => ();
-
-    (($($arms:tt)*) $tokens:ident $name:ident { $variant:ident, $($next:tt)*}) => {
-        generate_to_tokens!(
-            ($($arms)* $name::$variant => {})
-            $tokens $name { $($next)* }
-        );
-    };
-
-    (($($arms:tt)*) $tokens:ident $name:ident { $variant:ident [$($rest:tt)*], $($next:tt)*}) => {
-        generate_to_tokens!(
-            ($($arms)* $name::$variant(ref _e) => to_tokens_call!(_e, $tokens, $($rest)*),)
-            $tokens $name { $($next)* }
-        );
-    };
-
-    (($($arms:tt)*) $tokens:ident $name:ident {}) => {
-        impl ::quote::ToTokens for $name {
-            fn to_tokens(&self, $tokens: &mut ::proc_macro2::TokenStream) {
-                match *self {
-                    $($arms)*
-                }
-            }
-        }
-    };
-}
-
-#[cfg(all(feature = "printing", feature = "full"))]
-macro_rules! to_tokens_call {
-    ($e:ident, $tokens:ident, $($rest:tt)*) => {
-        $e.to_tokens($tokens)
-    };
-}
-
-#[cfg(
-    all(
-        feature = "printing",
-        feature = "derive",
-        not(feature = "full")
-    )
-)]
-macro_rules! to_tokens_call {
-    // If the variant is marked as #full, don't auto-generate to-tokens for it.
-    ($e:ident, $tokens:ident, #full $($rest:tt)*) => {
-        unreachable!()
-    };
-    ($e:ident, $tokens:ident, $($rest:tt)*) => {
-        $e.to_tokens($tokens)
-    };
-}
-
-#[cfg(any(feature = "full", feature = "derive"))]
-macro_rules! maybe_ast_struct {
-    (
-        $(#[$attr:meta])*
-        $(
-            pub struct $name:ident
-        )*
-    ) => ();
-
-    ($($rest:tt)*) => (ast_struct! { $($rest)* });
-}
-
-#[cfg(
-    all(
-        feature = "parsing",
-        any(feature = "full", feature = "derive")
-    )
-)]
-macro_rules! impl_synom {
-    ($t:ident $description:tt $($parser:tt)+) => {
-        impl Synom for $t {
-            named!(parse -> Self, $($parser)+);
-
-            fn description() -> Option<&'static str> {
-                Some($description)
-            }
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/op.rs b/third_party/rust/syn-0.14.6/src/op.rs
deleted file mode 100644
index a5188d02c14e..000000000000
--- a/third_party/rust/syn-0.14.6/src/op.rs
+++ /dev/null
@@ -1,224 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-ast_enum! {
-    /// A binary operator: `+`, `+=`, `&`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    #[cfg_attr(feature = "clone-impls", derive(Copy))]
-    pub enum BinOp {
-        /// The `+` operator (addition)
-        Add(Token![+]),
-        /// The `-` operator (subtraction)
-        Sub(Token![-]),
-        /// The `*` operator (multiplication)
-        Mul(Token![*]),
-        /// The `/` operator (division)
-        Div(Token![/]),
-        /// The `%` operator (modulus)
-        Rem(Token![%]),
-        /// The `&&` operator (logical and)
-        And(Token![&&]),
-        /// The `||` operator (logical or)
-        Or(Token![||]),
-        /// The `^` operator (bitwise xor)
-        BitXor(Token![^]),
-        /// The `&` operator (bitwise and)
-        BitAnd(Token![&]),
-        /// The `|` operator (bitwise or)
-        BitOr(Token![|]),
-        /// The `<<` operator (shift left)
-        Shl(Token![<<]),
-        /// The `>>` operator (shift right)
-        Shr(Token![>>]),
-        /// The `==` operator (equality)
-        Eq(Token![==]),
-        /// The `<` operator (less than)
-        Lt(Token![<]),
-        /// The `<=` operator (less than or equal to)
-        Le(Token![<=]),
-        /// The `!=` operator (not equal to)
-        Ne(Token![!=]),
-        /// The `>=` operator (greater than or equal to)
-        Ge(Token![>=]),
-        /// The `>` operator (greater than)
-        Gt(Token![>]),
-        /// The `+=` operator
-        AddEq(Token![+=]),
-        /// The `-=` operator
-        SubEq(Token![-=]),
-        /// The `*=` operator
-        MulEq(Token![*=]),
-        /// The `/=` operator
-        DivEq(Token![/=]),
-        /// The `%=` operator
-        RemEq(Token![%=]),
-        /// The `^=` operator
-        BitXorEq(Token![^=]),
-        /// The `&=` operator
-        BitAndEq(Token![&=]),
-        /// The `|=` operator
-        BitOrEq(Token![|=]),
-        /// The `<<=` operator
-        ShlEq(Token![<<=]),
-        /// The `>>=` operator
-        ShrEq(Token![>>=]),
-    }
-}
-
-ast_enum! {
-    /// A unary operator: `*`, `!`, `-`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    #[cfg_attr(feature = "clone-impls", derive(Copy))]
-    pub enum UnOp {
-        /// The `*` operator for dereferencing
-        Deref(Token![*]),
-        /// The `!` operator for logical inversion
-        Not(Token![!]),
-        /// The `-` operator for negation
-        Neg(Token![-]),
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use synom::Synom;
-
-    impl BinOp {
-        named!(pub parse_binop -> Self, alt!(
-            punct!(&&) => { BinOp::And }
-            |
-            punct!(||) => { BinOp::Or }
-            |
-            punct!(<<) => { BinOp::Shl }
-            |
-            punct!(>>) => { BinOp::Shr }
-            |
-            punct!(==) => { BinOp::Eq }
-            |
-            punct!(<=) => { BinOp::Le }
-            |
-            punct!(!=) => { BinOp::Ne }
-            |
-            punct!(>=) => { BinOp::Ge }
-            |
-            punct!(+) => { BinOp::Add }
-            |
-            punct!(-) => { BinOp::Sub }
-            |
-            punct!(*) => { BinOp::Mul }
-            |
-            punct!(/) => { BinOp::Div }
-            |
-            punct!(%) => { BinOp::Rem }
-            |
-            punct!(^) => { BinOp::BitXor }
-            |
-            punct!(&) => { BinOp::BitAnd }
-            |
-            punct!(|) => { BinOp::BitOr }
-            |
-            punct!(<) => { BinOp::Lt }
-            |
-            punct!(>) => { BinOp::Gt }
-        ));
-
-        #[cfg(feature = "full")]
-        named!(pub parse_assign_op -> Self, alt!(
-            punct!(+=) => { BinOp::AddEq }
-            |
-            punct!(-=) => { BinOp::SubEq }
-            |
-            punct!(*=) => { BinOp::MulEq }
-            |
-            punct!(/=) => { BinOp::DivEq }
-            |
-            punct!(%=) => { BinOp::RemEq }
-            |
-            punct!(^=) => { BinOp::BitXorEq }
-            |
-            punct!(&=) => { BinOp::BitAndEq }
-            |
-            punct!(|=) => { BinOp::BitOrEq }
-            |
-            punct!(<<=) => { BinOp::ShlEq }
-            |
-            punct!(>>=) => { BinOp::ShrEq }
-        ));
-    }
-
-    impl Synom for UnOp {
-        named!(parse -> Self, alt!(
-            punct!(*) => { UnOp::Deref }
-            |
-            punct!(!) => { UnOp::Not }
-            |
-            punct!(-) => { UnOp::Neg }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("unary operator: `*`, `!`, or `-`")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use proc_macro2::TokenStream;
-    use quote::ToTokens;
-
-    impl ToTokens for BinOp {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            match *self {
-                BinOp::Add(ref t) => t.to_tokens(tokens),
-                BinOp::Sub(ref t) => t.to_tokens(tokens),
-                BinOp::Mul(ref t) => t.to_tokens(tokens),
-                BinOp::Div(ref t) => t.to_tokens(tokens),
-                BinOp::Rem(ref t) => t.to_tokens(tokens),
-                BinOp::And(ref t) => t.to_tokens(tokens),
-                BinOp::Or(ref t) => t.to_tokens(tokens),
-                BinOp::BitXor(ref t) => t.to_tokens(tokens),
-                BinOp::BitAnd(ref t) => t.to_tokens(tokens),
-                BinOp::BitOr(ref t) => t.to_tokens(tokens),
-                BinOp::Shl(ref t) => t.to_tokens(tokens),
-                BinOp::Shr(ref t) => t.to_tokens(tokens),
-                BinOp::Eq(ref t) => t.to_tokens(tokens),
-                BinOp::Lt(ref t) => t.to_tokens(tokens),
-                BinOp::Le(ref t) => t.to_tokens(tokens),
-                BinOp::Ne(ref t) => t.to_tokens(tokens),
-                BinOp::Ge(ref t) => t.to_tokens(tokens),
-                BinOp::Gt(ref t) => t.to_tokens(tokens),
-                BinOp::AddEq(ref t) => t.to_tokens(tokens),
-                BinOp::SubEq(ref t) => t.to_tokens(tokens),
-                BinOp::MulEq(ref t) => t.to_tokens(tokens),
-                BinOp::DivEq(ref t) => t.to_tokens(tokens),
-                BinOp::RemEq(ref t) => t.to_tokens(tokens),
-                BinOp::BitXorEq(ref t) => t.to_tokens(tokens),
-                BinOp::BitAndEq(ref t) => t.to_tokens(tokens),
-                BinOp::BitOrEq(ref t) => t.to_tokens(tokens),
-                BinOp::ShlEq(ref t) => t.to_tokens(tokens),
-                BinOp::ShrEq(ref t) => t.to_tokens(tokens),
-            }
-        }
-    }
-
-    impl ToTokens for UnOp {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            match *self {
-                UnOp::Deref(ref t) => t.to_tokens(tokens),
-                UnOp::Not(ref t) => t.to_tokens(tokens),
-                UnOp::Neg(ref t) => t.to_tokens(tokens),
-            }
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/parse_quote.rs b/third_party/rust/syn-0.14.6/src/parse_quote.rs
deleted file mode 100644
index ec8ef5a56ed9..000000000000
--- a/third_party/rust/syn-0.14.6/src/parse_quote.rs
+++ /dev/null
@@ -1,163 +0,0 @@
-/// Quasi-quotation macro that accepts input like the [`quote!`] macro but uses
-/// type inference to figure out a return type for those tokens.
-///
-/// [`quote!`]: https://docs.rs/quote/0.4/quote/index.html
-///
-/// The return type can be any syntax tree node that implements the [`Synom`]
-/// trait.
-///
-/// [`Synom`]: synom/trait.Synom.html
-///
-/// ```
-/// #[macro_use]
-/// extern crate syn;
-///
-/// #[macro_use]
-/// extern crate quote;
-///
-/// use syn::Stmt;
-///
-/// fn main() {
-///     let name = quote!(v);
-///     let ty = quote!(u8);
-///
-///     let stmt: Stmt = parse_quote! {
-///         let #name: #ty = Default::default();
-///     };
-///
-///     println!("{:#?}", stmt);
-/// }
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature,
-/// although interpolation of syntax tree nodes into the quoted tokens is only
-/// supported if Syn is built with the `"printing"` feature as well.*
-///
-/// # Example
-///
-/// The following helper function adds a bound `T: HeapSize` to every type
-/// parameter `T` in the input generics.
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate syn;
-/// #
-/// # #[macro_use]
-/// # extern crate quote;
-/// #
-/// # use syn::{Generics, GenericParam};
-/// #
-/// // Add a bound `T: HeapSize` to every type parameter T.
-/// fn add_trait_bounds(mut generics: Generics) -> Generics {
-///     for param in &mut generics.params {
-///         if let GenericParam::Type(ref mut type_param) = *param {
-///             type_param.bounds.push(parse_quote!(HeapSize));
-///         }
-///     }
-///     generics
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// # Special cases
-///
-/// This macro can parse the following additional types as a special case even
-/// though they do not implement the `Synom` trait.
-///
-/// - [`Attribute`] — parses one attribute, allowing either outer like `#[...]`
-///   or inner like `#![...]`
-/// - [`Punctuated<T, P>`] — parses zero or more `T` separated by punctuation
-///   `P` with optional trailing punctuation
-///
-/// [`Attribute`]: struct.Attribute.html
-/// [`Punctuated<T, P>`]: punctuated/struct.Punctuated.html
-///
-/// # Panics
-///
-/// Panics if the tokens fail to parse as the expected syntax tree type. The
-/// caller is responsible for ensuring that the input tokens are syntactically
-/// valid.
-#[macro_export]
-macro_rules! parse_quote {
-    ($($tt:tt)*) => {
-        $crate::parse_quote::parse($crate::parse_quote::From::from(quote!($($tt)*)))
-    };
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Can parse any type that implements Synom.
-
-use buffer::Cursor;
-use proc_macro2::TokenStream;
-use synom::{PResult, Parser, Synom};
-
-// Not public API.
-#[doc(hidden)]
-pub use std::convert::From;
-
-// Not public API.
-#[doc(hidden)]
-pub fn parse<T: ParseQuote>(token_stream: TokenStream) -> T {
-    let parser = T::parse;
-    match parser.parse2(token_stream) {
-        Ok(t) => t,
-        Err(err) => match T::description() {
-            Some(s) => panic!("failed to parse {}: {}", s, err),
-            None => panic!("{}", err),
-        },
-    }
-}
-
-// Not public API.
-#[doc(hidden)]
-pub trait ParseQuote: Sized {
-    fn parse(input: Cursor) -> PResult<Self>;
-    fn description() -> Option<&'static str>;
-}
-
-impl<T> ParseQuote for T
-where
-    T: Synom,
-{
-    fn parse(input: Cursor) -> PResult<Self> {
-        <T as Synom>::parse(input)
-    }
-
-    fn description() -> Option<&'static str> {
-        <T as Synom>::description()
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Any other types that we want `parse_quote!` to be able to parse.
-
-use punctuated::Punctuated;
-
-#[cfg(any(feature = "full", feature = "derive"))]
-use Attribute;
-
-impl<T, P> ParseQuote for Punctuated<T, P>
-where
-    T: Synom,
-    P: Synom,
-{
-    named!(parse -> Self, call!(Punctuated::parse_terminated));
-
-    fn description() -> Option<&'static str> {
-        Some("punctuated sequence")
-    }
-}
-
-#[cfg(any(feature = "full", feature = "derive"))]
-impl ParseQuote for Attribute {
-    named!(parse -> Self, alt!(
-        call!(Attribute::parse_outer)
-        |
-        call!(Attribute::parse_inner)
-    ));
-
-    fn description() -> Option<&'static str> {
-        Some("attribute")
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/parsers.rs b/third_party/rust/syn-0.14.6/src/parsers.rs
deleted file mode 100644
index 400c0ca23305..000000000000
--- a/third_party/rust/syn-0.14.6/src/parsers.rs
+++ /dev/null
@@ -1,1428 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use buffer::Cursor;
-use parse_error;
-use synom::PResult;
-
-/// Define a parser function with the signature expected by syn parser
-/// combinators.
-///
-/// The function may be the `parse` function of the [`Synom`] trait, or it may
-/// be a free-standing function with an arbitrary name. When implementing the
-/// `Synom` trait, the function name is `parse` and the return type is `Self`.
-///
-/// [`Synom`]: synom/trait.Synom.html
-///
-/// - **Syntax:** `named!(NAME -> TYPE, PARSER)` or `named!(pub NAME -> TYPE, PARSER)`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Type;
-/// use syn::punctuated::Punctuated;
-/// use syn::synom::Synom;
-///
-/// /// Parses one or more Rust types separated by commas.
-/// ///
-/// /// Example: `String, Vec<T>, [u8; LEN + 1]`
-/// named!(pub comma_separated_types -> Punctuated<Type, Token![,]>,
-///     call!(Punctuated::parse_separated_nonempty)
-/// );
-///
-/// /// The same function as a `Synom` implementation.
-/// struct CommaSeparatedTypes {
-///     types: Punctuated<Type, Token![,]>,
-/// }
-///
-/// impl Synom for CommaSeparatedTypes {
-///     /// As the default behavior, we want there to be at least 1 type.
-///     named!(parse -> Self, do_parse!(
-///         types: call!(Punctuated::parse_separated_nonempty) >>
-///         (CommaSeparatedTypes { types })
-///     ));
-/// }
-///
-/// impl CommaSeparatedTypes {
-///     /// A separate parser that the user can invoke explicitly which allows
-///     /// for parsing 0 or more types, rather than the default 1 or more.
-///     named!(pub parse0 -> Self, do_parse!(
-///         types: call!(Punctuated::parse_separated) >>
-///         (CommaSeparatedTypes { types })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! named {
-    ($name:ident -> $o:ty, $submac:ident!( $($args:tt)* )) => {
-        fn $name(i: $crate::buffer::Cursor) -> $crate::synom::PResult<$o> {
-            $submac!(i, $($args)*)
-        }
-    };
-
-    (pub $name:ident -> $o:ty, $submac:ident!( $($args:tt)* )) => {
-        pub fn $name(i: $crate::buffer::Cursor) -> $crate::synom::PResult<$o> {
-            $submac!(i, $($args)*)
-        }
-    };
-
-    // These two variants are for defining named parsers which have custom
-    // arguments, and are called with `call!()`
-    ($name:ident($($params:tt)*) -> $o:ty, $submac:ident!( $($args:tt)* )) => {
-        fn $name(i: $crate::buffer::Cursor, $($params)*) -> $crate::synom::PResult<$o> {
-            $submac!(i, $($args)*)
-        }
-    };
-
-    (pub $name:ident($($params:tt)*) -> $o:ty, $submac:ident!( $($args:tt)* )) => {
-        pub fn $name(i: $crate::buffer::Cursor, $($params)*) -> $crate::synom::PResult<$o> {
-            $submac!(i, $($args)*)
-        }
-    };
-}
-
-#[cfg(synom_verbose_trace)]
-#[macro_export]
-macro_rules! call {
-    ($i:expr, $fun:expr $(, $args:expr)*) => {{
-        #[allow(unused_imports)]
-        use $crate::synom::ext::*;
-        let i = $i;
-        eprintln!(concat!(" -> ", stringify!($fun), " @ {:?}"), i);
-        let r = $fun(i $(, $args)*);
-        match r {
-            Ok((_, i)) => eprintln!(concat!("OK  ", stringify!($fun), " @ {:?}"), i),
-            Err(_) => eprintln!(concat!("ERR ", stringify!($fun), " @ {:?}"), i),
-        }
-        r
-    }};
-}
-
-/// Invoke the given parser function with zero or more arguments.
-///
-/// - **Syntax:** `call!(FN, ARGS...)`
-///
-///   where the signature of the function is `fn(Cursor, ARGS...) -> PResult<T>`
-///
-/// - **Output:** `T`, the result of invoking the function `FN`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Type;
-/// use syn::punctuated::Punctuated;
-/// use syn::synom::Synom;
-///
-/// /// Parses one or more Rust types separated by commas.
-/// ///
-/// /// Example: `String, Vec<T>, [u8; LEN + 1]`
-/// struct CommaSeparatedTypes {
-///     types: Punctuated<Type, Token![,]>,
-/// }
-///
-/// impl Synom for CommaSeparatedTypes {
-///     named!(parse -> Self, do_parse!(
-///         types: call!(Punctuated::parse_separated_nonempty) >>
-///         (CommaSeparatedTypes { types })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[cfg(not(synom_verbose_trace))]
-#[macro_export]
-macro_rules! call {
-    ($i:expr, $fun:expr $(, $args:expr)*) => {{
-        #[allow(unused_imports)]
-        use $crate::synom::ext::*;
-        $fun($i $(, $args)*)
-    }};
-}
-
-/// Transform the result of a parser by applying a function or closure.
-///
-/// - **Syntax:** `map!(THING, FN)`
-/// - **Output:** the return type of function FN applied to THING
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{Expr, ExprIf};
-///
-/// /// Extracts the branch condition of an `if`-expression.
-/// fn get_cond(if_: ExprIf) -> Expr {
-///     *if_.cond
-/// }
-///
-/// /// Parses a full `if`-expression but returns the condition part only.
-/// ///
-/// /// Example: `if x > 0xFF { "big" } else { "small" }`
-/// /// The return would be the expression `x > 0xFF`.
-/// named!(if_condition -> Expr,
-///     map!(syn!(ExprIf), get_cond)
-/// );
-///
-/// /// Equivalent using a closure.
-/// named!(if_condition2 -> Expr,
-///     map!(syn!(ExprIf), |if_| *if_.cond)
-/// );
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! map {
-    ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((o, i)) =>
-                ::std::result::Result::Ok(($crate::parsers::invoke($g, o), i)),
-        }
-    };
-
-    ($i:expr, $f:expr, $g:expr) => {
-        map!($i, call!($f), $g)
-    };
-}
-
-// Somehow this helps with type inference in `map!` and `alt!`.
-//
-// Not public API.
-#[doc(hidden)]
-pub fn invoke<T, R, F: FnOnce(T) -> R>(f: F, t: T) -> R {
-    f(t)
-}
-
-/// Invert the result of a parser by parsing successfully if the given parser
-/// fails to parse and vice versa.
-///
-/// Does not consume any of the input.
-///
-/// - **Syntax:** `not!(THING)`
-/// - **Output:** `()`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Expr;
-///
-/// /// Parses any expression that does not begin with a `-` minus sign.
-/// named!(not_negative_expr -> Expr, do_parse!(
-///     not!(punct!(-)) >>
-///     e: syn!(Expr) >>
-///     (e)
-/// ));
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! not {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Ok(_) => $crate::parse_error(),
-            ::std::result::Result::Err(_) =>
-                ::std::result::Result::Ok(((), $i)),
-        }
-    };
-}
-
-/// Execute a parser only if a condition is met, otherwise return None.
-///
-/// If you are familiar with nom, this is nom's `cond_with_error` parser.
-///
-/// - **Syntax:** `cond!(CONDITION, THING)`
-/// - **Output:** `Some(THING)` if the condition is true, else `None`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{Ident, MacroDelimiter};
-/// use syn::token::{Paren, Bracket, Brace};
-/// use syn::synom::Synom;
-///
-/// /// Parses a macro call with empty input. If the macro is written with
-/// /// parentheses or brackets, a trailing semicolon is required.
-/// ///
-/// /// Example: `my_macro!{}` or `my_macro!();` or `my_macro![];`
-/// struct EmptyMacroCall {
-///     name: Ident,
-///     bang_token: Token![!],
-///     empty_body: MacroDelimiter,
-///     semi_token: Option<Token![;]>,
-/// }
-///
-/// fn requires_semi(delimiter: &MacroDelimiter) -> bool {
-///     match *delimiter {
-///         MacroDelimiter::Paren(_) | MacroDelimiter::Bracket(_) => true,
-///         MacroDelimiter::Brace(_) => false,
-///     }
-/// }
-///
-/// impl Synom for EmptyMacroCall {
-///     named!(parse -> Self, do_parse!(
-///         name: syn!(Ident) >>
-///         bang_token: punct!(!) >>
-///         empty_body: alt!(
-///             parens!(epsilon!()) => { |d| MacroDelimiter::Paren(d.0) }
-///             |
-///             brackets!(epsilon!()) => { |d| MacroDelimiter::Bracket(d.0) }
-///             |
-///             braces!(epsilon!()) => { |d| MacroDelimiter::Brace(d.0) }
-///         ) >>
-///         semi_token: cond!(requires_semi(&empty_body), punct!(;)) >>
-///         (EmptyMacroCall {
-///             name,
-///             bang_token,
-///             empty_body,
-///             semi_token,
-///         })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! cond {
-    ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => {
-        if $cond {
-            match $submac!($i, $($args)*) {
-                ::std::result::Result::Ok((o, i)) =>
-                    ::std::result::Result::Ok((::std::option::Option::Some(o), i)),
-                ::std::result::Result::Err(x) => ::std::result::Result::Err(x),
-            }
-        } else {
-            ::std::result::Result::Ok((::std::option::Option::None, $i))
-        }
-    };
-
-    ($i:expr, $cond:expr, $f:expr) => {
-        cond!($i, $cond, call!($f))
-    };
-}
-
-/// Execute a parser only if a condition is met, otherwise fail to parse.
-///
-/// This is typically used inside of [`option!`] or [`alt!`].
-///
-/// [`option!`]: macro.option.html
-/// [`alt!`]: macro.alt.html
-///
-/// - **Syntax:** `cond_reduce!(CONDITION, THING)`
-/// - **Output:** `THING`
-///
-/// The subparser may be omitted in which case it defaults to [`epsilon!`].
-///
-/// [`epsilon!`]: macro.epsilon.html
-///
-/// - **Syntax:** `cond_reduce!(CONDITION)`
-/// - **Output:** `()`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Type;
-/// use syn::token::Paren;
-/// use syn::punctuated::Punctuated;
-/// use syn::synom::Synom;
-///
-/// /// Parses a possibly variadic function signature.
-/// ///
-/// /// Example: `fn(A) or `fn(A, B, C, ...)` or `fn(...)`
-/// /// Rejected: `fn(A, B...)`
-/// struct VariadicFn {
-///     fn_token: Token![fn],
-///     paren_token: Paren,
-///     types: Punctuated<Type, Token![,]>,
-///     variadic: Option<Token![...]>,
-/// }
-///
-/// // Example of using `cond_reduce!` inside of `option!`.
-/// impl Synom for VariadicFn {
-///     named!(parse -> Self, do_parse!(
-///         fn_token: keyword!(fn) >>
-///         params: parens!(do_parse!(
-///             types: call!(Punctuated::parse_terminated) >>
-///             // Allow, but do not require, an ending `...` but only if the
-///             // preceding list of types is empty or ends with a trailing comma.
-///             variadic: option!(cond_reduce!(types.empty_or_trailing(), punct!(...))) >>
-///             (types, variadic)
-///         )) >>
-///         ({
-///             let (paren_token, (types, variadic)) = params;
-///             VariadicFn {
-///                 fn_token,
-///                 paren_token,
-///                 types,
-///                 variadic,
-///             }
-///         })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! cond_reduce {
-    ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => {
-        if $cond {
-            $submac!($i, $($args)*)
-        } else {
-            $crate::parse_error()
-        }
-    };
-
-    ($i:expr, $cond:expr) => {
-        cond_reduce!($i, $cond, epsilon!())
-    };
-
-    ($i:expr, $cond:expr, $f:expr) => {
-        cond_reduce!($i, $cond, call!($f))
-    };
-}
-
-/// Parse zero or more values using the given parser.
-///
-/// - **Syntax:** `many0!(THING)`
-/// - **Output:** `Vec<THING>`
-///
-/// You may also be looking for:
-///
-/// - `call!(Punctuated::parse_separated)` - zero or more values with separator
-/// - `call!(Punctuated::parse_separated_nonempty)` - one or more values
-/// - `call!(Punctuated::parse_terminated)` - zero or more, allows trailing separator
-/// - `call!(Punctuated::parse_terminated_nonempty)` - one or more
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{Ident, Item};
-/// use syn::token::Brace;
-/// use syn::synom::Synom;
-///
-/// /// Parses a module containing zero or more Rust items.
-/// ///
-/// /// Example: `mod m { type Result<T> = ::std::result::Result<T, MyError>; }`
-/// struct SimpleMod {
-///     mod_token: Token![mod],
-///     name: Ident,
-///     brace_token: Brace,
-///     items: Vec<Item>,
-/// }
-///
-/// impl Synom for SimpleMod {
-///     named!(parse -> Self, do_parse!(
-///         mod_token: keyword!(mod) >>
-///         name: syn!(Ident) >>
-///         body: braces!(many0!(syn!(Item))) >>
-///         (SimpleMod {
-///             mod_token,
-///             name,
-///             brace_token: body.0,
-///             items: body.1,
-///         })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! many0 {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {{
-        let ret;
-        let mut res   = ::std::vec::Vec::new();
-        let mut input = $i;
-
-        loop {
-            if input.eof() {
-                ret = ::std::result::Result::Ok((res, input));
-                break;
-            }
-
-            match $submac!(input, $($args)*) {
-                ::std::result::Result::Err(_) => {
-                    ret = ::std::result::Result::Ok((res, input));
-                    break;
-                }
-                ::std::result::Result::Ok((o, i)) => {
-                    // loop trip must always consume (otherwise infinite loops)
-                    if i == input {
-                        ret = $crate::parse_error();
-                        break;
-                    }
-
-                    res.push(o);
-                    input = i;
-                }
-            }
-        }
-
-        ret
-    }};
-
-    ($i:expr, $f:expr) => {
-        $crate::parsers::many0($i, $f)
-    };
-}
-
-// Improve compile time by compiling this loop only once per type it is used
-// with.
-//
-// Not public API.
-#[doc(hidden)]
-pub fn many0<T>(mut input: Cursor, f: fn(Cursor) -> PResult<T>) -> PResult<Vec<T>> {
-    let mut res = Vec::new();
-
-    loop {
-        if input.eof() {
-            return Ok((res, input));
-        }
-
-        match f(input) {
-            Err(_) => {
-                return Ok((res, input));
-            }
-            Ok((o, i)) => {
-                // loop trip must always consume (otherwise infinite loops)
-                if i == input {
-                    return parse_error();
-                }
-
-                res.push(o);
-                input = i;
-            }
-        }
-    }
-}
-
-/// Pattern-match the result of a parser to select which other parser to run.
-///
-/// - **Syntax:** `switch!(TARGET, PAT1 => THEN1 | PAT2 => THEN2 | ...)`
-/// - **Output:** `T`, the return type of `THEN1` and `THEN2` and ...
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Ident;
-/// use syn::token::Brace;
-/// use syn::synom::Synom;
-///
-/// /// Parse a unit struct or enum: either `struct S;` or `enum E { V }`.
-/// enum UnitType {
-///     Struct {
-///         struct_token: Token![struct],
-///         name: Ident,
-///         semi_token: Token![;],
-///     },
-///     Enum {
-///         enum_token: Token![enum],
-///         name: Ident,
-///         brace_token: Brace,
-///         variant: Ident,
-///     },
-/// }
-///
-/// enum StructOrEnum {
-///     Struct(Token![struct]),
-///     Enum(Token![enum]),
-/// }
-///
-/// impl Synom for StructOrEnum {
-///     named!(parse -> Self, alt!(
-///         keyword!(struct) => { StructOrEnum::Struct }
-///         |
-///         keyword!(enum) => { StructOrEnum::Enum }
-///     ));
-/// }
-///
-/// impl Synom for UnitType {
-///     named!(parse -> Self, do_parse!(
-///         which: syn!(StructOrEnum) >>
-///         name: syn!(Ident) >>
-///         item: switch!(value!(which),
-///             StructOrEnum::Struct(struct_token) => map!(
-///                 punct!(;),
-///                 |semi_token| UnitType::Struct {
-///                     struct_token,
-///                     name,
-///                     semi_token,
-///                 }
-///             )
-///             |
-///             StructOrEnum::Enum(enum_token) => map!(
-///                 braces!(syn!(Ident)),
-///                 |(brace_token, variant)| UnitType::Enum {
-///                     enum_token,
-///                     name,
-///                     brace_token,
-///                     variant,
-///                 }
-///             )
-///         ) >>
-///         (item)
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! switch {
-    ($i:expr, $submac:ident!( $($args:tt)* ), $($p:pat => $subrule:ident!( $($args2:tt)* ))|* ) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) => ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((o, i)) => match o {
-                $(
-                    $p => $subrule!(i, $($args2)*),
-                )*
-            }
-        }
-    };
-}
-
-/// Produce the given value without parsing anything.
-///
-/// This can be needed where you have an existing parsed value but a parser
-/// macro's syntax expects you to provide a submacro, such as in the first
-/// argument of [`switch!`] or one of the branches of [`alt!`].
-///
-/// [`switch!`]: macro.switch.html
-/// [`alt!`]: macro.alt.html
-///
-/// - **Syntax:** `value!(VALUE)`
-/// - **Output:** `VALUE`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Ident;
-/// use syn::token::Brace;
-/// use syn::synom::Synom;
-///
-/// /// Parse a unit struct or enum: either `struct S;` or `enum E { V }`.
-/// enum UnitType {
-///     Struct {
-///         struct_token: Token![struct],
-///         name: Ident,
-///         semi_token: Token![;],
-///     },
-///     Enum {
-///         enum_token: Token![enum],
-///         name: Ident,
-///         brace_token: Brace,
-///         variant: Ident,
-///     },
-/// }
-///
-/// enum StructOrEnum {
-///     Struct(Token![struct]),
-///     Enum(Token![enum]),
-/// }
-///
-/// impl Synom for StructOrEnum {
-///     named!(parse -> Self, alt!(
-///         keyword!(struct) => { StructOrEnum::Struct }
-///         |
-///         keyword!(enum) => { StructOrEnum::Enum }
-///     ));
-/// }
-///
-/// impl Synom for UnitType {
-///     named!(parse -> Self, do_parse!(
-///         which: syn!(StructOrEnum) >>
-///         name: syn!(Ident) >>
-///         item: switch!(value!(which),
-///             StructOrEnum::Struct(struct_token) => map!(
-///                 punct!(;),
-///                 |semi_token| UnitType::Struct {
-///                     struct_token,
-///                     name,
-///                     semi_token,
-///                 }
-///             )
-///             |
-///             StructOrEnum::Enum(enum_token) => map!(
-///                 braces!(syn!(Ident)),
-///                 |(brace_token, variant)| UnitType::Enum {
-///                     enum_token,
-///                     name,
-///                     brace_token,
-///                     variant,
-///                 }
-///             )
-///         ) >>
-///         (item)
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! value {
-    ($i:expr, $res:expr) => {
-        ::std::result::Result::Ok(($res, $i))
-    };
-}
-
-/// Unconditionally fail to parse anything.
-///
-/// This may be useful in rejecting some arms of a `switch!` parser.
-///
-/// - **Syntax:** `reject!()`
-/// - **Output:** never succeeds
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Item;
-///
-/// // Parse any item, except for a module.
-/// named!(almost_any_item -> Item,
-///     switch!(syn!(Item),
-///         Item::Mod(_) => reject!()
-///         |
-///         ok => value!(ok)
-///     )
-/// );
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! reject {
-    ($i:expr,) => {{
-        let _ = $i;
-        $crate::parse_error()
-    }};
-}
-
-/// Run a series of parsers and produce all of the results in a tuple.
-///
-/// - **Syntax:** `tuple!(A, B, C, ...)`
-/// - **Output:** `(A, B, C, ...)`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Type;
-///
-/// named!(two_types -> (Type, Type), tuple!(syn!(Type), syn!(Type)));
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! tuple {
-    ($i:expr, $($rest:tt)+) => {
-        tuple_parser!($i, (), $($rest)+)
-    };
-}
-
-// Internal parser, do not use directly.
-#[doc(hidden)]
-#[macro_export]
-macro_rules! tuple_parser {
-    ($i:expr, ($($parsed:ident,)*), $e:ident) => {
-        tuple_parser!($i, ($($parsed,)*), call!($e))
-    };
-
-    ($i:expr, ($($parsed:ident,)*), $e:ident, $($rest:tt)*) => {
-        tuple_parser!($i, ($($parsed,)*), call!($e), $($rest)*)
-    };
-
-    ($i:expr, ($($parsed:ident,)*), $submac:ident!( $($args:tt)* )) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((o, i)) =>
-                ::std::result::Result::Ok((($($parsed,)* o,), i)),
-        }
-    };
-
-    ($i:expr, ($($parsed:ident,)*), $submac:ident!( $($args:tt)* ), $($rest:tt)*) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((o, i)) =>
-                tuple_parser!(i, ($($parsed,)* o,), $($rest)*),
-        }
-    };
-
-    ($i:expr, ($($parsed:ident,)*),) => {
-        ::std::result::Result::Ok((($($parsed,)*), $i))
-    };
-}
-
-/// Run a series of parsers, returning the result of the first one which
-/// succeeds.
-///
-/// Optionally allows for the result to be transformed.
-///
-/// - **Syntax:** `alt!(THING1 | THING2 => { FUNC } | ...)`
-/// - **Output:** `T`, the return type of `THING1` and `FUNC(THING2)` and ...
-///
-/// # Example
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-/// extern crate proc_macro2;
-///
-/// use proc_macro2::{Ident, Span};
-///
-/// // Parse any identifier token, or the `!` token in which case the
-/// // identifier is treated as `"BANG"`.
-/// named!(ident_or_bang -> Ident, alt!(
-///     syn!(Ident)
-///     |
-///     punct!(!) => { |_| Ident::new("BANG", Span::call_site()) }
-/// ));
-/// #
-/// # fn main() {}
-/// ```
-///
-/// The `alt!` macro is most commonly seen when parsing a syntax tree enum such
-/// as the [`Item`] enum.
-///
-/// [`Item`]: enum.Item.html
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate syn;
-/// #
-/// # use syn::synom::Synom;
-/// #
-/// # struct Item;
-/// #
-/// impl Synom for Item {
-///     named!(parse -> Self, alt!(
-/// #       epsilon!() => { |_| unimplemented!() }
-/// #   ));
-/// # }
-/// #
-/// # mod example {
-/// #   use syn::*;
-/// #
-/// #   named!(parse -> Item, alt!(
-///         syn!(ItemExternCrate) => { Item::ExternCrate }
-///         |
-///         syn!(ItemUse) => { Item::Use }
-///         |
-///         syn!(ItemStatic) => { Item::Static }
-///         |
-///         syn!(ItemConst) => { Item::Const }
-///         |
-///         /* ... */
-/// #       syn!(ItemFn) => { Item::Fn }
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! alt {
-    ($i:expr, $e:ident | $($rest:tt)*) => {
-        alt!($i, call!($e) | $($rest)*)
-    };
-
-    ($i:expr, $subrule:ident!( $($args:tt)*) | $($rest:tt)*) => {
-        match $subrule!($i, $($args)*) {
-            res @ ::std::result::Result::Ok(_) => res,
-            _ => alt!($i, $($rest)*)
-        }
-    };
-
-    ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr } | $($rest:tt)+) => {
-        match $subrule!($i, $($args)*) {
-            ::std::result::Result::Ok((o, i)) =>
-                ::std::result::Result::Ok(($crate::parsers::invoke($gen, o), i)),
-            ::std::result::Result::Err(_) => alt!($i, $($rest)*),
-        }
-    };
-
-    ($i:expr, $e:ident => { $gen:expr } | $($rest:tt)*) => {
-        alt!($i, call!($e) => { $gen } | $($rest)*)
-    };
-
-    ($i:expr, $e:ident => { $gen:expr }) => {
-        alt!($i, call!($e) => { $gen })
-    };
-
-    ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr }) => {
-        match $subrule!($i, $($args)*) {
-            ::std::result::Result::Ok((o, i)) =>
-                ::std::result::Result::Ok(($crate::parsers::invoke($gen, o), i)),
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-        }
-    };
-
-    ($i:expr, $e:ident) => {
-        alt!($i, call!($e))
-    };
-
-    ($i:expr, $subrule:ident!( $($args:tt)*)) => {
-        $subrule!($i, $($args)*)
-    };
-}
-
-/// Run a series of parsers, optionally naming each intermediate result,
-/// followed by a step to combine the intermediate results.
-///
-/// Produces the result of evaluating the final expression in parentheses with
-/// all of the previously named results bound.
-///
-/// - **Syntax:** `do_parse!(name: THING1 >> THING2 >> (RESULT))`
-/// - **Output:** `RESULT`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-/// extern crate proc_macro2;
-///
-/// use proc_macro2::Ident;
-/// use proc_macro2::TokenStream;
-/// use syn::token::Paren;
-/// use syn::synom::Synom;
-///
-/// /// Parse a macro invocation that uses `(` `)` parentheses.
-/// ///
-/// /// Example: `stringify!($args)`.
-/// struct Macro {
-///     name: Ident,
-///     bang_token: Token![!],
-///     paren_token: Paren,
-///     tts: TokenStream,
-/// }
-///
-/// impl Synom for Macro {
-///     named!(parse -> Self, do_parse!(
-///         name: syn!(Ident) >>
-///         bang_token: punct!(!) >>
-///         body: parens!(syn!(TokenStream)) >>
-///         (Macro {
-///             name,
-///             bang_token,
-///             paren_token: body.0,
-///             tts: body.1,
-///         })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! do_parse {
-    ($i:expr, ( $($rest:expr),* )) => {
-        ::std::result::Result::Ok((( $($rest),* ), $i))
-    };
-
-    ($i:expr, $e:ident >> $($rest:tt)*) => {
-        do_parse!($i, call!($e) >> $($rest)*)
-    };
-
-    ($i:expr, $submac:ident!( $($args:tt)* ) >> $($rest:tt)*) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((_, i)) =>
-                do_parse!(i, $($rest)*),
-        }
-    };
-
-    ($i:expr, $field:ident : $e:ident >> $($rest:tt)*) => {
-        do_parse!($i, $field: call!($e) >> $($rest)*)
-    };
-
-    ($i:expr, $field:ident : $submac:ident!( $($args:tt)* ) >> $($rest:tt)*) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((o, i)) => {
-                let $field = o;
-                do_parse!(i, $($rest)*)
-            },
-        }
-    };
-
-    ($i:expr, mut $field:ident : $e:ident >> $($rest:tt)*) => {
-        do_parse!($i, mut $field: call!($e) >> $($rest)*)
-    };
-
-    ($i:expr, mut $field:ident : $submac:ident!( $($args:tt)* ) >> $($rest:tt)*) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((o, i)) => {
-                let mut $field = o;
-                do_parse!(i, $($rest)*)
-            },
-        }
-    };
-}
-
-/// Parse nothing and succeed only if the end of the enclosing block has been
-/// reached.
-///
-/// The enclosing block may be the full input if we are parsing at the top
-/// level, or the surrounding parenthesis/bracket/brace if we are parsing within
-/// those.
-///
-/// - **Syntax:** `input_end!()`
-/// - **Output:** `()`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Expr;
-/// use syn::synom::Synom;
-///
-/// /// Parses any Rust expression followed either by a semicolon or by the end
-/// /// of the input.
-/// ///
-/// /// For example `many0!(syn!(TerminatedExpr))` would successfully parse the
-/// /// following input into three expressions.
-/// ///
-/// ///     1 + 1; second.two(); third!()
-/// ///
-/// /// Similarly within a block, `braced!(many0!(syn!(TerminatedExpr)))` would
-/// /// successfully parse three expressions.
-/// ///
-/// ///     { 1 + 1; second.two(); third!() }
-/// struct TerminatedExpr {
-///     expr: Expr,
-///     semi_token: Option<Token![;]>,
-/// }
-///
-/// impl Synom for TerminatedExpr {
-///     named!(parse -> Self, do_parse!(
-///         expr: syn!(Expr) >>
-///         semi_token: alt!(
-///             input_end!() => { |_| None }
-///             |
-///             punct!(;) => { Some }
-///         ) >>
-///         (TerminatedExpr {
-///             expr,
-///             semi_token,
-///         })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! input_end {
-    ($i:expr,) => {
-        $crate::parsers::input_end($i)
-    };
-}
-
-// Not a public API
-#[doc(hidden)]
-pub fn input_end(input: Cursor) -> PResult<'static, ()> {
-    if input.eof() {
-        Ok(((), Cursor::empty()))
-    } else {
-        parse_error()
-    }
-}
-
-/// Turn a failed parse into `None` and a successful parse into `Some`.
-///
-/// A failed parse consumes none of the input.
-///
-/// - **Syntax:** `option!(THING)`
-/// - **Output:** `Option<THING>`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{Label, Block};
-/// use syn::synom::Synom;
-///
-/// /// Parses a Rust loop. Equivalent to syn::ExprLoop.
-/// ///
-/// /// Examples:
-/// ///     loop { println!("y"); }
-/// ///     'x: loop { break 'x; }
-/// struct ExprLoop {
-///     label: Option<Label>,
-///     loop_token: Token![loop],
-///     body: Block,
-/// }
-///
-/// impl Synom for ExprLoop {
-///     named!(parse -> Self, do_parse!(
-///         // Loop may or may not have a label.
-///         label: option!(syn!(Label)) >>
-///         loop_token: keyword!(loop) >>
-///         body: syn!(Block) >>
-///         (ExprLoop {
-///             label,
-///             loop_token,
-///             body,
-///         })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! option {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Ok((o, i)) =>
-                ::std::result::Result::Ok((Some(o), i)),
-            ::std::result::Result::Err(_) =>
-                ::std::result::Result::Ok((None, $i)),
-        }
-    };
-
-    ($i:expr, $f:expr) => {
-        option!($i, call!($f));
-    };
-}
-
-/// Parses nothing and always succeeds.
-///
-/// This can be useful as a fallthrough case in [`alt!`], as shown below. Also
-/// useful for parsing empty delimiters using [`parens!`] or [`brackets!`] or
-/// [`braces!`] by parsing for example `braces!(epsilon!())` for an empty `{}`.
-///
-/// [`alt!`]: macro.alt.html
-/// [`parens!`]: macro.parens.html
-/// [`brackets!`]: macro.brackets.html
-/// [`braces!`]: macro.braces.html
-///
-/// - **Syntax:** `epsilon!()`
-/// - **Output:** `()`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::synom::Synom;
-///
-/// enum Mutability {
-///     Mutable(Token![mut]),
-///     Immutable,
-/// }
-///
-/// impl Synom for Mutability {
-///     named!(parse -> Self, alt!(
-///         keyword!(mut) => { Mutability::Mutable }
-///         |
-///         epsilon!() => { |_| Mutability::Immutable }
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! epsilon {
-    ($i:expr,) => {
-        ::std::result::Result::Ok(((), $i))
-    };
-}
-
-/// Run a parser, binding the result to a name, and then evaluating an
-/// expression.
-///
-/// Discards the result of the expression and parser.
-///
-/// - **Syntax:** `tap!(NAME : THING => EXPR)`
-/// - **Output:** `()`
-#[doc(hidden)]
-#[macro_export]
-macro_rules! tap {
-    ($i:expr, $name:ident : $submac:ident!( $($args:tt)* ) => $e:expr) => {
-        match $submac!($i, $($args)*) {
-            ::std::result::Result::Ok((o, i)) => {
-                let $name = o;
-                $e;
-                ::std::result::Result::Ok(((), i))
-            }
-            ::std::result::Result::Err(err) =>
-                ::std::result::Result::Err(err),
-        }
-    };
-
-    ($i:expr, $name:ident : $f:expr => $e:expr) => {
-        tap!($i, $name: call!($f) => $e);
-    };
-}
-
-/// Parse any type that implements the `Synom` trait.
-///
-/// Any type implementing [`Synom`] can be used with this parser, whether the
-/// implementation is provided by Syn or is one that you write.
-///
-/// [`Synom`]: synom/trait.Synom.html
-///
-/// - **Syntax:** `syn!(TYPE)`
-/// - **Output:** `TYPE`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{Ident, Item};
-/// use syn::token::Brace;
-/// use syn::synom::Synom;
-///
-/// /// Parses a module containing zero or more Rust items.
-/// ///
-/// /// Example: `mod m { type Result<T> = ::std::result::Result<T, MyError>; }`
-/// struct SimpleMod {
-///     mod_token: Token![mod],
-///     name: Ident,
-///     brace_token: Brace,
-///     items: Vec<Item>,
-/// }
-///
-/// impl Synom for SimpleMod {
-///     named!(parse -> Self, do_parse!(
-///         mod_token: keyword!(mod) >>
-///         name: syn!(Ident) >>
-///         body: braces!(many0!(syn!(Item))) >>
-///         (SimpleMod {
-///             mod_token,
-///             name,
-///             brace_token: body.0,
-///             items: body.1,
-///         })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! syn {
-    ($i:expr, $t:ty) => {
-        <$t as $crate::synom::Synom>::parse($i)
-    };
-}
-
-/// Parse the given word as a keyword.
-///
-/// For words that are keywords in the Rust language, it is better to use the
-/// [`keyword!`] parser which returns a unique type for each keyword.
-///
-/// [`keyword!`]: macro.keyword.html
-///
-/// - **Syntax:** `custom_keyword!(KEYWORD)`
-/// - **Output:** `Ident`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Ident;
-/// use syn::synom::Synom;
-///
-/// struct Flag {
-///     name: Ident,
-/// }
-///
-/// // Parses the custom keyword `flag` followed by any name for a flag.
-/// //
-/// // Example: `flag Verbose`
-/// impl Synom for Flag {
-///     named!(parse -> Flag, do_parse!(
-///         custom_keyword!(flag) >>
-///         name: syn!(Ident) >>
-///         (Flag { name })
-///     ));
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! custom_keyword {
-    ($i:expr, $keyword:ident) => {
-        match <$crate::Ident as $crate::synom::Synom>::parse($i) {
-            ::std::result::Result::Err(err) => ::std::result::Result::Err(err),
-            ::std::result::Result::Ok((token, i)) => {
-                if token == stringify!($keyword) {
-                    ::std::result::Result::Ok((token, i))
-                } else {
-                    $crate::parse_error()
-                }
-            }
-        }
-    };
-}
-
-/// Parse inside of `(` `)` parentheses.
-///
-/// This macro parses a set of balanced parentheses and invokes a sub-parser on
-/// the content inside. The sub-parser is required to consume all tokens within
-/// the parentheses in order for this parser to return successfully.
-///
-/// - **Syntax:** `parens!(CONTENT)`
-/// - **Output:** `(token::Paren, CONTENT)`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Expr;
-/// use syn::token::Paren;
-///
-/// /// Parses an expression inside of parentheses.
-/// ///
-/// /// Example: `(1 + 1)`
-/// named!(expr_paren -> (Paren, Expr), parens!(syn!(Expr)));
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! parens {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {
-        $crate::token::Paren::parse($i, |i| $submac!(i, $($args)*))
-    };
-
-    ($i:expr, $f:expr) => {
-        parens!($i, call!($f));
-    };
-}
-
-/// Parse inside of `[` `]` square brackets.
-///
-/// This macro parses a set of balanced brackets and invokes a sub-parser on the
-/// content inside. The sub-parser is required to consume all tokens within the
-/// brackets in order for this parser to return successfully.
-///
-/// - **Syntax:** `brackets!(CONTENT)`
-/// - **Output:** `(token::Bracket, CONTENT)`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Expr;
-/// use syn::token::Bracket;
-///
-/// /// Parses an expression inside of brackets.
-/// ///
-/// /// Example: `[1 + 1]`
-/// named!(expr_paren -> (Bracket, Expr), brackets!(syn!(Expr)));
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! brackets {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {
-        $crate::token::Bracket::parse($i, |i| $submac!(i, $($args)*))
-    };
-
-    ($i:expr, $f:expr) => {
-        brackets!($i, call!($f));
-    };
-}
-
-/// Parse inside of `{` `}` curly braces.
-///
-/// This macro parses a set of balanced braces and invokes a sub-parser on the
-/// content inside. The sub-parser is required to consume all tokens within the
-/// braces in order for this parser to return successfully.
-///
-/// - **Syntax:** `braces!(CONTENT)`
-/// - **Output:** `(token::Brace, CONTENT)`
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Expr;
-/// use syn::token::Brace;
-///
-/// /// Parses an expression inside of braces.
-/// ///
-/// /// Example: `{1 + 1}`
-/// named!(expr_paren -> (Brace, Expr), braces!(syn!(Expr)));
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[macro_export]
-macro_rules! braces {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {
-        $crate::token::Brace::parse($i, |i| $submac!(i, $($args)*))
-    };
-
-    ($i:expr, $f:expr) => {
-        braces!($i, call!($f));
-    };
-}
-
-// Not public API.
-#[doc(hidden)]
-#[macro_export]
-macro_rules! grouped {
-    ($i:expr, $submac:ident!( $($args:tt)* )) => {
-        $crate::token::Group::parse($i, |i| $submac!(i, $($args)*))
-    };
-
-    ($i:expr, $f:expr) => {
-        grouped!($i, call!($f));
-    };
-}
diff --git a/third_party/rust/syn-0.14.6/src/path.rs b/third_party/rust/syn-0.14.6/src/path.rs
deleted file mode 100644
index e57c8f42b50b..000000000000
--- a/third_party/rust/syn-0.14.6/src/path.rs
+++ /dev/null
@@ -1,577 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use punctuated::Punctuated;
-
-ast_struct! {
-    /// A path at which a named item is exported: `std::collections::HashMap`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct Path {
-        pub leading_colon: Option<Token![::]>,
-        pub segments: Punctuated<PathSegment, Token![::]>,
-    }
-}
-
-impl Path {
-    pub fn global(&self) -> bool {
-        self.leading_colon.is_some()
-    }
-}
-
-/// A helper for printing a self-type qualified path as tokens.
-///
-/// ```rust
-/// extern crate syn;
-/// extern crate quote;
-/// extern crate proc_macro2;
-///
-/// use syn::{QSelf, Path, PathTokens};
-/// use proc_macro2::TokenStream;
-/// use quote::ToTokens;
-///
-/// struct MyNode {
-///     qself: Option<QSelf>,
-///     path: Path,
-/// }
-///
-/// impl ToTokens for MyNode {
-///     fn to_tokens(&self, tokens: &mut TokenStream) {
-///         PathTokens(&self.qself, &self.path).to_tokens(tokens);
-///     }
-/// }
-/// #
-/// # fn main() {}
-/// ```
-///
-/// *This type is available if Syn is built with the `"derive"` or `"full"`
-/// feature and the `"printing"` feature.*
-#[cfg(feature = "printing")]
-#[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
-#[cfg_attr(feature = "clone-impls", derive(Clone))]
-pub struct PathTokens<'a>(pub &'a Option<QSelf>, pub &'a Path);
-
-impl<T> From<T> for Path
-where
-    T: Into<PathSegment>,
-{
-    fn from(segment: T) -> Self {
-        let mut path = Path {
-            leading_colon: None,
-            segments: Punctuated::new(),
-        };
-        path.segments.push_value(segment.into());
-        path
-    }
-}
-
-ast_struct! {
-    /// A segment of a path together with any path arguments on that segment.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct PathSegment {
-        pub ident: Ident,
-        pub arguments: PathArguments,
-    }
-}
-
-impl<T> From<T> for PathSegment
-where
-    T: Into<Ident>,
-{
-    fn from(ident: T) -> Self {
-        PathSegment {
-            ident: ident.into(),
-            arguments: PathArguments::None,
-        }
-    }
-}
-
-ast_enum! {
-    /// Angle bracketed or parenthesized arguments of a path segment.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// ## Angle bracketed
-    ///
-    /// The `<'a, T>` in `std::slice::iter<'a, T>`.
-    ///
-    /// ## Parenthesized
-    ///
-    /// The `(A, B) -> C` in `Fn(A, B) -> C`.
-    pub enum PathArguments {
-        None,
-        /// The `<'a, T>` in `std::slice::iter<'a, T>`.
-        AngleBracketed(AngleBracketedGenericArguments),
-        /// The `(A, B) -> C` in `Fn(A, B) -> C`.
-        Parenthesized(ParenthesizedGenericArguments),
-    }
-}
-
-impl Default for PathArguments {
-    fn default() -> Self {
-        PathArguments::None
-    }
-}
-
-impl PathArguments {
-    pub fn is_empty(&self) -> bool {
-        match *self {
-            PathArguments::None => true,
-            PathArguments::AngleBracketed(ref bracketed) => bracketed.args.is_empty(),
-            PathArguments::Parenthesized(_) => false,
-        }
-    }
-}
-
-ast_enum! {
-    /// An individual generic argument, like `'a`, `T`, or `Item = T`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum GenericArgument {
-        /// A lifetime argument.
-        Lifetime(Lifetime),
-        /// A type argument.
-        Type(Type),
-        /// A binding (equality constraint) on an associated type: the `Item =
-        /// u8` in `Iterator<Item = u8>`.
-        Binding(Binding),
-        /// A const expression. Must be inside of a block.
-        ///
-        /// NOTE: Identity expressions are represented as Type arguments, as
-        /// they are indistinguishable syntactically.
-        Const(Expr),
-    }
-}
-
-ast_struct! {
-    /// Angle bracketed arguments of a path segment: the `<K, V>` in `HashMap<K,
-    /// V>`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct AngleBracketedGenericArguments {
-        pub colon2_token: Option<Token![::]>,
-        pub lt_token: Token![<],
-        pub args: Punctuated<GenericArgument, Token![,]>,
-        pub gt_token: Token![>],
-    }
-}
-
-ast_struct! {
-    /// A binding (equality constraint) on an associated type: `Item = u8`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct Binding {
-        pub ident: Ident,
-        pub eq_token: Token![=],
-        pub ty: Type,
-    }
-}
-
-ast_struct! {
-    /// Arguments of a function path segment: the `(A, B) -> C` in `Fn(A,B) ->
-    /// C`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct ParenthesizedGenericArguments {
-        pub paren_token: token::Paren,
-        /// `(A, B)`
-        pub inputs: Punctuated<Type, Token![,]>,
-        /// `C`
-        pub output: ReturnType,
-    }
-}
-
-ast_struct! {
-    /// The explicit Self type in a qualified path: the `T` in `<T as
-    /// Display>::fmt`.
-    ///
-    /// The actual path, including the trait and the associated item, is stored
-    /// separately. The `position` field represents the index of the associated
-    /// item qualified with this Self type.
-    ///
-    /// ```text
-    /// <Vec<T> as a::b::Trait>::AssociatedItem
-    ///  ^~~~~~    ~~~~~~~~~~~~~~^
-    ///  ty        position = 3
-    ///
-    /// <Vec<T>>::AssociatedItem
-    ///  ^~~~~~   ^
-    ///  ty       position = 0
-    /// ```
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct QSelf {
-        pub lt_token: Token![<],
-        pub ty: Box<Type>,
-        pub position: usize,
-        pub as_token: Option<Token![as]>,
-        pub gt_token: Token![>],
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use synom::Synom;
-
-    impl Synom for Path {
-        named!(parse -> Self, do_parse!(
-            colon: option!(punct!(::)) >>
-            segments: call!(Punctuated::<PathSegment, Token![::]>::parse_separated_nonempty) >>
-            cond_reduce!(segments.first().map_or(true, |seg| seg.value().ident != "dyn")) >>
-            (Path {
-                leading_colon: colon,
-                segments: segments,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("path")
-        }
-    }
-
-    #[cfg(not(feature = "full"))]
-    impl Synom for GenericArgument {
-        named!(parse -> Self, alt!(
-            call!(ty_no_eq_after) => { GenericArgument::Type }
-            |
-            syn!(Lifetime) => { GenericArgument::Lifetime }
-            |
-            syn!(Binding) => { GenericArgument::Binding }
-        ));
-    }
-
-    #[cfg(feature = "full")]
-    impl Synom for GenericArgument {
-        named!(parse -> Self, alt!(
-            call!(ty_no_eq_after) => { GenericArgument::Type }
-            |
-            syn!(Lifetime) => { GenericArgument::Lifetime }
-            |
-            syn!(Binding) => { GenericArgument::Binding }
-            |
-            syn!(ExprLit) => { |l| GenericArgument::Const(Expr::Lit(l)) }
-            |
-            syn!(ExprBlock) => { |b| GenericArgument::Const(Expr::Block(b)) }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("generic argument")
-        }
-    }
-
-    impl Synom for AngleBracketedGenericArguments {
-        named!(parse -> Self, do_parse!(
-            colon2: option!(punct!(::)) >>
-            lt: punct!(<) >>
-            args: call!(Punctuated::parse_terminated) >>
-            gt: punct!(>) >>
-            (AngleBracketedGenericArguments {
-                colon2_token: colon2,
-                lt_token: lt,
-                args: args,
-                gt_token: gt,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("angle bracketed generic arguments")
-        }
-    }
-
-    impl Synom for ParenthesizedGenericArguments {
-        named!(parse -> Self, do_parse!(
-            data: parens!(Punctuated::parse_terminated) >>
-            output: call!(ReturnType::without_plus) >>
-            (ParenthesizedGenericArguments {
-                paren_token: data.0,
-                inputs: data.1,
-                output: output,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("parenthesized generic arguments: `Foo(A, B, ..) -> T`")
-        }
-    }
-
-    impl Synom for PathSegment {
-        named!(parse -> Self, alt!(
-            do_parse!(
-                ident: syn!(Ident) >>
-                arguments: syn!(AngleBracketedGenericArguments) >>
-                (PathSegment {
-                    ident: ident,
-                    arguments: PathArguments::AngleBracketed(arguments),
-                })
-            )
-            |
-            mod_style_path_segment
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("path segment")
-        }
-    }
-
-    impl Synom for Binding {
-        named!(parse -> Self, do_parse!(
-            id: syn!(Ident) >>
-            eq: punct!(=) >>
-            ty: syn!(Type) >>
-            (Binding {
-                ident: id,
-                eq_token: eq,
-                ty: ty,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("associated type binding")
-        }
-    }
-
-    impl Path {
-        named!(pub parse_mod_style -> Self, do_parse!(
-            colon: option!(punct!(::)) >>
-            segments: call!(Punctuated::parse_separated_nonempty_with,
-                            mod_style_path_segment) >>
-            (Path {
-                leading_colon: colon,
-                segments: segments,
-            })
-        ));
-    }
-
-    named!(mod_style_path_segment -> PathSegment, alt!(
-        syn!(Ident) => { Into::into }
-        |
-        keyword!(super) => { Into::into }
-        |
-        keyword!(self) => { Into::into }
-        |
-        keyword!(Self) => { Into::into }
-        |
-        keyword!(crate) => { Into::into }
-        |
-        keyword!(extern) => { Into::into }
-    ));
-
-    named!(pub qpath -> (Option<QSelf>, Path), alt!(
-        map!(syn!(Path), |p| (None, p))
-        |
-        do_parse!(
-            lt: punct!(<) >>
-            this: syn!(Type) >>
-            path: option!(tuple!(keyword!(as), syn!(Path))) >>
-            gt: punct!(>) >>
-            colon2: punct!(::) >>
-            rest: call!(Punctuated::parse_separated_nonempty) >>
-            ({
-                let (pos, as_, path) = match path {
-                    Some((as_, mut path)) => {
-                        let pos = path.segments.len();
-                        path.segments.push_punct(colon2);
-                        path.segments.extend(rest.into_pairs());
-                        (pos, Some(as_), path)
-                    }
-                    None => {
-                        (0, None, Path {
-                            leading_colon: Some(colon2),
-                            segments: rest,
-                        })
-                    }
-                };
-                (Some(QSelf {
-                    lt_token: lt,
-                    ty: Box::new(this),
-                    position: pos,
-                    as_token: as_,
-                    gt_token: gt,
-                }), path)
-            })
-        )
-        |
-        map!(keyword!(self), |s| (None, s.into()))
-    ));
-
-    named!(pub ty_no_eq_after -> Type, do_parse!(
-        ty: syn!(Type) >>
-        not!(punct!(=)) >>
-        (ty)
-    ));
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use proc_macro2::TokenStream;
-    use quote::ToTokens;
-
-    impl ToTokens for Path {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.leading_colon.to_tokens(tokens);
-            self.segments.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for PathSegment {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.ident.to_tokens(tokens);
-            self.arguments.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for PathArguments {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            match *self {
-                PathArguments::None => {}
-                PathArguments::AngleBracketed(ref arguments) => {
-                    arguments.to_tokens(tokens);
-                }
-                PathArguments::Parenthesized(ref arguments) => {
-                    arguments.to_tokens(tokens);
-                }
-            }
-        }
-    }
-
-    impl ToTokens for GenericArgument {
-        #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))]
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            match *self {
-                GenericArgument::Lifetime(ref lt) => lt.to_tokens(tokens),
-                GenericArgument::Type(ref ty) => ty.to_tokens(tokens),
-                GenericArgument::Binding(ref tb) => tb.to_tokens(tokens),
-                GenericArgument::Const(ref e) => match *e {
-                    Expr::Lit(_) => e.to_tokens(tokens),
-
-                    // NOTE: We should probably support parsing blocks with only
-                    // expressions in them without the full feature for const
-                    // generics.
-                    #[cfg(feature = "full")]
-                    Expr::Block(_) => e.to_tokens(tokens),
-
-                    // ERROR CORRECTION: Add braces to make sure that the
-                    // generated code is valid.
-                    _ => token::Brace::default().surround(tokens, |tokens| {
-                        e.to_tokens(tokens);
-                    }),
-                },
-            }
-        }
-    }
-
-    impl ToTokens for AngleBracketedGenericArguments {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.colon2_token.to_tokens(tokens);
-            self.lt_token.to_tokens(tokens);
-
-            // Print lifetimes before types and consts, all before bindings,
-            // regardless of their order in self.args.
-            //
-            // TODO: ordering rules for const arguments vs type arguments have
-            // not been settled yet. https://github.com/rust-lang/rust/issues/44580
-            let mut trailing_or_empty = true;
-            for param in self.args.pairs() {
-                if let GenericArgument::Lifetime(_) = **param.value() {
-                    param.to_tokens(tokens);
-                    trailing_or_empty = param.punct().is_some();
-                }
-            }
-            for param in self.args.pairs() {
-                match **param.value() {
-                    GenericArgument::Type(_) | GenericArgument::Const(_) => {
-                        if !trailing_or_empty {
-                            <Token![,]>::default().to_tokens(tokens);
-                        }
-                        param.to_tokens(tokens);
-                        trailing_or_empty = param.punct().is_some();
-                    }
-                    GenericArgument::Lifetime(_) | GenericArgument::Binding(_) => {}
-                }
-            }
-            for param in self.args.pairs() {
-                if let GenericArgument::Binding(_) = **param.value() {
-                    if !trailing_or_empty {
-                        <Token![,]>::default().to_tokens(tokens);
-                        trailing_or_empty = true;
-                    }
-                    param.to_tokens(tokens);
-                }
-            }
-
-            self.gt_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for Binding {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.ident.to_tokens(tokens);
-            self.eq_token.to_tokens(tokens);
-            self.ty.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ParenthesizedGenericArguments {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.paren_token.surround(tokens, |tokens| {
-                self.inputs.to_tokens(tokens);
-            });
-            self.output.to_tokens(tokens);
-        }
-    }
-
-    impl<'a> ToTokens for PathTokens<'a> {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            let qself = match *self.0 {
-                Some(ref qself) => qself,
-                None => return self.1.to_tokens(tokens),
-            };
-            qself.lt_token.to_tokens(tokens);
-            qself.ty.to_tokens(tokens);
-
-            // XXX: Gross.
-            let pos = if qself.position > 0 && qself.position >= self.1.segments.len() {
-                self.1.segments.len() - 1
-            } else {
-                qself.position
-            };
-            let mut segments = self.1.segments.pairs();
-            if pos > 0 {
-                TokensOrDefault(&qself.as_token).to_tokens(tokens);
-                self.1.leading_colon.to_tokens(tokens);
-                for (i, segment) in segments.by_ref().take(pos).enumerate() {
-                    if i + 1 == pos {
-                        segment.value().to_tokens(tokens);
-                        qself.gt_token.to_tokens(tokens);
-                        segment.punct().to_tokens(tokens);
-                    } else {
-                        segment.to_tokens(tokens);
-                    }
-                }
-            } else {
-                qself.gt_token.to_tokens(tokens);
-                self.1.leading_colon.to_tokens(tokens);
-            }
-            for segment in segments {
-                segment.to_tokens(tokens);
-            }
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/punctuated.rs b/third_party/rust/syn-0.14.6/src/punctuated.rs
deleted file mode 100644
index 0ab23fc4eb24..000000000000
--- a/third_party/rust/syn-0.14.6/src/punctuated.rs
+++ /dev/null
@@ -1,796 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! A punctuated sequence of syntax tree nodes separated by punctuation.
-//!
-//! Lots of things in Rust are punctuated sequences.
-//!
-//! - The fields of a struct are `Punctuated<Field, Token![,]>`.
-//! - The segments of a path are `Punctuated<PathSegment, Token![::]>`.
-//! - The bounds on a generic parameter are `Punctuated<TypeParamBound, Token![+]>`.
-//! - The arguments to a function call are `Punctuated<Expr, Token![,]>`.
-//!
-//! This module provides a common representation for these punctuated sequences
-//! in the form of the [`Punctuated<T, P>`] type. We store a vector of pairs of
-//! syntax tree node + punctuation, where every node in the sequence is followed
-//! by punctuation except for possibly the final one.
-//!
-//! [`Punctuated<T, P>`]: struct.Punctuated.html
-//!
-//! ```text
-//! a_function_call(arg1, arg2, arg3);
-//!                 ^^^^^ ~~~~~ ^^^^
-//! ```
-
-#[cfg(feature = "extra-traits")]
-use std::fmt::{self, Debug};
-#[cfg(any(feature = "full", feature = "derive"))]
-use std::iter;
-use std::iter::FromIterator;
-use std::ops::{Index, IndexMut};
-use std::option;
-use std::slice;
-use std::vec;
-
-#[cfg(feature = "parsing")]
-use buffer::Cursor;
-#[cfg(feature = "parsing")]
-use parse_error;
-#[cfg(feature = "parsing")]
-use synom::{PResult, Synom};
-
-/// A punctuated sequence of syntax tree nodes of type `T` separated by
-/// punctuation of type `P`.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-#[cfg_attr(feature = "extra-traits", derive(Eq, PartialEq, Hash))]
-#[cfg_attr(feature = "clone-impls", derive(Clone))]
-pub struct Punctuated<T, P> {
-    inner: Vec<(T, P)>,
-    last: Option<Box<T>>,
-}
-
-impl<T, P> Punctuated<T, P> {
-    /// Creates an empty punctuated sequence.
-    pub fn new() -> Punctuated<T, P> {
-        Punctuated {
-            inner: Vec::new(),
-            last: None,
-        }
-    }
-
-    /// Determines whether this punctuated sequence is empty, meaning it
-    /// contains no syntax tree nodes or punctuation.
-    pub fn is_empty(&self) -> bool {
-        self.inner.len() == 0 && self.last.is_none()
-    }
-
-    /// Returns the number of syntax tree nodes in this punctuated sequence.
-    ///
-    /// This is the number of nodes of type `T`, not counting the punctuation of
-    /// type `P`.
-    pub fn len(&self) -> usize {
-        self.inner.len() + if self.last.is_some() { 1 } else { 0 }
-    }
-
-    /// Borrows the first punctuated pair in this sequence.
-    pub fn first(&self) -> Option<Pair<&T, &P>> {
-        self.pairs().next()
-    }
-
-    /// Borrows the last punctuated pair in this sequence.
-    pub fn last(&self) -> Option<Pair<&T, &P>> {
-        if self.last.is_some() {
-            self.last.as_ref().map(|t| Pair::End(t.as_ref()))
-        } else {
-            self.inner
-                .last()
-                .map(|&(ref t, ref d)| Pair::Punctuated(t, d))
-        }
-    }
-
-    /// Mutably borrows the last punctuated pair in this sequence.
-    pub fn last_mut(&mut self) -> Option<Pair<&mut T, &mut P>> {
-        if self.last.is_some() {
-            self.last.as_mut().map(|t| Pair::End(t.as_mut()))
-        } else {
-            self.inner
-                .last_mut()
-                .map(|&mut (ref mut t, ref mut d)| Pair::Punctuated(t, d))
-        }
-    }
-
-    /// Returns an iterator over borrowed syntax tree nodes of type `&T`.
-    pub fn iter(&self) -> Iter<T> {
-        Iter {
-            inner: Box::new(PrivateIter {
-                inner: self.inner.iter(),
-                last: self.last.as_ref().map(|t| t.as_ref()).into_iter(),
-            }),
-        }
-    }
-
-    /// Returns an iterator over mutably borrowed syntax tree nodes of type
-    /// `&mut T`.
-    pub fn iter_mut(&mut self) -> IterMut<T> {
-        IterMut {
-            inner: Box::new(PrivateIterMut {
-                inner: self.inner.iter_mut(),
-                last: self.last.as_mut().map(|t| t.as_mut()).into_iter(),
-            }),
-        }
-    }
-
-    /// Returns an iterator over the contents of this sequence as borrowed
-    /// punctuated pairs.
-    pub fn pairs(&self) -> Pairs<T, P> {
-        Pairs {
-            inner: self.inner.iter(),
-            last: self.last.as_ref().map(|t| t.as_ref()).into_iter(),
-        }
-    }
-
-    /// Returns an iterator over the contents of this sequence as mutably
-    /// borrowed punctuated pairs.
-    pub fn pairs_mut(&mut self) -> PairsMut<T, P> {
-        PairsMut {
-            inner: self.inner.iter_mut(),
-            last: self.last.as_mut().map(|t| t.as_mut()).into_iter(),
-        }
-    }
-
-    /// Returns an iterator over the contents of this sequence as owned
-    /// punctuated pairs.
-    pub fn into_pairs(self) -> IntoPairs<T, P> {
-        IntoPairs {
-            inner: self.inner.into_iter(),
-            last: self.last.map(|t| *t).into_iter(),
-        }
-    }
-
-    /// Appends a syntax tree node onto the end of this punctuated sequence. The
-    /// sequence must previously have a trailing punctuation.
-    ///
-    /// Use [`push`] instead if the punctuated sequence may or may not already
-    /// have trailing punctuation.
-    ///
-    /// [`push`]: #method.push
-    ///
-    /// # Panics
-    ///
-    /// Panics if the sequence does not already have a trailing punctuation when
-    /// this method is called.
-    pub fn push_value(&mut self, value: T) {
-        assert!(self.empty_or_trailing());
-        self.last = Some(Box::new(value));
-    }
-
-    /// Appends a trailing punctuation onto the end of this punctuated sequence.
-    /// The sequence must be non-empty and must not already have trailing
-    /// punctuation.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the sequence is empty or already has a trailing punctuation.
-    pub fn push_punct(&mut self, punctuation: P) {
-        assert!(self.last.is_some());
-        let last = self.last.take().unwrap();
-        self.inner.push((*last, punctuation));
-    }
-
-    /// Removes the last punctuated pair from this sequence, or `None` if the
-    /// sequence is empty.
-    pub fn pop(&mut self) -> Option<Pair<T, P>> {
-        if self.last.is_some() {
-            self.last.take().map(|t| Pair::End(*t))
-        } else {
-            self.inner.pop().map(|(t, d)| Pair::Punctuated(t, d))
-        }
-    }
-
-    /// Determines whether this punctuated sequence ends with a trailing
-    /// punctuation.
-    pub fn trailing_punct(&self) -> bool {
-        self.last.is_none() && !self.is_empty()
-    }
-
-    /// Returns true if either this `Punctuated` is empty, or it has a trailing
-    /// punctuation.
-    ///
-    /// Equivalent to `punctuated.is_empty() || punctuated.trailing_punct()`.
-    pub fn empty_or_trailing(&self) -> bool {
-        self.last.is_none()
-    }
-}
-
-impl<T, P> Punctuated<T, P>
-where
-    P: Default,
-{
-    /// Appends a syntax tree node onto the end of this punctuated sequence.
-    ///
-    /// If there is not a trailing punctuation in this sequence when this method
-    /// is called, the default value of punctuation type `P` is inserted before
-    /// the given value of type `T`.
-    pub fn push(&mut self, value: T) {
-        if !self.empty_or_trailing() {
-            self.push_punct(Default::default());
-        }
-        self.push_value(value);
-    }
-
-    /// Inserts an element at position `index`.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `index` is greater than the number of elements previously in
-    /// this punctuated sequence.
-    pub fn insert(&mut self, index: usize, value: T) {
-        assert!(index <= self.len());
-
-        if index == self.len() {
-            self.push(value);
-        } else {
-            self.inner.insert(index, (value, Default::default()));
-        }
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl<T: Debug, P: Debug> Debug for Punctuated<T, P> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let mut list = f.debug_list();
-        for &(ref t, ref p) in &self.inner {
-            list.entry(t);
-            list.entry(p);
-        }
-        if let Some(ref last) = self.last {
-            list.entry(last);
-        }
-        list.finish()
-    }
-}
-
-impl<T, P> FromIterator<T> for Punctuated<T, P>
-where
-    P: Default,
-{
-    fn from_iter<I: IntoIterator<Item = T>>(i: I) -> Self {
-        let mut ret = Punctuated::new();
-        ret.extend(i);
-        ret
-    }
-}
-
-impl<T, P> Extend<T> for Punctuated<T, P>
-where
-    P: Default,
-{
-    fn extend<I: IntoIterator<Item = T>>(&mut self, i: I) {
-        for value in i {
-            self.push(value);
-        }
-    }
-}
-
-impl<T, P> FromIterator<Pair<T, P>> for Punctuated<T, P> {
-    fn from_iter<I: IntoIterator<Item = Pair<T, P>>>(i: I) -> Self {
-        let mut ret = Punctuated::new();
-        ret.extend(i);
-        ret
-    }
-}
-
-impl<T, P> Extend<Pair<T, P>> for Punctuated<T, P> {
-    fn extend<I: IntoIterator<Item = Pair<T, P>>>(&mut self, i: I) {
-        assert!(self.empty_or_trailing());
-        let mut nomore = false;
-        for pair in i {
-            if nomore {
-                panic!("Punctuated extended with items after a Pair::End");
-            }
-            match pair {
-                Pair::Punctuated(a, b) => self.inner.push((a, b)),
-                Pair::End(a) => {
-                    self.last = Some(Box::new(a));
-                    nomore = true;
-                }
-            }
-        }
-    }
-}
-
-impl<T, P> IntoIterator for Punctuated<T, P> {
-    type Item = T;
-    type IntoIter = IntoIter<T, P>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        IntoIter {
-            inner: self.inner.into_iter(),
-            last: self.last.map(|t| *t).into_iter(),
-        }
-    }
-}
-
-impl<'a, T, P> IntoIterator for &'a Punctuated<T, P> {
-    type Item = &'a T;
-    type IntoIter = Iter<'a, T>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        Punctuated::iter(self)
-    }
-}
-
-impl<'a, T, P> IntoIterator for &'a mut Punctuated<T, P> {
-    type Item = &'a mut T;
-    type IntoIter = IterMut<'a, T>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        Punctuated::iter_mut(self)
-    }
-}
-
-impl<T, P> Default for Punctuated<T, P> {
-    fn default() -> Self {
-        Punctuated::new()
-    }
-}
-
-/// An iterator over borrowed pairs of type `Pair<&T, &P>`.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-pub struct Pairs<'a, T: 'a, P: 'a> {
-    inner: slice::Iter<'a, (T, P)>,
-    last: option::IntoIter<&'a T>,
-}
-
-impl<'a, T, P> Iterator for Pairs<'a, T, P> {
-    type Item = Pair<&'a T, &'a P>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner
-            .next()
-            .map(|&(ref t, ref p)| Pair::Punctuated(t, p))
-            .or_else(|| self.last.next().map(Pair::End))
-    }
-}
-
-impl<'a, T, P> ExactSizeIterator for Pairs<'a, T, P> {
-    fn len(&self) -> usize {
-        self.inner.len() + self.last.len()
-    }
-}
-
-/// An iterator over mutably borrowed pairs of type `Pair<&mut T, &mut P>`.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-pub struct PairsMut<'a, T: 'a, P: 'a> {
-    inner: slice::IterMut<'a, (T, P)>,
-    last: option::IntoIter<&'a mut T>,
-}
-
-impl<'a, T, P> Iterator for PairsMut<'a, T, P> {
-    type Item = Pair<&'a mut T, &'a mut P>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner
-            .next()
-            .map(|&mut (ref mut t, ref mut p)| Pair::Punctuated(t, p))
-            .or_else(|| self.last.next().map(Pair::End))
-    }
-}
-
-impl<'a, T, P> ExactSizeIterator for PairsMut<'a, T, P> {
-    fn len(&self) -> usize {
-        self.inner.len() + self.last.len()
-    }
-}
-
-/// An iterator over owned pairs of type `Pair<T, P>`.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-pub struct IntoPairs<T, P> {
-    inner: vec::IntoIter<(T, P)>,
-    last: option::IntoIter<T>,
-}
-
-impl<T, P> Iterator for IntoPairs<T, P> {
-    type Item = Pair<T, P>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner
-            .next()
-            .map(|(t, p)| Pair::Punctuated(t, p))
-            .or_else(|| self.last.next().map(Pair::End))
-    }
-}
-
-impl<T, P> ExactSizeIterator for IntoPairs<T, P> {
-    fn len(&self) -> usize {
-        self.inner.len() + self.last.len()
-    }
-}
-
-/// An iterator over owned values of type `T`.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-pub struct IntoIter<T, P> {
-    inner: vec::IntoIter<(T, P)>,
-    last: option::IntoIter<T>,
-}
-
-impl<T, P> Iterator for IntoIter<T, P> {
-    type Item = T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner
-            .next()
-            .map(|pair| pair.0)
-            .or_else(|| self.last.next())
-    }
-}
-
-impl<T, P> ExactSizeIterator for IntoIter<T, P> {
-    fn len(&self) -> usize {
-        self.inner.len() + self.last.len()
-    }
-}
-
-/// An iterator over borrowed values of type `&T`.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-pub struct Iter<'a, T: 'a> {
-    inner: Box<ExactSizeIterator<Item = &'a T> + 'a>,
-}
-
-struct PrivateIter<'a, T: 'a, P: 'a> {
-    inner: slice::Iter<'a, (T, P)>,
-    last: option::IntoIter<&'a T>,
-}
-
-#[cfg(any(feature = "full", feature = "derive"))]
-impl<'a, T> Iter<'a, T> {
-    // Not public API.
-    #[doc(hidden)]
-    pub fn private_empty() -> Self {
-        Iter {
-            inner: Box::new(iter::empty()),
-        }
-    }
-}
-
-impl<'a, T> Iterator for Iter<'a, T> {
-    type Item = &'a T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next()
-    }
-}
-
-impl<'a, T> ExactSizeIterator for Iter<'a, T> {
-    fn len(&self) -> usize {
-        self.inner.len()
-    }
-}
-
-impl<'a, T, P> Iterator for PrivateIter<'a, T, P> {
-    type Item = &'a T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner
-            .next()
-            .map(|pair| &pair.0)
-            .or_else(|| self.last.next())
-    }
-}
-
-impl<'a, T, P> ExactSizeIterator for PrivateIter<'a, T, P> {
-    fn len(&self) -> usize {
-        self.inner.len() + self.last.len()
-    }
-}
-
-/// An iterator over mutably borrowed values of type `&mut T`.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-pub struct IterMut<'a, T: 'a> {
-    inner: Box<ExactSizeIterator<Item = &'a mut T> + 'a>,
-}
-
-struct PrivateIterMut<'a, T: 'a, P: 'a> {
-    inner: slice::IterMut<'a, (T, P)>,
-    last: option::IntoIter<&'a mut T>,
-}
-
-impl<'a, T> Iterator for IterMut<'a, T> {
-    type Item = &'a mut T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next()
-    }
-}
-
-impl<'a, T> ExactSizeIterator for IterMut<'a, T> {
-    fn len(&self) -> usize {
-        self.inner.len()
-    }
-}
-
-impl<'a, T, P> Iterator for PrivateIterMut<'a, T, P> {
-    type Item = &'a mut T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner
-            .next()
-            .map(|pair| &mut pair.0)
-            .or_else(|| self.last.next())
-    }
-}
-
-impl<'a, T, P> ExactSizeIterator for PrivateIterMut<'a, T, P> {
-    fn len(&self) -> usize {
-        self.inner.len() + self.last.len()
-    }
-}
-
-/// A single syntax tree node of type `T` followed by its trailing punctuation
-/// of type `P` if any.
-///
-/// Refer to the [module documentation] for details about punctuated sequences.
-///
-/// [module documentation]: index.html
-pub enum Pair<T, P> {
-    Punctuated(T, P),
-    End(T),
-}
-
-impl<T, P> Pair<T, P> {
-    /// Extracts the syntax tree node from this punctuated pair, discarding the
-    /// following punctuation.
-    pub fn into_value(self) -> T {
-        match self {
-            Pair::Punctuated(t, _) | Pair::End(t) => t,
-        }
-    }
-
-    /// Borrows the syntax tree node from this punctuated pair.
-    pub fn value(&self) -> &T {
-        match *self {
-            Pair::Punctuated(ref t, _) | Pair::End(ref t) => t,
-        }
-    }
-
-    /// Mutably borrows the syntax tree node from this punctuated pair.
-    pub fn value_mut(&mut self) -> &mut T {
-        match *self {
-            Pair::Punctuated(ref mut t, _) | Pair::End(ref mut t) => t,
-        }
-    }
-
-    /// Borrows the punctuation from this punctuated pair, unless this pair is
-    /// the final one and there is no trailing punctuation.
-    pub fn punct(&self) -> Option<&P> {
-        match *self {
-            Pair::Punctuated(_, ref d) => Some(d),
-            Pair::End(_) => None,
-        }
-    }
-
-    /// Creates a punctuated pair out of a syntax tree node and an optional
-    /// following punctuation.
-    pub fn new(t: T, d: Option<P>) -> Self {
-        match d {
-            Some(d) => Pair::Punctuated(t, d),
-            None => Pair::End(t),
-        }
-    }
-
-    /// Produces this punctuated pair as a tuple of syntax tree node and
-    /// optional following punctuation.
-    pub fn into_tuple(self) -> (T, Option<P>) {
-        match self {
-            Pair::Punctuated(t, d) => (t, Some(d)),
-            Pair::End(t) => (t, None),
-        }
-    }
-}
-
-impl<T, P> Index<usize> for Punctuated<T, P> {
-    type Output = T;
-
-    fn index(&self, index: usize) -> &Self::Output {
-        if index == self.len() - 1 {
-            match self.last {
-                Some(ref t) => t,
-                None => &self.inner[index].0,
-            }
-        } else {
-            &self.inner[index].0
-        }
-    }
-}
-
-impl<T, P> IndexMut<usize> for Punctuated<T, P> {
-    fn index_mut(&mut self, index: usize) -> &mut Self::Output {
-        if index == self.len() - 1 {
-            match self.last {
-                Some(ref mut t) => t,
-                None => &mut self.inner[index].0,
-            }
-        } else {
-            &mut self.inner[index].0
-        }
-    }
-}
-
-#[cfg(feature = "parsing")]
-impl<T, P> Punctuated<T, P>
-where
-    T: Synom,
-    P: Synom,
-{
-    /// Parse **zero or more** syntax tree nodes with punctuation in between and
-    /// **no trailing** punctuation.
-    pub fn parse_separated(input: Cursor) -> PResult<Self> {
-        Self::parse_separated_with(input, T::parse)
-    }
-
-    /// Parse **one or more** syntax tree nodes with punctuation in bewteen and
-    /// **no trailing** punctuation.
-    /// allowing trailing punctuation.
-    pub fn parse_separated_nonempty(input: Cursor) -> PResult<Self> {
-        Self::parse_separated_nonempty_with(input, T::parse)
-    }
-
-    /// Parse **zero or more** syntax tree nodes with punctuation in between and
-    /// **optional trailing** punctuation.
-    pub fn parse_terminated(input: Cursor) -> PResult<Self> {
-        Self::parse_terminated_with(input, T::parse)
-    }
-
-    /// Parse **one or more** syntax tree nodes with punctuation in between and
-    /// **optional trailing** punctuation.
-    pub fn parse_terminated_nonempty(input: Cursor) -> PResult<Self> {
-        Self::parse_terminated_nonempty_with(input, T::parse)
-    }
-}
-
-#[cfg(feature = "parsing")]
-impl<T, P> Punctuated<T, P>
-where
-    P: Synom,
-{
-    /// Parse **zero or more** syntax tree nodes using the given parser with
-    /// punctuation in between and **no trailing** punctuation.
-    pub fn parse_separated_with(input: Cursor, parse: fn(Cursor) -> PResult<T>) -> PResult<Self> {
-        Self::parse(input, parse, false)
-    }
-
-    /// Parse **one or more** syntax tree nodes using the given parser with
-    /// punctuation in between and **no trailing** punctuation.
-    pub fn parse_separated_nonempty_with(
-        input: Cursor,
-        parse: fn(Cursor) -> PResult<T>,
-    ) -> PResult<Self> {
-        match Self::parse(input, parse, false) {
-            Ok((ref b, _)) if b.is_empty() => parse_error(),
-            other => other,
-        }
-    }
-
-    /// Parse **zero or more** syntax tree nodes using the given parser with
-    /// punctuation in between and **optional trailing** punctuation.
-    pub fn parse_terminated_with(input: Cursor, parse: fn(Cursor) -> PResult<T>) -> PResult<Self> {
-        Self::parse(input, parse, true)
-    }
-
-    /// Parse **one or more** syntax tree nodes using the given parser with
-    /// punctuation in between and **optional trailing** punctuation.
-    pub fn parse_terminated_nonempty_with(
-        input: Cursor,
-        parse: fn(Cursor) -> PResult<T>,
-    ) -> PResult<Self> {
-        match Self::parse(input, parse, true) {
-            Ok((ref b, _)) if b.is_empty() => parse_error(),
-            other => other,
-        }
-    }
-
-    fn parse(
-        mut input: Cursor,
-        parse: fn(Cursor) -> PResult<T>,
-        terminated: bool,
-    ) -> PResult<Self> {
-        let mut res = Punctuated::new();
-
-        // get the first element
-        match parse(input) {
-            Err(_) => Ok((res, input)),
-            Ok((o, i)) => {
-                if i == input {
-                    return parse_error();
-                }
-                input = i;
-                res.push_value(o);
-
-                // get the separator first
-                while let Ok((s, i2)) = P::parse(input) {
-                    if i2 == input {
-                        break;
-                    }
-
-                    // get the element next
-                    if let Ok((o3, i3)) = parse(i2) {
-                        if i3 == i2 {
-                            break;
-                        }
-                        res.push_punct(s);
-                        res.push_value(o3);
-                        input = i3;
-                    } else {
-                        break;
-                    }
-                }
-                if terminated {
-                    if let Ok((sep, after)) = P::parse(input) {
-                        res.push_punct(sep);
-                        input = after;
-                    }
-                }
-                Ok((res, input))
-            }
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use proc_macro2::TokenStream;
-    use quote::{ToTokens, TokenStreamExt};
-
-    impl<T, P> ToTokens for Punctuated<T, P>
-    where
-        T: ToTokens,
-        P: ToTokens,
-    {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            tokens.append_all(self.pairs())
-        }
-    }
-
-    impl<T, P> ToTokens for Pair<T, P>
-    where
-        T: ToTokens,
-        P: ToTokens,
-    {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            match *self {
-                Pair::Punctuated(ref a, ref b) => {
-                    a.to_tokens(tokens);
-                    b.to_tokens(tokens);
-                }
-                Pair::End(ref a) => a.to_tokens(tokens),
-            }
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/spanned.rs b/third_party/rust/syn-0.14.6/src/spanned.rs
deleted file mode 100644
index 9372dce1b614..000000000000
--- a/third_party/rust/syn-0.14.6/src/spanned.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! A trait that can provide the `Span` of the complete contents of a syntax
-//! tree node.
-//!
-//! *This module is available if Syn is built with both the `"parsing"` and
-//! `"printing"` features.*
-//!
-//! # Example
-//!
-//! Suppose in a procedural macro we have a [`Type`] that we want to assert
-//! implements the [`Sync`] trait. Maybe this is the type of one of the fields
-//! of a struct for which we are deriving a trait implementation, and we need to
-//! be able to pass a reference to one of those fields across threads.
-//!
-//! [`Type`]: ../enum.Type.html
-//! [`Sync`]: https://doc.rust-lang.org/std/marker/trait.Sync.html
-//!
-//! If the field type does *not* implement `Sync` as required, we want the
-//! compiler to report an error pointing out exactly which type it was.
-//!
-//! The following macro code takes a variable `ty` of type `Type` and produces a
-//! static assertion that `Sync` is implemented for that type.
-//!
-//! ```
-//! #[macro_use]
-//! extern crate quote;
-//!
-//! extern crate syn;
-//! extern crate proc_macro;
-//! extern crate proc_macro2;
-//!
-//! use syn::Type;
-//! use syn::spanned::Spanned;
-//! use proc_macro::TokenStream;
-//! use proc_macro2::Span;
-//!
-//! # const IGNORE_TOKENS: &str = stringify! {
-//! #[proc_macro_derive(MyMacro)]
-//! # };
-//! pub fn my_macro(input: TokenStream) -> TokenStream {
-//!     # let ty = get_a_type();
-//!     /* ... */
-//!
-//!     let assert_sync = quote_spanned! {ty.span()=>
-//!         struct _AssertSync where #ty: Sync;
-//!     };
-//!
-//!     /* ... */
-//!     # input
-//! }
-//! #
-//! # fn get_a_type() -> Type {
-//! #     unimplemented!()
-//! # }
-//! #
-//! # fn main() {}
-//! ```
-//!
-//! By inserting this `assert_sync` fragment into the output code generated by
-//! our macro, the user's code will fail to compile if `ty` does not implement
-//! `Sync`. The errors they would see look like the following.
-//!
-//! ```text
-//! error[E0277]: the trait bound `*const i32: std::marker::Sync` is not satisfied
-//!   --> src/main.rs:10:21
-//!    |
-//! 10 |     bad_field: *const i32,
-//!    |                ^^^^^^^^^^ `*const i32` cannot be shared between threads safely
-//! ```
-//!
-//! In this technique, using the `Type`'s span for the error message makes the
-//! error appear in the correct place underlining the right type.
-
-use proc_macro2::{Span, TokenStream};
-use quote::ToTokens;
-
-/// A trait that can provide the `Span` of the complete contents of a syntax
-/// tree node.
-///
-/// This trait is automatically implemented for all types that implement
-/// [`ToTokens`] from the `quote` crate.
-///
-/// [`ToTokens`]: https://docs.rs/quote/0.4/quote/trait.ToTokens.html
-///
-/// See the [module documentation] for an example.
-///
-/// [module documentation]: index.html
-///
-/// *This trait is available if Syn is built with both the `"parsing"` and
-/// `"printing"` features.*
-pub trait Spanned {
-    /// Returns a `Span` covering the complete contents of this syntax tree
-    /// node, or [`Span::call_site()`] if this node is empty.
-    ///
-    /// [`Span::call_site()`]: https://docs.rs/proc-macro2/0.2/proc_macro2/struct.Span.html#method.call_site
-    fn span(&self) -> Span;
-}
-
-impl<T> Spanned for T
-where
-    T: ToTokens,
-{
-    #[cfg(procmacro2_semver_exempt)]
-    fn span(&self) -> Span {
-        let mut tokens = TokenStream::new();
-        self.to_tokens(&mut tokens);
-        let mut iter = tokens.into_iter();
-        let mut span = match iter.next() {
-            Some(tt) => tt.span(),
-            None => {
-                return Span::call_site();
-            }
-        };
-        for tt in iter {
-            if let Some(joined) = span.join(tt.span()) {
-                span = joined;
-            }
-        }
-        span
-    }
-
-    #[cfg(not(procmacro2_semver_exempt))]
-    fn span(&self) -> Span {
-        let mut tokens = TokenStream::new();
-        self.to_tokens(&mut tokens);
-        let mut iter = tokens.into_iter();
-
-        // We can't join spans without procmacro2_semver_exempt so just grab the
-        // first one.
-        match iter.next() {
-            Some(tt) => tt.span(),
-            None => Span::call_site(),
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/synom.rs b/third_party/rust/syn-0.14.6/src/synom.rs
deleted file mode 100644
index 2b0538d88ad7..000000000000
--- a/third_party/rust/syn-0.14.6/src/synom.rs
+++ /dev/null
@@ -1,413 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Parsing interface for parsing a token stream into a syntax tree node.
-//!
-//! Parsing in Syn is built on parser functions that take in a [`Cursor`] and
-//! produce a [`PResult<T>`] where `T` is some syntax tree node. `Cursor` is a
-//! cheaply copyable cursor over a range of tokens in a token stream, and
-//! `PResult` is a result that packages together a parsed syntax tree node `T`
-//! with a stream of remaining unparsed tokens after `T` represented as another
-//! `Cursor`, or a [`ParseError`] if parsing failed.
-//!
-//! [`Cursor`]: ../buffer/index.html
-//! [`PResult<T>`]: type.PResult.html
-//! [`ParseError`]: struct.ParseError.html
-//!
-//! This `Cursor`- and `PResult`-based interface is convenient for parser
-//! combinators and parser implementations, but not necessarily when you just
-//! have some tokens that you want to parse. For that we expose the following
-//! two entry points.
-//!
-//! ## The `syn::parse*` functions
-//!
-//! The [`syn::parse`], [`syn::parse2`], and [`syn::parse_str`] functions serve
-//! as an entry point for parsing syntax tree nodes that can be parsed in an
-//! obvious default way. These functions can return any syntax tree node that
-//! implements the [`Synom`] trait, which includes most types in Syn.
-//!
-//! [`syn::parse`]: ../fn.parse.html
-//! [`syn::parse2`]: ../fn.parse2.html
-//! [`syn::parse_str`]: ../fn.parse_str.html
-//! [`Synom`]: trait.Synom.html
-//!
-//! ```
-//! use syn::Type;
-//!
-//! # fn run_parser() -> Result<(), syn::synom::ParseError> {
-//! let t: Type = syn::parse_str("std::collections::HashMap<String, Value>")?;
-//! #     Ok(())
-//! # }
-//! #
-//! # fn main() {
-//! #     run_parser().unwrap();
-//! # }
-//! ```
-//!
-//! The [`parse_quote!`] macro also uses this approach.
-//!
-//! [`parse_quote!`]: ../macro.parse_quote.html
-//!
-//! ## The `Parser` trait
-//!
-//! Some types can be parsed in several ways depending on context. For example
-//! an [`Attribute`] can be either "outer" like `#[...]` or "inner" like
-//! `#![...]` and parsing the wrong one would be a bug. Similarly [`Punctuated`]
-//! may or may not allow trailing punctuation, and parsing it the wrong way
-//! would either reject valid input or accept invalid input.
-//!
-//! [`Attribute`]: ../struct.Attribute.html
-//! [`Punctuated`]: ../punctuated/index.html
-//!
-//! The `Synom` trait is not implemented in these cases because there is no good
-//! behavior to consider the default.
-//!
-//! ```ignore
-//! // Can't parse `Punctuated` without knowing whether trailing punctuation
-//! // should be allowed in this context.
-//! let path: Punctuated<PathSegment, Token![::]> = syn::parse(tokens)?;
-//! ```
-//!
-//! In these cases the types provide a choice of parser functions rather than a
-//! single `Synom` implementation, and those parser functions can be invoked
-//! through the [`Parser`] trait.
-//!
-//! [`Parser`]: trait.Parser.html
-//!
-//! ```
-//! # #[macro_use]
-//! # extern crate syn;
-//! #
-//! # extern crate proc_macro2;
-//! # use proc_macro2::TokenStream;
-//! #
-//! use syn::synom::Parser;
-//! use syn::punctuated::Punctuated;
-//! use syn::{PathSegment, Expr, Attribute};
-//!
-//! # fn run_parsers() -> Result<(), syn::synom::ParseError> {
-//! #     let tokens = TokenStream::new().into();
-//! // Parse a nonempty sequence of path segments separated by `::` punctuation
-//! // with no trailing punctuation.
-//! let parser = Punctuated::<PathSegment, Token![::]>::parse_separated_nonempty;
-//! let path = parser.parse(tokens)?;
-//!
-//! #     let tokens = TokenStream::new().into();
-//! // Parse a possibly empty sequence of expressions terminated by commas with
-//! // an optional trailing punctuation.
-//! let parser = Punctuated::<Expr, Token![,]>::parse_terminated;
-//! let args = parser.parse(tokens)?;
-//!
-//! #     let tokens = TokenStream::new().into();
-//! // Parse zero or more outer attributes but not inner attributes.
-//! named!(outer_attrs -> Vec<Attribute>, many0!(Attribute::parse_outer));
-//! let attrs = outer_attrs.parse(tokens)?;
-//! #
-//! #     Ok(())
-//! # }
-//! #
-//! # fn main() {}
-//! ```
-//!
-//! # Implementing a parser function
-//!
-//! Parser functions are usually implemented using the [`nom`]-style parser
-//! combinator macros provided by Syn, but may also be implemented without
-//! macros be using the low-level [`Cursor`] API directly.
-//!
-//! [`nom`]: https://github.com/Geal/nom
-//!
-//! The following parser combinator macros are available and a `Synom` parsing
-//! example is provided for each one.
-//!
-//! - [`alt!`](../macro.alt.html)
-//! - [`braces!`](../macro.braces.html)
-//! - [`brackets!`](../macro.brackets.html)
-//! - [`call!`](../macro.call.html)
-//! - [`cond!`](../macro.cond.html)
-//! - [`cond_reduce!`](../macro.cond_reduce.html)
-//! - [`custom_keyword!`](../macro.custom_keyword.html)
-//! - [`do_parse!`](../macro.do_parse.html)
-//! - [`epsilon!`](../macro.epsilon.html)
-//! - [`input_end!`](../macro.input_end.html)
-//! - [`keyword!`](../macro.keyword.html)
-//! - [`many0!`](../macro.many0.html)
-//! - [`map!`](../macro.map.html)
-//! - [`not!`](../macro.not.html)
-//! - [`option!`](../macro.option.html)
-//! - [`parens!`](../macro.parens.html)
-//! - [`punct!`](../macro.punct.html)
-//! - [`reject!`](../macro.reject.html)
-//! - [`switch!`](../macro.switch.html)
-//! - [`syn!`](../macro.syn.html)
-//! - [`tuple!`](../macro.tuple.html)
-//! - [`value!`](../macro.value.html)
-//!
-//! *This module is available if Syn is built with the `"parsing"` feature.*
-
-#[cfg(feature = "proc-macro")]
-use proc_macro;
-use proc_macro2::{Delimiter, Group, Ident, Literal, Punct, TokenStream, TokenTree};
-
-use error::parse_error;
-pub use error::{PResult, ParseError};
-
-use buffer::{Cursor, TokenBuffer};
-
-/// Parsing interface implemented by all types that can be parsed in a default
-/// way from a token stream.
-///
-/// Refer to the [module documentation] for details about parsing in Syn.
-///
-/// [module documentation]: index.html
-///
-/// *This trait is available if Syn is built with the `"parsing"` feature.*
-pub trait Synom: Sized {
-    fn parse(input: Cursor) -> PResult<Self>;
-
-    /// A short name of the type being parsed.
-    ///
-    /// The description should only be used for a simple name.  It should not
-    /// contain newlines or sentence-ending punctuation, to facilitate embedding in
-    /// larger user-facing strings.  Syn will use this description when building
-    /// error messages about parse failures.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use syn::buffer::Cursor;
-    /// # use syn::synom::{Synom, PResult};
-    /// #
-    /// struct ExprMacro {
-    ///     // ...
-    /// }
-    ///
-    /// impl Synom for ExprMacro {
-    /// #   fn parse(input: Cursor) -> PResult<Self> { unimplemented!() }
-    ///     // fn parse(...) -> ... { ... }
-    ///
-    ///     fn description() -> Option<&'static str> {
-    ///         // Will result in messages like
-    ///         //
-    ///         //     "failed to parse macro invocation expression: $reason"
-    ///         Some("macro invocation expression")
-    ///     }
-    /// }
-    /// ```
-    fn description() -> Option<&'static str> {
-        None
-    }
-}
-
-impl Synom for TokenStream {
-    fn parse(input: Cursor) -> PResult<Self> {
-        Ok((input.token_stream(), Cursor::empty()))
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("arbitrary token stream")
-    }
-}
-
-impl Synom for TokenTree {
-    fn parse(input: Cursor) -> PResult<Self> {
-        match input.token_tree() {
-            Some((tt, rest)) => Ok((tt, rest)),
-            None => parse_error(),
-        }
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("token tree")
-    }
-}
-
-impl Synom for Group {
-    fn parse(input: Cursor) -> PResult<Self> {
-        for delim in &[Delimiter::Parenthesis, Delimiter::Brace, Delimiter::Bracket] {
-            if let Some((inside, span, rest)) = input.group(*delim) {
-                let mut group = Group::new(*delim, inside.token_stream());
-                group.set_span(span);
-                return Ok((group, rest));
-            }
-        }
-        parse_error()
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("group token")
-    }
-}
-
-impl Synom for Ident {
-    fn parse(input: Cursor) -> PResult<Self> {
-        let (ident, rest) = match input.ident() {
-            Some(ident) => ident,
-            _ => return parse_error(),
-        };
-        match &ident.to_string()[..] {
-            "_"
-            // Based on https://doc.rust-lang.org/grammar.html#keywords
-            // and https://github.com/rust-lang/rfcs/blob/master/text/2421-unreservations-2018.md
-            | "abstract" | "as" | "become" | "box" | "break" | "const"
-            | "continue" | "crate" | "do" | "else" | "enum" | "extern" | "false" | "final"
-            | "fn" | "for" | "if" | "impl" | "in" | "let" | "loop" | "macro" | "match"
-            | "mod" | "move" | "mut" | "override" | "priv" | "proc" | "pub"
-            | "ref" | "return" | "Self" | "self" | "static" | "struct"
-            | "super" | "trait" | "true" | "type" | "typeof" | "unsafe" | "unsized" | "use"
-            | "virtual" | "where" | "while" | "yield" => return parse_error(),
-            _ => {}
-        }
-
-        Ok((ident, rest))
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("identifier")
-    }
-}
-
-impl Synom for Punct {
-    fn parse(input: Cursor) -> PResult<Self> {
-        match input.punct() {
-            Some((punct, rest)) => Ok((punct, rest)),
-            None => parse_error(),
-        }
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("punctuation token")
-    }
-}
-
-impl Synom for Literal {
-    fn parse(input: Cursor) -> PResult<Self> {
-        match input.literal() {
-            Some((literal, rest)) => Ok((literal, rest)),
-            None => parse_error(),
-        }
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("literal token")
-    }
-}
-
-/// Parser that can parse Rust tokens into a particular syntax tree node.
-///
-/// Refer to the [module documentation] for details about parsing in Syn.
-///
-/// [module documentation]: index.html
-///
-/// *This trait is available if Syn is built with the `"parsing"` feature.*
-pub trait Parser: Sized {
-    type Output;
-
-    /// Parse a proc-macro2 token stream into the chosen syntax tree node.
-    fn parse2(self, tokens: TokenStream) -> Result<Self::Output, ParseError>;
-
-    /// Parse tokens of source code into the chosen syntax tree node.
-    ///
-    /// *This method is available if Syn is built with both the `"parsing"` and
-    /// `"proc-macro"` features.*
-    #[cfg(feature = "proc-macro")]
-    fn parse(self, tokens: proc_macro::TokenStream) -> Result<Self::Output, ParseError> {
-        self.parse2(tokens.into())
-    }
-
-    /// Parse a string of Rust code into the chosen syntax tree node.
-    ///
-    /// # Hygiene
-    ///
-    /// Every span in the resulting syntax tree will be set to resolve at the
-    /// macro call site.
-    fn parse_str(self, s: &str) -> Result<Self::Output, ParseError> {
-        match s.parse() {
-            Ok(tts) => self.parse2(tts),
-            Err(_) => Err(ParseError::new("error while lexing input string")),
-        }
-    }
-}
-
-impl<F, T> Parser for F
-where
-    F: FnOnce(Cursor) -> PResult<T>,
-{
-    type Output = T;
-
-    fn parse2(self, tokens: TokenStream) -> Result<T, ParseError> {
-        let buf = TokenBuffer::new2(tokens);
-        let (t, rest) = self(buf.begin())?;
-        if rest.eof() {
-            Ok(t)
-        } else if rest == buf.begin() {
-            // parsed nothing
-            Err(ParseError::new("failed to parse anything"))
-        } else {
-            Err(ParseError::new("failed to parse all tokens"))
-        }
-    }
-}
-
-/// Extension traits that are made available within the `call!` parser.
-///
-/// *This module is available if Syn is built with the `"parsing"` feature.*
-pub mod ext {
-    use super::*;
-    use proc_macro2::Ident;
-
-    /// Additional parsing methods for `Ident`.
-    ///
-    /// This trait is sealed and cannot be implemented for types outside of Syn.
-    ///
-    /// *This trait is available if Syn is built with the `"parsing"` feature.*
-    pub trait IdentExt: Sized + private::Sealed {
-        /// Parses any identifier including keywords.
-        ///
-        /// This is useful when parsing a DSL which allows Rust keywords as
-        /// identifiers.
-        ///
-        /// ```rust
-        /// #[macro_use]
-        /// extern crate syn;
-        ///
-        /// use syn::Ident;
-        ///
-        /// // Parses input that looks like `name = NAME` where `NAME` can be
-        /// // any identifier.
-        /// //
-        /// // Examples:
-        /// //
-        /// //     name = anything
-        /// //     name = impl
-        /// named!(parse_dsl -> Ident, do_parse!(
-        ///     custom_keyword!(name) >>
-        ///     punct!(=) >>
-        ///     name: call!(Ident::parse_any) >>
-        ///     (name)
-        /// ));
-        /// #
-        /// # fn main() {}
-        /// ```
-        fn parse_any(input: Cursor) -> PResult<Self>;
-    }
-
-    impl IdentExt for Ident {
-        fn parse_any(input: Cursor) -> PResult<Self> {
-            input.ident().map_or_else(parse_error, Ok)
-        }
-    }
-
-    mod private {
-        use proc_macro2::Ident;
-
-        pub trait Sealed {}
-
-        impl Sealed for Ident {}
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/token.rs b/third_party/rust/syn-0.14.6/src/token.rs
deleted file mode 100644
index a60202fd1c13..000000000000
--- a/third_party/rust/syn-0.14.6/src/token.rs
+++ /dev/null
@@ -1,889 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Tokens representing Rust punctuation, keywords, and delimiters.
-//!
-//! The type names in this module can be difficult to keep straight, so we
-//! prefer to use the [`Token!`] macro instead. This is a type-macro that
-//! expands to the token type of the given token.
-//!
-//! [`Token!`]: ../macro.Token.html
-//!
-//! # Example
-//!
-//! The [`ItemStatic`] syntax tree node is defined like this.
-//!
-//! [`ItemStatic`]: ../struct.ItemStatic.html
-//!
-//! ```
-//! # #[macro_use]
-//! # extern crate syn;
-//! #
-//! # use syn::{Attribute, Visibility, Ident, Type, Expr};
-//! #
-//! pub struct ItemStatic {
-//!     pub attrs: Vec<Attribute>,
-//!     pub vis: Visibility,
-//!     pub static_token: Token![static],
-//!     pub mutability: Option<Token![mut]>,
-//!     pub ident: Ident,
-//!     pub colon_token: Token![:],
-//!     pub ty: Box<Type>,
-//!     pub eq_token: Token![=],
-//!     pub expr: Box<Expr>,
-//!     pub semi_token: Token![;],
-//! }
-//! #
-//! # fn main() {}
-//! ```
-//!
-//! # Parsing
-//!
-//! These tokens can be parsed using the [`Synom`] trait and the parser
-//! combinator macros [`punct!`], [`keyword!`], [`parens!`], [`braces!`], and
-//! [`brackets!`].
-//!
-//! [`Synom`]: ../synom/trait.Synom.html
-//! [`punct!`]: ../macro.punct.html
-//! [`keyword!`]: ../macro.keyword.html
-//! [`parens!`]: ../macro.parens.html
-//! [`braces!`]: ../macro.braces.html
-//! [`brackets!`]: ../macro.brackets.html
-//!
-//! ```
-//! #[macro_use]
-//! extern crate syn;
-//!
-//! use syn::synom::Synom;
-//! use syn::{Attribute, Visibility, Ident, Type, Expr};
-//! #
-//! # struct ItemStatic;
-//! # use syn::ItemStatic as SynItemStatic;
-//!
-//! // Parse the ItemStatic struct shown above.
-//! impl Synom for ItemStatic {
-//!     named!(parse -> Self, do_parse!(
-//! #       (ItemStatic)
-//! #   ));
-//! # }
-//! #
-//! # mod example {
-//! #   use super::*;
-//! #   use super::SynItemStatic as ItemStatic;
-//! #
-//! #   named!(parse -> ItemStatic, do_parse!(
-//!         attrs: many0!(Attribute::parse_outer) >>
-//!         vis: syn!(Visibility) >>
-//!         static_token: keyword!(static) >>
-//!         mutability: option!(keyword!(mut)) >>
-//!         ident: syn!(Ident) >>
-//!         colon_token: punct!(:) >>
-//!         ty: syn!(Type) >>
-//!         eq_token: punct!(=) >>
-//!         expr: syn!(Expr) >>
-//!         semi_token: punct!(;) >>
-//!         (ItemStatic {
-//!             attrs, vis, static_token, mutability, ident, colon_token,
-//!             ty: Box::new(ty), eq_token, expr: Box::new(expr), semi_token,
-//!         })
-//!     ));
-//! }
-//! #
-//! # fn main() {}
-//! ```
-
-use proc_macro2::{Ident, Span};
-
-macro_rules! tokens {
-    (
-        punct: {
-            $($punct:tt pub struct $punct_name:ident/$len:tt #[$punct_doc:meta])*
-        }
-        delimiter: {
-            $($delimiter:tt pub struct $delimiter_name:ident #[$delimiter_doc:meta])*
-        }
-        keyword: {
-            $($keyword:tt pub struct $keyword_name:ident #[$keyword_doc:meta])*
-        }
-    ) => (
-        $(token_punct_def! { #[$punct_doc] pub struct $punct_name/$len })*
-        $(token_punct_parser! { $punct pub struct $punct_name })*
-        $(token_delimiter! { #[$delimiter_doc] $delimiter pub struct $delimiter_name })*
-        $(token_keyword! { #[$keyword_doc] $keyword pub struct $keyword_name })*
-    )
-}
-
-macro_rules! token_punct_def {
-    (#[$doc:meta]pub struct $name:ident / $len:tt) => {
-        #[cfg_attr(feature = "clone-impls", derive(Copy, Clone))]
-        #[$doc]
-        ///
-        /// Don't try to remember the name of this type -- use the [`Token!`]
-        /// macro instead.
-        ///
-        /// [`Token!`]: index.html
-        pub struct $name(pub [Span; $len]);
-
-        impl $name {
-            pub fn new(span: Span) -> Self {
-                $name([span; $len])
-            }
-        }
-
-        impl ::std::default::Default for $name {
-            fn default() -> Self {
-                $name([Span::call_site(); $len])
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::fmt::Debug for $name {
-            fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-                f.write_str(stringify!($name))
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::cmp::Eq for $name {}
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::cmp::PartialEq for $name {
-            fn eq(&self, _other: &$name) -> bool {
-                true
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::hash::Hash for $name {
-            fn hash<H>(&self, _state: &mut H)
-            where
-                H: ::std::hash::Hasher,
-            {
-            }
-        }
-
-        impl From<Span> for $name {
-            fn from(span: Span) -> Self {
-                $name([span; $len])
-            }
-        }
-    };
-}
-
-macro_rules! token_punct_parser {
-    ($s:tt pub struct $name:ident) => {
-        #[cfg(feature = "printing")]
-        impl ::quote::ToTokens for $name {
-            fn to_tokens(&self, tokens: &mut ::proc_macro2::TokenStream) {
-                printing::punct($s, &self.0, tokens);
-            }
-        }
-
-        #[cfg(feature = "parsing")]
-        impl ::Synom for $name {
-            fn parse(tokens: $crate::buffer::Cursor) -> $crate::synom::PResult<$name> {
-                parsing::punct($s, tokens, $name)
-            }
-
-            fn description() -> Option<&'static str> {
-                Some(concat!("`", $s, "`"))
-            }
-        }
-    };
-}
-
-macro_rules! token_keyword {
-    (#[$doc:meta] $s:tt pub struct $name:ident) => {
-        #[cfg_attr(feature = "clone-impls", derive(Copy, Clone))]
-        #[$doc]
-        ///
-        /// Don't try to remember the name of this type -- use the [`Token!`]
-        /// macro instead.
-        ///
-        /// [`Token!`]: index.html
-        pub struct $name(pub Span);
-
-        impl ::std::default::Default for $name {
-            fn default() -> Self {
-                $name(Span::call_site())
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::fmt::Debug for $name {
-            fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-                f.write_str(stringify!($name))
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::cmp::Eq for $name {}
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::cmp::PartialEq for $name {
-            fn eq(&self, _other: &$name) -> bool {
-                true
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::hash::Hash for $name {
-            fn hash<H>(&self, _state: &mut H)
-            where
-                H: ::std::hash::Hasher,
-            {
-            }
-        }
-
-        #[cfg(feature = "printing")]
-        impl ::quote::ToTokens for $name {
-            fn to_tokens(&self, tokens: &mut ::proc_macro2::TokenStream) {
-                printing::keyword($s, &self.0, tokens);
-            }
-        }
-
-        #[cfg(feature = "parsing")]
-        impl ::Synom for $name {
-            fn parse(tokens: $crate::buffer::Cursor) -> $crate::synom::PResult<$name> {
-                parsing::keyword($s, tokens, $name)
-            }
-
-            fn description() -> Option<&'static str> {
-                Some(concat!("`", $s, "`"))
-            }
-        }
-
-        impl From<Span> for $name {
-            fn from(span: Span) -> Self {
-                $name(span)
-            }
-        }
-    };
-}
-
-macro_rules! token_delimiter {
-    (#[$doc:meta] $s:tt pub struct $name:ident) => {
-        #[cfg_attr(feature = "clone-impls", derive(Copy, Clone))]
-        #[$doc]
-        pub struct $name(pub Span);
-
-        impl ::std::default::Default for $name {
-            fn default() -> Self {
-                $name(Span::call_site())
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::fmt::Debug for $name {
-            fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-                f.write_str(stringify!($name))
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::cmp::Eq for $name {}
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::cmp::PartialEq for $name {
-            fn eq(&self, _other: &$name) -> bool {
-                true
-            }
-        }
-
-        #[cfg(feature = "extra-traits")]
-        impl ::std::hash::Hash for $name {
-            fn hash<H>(&self, _state: &mut H)
-            where
-                H: ::std::hash::Hasher,
-            {
-            }
-        }
-
-        impl $name {
-            #[cfg(feature = "printing")]
-            pub fn surround<F>(&self, tokens: &mut ::proc_macro2::TokenStream, f: F)
-            where
-                F: FnOnce(&mut ::proc_macro2::TokenStream),
-            {
-                printing::delim($s, &self.0, tokens, f);
-            }
-
-            #[cfg(feature = "parsing")]
-            pub fn parse<F, R>(
-                tokens: $crate::buffer::Cursor,
-                f: F,
-            ) -> $crate::synom::PResult<($name, R)>
-            where
-                F: FnOnce($crate::buffer::Cursor) -> $crate::synom::PResult<R>,
-            {
-                parsing::delim($s, tokens, $name, f)
-            }
-        }
-
-        impl From<Span> for $name {
-            fn from(span: Span) -> Self {
-                $name(span)
-            }
-        }
-    };
-}
-
-token_punct_def! {
-    /// `_`
-    pub struct Underscore/1
-}
-
-#[cfg(feature = "printing")]
-impl ::quote::ToTokens for Underscore {
-    fn to_tokens(&self, tokens: &mut ::proc_macro2::TokenStream) {
-        use quote::TokenStreamExt;
-        tokens.append(::proc_macro2::Ident::new("_", self.0[0]));
-    }
-}
-
-#[cfg(feature = "parsing")]
-impl ::Synom for Underscore {
-    fn parse(input: ::buffer::Cursor) -> ::synom::PResult<Underscore> {
-        match input.ident() {
-            Some((ident, rest)) => {
-                if ident == "_" {
-                    Ok((Underscore([ident.span()]), rest))
-                } else {
-                    ::parse_error()
-                }
-            }
-            None => parsing::punct("_", input, Underscore),
-        }
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("`_`")
-    }
-}
-
-token_punct_def! {
-    /// `'`
-    pub struct Apostrophe/1
-}
-
-// Implement Clone anyway because it is required for cloning Lifetime.
-#[cfg(not(feature = "clone-impls"))]
-impl Clone for Apostrophe {
-    fn clone(&self) -> Self {
-        Apostrophe(self.0)
-    }
-}
-
-#[cfg(feature = "printing")]
-impl ::quote::ToTokens for Apostrophe {
-    fn to_tokens(&self, tokens: &mut ::proc_macro2::TokenStream) {
-        use quote::TokenStreamExt;
-        let mut token = ::proc_macro2::Punct::new('\'', ::proc_macro2::Spacing::Joint);
-        token.set_span(self.0[0]);
-        tokens.append(token);
-    }
-}
-
-#[cfg(feature = "parsing")]
-impl ::Synom for Apostrophe {
-    fn parse(input: ::buffer::Cursor) -> ::synom::PResult<Apostrophe> {
-        match input.punct() {
-            Some((op, rest)) => {
-                if op.as_char() == '\'' && op.spacing() == ::proc_macro2::Spacing::Joint {
-                    Ok((Apostrophe([op.span()]), rest))
-                } else {
-                    ::parse_error()
-                }
-            }
-            None => ::parse_error(),
-        }
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("`'`")
-    }
-}
-
-tokens! {
-    punct: {
-        "+"        pub struct Add/1        /// `+`
-        "+="       pub struct AddEq/2      /// `+=`
-        "&"        pub struct And/1        /// `&`
-        "&&"       pub struct AndAnd/2     /// `&&`
-        "&="       pub struct AndEq/2      /// `&=`
-        "@"        pub struct At/1         /// `@`
-        "!"        pub struct Bang/1       /// `!`
-        "^"        pub struct Caret/1      /// `^`
-        "^="       pub struct CaretEq/2    /// `^=`
-        ":"        pub struct Colon/1      /// `:`
-        "::"       pub struct Colon2/2     /// `::`
-        ","        pub struct Comma/1      /// `,`
-        "/"        pub struct Div/1        /// `/`
-        "/="       pub struct DivEq/2      /// `/=`
-        "$"        pub struct Dollar/1     /// `$`
-        "."        pub struct Dot/1        /// `.`
-        ".."       pub struct Dot2/2       /// `..`
-        "..."      pub struct Dot3/3       /// `...`
-        "..="      pub struct DotDotEq/3   /// `..=`
-        "="        pub struct Eq/1         /// `=`
-        "=="       pub struct EqEq/2       /// `==`
-        ">="       pub struct Ge/2         /// `>=`
-        ">"        pub struct Gt/1         /// `>`
-        "<="       pub struct Le/2         /// `<=`
-        "<"        pub struct Lt/1         /// `<`
-        "*="       pub struct MulEq/2      /// `*=`
-        "!="       pub struct Ne/2         /// `!=`
-        "|"        pub struct Or/1         /// `|`
-        "|="       pub struct OrEq/2       /// `|=`
-        "||"       pub struct OrOr/2       /// `||`
-        "#"        pub struct Pound/1      /// `#`
-        "?"        pub struct Question/1   /// `?`
-        "->"       pub struct RArrow/2     /// `->`
-        "<-"       pub struct LArrow/2     /// `<-`
-        "%"        pub struct Rem/1        /// `%`
-        "%="       pub struct RemEq/2      /// `%=`
-        "=>"       pub struct FatArrow/2   /// `=>`
-        ";"        pub struct Semi/1       /// `;`
-        "<<"       pub struct Shl/2        /// `<<`
-        "<<="      pub struct ShlEq/3      /// `<<=`
-        ">>"       pub struct Shr/2        /// `>>`
-        ">>="      pub struct ShrEq/3      /// `>>=`
-        "*"        pub struct Star/1       /// `*`
-        "-"        pub struct Sub/1        /// `-`
-        "-="       pub struct SubEq/2      /// `-=`
-    }
-    delimiter: {
-        "{"        pub struct Brace        /// `{...}`
-        "["        pub struct Bracket      /// `[...]`
-        "("        pub struct Paren        /// `(...)`
-        " "        pub struct Group        /// None-delimited group
-    }
-    keyword: {
-        "as"       pub struct As           /// `as`
-        "async"    pub struct Async        /// `async`
-        "auto"     pub struct Auto         /// `auto`
-        "box"      pub struct Box          /// `box`
-        "break"    pub struct Break        /// `break`
-        "Self"     pub struct CapSelf      /// `Self`
-        "catch"    pub struct Catch        /// `catch`
-        "const"    pub struct Const        /// `const`
-        "continue" pub struct Continue     /// `continue`
-        "crate"    pub struct Crate        /// `crate`
-        "default"  pub struct Default      /// `default`
-        "do"       pub struct Do           /// `do`
-        "dyn"      pub struct Dyn          /// `dyn`
-        "else"     pub struct Else         /// `else`
-        "enum"     pub struct Enum         /// `enum`
-        "extern"   pub struct Extern       /// `extern`
-        "fn"       pub struct Fn           /// `fn`
-        "for"      pub struct For          /// `for`
-        "if"       pub struct If           /// `if`
-        "impl"     pub struct Impl         /// `impl`
-        "in"       pub struct In           /// `in`
-        "let"      pub struct Let          /// `let`
-        "loop"     pub struct Loop         /// `loop`
-        "macro"    pub struct Macro        /// `macro`
-        "match"    pub struct Match        /// `match`
-        "mod"      pub struct Mod          /// `mod`
-        "move"     pub struct Move         /// `move`
-        "mut"      pub struct Mut          /// `mut`
-        "pub"      pub struct Pub          /// `pub`
-        "ref"      pub struct Ref          /// `ref`
-        "return"   pub struct Return       /// `return`
-        "self"     pub struct Self_        /// `self`
-        "static"   pub struct Static       /// `static`
-        "struct"   pub struct Struct       /// `struct`
-        "super"    pub struct Super        /// `super`
-        "trait"    pub struct Trait        /// `trait`
-        "type"     pub struct Type         /// `type`
-        "union"    pub struct Union        /// `union`
-        "unsafe"   pub struct Unsafe       /// `unsafe`
-        "use"      pub struct Use          /// `use`
-        "where"    pub struct Where        /// `where`
-        "while"    pub struct While        /// `while`
-        "yield"    pub struct Yield        /// `yield`
-    }
-}
-
-/// A type-macro that expands to the name of the Rust type representation of a
-/// given token.
-///
-/// See the [token module] documentation for details and examples.
-///
-/// [token module]: token/index.html
-// Unfortunate duplication due to a rustdoc bug.
-// https://github.com/rust-lang/rust/issues/45939
-#[macro_export]
-#[cfg_attr(rustfmt, rustfmt_skip)]
-macro_rules! Token {
-    (+)        => { $crate::token::Add };
-    (+=)       => { $crate::token::AddEq };
-    (&)        => { $crate::token::And };
-    (&&)       => { $crate::token::AndAnd };
-    (&=)       => { $crate::token::AndEq };
-    (@)        => { $crate::token::At };
-    (!)        => { $crate::token::Bang };
-    (^)        => { $crate::token::Caret };
-    (^=)       => { $crate::token::CaretEq };
-    (:)        => { $crate::token::Colon };
-    (::)       => { $crate::token::Colon2 };
-    (,)        => { $crate::token::Comma };
-    (/)        => { $crate::token::Div };
-    (/=)       => { $crate::token::DivEq };
-    (.)        => { $crate::token::Dot };
-    (..)       => { $crate::token::Dot2 };
-    (...)      => { $crate::token::Dot3 };
-    (..=)      => { $crate::token::DotDotEq };
-    (=)        => { $crate::token::Eq };
-    (==)       => { $crate::token::EqEq };
-    (>=)       => { $crate::token::Ge };
-    (>)        => { $crate::token::Gt };
-    (<=)       => { $crate::token::Le };
-    (<)        => { $crate::token::Lt };
-    (*=)       => { $crate::token::MulEq };
-    (!=)       => { $crate::token::Ne };
-    (|)        => { $crate::token::Or };
-    (|=)       => { $crate::token::OrEq };
-    (||)       => { $crate::token::OrOr };
-    (#)        => { $crate::token::Pound };
-    (?)        => { $crate::token::Question };
-    (->)       => { $crate::token::RArrow };
-    (<-)       => { $crate::token::LArrow };
-    (%)        => { $crate::token::Rem };
-    (%=)       => { $crate::token::RemEq };
-    (=>)       => { $crate::token::FatArrow };
-    (;)        => { $crate::token::Semi };
-    (<<)       => { $crate::token::Shl };
-    (<<=)      => { $crate::token::ShlEq };
-    (>>)       => { $crate::token::Shr };
-    (>>=)      => { $crate::token::ShrEq };
-    (*)        => { $crate::token::Star };
-    (-)        => { $crate::token::Sub };
-    (-=)       => { $crate::token::SubEq };
-    (_)        => { $crate::token::Underscore };
-    (as)       => { $crate::token::As };
-    (async)    => { $crate::token::Async };
-    (auto)     => { $crate::token::Auto };
-    (box)      => { $crate::token::Box };
-    (break)    => { $crate::token::Break };
-    (Self)     => { $crate::token::CapSelf };
-    (catch)    => { $crate::token::Catch };
-    (const)    => { $crate::token::Const };
-    (continue) => { $crate::token::Continue };
-    (crate)    => { $crate::token::Crate };
-    (default)  => { $crate::token::Default };
-    (do)       => { $crate::token::Do };
-    (dyn)      => { $crate::token::Dyn };
-    (else)     => { $crate::token::Else };
-    (enum)     => { $crate::token::Enum };
-    (extern)   => { $crate::token::Extern };
-    (fn)       => { $crate::token::Fn };
-    (for)      => { $crate::token::For };
-    (if)       => { $crate::token::If };
-    (impl)     => { $crate::token::Impl };
-    (in)       => { $crate::token::In };
-    (let)      => { $crate::token::Let };
-    (loop)     => { $crate::token::Loop };
-    (macro)    => { $crate::token::Macro };
-    (match)    => { $crate::token::Match };
-    (mod)      => { $crate::token::Mod };
-    (move)     => { $crate::token::Move };
-    (mut)      => { $crate::token::Mut };
-    (pub)      => { $crate::token::Pub };
-    (ref)      => { $crate::token::Ref };
-    (return)   => { $crate::token::Return };
-    (self)     => { $crate::token::Self_ };
-    (static)   => { $crate::token::Static };
-    (struct)   => { $crate::token::Struct };
-    (super)    => { $crate::token::Super };
-    (trait)    => { $crate::token::Trait };
-    (type)     => { $crate::token::Type };
-    (union)    => { $crate::token::Union };
-    (unsafe)   => { $crate::token::Unsafe };
-    (use)      => { $crate::token::Use };
-    (where)    => { $crate::token::Where };
-    (while)    => { $crate::token::While };
-    (yield)    => { $crate::token::Yield };
-}
-
-/// Parse a single Rust punctuation token.
-///
-/// See the [token module] documentation for details and examples.
-///
-/// [token module]: token/index.html
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[cfg(feature = "parsing")]
-#[macro_export]
-#[cfg_attr(rustfmt, rustfmt_skip)]
-macro_rules! punct {
-    ($i:expr, +)   => { call!($i, <$crate::token::Add as $crate::synom::Synom>::parse) };
-    ($i:expr, +=)  => { call!($i, <$crate::token::AddEq as $crate::synom::Synom>::parse) };
-    ($i:expr, &)   => { call!($i, <$crate::token::And as $crate::synom::Synom>::parse) };
-    ($i:expr, &&)  => { call!($i, <$crate::token::AndAnd as $crate::synom::Synom>::parse) };
-    ($i:expr, &=)  => { call!($i, <$crate::token::AndEq as $crate::synom::Synom>::parse) };
-    ($i:expr, @)   => { call!($i, <$crate::token::At as $crate::synom::Synom>::parse) };
-    ($i:expr, !)   => { call!($i, <$crate::token::Bang as $crate::synom::Synom>::parse) };
-    ($i:expr, ^)   => { call!($i, <$crate::token::Caret as $crate::synom::Synom>::parse) };
-    ($i:expr, ^=)  => { call!($i, <$crate::token::CaretEq as $crate::synom::Synom>::parse) };
-    ($i:expr, :)   => { call!($i, <$crate::token::Colon as $crate::synom::Synom>::parse) };
-    ($i:expr, ::)  => { call!($i, <$crate::token::Colon2 as $crate::synom::Synom>::parse) };
-    ($i:expr, ,)   => { call!($i, <$crate::token::Comma as $crate::synom::Synom>::parse) };
-    ($i:expr, /)   => { call!($i, <$crate::token::Div as $crate::synom::Synom>::parse) };
-    ($i:expr, /=)  => { call!($i, <$crate::token::DivEq as $crate::synom::Synom>::parse) };
-    ($i:expr, .)   => { call!($i, <$crate::token::Dot as $crate::synom::Synom>::parse) };
-    ($i:expr, ..)  => { call!($i, <$crate::token::Dot2 as $crate::synom::Synom>::parse) };
-    ($i:expr, ...) => { call!($i, <$crate::token::Dot3 as $crate::synom::Synom>::parse) };
-    ($i:expr, ..=) => { call!($i, <$crate::token::DotDotEq as $crate::synom::Synom>::parse) };
-    ($i:expr, =)   => { call!($i, <$crate::token::Eq as $crate::synom::Synom>::parse) };
-    ($i:expr, ==)  => { call!($i, <$crate::token::EqEq as $crate::synom::Synom>::parse) };
-    ($i:expr, >=)  => { call!($i, <$crate::token::Ge as $crate::synom::Synom>::parse) };
-    ($i:expr, >)   => { call!($i, <$crate::token::Gt as $crate::synom::Synom>::parse) };
-    ($i:expr, <=)  => { call!($i, <$crate::token::Le as $crate::synom::Synom>::parse) };
-    ($i:expr, <)   => { call!($i, <$crate::token::Lt as $crate::synom::Synom>::parse) };
-    ($i:expr, *=)  => { call!($i, <$crate::token::MulEq as $crate::synom::Synom>::parse) };
-    ($i:expr, !=)  => { call!($i, <$crate::token::Ne as $crate::synom::Synom>::parse) };
-    ($i:expr, |)   => { call!($i, <$crate::token::Or as $crate::synom::Synom>::parse) };
-    ($i:expr, |=)  => { call!($i, <$crate::token::OrEq as $crate::synom::Synom>::parse) };
-    ($i:expr, ||)  => { call!($i, <$crate::token::OrOr as $crate::synom::Synom>::parse) };
-    ($i:expr, #)   => { call!($i, <$crate::token::Pound as $crate::synom::Synom>::parse) };
-    ($i:expr, ?)   => { call!($i, <$crate::token::Question as $crate::synom::Synom>::parse) };
-    ($i:expr, ->)  => { call!($i, <$crate::token::RArrow as $crate::synom::Synom>::parse) };
-    ($i:expr, <-)  => { call!($i, <$crate::token::LArrow as $crate::synom::Synom>::parse) };
-    ($i:expr, %)   => { call!($i, <$crate::token::Rem as $crate::synom::Synom>::parse) };
-    ($i:expr, %=)  => { call!($i, <$crate::token::RemEq as $crate::synom::Synom>::parse) };
-    ($i:expr, =>)  => { call!($i, <$crate::token::FatArrow as $crate::synom::Synom>::parse) };
-    ($i:expr, ;)   => { call!($i, <$crate::token::Semi as $crate::synom::Synom>::parse) };
-    ($i:expr, <<)  => { call!($i, <$crate::token::Shl as $crate::synom::Synom>::parse) };
-    ($i:expr, <<=) => { call!($i, <$crate::token::ShlEq as $crate::synom::Synom>::parse) };
-    ($i:expr, >>)  => { call!($i, <$crate::token::Shr as $crate::synom::Synom>::parse) };
-    ($i:expr, >>=) => { call!($i, <$crate::token::ShrEq as $crate::synom::Synom>::parse) };
-    ($i:expr, *)   => { call!($i, <$crate::token::Star as $crate::synom::Synom>::parse) };
-    ($i:expr, -)   => { call!($i, <$crate::token::Sub as $crate::synom::Synom>::parse) };
-    ($i:expr, -=)  => { call!($i, <$crate::token::SubEq as $crate::synom::Synom>::parse) };
-    ($i:expr, _)   => { call!($i, <$crate::token::Underscore as $crate::synom::Synom>::parse) };
-}
-
-/// Parse a single Rust keyword token.
-///
-/// See the [token module] documentation for details and examples.
-///
-/// [token module]: token/index.html
-///
-/// *This macro is available if Syn is built with the `"parsing"` feature.*
-#[cfg(feature = "parsing")]
-#[macro_export]
-#[cfg_attr(rustfmt, rustfmt_skip)]
-macro_rules! keyword {
-    ($i:expr, as)       => { call!($i, <$crate::token::As as $crate::synom::Synom>::parse) };
-    ($i:expr, async)    => { call!($i, <$crate::token::Async as $crate::synom::Synom>::parse) };
-    ($i:expr, auto)     => { call!($i, <$crate::token::Auto as $crate::synom::Synom>::parse) };
-    ($i:expr, box)      => { call!($i, <$crate::token::Box as $crate::synom::Synom>::parse) };
-    ($i:expr, break)    => { call!($i, <$crate::token::Break as $crate::synom::Synom>::parse) };
-    ($i:expr, Self)     => { call!($i, <$crate::token::CapSelf as $crate::synom::Synom>::parse) };
-    ($i:expr, catch)    => { call!($i, <$crate::token::Catch as $crate::synom::Synom>::parse) };
-    ($i:expr, const)    => { call!($i, <$crate::token::Const as $crate::synom::Synom>::parse) };
-    ($i:expr, continue) => { call!($i, <$crate::token::Continue as $crate::synom::Synom>::parse) };
-    ($i:expr, crate)    => { call!($i, <$crate::token::Crate as $crate::synom::Synom>::parse) };
-    ($i:expr, default)  => { call!($i, <$crate::token::Default as $crate::synom::Synom>::parse) };
-    ($i:expr, do)       => { call!($i, <$crate::token::Do as $crate::synom::Synom>::parse) };
-    ($i:expr, dyn)      => { call!($i, <$crate::token::Dyn as $crate::synom::Synom>::parse) };
-    ($i:expr, else)     => { call!($i, <$crate::token::Else as $crate::synom::Synom>::parse) };
-    ($i:expr, enum)     => { call!($i, <$crate::token::Enum as $crate::synom::Synom>::parse) };
-    ($i:expr, extern)   => { call!($i, <$crate::token::Extern as $crate::synom::Synom>::parse) };
-    ($i:expr, fn)       => { call!($i, <$crate::token::Fn as $crate::synom::Synom>::parse) };
-    ($i:expr, for)      => { call!($i, <$crate::token::For as $crate::synom::Synom>::parse) };
-    ($i:expr, if)       => { call!($i, <$crate::token::If as $crate::synom::Synom>::parse) };
-    ($i:expr, impl)     => { call!($i, <$crate::token::Impl as $crate::synom::Synom>::parse) };
-    ($i:expr, in)       => { call!($i, <$crate::token::In as $crate::synom::Synom>::parse) };
-    ($i:expr, let)      => { call!($i, <$crate::token::Let as $crate::synom::Synom>::parse) };
-    ($i:expr, loop)     => { call!($i, <$crate::token::Loop as $crate::synom::Synom>::parse) };
-    ($i:expr, macro)    => { call!($i, <$crate::token::Macro as $crate::synom::Synom>::parse) };
-    ($i:expr, match)    => { call!($i, <$crate::token::Match as $crate::synom::Synom>::parse) };
-    ($i:expr, mod)      => { call!($i, <$crate::token::Mod as $crate::synom::Synom>::parse) };
-    ($i:expr, move)     => { call!($i, <$crate::token::Move as $crate::synom::Synom>::parse) };
-    ($i:expr, mut)      => { call!($i, <$crate::token::Mut as $crate::synom::Synom>::parse) };
-    ($i:expr, pub)      => { call!($i, <$crate::token::Pub as $crate::synom::Synom>::parse) };
-    ($i:expr, ref)      => { call!($i, <$crate::token::Ref as $crate::synom::Synom>::parse) };
-    ($i:expr, return)   => { call!($i, <$crate::token::Return as $crate::synom::Synom>::parse) };
-    ($i:expr, self)     => { call!($i, <$crate::token::Self_ as $crate::synom::Synom>::parse) };
-    ($i:expr, static)   => { call!($i, <$crate::token::Static as $crate::synom::Synom>::parse) };
-    ($i:expr, struct)   => { call!($i, <$crate::token::Struct as $crate::synom::Synom>::parse) };
-    ($i:expr, super)    => { call!($i, <$crate::token::Super as $crate::synom::Synom>::parse) };
-    ($i:expr, trait)    => { call!($i, <$crate::token::Trait as $crate::synom::Synom>::parse) };
-    ($i:expr, type)     => { call!($i, <$crate::token::Type as $crate::synom::Synom>::parse) };
-    ($i:expr, union)    => { call!($i, <$crate::token::Union as $crate::synom::Synom>::parse) };
-    ($i:expr, unsafe)   => { call!($i, <$crate::token::Unsafe as $crate::synom::Synom>::parse) };
-    ($i:expr, use)      => { call!($i, <$crate::token::Use as $crate::synom::Synom>::parse) };
-    ($i:expr, where)    => { call!($i, <$crate::token::Where as $crate::synom::Synom>::parse) };
-    ($i:expr, while)    => { call!($i, <$crate::token::While as $crate::synom::Synom>::parse) };
-    ($i:expr, yield)    => { call!($i, <$crate::token::Yield as $crate::synom::Synom>::parse) };
-}
-
-macro_rules! ident_from_token {
-    ($token:ident) => {
-        impl From<Token![$token]> for Ident {
-            fn from(token: Token![$token]) -> Ident {
-                Ident::new(stringify!($token), token.0)
-            }
-        }
-    };
-}
-
-ident_from_token!(self);
-ident_from_token!(Self);
-ident_from_token!(super);
-ident_from_token!(crate);
-ident_from_token!(extern);
-
-#[cfg(feature = "parsing")]
-mod parsing {
-    use proc_macro2::{Delimiter, Spacing, Span};
-
-    use buffer::Cursor;
-    use parse_error;
-    use synom::PResult;
-
-    pub trait FromSpans: Sized {
-        fn from_spans(spans: &[Span]) -> Self;
-    }
-
-    impl FromSpans for [Span; 1] {
-        fn from_spans(spans: &[Span]) -> Self {
-            [spans[0]]
-        }
-    }
-
-    impl FromSpans for [Span; 2] {
-        fn from_spans(spans: &[Span]) -> Self {
-            [spans[0], spans[1]]
-        }
-    }
-
-    impl FromSpans for [Span; 3] {
-        fn from_spans(spans: &[Span]) -> Self {
-            [spans[0], spans[1], spans[2]]
-        }
-    }
-
-    pub fn punct<'a, T, R>(s: &str, mut tokens: Cursor<'a>, new: fn(T) -> R) -> PResult<'a, R>
-    where
-        T: FromSpans,
-    {
-        let mut spans = [Span::call_site(); 3];
-        assert!(s.len() <= spans.len());
-        let chars = s.chars();
-
-        for (i, (ch, slot)) in chars.zip(&mut spans).enumerate() {
-            match tokens.punct() {
-                Some((op, rest)) => {
-                    if op.as_char() == ch {
-                        if i != s.len() - 1 {
-                            match op.spacing() {
-                                Spacing::Joint => {}
-                                _ => return parse_error(),
-                            }
-                        }
-                        *slot = op.span();
-                        tokens = rest;
-                    } else {
-                        return parse_error();
-                    }
-                }
-                _ => return parse_error(),
-            }
-        }
-        Ok((new(T::from_spans(&spans)), tokens))
-    }
-
-    pub fn keyword<'a, T>(keyword: &str, tokens: Cursor<'a>, new: fn(Span) -> T) -> PResult<'a, T> {
-        if let Some((ident, rest)) = tokens.ident() {
-            if ident == keyword {
-                return Ok((new(ident.span()), rest));
-            }
-        }
-        parse_error()
-    }
-
-    pub fn delim<'a, F, R, T>(
-        delim: &str,
-        tokens: Cursor<'a>,
-        new: fn(Span) -> T,
-        f: F,
-    ) -> PResult<'a, (T, R)>
-    where
-        F: FnOnce(Cursor) -> PResult<R>,
-    {
-        // NOTE: We should support none-delimited sequences here.
-        let delim = match delim {
-            "(" => Delimiter::Parenthesis,
-            "{" => Delimiter::Brace,
-            "[" => Delimiter::Bracket,
-            " " => Delimiter::None,
-            _ => panic!("unknown delimiter: {}", delim),
-        };
-
-        if let Some((inside, span, rest)) = tokens.group(delim) {
-            match f(inside) {
-                Ok((ret, remaining)) => {
-                    if remaining.eof() {
-                        return Ok(((new(span), ret), rest));
-                    }
-                }
-                Err(err) => return Err(err),
-            }
-        }
-        parse_error()
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use proc_macro2::{Delimiter, Group, Ident, Punct, Spacing, Span, TokenStream};
-    use quote::TokenStreamExt;
-
-    pub fn punct(s: &str, spans: &[Span], tokens: &mut TokenStream) {
-        assert_eq!(s.len(), spans.len());
-
-        let mut chars = s.chars();
-        let mut spans = spans.iter();
-        let ch = chars.next_back().unwrap();
-        let span = spans.next_back().unwrap();
-        for (ch, span) in chars.zip(spans) {
-            let mut op = Punct::new(ch, Spacing::Joint);
-            op.set_span(*span);
-            tokens.append(op);
-        }
-
-        let mut op = Punct::new(ch, Spacing::Alone);
-        op.set_span(*span);
-        tokens.append(op);
-    }
-
-    pub fn keyword(s: &str, span: &Span, tokens: &mut TokenStream) {
-        tokens.append(Ident::new(s, *span));
-    }
-
-    pub fn delim<F>(s: &str, span: &Span, tokens: &mut TokenStream, f: F)
-    where
-        F: FnOnce(&mut TokenStream),
-    {
-        let delim = match s {
-            "(" => Delimiter::Parenthesis,
-            "[" => Delimiter::Bracket,
-            "{" => Delimiter::Brace,
-            " " => Delimiter::None,
-            _ => panic!("unknown delimiter: {}", s),
-        };
-        let mut inner = TokenStream::new();
-        f(&mut inner);
-        let mut g = Group::new(delim, inner);
-        g.set_span(*span);
-        tokens.append(g);
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/tt.rs b/third_party/rust/syn-0.14.6/src/tt.rs
deleted file mode 100644
index bde82dcafbc6..000000000000
--- a/third_party/rust/syn-0.14.6/src/tt.rs
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[cfg(feature = "parsing")]
-use buffer::Cursor;
-#[cfg(feature = "parsing")]
-use synom::PResult;
-#[cfg(feature = "parsing")]
-use token::{Brace, Bracket, Paren};
-#[cfg(feature = "parsing")]
-use {parse_error, MacroDelimiter};
-
-#[cfg(feature = "extra-traits")]
-use std::hash::{Hash, Hasher};
-
-#[cfg(any(feature = "parsing", feature = "extra-traits"))]
-use proc_macro2::{Delimiter, TokenStream, TokenTree};
-
-#[cfg(feature = "parsing")]
-pub fn delimited(input: Cursor) -> PResult<(MacroDelimiter, TokenStream)> {
-    if let Some((TokenTree::Group(g), rest)) = input.token_tree() {
-        let span = g.span();
-        let delimiter = match g.delimiter() {
-            Delimiter::Parenthesis => MacroDelimiter::Paren(Paren(span)),
-            Delimiter::Brace => MacroDelimiter::Brace(Brace(span)),
-            Delimiter::Bracket => MacroDelimiter::Bracket(Bracket(span)),
-            Delimiter::None => return parse_error(),
-        };
-
-        return Ok(((delimiter, g.stream().clone()), rest));
-    }
-    parse_error()
-}
-
-#[cfg(all(feature = "full", feature = "parsing"))]
-pub fn braced(input: Cursor) -> PResult<(Brace, TokenStream)> {
-    if let Some((TokenTree::Group(g), rest)) = input.token_tree() {
-        if g.delimiter() == Delimiter::Brace {
-            return Ok(((Brace(g.span()), g.stream().clone()), rest));
-        }
-    }
-    parse_error()
-}
-
-#[cfg(all(feature = "full", feature = "parsing"))]
-pub fn parenthesized(input: Cursor) -> PResult<(Paren, TokenStream)> {
-    if let Some((TokenTree::Group(g), rest)) = input.token_tree() {
-        if g.delimiter() == Delimiter::Parenthesis {
-            return Ok(((Paren(g.span()), g.stream().clone()), rest));
-        }
-    }
-    parse_error()
-}
-
-#[cfg(feature = "extra-traits")]
-pub struct TokenTreeHelper<'a>(pub &'a TokenTree);
-
-#[cfg(feature = "extra-traits")]
-impl<'a> PartialEq for TokenTreeHelper<'a> {
-    fn eq(&self, other: &Self) -> bool {
-        use proc_macro2::Spacing;
-
-        match (self.0, other.0) {
-            (&TokenTree::Group(ref g1), &TokenTree::Group(ref g2)) => {
-                match (g1.delimiter(), g2.delimiter()) {
-                    (Delimiter::Parenthesis, Delimiter::Parenthesis)
-                    | (Delimiter::Brace, Delimiter::Brace)
-                    | (Delimiter::Bracket, Delimiter::Bracket)
-                    | (Delimiter::None, Delimiter::None) => {}
-                    _ => return false,
-                }
-
-                let s1 = g1.stream().clone().into_iter();
-                let mut s2 = g2.stream().clone().into_iter();
-
-                for item1 in s1 {
-                    let item2 = match s2.next() {
-                        Some(item) => item,
-                        None => return false,
-                    };
-                    if TokenTreeHelper(&item1) != TokenTreeHelper(&item2) {
-                        return false;
-                    }
-                }
-                s2.next().is_none()
-            }
-            (&TokenTree::Punct(ref o1), &TokenTree::Punct(ref o2)) => {
-                o1.as_char() == o2.as_char() && match (o1.spacing(), o2.spacing()) {
-                    (Spacing::Alone, Spacing::Alone) | (Spacing::Joint, Spacing::Joint) => true,
-                    _ => false,
-                }
-            }
-            (&TokenTree::Literal(ref l1), &TokenTree::Literal(ref l2)) => {
-                l1.to_string() == l2.to_string()
-            }
-            (&TokenTree::Ident(ref s1), &TokenTree::Ident(ref s2)) => s1 == s2,
-            _ => false,
-        }
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl<'a> Hash for TokenTreeHelper<'a> {
-    fn hash<H: Hasher>(&self, h: &mut H) {
-        use proc_macro2::Spacing;
-
-        match *self.0 {
-            TokenTree::Group(ref g) => {
-                0u8.hash(h);
-                match g.delimiter() {
-                    Delimiter::Parenthesis => 0u8.hash(h),
-                    Delimiter::Brace => 1u8.hash(h),
-                    Delimiter::Bracket => 2u8.hash(h),
-                    Delimiter::None => 3u8.hash(h),
-                }
-
-                for item in g.stream().clone() {
-                    TokenTreeHelper(&item).hash(h);
-                }
-                0xffu8.hash(h); // terminator w/ a variant we don't normally hash
-            }
-            TokenTree::Punct(ref op) => {
-                1u8.hash(h);
-                op.as_char().hash(h);
-                match op.spacing() {
-                    Spacing::Alone => 0u8.hash(h),
-                    Spacing::Joint => 1u8.hash(h),
-                }
-            }
-            TokenTree::Literal(ref lit) => (2u8, lit.to_string()).hash(h),
-            TokenTree::Ident(ref word) => (3u8, word).hash(h),
-        }
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-pub struct TokenStreamHelper<'a>(pub &'a TokenStream);
-
-#[cfg(feature = "extra-traits")]
-impl<'a> PartialEq for TokenStreamHelper<'a> {
-    fn eq(&self, other: &Self) -> bool {
-        let left = self.0.clone().into_iter().collect::<Vec<_>>();
-        let right = other.0.clone().into_iter().collect::<Vec<_>>();
-        if left.len() != right.len() {
-            return false;
-        }
-        for (a, b) in left.into_iter().zip(right) {
-            if TokenTreeHelper(&a) != TokenTreeHelper(&b) {
-                return false;
-            }
-        }
-        true
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl<'a> Hash for TokenStreamHelper<'a> {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        let tts = self.0.clone().into_iter().collect::<Vec<_>>();
-        tts.len().hash(state);
-        for tt in tts {
-            TokenTreeHelper(&tt).hash(state);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/ty.rs b/third_party/rust/syn-0.14.6/src/ty.rs
deleted file mode 100644
index 1ee46d06f99e..000000000000
--- a/third_party/rust/syn-0.14.6/src/ty.rs
+++ /dev/null
@@ -1,818 +0,0 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use super::*;
-use proc_macro2::TokenStream;
-use punctuated::Punctuated;
-#[cfg(feature = "extra-traits")]
-use std::hash::{Hash, Hasher};
-#[cfg(feature = "extra-traits")]
-use tt::TokenStreamHelper;
-
-ast_enum_of_structs! {
-    /// The possible types that a Rust value could have.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    ///
-    /// # Syntax tree enum
-    ///
-    /// This type is a [syntax tree enum].
-    ///
-    /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
-    pub enum Type {
-        /// A dynamically sized slice type: `[T]`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Slice(TypeSlice {
-            pub bracket_token: token::Bracket,
-            pub elem: Box<Type>,
-        }),
-
-        /// A fixed size array type: `[T; n]`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Array(TypeArray {
-            pub bracket_token: token::Bracket,
-            pub elem: Box<Type>,
-            pub semi_token: Token![;],
-            pub len: Expr,
-        }),
-
-        /// A raw pointer type: `*const T` or `*mut T`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Ptr(TypePtr {
-            pub star_token: Token![*],
-            pub const_token: Option<Token![const]>,
-            pub mutability: Option<Token![mut]>,
-            pub elem: Box<Type>,
-        }),
-
-        /// A reference type: `&'a T` or `&'a mut T`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Reference(TypeReference {
-            pub and_token: Token![&],
-            pub lifetime: Option<Lifetime>,
-            pub mutability: Option<Token![mut]>,
-            pub elem: Box<Type>,
-        }),
-
-        /// A bare function type: `fn(usize) -> bool`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub BareFn(TypeBareFn {
-            pub unsafety: Option<Token![unsafe]>,
-            pub abi: Option<Abi>,
-            pub fn_token: Token![fn],
-            pub lifetimes: Option<BoundLifetimes>,
-            pub paren_token: token::Paren,
-            pub inputs: Punctuated<BareFnArg, Token![,]>,
-            pub variadic: Option<Token![...]>,
-            pub output: ReturnType,
-        }),
-
-        /// The never type: `!`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Never(TypeNever {
-            pub bang_token: Token![!],
-        }),
-
-        /// A tuple type: `(A, B, C, String)`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Tuple(TypeTuple {
-            pub paren_token: token::Paren,
-            pub elems: Punctuated<Type, Token![,]>,
-        }),
-
-        /// A path like `std::slice::Iter`, optionally qualified with a
-        /// self-type as in `<Vec<T> as SomeTrait>::Associated`.
-        ///
-        /// Type arguments are stored in the Path itself.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Path(TypePath {
-            pub qself: Option<QSelf>,
-            pub path: Path,
-        }),
-
-        /// A trait object type `Bound1 + Bound2 + Bound3` where `Bound` is a
-        /// trait or a lifetime.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub TraitObject(TypeTraitObject {
-            pub dyn_token: Option<Token![dyn]>,
-            pub bounds: Punctuated<TypeParamBound, Token![+]>,
-        }),
-
-        /// An `impl Bound1 + Bound2 + Bound3` type where `Bound` is a trait or
-        /// a lifetime.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub ImplTrait(TypeImplTrait {
-            pub impl_token: Token![impl],
-            pub bounds: Punctuated<TypeParamBound, Token![+]>,
-        }),
-
-        /// A parenthesized type equivalent to the inner type.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Paren(TypeParen {
-            pub paren_token: token::Paren,
-            pub elem: Box<Type>,
-        }),
-
-        /// A type contained within invisible delimiters.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Group(TypeGroup {
-            pub group_token: token::Group,
-            pub elem: Box<Type>,
-        }),
-
-        /// Indication that a type should be inferred by the compiler: `_`.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Infer(TypeInfer {
-            pub underscore_token: Token![_],
-        }),
-
-        /// A macro in the type position.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Macro(TypeMacro {
-            pub mac: Macro,
-        }),
-
-        /// Tokens in type position not interpreted by Syn.
-        ///
-        /// *This type is available if Syn is built with the `"derive"` or
-        /// `"full"` feature.*
-        pub Verbatim(TypeVerbatim #manual_extra_traits {
-            pub tts: TokenStream,
-        }),
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Eq for TypeVerbatim {}
-
-#[cfg(feature = "extra-traits")]
-impl PartialEq for TypeVerbatim {
-    fn eq(&self, other: &Self) -> bool {
-        TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
-    }
-}
-
-#[cfg(feature = "extra-traits")]
-impl Hash for TypeVerbatim {
-    fn hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        TokenStreamHelper(&self.tts).hash(state);
-    }
-}
-
-ast_struct! {
-    /// The binary interface of a function: `extern "C"`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct Abi {
-        pub extern_token: Token![extern],
-        pub name: Option<LitStr>,
-    }
-}
-
-ast_struct! {
-    /// An argument in a function type: the `usize` in `fn(usize) -> bool`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub struct BareFnArg {
-        pub name: Option<(BareFnArgName, Token![:])>,
-        pub ty: Type,
-    }
-}
-
-ast_enum! {
-    /// Name of an argument in a function type: the `n` in `fn(n: usize)`.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum BareFnArgName {
-        /// Argument given a name.
-        Named(Ident),
-        /// Argument not given a name, matched with `_`.
-        Wild(Token![_]),
-    }
-}
-
-ast_enum! {
-    /// Return type of a function signature.
-    ///
-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-    /// feature.*
-    pub enum ReturnType {
-        /// Return type is not specified.
-        ///
-        /// Functions default to `()` and closures default to type inference.
-        Default,
-        /// A particular type is returned.
-        Type(Token![->], Box<Type>),
-    }
-}
-
-#[cfg(feature = "parsing")]
-pub mod parsing {
-    use super::*;
-    use path::parsing::qpath;
-    use synom::Synom;
-
-    impl Synom for Type {
-        named!(parse -> Self, call!(ambig_ty, true));
-
-        fn description() -> Option<&'static str> {
-            Some("type")
-        }
-    }
-
-    impl Type {
-        /// In some positions, types may not contain the `+` character, to
-        /// disambiguate them. For example in the expression `1 as T`, T may not
-        /// contain a `+` character.
-        ///
-        /// This parser does not allow a `+`, while the default parser does.
-        named!(pub without_plus -> Self, call!(ambig_ty, false));
-    }
-
-    named!(ambig_ty(allow_plus: bool) -> Type, alt!(
-        syn!(TypeGroup) => { Type::Group }
-        |
-        // must be before TypeTuple
-        call!(TypeParen::parse, allow_plus) => { Type::Paren }
-        |
-        // must be before TypePath
-        syn!(TypeMacro) => { Type::Macro }
-        |
-        // must be before TypePath
-        syn!(TypeBareFn) => { Type::BareFn }
-        |
-        // must be before TypeTraitObject
-        call!(TypePath::parse, allow_plus) => { Type::Path }
-        |
-        // Don't try parsing more than one trait bound if we aren't allowing it.
-        // must be before TypeTuple
-        call!(TypeTraitObject::parse, allow_plus) => { Type::TraitObject }
-        |
-        syn!(TypeSlice) => { Type::Slice }
-        |
-        syn!(TypeArray) => { Type::Array }
-        |
-        syn!(TypePtr) => { Type::Ptr }
-        |
-        syn!(TypeReference) => { Type::Reference }
-        |
-        syn!(TypeNever) => { Type::Never }
-        |
-        syn!(TypeTuple) => { Type::Tuple }
-        |
-        syn!(TypeImplTrait) => { Type::ImplTrait }
-        |
-        syn!(TypeInfer) => { Type::Infer }
-    ));
-
-    impl Synom for TypeSlice {
-        named!(parse -> Self, map!(
-            brackets!(syn!(Type)),
-            |(b, ty)| TypeSlice {
-                elem: Box::new(ty),
-                bracket_token: b,
-            }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("slice type")
-        }
-    }
-
-    impl Synom for TypeArray {
-        named!(parse -> Self, map!(
-            brackets!(do_parse!(
-                elem: syn!(Type) >>
-                    semi: punct!(;) >>
-                    len: syn!(Expr) >>
-                    (elem, semi, len)
-            )),
-            |(brackets, (elem, semi, len))| {
-                TypeArray {
-                    elem: Box::new(elem),
-                    len: len,
-                    bracket_token: brackets,
-                    semi_token: semi,
-                }
-            }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("array type")
-        }
-    }
-
-    impl Synom for TypePtr {
-        named!(parse -> Self, do_parse!(
-            star: punct!(*) >>
-            mutability: alt!(
-                keyword!(const) => { |c| (None, Some(c)) }
-                |
-                keyword!(mut) => { |m| (Some(m), None) }
-            ) >>
-            target: call!(Type::without_plus) >>
-            (TypePtr {
-                const_token: mutability.1,
-                star_token: star,
-                mutability: mutability.0,
-                elem: Box::new(target),
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("raw pointer type")
-        }
-    }
-
-    impl Synom for TypeReference {
-        named!(parse -> Self, do_parse!(
-            amp: punct!(&) >>
-            life: option!(syn!(Lifetime)) >>
-            mutability: option!(keyword!(mut)) >>
-            // & binds tighter than +, so we don't allow + here.
-            target: call!(Type::without_plus) >>
-            (TypeReference {
-                lifetime: life,
-                mutability: mutability,
-                elem: Box::new(target),
-                and_token: amp,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("reference type")
-        }
-    }
-
-    impl Synom for TypeBareFn {
-        named!(parse -> Self, do_parse!(
-            lifetimes: option!(syn!(BoundLifetimes)) >>
-            unsafety: option!(keyword!(unsafe)) >>
-            abi: option!(syn!(Abi)) >>
-            fn_: keyword!(fn) >>
-            parens: parens!(do_parse!(
-                inputs: call!(Punctuated::parse_terminated) >>
-                variadic: option!(cond_reduce!(inputs.empty_or_trailing(), punct!(...))) >>
-                (inputs, variadic)
-            )) >>
-            output: call!(ReturnType::without_plus) >>
-            (TypeBareFn {
-                unsafety: unsafety,
-                abi: abi,
-                lifetimes: lifetimes,
-                output: output,
-                variadic: (parens.1).1,
-                fn_token: fn_,
-                paren_token: parens.0,
-                inputs: (parens.1).0,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`fn` type")
-        }
-    }
-
-    impl Synom for TypeNever {
-        named!(parse -> Self, map!(
-            punct!(!),
-            |b| TypeNever { bang_token: b }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("never type: `!`")
-        }
-    }
-
-    impl Synom for TypeInfer {
-        named!(parse -> Self, map!(
-            punct!(_),
-            |u| TypeInfer { underscore_token: u }
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("inferred type: `_`")
-        }
-    }
-
-    impl Synom for TypeTuple {
-        named!(parse -> Self, do_parse!(
-            data: parens!(Punctuated::parse_terminated) >>
-            (TypeTuple {
-                paren_token: data.0,
-                elems: data.1,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("tuple type")
-        }
-    }
-
-    impl Synom for TypeMacro {
-        named!(parse -> Self, map!(syn!(Macro), |mac| TypeMacro { mac: mac }));
-
-        fn description() -> Option<&'static str> {
-            Some("macro invocation")
-        }
-    }
-
-    impl Synom for TypePath {
-        named!(parse -> Self, call!(Self::parse, false));
-
-        fn description() -> Option<&'static str> {
-            Some("type path")
-        }
-    }
-
-    impl TypePath {
-        named!(parse(allow_plus: bool) -> Self, do_parse!(
-            qpath: qpath >>
-            parenthesized: option!(cond_reduce!(
-                qpath.1.segments.last().unwrap().value().arguments.is_empty(),
-                syn!(ParenthesizedGenericArguments)
-            )) >>
-            cond!(allow_plus, not!(punct!(+))) >>
-            ({
-                let (qself, mut path) = qpath;
-                if let Some(parenthesized) = parenthesized {
-                    let parenthesized = PathArguments::Parenthesized(parenthesized);
-                    path.segments.last_mut().unwrap().value_mut().arguments = parenthesized;
-                }
-                TypePath { qself: qself, path: path }
-            })
-        ));
-    }
-
-    impl ReturnType {
-        named!(pub without_plus -> Self, call!(Self::parse, false));
-        named!(parse(allow_plus: bool) -> Self, alt!(
-            do_parse!(
-                arrow: punct!(->) >>
-                ty: call!(ambig_ty, allow_plus) >>
-                (ReturnType::Type(arrow, Box::new(ty)))
-            )
-            |
-            epsilon!() => { |_| ReturnType::Default }
-        ));
-    }
-
-    impl Synom for ReturnType {
-        named!(parse -> Self, call!(Self::parse, true));
-
-        fn description() -> Option<&'static str> {
-            Some("return type")
-        }
-    }
-
-    impl Synom for TypeTraitObject {
-        named!(parse -> Self, call!(Self::parse, true));
-
-        fn description() -> Option<&'static str> {
-            Some("trait object type")
-        }
-    }
-
-    fn at_least_one_type(bounds: &Punctuated<TypeParamBound, Token![+]>) -> bool {
-        for bound in bounds {
-            if let TypeParamBound::Trait(_) = *bound {
-                return true;
-            }
-        }
-        false
-    }
-
-    impl TypeTraitObject {
-        named!(pub without_plus -> Self, call!(Self::parse, false));
-
-        // Only allow multiple trait references if allow_plus is true.
-        named!(parse(allow_plus: bool) -> Self, do_parse!(
-            dyn_token: option!(keyword!(dyn)) >>
-            bounds: alt!(
-                cond_reduce!(allow_plus, Punctuated::parse_terminated_nonempty)
-                |
-                syn!(TypeParamBound) => {|x| {
-                    let mut bounds = Punctuated::new();
-                    bounds.push_value(x);
-                    bounds
-                }}
-            ) >>
-            // Just lifetimes like `'a + 'b` is not a TraitObject.
-            cond_reduce!(at_least_one_type(&bounds)) >>
-            (TypeTraitObject {
-                dyn_token: dyn_token,
-                bounds: bounds,
-            })
-        ));
-    }
-
-    impl Synom for TypeImplTrait {
-        named!(parse -> Self, do_parse!(
-            impl_: keyword!(impl) >>
-            // NOTE: rust-lang/rust#34511 includes discussion about whether or
-            // not + should be allowed in ImplTrait directly without ().
-            elem: call!(Punctuated::parse_terminated_nonempty) >>
-            (TypeImplTrait {
-                impl_token: impl_,
-                bounds: elem,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`impl Trait` type")
-        }
-    }
-
-    impl Synom for TypeGroup {
-        named!(parse -> Self, do_parse!(
-            data: grouped!(syn!(Type)) >>
-            (TypeGroup {
-                group_token: data.0,
-                elem: Box::new(data.1),
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("type surrounded by invisible delimiters")
-        }
-    }
-
-    impl Synom for TypeParen {
-        named!(parse -> Self, call!(Self::parse, false));
-
-        fn description() -> Option<&'static str> {
-            Some("parenthesized type")
-        }
-    }
-
-    impl TypeParen {
-        named!(parse(allow_plus: bool) -> Self, do_parse!(
-            data: parens!(syn!(Type)) >>
-            cond!(allow_plus, not!(punct!(+))) >>
-            (TypeParen {
-                paren_token: data.0,
-                elem: Box::new(data.1),
-            })
-        ));
-    }
-
-    impl Synom for BareFnArg {
-        named!(parse -> Self, do_parse!(
-            name: option!(do_parse!(
-                name: syn!(BareFnArgName) >>
-                not!(punct!(::)) >>
-                colon: punct!(:) >>
-                (name, colon)
-            )) >>
-            ty: syn!(Type) >>
-            (BareFnArg {
-                name: name,
-                ty: ty,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("function type argument")
-        }
-    }
-
-    impl Synom for BareFnArgName {
-        named!(parse -> Self, alt!(
-            map!(syn!(Ident), BareFnArgName::Named)
-            |
-            map!(punct!(_), BareFnArgName::Wild)
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("function argument name")
-        }
-    }
-
-    impl Synom for Abi {
-        named!(parse -> Self, do_parse!(
-            extern_: keyword!(extern) >>
-            name: option!(syn!(LitStr)) >>
-            (Abi {
-                extern_token: extern_,
-                name: name,
-            })
-        ));
-
-        fn description() -> Option<&'static str> {
-            Some("`extern` ABI qualifier")
-        }
-    }
-}
-
-#[cfg(feature = "printing")]
-mod printing {
-    use super::*;
-    use proc_macro2::TokenStream;
-    use quote::ToTokens;
-
-    impl ToTokens for TypeSlice {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.bracket_token.surround(tokens, |tokens| {
-                self.elem.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for TypeArray {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.bracket_token.surround(tokens, |tokens| {
-                self.elem.to_tokens(tokens);
-                self.semi_token.to_tokens(tokens);
-                self.len.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for TypePtr {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.star_token.to_tokens(tokens);
-            match self.mutability {
-                Some(ref tok) => tok.to_tokens(tokens),
-                None => {
-                    TokensOrDefault(&self.const_token).to_tokens(tokens);
-                }
-            }
-            self.elem.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeReference {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.and_token.to_tokens(tokens);
-            self.lifetime.to_tokens(tokens);
-            self.mutability.to_tokens(tokens);
-            self.elem.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeBareFn {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.lifetimes.to_tokens(tokens);
-            self.unsafety.to_tokens(tokens);
-            self.abi.to_tokens(tokens);
-            self.fn_token.to_tokens(tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                self.inputs.to_tokens(tokens);
-                if let Some(ref variadic) = self.variadic {
-                    if !self.inputs.empty_or_trailing() {
-                        let span = variadic.0[0];
-                        <Token![,]>::new(span).to_tokens(tokens);
-                    }
-                    variadic.to_tokens(tokens);
-                }
-            });
-            self.output.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeNever {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.bang_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeTuple {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.paren_token.surround(tokens, |tokens| {
-                self.elems.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for TypePath {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            PathTokens(&self.qself, &self.path).to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeTraitObject {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.dyn_token.to_tokens(tokens);
-            self.bounds.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeImplTrait {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.impl_token.to_tokens(tokens);
-            self.bounds.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeGroup {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.group_token.surround(tokens, |tokens| {
-                self.elem.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for TypeParen {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.paren_token.surround(tokens, |tokens| {
-                self.elem.to_tokens(tokens);
-            });
-        }
-    }
-
-    impl ToTokens for TypeInfer {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.underscore_token.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeMacro {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.mac.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for TypeVerbatim {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.tts.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for ReturnType {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            match *self {
-                ReturnType::Default => {}
-                ReturnType::Type(ref arrow, ref ty) => {
-                    arrow.to_tokens(tokens);
-                    ty.to_tokens(tokens);
-                }
-            }
-        }
-    }
-
-    impl ToTokens for BareFnArg {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            if let Some((ref name, ref colon)) = self.name {
-                name.to_tokens(tokens);
-                colon.to_tokens(tokens);
-            }
-            self.ty.to_tokens(tokens);
-        }
-    }
-
-    impl ToTokens for BareFnArgName {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            match *self {
-                BareFnArgName::Named(ref t) => t.to_tokens(tokens),
-                BareFnArgName::Wild(ref t) => t.to_tokens(tokens),
-            }
-        }
-    }
-
-    impl ToTokens for Abi {
-        fn to_tokens(&self, tokens: &mut TokenStream) {
-            self.extern_token.to_tokens(tokens);
-            self.name.to_tokens(tokens);
-        }
-    }
-}
diff --git a/third_party/rust/syn-0.14.6/src/verbatim.rs b/third_party/rust/syn-0.14.6/src/verbatim.rs
deleted file mode 100644
index 8ab0603e1a11..000000000000
--- a/third_party/rust/syn-0.14.6/src/verbatim.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use std::ops::Range;
-
-use buffer::Cursor;
-use proc_macro2::TokenStream;
-use synom::PResult;
-
-pub fn grab_cursor(cursor: Cursor) -> PResult<Cursor> {
-    Ok((cursor, cursor))
-}
-
-pub fn token_range(range: Range<Cursor>) -> TokenStream {
-    let mut tts = Vec::new();
-    let mut cursor = range.start;
-    while cursor != range.end {
-        let (tt, next) = cursor.token_tree().expect("malformed token range");
-        tts.push(tt);
-        cursor = next;
-    }
-    tts.into_iter().collect()
-}

From 0b64fb287868dc69de4456728195191567821ef3 Mon Sep 17 00:00:00 2001
From: Johan Lorenzo <jlorenzo@mozilla.com>
Date: Fri, 3 May 2019 13:38:38 +0000
Subject: [PATCH 036/129] Bug 1552908 - Bump mozapkpublisher so push-apk-checks
 expects ARM64 builds on Beta. r=tomprince

Differential Revision: https://phabricator.services.mozilla.com/D29856

--HG--
extra : rebase_source : 2d8970e63e8d9db23685cf50e4bab66cf64c9d82
---
 taskcluster/docker/mozapkpublisher/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/taskcluster/docker/mozapkpublisher/Dockerfile b/taskcluster/docker/mozapkpublisher/Dockerfile
index 8862875920b2..b5fb75b19320 100644
--- a/taskcluster/docker/mozapkpublisher/Dockerfile
+++ b/taskcluster/docker/mozapkpublisher/Dockerfile
@@ -25,7 +25,7 @@ RUN apt-get update \
 WORKDIR /builds/worker/
 # Change hash_for_given_tag to point to a newer tag. For more information, see
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1459980#c3
-RUN export revision='0ac130cdece189f3913952a5c80913504413de7c' \
+RUN export revision='49254cd61a4536206651424179a39e846d61d8b1' \
   && curl --location "https://github.com/mozilla-releng/mozapkpublisher/archive/$revision.zip" > mozapkpublisher.zip \
   && unzip mozapkpublisher.zip \
   && mv "mozapkpublisher-$revision" mozapkpublisher \

From f1f2d7ade12e39e9c4f2771087c371f08e874f95 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 20 May 2019 16:17:51 +0000
Subject: [PATCH 037/129] Bug 1552547 part 1.  Stop using [array] in
 mozIStorageAsyncConnection.executeAsync.  r=mak

Differential Revision: https://phabricator.services.mozilla.com/D31658

--HG--
extra : moz-landing-system : lando
---
 dom/cache/Connection.cpp                      |   2 +-
 storage/mozIStorageAsyncConnection.idl        |   5 +-
 storage/mozStorageConnection.cpp              |  12 +-
 ...st_asyncStatementExecution_transaction.cpp | 105 +++++++++---------
 storage/test/unit/head_storage.js             |   2 +-
 toolkit/components/places/Database.cpp        |  13 ++-
 .../components/places/PlacesExpiration.jsm    |   2 +-
 .../components/places/nsFaviconService.cpp    |   9 +-
 toolkit/components/places/nsNavHistory.cpp    |  12 +-
 9 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/dom/cache/Connection.cpp b/dom/cache/Connection.cpp
index dde4b176390d..5e3897de8e49 100644
--- a/dom/cache/Connection.cpp
+++ b/dom/cache/Connection.cpp
@@ -82,7 +82,7 @@ Connection::CreateAsyncStatement(const nsACString&,
 }
 
 NS_IMETHODIMP
-Connection::ExecuteAsync(mozIStorageBaseStatement**, uint32_t,
+Connection::ExecuteAsync(const nsTArray<RefPtr<mozIStorageBaseStatement>>&,
                          mozIStorageStatementCallback*,
                          mozIStoragePendingStatement**) {
   // async methods are not supported
diff --git a/storage/mozIStorageAsyncConnection.idl b/storage/mozIStorageAsyncConnection.idl
index bcb65fa4239b..1a573709d9f1 100644
--- a/storage/mozIStorageAsyncConnection.idl
+++ b/storage/mozIStorageAsyncConnection.idl
@@ -165,8 +165,6 @@ interface mozIStorageAsyncConnection : nsISupports {
    * @param aStatements
    *        The array of statements to execute asynchronously, in the order they
    *        are given in the array.
-   * @param aNumStatements
-   *        The number of statements in aStatements.
    * @param aCallback [optional]
    *        The callback object that will be notified of progress, errors, and
    *        completion.
@@ -176,8 +174,7 @@ interface mozIStorageAsyncConnection : nsISupports {
    *        re-entrant since they can be called on multiple threads.
    */
   mozIStoragePendingStatement executeAsync(
-    [array, size_is(aNumStatements)] in mozIStorageBaseStatement aStatements,
-    in unsigned long aNumStatements,
+    in Array<mozIStorageBaseStatement> aStatements,
     [optional] in mozIStorageStatementCallback aCallback
   );
 
diff --git a/storage/mozStorageConnection.cpp b/storage/mozStorageConnection.cpp
index 371cc5797a21..c2e1bec66e53 100644
--- a/storage/mozStorageConnection.cpp
+++ b/storage/mozStorageConnection.cpp
@@ -1854,12 +1854,12 @@ Connection::ExecuteSimpleSQL(const nsACString& aSQLStatement) {
 }
 
 NS_IMETHODIMP
-Connection::ExecuteAsync(mozIStorageBaseStatement** aStatements,
-                         uint32_t aNumStatements,
-                         mozIStorageStatementCallback* aCallback,
-                         mozIStoragePendingStatement** _handle) {
-  nsTArray<StatementData> stmts(aNumStatements);
-  for (uint32_t i = 0; i < aNumStatements; i++) {
+Connection::ExecuteAsync(
+    const nsTArray<RefPtr<mozIStorageBaseStatement>>& aStatements,
+    mozIStorageStatementCallback* aCallback,
+    mozIStoragePendingStatement** _handle) {
+  nsTArray<StatementData> stmts(aStatements.Length());
+  for (uint32_t i = 0; i < aStatements.Length(); i++) {
     nsCOMPtr<StorageBaseStatementInternal> stmt =
         do_QueryInterface(aStatements[i]);
 
diff --git a/storage/test/gtest/test_asyncStatementExecution_transaction.cpp b/storage/test/gtest/test_asyncStatementExecution_transaction.cpp
index 908698052676..3b3b02e830ec 100644
--- a/storage/test/gtest/test_asyncStatementExecution_transaction.cpp
+++ b/storage/test/gtest/test_asyncStatementExecution_transaction.cpp
@@ -40,7 +40,7 @@ int commit_hook(void* aArg) {
  *        Whether a transaction is expected or not.
  */
 void check_transaction(mozIStorageConnection* aDB,
-                       mozIStorageBaseStatement** aStmts, uint32_t aStmtsLen,
+                       const nsTArray<RefPtr<mozIStorageBaseStatement>>& aStmts,
                        bool aTransactionExpected) {
   // -- install a transaction commit hook.
   int commit = 0;
@@ -48,8 +48,8 @@ void check_transaction(mozIStorageConnection* aDB,
 
   RefPtr<AsyncStatementSpinner> asyncSpin(new AsyncStatementSpinner());
   nsCOMPtr<mozIStoragePendingStatement> asyncPend;
-  do_check_success(aDB->ExecuteAsync(aStmts, aStmtsLen, asyncSpin,
-                                     getter_AddRefs(asyncPend)));
+  do_check_success(
+      aDB->ExecuteAsync(aStmts, asyncSpin, getter_AddRefs(asyncPend)));
   do_check_true(asyncPend);
 
   // -- complete the execution
@@ -67,7 +67,7 @@ void check_transaction(mozIStorageConnection* aDB,
   }
 
   // -- cleanup
-  for (uint32_t i = 0; i < aStmtsLen; ++i) {
+  for (uint32_t i = 0; i < aStmts.Length(); ++i) {
     aStmts[i]->Finalize();
   }
   blocking_async_close(aDB);
@@ -93,12 +93,13 @@ TEST(storage_asyncStatementExecution_transaction, MultipleAsyncReadStatements)
   db->CreateAsyncStatement(NS_LITERAL_CSTRING("SELECT * FROM sqlite_master"),
                            getter_AddRefs(stmt2));
 
-  mozIStorageBaseStatement* stmts[] = {
-      stmt1,
-      stmt2,
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      stmt1.forget(),
+      stmt2.forget(),
   };
 
-  check_transaction(db, stmts, ArrayLength(stmts), false);
+  check_transaction(db, nsTArray<RefPtr<mozIStorageBaseStatement>>(stmts),
+                    false);
 }
 
 /**
@@ -118,12 +119,12 @@ TEST(storage_asyncStatementExecution_transaction, MultipleReadStatements)
   db->CreateStatement(NS_LITERAL_CSTRING("SELECT * FROM sqlite_master"),
                       getter_AddRefs(stmt2));
 
-  mozIStorageBaseStatement* stmts[] = {
-      stmt1,
-      stmt2,
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      stmt1.forget(),
+      stmt2.forget(),
   };
 
-  check_transaction(db, stmts, ArrayLength(stmts), false);
+  check_transaction(db, stmts, false);
 }
 
 /**
@@ -145,12 +146,12 @@ TEST(storage_asyncStatementExecution_transaction,
       NS_LITERAL_CSTRING("CREATE TABLE test (id INTEGER PRIMARY KEY)"),
       getter_AddRefs(stmt2));
 
-  mozIStorageBaseStatement* stmts[] = {
-      stmt1,
-      stmt2,
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      stmt1.forget(),
+      stmt2.forget(),
   };
 
-  check_transaction(db, stmts, ArrayLength(stmts), true);
+  check_transaction(db, stmts, true);
 }
 
 /**
@@ -170,12 +171,12 @@ TEST(storage_asyncStatementExecution_transaction, MultipleReadWriteStatements)
       NS_LITERAL_CSTRING("CREATE TABLE test (id INTEGER PRIMARY KEY)"),
       getter_AddRefs(stmt2));
 
-  mozIStorageBaseStatement* stmts[] = {
-      stmt1,
-      stmt2,
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      stmt1.forget(),
+      stmt2.forget(),
   };
 
-  check_transaction(db, stmts, ArrayLength(stmts), true);
+  check_transaction(db, stmts, true);
 }
 
 /**
@@ -197,12 +198,12 @@ TEST(storage_asyncStatementExecution_transaction, MultipleAsyncWriteStatements)
       NS_LITERAL_CSTRING("CREATE TABLE test2 (id INTEGER PRIMARY KEY)"),
       getter_AddRefs(stmt2));
 
-  mozIStorageBaseStatement* stmts[] = {
-      stmt1,
-      stmt2,
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      stmt1.forget(),
+      stmt2.forget(),
   };
 
-  check_transaction(db, stmts, ArrayLength(stmts), true);
+  check_transaction(db, stmts, true);
 }
 
 /**
@@ -224,12 +225,12 @@ TEST(storage_asyncStatementExecution_transaction, MultipleWriteStatements)
       NS_LITERAL_CSTRING("CREATE TABLE test2 (id INTEGER PRIMARY KEY)"),
       getter_AddRefs(stmt2));
 
-  mozIStorageBaseStatement* stmts[] = {
-      stmt1,
-      stmt2,
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      stmt1.forget(),
+      stmt2.forget(),
   };
 
-  check_transaction(db, stmts, ArrayLength(stmts), true);
+  check_transaction(db, stmts, true);
 }
 
 /**
@@ -245,11 +246,11 @@ TEST(storage_asyncStatementExecution_transaction, SingleAsyncReadStatement)
   db->CreateAsyncStatement(NS_LITERAL_CSTRING("SELECT * FROM sqlite_master"),
                            getter_AddRefs(stmt));
 
-  mozIStorageBaseStatement* stmts[] = {
-      stmt,
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      stmt.forget(),
   };
 
-  check_transaction(db, stmts, ArrayLength(stmts), false);
+  check_transaction(db, stmts, false);
 }
 
 /**
@@ -265,11 +266,11 @@ TEST(storage_asyncStatementExecution_transaction, SingleReadStatement)
   db->CreateStatement(NS_LITERAL_CSTRING("SELECT * FROM sqlite_master"),
                       getter_AddRefs(stmt));
 
-  mozIStorageBaseStatement* stmts[] = {
-      stmt,
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      stmt.forget(),
   };
 
-  check_transaction(db, stmts, ArrayLength(stmts), false);
+  check_transaction(db, stmts, false);
 }
 
 /**
@@ -286,11 +287,11 @@ TEST(storage_asyncStatementExecution_transaction, SingleAsyncWriteStatement)
       NS_LITERAL_CSTRING("CREATE TABLE test (id INTEGER PRIMARY KEY)"),
       getter_AddRefs(stmt));
 
-  mozIStorageBaseStatement* stmts[] = {
-      stmt,
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      stmt.forget(),
   };
 
-  check_transaction(db, stmts, ArrayLength(stmts), true);
+  check_transaction(db, stmts, true);
 }
 
 /**
@@ -306,11 +307,11 @@ TEST(storage_asyncStatementExecution_transaction, SingleWriteStatement)
       NS_LITERAL_CSTRING("CREATE TABLE test (id INTEGER PRIMARY KEY)"),
       getter_AddRefs(stmt));
 
-  mozIStorageBaseStatement* stmts[] = {
-      stmt,
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      stmt.forget(),
   };
 
-  check_transaction(db, stmts, ArrayLength(stmts), true);
+  check_transaction(db, stmts, true);
 }
 
 /**
@@ -340,11 +341,11 @@ TEST(storage_asyncStatementExecution_transaction,
   stmt->BindParameters(paramsArray);
   paramsArray = nullptr;
 
-  mozIStorageBaseStatement* stmts[] = {
-      stmt,
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      stmt.forget(),
   };
 
-  check_transaction(db, stmts, ArrayLength(stmts), false);
+  check_transaction(db, stmts, false);
 }
 
 /**
@@ -372,11 +373,11 @@ TEST(storage_asyncStatementExecution_transaction, MultipleParamsReadStatement)
   stmt->BindParameters(paramsArray);
   paramsArray = nullptr;
 
-  mozIStorageBaseStatement* stmts[] = {
-      stmt,
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      stmt.forget(),
   };
 
-  check_transaction(db, stmts, ArrayLength(stmts), false);
+  check_transaction(db, stmts, false);
 }
 
 /**
@@ -414,11 +415,11 @@ TEST(storage_asyncStatementExecution_transaction,
   stmt->BindParameters(paramsArray);
   paramsArray = nullptr;
 
-  mozIStorageBaseStatement* stmts[] = {
-      stmt,
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      stmt.forget(),
   };
 
-  check_transaction(db, stmts, ArrayLength(stmts), true);
+  check_transaction(db, stmts, true);
 }
 
 /**
@@ -454,9 +455,9 @@ TEST(storage_asyncStatementExecution_transaction, MultipleParamsWriteStatement)
   stmt->BindParameters(paramsArray);
   paramsArray = nullptr;
 
-  mozIStorageBaseStatement* stmts[] = {
-      stmt,
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      stmt.forget(),
   };
 
-  check_transaction(db, stmts, ArrayLength(stmts), true);
+  check_transaction(db, stmts, true);
 }
diff --git a/storage/test/unit/head_storage.js b/storage/test/unit/head_storage.js
index 3722efd5dddf..779f593346b7 100644
--- a/storage/test/unit/head_storage.js
+++ b/storage/test/unit/head_storage.js
@@ -297,7 +297,7 @@ function executeAsync(statement, onResult) {
 
 function executeMultipleStatementsAsync(db, statements, onResult) {
   return new Promise((resolve, reject) => {
-    db.executeAsync(statements, statements.length, {
+    db.executeAsync(statements, {
       handleError(error) {
         reject(error);
       },
diff --git a/toolkit/components/places/Database.cpp b/toolkit/components/places/Database.cpp
index 334ae7f0315a..b522981e24df 100644
--- a/toolkit/components/places/Database.cpp
+++ b/toolkit/components/places/Database.cpp
@@ -1818,11 +1818,14 @@ nsresult Database::MigrateV32Up() {
       getter_AddRefs(dropTableStmt));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mozIStorageBaseStatement* stmts[] = {expireOrphansStmt, deleteHostsStmt,
-                                       updateHostsStmt, dropTableStmt};
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      expireOrphansStmt.forget(),
+      deleteHostsStmt.forget(),
+      updateHostsStmt.forget(),
+      dropTableStmt.forget(),
+  };
   nsCOMPtr<mozIStoragePendingStatement> ps;
-  rv = mMainConn->ExecuteAsync(stmts, ArrayLength(stmts), nullptr,
-                               getter_AddRefs(ps));
+  rv = mMainConn->ExecuteAsync(stmts, nullptr, getter_AddRefs(ps));
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
@@ -2966,7 +2969,7 @@ void Database::Shutdown() {
   mMainThreadStatements.FinalizeStatements();
   mMainThreadAsyncStatements.FinalizeStatements();
 
-  RefPtr<FinalizeStatementCacheProxy<mozIStorageStatement> > event =
+  RefPtr<FinalizeStatementCacheProxy<mozIStorageStatement>> event =
       new FinalizeStatementCacheProxy<mozIStorageStatement>(
           mAsyncThreadStatements, NS_ISUPPORTS_CAST(nsIObserver*, this));
   DispatchToAsyncThread(event);
diff --git a/toolkit/components/places/PlacesExpiration.jsm b/toolkit/components/places/PlacesExpiration.jsm
index e1ad56e2766b..9588d74a8bd3 100644
--- a/toolkit/components/places/PlacesExpiration.jsm
+++ b/toolkit/components/places/PlacesExpiration.jsm
@@ -816,7 +816,7 @@ nsPlacesExpiration.prototype = {
 
 
       // Execute statements asynchronously in a transaction.
-      this._db.executeAsync(boundStatements, boundStatements.length, this);
+      this._db.executeAsync(boundStatements, this);
     })().catch(Cu.reportError);
   },
 
diff --git a/toolkit/components/places/nsFaviconService.cpp b/toolkit/components/places/nsFaviconService.cpp
index 6ef60a77294b..0c5842cf598a 100644
--- a/toolkit/components/places/nsFaviconService.cpp
+++ b/toolkit/components/places/nsFaviconService.cpp
@@ -178,8 +178,10 @@ nsFaviconService::ExpireAllFavicons() {
       mDB->GetAsyncStatement("DELETE FROM moz_icons_to_pages");
   NS_ENSURE_STATE(unlinkIconsStmt);
 
-  mozIStorageBaseStatement* stmts[] = {
-      removePagesStmt.get(), removeIconsStmt.get(), unlinkIconsStmt.get()};
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {removePagesStmt.forget(),
+
+                                                      removeIconsStmt.forget(),
+                                                      unlinkIconsStmt.forget()};
   nsCOMPtr<mozIStorageConnection> conn = mDB->MainConn();
   if (!conn) {
     return NS_ERROR_UNEXPECTED;
@@ -187,8 +189,7 @@ nsFaviconService::ExpireAllFavicons() {
   nsCOMPtr<mozIStoragePendingStatement> ps;
   RefPtr<ExpireFaviconsStatementCallbackNotifier> callback =
       new ExpireFaviconsStatementCallbackNotifier();
-  return conn->ExecuteAsync(stmts, ArrayLength(stmts), callback,
-                            getter_AddRefs(ps));
+  return conn->ExecuteAsync(stmts, callback, getter_AddRefs(ps));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/toolkit/components/places/nsNavHistory.cpp b/toolkit/components/places/nsNavHistory.cpp
index 3037008f7417..990f3a011ba9 100644
--- a/toolkit/components/places/nsNavHistory.cpp
+++ b/toolkit/components/places/nsNavHistory.cpp
@@ -2025,7 +2025,8 @@ nsNavHistory::RemoveObserver(nsINavHistoryObserver* aObserver) {
 }
 
 NS_IMETHODIMP
-nsNavHistory::GetObservers(nsTArray<RefPtr<nsINavHistoryObserver>>& aObservers) {
+nsNavHistory::GetObservers(
+    nsTArray<RefPtr<nsINavHistoryObserver>>& aObservers) {
   aObservers.Clear();
 
   // Clear any cached value, cause it's very likely the consumer has made
@@ -3439,11 +3440,12 @@ nsresult nsNavHistory::UpdateFrecency(int64_t aPlaceId) {
     return NS_ERROR_UNEXPECTED;
   }
 
-  mozIStorageBaseStatement* stmts[] = {updateFrecencyStmt.get(),
-                                       updateHiddenStmt.get()};
+  nsTArray<RefPtr<mozIStorageBaseStatement>> stmts = {
+      updateFrecencyStmt.forget(),
+      updateHiddenStmt.forget(),
+  };
   nsCOMPtr<mozIStoragePendingStatement> ps;
-  rv = conn->ExecuteAsync(stmts, ArrayLength(stmts), nullptr,
-                          getter_AddRefs(ps));
+  rv = conn->ExecuteAsync(stmts, nullptr, getter_AddRefs(ps));
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Trigger frecency updates for all affected origins.

From 202f15eaec2c93c97ed4f638e8c3ee8bfe0bf1be Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 20 May 2019 16:30:12 +0000
Subject: [PATCH 038/129] Bug 1552547 part 2.  Stop using [array] in
 mozIStorageBindingParams.  r=mak

Differential Revision: https://phabricator.services.mozilla.com/D31659

--HG--
extra : moz-landing-system : lando
---
 storage/StorageBaseStatementInternal.h        |  4 +++
 storage/mozIStorageBindingParams.idl          | 33 ++++++++++++++-----
 storage/mozStorageBindingParams.cpp           | 12 +++++++
 .../test/unit/test_connection_executeAsync.js |  2 +-
 .../test/unit/test_statement_executeAsync.js  |  6 ++--
 5 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/storage/StorageBaseStatementInternal.h b/storage/StorageBaseStatementInternal.h
index 832e7ee176e0..b3b586b67ffa 100644
--- a/storage/StorageBaseStatementInternal.h
+++ b/storage/StorageBaseStatementInternal.h
@@ -270,6 +270,10 @@ NS_DEFINE_STATIC_IID_ACCESSOR(StorageBaseStatementInternal,
       (const nsACString& aWhere, const uint8_t* aValue, uint32_t aValueSize),  \
       (uint32_t aWhere, const uint8_t* aValue, uint32_t aValueSize),           \
       (aWhere, aValue, aValueSize))                                            \
+  BIND_GEN_IMPL(_class, _optionalGuard, BlobArray,                             \
+                (const nsACString& aWhere, const nsTArray<uint8_t>& aValue),   \
+                (uint32_t aWhere, const nsTArray<uint8_t>& aValue),            \
+                (aWhere, aValue))                                              \
   BIND_GEN_IMPL(_class, _optionalGuard, StringAsBlob,                          \
                 (const nsACString& aWhere, const nsAString& aValue),           \
                 (uint32_t aWhere, const nsAString& aValue), (aWhere, aValue))  \
diff --git a/storage/mozIStorageBindingParams.idl b/storage/mozIStorageBindingParams.idl
index 2c537aaf02c5..6a5279e07dac 100644
--- a/storage/mozIStorageBindingParams.idl
+++ b/storage/mozIStorageBindingParams.idl
@@ -8,7 +8,9 @@
 
 interface nsIVariant;
 
-[scriptable, uuid(2d09f42f-966e-4663-b4b3-b0c8676bf2bf)]
+[ptr] native octetPtr(uint8_t);
+
+[scriptable, builtinclass, uuid(2d09f42f-966e-4663-b4b3-b0c8676bf2bf)]
 interface mozIStorageBindingParams : nsISupports {
   /**
    * Binds aValue to the parameter with the name aName.
@@ -31,9 +33,16 @@ interface mozIStorageBindingParams : nsISupports {
    [noscript] void bindInt64ByName(in AUTF8String aName,
                                    in long long aValue);
    [noscript] void bindNullByName(in AUTF8String aName);
-   void bindBlobByName(in AUTF8String aName,
-                       [array, const, size_is(aValueSize)] in octet aValue,
-                       in unsigned long aValueSize);
+
+   // The noscript version of bindBlobByName can be used with any (const
+   // uint8_t*, length) pair.  The scriptable version is meant for use with
+   // nsTArray<uint8_t>, which is what xpconnect has to work with.
+   [noscript, binaryname(BindBlobByName)]
+   void bindBlobByNameNoscript(in AUTF8String aName,
+                               [const] in octetPtr aValue,
+                               in unsigned long aValueSize);
+   [binaryname(BindBlobArrayByName)]
+   void bindBlobByName(in AUTF8String aName, in Array<octet> aValue);
 
    // Convenience routines for storing strings as blobs.
    void bindStringAsBlobByName(in AUTF8String aName, in AString aValue);
@@ -44,7 +53,7 @@ interface mozIStorageBindingParams : nsISupports {
    // underlying pointer.
    [noscript]
    void bindAdoptedBlobByName(in AUTF8String aName,
-                              [array, size_is(aValueSize)] in octet aValue,
+                              in octetPtr aValue,
                               in unsigned long aValueSize);
 
    /**
@@ -68,9 +77,17 @@ interface mozIStorageBindingParams : nsISupports {
    [noscript] void bindInt64ByIndex(in unsigned long aIndex,
                                     in long long aValue);
    [noscript] void bindNullByIndex(in unsigned long aIndex);
+
+   // The noscript version of bindBlobByIndex can be used with any (const
+   // uint8_t*, length) pair.  The scriptable version is meant for use with
+   // nsTArray<uint8_t>, which is what xpconnect has to work with.
+   [noscript, binaryname(BindBlobByIndex)]
+   void bindBlobByIndexNoscript(in unsigned long aIndex,
+                                [const] in octetPtr aValue,
+                                in unsigned long aValueSize);
+   [binaryname(BindBlobArrayByIndex)]
    void bindBlobByIndex(in unsigned long aIndex,
-                        [array, const, size_is(aValueSize)] in octet aValue,
-                        in unsigned long aValueSize);
+                        in Array<octet> aValue);
 
    // Convenience routines for storing strings as blobs.
    void bindStringAsBlobByIndex(in unsigned long aIndex, in AString aValue);
@@ -81,6 +98,6 @@ interface mozIStorageBindingParams : nsISupports {
    // underlying pointer.
    [noscript]
    void bindAdoptedBlobByIndex(in unsigned long aIndex,
-                               [array, size_is(aValueSize)] in octet aValue,
+                               in octetPtr aValue,
                                in unsigned long aValueSize);
 };
diff --git a/storage/mozStorageBindingParams.cpp b/storage/mozStorageBindingParams.cpp
index e767145fcc5c..d7ea5ad2a445 100644
--- a/storage/mozStorageBindingParams.cpp
+++ b/storage/mozStorageBindingParams.cpp
@@ -277,6 +277,12 @@ BindingParams::BindBlobByName(const nsACString& aName, const uint8_t* aValue,
   return BindByName(aName, value);
 }
 
+NS_IMETHODIMP
+BindingParams::BindBlobArrayByName(const nsACString& aName,
+                                   const nsTArray<uint8_t>& aValue) {
+  return BindBlobByName(aName, aValue.Elements(), aValue.Length());
+}
+
 NS_IMETHODIMP
 BindingParams::BindStringAsBlobByName(const nsACString& aName,
                                       const nsAString& aValue) {
@@ -397,6 +403,12 @@ BindingParams::BindBlobByIndex(uint32_t aIndex, const uint8_t* aValue,
   return BindByIndex(aIndex, value);
 }
 
+NS_IMETHODIMP
+BindingParams::BindBlobArrayByIndex(uint32_t aIndex,
+                                    const nsTArray<uint8_t>& aValue) {
+  return BindBlobByIndex(aIndex, aValue.Elements(), aValue.Length());
+}
+
 NS_IMETHODIMP
 BindingParams::BindStringAsBlobByIndex(uint32_t aIndex,
                                        const nsAString& aValue) {
diff --git a/storage/test/unit/test_connection_executeAsync.js b/storage/test/unit/test_connection_executeAsync.js
index 78e2382a0061..2d180d7a8f3b 100644
--- a/storage/test/unit/test_connection_executeAsync.js
+++ b/storage/test/unit/test_connection_executeAsync.js
@@ -118,7 +118,7 @@ add_task(async function test_last_multiple_bindings_on_statements() {
       bp.bindByName("text", TEXT);
       bp.bindByName("real", REAL);
       bp.bindByName("null", null);
-      bp.bindBlobByName("blob", BLOB, BLOB.length);
+      bp.bindBlobByName("blob", BLOB);
       params.addParams(bp);
     }
     stmts[i].bindParameters(params);
diff --git a/storage/test/unit/test_statement_executeAsync.js b/storage/test/unit/test_statement_executeAsync.js
index 7d3b7d3739eb..3a387ecf0665 100644
--- a/storage/test/unit/test_statement_executeAsync.js
+++ b/storage/test/unit/test_statement_executeAsync.js
@@ -479,7 +479,7 @@ function test_bind_direct_binding_params_by_name() {
   stmt.bindByName("text", TEXT);
   stmt.bindByName("real", REAL);
   stmt.bindByName("null", null);
-  stmt.bindBlobByName("blob", BLOB, BLOB.length);
+  stmt.bindBlobByName("blob", BLOB);
   execAsync(stmt);
   stmt.finalize();
   verifyQuery("SELECT string, number, nuller, blober FROM test WHERE id = ?",
@@ -563,7 +563,7 @@ function test_bind_multiple_rows_by_name() {
     bp.bindByName("text", TEXT);
     bp.bindByName("real", REAL);
     bp.bindByName("null", null);
-    bp.bindBlobByName("blob", BLOB, BLOB.length);
+    bp.bindBlobByName("blob", BLOB);
     array.addParams(bp);
     Assert.equal(array.length, i + 1);
   }
@@ -639,7 +639,7 @@ function test_bind_no_such_name_sync_immediate() {
               () => bp.bindByName("doesnotexist", INTEGER));
   // Check blob binding.
   expectError(Cr.NS_ERROR_INVALID_ARG,
-              () => bp.bindBlobByName("doesnotexist", BLOB, BLOB.length));
+              () => bp.bindBlobByName("doesnotexist", BLOB));
 
   stmt.finalize();
   run_next_test();

From 5ceda0b2bdec023a1637e843d9395e318d16f7f7 Mon Sep 17 00:00:00 2001
From: Andrei Oprea <andrei.br92@gmail.com>
Date: Mon, 20 May 2019 16:32:49 +0000
Subject: [PATCH 039/129] Bug 1552768 - Remove hover style rules on Windows for
 the search input field r=nhnt11

Differential Revision: https://phabricator.services.mozilla.com/D31772

--HG--
extra : moz-landing-system : lando
---
 browser/themes/windows/syncedtabs/sidebar.css | 8 --------
 toolkit/themes/windows/global/textbox.css     | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/browser/themes/windows/syncedtabs/sidebar.css b/browser/themes/windows/syncedtabs/sidebar.css
index f1f16110d754..732019aae605 100644
--- a/browser/themes/windows/syncedtabs/sidebar.css
+++ b/browser/themes/windows/syncedtabs/sidebar.css
@@ -43,14 +43,6 @@
   cursor: default;
 }
 
-.textbox-search-clear:not([disabled]):hover {
-  background-position: -16px 0;
-}
-
-.textbox-search-clear:not([disabled]):hover:active {
-  background-position: -32px 0;
-}
-
 .client .item.tab > .item-title-container {
   padding-inline-start: 26px;
 }
diff --git a/toolkit/themes/windows/global/textbox.css b/toolkit/themes/windows/global/textbox.css
index 25798f7c2f21..0c9d5859b242 100644
--- a/toolkit/themes/windows/global/textbox.css
+++ b/toolkit/themes/windows/global/textbox.css
@@ -102,14 +102,6 @@ textbox:not([searchbutton]) > .textbox-search-sign {
   cursor: default;
 }
 
-.textbox-search-clear:not([disabled]):hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.textbox-search-clear:not([disabled]):hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
 /* ::::: textboxes inside toolbarpaletteitems ::::: */
 
 toolbarpaletteitem > toolbaritem > textbox > moz-input-box > html|*.textbox-input {

From a01fdc8da3ec27e0fa7cde541c6c97823d70a89e Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Mon, 20 May 2019 16:42:47 +0000
Subject: [PATCH 040/129] Bug 1552657 (xpcshell test only) - Fix app update
 xpcshell tests so it is possible to run them locally. r=bytesized

Specify a profile when running marAppApply* xpcshell tests to prevent the application from trying to display the profile manager
Don't unset LD_LIBRARY_PATH when running the tests on Linux so startup dependencies can be found

Differential Revision: https://phabricator.services.mozilla.com/D31740

--HG--
extra : moz-landing-system : lando
---
 .../update/tests/data/xpcshellUtilsAUS.js     | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
index aa78f230f848..e9304a1706cf 100644
--- a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
+++ b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
@@ -143,7 +143,6 @@ var gAddedEnvXRENoWindowsCrashDialog = false;
 var gEnvXPCOMDebugBreak;
 var gEnvXPCOMMemLeakLog;
 var gEnvDyldLibraryPath;
-var gEnvLdLibraryPath;
 
 const URL_HTTP_UPDATE_SJS = "http://test_details/";
 const DATA_URI_SPEC = Services.io.newFileURI(do_get_file("", false)).spec;
@@ -3656,6 +3655,15 @@ function getProcessArgs(aExtraArgs) {
     appBinPath = '"' + appBinPath + '"';
   }
 
+  // The profile must be specified for the tests that launch the application to
+  // run locally when the profiles.ini and installs.ini files already exist.
+  let profileDir = appBin.parent.parent;
+  profileDir.append("profile");
+  let profilePath = profileDir.path;
+  if (/ /.test(profilePath)) {
+    profilePath = '"' + profilePath + '"';
+  }
+
   let args;
   if (AppConstants.platform == "macosx" || AppConstants.platform == "linux") {
     let launchScript = getLaunchScript();
@@ -3663,6 +3671,7 @@ function getProcessArgs(aExtraArgs) {
     launchScript.create(Ci.nsIFile.NORMAL_FILE_TYPE, PERMS_DIRECTORY);
 
     let scriptContents = "#! /bin/sh\n";
+    scriptContents += "export XRE_PROFILE_PATH=" + profilePath + "\n";
     scriptContents += appBinPath + " -no-remote -test-process-updates " +
                       aExtraArgs.join(" ") + " " + PIPE_TO_NULL;
     writeFile(launchScript, scriptContents);
@@ -3670,7 +3679,8 @@ function getProcessArgs(aExtraArgs) {
               scriptContents);
     args = [launchScript.path];
   } else {
-    args = ["/D", "/Q", "/C", appBinPath, "-no-remote", "-test-process-updates",
+    args = ["/D", "/Q", "/C", "set", "XRE_PROFILE_PATH=" + profilePath, "&&",
+            appBinPath, "-no-remote", "-test-process-updates",
             "-wait-for-browser"].concat(aExtraArgs).concat([PIPE_TO_NULL]);
   }
   return args;
@@ -4038,14 +4048,6 @@ function setEnvironment() {
     }
   }
 
-  if (AppConstants.platform == "linux" && gEnv.exists("LD_LIBRARY_PATH")) {
-    gEnvLdLibraryPath = gEnv.get("LD_LIBRARY_PATH");
-    debugDump("removing LD_LIBRARY_PATH environment variable");
-    // By removing the LD_LIBRARY_PATH environment variable this will test
-    // that setting the rpath for the updater is working properly.
-    gEnv.set("LD_LIBRARY_PATH", "");
-  }
-
   if (gEnv.exists("XPCOM_MEM_LEAK_LOG")) {
     gEnvXPCOMMemLeakLog = gEnv.get("XPCOM_MEM_LEAK_LOG");
     debugDump("removing the XPCOM_MEM_LEAK_LOG environment variable... " +
@@ -4108,12 +4110,6 @@ function resetEnvironment() {
     }
   }
 
-  if (AppConstants.platform == "linux" && gEnvLdLibraryPath) {
-    debugDump("setting LD_LIBRARY_PATH environment variable value back " +
-              "to " + gEnvLdLibraryPath);
-    gEnv.set("LD_LIBRARY_PATH", gEnvLdLibraryPath);
-  }
-
   if (AppConstants.platform == "win" && gAddedEnvXRENoWindowsCrashDialog) {
     debugDump("removing the XRE_NO_WINDOWS_CRASH_DIALOG environment " +
               "variable");

From 543c10a1d2502ea88a4bda04c4db2a2a59e28de0 Mon Sep 17 00:00:00 2001
From: Brendan Dahl <bdahl@mozilla.com>
Date: Mon, 20 May 2019 16:50:28 +0000
Subject: [PATCH 041/129] Bug 1551320 - Replace all CreateElement calls in XUL
 documents with CreateXULElement. r=mossop

Differential Revision: https://phabricator.services.mozilla.com/D31295

--HG--
extra : moz-landing-system : lando
---
 .../mochitest/treeupdate/test_listbox.xul     |  4 +--
 .../general/browser_clipboard_pastefile.js    |  2 +-
 .../test/general/browser_gestureSupport.js    |  2 +-
 browser/components/BrowserGlue.jsm            |  6 ++--
 .../components/migration/content/migration.js |  6 ++--
 .../components/newtab/lib/CFRPageActions.jsm  |  6 ++--
 browser/components/places/content/places.js   |  6 ++--
 .../preferences/browserLanguages.js           |  6 ++--
 .../performance/modules/marker-dom-utils.js   | 34 +++++++++----------
 .../performance/modules/widgets/tree-view.js  | 20 +++++------
 .../shared/widgets/AbstractTreeItem.jsm       |  4 +--
 devtools/client/styleeditor/StyleEditorUI.jsm | 10 +++---
 devtools/client/webide/content/newapp.js      | 10 +++---
 devtools/shared/fronts/css-properties.js      |  2 +-
 .../browser/browser_l10n_localizeMarkup.js    | 17 +++++-----
 docshell/test/chrome/test_bug453650.xul       |  2 +-
 docshell/test/chrome/test_bug846906.xul       |  2 +-
 .../test/chrome/test_principalInherit.xul     |  4 +--
 dom/base/test/chrome/file_bug549682.xul       |  2 +-
 dom/base/test/chrome/file_bug990812-1.xul     |  2 +-
 dom/base/test/chrome/file_bug990812.xul       |  2 +-
 dom/base/test/chrome/test_bug120684.xul       |  8 ++---
 dom/base/test/chrome/test_bug683852.xul       |  2 +-
 dom/base/test/test_domrequesthelper.xul       |  2 +-
 dom/events/test/bug418986-3.js                |  2 +-
 dom/l10n/DOMOverlays.cpp                      |  6 ++--
 dom/l10n/tests/mochitest/test_domoverlays.xul |  2 +-
 .../tests/test_messageChannel.xul             |  2 +-
 dom/tests/browser/browser_bug396843.js        |  2 +-
 dom/tests/browser/browser_xhr_sandbox.js      |  2 +-
 .../chrome/DOMWindowCreated_chrome.xul        |  2 +-
 dom/tests/mochitest/chrome/window_focus.xul   |  4 +--
 dom/tests/mochitest/general/test_offsets.js   |  2 +-
 .../test_custom_element_namespace.xul         |  8 ++---
 dom/xbl/crashtests/406900-1.xul               |  2 +-
 dom/xbl/test/test_bug398492.xul               |  2 +-
 dom/xul/test/test_import_xul_to_content.xul   |  2 +-
 .../chrome/test_weakmap_keys_preserved2.xul   |  6 ++--
 layout/base/tests/browser_bug617076.js        |  2 +-
 layout/reftests/bugs/272646-1.xul             |  2 +-
 layout/reftests/bugs/472020-1a.xul            |  2 +-
 layout/reftests/bugs/472020-1b.xul            |  2 +-
 layout/reftests/bugs/472020-2.xul             |  2 +-
 layout/style/test/chrome/bug418986-2.js       |  8 ++---
 layout/xul/crashtests/538308-1.xul            |  2 +-
 layout/xul/grid/examples/dynamicgrid.xul      |  8 ++---
 layout/xul/grid/examples/javascriptappend.xul |  2 +-
 mobile/android/chrome/content/browser.js      |  2 +-
 mobile/android/chrome/geckoview/geckoview.js  |  2 +-
 .../tests/unit/test_findelement_chrome.py     |  2 +-
 .../extensions/ExtensionXPCShellUtils.jsm     |  2 +-
 .../content/tests/chrome/test_bug437844.xul   |  4 +--
 .../tests/chrome/test_custom_element_base.xul |  2 +-
 .../content/tests/chrome/window_largemenu.xul |  4 +--
 toolkit/content/tests/chrome/window_panel.xul |  4 +--
 .../content/tests/chrome/xul_selectcontrol.js |  2 +-
 toolkit/content/widgets/tree.js               |  2 +-
 toolkit/modules/CharsetMenu.jsm               | 10 +++---
 .../test/browser/browser_html_message_bar.js  | 10 +++---
 toolkit/mozapps/handling/content/dialog.js    |  8 ++---
 60 files changed, 148 insertions(+), 141 deletions(-)

diff --git a/accessible/tests/mochitest/treeupdate/test_listbox.xul b/accessible/tests/mochitest/treeupdate/test_listbox.xul
index 4fda85c78f3f..629c4b09156f 100644
--- a/accessible/tests/mochitest/treeupdate/test_listbox.xul
+++ b/accessible/tests/mochitest/treeupdate/test_listbox.xul
@@ -24,8 +24,8 @@
     {
       this.listboxNode = getNode(aListboxID);
 
-      this.listitemNode = document.createElement("richlistitem");
-      var label = document.createElement("label");
+      this.listitemNode = document.createXULElement("richlistitem");
+      var label = document.createXULElement("label");
       label.setAttribute("value", "item1");
       this.listitemNode.appendChild(label);
 
diff --git a/browser/base/content/test/general/browser_clipboard_pastefile.js b/browser/base/content/test/general/browser_clipboard_pastefile.js
index cc14d162fe20..f74bee52fd6d 100644
--- a/browser/base/content/test/general/browser_clipboard_pastefile.js
+++ b/browser/base/content/test/general/browser_clipboard_pastefile.js
@@ -2,7 +2,7 @@
 // event.clipboardData.
 
 add_task(async function() {
-  var textbox = document.createElement("textbox");
+  var textbox = document.createXULElement("textbox");
   document.documentElement.appendChild(textbox);
 
   textbox.focus();
diff --git a/browser/base/content/test/general/browser_gestureSupport.js b/browser/base/content/test/general/browser_gestureSupport.js
index f01af244a1a7..9d6006708f3c 100644
--- a/browser/base/content/test/general/browser_gestureSupport.js
+++ b/browser/base/content/test/general/browser_gestureSupport.js
@@ -336,7 +336,7 @@ function test_emitLatchedEvents(eventPrefix, initialDelta, cmd) {
 }
 
 function test_addCommand(prefName, id) {
-  let cmd = test_commandset.appendChild(document.createElement("command"));
+  let cmd = test_commandset.appendChild(document.createXULElement("command"));
   cmd.setAttribute("id", id);
   cmd.setAttribute("oncommand", "this.callCount++;");
 
diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
index 9242494670dd..cedc6c5d22bf 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -3370,16 +3370,16 @@ var DefaultBrowserCheck = {
 
   _createPopup(win, notNowStrings, neverStrings) {
     let doc = win.document;
-    let popup = doc.createElement("menupopup");
+    let popup = doc.createXULElement("menupopup");
     popup.id = this.OPTIONPOPUP;
 
-    let notNowItem = doc.createElement("menuitem");
+    let notNowItem = doc.createXULElement("menuitem");
     notNowItem.id = "defaultBrowserNotNow";
     notNowItem.setAttribute("label", notNowStrings.label);
     notNowItem.setAttribute("accesskey", notNowStrings.accesskey);
     popup.appendChild(notNowItem);
 
-    let neverItem = doc.createElement("menuitem");
+    let neverItem = doc.createXULElement("menuitem");
     neverItem.id = "defaultBrowserNever";
     neverItem.setAttribute("label", neverStrings.label);
     neverItem.setAttribute("accesskey", neverStrings.accesskey);
diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
index fdc5324dd7ac..5dad4939b879 100644
--- a/browser/components/migration/content/migration.js
+++ b/browser/components/migration/content/migration.js
@@ -217,7 +217,7 @@ var MigrationWizard = { /* exported MigrationWizard */
       var sourceProfiles = this.spinResolve(this._migrator.getSourceProfiles());
 
       for (let profile of sourceProfiles) {
-        var item = document.createElement("radio");
+        var item = document.createXULElement("radio");
         item.id = profile.id;
         item.setAttribute("label", profile.name);
         profiles.appendChild(item);
@@ -258,7 +258,7 @@ var MigrationWizard = { /* exported MigrationWizard */
     for (var i = 0; i < 16; ++i) {
       var itemID = (items >> i) & 0x1 ? Math.pow(2, i) : 0;
       if (itemID > 0) {
-        var checkbox = document.createElement("checkbox");
+        var checkbox = document.createXULElement("checkbox");
         checkbox.id = itemID;
         checkbox.setAttribute("label",
           MigrationUtils.getLocalizedString(itemID + "_" + this._source));
@@ -344,7 +344,7 @@ var MigrationWizard = { /* exported MigrationWizard */
     for (var i = 0; i < 16; ++i) {
       itemID = (this._itemsFlags >> i) & 0x1 ? Math.pow(2, i) : 0;
       if (itemID > 0) {
-        var label = document.createElement("label");
+        var label = document.createXULElement("label");
         label.id = itemID + "_migrated";
         try {
           label.setAttribute("value",
diff --git a/browser/components/newtab/lib/CFRPageActions.jsm b/browser/components/newtab/lib/CFRPageActions.jsm
index cfaba2e2c199..3824397eb484 100644
--- a/browser/components/newtab/lib/CFRPageActions.jsm
+++ b/browser/components/newtab/lib/CFRPageActions.jsm
@@ -291,7 +291,7 @@ class PageAction {
   }
 
   _createElementAndAppend({type, id}, parent) {
-    let element = this.window.document.createElement(type);
+    let element = this.window.document.createXULElement(type);
     if (id) {
       element.setAttribute("id", id);
     }
@@ -397,12 +397,12 @@ class PageAction {
         stepsContainer.remove();
         stepsContainer = stepsContainer.cloneNode(false);
       } else {
-        stepsContainer = this.window.document.createElement("vbox");
+        stepsContainer = this.window.document.createXULElement("vbox");
         stepsContainer.setAttribute("id", stepsContainerId);
       }
       footerText.parentNode.appendChild(stepsContainer);
       for (let step of content.descriptionDetails.steps) {
-        const li = this.window.document.createElement("li");
+        const li = this.window.document.createXULElement("li");
         this._l10n.setAttributes(li, step.string_id);
         stepsContainer.appendChild(li);
       }
diff --git a/browser/components/places/content/places.js b/browser/components/places/content/places.js
index 5faada5fa0b2..c7bd58b3a7ad 100644
--- a/browser/components/places/content/places.js
+++ b/browser/components/places/content/places.js
@@ -487,7 +487,7 @@ var PlacesOrganizer = {
         }
 
         let backupDate = PlacesBackups.getDateForFile(backupFiles[i]);
-        let m = restorePopup.insertBefore(document.createElement("menuitem"),
+        let m = restorePopup.insertBefore(document.createXULElement("menuitem"),
                                           document.getElementById("restoreFromFile"));
         m.setAttribute("label", dateFormatter.format(backupDate) + sizeInfo);
         m.setAttribute("value", OS.Path.basename(backupFiles[i]));
@@ -496,7 +496,7 @@ var PlacesOrganizer = {
       }
 
       // Add the restoreFromFile item.
-      restorePopup.insertBefore(document.createElement("menuseparator"),
+      restorePopup.insertBefore(document.createXULElement("menuseparator"),
                                 document.getElementById("restoreFromFile"));
     })();
   },
@@ -972,7 +972,7 @@ var ViewMenu = {
     var columns = content.columns;
     for (var i = 0; i < columns.count; ++i) {
       var column = columns.getColumnAt(i).element;
-      var menuitem = document.createElement("menuitem");
+      var menuitem = document.createXULElement("menuitem");
       menuitem.id = "menucol_" + column.id;
       menuitem.column = column;
       var label = column.getAttribute("label");
diff --git a/browser/components/preferences/browserLanguages.js b/browser/components/preferences/browserLanguages.js
index 87362909d0f9..f8bae44b52c9 100644
--- a/browser/components/preferences/browserLanguages.js
+++ b/browser/components/preferences/browserLanguages.js
@@ -170,11 +170,11 @@ class OrderedListBox {
   }
 
   createItem({id, label, value}) {
-    let listitem = document.createElement("richlistitem");
+    let listitem = document.createXULElement("richlistitem");
     listitem.id = id;
     listitem.setAttribute("value", value);
 
-    let labelEl = document.createElement("label");
+    let labelEl = document.createXULElement("label");
     labelEl.textContent = label;
     listitem.appendChild(labelEl);
 
@@ -249,7 +249,7 @@ class SortedItemSelectList {
   }
 
   createItem({label, value, className, disabled}) {
-    let item = document.createElement("menuitem");
+    let item = document.createXULElement("menuitem");
     item.setAttribute("label", label);
     if (value)
       item.value = value;
diff --git a/devtools/client/performance/modules/marker-dom-utils.js b/devtools/client/performance/modules/marker-dom-utils.js
index 574a4196d266..82aad97a34af 100644
--- a/devtools/client/performance/modules/marker-dom-utils.js
+++ b/devtools/client/performance/modules/marker-dom-utils.js
@@ -39,14 +39,14 @@ exports.MarkerDOMUtils = {
   buildTitle: function(doc, marker) {
     const blueprint = MarkerBlueprintUtils.getBlueprintFor(marker);
 
-    const hbox = doc.createElement("hbox");
+    const hbox = doc.createXULElement("hbox");
     hbox.setAttribute("align", "center");
 
-    const bullet = doc.createElement("hbox");
+    const bullet = doc.createXULElement("hbox");
     bullet.className = `marker-details-bullet marker-color-${blueprint.colorName}`;
 
     const title = MarkerBlueprintUtils.getMarkerLabel(marker);
-    const label = doc.createElement("label");
+    const label = doc.createXULElement("label");
     label.className = "marker-details-type";
     label.setAttribute("value", title);
 
@@ -87,15 +87,15 @@ exports.MarkerDOMUtils = {
    * @return Node
    */
   buildNameValueLabel: function(doc, field, value) {
-    const hbox = doc.createElement("hbox");
+    const hbox = doc.createXULElement("hbox");
     hbox.className = "marker-details-labelcontainer";
 
-    const nameLabel = doc.createElement("label");
+    const nameLabel = doc.createXULElement("label");
     nameLabel.className = "plain marker-details-name-label";
     nameLabel.setAttribute("value", field);
     hbox.appendChild(nameLabel);
 
-    const valueLabel = doc.createElement("label");
+    const valueLabel = doc.createXULElement("label");
     valueLabel.className = "plain marker-details-value-label";
     valueLabel.setAttribute("value", value);
     hbox.appendChild(valueLabel);
@@ -119,7 +119,7 @@ exports.MarkerDOMUtils = {
     container.className = "marker-details-stack";
     container.setAttribute("type", type);
 
-    const nameLabel = doc.createElement("label");
+    const nameLabel = doc.createXULElement("label");
     nameLabel.className = "plain marker-details-name-label";
     nameLabel.setAttribute("value", L10N.getStr(`marker.field.${type}`));
     container.appendChild(nameLabel);
@@ -144,8 +144,8 @@ exports.MarkerDOMUtils = {
       // cause is in this frame and should be displayed.
       if (wasAsyncParent) {
         const asyncStr = L10N.getFormatStr("marker.field.asyncStack", frame.asyncCause);
-        const asyncBox = doc.createElement("hbox");
-        const asyncLabel = doc.createElement("label");
+        const asyncBox = doc.createXULElement("hbox");
+        const asyncLabel = doc.createXULElement("label");
         asyncLabel.className = "devtools-monospace";
         asyncLabel.setAttribute("value", asyncStr);
         asyncBox.appendChild(asyncLabel);
@@ -153,28 +153,28 @@ exports.MarkerDOMUtils = {
         wasAsyncParent = false;
       }
 
-      const hbox = doc.createElement("hbox");
+      const hbox = doc.createXULElement("hbox");
 
       if (displayName) {
-        const functionLabel = doc.createElement("label");
+        const functionLabel = doc.createXULElement("label");
         functionLabel.className = "devtools-monospace";
         functionLabel.setAttribute("value", displayName);
         hbox.appendChild(functionLabel);
       }
 
       if (url) {
-        const linkNode = doc.createElement("a");
+        const linkNode = doc.createXULElement("a");
         linkNode.className = "waterfall-marker-location devtools-source-link";
         linkNode.href = url;
         linkNode.draggable = false;
         linkNode.setAttribute("title", url);
 
-        const urlLabel = doc.createElement("label");
+        const urlLabel = doc.createXULElement("label");
         urlLabel.className = "filename";
         urlLabel.setAttribute("value", getSourceNames(url).short);
         linkNode.appendChild(urlLabel);
 
-        const lineLabel = doc.createElement("label");
+        const lineLabel = doc.createXULElement("label");
         lineLabel.className = "line-number";
         lineLabel.setAttribute("value", `:${line}`);
         linkNode.appendChild(lineLabel);
@@ -191,7 +191,7 @@ exports.MarkerDOMUtils = {
       }
 
       if (!displayName && !url) {
-        const unknownLabel = doc.createElement("label");
+        const unknownLabel = doc.createXULElement("label");
         unknownLabel.setAttribute("value", L10N.getStr("marker.value.unknownFrame"));
         hbox.appendChild(unknownLabel);
       }
@@ -221,10 +221,10 @@ exports.MarkerDOMUtils = {
     const elements = [];
 
     if (options.allocations && shouldShowAllocationsTrigger(marker)) {
-      const hbox = doc.createElement("hbox");
+      const hbox = doc.createXULElement("hbox");
       hbox.className = "marker-details-customcontainer";
 
-      const label = doc.createElement("label");
+      const label = doc.createXULElement("label");
       label.className = "custom-button";
       label.setAttribute("value", "Show allocation triggers");
       label.setAttribute("type", "show-allocations");
diff --git a/devtools/client/performance/modules/widgets/tree-view.js b/devtools/client/performance/modules/widgets/tree-view.js
index a3013514e499..98366c1f143e 100644
--- a/devtools/client/performance/modules/widgets/tree-view.js
+++ b/devtools/client/performance/modules/widgets/tree-view.js
@@ -199,7 +199,7 @@ CallView.prototype = extend(AbstractTreeItem.prototype, {
                                           this.level));
     }
 
-    const targetNode = document.createElement("hbox");
+    const targetNode = document.createXULElement("hbox");
     targetNode.className = "call-tree-item";
     targetNode.setAttribute("origin", frameInfo.isContent ? "content" : "chrome");
     targetNode.setAttribute("category", frameInfo.categoryData.abbrev || "");
@@ -243,7 +243,7 @@ CallView.prototype = extend(AbstractTreeItem.prototype, {
    * Invoked by `_displaySelf`.
    */
   _createCell: function(doc, value, type) {
-    const cell = doc.createElement("description");
+    const cell = doc.createXULElement("description");
     cell.className = "plain call-tree-cell";
     cell.setAttribute("type", type);
     cell.setAttribute("crop", "end");
@@ -253,7 +253,7 @@ CallView.prototype = extend(AbstractTreeItem.prototype, {
   },
 
   _createFunctionCell: function(doc, arrowNode, frameName, frameInfo, frameLevel) {
-    const cell = doc.createElement("hbox");
+    const cell = doc.createXULElement("hbox");
     cell.className = "call-tree-cell";
     cell.style.marginInlineStart = (frameLevel * CALL_TREE_INDENTATION) + "px";
     cell.setAttribute("type", "function");
@@ -262,7 +262,7 @@ CallView.prototype = extend(AbstractTreeItem.prototype, {
     // Render optimization hint if this frame has opt data.
     if (this.root.showOptimizationHint && frameInfo.hasOptimizations &&
         !frameInfo.isMetaCategory) {
-      const icon = doc.createElement("description");
+      const icon = doc.createXULElement("description");
       icon.setAttribute("tooltiptext", VIEW_OPTIMIZATIONS_TOOLTIP);
       icon.className = "opt-icon";
       cell.appendChild(icon);
@@ -271,7 +271,7 @@ CallView.prototype = extend(AbstractTreeItem.prototype, {
     // Don't render a name label node if there's no function name. A different
     // location label node will be rendered instead.
     if (frameName) {
-      const nameNode = doc.createElement("description");
+      const nameNode = doc.createXULElement("description");
       nameNode.className = "plain call-tree-name";
       nameNode.textContent = frameName;
       cell.appendChild(nameNode);
@@ -304,7 +304,7 @@ CallView.prototype = extend(AbstractTreeItem.prototype, {
 
   _appendFunctionDetailsCells: function(doc, cell, frameInfo) {
     if (frameInfo.fileName) {
-      const urlNode = doc.createElement("description");
+      const urlNode = doc.createXULElement("description");
       urlNode.className = "plain call-tree-url";
       urlNode.textContent = frameInfo.fileName;
       urlNode.setAttribute("tooltiptext", URL_LABEL_TOOLTIP + " → " + frameInfo.url);
@@ -313,28 +313,28 @@ CallView.prototype = extend(AbstractTreeItem.prototype, {
     }
 
     if (frameInfo.line) {
-      const lineNode = doc.createElement("description");
+      const lineNode = doc.createXULElement("description");
       lineNode.className = "plain call-tree-line";
       lineNode.textContent = ":" + frameInfo.line;
       cell.appendChild(lineNode);
     }
 
     if (frameInfo.column) {
-      const columnNode = doc.createElement("description");
+      const columnNode = doc.createXULElement("description");
       columnNode.className = "plain call-tree-column";
       columnNode.textContent = ":" + frameInfo.column;
       cell.appendChild(columnNode);
     }
 
     if (frameInfo.host) {
-      const hostNode = doc.createElement("description");
+      const hostNode = doc.createXULElement("description");
       hostNode.className = "plain call-tree-host";
       hostNode.textContent = frameInfo.host;
       cell.appendChild(hostNode);
     }
 
     if (frameInfo.categoryData.label) {
-      const categoryNode = doc.createElement("description");
+      const categoryNode = doc.createXULElement("description");
       categoryNode.className = "plain call-tree-category";
       categoryNode.style.color = frameInfo.categoryData.color;
       categoryNode.textContent = frameInfo.categoryData.label;
diff --git a/devtools/client/shared/widgets/AbstractTreeItem.jsm b/devtools/client/shared/widgets/AbstractTreeItem.jsm
index 684dcbd42d42..6bd14c7722fe 100644
--- a/devtools/client/shared/widgets/AbstractTreeItem.jsm
+++ b/devtools/client/shared/widgets/AbstractTreeItem.jsm
@@ -37,7 +37,7 @@ this.EXPORTED_SYMBOLS = ["AbstractTreeItem"];
  *
  * MyCustomTreeItem.prototype = extend(AbstractTreeItem.prototype, {
  *   _displaySelf: function(document, arrowNode) {
- *     let node = document.createElement("hbox");
+ *     let node = document.createXULElement("hbox");
  *     ...
  *     // Append the provided arrow node wherever you want.
  *     node.appendChild(arrowNode);
@@ -443,7 +443,7 @@ AbstractTreeItem.prototype = {
 
     const document = this.document;
 
-    const arrowNode = this._arrowNode = document.createElement("hbox");
+    const arrowNode = this._arrowNode = document.createXULElement("hbox");
     arrowNode.className = "arrow theme-twisty";
     arrowNode.addEventListener("mousedown", this._onArrowClick);
 
diff --git a/devtools/client/styleeditor/StyleEditorUI.jsm b/devtools/client/styleeditor/StyleEditorUI.jsm
index a93019986c69..3f6fcceda713 100644
--- a/devtools/client/styleeditor/StyleEditorUI.jsm
+++ b/devtools/client/styleeditor/StyleEditorUI.jsm
@@ -38,6 +38,8 @@ const PREF_SIDEBAR_WIDTH = "devtools.styleeditor.mediaSidebarWidth";
 const PREF_NAV_WIDTH = "devtools.styleeditor.navSidebarWidth";
 const PREF_ORIG_SOURCES = "devtools.source-map.client-service.enabled";
 
+const HTML_NS = "http://www.w3.org/1999/xhtml";
+
 /**
  * StyleEditorUI is controls and builds the UI of the Style Editor, including
  * maintaining a list of editors for each stylesheet on a debuggee.
@@ -897,12 +899,12 @@ StyleEditorUI.prototype = {
         }
         inSource = true;
 
-        const div = this._panelDoc.createElement("div");
+        const div = this._panelDoc.createElementNS(HTML_NS, "div");
         div.className = "media-rule-label";
         div.addEventListener("click",
                              this._jumpToLocation.bind(this, location));
 
-        const cond = this._panelDoc.createElement("div");
+        const cond = this._panelDoc.createElementNS(HTML_NS, "div");
         cond.className = "media-rule-condition";
         if (!rule.matches) {
           cond.classList.add("media-condition-unmatched");
@@ -914,7 +916,7 @@ StyleEditorUI.prototype = {
         }
         div.appendChild(cond);
 
-        const link = this._panelDoc.createElement("div");
+        const link = this._panelDoc.createElementNS(HTML_NS, "div");
         link.className = "media-rule-line theme-link";
         if (location.line != -1) {
           link.textContent = ":" + location.line;
@@ -950,7 +952,7 @@ StyleEditorUI.prototype = {
       );
       element.appendChild(node);
 
-      const link = this._panelDoc.createElement("a");
+      const link = this._panelDoc.createElementNS(HTML_NS, "a");
       link.href = "#";
       link.className = "media-responsive-mode-toggle";
       link.textContent = rawText.substring(match.index, matchEnd);
diff --git a/devtools/client/webide/content/newapp.js b/devtools/client/webide/content/newapp.js
index f7815d85a245..366ec2753748 100644
--- a/devtools/client/webide/content/newapp.js
+++ b/devtools/client/webide/content/newapp.js
@@ -37,14 +37,14 @@ function getTemplatesJSON() {
     const templatelistNode = document.querySelector("#templatelist");
     templatelistNode.innerHTML = "";
     for (const template of list) {
-      const richlistitemNode = document.createElement("richlistitem");
-      const imageNode = document.createElement("image");
+      const richlistitemNode = document.createXULElement("richlistitem");
+      const imageNode = document.createXULElement("image");
       imageNode.setAttribute("src", template.icon);
-      const labelNode = document.createElement("label");
+      const labelNode = document.createXULElement("label");
       labelNode.setAttribute("value", template.name);
-      const descriptionNode = document.createElement("description");
+      const descriptionNode = document.createXULElement("description");
       descriptionNode.textContent = template.description;
-      const vboxNode = document.createElement("vbox");
+      const vboxNode = document.createXULElement("vbox");
       vboxNode.setAttribute("flex", "1");
       richlistitemNode.appendChild(imageNode);
       vboxNode.appendChild(labelNode);
diff --git a/devtools/shared/fronts/css-properties.js b/devtools/shared/fronts/css-properties.js
index 441599ac315b..68645c32f2dd 100644
--- a/devtools/shared/fronts/css-properties.js
+++ b/devtools/shared/fronts/css-properties.js
@@ -124,7 +124,7 @@ CssProperties.prototype = {
   isValidOnClient(name, value, doc) {
     let dummyElement = this._dummyElements.get(doc);
     if (!dummyElement) {
-      dummyElement = doc.createElement("div");
+      dummyElement = doc.createElementNS("http://www.w3.org/1999/xhtml", "div");
       this._dummyElements.set(doc, dummyElement);
     }
 
diff --git a/devtools/shared/tests/browser/browser_l10n_localizeMarkup.js b/devtools/shared/tests/browser/browser_l10n_localizeMarkup.js
index 1a3db9687471..575f7d93eaa6 100644
--- a/devtools/shared/tests/browser/browser_l10n_localizeMarkup.js
+++ b/devtools/shared/tests/browser/browser_l10n_localizeMarkup.js
@@ -6,6 +6,7 @@
 // Tests that the markup localization works properly.
 
 const { localizeMarkup, LocalizationHelper } = require("devtools/shared/l10n");
+const HTML_NS = "http://www.w3.org/1999/xhtml";
 
 add_task(async function() {
   info("Check that the strings used for this test are still valid");
@@ -19,38 +20,38 @@ add_task(async function() {
   ok(str1 && str2 && str3, "If this failed, strings should be updated in the test");
 
   info("Create the test markup");
-  const div = document.createElement("div");
+  const div = document.createElementNS(HTML_NS, "div");
   div.setAttribute("data-localization-bundle",
                    "devtools/client/locales/startup.properties");
-  const div0 = document.createElement("div");
+  const div0 = document.createElementNS(HTML_NS, "div");
   div0.setAttribute("id", "d0");
   div0.setAttribute("data-localization", "content=inspector.someInvalidKey");
   div.appendChild(div0);
-  const div1 = document.createElement("div");
+  const div1 = document.createElementNS(HTML_NS, "div");
   div1.setAttribute("id", "d1");
   div1.setAttribute("data-localization", "content=inspector.label");
   div.appendChild(div1);
   div1.append("Text will disappear");
-  const div2 = document.createElement("div");
+  const div2 = document.createElementNS(HTML_NS, "div");
   div2.setAttribute("id", "d2");
   div2.setAttribute("data-localization",
                     "content=inspector.label;title=inspector.accesskey");
   div.appendChild(div2);
-  const div3 = document.createElement("div");
+  const div3 = document.createElementNS(HTML_NS, "div");
   div3.setAttribute("id", "d3");
   div3.setAttribute("data-localization",
                     "content=inspector.label;title=inspector.accesskey");
   div.appendChild(div3);
-  const div4 = document.createElement("div");
+  const div4 = document.createElementNS(HTML_NS, "div");
   div4.setAttribute("id", "d4");
   div4.setAttribute("data-localization", "aria-label=inspector.label");
   div.appendChild(div4);
   div4.append("Some content");
-  const toolboxDiv = document.createElement("div");
+  const toolboxDiv = document.createElementNS(HTML_NS, "div");
   toolboxDiv.setAttribute("data-localization-bundle",
                           "devtools/client/locales/toolbox.properties");
   div.appendChild(toolboxDiv);
-  const div5 = document.createElement("div");
+  const div5 = document.createElementNS(HTML_NS, "div");
   div5.setAttribute("id", "d5");
   div5.setAttribute("data-localization", "content=toolbox.defaultTitle");
   toolboxDiv.appendChild(div5);
diff --git a/docshell/test/chrome/test_bug453650.xul b/docshell/test/chrome/test_bug453650.xul
index 3a3e2e7a2716..f304038f07ab 100644
--- a/docshell/test/chrome/test_bug453650.xul
+++ b/docshell/test/chrome/test_bug453650.xul
@@ -20,7 +20,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=453650
   nextTest();
 
   function* runTests() {
-    var iframe = document.createElement("iframe");
+    var iframe = document.createXULElement("iframe");
     iframe.style.width = "300px";
     iframe.style.height = "300px";
     iframe.setAttribute("src", "data:text/html,<h1 id='h'>hello</h1>");
diff --git a/docshell/test/chrome/test_bug846906.xul b/docshell/test/chrome/test_bug846906.xul
index ab6613726a6b..152ab53a6b37 100644
--- a/docshell/test/chrome/test_bug846906.xul
+++ b/docshell/test/chrome/test_bug846906.xul
@@ -38,7 +38,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=846906
   var document = webNavigation.document;
   ok(document, "Should be able to get document");
 
-  var iframe = document.createElement("iframe");
+  var iframe = document.createXULElement("iframe");
   ok(iframe, "Should be able to create iframe");
 
   iframe.onload = function () {
diff --git a/docshell/test/chrome/test_principalInherit.xul b/docshell/test/chrome/test_principalInherit.xul
index 74ccfe00a7f4..47957b76a3cc 100644
--- a/docshell/test/chrome/test_principalInherit.xul
+++ b/docshell/test/chrome/test_principalInherit.xul
@@ -38,7 +38,7 @@ var gFrame;
 // matters when these tests fail (produces better error messages).
 var tests = [
   function testInheritFromParent(cb) {
-    gFrame = document.createElement("iframe");
+    gFrame = document.createXULElement("iframe");
     loadListener(gFrame, function () {
       is(window.inheritedFromParent, true, "load in type=content iframe inherited principal of same type parent");
       cb();
@@ -63,7 +63,7 @@ var tests = [
                     '<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>';
     let newWin = window.openDialog(xulWinURL, "chrome_window", "chrome");
     loadListener(newWin, function () {
-      let frame = newWin.document.createElement("iframe");
+      let frame = newWin.document.createXULElement("iframe");
       frame.setAttribute("type", "content");
       frame.setAttribute("src", "javascript:'1';");
       loadListener(frame, function () {
diff --git a/dom/base/test/chrome/file_bug549682.xul b/dom/base/test/chrome/file_bug549682.xul
index 39b8a5b1bb17..07e05176e39b 100644
--- a/dom/base/test/chrome/file_bug549682.xul
+++ b/dom/base/test/chrome/file_bug549682.xul
@@ -173,7 +173,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=549682
     messageManager.removeDelayedFrameScript(toBeRemovedScript);
 
     var oldValue = globalListenerCallCount;
-    var b = document.createElement("browser");
+    var b = document.createXULElement("browser");
     b.setAttribute("type", "content");
     document.documentElement.appendChild(b);
     is(globalListenerCallCount, oldValue + 1,
diff --git a/dom/base/test/chrome/file_bug990812-1.xul b/dom/base/test/chrome/file_bug990812-1.xul
index fce796086fe1..5f954e5b801b 100644
--- a/dom/base/test/chrome/file_bug990812-1.xul
+++ b/dom/base/test/chrome/file_bug990812-1.xul
@@ -45,7 +45,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=990812
         }
       });
 
-      var browser = document.createElement("browser");
+      var browser = document.createXULElement("browser");
       browser.setAttribute("messagemanagergroup", "test");
       browser.setAttribute("src", "about:mozilla");
       browser.setAttribute("type", "content");
diff --git a/dom/base/test/chrome/file_bug990812.xul b/dom/base/test/chrome/file_bug990812.xul
index 26d99f3efc1a..51c709b5f03b 100644
--- a/dom/base/test/chrome/file_bug990812.xul
+++ b/dom/base/test/chrome/file_bug990812.xul
@@ -39,7 +39,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=990812
         }
       });
 
-      var browser = document.createElement("browser");
+      var browser = document.createXULElement("browser");
       browser.setAttribute("messagemanagergroup", "test");
       browser.setAttribute("src", "about:mozilla");
       browser.setAttribute("type", "content");
diff --git a/dom/base/test/chrome/test_bug120684.xul b/dom/base/test/chrome/test_bug120684.xul
index 17471088daef..5430ed852efc 100644
--- a/dom/base/test/chrome/test_bug120684.xul
+++ b/dom/base/test/chrome/test_bug120684.xul
@@ -45,7 +45,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=120684
   is(list[1], undefined);
 
   // Removing element which isn't in the list shouldn't do anything.
-  list.remove(document.createElement("foo"));
+  list.remove(document.createXULElement("foo"));
   is(list.length, 1, "Length should be 1.");
   is(list[0], document.documentElement);
 
@@ -53,9 +53,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=120684
   is(list.length, 0, "Length should be 0.");
   is(list[0], undefined);
 
-  var e1 = document.createElement("foo");
-  var e2 = document.createElement("foo");
-  var e3 = document.createElement("foo");
+  var e1 = document.createXULElement("foo");
+  var e2 = document.createXULElement("foo");
+  var e3 = document.createXULElement("foo");
 
   list.append(e1);
   list.append(e2);
diff --git a/dom/base/test/chrome/test_bug683852.xul b/dom/base/test/chrome/test_bug683852.xul
index 2c7e86c3a7ee..0338721d833f 100644
--- a/dom/base/test/chrome/test_bug683852.xul
+++ b/dom/base/test/chrome/test_bug683852.xul
@@ -40,7 +40,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=683852
     is(box.contains(anon), false, "Element should not contain anonymous element in it!");
     is(anon.contains(anon), true, "Anonymous element should contain itself.")
     is(document.documentElement.contains(box), true, "Element should contain element in it!");
-    is(document.contains(document.createElement("foo")), false, "Document shouldn't contain element which is't in the document");
+    is(document.contains(document.createXULElement("foo")), false, "Document shouldn't contain element which is't in the document");
     is(document.contains(document.createTextNode("foo")), false, "Document shouldn't contain text node which is't in the document");
 
     var link = document.getElementById("link");
diff --git a/dom/base/test/test_domrequesthelper.xul b/dom/base/test/test_domrequesthelper.xul
index ef50f0882992..c081c7bd085b 100644
--- a/dom/base/test/test_domrequesthelper.xul
+++ b/dom/base/test/test_domrequesthelper.xul
@@ -141,7 +141,7 @@
         }
       };
 
-      let frame = document.createElement("iframe");
+      let frame = document.createXULElement("iframe");
       frame.onload = function() {
         obs.addObserver(observer, TOPIC);
         // Create dummy DOMRequestHelper specific to checkWindowDestruction()
diff --git a/dom/events/test/bug418986-3.js b/dom/events/test/bug418986-3.js
index 9641b20dd29d..9320a28d347d 100644
--- a/dom/events/test/bug418986-3.js
+++ b/dom/events/test/bug418986-3.js
@@ -43,7 +43,7 @@ var test = function (isContent) {
         // The following code creates a new div for each event in eventDefs,
         // attaches a listener to listen for the event, and then generates
         // a fake event at the center of the div.
-        let div = document.createElement("div");
+        let div = document.createElementNS("http://www.w3.org/1999/xhtml", "div");
         div.style.width = "10px";
         div.style.height = "10px";
         div.style.backgroundColor = "red";
diff --git a/dom/l10n/DOMOverlays.cpp b/dom/l10n/DOMOverlays.cpp
index 4df19342e583..80a9c197abac 100644
--- a/dom/l10n/DOMOverlays.cpp
+++ b/dom/l10n/DOMOverlays.cpp
@@ -314,9 +314,11 @@ already_AddRefed<Element> DOMOverlays::CreateSanitizedElement(
   // Start with an empty element of the same type to remove nested children
   // and non-localizable attributes defined by the translation.
 
+  nsAutoString nameSpaceURI;
+  aElement->NodeInfo()->GetNamespaceURI(nameSpaceURI);
   ElementCreationOptionsOrString options;
-  RefPtr<Element> clone = aElement->OwnerDoc()->CreateElement(
-      aElement->NodeInfo()->LocalName(), options, aRv);
+  RefPtr<Element> clone = aElement->OwnerDoc()->CreateElementNS(
+      nameSpaceURI, aElement->NodeInfo()->LocalName(), options, aRv);
   if (NS_WARN_IF(aRv.Failed())) {
     return nullptr;
   }
diff --git a/dom/l10n/tests/mochitest/test_domoverlays.xul b/dom/l10n/tests/mochitest/test_domoverlays.xul
index c49005862d4b..a486ce70008a 100644
--- a/dom/l10n/tests/mochitest/test_domoverlays.xul
+++ b/dom/l10n/tests/mochitest/test_domoverlays.xul
@@ -20,7 +20,7 @@
 
   function elem(name) {
     return function(str) {
-      const element = document.createElement(name);
+      const element = document.createXULElement(name);
       // eslint-disable-next-line no-unsanitized/property
       element.innerHTML = str;
       return element;
diff --git a/dom/messagechannel/tests/test_messageChannel.xul b/dom/messagechannel/tests/test_messageChannel.xul
index 42621ca03123..e51359d67d74 100644
--- a/dom/messagechannel/tests/test_messageChannel.xul
+++ b/dom/messagechannel/tests/test_messageChannel.xul
@@ -22,7 +22,7 @@
     SimpleTest.finish();
   }
 
-  var ifr = document.createElement('browser');
+  var ifr = document.createXULElement('browser');
   ifr.setAttribute("src", "iframe_messageChannel_chrome.html");
   ifr.setAttribute("flex", "1");
   ifr.addEventListener('load', function() {
diff --git a/dom/tests/browser/browser_bug396843.js b/dom/tests/browser/browser_bug396843.js
index 07c4a191d4be..327a749493c5 100644
--- a/dom/tests/browser/browser_bug396843.js
+++ b/dom/tests/browser/browser_bug396843.js
@@ -6,7 +6,7 @@ function testInDocument(doc, documentID) {
 
     // HTML
     function HTML_TAG(name) {
-        allNodes.push(doc.createElement(name));
+        allNodes.push(doc.createElementNS("http://www.w3.org/1999/xhtml", name));
     }
 
     /* List copy/pasted from nsHTMLTagList.h */
diff --git a/dom/tests/browser/browser_xhr_sandbox.js b/dom/tests/browser/browser_xhr_sandbox.js
index 6448744d4466..2fe92ee2033b 100644
--- a/dom/tests/browser/browser_xhr_sandbox.js
+++ b/dom/tests/browser/browser_xhr_sandbox.js
@@ -24,7 +24,7 @@ var sandboxCode = (function() {
 add_task(async function test() {
   let newWin = await BrowserTestUtils.openNewBrowserWindow();
 
-  let frame = newWin.document.createElement("iframe");
+  let frame = newWin.document.createXULElement("iframe");
   frame.setAttribute("type", "content");
   frame.setAttribute("src", "http://mochi.test:8888/browser/dom/tests/browser/browser_xhr_sandbox.js");
 
diff --git a/dom/tests/mochitest/chrome/DOMWindowCreated_chrome.xul b/dom/tests/mochitest/chrome/DOMWindowCreated_chrome.xul
index 3faaf8fd56a1..37db98597846 100644
--- a/dom/tests/mochitest/chrome/DOMWindowCreated_chrome.xul
+++ b/dom/tests/mochitest/chrome/DOMWindowCreated_chrome.xul
@@ -25,7 +25,7 @@ document.addEventListener("DOMWindowCreated", function(e) {
 }, false);
 
 var root = getRootDirectory(window.location.href);
-var el = document.createElement("iframe");
+var el = document.createXULElement("iframe");
 el.setAttribute('type', 'content');
 el.setAttribute('src', root + 'DOMWindowCreated_content.html');
 document.documentElement.appendChild(el);
diff --git a/dom/tests/mochitest/chrome/window_focus.xul b/dom/tests/mochitest/chrome/window_focus.xul
index c857b964e270..26482edfc664 100644
--- a/dom/tests/mochitest/chrome/window_focus.xul
+++ b/dom/tests/mochitest/chrome/window_focus.xul
@@ -791,10 +791,10 @@ function startTest()
 
   setFocusTo("t1", window);
 
-  var textbox1 = document.createElement("textbox");
+  var textbox1 = document.createXULElement("textbox");
   $("innerbox").appendChild(textbox1);
 
-  var textbox2 = document.createElement("textbox");
+  var textbox2 = document.createXULElement("textbox");
   $("innerbox").appendChild(textbox2);
 
   gLastFocusMethod = 0;
diff --git a/dom/tests/mochitest/general/test_offsets.js b/dom/tests/mochitest/general/test_offsets.js
index 3311c3aa8b12..7a43d541292b 100644
--- a/dom/tests/mochitest/general/test_offsets.js
+++ b/dom/tests/mochitest/general/test_offsets.js
@@ -23,7 +23,7 @@ function testElements(baseid, callback)
     testElement(element);
   }
 
-  var nonappended = document.createElement("div");
+  var nonappended = document.createElementNS("http://www.w3.org/1999/xhtml", "div");
   nonappended.id = "nonappended";
   nonappended.setAttribute("_offsetParent", "null");
   testElement(nonappended);
diff --git a/dom/tests/mochitest/webcomponents/test_custom_element_namespace.xul b/dom/tests/mochitest/webcomponents/test_custom_element_namespace.xul
index e3121028aac5..3a37005dd48c 100644
--- a/dom/tests/mochitest/webcomponents/test_custom_element_namespace.xul
+++ b/dom/tests/mochitest/webcomponents/test_custom_element_namespace.xul
@@ -71,8 +71,8 @@
       element = document.getElementById("xul2");
       checkElement(element, HTML_NS, false, "parsed XUL as HTML");
 
-      element = document.createElement("test-xul-element");
-      checkElement(element, XUL_NS, true, "document.createElement(XUL)");
+      element = document.createXULElement("test-xul-element");
+      checkElement(element, XUL_NS, true, "document.createXULElement(XUL)");
 
       element = document.createXULElement("test-xul-element");
       checkElement(element, XUL_NS, true, "document.createXULElement(XUL)");
@@ -101,8 +101,8 @@
       element = document.getElementById("html4");
       checkElement(element, HTML_NS, true, "parsed HTML as HTML");
 
-      element = document.createElement("test-html-element");
-      checkElement(element, XUL_NS, false, "document.createElement(HTML)");
+      element = document.createXULElement("test-html-element");
+      checkElement(element, XUL_NS, false, "document.createXULElement(HTML)");
 
       element = document.createXULElement("test-html-element");
       checkElement(element, XUL_NS, false, "document.createXULElement(HTML)");
diff --git a/dom/xbl/crashtests/406900-1.xul b/dom/xbl/crashtests/406900-1.xul
index 3b3dc1f87040..69e12308a87c 100644
--- a/dom/xbl/crashtests/406900-1.xul
+++ b/dom/xbl/crashtests/406900-1.xul
@@ -22,7 +22,7 @@ function boom()
   var anon = document.getAnonymousNodes(x)[0];
   document.documentElement.removeChild(x);
   document.documentElement.appendChild(x);
-  var hbox = document.createElement('hbox');
+  var hbox = document.createXULElement('hbox');
   anon.appendChild(hbox);
 }
 
diff --git a/dom/xbl/test/test_bug398492.xul b/dom/xbl/test/test_bug398492.xul
index 895b01542ce7..22719dab1fbe 100644
--- a/dom/xbl/test/test_bug398492.xul
+++ b/dom/xbl/test/test_bug398492.xul
@@ -50,7 +50,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=398492
       var anonKids = document.getAnonymousNodes(n2);
       is(anonKids, null, "No XBL binding attached to cloned node");
 
-      var n3 = document.createElement("hbox");
+      var n3 = document.createXULElement("hbox");
       document.documentElement.appendChild(n3);
       var kid3 = document.createTextNode("Text");
       n3.appendChild(kid3);
diff --git a/dom/xul/test/test_import_xul_to_content.xul b/dom/xul/test/test_import_xul_to_content.xul
index 33d2c0c2b5c3..1fd02fabe74a 100644
--- a/dom/xul/test/test_import_xul_to_content.xul
+++ b/dom/xul/test/test_import_xul_to_content.xul
@@ -55,7 +55,7 @@
     });
 
     // We add some XUL to a content document. This should generate a warning.
-    var elt = document.createElement("label");
+    var elt = document.createXULElement("label");
     var newElt = doc.importNode(elt, false);
     expectWarning(true, "appending XUL", function() {
       doc.documentElement.appendChild(newElt);
diff --git a/js/xpconnect/tests/chrome/test_weakmap_keys_preserved2.xul b/js/xpconnect/tests/chrome/test_weakmap_keys_preserved2.xul
index 8ffef02398b0..d93bc2d30c65 100644
--- a/js/xpconnect/tests/chrome/test_weakmap_keys_preserved2.xul
+++ b/js/xpconnect/tests/chrome/test_weakmap_keys_preserved2.xul
@@ -27,12 +27,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=673468
 
   let wrappers_as_keys_test = function () {
     let e = new MessageEvent("foo", { bubbles: false, cancellable: false,
-                                      data: { dummy: document.createElement("foo") }});
+                                      data: { dummy: document.createXULElement("foo") }});
     window.eeeevent = e;
 
     let live_dom = e.data.dummy;
-    let dead_dom = document.createElement("div");
-    let dead_child = document.createElement("div");
+    let dead_dom = document.createElementNS("http://www.w3.org/1999/xhtml", "div");
+    let dead_child = document.createElementNS("http://www.w3.org/1999/xhtml", "div");
     dead_dom.appendChild(dead_child);
     is(dead_dom.children.length, 1, "children have wrong length");
     let wrappee = new Object();
diff --git a/layout/base/tests/browser_bug617076.js b/layout/base/tests/browser_bug617076.js
index 67bbd560ac86..4bb2c46591f8 100644
--- a/layout/base/tests/browser_bug617076.js
+++ b/layout/base/tests/browser_bug617076.js
@@ -16,7 +16,7 @@ add_task(async function test() {
   // insert button into test page content
   await ContentTask.spawn(gBrowser.selectedBrowser, null, async function() {
     let doc = content.document;
-    let e = doc.createElement("button");
+    let e = doc.createXULElement("button");
     e.setAttribute("label", "hello");
     e.setAttribute("tooltiptext", "world");
     e.setAttribute("id", "test-button");
diff --git a/layout/reftests/bugs/272646-1.xul b/layout/reftests/bugs/272646-1.xul
index db570f497bff..c0f6129052e9 100644
--- a/layout/reftests/bugs/272646-1.xul
+++ b/layout/reftests/bugs/272646-1.xul
@@ -2,7 +2,7 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
         title="insertBefore - Weirdness"
-        onload="var atab = document.createElement('tab'); atab.setAttribute('label','new'); document.getElementById('tabs-id').insertBefore(atab,document.getElementById('tabs-id').lastChild);" >
+        onload="var atab = document.createXULElement('tab'); atab.setAttribute('label','new'); document.getElementById('tabs-id').insertBefore(atab,document.getElementById('tabs-id').lastChild);" >
 <tabbox>
  <tabs id="tabs-id">
   <tab label="foo" />
diff --git a/layout/reftests/bugs/472020-1a.xul b/layout/reftests/bugs/472020-1a.xul
index 9b80d530fa5c..e5fe5973bf32 100644
--- a/layout/reftests/bugs/472020-1a.xul
+++ b/layout/reftests/bugs/472020-1a.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	onload="document.getElementById('o').appendChild(document.createElement('box'));">
+	onload="document.getElementById('o').appendChild(document.createXULElement('box'));">
 
 <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
   outer {
diff --git a/layout/reftests/bugs/472020-1b.xul b/layout/reftests/bugs/472020-1b.xul
index 16d5319b97d0..7aa7098c2916 100644
--- a/layout/reftests/bugs/472020-1b.xul
+++ b/layout/reftests/bugs/472020-1b.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	onload="var p = document.getElementById('o'); p.insertBefore(document.createElement('box'), p.firstChild);">
+	onload="var p = document.getElementById('o'); p.insertBefore(document.createXULElement('box'), p.firstChild);">
 
 <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
   outer {
diff --git a/layout/reftests/bugs/472020-2.xul b/layout/reftests/bugs/472020-2.xul
index 461d1686f38c..fafbd777a053 100644
--- a/layout/reftests/bugs/472020-2.xul
+++ b/layout/reftests/bugs/472020-2.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	onload="document.getElementById('o').appendChild(document.createElement('box'));">
+	onload="document.getElementById('o').appendChild(document.createXULElement('box'));">
 
 <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
   outer {
diff --git a/layout/style/test/chrome/bug418986-2.js b/layout/style/test/chrome/bug418986-2.js
index 0234ac50a4bf..0e842d9d58b6 100644
--- a/layout/style/test/chrome/bug418986-2.js
+++ b/layout/style/test/chrome/bug418986-2.js
@@ -145,7 +145,7 @@ var generateHtmlLines = function (resisting) {
     function ([key, offVal, onVal]) {
       let val = resisting ? onVal : offVal;
       if (val) {
-        let div = document.createElement("div");
+        let div = document.createElementNS(HTML_NS, "div");
         div.setAttribute("class", "spoof");
         div.setAttribute("id", key);
         div.textContent = key;
@@ -154,14 +154,14 @@ var generateHtmlLines = function (resisting) {
     });
   suppressed_toggles.forEach(
     function (key) {
-      let div = document.createElement("div");
+      let div = document.createElementNS(HTML_NS, "div");
       div.setAttribute("class", "suppress");
       div.setAttribute("id", key);
       div.textContent = key;
       fragment.appendChild(div);
     });
   if (OS === "WINNT") {
-    let div = document.createElement("div");
+    let div = document.createElementNS(HTML_NS, "div");
     div.setAttribute("class", "windows");
     div.setAttribute("id", "-moz-os-version");
     div.textContent = "-moz-os-version";
@@ -253,7 +253,7 @@ var testCSS = function (resisting) {
 // When fingerprinting resistance is enabled, the `getComputedStyle`
 // should always return `undefined` for `MozOSXFontSmoothing`.
 var testOSXFontSmoothing = function (resisting) {
-  let div = document.createElement("div");
+  let div = document.createElementNS(HTML_NS, "div");
   div.style.MozOsxFontSmoothing = "unset";
   document.documentElement.appendChild(div);
   let readBack = window.getComputedStyle(div).MozOsxFontSmoothing;
diff --git a/layout/xul/crashtests/538308-1.xul b/layout/xul/crashtests/538308-1.xul
index a569a728b33b..477c725ed109 100644
--- a/layout/xul/crashtests/538308-1.xul
+++ b/layout/xul/crashtests/538308-1.xul
@@ -17,7 +17,7 @@
     <script type="text/javascript"><![CDATA[
     function run() {
         group = document.getElementById("group");
-        tc = document.createElement("treechildren");
+        tc = document.createXULElement("treechildren");
         group.appendChild(tc);
 
         v = document.getElementById("victim");
diff --git a/layout/xul/grid/examples/dynamicgrid.xul b/layout/xul/grid/examples/dynamicgrid.xul
index d718df5f917f..1bf7196e5759 100644
--- a/layout/xul/grid/examples/dynamicgrid.xul
+++ b/layout/xul/grid/examples/dynamicgrid.xul
@@ -63,7 +63,7 @@
 
    function createButton(str)
    {
-	 var b = document.createElement("button");
+	 var b = document.createXULElement("button");
 	 b.setAttribute("label", str+count);
 	 count++;
 	 addCellSelectionHandle(b);
@@ -72,7 +72,7 @@
 
    function createRow()
    {
-	 var b = document.createElement("row");
+	 var b = document.createXULElement("row");
  	 b.setAttribute("dynamic","true");
 
 	 addRowColumnSelectionHandle(b);
@@ -81,7 +81,7 @@
 
    function createColumn()
    {
-	 var b = document.createElement("column");
+	 var b = document.createXULElement("column");
 	 b.setAttribute("dynamic","true");
 	 addRowColumnSelectionHandle(b);
 	 return b;
@@ -89,7 +89,7 @@
 
    function createText(str)
    {
-	 var text = document.createElement("text");
+	 var text = document.createXULElement("text");
 	 text.setAttribute("value", str+count);
 	 count++;
 	 text.setAttribute("style", "font-size: 40pt");
diff --git a/layout/xul/grid/examples/javascriptappend.xul b/layout/xul/grid/examples/javascriptappend.xul
index f2a415cae218..deaabf4c3b4b 100644
--- a/layout/xul/grid/examples/javascriptappend.xul
+++ b/layout/xul/grid/examples/javascriptappend.xul
@@ -16,7 +16,7 @@
     function start()
 	{
 	   var row = document.getElementById("row");
-	   var text = document.createElement("text");
+	   var text = document.createXULElement("text");
 	   text.setAttribute("value", "foo");
 	   row.appendChild(text);
 	}
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 86076eb677bc..19d8db0859a3 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -3615,7 +3615,7 @@ Tab.prototype = {
 
     aParams = aParams || {};
 
-    this.browser = document.createElement("browser");
+    this.browser = document.createXULElement("browser");
     this.browser.setAttribute("type", "content");
     this.browser.setAttribute("messagemanagergroup", "browsers");
 
diff --git a/mobile/android/chrome/geckoview/geckoview.js b/mobile/android/chrome/geckoview/geckoview.js
index 26bb97fadcc4..eea7089d9fdc 100644
--- a/mobile/android/chrome/geckoview/geckoview.js
+++ b/mobile/android/chrome/geckoview/geckoview.js
@@ -378,7 +378,7 @@ class ModuleInfo {
 }
 
 function createBrowser() {
-  const browser = window.browser = document.createElement("browser");
+  const browser = window.browser = document.createXULElement("browser");
   // Identify this `<browser>` element uniquely to Marionette, devtools, etc.
   browser.permanentKey = {};
 
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_findelement_chrome.py b/testing/marionette/harness/marionette_harness/tests/unit/test_findelement_chrome.py
index 0c999747dab7..82bab50d4923 100644
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_findelement_chrome.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_findelement_chrome.py
@@ -85,7 +85,7 @@ class TestElementsChrome(WindowManagerMixin, MarionetteTestCase):
         self.marionette.timeout.implicit = 4
         self.marionette.execute_script("""
             window.setTimeout(function () {
-              var b = window.document.createElement('button');
+              var b = window.document.createXULElement('button');
               b.id = 'myid';
               document.getElementById('things').appendChild(b);
             }, 1000); """)
diff --git a/toolkit/components/extensions/ExtensionXPCShellUtils.jsm b/toolkit/components/extensions/ExtensionXPCShellUtils.jsm
index 2be842569935..d28da74d275f 100644
--- a/toolkit/components/extensions/ExtensionXPCShellUtils.jsm
+++ b/toolkit/components/extensions/ExtensionXPCShellUtils.jsm
@@ -151,7 +151,7 @@ class ContentPage {
 
     let chromeDoc = await promiseDocumentLoaded(chromeShell.document);
 
-    let browser = chromeDoc.createElement("browser");
+    let browser = chromeDoc.createXULElement("browser");
     browser.setAttribute("type", "content");
     browser.setAttribute("disableglobalhistory", "true");
     if (this.userContextId) {
diff --git a/toolkit/content/tests/chrome/test_bug437844.xul b/toolkit/content/tests/chrome/test_bug437844.xul
index bb4d846ea3ba..7716b467a4c7 100644
--- a/toolkit/content/tests/chrome/test_bug437844.xul
+++ b/toolkit/content/tests/chrome/test_bug437844.xul
@@ -63,7 +63,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=348233
       let cleanupFunc = createManifestTemporarily(tempProfileDir, manifest);
 
       // Load about:plugins in an iframe
-      let frame = document.createElement("iframe");
+      let frame = document.createXULElement("iframe");
       frame.setAttribute("src", "about:plugins");
       frame.addEventListener("load", function () {
           frame.removeEventListener("load", arguments.callee, false);
@@ -74,7 +74,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=348233
                                       QueryInterface(Ci.nsIProperties);
           let tmpd = gDirSvc.get("ProfD", Ci.nsIFile);
 
-          frame = document.createElement("iframe");
+          frame = document.createXULElement("iframe");
           frame.setAttribute("src", "file://" + tmpd.path); // a file:// URI, bug 348233
           frame.addEventListener("load", function () {
               frame.removeEventListener("load", arguments.callee, false);
diff --git a/toolkit/content/tests/chrome/test_custom_element_base.xul b/toolkit/content/tests/chrome/test_custom_element_base.xul
index 7829c0b9409c..acb8defc2943 100644
--- a/toolkit/content/tests/chrome/test_custom_element_base.xul
+++ b/toolkit/content/tests/chrome/test_custom_element_base.xul
@@ -64,7 +64,7 @@
     await testCustomInterface();
 
     let htmlWin = await new Promise(resolve => {
-      let htmlIframe = document.createElement("iframe");
+      let htmlIframe = document.createXULElement("iframe");
       htmlIframe.src = "file_empty.xhtml";
       htmlIframe.onload = () => resolve(htmlIframe.contentWindow);
       document.documentElement.appendChild(htmlIframe);
diff --git a/toolkit/content/tests/chrome/window_largemenu.xul b/toolkit/content/tests/chrome/window_largemenu.xul
index 52e1e11bff24..953d8e4679be 100644
--- a/toolkit/content/tests/chrome/window_largemenu.xul
+++ b/toolkit/content/tests/chrome/window_largemenu.xul
@@ -73,7 +73,7 @@ function nextTest()
     // add some more menuitems so that scrolling will be necessary
     var moreItemCount = Math.round(screen.height / popup.firstChild.getBoundingClientRect().height);
     for (var t = 1; t <= moreItemCount; t++) {
-      var menu = document.createElement("menuitem");
+      var menu = document.createXULElement("menuitem");
       menu.setAttribute("label", "More" + t);
       popup.appendChild(menu);
     }
@@ -299,7 +299,7 @@ function nextContextMenuTest(desiredHeight)
     var height = popup.getBoundingClientRect().height;
     var itemheight = document.getElementById("firstitem").getBoundingClientRect().height;
     while (height < desiredHeight) {
-      var menu = document.createElement("menuitem");
+      var menu = document.createXULElement("menuitem");
       menu.setAttribute("label", "Item");
       popup.appendChild(menu);
       height += itemheight;
diff --git a/toolkit/content/tests/chrome/window_panel.xul b/toolkit/content/tests/chrome/window_panel.xul
index 54dce718083b..b60d77b75a18 100644
--- a/toolkit/content/tests/chrome/window_panel.xul
+++ b/toolkit/content/tests/chrome/window_panel.xul
@@ -91,12 +91,12 @@ function popupShown(event)
 
 function createPanel(attrs)
 {
-  var panel = document.createElement("panel");
+  var panel = document.createXULElement("panel");
   for (var a in attrs) {
     panel.setAttribute(a, attrs[a]);
   }
 
-  var button = document.createElement("button");
+  var button = document.createXULElement("button");
   panel.appendChild(button);
   button.label = "OK";
   button.width = 120;
diff --git a/toolkit/content/tests/chrome/xul_selectcontrol.js b/toolkit/content/tests/chrome/xul_selectcontrol.js
index 949d06ab885f..59c8e6790625 100644
--- a/toolkit/content/tests/chrome/xul_selectcontrol.js
+++ b/toolkit/content/tests/chrome/xul_selectcontrol.js
@@ -84,7 +84,7 @@ function test_nsIDOMXULSelectControlElement(element, childtag, testprefix) {
   is(element.getIndexOfItem(firstitem), 0, testid + "getIndexOfItem - first item at index 0");
   is(element.getIndexOfItem(seconditem), 1, testid + "getIndexOfItem - second item at index 1");
 
-  var otheritem = element.ownerDocument.createElement(childtag);
+  var otheritem = element.ownerDocument.createXULElement(childtag);
   is(element.getIndexOfItem(otheritem), -1, testid + "getIndexOfItem - other item not found");
 
   // 'getItemAtIndex' - check if getItemAtIndex returns the right item
diff --git a/toolkit/content/widgets/tree.js b/toolkit/content/widgets/tree.js
index 3037f23eaf8b..c3609d6e1ebe 100644
--- a/toolkit/content/widgets/tree.js
+++ b/toolkit/content/widgets/tree.js
@@ -226,7 +226,7 @@
         // it is not being shown.
         var currElement = currCol.element;
         if (!currElement.hasAttribute("ignoreincolumnpicker")) {
-          var popupChild = document.createElement("menuitem");
+          var popupChild = document.createXULElement("menuitem");
           popupChild.setAttribute("type", "checkbox");
           var columnName = currElement.getAttribute("display") ||
             currElement.getAttribute("label");
diff --git a/toolkit/modules/CharsetMenu.jsm b/toolkit/modules/CharsetMenu.jsm
index 7d880f1afaef..42bb73f31588 100644
--- a/toolkit/modules/CharsetMenu.jsm
+++ b/toolkit/modules/CharsetMenu.jsm
@@ -123,7 +123,7 @@ var CharsetMenu = {
                          "https://bugzilla.mozilla.org/show_bug.cgi?id=1088710");
     }
     function createDOMNode(doc, nodeInfo) {
-      let node = doc.createElement("menuitem");
+      let node = doc.createXULElement("menuitem");
       node.setAttribute("type", "radio");
       node.setAttribute("name", nodeInfo.name + "Group");
       node.setAttribute(nodeInfo.name, nodeInfo.value);
@@ -142,22 +142,22 @@ var CharsetMenu = {
     let doc = parent.ownerDocument;
 
     if (showDetector) {
-      let menuNode = doc.createElement("menu");
+      let menuNode = doc.createXULElement("menu");
       menuNode.setAttribute("label", gBundle.GetStringFromName("charsetMenuAutodet"));
       menuNode.setAttribute("accesskey", gBundle.GetStringFromName("charsetMenuAutodet.key"));
       parent.appendChild(menuNode);
 
-      let menuPopupNode = doc.createElement("menupopup");
+      let menuPopupNode = doc.createXULElement("menupopup");
       menuNode.appendChild(menuPopupNode);
       menuPopupNode.addEventListener("command", SetDetector);
       menuPopupNode.addEventListener("popupshown", UpdateDetectorMenu);
 
       gDetectorInfoCache.forEach(detectorInfo => menuPopupNode.appendChild(createDOMNode(doc, detectorInfo)));
-      parent.appendChild(doc.createElement("menuseparator"));
+      parent.appendChild(doc.createXULElement("menuseparator"));
     }
 
     gPinnedInfoCache.forEach(charsetInfo => parent.appendChild(createDOMNode(doc, charsetInfo)));
-    parent.appendChild(doc.createElement("menuseparator"));
+    parent.appendChild(doc.createXULElement("menuseparator"));
     gCharsetInfoCache.forEach(charsetInfo => parent.appendChild(createDOMNode(doc, charsetInfo)));
   },
 
diff --git a/toolkit/mozapps/extensions/test/browser/browser_html_message_bar.js b/toolkit/mozapps/extensions/test/browser/browser_html_message_bar.js
index a962d065f3c4..91ced775eb88 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_html_message_bar.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_message_bar.js
@@ -6,13 +6,15 @@
 
 let htmlAboutAddonsWindow;
 
+const HTML_NS = "http://www.w3.org/1999/xhtml";
+
 function clickElement(el) {
   el.dispatchEvent(new CustomEvent("click"));
 }
 
 function createMessageBar(messageBarStack, {attrs, children, onclose} = {}) {
   const win = messageBarStack.ownerGlobal;
-  const messageBar = win.document.createElement("message-bar");
+  const messageBar = win.document.createElementNS(HTML_NS, "message-bar");
   if (attrs) {
     for (const [k, v] of Object.entries(attrs)) {
       messageBar.setAttribute(k, v);
@@ -61,9 +63,9 @@ add_task(async function test_create_message_bar_create_and_onclose() {
   const win = htmlAboutAddonsWindow;
   const messageBarStack = win.document.querySelector("message-bar-stack");
 
-  let messageEl = win.document.createElement("span");
+  let messageEl = win.document.createElementNS(HTML_NS, "span");
   messageEl.textContent = "A message bar text";
-  let buttonEl = win.document.createElement("button");
+  let buttonEl = win.document.createElementNS(HTML_NS, "button");
   buttonEl.textContent = "An action button";
 
   let messageBar;
@@ -100,7 +102,7 @@ add_task(async function test_max_message_bar_count() {
   const messageBarStack = win.document.querySelector("message-bar-stack");
 
   info("Create a new message-bar");
-  let messageElement = document.createElement("span");
+  let messageElement = document.createElementNS(HTML_NS, "span");
   messageElement = "message bar label";
 
   let onceMessageBarClosed = new Promise(resolve => {
diff --git a/toolkit/mozapps/handling/content/dialog.js b/toolkit/mozapps/handling/content/dialog.js
index bb6eb4020234..8ddf31714268 100644
--- a/toolkit/mozapps/handling/content/dialog.js
+++ b/toolkit/mozapps/handling/content/dialog.js
@@ -157,7 +157,7 @@ var dialog = {
     var preferredHandler = this._handlerInfo.preferredApplicationHandler;
     for (let i = possibleHandlers.length - 1; i >= 0; --i) {
       let app = possibleHandlers.queryElementAt(i, Ci.nsIHandlerApp);
-      let elm = document.createElement("richlistitem", {is: "mozapps-handler"});
+      let elm = document.createXULElement("richlistitem", {is: "mozapps-handler"});
       elm.setAttribute("name", app.name);
       elm.obj = app;
 
@@ -205,7 +205,7 @@ var dialog = {
     }
 
     if (this._handlerInfo.hasDefaultHandler) {
-      let elm = document.createElement("richlistitem", {is: "mozapps-handler"});
+      let elm = document.createXULElement("richlistitem", {is: "mozapps-handler"});
       elm.id = "os-default-handler";
       elm.setAttribute("name", this._handlerInfo.defaultDescription);
 
@@ -236,7 +236,7 @@ var dialog = {
           }
         }
         if (!appAlreadyInHandlers) {
-          let elm = document.createElement("richlistitem", {is: "mozapps-handler"});
+          let elm = document.createXULElement("richlistitem", {is: "mozapps-handler"});
           elm.setAttribute("name", handler.name);
           elm.obj = handler;
           items.insertBefore(elm, this._itemChoose);
@@ -277,7 +277,7 @@ var dialog = {
           }
         }
 
-        let elm = document.createElement("richlistitem", {is: "mozapps-handler"});
+        let elm = document.createXULElement("richlistitem", {is: "mozapps-handler"});
         elm.setAttribute("name", fp.file.leafName);
         elm.setAttribute("image", "moz-icon://" + uri.spec + "?size=32");
         elm.obj = handlerApp;

From 4401954b60f1dcd64d6e557b5e23884494699086 Mon Sep 17 00:00:00 2001
From: Dana Keeler <dkeeler@mozilla.com>
Date: Sat, 18 May 2019 00:15:54 +0000
Subject: [PATCH 042/129] Bug 1551177 - avoid searching unproductive
 certificate paths during verification r=jcj,KevinJacobs

In bug 1056341 we introduced a search budget to mozilla::pkix to attempt to work
around the problem of having an extremely large search space given a set of
certificates all with the same subject and issuer distinguished names but
different public keys. In the end, though, there is probably no good value to
choose for the budget that is small enough to run quickly on the wide range of
hardware our users have and yet is large enough that we're confident won't break
someone's complicated pki setup (looking at you, the US federal government).

To address this, use the observation that as long as an intermediate can't *add*
information necessary to build a certificate chain (e.g. stapled SCTs), we
should never need a self-signed intermediate (as in, its own key verifies the
signature on it and its subject and issuer distinguished names are identical) to
build a trusted chain (since the exact same chain without that intermediate
should be valid). Given this, we simply skip all self-signed non-trust anchor
CA certificates during path building.

Differential Revision: https://phabricator.services.mozilla.com/D31368

--HG--
extra : moz-landing-system : lando
---
 .../certverifier/NSSCertDBTrustDomain.cpp     |  51 ++++++++++++++-
 security/certverifier/NSSCertDBTrustDomain.h  |   1 +
 .../ssl/tests/unit/test_self_signed_certs.js  |  58 ++++++++++++++++++
 .../unit/test_self_signed_certs/cert9.db      | Bin 0 -> 45056 bytes
 security/manager/ssl/tests/unit/xpcshell.ini  |   2 +
 5 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 security/manager/ssl/tests/unit/test_self_signed_certs.js
 create mode 100644 security/manager/ssl/tests/unit/test_self_signed_certs/cert9.db

diff --git a/security/certverifier/NSSCertDBTrustDomain.cpp b/security/certverifier/NSSCertDBTrustDomain.cpp
index ab3bacbbe60b..602270c60de4 100644
--- a/security/certverifier/NSSCertDBTrustDomain.cpp
+++ b/security/certverifier/NSSCertDBTrustDomain.cpp
@@ -36,6 +36,7 @@
 #include "mozpkix/Result.h"
 #include "mozpkix/pkix.h"
 #include "mozpkix/pkixnss.h"
+#include "mozpkix/pkixutil.h"
 #include "prerror.h"
 #include "secerr.h"
 
@@ -97,7 +98,52 @@ NSSCertDBTrustDomain::NSSCertDBTrustDomain(
 #endif
       mOCSPStaplingStatus(CertVerifier::OCSP_STAPLING_NEVER_CHECKED),
       mSCTListFromCertificate(),
-      mSCTListFromOCSPStapling() {}
+      mSCTListFromOCSPStapling() {
+}
+
+// A self-signed issuer certificate should never be necessary in order to build
+// a trusted certificate chain unless it is a trust anchor. This is because if
+// it were necessary, there would exist another certificate with the same
+// subject and public key that is also a valid issing certificate. Given this
+// certificate, it is possible to build another chain using just it instead of
+// it and the self-signed certificate. This is only true as long as the
+// certificate extensions we support are restrictive rather than additive in
+// terms of the rest of the chain (for example, we don't support policy mapping
+// and we ignore any SCT information in intermediates).
+bool NSSCertDBTrustDomain::ShouldSkipSelfSignedNonTrustAnchor(Input certDER) {
+  BackCert cert(certDER, EndEntityOrCA::MustBeCA, nullptr);
+  if (cert.Init() != Success) {
+    return false;  // turn any failures into "don't skip trying this cert"
+  }
+  // If subject != issuer, this isn't a self-signed cert.
+  if (!InputsAreEqual(cert.GetSubject(), cert.GetIssuer())) {
+    return false;
+  }
+  TrustLevel trust;
+  if (GetCertTrust(EndEntityOrCA::MustBeCA, CertPolicyId::anyPolicy, certDER,
+                   trust) != Success) {
+    return false;
+  }
+  // If the trust for this certificate is anything other than "inherit", we want
+  // to process it like normal.
+  if (trust != TrustLevel::InheritsTrust) {
+    return false;
+  }
+  uint8_t digestBuf[MAX_DIGEST_SIZE_IN_BYTES];
+  pkix::der::PublicKeyAlgorithm publicKeyAlg;
+  SignedDigest signature;
+  if (DigestSignedData(*this, cert.GetSignedData(), digestBuf, publicKeyAlg,
+                       signature) != Success) {
+    return false;
+  }
+  if (VerifySignedDigest(*this, publicKeyAlg, signature,
+                         cert.GetSubjectPublicKeyInfo()) != Success) {
+    return false;
+  }
+  // This is a self-signed, non-trust-anchor certificate, so we shouldn't use it
+  // for path building. See bug 1056341.
+  return true;
+}
 
 Result NSSCertDBTrustDomain::FindIssuer(Input encodedIssuerName,
                                         IssuerChecker& checker, Time) {
@@ -193,6 +239,9 @@ Result NSSCertDBTrustDomain::FindIssuer(Input encodedIssuerName,
   }
 
   for (Input candidate : rootCandidates) {
+    if (ShouldSkipSelfSignedNonTrustAnchor(candidate)) {
+      continue;
+    }
     bool keepGoing;
     Result rv = checker.Check(candidate, nameConstraintsInputPtr, keepGoing);
     if (rv != Success) {
diff --git a/security/certverifier/NSSCertDBTrustDomain.h b/security/certverifier/NSSCertDBTrustDomain.h
index ddeac1db2bc2..47055f67c4ea 100644
--- a/security/certverifier/NSSCertDBTrustDomain.h
+++ b/security/certverifier/NSSCertDBTrustDomain.h
@@ -240,6 +240,7 @@ class NSSCertDBTrustDomain : public mozilla::pkix::TrustDomain {
   Result HandleOCSPFailure(const Result cachedResponseResult,
                            const Result stapledOCSPResponseResult,
                            const Result error);
+  bool ShouldSkipSelfSignedNonTrustAnchor(mozilla::pkix::Input certDER);
 
   const SECTrustType mCertDBTrustType;
   const OCSPFetching mOCSPFetching;
diff --git a/security/manager/ssl/tests/unit/test_self_signed_certs.js b/security/manager/ssl/tests/unit/test_self_signed_certs.js
new file mode 100644
index 000000000000..21b6b2947510
--- /dev/null
+++ b/security/manager/ssl/tests/unit/test_self_signed_certs.js
@@ -0,0 +1,58 @@
+// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+"use strict";
+
+// This test uses a specially-crafted NSS cert DB containing 12 self-signed certificates that all
+// have the same subject and issuer distinguished name. Since they all have different keys and none
+// of them are trust anchors, there are a large number of potential trust paths that could be
+// explored. If our trust domain were naive enough to allow mozilla::pkix to explore them all, it
+// would take a long time to perform (mozilla::pkix does have the concept of a path-building budget,
+// but even on a fast computer, it takes an unacceptable amount of time to exhaust). To prevent the
+// full exploration of this space, NSSCertDBTrustDomain skips searching through self-signed
+// certificates that aren't trust anchors, since those would never otherwise be essential to
+// complete a path (note that this is only true as long as the extensions we support are restrictive
+// rather than additive).
+// When we try to verify one of these certificates in this test, we should finish relatively
+// quickly, even on slow hardware.
+// Should these certificates ever need regenerating, they were produced with the following commands:
+// certutil -N -d . --empty-password
+// for num in 00 01 02 03 04 05 06 07 08 09 10 11; do
+//   echo -ne "5\n6\n9\ny\ny\n\ny\n" | certutil -d . -S -s "CN=self-signed cert" -t ,, \
+//   -q secp256r1 -x -k ec -z <(date +%s) -1 -2 -n cert$num; sleep 2;
+// done
+
+add_task(async function run_test_no_overlong_path_building() {
+  let profile = do_get_profile();
+  const CERT_DB_NAME = "cert9.db";
+  let srcCertDBFile = do_get_file(`test_self_signed_certs/${CERT_DB_NAME}`);
+  srcCertDBFile.copyTo(profile, CERT_DB_NAME);
+
+  let certDB = Cc["@mozilla.org/security/x509certdb;1"].getService(Ci.nsIX509CertDB);
+  let certToVerify = null;
+  for (let cert of certDB.getCerts().getEnumerator()) {
+    if (cert.subjectName == "CN=self-signed cert") {
+      certToVerify = cert;
+      break;
+    }
+  }
+  notEqual(certToVerify, null, "should have found one of the preloaded self-signed certs");
+  let timeBefore = Date.now();
+  // As mentioned above, mozilla::pkix limits how much it will search for a trusted path, even if a
+  // trust domain keeps providing potential issuers. So, if we only tried to verify a certificate
+  // once, this test could potentially pass on a fast computer even if we weren't properly skipping
+  // unnecessary paths. If we were to try and lower our time limit (the comparison with
+  // secondsElapsed, below), this test would intermittently fail on slow hardware. By trying to
+  // verify the certificate 10 times, we hopefully end up with a meaningful test (it should still
+  // fail on fast hardware if we don't properly skip unproductive paths) that won't intermittently
+  // time out on slow hardware.
+  for (let i = 0; i < 10; i++) {
+    let date = new Date("2019-05-15T00:00:00.000Z");
+    await checkCertErrorGenericAtTime(certDB, certToVerify, SEC_ERROR_UNKNOWN_ISSUER,
+                                      certificateUsageSSLCA, date.getTime() / 1000);
+  }
+  let timeAfter = Date.now();
+  let secondsElapsed = (timeAfter - timeBefore) / 1000;
+  ok(secondsElapsed < 120, "verifications shouldn't take too long");
+});
diff --git a/security/manager/ssl/tests/unit/test_self_signed_certs/cert9.db b/security/manager/ssl/tests/unit/test_self_signed_certs/cert9.db
new file mode 100644
index 0000000000000000000000000000000000000000..5450fe82e5d8867914e864bc34bfefd90678c566
GIT binary patch
literal 45056
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
Wo1F&VW^b}|CM}OLCdIzAO8*1kH)}Bf

literal 0
HcmV?d00001

diff --git a/security/manager/ssl/tests/unit/xpcshell.ini b/security/manager/ssl/tests/unit/xpcshell.ini
index abfe77894604..64f97b026beb 100644
--- a/security/manager/ssl/tests/unit/xpcshell.ini
+++ b/security/manager/ssl/tests/unit/xpcshell.ini
@@ -34,6 +34,7 @@ support-files =
   test_sdr_preexisting/**
   test_sdr_preexisting_with_password/**
   test_sdr_upgraded_with_password/**
+  test_self_signed_certs/**
   test_signed_apps/**
   test_startcom_wosign/**
   test_symantec_apple_google/**
@@ -173,6 +174,7 @@ skip-if = toolkit == 'android'
 [test_sdr_upgraded_with_password.js]
 # Not relevant to Android. See the comment in the test.
 skip-if = toolkit == 'android'
+[test_self_signed_certs.js]
 [test_session_resumption.js]
 run-sequentially = hardcoded ports
 [test_signed_apps.js]

From eb97e60e6c1d740c4792fd9fe8f7280ebc475313 Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Thu, 16 May 2019 16:34:20 +0000
Subject: [PATCH 043/129] Bug 1534407 - Enable browser.xhtml by default
 r=mossop

Differential Revision: https://phabricator.services.mozilla.com/D26599

--HG--
extra : moz-landing-system : lando
---
 browser/base/jar.mn                |  6 +++---
 browser/base/moz.build             |  4 ++--
 browser/components/BrowserGlue.jsm | 16 +++++++++++++++-
 browser/confvars.sh                |  6 +++---
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 30c6a8b09331..91ec7d34ff0e 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -28,10 +28,10 @@ browser.jar:
         content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
 *       content/browser/browser.css                   (content/browser.css)
         content/browser/browser.js                    (content/browser.js)
-#ifdef MOZ_BROWSER_XHTML
-*       content/browser/browser.xhtml                 (content/browser.xhtml)
-#else
+#ifdef MOZ_BROWSER_XUL
 *       content/browser/browser.xul                   (content/browser.xul)
+#else
+*       content/browser/browser.xhtml                 (content/browser.xhtml)
 #endif
         content/browser/browser-addons.js             (content/browser-addons.js)
         content/browser/browser-allTabsMenu.js        (content/browser-allTabsMenu.js)
diff --git a/browser/base/moz.build b/browser/base/moz.build
index 669de9ce4f43..7f8259340aa6 100644
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -59,8 +59,8 @@ BROWSER_CHROME_MANIFESTS += [
 
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']
-if CONFIG['MOZ_BROWSER_XHTML']:
-    DEFINES['MOZ_BROWSER_XHTML'] = CONFIG['MOZ_BROWSER_XHTML']
+if CONFIG['MOZ_BROWSER_XUL']:
+   DEFINES['MOZ_BROWSER_XUL'] = CONFIG['MOZ_BROWSER_XUL']
 
 DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR
 
diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
index cedc6c5d22bf..6abe6fb27ace 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -2316,11 +2316,20 @@ BrowserGlue.prototype = {
     }
   },
 
+  _migrateXULStoreForDocument(fromURL, toURL) {
+    Array.from(Services.xulStore.getIDsEnumerator(fromURL)).forEach((id) => {
+      Array.from(Services.xulStore.getAttributeEnumerator(fromURL, id)).forEach(attr => {
+        let value = Services.xulStore.getValue(fromURL, id, attr);
+        Services.xulStore.setValue(toURL, id, attr, value);
+      });
+    });
+  },
+
   // eslint-disable-next-line complexity
   _migrateUI: function BG__migrateUI() {
     // Use an increasing number to keep track of the current migration state.
     // Completely unrelated to the current Firefox release number.
-    const UI_VERSION = 81;
+    const UI_VERSION = 82;
     const BROWSER_DOCURL = AppConstants.BROWSER_CHROME_URL;
 
     let currentUIVersion;
@@ -2624,6 +2633,11 @@ BrowserGlue.prototype = {
       }
     }
 
+    if (currentUIVersion < 82) {
+      this._migrateXULStoreForDocument("chrome://browser/content/browser.xul",
+                                       "chrome://browser/content/browser.xhtml");
+    }
+
     // Update the migration version.
     Services.prefs.setIntPref("browser.migration.version", UI_VERSION);
   },
diff --git a/browser/confvars.sh b/browser/confvars.sh
index d79fc691b514..1df699b64626 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -31,10 +31,10 @@ fi
 # Enable building ./signmar and running libmar signature tests
 MOZ_ENABLE_SIGNMAR=1
 
-if [ "${MOZ_BROWSER_XHTML}" = "1" ]; then
-  BROWSER_CHROME_URL=chrome://browser/content/browser.xhtml
-else
+if [ "${MOZ_BROWSER_XUL}" = "1" ]; then
   BROWSER_CHROME_URL=chrome://browser/content/browser.xul
+else
+  BROWSER_CHROME_URL=chrome://browser/content/browser.xhtml
 fi
 
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh

From 636c68369c617343241e640670fc20966928edff Mon Sep 17 00:00:00 2001
From: Shane Caraveo <scaraveo@mozilla.com>
Date: Mon, 20 May 2019 15:05:26 +0000
Subject: [PATCH 044/129] Bug 1552248 support ftp channel in proxy api
 r=mayhemer,kmag

ChannelWrapper is used throughout webext APIs and it requires a channel to support weakref.
FTPChannel did not, thus ftp requests did not go through proxy.onRequest.

Differential Revision: https://phabricator.services.mozilla.com/D31540

--HG--
extra : moz-landing-system : lando
---
 netwerk/protocol/ftp/nsFTPChannel.cpp         |  1 +
 netwerk/protocol/ftp/nsFTPChannel.h           |  2 ++
 .../test/xpcshell/test_proxy_listener.js      | 14 ++++++++++++--
 .../xpcshell/test_proxy_scripts_results.js    | 19 +++++++++++++++++--
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/netwerk/protocol/ftp/nsFTPChannel.cpp b/netwerk/protocol/ftp/nsFTPChannel.cpp
index 07d0e84f7c86..48a617b0b2c3 100644
--- a/netwerk/protocol/ftp/nsFTPChannel.cpp
+++ b/netwerk/protocol/ftp/nsFTPChannel.cpp
@@ -27,6 +27,7 @@ extern LazyLogModule gFTPLog;
 NS_IMPL_ISUPPORTS_INHERITED(nsFtpChannel, nsBaseChannel, nsIUploadChannel,
                             nsIResumableChannel, nsIFTPChannel,
                             nsIProxiedChannel, nsIForcePendingChannel,
+                            nsISupportsWeakReference,
                             nsIChannelWithDivertableParentListener)
 
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/ftp/nsFTPChannel.h b/netwerk/protocol/ftp/nsFTPChannel.h
index f8ae858538af..0f488437ad1d 100644
--- a/netwerk/protocol/ftp/nsFTPChannel.h
+++ b/netwerk/protocol/ftp/nsFTPChannel.h
@@ -18,6 +18,7 @@
 #include "nsIProxyInfo.h"
 #include "nsIProxiedChannel.h"
 #include "nsIResumableChannel.h"
+#include "nsWeakReference.h"
 
 class nsIURI;
 using mozilla::net::ADivertableParentChannel;
@@ -28,6 +29,7 @@ class nsFtpChannel final : public nsBaseChannel,
                            public nsIResumableChannel,
                            public nsIProxiedChannel,
                            public nsIForcePendingChannel,
+                           public nsSupportsWeakReference,
                            public nsIChannelWithDivertableParentListener {
  public:
   NS_DECL_ISUPPORTS_INHERITED
diff --git a/toolkit/components/extensions/test/xpcshell/test_proxy_listener.js b/toolkit/components/extensions/test/xpcshell/test_proxy_listener.js
index 08d77ba3fc5a..43e99afab67f 100644
--- a/toolkit/components/extensions/test/xpcshell/test_proxy_listener.js
+++ b/toolkit/components/extensions/test/xpcshell/test_proxy_listener.js
@@ -158,7 +158,6 @@ async function getExtension(expectedProxyInfo) {
     browser.proxy.onRequest.addListener(details => {
       return proxyInfo;
     }, {urls: ["<all_urls>"]});
-    browser.test.sendMessage("ready");
   }
   let extensionData = {
     manifest: {
@@ -168,7 +167,6 @@ async function getExtension(expectedProxyInfo) {
   };
   let extension = ExtensionTestUtils.loadExtension(extensionData);
   await extension.startup();
-  await extension.awaitMessage("ready");
   return extension;
 }
 
@@ -189,3 +187,15 @@ add_task(async function test_passthrough() {
   equal(proxyInfo, null, `expected no proxy`);
   await ext1.unload();
 });
+
+add_task(async function test_ftp() {
+  let extension = await getExtension({host: "1.2.3.4", port: 8888, type: "http"});
+
+  let proxyInfo = await getProxyInfo("ftp://somewhere.mozilla.org/");
+
+  equal(proxyInfo.host, "1.2.3.4", `proxy host correct`);
+  equal(proxyInfo.port, "8888", `proxy port correct`);
+  equal(proxyInfo.type, "http", `proxy type correct`);
+
+  await extension.unload();
+});
diff --git a/toolkit/components/extensions/test/xpcshell/test_proxy_scripts_results.js b/toolkit/components/extensions/test/xpcshell/test_proxy_scripts_results.js
index 5a5edb643077..5f5cb1c98b81 100644
--- a/toolkit/components/extensions/test/xpcshell/test_proxy_scripts_results.js
+++ b/toolkit/components/extensions/test/xpcshell/test_proxy_scripts_results.js
@@ -56,14 +56,14 @@ async function setupProxyScript(proxy) {
 }
 
 async function testProxyResolution(test) {
-  let {proxy, expected} = test;
+  let {uri, proxy, expected} = test;
   let errorMsg;
   if (expected.error) {
     errorMsg = extension.awaitMessage("proxy-error-received");
   }
   let proxyInfo = await new Promise((resolve, reject) => {
     let channel = NetUtil.newChannel({
-      uri: "http://www.mozilla.org/",
+      uri,
       loadUsingSystemPrincipal: true,
     });
 
@@ -202,6 +202,18 @@ add_task(async function test_pac_results() {
         },
       },
     },
+    {
+      uri: "ftp://mozilla.org",
+      proxy: "PROXY 1.2.3.4:8080",
+      expected: {
+        proxyInfo: {
+          host: "1.2.3.4",
+          port: "8080",
+          type: "http",
+          failoverProxy: null,
+        },
+      },
+    },
     {
       proxy: "   PROXY    2.3.4.5:8080      ",
       expected: {
@@ -329,6 +341,9 @@ add_task(async function test_pac_results() {
   ];
   for (let test of tests) {
     await setupProxyScript(test.proxy);
+    if (!test.uri) {
+      test.uri = "http://www.mozilla.org/";
+    }
     await testProxyResolution(test);
     // Our proxy script for testing is stateless, so repeating the test should
     // yield exactly the same results.

From 9054636e2c56ddbc77e8b3f13dc2a1d86e7cf5fb Mon Sep 17 00:00:00 2001
From: Daniel Varga <dvarga@mozilla.com>
Date: Mon, 20 May 2019 21:04:40 +0300
Subject: [PATCH 045/129] Backed out 2 changesets (bug 1487113) for mochitest
 failure at dom/base/test/test_script_loader_js_cache.html.

Backed out changeset dce59b615568 (bug 1487113)
Backed out changeset e6f579752678 (bug 1487113)
---
 netwerk/base/nsICacheInfoChannel.idl          |  12 +-
 netwerk/protocol/http/HttpChannelChild.cpp    | 114 ++++++++++--------
 netwerk/protocol/http/HttpChannelChild.h      |  21 ++--
 netwerk/protocol/http/HttpChannelParent.cpp   |  73 ++++++-----
 netwerk/protocol/http/HttpChannelParent.h     |   3 +
 .../protocol/http/InterceptedHttpChannel.cpp  |  11 +-
 netwerk/protocol/http/PHttpChannel.ipdl       |  12 +-
 netwerk/protocol/http/nsHttpChannel.cpp       |  31 +++--
 netwerk/test/unit/test_alt-data_simple.js     |   6 +-
 netwerk/test/unit/test_alt-data_stream.js     |   8 +-
 .../test_alt-data_cross_process_wrap.js       |  34 +++++-
 11 files changed, 199 insertions(+), 126 deletions(-)

diff --git a/netwerk/base/nsICacheInfoChannel.idl b/netwerk/base/nsICacheInfoChannel.idl
index 26346109e46f..015f264a5ce9 100644
--- a/netwerk/base/nsICacheInfoChannel.idl
+++ b/netwerk/base/nsICacheInfoChannel.idl
@@ -140,16 +140,18 @@ interface nsICacheInfoChannel : nsISupports
 
   /**
    * If preferAlternativeDataType() has been called passing deliverAltData
-   * equal to false, this attribute will expose the alt-data inputStream if
-   * avaiable.
+   * equal to false, this method will expose the alt-data inputStream if
+   * aviable.
    */
-  readonly attribute nsIInputStream alternativeDataInputStream;
+  void getAltDataInputStream(in ACString type,
+                             in nsIInputStreamReceiver aReceiver);
 
   /**
    * Sometimes when the channel is delivering alt-data, we may want to somehow
-   * access the original content too.
+   * access the original content too. This method asynchronously opens the
+   * input stream and delivers it to the receiver.
    */
-  readonly attribute nsIInputStream originalInputStream;
+  void getOriginalInputStream(in nsIInputStreamReceiver aReceiver);
 
   /**
    * Opens and returns an output stream that a consumer may use to save an
diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index 70ddfef3ccbf..9dceeb4745a2 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -395,25 +395,20 @@ void HttpChannelChild::AssociateApplicationCache(const nsCString& groupID,
 
 class StartRequestEvent : public NeckoTargetChannelEvent<HttpChannelChild> {
  public:
-  StartRequestEvent(HttpChannelChild* aChild, const nsresult& aChannelStatus,
-                    const nsHttpResponseHead& aResponseHead,
-                    const bool& aUseResponseHead,
-                    const nsHttpHeaderArray& aRequestHeaders,
-                    const ParentLoadInfoForwarderArgs& loadInfoForwarder,
-                    const bool& aIsFromCache, const bool& aIsRacing,
-                    const bool& aCacheEntryAvailable,
-                    const uint64_t& aCacheEntryId,
-                    const int32_t& aCacheFetchCount,
-                    const uint32_t& aCacheExpirationTime,
-                    const nsCString& aCachedCharset,
-                    const nsCString& aSecurityInfoSerialization,
-                    const NetAddr& aSelfAddr, const NetAddr& aPeerAddr,
-                    const uint32_t& aCacheKey, const nsCString& altDataType,
-                    const int64_t& altDataLen, const bool& deliveringAltData,
-                    already_AddRefed<nsIInputStream> originalCacheInputStream,
-                    already_AddRefed<nsIInputStream> altDataInputStream,
-                    const bool& aApplyConversion, const bool& aIsResolvedByTRR,
-                    const ResourceTimingStruct& aTiming)
+  StartRequestEvent(
+      HttpChannelChild* aChild, const nsresult& aChannelStatus,
+      const nsHttpResponseHead& aResponseHead, const bool& aUseResponseHead,
+      const nsHttpHeaderArray& aRequestHeaders,
+      const ParentLoadInfoForwarderArgs& loadInfoForwarder,
+      const bool& aIsFromCache, const bool& aIsRacing,
+      const bool& aCacheEntryAvailable, const uint64_t& aCacheEntryId,
+      const int32_t& aCacheFetchCount, const uint32_t& aCacheExpirationTime,
+      const nsCString& aCachedCharset,
+      const nsCString& aSecurityInfoSerialization, const NetAddr& aSelfAddr,
+      const NetAddr& aPeerAddr, const uint32_t& aCacheKey,
+      const nsCString& altDataType, const int64_t& altDataLen,
+      const bool& deliveringAltData, const bool& aApplyConversion,
+      const bool& aIsResolvedByTRR, const ResourceTimingStruct& aTiming)
       : NeckoTargetChannelEvent<HttpChannelChild>(aChild),
         mChannelStatus(aChannelStatus),
         mResponseHead(aResponseHead),
@@ -434,8 +429,6 @@ class StartRequestEvent : public NeckoTargetChannelEvent<HttpChannelChild> {
         mAltDataType(altDataType),
         mAltDataLen(altDataLen),
         mDeliveringAltData(deliveringAltData),
-        mOriginalCacheInputStream(originalCacheInputStream),
-        mAltDataInputStream(altDataInputStream),
         mLoadInfoForwarder(loadInfoForwarder),
         mIsResolvedByTRR(aIsResolvedByTRR),
         mTiming(aTiming) {}
@@ -447,9 +440,8 @@ class StartRequestEvent : public NeckoTargetChannelEvent<HttpChannelChild> {
         mLoadInfoForwarder, mIsFromCache, mIsRacing, mCacheEntryAvailable,
         mCacheEntryId, mCacheFetchCount, mCacheExpirationTime, mCachedCharset,
         mSecurityInfoSerialization, mSelfAddr, mPeerAddr, mCacheKey,
-        mAltDataType, mAltDataLen, mDeliveringAltData,
-        mOriginalCacheInputStream.forget(), mAltDataInputStream.forget(),
-        mApplyConversion, mIsResolvedByTRR, mTiming);
+        mAltDataType, mAltDataLen, mDeliveringAltData, mApplyConversion,
+        mIsResolvedByTRR, mTiming);
   }
 
  private:
@@ -472,8 +464,6 @@ class StartRequestEvent : public NeckoTargetChannelEvent<HttpChannelChild> {
   nsCString mAltDataType;
   int64_t mAltDataLen;
   bool mDeliveringAltData;
-  nsCOMPtr<nsIInputStream> mOriginalCacheInputStream;
-  nsCOMPtr<nsIInputStream> mAltDataInputStream;
   ParentLoadInfoForwarderArgs mLoadInfoForwarder;
   bool mIsResolvedByTRR;
   ResourceTimingStruct mTiming;
@@ -490,9 +480,7 @@ mozilla::ipc::IPCResult HttpChannelChild::RecvOnStartRequest(
     const NetAddr& selfAddr, const NetAddr& peerAddr,
     const int16_t& redirectCount, const uint32_t& cacheKey,
     const nsCString& altDataType, const int64_t& altDataLen,
-    const bool& deliveringAltData,
-    const Maybe<IPCStream>& aOriginalCacheInputStream,
-    const Maybe<IPCStream>& aAltDataInputStream, const bool& aApplyConversion,
+    const bool& deliveringAltData, const bool& aApplyConversion,
     const bool& aIsResolvedByTRR, const ResourceTimingStruct& aTiming) {
   AUTO_PROFILER_LABEL("HttpChannelChild::RecvOnStartRequest", NETWORK);
   LOG(("HttpChannelChild::RecvOnStartRequest [this=%p]\n", this));
@@ -507,19 +495,12 @@ mozilla::ipc::IPCResult HttpChannelChild::RecvOnStartRequest(
 
   mRedirectCount = redirectCount;
 
-  nsCOMPtr<nsIInputStream> originalCacheInputStream =
-      DeserializeIPCStream(aOriginalCacheInputStream);
-
-  nsCOMPtr<nsIInputStream> altDataInputStream =
-      DeserializeIPCStream(aAltDataInputStream);
-
   mEventQ->RunOrEnqueue(new StartRequestEvent(
       this, channelStatus, responseHead, useResponseHead, requestHeaders,
       loadInfoForwarder, isFromCache, isRacing, cacheEntryAvailable,
       cacheEntryId, cacheFetchCount, cacheExpirationTime, cachedCharset,
       securityInfoSerialization, selfAddr, peerAddr, cacheKey, altDataType,
-      altDataLen, deliveringAltData, originalCacheInputStream.forget(),
-      altDataInputStream.forget(), aApplyConversion, aIsResolvedByTRR,
+      altDataLen, deliveringAltData, aApplyConversion, aIsResolvedByTRR,
       aTiming));
 
   {
@@ -553,11 +534,8 @@ void HttpChannelChild::OnStartRequest(
     const nsCString& cachedCharset, const nsCString& securityInfoSerialization,
     const NetAddr& selfAddr, const NetAddr& peerAddr, const uint32_t& cacheKey,
     const nsCString& altDataType, const int64_t& altDataLen,
-    const bool& deliveringAltData,
-    already_AddRefed<nsIInputStream> originalCacheInputStream,
-    already_AddRefed<nsIInputStream> altDataInputStream,
-    const bool& aApplyConversion, const bool& aIsResolvedByTRR,
-    const ResourceTimingStruct& aTiming) {
+    const bool& deliveringAltData, const bool& aApplyConversion,
+    const bool& aIsResolvedByTRR, const ResourceTimingStruct& aTiming) {
   LOG(("HttpChannelChild::OnStartRequest [this=%p]\n", this));
 
   // mFlushedForDiversion and mDivertingToParent should NEVER be set at this
@@ -569,9 +547,6 @@ void HttpChannelChild::OnStartRequest(
       !mDivertingToParent,
       "mDivertingToParent should be unset before OnStartRequest!");
 
-  mOriginalCacheInputStream = originalCacheInputStream;
-  mAltDataInputStream = altDataInputStream;
-
   // If this channel was aborted by ActorDestroy, then there may be other
   // OnStartRequest/OnStopRequest/OnDataAvailable IPC messages that need to
   // be handled. In that case we just ignore them to avoid calling the listener
@@ -3261,29 +3236,62 @@ HttpChannelChild::OpenAlternativeOutputStream(const nsACString& aType,
 }
 
 NS_IMETHODIMP
-HttpChannelChild::GetOriginalInputStream(nsIInputStream** aInputStream) {
-  NS_ENSURE_ARG_POINTER(aInputStream);
+HttpChannelChild::GetOriginalInputStream(nsIInputStreamReceiver* aReceiver) {
+  if (aReceiver == nullptr) {
+    return NS_ERROR_INVALID_ARG;
+  }
 
   if (!mIPCOpen) {
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  nsCOMPtr<nsIInputStream> is = mOriginalCacheInputStream;
-  is.forget(aInputStream);
+  mOriginalInputStreamReceiver = aReceiver;
+  Unused << SendOpenOriginalCacheInputStream();
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-HttpChannelChild::GetAlternativeDataInputStream(nsIInputStream** aInputStream) {
-  NS_ENSURE_ARG_POINTER(aInputStream);
+HttpChannelChild::GetAltDataInputStream(const nsACString& aType,
+                                        nsIInputStreamReceiver* aReceiver) {
+  if (aReceiver == nullptr) {
+    return NS_ERROR_INVALID_ARG;
+  }
 
-  nsCOMPtr<nsIInputStream> is = mAltDataInputStream;
-  is.forget(aInputStream);
+  if (!mIPCOpen) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  mAltDataInputStreamReceiver = aReceiver;
+  Unused << SendOpenAltDataCacheInputStream(nsCString(aType));
 
   return NS_OK;
 }
 
+mozilla::ipc::IPCResult HttpChannelChild::RecvOriginalCacheInputStreamAvailable(
+    const Maybe<IPCStream>& aStream) {
+  nsCOMPtr<nsIInputStream> stream = DeserializeIPCStream(aStream);
+  nsCOMPtr<nsIInputStreamReceiver> receiver;
+  receiver.swap(mOriginalInputStreamReceiver);
+  if (receiver) {
+    receiver->OnInputStreamReady(stream);
+  }
+
+  return IPC_OK();
+}
+
+mozilla::ipc::IPCResult HttpChannelChild::RecvAltDataCacheInputStreamAvailable(
+    const Maybe<IPCStream>& aStream) {
+  nsCOMPtr<nsIInputStream> stream = DeserializeIPCStream(aStream);
+  nsCOMPtr<nsIInputStreamReceiver> receiver;
+  receiver.swap(mAltDataInputStreamReceiver);
+  if (receiver) {
+    receiver->OnInputStreamReady(stream);
+  }
+
+  return IPC_OK();
+}
+
 //-----------------------------------------------------------------------------
 // HttpChannelChild::nsIResumableChannel
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/HttpChannelChild.h b/netwerk/protocol/http/HttpChannelChild.h
index d6f4f2ba1021..deaec9682560 100644
--- a/netwerk/protocol/http/HttpChannelChild.h
+++ b/netwerk/protocol/http/HttpChannelChild.h
@@ -146,9 +146,7 @@ class HttpChannelChild final : public PHttpChannelChild,
       const NetAddr& peerAddr, const int16_t& redirectCount,
       const uint32_t& cacheKey, const nsCString& altDataType,
       const int64_t& altDataLen, const bool& deliveringAltData,
-      const Maybe<IPCStream>& originalCacheInputStream,
-      const Maybe<IPCStream>& altDataInputStream, const bool& aApplyConversion,
-      const bool& aIsResolvedByTRR,
+      const bool& aApplyConversion, const bool& aIsResolvedByTRR,
       const ResourceTimingStruct& aTiming) override;
   mozilla::ipc::IPCResult RecvFailedAsyncOpen(const nsresult& status) override;
   mozilla::ipc::IPCResult RecvRedirect1Begin(
@@ -179,6 +177,12 @@ class HttpChannelChild final : public PHttpChannelChild,
 
   mozilla::ipc::IPCResult RecvCancelRedirected() override;
 
+  mozilla::ipc::IPCResult RecvOriginalCacheInputStreamAvailable(
+      const Maybe<IPCStream>& aStream) override;
+
+  mozilla::ipc::IPCResult RecvAltDataCacheInputStreamAvailable(
+      const Maybe<IPCStream>& aStream) override;
+
   virtual void ActorDestroy(ActorDestroyReason aWhy) override;
 
   virtual void DoNotifyListenerCleanup() override;
@@ -346,8 +350,8 @@ class HttpChannelChild final : public PHttpChannelChild,
   nsCOMPtr<nsICacheInfoChannel> mSynthesizedCacheInfo;
   RefPtr<ChannelEventQueue> mEventQ;
 
-  nsCOMPtr<nsIInputStream> mOriginalCacheInputStream;
-  nsCOMPtr<nsIInputStream> mAltDataInputStream;
+  nsCOMPtr<nsIInputStreamReceiver> mOriginalInputStreamReceiver;
+  nsCOMPtr<nsIInputStreamReceiver> mAltDataInputStreamReceiver;
 
   // Used to ensure atomicity of mBgChild and mBgInitFailCallback
   Mutex mBgChildMutex;
@@ -474,11 +478,8 @@ class HttpChannelChild final : public PHttpChannelChild,
       const nsCString& securityInfoSerialization, const NetAddr& selfAddr,
       const NetAddr& peerAddr, const uint32_t& cacheKey,
       const nsCString& altDataType, const int64_t& altDataLen,
-      const bool& deliveringAltData,
-      already_AddRefed<nsIInputStream> originalCacheInputStream,
-      already_AddRefed<nsIInputStream> altDataInputStream,
-      const bool& aApplyConversion, const bool& aIsResolvedByTRR,
-      const ResourceTimingStruct& aTiming);
+      const bool& deliveringAltData, const bool& aApplyConversion,
+      const bool& aIsResolvedByTRR, const ResourceTimingStruct& aTiming);
   void MaybeDivertOnData(const nsCString& data, const uint64_t& offset,
                          const uint32_t& count);
   void OnTransportAndData(const nsresult& channelStatus, const nsresult& status,
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index c1be31a58917..f39b3a9b56a8 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -1467,33 +1467,6 @@ HttpChannelParent::OnStartRequest(nsIRequest* aRequest) {
   bool isResolvedByTRR = false;
   chan->GetIsResolvedByTRR(&isResolvedByTRR);
 
-  AutoIPCStream originalCacheInputStream(true /* delay start */);
-  AutoIPCStream altDataInputStream(true /* delay start */);
-
-  if (mCacheEntry) {
-    PContentParent* pcp = Manager()->Manager();
-
-    {
-      nsCOMPtr<nsIInputStream> inputStream;
-      nsresult rv =
-          mCacheEntry->OpenInputStream(0, getter_AddRefs(inputStream));
-      if (NS_SUCCEEDED(rv)) {
-        Unused << originalCacheInputStream.Serialize(
-            inputStream, static_cast<ContentParent*>(pcp));
-      }
-    }
-
-    if (!altDataType.IsEmpty()) {
-      nsCOMPtr<nsIInputStream> inputStream;
-      nsresult rv = mCacheEntry->OpenAlternativeInputStream(
-          altDataType, getter_AddRefs(inputStream));
-      if (NS_SUCCEEDED(rv)) {
-        Unused << altDataInputStream.Serialize(
-            inputStream, static_cast<ContentParent*>(pcp));
-      }
-    }
-  }
-
   rv = NS_OK;
   if (mIPCClosed ||
       !SendOnStartRequest(
@@ -1503,9 +1476,7 @@ HttpChannelParent::OnStartRequest(nsIRequest* aRequest) {
           mCacheEntry ? true : false, cacheEntryId, fetchCount, expirationTime,
           cachedCharset, secInfoSerialization, chan->GetSelfAddr(),
           chan->GetPeerAddr(), redirectCount, cacheKey, altDataType, altDataLen,
-          deliveringAltData, originalCacheInputStream.TakeOptionalValue(),
-          altDataInputStream.TakeOptionalValue(), applyConversion,
-          isResolvedByTRR, timing)) {
+          deliveringAltData, applyConversion, isResolvedByTRR, timing)) {
     rv = NS_ERROR_UNEXPECTED;
   }
   requestHead->Exit();
@@ -1721,6 +1692,48 @@ mozilla::ipc::IPCResult HttpChannelParent::RecvBytesRead(
   return IPC_OK();
 }
 
+mozilla::ipc::IPCResult HttpChannelParent::RecvOpenOriginalCacheInputStream() {
+  if (mIPCClosed) {
+    return IPC_OK();
+  }
+  AutoIPCStream autoStream;
+  if (mCacheEntry) {
+    nsCOMPtr<nsIInputStream> inputStream;
+    nsresult rv = mCacheEntry->OpenInputStream(0, getter_AddRefs(inputStream));
+    if (NS_SUCCEEDED(rv)) {
+      PContentParent* pcp = Manager()->Manager();
+      Unused << autoStream.Serialize(inputStream,
+                                     static_cast<ContentParent*>(pcp));
+    }
+  }
+
+  Unused << SendOriginalCacheInputStreamAvailable(
+      autoStream.TakeOptionalValue());
+  return IPC_OK();
+}
+
+mozilla::ipc::IPCResult HttpChannelParent::RecvOpenAltDataCacheInputStream(
+    const nsCString& aType) {
+  if (mIPCClosed) {
+    return IPC_OK();
+  }
+  AutoIPCStream autoStream;
+  if (mCacheEntry) {
+    nsCOMPtr<nsIInputStream> inputStream;
+    nsresult rv = mCacheEntry->OpenAlternativeInputStream(
+        aType, getter_AddRefs(inputStream));
+    if (NS_SUCCEEDED(rv)) {
+      PContentParent* pcp = Manager()->Manager();
+      Unused << autoStream.Serialize(inputStream,
+                                     static_cast<ContentParent*>(pcp));
+    }
+  }
+
+  Unused << SendAltDataCacheInputStreamAvailable(
+      autoStream.TakeOptionalValue());
+  return IPC_OK();
+}
+
 //-----------------------------------------------------------------------------
 // HttpChannelParent::nsIProgressEventSink
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h
index 6a2109dae2c7..825728ad26a4 100644
--- a/netwerk/protocol/http/HttpChannelParent.h
+++ b/netwerk/protocol/http/HttpChannelParent.h
@@ -205,6 +205,9 @@ class HttpChannelParent final : public nsIInterfaceRequestor,
       const URIParams& uri,
       const mozilla::ipc::PrincipalInfo& requestingPrincipal) override;
   virtual mozilla::ipc::IPCResult RecvBytesRead(const int32_t& aCount) override;
+  virtual mozilla::ipc::IPCResult RecvOpenOriginalCacheInputStream() override;
+  virtual mozilla::ipc::IPCResult RecvOpenAltDataCacheInputStream(
+      const nsCString& aType) override;
   virtual void ActorDestroy(ActorDestroyReason why) override;
 
   // Supporting function for ADivertableParentChannel.
diff --git a/netwerk/protocol/http/InterceptedHttpChannel.cpp b/netwerk/protocol/http/InterceptedHttpChannel.cpp
index e33c0680bbcd..b2e194f188fc 100644
--- a/netwerk/protocol/http/InterceptedHttpChannel.cpp
+++ b/netwerk/protocol/http/InterceptedHttpChannel.cpp
@@ -1284,18 +1284,19 @@ InterceptedHttpChannel::OpenAlternativeOutputStream(
 }
 
 NS_IMETHODIMP
-InterceptedHttpChannel::GetOriginalInputStream(nsIInputStream** aStream) {
+InterceptedHttpChannel::GetOriginalInputStream(
+    nsIInputStreamReceiver* aReceiver) {
   if (mSynthesizedCacheInfo) {
-    return mSynthesizedCacheInfo->GetOriginalInputStream(aStream);
+    return mSynthesizedCacheInfo->GetOriginalInputStream(aReceiver);
   }
   return NS_ERROR_NOT_AVAILABLE;
 }
 
 NS_IMETHODIMP
-InterceptedHttpChannel::GetAlternativeDataInputStream(
-    nsIInputStream** aInputStream) {
+InterceptedHttpChannel::GetAltDataInputStream(
+    const nsACString& aType, nsIInputStreamReceiver* aReceiver) {
   if (mSynthesizedCacheInfo) {
-    return mSynthesizedCacheInfo->GetAlternativeDataInputStream(aInputStream);
+    return mSynthesizedCacheInfo->GetAltDataInputStream(aType, aReceiver);
   }
   return NS_ERROR_NOT_AVAILABLE;
 }
diff --git a/netwerk/protocol/http/PHttpChannel.ipdl b/netwerk/protocol/http/PHttpChannel.ipdl
index 05e7d271af4b..e58a0752a1c1 100644
--- a/netwerk/protocol/http/PHttpChannel.ipdl
+++ b/netwerk/protocol/http/PHttpChannel.ipdl
@@ -94,6 +94,12 @@ parent:
   // sure not to send any more messages after that.
   async DeletingChannel();
 
+  // Called to get the input stream when altData was delivered.
+  async OpenOriginalCacheInputStream();
+
+  // Called to get the input stream when altData is available.
+  async OpenAltDataCacheInputStream(nsCString aType);
+
   // Tell the parent the amount bytes read by child for the e10s back pressure
   // flow control
   async BytesRead(int32_t count);
@@ -121,8 +127,6 @@ child:
                        nsCString           altDataType,
                        int64_t             altDataLength,
                        bool                deliveringAltData,
-                       IPCStream?          originalCacheInputStream,
-                       IPCStream?          altDataInputStream,
                        bool                applyConversion,
                        bool                isResolvedByTRR,
                        ResourceTimingStruct timing);
@@ -181,6 +185,10 @@ child:
   // See ADivertableParentChannel::CancelDiversion
   async CancelDiversion();
 
+  async OriginalCacheInputStreamAvailable(IPCStream? stream);
+
+  async AltDataCacheInputStreamAvailable(IPCStream? stream);
+
 both:
   // After receiving this message, the parent also calls
   // SendFinishInterceptedRedirect, and makes sure not to send any more messages
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 8c3da66cc2d4..c02bfed4a3db 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -8613,39 +8613,38 @@ nsHttpChannel::OpenAlternativeOutputStream(const nsACString& type,
 }
 
 NS_IMETHODIMP
-nsHttpChannel::GetOriginalInputStream(nsIInputStream** aInputStream) {
-  NS_ENSURE_ARG_POINTER(aInputStream);
-
-  *aInputStream = nullptr;
+nsHttpChannel::GetOriginalInputStream(nsIInputStreamReceiver* aReceiver) {
+  if (aReceiver == nullptr) {
+    return NS_ERROR_INVALID_ARG;
+  }
+  nsCOMPtr<nsIInputStream> inputStream;
 
   nsCOMPtr<nsICacheEntry> cacheEntry =
       mCacheEntry ? mCacheEntry : mAltDataCacheEntry;
   if (cacheEntry) {
-    nsresult rv = cacheEntry->OpenInputStream(0, aInputStream);
-    NS_ENSURE_SUCCESS(rv, rv);
+    cacheEntry->OpenInputStream(0, getter_AddRefs(inputStream));
   }
-
+  aReceiver->OnInputStreamReady(inputStream);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsHttpChannel::GetAlternativeDataInputStream(nsIInputStream** aInputStream) {
-  NS_ENSURE_ARG_POINTER(aInputStream);
-
-  *aInputStream = nullptr;
-
-  if (!mAfterOnStartRequestBegun) {
-    return NS_ERROR_NOT_AVAILABLE;
+nsHttpChannel::GetAltDataInputStream(const nsACString& aType,
+                                     nsIInputStreamReceiver* aReceiver) {
+  if (aReceiver == nullptr) {
+    return NS_ERROR_INVALID_ARG;
   }
+  nsCOMPtr<nsIInputStream> inputStream;
 
   nsCOMPtr<nsICacheEntry> cacheEntry =
       mCacheEntry ? mCacheEntry : mAltDataCacheEntry;
-  if (!mAvailableCachedAltDataType.IsEmpty() && cacheEntry) {
+  if (cacheEntry) {
     nsresult rv = cacheEntry->OpenAlternativeInputStream(
-        mAvailableCachedAltDataType, aInputStream);
+        aType, getter_AddRefs(inputStream));
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
+  aReceiver->OnInputStreamReady(inputStream);
   return NS_OK;
 }
 
diff --git a/netwerk/test/unit/test_alt-data_simple.js b/netwerk/test/unit/test_alt-data_simple.js
index 3b005d0fa48e..8aa86d4b655c 100644
--- a/netwerk/test/unit/test_alt-data_simple.js
+++ b/netwerk/test/unit/test_alt-data_simple.js
@@ -150,7 +150,11 @@ function readAltContent(request, buffer)
   Assert.equal(buffer, altContent);
   check_has_alt_data_in_index(true);
 
-  executeSoon(() => readOriginalInputStream(cc.originalInputStream));
+  cc.getOriginalInputStream({
+    onInputStreamReady: function(aInputStream) {
+      executeSoon(() => readOriginalInputStream(aInputStream));
+    }
+  });
 }
 
 function readOriginalInputStream(aInputStream)
diff --git a/netwerk/test/unit/test_alt-data_stream.js b/netwerk/test/unit/test_alt-data_stream.js
index d8b763a9dc32..0fa61985dfc9 100644
--- a/netwerk/test/unit/test_alt-data_stream.js
+++ b/netwerk/test/unit/test_alt-data_stream.js
@@ -144,6 +144,10 @@ var originalListener = {
 
 function testAltDataStream(cc)
 {
-  Assert.ok(!!cc.alternativeDataInputStream);
-  httpServer.stop(do_test_finished);
+  cc.getAltDataInputStream(altContentType, {
+    onInputStreamReady: function(aInputStream) {
+      Assert.ok(!!aInputStream);
+      httpServer.stop(do_test_finished);
+    }
+  });
 }
diff --git a/netwerk/test/unit_ipc/test_alt-data_cross_process_wrap.js b/netwerk/test/unit_ipc/test_alt-data_cross_process_wrap.js
index 02a34bbd4350..c7e5b7d9c402 100644
--- a/netwerk/test/unit_ipc/test_alt-data_cross_process_wrap.js
+++ b/netwerk/test/unit_ipc/test_alt-data_cross_process_wrap.js
@@ -9,6 +9,12 @@ var cacheFlushObserver = { observe: function() {
 // We get this from the child a bit later
 var URL = null;
 
+// needs to be rooted
+var cacheFlushObserver2 = { observe: function() {
+  cacheFlushObserver2 = null;
+  openAltChannel();
+}};
+
 function run_test() {
   do_get_profile();
   do_await_remote_message('flush').then(() => {
@@ -44,7 +50,31 @@ function readTextData(request, buffer)
   // Now let's generate some alt-data in the parent, and make sure we can get it
   var altContent = "altContentParentGenerated";
   executeSoon(() => {
-    Assert.throws(() => cc.openAlternativeOutputStream("text/parent-binary", altContent.length), /NS_ERROR_NOT_AVAILABLE/);
-    do_send_remote_message('finish');
+    var os = cc.openAlternativeOutputStream("text/parent-binary", altContent.length);
+    os.write(altContent, altContent.length);
+    os.close();
+
+    executeSoon(() => {
+      Services.cache2.QueryInterface(Ci.nsICacheTesting).flush(cacheFlushObserver2);
+    });
   });
 }
+
+function openAltChannel() {
+  var chan = make_channel(URL);
+  var cc = chan.QueryInterface(Ci.nsICacheInfoChannel);
+  cc.preferAlternativeDataType("text/parent-binary", "", true);
+  chan.asyncOpen(new ChannelListener(readAltData, null));
+}
+
+function readAltData(request, buffer)
+{
+  var cc = request.QueryInterface(Ci.nsICacheInfoChannel);
+
+  // This was generated in the parent, so it's OK to get it.
+  Assert.equal(buffer, "altContentParentGenerated");
+  Assert.equal(cc.alternativeDataType, "text/parent-binary");
+
+  // FINISH
+  do_send_remote_message('finish');
+}

From ea5463cbff08df1b6c814263bb45979a949ec72c Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sun, 12 May 2019 02:47:58 +0000
Subject: [PATCH 046/129] Bug 325352 part 2.  Don't no-op document.open if our
 parser has a script nesting level equal to 0.  r=hsivonen

Differential Revision: https://phabricator.services.mozilla.com/D30314

--HG--
extra : moz-landing-system : lando
---
 dom/html/nsHTMLDocument.cpp                   | 38 +++++++++----------
 .../parser-no-script-nesting.window.js        | 18 +++++++++
 2 files changed, 37 insertions(+), 19 deletions(-)
 create mode 100644 testing/web-platform/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/parser-no-script-nesting.window.js

diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp
index 9ed9c0d1d06d..82551cbb34a0 100644
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@@ -1017,25 +1017,23 @@ Document* nsHTMLDocument::Open(const Optional<nsAString>& /* unused */,
     return nullptr;
   }
 
-  // Step 5 -- if we have an active parser, just no-op.
-  // If we already have a parser we ignore the document.open call.
+  // Step 5 -- if we have an active parser with a nonzero script nesting level,
+  // just no-op.
+  //
+  // If we have a parser that has a zero script nesting level, we need to
+  // properly terminate it before setting up a new parser.  See the similar code
+  // in WriteCommon that handles the !IsInsertionPointDefined() case and should
+  // stay in sync with this code.
+  if (mParser && !mParser->HasNonzeroScriptNestingLevel()) {
+    // Make sure we don't re-enter.
+    IgnoreOpensDuringUnload ignoreOpenGuard(this);
+    mParser->Terminate();
+    MOZ_RELEASE_ASSERT(!mParser, "mParser should have been null'd out");
+  }
+
+  // The mParserAborted check here is probably wrong.  Removing it is
+  // tracked in https://bugzilla.mozilla.org/show_bug.cgi?id=1475000
   if (mParser || mParserAborted) {
-    // The WHATWG spec used to say: "If the document has an active parser that
-    // isn't a script-created parser, and the insertion point associated with
-    // that parser's input stream is not undefined (that is, it does point to
-    // somewhere in the input stream), then the method does nothing. Abort these
-    // steps and return the Document object on which the method was invoked."
-    // Note that aborting a parser leaves the parser "active" with its insertion
-    // point "not undefined". We track this using mParserAborted, because
-    // aborting a parser nulls out mParser.
-    //
-    // Actually, the spec says something slightly different now, about having
-    // an "active parser whose script nesting level is greater than 0".  It
-    // does not mention insertion points at all.  Not sure whether it matters
-    // in practice.  It seems like "script nesting level" replaced the
-    // insertion point concept?  Anyway,
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=1475000 is probably
-    // relevant here.
     return this;
   }
 
@@ -1336,7 +1334,9 @@ void nsHTMLDocument::WriteCommon(const nsAString& aText, bool aNewlineTerminate,
       return;
     }
     // The spec doesn't tell us to ignore opens from here, but we need to
-    // ensure opens are ignored here.
+    // ensure opens are ignored here.  See similar code in Open() that handles
+    // the case of an existing parser which is not currently running script and
+    // should stay in sync with this code.
     IgnoreOpensDuringUnload ignoreOpenGuard(this);
     mParser->Terminate();
     MOZ_RELEASE_ASSERT(!mParser, "mParser should have been null'd out");
diff --git a/testing/web-platform/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/parser-no-script-nesting.window.js b/testing/web-platform/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/parser-no-script-nesting.window.js
new file mode 100644
index 000000000000..fc658c1b4356
--- /dev/null
+++ b/testing/web-platform/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/parser-no-script-nesting.window.js
@@ -0,0 +1,18 @@
+async_test(t => {
+  const frame = document.createElement("iframe");
+  frame.onload = t.step_func_done(() => {
+    frame.onload = null;
+    const doc = frame.contentDocument;
+
+    // Each open() call should reset the DOM for the document, because even
+    // though there is a live parser, that parser's script insertion level is 0.
+    for (var i = 0; i < 5; ++i) {
+      doc.open();
+      doc.write("hello");
+    }
+    doc.close()
+    assert_equals(doc.documentElement.textContent, "hello");
+  });
+  t.add_cleanup(() => frame.remove());
+  document.body.appendChild(frame);
+}, "open() should reset the DOM even if there's an active parser, if that parser's script insertion level is 0");

From 8152dc3ce51f6b4ca61b60a4a9279d31faf2f330 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sun, 12 May 2019 02:47:58 +0000
Subject: [PATCH 047/129] Bug 1550845.  Don't terminate the old parser, if we
 have one, in document.open() until after we remove event listeners. 
 r=hsivonen

This way we won't accidentally run script during termination, hopefully.

Differential Revision: https://phabricator.services.mozilla.com/D30763

--HG--
extra : moz-landing-system : lando
---
 dom/html/nsHTMLDocument.cpp | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp
index 82551cbb34a0..23e3a48416da 100644
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@@ -1020,20 +1020,9 @@ Document* nsHTMLDocument::Open(const Optional<nsAString>& /* unused */,
   // Step 5 -- if we have an active parser with a nonzero script nesting level,
   // just no-op.
   //
-  // If we have a parser that has a zero script nesting level, we need to
-  // properly terminate it before setting up a new parser.  See the similar code
-  // in WriteCommon that handles the !IsInsertionPointDefined() case and should
-  // stay in sync with this code.
-  if (mParser && !mParser->HasNonzeroScriptNestingLevel()) {
-    // Make sure we don't re-enter.
-    IgnoreOpensDuringUnload ignoreOpenGuard(this);
-    mParser->Terminate();
-    MOZ_RELEASE_ASSERT(!mParser, "mParser should have been null'd out");
-  }
-
   // The mParserAborted check here is probably wrong.  Removing it is
   // tracked in https://bugzilla.mozilla.org/show_bug.cgi?id=1475000
-  if (mParser || mParserAborted) {
+  if ((mParser && mParser->HasNonzeroScriptNestingLevel()) || mParserAborted) {
     return this;
   }
 
@@ -1097,6 +1086,22 @@ Document* nsHTMLDocument::Open(const Optional<nsAString>& /* unused */,
     }
   }
 
+  // If we have a parser that has a zero script nesting level, we need to
+  // properly terminate it.  We do that after we've removed all the event
+  // listeners (so termination won't trigger event listeners if it does
+  // something to the DOM), but before we remove all elements from the document
+  // (so if termination does modify the DOM in some way we will just blow it
+  // away immediately.  See the similar code in WriteCommon that handles the
+  // !IsInsertionPointDefined() case and should stay in sync with this code.
+  if (mParser) {
+    MOZ_ASSERT(!mParser->HasNonzeroScriptNestingLevel(),
+               "Why didn't we take the early return?");
+    // Make sure we don't re-enter.
+    IgnoreOpensDuringUnload ignoreOpenGuard(this);
+    mParser->Terminate();
+    MOZ_RELEASE_ASSERT(!mParser, "mParser should have been null'd out");
+  }
+
   // Step 10 -- remove all our DOM kids without firing any mutation events.
   {
     // We want to ignore any recursive calls to Open() that happen while

From eef685d1fd87e81c173c7fbe8c38b37061ea3c3c Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Wed, 15 May 2019 04:04:38 +0000
Subject: [PATCH 048/129] Bug 1550535: Mark outer svg frames as reflow roots.
 r=dbaron

Differential Revision: https://phabricator.services.mozilla.com/D30671

--HG--
extra : moz-landing-system : lando
---
 layout/svg/nsSVGOuterSVGFrame.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/svg/nsSVGOuterSVGFrame.cpp b/layout/svg/nsSVGOuterSVGFrame.cpp
index 3af86e84c257..20de89adfe01 100644
--- a/layout/svg/nsSVGOuterSVGFrame.cpp
+++ b/layout/svg/nsSVGOuterSVGFrame.cpp
@@ -105,7 +105,7 @@ void nsSVGOuterSVGFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
   NS_ASSERTION(aContent->IsSVGElement(nsGkAtoms::svg),
                "Content is not an SVG 'svg' element!");
 
-  AddStateBits(NS_FRAME_FONT_INFLATION_CONTAINER |
+  AddStateBits(NS_FRAME_REFLOW_ROOT | NS_FRAME_FONT_INFLATION_CONTAINER |
                NS_FRAME_FONT_INFLATION_FLOW_ROOT);
 
   // Check for conditional processing attributes here rather than in

From bc1c818a3b0553915516d9d1a6fc20a9f8cff38d Mon Sep 17 00:00:00 2001
From: David Walsh <dwalsh@mozilla.com>
Date: Mon, 20 May 2019 17:23:58 +0000
Subject: [PATCH 049/129] Bug 1550001 - Provide event listener breakpoint UI
 r=loganfsmyth

Differential Revision: https://phabricator.services.mozilla.com/D30986

--HG--
extra : moz-landing-system : lando
---
 .../debugger/src/actions/event-listeners.js   |  93 ++++-
 .../debugger/src/actions/types/index.js       |  27 +-
 .../client/debugger/src/client/firefox.js     |   3 +
 .../debugger/src/client/firefox/commands.js   |  17 +-
 .../debugger/src/client/firefox/types.js      |   7 +-
 devtools/client/debugger/src/client/index.js  |   8 +-
 .../SecondaryPanes/EventListeners.js          | 142 ++++----
 .../tests/EventListeners.spec.js              |  82 +++++
 .../__snapshots__/EventListeners.spec.js.snap | 320 ++++++++++++++++++
 .../debugger/src/reducers/event-listeners.js  |  68 ++--
 .../client/debugger/src/reducers/types.js     |   2 +
 devtools/client/debugger/src/utils/prefs.js   |   5 +-
 devtools/client/preferences/debugger.js       |   3 +-
 13 files changed, 647 insertions(+), 130 deletions(-)
 create mode 100644 devtools/client/debugger/src/components/SecondaryPanes/tests/EventListeners.spec.js
 create mode 100644 devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/EventListeners.spec.js.snap

diff --git a/devtools/client/debugger/src/actions/event-listeners.js b/devtools/client/debugger/src/actions/event-listeners.js
index 0e47899bf087..4e1e41e321f7 100644
--- a/devtools/client/debugger/src/actions/event-listeners.js
+++ b/devtools/client/debugger/src/actions/event-listeners.js
@@ -4,29 +4,88 @@
 
 // @flow
 
+import { uniq, remove } from "lodash";
+
 import { asyncStore } from "../utils/prefs";
 
+import {
+  getActiveEventListeners,
+  getEventListenerExpanded,
+} from "../selectors";
+
 import type { ThunkArgs } from "./types";
-import type { EventListenerBreakpoints } from "../types";
 
-export function addEventListeners(events: EventListenerBreakpoints) {
-  return async ({ dispatch, client }: ThunkArgs) => {
-    await dispatch({
-      type: "ADD_EVENT_LISTENERS",
-      events,
-    });
-    const newList = await asyncStore.eventListenerBreakpoints;
-    client.setEventListenerBreakpoints(newList);
+async function updateBreakpoints(dispatch, client, newEvents: string[]) {
+  dispatch({ type: "UPDATE_EVENT_LISTENERS", active: newEvents });
+
+  const current = await asyncStore.eventListenerBreakpoints;
+  asyncStore.eventListenerBreakpoints = {
+    ...current,
+    active: newEvents,
+  };
+
+  client.setEventListenerBreakpoints(newEvents);
+}
+
+async function updateExpanded(dispatch, newExpanded: string[]) {
+  dispatch({
+    type: "UPDATE_EVENT_LISTENER_EXPANDED",
+    expanded: newExpanded,
+  });
+
+  const current = await asyncStore.eventListenerBreakpoints;
+  asyncStore.eventListenerBreakpoints = {
+    ...current,
+    expanded: newExpanded,
   };
 }
 
-export function removeEventListeners(events: EventListenerBreakpoints) {
-  return async ({ dispatch, client }: ThunkArgs) => {
-    await dispatch({
-      type: "REMOVE_EVENT_LISTENERS",
-      events,
-    });
-    const newList = await asyncStore.eventListenerBreakpoints;
-    client.setEventListenerBreakpoints(newList);
+export function addEventListenerBreakpoints(eventsToAdd: string[]) {
+  return async ({ dispatch, client, getState }: ThunkArgs) => {
+    const activeListenerBreakpoints = await getActiveEventListeners(getState());
+
+    const newEvents = uniq([...eventsToAdd, ...activeListenerBreakpoints]);
+
+    updateBreakpoints(dispatch, client, newEvents);
+  };
+}
+
+export function removeEventListenerBreakpoints(eventsToRemove: string[]) {
+  return async ({ dispatch, client, getState }: ThunkArgs) => {
+    const activeListenerBreakpoints = await getActiveEventListeners(getState());
+
+    const newEvents = remove(
+      activeListenerBreakpoints,
+      event => !eventsToRemove.includes(event)
+    );
+
+    updateBreakpoints(dispatch, client, newEvents);
+  };
+}
+
+export function addEventListenerExpanded(category: string) {
+  return async ({ dispatch, getState }: ThunkArgs) => {
+    const expanded = await getEventListenerExpanded(getState());
+
+    const newExpanded = uniq([...expanded, category]);
+
+    await updateExpanded(dispatch, newExpanded);
+  };
+}
+
+export function removeEventListenerExpanded(category: string) {
+  return async ({ dispatch, getState }: ThunkArgs) => {
+    const expanded = await getEventListenerExpanded(getState());
+
+    const newExpanded = expanded.filter(expand => expand != category);
+
+    updateExpanded(dispatch, newExpanded);
+  };
+}
+
+export function getEventListenerBreakpointTypes() {
+  return async ({ dispatch, client }: ThunkArgs) => {
+    const categories = await client.getEventListenerBreakpointTypes();
+    dispatch({ type: "RECEIVE_EVENT_LISTENER_TYPES", categories });
   };
 }
diff --git a/devtools/client/debugger/src/actions/types/index.js b/devtools/client/debugger/src/actions/types/index.js
index 51a110cf42c6..01296b64b8e7 100644
--- a/devtools/client/debugger/src/actions/types/index.js
+++ b/devtools/client/debugger/src/actions/types/index.js
@@ -159,6 +159,30 @@ export type {
 
 export type { panelPositionType } from "./UIAction";
 
+export type { ASTAction } from "./ASTAction";
+
+type ActiveEventListener = string;
+type EventListenerEvent = { name: string, id: ActiveEventListener };
+type EventListenerCategory = { name: string, events: EventListenerEvent[] };
+
+export type EventListenerActiveList = ActiveEventListener[];
+export type EventListenerCategoryList = EventListenerCategory[];
+export type EventListenerExpandedList = string[];
+
+export type EventListenerAction =
+  | {|
+      +type: "UPDATE_EVENT_LISTENERS",
+      +active: EventListenerActiveList,
+    |}
+  | {|
+      +type: "RECEIVE_EVENT_LISTENER_TYPES",
+      +categories: EventListenerCategoryList,
+    |}
+  | {|
+      +type: "UPDATE_EVENT_LISTENER_EXPANDED",
+      +expanded: EventListenerExpandedList,
+    |};
+
 /**
  * Actions: Source, Breakpoint, and Navigation
  *
@@ -180,4 +204,5 @@ export type Action =
   | FileTextSearchAction
   | ProjectTextSearchAction
   | DebuggeeAction
-  | SourceTreeAction;
+  | SourceTreeAction
+  | EventListenerAction;
diff --git a/devtools/client/debugger/src/client/firefox.js b/devtools/client/debugger/src/client/firefox.js
index 3d8fb32624cb..e24f96eb7bee 100644
--- a/devtools/client/debugger/src/client/firefox.js
+++ b/devtools/client/debugger/src/client/firefox.js
@@ -47,6 +47,9 @@ export async function onConnect(connection: any, actions: Object) {
     skipBreakpoints: prefs.skipPausing,
   });
 
+  // Retrieve possible event listener breakpoints
+  actions.getEventListenerBreakpointTypes();
+
   // In Firefox, we need to initially request all of the sources. This
   // usually fires off individual `newSource` notifications as the
   // debugger finds them, but there may be existing sources already in
diff --git a/devtools/client/debugger/src/client/firefox/commands.js b/devtools/client/debugger/src/client/firefox/commands.js
index 59758b83ee75..b7cf035a7f43 100644
--- a/devtools/client/debugger/src/client/firefox/commands.js
+++ b/devtools/client/debugger/src/client/firefox/commands.js
@@ -16,7 +16,6 @@ import type {
   BreakpointLocation,
   BreakpointOptions,
   PendingLocation,
-  EventListenerBreakpoints,
   Frame,
   FrameId,
   GeneratedSourceData,
@@ -36,6 +35,8 @@ import type {
   SourcesPacket,
 } from "./types";
 
+import type { EventListenerCategoryList } from "../../actions/types";
+
 let workerClients: Object;
 let threadClient: ThreadClient;
 let tabTarget: TabTarget;
@@ -361,8 +362,17 @@ function interrupt(thread: string): Promise<*> {
   return lookupThreadClient(thread).interrupt();
 }
 
-function setEventListenerBreakpoints(eventTypes: EventListenerBreakpoints) {
-  // TODO: Figure out what sendpoint we want to hit
+async function setEventListenerBreakpoints(ids: string[]) {
+  await threadClient.setActiveEventBreakpoints(ids);
+  await forEachWorkerThread(thread => thread.setActiveEventBreakpoints(ids));
+}
+
+// eslint-disable-next-line
+async function getEventListenerBreakpointTypes(): Promise<
+  EventListenerCategoryList
+> {
+  const { value } = await threadClient.getAvailableEventBreakpoints();
+  return value;
 }
 
 function pauseGrip(thread: string, func: Function): ObjectClient {
@@ -525,6 +535,7 @@ const clientCommands = {
   sendPacket,
   setSkipPausing,
   setEventListenerBreakpoints,
+  getEventListenerBreakpointTypes,
   waitForWorkers,
   detachWorkers,
   hasWasmSupport,
diff --git a/devtools/client/debugger/src/client/firefox/types.js b/devtools/client/debugger/src/client/firefox/types.js
index 8f87962d777c..3c89c5041aec 100644
--- a/devtools/client/debugger/src/client/firefox/types.js
+++ b/devtools/client/debugger/src/client/firefox/types.js
@@ -25,6 +25,8 @@ import type {
   Range,
 } from "../../types";
 
+import type { EventListenerCategoryList } from "../../actions/types";
+
 type URL = string;
 
 /**
@@ -369,7 +371,10 @@ export type ThreadClient = {
   actor: ActorId,
   request: (payload: Object) => Promise<*>,
   url: string,
-  setEventListenerBreakpoints: (string[]) => void,
+  setActiveEventBreakpoints: (string[]) => void,
+  getAvailableEventBreakpoints: () => Promise<{|
+    value: EventListenerCategoryList,
+  |}>,
   skipBreakpoints: boolean => Promise<{| skip: boolean |}>,
 };
 
diff --git a/devtools/client/debugger/src/client/index.js b/devtools/client/debugger/src/client/index.js
index e68801c9ec6f..e4fe19c14671 100644
--- a/devtools/client/debugger/src/client/index.js
+++ b/devtools/client/debugger/src/client/index.js
@@ -15,6 +15,7 @@ import {
   bootstrapStore,
   bootstrapWorkers,
 } from "../utils/bootstrap";
+
 import { initialBreakpointsState } from "../reducers/breakpoints";
 
 import type { Panel } from "./firefox/types";
@@ -47,7 +48,12 @@ async function loadInitialState() {
 
   const breakpoints = initialBreakpointsState(xhrBreakpoints);
 
-  return { pendingBreakpoints, tabs, breakpoints, eventListenerBreakpoints };
+  return {
+    pendingBreakpoints,
+    tabs,
+    breakpoints,
+    eventListenerBreakpoints,
+  };
 }
 
 function getClient(connection: any) {
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js b/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
index be2ce126448f..ad18d6c0a01d 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
@@ -9,141 +9,121 @@ import classnames from "classnames";
 
 import { connect } from "../../utils/connect";
 import actions from "../../actions";
-import { getActiveEventListeners } from "../../selectors";
+import {
+  getActiveEventListeners,
+  getEventListenerBreakpointTypes,
+  getEventListenerExpanded,
+} from "../../selectors";
 
 import AccessibleImage from "../shared/AccessibleImage";
 
-import type { EventListenerBreakpoints } from "../../types";
+import type {
+  EventListenerActiveList,
+  EventListenerCategoryList,
+  EventListenerExpandedList,
+} from "../../actions/types";
 
 import "./EventListeners.css";
 
-const CATEGORIES = {
-  Mouse: ["click", "mouseover", "dblclick"],
-  Keyboard: ["keyup", "keydown"],
-};
-
 type Props = {
-  addEventListeners: typeof actions.addEventListeners,
-  removeEventListeners: typeof actions.removeEventListeners,
-  activeEventListeners: EventListenerBreakpoints,
+  categories: EventListenerCategoryList,
+  expandedCategories: EventListenerExpandedList,
+  activeEventListeners: EventListenerActiveList,
+  addEventListeners: typeof actions.addEventListenerBreakpoints,
+  removeEventListeners: typeof actions.removeEventListenerBreakpoints,
+  addEventListenerExpanded: typeof actions.addEventListenerExpanded,
+  removeEventListenerExpanded: typeof actions.removeEventListenerExpanded,
 };
 
-type State = {
-  expandedCategories: string[],
-};
-
-function getKey(category: string, eventType: string) {
-  return `${category}:${eventType}`;
-}
-
-class EventListeners extends Component<Props, State> {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      expandedCategories: [],
-    };
-  }
-
-  onCategoryToggle(category, event) {
-    const { expandedCategories } = this.state;
+class EventListeners extends Component<Props> {
+  onCategoryToggle(category) {
+    const {
+      expandedCategories,
+      removeEventListenerExpanded,
+      addEventListenerExpanded,
+    } = this.props;
 
     if (expandedCategories.includes(category)) {
-      this.setState({
-        expandedCategories: expandedCategories.filter(
-          eventCategory => eventCategory !== category
-        ),
-      });
+      removeEventListenerExpanded(category);
     } else {
-      this.setState({
-        expandedCategories: [...expandedCategories, category],
-      });
+      addEventListenerExpanded(category);
     }
   }
 
   onCategoryClick(category, isChecked) {
     const { addEventListeners, removeEventListeners } = this.props;
-    const events = CATEGORIES[category].map(eventType =>
-      getKey(category, eventType)
-    );
+    const eventsIds = category.events.map(event => event.id);
 
     if (isChecked) {
-      addEventListeners(events);
+      addEventListeners(eventsIds);
     } else {
-      removeEventListeners(events);
+      removeEventListeners(eventsIds);
     }
   }
 
-  onEventTypeClick(eventType, isChecked) {
+  onEventTypeClick(eventId, isChecked) {
     const { addEventListeners, removeEventListeners } = this.props;
     if (isChecked) {
-      addEventListeners([eventType]);
+      addEventListeners([eventId]);
     } else {
-      removeEventListeners([eventType]);
+      removeEventListeners([eventId]);
     }
   }
 
   renderCategoryHeading(category) {
-    const { expandedCategories } = this.state;
-    const { activeEventListeners } = this.props;
+    const { activeEventListeners, expandedCategories } = this.props;
+    const { events } = category;
 
-    const eventTypes = CATEGORIES[category];
-
-    const expanded = expandedCategories.includes(category);
-    const checked = eventTypes.every(eventType =>
-      activeEventListeners.includes(getKey(category, eventType))
-    );
+    const expanded = expandedCategories.includes(category.name);
+    const checked = events.every(({ id }) => activeEventListeners.includes(id));
     const indeterminate =
-      !checked &&
-      eventTypes.some(eventType =>
-        activeEventListeners.includes(getKey(category, eventType))
-      );
+      !checked && events.some(({ id }) => activeEventListeners.includes(id));
 
     return (
       <div className="event-listener-header">
         <button
           className="event-listener-expand"
-          onClick={e => this.onCategoryToggle(category, e)}
+          onClick={() => this.onCategoryToggle(category.name)}
         >
           <AccessibleImage className={classnames("arrow", { expanded })} />
         </button>
         <label className="event-listener-label">
           <input
             type="checkbox"
-            value={category}
+            value={category.name}
             onChange={e => this.onCategoryClick(category, e.target.checked)}
             checked={checked}
             ref={el => el && (el.indeterminate = indeterminate)}
           />
-          <span className="event-listener-category">{category}</span>
+          <span className="event-listener-category">{category.name}</span>
         </label>
       </div>
     );
   }
 
   renderCategoryListing(category) {
-    const { activeEventListeners } = this.props;
-    const { expandedCategories } = this.state;
+    const { activeEventListeners, expandedCategories } = this.props;
 
-    const expanded = expandedCategories.includes(category);
+    const expanded = expandedCategories.includes(category.name);
     if (!expanded) {
       return null;
     }
 
     return (
       <ul>
-        {CATEGORIES[category].map(eventType => {
-          const key = getKey(category, eventType);
+        {category.events.map(event => {
           return (
-            <li className="event-listener-event" key={key}>
+            <li className="event-listener-event" key={event.id}>
               <label className="event-listener-label">
                 <input
                   type="checkbox"
-                  value={key}
-                  onChange={e => this.onEventTypeClick(key, e.target.checked)}
-                  checked={activeEventListeners.includes(key)}
+                  value={event.id}
+                  onChange={e =>
+                    this.onEventTypeClick(event.id, e.target.checked)
+                  }
+                  checked={activeEventListeners.includes(event.id)}
                 />
-                <span className="event-listener-name">{eventType}</span>
+                <span className="event-listener-name">{event.name}</span>
               </label>
             </li>
           );
@@ -153,12 +133,14 @@ class EventListeners extends Component<Props, State> {
   }
 
   render() {
+    const { categories } = this.props;
+
     return (
       <div className="event-listeners-content">
         <ul className="event-listeners-list">
-          {Object.keys(CATEGORIES).map(category => {
+          {categories.map((category, index) => {
             return (
-              <li className="event-listener-group" key={category}>
+              <li className="event-listener-group" key={index}>
                 {this.renderCategoryHeading(category)}
                 {this.renderCategoryListing(category)}
               </li>
@@ -170,14 +152,20 @@ class EventListeners extends Component<Props, State> {
   }
 }
 
-const mapStateToProps = state => ({
-  activeEventListeners: getActiveEventListeners(state),
-});
+const mapStateToProps = state => {
+  return {
+    activeEventListeners: getActiveEventListeners(state),
+    categories: getEventListenerBreakpointTypes(state),
+    expandedCategories: getEventListenerExpanded(state),
+  };
+};
 
 export default connect(
   mapStateToProps,
   {
-    addEventListeners: actions.addEventListeners,
-    removeEventListeners: actions.removeEventListeners,
+    addEventListeners: actions.addEventListenerBreakpoints,
+    removeEventListeners: actions.removeEventListenerBreakpoints,
+    addEventListenerExpanded: actions.addEventListenerExpanded,
+    removeEventListenerExpanded: actions.removeEventListenerExpanded,
   }
 )(EventListeners);
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/tests/EventListeners.spec.js b/devtools/client/debugger/src/components/SecondaryPanes/tests/EventListeners.spec.js
new file mode 100644
index 000000000000..8d837ac6412c
--- /dev/null
+++ b/devtools/client/debugger/src/components/SecondaryPanes/tests/EventListeners.spec.js
@@ -0,0 +1,82 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
+
+// @flow
+
+import React from "react";
+import { shallow } from "enzyme";
+import EventListeners from "../EventListeners";
+
+function getCategories() {
+  return [
+    {
+      name: "Category 1",
+      events: [
+        { name: "Subcategory 1", id: "category1.subcategory1" },
+        { name: "Subcategory 2", id: "category1.subcategory2" },
+      ],
+    },
+    {
+      name: "Category 2",
+      events: [
+        { name: "Subcategory 3", id: "category2.subcategory1" },
+        { name: "Subcategory 4", id: "category2.subcategory2" },
+      ],
+    },
+  ];
+}
+
+function generateDefaults(overrides = {}) {
+  const defaults = {
+    activeEventListeners: [],
+    expandedCategories: [],
+    categories: [],
+  };
+
+  return { ...defaults, ...overrides };
+}
+
+function render(overrides = {}) {
+  const props = generateDefaults(overrides);
+  // $FlowIgnore
+  const component = shallow(<EventListeners.WrappedComponent {...props} />);
+  return { component, props };
+}
+
+describe("EventListeners", () => {
+  it("should render", async () => {
+    const { component } = render();
+    expect(component).toMatchSnapshot();
+  });
+
+  it("should render categories appropriately", async () => {
+    const props = {
+      ...generateDefaults(),
+      categories: getCategories(),
+    };
+    const { component } = render(props);
+    expect(component).toMatchSnapshot();
+  });
+
+  it("should render expanded categories appropriately", async () => {
+    const props = {
+      ...generateDefaults(),
+      categories: getCategories(),
+      expandedCategories: ["Category 2"],
+    };
+    const { component } = render(props);
+    expect(component).toMatchSnapshot();
+  });
+
+  it("should render checked subcategories appropriately", async () => {
+    const props = {
+      ...generateDefaults(),
+      categories: getCategories(),
+      activeEventListeners: ["category1.subcategory2"],
+      expandedCategories: ["Category 1"],
+    };
+    const { component } = render(props);
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/EventListeners.spec.js.snap b/devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/EventListeners.spec.js.snap
new file mode 100644
index 000000000000..02869aa02edd
--- /dev/null
+++ b/devtools/client/debugger/src/components/SecondaryPanes/tests/__snapshots__/EventListeners.spec.js.snap
@@ -0,0 +1,320 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EventListeners should render 1`] = `
+<div
+  className="event-listeners-content"
+>
+  <ul
+    className="event-listeners-list"
+  />
+</div>
+`;
+
+exports[`EventListeners should render categories appropriately 1`] = `
+<div
+  className="event-listeners-content"
+>
+  <ul
+    className="event-listeners-list"
+  >
+    <li
+      className="event-listener-group"
+      key="0"
+    >
+      <div
+        className="event-listener-header"
+      >
+        <button
+          className="event-listener-expand"
+          onClick={[Function]}
+        >
+          <AccessibleImage
+            className="arrow"
+          />
+        </button>
+        <label
+          className="event-listener-label"
+        >
+          <input
+            checked={false}
+            onChange={[Function]}
+            type="checkbox"
+            value="Category 1"
+          />
+          <span
+            className="event-listener-category"
+          >
+            Category 1
+          </span>
+        </label>
+      </div>
+    </li>
+    <li
+      className="event-listener-group"
+      key="1"
+    >
+      <div
+        className="event-listener-header"
+      >
+        <button
+          className="event-listener-expand"
+          onClick={[Function]}
+        >
+          <AccessibleImage
+            className="arrow"
+          />
+        </button>
+        <label
+          className="event-listener-label"
+        >
+          <input
+            checked={false}
+            onChange={[Function]}
+            type="checkbox"
+            value="Category 2"
+          />
+          <span
+            className="event-listener-category"
+          >
+            Category 2
+          </span>
+        </label>
+      </div>
+    </li>
+  </ul>
+</div>
+`;
+
+exports[`EventListeners should render checked subcategories appropriately 1`] = `
+<div
+  className="event-listeners-content"
+>
+  <ul
+    className="event-listeners-list"
+  >
+    <li
+      className="event-listener-group"
+      key="0"
+    >
+      <div
+        className="event-listener-header"
+      >
+        <button
+          className="event-listener-expand"
+          onClick={[Function]}
+        >
+          <AccessibleImage
+            className="arrow expanded"
+          />
+        </button>
+        <label
+          className="event-listener-label"
+        >
+          <input
+            checked={false}
+            onChange={[Function]}
+            type="checkbox"
+            value="Category 1"
+          />
+          <span
+            className="event-listener-category"
+          >
+            Category 1
+          </span>
+        </label>
+      </div>
+      <ul>
+        <li
+          className="event-listener-event"
+          key="category1.subcategory1"
+        >
+          <label
+            className="event-listener-label"
+          >
+            <input
+              checked={false}
+              onChange={[Function]}
+              type="checkbox"
+              value="category1.subcategory1"
+            />
+            <span
+              className="event-listener-name"
+            >
+              Subcategory 1
+            </span>
+          </label>
+        </li>
+        <li
+          className="event-listener-event"
+          key="category1.subcategory2"
+        >
+          <label
+            className="event-listener-label"
+          >
+            <input
+              checked={true}
+              onChange={[Function]}
+              type="checkbox"
+              value="category1.subcategory2"
+            />
+            <span
+              className="event-listener-name"
+            >
+              Subcategory 2
+            </span>
+          </label>
+        </li>
+      </ul>
+    </li>
+    <li
+      className="event-listener-group"
+      key="1"
+    >
+      <div
+        className="event-listener-header"
+      >
+        <button
+          className="event-listener-expand"
+          onClick={[Function]}
+        >
+          <AccessibleImage
+            className="arrow"
+          />
+        </button>
+        <label
+          className="event-listener-label"
+        >
+          <input
+            checked={false}
+            onChange={[Function]}
+            type="checkbox"
+            value="Category 2"
+          />
+          <span
+            className="event-listener-category"
+          >
+            Category 2
+          </span>
+        </label>
+      </div>
+    </li>
+  </ul>
+</div>
+`;
+
+exports[`EventListeners should render expanded categories appropriately 1`] = `
+<div
+  className="event-listeners-content"
+>
+  <ul
+    className="event-listeners-list"
+  >
+    <li
+      className="event-listener-group"
+      key="0"
+    >
+      <div
+        className="event-listener-header"
+      >
+        <button
+          className="event-listener-expand"
+          onClick={[Function]}
+        >
+          <AccessibleImage
+            className="arrow"
+          />
+        </button>
+        <label
+          className="event-listener-label"
+        >
+          <input
+            checked={false}
+            onChange={[Function]}
+            type="checkbox"
+            value="Category 1"
+          />
+          <span
+            className="event-listener-category"
+          >
+            Category 1
+          </span>
+        </label>
+      </div>
+    </li>
+    <li
+      className="event-listener-group"
+      key="1"
+    >
+      <div
+        className="event-listener-header"
+      >
+        <button
+          className="event-listener-expand"
+          onClick={[Function]}
+        >
+          <AccessibleImage
+            className="arrow expanded"
+          />
+        </button>
+        <label
+          className="event-listener-label"
+        >
+          <input
+            checked={false}
+            onChange={[Function]}
+            type="checkbox"
+            value="Category 2"
+          />
+          <span
+            className="event-listener-category"
+          >
+            Category 2
+          </span>
+        </label>
+      </div>
+      <ul>
+        <li
+          className="event-listener-event"
+          key="category2.subcategory1"
+        >
+          <label
+            className="event-listener-label"
+          >
+            <input
+              checked={false}
+              onChange={[Function]}
+              type="checkbox"
+              value="category2.subcategory1"
+            />
+            <span
+              className="event-listener-name"
+            >
+              Subcategory 3
+            </span>
+          </label>
+        </li>
+        <li
+          className="event-listener-event"
+          key="category2.subcategory2"
+        >
+          <label
+            className="event-listener-label"
+          >
+            <input
+              checked={false}
+              onChange={[Function]}
+              type="checkbox"
+              value="category2.subcategory2"
+            />
+            <span
+              className="event-listener-name"
+            >
+              Subcategory 4
+            </span>
+          </label>
+        </li>
+      </ul>
+    </li>
+  </ul>
+</div>
+`;
diff --git a/devtools/client/debugger/src/reducers/event-listeners.js b/devtools/client/debugger/src/reducers/event-listeners.js
index 41da38eb09bf..e7349e38dbdc 100644
--- a/devtools/client/debugger/src/reducers/event-listeners.js
+++ b/devtools/client/debugger/src/reducers/event-listeners.js
@@ -4,45 +4,61 @@
 
 // @flow
 
-import { uniq } from "lodash";
+import type { State } from "./types";
+import type {
+  EventListenerAction,
+  EventListenerActiveList,
+  EventListenerCategoryList,
+  EventListenerExpandedList,
+} from "../actions/types";
 
-import { asyncStore } from "../utils/prefs";
-import type { EventListenerBreakpoints } from "../types";
+export type EventListenersState = {
+  active: EventListenerActiveList,
+  categories: EventListenerCategoryList,
+  expanded: EventListenerExpandedList,
+};
 
-type OuterState = { eventListenerBreakpoints: EventListenerBreakpoints };
+export function initialEventListenerState(): EventListenersState {
+  return {
+    active: [],
+    categories: [],
+    expanded: [],
+  };
+}
 
-function update(state: EventListenerBreakpoints = [], action: any) {
+function update(
+  state: EventListenersState = initialEventListenerState(),
+  action: EventListenerAction
+) {
   switch (action.type) {
-    case "ADD_EVENT_LISTENERS":
-      return updateEventTypes("add", state, action.events);
+    case "UPDATE_EVENT_LISTENERS":
+      return { ...state, active: action.active };
 
-    case "REMOVE_EVENT_LISTENERS":
-      return updateEventTypes("remove", state, action.events);
+    case "RECEIVE_EVENT_LISTENER_TYPES":
+      return { ...state, categories: action.categories };
+
+    case "UPDATE_EVENT_LISTENER_EXPANDED":
+      return { ...state, expanded: action.expanded };
 
     default:
       return state;
   }
 }
 
-function updateEventTypes(
-  addOrRemove: string,
-  currentEvents: EventListenerBreakpoints,
-  events: EventListenerBreakpoints
-): EventListenerBreakpoints {
-  let newEventListeners;
-
-  if (addOrRemove === "add") {
-    newEventListeners = uniq([...currentEvents, ...events]);
-  } else {
-    newEventListeners = currentEvents.filter(event => !events.includes(event));
-  }
-
-  asyncStore.eventListenerBreakpoints = newEventListeners;
-  return newEventListeners;
+export function getActiveEventListeners(state: State): EventListenerActiveList {
+  return state.eventListenerBreakpoints.active;
 }
 
-export function getActiveEventListeners(state: OuterState) {
-  return state.eventListenerBreakpoints;
+export function getEventListenerBreakpointTypes(
+  state: State
+): EventListenerCategoryList {
+  return state.eventListenerBreakpoints.categories;
+}
+
+export function getEventListenerExpanded(
+  state: State
+): EventListenerExpandedList {
+  return state.eventListenerBreakpoints.expanded;
 }
 
 export default update;
diff --git a/devtools/client/debugger/src/reducers/types.js b/devtools/client/debugger/src/reducers/types.js
index 97d9e3de5a9f..0abc8d955b09 100644
--- a/devtools/client/debugger/src/reducers/types.js
+++ b/devtools/client/debugger/src/reducers/types.js
@@ -24,11 +24,13 @@ import type { SourceActorsState } from "./source-actors";
 import type { TabList } from "./tabs";
 import type { UIState } from "./ui";
 import type { QuickOpenState } from "./quick-open";
+import type { EventListenersState } from "./event-listeners";
 
 export type State = {
   ast: ASTState,
   breakpoints: BreakpointsState,
   expressions: Record<ExpressionState>,
+  eventListenerBreakpoints: EventListenersState,
   debuggee: DebuggeeState,
   fileSearch: Record<FileSearchState>,
   pause: PauseState,
diff --git a/devtools/client/debugger/src/utils/prefs.js b/devtools/client/debugger/src/utils/prefs.js
index 1bb248d78cf0..8f4634331764 100644
--- a/devtools/client/debugger/src/utils/prefs.js
+++ b/devtools/client/debugger/src/utils/prefs.js
@@ -12,7 +12,7 @@ import { asyncStoreHelper } from "./asyncStoreHelper";
 // Schema version to bump when the async store format has changed incompatibly
 // and old stores should be cleared. This needs to match the prefs schema
 // version in devtools/client/preferences/debugger.js.
-const prefsSchemaVersion = "1.0.9";
+const prefsSchemaVersion = "1.0.10";
 const pref = Services.pref;
 
 if (isDevelopment()) {
@@ -134,7 +134,7 @@ export const asyncStore = asyncStoreHelper("debugger", {
   pendingBreakpoints: ["pending-breakpoints", {}],
   tabs: ["tabs", []],
   xhrBreakpoints: ["xhr-breakpoints", []],
-  eventListenerBreakpoints: ["event-listener-breakpoints", []],
+  eventListenerBreakpoints: ["event-listener-breakpoints", undefined],
 });
 
 export function verifyPrefSchema() {
@@ -143,6 +143,7 @@ export function verifyPrefSchema() {
     asyncStore.pendingBreakpoints = {};
     asyncStore.tabs = [];
     asyncStore.xhrBreakpoints = [];
+    asyncStore.eventListenerBreakpoints = undefined;
     prefs.debuggerPrefsSchemaVersion = prefsSchemaVersion;
   }
 }
diff --git a/devtools/client/preferences/debugger.js b/devtools/client/preferences/debugger.js
index 8cfde1502e97..56f56ebdbec4 100644
--- a/devtools/client/preferences/debugger.js
+++ b/devtools/client/preferences/debugger.js
@@ -20,7 +20,7 @@ pref("devtools.debugger.workers", false);
 
 // The default Debugger UI settings
 // This schema version needs to match that in devtools/client/debugger/src/utils/prefs.js.
-pref("devtools.debugger.prefs-schema-version", "1.0.9");
+pref("devtools.debugger.prefs-schema-version", "1.0.10");
 pref("devtools.debugger.ui.panes-workers-and-sources-width", 200);
 pref("devtools.debugger.ui.panes-instruments-width", 300);
 pref("devtools.debugger.ui.panes-visible-on-startup", false);
@@ -46,7 +46,6 @@ pref("devtools.debugger.tabsBlackBoxed", "[]");
 pref("devtools.debugger.pending-selected-location", "{}");
 pref("devtools.debugger.pending-breakpoints", "{}");
 pref("devtools.debugger.expressions", "[]");
-pref("devtools.debugger.event-listener-breakpoints", "[]");
 pref("devtools.debugger.file-search-case-sensitive", false);
 pref("devtools.debugger.file-search-whole-word", false);
 pref("devtools.debugger.file-search-regex-match", false);

From 661bd00c4208d76fc2a96516e1845c6a547c4f93 Mon Sep 17 00:00:00 2001
From: Eitan Isaacson <eitan@monotonous.org>
Date: Mon, 20 May 2019 15:54:56 +0000
Subject: [PATCH 050/129] Bug 1506514 - Don't create accessibles for unselected
 deck panel descendants. r=Jamie

Differential Revision: https://phabricator.services.mozilla.com/D31656

--HG--
extra : moz-landing-system : lando
---
 accessible/base/NotificationController.cpp    |  4 +-
 accessible/generic/DocAccessible-inl.h        |  4 +-
 accessible/generic/DocAccessible.cpp          | 24 ++++++++--
 accessible/generic/DocAccessible.h            | 11 +++--
 .../tests/mochitest/treeupdate/test_deck.xul  | 46 +++++++++++++++++++
 5 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/accessible/base/NotificationController.cpp b/accessible/base/NotificationController.cpp
index 20572aa3347d..855e1d43db68 100644
--- a/accessible/base/NotificationController.cpp
+++ b/accessible/base/NotificationController.cpp
@@ -751,8 +751,8 @@ void NotificationController::WillRefresh(mozilla::TimeStamp aTime) {
       MOZ_ASSERT(mDocument->AccessibleOrTrueContainer(containerNode),
                  "Text node having rendered text hasn't accessible document!");
 
-      Accessible* container = mDocument->AccessibleOrTrueContainer(
-          containerNode, DocAccessible::eNoContainerIfARIAHidden);
+      Accessible* container =
+          mDocument->AccessibleOrTrueContainer(containerNode, true);
       if (container) {
         nsTArray<nsCOMPtr<nsIContent>>* list =
             mContentInsertions.LookupOrAdd(container);
diff --git a/accessible/generic/DocAccessible-inl.h b/accessible/generic/DocAccessible-inl.h
index ea98a0f4f2de..e0665adc28b5 100644
--- a/accessible/generic/DocAccessible-inl.h
+++ b/accessible/generic/DocAccessible-inl.h
@@ -23,10 +23,10 @@ namespace mozilla {
 namespace a11y {
 
 inline Accessible* DocAccessible::AccessibleOrTrueContainer(
-    nsINode* aNode, int aIgnoreARIAHidden) const {
+    nsINode* aNode, bool aNoContainerIfPruned) const {
   // HTML comboboxes have no-content list accessible as an intermediate
   // containing all options.
-  Accessible* container = GetAccessibleOrContainer(aNode, aIgnoreARIAHidden);
+  Accessible* container = GetAccessibleOrContainer(aNode, aNoContainerIfPruned);
   if (container && container->IsHTMLCombobox()) {
     return container->FirstChild();
   }
diff --git a/accessible/generic/DocAccessible.cpp b/accessible/generic/DocAccessible.cpp
index 4c250458d291..1d202fa6b81d 100644
--- a/accessible/generic/DocAccessible.cpp
+++ b/accessible/generic/DocAccessible.cpp
@@ -1132,8 +1132,8 @@ Accessible* DocAccessible::GetAccessibleByUniqueIDInSubtree(void* aUniqueID) {
   return nullptr;
 }
 
-Accessible* DocAccessible::GetAccessibleOrContainer(nsINode* aNode,
-                                                    int aARIAHiddenFlag) const {
+Accessible* DocAccessible::GetAccessibleOrContainer(
+    nsINode* aNode, bool aNoContainerIfPruned) const {
   if (!aNode || !aNode->GetComposedDoc()) {
     return nullptr;
   }
@@ -1157,11 +1157,26 @@ Accessible* DocAccessible::GetAccessibleOrContainer(nsINode* aNode,
   MOZ_ASSERT(currNode);
   for (; currNode; currNode = currNode->GetFlattenedTreeParentNode()) {
     // No container if is inside of aria-hidden subtree.
-    if (aARIAHiddenFlag == eNoContainerIfARIAHidden && currNode->IsElement() &&
+    if (aNoContainerIfPruned && currNode->IsElement() &&
         aria::HasDefinedARIAHidden(currNode->AsElement())) {
       return nullptr;
     }
 
+    // Check if node is in an unselected deck panel
+    if (aNoContainerIfPruned && currNode->IsXULElement()) {
+      if (nsIFrame* frame = currNode->AsContent()->GetPrimaryFrame()) {
+        nsDeckFrame* deckFrame = do_QueryFrame(frame->GetParent());
+        if (deckFrame && deckFrame->GetSelectedBox() != frame) {
+          // If deck is not a <tabpanels>, return null
+          nsIContent* parentFrameContent = deckFrame->GetContent();
+          if (!parentFrameContent ||
+              !parentFrameContent->IsXULElement(nsGkAtoms::tabpanels)) {
+            return nullptr;
+          }
+        }
+      }
+    }
+
     if (Accessible* accessible = GetAccessible(currNode)) {
       return accessible;
     }
@@ -1666,8 +1681,7 @@ bool InsertIterator::Next() {
     // what means there's no container. Ignore the insertion too.
     nsIContent* prevNode = mNodes->SafeElementAt(mNodesIdx - 1);
     nsIContent* node = mNodes->ElementAt(mNodesIdx++);
-    Accessible* container = Document()->AccessibleOrTrueContainer(
-        node, DocAccessible::eNoContainerIfARIAHidden);
+    Accessible* container = Document()->AccessibleOrTrueContainer(node, true);
     if (container != Context()) {
       continue;
     }
diff --git a/accessible/generic/DocAccessible.h b/accessible/generic/DocAccessible.h
index a3fa5b2314e1..cd6cb6da87c3 100644
--- a/accessible/generic/DocAccessible.h
+++ b/accessible/generic/DocAccessible.h
@@ -284,11 +284,12 @@ class DocAccessible : public HyperTextAccessibleWrap,
 
   /**
    * Return an accessible for the given DOM node or container accessible if
-   * the node is not accessible.
+   * the node is not accessible. If aNoContainerIfPruned is true it will return
+   * null if the node is in a pruned subtree (eg. aria-hidden or unselected deck
+   * panel)
    */
-  enum { eIgnoreARIAHidden = 0, eNoContainerIfARIAHidden = 1 };
-  Accessible* GetAccessibleOrContainer(
-      nsINode* aNode, int aARIAHiddenFlag = eIgnoreARIAHidden) const;
+  Accessible* GetAccessibleOrContainer(nsINode* aNode,
+                                       bool aNoContainerIfPruned = false) const;
 
   /**
    * Return a container accessible for the given DOM node.
@@ -302,7 +303,7 @@ class DocAccessible : public HyperTextAccessibleWrap,
    * container for it.
    */
   Accessible* AccessibleOrTrueContainer(
-      nsINode* aNode, int aARIAHiddenFlag = eIgnoreARIAHidden) const;
+      nsINode* aNode, bool aNoContainerIfPruned = false) const;
 
   /**
    * Return an accessible for the given node or its first accessible descendant.
diff --git a/accessible/tests/mochitest/treeupdate/test_deck.xul b/accessible/tests/mochitest/treeupdate/test_deck.xul
index 2e33991e2bb4..979996a66cbb 100644
--- a/accessible/tests/mochitest/treeupdate/test_deck.xul
+++ b/accessible/tests/mochitest/treeupdate/test_deck.xul
@@ -64,10 +64,55 @@
       }
     }
 
+    function showDeckPanel(aContainerID, aPanelID)
+    {
+      this.container = getAccessible(aContainerID);
+      this.deckNode = getNode(aPanelID);
+      var tree =
+        { GROUPING: [ // role="group"
+          { GROUPING: [ // grouping of panel 2
+            { PUSHBUTTON: []  } // push button in panel 2
+          ] }
+        ] };
+
+
+      this.unexpectedEventSeq = [
+        new invokerChecker(EVENT_REORDER, this.container)
+      ];
+
+      this.invoke = function showDeckPanel_invoke()
+      {
+        // This stops the refreh driver from doing its regular ticks, and leaves
+        // us in control. 100 is an arbitrary positive number to advance the clock
+        // it is not checked or used anywhere.
+        window.windowUtils.advanceTimeAndRefresh(100);
+
+        testAccessibleTree(this.container, tree);
+        this.deckNode.style.display = "-moz-box";
+
+        // This flushes our DOM mutations and forces any pending mutation events.
+        window.windowUtils.advanceTimeAndRefresh(100);
+      }
+
+      this.finalCheck = function showDeckPanel_finalCheck()
+      {
+        testAccessibleTree(this.container, tree);
+
+        // Return to regular refresh driver ticks.
+        window.windowUtils.restoreNormalRefresh();
+      }
+
+      this.getID = function showDeckPanel_getID()
+      {
+        return "show deck panel";
+      }
+    }
+
     var gQueue = null;
     function doTest()
     {
       gQueue = new eventQueue();
+      gQueue.push(new showDeckPanel("container", "hidden"));
       gQueue.push(new switchDeckPanel("container", "deck"));
       gQueue.invoke(); // will call SimpleTest.finish();
     }
@@ -99,6 +144,7 @@
         <groupbox>
           <button label="This is the second page"/>
         </groupbox>
+        <hbox id="hidden" style="display: none;"><label>This is the third page</label></hbox>
       </deck>
 
     </vbox>

From 48ee5185e074f8fba8d8a1404685f2858267b0ba Mon Sep 17 00:00:00 2001
From: Dorel Luca <dluca@mozilla.com>
Date: Mon, 20 May 2019 22:41:11 +0300
Subject: [PATCH 051/129] Backed out changeset 158eb97dfd5e (bug 1552441) for
 browser-chrome failures in
 dom/tests/browser/browser_unlinkable_about_page_can_load_module_scripts.js.
 CLOSED TREE

--HG--
extra : histedit_source : fc81d91d500af7599b59e913b6517c926d9debaa
---
 dom/tests/browser/.eslintrc.js                | 17 ------
 dom/tests/browser/browser.ini                 |  5 --
 ...able_about_page_can_load_module_scripts.js | 54 -------------------
 .../browser/file_load_module_script.html      |  8 ---
 dom/tests/browser/file_module_loaded.js       |  3 --
 dom/tests/browser/file_script_loaded.js       |  5 --
 6 files changed, 92 deletions(-)
 delete mode 100644 dom/tests/browser/.eslintrc.js
 delete mode 100644 dom/tests/browser/browser_unlinkable_about_page_can_load_module_scripts.js
 delete mode 100644 dom/tests/browser/file_load_module_script.html
 delete mode 100644 dom/tests/browser/file_module_loaded.js
 delete mode 100644 dom/tests/browser/file_script_loaded.js

diff --git a/dom/tests/browser/.eslintrc.js b/dom/tests/browser/.eslintrc.js
deleted file mode 100644
index de95be7b6de7..000000000000
--- a/dom/tests/browser/.eslintrc.js
+++ /dev/null
@@ -1,17 +0,0 @@
-"use strict";
-
-module.exports = {
-  overrides: [
-    {
-      files: [
-        "file_module_loaded.js",
-      ],
-      parserOptions: {
-        sourceType: "module",
-      },
-    },
-  ],
-  "extends": [
-    "plugin:mozilla/browser-test"
-  ]
-};
diff --git a/dom/tests/browser/browser.ini b/dom/tests/browser/browser.ini
index 9fdd0efc7abd..c92fdb7bbd54 100644
--- a/dom/tests/browser/browser.ini
+++ b/dom/tests/browser/browser.ini
@@ -79,11 +79,6 @@ support-files =
 [browser_test_toolbars_visibility.js]
 support-files =
   test_new_window_from_content_child.html
-[browser_unlinkable_about_page_can_load_module_scripts.js]
-support-files =
-  file_load_module_script.html
-  file_module_loaded.js
-  file_script_loaded.js
 [browser_xhr_sandbox.js]
 [browser_noopener.js]
 skip-if = (verify && debug && (os == 'linux'))
diff --git a/dom/tests/browser/browser_unlinkable_about_page_can_load_module_scripts.js b/dom/tests/browser/browser_unlinkable_about_page_can_load_module_scripts.js
deleted file mode 100644
index 3d779b903844..000000000000
--- a/dom/tests/browser/browser_unlinkable_about_page_can_load_module_scripts.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-"use strict";
-
-const kTestPage = getRootDirectory(gTestPath) + "file_load_module_script.html";
-
-const kAboutPagesRegistered = Promise.all([
-  BrowserTestUtils.registerAboutPage(
-    registerCleanupFunction, "test-linkable-page", kTestPage,
-    Ci.nsIAboutModule.URI_SAFE_FOR_UNTRUSTED_CONTENT | Ci.nsIAboutModule.MAKE_LINKABLE),
-  BrowserTestUtils.registerAboutPage(
-    registerCleanupFunction, "test-unlinkable-page", kTestPage,
-    Ci.nsIAboutModule.ALLOW_SCRIPT),
-]);
-
-add_task(async function() {
-  await kAboutPagesRegistered;
-
-  let consoleListener = {
-    observe() {
-      errorCount++;
-      if (shouldHaveJSError) {
-        ok(true, "JS error is expected and received");
-      } else {
-        ok(false, "Unexpected JS error was received");
-      }
-    },
-  };
-  Services.console.registerListener(consoleListener);
-  registerCleanupFunction(() => Services.console.unregisterListener(consoleListener));
-
-  let shouldHaveJSError = true;
-  let errorCount = 0;
-  await BrowserTestUtils.withNewTab({gBrowser, url: "about:test-linkable-page"}, async (browser) => {
-    await ContentTask.spawn(browser, null, () => {
-      isnot(content.document.body.textContent, "scriptLoaded",
-        "The page content shouldn't be changed on the linkable page");
-    });
-  });
-  ok(errorCount > 0, "Should have an error when loading test-linkable-page, got " + errorCount);
-
-  shouldHaveJSError = false;
-  errorCount = 0;
-  await BrowserTestUtils.withNewTab({gBrowser, url: "about:test-unlinkable-page"}, async (browser) => {
-    await ContentTask.spawn(browser, null, () => {
-      is(content.document.body.textContent, "scriptLoaded",
-        "The page content should be changed on the unlinkable page");
-    });
-  });
-  is(errorCount, 0, "Should have no errors when loading test-unlinkable-page");
-});
diff --git a/dom/tests/browser/file_load_module_script.html b/dom/tests/browser/file_load_module_script.html
deleted file mode 100644
index 701d5fe03732..000000000000
--- a/dom/tests/browser/file_load_module_script.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="Content-Security-Policy" content="default-src *"/>
-  <script type="module" src="chrome://mochitests/content/browser/dom/tests/browser/file_script_loaded.js"></script>
-</head>
-<body></body>
-</html>
diff --git a/dom/tests/browser/file_module_loaded.js b/dom/tests/browser/file_module_loaded.js
deleted file mode 100644
index 83b279e52856..000000000000
--- a/dom/tests/browser/file_module_loaded.js
+++ /dev/null
@@ -1,3 +0,0 @@
-"use strict";
-
-import "file_script_loaded";
diff --git a/dom/tests/browser/file_script_loaded.js b/dom/tests/browser/file_script_loaded.js
deleted file mode 100644
index 108562a6aae2..000000000000
--- a/dom/tests/browser/file_script_loaded.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-document.addEventListener("DOMContentLoaded", () => {
-  document.body.textContent = "scriptLoaded";
-});

From 06b2e4e9d24d0d119c0f441bd2ee38cb00944ab3 Mon Sep 17 00:00:00 2001
From: Dorel Luca <dluca@mozilla.com>
Date: Mon, 20 May 2019 23:40:10 +0300
Subject: [PATCH 052/129] Backed out changeset 41c511d9528c (bug 1551729) for
 causing WPT failures in cookies/http-state/mozilla-tests.html. CLOSED TREE

---
 .../browser/browser_favicon_firstParty.js     |  4 ++--
 .../browser/browser_favicon_userContextId.js  |  4 ++--
 .../browser_privatebrowsing_favicon.js        |  4 ++--
 .../test/browser_sessionStoreContainer.js     |  2 +-
 ...e_browserElement_CookiesNotThirdParty.html |  4 ++--
 netwerk/cookie/nsCookieService.cpp            | 19 +++++++++++++++----
 netwerk/cookie/nsCookieService.h              |  3 ++-
 netwerk/test/TestCookie.cpp                   |  8 ++++----
 .../http-state/chromium-tests.html.ini        | 12 ------------
 .../cookies/http-state/general-tests.html.ini | 14 --------------
 .../thumbnails/test/thumbnails_background.sjs | 12 ++++++------
 11 files changed, 36 insertions(+), 50 deletions(-)

diff --git a/browser/components/originattributes/test/browser/browser_favicon_firstParty.js b/browser/components/originattributes/test/browser/browser_favicon_firstParty.js
index 5997c4af5476..d350aee8da57 100644
--- a/browser/components/originattributes/test/browser/browser_favicon_firstParty.js
+++ b/browser/components/originattributes/test/browser/browser_favicon_firstParty.js
@@ -183,8 +183,8 @@ async function assignCookiesUnderFirstParty(aURL, aFirstParty, aCookieValue) {
 async function generateCookies(aThirdParty) {
   // we generate two different cookies for two first party domains.
   let cookies = [];
-  cookies.push(Math.random().toString());
-  cookies.push(Math.random().toString());
+  cookies.push(Math.random().toString() + "=1");
+  cookies.push(Math.random().toString() + "=1");
 
   let firstSiteURL;
   let secondSiteURL;
diff --git a/browser/components/originattributes/test/browser/browser_favicon_userContextId.js b/browser/components/originattributes/test/browser/browser_favicon_userContextId.js
index 00457eb1a522..62f042aed2e4 100644
--- a/browser/components/originattributes/test/browser/browser_favicon_userContextId.js
+++ b/browser/components/originattributes/test/browser/browser_favicon_userContextId.js
@@ -128,8 +128,8 @@ function waitOnFaviconLoaded(aFaviconURL) {
 async function generateCookies(aHost) {
   // we generate two different cookies for two userContextIds.
   let cookies = [];
-  cookies.push(Math.random().toString());
-  cookies.push(Math.random().toString());
+  cookies.push(Math.random().toString() + "=1");
+  cookies.push(Math.random().toString() + "=1");
 
   // Then, we add cookies into the site for 'personal' and 'work'.
   let tabInfoA = await openTabInUserContext(aHost, USER_CONTEXT_ID_PERSONAL);
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js
index bac6fa648631..bbeebc5cea1c 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js
@@ -189,8 +189,8 @@ add_task(async function test_favicon_privateBrowsing() {
   // Generate two random cookies for non-private window and private window
   // respectively.
   let cookies = [];
-  cookies.push(Math.random().toString());
-  cookies.push(Math.random().toString());
+  cookies.push(Math.random().toString() + "=1");
+  cookies.push(Math.random().toString() + "=1");
 
   // Open a tab in private window and add a cookie into it.
   await assignCookies(privateWindow.gBrowser, TEST_SITE, cookies[0]);
diff --git a/browser/components/sessionstore/test/browser_sessionStoreContainer.js b/browser/components/sessionstore/test/browser_sessionStoreContainer.js
index 74830f16f0a3..e5627e23c66f 100644
--- a/browser/components/sessionstore/test/browser_sessionStoreContainer.js
+++ b/browser/components/sessionstore/test/browser_sessionStoreContainer.js
@@ -114,7 +114,7 @@ add_task(async function test() {
   for (let userContextId of Object.keys(USER_CONTEXTS)) {
     // Load the page in 3 different contexts and set a cookie
     // which should only be visible in that context.
-    let cookie = USER_CONTEXTS[userContextId];
+    let cookie = USER_CONTEXTS[userContextId] + "=1";
 
     // Open our tab in the given user context.
     let { tab, browser } = await openTabInUserContext(userContextId);
diff --git a/dom/browser-element/mochitest/file_browserElement_CookiesNotThirdParty.html b/dom/browser-element/mochitest/file_browserElement_CookiesNotThirdParty.html
index ff122f31a44f..053953ed6fea 100644
--- a/dom/browser-element/mochitest/file_browserElement_CookiesNotThirdParty.html
+++ b/dom/browser-element/mochitest/file_browserElement_CookiesNotThirdParty.html
@@ -5,11 +5,11 @@ file_browserElement_CookiesNotThirdParty.html
 <script type='text/javascript'>
 if (location.search != "?step=2") {
   // Step 1: Set a cookie.
-  document.cookie = "file_browserElement_CookiesNotThirdParty";
+  document.cookie = "file_browserElement_CookiesNotThirdParty=1";
   alert("next");
 } else {
   // Step 2: Read the cookie.
-  if (document.cookie == "file_browserElement_CookiesNotThirdParty") {
+  if (document.cookie == "file_browserElement_CookiesNotThirdParty=1") {
     alert("success: got the correct cookie");
   } else {
     alert('failure: got unexpected cookie: "' + document.cookie + '"');
diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp
index cceae5079db5..23b4fb05a2b0 100644
--- a/netwerk/cookie/nsCookieService.cpp
+++ b/netwerk/cookie/nsCookieService.cpp
@@ -3239,7 +3239,8 @@ bool nsCookieService::CanSetCookie(nsIURI* aHostURI, const nsCookieKey& aKey,
 
   // newCookie says whether there are multiple cookies in the header;
   // so we can handle them separately.
-  bool newCookie = ParseAttributes(aCookieHeader, aCookieAttributes);
+  bool discard = false;
+  bool newCookie = ParseAttributes(aCookieHeader, aCookieAttributes, discard);
 
   // Collect telemetry on how often secure cookies are set from non-secure
   // origins, and vice-versa.
@@ -3385,7 +3386,7 @@ bool nsCookieService::CanSetCookie(nsIURI* aHostURI, const nsCookieKey& aKey,
     }
   }
 
-  aSetCookie = true;
+  aSetCookie = !discard;
   return newCookie;
 }
 
@@ -3786,7 +3787,8 @@ bool nsCookieService::GetTokenValue(nsACString::const_char_iterator& aIter,
 // folded into the cookie struct here, because we don't know which one to use
 // until we've parsed the header.
 bool nsCookieService::ParseAttributes(nsDependentCString& aCookieHeader,
-                                      nsCookieAttributes& aCookieAttributes) {
+                                      nsCookieAttributes& aCookieAttributes,
+                                      bool& aDiscard) {
   static const char kPath[] = "path";
   static const char kDomain[] = "domain";
   static const char kExpires[] = "expires";
@@ -3806,6 +3808,8 @@ bool nsCookieService::ParseAttributes(nsDependentCString& aCookieHeader,
   aCookieAttributes.isHttpOnly = false;
   aCookieAttributes.sameSite = nsICookie2::SAMESITE_UNSET;
 
+  aDiscard = false;
+
   nsDependentCSubstring tokenString(cookieStart, cookieStart);
   nsDependentCSubstring tokenValue(cookieStart, cookieStart);
   bool newCookie, equalsFound;
@@ -3820,8 +3824,11 @@ bool nsCookieService::ParseAttributes(nsDependentCString& aCookieHeader,
   if (equalsFound) {
     aCookieAttributes.name = tokenString;
     aCookieAttributes.value = tokenValue;
+    if (aCookieAttributes.name.IsEmpty()) {
+      aDiscard = true;
+    }
   } else {
-    aCookieAttributes.value = tokenString;
+    aDiscard = true;
   }
 
   // extract remaining attributes
@@ -3829,6 +3836,10 @@ bool nsCookieService::ParseAttributes(nsDependentCString& aCookieHeader,
     newCookie = GetTokenValue(cookieStart, cookieEnd, tokenString, tokenValue,
                               equalsFound);
 
+    if (aDiscard) {
+      continue;
+    }
+
     if (!tokenValue.IsEmpty()) {
       tokenValue.BeginReading(tempBegin);
       tokenValue.EndReading(tempEnd);
diff --git a/netwerk/cookie/nsCookieService.h b/netwerk/cookie/nsCookieService.h
index c0a65bce2aa8..f614cc0822f9 100644
--- a/netwerk/cookie/nsCookieService.h
+++ b/netwerk/cookie/nsCookieService.h
@@ -341,7 +341,8 @@ class nsCookieService final : public nsICookieService,
                             nsDependentCSubstring& aTokenValue,
                             bool& aEqualsFound);
   static bool ParseAttributes(nsDependentCString& aCookieHeader,
-                              nsCookieAttributes& aCookie);
+                              nsCookieAttributes& aCookieAttributes,
+                              bool& aDiscard);
   bool RequireThirdPartyCheck();
   static bool CheckDomain(nsCookieAttributes& aCookie, nsIURI* aHostURI,
                           const nsCString& aBaseDomain, bool aRequireHostMatch);
diff --git a/netwerk/test/TestCookie.cpp b/netwerk/test/TestCookie.cpp
index 7c838a4a1c6c..2129e26ef64e 100644
--- a/netwerk/test/TestCookie.cpp
+++ b/netwerk/test/TestCookie.cpp
@@ -620,7 +620,7 @@ TEST(TestCookie, TestCookieMain)
              nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
   EXPECT_TRUE(CheckResult(cookie.get(), MUST_CONTAIN, R"(test="fubar! = foo)"));
-  EXPECT_TRUE(CheckResult(cookie.get(), MUST_CONTAIN, "five"));
+  EXPECT_TRUE(CheckResult(cookie.get(), MUST_NOT_CONTAIN, "five"));
   SetACookie(cookieService, "http://parser.test/", nullptr,
              "test=kill; domain=.parser.test; max-age=0 \n five; max-age=0",
              nullptr);
@@ -632,13 +632,13 @@ TEST(TestCookie, TestCookieMain)
   // cookies to overwrite it
   SetACookie(cookieService, "http://parser.test/", nullptr, "six", nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
-  EXPECT_TRUE(CheckResult(cookie.get(), MUST_EQUAL, "six"));
+  EXPECT_TRUE(CheckResult(cookie.get(), MUST_BE_NULL));
   SetACookie(cookieService, "http://parser.test/", nullptr, "seven", nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
-  EXPECT_TRUE(CheckResult(cookie.get(), MUST_EQUAL, "seven"));
+  EXPECT_TRUE(CheckResult(cookie.get(), MUST_BE_NULL));
   SetACookie(cookieService, "http://parser.test/", nullptr, " =eight", nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
-  EXPECT_TRUE(CheckResult(cookie.get(), MUST_EQUAL, "eight"));
+  EXPECT_TRUE(CheckResult(cookie.get(), MUST_BE_NULL));
   SetACookie(cookieService, "http://parser.test/", nullptr, "test=six",
              nullptr);
   GetACookie(cookieService, "http://parser.test/", nullptr, cookie);
diff --git a/testing/web-platform/meta/cookies/http-state/chromium-tests.html.ini b/testing/web-platform/meta/cookies/http-state/chromium-tests.html.ini
index 8bc56f0d4f7f..2140bfe1f36e 100644
--- a/testing/web-platform/meta/cookies/http-state/chromium-tests.html.ini
+++ b/testing/web-platform/meta/cookies/http-state/chromium-tests.html.ini
@@ -1,19 +1,7 @@
 [chromium-tests.html]
-  [chromium0009 - chromium0009]
-    expected: FAIL
-
   [chromium0006 - chromium0006]
     expected: FAIL
 
-  [chromium0012 - chromium0012]
-    expected: FAIL
-
-  [disabled-chromium0022 - disabled-chromium0022]
-    expected: FAIL
-
-  [chromium0010 - chromium0010]
-    expected: FAIL
-
   [chromium0007 - chromium0007]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/cookies/http-state/general-tests.html.ini b/testing/web-platform/meta/cookies/http-state/general-tests.html.ini
index b5a16e51a642..6cc93211e20b 100644
--- a/testing/web-platform/meta/cookies/http-state/general-tests.html.ini
+++ b/testing/web-platform/meta/cookies/http-state/general-tests.html.ini
@@ -1,18 +1,4 @@
 [general-tests.html]
-  [0021 - Ignore cookie without key in all 'Set-Cookie'.]
-    expected: FAIL
-
-  [0023 - Ignore cookies without '=' in all 'Set-Cookie'.]
-    expected: FAIL
-
-  [0026 - Ignore malformed cookies in all 'Set-Cookie' v2.]
-    expected: FAIL
-
-  [0027 - Ignore malformed cookies in all 'Set-Cookie' v3.]
-    expected: FAIL
-
   [0028 - [INVALID EXPECTATION\] Ignore malformed cookies in all 'Set-Cookie' v4.]
     expected: FAIL
 
-  [0004 - Ignore cookie without key.]
-    expected: FAIL
diff --git a/toolkit/components/thumbnails/test/thumbnails_background.sjs b/toolkit/components/thumbnails/test/thumbnails_background.sjs
index f1cce96a0edc..5ec635005833 100644
--- a/toolkit/components/thumbnails/test/thumbnails_background.sjs
+++ b/toolkit/components/thumbnails/test/thumbnails_background.sjs
@@ -19,13 +19,13 @@ function handleRequest(req, resp) {
 
   let setCookieScript = "";
   if (opts.setRedCookie) {
-    resp.setHeader("Set-Cookie", "red", false);
-    setCookieScript = '<script>document.cookie="red";</script>';
+    resp.setHeader("Set-Cookie", "red=1", false);
+    setCookieScript = '<script>document.cookie="red=1";</script>';
   }
 
   if (opts.setGreenCookie) {
-    resp.setHeader("Set-Cookie", "green", false);
-    setCookieScript = '<script>document.cookie="green";</script>';
+    resp.setHeader("Set-Cookie", "green=1", false);
+    setCookieScript = '<script>document.cookie="green=1";</script>';
   }
 
   if (opts.iframe) {
@@ -43,14 +43,14 @@ function handleRequest(req, resp) {
   }
 
   if (req.hasHeader("Cookie") &&
-      req.getHeader("Cookie").split(";").indexOf("red") >= 0) {
+      req.getHeader("Cookie").split(";").indexOf("red=1") >= 0) {
     resp.write('<html style="background: #f00;">' + setCookieScript + '</html>');
     resp.finish();
     return;
   }
 
   if (req.hasHeader("Cookie") &&
-      req.getHeader("Cookie").split(";").indexOf("green") >= 0) {
+      req.getHeader("Cookie").split(";").indexOf("green=1") >= 0) {
     resp.write('<html style="background: #0f0;">' + setCookieScript + '</html>');
     resp.finish();
     return;

From 1910d07e93617b2d829c201b997e587eef52d9d4 Mon Sep 17 00:00:00 2001
From: Ashley Hauck <khyperia@mozilla.com>
Date: Mon, 20 May 2019 18:38:03 +0000
Subject: [PATCH 053/129] Bug 1547467 - Introduce another scope for
 .initializers, and remove .localInitializers. r=jorendorff

Differential Revision: https://phabricator.services.mozilla.com/D29907

--HG--
extra : moz-landing-system : lando
---
 js/src/builtin/ReflectParse.cpp            |   3 +
 js/src/frontend/BytecodeEmitter.cpp        | 130 ++++++++++-----------
 js/src/frontend/BytecodeEmitter.h          |   4 +-
 js/src/frontend/FullParseHandler.h         |  39 ++++---
 js/src/frontend/FunctionEmitter.cpp        |  10 +-
 js/src/frontend/ParseNode.h                |  13 +--
 js/src/frontend/Parser.cpp                 | 129 ++++++++++----------
 js/src/frontend/SyntaxParseHandler.h       |  11 +-
 js/src/jit-test/tests/fields/bug1547467.js |  19 +++
 js/src/jit-test/tests/fields/super.js      |  35 ++++--
 js/src/vm/CommonPropertyNames.h            |   1 -
 11 files changed, 220 insertions(+), 174 deletions(-)
 create mode 100644 js/src/jit-test/tests/fields/bug1547467.js

diff --git a/js/src/builtin/ReflectParse.cpp b/js/src/builtin/ReflectParse.cpp
index 6ba38a13d3ca..d462c4e9ecc9 100644
--- a/js/src/builtin/ReflectParse.cpp
+++ b/js/src/builtin/ReflectParse.cpp
@@ -2469,6 +2469,9 @@ bool ASTSerializer::statement(ParseNode* pn, MutableHandleValue dst) {
       }
 
       for (ParseNode* item : memberList->contents()) {
+        if (item->is<LexicalScopeNode>()) {
+          item = item->as<LexicalScopeNode>().scopeBody();
+        }
         if (item->is<ClassField>()) {
           ClassField* field = &item->as<ClassField>();
           MOZ_ASSERT(memberList->pn_pos.encloses(field->pn_pos));
diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index 61b13fdff5d4..5d0c3cf1283c 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -2342,7 +2342,7 @@ bool BytecodeEmitter::emitSetThis(BinaryNode* setThisNode) {
     return false;
   }
 
-  if (!emitInitializeInstanceFields(IsSuperCall::Yes)) {
+  if (!emitInitializeInstanceFields()) {
     return false;
   }
 
@@ -7644,6 +7644,14 @@ bool BytecodeEmitter::emitPropertyList(ListNode* obj, PropertyEmitter& pe,
       continue;
     }
 
+    if (propdef->is<LexicalScopeNode>()) {
+      // Constructors are sometimes wrapped in LexicalScopeNodes. As we already
+      // handled emitting the constructor, skip it.
+      MOZ_ASSERT(propdef->as<LexicalScopeNode>().scopeBody()->isKind(
+          ParseNodeKind::ClassMethod));
+      continue;
+    }
+
     // Handle __proto__: v specially because *only* this form, and no other
     // involving "__proto__", performs [[Prototype]] mutation.
     if (propdef->isKind(ParseNodeKind::MutateProto)) {
@@ -7897,15 +7905,6 @@ bool BytecodeEmitter::emitPropertyList(ListNode* obj, PropertyEmitter& pe,
     }
   }
 
-  if (obj->getKind() == ParseNodeKind::ClassMemberList) {
-    if (!emitCreateFieldKeys(obj)) {
-      return false;
-    }
-    if (!emitCreateFieldInitializers(obj)) {
-      return false;
-    }
-  }
-
   return true;
 }
 
@@ -8103,38 +8102,7 @@ const FieldInitializers& BytecodeEmitter::findFieldInitializersForCall() {
   MOZ_CRASH("Constructor for field initializers not found.");
 }
 
-bool BytecodeEmitter::emitCopyInitializersToLocalInitializers() {
-  MOZ_ASSERT(sc->asFunctionBox()->isDerivedClassConstructor());
-  if (getFieldInitializers().numFieldInitializers == 0) {
-    return true;
-  }
-
-  NameOpEmitter noe(this, cx->names().dotLocalInitializers,
-                    NameOpEmitter::Kind::Initialize);
-  if (!noe.prepareForRhs()) {
-    //              [stack]
-    return false;
-  }
-
-  if (!emitGetName(cx->names().dotInitializers)) {
-    //              [stack] .initializers
-    return false;
-  }
-
-  if (!noe.emitAssignment()) {
-    //              [stack] .initializers
-    return false;
-  }
-
-  if (!emit1(JSOP_POP)) {
-    //              [stack]
-    return false;
-  }
-
-  return true;
-}
-
-bool BytecodeEmitter::emitInitializeInstanceFields(IsSuperCall isSuperCall) {
+bool BytecodeEmitter::emitInitializeInstanceFields() {
   const FieldInitializers& fieldInitializers = findFieldInitializersForCall();
   size_t numFields = fieldInitializers.numFieldInitializers;
 
@@ -8142,16 +8110,9 @@ bool BytecodeEmitter::emitInitializeInstanceFields(IsSuperCall isSuperCall) {
     return true;
   }
 
-  if (isSuperCall == IsSuperCall::Yes) {
-    if (!emitGetName(cx->names().dotLocalInitializers)) {
-      //            [stack] ARRAY
-      return false;
-    }
-  } else {
-    if (!emitGetName(cx->names().dotInitializers)) {
-      //            [stack] ARRAY
-      return false;
-    }
+  if (!emitGetName(cx->names().dotInitializers)) {
+    //              [stack] ARRAY
+    return false;
   }
 
   for (size_t fieldIndex = 0; fieldIndex < numFields; fieldIndex++) {
@@ -8671,21 +8632,24 @@ bool BytecodeEmitter::emitLexicalInitialization(JSAtom* name) {
   return true;
 }
 
-static MOZ_ALWAYS_INLINE FunctionNode* FindConstructor(JSContext* cx,
-                                                       ListNode* classMethods) {
-  for (ParseNode* mn : classMethods->contents()) {
-    if (mn->is<ClassMethod>()) {
-      ClassMethod& method = mn->as<ClassMethod>();
+static MOZ_ALWAYS_INLINE ParseNode* FindConstructor(JSContext* cx,
+                                                    ListNode* classMethods) {
+  for (ParseNode* classElement : classMethods->contents()) {
+    ParseNode* unwrappedElement = classElement;
+    if (unwrappedElement->is<LexicalScopeNode>()) {
+      unwrappedElement = unwrappedElement->as<LexicalScopeNode>().scopeBody();
+    }
+    if (unwrappedElement->is<ClassMethod>()) {
+      ClassMethod& method = unwrappedElement->as<ClassMethod>();
       ParseNode& methodName = method.name();
       if (!method.isStatic() &&
           (methodName.isKind(ParseNodeKind::ObjectPropertyName) ||
            methodName.isKind(ParseNodeKind::StringExpr)) &&
           methodName.as<NameNode>().atom() == cx->names().constructor) {
-        return &method.method();
+        return classElement;
       }
     }
   }
-
   return nullptr;
 }
 
@@ -8700,7 +8664,7 @@ bool BytecodeEmitter::emitClass(
 
   ParseNode* heritageExpression = classNode->heritage();
   ListNode* classMembers = classNode->memberList();
-  FunctionNode* constructor = FindConstructor(cx, classMembers);
+  ParseNode* constructor = FindConstructor(cx, classMembers);
 
   // If |nameKind != ClassNameKind::ComputedName|
   //                [stack]
@@ -8722,8 +8686,8 @@ bool BytecodeEmitter::emitClass(
     }
   }
 
-  if (!classNode->isEmptyScope()) {
-    if (!ce.emitScope(classNode->scopeBindings())) {
+  if (LexicalScopeNode* scopeBindings = classNode->scopeBindings()) {
+    if (!ce.emitScope(scopeBindings->scopeBindings())) {
       //            [stack]
       return false;
     }
@@ -8761,18 +8725,47 @@ bool BytecodeEmitter::emitClass(
   // Stack currently has HOMEOBJ followed by optional HERITAGE. When HERITAGE
   // is not used, an implicit value of %FunctionPrototype% is implied.
   if (constructor) {
-    bool needsHomeObject = constructor->funbox()->needsHomeObject();
+    FunctionNode* ctor;
+    // .fieldKeys must be declared outside the scope .initializers is declared
+    // in, hence this extra scope.
+    Maybe<LexicalScopeEmitter> lse;
+    if (constructor->is<LexicalScopeNode>()) {
+      lse.emplace(this);
+      if (!lse->emitScope(
+              ScopeKind::Lexical,
+              constructor->as<LexicalScopeNode>().scopeBindings())) {
+        return false;
+      }
+
+      // Any class with field initializers will have a constructor
+      if (!emitCreateFieldInitializers(classMembers)) {
+        return false;
+      }
+      ctor = &constructor->as<LexicalScopeNode>()
+                  .scopeBody()
+                  ->as<ClassMethod>()
+                  .method();
+    } else {
+      ctor = &constructor->as<ClassMethod>().method();
+    }
+
+    bool needsHomeObject = ctor->funbox()->needsHomeObject();
     // HERITAGE is consumed inside emitFunction.
-    if (!emitFunction(constructor, isDerived, classMembers)) {
+    if (!emitFunction(ctor, isDerived, classMembers)) {
       //            [stack] HOMEOBJ CTOR
       return false;
     }
     if (nameKind == ClassNameKind::InferredName) {
-      if (!setFunName(constructor->funbox()->function(),
-                      nameForAnonymousClass)) {
+      if (!setFunName(ctor->funbox()->function(), nameForAnonymousClass)) {
         return false;
       }
     }
+    if (lse.isSome()) {
+      if (!lse->emitEnd()) {
+        return false;
+      }
+      lse.reset();
+    }
     if (!ce.emitInitConstructor(needsHomeObject)) {
       //            [stack] CTOR HOMEOBJ
       return false;
@@ -8788,6 +8781,11 @@ bool BytecodeEmitter::emitClass(
     //              [stack] CTOR HOMEOBJ
     return false;
   }
+
+  if (!emitCreateFieldKeys(classMembers)) {
+    return false;
+  }
+
   if (!ce.emitEnd(kind)) {
     //              [stack] # class declaration
     //              [stack]
diff --git a/js/src/frontend/BytecodeEmitter.h b/js/src/frontend/BytecodeEmitter.h
index 84f53b27c06d..3a76e901e1ec 100644
--- a/js/src/frontend/BytecodeEmitter.h
+++ b/js/src/frontend/BytecodeEmitter.h
@@ -480,9 +480,7 @@ struct MOZ_STACK_CLASS BytecodeEmitter {
   MOZ_MUST_USE bool emitCreateFieldKeys(ListNode* obj);
   MOZ_MUST_USE bool emitCreateFieldInitializers(ListNode* obj);
   const FieldInitializers& findFieldInitializersForCall();
-  MOZ_MUST_USE bool emitCopyInitializersToLocalInitializers();
-  enum class IsSuperCall : bool { No, Yes };
-  MOZ_MUST_USE bool emitInitializeInstanceFields(IsSuperCall isSuperCall);
+  MOZ_MUST_USE bool emitInitializeInstanceFields();
 
   // To catch accidental misuse, emitUint16Operand/emit3 assert that they are
   // not used to unconditionally emit JSOP_GETLOCAL. Variable access should
diff --git a/js/src/frontend/FullParseHandler.h b/js/src/frontend/FullParseHandler.h
index 75e5af8eecc3..949ba08a49dd 100644
--- a/js/src/frontend/FullParseHandler.h
+++ b/js/src/frontend/FullParseHandler.h
@@ -440,34 +440,35 @@ class FullParseHandler {
     return true;
   }
 
-  MOZ_MUST_USE bool addClassMethodDefinition(ListNodeType memberList, Node key,
-                                             FunctionNodeType funNode,
-                                             AccessorType atype,
-                                             bool isStatic) {
-    MOZ_ASSERT(memberList->isKind(ParseNodeKind::ClassMemberList));
+  MOZ_MUST_USE ClassMethod* newClassMethodDefinition(Node key,
+                                                     FunctionNodeType funNode,
+                                                     AccessorType atype,
+                                                     bool isStatic) {
     MOZ_ASSERT(isUsableAsObjectPropertyName(key));
 
     checkAndSetIsDirectRHSAnonFunction(funNode);
 
-    ClassMethod* classMethod = new_<ClassMethod>(key, funNode, atype, isStatic);
-    if (!classMethod) {
-      return false;
-    }
-    addList(/* list = */ memberList, /* kid = */ classMethod);
-    return true;
+    return new_<ClassMethod>(key, funNode, atype, isStatic);
   }
 
-  MOZ_MUST_USE bool addClassFieldDefinition(ListNodeType memberList, Node name,
-                                            FunctionNodeType initializer) {
-    MOZ_ASSERT(memberList->isKind(ParseNodeKind::ClassMemberList));
+  MOZ_MUST_USE ClassField* newClassFieldDefinition(
+      Node name, FunctionNodeType initializer) {
     MOZ_ASSERT(isUsableAsObjectPropertyName(name));
 
-    ClassField* classField = new_<ClassField>(name, initializer);
+    return new_<ClassField>(name, initializer);
+  }
 
-    if (!classField) {
-      return false;
-    }
-    addList(/* list = */ memberList, /* kid = */ classField);
+  MOZ_MUST_USE bool addClassMemberDefinition(ListNodeType memberList,
+                                             Node member) {
+    MOZ_ASSERT(memberList->isKind(ParseNodeKind::ClassMemberList));
+    // Constructors can be surrounded by LexicalScopes.
+    MOZ_ASSERT(member->isKind(ParseNodeKind::ClassMethod) ||
+               member->isKind(ParseNodeKind::ClassField) ||
+               member->isKind(ParseNodeKind::LexicalScope) &&
+                   member->as<LexicalScopeNode>().scopeBody()->isKind(
+                       ParseNodeKind::ClassMethod));
+
+    addList(/* list = */ memberList, /* kid = */ member);
     return true;
   }
 
diff --git a/js/src/frontend/FunctionEmitter.cpp b/js/src/frontend/FunctionEmitter.cpp
index 92a0f862ef24..ac85f56e17c0 100644
--- a/js/src/frontend/FunctionEmitter.cpp
+++ b/js/src/frontend/FunctionEmitter.cpp
@@ -477,14 +477,8 @@ bool FunctionScriptEmitter::prepareForBody() {
 
   if (funbox_->function()->kind() ==
       JSFunction::FunctionKind::ClassConstructor) {
-    if (funbox_->isDerivedClassConstructor()) {
-      if (!bce_->emitCopyInitializersToLocalInitializers()) {
-        //          [stack]
-        return false;
-      }
-    } else {
-      if (!bce_->emitInitializeInstanceFields(
-              BytecodeEmitter::IsSuperCall::No)) {
+    if (!funbox_->isDerivedClassConstructor()) {
+      if (!bce_->emitInitializeInstanceFields()) {
         //          [stack]
         return false;
       }
diff --git a/js/src/frontend/ParseNode.h b/js/src/frontend/ParseNode.h
index 403933af5273..9dd7feafd96c 100644
--- a/js/src/frontend/ParseNode.h
+++ b/js/src/frontend/ParseNode.h
@@ -2081,20 +2081,19 @@ class ClassNode : public TernaryNode {
   ClassNames* names() const {
     return kid1() ? &kid1()->as<ClassNames>() : nullptr;
   }
+
   ParseNode* heritage() const { return kid2(); }
+
   ListNode* memberList() const {
     ListNode* list =
         &kid3()->as<LexicalScopeNode>().scopeBody()->as<ListNode>();
     MOZ_ASSERT(list->isKind(ParseNodeKind::ClassMemberList));
     return list;
   }
-  bool isEmptyScope() const {
-    ParseNode* scope = kid3();
-    return scope->as<LexicalScopeNode>().isEmptyScope();
-  }
-  Handle<LexicalScope::Data*> scopeBindings() const {
-    ParseNode* scope = kid3();
-    return scope->as<LexicalScopeNode>().scopeBindings();
+
+  LexicalScopeNode* scopeBindings() const {
+    LexicalScopeNode* scope = &kid3()->as<LexicalScopeNode>();
+    return scope->isEmptyScope() ? nullptr : scope;
   }
 };
 
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index 8878ade77f68..e7b63abd1e9f 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -1939,13 +1939,6 @@ GeneralParser<ParseHandler, Unit>::functionBody(InHandling inHandling,
     }
   }
 
-  if (kind == FunctionSyntaxKind::DerivedClassConstructor) {
-    if (!noteDeclaredName(cx_->names().dotLocalInitializers,
-                          DeclarationKind::Var, pos())) {
-      return null();
-    }
-  }
-
   return finishLexicalScope(pc_->varScope(), body);
 }
 
@@ -2930,6 +2923,13 @@ bool GeneralParser<ParseHandler, Unit>::functionFormalParametersAndBody(
   FunctionBox* funbox = pc_->functionBox();
   RootedFunction fun(cx_, funbox->function());
 
+  if (kind == FunctionSyntaxKind::ClassConstructor ||
+      kind == FunctionSyntaxKind::DerivedClassConstructor) {
+    if (!noteUsedName(cx_->names().dotInitializers)) {
+      return null();
+    }
+  }
+
   // See below for an explanation why arrow function parameters and arrow
   // function bodies are parsed with different yield/await settings.
   {
@@ -6823,8 +6823,13 @@ bool GeneralParser<ParseHandler, Unit>::classMember(
       return false;
     }
 
-    return handler_.addClassFieldDefinition(classMembers, propName,
-                                            initializer);
+    ClassFieldType field =
+        handler_.newClassFieldDefinition(propName, initializer);
+    if (!field) {
+      return false;
+    }
+
+    return handler_.addClassMemberDefinition(classMembers, field);
   }
 
   if (propType != PropertyType::Getter && propType != PropertyType::Setter &&
@@ -6875,6 +6880,21 @@ bool GeneralParser<ParseHandler, Unit>::classMember(
       }
   }
 
+  // .fieldKeys must be declared outside the scope .initializers is declared in,
+  // hence this extra scope.
+  Maybe<ParseContext::Scope> dotInitializersScope;
+  if (isConstructor && !options().selfHostingMode) {
+    dotInitializersScope.emplace(this);
+    if (!dotInitializersScope->init(pc_)) {
+      return null();
+    }
+
+    if (!noteDeclaredName(cx_->names().dotInitializers, DeclarationKind::Let,
+                          pos())) {
+      return null();
+    }
+  }
+
   // Calling toString on constructors need to return the source text for
   // the entire class. The end offset is unknown at this point in
   // parsing and will be amended when class parsing finishes below.
@@ -6885,8 +6905,22 @@ bool GeneralParser<ParseHandler, Unit>::classMember(
   }
 
   AccessorType atype = ToAccessorType(propType);
-  return handler_.addClassMethodDefinition(classMembers, propName, funNode,
-                                           atype, isStatic);
+
+  Node method =
+      handler_.newClassMethodDefinition(propName, funNode, atype, isStatic);
+  if (!method) {
+    return false;
+  }
+
+  if (dotInitializersScope.isSome()) {
+    method = finishLexicalScope(*dotInitializersScope, method);
+    if (!method) {
+      return null();
+    }
+    dotInitializersScope.reset();
+  }
+
+  return handler_.addClassMemberDefinition(classMembers, method);
 }
 
 template <class ParseHandler, typename Unit>
@@ -6898,6 +6932,19 @@ bool GeneralParser<ParseHandler, Unit>::finishClassConstructor(
   // JSOP_DERIVEDCONSTRUCTOR due to needing to emit calls to the field
   // initializers in the constructor. So, synthesize a new one.
   if (classStmt.constructorBox == nullptr && numFields > 0) {
+    MOZ_ASSERT(!options().selfHostingMode);
+    // Unconditionally create the scope here, because it's always the
+    // constructor.
+    ParseContext::Scope dotInitializersScope(this);
+    if (!dotInitializersScope.init(pc_)) {
+      return null();
+    }
+
+    if (!noteDeclaredName(cx_->names().dotInitializers, DeclarationKind::Let,
+                          pos())) {
+      return null();
+    }
+
     // synthesizeConstructor assigns to classStmt.constructorBox
     FunctionNodeType synthesizedCtor =
         synthesizeConstructor(className, classStartOffset, hasHeritage);
@@ -6914,10 +6961,15 @@ bool GeneralParser<ParseHandler, Unit>::finishClassConstructor(
     if (!constructorNameNode) {
       return false;
     }
-
-    if (!handler_.addClassMethodDefinition(classMembers, constructorNameNode,
-                                           synthesizedCtor, AccessorType::None,
-                                           /* isStatic = */ false)) {
+    ClassMethodType method = handler_.newClassMethodDefinition(
+        constructorNameNode, synthesizedCtor, AccessorType::None,
+        /* isStatic = */ false);
+    if (!method) {
+      return false;
+    }
+    LexicalScopeNodeType scope =
+        finishLexicalScope(dotInitializersScope, method);
+    if (!handler_.addClassMemberDefinition(classMembers, scope)) {
       return false;
     }
   }
@@ -7042,37 +7094,6 @@ GeneralParser<ParseHandler, Unit>::classDefinition(
       }
     }
 
-    if (numFields > 0) {
-      // .initializers is always closed over by the constructor when there are
-      // fields with initializers. However, there's some strange circumstances
-      // which prevents us from using the normal noteUsedName() system. We
-      // cannot call noteUsedName(".initializers") when parsing the constructor,
-      // because .initializers should be marked as used *only if* there are
-      // fields with initializers. Even if we haven't seen any fields yet,
-      // there may be fields after the constructor.
-      // Consider the following class:
-      //
-      //  class C {
-      //    constructor() {
-      //      // do we noteUsedName(".initializers") here?
-      //    }
-      //    // ... because there might be some fields down here.
-      //  }
-      //
-      // So, instead, at the end of class parsing (where we are now), we do some
-      // tricks to pretend that noteUsedName(".initializers") was called in the
-      // constructor.
-      if (!usedNames_.markAsAlwaysClosedOver(cx_, cx_->names().dotInitializers,
-                                             pc_->scriptId(),
-                                             pc_->innermostScope()->id())) {
-        return null();
-      }
-      if (!noteDeclaredName(cx_->names().dotInitializers, DeclarationKind::Let,
-                            namePos)) {
-        return null();
-      }
-    }
-
     if (numFieldKeys > 0) {
       if (!noteDeclaredName(cx_->names().dotFieldKeys, DeclarationKind::Let,
                             namePos)) {
@@ -7209,14 +7230,8 @@ GeneralParser<ParseHandler, Unit>::synthesizeConstructor(
     return null();
   }
 
-  // One might expect a noteUsedName(".initializers") here. See comment in
-  // GeneralParser<ParseHandler, Unit>::classDefinition on why it's not here.
-
-  if (hasHeritage == HasHeritage::Yes) {
-    if (!noteDeclaredName(cx_->names().dotLocalInitializers,
-                          DeclarationKind::Var, synthesizedBodyPos)) {
-      return null();
-    }
+  if (!noteUsedName(cx_->names().dotInitializers)) {
+    return null();
   }
 
   bool canSkipLazyClosedOverBindings = handler_.canSkipLazyClosedOverBindings();
@@ -7267,10 +7282,6 @@ GeneralParser<ParseHandler, Unit>::synthesizeConstructor(
       return null();
     }
 
-    if (!noteUsedName(cx_->names().dotLocalInitializers)) {
-      return null();
-    }
-
     UnaryNodeType exprStatement =
         handler_.newExprStatement(setThis, synthesizedBodyPos.end);
     if (!exprStatement) {
@@ -9028,7 +9039,7 @@ typename ParseHandler::Node GeneralParser<ParseHandler, Unit>::memberExpr(
           return null();
         }
 
-        if (!noteUsedName(cx_->names().dotLocalInitializers)) {
+        if (!noteUsedName(cx_->names().dotInitializers)) {
           return null();
         }
       } else {
diff --git a/js/src/frontend/SyntaxParseHandler.h b/js/src/frontend/SyntaxParseHandler.h
index 9824d75431f3..1491173dcd9c 100644
--- a/js/src/frontend/SyntaxParseHandler.h
+++ b/js/src/frontend/SyntaxParseHandler.h
@@ -348,14 +348,17 @@ class SyntaxParseHandler {
                                               AccessorType atype) {
     return true;
   }
-  MOZ_MUST_USE bool addClassMethodDefinition(ListNodeType memberList, Node key,
-                                             FunctionNodeType funNode,
+  MOZ_MUST_USE Node newClassMethodDefinition(Node key, FunctionNodeType funNode,
                                              AccessorType atype,
                                              bool isStatic) {
-    return true;
+    return NodeGeneric;
   }
-  MOZ_MUST_USE bool addClassFieldDefinition(ListNodeType memberList, Node name,
+  MOZ_MUST_USE Node newClassFieldDefinition(Node name,
                                             FunctionNodeType initializer) {
+    return NodeGeneric;
+  }
+  MOZ_MUST_USE bool addClassMemberDefinition(ListNodeType memberList,
+                                             Node member) {
     return true;
   }
   UnaryNodeType newYieldExpression(uint32_t begin, Node value) {
diff --git a/js/src/jit-test/tests/fields/bug1547467.js b/js/src/jit-test/tests/fields/bug1547467.js
new file mode 100644
index 000000000000..adc41435870b
--- /dev/null
+++ b/js/src/jit-test/tests/fields/bug1547467.js
@@ -0,0 +1,19 @@
+// |jit-test| --enable-experimental-fields
+
+load(libdir + "asserts.js");
+
+assertThrowsInstanceOf(() => {
+        class foo extends null {
+            constructor(a = class bar extends bar {}) {}
+        }
+        new foo();
+    },
+    ReferenceError
+)
+
+class B { }
+class C extends B {
+    constructor(a = class D { [super()] = 5; }) {
+    }
+}
+new C()
diff --git a/js/src/jit-test/tests/fields/super.js b/js/src/jit-test/tests/fields/super.js
index a040fac79b4a..1bcd8c1ccb4a 100644
--- a/js/src/jit-test/tests/fields/super.js
+++ b/js/src/jit-test/tests/fields/super.js
@@ -6,12 +6,14 @@ class Base {
 class C extends Base {
   field;
 }
-new C();
+let c = new C();
+assertEq(true, "field" in c);
 
 var D = class extends Base {
   field;
 };
-new D();
+let d = new D();
+assertEq(true, "field" in d);
 
 class E extends Base {
   field;
@@ -19,7 +21,8 @@ class E extends Base {
     super();
   }
 };
-new E();
+let e = new E();
+assertEq(true, "field" in e);
 
 class F extends Base {
   constructor() {
@@ -27,7 +30,8 @@ class F extends Base {
   }
   field;
 };
-new F();
+let f = new F();
+assertEq(true, "field" in f);
 
 class G extends Base {
   field2 = 2;
@@ -36,7 +40,9 @@ class G extends Base {
   }
   field3 = 3;
 };
-new G();
+let g = new G();
+assertEq(2, g.field2);
+assertEq(3, g.field3);
 
 class H extends Base {
   field = 2;
@@ -44,14 +50,29 @@ class H extends Base {
     eval("super()");
   }
 };
-new H();
+let h = new H();
+assertEq(2, h.field);
 
 class I extends Base {
   field = 2;
   constructor() {
       class Tmp {
+          field = 10;
           [super()];
       }
   }
 };
-new I();
+let i = new I();
+assertEq(2, i.field);
+
+class J extends Base {
+  field = 2;
+  constructor() {
+      class Tmp {
+          field = 10;
+          [super()](){}
+      }
+  }
+};
+let j = new J();
+assertEq(2, j.field);
diff --git a/js/src/vm/CommonPropertyNames.h b/js/src/vm/CommonPropertyNames.h
index 40a1c1e860ac..ec272125a050 100644
--- a/js/src/vm/CommonPropertyNames.h
+++ b/js/src/vm/CommonPropertyNames.h
@@ -122,7 +122,6 @@
   MACRO(dotGenerator, dotGenerator, ".generator")                              \
   MACRO(dotThis, dotThis, ".this")                                             \
   MACRO(dotInitializers, dotInitializers, ".initializers")                     \
-  MACRO(dotLocalInitializers, dotLocalInitializers, ".localInitializers")      \
   MACRO(dotFieldKeys, dotFieldKeys, ".fieldKeys")                              \
   MACRO(each, each, "each")                                                    \
   MACRO(elementType, elementType, "elementType")                               \

From 5b2a4e74f30edb3511e9d8ffe1777430df45bc17 Mon Sep 17 00:00:00 2001
From: Ashley Hauck <khyperia@mozilla.com>
Date: Mon, 20 May 2019 18:36:33 +0000
Subject: [PATCH 054/129] Bug 1552229 - Emit field keys in correct order.
 r=jorendorff

Differential Revision: https://phabricator.services.mozilla.com/D31495

--HG--
extra : moz-landing-system : lando
---
 js/src/frontend/BytecodeEmitter.cpp        | 76 ++++++++++++----------
 js/src/jit-test/tests/fields/bug1552229.js | 17 +++++
 2 files changed, 58 insertions(+), 35 deletions(-)
 create mode 100644 js/src/jit-test/tests/fields/bug1552229.js

diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index 5d0c3cf1283c..d5a87617e8ac 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -7636,11 +7636,43 @@ bool BytecodeEmitter::emitPropertyList(ListNode* obj, PropertyEmitter& pe,
                                        PropListType type) {
   //                [stack] CTOR? OBJ
 
+  size_t curFieldKeyIndex = 0;
   for (ParseNode* propdef : obj->contents()) {
     if (propdef->is<ClassField>()) {
-      // Skip over class fields and emit them at the end.  This is needed
-      // because they're all emitted into a single array, which is then stored
-      // into a local variable.
+      MOZ_ASSERT(type == ClassBody);
+      // Only handle computing field keys here: the .initializers lambda array
+      // is created elsewhere.
+      ClassField* field = &propdef->as<ClassField>();
+      if (field->name().getKind() == ParseNodeKind::ComputedName) {
+        if (!emitGetName(cx->names().dotFieldKeys)) {
+          //        [stack] CTOR? OBJ ARRAY
+          return false;
+        }
+
+        ParseNode* nameExpr = field->name().as<UnaryNode>().kid();
+
+        if (!emitTree(nameExpr)) {
+          //        [stack] CTOR? OBJ ARRAY KEY
+          return false;
+        }
+
+        if (!emit1(JSOP_TOID)) {
+          //        [stack] CTOR? OBJ ARRAY KEY
+          return false;
+        }
+
+        if (!emitUint32Operand(JSOP_INITELEM_ARRAY, curFieldKeyIndex)) {
+          //        [stack] CTOR? OBJ ARRAY
+          return false;
+        }
+
+        if (!emit1(JSOP_POP)) {
+          //        [stack] CTOR? OBJ
+          return false;
+        }
+
+        curFieldKeyIndex++;
+      }
       continue;
     }
 
@@ -7943,7 +7975,8 @@ FieldInitializers BytecodeEmitter::setupFieldInitializers(
 //   }
 // }
 //
-// BytecodeEmitter::emitCreateFieldKeys does `let .fieldKeys = [keyExpr, ...];`
+// BytecodeEmitter::emitCreateFieldKeys does `let .fieldKeys = [...];`
+// BytecodeEmitter::emitPropertyList fills in the elements of the array.
 // See GeneralParser::fieldInitializer for the `this[.fieldKeys[0]]` part.
 bool BytecodeEmitter::emitCreateFieldKeys(ListNode* obj) {
   size_t numFieldKeys = 0;
@@ -7971,34 +8004,6 @@ bool BytecodeEmitter::emitCreateFieldKeys(ListNode* obj) {
     return false;
   }
 
-  size_t curFieldKeyIndex = 0;
-  for (ParseNode* propdef : obj->contents()) {
-    if (propdef->is<ClassField>()) {
-      ClassField* field = &propdef->as<ClassField>();
-      if (field->name().getKind() == ParseNodeKind::ComputedName) {
-        ParseNode* nameExpr = field->name().as<UnaryNode>().kid();
-
-        if (!emitTree(nameExpr)) {
-          //        [stack] ARRAY KEY
-          return false;
-        }
-
-        if (!emit1(JSOP_TOID)) {
-          //        [stack] ARRAY KEY
-          return false;
-        }
-
-        if (!emitUint32Operand(JSOP_INITELEM_ARRAY, curFieldKeyIndex)) {
-          //        [stack] ARRAY
-          return false;
-        }
-
-        curFieldKeyIndex++;
-      }
-    }
-  }
-  MOZ_ASSERT(curFieldKeyIndex == numFieldKeys);
-
   if (!noe.emitAssignment()) {
     //              [stack] ARRAY
     return false;
@@ -8777,12 +8782,13 @@ bool BytecodeEmitter::emitClass(
       return false;
     }
   }
-  if (!emitPropertyList(classMembers, ce, ClassBody)) {
-    //              [stack] CTOR HOMEOBJ
+
+  if (!emitCreateFieldKeys(classMembers)) {
     return false;
   }
 
-  if (!emitCreateFieldKeys(classMembers)) {
+  if (!emitPropertyList(classMembers, ce, ClassBody)) {
+    //              [stack] CTOR HOMEOBJ
     return false;
   }
 
diff --git a/js/src/jit-test/tests/fields/bug1552229.js b/js/src/jit-test/tests/fields/bug1552229.js
new file mode 100644
index 000000000000..649ea010df24
--- /dev/null
+++ b/js/src/jit-test/tests/fields/bug1552229.js
@@ -0,0 +1,17 @@
+// |jit-test| --enable-experimental-fields
+
+let i = 0;
+function f(x) {
+    assertEq(++i, x);
+    return x;
+}
+class C{
+    [f(1)](){}
+    [f(2)] = "hi";
+    [f(3)](){}
+    [f(4)] = "hi";
+}
+new C();
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);

From 75dc4381a5dc3f4b8fa0eedf9a6e4d6d7d4f6957 Mon Sep 17 00:00:00 2001
From: Ashley Hauck <khyperia@mozilla.com>
Date: Mon, 20 May 2019 18:35:21 +0000
Subject: [PATCH 055/129] Bug 1551454 - Don't name field initializer lambdas.
 r=jorendorff

Differential Revision: https://phabricator.services.mozilla.com/D31500

--HG--
extra : moz-landing-system : lando
---
 js/src/frontend/Parser.cpp                   |  2 +-
 js/src/jit-test/tests/fields/bug1551454.js   | 14 ++++++++++++++
 js/src/jit-test/tests/fields/bug1551454_2.js |  8 ++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 js/src/jit-test/tests/fields/bug1551454.js
 create mode 100644 js/src/jit-test/tests/fields/bug1551454_2.js

diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index e7b63abd1e9f..b71b2a79df56 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -7335,7 +7335,7 @@ GeneralParser<ParseHandler, Unit>::fieldInitializerOpt(
   }
 
   // Create the function object.
-  RootedFunction fun(cx_, newFunction(propAtom, FunctionSyntaxKind::Expression,
+  RootedFunction fun(cx_, newFunction(nullptr, FunctionSyntaxKind::Expression,
                                       GeneratorKind::NotGenerator,
                                       FunctionAsyncKind::SyncFunction));
   if (!fun) {
diff --git a/js/src/jit-test/tests/fields/bug1551454.js b/js/src/jit-test/tests/fields/bug1551454.js
new file mode 100644
index 000000000000..cb17af397d52
--- /dev/null
+++ b/js/src/jit-test/tests/fields/bug1551454.js
@@ -0,0 +1,14 @@
+// |jit-test| --enable-experimental-fields
+
+class C {
+  1 = eval();
+}
+new C();
+
+class D {
+  1.5 = eval();
+}
+new D();
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
diff --git a/js/src/jit-test/tests/fields/bug1551454_2.js b/js/src/jit-test/tests/fields/bug1551454_2.js
new file mode 100644
index 000000000000..ee182cbac8c1
--- /dev/null
+++ b/js/src/jit-test/tests/fields/bug1551454_2.js
@@ -0,0 +1,8 @@
+// |jit-test| --enable-experimental-fields
+
+let f = 1;
+class X { f=f; }
+assertEq(new X().f, 1);
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);

From 42b93f68cde618cb657e7f3f27ebf59df3e529dc Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 18:21:34 +0000
Subject: [PATCH 056/129] Bug 1551407 - Improve readability of
 LoginAutoCompleteResult. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31028

--HG--
extra : moz-landing-system : lando
---
 .../passwordmgr/LoginAutoCompleteResult.jsm   | 60 ++++++++++---------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
index d44793b9e241..745d53351f3b 100644
--- a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
@@ -37,36 +37,40 @@ XPCOMUtils.defineLazyGetter(this, "log", () => {
   return LoginHelper.createLogger("LoginAutoCompleteResult");
 });
 
+function loginSort(a, b) {
+  let userA = a.username.toLowerCase();
+  let userB = b.username.toLowerCase();
+
+  if (userA < userB) {
+    return -1;
+  }
+
+  if (userA > userB) {
+    return 1;
+  }
+
+  return 0;
+}
+
+function findDuplicates(loginList) {
+  let seen = new Set();
+  let duplicates = new Set();
+  for (let login of loginList) {
+    if (seen.has(login.username)) {
+      duplicates.add(login.username);
+    }
+    seen.add(login.username);
+  }
+  return duplicates;
+}
 
 // nsIAutoCompleteResult implementation
-function LoginAutoCompleteResult(aSearchString, matchingLogins, {isSecure, messageManager, isPasswordField, hostname}) {
-  function loginSort(a, b) {
-    let userA = a.username.toLowerCase();
-    let userB = b.username.toLowerCase();
-
-    if (userA < userB) {
-      return -1;
-    }
-
-    if (userA > userB) {
-      return 1;
-    }
-
-    return 0;
-  }
-
-  function findDuplicates(loginList) {
-    let seen = new Set();
-    let duplicates = new Set();
-    for (let login of loginList) {
-      if (seen.has(login.username)) {
-        duplicates.add(login.username);
-      }
-      seen.add(login.username);
-    }
-    return duplicates;
-  }
-
+function LoginAutoCompleteResult(aSearchString, matchingLogins, {
+  isSecure,
+  messageManager,
+  isPasswordField,
+  hostname,
+}) {
   let hidingFooterOnPWFieldAutoOpened = false;
   function isFooterEnabled() {
     // We need to check LoginHelper.enabled here since the insecure warning should

From b2364909021f9e7ec72c28254c7bb318d3e4ab7e Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 18:21:36 +0000
Subject: [PATCH 057/129] Bug 1551407 - Move string utilities to the top-level
 of LoginAutoCompleteResult.jsm. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31029

--HG--
extra : moz-landing-system : lando
---
 .../passwordmgr/LoginAutoCompleteResult.jsm    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
index 745d53351f3b..70a279231c16 100644
--- a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
@@ -36,6 +36,9 @@ XPCOMUtils.defineLazyPreferenceGetter(this, "SHOULD_SHOW_ORIGIN",
 XPCOMUtils.defineLazyGetter(this, "log", () => {
   return LoginHelper.createLogger("LoginAutoCompleteResult");
 });
+XPCOMUtils.defineLazyGetter(this, "passwordMgrBundle", () => {
+  return Services.strings.createBundle("chrome://passwordmgr/locale/passwordmgr.properties");
+});
 
 function loginSort(a, b) {
   let userA = a.username.toLowerCase();
@@ -64,6 +67,13 @@ function findDuplicates(loginList) {
   return duplicates;
 }
 
+function getLocalizedString(key, formatArgs = null) {
+  if (formatArgs) {
+    return passwordMgrBundle.formatStringFromName(key, formatArgs, formatArgs.length);
+  }
+  return passwordMgrBundle.GetStringFromName(key);
+}
+
 // nsIAutoCompleteResult implementation
 function LoginAutoCompleteResult(aSearchString, matchingLogins, {
   isSecure,
@@ -102,7 +112,6 @@ function LoginAutoCompleteResult(aSearchString, matchingLogins, {
   this.logins = matchingLogins.sort(loginSort);
   this.matchCount = matchingLogins.length + this._showInsecureFieldWarning + this._showAutoCompleteFooter;
   this._messageManager = messageManager;
-  this._stringBundle = Services.strings.createBundle("chrome://passwordmgr/locale/passwordmgr.properties");
   this._dateAndTimeFormatter = new Services.intl.DateTimeFormat(undefined, { dateStyle: "medium" });
 
   this._isPasswordField = isPasswordField;
@@ -164,13 +173,6 @@ LoginAutoCompleteResult.prototype = {
       throw new Error("Index out of range.");
     }
 
-    let getLocalizedString = (key, formatArgs = null) => {
-      if (formatArgs) {
-        return this._stringBundle.formatStringFromName(key, formatArgs, formatArgs.length);
-      }
-      return this._stringBundle.GetStringFromName(key);
-    };
-
     if (this._showInsecureFieldWarning && index === 0) {
       let learnMoreString = getLocalizedString("insecureFieldWarningLearnMore");
       return getLocalizedString("insecureFieldWarningDescription2", [learnMoreString]);

From aa0549cee3e17e889c63858f11b46606c8edf03b Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 18:21:38 +0000
Subject: [PATCH 058/129] Bug 1551407 - Make a class for each style of login
 autocomplete item. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31030

--HG--
extra : moz-landing-system : lando
---
 .../passwordmgr/LoginAutoCompleteResult.jsm   | 60 +++++++++++++++----
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
index 70a279231c16..f927ced20bbd 100644
--- a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
@@ -74,6 +74,32 @@ function getLocalizedString(key, formatArgs = null) {
   return passwordMgrBundle.GetStringFromName(key);
 }
 
+
+class AutocompleteItem {
+  constructor(style) {
+    this.style = style;
+  }
+}
+
+class InsecureLoginFormAutocompleteItem extends AutocompleteItem {
+  constructor() {
+    super("insecureWarning");
+  }
+}
+
+class LoginAutocompleteItem extends AutocompleteItem {
+  constructor(login) {
+    super(SHOULD_SHOW_ORIGIN ? "loginWithOrigin" : "login");
+  }
+}
+
+class LoginsFooterAutocompleteItem extends AutocompleteItem {
+  constructor() {
+    super("loginsFooter");
+  }
+}
+
+
 // nsIAutoCompleteResult implementation
 function LoginAutoCompleteResult(aSearchString, matchingLogins, {
   isSecure,
@@ -107,10 +133,9 @@ function LoginAutoCompleteResult(aSearchString, matchingLogins, {
 
   this._showInsecureFieldWarning = (!isSecure && LoginHelper.showInsecureFieldWarning) ? 1 : 0;
   this._showAutoCompleteFooter = isFooterEnabled() ? 1 : 0;
-  this._showOrigin = SHOULD_SHOW_ORIGIN ? 1 : 0;
-  this.searchString = aSearchString;
+
   this.logins = matchingLogins.sort(loginSort);
-  this.matchCount = matchingLogins.length + this._showInsecureFieldWarning + this._showAutoCompleteFooter;
+  this.searchString = aSearchString;
   this._messageManager = messageManager;
   this._dateAndTimeFormatter = new Services.intl.DateTimeFormat(undefined, { dateStyle: "medium" });
 
@@ -119,6 +144,21 @@ function LoginAutoCompleteResult(aSearchString, matchingLogins, {
 
   this._duplicateUsernames = findDuplicates(matchingLogins);
 
+  // Build up the results array
+  this.results = [];
+  if (this._showInsecureFieldWarning) {
+    this.results.push(new InsecureLoginFormAutocompleteItem());
+  }
+
+  for (let login of this.logins) {
+    this.results.push(new LoginAutocompleteItem(login));
+  }
+
+  if (this._showAutoCompleteFooter) {
+    this.results.push(new LoginsFooterAutocompleteItem());
+  }
+
+
   if (this.matchCount > 0) {
     this.searchResult = Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
     this.defaultIndex = 0;
@@ -148,7 +188,9 @@ LoginAutoCompleteResult.prototype = {
   searchResult: Ci.nsIAutoCompleteResult.RESULT_NOMATCH,
   defaultIndex: -1,
   errorDescription: "",
-  matchCount: 0,
+  get matchCount() {
+    return this.results.length;
+  },
 
   getValueAt(index) {
     if (index < 0 || index >= this.matchCount) {
@@ -214,15 +256,7 @@ LoginAutoCompleteResult.prototype = {
   },
 
   getStyleAt(index) {
-    if (index == 0 && this._showInsecureFieldWarning) {
-      return "insecureWarning";
-    } else if (this._showAutoCompleteFooter && index == this.matchCount - 1) {
-      return "loginsFooter";
-    } else if (this._showOrigin) {
-      return "loginWithOrigin";
-    }
-
-    return "login";
+    return this.results[index].style;
   },
 
   getImageAt(index) {

From 0a894e862241721b43f0847086d71473e763a39b Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 18:21:40 +0000
Subject: [PATCH 059/129] Bug 1551407 - Read login autocomplete labels from the
 AutocompleteItem instance. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31031

--HG--
extra : moz-landing-system : lando
---
 .../passwordmgr/LoginAutoCompleteResult.jsm   | 65 ++++++++++---------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
index f927ced20bbd..77500fc4ab4b 100644
--- a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
@@ -84,18 +84,45 @@ class AutocompleteItem {
 class InsecureLoginFormAutocompleteItem extends AutocompleteItem {
   constructor() {
     super("insecureWarning");
+
+    XPCOMUtils.defineLazyGetter(this, "label", () => {
+      let learnMoreString = getLocalizedString("insecureFieldWarningLearnMore");
+      return getLocalizedString("insecureFieldWarningDescription2", [learnMoreString]);
+    });
   }
 }
 
 class LoginAutocompleteItem extends AutocompleteItem {
-  constructor(login) {
+  constructor(login, dateAndTimeFormatter, duplicateUsernames) {
     super(SHOULD_SHOW_ORIGIN ? "loginWithOrigin" : "login");
+
+    XPCOMUtils.defineLazyGetter(this, "label", () => {
+      let username = login.username;
+      // If login is empty or duplicated we want to append a modification date to it.
+      if (!username || duplicateUsernames.has(username)) {
+        if (!username) {
+          username = getLocalizedString("noUsername");
+        }
+        let meta = login.QueryInterface(Ci.nsILoginMetaInfo);
+        let time = dateAndTimeFormatter.format(new Date(meta.timePasswordChanged));
+        username = getLocalizedString("loginHostAge", [username, time]);
+      }
+
+      return username;
+    });
   }
 }
 
 class LoginsFooterAutocompleteItem extends AutocompleteItem {
-  constructor() {
+  constructor(hostname) {
     super("loginsFooter");
+
+    XPCOMUtils.defineLazyGetter(this, "label", () => {
+      return JSON.stringify({
+        label: getLocalizedString("viewSavedLogins.label"),
+        hostname,
+      });
+    });
   }
 }
 
@@ -137,12 +164,11 @@ function LoginAutoCompleteResult(aSearchString, matchingLogins, {
   this.logins = matchingLogins.sort(loginSort);
   this.searchString = aSearchString;
   this._messageManager = messageManager;
-  this._dateAndTimeFormatter = new Services.intl.DateTimeFormat(undefined, { dateStyle: "medium" });
+  let dateAndTimeFormatter = new Services.intl.DateTimeFormat(undefined, { dateStyle: "medium" });
 
   this._isPasswordField = isPasswordField;
-  this._hostname = hostname;
 
-  this._duplicateUsernames = findDuplicates(matchingLogins);
+  let duplicateUsernames = findDuplicates(matchingLogins);
 
   // Build up the results array
   this.results = [];
@@ -151,11 +177,11 @@ function LoginAutoCompleteResult(aSearchString, matchingLogins, {
   }
 
   for (let login of this.logins) {
-    this.results.push(new LoginAutocompleteItem(login));
+    this.results.push(new LoginAutocompleteItem(login, dateAndTimeFormatter, duplicateUsernames));
   }
 
   if (this._showAutoCompleteFooter) {
-    this.results.push(new LoginsFooterAutocompleteItem());
+    this.results.push(new LoginsFooterAutocompleteItem(hostname));
   }
 
 
@@ -214,30 +240,7 @@ LoginAutoCompleteResult.prototype = {
     if (index < 0 || index >= this.matchCount) {
       throw new Error("Index out of range.");
     }
-
-    if (this._showInsecureFieldWarning && index === 0) {
-      let learnMoreString = getLocalizedString("insecureFieldWarningLearnMore");
-      return getLocalizedString("insecureFieldWarningDescription2", [learnMoreString]);
-    } else if (this._showAutoCompleteFooter && index === this.matchCount - 1) {
-      return JSON.stringify({
-        label: getLocalizedString("viewSavedLogins.label"),
-        hostname: this._hostname,
-      });
-    }
-
-    let login = this.logins[index - this._showInsecureFieldWarning];
-    let username = login.username;
-    // If login is empty or duplicated we want to append a modification date to it.
-    if (!username || this._duplicateUsernames.has(username)) {
-      if (!username) {
-        username = getLocalizedString("noUsername");
-      }
-      let meta = login.QueryInterface(Ci.nsILoginMetaInfo);
-      let time = this._dateAndTimeFormatter.format(new Date(meta.timePasswordChanged));
-      username = getLocalizedString("loginHostAge", [username, time]);
-    }
-
-    return username;
+    return this.results[index].label;
   },
 
   getCommentAt(index) {

From 768fd0dac1694b6bd00e88d9e48676084ef9939d Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 18:21:42 +0000
Subject: [PATCH 060/129] Bug 1551407 - Read login autocomplete values from the
 AutocompleteItem instance. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31032

--HG--
extra : moz-landing-system : lando
---
 .../passwordmgr/LoginAutoCompleteResult.jsm   | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
index 77500fc4ab4b..1b3fb30a1bc9 100644
--- a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
@@ -78,6 +78,7 @@ function getLocalizedString(key, formatArgs = null) {
 class AutocompleteItem {
   constructor(style) {
     this.style = style;
+    this.value = "";
   }
 }
 
@@ -93,7 +94,7 @@ class InsecureLoginFormAutocompleteItem extends AutocompleteItem {
 }
 
 class LoginAutocompleteItem extends AutocompleteItem {
-  constructor(login, dateAndTimeFormatter, duplicateUsernames) {
+  constructor(login, isPasswordField, dateAndTimeFormatter, duplicateUsernames) {
     super(SHOULD_SHOW_ORIGIN ? "loginWithOrigin" : "login");
 
     XPCOMUtils.defineLazyGetter(this, "label", () => {
@@ -110,6 +111,10 @@ class LoginAutocompleteItem extends AutocompleteItem {
 
       return username;
     });
+
+    XPCOMUtils.defineLazyGetter(this, "value", () => {
+      return isPasswordField ? login.password : login.username;
+    });
   }
 }
 
@@ -166,8 +171,6 @@ function LoginAutoCompleteResult(aSearchString, matchingLogins, {
   this._messageManager = messageManager;
   let dateAndTimeFormatter = new Services.intl.DateTimeFormat(undefined, { dateStyle: "medium" });
 
-  this._isPasswordField = isPasswordField;
-
   let duplicateUsernames = findDuplicates(matchingLogins);
 
   // Build up the results array
@@ -177,7 +180,7 @@ function LoginAutoCompleteResult(aSearchString, matchingLogins, {
   }
 
   for (let login of this.logins) {
-    this.results.push(new LoginAutocompleteItem(login, dateAndTimeFormatter, duplicateUsernames));
+    this.results.push(new LoginAutocompleteItem(login, isPasswordField, dateAndTimeFormatter, duplicateUsernames));
   }
 
   if (this._showAutoCompleteFooter) {
@@ -222,18 +225,7 @@ LoginAutoCompleteResult.prototype = {
     if (index < 0 || index >= this.matchCount) {
       throw new Error("Index out of range.");
     }
-
-    if (this._showInsecureFieldWarning && index === 0) {
-      return "";
-    }
-
-    if (this._showAutoCompleteFooter && index === this.matchCount - 1) {
-      return "";
-    }
-
-    let selectedLogin = this.logins[index - this._showInsecureFieldWarning];
-
-    return this._isPasswordField ? selectedLogin.password : selectedLogin.username;
+    return this.results[index].value;
   },
 
   getLabelAt(index) {

From f1aa142e4305156a6f9d926ff851e31681a37962 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 18:21:51 +0000
Subject: [PATCH 061/129] Bug 1551407 - Read login autocomplete comments from
 the AutocompleteItem instance. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31033

--HG--
extra : moz-landing-system : lando
---
 .../passwordmgr/LoginAutoCompleteResult.jsm   | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
index 1b3fb30a1bc9..1276ecbef05e 100644
--- a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
@@ -77,6 +77,7 @@ function getLocalizedString(key, formatArgs = null) {
 
 class AutocompleteItem {
   constructor(style) {
+    this.comment = "";
     this.style = style;
     this.value = "";
   }
@@ -115,6 +116,12 @@ class LoginAutocompleteItem extends AutocompleteItem {
     XPCOMUtils.defineLazyGetter(this, "value", () => {
       return isPasswordField ? login.password : login.username;
     });
+
+    XPCOMUtils.defineLazyGetter(this, "comment", () => {
+      return JSON.stringify({
+        loginOrigin: login.hostname,
+      });
+    });
   }
 }
 
@@ -236,18 +243,10 @@ LoginAutoCompleteResult.prototype = {
   },
 
   getCommentAt(index) {
-    if (this._showInsecureFieldWarning && index === 0) {
-      return "";
+    if (index < 0 || index >= this.matchCount) {
+      throw new Error("Index out of range.");
     }
-
-    if (this._showAutoCompleteFooter && index === this.matchCount - 1) {
-      return "";
-    }
-
-    let login = this.logins[index - this._showInsecureFieldWarning];
-    return JSON.stringify({
-      loginOrigin: login.hostname,
-    });
+    return this.results[index].comment;
   },
 
   getStyleAt(index) {

From d524aca3c63dee8aa9e138b21c3ce41082f2f6b1 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 19:17:05 +0000
Subject: [PATCH 062/129] Bug 1551407 - Delete login autocomplete rows using
 the AutocompleteItem instance. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31034

--HG--
extra : moz-landing-system : lando
---
 .../passwordmgr/LoginAutoCompleteResult.jsm   | 58 +++++++++----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
index 1276ecbef05e..f6094f38b274 100644
--- a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
@@ -81,6 +81,8 @@ class AutocompleteItem {
     this.style = style;
     this.value = "";
   }
+
+  removeFromStorage() { /* Do nothing by default */ }
 }
 
 class InsecureLoginFormAutocompleteItem extends AutocompleteItem {
@@ -95,8 +97,10 @@ class InsecureLoginFormAutocompleteItem extends AutocompleteItem {
 }
 
 class LoginAutocompleteItem extends AutocompleteItem {
-  constructor(login, isPasswordField, dateAndTimeFormatter, duplicateUsernames) {
+  constructor(login, isPasswordField, dateAndTimeFormatter, duplicateUsernames, messageManager) {
     super(SHOULD_SHOW_ORIGIN ? "loginWithOrigin" : "login");
+    this._login = login;
+    this._messageManager = messageManager;
 
     XPCOMUtils.defineLazyGetter(this, "label", () => {
       let username = login.username;
@@ -123,6 +127,16 @@ class LoginAutocompleteItem extends AutocompleteItem {
       });
     });
   }
+
+  removeFromStorage() {
+    if (this._messageManager) {
+      let vanilla = LoginHelper.loginToVanillaObject(this._login);
+      this._messageManager.sendAsyncMessage("PasswordManager:removeLogin",
+                                            { login: vanilla });
+    } else {
+      Services.logins.removeLogin(this._login);
+    }
+  }
 }
 
 class LoginsFooterAutocompleteItem extends AutocompleteItem {
@@ -173,9 +187,8 @@ function LoginAutoCompleteResult(aSearchString, matchingLogins, {
   this._showInsecureFieldWarning = (!isSecure && LoginHelper.showInsecureFieldWarning) ? 1 : 0;
   this._showAutoCompleteFooter = isFooterEnabled() ? 1 : 0;
 
-  this.logins = matchingLogins.sort(loginSort);
+  let logins = matchingLogins.sort(loginSort);
   this.searchString = aSearchString;
-  this._messageManager = messageManager;
   let dateAndTimeFormatter = new Services.intl.DateTimeFormat(undefined, { dateStyle: "medium" });
 
   let duplicateUsernames = findDuplicates(matchingLogins);
@@ -186,8 +199,10 @@ function LoginAutoCompleteResult(aSearchString, matchingLogins, {
     this.results.push(new InsecureLoginFormAutocompleteItem());
   }
 
-  for (let login of this.logins) {
-    this.results.push(new LoginAutocompleteItem(login, isPasswordField, dateAndTimeFormatter, duplicateUsernames));
+  for (let login of logins) {
+    let item = new LoginAutocompleteItem(login, isPasswordField, dateAndTimeFormatter,
+                                         duplicateUsernames, messageManager);
+    this.results.push(item);
   }
 
   if (this._showAutoCompleteFooter) {
@@ -211,7 +226,11 @@ LoginAutoCompleteResult.prototype = {
                                           Ci.nsISupportsWeakReference]),
 
   // private
-  logins: null,
+  get logins() {
+    return this.results.filter(item => {
+      return item.constructor === LoginAutocompleteItem;
+    }).map(item => item._login);
+  },
 
   // Allow autoCompleteSearch to get at the JS object so it can
   // modify some readonly properties for internal use.
@@ -266,35 +285,14 @@ LoginAutoCompleteResult.prototype = {
       throw new Error("Index out of range.");
     }
 
-    if (this._showInsecureFieldWarning && index === 0) {
-      // Ignore the warning message item.
-      return;
-    }
+    let [removedItem] = this.results.splice(index, 1);
 
-    if (this._showInsecureFieldWarning) {
-      index--;
-    }
-
-    // The user cannot delete the autocomplete footer.
-    if (this._showAutoCompleteFooter && index === this.matchCount - 1) {
-      return;
-    }
-
-    let [removedLogin] = this.logins.splice(index, 1);
-
-    this.matchCount--;
-    if (this.defaultIndex > this.logins.length) {
+    if (this.defaultIndex > this.results.length) {
       this.defaultIndex--;
     }
 
     if (removeFromDB) {
-      if (this._messageManager) {
-        let vanilla = LoginHelper.loginToVanillaObject(removedLogin);
-        this._messageManager.sendAsyncMessage("PasswordManager:removeLogin",
-                                              { login: vanilla });
-      } else {
-        Services.logins.removeLogin(removedLogin);
-      }
+      removedItem.removeFromStorage();
     }
   },
 };

From 06338c6e92313415fc825ee92e117d8746f35b7a Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 18:22:09 +0000
Subject: [PATCH 063/129] Bug 1551407 - Move LoginAutoCompleteResult ctr.
 variables closer to their use and cleanup cruft. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31035

--HG--
extra : moz-landing-system : lando
---
 .../passwordmgr/LoginAutoCompleteResult.jsm   | 50 ++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
index f6094f38b274..531197c48132 100644
--- a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
@@ -184,32 +184,33 @@ function LoginAutoCompleteResult(aSearchString, matchingLogins, {
     return true;
   }
 
-  this._showInsecureFieldWarning = (!isSecure && LoginHelper.showInsecureFieldWarning) ? 1 : 0;
-  this._showAutoCompleteFooter = isFooterEnabled() ? 1 : 0;
-
-  let logins = matchingLogins.sort(loginSort);
   this.searchString = aSearchString;
-  let dateAndTimeFormatter = new Services.intl.DateTimeFormat(undefined, { dateStyle: "medium" });
 
-  let duplicateUsernames = findDuplicates(matchingLogins);
 
-  // Build up the results array
-  this.results = [];
-  if (this._showInsecureFieldWarning) {
-    this.results.push(new InsecureLoginFormAutocompleteItem());
+  // Build up the array of autocomplete rows to display.
+  this._rows = [];
+
+  // Insecure field warning comes first if it applies and is enabled.
+  if (!isSecure && LoginHelper.showInsecureFieldWarning) {
+    this._rows.push(new InsecureLoginFormAutocompleteItem());
   }
 
+  // Saved login items
+  let logins = matchingLogins.sort(loginSort);
+  let dateAndTimeFormatter = new Services.intl.DateTimeFormat(undefined, { dateStyle: "medium" });
+  let duplicateUsernames = findDuplicates(matchingLogins);
   for (let login of logins) {
     let item = new LoginAutocompleteItem(login, isPasswordField, dateAndTimeFormatter,
                                          duplicateUsernames, messageManager);
-    this.results.push(item);
+    this._rows.push(item);
   }
 
-  if (this._showAutoCompleteFooter) {
-    this.results.push(new LoginsFooterAutocompleteItem(hostname));
+  // The footer comes last if it's enabled
+  if (isFooterEnabled()) {
+    this._rows.push(new LoginsFooterAutocompleteItem(hostname));
   }
 
-
+  // Determine the result code and default index.
   if (this.matchCount > 0) {
     this.searchResult = Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
     this.defaultIndex = 0;
@@ -225,9 +226,12 @@ LoginAutoCompleteResult.prototype = {
   QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteResult,
                                           Ci.nsISupportsWeakReference]),
 
-  // private
+  /**
+   * Accessed via .wrappedJSObject
+   * @private
+   */
   get logins() {
-    return this.results.filter(item => {
+    return this._rows.filter(item => {
       return item.constructor === LoginAutocompleteItem;
     }).map(item => item._login);
   },
@@ -244,32 +248,32 @@ LoginAutoCompleteResult.prototype = {
   defaultIndex: -1,
   errorDescription: "",
   get matchCount() {
-    return this.results.length;
+    return this._rows.length;
   },
 
   getValueAt(index) {
     if (index < 0 || index >= this.matchCount) {
       throw new Error("Index out of range.");
     }
-    return this.results[index].value;
+    return this._rows[index].value;
   },
 
   getLabelAt(index) {
     if (index < 0 || index >= this.matchCount) {
       throw new Error("Index out of range.");
     }
-    return this.results[index].label;
+    return this._rows[index].label;
   },
 
   getCommentAt(index) {
     if (index < 0 || index >= this.matchCount) {
       throw new Error("Index out of range.");
     }
-    return this.results[index].comment;
+    return this._rows[index].comment;
   },
 
   getStyleAt(index) {
-    return this.results[index].style;
+    return this._rows[index].style;
   },
 
   getImageAt(index) {
@@ -285,9 +289,9 @@ LoginAutoCompleteResult.prototype = {
       throw new Error("Index out of range.");
     }
 
-    let [removedItem] = this.results.splice(index, 1);
+    let [removedItem] = this._rows.splice(index, 1);
 
-    if (this.defaultIndex > this.results.length) {
+    if (this.defaultIndex > this._rows.length) {
       this.defaultIndex--;
     }
 

From 33f7f47bf3ffa904b56b6c5427eb8a7e7a5604c1 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Mon, 20 May 2019 18:29:41 +0000
Subject: [PATCH 064/129] Bug 1552919 - remove unneeded AnimationValueMap uses;
 r=emilio

Nightly Rust complains thusly:

```
error: the item `AnimationValueMap` is imported redundantly
   --> servo/ports/geckolib/glue.rs:629:9
    |
104 | use style::properties::animated_properties::{AnimationValue, AnimationValueMap};
    |                                                              ----------------- the item `AnimationValueMap` is already imported here
...
629 |     use style::properties::animated_properties::AnimationValueMap;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `-D unused-imports` implied by `-D warnings`
```

Remove the local imports to make it happy.

Differential Revision: https://phabricator.services.mozilla.com/D31816

--HG--
extra : moz-landing-system : lando
---
 servo/ports/geckolib/glue.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/servo/ports/geckolib/glue.rs b/servo/ports/geckolib/glue.rs
index b7a3daed95e8..51292ca55a47 100644
--- a/servo/ports/geckolib/glue.rs
+++ b/servo/ports/geckolib/glue.rs
@@ -626,7 +626,6 @@ pub extern "C" fn Servo_AnimationCompose(
     use style::gecko_bindings::bindings::Gecko_AnimationGetBaseStyle;
     use style::gecko_bindings::bindings::Gecko_GetPositionInSegment;
     use style::gecko_bindings::bindings::Gecko_GetProgressFromComputedTiming;
-    use style::properties::animated_properties::AnimationValueMap;
 
     let property = match LonghandId::from_nscsspropertyid(css_property) {
         Ok(longhand) if longhand.is_animatable() => longhand,
@@ -928,8 +927,6 @@ pub extern "C" fn Servo_AnimationValueMap_GetValue(
     raw_value_map: &mut structs::RawServoAnimationValueMap,
     property_id: nsCSSPropertyID,
 ) -> Strong<RawServoAnimationValue> {
-    use style::properties::animated_properties::AnimationValueMap;
-
     let property = match LonghandId::from_nscsspropertyid(property_id) {
         Ok(longhand) => longhand,
         Err(()) => return Strong::null(),

From a61401178647cb74dcf02fe65efdeef6cac43a2c Mon Sep 17 00:00:00 2001
From: Jason Laster <jlaster@mozilla.com>
Date: Mon, 20 May 2019 18:42:36 +0000
Subject: [PATCH 065/129] Bug 1552123 - debugger/devtools node test runners
 fail to detect jest snapshot failures. r=jdescottes

Differential Revision: https://phabricator.services.mozilla.com/D31624

--HG--
extra : moz-landing-system : lando
---
 devtools/client/debugger/bin/try-runner.js    | 41 ++++++++++++-------
 devtools/client/debugger/package.json         |  1 +
 .../component/__snapshots__/window.js.snap    |  4 +-
 .../src/tests/network-request.js              |  7 ++--
 .../devtools-utils/src/tests/worker-utils.js  | 28 -------------
 .../src/actions/pause/tests/pause.spec.js     |  8 ++--
 .../project-text-search.spec.js.snap          | 21 ----------
 .../components/shared/tests/Popover.spec.js   | 29 -------------
 .../tests/__snapshots__/Popover.spec.js.snap  |  8 ----
 .../__snapshots__/ProjectSearch.spec.js.snap  | 10 ++---
 .../client/debugger/src/test/tests-setup.js   |  4 ++
 .../client/debugger/src/utils/test-head.js    |  3 +-
 12 files changed, 48 insertions(+), 116 deletions(-)

diff --git a/devtools/client/debugger/bin/try-runner.js b/devtools/client/debugger/bin/try-runner.js
index 910addd50135..6efcf7fac7e3 100644
--- a/devtools/client/debugger/bin/try-runner.js
+++ b/devtools/client/debugger/bin/try-runner.js
@@ -18,7 +18,7 @@ function execOut(...args) {
   let out;
   let err;
   try {
-    out = execFileSync(...args);
+    out = execFileSync(...args, { silent: true });
   } catch (e) {
     out = e.stdout;
     err = e.stderr;
@@ -26,8 +26,7 @@ function execOut(...args) {
   return { out: out.toString(), err: err && err.toString() };
 }
 
-function logErrors(tool, text, regexp) {
-  const errors = text.match(regexp) || [];
+function logErrors(tool, errors) {
   for (const error of errors) {
     console.log(`TEST-UNEXPECTED-FAIL ${tool} | ${error}`);
   }
@@ -64,23 +63,37 @@ function eslint() {
   logStart("Eslint");
   const { out } = execOut("yarn", ["lint:js"]);
   console.log(out);
-  const errors = logErrors("eslint", out, / {2}error {2}(.*)/g);
+  const errors = logErrors("eslint", out.match(/ {2}error {2}(.*)/g) || []);
+
   return errors.length == 0;
 }
 
 function jest() {
   logStart("Jest");
-  const { out, err } = execOut("yarn", ["test"]);
-  console.log(err);
-  const errors = logErrors("jest", err || "", / {4}✕(.*)/g);
-  return errors.length == 0;
+  const { out } = execOut("yarn", ["test-ci"]);
+  // Remove the non-JSON logs mixed with the JSON output by yarn.
+  const jsonOut = out.substring(out.indexOf("{"), out.lastIndexOf("}") + 1);
+  const results = JSON.parse(jsonOut);
+
+  const failed = results.numFailedTests == 0;
+
+  // The individual failing tests are in jammed into the same message string :/
+  const errors = [].concat(
+    ...results.testResults.map(r =>
+      r.message.split("\n").filter(l => l.includes("●"))
+    )
+  );
+
+  logErrors("jest", errors);
+  return failed;
 }
 
 function stylelint() {
   logStart("Stylelint");
   const { out } = execOut("yarn", ["lint:css"]);
   console.log(out);
-  const errors = logErrors("stylelint", out, / {2}✖(.*)/g);
+  const errors = logErrors("stylelint", out.match(/ {2}✖(.*)/g) || []);
+
   return errors.length == 0;
 }
 
@@ -91,8 +104,7 @@ function jsxAccessibility() {
   console.log(out);
   const errors = logErrors(
     "eslint (jsx accessibility)",
-    out,
-    / {2}error {2}(.*)/g
+    out.match(/ {2}error {2}(.*)/g) || []
   );
   return errors.length == 0;
 }
@@ -100,8 +112,8 @@ function jsxAccessibility() {
 function lintMd() {
   logStart("Remark");
 
-  const { out, err } = execOut("yarn", ["lint:md"]);
-  const errors = logErrors("remark", err || "", /warning(.+)/g);
+  const { err } = execOut("yarn", ["lint:md"]);
+  const errors = logErrors("remark", (err || "").match(/warning(.+)/g) || []);
   return errors.length == 0;
 }
 
@@ -127,7 +139,8 @@ console.log({
   jestPassed,
   styleLintPassed,
   jsxAccessibilityPassed,
-  remarkPassed
+  remarkPassed,
 });
 
 process.exitCode = success ? 0 : 1;
+console.log("CODE", process.exitCode);
diff --git a/devtools/client/debugger/package.json b/devtools/client/debugger/package.json
index 290bd163c132..22a297d156e1 100644
--- a/devtools/client/debugger/package.json
+++ b/devtools/client/debugger/package.json
@@ -30,6 +30,7 @@
     "mochih": "yarn mochi -- --headless --",
     "mochici": "mochii --mc ./firefox --ci --default-test-path devtools/client/debugger --headless --",
     "test": "TZ=Africa/Nairobi jest",
+    "test-ci": "TZ=Africa/Nairobi jest --json",
     "test:watch": "jest --watch",
     "test:coverage": "yarn test --coverage",
     "test:all": "yarn test; yarn lint; yarn flow",
diff --git a/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/window.js.snap b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/window.js.snap
index 949c94f5383a..e1685a686180 100644
--- a/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/window.js.snap
+++ b/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/window.js.snap
@@ -102,7 +102,7 @@ exports[`ObjectInspector - dimTopLevelWindow renders sub-level window 1`] = `
     role="treeitem"
   >
     <span
-      className="tree-indent"
+      className="tree-indent tree-last-indent"
     >
       ​
     </span>
@@ -254,7 +254,7 @@ exports[`ObjectInspector - dimTopLevelWindow renders window as expected when dim
     role="treeitem"
   >
     <span
-      className="tree-indent"
+      className="tree-indent tree-last-indent"
     >
       ​
     </span>
diff --git a/devtools/client/debugger/packages/devtools-utils/src/tests/network-request.js b/devtools/client/debugger/packages/devtools-utils/src/tests/network-request.js
index d734dd7bba52..701135c9a39a 100644
--- a/devtools/client/debugger/packages/devtools-utils/src/tests/network-request.js
+++ b/devtools/client/debugger/packages/devtools-utils/src/tests/network-request.js
@@ -47,11 +47,10 @@ describe("network request", () => {
   it("timed out fetch", async () => {
     global.fetch.mockImplementation(async () => {});
 
-    try {
-      await networkRequest("foo");
-    } catch (e) {
+    // eslint-disable-next-line jest/valid-expect-in-promise
+    networkRequest("foo").catch(e => {
       expect(e.message).toEqual("Connect timeout error");
-    }
+    });
 
     jest.runAllTimers();
   });
diff --git a/devtools/client/debugger/packages/devtools-utils/src/tests/worker-utils.js b/devtools/client/debugger/packages/devtools-utils/src/tests/worker-utils.js
index 22c8a83a85a2..f8969f23f585 100644
--- a/devtools/client/debugger/packages/devtools-utils/src/tests/worker-utils.js
+++ b/devtools/client/debugger/packages/devtools-utils/src/tests/worker-utils.js
@@ -119,32 +119,4 @@ describe("worker utils", () => {
       ],
     });
   });
-
-  it("test a task completing when the worker has shutdown", async () => {
-    const dispatcher = new WorkerDispatcher();
-    const postMessageMock = jest.fn();
-    const addEventListenerMock = jest.fn();
-    const terminateMock = jest.fn();
-
-    global.Worker = jest.fn(() => {
-      return {
-        postMessage: postMessageMock,
-        addEventListener: addEventListenerMock,
-        terminate: terminateMock,
-      };
-    });
-
-    dispatcher.start();
-    const task = dispatcher.task("foo");
-
-    try {
-      await task("bar");
-    } catch (e) {
-      expect(e).toEqual("Oops, The worker has shutdown!");
-    }
-
-    const listener = addEventListenerMock.mock.calls[0][1];
-    dispatcher.stop();
-    listener({ data: { id: 1 } });
-  });
 });
diff --git a/devtools/client/debugger/src/actions/pause/tests/pause.spec.js b/devtools/client/debugger/src/actions/pause/tests/pause.spec.js
index d2b1f56d5cf5..a7d8ca5c6125 100644
--- a/devtools/client/debugger/src/actions/pause/tests/pause.spec.js
+++ b/devtools/client/debugger/src/actions/pause/tests/pause.spec.js
@@ -16,7 +16,7 @@ import {
 
 import { makeWhyNormal } from "../../../utils/test-mockup";
 
-import * as parser from "../../../workers/parser/index";
+import { parserWorker } from "../../../test/tests-setup";
 
 const { isStepping } = selectors;
 
@@ -147,7 +147,7 @@ describe("pause", () => {
       await dispatch(actions.newGeneratedSource(makeSource("foo1")));
       await dispatch(actions.paused(mockPauseInfo));
       const cx = selectors.getThreadContext(getState());
-      const getNextStepSpy = jest.spyOn(parser, "getNextStep");
+      const getNextStepSpy = jest.spyOn(parserWorker, "getNextStep");
       dispatch(actions.stepOver(cx));
       expect(getNextStepSpy).not.toHaveBeenCalled();
       expect(isStepping(getState(), "FakeThread")).toBeTruthy();
@@ -166,7 +166,7 @@ describe("pause", () => {
 
       await dispatch(actions.paused(mockPauseInfo));
       const cx = selectors.getThreadContext(getState());
-      const getNextStepSpy = jest.spyOn(parser, "getNextStep");
+      const getNextStepSpy = jest.spyOn(parserWorker, "getNextStep");
       dispatch(actions.stepOver(cx));
       expect(getNextStepSpy).toHaveBeenCalled();
       getNextStepSpy.mockRestore();
@@ -188,7 +188,7 @@ describe("pause", () => {
 
       await dispatch(actions.paused(mockPauseInfo));
       const cx = selectors.getThreadContext(getState());
-      const getNextStepSpy = jest.spyOn(parser, "getNextStep");
+      const getNextStepSpy = jest.spyOn(parserWorker, "getNextStep");
       dispatch(actions.stepOver(cx));
       expect(getNextStepSpy).toHaveBeenCalled();
       getNextStepSpy.mockRestore();
diff --git a/devtools/client/debugger/src/actions/tests/__snapshots__/project-text-search.spec.js.snap b/devtools/client/debugger/src/actions/tests/__snapshots__/project-text-search.spec.js.snap
index c75282e0e421..e7f0e40d64be 100644
--- a/devtools/client/debugger/src/actions/tests/__snapshots__/project-text-search.spec.js.snap
+++ b/devtools/client/debugger/src/actions/tests/__snapshots__/project-text-search.spec.js.snap
@@ -124,27 +124,6 @@ Array [
 ]
 `;
 
-exports[`project text search should search a specific source 2`] = `
-Array [
-  Object {
-    "filepath": "http://localhost:8000/examples/bar",
-    "matches": Array [
-      Object {
-        "column": 9,
-        "line": 1,
-        "match": "bla",
-        "matchIndex": 9,
-        "sourceId": "bar",
-        "type": "MATCH",
-        "value": "function bla(x, y) {",
-      },
-    ],
-    "sourceId": "bar",
-    "type": "RESULT",
-  },
-]
-`;
-
 exports[`project text search should search all the loaded sources based on the query 1`] = `
 Array [
   Object {
diff --git a/devtools/client/debugger/src/components/shared/tests/Popover.spec.js b/devtools/client/debugger/src/components/shared/tests/Popover.spec.js
index 205dcf3e705e..6ad0a320f58d 100644
--- a/devtools/client/debugger/src/components/shared/tests/Popover.spec.js
+++ b/devtools/client/debugger/src/components/shared/tests/Popover.spec.js
@@ -59,10 +59,6 @@ describe("Popover", () => {
     </Popover>
   );
 
-  const div = document.createElement("div");
-
-  const event = { currentTarget: div };
-
   beforeEach(() => {
     onMouseLeave.mockClear();
     onKeyDown.mockClear();
@@ -72,31 +68,6 @@ describe("Popover", () => {
 
   it("render (tooltip)", () => expect(tooltip).toMatchSnapshot());
 
-  it("calls mouseLeave", () => {
-    popover.find(".popover").simulate("mouseleave", event);
-    expect(onMouseLeave).toHaveBeenCalled();
-  });
-
-  it("calls mouseLeave (tooltip)", () => {
-    tooltip.find(".tooltip").simulate("mouseleave", event);
-    expect(onMouseLeave).toHaveBeenCalled();
-  });
-
-  it("no mouse leave on bracket or gap", () => {
-    popover.find(".bracket-arrow").simulate("mouseleave", event);
-    expect(onMouseLeave).not.toHaveBeenCalled();
-  });
-
-  it("calls keyDown", () => {
-    popover.find(".popover").simulate("keydown", { key: "Escape" });
-    expect(onKeyDown).toHaveBeenCalled();
-  });
-
-  it("calls keyDown (tooltip)", () => {
-    tooltip.find(".tooltip").simulate("keydown", { key: "Escape" });
-    expect(onKeyDown).toHaveBeenCalled();
-  });
-
   it("mount popover", () => {
     const mountedPopover = mount(
       <Popover
diff --git a/devtools/client/debugger/src/components/shared/tests/__snapshots__/Popover.spec.js.snap b/devtools/client/debugger/src/components/shared/tests/__snapshots__/Popover.spec.js.snap
index 1a9edcbc650d..829bfdbb13a8 100644
--- a/devtools/client/debugger/src/components/shared/tests/__snapshots__/Popover.spec.js.snap
+++ b/devtools/client/debugger/src/components/shared/tests/__snapshots__/Popover.spec.js.snap
@@ -26,8 +26,6 @@ exports[`Popover mount popover 1`] = `
 >
   <div
     className="popover orientation-right"
-    onKeyDown={[MockFunction]}
-    onMouseLeave={[MockFunction]}
     style={
       Object {
         "left": 505,
@@ -88,8 +86,6 @@ exports[`Popover mount tooltip 1`] = `
 >
   <div
     className="tooltip"
-    onKeyDown={[MockFunction]}
-    onMouseLeave={[MockFunction]}
     style={
       Object {
         "left": -8,
@@ -111,8 +107,6 @@ exports[`Popover mount tooltip 1`] = `
 exports[`Popover render (tooltip) 1`] = `
 <div
   className="tooltip"
-  onKeyDown={[MockFunction]}
-  onMouseLeave={[MockFunction]}
   style={
     Object {
       "left": 0,
@@ -156,8 +150,6 @@ exports[`Popover render 1`] = `
 >
   <div
     className="popover orientation-right"
-    onKeyDown={[MockFunction]}
-    onMouseLeave={[MockFunction]}
     style={
       Object {
         "left": 505,
diff --git a/devtools/client/debugger/src/components/test/__snapshots__/ProjectSearch.spec.js.snap b/devtools/client/debugger/src/components/test/__snapshots__/ProjectSearch.spec.js.snap
index a53b5ef69381..6414377523c8 100644
--- a/devtools/client/debugger/src/components/test/__snapshots__/ProjectSearch.spec.js.snap
+++ b/devtools/client/debugger/src/components/test/__snapshots__/ProjectSearch.spec.js.snap
@@ -337,7 +337,7 @@ exports[`ProjectSearch found search results 1`] = `
                   role="treeitem"
                 >
                   <span
-                    className="tree-indent"
+                    className="tree-indent tree-last-indent"
                   >
                     ​
                   </span>
@@ -405,7 +405,7 @@ exports[`ProjectSearch found search results 1`] = `
                   role="treeitem"
                 >
                   <span
-                    className="tree-indent"
+                    className="tree-indent tree-last-indent"
                   >
                     ​
                   </span>
@@ -473,7 +473,7 @@ exports[`ProjectSearch found search results 1`] = `
                   role="treeitem"
                 >
                   <span
-                    className="tree-indent"
+                    className="tree-indent tree-last-indent"
                   >
                     ​
                   </span>
@@ -613,7 +613,7 @@ exports[`ProjectSearch found search results 1`] = `
                   role="treeitem"
                 >
                   <span
-                    className="tree-indent"
+                    className="tree-indent tree-last-indent"
                   >
                     ​
                   </span>
@@ -681,7 +681,7 @@ exports[`ProjectSearch found search results 1`] = `
                   role="treeitem"
                 >
                   <span
-                    className="tree-indent"
+                    className="tree-indent tree-last-indent"
                   >
                     ​
                   </span>
diff --git a/devtools/client/debugger/src/test/tests-setup.js b/devtools/client/debugger/src/test/tests-setup.js
index 7fdaadc7919b..9a87ae87f593 100644
--- a/devtools/client/debugger/src/test/tests-setup.js
+++ b/devtools/client/debugger/src/test/tests-setup.js
@@ -64,6 +64,7 @@ function formatException(reason, p) {
 }
 
 export const parserWorker = new ParserDispatcher();
+export const evaluationsParser = new ParserDispatcher();
 
 beforeAll(() => {
   startSourceMapWorker(
@@ -74,6 +75,7 @@ beforeAll(() => {
     path.join(rootPath, "src/workers/pretty-print/worker.js")
   );
   parserWorker.start(path.join(rootPath, "src/workers/parser/worker.js"));
+  evaluationsParser.start(path.join(rootPath, "src/workers/parser/worker.js"));
   startSearchWorker(path.join(rootPath, "src/workers/search/worker.js"));
   process.on("unhandledRejection", formatException);
 });
@@ -82,6 +84,7 @@ afterAll(() => {
   stopSourceMapWorker();
   stopPrettyPrintWorker();
   parserWorker.stop();
+  evaluationsParser.stop();
   stopSearchWorker();
   process.removeListener("unhandledRejection", formatException);
 });
@@ -90,6 +93,7 @@ afterEach(() => {});
 
 beforeEach(async () => {
   parserWorker.clear();
+  evaluationsParser.clear();
   clearHistory();
   clearDocuments();
   prefs.projectDirectoryRoot = "";
diff --git a/devtools/client/debugger/src/utils/test-head.js b/devtools/client/debugger/src/utils/test-head.js
index 180b43a03092..a5e088faf6e8 100644
--- a/devtools/client/debugger/src/utils/test-head.js
+++ b/devtools/client/debugger/src/utils/test-head.js
@@ -15,7 +15,7 @@ import reducers from "../reducers";
 import actions from "../actions";
 import * as selectors from "../selectors";
 import { getHistory } from "../test/utils/history";
-import { parserWorker } from "../test/tests-setup";
+import { parserWorker, evaluationsParser } from "../test/tests-setup";
 import configureStore from "../actions/utils/create-store";
 import sourceQueue from "../utils/source-queue";
 import type { Source, OriginalSourceData, GeneratedSourceData } from "../types";
@@ -44,6 +44,7 @@ function createStore(client: any, initialState: any = {}, sourceMapsMock: any) {
         client,
         sourceMaps: sourceMapsMock !== undefined ? sourceMapsMock : sourceMaps,
         parser: parserWorker,
+        evaluationsParser,
       };
     },
   })(combineReducers(reducers), initialState);

From 2058c1798918a94ab05f78e2a36c73f12f9286d0 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 02:56:01 +0000
Subject: [PATCH 066/129] Bug 1550131 - Expose an iterator for
 AboutLoginsParent subscribers. r=jaws

Differential Revision: https://phabricator.services.mozilla.com/D31698

--HG--
extra : moz-landing-system : lando
---
 browser/components/aboutlogins/AboutLoginsParent.jsm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm
index 03d020a2ce8d..2dc183176138 100644
--- a/browser/components/aboutlogins/AboutLoginsParent.jsm
+++ b/browser/components/aboutlogins/AboutLoginsParent.jsm
@@ -141,7 +141,7 @@ var AboutLoginsParent = {
     }
   },
 
-  messageSubscribers(name, details) {
+  * _subscriberIterator() {
     let subscribers = ChromeUtils.nondeterministicGetWeakSetKeys(this._subscribers);
     for (let subscriber of subscribers) {
       if (subscriber.remoteType != EXPECTED_ABOUTLOGINS_REMOTE_TYPE ||
@@ -150,6 +150,12 @@ var AboutLoginsParent = {
         this._subscribers.delete(subscriber);
         continue;
       }
+      yield subscriber;
+    }
+  },
+
+  messageSubscribers(name, details) {
+    for (let subscriber of this._subscriberIterator()) {
       try {
         subscriber.messageManager.sendAsyncMessage(name, details);
       } catch (ex) {}

From 80e05944316cd45fe2a687629e57d5b3c2e026fa Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 02:56:05 +0000
Subject: [PATCH 067/129] Bug 1550131 - Show a notification when master
 password login is cancelled while about:logins is open. r=jaws

Depends on D31698

Differential Revision: https://phabricator.services.mozilla.com/D31699

--HG--
extra : moz-landing-system : lando
---
 .../aboutlogins/AboutLoginsParent.jsm         | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm
index 2dc183176138..8e9d37970b2a 100644
--- a/browser/components/aboutlogins/AboutLoginsParent.jsm
+++ b/browser/components/aboutlogins/AboutLoginsParent.jsm
@@ -19,6 +19,7 @@ XPCOMUtils.defineLazyGetter(this, "log", () => {
 });
 
 const ABOUT_LOGINS_ORIGIN = "about:logins";
+const MASTER_PASSWORD_NOTIFICATION_ID = "master-password-login-required";
 
 const PRIVILEGED_PROCESS_PREF =
   "browser.tabs.remote.separatePrivilegedContentProcess";
@@ -74,6 +75,7 @@ var AboutLoginsParent = {
       }
       case "AboutLogins:Subscribe": {
         if (!ChromeUtils.nondeterministicGetWeakSetKeys(this._subscribers).length) {
+          Services.obs.addObserver(this, "passwordmgr-crypto-loginCanceled");
           Services.obs.addObserver(this, "passwordmgr-storage-changed");
         }
         this._subscribers.add(message.target);
@@ -106,10 +108,16 @@ var AboutLoginsParent = {
 
   observe(subject, topic, type) {
     if (!ChromeUtils.nondeterministicGetWeakSetKeys(this._subscribers).length) {
+      Services.obs.removeObserver(this, "passwordmgr-crypto-loginCanceled");
       Services.obs.removeObserver(this, "passwordmgr-storage-changed");
       return;
     }
 
+    if (topic == "passwordmgr-crypto-loginCanceled") {
+      this.showMasterPasswordLoginNotifications();
+      return;
+    }
+
     switch (type) {
       case "addLogin": {
         const login = convertSubjectToLogin(subject);
@@ -141,6 +149,36 @@ var AboutLoginsParent = {
     }
   },
 
+  showMasterPasswordLoginNotifications() {
+    let messageString = "You must enter your Master Password to view saved logins"; // TODO
+    for (let subscriber of this._subscriberIterator()) {
+      // If there's already an existing notification bar, don't do anything.
+      let {gBrowser} = subscriber.ownerGlobal;
+      let browser = subscriber;
+      let notificationBox = gBrowser.getNotificationBox(browser);
+      let notification = notificationBox.getNotificationWithValue(MASTER_PASSWORD_NOTIFICATION_ID);
+      if (notification) {
+        continue;
+      }
+
+      // Configure the notification bar
+      let priority = notificationBox.PRIORITY_WARNING_MEDIUM;
+      let iconURL = "chrome://browser/skin/login.svg";
+      let reloadLabel = "Log in"; // TODO
+      let reloadKey   = "L"; // TODO
+
+      let buttons = [{
+        label: reloadLabel,
+        accessKey: reloadKey,
+        popup: null,
+        callback() { browser.reload(); },
+      }];
+
+      notification = notificationBox.appendNotification(messageString, MASTER_PASSWORD_NOTIFICATION_ID,
+                                                        iconURL, priority, buttons);
+    }
+  },
+
   * _subscriberIterator() {
     let subscribers = ChromeUtils.nondeterministicGetWeakSetKeys(this._subscribers);
     for (let subscriber of subscribers) {

From 2cee12df26207545c36102a794ef6e1419113551 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 02:56:08 +0000
Subject: [PATCH 068/129] Bug 1550131 - Remove about:logins master password
 login notifications when the user logs in. r=jaws

Depends on D31699

Differential Revision: https://phabricator.services.mozilla.com/D31700

--HG--
extra : moz-landing-system : lando
---
 .../aboutlogins/AboutLoginsParent.jsm         | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm
index 8e9d37970b2a..7ec04d6f9f97 100644
--- a/browser/components/aboutlogins/AboutLoginsParent.jsm
+++ b/browser/components/aboutlogins/AboutLoginsParent.jsm
@@ -75,6 +75,7 @@ var AboutLoginsParent = {
       }
       case "AboutLogins:Subscribe": {
         if (!ChromeUtils.nondeterministicGetWeakSetKeys(this._subscribers).length) {
+          Services.obs.addObserver(this, "passwordmgr-crypto-login");
           Services.obs.addObserver(this, "passwordmgr-crypto-loginCanceled");
           Services.obs.addObserver(this, "passwordmgr-storage-changed");
         }
@@ -108,11 +109,18 @@ var AboutLoginsParent = {
 
   observe(subject, topic, type) {
     if (!ChromeUtils.nondeterministicGetWeakSetKeys(this._subscribers).length) {
+      Services.obs.removeObserver(this, "passwordmgr-crypto-login");
       Services.obs.removeObserver(this, "passwordmgr-crypto-loginCanceled");
       Services.obs.removeObserver(this, "passwordmgr-storage-changed");
       return;
     }
 
+    if (topic == "passwordmgr-crypto-login") {
+      this.removeMasterPasswordLoginNotifications();
+      this.messageSubscribers("AboutLogins:AllLogins", this.getAllLogins());
+      return;
+    }
+
     if (topic == "passwordmgr-crypto-loginCanceled") {
       this.showMasterPasswordLoginNotifications();
       return;
@@ -179,6 +187,19 @@ var AboutLoginsParent = {
     }
   },
 
+  removeMasterPasswordLoginNotifications() {
+    for (let subscriber of this._subscriberIterator()) {
+      let {gBrowser} = subscriber.ownerGlobal;
+      let browser = subscriber;
+      let notificationBox = gBrowser.getNotificationBox(browser);
+      let notification = notificationBox.getNotificationWithValue(MASTER_PASSWORD_NOTIFICATION_ID);
+      if (!notification) {
+        continue;
+      }
+      notificationBox.removeNotification(notification);
+    }
+  },
+
   * _subscriberIterator() {
     let subscribers = ChromeUtils.nondeterministicGetWeakSetKeys(this._subscribers);
     for (let subscriber of subscribers) {

From ef4dd0773b6b698db95e19f2dc6d8ac072933073 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Mon, 20 May 2019 20:08:10 +0000
Subject: [PATCH 069/129] Bug 1550131 - Move notification strings to Fluent
 file. r=MattN,Pike

Differential Revision: https://phabricator.services.mozilla.com/D31747

--HG--
extra : moz-landing-system : lando
---
 .../components/aboutlogins/AboutLoginsParent.jsm  | 15 +++++++++++----
 .../aboutlogins/content/aboutLogins.ftl           |  6 ++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm
index 7ec04d6f9f97..96cf6ba50bee 100644
--- a/browser/components/aboutlogins/AboutLoginsParent.jsm
+++ b/browser/components/aboutlogins/AboutLoginsParent.jsm
@@ -9,6 +9,8 @@ var EXPORTED_SYMBOLS = ["AboutLoginsParent"];
 const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.defineModuleGetter(this, "E10SUtils",
                                "resource://gre/modules/E10SUtils.jsm");
+ChromeUtils.defineModuleGetter(this, "Localization",
+                               "resource://gre/modules/Localization.jsm");
 ChromeUtils.defineModuleGetter(this, "LoginHelper",
                                "resource://gre/modules/LoginHelper.jsm");
 ChromeUtils.defineModuleGetter(this, "Services",
@@ -46,6 +48,7 @@ const convertSubjectToLogin = subject => {
 };
 
 var AboutLoginsParent = {
+  _l10n: null,
   _subscribers: new WeakSet(),
 
   // Listeners are added in BrowserGlue.jsm
@@ -157,8 +160,12 @@ var AboutLoginsParent = {
     }
   },
 
-  showMasterPasswordLoginNotifications() {
-    let messageString = "You must enter your Master Password to view saved logins"; // TODO
+  async showMasterPasswordLoginNotifications() {
+    if (!this._l10n) {
+      this._l10n = new Localization(["browser/aboutLogins.ftl"]);
+    }
+
+    let messageString = await this._l10n.formatValue("master-password-notification-message");
     for (let subscriber of this._subscriberIterator()) {
       // If there's already an existing notification bar, don't do anything.
       let {gBrowser} = subscriber.ownerGlobal;
@@ -172,8 +179,8 @@ var AboutLoginsParent = {
       // Configure the notification bar
       let priority = notificationBox.PRIORITY_WARNING_MEDIUM;
       let iconURL = "chrome://browser/skin/login.svg";
-      let reloadLabel = "Log in"; // TODO
-      let reloadKey   = "L"; // TODO
+      let reloadLabel = await this._l10n.formatValue("master-password-reload-button-label");
+      let reloadKey = await this._l10n.formatValue("master-password-reload-button-accesskey");
 
       let buttons = [{
         label: reloadLabel,
diff --git a/browser/components/aboutlogins/content/aboutLogins.ftl b/browser/components/aboutlogins/content/aboutLogins.ftl
index 8161cf2a3a1c..a884c8b2cd78 100644
--- a/browser/components/aboutlogins/content/aboutLogins.ftl
+++ b/browser/components/aboutlogins/content/aboutLogins.ftl
@@ -40,3 +40,9 @@ login-item =
   .time-changed = Last changed: { DATETIME($timeChanged, day: "numeric", month: "long", year: "numeric") }
   .time-used = Last used: { DATETIME($timeUsed, day: "numeric", month: "long", year: "numeric") }
   .username-label = Username
+
+master-password-notification-message = Please enter your master password to view saved logins & passwords
+# TODO: Not sure how to use formatValue with these as attributes on a single ID
+master-password-reload-button-label = Log in
+# TODO: Not sure how to use formatValue with these as attributes on a single ID
+master-password-reload-button-accesskey = L

From a0851d90138945de98403dadc8ff4b4f283aeb21 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Mon, 20 May 2019 20:09:25 +0000
Subject: [PATCH 070/129] Bug 1550131 - Automated test for master password
 prompt from about:logins. r=MattN

Differential Revision: https://phabricator.services.mozilla.com/D31125

--HG--
extra : moz-landing-system : lando
---
 .../aboutlogins/tests/browser/browser.ini     |  1 +
 .../tests/browser/browser_masterPassword.js   | 82 +++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 browser/components/aboutlogins/tests/browser/browser_masterPassword.js

diff --git a/browser/components/aboutlogins/tests/browser/browser.ini b/browser/components/aboutlogins/tests/browser/browser.ini
index e0ad36550732..099a62080462 100644
--- a/browser/components/aboutlogins/tests/browser/browser.ini
+++ b/browser/components/aboutlogins/tests/browser/browser.ini
@@ -5,5 +5,6 @@ prefs =
 [browser_copyToClipboardButton.js]
 [browser_deleteLogin.js]
 [browser_loginListChanges.js]
+[browser_masterPassword.js]
 [browser_openSite.js]
 [browser_updateLogin.js]
diff --git a/browser/components/aboutlogins/tests/browser/browser_masterPassword.js b/browser/components/aboutlogins/tests/browser/browser_masterPassword.js
new file mode 100644
index 000000000000..a4aec4ae097e
--- /dev/null
+++ b/browser/components/aboutlogins/tests/browser/browser_masterPassword.js
@@ -0,0 +1,82 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+ChromeUtils.import("resource://testing-common/LoginTestUtils.jsm", this);
+
+/**
+ * Waits for the master password prompt and performs an action.
+ * @param {string} action Set to "authenticate" to log in or "cancel" to
+ *        close the dialog without logging in.
+ */
+function waitForMPDialog(action) {
+  let dialogShown = TestUtils.topicObserved("common-dialog-loaded");
+  return dialogShown.then(function([subject]) {
+    let dialog = subject.Dialog;
+    is(dialog.args.title, "Password Required");
+    if (action == "authenticate") {
+      SpecialPowers.wrap(dialog.ui.password1Textbox)
+                   .setUserInput(LoginTestUtils.masterPassword.masterPassword);
+      dialog.ui.button0.click();
+    } else if (action == "cancel") {
+      dialog.ui.button1.click();
+    }
+    return BrowserTestUtils.waitForEvent(window, "DOMModalDialogClosed");
+  });
+}
+
+function getNumberOfLoginsDisplayed(browser) {
+  return ContentTask.spawn(browser, null, async () => {
+    let loginList = Cu.waiveXrays(content.document.querySelector("login-list"));
+    return loginList._logins.length;
+  });
+}
+
+add_task(async function test() {
+  let login = LoginTestUtils.testData.formLogin({
+    hostname: "https://example.com",
+    formSubmitURL: "https://example.com",
+    username: "username",
+    password: "password",
+  });
+
+  Services.logins.addLogin(login);
+  LoginTestUtils.masterPassword.enable();
+
+  let mpDialogShown = waitForMPDialog("cancel");
+  await BrowserTestUtils.openNewForegroundTab({gBrowser, url: "about:logins"});
+  await mpDialogShown;
+
+  registerCleanupFunction(function() {
+    LoginTestUtils.masterPassword.disable();
+    Services.logins.removeAllLogins();
+    BrowserTestUtils.removeTab(gBrowser.selectedTab);
+  });
+
+  let browser = gBrowser.selectedBrowser;
+  let logins = await getNumberOfLoginsDisplayed(browser);
+  is(logins, 0, "No logins should be displayed when MP is set and unauthenticated");
+
+  let notificationBox = gBrowser.getNotificationBox(browser);
+  let notification = notificationBox.currentNotification;
+
+  ok(notification, "Notification should be visible");
+  is(notification.getAttribute("value"), "master-password-login-required",
+     "Should be showing the right notification");
+
+  let buttons = notification.querySelectorAll(".notification-button");
+  is(buttons.length, 1, "Should have one button.");
+
+  let refreshPromise = BrowserTestUtils.browserLoaded(browser);
+  // Sign in with the Master Password this time the dialog is shown
+  mpDialogShown = waitForMPDialog("authenticate");
+  // Click the button to reload the page.
+  buttons[0].click();
+  await refreshPromise;
+  info("Page reloaded");
+
+  await mpDialogShown;
+  info("Master Password dialog shown and authenticated");
+
+  logins = await getNumberOfLoginsDisplayed(browser);
+  is(logins, 1, "Logins should be displayed when MP is set and authenticated");
+});

From eb2e0187f1c2a15bbf1a97fee66eb005dcf58958 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 20 May 2019 20:46:07 +0000
Subject: [PATCH 071/129] Bug 1531715 - Implement the CSS line-break property,
 with values "auto | anywhere". r=emilio

Note that the "loose | normal | strict" values are not yet parsed/implemented.

Differential Revision: https://phabricator.services.mozilla.com/D29817

--HG--
extra : moz-landing-system : lando
---
 .../server/actors/animation-type-longhand.js  |  1 +
 .../shared/css/generated/properties-db.js     | 16 ++++++++
 dom/base/nsLineBreaker.cpp                    |  9 +++--
 intl/lwbrk/LineBreaker.h                      |  6 ++-
 layout/generic/nsTextFrame.cpp                | 37 +++++++++++--------
 layout/style/ServoBindings.toml               |  1 +
 layout/style/nsStyleStruct.cpp                |  2 +
 layout/style/nsStyleStruct.h                  |  1 +
 layout/style/test/property_database.js        |  9 +++++
 servo/components/style/properties/data.py     |  1 +
 .../longhands/inherited_text.mako.rs          | 10 +++++
 servo/components/style/values/computed/mod.rs |  2 +-
 .../components/style/values/computed/text.rs  |  2 +-
 .../components/style/values/specified/mod.rs  |  2 +-
 .../components/style/values/specified/text.rs | 26 +++++++++++++
 servo/ports/geckolib/cbindgen.toml            |  1 +
 .../line-break-anywhere-001.html.ini          |  2 -
 .../line-break-anywhere-002.html.ini          |  2 -
 .../parsing/line-break-valid.html.ini         |  6 ---
 19 files changed, 102 insertions(+), 34 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-anywhere-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-anywhere-002.html.ini

diff --git a/devtools/server/actors/animation-type-longhand.js b/devtools/server/actors/animation-type-longhand.js
index e232c33774c7..d862490542a7 100644
--- a/devtools/server/actors/animation-type-longhand.js
+++ b/devtools/server/actors/animation-type-longhand.js
@@ -90,6 +90,7 @@ exports.ANIMATION_TYPE_FOR_LONGHANDS = [
     "justify-content",
     "justify-items",
     "justify-self",
+    "line-break",
     "list-style-image",
     "list-style-position",
     "list-style-type",
diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js
index 9832d8127772..4f0a23944e16 100644
--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@@ -3183,6 +3183,7 @@ exports.CSS_PROPERTIES = {
       "text-emphasis-position",
       "text-emphasis-color",
       "-moz-tab-size",
+      "line-break",
       "-webkit-text-fill-color",
       "-webkit-text-stroke-color",
       "-webkit-text-stroke-width",
@@ -7323,6 +7324,21 @@ exports.CSS_PROPERTIES = {
       "unset"
     ]
   },
+  "line-break": {
+    "isInherited": true,
+    "subproperties": [
+      "line-break"
+    ],
+    "supports": [],
+    "values": [
+      "anywhere",
+      "auto",
+      "inherit",
+      "initial",
+      "revert",
+      "unset"
+    ]
+  },
   "line-height": {
     "isInherited": true,
     "subproperties": [
diff --git a/dom/base/nsLineBreaker.cpp b/dom/base/nsLineBreaker.cpp
index fb572b4117a5..84d13a3f6f83 100644
--- a/dom/base/nsLineBreaker.cpp
+++ b/dom/base/nsLineBreaker.cpp
@@ -61,11 +61,12 @@ nsresult nsLineBreaker::FlushCurrentWord() {
 
   nsTArray<bool> capitalizationState;
 
-  if (!mCurrentWordContainsComplexChar) {
+  if (!mCurrentWordContainsComplexChar ||
+      mWordBreak == LineBreaker::kWordBreak_Anywhere) {
     // For break-strict set everything internal to "break", otherwise
     // to "no break"!
     memset(breakState.Elements(),
-           mWordBreak == LineBreaker::kWordBreak_BreakAll
+           mWordBreak >= LineBreaker::kWordBreak_BreakAll
                ? gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NORMAL
                : gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NONE,
            length * sizeof(uint8_t));
@@ -225,7 +226,7 @@ nsresult nsLineBreaker::AppendText(nsAtom* aHyphenationLanguage,
     if (aSink && !noBreaksNeeded) {
       breakState[offset] =
           mBreakHere || (mAfterBreakableSpace && !isBreakableSpace) ||
-                  (mWordBreak == LineBreaker::kWordBreak_BreakAll)
+                  (mWordBreak >= LineBreaker::kWordBreak_BreakAll)
               ? gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NORMAL
               : gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NONE;
     }
@@ -383,7 +384,7 @@ nsresult nsLineBreaker::AppendText(nsAtom* aHyphenationLanguage,
       // will be set by nsILineBreaker, we don't consider CJK at this point.
       breakState[offset] =
           mBreakHere || (mAfterBreakableSpace && !isBreakableSpace) ||
-                  (mWordBreak == LineBreaker::kWordBreak_BreakAll)
+                  (mWordBreak >= LineBreaker::kWordBreak_BreakAll)
               ? gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NORMAL
               : gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NONE;
     }
diff --git a/intl/lwbrk/LineBreaker.h b/intl/lwbrk/LineBreaker.h
index 2246f56e5942..e20176ac27f3 100644
--- a/intl/lwbrk/LineBreaker.h
+++ b/intl/lwbrk/LineBreaker.h
@@ -18,9 +18,11 @@ class LineBreaker {
   NS_INLINE_DECL_REFCOUNTING(LineBreaker)
 
   enum {
+    // Order is important here, because of tests for value >= BreakAll
     kWordBreak_Normal = 0,    // default
-    kWordBreak_BreakAll = 1,  // break all
-    kWordBreak_KeepAll = 2    // always keep
+    kWordBreak_KeepAll = 1,   // always keep
+    kWordBreak_BreakAll = 2,  // break all
+    kWordBreak_Anywhere = 3   // line-break:anywhere
   };
 
   static already_AddRefed<LineBreaker> Create();
diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp
index 5fb4301a2109..1e29b96c6632 100644
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -1905,7 +1905,8 @@ bool BuildTextRunsScanner::ContinueTextRunAcrossFrames(nsTextFrame* aFrame1,
 
   const nsStyleText* textStyle2 = sc2->StyleText();
   if (textStyle1->mTextTransform != textStyle2->mTextTransform ||
-      textStyle1->EffectiveWordBreak() != textStyle2->EffectiveWordBreak()) {
+      textStyle1->EffectiveWordBreak() != textStyle2->EffectiveWordBreak() ||
+      textStyle1->mLineBreak != textStyle2->mLineBreak) {
     return false;
   }
 
@@ -2587,19 +2588,24 @@ void BuildTextRunsScanner::SetupBreakSinksForTextRun(gfxTextRun* aTextRun,
     // The CSS word-break value may change within a word, so we reset it for
     // each MappedFlow. The line-breaker will flush its text if the property
     // actually changes.
-    auto wordBreak = mappedFlow->mStartFrame->StyleText()->EffectiveWordBreak();
-    switch (wordBreak) {
-      case StyleWordBreak::BreakAll:
-        mLineBreaker.SetWordBreak(LineBreaker::kWordBreak_BreakAll);
-        break;
-      case StyleWordBreak::KeepAll:
-        mLineBreaker.SetWordBreak(LineBreaker::kWordBreak_KeepAll);
-        break;
-      case StyleWordBreak::Normal:
-      default:
-        MOZ_ASSERT(wordBreak == StyleWordBreak::Normal);
-        mLineBreaker.SetWordBreak(LineBreaker::kWordBreak_Normal);
-        break;
+    const auto* styleText = mappedFlow->mStartFrame->StyleText();
+    if (styleText->mLineBreak == StyleLineBreak::Anywhere) {
+        mLineBreaker.SetWordBreak(LineBreaker::kWordBreak_Anywhere);
+    } else {
+      auto wordBreak = styleText->EffectiveWordBreak();
+      switch (wordBreak) {
+        case StyleWordBreak::BreakAll:
+          mLineBreaker.SetWordBreak(LineBreaker::kWordBreak_BreakAll);
+          break;
+        case StyleWordBreak::KeepAll:
+          mLineBreaker.SetWordBreak(LineBreaker::kWordBreak_KeepAll);
+          break;
+        case StyleWordBreak::Normal:
+        default:
+          MOZ_ASSERT(wordBreak == StyleWordBreak::Normal);
+          mLineBreaker.SetWordBreak(LineBreaker::kWordBreak_Normal);
+          break;
+      }
     }
 
     uint32_t offset = iter.GetSkippedOffset();
@@ -2633,7 +2639,8 @@ void BuildTextRunsScanner::SetupBreakSinksForTextRun(gfxTextRun* aTextRun,
     if (textStyle->mTextTransform.case_ == StyleTextTransformCase::Capitalize) {
       flags |= nsLineBreaker::BREAK_NEED_CAPITALIZATION;
     }
-    if (textStyle->mHyphens == StyleHyphens::Auto) {
+    if (textStyle->mHyphens == StyleHyphens::Auto &&
+        textStyle->mLineBreak != StyleLineBreak::Anywhere) {
       flags |= nsLineBreaker::BREAK_USE_AUTO_HYPHENATION;
     }
 
diff --git a/layout/style/ServoBindings.toml b/layout/style/ServoBindings.toml
index ad1244f73dd3..f669a0ce528f 100644
--- a/layout/style/ServoBindings.toml
+++ b/layout/style/ServoBindings.toml
@@ -412,6 +412,7 @@ cbindgen-types = [
     { gecko = "StyleUnicodeRange", servo = "cssparser::UnicodeRange" },
     { gecko = "StyleOverflowWrap", servo = "values::computed::OverflowWrap" },
     { gecko = "StyleWordBreak", servo = "values::computed::WordBreak" },
+    { gecko = "StyleLineBreak", servo = "values::computed::LineBreak" },
     { gecko = "StyleUserSelect", servo = "values::computed::UserSelect" },
     { gecko = "StyleBreakBetween", servo = "values::computed::BreakBetween" },
     { gecko = "StyleBreakWithin", servo = "values::computed::BreakWithin" },
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 0b24f61368d8..768274f7d26b 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -3661,6 +3661,7 @@ nsStyleText::nsStyleText(const nsStyleText& aSource)
       mTextAlignLast(aSource.mTextAlignLast),
       mTextJustify(aSource.mTextJustify),
       mWhiteSpace(aSource.mWhiteSpace),
+      mLineBreak(aSource.mLineBreak),
       mWordBreak(aSource.mWordBreak),
       mOverflowWrap(aSource.mOverflowWrap),
       mHyphens(aSource.mHyphens),
@@ -3704,6 +3705,7 @@ nsChangeHint nsStyleText::CalcDifference(const nsStyleText& aNewData) const {
       (mTextAlignLast != aNewData.mTextAlignLast) ||
       (mTextTransform != aNewData.mTextTransform) ||
       (mWhiteSpace != aNewData.mWhiteSpace) ||
+      (mLineBreak != aNewData.mLineBreak) ||
       (mWordBreak != aNewData.mWordBreak) ||
       (mOverflowWrap != aNewData.mOverflowWrap) ||
       (mHyphens != aNewData.mHyphens) || (mRubyAlign != aNewData.mRubyAlign) ||
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index e866614459ff..3826de8c6ac4 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -1356,6 +1356,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleText {
   uint8_t mTextAlignLast;  // NS_STYLE_TEXT_ALIGN_*
   mozilla::StyleTextJustify mTextJustify;
   mozilla::StyleWhiteSpace mWhiteSpace;
+  mozilla::StyleLineBreak mLineBreak = mozilla::StyleLineBreak::Auto;
 
  private:
   mozilla::StyleWordBreak mWordBreak = mozilla::StyleWordBreak::Normal;
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index a66fecb2915a..c7b778c66a63 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -3996,6 +3996,15 @@ var gCSSProperties = {
     invalid_values: [],
     quirks_values: { "5": "5px" },
   },
+  "line-break": {
+    domProp: "lineBreak",
+    inherited: true,
+    type: CSS_TYPE_LONGHAND,
+    initial_values: [ "auto" ],
+    other_values: [ "anywhere" ],
+    /* these values should be valid but are not yet implemented in gecko */
+    invalid_values: [ "loose", "normal", "strict" ]
+  },
   "line-height": {
     domProp: "lineHeight",
     inherited: true,
diff --git a/servo/components/style/properties/data.py b/servo/components/style/properties/data.py
index 12bd3ce38aec..daeb82ffab90 100644
--- a/servo/components/style/properties/data.py
+++ b/servo/components/style/properties/data.py
@@ -325,6 +325,7 @@ class Longhand(object):
                 "JustifyContent",
                 "JustifyItems",
                 "JustifySelf",
+                "LineBreak",
                 "MozForceBrokenImageIcon",
                 "MozListReversed",
                 "MozScriptLevel",
diff --git a/servo/components/style/properties/longhands/inherited_text.mako.rs b/servo/components/style/properties/longhands/inherited_text.mako.rs
index b864bc483f92..94af642713e0 100644
--- a/servo/components/style/properties/longhands/inherited_text.mako.rs
+++ b/servo/components/style/properties/longhands/inherited_text.mako.rs
@@ -264,6 +264,16 @@ ${helpers.predefined_type(
     spec="https://drafts.csswg.org/css-text-3/#tab-size-property",
 )}
 
+${helpers.predefined_type(
+    "line-break",
+    "LineBreak",
+    "computed::LineBreak::Auto",
+    products="gecko",
+    animation_value_type="discrete",
+    spec="https://drafts.csswg.org/css-text-3/#line-break-property",
+    needs_context=False,
+)}
+
 // CSS Compatibility
 // https://compat.spec.whatwg.org
 ${helpers.predefined_type(
diff --git a/servo/components/style/values/computed/mod.rs b/servo/components/style/values/computed/mod.rs
index 993af4177ade..aa3963db8043 100644
--- a/servo/components/style/values/computed/mod.rs
+++ b/servo/components/style/values/computed/mod.rs
@@ -77,7 +77,7 @@ pub use self::svg::MozContextProperties;
 pub use self::svg::{SVGLength, SVGOpacity, SVGPaint, SVGPaintKind};
 pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
 pub use self::table::XSpan;
-pub use self::text::{InitialLetter, LetterSpacing, LineHeight};
+pub use self::text::{InitialLetter, LetterSpacing, LineBreak, LineHeight};
 pub use self::text::{OverflowWrap, TextOverflow, WordBreak, WordSpacing};
 pub use self::text::{TextAlign, TextEmphasisPosition, TextEmphasisStyle};
 pub use self::time::Time;
diff --git a/servo/components/style/values/computed/text.rs b/servo/components/style/values/computed/text.rs
index c29d3d452103..7395cf71bb25 100644
--- a/servo/components/style/values/computed/text.rs
+++ b/servo/components/style/values/computed/text.rs
@@ -20,7 +20,7 @@ use style_traits::{CssWriter, ToCss};
 
 pub use crate::values::specified::TextAlignKeyword as TextAlign;
 pub use crate::values::specified::TextTransform;
-pub use crate::values::specified::{OverflowWrap, WordBreak};
+pub use crate::values::specified::{LineBreak, OverflowWrap, WordBreak};
 pub use crate::values::specified::{TextDecorationLine, TextEmphasisPosition};
 
 /// A computed value for the `initial-letter` property.
diff --git a/servo/components/style/values/specified/mod.rs b/servo/components/style/values/specified/mod.rs
index 83fc71444bbd..7c59f66e3183 100644
--- a/servo/components/style/values/specified/mod.rs
+++ b/servo/components/style/values/specified/mod.rs
@@ -81,7 +81,7 @@ pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
 pub use self::svg_path::SVGPathData;
 pub use self::table::XSpan;
 pub use self::text::TextTransform;
-pub use self::text::{InitialLetter, LetterSpacing, LineHeight, TextAlign};
+pub use self::text::{InitialLetter, LetterSpacing, LineBreak, LineHeight, TextAlign};
 pub use self::text::{OverflowWrap, TextEmphasisPosition, TextEmphasisStyle, WordBreak};
 pub use self::text::{TextAlignKeyword, TextDecorationLine, TextOverflow, WordSpacing};
 pub use self::time::Time;
diff --git a/servo/components/style/values/specified/text.rs b/servo/components/style/values/specified/text.rs
index 6be20f58618c..a78cb4135c3d 100644
--- a/servo/components/style/values/specified/text.rs
+++ b/servo/components/style/values/specified/text.rs
@@ -1005,6 +1005,32 @@ pub enum WordBreak {
     BreakWord,
 }
 
+/// Values for the `line-break` property.
+#[repr(u8)]
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Eq,
+    MallocSizeOf,
+    Parse,
+    PartialEq,
+    SpecifiedValueInfo,
+    ToComputedValue,
+    ToCss,
+    ToResolvedValue,
+    ToShmem,
+)]
+#[allow(missing_docs)]
+pub enum LineBreak {
+    Auto,
+    /// TODO: additional values not yet implemented
+    /// Loose,
+    /// Normal,
+    /// Strict,
+    Anywhere,
+}
+
 /// Values for the `overflow-wrap` property.
 #[repr(u8)]
 #[derive(
diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml
index 600f1012b1a8..df4a99aa62e6 100644
--- a/servo/ports/geckolib/cbindgen.toml
+++ b/servo/ports/geckolib/cbindgen.toml
@@ -105,6 +105,7 @@ include = [
   "Perspective",
   "ZIndex",
   "TransformOrigin",
+  "LineBreak",
   "WordBreak",
   "Contain",
   "Origin",
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-anywhere-001.html.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-anywhere-001.html.ini
deleted file mode 100644
index 3d475eda8311..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-anywhere-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-anywhere-001.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-anywhere-002.html.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-anywhere-002.html.ini
deleted file mode 100644
index 83232ded79f3..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-anywhere-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-anywhere-002.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/parsing/line-break-valid.html.ini b/testing/web-platform/meta/css/css-text/parsing/line-break-valid.html.ini
index 6ff20f08110c..3ad3ade704b7 100644
--- a/testing/web-platform/meta/css/css-text/parsing/line-break-valid.html.ini
+++ b/testing/web-platform/meta/css/css-text/parsing/line-break-valid.html.ini
@@ -5,12 +5,6 @@
   [e.style['line-break'\] = "normal" should set the property value]
     expected: FAIL
 
-  [e.style['line-break'\] = "anywhere" should set the property value]
-    expected: FAIL
-
-  [e.style['line-break'\] = "auto" should set the property value]
-    expected: FAIL
-
   [e.style['line-break'\] = "strict" should set the property value]
     expected: FAIL
 

From 837368bc29ae26d2f8a7f90e405e81bacd542966 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 20 May 2019 20:46:28 +0000
Subject: [PATCH 072/129] Bug 1011369 - Add parsing of the loose|normal|strict
 values of the CSS line-break property. r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D30785

--HG--
extra : moz-landing-system : lando
---
 devtools/shared/css/generated/properties-db.js  | 3 +++
 layout/style/test/property_database.js          | 5 ++---
 servo/components/style/values/specified/text.rs | 7 +++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js
index 4f0a23944e16..0bf3897795e6 100644
--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@@ -7335,7 +7335,10 @@ exports.CSS_PROPERTIES = {
       "auto",
       "inherit",
       "initial",
+      "loose",
+      "normal",
       "revert",
+      "strict",
       "unset"
     ]
   },
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index c7b778c66a63..c8094f1eeeeb 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -4001,9 +4001,8 @@ var gCSSProperties = {
     inherited: true,
     type: CSS_TYPE_LONGHAND,
     initial_values: [ "auto" ],
-    other_values: [ "anywhere" ],
-    /* these values should be valid but are not yet implemented in gecko */
-    invalid_values: [ "loose", "normal", "strict" ]
+    other_values: [ "loose", "normal", "strict", "anywhere" ],
+    invalid_values: []
   },
   "line-height": {
     domProp: "lineHeight",
diff --git a/servo/components/style/values/specified/text.rs b/servo/components/style/values/specified/text.rs
index a78cb4135c3d..1ab805cdcfb7 100644
--- a/servo/components/style/values/specified/text.rs
+++ b/servo/components/style/values/specified/text.rs
@@ -1024,10 +1024,9 @@ pub enum WordBreak {
 #[allow(missing_docs)]
 pub enum LineBreak {
     Auto,
-    /// TODO: additional values not yet implemented
-    /// Loose,
-    /// Normal,
-    /// Strict,
+    Loose,
+    Normal,
+    Strict,
     Anywhere,
 }
 

From 9ac5b6c1afe791ec4b855596be7a36e8ec3efa8a Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 20 May 2019 20:46:35 +0000
Subject: [PATCH 073/129] Bug 1011369 - Pass word-break and line-break
 properties to the line-breaker as two distinct enum class parameters.
 r=m_kato

Differential Revision: https://phabricator.services.mozilla.com/D30786

--HG--
extra : moz-landing-system : lando
---
 dom/base/nsLineBreaker.cpp     | 29 +++++++++++++--------
 dom/base/nsLineBreaker.h       | 29 ++++++++++++++++++---
 intl/lwbrk/LineBreaker.cpp     | 24 +++++++++--------
 intl/lwbrk/LineBreaker.h       | 24 +++++++++++------
 layout/generic/nsTextFrame.cpp | 47 ++++++++++++++++++++++------------
 5 files changed, 103 insertions(+), 50 deletions(-)

diff --git a/dom/base/nsLineBreaker.cpp b/dom/base/nsLineBreaker.cpp
index 84d13a3f6f83..7347065c3be9 100644
--- a/dom/base/nsLineBreaker.cpp
+++ b/dom/base/nsLineBreaker.cpp
@@ -20,7 +20,8 @@ nsLineBreaker::nsLineBreaker()
       mCurrentWordContainsComplexChar(false),
       mAfterBreakableSpace(false),
       mBreakHere(false),
-      mWordBreak(LineBreaker::kWordBreak_Normal) {}
+      mWordBreak(LineBreaker::WordBreak::Normal),
+      mStrictness(LineBreaker::Strictness::Auto) {}
 
 nsLineBreaker::~nsLineBreaker() {
   NS_ASSERTION(mCurrentWord.Length() == 0,
@@ -57,22 +58,28 @@ static void SetupCapitalization(const char16_t* aWord, uint32_t aLength,
 nsresult nsLineBreaker::FlushCurrentWord() {
   uint32_t length = mCurrentWord.Length();
   AutoTArray<uint8_t, 4000> breakState;
-  if (!breakState.AppendElements(length)) return NS_ERROR_OUT_OF_MEMORY;
+  if (!breakState.AppendElements(length)) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
 
   nsTArray<bool> capitalizationState;
 
-  if (!mCurrentWordContainsComplexChar ||
-      mWordBreak == LineBreaker::kWordBreak_Anywhere) {
+  if (mStrictness == LineBreaker::Strictness::Anywhere) {
+    memset(breakState.Elements(),
+           gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NORMAL,
+           length * sizeof(uint8_t));
+  } else if (!mCurrentWordContainsComplexChar) {
     // For break-strict set everything internal to "break", otherwise
     // to "no break"!
     memset(breakState.Elements(),
-           mWordBreak >= LineBreaker::kWordBreak_BreakAll
+           mWordBreak == LineBreaker::WordBreak::BreakAll
                ? gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NORMAL
                : gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NONE,
            length * sizeof(uint8_t));
   } else {
     nsContentUtils::LineBreaker()->GetJISx4051Breaks(
-        mCurrentWord.Elements(), length, mWordBreak, breakState.Elements());
+        mCurrentWord.Elements(), length, mWordBreak, mStrictness,
+        breakState.Elements());
   }
 
   bool autoHyphenate = mCurrentWordLanguage && !mCurrentWordContainsMixedLang;
@@ -226,7 +233,8 @@ nsresult nsLineBreaker::AppendText(nsAtom* aHyphenationLanguage,
     if (aSink && !noBreaksNeeded) {
       breakState[offset] =
           mBreakHere || (mAfterBreakableSpace && !isBreakableSpace) ||
-                  (mWordBreak >= LineBreaker::kWordBreak_BreakAll)
+                  mWordBreak == LineBreaker::WordBreak::BreakAll ||
+                  mStrictness == LineBreaker::Strictness::Anywhere
               ? gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NORMAL
               : gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NONE;
     }
@@ -241,7 +249,7 @@ nsresult nsLineBreaker::AppendText(nsAtom* aHyphenationLanguage,
             // set it to false
             uint8_t currentStart = breakState[wordStart];
             nsContentUtils::LineBreaker()->GetJISx4051Breaks(
-                aText + wordStart, offset - wordStart, mWordBreak,
+                aText + wordStart, offset - wordStart, mWordBreak, mStrictness,
                 breakState.Elements() + wordStart);
             breakState[wordStart] = currentStart;
           }
@@ -384,7 +392,8 @@ nsresult nsLineBreaker::AppendText(nsAtom* aHyphenationLanguage,
       // will be set by nsILineBreaker, we don't consider CJK at this point.
       breakState[offset] =
           mBreakHere || (mAfterBreakableSpace && !isBreakableSpace) ||
-                  (mWordBreak >= LineBreaker::kWordBreak_BreakAll)
+                  mWordBreak == LineBreaker::WordBreak::BreakAll ||
+                  mStrictness == LineBreaker::Strictness::Anywhere
               ? gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NORMAL
               : gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NONE;
     }
@@ -398,7 +407,7 @@ nsresult nsLineBreaker::AppendText(nsAtom* aHyphenationLanguage,
           // set it to false
           uint8_t currentStart = breakState[wordStart];
           nsContentUtils::LineBreaker()->GetJISx4051Breaks(
-              aText + wordStart, offset - wordStart, mWordBreak,
+              aText + wordStart, offset - wordStart, mWordBreak, mStrictness,
               breakState.Elements() + wordStart);
           breakState[wordStart] = currentStart;
         }
diff --git a/dom/base/nsLineBreaker.h b/dom/base/nsLineBreaker.h
index 7329648253de..8ee04d8a8dc2 100644
--- a/dom/base/nsLineBreaker.h
+++ b/dom/base/nsLineBreaker.h
@@ -175,9 +175,9 @@ class nsLineBreaker {
 
   /*
    * Set word-break mode for linebreaker.  This is set by word-break property.
-   * @param aMode is LineBreaker::kWordBreak_* value.
+   * @param aMode is LineBreaker::WordBreak::* value.
    */
-  void SetWordBreak(uint8_t aMode) {
+  void SetWordBreak(mozilla::intl::LineBreaker::WordBreak aMode) {
     // If current word is non-empty and mode is changing, flush the breaker.
     if (aMode != mWordBreak && !mCurrentWord.IsEmpty()) {
       nsresult rv = FlushCurrentWord();
@@ -187,13 +187,32 @@ class nsLineBreaker {
       // If previous mode was break-all, we should allow a break here.
       // XXX (jfkthame) css-text spec seems unclear on this, raised question in
       // https://github.com/w3c/csswg-drafts/issues/3897
-      if (mWordBreak == mozilla::intl::LineBreaker::kWordBreak_BreakAll) {
+      if (mWordBreak == mozilla::intl::LineBreaker::WordBreak::BreakAll) {
         mBreakHere = true;
       }
     }
     mWordBreak = aMode;
   }
 
+  /*
+   * Set line-break rule strictness mode for linebreaker.  This is set by the
+   * line-break property.
+   * @param aMode is LineBreaker::Strictness::* value.
+   */
+  void SetStrictness(mozilla::intl::LineBreaker::Strictness aMode) {
+    if (aMode != mStrictness && !mCurrentWord.IsEmpty()) {
+      nsresult rv = FlushCurrentWord();
+      if (NS_FAILED(rv)) {
+        NS_WARNING("FlushCurrentWord failed, line-breaks may be wrong");
+      }
+      // If previous mode was anywhere, we should allow a break here.
+      if (mStrictness == mozilla::intl::LineBreaker::Strictness::Anywhere) {
+        mBreakHere = true;
+      }
+    }
+    mStrictness = aMode;
+  }
+
  private:
   // This is a list of text sources that make up the "current word" (i.e.,
   // run of text which does not contain any whitespace). All the mLengths
@@ -239,7 +258,9 @@ class nsLineBreaker {
   // a run of breakable whitespace ends here
   bool mBreakHere;
   // line break mode by "word-break" style
-  uint8_t mWordBreak;
+  mozilla::intl::LineBreaker::WordBreak mWordBreak;
+  // strictness of break rules, from line-break property
+  mozilla::intl::LineBreaker::Strictness mStrictness;
 };
 
 #endif /*NSLINEBREAKER_H_*/
diff --git a/intl/lwbrk/LineBreaker.cpp b/intl/lwbrk/LineBreaker.cpp
index 193d99f0243e..850e930bde78 100644
--- a/intl/lwbrk/LineBreaker.cpp
+++ b/intl/lwbrk/LineBreaker.cpp
@@ -824,8 +824,8 @@ int32_t LineBreaker::WordMove(const char16_t* aText, uint32_t aLen,
       ret = end;
     }
   } else {
-    GetJISx4051Breaks(aText + begin, end - begin,
-                      LineBreaker::kWordBreak_Normal, breakState.Elements());
+    GetJISx4051Breaks(aText + begin, end - begin, WordBreak::Normal,
+                      Strictness::Auto, breakState.Elements());
 
     ret = aPos;
     do {
@@ -855,7 +855,8 @@ int32_t LineBreaker::Prev(const char16_t* aText, uint32_t aLen, uint32_t aPos) {
 }
 
 void LineBreaker::GetJISx4051Breaks(const char16_t* aChars, uint32_t aLength,
-                                    uint8_t aWordBreak, uint8_t* aBreakBefore) {
+                                    WordBreak aWordBreak, Strictness aLevel,
+                                    uint8_t* aBreakBefore) {
   uint32_t cur;
   int8_t lastClass = CLASS_NONE;
   ContextState state(aChars, aLength);
@@ -896,7 +897,7 @@ void LineBreaker::GetJISx4051Breaks(const char16_t* aChars, uint32_t aLength,
     // CLASS_CLOSE by GetClass(), but those classes also include others that
     // we don't want to touch here, so we re-check the Unicode line-break class
     // to determine which ones to modify.
-    if (aWordBreak == LineBreaker::kWordBreak_BreakAll &&
+    if (aWordBreak == WordBreak::BreakAll &&
         (cl == CLASS_CHARACTER || cl == CLASS_CLOSE)) {
       auto cls = GetLineBreakClass(ch);
       if (cls == U_LB_ALPHABETIC || cls == U_LB_NUMERIC ||
@@ -914,8 +915,8 @@ void LineBreaker::GetJISx4051Breaks(const char16_t* aChars, uint32_t aLength,
     if (cur > 0) {
       NS_ASSERTION(CLASS_COMPLEX != lastClass || CLASS_COMPLEX != cl,
                    "Loop should have prevented adjacent complex chars here");
-      if (aWordBreak == LineBreaker::kWordBreak_Normal ||
-          aWordBreak == LineBreaker::kWordBreak_BreakAll) {
+      if (aWordBreak == WordBreak::Normal ||
+          aWordBreak == WordBreak::BreakAll) {
         allowBreak = (state.UseConservativeBreaking())
                          ? GetPairConservative(lastClass, cl)
                          : GetPair(lastClass, cl);
@@ -938,7 +939,7 @@ void LineBreaker::GetJISx4051Breaks(const char16_t* aChars, uint32_t aLength,
         }
       }
 
-      if (aWordBreak == LineBreaker::kWordBreak_BreakAll) {
+      if (aWordBreak == WordBreak::BreakAll) {
         // For break-all, we don't need to run a dictionary-based breaking
         // algorithm, we just allow breaks between all grapheme clusters.
         ClusterIterator ci(aChars + cur, end - cur);
@@ -967,7 +968,8 @@ void LineBreaker::GetJISx4051Breaks(const char16_t* aChars, uint32_t aLength,
 }
 
 void LineBreaker::GetJISx4051Breaks(const uint8_t* aChars, uint32_t aLength,
-                                    uint8_t aWordBreak, uint8_t* aBreakBefore) {
+                                    WordBreak aWordBreak, Strictness aLevel,
+                                    uint8_t* aBreakBefore) {
   uint32_t cur;
   int8_t lastClass = CLASS_NONE;
   ContextState state(aChars, aLength);
@@ -985,7 +987,7 @@ void LineBreaker::GetJISx4051Breaks(const uint8_t* aChars, uint32_t aLength,
       state.NotifyNonHyphenCharacter(ch);
       cl = GetClass(ch);
     }
-    if (aWordBreak == LineBreaker::kWordBreak_BreakAll &&
+    if (aWordBreak == WordBreak::BreakAll &&
         (cl == CLASS_CHARACTER || cl == CLASS_CLOSE)) {
       auto cls = GetLineBreakClass(ch);
       // Don't need to check additional Japanese/Korean classes in 8-bit
@@ -997,8 +999,8 @@ void LineBreaker::GetJISx4051Breaks(const uint8_t* aChars, uint32_t aLength,
 
     bool allowBreak = false;
     if (cur > 0) {
-      if (aWordBreak == LineBreaker::kWordBreak_Normal ||
-          aWordBreak == LineBreaker::kWordBreak_BreakAll) {
+      if (aWordBreak == WordBreak::Normal ||
+          aWordBreak == WordBreak::BreakAll) {
         allowBreak = (state.UseConservativeBreaking())
                          ? GetPairConservative(lastClass, cl)
                          : GetPair(lastClass, cl);
diff --git a/intl/lwbrk/LineBreaker.h b/intl/lwbrk/LineBreaker.h
index e20176ac27f3..88b2e4049e03 100644
--- a/intl/lwbrk/LineBreaker.h
+++ b/intl/lwbrk/LineBreaker.h
@@ -17,12 +17,18 @@ class LineBreaker {
  public:
   NS_INLINE_DECL_REFCOUNTING(LineBreaker)
 
-  enum {
-    // Order is important here, because of tests for value >= BreakAll
-    kWordBreak_Normal = 0,    // default
-    kWordBreak_KeepAll = 1,   // always keep
-    kWordBreak_BreakAll = 2,  // break all
-    kWordBreak_Anywhere = 3   // line-break:anywhere
+  enum class WordBreak : uint8_t {
+    Normal = 0,    // default
+    BreakAll = 1,  // break all
+    KeepAll = 2    // always keep
+  };
+
+  enum class Strictness : uint8_t {
+    Auto = 0,
+    Loose = 1,
+    Normal = 2,
+    Strict = 3,
+    Anywhere = 4
   };
 
   static already_AddRefed<LineBreaker> Create();
@@ -38,9 +44,11 @@ class LineBreaker {
   // aLength is the length of the aText array and also the length of the
   // aBreakBefore output array.
   void GetJISx4051Breaks(const char16_t* aText, uint32_t aLength,
-                         uint8_t aWordBreak, uint8_t* aBreakBefore);
+                         WordBreak aWordBreak, Strictness aLevel,
+                         uint8_t* aBreakBefore);
   void GetJISx4051Breaks(const uint8_t* aText, uint32_t aLength,
-                         uint8_t aWordBreak, uint8_t* aBreakBefore);
+                         WordBreak aWordBreak, Strictness aLevel,
+                         uint8_t* aBreakBefore);
 
  private:
   ~LineBreaker() {}
diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp
index 1e29b96c6632..638207530ce5 100644
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -2589,23 +2589,36 @@ void BuildTextRunsScanner::SetupBreakSinksForTextRun(gfxTextRun* aTextRun,
     // each MappedFlow. The line-breaker will flush its text if the property
     // actually changes.
     const auto* styleText = mappedFlow->mStartFrame->StyleText();
-    if (styleText->mLineBreak == StyleLineBreak::Anywhere) {
-        mLineBreaker.SetWordBreak(LineBreaker::kWordBreak_Anywhere);
-    } else {
-      auto wordBreak = styleText->EffectiveWordBreak();
-      switch (wordBreak) {
-        case StyleWordBreak::BreakAll:
-          mLineBreaker.SetWordBreak(LineBreaker::kWordBreak_BreakAll);
-          break;
-        case StyleWordBreak::KeepAll:
-          mLineBreaker.SetWordBreak(LineBreaker::kWordBreak_KeepAll);
-          break;
-        case StyleWordBreak::Normal:
-        default:
-          MOZ_ASSERT(wordBreak == StyleWordBreak::Normal);
-          mLineBreaker.SetWordBreak(LineBreaker::kWordBreak_Normal);
-          break;
-      }
+    auto wordBreak = styleText->EffectiveWordBreak();
+    switch (wordBreak) {
+      case StyleWordBreak::BreakAll:
+        mLineBreaker.SetWordBreak(LineBreaker::WordBreak::BreakAll);
+        break;
+      case StyleWordBreak::KeepAll:
+        mLineBreaker.SetWordBreak(LineBreaker::WordBreak::KeepAll);
+        break;
+      case StyleWordBreak::Normal:
+      default:
+        MOZ_ASSERT(wordBreak == StyleWordBreak::Normal);
+        mLineBreaker.SetWordBreak(LineBreaker::WordBreak::Normal);
+        break;
+    }
+    switch (styleText->mLineBreak) {
+      case StyleLineBreak::Auto:
+        mLineBreaker.SetStrictness(LineBreaker::Strictness::Auto);
+        break;
+      case StyleLineBreak::Normal:
+        mLineBreaker.SetStrictness(LineBreaker::Strictness::Normal);
+        break;
+      case StyleLineBreak::Loose:
+        mLineBreaker.SetStrictness(LineBreaker::Strictness::Loose);
+        break;
+      case StyleLineBreak::Strict:
+        mLineBreaker.SetStrictness(LineBreaker::Strictness::Strict);
+        break;
+      case StyleLineBreak::Anywhere:
+        mLineBreaker.SetStrictness(LineBreaker::Strictness::Anywhere);
+        break;
     }
 
     uint32_t offset = iter.GetSkippedOffset();

From 5cd611f65b2b95218137986bb8a9d8efd8f941f7 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 20 May 2019 20:46:57 +0000
Subject: [PATCH 074/129] Bug 1011369 - Implement loose|normal|strict
 line-break values by remapping the linebreak class of affected characters.
 r=m_kato

Differential Revision: https://phabricator.services.mozilla.com/D30787

--HG--
extra : moz-landing-system : lando
---
 intl/lwbrk/LineBreaker.cpp                  | 318 +++++++++++++-------
 intl/unicharutil/util/nsUnicodeProperties.h |  14 +
 2 files changed, 215 insertions(+), 117 deletions(-)

diff --git a/intl/lwbrk/LineBreaker.cpp b/intl/lwbrk/LineBreaker.cpp
index 850e930bde78..89d2c0bb7806 100644
--- a/intl/lwbrk/LineBreaker.cpp
+++ b/intl/lwbrk/LineBreaker.cpp
@@ -127,7 +127,7 @@ already_AddRefed<LineBreaker> LineBreaker::Create() {
         7        X  X
         8        X              X
         9        X
-      [b]        X
+      [b]        X  x
        15        X        X     X  X
        18        X              X  X
 
@@ -146,7 +146,7 @@ already_AddRefed<LineBreaker> LineBreaker::Create() {
         7        X  X
         8        X              X
         9        X
-      [b]        X
+      [b]        X  x
        15        X        X     X  X
        18        X              X  X
   COMPLEX        X                    T
@@ -174,7 +174,7 @@ already_AddRefed<LineBreaker> LineBreaker::Create() {
         7        X  X
         8        X              X
         9        X
-      [b]        X                                 X
+      [b]        X  x                              X
        15        X        X     X  X          X    X
        18        X              X  X          X    X
   COMPLEX        X                    T
@@ -196,7 +196,7 @@ already_AddRefed<LineBreaker> LineBreaker::Create() {
         7        X  X                                  X
         8        X              X                      X
         9        X                                     X
-      [b]        X                                 X   X
+      [b]        X  x                              X   X
        15        X        X     X  X          X    X   X
        18        X              X  X          X    X   X
   COMPLEX        X                    T                X
@@ -215,7 +215,7 @@ already_AddRefed<LineBreaker> LineBreaker::Create() {
        7  0000 1000 0000 0110  = 0x0806
        8  0000 1000 0100 0010  = 0x0842
        9  0000 1000 0000 0010  = 0x0802
-      [b] 0000 1100 0000 0010  = 0x0C02
+      [b] 0000 1100 0000 0110  = 0x0C06
       15  0000 1110 1101 0010  = 0x0ED2
       18  0000 1110 1100 0010  = 0x0EC2
  COMPLEX  0000 1001 0000 0010  = 0x0902
@@ -227,7 +227,7 @@ already_AddRefed<LineBreaker> LineBreaker::Create() {
 #define MAX_CLASSES 12
 
 static const uint16_t gPair[MAX_CLASSES] = {0x0FFF, 0x0C02, 0x0806, 0x0842,
-                                            0x0802, 0x0C02, 0x0ED2, 0x0EC2,
+                                            0x0802, 0x0C06, 0x0ED2, 0x0EC2,
                                             0x0902, 0x0FFF, 0x0CC2, 0x0FFF};
 
 /*
@@ -248,7 +248,7 @@ static const uint16_t gPair[MAX_CLASSES] = {0x0FFF, 0x0C02, 0x0806, 0x0842,
         7        X  X           X  X          X    X   X
         8        X              X  X          X    X   X
         9        X              X  X          X    X   X
-      [b]        X                                 X   X
+      [b]        X  x                              X   X
        15     X  X  X  X  X     X  X  X       X    X   X
        18     X  X  X  X  X     X  X  X       X    X   X
   COMPLEX        X              X  X  T       X    X   X
@@ -263,7 +263,7 @@ static const uint16_t gPair[MAX_CLASSES] = {0x0FFF, 0x0C02, 0x0806, 0x0842,
        7  0000 1110 1100 0110  = 0x0EC6
        8  0000 1110 1100 0010  = 0x0EC2
        9  0000 1110 1100 0010  = 0x0EC2
-      [b] 0000 1100 0000 0010  = 0x0C02
+      [b] 0000 1100 0000 0110  = 0x0C06
       15  0000 1111 1101 1111  = 0x0FDF
       18  0000 1111 1101 1111  = 0x0FDF
  COMPLEX  0000 1111 1100 0010  = 0x0FC2
@@ -273,7 +273,7 @@ static const uint16_t gPair[MAX_CLASSES] = {0x0FFF, 0x0C02, 0x0806, 0x0842,
 */
 
 static const uint16_t gPairConservative[MAX_CLASSES] = {
-    0x0FFF, 0x0EC2, 0x0EC6, 0x0EC2, 0x0EC2, 0x0C02,
+    0x0FFF, 0x0EC2, 0x0EC6, 0x0EC2, 0x0EC2, 0x0C06,
     0x0FDF, 0x0FDF, 0x0FC2, 0x0FFF, 0x0FDF, 0x0FFF};
 
 /*
@@ -370,104 +370,7 @@ static inline bool IS_HYPHEN(char16_t u) {
           u == 0x2013);                    // EN DASH
 }
 
-static int8_t GetClass(uint32_t u) {
-  if (u < 0x10000) {
-    uint16_t h = u & 0xFF00;
-    uint16_t l = u & 0x00ff;
-
-    // Handle 3 range table first
-    if (0x0000 == h) {
-      return GETCLASSFROMTABLE(gLBClass00, l);
-    }
-    if (0x1700 == h) {
-      return GETCLASSFROMTABLE(gLBClass17, l);
-    }
-    if (NS_NeedsPlatformNativeHandling(u)) {
-      return CLASS_COMPLEX;
-    }
-    if (0x0E00 == h) {
-      return GETCLASSFROMTABLE(gLBClass0E, l);
-    }
-    if (0x2000 == h) {
-      return GETCLASSFROMTABLE(gLBClass20, l);
-    }
-    if (0x2100 == h) {
-      return GETCLASSFROMTABLE(gLBClass21, l);
-    }
-    if (0x3000 == h) {
-      return GETCLASSFROMTABLE(gLBClass30, l);
-    }
-    if (0xff00 == h) {
-      if (l < 0x0060) {  // Fullwidth ASCII variant
-        return GETCLASSFROMTABLE(gLBClass00, (l + 0x20));
-      }
-      if (l < 0x00a0) {  // Halfwidth Katakana variants
-        switch (l) {
-          case 0x61:
-            return GetClass(0x3002);
-          case 0x62:
-            return GetClass(0x300c);
-          case 0x63:
-            return GetClass(0x300d);
-          case 0x64:
-            return GetClass(0x3001);
-          case 0x65:
-            return GetClass(0x30fb);
-          case 0x9e:
-            return GetClass(0x309b);
-          case 0x9f:
-            return GetClass(0x309c);
-          default:
-            if (IS_HALFWIDTH_IN_JISx4051_CLASS3(u)) {
-              return CLASS_CLOSE;  // jis x4051 class 3
-            }
-            return CLASS_BREAKABLE;  // jis x4051 class 11
-        }
-      }
-      if (l < 0x00e0) {
-        return CLASS_CHARACTER;  // Halfwidth Hangul variants
-      }
-      if (l < 0x00f0) {
-        static char16_t NarrowFFEx[16] = {
-            0x00A2, 0x00A3, 0x00AC, 0x00AF, 0x00A6, 0x00A5, 0x20A9, 0x0000,
-            0x2502, 0x2190, 0x2191, 0x2192, 0x2193, 0x25A0, 0x25CB, 0x0000};
-        return GetClass(NarrowFFEx[l - 0x00e0]);
-      }
-    } else if (0x3100 == h) {
-      if (l <= 0xbf) {  // Hangul Compatibility Jamo, Bopomofo, Kanbun
-                        // XXX: This is per UAX #14, but UAX #14 may change
-                        // the line breaking rules about Kanbun and Bopomofo.
-        return CLASS_BREAKABLE;
-      }
-      if (l >= 0xf0) {  // Katakana small letters for Ainu
-        return CLASS_CLOSE;
-      }
-    } else if (0x0300 == h) {
-      if (0x4F == l || (0x5C <= l && l <= 0x62)) {
-        return CLASS_NON_BREAKABLE;
-      }
-    } else if (0x0500 == h) {
-      // ARMENIAN HYPHEN (for "Breaking Hyphens" of UAX#14)
-      if (l == 0x8A) {
-        return GETCLASSFROMTABLE(gLBClass00, uint16_t(U_HYPHEN));
-      }
-    } else if (0x0F00 == h) {
-      if (0x08 == l || 0x0C == l || 0x12 == l) {
-        return CLASS_NON_BREAKABLE;
-      }
-    } else if (0x1800 == h) {
-      if (0x0E == l) {
-        return CLASS_NON_BREAKABLE;
-      }
-    } else if (0x1600 == h) {
-      if (0x80 == l) {  // U+1680 OGHAM SPACE MARK
-        return CLASS_BREAKABLE;
-      }
-    } else if (u == 0xfeff) {
-      return CLASS_NON_BREAKABLE;
-    }
-  }
-
+static int8_t GetClass(uint32_t u, LineBreaker::Strictness aLevel) {
   // Mapping for Unicode LineBreak.txt classes to the (simplified) set of
   // character classes used here.
   // XXX The mappings here were derived by comparing the Unicode LineBreak
@@ -476,7 +379,7 @@ static int8_t GetClass(uint32_t u) {
   //     LineBreak class mapped to various classes here, I picked what seemed
   //     the most prevalent equivalence.
   //     Some of these are unclear to me, but currently they are ONLY used
-  //     for characters not handled by the old code above, so all the JISx405
+  //     for characters not handled by the old code below, so all the JISx405
   //     special cases should already be accounted for.
   static const int8_t sUnicodeLineBreakToClass[] = {
       /* UNKNOWN = 0,                       [XX] */ CLASS_CHARACTER,
@@ -528,6 +431,186 @@ static int8_t GetClass(uint32_t u) {
 
   auto cls = GetLineBreakClass(u);
   MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
+
+  // Overrides based on rules for the different line-break values given in
+  // https://drafts.csswg.org/css-text-3/#line-break-property
+  switch (aLevel) {
+    case LineBreaker::Strictness::Auto:
+      // For now, just use legacy Gecko behavior.
+      // XXX Possible enhancement - vary strictness according to line width
+      // or other criteria.
+      break;
+    case LineBreaker::Strictness::Strict:
+      if (cls == U_LB_CONDITIONAL_JAPANESE_STARTER ||
+          (u == 0x3095 || u == 0x3096 || u == 0x30f5 || u == 0x30f6)) {
+        return CLASS_CLOSE;
+      }
+      if (cls == U_LB_INSEPARABLE) {
+        return CLASS_NON_BREAKABLE_BETWEEN_SAME_CLASS;
+      }
+      if (u == 0x3005 || u == 0x303B || u == 0x309D || u == 0x309E ||
+          u == 0x30FD || u == 0x30FE) {
+        return CLASS_CLOSE_LIKE_CHARACTER;
+      }
+      if (cls == U_LB_POSTFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
+        return CLASS_CLOSE_LIKE_CHARACTER;
+      }
+      if (cls == U_LB_PREFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
+        return CLASS_OPEN_LIKE_CHARACTER;
+      }
+      if (u == 0x2010 || u == 0x2013 || u == 0x301C || u == 0x30A0) {
+        return CLASS_CLOSE_LIKE_CHARACTER;
+      }
+      break;
+    case LineBreaker::Strictness::Normal:
+      if (cls == U_LB_CONDITIONAL_JAPANESE_STARTER) {
+        return CLASS_BREAKABLE;
+      }
+      if (cls == U_LB_INSEPARABLE) {
+        return CLASS_NON_BREAKABLE_BETWEEN_SAME_CLASS;
+      }
+      if (u == 0x3005 || u == 0x303B || u == 0x309D || u == 0x309E ||
+          u == 0x30FD || u == 0x30FE) {
+        return CLASS_CLOSE_LIKE_CHARACTER;
+      }
+      if (cls == U_LB_POSTFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
+        return CLASS_CLOSE_LIKE_CHARACTER;
+      }
+      if (cls == U_LB_PREFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
+        return CLASS_OPEN_LIKE_CHARACTER;
+      }
+      if (u == 0x2010 || u == 0x2013 || u == 0x301C || u == 0x30A0) {
+        return CLASS_BREAKABLE;
+      }
+      break;
+    case LineBreaker::Strictness::Loose:
+      if (cls == U_LB_CONDITIONAL_JAPANESE_STARTER) {
+        return CLASS_BREAKABLE;
+      }
+      if (u == 0x3005 || u == 0x303B || u == 0x309D || u == 0x309E ||
+          u == 0x30FD || u == 0x30FE) {
+        return CLASS_BREAKABLE;
+      }
+      if (cls == U_LB_INSEPARABLE) {
+        return CLASS_BREAKABLE;
+      }
+      if (u == 0x30FB || u == 0xFF1A || u == 0xFF1B || u == 0xFF65 ||
+          u == 0x203C || u == 0x2047 || u == 0x2048 || u == 0x2049 ||
+          u == 0xFF01 || u == 0xFF1F) {
+        return CLASS_BREAKABLE;
+      }
+      if (cls == U_LB_POSTFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
+        return CLASS_BREAKABLE;
+      }
+      if (cls == U_LB_PREFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
+        return CLASS_BREAKABLE;
+      }
+      if (u == 0x2010 || u == 0x2013 || u == 0x301C || u == 0x30A0) {
+        return CLASS_BREAKABLE;
+      }
+      break;
+    case LineBreaker::Strictness::Anywhere:
+      MOZ_ASSERT_UNREACHABLE("should have been handled already");
+      break;
+  }
+
+  if (u < 0x10000) {
+    uint16_t h = u & 0xFF00;
+    uint16_t l = u & 0x00ff;
+
+    // Handle 3 range table first
+    if (0x0000 == h) {
+      return GETCLASSFROMTABLE(gLBClass00, l);
+    }
+    if (0x1700 == h) {
+      return GETCLASSFROMTABLE(gLBClass17, l);
+    }
+    if (NS_NeedsPlatformNativeHandling(u)) {
+      return CLASS_COMPLEX;
+    }
+    if (0x0E00 == h) {
+      return GETCLASSFROMTABLE(gLBClass0E, l);
+    }
+    if (0x2000 == h) {
+      return GETCLASSFROMTABLE(gLBClass20, l);
+    }
+    if (0x2100 == h) {
+      return GETCLASSFROMTABLE(gLBClass21, l);
+    }
+    if (0x3000 == h) {
+      return GETCLASSFROMTABLE(gLBClass30, l);
+    }
+    if (0xff00 == h) {
+      if (l < 0x0060) {  // Fullwidth ASCII variant
+        return GETCLASSFROMTABLE(gLBClass00, (l + 0x20));
+      }
+      if (l < 0x00a0) {  // Halfwidth Katakana variants
+        switch (l) {
+          case 0x61:
+            return GetClass(0x3002, aLevel);
+          case 0x62:
+            return GetClass(0x300c, aLevel);
+          case 0x63:
+            return GetClass(0x300d, aLevel);
+          case 0x64:
+            return GetClass(0x3001, aLevel);
+          case 0x65:
+            return GetClass(0x30fb, aLevel);
+          case 0x9e:
+            return GetClass(0x309b, aLevel);
+          case 0x9f:
+            return GetClass(0x309c, aLevel);
+          default:
+            if (IS_HALFWIDTH_IN_JISx4051_CLASS3(u)) {
+              return CLASS_CLOSE;  // jis x4051 class 3
+            }
+            return CLASS_BREAKABLE;  // jis x4051 class 11
+        }
+      }
+      if (l < 0x00e0) {
+        return CLASS_CHARACTER;  // Halfwidth Hangul variants
+      }
+      if (l < 0x00f0) {
+        static char16_t NarrowFFEx[16] = {
+            0x00A2, 0x00A3, 0x00AC, 0x00AF, 0x00A6, 0x00A5, 0x20A9, 0x0000,
+            0x2502, 0x2190, 0x2191, 0x2192, 0x2193, 0x25A0, 0x25CB, 0x0000};
+        return GetClass(NarrowFFEx[l - 0x00e0], aLevel);
+      }
+    } else if (0x3100 == h) {
+      if (l <= 0xbf) {  // Hangul Compatibility Jamo, Bopomofo, Kanbun
+                        // XXX: This is per UAX #14, but UAX #14 may change
+                        // the line breaking rules about Kanbun and Bopomofo.
+        return CLASS_BREAKABLE;
+      }
+      if (l >= 0xf0) {  // Katakana small letters for Ainu
+        return CLASS_CLOSE;
+      }
+    } else if (0x0300 == h) {
+      if (0x4F == l || (0x5C <= l && l <= 0x62)) {
+        return CLASS_NON_BREAKABLE;
+      }
+    } else if (0x0500 == h) {
+      // ARMENIAN HYPHEN (for "Breaking Hyphens" of UAX#14)
+      if (l == 0x8A) {
+        return GETCLASSFROMTABLE(gLBClass00, uint16_t(U_HYPHEN));
+      }
+    } else if (0x0F00 == h) {
+      if (0x08 == l || 0x0C == l || 0x12 == l) {
+        return CLASS_NON_BREAKABLE;
+      }
+    } else if (0x1800 == h) {
+      if (0x0E == l) {
+        return CLASS_NON_BREAKABLE;
+      }
+    } else if (0x1600 == h) {
+      if (0x80 == l) {  // U+1680 OGHAM SPACE MARK
+        return CLASS_BREAKABLE;
+      }
+    } else if (u == 0xfeff) {
+      return CLASS_NON_BREAKABLE;
+    }
+  }
+
   return sUnicodeLineBreakToClass[cls];
 }
 
@@ -714,7 +797,8 @@ class ContextState {
 };
 
 static int8_t ContextualAnalysis(char32_t prev, char32_t cur, char32_t next,
-                                 ContextState& aState) {
+                                 ContextState& aState,
+                                 LineBreaker::Strictness aLevel) {
   // Don't return CLASS_OPEN/CLASS_CLOSE if aState.UseJISX4051 is FALSE.
 
   if (IS_HYPHEN(cur)) {
@@ -730,8 +814,8 @@ static int8_t ContextualAnalysis(char32_t prev, char32_t cur, char32_t next,
     if (!aState.UseConservativeBreaking(1)) {
       char32_t prevOfHyphen = aState.GetPreviousNonHyphenCharacter();
       if (prevOfHyphen && next) {
-        int8_t prevClass = GetClass(prevOfHyphen);
-        int8_t nextClass = GetClass(next);
+        int8_t prevClass = GetClass(prevOfHyphen, aLevel);
+        int8_t nextClass = GetClass(next, aLevel);
         bool prevIsNumOrCharOrClose =
             prevIsNum ||
             (prevClass == CLASS_CHARACTER &&
@@ -792,7 +876,7 @@ static int8_t ContextualAnalysis(char32_t prev, char32_t cur, char32_t next,
       NS_ERROR("Forgot to handle the current character!");
     }
   }
-  return GetClass(cur);
+  return GetClass(cur, aLevel);
 }
 
 int32_t LineBreaker::WordMove(const char16_t* aText, uint32_t aLen,
@@ -884,11 +968,11 @@ void LineBreaker::GetJISx4051Breaks(const char16_t* aChars, uint32_t aLength,
       } else {
         next = 0;
       }
-      cl = ContextualAnalysis(prev, ch, next, state);
+      cl = ContextualAnalysis(prev, ch, next, state, aLevel);
     } else {
       if (ch == U_EQUAL) state.NotifySeenEqualsSign();
       state.NotifyNonHyphenCharacter(ch);
-      cl = GetClass(ch);
+      cl = GetClass(ch, aLevel);
     }
 
     // To implement word-break:break-all, we overwrite the line-break class of
@@ -930,7 +1014,7 @@ void LineBreaker::GetJISx4051Breaks(const char16_t* aChars, uint32_t aLength,
 
       while (end < aLength) {
         char32_t c = state.GetUnicodeCharAt(end);
-        if (CLASS_COMPLEX != GetClass(c)) {
+        if (CLASS_COMPLEX != GetClass(c, aLevel)) {
           break;
         }
         ++end;
@@ -981,11 +1065,11 @@ void LineBreaker::GetJISx4051Breaks(const uint8_t* aChars, uint32_t aLength,
     if (NEED_CONTEXTUAL_ANALYSIS(ch)) {
       cl = ContextualAnalysis(cur > 0 ? aChars[cur - 1] : U_NULL, ch,
                               cur + 1 < aLength ? aChars[cur + 1] : U_NULL,
-                              state);
+                              state, aLevel);
     } else {
       if (ch == U_EQUAL) state.NotifySeenEqualsSign();
       state.NotifyNonHyphenCharacter(ch);
-      cl = GetClass(ch);
+      cl = GetClass(ch, aLevel);
     }
     if (aWordBreak == WordBreak::BreakAll &&
         (cl == CLASS_CHARACTER || cl == CLASS_CLOSE)) {
diff --git a/intl/unicharutil/util/nsUnicodeProperties.h b/intl/unicharutil/util/nsUnicodeProperties.h
index 367b6ba05a5f..4c3a27fb13bd 100644
--- a/intl/unicharutil/util/nsUnicodeProperties.h
+++ b/intl/unicharutil/util/nsUnicodeProperties.h
@@ -138,6 +138,20 @@ inline bool IsEastAsianWidthFWH(uint32_t aCh) {
   return false;
 }
 
+inline bool IsEastAsianWidthAFW(uint32_t aCh) {
+  switch (u_getIntPropertyValue(aCh, UCHAR_EAST_ASIAN_WIDTH)) {
+    case U_EA_AMBIGUOUS:
+    case U_EA_FULLWIDTH:
+    case U_EA_WIDE:
+      return true;
+    case U_EA_HALFWIDTH:
+    case U_EA_NARROW:
+    case U_EA_NEUTRAL:
+      return false;
+  }
+  return false;
+}
+
 inline bool IsDefaultIgnorable(uint32_t aCh) {
   return u_hasBinaryProperty(aCh, UCHAR_DEFAULT_IGNORABLE_CODE_POINT);
 }

From d1e76014ab90564a4a6546f53ac12d749cb9e3da Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 20 May 2019 20:47:09 +0000
Subject: [PATCH 075/129] Bug 1011369 - Restrict some line-break behaviors to
 Chinese and Japanese contexts, as per spec. r=m_kato

Differential Revision: https://phabricator.services.mozilla.com/D30788

--HG--
extra : moz-landing-system : lando
---
 dom/base/nsLineBreaker.cpp |  20 +++++-
 dom/base/nsLineBreaker.h   |   1 +
 intl/lwbrk/LineBreaker.cpp | 122 +++++++++++++++++++++----------------
 intl/lwbrk/LineBreaker.h   |   4 +-
 4 files changed, 88 insertions(+), 59 deletions(-)

diff --git a/dom/base/nsLineBreaker.cpp b/dom/base/nsLineBreaker.cpp
index 7347065c3be9..bce1d922b7fb 100644
--- a/dom/base/nsLineBreaker.cpp
+++ b/dom/base/nsLineBreaker.cpp
@@ -11,13 +11,16 @@
 #include "nsHyphenator.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/intl/LineBreaker.h"
+#include "mozilla/intl/MozLocale.h"
 
 using mozilla::intl::LineBreaker;
+using mozilla::intl::Locale;
 
 nsLineBreaker::nsLineBreaker()
     : mCurrentWordLanguage(nullptr),
       mCurrentWordContainsMixedLang(false),
       mCurrentWordContainsComplexChar(false),
+      mScriptIsChineseOrJapanese(false),
       mAfterBreakableSpace(false),
       mBreakHere(false),
       mWordBreak(LineBreaker::WordBreak::Normal),
@@ -79,7 +82,7 @@ nsresult nsLineBreaker::FlushCurrentWord() {
   } else {
     nsContentUtils::LineBreaker()->GetJISx4051Breaks(
         mCurrentWord.Elements(), length, mWordBreak, mStrictness,
-        breakState.Elements());
+        mScriptIsChineseOrJapanese, breakState.Elements());
   }
 
   bool autoHyphenate = mCurrentWordLanguage && !mCurrentWordContainsMixedLang;
@@ -250,7 +253,7 @@ nsresult nsLineBreaker::AppendText(nsAtom* aHyphenationLanguage,
             uint8_t currentStart = breakState[wordStart];
             nsContentUtils::LineBreaker()->GetJISx4051Breaks(
                 aText + wordStart, offset - wordStart, mWordBreak, mStrictness,
-                breakState.Elements() + wordStart);
+                mScriptIsChineseOrJapanese, breakState.Elements() + wordStart);
             breakState[wordStart] = currentStart;
           }
           if (hyphenator) {
@@ -408,7 +411,7 @@ nsresult nsLineBreaker::AppendText(nsAtom* aHyphenationLanguage,
           uint8_t currentStart = breakState[wordStart];
           nsContentUtils::LineBreaker()->GetJISx4051Breaks(
               aText + wordStart, offset - wordStart, mWordBreak, mStrictness,
-              breakState.Elements() + wordStart);
+              mScriptIsChineseOrJapanese, breakState.Elements() + wordStart);
           breakState[wordStart] = currentStart;
         }
         wordHasComplexChar = false;
@@ -449,7 +452,18 @@ nsresult nsLineBreaker::AppendText(nsAtom* aHyphenationLanguage,
 void nsLineBreaker::UpdateCurrentWordLanguage(nsAtom* aHyphenationLanguage) {
   if (mCurrentWordLanguage && mCurrentWordLanguage != aHyphenationLanguage) {
     mCurrentWordContainsMixedLang = true;
+    mScriptIsChineseOrJapanese = false;
   } else {
+    if (aHyphenationLanguage && !mCurrentWordLanguage) {
+      Locale loc = Locale(nsAtomCString(aHyphenationLanguage));
+      if (loc.GetScript().IsEmpty()) {
+        loc.AddLikelySubtags();
+      }
+      const nsCString& script = loc.GetScript();
+      mScriptIsChineseOrJapanese =
+          script.EqualsLiteral("Hans") || script.EqualsLiteral("Hant") ||
+          script.EqualsLiteral("Jpan") || script.EqualsLiteral("Hrkt");
+    }
     mCurrentWordLanguage = aHyphenationLanguage;
   }
 }
diff --git a/dom/base/nsLineBreaker.h b/dom/base/nsLineBreaker.h
index 8ee04d8a8dc2..4a44e8ac5b7a 100644
--- a/dom/base/nsLineBreaker.h
+++ b/dom/base/nsLineBreaker.h
@@ -251,6 +251,7 @@ class nsLineBreaker {
   nsAtom* mCurrentWordLanguage;
   bool mCurrentWordContainsMixedLang;
   bool mCurrentWordContainsComplexChar;
+  bool mScriptIsChineseOrJapanese;
 
   // True if the previous character was breakable whitespace
   bool mAfterBreakableSpace;
diff --git a/intl/lwbrk/LineBreaker.cpp b/intl/lwbrk/LineBreaker.cpp
index 89d2c0bb7806..de53c3c86ba2 100644
--- a/intl/lwbrk/LineBreaker.cpp
+++ b/intl/lwbrk/LineBreaker.cpp
@@ -115,6 +115,9 @@ already_AddRefed<LineBreaker> LineBreaker::Create() {
    a. class 2, 3, 4, 5, 6,  are the same- we can merged them
    b. class 10, 11, 12, 17  are the same- we can merged them
 
+   We introduce an extra non-breaking pair at [b]/7 to better match
+   the expectations of CSS line-breaking as tested by WPT tests.
+   This added entry is marked as * in the tables below.
 
    Class of
    Leading    Class of Trailing Char Class
@@ -127,7 +130,7 @@ already_AddRefed<LineBreaker> LineBreaker::Create() {
         7        X  X
         8        X              X
         9        X
-      [b]        X  x
+      [b]        X  *
        15        X        X     X  X
        18        X              X  X
 
@@ -146,7 +149,7 @@ already_AddRefed<LineBreaker> LineBreaker::Create() {
         7        X  X
         8        X              X
         9        X
-      [b]        X  x
+      [b]        X  *
        15        X        X     X  X
        18        X              X  X
   COMPLEX        X                    T
@@ -174,7 +177,7 @@ already_AddRefed<LineBreaker> LineBreaker::Create() {
         7        X  X
         8        X              X
         9        X
-      [b]        X  x                              X
+      [b]        X  *                              X
        15        X        X     X  X          X    X
        18        X              X  X          X    X
   COMPLEX        X                    T
@@ -196,7 +199,7 @@ already_AddRefed<LineBreaker> LineBreaker::Create() {
         7        X  X                                  X
         8        X              X                      X
         9        X                                     X
-      [b]        X  x                              X   X
+      [b]        X  *                              X   X
        15        X        X     X  X          X    X   X
        18        X              X  X          X    X   X
   COMPLEX        X                    T                X
@@ -205,7 +208,7 @@ already_AddRefed<LineBreaker> LineBreaker::Create() {
       [e]     X  X  X  X  X  X  X  X  X       X    X   X
 
 
-   7. Now we use one bit to encode weather it is breakable, and use 2 bytes
+   7. Now we use one bit to encode whether it is breakable, and use 2 bytes
       for one row, then the bit table will look like:
 
                  18    <-   1
@@ -248,7 +251,7 @@ static const uint16_t gPair[MAX_CLASSES] = {0x0FFF, 0x0C02, 0x0806, 0x0842,
         7        X  X           X  X          X    X   X
         8        X              X  X          X    X   X
         9        X              X  X          X    X   X
-      [b]        X  x                              X   X
+      [b]        X  *                              X   X
        15     X  X  X  X  X     X  X  X       X    X   X
        18     X  X  X  X  X     X  X  X       X    X   X
   COMPLEX        X              X  X  T       X    X   X
@@ -370,7 +373,8 @@ static inline bool IS_HYPHEN(char16_t u) {
           u == 0x2013);                    // EN DASH
 }
 
-static int8_t GetClass(uint32_t u, LineBreaker::Strictness aLevel) {
+static int8_t GetClass(uint32_t u, LineBreaker::Strictness aLevel,
+                       bool aIsChineseOrJapanese) {
   // Mapping for Unicode LineBreak.txt classes to the (simplified) set of
   // character classes used here.
   // XXX The mappings here were derived by comparing the Unicode LineBreak
@@ -452,14 +456,16 @@ static int8_t GetClass(uint32_t u, LineBreaker::Strictness aLevel) {
           u == 0x30FD || u == 0x30FE) {
         return CLASS_CLOSE_LIKE_CHARACTER;
       }
-      if (cls == U_LB_POSTFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
-        return CLASS_CLOSE_LIKE_CHARACTER;
-      }
-      if (cls == U_LB_PREFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
-        return CLASS_OPEN_LIKE_CHARACTER;
-      }
-      if (u == 0x2010 || u == 0x2013 || u == 0x301C || u == 0x30A0) {
-        return CLASS_CLOSE_LIKE_CHARACTER;
+      if (aIsChineseOrJapanese) {
+        if (cls == U_LB_POSTFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
+          return CLASS_CLOSE_LIKE_CHARACTER;
+        }
+        if (cls == U_LB_PREFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
+          return CLASS_OPEN_LIKE_CHARACTER;
+        }
+        if (u == 0x2010 || u == 0x2013 || u == 0x301C || u == 0x30A0) {
+          return CLASS_CLOSE_LIKE_CHARACTER;
+        }
       }
       break;
     case LineBreaker::Strictness::Normal:
@@ -473,14 +479,16 @@ static int8_t GetClass(uint32_t u, LineBreaker::Strictness aLevel) {
           u == 0x30FD || u == 0x30FE) {
         return CLASS_CLOSE_LIKE_CHARACTER;
       }
-      if (cls == U_LB_POSTFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
-        return CLASS_CLOSE_LIKE_CHARACTER;
-      }
-      if (cls == U_LB_PREFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
-        return CLASS_OPEN_LIKE_CHARACTER;
-      }
-      if (u == 0x2010 || u == 0x2013 || u == 0x301C || u == 0x30A0) {
-        return CLASS_BREAKABLE;
+      if (aIsChineseOrJapanese) {
+        if (cls == U_LB_POSTFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
+          return CLASS_CLOSE_LIKE_CHARACTER;
+        }
+        if (cls == U_LB_PREFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
+          return CLASS_OPEN_LIKE_CHARACTER;
+        }
+        if (u == 0x2010 || u == 0x2013 || u == 0x301C || u == 0x30A0) {
+          return CLASS_BREAKABLE;
+        }
       }
       break;
     case LineBreaker::Strictness::Loose:
@@ -494,19 +502,21 @@ static int8_t GetClass(uint32_t u, LineBreaker::Strictness aLevel) {
       if (cls == U_LB_INSEPARABLE) {
         return CLASS_BREAKABLE;
       }
-      if (u == 0x30FB || u == 0xFF1A || u == 0xFF1B || u == 0xFF65 ||
-          u == 0x203C || u == 0x2047 || u == 0x2048 || u == 0x2049 ||
-          u == 0xFF01 || u == 0xFF1F) {
-        return CLASS_BREAKABLE;
-      }
-      if (cls == U_LB_POSTFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
-        return CLASS_BREAKABLE;
-      }
-      if (cls == U_LB_PREFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
-        return CLASS_BREAKABLE;
-      }
-      if (u == 0x2010 || u == 0x2013 || u == 0x301C || u == 0x30A0) {
-        return CLASS_BREAKABLE;
+      if (aIsChineseOrJapanese) {
+        if (u == 0x30FB || u == 0xFF1A || u == 0xFF1B || u == 0xFF65 ||
+            u == 0x203C || u == 0x2047 || u == 0x2048 || u == 0x2049 ||
+            u == 0xFF01 || u == 0xFF1F) {
+          return CLASS_BREAKABLE;
+        }
+        if (cls == U_LB_POSTFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
+          return CLASS_BREAKABLE;
+        }
+        if (cls == U_LB_PREFIX_NUMERIC && IsEastAsianWidthAFW(u)) {
+          return CLASS_BREAKABLE;
+        }
+        if (u == 0x2010 || u == 0x2013 || u == 0x301C || u == 0x30A0) {
+          return CLASS_BREAKABLE;
+        }
       }
       break;
     case LineBreaker::Strictness::Anywhere:
@@ -547,19 +557,19 @@ static int8_t GetClass(uint32_t u, LineBreaker::Strictness aLevel) {
       if (l < 0x00a0) {  // Halfwidth Katakana variants
         switch (l) {
           case 0x61:
-            return GetClass(0x3002, aLevel);
+            return GetClass(0x3002, aLevel, aIsChineseOrJapanese);
           case 0x62:
-            return GetClass(0x300c, aLevel);
+            return GetClass(0x300c, aLevel, aIsChineseOrJapanese);
           case 0x63:
-            return GetClass(0x300d, aLevel);
+            return GetClass(0x300d, aLevel, aIsChineseOrJapanese);
           case 0x64:
-            return GetClass(0x3001, aLevel);
+            return GetClass(0x3001, aLevel, aIsChineseOrJapanese);
           case 0x65:
-            return GetClass(0x30fb, aLevel);
+            return GetClass(0x30fb, aLevel, aIsChineseOrJapanese);
           case 0x9e:
-            return GetClass(0x309b, aLevel);
+            return GetClass(0x309b, aLevel, aIsChineseOrJapanese);
           case 0x9f:
-            return GetClass(0x309c, aLevel);
+            return GetClass(0x309c, aLevel, aIsChineseOrJapanese);
           default:
             if (IS_HALFWIDTH_IN_JISx4051_CLASS3(u)) {
               return CLASS_CLOSE;  // jis x4051 class 3
@@ -574,7 +584,7 @@ static int8_t GetClass(uint32_t u, LineBreaker::Strictness aLevel) {
         static char16_t NarrowFFEx[16] = {
             0x00A2, 0x00A3, 0x00AC, 0x00AF, 0x00A6, 0x00A5, 0x20A9, 0x0000,
             0x2502, 0x2190, 0x2191, 0x2192, 0x2193, 0x25A0, 0x25CB, 0x0000};
-        return GetClass(NarrowFFEx[l - 0x00e0], aLevel);
+        return GetClass(NarrowFFEx[l - 0x00e0], aLevel, aIsChineseOrJapanese);
       }
     } else if (0x3100 == h) {
       if (l <= 0xbf) {  // Hangul Compatibility Jamo, Bopomofo, Kanbun
@@ -798,7 +808,8 @@ class ContextState {
 
 static int8_t ContextualAnalysis(char32_t prev, char32_t cur, char32_t next,
                                  ContextState& aState,
-                                 LineBreaker::Strictness aLevel) {
+                                 LineBreaker::Strictness aLevel,
+                                 bool aIsChineseOrJapanese) {
   // Don't return CLASS_OPEN/CLASS_CLOSE if aState.UseJISX4051 is FALSE.
 
   if (IS_HYPHEN(cur)) {
@@ -814,8 +825,8 @@ static int8_t ContextualAnalysis(char32_t prev, char32_t cur, char32_t next,
     if (!aState.UseConservativeBreaking(1)) {
       char32_t prevOfHyphen = aState.GetPreviousNonHyphenCharacter();
       if (prevOfHyphen && next) {
-        int8_t prevClass = GetClass(prevOfHyphen, aLevel);
-        int8_t nextClass = GetClass(next, aLevel);
+        int8_t prevClass = GetClass(prevOfHyphen, aLevel, aIsChineseOrJapanese);
+        int8_t nextClass = GetClass(next, aLevel, aIsChineseOrJapanese);
         bool prevIsNumOrCharOrClose =
             prevIsNum ||
             (prevClass == CLASS_CHARACTER &&
@@ -876,7 +887,7 @@ static int8_t ContextualAnalysis(char32_t prev, char32_t cur, char32_t next,
       NS_ERROR("Forgot to handle the current character!");
     }
   }
-  return GetClass(cur, aLevel);
+  return GetClass(cur, aLevel, aIsChineseOrJapanese);
 }
 
 int32_t LineBreaker::WordMove(const char16_t* aText, uint32_t aLen,
@@ -909,7 +920,7 @@ int32_t LineBreaker::WordMove(const char16_t* aText, uint32_t aLen,
     }
   } else {
     GetJISx4051Breaks(aText + begin, end - begin, WordBreak::Normal,
-                      Strictness::Auto, breakState.Elements());
+                      Strictness::Auto, false, breakState.Elements());
 
     ret = aPos;
     do {
@@ -940,6 +951,7 @@ int32_t LineBreaker::Prev(const char16_t* aText, uint32_t aLen, uint32_t aPos) {
 
 void LineBreaker::GetJISx4051Breaks(const char16_t* aChars, uint32_t aLength,
                                     WordBreak aWordBreak, Strictness aLevel,
+                                    bool aIsChineseOrJapanese,
                                     uint8_t* aBreakBefore) {
   uint32_t cur;
   int8_t lastClass = CLASS_NONE;
@@ -968,11 +980,12 @@ void LineBreaker::GetJISx4051Breaks(const char16_t* aChars, uint32_t aLength,
       } else {
         next = 0;
       }
-      cl = ContextualAnalysis(prev, ch, next, state, aLevel);
+      cl = ContextualAnalysis(prev, ch, next, state, aLevel,
+                              aIsChineseOrJapanese);
     } else {
       if (ch == U_EQUAL) state.NotifySeenEqualsSign();
       state.NotifyNonHyphenCharacter(ch);
-      cl = GetClass(ch, aLevel);
+      cl = GetClass(ch, aLevel, aIsChineseOrJapanese);
     }
 
     // To implement word-break:break-all, we overwrite the line-break class of
@@ -1014,7 +1027,7 @@ void LineBreaker::GetJISx4051Breaks(const char16_t* aChars, uint32_t aLength,
 
       while (end < aLength) {
         char32_t c = state.GetUnicodeCharAt(end);
-        if (CLASS_COMPLEX != GetClass(c, aLevel)) {
+        if (CLASS_COMPLEX != GetClass(c, aLevel, false)) {
           break;
         }
         ++end;
@@ -1053,6 +1066,7 @@ void LineBreaker::GetJISx4051Breaks(const char16_t* aChars, uint32_t aLength,
 
 void LineBreaker::GetJISx4051Breaks(const uint8_t* aChars, uint32_t aLength,
                                     WordBreak aWordBreak, Strictness aLevel,
+                                    bool aIsChineseOrJapanese,
                                     uint8_t* aBreakBefore) {
   uint32_t cur;
   int8_t lastClass = CLASS_NONE;
@@ -1065,11 +1079,11 @@ void LineBreaker::GetJISx4051Breaks(const uint8_t* aChars, uint32_t aLength,
     if (NEED_CONTEXTUAL_ANALYSIS(ch)) {
       cl = ContextualAnalysis(cur > 0 ? aChars[cur - 1] : U_NULL, ch,
                               cur + 1 < aLength ? aChars[cur + 1] : U_NULL,
-                              state, aLevel);
+                              state, aLevel, aIsChineseOrJapanese);
     } else {
       if (ch == U_EQUAL) state.NotifySeenEqualsSign();
       state.NotifyNonHyphenCharacter(ch);
-      cl = GetClass(ch, aLevel);
+      cl = GetClass(ch, aLevel, aIsChineseOrJapanese);
     }
     if (aWordBreak == WordBreak::BreakAll &&
         (cl == CLASS_CHARACTER || cl == CLASS_CLOSE)) {
diff --git a/intl/lwbrk/LineBreaker.h b/intl/lwbrk/LineBreaker.h
index 88b2e4049e03..7f1db94b04f2 100644
--- a/intl/lwbrk/LineBreaker.h
+++ b/intl/lwbrk/LineBreaker.h
@@ -45,10 +45,10 @@ class LineBreaker {
   // aBreakBefore output array.
   void GetJISx4051Breaks(const char16_t* aText, uint32_t aLength,
                          WordBreak aWordBreak, Strictness aLevel,
-                         uint8_t* aBreakBefore);
+                         bool aIsChineseOrJapanese, uint8_t* aBreakBefore);
   void GetJISx4051Breaks(const uint8_t* aText, uint32_t aLength,
                          WordBreak aWordBreak, Strictness aLevel,
-                         uint8_t* aBreakBefore);
+                         bool aIsChineseOrJapanese, uint8_t* aBreakBefore);
 
  private:
   ~LineBreaker() {}

From c3d6352d07b6f8b0beb6362ed25cd989a6042e8c Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 20 May 2019 20:47:31 +0000
Subject: [PATCH 076/129] Bug 1011369 - Reduce the available width slightly in
 line-break-loose-017a because a couple of the target characters may be less
 then .2em wide. r=m_kato

Differential Revision: https://phabricator.services.mozilla.com/D30810

--HG--
extra : moz-landing-system : lando
---
 .../tests/css/css-text/line-break/line-break-loose-017a.xht     | 2 +-
 .../tests/css/css-text/line-break/line-break-normal-017a.xht    | 2 +-
 .../tests/css/css-text/line-break/line-break-strict-017a.xht    | 2 +-
 .../css-text/line-break/reference/line-break-loose-017a-ref.xht | 2 +-
 .../line-break/reference/line-break-normal-017a-ref.xht         | 2 +-
 .../line-break/reference/line-break-strict-017a-ref.xht         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/testing/web-platform/tests/css/css-text/line-break/line-break-loose-017a.xht b/testing/web-platform/tests/css/css-text/line-break/line-break-loose-017a.xht
index 59b0af7b3fde..b63f1504c29f 100644
--- a/testing/web-platform/tests/css/css-text/line-break/line-break-loose-017a.xht
+++ b/testing/web-platform/tests/css/css-text/line-break/line-break-loose-017a.xht
@@ -27,7 +27,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+				width: 10.1em;		/* added extra .1em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/testing/web-platform/tests/css/css-text/line-break/line-break-normal-017a.xht b/testing/web-platform/tests/css/css-text/line-break/line-break-normal-017a.xht
index e9637b55827e..f9b5169cf450 100644
--- a/testing/web-platform/tests/css/css-text/line-break/line-break-normal-017a.xht
+++ b/testing/web-platform/tests/css/css-text/line-break/line-break-normal-017a.xht
@@ -27,7 +27,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+				width: 10.1em;		/* added extra .1em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/testing/web-platform/tests/css/css-text/line-break/line-break-strict-017a.xht b/testing/web-platform/tests/css/css-text/line-break/line-break-strict-017a.xht
index 1c0e91fd63e9..795f2aecb38b 100644
--- a/testing/web-platform/tests/css/css-text/line-break/line-break-strict-017a.xht
+++ b/testing/web-platform/tests/css/css-text/line-break/line-break-strict-017a.xht
@@ -27,7 +27,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+				width: 10.1em;		/* added extra .1em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/testing/web-platform/tests/css/css-text/line-break/reference/line-break-loose-017a-ref.xht b/testing/web-platform/tests/css/css-text/line-break/reference/line-break-loose-017a-ref.xht
index 09a18a2396fa..dc1084a8159a 100644
--- a/testing/web-platform/tests/css/css-text/line-break/reference/line-break-loose-017a-ref.xht
+++ b/testing/web-platform/tests/css/css-text/line-break/reference/line-break-loose-017a-ref.xht
@@ -21,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+				width: 10.1em;		/* added extra .1em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/testing/web-platform/tests/css/css-text/line-break/reference/line-break-normal-017a-ref.xht b/testing/web-platform/tests/css/css-text/line-break/reference/line-break-normal-017a-ref.xht
index cd9710014efe..d6d7080fddca 100644
--- a/testing/web-platform/tests/css/css-text/line-break/reference/line-break-normal-017a-ref.xht
+++ b/testing/web-platform/tests/css/css-text/line-break/reference/line-break-normal-017a-ref.xht
@@ -21,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+				width: 10.1em;		/* added extra .1em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;
diff --git a/testing/web-platform/tests/css/css-text/line-break/reference/line-break-strict-017a-ref.xht b/testing/web-platform/tests/css/css-text/line-break/reference/line-break-strict-017a-ref.xht
index 87f9f322c11a..874b4ddcaee8 100644
--- a/testing/web-platform/tests/css/css-text/line-break/reference/line-break-strict-017a-ref.xht
+++ b/testing/web-platform/tests/css/css-text/line-break/reference/line-break-strict-017a-ref.xht
@@ -21,7 +21,7 @@
 				border: 1px solid gray;
 				color: blue;
 				font-family: "mplus-1p-regular";
-				width: 10.2em;		/* added extra .2em for some symbols wider than 1em */
+				width: 10.1em;		/* added extra .1em for some symbols wider than 1em */
 			}
 			span.target {
 				background-color: aqua;

From 5aac1ed3b4d98d1fa255a172e470f566fb438485 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 20 May 2019 20:47:51 +0000
Subject: [PATCH 077/129] Bug 1011369 - Update metadata for WPT tests that now
 pass. r=m_kato

Differential Revision: https://phabricator.services.mozilla.com/D30789

--HG--
extra : moz-landing-system : lando
---
 .../css-text-line-break-ja-cj-loose.html.ini  | 148 ------------------
 .../css-text-line-break-ja-cj-normal.html.ini | 148 ------------------
 .../css-text-line-break-ja-cj-strict.html.ini |   7 -
 .../css-text-line-break-ja-cpm-loose.html.ini |  31 ----
 ...-text-line-break-ja-hyphens-loose.html.ini |   4 -
 ...text-line-break-ja-hyphens-normal.html.ini |   4 -
 ...text-line-break-ja-hyphens-strict.html.ini |  10 --
 .../css-text-line-break-ja-in-loose.html.ini  |  15 --
 ...ext-line-break-ja-iteration-loose.html.ini |  16 --
 ...xt-line-break-ja-iteration-normal.html.ini |   4 -
 ...xt-line-break-ja-iteration-strict.html.ini |   4 -
 .../css-text-line-break-ja-po-loose.html.ini  |  10 --
 .../css-text-line-break-ja-po-normal.html.ini |  22 ---
 .../css-text-line-break-ja-po-strict.html.ini |  22 ---
 .../css-text-line-break-zh-cpm-loose.html.ini |  31 ----
 ...-text-line-break-zh-hyphens-loose.html.ini |   4 -
 ...text-line-break-zh-hyphens-normal.html.ini |   4 -
 ...text-line-break-zh-hyphens-strict.html.ini |  10 --
 .../css-text-line-break-zh-in-loose.html.ini  |  15 --
 ...ext-line-break-zh-iteration-loose.html.ini |  16 --
 ...xt-line-break-zh-iteration-normal.html.ini |   4 -
 ...xt-line-break-zh-iteration-strict.html.ini |   4 -
 .../css-text-line-break-zh-po-loose.html.ini  |  10 --
 .../css-text-line-break-zh-po-normal.html.ini |  22 ---
 .../css-text-line-break-zh-po-strict.html.ini |  22 ---
 .../line-break/line-break-loose-011.xht.ini   |   2 -
 .../line-break/line-break-loose-012.xht.ini   |   2 -
 .../line-break/line-break-loose-013.xht.ini   |   2 -
 .../line-break/line-break-loose-014.xht.ini   |   2 -
 .../line-break/line-break-loose-015.xht.ini   |   2 -
 .../line-break/line-break-loose-016a.xht.ini  |   2 -
 .../line-break/line-break-loose-016b.xht.ini  |   2 -
 .../line-break/line-break-loose-017a.xht.ini  |   2 -
 .../line-break/line-break-loose-017b.xht.ini  |   2 -
 .../line-break/line-break-loose-018.xht.ini   |   2 -
 .../line-break/line-break-normal-011.xht.ini  |   2 -
 .../line-break/line-break-normal-012.xht.ini  |   2 -
 .../line-break/line-break-normal-013.xht.ini  |   2 -
 .../line-break/line-break-normal-014.xht.ini  |   2 -
 .../line-break/line-break-normal-015.xht.ini  |   2 -
 .../line-break/line-break-normal-017a.xht.ini |   2 -
 .../line-break/line-break-normal-017b.xht.ini |   2 -
 .../line-break/line-break-normal-018.xht.ini  |   2 -
 .../line-break/line-break-strict-013.xht.ini  |   2 -
 .../line-break/line-break-strict-014.xht.ini  |   2 -
 .../line-break/line-break-strict-015.xht.ini  |   2 -
 .../line-break/line-break-strict-017a.xht.ini |   2 -
 .../line-break/line-break-strict-017b.xht.ini |   2 -
 .../line-break/line-break-strict-018.xht.ini  |   2 -
 .../parsing/line-break-valid.html.ini         |  10 --
 .../writing-system-line-break-002.html.ini    |   3 +-
 51 files changed, 2 insertions(+), 646 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-loose.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-normal.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-strict.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cpm-loose.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-loose.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-normal.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-strict.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-loose.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-normal.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-strict.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-loose.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-normal.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-strict.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-cpm-loose.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-loose.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-normal.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-strict.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-loose.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-normal.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-strict.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-loose.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-normal.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-strict.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-loose-011.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-loose-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-loose-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-loose-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-loose-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-loose-016a.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-loose-016b.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-loose-017a.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-loose-017b.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-loose-018.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-normal-011.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-normal-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-normal-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-normal-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-normal-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-normal-017a.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-normal-017b.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-normal-018.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-strict-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-strict-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-strict-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-strict-017a.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-strict-017b.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-break/line-break-strict-018.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/parsing/line-break-valid.html.ini

diff --git a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-loose.html.ini b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-loose.html.ini
deleted file mode 100644
index 1f10583093a2..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-loose.html.ini
+++ /dev/null
@@ -1,148 +0,0 @@
-[css-text-line-break-ja-cj-loose.html]
-  [3041  HIRAGANA LETTER SMALL A may appear at line start if ja and loose]
-    expected: FAIL
-
-  [3043  HIRAGANA LETTER SMALL I may appear at line start if ja and loose]
-    expected: FAIL
-
-  [3045  HIRAGANA LETTER SMALL U may appear at line start if ja and loose]
-    expected: FAIL
-
-  [3047  HIRAGANA LETTER SMALL E may appear at line start if ja and loose]
-    expected: FAIL
-
-  [3049  HIRAGANA LETTER SMALL O may appear at line start if ja and loose]
-    expected: FAIL
-
-  [3063  HIRAGANA LETTER SMALL TU may appear at line start if ja and loose]
-    expected: FAIL
-
-  [3083  HIRAGANA LETTER SMALL YA may appear at line start if ja and loose]
-    expected: FAIL
-
-  [3085  HIRAGANA LETTER SMALL YU may appear at line start if ja and loose]
-    expected: FAIL
-
-  [3087  HIRAGANA LETTER SMALL YO may appear at line start if ja and loose]
-    expected: FAIL
-
-  [308E  HIRAGANA LETTER SMALL WA may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30A1  KATAKANA LETTER SMALL A may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30A3  KATAKANA LETTER SMALL I may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30A5  KATAKANA LETTER SMALL U may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30A7  KATAKANA LETTER SMALL E may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30A9  KATAKANA LETTER SMALL O may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30C3  KATAKANA LETTER SMALL TU may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30E3  KATAKANA LETTER SMALL YA may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30E5  KATAKANA LETTER SMALL YU may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30E7  KATAKANA LETTER SMALL YO may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30EE  KATAKANA LETTER SMALL WA may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30F5  KATAKANA LETTER SMALL KA may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30F6  KATAKANA LETTER SMALL KE may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30FC  KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31F0  KATAKANA LETTER SMALL KU may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31F1  KATAKANA LETTER SMALL SI may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31F2  KATAKANA LETTER SMALL SU may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31F3  KATAKANA LETTER SMALL TO may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31F4  KATAKANA LETTER SMALL NU may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31F5  KATAKANA LETTER SMALL HA may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31F6  KATAKANA LETTER SMALL HI may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31F7  KATAKANA LETTER SMALL HU may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31F8  KATAKANA LETTER SMALL HE may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31F9  KATAKANA LETTER SMALL HO may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31FA  KATAKANA LETTER SMALL MU may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31FB  KATAKANA LETTER SMALL RA may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31FC  KATAKANA LETTER SMALL RI may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31FD  KATAKANA LETTER SMALL RU may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31FE  KATAKANA LETTER SMALL RE may appear at line start if ja and loose]
-    expected: FAIL
-
-  [31FF  KATAKANA LETTER SMALL RO may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF67  HALFWIDTH KATAKANA LETTER SMALL A may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF68  HALFWIDTH KATAKANA LETTER SMALL I may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF69  HALFWIDTH KATAKANA LETTER SMALL U may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF6A  HALFWIDTH KATAKANA LETTER SMALL E may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF6B  HALFWIDTH KATAKANA LETTER SMALL O may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF6C  HALFWIDTH KATAKANA LETTER SMALL YA may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF6D  HALFWIDTH KATAKANA LETTER SMALL YU may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF6E  HALFWIDTH KATAKANA LETTER SMALL YO may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF6F  HALFWIDTH KATAKANA LETTER SMALL TU may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF70  HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if ja and loose]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-normal.html.ini b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-normal.html.ini
deleted file mode 100644
index 449d07e23d83..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-normal.html.ini
+++ /dev/null
@@ -1,148 +0,0 @@
-[css-text-line-break-ja-cj-normal.html]
-  [3041  HIRAGANA LETTER SMALL A may appear at line start if ja and normal]
-    expected: FAIL
-
-  [3043  HIRAGANA LETTER SMALL I may appear at line start if ja and normal]
-    expected: FAIL
-
-  [3045  HIRAGANA LETTER SMALL U may appear at line start if ja and normal]
-    expected: FAIL
-
-  [3047  HIRAGANA LETTER SMALL E may appear at line start if ja and normal]
-    expected: FAIL
-
-  [3049  HIRAGANA LETTER SMALL O may appear at line start if ja and normal]
-    expected: FAIL
-
-  [3063  HIRAGANA LETTER SMALL TU may appear at line start if ja and normal]
-    expected: FAIL
-
-  [3083  HIRAGANA LETTER SMALL YA may appear at line start if ja and normal]
-    expected: FAIL
-
-  [3085  HIRAGANA LETTER SMALL YU may appear at line start if ja and normal]
-    expected: FAIL
-
-  [3087  HIRAGANA LETTER SMALL YO may appear at line start if ja and normal]
-    expected: FAIL
-
-  [308E  HIRAGANA LETTER SMALL WA may appear at line start if ja and normal]
-    expected: FAIL
-
-  [30A1  KATAKANA LETTER SMALL A may appear at line start if ja and normal]
-    expected: FAIL
-
-  [30A3  KATAKANA LETTER SMALL I may appear at line start if ja and normal]
-    expected: FAIL
-
-  [30A5  KATAKANA LETTER SMALL U may appear at line start if ja and normal]
-    expected: FAIL
-
-  [30A7  KATAKANA LETTER SMALL E may appear at line start if ja and normal]
-    expected: FAIL
-
-  [30A9  KATAKANA LETTER SMALL O may appear at line start if ja and normal]
-    expected: FAIL
-
-  [30C3  KATAKANA LETTER SMALL TU may appear at line start if ja and normal]
-    expected: FAIL
-
-  [30E3  KATAKANA LETTER SMALL YA may appear at line start if ja and normal]
-    expected: FAIL
-
-  [30E5  KATAKANA LETTER SMALL YU may appear at line start if ja and normal]
-    expected: FAIL
-
-  [30E7  KATAKANA LETTER SMALL YO may appear at line start if ja and normal]
-    expected: FAIL
-
-  [30EE  KATAKANA LETTER SMALL WA may appear at line start if ja and normal]
-    expected: FAIL
-
-  [30F5  KATAKANA LETTER SMALL KA may appear at line start if ja and normal]
-    expected: FAIL
-
-  [30F6  KATAKANA LETTER SMALL KE may appear at line start if ja and normal]
-    expected: FAIL
-
-  [30FC  KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31F0  KATAKANA LETTER SMALL KU may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31F1  KATAKANA LETTER SMALL SI may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31F2  KATAKANA LETTER SMALL SU may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31F3  KATAKANA LETTER SMALL TO may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31F4  KATAKANA LETTER SMALL NU may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31F5  KATAKANA LETTER SMALL HA may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31F6  KATAKANA LETTER SMALL HI may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31F7  KATAKANA LETTER SMALL HU may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31F8  KATAKANA LETTER SMALL HE may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31F9  KATAKANA LETTER SMALL HO may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31FA  KATAKANA LETTER SMALL MU may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31FB  KATAKANA LETTER SMALL RA may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31FC  KATAKANA LETTER SMALL RI may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31FD  KATAKANA LETTER SMALL RU may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31FE  KATAKANA LETTER SMALL RE may appear at line start if ja and normal]
-    expected: FAIL
-
-  [31FF  KATAKANA LETTER SMALL RO may appear at line start if ja and normal]
-    expected: FAIL
-
-  [FF67  HALFWIDTH KATAKANA LETTER SMALL A may appear at line start if ja and normal]
-    expected: FAIL
-
-  [FF68  HALFWIDTH KATAKANA LETTER SMALL I may appear at line start if ja and normal]
-    expected: FAIL
-
-  [FF69  HALFWIDTH KATAKANA LETTER SMALL U may appear at line start if ja and normal]
-    expected: FAIL
-
-  [FF6A  HALFWIDTH KATAKANA LETTER SMALL E may appear at line start if ja and normal]
-    expected: FAIL
-
-  [FF6B  HALFWIDTH KATAKANA LETTER SMALL O may appear at line start if ja and normal]
-    expected: FAIL
-
-  [FF6C  HALFWIDTH KATAKANA LETTER SMALL YA may appear at line start if ja and normal]
-    expected: FAIL
-
-  [FF6D  HALFWIDTH KATAKANA LETTER SMALL YU may appear at line start if ja and normal]
-    expected: FAIL
-
-  [FF6E  HALFWIDTH KATAKANA LETTER SMALL YO may appear at line start if ja and normal]
-    expected: FAIL
-
-  [FF6F  HALFWIDTH KATAKANA LETTER SMALL TU may appear at line start if ja and normal]
-    expected: FAIL
-
-  [FF70  HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK may appear at line start if ja and normal]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-strict.html.ini b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-strict.html.ini
deleted file mode 100644
index 0f107a8a5432..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cj-strict.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[css-text-line-break-ja-cj-strict.html]
-  [3095  HIRAGANA LETTER SMALL KA may NOT appear at line start if ja and strict]
-    expected: FAIL
-
-  [3096  HIRAGANA LETTER SMALL KE may NOT appear at line start if ja and strict]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cpm-loose.html.ini b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cpm-loose.html.ini
deleted file mode 100644
index 81d7983ba510..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-cpm-loose.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[css-text-line-break-ja-cpm-loose.html]
-  [30FB  KATAKANA MIDDLE DOT may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF1A  FULLWIDTH COLON may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF1B  FULLWIDTH SEMICOLON may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF65  HALFWIDTH KATAKANA MIDDLE DOT may appear at line start if ja and loose]
-    expected: FAIL
-
-  [203C  DOUBLE EXCLAMATION MARK may appear at line start if ja and loose]
-    expected: FAIL
-
-  [2047  DOUBLE QUESTION MARK may appear at line start if ja and loose]
-    expected: FAIL
-
-  [2048  QUESTION EXCLAMATION MARK may appear at line start if ja and loose]
-    expected: FAIL
-
-  [2049  EXCLAMATION QUESTION MARK may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF01  FULLWIDTH EXCLAMATION MARK may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF1F  FULLWIDTH QUESTION MARK may appear at line start if ja and loose]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-loose.html.ini b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-loose.html.ini
deleted file mode 100644
index 15dfa1b94cdf..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-loose.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[css-text-line-break-ja-hyphens-loose.html]
-  [301C WAVE DASH may appear at line start if ja and loose]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-normal.html.ini b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-normal.html.ini
deleted file mode 100644
index 1c2e2c8d4db1..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-normal.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[css-text-line-break-ja-hyphens-normal.html]
-  [301C WAVE DASH may appear at line start if ja and normal]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-strict.html.ini b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-strict.html.ini
deleted file mode 100644
index 063fed3d28e9..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-strict.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[css-text-line-break-ja-hyphens-strict.html]
-  [2010 HYPHEN may NOT appear at line start if ja and strict]
-    expected: FAIL
-
-  [2013 EN DASH may NOT appear at line start if ja and strict]
-    expected: FAIL
-
-  [30A0 KATAKANA-HIRAGANA DOUBLE HYPHEN may NOT appear at line start if ja and strict]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-in-loose.html.ini b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-in-loose.html.ini
index 15aab9cf2d7d..786b1c0c6d76 100644
--- a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-in-loose.html.ini
+++ b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-in-loose.html.ini
@@ -1,19 +1,4 @@
 [css-text-line-break-ja-in-loose.html]
-  [2024  ONE DOT LEADER may appear at line start if ja and loose]
-    expected: FAIL
-
-  [2025  TWO DOT LEADER may appear at line start if ja and loose]
-    expected: FAIL
-
-  [2026  HORIZONTAL ELLIPSIS may appear at line start if ja and loose]
-    expected: FAIL
-
-  [22EF  MIDLINE HORIZONTAL ELLIPSIS may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FE19  PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS may appear at line start if ja and loose]
-    expected: FAIL
-
   [10AF6  MANICHAEAN PUNCTUATION LINE FILLER may appear at line start if ja and loose]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-loose.html.ini b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-loose.html.ini
deleted file mode 100644
index 29bb71ec0f6e..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-loose.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[css-text-line-break-ja-iteration-loose.html]
-  [3005  IDEOGRAPHIC ITERATION MARK may appear at line start if ja and loose]
-    expected: FAIL
-
-  [309D  HIRAGANA ITERATION MARK may appear at line start if ja and loose]
-    expected: FAIL
-
-  [309E  HIRAGANA VOICED ITERATION MARK may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30FD  KATAKANA ITERATION MARK may appear at line start if ja and loose]
-    expected: FAIL
-
-  [30FE  KATAKANA VOICED ITERATION MARK may appear at line start if ja and loose]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-normal.html.ini b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-normal.html.ini
deleted file mode 100644
index 7db423ef2666..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-normal.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[css-text-line-break-ja-iteration-normal.html]
-  [303B  VERTICAL IDEOGRAPHIC ITERATION MARK may NOT appear at line start if ja and normal]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-strict.html.ini b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-strict.html.ini
deleted file mode 100644
index 4577cd8f97a2..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-iteration-strict.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[css-text-line-break-ja-iteration-strict.html]
-  [303B  VERTICAL IDEOGRAPHIC ITERATION MARK may NOT appear at line start if ja and strict]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-loose.html.ini b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-loose.html.ini
deleted file mode 100644
index 50b5573a2cb4..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-loose.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[css-text-line-break-ja-po-loose.html]
-  [00B0  DEGREE SIGN may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FF05  FULLWIDTH PERCENT SIGN may appear at line start if ja and loose]
-    expected: FAIL
-
-  [FFE0  FULLWIDTH CENT SIGN may appear at line start if ja and loose]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-normal.html.ini b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-normal.html.ini
deleted file mode 100644
index ff2c96c5524e..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-normal.html.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[css-text-line-break-ja-po-normal.html]
-  [2030  PER MILLE SIGN may NOT appear at line start if ja and normal]
-    expected: FAIL
-
-  [2032  PRIME may NOT appear at line start if ja and normal]
-    expected: FAIL
-
-  [2033  DOUBLE PRIME may NOT appear at line start if ja and normal]
-    expected: FAIL
-
-  [2035  REVERSED PRIME may NOT appear at line start if ja and normal]
-    expected: FAIL
-
-  [2103  DEGREE CELSIUS may NOT appear at line start if ja and normal]
-    expected: FAIL
-
-  [2109  DEGREE FAHRENHEIT may NOT appear at line start if ja and normal]
-    expected: FAIL
-
-  [FE6A  SMALL PERCENT SIGN may NOT appear at line start if ja and normal]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-strict.html.ini b/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-strict.html.ini
deleted file mode 100644
index 1b68fdec0ef1..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-strict.html.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[css-text-line-break-ja-po-strict.html]
-  [2030  PER MILLE SIGN may NOT appear at line start if ja and strict]
-    expected: FAIL
-
-  [2032  PRIME may NOT appear at line start if ja and strict]
-    expected: FAIL
-
-  [2033  DOUBLE PRIME may NOT appear at line start if ja and strict]
-    expected: FAIL
-
-  [2035  REVERSED PRIME may NOT appear at line start if ja and strict]
-    expected: FAIL
-
-  [2103  DEGREE CELSIUS may NOT appear at line start if ja and strict]
-    expected: FAIL
-
-  [2109  DEGREE FAHRENHEIT may NOT appear at line start if ja and strict]
-    expected: FAIL
-
-  [FE6A  SMALL PERCENT SIGN may NOT appear at line start if ja and strict]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-cpm-loose.html.ini b/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-cpm-loose.html.ini
deleted file mode 100644
index 1789453a4ba8..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-cpm-loose.html.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[css-text-line-break-zh-cpm-loose.html]
-  [30FB  KATAKANA MIDDLE DOT may appear at line start if zh and loose]
-    expected: FAIL
-
-  [FF1A  FULLWIDTH COLON may appear at line start if zh and loose]
-    expected: FAIL
-
-  [FF1B  FULLWIDTH SEMICOLON may appear at line start if zh and loose]
-    expected: FAIL
-
-  [FF65  HALFWIDTH KATAKANA MIDDLE DOT may appear at line start if zh and loose]
-    expected: FAIL
-
-  [203C  DOUBLE EXCLAMATION MARK may appear at line start if zh and loose]
-    expected: FAIL
-
-  [2047  DOUBLE QUESTION MARK may appear at line start if zh and loose]
-    expected: FAIL
-
-  [2048  QUESTION EXCLAMATION MARK may appear at line start if zh and loose]
-    expected: FAIL
-
-  [2049  EXCLAMATION QUESTION MARK may appear at line start if zh and loose]
-    expected: FAIL
-
-  [FF01  FULLWIDTH EXCLAMATION MARK may appear at line start if zh and loose]
-    expected: FAIL
-
-  [FF1F  FULLWIDTH QUESTION MARK may appear at line start if zh and loose]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-loose.html.ini b/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-loose.html.ini
deleted file mode 100644
index 455fa1d952fb..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-loose.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[css-text-line-break-zh-hyphens-loose.html]
-  [301C WAVE DASH may appear at line start if zh and loose]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-normal.html.ini b/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-normal.html.ini
deleted file mode 100644
index 6c976987b34a..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-normal.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[css-text-line-break-zh-hyphens-normal.html]
-  [301C WAVE DASH may appear at line start if zh and normal]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-strict.html.ini b/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-strict.html.ini
deleted file mode 100644
index 7fea3c89c325..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-strict.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[css-text-line-break-zh-hyphens-strict.html]
-  [2010 HYPHEN may NOT appear at line start if zh and strict]
-    expected: FAIL
-
-  [2013 EN DASH may NOT appear at line start if zh and strict]
-    expected: FAIL
-
-  [30A0 KATAKANA-HIRAGANA DOUBLE HYPHEN may NOT appear at line start if zh and strict]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-in-loose.html.ini b/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-in-loose.html.ini
index d77e2d991939..8445388c6129 100644
--- a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-in-loose.html.ini
+++ b/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-in-loose.html.ini
@@ -1,19 +1,4 @@
 [css-text-line-break-zh-in-loose.html]
-  [2024  ONE DOT LEADER may appear at line start if zh and loose]
-    expected: FAIL
-
-  [2025  TWO DOT LEADER may appear at line start if zh and loose]
-    expected: FAIL
-
-  [2026  HORIZONTAL ELLIPSIS may appear at line start if zh and loose]
-    expected: FAIL
-
-  [22EF  MIDLINE HORIZONTAL ELLIPSIS may appear at line start if zh and loose]
-    expected: FAIL
-
-  [FE19  PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS may appear at line start if zh and loose]
-    expected: FAIL
-
   [10AF6  MANICHAEAN PUNCTUATION LINE FILLER may appear at line start if zh and loose]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-loose.html.ini b/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-loose.html.ini
deleted file mode 100644
index 74112e8662a7..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-loose.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[css-text-line-break-zh-iteration-loose.html]
-  [3005  IDEOGRAPHIC ITERATION MARK may appear at line start if zh and loose]
-    expected: FAIL
-
-  [309D  HIRAGANA ITERATION MARK may appear at line start if zh and loose]
-    expected: FAIL
-
-  [309E  HIRAGANA VOICED ITERATION MARK may appear at line start if zh and loose]
-    expected: FAIL
-
-  [30FD  KATAKANA ITERATION MARK may appear at line start if zh and loose]
-    expected: FAIL
-
-  [30FE  KATAKANA VOICED ITERATION MARK may appear at line start if zh and loose]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-normal.html.ini b/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-normal.html.ini
deleted file mode 100644
index c150ba2002ab..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-normal.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[css-text-line-break-zh-iteration-normal.html]
-  [303B  VERTICAL IDEOGRAPHIC ITERATION MARK may NOT appear at line start if zh and normal]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-strict.html.ini b/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-strict.html.ini
deleted file mode 100644
index 03e77baa1db6..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-iteration-strict.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[css-text-line-break-zh-iteration-strict.html]
-  [303B  VERTICAL IDEOGRAPHIC ITERATION MARK may NOT appear at line start if zh and strict]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-loose.html.ini b/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-loose.html.ini
deleted file mode 100644
index 286cffeff6eb..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-loose.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[css-text-line-break-zh-po-loose.html]
-  [00B0  DEGREE SIGN may appear at line start if zh and loose]
-    expected: FAIL
-
-  [FF05  FULLWIDTH PERCENT SIGN may appear at line start if zh and loose]
-    expected: FAIL
-
-  [FFE0  FULLWIDTH CENT SIGN may appear at line start if zh and loose]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-normal.html.ini b/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-normal.html.ini
deleted file mode 100644
index 302613d2b123..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-normal.html.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[css-text-line-break-zh-po-normal.html]
-  [2030  PER MILLE SIGN may NOT appear at line start if zh and normal]
-    expected: FAIL
-
-  [2032  PRIME may NOT appear at line start if zh and normal]
-    expected: FAIL
-
-  [2033  DOUBLE PRIME may NOT appear at line start if zh and normal]
-    expected: FAIL
-
-  [2035  REVERSED PRIME may NOT appear at line start if zh and normal]
-    expected: FAIL
-
-  [2103  DEGREE CELSIUS may NOT appear at line start if zh and normal]
-    expected: FAIL
-
-  [2109  DEGREE FAHRENHEIT may NOT appear at line start if zh and normal]
-    expected: FAIL
-
-  [FE6A  SMALL PERCENT SIGN may NOT appear at line start if zh and normal]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-strict.html.ini b/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-strict.html.ini
deleted file mode 100644
index 68d6f3dff005..000000000000
--- a/testing/web-platform/meta/css/css-text/i18n/zh/css-text-line-break-zh-po-strict.html.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[css-text-line-break-zh-po-strict.html]
-  [2030  PER MILLE SIGN may NOT appear at line start if zh and strict]
-    expected: FAIL
-
-  [2032  PRIME may NOT appear at line start if zh and strict]
-    expected: FAIL
-
-  [2033  DOUBLE PRIME may NOT appear at line start if zh and strict]
-    expected: FAIL
-
-  [2035  REVERSED PRIME may NOT appear at line start if zh and strict]
-    expected: FAIL
-
-  [2103  DEGREE CELSIUS may NOT appear at line start if zh and strict]
-    expected: FAIL
-
-  [2109  DEGREE FAHRENHEIT may NOT appear at line start if zh and strict]
-    expected: FAIL
-
-  [FE6A  SMALL PERCENT SIGN may NOT appear at line start if zh and strict]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-011.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-loose-011.xht.ini
deleted file mode 100644
index 4c95f99d1c5d..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-011.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-loose-011.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-012.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-loose-012.xht.ini
deleted file mode 100644
index 26fe79ee1a7b..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-012.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-loose-012.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-013.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-loose-013.xht.ini
deleted file mode 100644
index fdc2c3630143..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-013.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-loose-013.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-014.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-loose-014.xht.ini
deleted file mode 100644
index 4b5d323daa1f..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-014.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-loose-014.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-015.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-loose-015.xht.ini
deleted file mode 100644
index a35228429f91..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-015.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-loose-015.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-016a.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-loose-016a.xht.ini
deleted file mode 100644
index 10cdf226e881..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-016a.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-loose-016a.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-016b.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-loose-016b.xht.ini
deleted file mode 100644
index 4149619c2f0c..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-016b.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-loose-016b.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-017a.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-loose-017a.xht.ini
deleted file mode 100644
index 73d616f93275..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-017a.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-loose-017a.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-017b.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-loose-017b.xht.ini
deleted file mode 100644
index 757d63998d2c..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-017b.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-loose-017b.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-018.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-loose-018.xht.ini
deleted file mode 100644
index 4b9be52268f9..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-loose-018.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-loose-018.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-011.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-normal-011.xht.ini
deleted file mode 100644
index 2efce4a71186..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-011.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-normal-011.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-012.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-normal-012.xht.ini
deleted file mode 100644
index 46982f363ba3..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-012.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-normal-012.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-013.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-normal-013.xht.ini
deleted file mode 100644
index 2de271314d1e..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-013.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-normal-013.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-014.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-normal-014.xht.ini
deleted file mode 100644
index 5be0313ea602..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-014.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-normal-014.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-015.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-normal-015.xht.ini
deleted file mode 100644
index 8f4870130ff7..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-015.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-normal-015.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-017a.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-normal-017a.xht.ini
deleted file mode 100644
index b6c645fde127..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-017a.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-normal-017a.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-017b.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-normal-017b.xht.ini
deleted file mode 100644
index 69112add7eba..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-017b.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-normal-017b.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-018.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-normal-018.xht.ini
deleted file mode 100644
index 693999d7f9de..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-normal-018.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-normal-018.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-strict-013.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-strict-013.xht.ini
deleted file mode 100644
index f8f0bd84d887..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-strict-013.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-strict-013.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-strict-014.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-strict-014.xht.ini
deleted file mode 100644
index fea600ceeabd..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-strict-014.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-strict-014.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-strict-015.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-strict-015.xht.ini
deleted file mode 100644
index 3a68b42577fd..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-strict-015.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-strict-015.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-strict-017a.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-strict-017a.xht.ini
deleted file mode 100644
index 5a07bba3993f..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-strict-017a.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-strict-017a.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-strict-017b.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-strict-017b.xht.ini
deleted file mode 100644
index 3386a06ea41e..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-strict-017b.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-strict-017b.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-break/line-break-strict-018.xht.ini b/testing/web-platform/meta/css/css-text/line-break/line-break-strict-018.xht.ini
deleted file mode 100644
index bd79bd226f90..000000000000
--- a/testing/web-platform/meta/css/css-text/line-break/line-break-strict-018.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-strict-018.xht]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/parsing/line-break-valid.html.ini b/testing/web-platform/meta/css/css-text/parsing/line-break-valid.html.ini
deleted file mode 100644
index 3ad3ade704b7..000000000000
--- a/testing/web-platform/meta/css/css-text/parsing/line-break-valid.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[line-break-valid.html]
-  [e.style['line-break'\] = "loose" should set the property value]
-    expected: FAIL
-
-  [e.style['line-break'\] = "normal" should set the property value]
-    expected: FAIL
-
-  [e.style['line-break'\] = "strict" should set the property value]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-text/writing-system/writing-system-line-break-002.html.ini b/testing/web-platform/meta/css/css-text/writing-system/writing-system-line-break-002.html.ini
index 447719ca0bd5..512838958f85 100644
--- a/testing/web-platform/meta/css/css-text/writing-system/writing-system-line-break-002.html.ini
+++ b/testing/web-platform/meta/css/css-text/writing-system/writing-system-line-break-002.html.ini
@@ -1,2 +1,3 @@
 [writing-system-line-break-002.html]
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL

From 2ba42a9f7ddc10be28ab43b3373d514ecc525963 Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Mon, 20 May 2019 18:15:24 +0000
Subject: [PATCH 078/129] Bug 1550130 - make
 tools/profiler/tests/xpcshell/test_enterjit_osr.js more robust. r=gregtatum

make tools/profiler/tests/xpcshell/test_enterjit_osr.js more robust.

Differential Revision: https://phabricator.services.mozilla.com/D31796

--HG--
extra : moz-landing-system : lando
---
 .../tests/xpcshell/test_enterjit_osr.js       | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/tools/profiler/tests/xpcshell/test_enterjit_osr.js b/tools/profiler/tests/xpcshell/test_enterjit_osr.js
index 1bc7324e4aba..b9c8e650e49e 100644
--- a/tools/profiler/tests/xpcshell/test_enterjit_osr.js
+++ b/tools/profiler/tests/xpcshell/test_enterjit_osr.js
@@ -12,44 +12,41 @@ function run_test() {
     Assert.ok(!Services.profiler.IsActive());
 
     const ms = 5;
-    Services.profiler.StartProfiler(100, ms, ["js"], 1);
+    Services.profiler.StartProfiler(10000, ms, ["js"], 1);
 
-    function arbitrary_name() {
+    function has_arbitrary_name_in_stack() {
         // A frame for |arbitrary_name| has been pushed.  Do a sequence of
         // increasingly long spins until we get a sample.
         var delayMS = 5;
         while (1) {
             info("loop: ms = " + delayMS);
-            let then = Date.now();
+            const then = Date.now();
             do {
                 let n = 10000;
                 while (--n); // OSR happens here
                 // Spin in the hope of getting a sample.
             } while (Date.now() - then < delayMS);
-            let pr = Services.profiler.getProfileData().threads[0];
-            if (pr.samples.data.length > 0 || delayMS > 30000)
-                return pr;
+            let profile = Services.profiler.getProfileData().threads[0];
+
+            // Go through all of the stacks, and search for this function name.
+            for (const sample of profile.samples.data) {
+                const stack = getInflatedStackLocations(profile, sample);
+                info(`The following stack was found: ${stack}`);
+                for (var i = 0; i < stack.length; i++) {
+                    if (stack[i].match(/arbitrary_name/)) {
+                        // This JS sample was correctly found.
+                        return true;
+                    }
+                }
+            }
+
+            // Continue running this function with an increasingly long delay.
             delayMS *= 2;
+            if (delayMS > 30000) {
+                return false;
+            }
         }
     }
-
-    var profile = arbitrary_name();
-
-    Assert.notEqual(profile.samples.data.length, 0);
-    var lastSample = profile.samples.data[profile.samples.data.length - 1];
-    var stack = getInflatedStackLocations(profile, lastSample);
-    info(stack);
-
-    // All we can really check here is ensure that there is exactly
-    // one arbitrary_name frame in the list.
-    var gotName = false;
-    for (var i = 0; i < stack.length; i++) {
-        if (stack[i].match(/arbitrary_name/)) {
-            Assert.equal(gotName, false);
-            gotName = true;
-        }
-    }
-    Assert.equal(gotName, true);
-
+    Assert.ok(has_arbitrary_name_in_stack(), "A JS frame was found before the test timeout.");
     Services.profiler.StopProfiler();
 }

From 4675bb945a80cd3744589169ea523d82b357f5c7 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 20 May 2019 21:01:18 +0000
Subject: [PATCH 079/129] Bug 1359240 - When loading an SVG glyph, check if the
 SVG document is gz-compressed, and decompress before attempting to parse.
 r=jrmuizel

Differential Revision: https://phabricator.services.mozilla.com/D31107

--HG--
extra : moz-landing-system : lando
---
 gfx/thebes/gfxSVGGlyphs.cpp | 40 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/gfx/thebes/gfxSVGGlyphs.cpp b/gfx/thebes/gfxSVGGlyphs.cpp
index d2d1c3e14914..7bfa4beda1b0 100644
--- a/gfx/thebes/gfxSVGGlyphs.cpp
+++ b/gfx/thebes/gfxSVGGlyphs.cpp
@@ -32,6 +32,7 @@
 #include "gfxFont.h"
 #include "gfxContext.h"
 #include "harfbuzz/hb.h"
+#include "zlib.h"
 
 #define SVG_CONTENT_TYPE NS_LITERAL_CSTRING("image/svg+xml")
 #define UTF8_CHARSET NS_LITERAL_CSTRING("utf-8")
@@ -257,7 +258,44 @@ gfxSVGGlyphsDocument::gfxSVGGlyphsDocument(const uint8_t* aBuffer,
                                            uint32_t aBufLen,
                                            gfxSVGGlyphs* aSVGGlyphs)
     : mOwner(aSVGGlyphs) {
-  ParseDocument(aBuffer, aBufLen);
+  if (aBufLen >= 14 && aBuffer[0] == 31 && aBuffer[1] == 139) {
+    // It's a gzip-compressed document; decompress it before parsing.
+    // The original length (modulo 2^32) is found in the last 4 bytes
+    // of the data, stored in little-endian format. We read it as
+    // individual bytes to avoid possible alignment issues.
+    // (Note that if the original length was >2^32, then origLen here
+    // will be incorrect; but then the inflate() call will not return
+    // Z_STREAM_END and we'll bail out safely.)
+    size_t origLen = (size_t(aBuffer[aBufLen - 1]) << 24) +
+                     (size_t(aBuffer[aBufLen - 2]) << 16) +
+                     (size_t(aBuffer[aBufLen - 3]) << 8) +
+                     size_t(aBuffer[aBufLen - 4]);
+    AutoTArray<uint8_t, 4096> outBuf;
+    if (outBuf.SetLength(origLen, mozilla::fallible)) {
+      z_stream s = {0};
+      s.next_in = const_cast<Byte*>(aBuffer);
+      s.avail_in = aBufLen;
+      s.next_out = outBuf.Elements();
+      s.avail_out = outBuf.Length();
+      // The magic number 16 here is the zlib flag to expect gzip format,
+      // see http://www.zlib.net/manual.html#Advanced
+      if (Z_OK == inflateInit2(&s, 16 + MAX_WBITS)) {
+        int result = inflate(&s, Z_FINISH);
+        if (Z_STREAM_END == result) {
+          MOZ_ASSERT(size_t(s.next_out - outBuf.Elements()) == origLen);
+          ParseDocument(outBuf.Elements(), outBuf.Length());
+        } else {
+          NS_WARNING("Failed to decompress SVG glyphs document");
+        }
+        inflateEnd(&s);
+      }
+    } else {
+      NS_WARNING("Failed to allocate memory for SVG glyphs document");
+    }
+  } else {
+    ParseDocument(aBuffer, aBufLen);
+  }
+
   if (!mDocument) {
     NS_WARNING("Could not parse SVG glyphs document");
     return;

From e0b346b91621271752966cd064933c80b13211d9 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 20 May 2019 21:01:28 +0000
Subject: [PATCH 080/129] Bug 1359240 - Reftest for SVG-in-OT font using
 gzip-compressed SVG glyph documents. r=jrmuizel

Differential Revision: https://phabricator.services.mozilla.com/D31108

--HG--
extra : moz-landing-system : lando
---
 layout/reftests/text-svgglyphs/reftest.list    |   1 +
 .../text-svgglyphs/resources/svg-gz.ttf        | Bin 0 -> 113804 bytes
 .../svg-glyph-compressed-ref.html              |  13 +++++++++++++
 .../text-svgglyphs/svg-glyph-compressed.html   |  13 +++++++++++++
 4 files changed, 27 insertions(+)
 create mode 100644 layout/reftests/text-svgglyphs/resources/svg-gz.ttf
 create mode 100644 layout/reftests/text-svgglyphs/svg-glyph-compressed-ref.html
 create mode 100644 layout/reftests/text-svgglyphs/svg-glyph-compressed.html

diff --git a/layout/reftests/text-svgglyphs/reftest.list b/layout/reftests/text-svgglyphs/reftest.list
index 97a1d07b4a87..f19e137f7657 100644
--- a/layout/reftests/text-svgglyphs/reftest.list
+++ b/layout/reftests/text-svgglyphs/reftest.list
@@ -21,3 +21,4 @@ pref(gfx.font_rendering.opentype_svg.enabled,true)    fuzzy-if(skiaContent,0-15,
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-paint-server.svg svg-glyph-paint-server-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-transform.svg svg-glyph-transform-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-extents.html svg-glyph-extents-ref.html
+pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-compressed.html svg-glyph-compressed-ref.html
diff --git a/layout/reftests/text-svgglyphs/resources/svg-gz.ttf b/layout/reftests/text-svgglyphs/resources/svg-gz.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..3a9660224ad20b70633e64a4adfc6425a3da7b95
GIT binary patch
literal 113804
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

literal 0
HcmV?d00001

diff --git a/layout/reftests/text-svgglyphs/svg-glyph-compressed-ref.html b/layout/reftests/text-svgglyphs/svg-glyph-compressed-ref.html
new file mode 100644
index 000000000000..3325c05f2255
--- /dev/null
+++ b/layout/reftests/text-svgglyphs/svg-glyph-compressed-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<title>Test for compressed SVG glyphs</title>
+<style>
+  @font-face {
+    font-family: test;
+    src: url(resources/svg.woff); /* uses uncompressed SVG documents */
+  }
+  html { width: 400px; height: 400px; background-color: white; }
+  body { margin: 0; }
+  div { font: 200px test; color: fuchsia; line-height: 1; stroke: none; }
+</style>
+<div>abcdefg</div>
+<div>LMNOPQR</div>
diff --git a/layout/reftests/text-svgglyphs/svg-glyph-compressed.html b/layout/reftests/text-svgglyphs/svg-glyph-compressed.html
new file mode 100644
index 000000000000..0c51a54b1236
--- /dev/null
+++ b/layout/reftests/text-svgglyphs/svg-glyph-compressed.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<title>Test for compressed SVG glyphs</title>
+<style>
+  @font-face {
+    font-family: test;
+    src: url(resources/svg-gz.ttf); /* copy of svg.woff using gzip-compressed SVG documents */
+  }
+  html { width: 400px; height: 400px; background-color: white; }
+  body { margin: 0; }
+  div { font: 200px test; color: fuchsia; line-height: 1; stroke: none; }
+</style>
+<div>abcdefg</div>
+<div>LMNOPQR</div>

From 3619d25eef8bd005e2ec7fda031b047ff3636085 Mon Sep 17 00:00:00 2001
From: Rob Thijssen <rthijssen@mozilla.com>
Date: Mon, 20 May 2019 19:14:06 +0000
Subject: [PATCH 081/129] Bug 1552917 - reenable parallel, tier 3, android,
 linux and macosx, gcp builds r=coop

Differential Revision: https://phabricator.services.mozilla.com/D31817

--HG--
extra : moz-landing-system : lando
---
 taskcluster/ci/build/android.yml          | 399 ++++++++++++++++++++++
 taskcluster/ci/build/linux.yml            | 233 +++++++++++++
 taskcluster/ci/build/macosx.yml           | 127 +++++++
 taskcluster/taskgraph/util/workertypes.py |   2 +
 4 files changed, 761 insertions(+)

diff --git a/taskcluster/ci/build/android.yml b/taskcluster/ci/build/android.yml
index 003e47f2a2ae..3a70ed1ea4f1 100644
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -839,3 +839,402 @@ android-x86_64/debug:
         - linux64-sccache
         - linux64-nasm
         - linux64-node
+
+android-api-16-gcp/debug:
+    description: "Android 4.0 api-16+ Debug - built on GCP"
+    index:
+        product: mobile
+        job-name: android-api-16-gcp-debug
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: android-4-0-armv7-api16/debug
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        docker-image: {in-tree: android-build}
+        max-run-time: 7200
+        env:
+            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
+            PERFHERDER_EXTRA_OPTIONS: gcp
+        artifacts:
+            - name: public/android/maven
+              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
+              type: directory
+            - name: public/build/target.maven.zip
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
+              type: file
+            - name: public/build/geckoview-androidTest.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
+              type: file
+            - name: public/build/geckoview_example.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
+              type: file
+            - name: public/build
+              path: /builds/worker/artifacts/
+              type: directory
+    run:
+        using: mozharness
+        actions: [get-secrets, build]
+        config:
+            - builds/releng_base_android_64_builds.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        custom-build-variant-cfg: api-16-debug
+        tooltool-downloads: internal
+    toolchains:
+        - android-gradle-dependencies
+        - android-ndk-linux
+        - android-sdk-linux
+        - linux64-clang
+        - linux64-rust-android
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-sccache
+        - linux64-nasm
+        - linux64-node
+
+android-x86-gcp/opt:
+    description: "Android 4.2 x86 Opt - built on GCP"
+    index:
+        product: mobile
+        job-name: android-x86-gcp-opt
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: android-4-2-x86/opt
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        docker-image: {in-tree: android-build}
+        max-run-time: 7200
+        env:
+            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
+            PERFHERDER_EXTRA_OPTIONS: gcp
+        artifacts:
+            - name: public/android/maven
+              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
+              type: directory
+            - name: public/build/target.maven.zip
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
+              type: file
+            - name: public/build/geckoview-androidTest.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
+              type: file
+            - name: public/build/geckoview_example.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
+              type: file
+            - name: public/build
+              path: /builds/worker/artifacts/
+              type: directory
+    run:
+        using: mozharness
+        actions: [get-secrets, build]
+        config:
+            - builds/releng_base_android_64_builds.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        custom-build-variant-cfg: x86
+        tooltool-downloads: internal
+    toolchains:
+        - android-gradle-dependencies
+        - android-ndk-linux
+        - android-sdk-linux
+        - linux64-clang
+        - linux64-rust-android
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-sccache
+        - linux64-nasm
+        - linux64-node
+
+android-api-16-gcp/opt:
+    description: "Android 4.0 api-16+ Opt - built on GCP"
+    index:
+        product: mobile
+        job-name: android-api-16-gcp-opt
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: android-4-0-armv7-api16/opt
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        docker-image: {in-tree: android-build}
+        max-run-time: 7200
+        env:
+            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
+            PERFHERDER_EXTRA_OPTIONS: gcp
+        artifacts:
+            - name: public/android/maven
+              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
+              type: directory
+            - name: public/build/target.maven.zip
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
+              type: file
+            - name: public/build/geckoview-androidTest.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
+              type: file
+            - name: public/build/geckoview_example.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
+              type: file
+            - name: public/build
+              path: /builds/worker/artifacts/
+              type: directory
+    run:
+        using: mozharness
+        actions: [get-secrets, build]
+        config:
+            - builds/releng_base_android_64_builds.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        custom-build-variant-cfg: api-16
+        tooltool-downloads: internal
+    toolchains:
+        - android-gradle-dependencies
+        - android-ndk-linux
+        - android-sdk-linux
+        - linux64-clang
+        - linux64-rust-android
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-sccache
+        - linux64-nasm
+        - linux64-node
+
+android-aarch64-gcp/opt:
+    description: "Android 5.0 AArch64 Opt - built on GCP"
+    index:
+        product: mobile
+        job-name: android-aarch64-gcp-opt
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: android-5-0-aarch64/opt
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        docker-image: {in-tree: android-build}
+        max-run-time: 7200
+        env:
+            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
+            PERFHERDER_EXTRA_OPTIONS: gcp
+        artifacts:
+            - name: public/android/maven
+              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
+              type: directory
+            - name: public/build/target.maven.zip
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
+              type: file
+            - name: public/build/geckoview-androidTest.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
+              type: file
+            - name: public/build/geckoview_example.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
+              type: file
+            - name: public/build
+              path: /builds/worker/artifacts/
+              type: directory
+    run:
+        using: mozharness
+        actions: [get-secrets, build]
+        config:
+            - builds/releng_base_android_64_builds.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        custom-build-variant-cfg: aarch64
+        tooltool-downloads: internal
+    toolchains:
+        - android-gradle-dependencies
+        - android-ndk-linux
+        - android-sdk-linux
+        - linux64-clang
+        - linux64-rust-android
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-sccache
+        - linux64-nasm
+        - linux64-node
+
+android-aarch64-gcp/debug:
+    description: "Android 5.0 AArch64 Debug - built on GCP"
+    index:
+        product: mobile
+        job-name: android-aarch64-gcp-debug
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: android-5-0-aarch64/debug
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        docker-image: {in-tree: android-build}
+        max-run-time: 7200
+        env:
+            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
+            PERFHERDER_EXTRA_OPTIONS: gcp
+        artifacts:
+            - name: public/android/maven
+              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
+              type: directory
+            - name: public/build/target.maven.zip
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
+              type: file
+            - name: public/build/geckoview-androidTest.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
+              type: file
+            - name: public/build/geckoview_example.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
+              type: file
+            - name: public/build
+              path: /builds/worker/artifacts/
+              type: directory
+    run:
+        using: mozharness
+        actions: [get-secrets, build]
+        config:
+            - builds/releng_base_android_64_builds.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        custom-build-variant-cfg: aarch64-debug
+        tooltool-downloads: internal
+    toolchains:
+        - android-gradle-dependencies
+        - android-ndk-linux
+        - android-sdk-linux
+        - linux64-clang
+        - linux64-rust-android
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-sccache
+        - linux64-nasm
+        - linux64-node
+
+android-x86_64-gcp/opt:
+    description: "Android 5.0 x86-64 Opt - built on GCP"
+    index:
+        product: mobile
+        job-name: android-x86_64-gcp-opt
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: android-5-0-x86_64/opt
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        docker-image: {in-tree: android-build}
+        max-run-time: 7200
+        env:
+            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
+            PERFHERDER_EXTRA_OPTIONS: gcp
+        artifacts:
+            - name: public/android/maven
+              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
+              type: directory
+            - name: public/build/target.maven.zip
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
+              type: file
+            - name: public/build/geckoview-androidTest.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
+              type: file
+            - name: public/build/geckoview_example.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
+              type: file
+            - name: public/build
+              path: /builds/worker/artifacts/
+              type: directory
+    run:
+        using: mozharness
+        actions: [get-secrets, build]
+        config:
+            - builds/releng_base_android_64_builds.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        custom-build-variant-cfg: x86_64
+        tooltool-downloads: internal
+    toolchains:
+        - android-gradle-dependencies
+        - android-ndk-linux
+        - android-sdk-linux
+        - linux64-clang
+        - linux64-rust-android
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-sccache
+        - linux64-nasm
+        - linux64-node
+
+android-x86_64-gcp/debug:
+    description: "Android 5.0 x86-64 Debug - built on GCP"
+    index:
+        product: mobile
+        job-name: android-x86_64-gcp-debug
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: android-5-0-x86_64/debug
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        docker-image: {in-tree: android-build}
+        max-run-time: 7200
+        env:
+            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
+            PERFHERDER_EXTRA_OPTIONS: gcp
+        artifacts:
+            - name: public/android/maven
+              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
+              type: directory
+            - name: public/build/target.maven.zip
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
+              type: file
+            - name: public/build/geckoview-androidTest.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
+              type: file
+            - name: public/build/geckoview_example.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
+              type: file
+            - name: public/build
+              path: /builds/worker/artifacts/
+              type: directory
+    run:
+        using: mozharness
+        actions: [get-secrets, build]
+        config:
+            - builds/releng_base_android_64_builds.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        custom-build-variant-cfg: x86_64-debug
+        tooltool-downloads: internal
+    toolchains:
+        - android-gradle-dependencies
+        - android-ndk-linux
+        - android-sdk-linux
+        - linux64-clang
+        - linux64-rust-android
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-sccache
+        - linux64-nasm
+        - linux64-node
diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml
index a631ee729d3f..1d55474b0184 100644
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -1139,3 +1139,236 @@ linux64-aarch64/opt:
         - linux64-cbindgen
         - linux64-sccache
         - linux64-node
+
+linux-gcp/debug:
+    description: "Linux32 Debug - built on GCP"
+    index:
+        product: firefox
+        job-name: linux-gcp-debug
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: linux32/debug
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        docker-image: {in-tree: debian7-i386-build}
+        max-run-time: 5400
+        env:
+            PERFHERDER_EXTRA_OPTIONS: gcp
+    run:
+        using: mozharness
+        actions: [get-secrets, build, check-test]
+        config:
+            - builds/releng_base_firefox.py
+            - builds/releng_base_linux_32_builds.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        custom-build-variant-cfg: debug
+        mozconfig-variant: debug
+        tooltool-downloads: public
+        need-xvfb: true
+    toolchains:
+        - linux64-binutils
+        - linux64-clang
+        - linux64-rust
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-sccache
+        - linux64-nasm
+        - linux64-node
+
+linux-gcp/opt:
+    description: "Linux32 Opt - built on GCP"
+    index:
+        product: firefox
+        job-name: linux-gcp-opt
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: linux32/opt
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        docker-image: {in-tree: debian7-i386-build}
+        max-run-time: 7200
+        env:
+            PERFHERDER_EXTRA_OPTIONS: gcp
+    run:
+        using: mozharness
+        actions: [get-secrets, build, check-test]
+        config:
+            - builds/releng_base_firefox.py
+            - builds/releng_base_linux_32_builds.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        tooltool-downloads: public
+        need-xvfb: true
+    run-on-projects: ['mozilla-central', 'try']
+    toolchains:
+        - linux64-binutils
+        - linux64-clang
+        - linux64-rust
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-sccache
+        - linux64-nasm
+        - linux64-node
+
+linux-gcp-shippable/opt:
+    description: "Linux32 Shippable - built on GCP"
+    attributes:
+        shippable: true
+        enable-full-crashsymbols: true
+    shipping-phase: build
+    shipping-product: firefox
+    index:
+        product: firefox
+        job-name: linux-gcp-opt
+        type: shippable
+    treeherder:
+        platform: linux32-shippable/opt
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        docker-image: {in-tree: debian7-i386-build}
+        max-run-time: 7200
+        env:
+            PERFHERDER_EXTRA_OPTIONS: gcp
+    run:
+        using: mozharness
+        actions: [get-secrets, build, check-test]
+        config:
+            - builds/releng_base_firefox.py
+            - builds/releng_base_linux_32_builds.py
+            - taskcluster_nightly.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        tooltool-downloads: public
+        need-xvfb: true
+    toolchains:
+        - linux64-binutils
+        - linux64-clang
+        - linux64-rust
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-nasm
+        - linux64-node
+
+linux64-gcp/debug:
+    description: "Linux64 Debug - built on GCP"
+    index:
+        product: firefox
+        job-name: linux64-gcp-debug
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: linux64/debug
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        max-run-time: 5400
+        env:
+            PERFHERDER_EXTRA_OPTIONS: gcp
+    run:
+        using: mozharness
+        actions: [get-secrets, build, check-test]
+        config:
+            - builds/releng_base_firefox.py
+            - builds/releng_base_linux_64_builds.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        custom-build-variant-cfg: debug
+        mozconfig-variant: debug
+        tooltool-downloads: public
+        need-xvfb: true
+    toolchains:
+        - linux64-binutils
+        - linux64-clang
+        - linux64-cbindgen
+        - linux64-sccache
+        - linux64-rust
+        - linux64-rust-size
+        - linux64-nasm
+        - linux64-node
+
+linux64-gcp/opt:
+    description: "Linux64 Opt - built on GCP"
+    index:
+        product: firefox
+        job-name: linux64-gcp-opt
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: linux64/opt
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        max-run-time: 7200
+        env:
+            PERFHERDER_EXTRA_OPTIONS: gcp
+    run:
+        using: mozharness
+        actions: [get-secrets, build, check-test]
+        config:
+            - builds/releng_base_firefox.py
+            - builds/releng_base_linux_64_builds.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        tooltool-downloads: public
+        need-xvfb: true
+    run-on-projects: ['mozilla-central', 'try']
+    toolchains:
+        - linux64-binutils
+        - linux64-clang
+        - linux64-rust
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-sccache
+        - linux64-nasm
+        - linux64-node
+
+linux64-gcp-shippable/opt:
+    description: "Linux64 Shippable - built on GCP"
+    attributes:
+        shippable: true
+        enable-full-crashsymbols: true
+    shipping-phase: build
+    shipping-product: firefox
+    index:
+        product: firefox
+        job-name: linux64-gcp-opt
+        type: shippable
+    treeherder:
+        platform: linux64-shippable/opt
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        max-run-time: 7200
+        env:
+            PERFHERDER_EXTRA_OPTIONS: gcp
+    run:
+        using: mozharness
+        actions: [get-secrets, build, check-test]
+        config:
+            - builds/releng_base_firefox.py
+            - builds/releng_base_linux_64_builds.py
+            - taskcluster_nightly.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        tooltool-downloads: public
+        need-xvfb: true
+    toolchains:
+        - linux64-binutils
+        - linux64-clang
+        - linux64-rust
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-nasm
+        - linux64-node
diff --git a/taskcluster/ci/build/macosx.yml b/taskcluster/ci/build/macosx.yml
index 27e9dd8235ac..e94a42f89561 100644
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -373,3 +373,130 @@ macosx64-ccov/debug:
         - linux64-sccache
         - linux64-nasm
         - linux64-node
+
+macosx64-gcp/debug:
+    description: "MacOS X x64 Cross-compile - built on GCP"
+    index:
+        product: firefox
+        job-name: macosx64-gcp-debug
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: osx-cross/debug
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        max-run-time: 3600
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
+            PERFHERDER_EXTRA_OPTIONS: gcp
+    run:
+        using: mozharness
+        actions: [get-secrets, build]
+        config:
+            - builds/releng_base_firefox.py
+            - builds/releng_base_mac_64_cross_builds.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        custom-build-variant-cfg: cross-debug
+        mozconfig-variant: debug
+        tooltool-downloads: internal
+    toolchains:
+        - linux64-binutils
+        - linux64-cctools-port
+        - linux64-clang
+        - linux64-hfsplus
+        - linux64-libdmg
+        - linux64-llvm-dsymutil
+        - linux64-rust-macos
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-sccache
+        - linux64-nasm
+        - linux64-node
+
+macosx64-gcp/opt:
+    description: "MacOS X x64 Cross-compile - built on GCP"
+    index:
+        product: firefox
+        job-name: macosx64-gcp-opt
+    attributes:
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: osx-cross/opt
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
+            PERFHERDER_EXTRA_OPTIONS: gcp
+    run:
+        using: mozharness
+        actions: [get-secrets, build]
+        config:
+            - builds/releng_base_firefox.py
+            - builds/releng_base_mac_64_cross_builds.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        tooltool-downloads: internal
+    run-on-projects: ['mozilla-central', 'try']
+    toolchains:
+        - linux64-binutils
+        - linux64-cctools-port
+        - linux64-clang
+        - linux64-hfsplus
+        - linux64-libdmg
+        - linux64-llvm-dsymutil
+        - linux64-rust-macos
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-sccache
+        - linux64-nasm
+        - linux64-node
+
+macosx64-gcp-shippable/opt:
+    description: "MacOS X x64 Cross-compile - built on GCP"
+    attributes:
+        shippable: true
+        enable-full-crashsymbols: true
+    shipping-phase: build
+    shipping-product: firefox
+    index:
+        product: firefox
+        job-name: macosx64-gcp-opt
+        type: shippable
+    treeherder:
+        platform: osx-shippable/opt
+        symbol: Bg
+        tier: 3
+    worker-type: gce/gecko-{level}-b-linux
+    worker:
+        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
+            PERFHERDER_EXTRA_OPTIONS: gcp
+    run:
+        using: mozharness
+        actions: [get-secrets, build]
+        config:
+            - builds/releng_base_firefox.py
+            - builds/releng_base_mac_64_cross_builds.py
+            - taskcluster_nightly.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        tooltool-downloads: internal
+    toolchains:
+        - linux64-binutils
+        - linux64-cctools-port
+        - linux64-clang
+        - linux64-hfsplus
+        - linux64-libdmg
+        - linux64-llvm-dsymutil
+        - linux64-rust-macos
+        - linux64-rust-size
+        - linux64-cbindgen
+        - linux64-nasm
+        - linux64-node
diff --git a/taskcluster/taskgraph/util/workertypes.py b/taskcluster/taskgraph/util/workertypes.py
index 002019a50b65..77d74efa3dc4 100644
--- a/taskcluster/taskgraph/util/workertypes.py
+++ b/taskcluster/taskgraph/util/workertypes.py
@@ -12,6 +12,8 @@ from .attributes import keymatch
 
 WORKER_TYPES = {
     'gce/gecko-1-b-linux': ('docker-worker', 'linux'),
+    'gce/gecko-2-b-linux': ('docker-worker', 'linux'),
+    'gce/gecko-3-b-linux': ('docker-worker', 'linux'),
     'releng-hardware/gecko-1-b-win2012-gamma': ('generic-worker', 'windows'),
     'invalid/invalid': ('invalid', None),
     'invalid/always-optimized': ('always-optimized', None),

From 170e44e58f81ad2a7df6aee15c3ac5c878fb4444 Mon Sep 17 00:00:00 2001
From: Sean Feng <sefeng@mozilla.com>
Date: Thu, 16 May 2019 19:35:30 +0000
Subject: [PATCH 082/129] Bug 1534012 - Use a low priority ThrottledEventQueue
 for postMessages during page load r=smaug

Differential Revision: https://phabricator.services.mozilla.com/D27386

--HG--
extra : moz-landing-system : lando
---
 dom/base/TabGroup.cpp                         | 40 +++++++++++++++++++
 dom/base/TabGroup.h                           |  9 +++++
 dom/base/nsGlobalWindowInner.cpp              | 12 ++++++
 dom/base/nsGlobalWindowOuter.cpp              | 13 ++++++
 .../file_separate_post_message_queue.html     | 39 ++++++++++++++++++
 dom/tests/mochitest/dom-level0/mochitest.ini  |  2 +
 .../test_separate_post_message_queue.html     | 31 ++++++++++++++
 layout/base/nsDocumentViewer.cpp              |  1 +
 modules/libpref/init/StaticPrefList.h         |  6 +++
 .../FileAPI/url/sandboxed-iframe.html.ini     |  1 +
 .../support/testharness-helper.sub.js         |  2 +-
 uriloader/base/nsDocLoader.cpp                |  1 +
 xpcom/threads/ThreadEventQueue.cpp            |  4 ++
 xpcom/threads/ThrottledEventQueue.cpp         | 21 ++++++++--
 xpcom/threads/ThrottledEventQueue.h           |  2 +
 xpcom/threads/nsIRunnable.idl                 |  2 +
 16 files changed, 181 insertions(+), 5 deletions(-)
 create mode 100644 dom/tests/mochitest/dom-level0/file_separate_post_message_queue.html
 create mode 100644 dom/tests/mochitest/dom-level0/test_separate_post_message_queue.html

diff --git a/dom/base/TabGroup.cpp b/dom/base/TabGroup.cpp
index ea51fb5b7ea9..5ba5be0da79d 100644
--- a/dom/base/TabGroup.cpp
+++ b/dom/base/TabGroup.cpp
@@ -304,6 +304,46 @@ bool TabGroup::IsBackground() const {
   return mForegroundCount == 0;
 }
 
+nsresult TabGroup::QueuePostMessageEvent(
+    already_AddRefed<nsIRunnable>&& aRunnable) {
+  if (StaticPrefs::dom_separate_event_queue_for_post_message_enabled()) {
+    if (!mPostMessageEventQueue) {
+      nsCOMPtr<nsISerialEventTarget> target = GetMainThreadSerialEventTarget();
+      mPostMessageEventQueue = ThrottledEventQueue::Create(
+          target, "PostMessage Queue",
+          nsIRunnablePriority::PRIORITY_DEFERRED_TIMERS);
+      nsresult rv = mPostMessageEventQueue->SetIsPaused(false);
+      MOZ_ALWAYS_SUCCEEDS(rv);
+    }
+
+    // Ensure the queue is enabled
+    if (mPostMessageEventQueue->IsPaused()) {
+      nsresult rv = mPostMessageEventQueue->SetIsPaused(false);
+      MOZ_ALWAYS_SUCCEEDS(rv);
+    }
+
+    if (mPostMessageEventQueue) {
+      mPostMessageEventQueue->Dispatch(std::move(aRunnable),
+                                       NS_DISPATCH_NORMAL);
+      return NS_OK;
+    }
+  }
+  return NS_ERROR_FAILURE;
+}
+
+void TabGroup::FlushPostMessageEvents() {
+  if (StaticPrefs::dom_separate_event_queue_for_post_message_enabled()) {
+    if (mPostMessageEventQueue) {
+      nsresult rv = mPostMessageEventQueue->SetIsPaused(true);
+      MOZ_ALWAYS_SUCCEEDS(rv);
+      nsCOMPtr<nsIRunnable> event;
+      while ((event = mPostMessageEventQueue->GetEvent())) {
+        Dispatch(TaskCategory::Other, event.forget());
+      }
+    }
+  }
+}
+
 uint32_t TabGroup::Count(bool aActiveOnly) const {
   if (!aActiveOnly) {
     return mDocGroups.Count();
diff --git a/dom/base/TabGroup.h b/dom/base/TabGroup.h
index 8864e5db9a55..9f266d1544d1 100644
--- a/dom/base/TabGroup.h
+++ b/dom/base/TabGroup.h
@@ -23,6 +23,7 @@ class nsPIDOMWindowOuter;
 
 namespace mozilla {
 class AbstractThread;
+class ThrottledEventQueue;
 namespace dom {
 class Document;
 class BrowserChild;
@@ -143,6 +144,10 @@ class TabGroup final : public SchedulerGroup,
   // can be throttled.
   static bool HasOnlyThrottableTabs();
 
+  nsresult QueuePostMessageEvent(already_AddRefed<nsIRunnable>&& aRunnable);
+
+  void FlushPostMessageEvents();
+
  private:
   virtual AbstractThread* AbstractMainThreadForImpl(
       TaskCategory aCategory) override;
@@ -166,6 +171,10 @@ class TabGroup final : public SchedulerGroup,
   uint32_t mForegroundCount;
 
   static LinkedList<TabGroup>* sTabGroups;
+
+  // A queue to store postMessage events during page load, the queue will be
+  // flushed once the page is loaded
+  RefPtr<mozilla::ThrottledEventQueue> mPostMessageEventQueue;
 };
 
 }  // namespace dom
diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp
index be14bbf57234..c8004239eced 100644
--- a/dom/base/nsGlobalWindowInner.cpp
+++ b/dom/base/nsGlobalWindowInner.cpp
@@ -2482,6 +2482,18 @@ void nsPIDOMWindowInner::SetAudioCapture(bool aCapture) {
 }
 
 void nsPIDOMWindowInner::SetActiveLoadingState(bool aIsLoading) {
+  if (StaticPrefs::dom_separate_event_queue_for_post_message_enabled()) {
+    if (!aIsLoading) {
+      Document* doc = GetExtantDoc();
+      if (doc) {
+        if (doc->IsTopLevelContentDocument()) {
+          mozilla::dom::TabGroup* tabGroup = doc->GetDocGroup()->GetTabGroup();
+          tabGroup->FlushPostMessageEvents();
+        }
+      }
+    }
+  }
+
   if (!nsGlobalWindowInner::Cast(this)->IsChromeWindow()) {
     mTimeoutManager->SetLoading(aIsLoading);
   }
diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp
index ad68bdb8ed04..63256bb07266 100644
--- a/dom/base/nsGlobalWindowOuter.cpp
+++ b/dom/base/nsGlobalWindowOuter.cpp
@@ -6057,6 +6057,19 @@ void nsGlobalWindowOuter::PostMessageMozOuter(JSContext* aCx,
     return;
   }
 
+  if (StaticPrefs::dom_separate_event_queue_for_post_message_enabled()) {
+    if (mDoc) {
+      Document* doc = mDoc->GetTopLevelContentDocument();
+      if (doc && doc->GetReadyStateEnum() < Document::READYSTATE_COMPLETE) {
+        // As long as the top level is loading, we can dispatch events to the
+        // queue because the queue will be flushed eventually
+        mozilla::dom::TabGroup* tabGroup = TabGroup();
+        aError = tabGroup->QueuePostMessageEvent(event.forget());
+        return;
+      }
+    }
+  }
+
   aError = Dispatch(TaskCategory::Other, event.forget());
 }
 
diff --git a/dom/tests/mochitest/dom-level0/file_separate_post_message_queue.html b/dom/tests/mochitest/dom-level0/file_separate_post_message_queue.html
new file mode 100644
index 000000000000..ce1494e3d255
--- /dev/null
+++ b/dom/tests/mochitest/dom-level0/file_separate_post_message_queue.html
@@ -0,0 +1,39 @@
+<script>
+
+let runnable1 = {
+  run() {
+    window.opener.callOrder.push("Runnable1");
+  }
+}
+
+let runnable2 = {
+  run() {
+    window.opener.callOrder.push("Runnable2");
+  }
+}
+
+let runnable3 = {
+  run() {
+    window.opener.callOrder.push("Runnable3");
+  }
+}
+
+window.onmessage = function () {
+  window.opener.callOrder.push("PostMessage");
+  if (window.loadCount == 1) {
+    window.loadCount += 1;
+    location.reload();
+  } else {
+    window.opener.onDone();
+  }
+};
+
+// Pushed to normal queue
+SpecialPowers.Services.tm.dispatchToMainThread(runnable1);
+// Pushed to idle queue
+window.postMessage("bar", "*");
+// Pushed to normal queue
+SpecialPowers.Services.tm.dispatchToMainThread(runnable2);
+// Pushed to normal queue
+SpecialPowers.Services.tm.dispatchToMainThread(runnable3);
+</script>
diff --git a/dom/tests/mochitest/dom-level0/mochitest.ini b/dom/tests/mochitest/dom-level0/mochitest.ini
index 3b980c958221..28f813279d98 100644
--- a/dom/tests/mochitest/dom-level0/mochitest.ini
+++ b/dom/tests/mochitest/dom-level0/mochitest.ini
@@ -3,6 +3,7 @@ support-files =
   child_ip_address.html
   file_crossdomainprops_inner.html
   file_location.html
+  file_separate_post_message_queue.html
   framed_location.html
   idn_child.html
   innerWidthHeight_script.html
@@ -19,3 +20,4 @@ support-files =
 [test_location_setters.html]
 [test_setting_document.domain_idn.html]
 [test_setting_document.domain_to_shortened_ipaddr.html]
+[test_separate_post_message_queue.html]
diff --git a/dom/tests/mochitest/dom-level0/test_separate_post_message_queue.html b/dom/tests/mochitest/dom-level0/test_separate_post_message_queue.html
new file mode 100644
index 000000000000..357faa6b09a1
--- /dev/null
+++ b/dom/tests/mochitest/dom-level0/test_separate_post_message_queue.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for using separate event queue for post messages during page load behaviors</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<p id="display"></p>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+SimpleTest.waitForExplicitFinish();
+var tab;
+var callOrder = [];
+function onDone() {
+  tab.close();
+  isDeeply(callOrder, ["Runnable1", "Runnable2", "Runnable3", "PostMessage",
+    "Runnable1", "Runnable2", "Runnable3", "PostMessage"], "Runnables should be fired prior to PostMessage");
+  SimpleTest.finish();
+}
+
+SpecialPowers.pushPrefEnv({"set":[["dom.separate_event_queue_for_post_message.enabled", true]]}, function () {
+  tab = window.open('file_separate_post_message_queue.html');
+  tab.loadCount = 1;
+});
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index b2a4c95ccad0..b5eaf5e01b9d 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -22,6 +22,7 @@
 #include "mozilla/dom/PopupBlocker.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/DocumentInlines.h"
+#include "mozilla/dom/DocGroup.h"
 #include "nsPresContext.h"
 #include "nsIFrame.h"
 #include "nsIWritablePropertyBag2.h"
diff --git a/modules/libpref/init/StaticPrefList.h b/modules/libpref/init/StaticPrefList.h
index 24be23bcea1f..2355fa80a1ee 100644
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -733,6 +733,12 @@ VARCACHE_PREF(
   bool, false
 )
 
+VARCACHE_PREF(
+  "dom.separate_event_queue_for_post_message.enabled",
+  dom_separate_event_queue_for_post_message_enabled,
+  bool, true
+)
+
 //---------------------------------------------------------------------------
 // Extension prefs
 //---------------------------------------------------------------------------
diff --git a/testing/web-platform/meta/FileAPI/url/sandboxed-iframe.html.ini b/testing/web-platform/meta/FileAPI/url/sandboxed-iframe.html.ini
index fcc1f89ff206..a58bdca3c1fd 100644
--- a/testing/web-platform/meta/FileAPI/url/sandboxed-iframe.html.ini
+++ b/testing/web-platform/meta/FileAPI/url/sandboxed-iframe.html.ini
@@ -1,4 +1,5 @@
 [sandboxed-iframe.html]
+  prefs: [dom.separate_event_queue_for_post_message.enabled:false] # Bug in WPT https://github.com/web-platform-tests/wpt/issues/16540
   disabled:
     if (os == "mac"): https://bugzilla.mozilla.org/show_bug.cgi?id=1433190
   [Blob URL parses correctly]
diff --git a/testing/web-platform/tests/content-security-policy/embedded-enforcement/support/testharness-helper.sub.js b/testing/web-platform/tests/content-security-policy/embedded-enforcement/support/testharness-helper.sub.js
index c1b2e673eced..3b84db085224 100644
--- a/testing/web-platform/tests/content-security-policy/embedded-enforcement/support/testharness-helper.sub.js
+++ b/testing/web-platform/tests/content-security-policy/embedded-enforcement/support/testharness-helper.sub.js
@@ -128,7 +128,7 @@ function assert_iframe_with_csp(t, url, csp, shouldBlock, urlId, blockedURI) {
       // Delay the check until after the postMessage has a chance to execute.
       setTimeout(t.step_func_done(function () {
         assert_equals(loaded[urlId], undefined);
-      }), 1);
+      }), 500);
       assert_throws("SecurityError", () => {
         var x = i.contentWindow.location.href;
       });
diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp
index 0254bd6a8920..83f20d8b3c8b 100644
--- a/uriloader/base/nsDocLoader.cpp
+++ b/uriloader/base/nsDocLoader.cpp
@@ -30,6 +30,7 @@
 
 #include "nsIDOMWindow.h"
 #include "nsPIDOMWindow.h"
+#include "nsGlobalWindow.h"
 
 #include "nsIStringBundle.h"
 #include "nsIScriptSecurityManager.h"
diff --git a/xpcom/threads/ThreadEventQueue.cpp b/xpcom/threads/ThreadEventQueue.cpp
index becc8965121a..c46a09e7edd1 100644
--- a/xpcom/threads/ThreadEventQueue.cpp
+++ b/xpcom/threads/ThreadEventQueue.cpp
@@ -89,6 +89,10 @@ bool ThreadEventQueue<InnerQueueT>::PutEventInternal(
           aPriority = EventQueuePriority::Input;
         } else if (prio == nsIRunnablePriority::PRIORITY_MEDIUMHIGH) {
           aPriority = EventQueuePriority::MediumHigh;
+        } else if (prio == nsIRunnablePriority::PRIORITY_DEFERRED_TIMERS) {
+          aPriority = EventQueuePriority::DeferredTimers;
+        } else if (prio == nsIRunnablePriority::PRIORITY_IDLE) {
+          aPriority = EventQueuePriority::Idle;
         }
       }
     }
diff --git a/xpcom/threads/ThrottledEventQueue.cpp b/xpcom/threads/ThrottledEventQueue.cpp
index 25f91df9c0d1..e6735be0d08e 100644
--- a/xpcom/threads/ThrottledEventQueue.cpp
+++ b/xpcom/threads/ThrottledEventQueue.cpp
@@ -179,11 +179,14 @@ class ThrottledEventQueue::Inner final : public nsISupports {
 
     {
       MutexAutoLock lock(mMutex);
-
-      // We only check the name of an executor runnable when we know there is
-      // something in the queue, so this should never fail.
       event = mEventQueue.PeekEvent(lock);
-      MOZ_ALWAYS_TRUE(event);
+      // It is possible that mEventQueue wasn't empty when the executor
+      // was added to the queue, but someone processed events from mEventQueue
+      // before the executor, this is why mEventQueue is empty here
+      if (!event) {
+        aName.AssignLiteral("no runnables left in the ThrottledEventQueue");
+        return NS_OK;
+      }
     }
 
     if (nsCOMPtr<nsINamed> named = do_QueryInterface(event)) {
@@ -272,6 +275,11 @@ class ThrottledEventQueue::Inner final : public nsISupports {
     return mEventQueue.Count(lock);
   }
 
+  already_AddRefed<nsIRunnable> GetEvent() {
+    MutexAutoLock lock(mMutex);
+    return mEventQueue.GetEvent(nullptr, lock);
+  }
+
   void AwaitIdle() const {
     // Any thread, except the main thread or our base target.  Blocking the
     // main thread is forbidden.  Blocking the base target is guaranteed to
@@ -379,6 +387,11 @@ bool ThrottledEventQueue::IsEmpty() const { return mInner->IsEmpty(); }
 
 uint32_t ThrottledEventQueue::Length() const { return mInner->Length(); }
 
+// Get the next runnable from the queue
+already_AddRefed<nsIRunnable> ThrottledEventQueue::GetEvent() {
+  return mInner->GetEvent();
+}
+
 void ThrottledEventQueue::AwaitIdle() const { return mInner->AwaitIdle(); }
 
 nsresult ThrottledEventQueue::SetIsPaused(bool aIsPaused) {
diff --git a/xpcom/threads/ThrottledEventQueue.h b/xpcom/threads/ThrottledEventQueue.h
index b15c9593a9c7..9a70c100a46c 100644
--- a/xpcom/threads/ThrottledEventQueue.h
+++ b/xpcom/threads/ThrottledEventQueue.h
@@ -78,6 +78,8 @@ class ThrottledEventQueue final : public nsISerialEventTarget {
   // Determine how many events are pending in the queue.
   uint32_t Length() const;
 
+  already_AddRefed<nsIRunnable> GetEvent();
+
   // Block the current thread until the queue is empty. This may not be called
   // on the main thread or the base target. The ThrottledEventQueue must not be
   // paused.
diff --git a/xpcom/threads/nsIRunnable.idl b/xpcom/threads/nsIRunnable.idl
index 69695796b68a..10252224003f 100644
--- a/xpcom/threads/nsIRunnable.idl
+++ b/xpcom/threads/nsIRunnable.idl
@@ -25,5 +25,7 @@ interface nsIRunnablePriority : nsISupports
     const unsigned short PRIORITY_INPUT = 1;
     const unsigned short PRIORITY_HIGH = 2;
     const unsigned short PRIORITY_MEDIUMHIGH = 3;
+    const unsigned short PRIORITY_IDLE = 4;
+    const unsigned short PRIORITY_DEFERRED_TIMERS = 5;
     readonly attribute unsigned long priority;
 };

From 835d6eb7d5a91e9cd20cb2436e30727b7851b1bc Mon Sep 17 00:00:00 2001
From: Sean Feng <sefeng@mozilla.com>
Date: Thu, 16 May 2019 19:35:35 +0000
Subject: [PATCH 083/129] Bug 1534012 - Update postMessage usage in WPT for
 promise rejection r=smaug

PostMessage Event uses "PostMessage task source" which is different
than "DOM manipulation task queue"; Update the code to use detail
object instead.

Depends on D27386

Differential Revision: https://phabricator.services.mozilla.com/D30673

--HG--
extra : moz-landing-system : lando
---
 .../support/promise-rejection-events.js       | 99 +++++++++----------
 1 file changed, 48 insertions(+), 51 deletions(-)

diff --git a/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/support/promise-rejection-events.js b/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/support/promise-rejection-events.js
index e9ba3a22a2f9..f371bc1da900 100644
--- a/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/support/promise-rejection-events.js
+++ b/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/support/promise-rejection-events.js
@@ -38,7 +38,7 @@ async_test(function(t) {
   onUnhandledSucceed(t, e, function() { return p; });
 
   p = new Promise(function(_, reject) {
-    postMessageTask(function() {
+    queueTask(function() {
       reject(e);
     });
   });
@@ -279,7 +279,7 @@ async_test(function(t) {
 
   onUnhandledFail(t, function() { return p; });
 
-  postMessageTask(function() {
+  queueTask(function() {
     p = Promise.resolve().then(function() {
       return Promise.reject(e);
     })
@@ -381,7 +381,7 @@ async_test(function(t) {
 
   onUnhandledFail(t, function() { return p; });
 
-  postMessageTask(function() {
+  queueTask(function() {
     p = Promise.reject(e);
     mutationObserverMicrotask(function() {
       Promise.resolve().then(function() {
@@ -394,7 +394,7 @@ async_test(function(t) {
     });
   });
 }, 'microtask nesting: attaching a handler inside a combination of mutationObserverMicrotask + promise microtasks, ' +
-   'all inside a postMessageTask');
+   'all inside a queueTask');
 
 async_test(function(t) {
   var e = new Error();
@@ -441,7 +441,7 @@ async_test(function(t) {
 
   onUnhandledFail(t, function() { return p; });
 
-  postMessageTask(function() {
+  queueTask(function() {
     p = Promise.reject(e);
     Promise.resolve().then(function() {
       mutationObserverMicrotask(function() {
@@ -454,7 +454,7 @@ async_test(function(t) {
     });
   });
 }, 'microtask nesting: attaching a handler inside a combination of promise microtasks + mutationObserverMicrotask, ' +
-   'all inside a postMessageTask');
+   'all inside a queueTask');
 
 async_test(function(t) {
   var e = new Error();
@@ -478,7 +478,7 @@ async_test(function(t) {
    'all inside a setTimeout');
 
 
-// For workers, postMessageTask() involves posting tasks to other threads, so
+// For workers, queueTask() involves posting tasks to other threads, so
 // the following tests don't work there.
 
 if ('document' in self) {
@@ -497,7 +497,7 @@ if ('document' in self) {
       _reject = reject;
     });
     _reject(e);
-    postMessageTask(function() {
+    queueTask(function() {
       var unreached = t.unreached_func('promise should not be fulfilled');
       p.then(unreached, function() {});
     });
@@ -510,12 +510,12 @@ if ('document' in self) {
     onUnhandledFail(t, function() { return p; });
 
     p = Promise.reject(e);
-    postMessageTask(function() {
+    queueTask(function() {
       Promise.resolve().then(function() {
         p.catch(function() {});
       });
     });
-  }, 'delayed handling: postMessageTask after promise creation/rejection, plus promise microtasks, is not too late to ' +
+  }, 'delayed handling: queueTask after promise creation/rejection, plus promise microtasks, is not too late to ' +
      'attach a rejection handler');
 
   async_test(function(t) {
@@ -524,7 +524,7 @@ if ('document' in self) {
 
     onUnhandledFail(t, function() { return p; });
 
-    postMessageTask(function() {
+    queueTask(function() {
       Promise.resolve().then(function() {
         Promise.resolve().then(function() {
           Promise.resolve().then(function() {
@@ -536,7 +536,7 @@ if ('document' in self) {
       });
     });
     p = Promise.reject(e);
-  }, 'delayed handling: postMessageTask before promise creation/rejection, plus many promise microtasks, is not too ' +
+  }, 'delayed handling: queueTask before promise creation/rejection, plus many promise microtasks, is not too ' +
      'late to attach a rejection handler');
 
   async_test(function(t) {
@@ -546,7 +546,7 @@ if ('document' in self) {
     onUnhandledFail(t, function() { return p; });
 
     p = Promise.reject(e);
-    postMessageTask(function() {
+    queueTask(function() {
       Promise.resolve().then(function() {
         Promise.resolve().then(function() {
           Promise.resolve().then(function() {
@@ -557,7 +557,7 @@ if ('document' in self) {
         });
       });
     });
-  }, 'delayed handling: postMessageTask after promise creation/rejection, plus many promise microtasks, is not too ' +
+  }, 'delayed handling: queueTask after promise creation/rejection, plus many promise microtasks, is not too ' +
      'late to attach a rejection handler');
 }
 
@@ -576,8 +576,8 @@ async_test(function(t) {
     _reject = reject;
   });
   _reject(e);
-  postMessageTask(function() {
-    postMessageTask(function() {
+  queueTask(function() {
+    queueTask(function() {
       var unreached = t.unreached_func('promise should not be fulfilled');
       p.then(unreached, function() {});
     });
@@ -591,14 +591,14 @@ async_test(function(t) {
   onUnhandledSucceed(t, e, function() { return p; });
 
   p = Promise.reject(e);
-  postMessageTask(function() {
-    postMessageTask(function() {
+  queueTask(function() {
+    queueTask(function() {
       Promise.resolve().then(function() {
         p.catch(function() {});
       });
     });
   });
-}, 'delayed handling: a nested-postMessageTask after promise creation/rejection, plus promise microtasks, is too ' +
+}, 'delayed handling: a nested-queueTask after promise creation/rejection, plus promise microtasks, is too ' +
    'late to attach a rejection handler');
 
 async_test(function(t) {
@@ -607,8 +607,8 @@ async_test(function(t) {
 
   onUnhandledSucceed(t, e, function() { return p; });
 
-  postMessageTask(function() {
-    postMessageTask(function() {
+  queueTask(function() {
+    queueTask(function() {
       Promise.resolve().then(function() {
         Promise.resolve().then(function() {
           Promise.resolve().then(function() {
@@ -621,7 +621,7 @@ async_test(function(t) {
     });
   });
   p = Promise.reject(e);
-}, 'delayed handling: a nested-postMessageTask before promise creation/rejection, plus many promise microtasks, is ' +
+}, 'delayed handling: a nested-queueTask before promise creation/rejection, plus many promise microtasks, is ' +
    'too late to attach a rejection handler');
 
 async_test(function(t) {
@@ -631,8 +631,8 @@ async_test(function(t) {
   onUnhandledSucceed(t, e, function() { return p; });
 
   p = Promise.reject(e);
-  postMessageTask(function() {
-    postMessageTask(function() {
+  queueTask(function() {
+    queueTask(function() {
       Promise.resolve().then(function() {
         Promise.resolve().then(function() {
           Promise.resolve().then(function() {
@@ -644,7 +644,7 @@ async_test(function(t) {
       });
     });
   });
-}, 'delayed handling: a nested-postMessageTask after promise creation/rejection, plus many promise microtasks, is ' +
+}, 'delayed handling: a nested-queueTask after promise creation/rejection, plus many promise microtasks, is ' +
    'too late to attach a rejection handler');
 
 async_test(function(t) {
@@ -746,9 +746,9 @@ async_test(function(t) {
   addEventListener('unhandledrejection', l);
   ensureCleanup(t, l);
   Promise.reject(e);
-}, 'mutationObserverMicrotask vs. postMessageTask ordering is not disturbed inside unhandledrejection events');
+}, 'mutationObserverMicrotask vs. queueTask ordering is not disturbed inside unhandledrejection events');
 
-// For workers, postMessageTask() involves posting tasks to other threads, so
+// For workers, queueTask() involves posting tasks to other threads, so
 // the following tests don't work there.
 
 if ('document' in self) {
@@ -764,10 +764,10 @@ if ('document' in self) {
 
     var p1 = Promise.reject();
     var p2;
-    postMessageTask(function() {
+    queueTask(function() {
       p2 = Promise.reject();
-      postMessageTask(function() {
-        sequenceOfEvents.push('postMessageTask');
+      queueTask(function() {
+        sequenceOfEvents.push('queueTask');
         checkSequence();
       });
     });
@@ -782,12 +782,12 @@ if ('document' in self) {
     function checkSequence() {
       if (sequenceOfEvents.length === 3) {
         t.step(function() {
-          assert_array_equals(sequenceOfEvents, [p1, 'postMessageTask', p2]);
+          assert_array_equals(sequenceOfEvents, [p1, 'queueTask', p2]);
         });
         t.done();
       }
     }
-  }, 'postMessageTask ordering vs. the task queued for unhandled rejection notification (1)');
+  }, 'queueTask ordering vs. the task queued for unhandled rejection notification (1)');
 
   async_test(function(t) {
     var sequenceOfEvents = [];
@@ -796,10 +796,10 @@ if ('document' in self) {
     ensureCleanup(t, l);
 
     var p2;
-    postMessageTask(function() {
+    queueTask(function() {
       p2 = Promise.reject();
-      postMessageTask(function() {
-        sequenceOfEvents.push('postMessageTask');
+      queueTask(function() {
+        sequenceOfEvents.push('queueTask');
         checkSequence();
       });
     });
@@ -814,12 +814,12 @@ if ('document' in self) {
     function checkSequence() {
       if (sequenceOfEvents.length === 2) {
         t.step(function() {
-          assert_array_equals(sequenceOfEvents, ['postMessageTask', p2]);
+          assert_array_equals(sequenceOfEvents, ['queueTask', p2]);
         });
         t.done();
       }
     }
-  }, 'postMessageTask ordering vs. the task queued for unhandled rejection notification (2)');
+  }, 'queueTask ordering vs. the task queued for unhandled rejection notification (2)');
 
   async_test(function(t) {
     var sequenceOfEvents = [];
@@ -832,7 +832,7 @@ if ('document' in self) {
     var p = Promise.reject();
 
     setTimeout(function() {
-      postMessageTask(function() {
+      queueTask(function() {
         sequenceOfEvents.push('task before catch');
         checkSequence();
       });
@@ -842,7 +842,7 @@ if ('document' in self) {
         checkSequence();
       });
 
-      postMessageTask(function() {
+      queueTask(function() {
         sequenceOfEvents.push('task after catch');
         checkSequence();
       });
@@ -881,21 +881,18 @@ if ('document' in self) {
 // HELPERS
 //
 
-var globalPostMessageCounter = 0;
-
-function postMessageTask(f) {
+// This function queues a task in "DOM manipulation task source" in window
+// context, but not in workers.
+function queueTask(f) {
   if ('document' in self) {
-    var message = 'abusingpostmessageforfunandprofit' + globalPostMessageCounter;
-    globalPostMessageCounter++;
-    var l = function(ev) {
-      if (ev.data === message) {
-        removeEventListener('message', l);
-        f();
-      }
+    var d = document.createElement("details");
+    d.ontoggle = function() {
+      f();
     };
-    addEventListener('message', l);
-    postMessage(message, '*');
+    d.setAttribute("open", "");
   } else {
+    // We need to fix this to use something that can queue tasks in
+    // "DOM manipulation task source" to ensure the order is correct
     var channel = new MessageChannel();
     channel.port1.onmessage = function() { channel.port1.close(); f(); };
     channel.port2.postMessage('abusingpostmessageforfunandprofit');

From 6265e0a0656b3c3165579f9405c21d432dfe5b03 Mon Sep 17 00:00:00 2001
From: David Burns <dburns@mozilla.com>
Date: Mon, 20 May 2019 21:20:50 +0000
Subject: [PATCH 084/129] Bug 1542244: Disable Privacy and tracking protection
 features during testing. r=webdriver-reviewers,ato,whimboo

When privacy and tracking protection is enabled there is a call home that
can break tests. This uses the relavant prefs to disable the features.

Differential Revision: https://phabricator.services.mozilla.com/D29644

--HG--
extra : moz-landing-system : lando
---
 .../marionette/client/marionette_driver/geckoinstance.py    | 6 ++++++
 testing/marionette/prefs/marionette.js                      | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/testing/marionette/client/marionette_driver/geckoinstance.py b/testing/marionette/client/marionette_driver/geckoinstance.py
index 208066a4edfb..f716914ec08d 100644
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -59,6 +59,9 @@ class GeckoInstance(object):
         "dom.max_chrome_script_run_time": 0,
         "dom.max_script_run_time": 0,
 
+        # DOM Push 
+        "dom.push.connection.enabled": False,
+
         # Only load extensions from the application and user profile
         # AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION
         "extensions.autoDisableScopes": 0,
@@ -116,6 +119,9 @@ class GeckoInstance(object):
         # Make sure SNTP requests don't hit the network
         "network.sntp.pools": "%(server)s",
 
+        # Privacy and Tracking Protection
+        "privacy.trackingprotection.enabled": False,
+
         # Don't do network connections for mitm priming
         "security.certerrors.mitm.priming.enabled": False,
 
diff --git a/testing/marionette/prefs/marionette.js b/testing/marionette/prefs/marionette.js
index b423fa9dcfab..506f94bc846a 100644
--- a/testing/marionette/prefs/marionette.js
+++ b/testing/marionette/prefs/marionette.js
@@ -36,3 +36,9 @@ pref("marionette.prefs.recommended", true);
 // Deprecated and scheduled for removal
 // with https://bugzil.la/marionette-window-tracking
 pref("marionette.contentListener", false);
+
+// Turn off DOM Push
+pref("dom.push.connection.enabled", false);
+
+// Privacy and tracking protection
+pref("privacy.trackingprotection.enabled", false);

From 0ad8df273dea0834e83bf78778575c6c40c530e6 Mon Sep 17 00:00:00 2001
From: Dorel Luca <dluca@mozilla.com>
Date: Tue, 21 May 2019 00:32:14 +0300
Subject: [PATCH 085/129] Backed out 2 changesets (bug 1552229, bug 1547467)
 for causing build bustages. CLOSED TREE

Backed out changeset a8f5dec91d72 (bug 1552229)
Backed out changeset 6004e7f60bb6 (bug 1547467)

--HG--
extra : amend_source : 45537a3eef627d29fa248d1dcd164576bae1d85f
---
 js/src/builtin/ReflectParse.cpp            |   3 -
 js/src/frontend/BytecodeEmitter.cpp        | 200 ++++++++++-----------
 js/src/frontend/BytecodeEmitter.h          |   4 +-
 js/src/frontend/FullParseHandler.h         |  39 ++--
 js/src/frontend/FunctionEmitter.cpp        |  10 +-
 js/src/frontend/ParseNode.h                |  13 +-
 js/src/frontend/Parser.cpp                 | 129 ++++++-------
 js/src/frontend/SyntaxParseHandler.h       |  11 +-
 js/src/jit-test/tests/fields/bug1547467.js |  19 --
 js/src/jit-test/tests/fields/bug1552229.js |  17 --
 js/src/jit-test/tests/fields/super.js      |  35 +---
 js/src/vm/CommonPropertyNames.h            |   1 +
 12 files changed, 206 insertions(+), 275 deletions(-)
 delete mode 100644 js/src/jit-test/tests/fields/bug1547467.js
 delete mode 100644 js/src/jit-test/tests/fields/bug1552229.js

diff --git a/js/src/builtin/ReflectParse.cpp b/js/src/builtin/ReflectParse.cpp
index d462c4e9ecc9..6ba38a13d3ca 100644
--- a/js/src/builtin/ReflectParse.cpp
+++ b/js/src/builtin/ReflectParse.cpp
@@ -2469,9 +2469,6 @@ bool ASTSerializer::statement(ParseNode* pn, MutableHandleValue dst) {
       }
 
       for (ParseNode* item : memberList->contents()) {
-        if (item->is<LexicalScopeNode>()) {
-          item = item->as<LexicalScopeNode>().scopeBody();
-        }
         if (item->is<ClassField>()) {
           ClassField* field = &item->as<ClassField>();
           MOZ_ASSERT(memberList->pn_pos.encloses(field->pn_pos));
diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index d5a87617e8ac..61b13fdff5d4 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -2342,7 +2342,7 @@ bool BytecodeEmitter::emitSetThis(BinaryNode* setThisNode) {
     return false;
   }
 
-  if (!emitInitializeInstanceFields()) {
+  if (!emitInitializeInstanceFields(IsSuperCall::Yes)) {
     return false;
   }
 
@@ -7636,51 +7636,11 @@ bool BytecodeEmitter::emitPropertyList(ListNode* obj, PropertyEmitter& pe,
                                        PropListType type) {
   //                [stack] CTOR? OBJ
 
-  size_t curFieldKeyIndex = 0;
   for (ParseNode* propdef : obj->contents()) {
     if (propdef->is<ClassField>()) {
-      MOZ_ASSERT(type == ClassBody);
-      // Only handle computing field keys here: the .initializers lambda array
-      // is created elsewhere.
-      ClassField* field = &propdef->as<ClassField>();
-      if (field->name().getKind() == ParseNodeKind::ComputedName) {
-        if (!emitGetName(cx->names().dotFieldKeys)) {
-          //        [stack] CTOR? OBJ ARRAY
-          return false;
-        }
-
-        ParseNode* nameExpr = field->name().as<UnaryNode>().kid();
-
-        if (!emitTree(nameExpr)) {
-          //        [stack] CTOR? OBJ ARRAY KEY
-          return false;
-        }
-
-        if (!emit1(JSOP_TOID)) {
-          //        [stack] CTOR? OBJ ARRAY KEY
-          return false;
-        }
-
-        if (!emitUint32Operand(JSOP_INITELEM_ARRAY, curFieldKeyIndex)) {
-          //        [stack] CTOR? OBJ ARRAY
-          return false;
-        }
-
-        if (!emit1(JSOP_POP)) {
-          //        [stack] CTOR? OBJ
-          return false;
-        }
-
-        curFieldKeyIndex++;
-      }
-      continue;
-    }
-
-    if (propdef->is<LexicalScopeNode>()) {
-      // Constructors are sometimes wrapped in LexicalScopeNodes. As we already
-      // handled emitting the constructor, skip it.
-      MOZ_ASSERT(propdef->as<LexicalScopeNode>().scopeBody()->isKind(
-          ParseNodeKind::ClassMethod));
+      // Skip over class fields and emit them at the end.  This is needed
+      // because they're all emitted into a single array, which is then stored
+      // into a local variable.
       continue;
     }
 
@@ -7937,6 +7897,15 @@ bool BytecodeEmitter::emitPropertyList(ListNode* obj, PropertyEmitter& pe,
     }
   }
 
+  if (obj->getKind() == ParseNodeKind::ClassMemberList) {
+    if (!emitCreateFieldKeys(obj)) {
+      return false;
+    }
+    if (!emitCreateFieldInitializers(obj)) {
+      return false;
+    }
+  }
+
   return true;
 }
 
@@ -7975,8 +7944,7 @@ FieldInitializers BytecodeEmitter::setupFieldInitializers(
 //   }
 // }
 //
-// BytecodeEmitter::emitCreateFieldKeys does `let .fieldKeys = [...];`
-// BytecodeEmitter::emitPropertyList fills in the elements of the array.
+// BytecodeEmitter::emitCreateFieldKeys does `let .fieldKeys = [keyExpr, ...];`
 // See GeneralParser::fieldInitializer for the `this[.fieldKeys[0]]` part.
 bool BytecodeEmitter::emitCreateFieldKeys(ListNode* obj) {
   size_t numFieldKeys = 0;
@@ -8004,6 +7972,34 @@ bool BytecodeEmitter::emitCreateFieldKeys(ListNode* obj) {
     return false;
   }
 
+  size_t curFieldKeyIndex = 0;
+  for (ParseNode* propdef : obj->contents()) {
+    if (propdef->is<ClassField>()) {
+      ClassField* field = &propdef->as<ClassField>();
+      if (field->name().getKind() == ParseNodeKind::ComputedName) {
+        ParseNode* nameExpr = field->name().as<UnaryNode>().kid();
+
+        if (!emitTree(nameExpr)) {
+          //        [stack] ARRAY KEY
+          return false;
+        }
+
+        if (!emit1(JSOP_TOID)) {
+          //        [stack] ARRAY KEY
+          return false;
+        }
+
+        if (!emitUint32Operand(JSOP_INITELEM_ARRAY, curFieldKeyIndex)) {
+          //        [stack] ARRAY
+          return false;
+        }
+
+        curFieldKeyIndex++;
+      }
+    }
+  }
+  MOZ_ASSERT(curFieldKeyIndex == numFieldKeys);
+
   if (!noe.emitAssignment()) {
     //              [stack] ARRAY
     return false;
@@ -8107,7 +8103,38 @@ const FieldInitializers& BytecodeEmitter::findFieldInitializersForCall() {
   MOZ_CRASH("Constructor for field initializers not found.");
 }
 
-bool BytecodeEmitter::emitInitializeInstanceFields() {
+bool BytecodeEmitter::emitCopyInitializersToLocalInitializers() {
+  MOZ_ASSERT(sc->asFunctionBox()->isDerivedClassConstructor());
+  if (getFieldInitializers().numFieldInitializers == 0) {
+    return true;
+  }
+
+  NameOpEmitter noe(this, cx->names().dotLocalInitializers,
+                    NameOpEmitter::Kind::Initialize);
+  if (!noe.prepareForRhs()) {
+    //              [stack]
+    return false;
+  }
+
+  if (!emitGetName(cx->names().dotInitializers)) {
+    //              [stack] .initializers
+    return false;
+  }
+
+  if (!noe.emitAssignment()) {
+    //              [stack] .initializers
+    return false;
+  }
+
+  if (!emit1(JSOP_POP)) {
+    //              [stack]
+    return false;
+  }
+
+  return true;
+}
+
+bool BytecodeEmitter::emitInitializeInstanceFields(IsSuperCall isSuperCall) {
   const FieldInitializers& fieldInitializers = findFieldInitializersForCall();
   size_t numFields = fieldInitializers.numFieldInitializers;
 
@@ -8115,9 +8142,16 @@ bool BytecodeEmitter::emitInitializeInstanceFields() {
     return true;
   }
 
-  if (!emitGetName(cx->names().dotInitializers)) {
-    //              [stack] ARRAY
-    return false;
+  if (isSuperCall == IsSuperCall::Yes) {
+    if (!emitGetName(cx->names().dotLocalInitializers)) {
+      //            [stack] ARRAY
+      return false;
+    }
+  } else {
+    if (!emitGetName(cx->names().dotInitializers)) {
+      //            [stack] ARRAY
+      return false;
+    }
   }
 
   for (size_t fieldIndex = 0; fieldIndex < numFields; fieldIndex++) {
@@ -8637,24 +8671,21 @@ bool BytecodeEmitter::emitLexicalInitialization(JSAtom* name) {
   return true;
 }
 
-static MOZ_ALWAYS_INLINE ParseNode* FindConstructor(JSContext* cx,
-                                                    ListNode* classMethods) {
-  for (ParseNode* classElement : classMethods->contents()) {
-    ParseNode* unwrappedElement = classElement;
-    if (unwrappedElement->is<LexicalScopeNode>()) {
-      unwrappedElement = unwrappedElement->as<LexicalScopeNode>().scopeBody();
-    }
-    if (unwrappedElement->is<ClassMethod>()) {
-      ClassMethod& method = unwrappedElement->as<ClassMethod>();
+static MOZ_ALWAYS_INLINE FunctionNode* FindConstructor(JSContext* cx,
+                                                       ListNode* classMethods) {
+  for (ParseNode* mn : classMethods->contents()) {
+    if (mn->is<ClassMethod>()) {
+      ClassMethod& method = mn->as<ClassMethod>();
       ParseNode& methodName = method.name();
       if (!method.isStatic() &&
           (methodName.isKind(ParseNodeKind::ObjectPropertyName) ||
            methodName.isKind(ParseNodeKind::StringExpr)) &&
           methodName.as<NameNode>().atom() == cx->names().constructor) {
-        return classElement;
+        return &method.method();
       }
     }
   }
+
   return nullptr;
 }
 
@@ -8669,7 +8700,7 @@ bool BytecodeEmitter::emitClass(
 
   ParseNode* heritageExpression = classNode->heritage();
   ListNode* classMembers = classNode->memberList();
-  ParseNode* constructor = FindConstructor(cx, classMembers);
+  FunctionNode* constructor = FindConstructor(cx, classMembers);
 
   // If |nameKind != ClassNameKind::ComputedName|
   //                [stack]
@@ -8691,8 +8722,8 @@ bool BytecodeEmitter::emitClass(
     }
   }
 
-  if (LexicalScopeNode* scopeBindings = classNode->scopeBindings()) {
-    if (!ce.emitScope(scopeBindings->scopeBindings())) {
+  if (!classNode->isEmptyScope()) {
+    if (!ce.emitScope(classNode->scopeBindings())) {
       //            [stack]
       return false;
     }
@@ -8730,47 +8761,18 @@ bool BytecodeEmitter::emitClass(
   // Stack currently has HOMEOBJ followed by optional HERITAGE. When HERITAGE
   // is not used, an implicit value of %FunctionPrototype% is implied.
   if (constructor) {
-    FunctionNode* ctor;
-    // .fieldKeys must be declared outside the scope .initializers is declared
-    // in, hence this extra scope.
-    Maybe<LexicalScopeEmitter> lse;
-    if (constructor->is<LexicalScopeNode>()) {
-      lse.emplace(this);
-      if (!lse->emitScope(
-              ScopeKind::Lexical,
-              constructor->as<LexicalScopeNode>().scopeBindings())) {
-        return false;
-      }
-
-      // Any class with field initializers will have a constructor
-      if (!emitCreateFieldInitializers(classMembers)) {
-        return false;
-      }
-      ctor = &constructor->as<LexicalScopeNode>()
-                  .scopeBody()
-                  ->as<ClassMethod>()
-                  .method();
-    } else {
-      ctor = &constructor->as<ClassMethod>().method();
-    }
-
-    bool needsHomeObject = ctor->funbox()->needsHomeObject();
+    bool needsHomeObject = constructor->funbox()->needsHomeObject();
     // HERITAGE is consumed inside emitFunction.
-    if (!emitFunction(ctor, isDerived, classMembers)) {
+    if (!emitFunction(constructor, isDerived, classMembers)) {
       //            [stack] HOMEOBJ CTOR
       return false;
     }
     if (nameKind == ClassNameKind::InferredName) {
-      if (!setFunName(ctor->funbox()->function(), nameForAnonymousClass)) {
+      if (!setFunName(constructor->funbox()->function(),
+                      nameForAnonymousClass)) {
         return false;
       }
     }
-    if (lse.isSome()) {
-      if (!lse->emitEnd()) {
-        return false;
-      }
-      lse.reset();
-    }
     if (!ce.emitInitConstructor(needsHomeObject)) {
       //            [stack] CTOR HOMEOBJ
       return false;
@@ -8782,16 +8784,10 @@ bool BytecodeEmitter::emitClass(
       return false;
     }
   }
-
-  if (!emitCreateFieldKeys(classMembers)) {
-    return false;
-  }
-
   if (!emitPropertyList(classMembers, ce, ClassBody)) {
     //              [stack] CTOR HOMEOBJ
     return false;
   }
-
   if (!ce.emitEnd(kind)) {
     //              [stack] # class declaration
     //              [stack]
diff --git a/js/src/frontend/BytecodeEmitter.h b/js/src/frontend/BytecodeEmitter.h
index 3a76e901e1ec..84f53b27c06d 100644
--- a/js/src/frontend/BytecodeEmitter.h
+++ b/js/src/frontend/BytecodeEmitter.h
@@ -480,7 +480,9 @@ struct MOZ_STACK_CLASS BytecodeEmitter {
   MOZ_MUST_USE bool emitCreateFieldKeys(ListNode* obj);
   MOZ_MUST_USE bool emitCreateFieldInitializers(ListNode* obj);
   const FieldInitializers& findFieldInitializersForCall();
-  MOZ_MUST_USE bool emitInitializeInstanceFields();
+  MOZ_MUST_USE bool emitCopyInitializersToLocalInitializers();
+  enum class IsSuperCall : bool { No, Yes };
+  MOZ_MUST_USE bool emitInitializeInstanceFields(IsSuperCall isSuperCall);
 
   // To catch accidental misuse, emitUint16Operand/emit3 assert that they are
   // not used to unconditionally emit JSOP_GETLOCAL. Variable access should
diff --git a/js/src/frontend/FullParseHandler.h b/js/src/frontend/FullParseHandler.h
index 949ba08a49dd..75e5af8eecc3 100644
--- a/js/src/frontend/FullParseHandler.h
+++ b/js/src/frontend/FullParseHandler.h
@@ -440,35 +440,34 @@ class FullParseHandler {
     return true;
   }
 
-  MOZ_MUST_USE ClassMethod* newClassMethodDefinition(Node key,
-                                                     FunctionNodeType funNode,
-                                                     AccessorType atype,
-                                                     bool isStatic) {
+  MOZ_MUST_USE bool addClassMethodDefinition(ListNodeType memberList, Node key,
+                                             FunctionNodeType funNode,
+                                             AccessorType atype,
+                                             bool isStatic) {
+    MOZ_ASSERT(memberList->isKind(ParseNodeKind::ClassMemberList));
     MOZ_ASSERT(isUsableAsObjectPropertyName(key));
 
     checkAndSetIsDirectRHSAnonFunction(funNode);
 
-    return new_<ClassMethod>(key, funNode, atype, isStatic);
+    ClassMethod* classMethod = new_<ClassMethod>(key, funNode, atype, isStatic);
+    if (!classMethod) {
+      return false;
+    }
+    addList(/* list = */ memberList, /* kid = */ classMethod);
+    return true;
   }
 
-  MOZ_MUST_USE ClassField* newClassFieldDefinition(
-      Node name, FunctionNodeType initializer) {
+  MOZ_MUST_USE bool addClassFieldDefinition(ListNodeType memberList, Node name,
+                                            FunctionNodeType initializer) {
+    MOZ_ASSERT(memberList->isKind(ParseNodeKind::ClassMemberList));
     MOZ_ASSERT(isUsableAsObjectPropertyName(name));
 
-    return new_<ClassField>(name, initializer);
-  }
+    ClassField* classField = new_<ClassField>(name, initializer);
 
-  MOZ_MUST_USE bool addClassMemberDefinition(ListNodeType memberList,
-                                             Node member) {
-    MOZ_ASSERT(memberList->isKind(ParseNodeKind::ClassMemberList));
-    // Constructors can be surrounded by LexicalScopes.
-    MOZ_ASSERT(member->isKind(ParseNodeKind::ClassMethod) ||
-               member->isKind(ParseNodeKind::ClassField) ||
-               member->isKind(ParseNodeKind::LexicalScope) &&
-                   member->as<LexicalScopeNode>().scopeBody()->isKind(
-                       ParseNodeKind::ClassMethod));
-
-    addList(/* list = */ memberList, /* kid = */ member);
+    if (!classField) {
+      return false;
+    }
+    addList(/* list = */ memberList, /* kid = */ classField);
     return true;
   }
 
diff --git a/js/src/frontend/FunctionEmitter.cpp b/js/src/frontend/FunctionEmitter.cpp
index ac85f56e17c0..92a0f862ef24 100644
--- a/js/src/frontend/FunctionEmitter.cpp
+++ b/js/src/frontend/FunctionEmitter.cpp
@@ -477,8 +477,14 @@ bool FunctionScriptEmitter::prepareForBody() {
 
   if (funbox_->function()->kind() ==
       JSFunction::FunctionKind::ClassConstructor) {
-    if (!funbox_->isDerivedClassConstructor()) {
-      if (!bce_->emitInitializeInstanceFields()) {
+    if (funbox_->isDerivedClassConstructor()) {
+      if (!bce_->emitCopyInitializersToLocalInitializers()) {
+        //          [stack]
+        return false;
+      }
+    } else {
+      if (!bce_->emitInitializeInstanceFields(
+              BytecodeEmitter::IsSuperCall::No)) {
         //          [stack]
         return false;
       }
diff --git a/js/src/frontend/ParseNode.h b/js/src/frontend/ParseNode.h
index 9dd7feafd96c..403933af5273 100644
--- a/js/src/frontend/ParseNode.h
+++ b/js/src/frontend/ParseNode.h
@@ -2081,19 +2081,20 @@ class ClassNode : public TernaryNode {
   ClassNames* names() const {
     return kid1() ? &kid1()->as<ClassNames>() : nullptr;
   }
-
   ParseNode* heritage() const { return kid2(); }
-
   ListNode* memberList() const {
     ListNode* list =
         &kid3()->as<LexicalScopeNode>().scopeBody()->as<ListNode>();
     MOZ_ASSERT(list->isKind(ParseNodeKind::ClassMemberList));
     return list;
   }
-
-  LexicalScopeNode* scopeBindings() const {
-    LexicalScopeNode* scope = &kid3()->as<LexicalScopeNode>();
-    return scope->isEmptyScope() ? nullptr : scope;
+  bool isEmptyScope() const {
+    ParseNode* scope = kid3();
+    return scope->as<LexicalScopeNode>().isEmptyScope();
+  }
+  Handle<LexicalScope::Data*> scopeBindings() const {
+    ParseNode* scope = kid3();
+    return scope->as<LexicalScopeNode>().scopeBindings();
   }
 };
 
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index b71b2a79df56..e83b79176240 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -1939,6 +1939,13 @@ GeneralParser<ParseHandler, Unit>::functionBody(InHandling inHandling,
     }
   }
 
+  if (kind == FunctionSyntaxKind::DerivedClassConstructor) {
+    if (!noteDeclaredName(cx_->names().dotLocalInitializers,
+                          DeclarationKind::Var, pos())) {
+      return null();
+    }
+  }
+
   return finishLexicalScope(pc_->varScope(), body);
 }
 
@@ -2923,13 +2930,6 @@ bool GeneralParser<ParseHandler, Unit>::functionFormalParametersAndBody(
   FunctionBox* funbox = pc_->functionBox();
   RootedFunction fun(cx_, funbox->function());
 
-  if (kind == FunctionSyntaxKind::ClassConstructor ||
-      kind == FunctionSyntaxKind::DerivedClassConstructor) {
-    if (!noteUsedName(cx_->names().dotInitializers)) {
-      return null();
-    }
-  }
-
   // See below for an explanation why arrow function parameters and arrow
   // function bodies are parsed with different yield/await settings.
   {
@@ -6823,13 +6823,8 @@ bool GeneralParser<ParseHandler, Unit>::classMember(
       return false;
     }
 
-    ClassFieldType field =
-        handler_.newClassFieldDefinition(propName, initializer);
-    if (!field) {
-      return false;
-    }
-
-    return handler_.addClassMemberDefinition(classMembers, field);
+    return handler_.addClassFieldDefinition(classMembers, propName,
+                                            initializer);
   }
 
   if (propType != PropertyType::Getter && propType != PropertyType::Setter &&
@@ -6880,21 +6875,6 @@ bool GeneralParser<ParseHandler, Unit>::classMember(
       }
   }
 
-  // .fieldKeys must be declared outside the scope .initializers is declared in,
-  // hence this extra scope.
-  Maybe<ParseContext::Scope> dotInitializersScope;
-  if (isConstructor && !options().selfHostingMode) {
-    dotInitializersScope.emplace(this);
-    if (!dotInitializersScope->init(pc_)) {
-      return null();
-    }
-
-    if (!noteDeclaredName(cx_->names().dotInitializers, DeclarationKind::Let,
-                          pos())) {
-      return null();
-    }
-  }
-
   // Calling toString on constructors need to return the source text for
   // the entire class. The end offset is unknown at this point in
   // parsing and will be amended when class parsing finishes below.
@@ -6905,22 +6885,8 @@ bool GeneralParser<ParseHandler, Unit>::classMember(
   }
 
   AccessorType atype = ToAccessorType(propType);
-
-  Node method =
-      handler_.newClassMethodDefinition(propName, funNode, atype, isStatic);
-  if (!method) {
-    return false;
-  }
-
-  if (dotInitializersScope.isSome()) {
-    method = finishLexicalScope(*dotInitializersScope, method);
-    if (!method) {
-      return null();
-    }
-    dotInitializersScope.reset();
-  }
-
-  return handler_.addClassMemberDefinition(classMembers, method);
+  return handler_.addClassMethodDefinition(classMembers, propName, funNode,
+                                           atype, isStatic);
 }
 
 template <class ParseHandler, typename Unit>
@@ -6932,19 +6898,6 @@ bool GeneralParser<ParseHandler, Unit>::finishClassConstructor(
   // JSOP_DERIVEDCONSTRUCTOR due to needing to emit calls to the field
   // initializers in the constructor. So, synthesize a new one.
   if (classStmt.constructorBox == nullptr && numFields > 0) {
-    MOZ_ASSERT(!options().selfHostingMode);
-    // Unconditionally create the scope here, because it's always the
-    // constructor.
-    ParseContext::Scope dotInitializersScope(this);
-    if (!dotInitializersScope.init(pc_)) {
-      return null();
-    }
-
-    if (!noteDeclaredName(cx_->names().dotInitializers, DeclarationKind::Let,
-                          pos())) {
-      return null();
-    }
-
     // synthesizeConstructor assigns to classStmt.constructorBox
     FunctionNodeType synthesizedCtor =
         synthesizeConstructor(className, classStartOffset, hasHeritage);
@@ -6961,15 +6914,10 @@ bool GeneralParser<ParseHandler, Unit>::finishClassConstructor(
     if (!constructorNameNode) {
       return false;
     }
-    ClassMethodType method = handler_.newClassMethodDefinition(
-        constructorNameNode, synthesizedCtor, AccessorType::None,
-        /* isStatic = */ false);
-    if (!method) {
-      return false;
-    }
-    LexicalScopeNodeType scope =
-        finishLexicalScope(dotInitializersScope, method);
-    if (!handler_.addClassMemberDefinition(classMembers, scope)) {
+
+    if (!handler_.addClassMethodDefinition(classMembers, constructorNameNode,
+                                           synthesizedCtor, AccessorType::None,
+                                           /* isStatic = */ false)) {
       return false;
     }
   }
@@ -7094,6 +7042,37 @@ GeneralParser<ParseHandler, Unit>::classDefinition(
       }
     }
 
+    if (numFields > 0) {
+      // .initializers is always closed over by the constructor when there are
+      // fields with initializers. However, there's some strange circumstances
+      // which prevents us from using the normal noteUsedName() system. We
+      // cannot call noteUsedName(".initializers") when parsing the constructor,
+      // because .initializers should be marked as used *only if* there are
+      // fields with initializers. Even if we haven't seen any fields yet,
+      // there may be fields after the constructor.
+      // Consider the following class:
+      //
+      //  class C {
+      //    constructor() {
+      //      // do we noteUsedName(".initializers") here?
+      //    }
+      //    // ... because there might be some fields down here.
+      //  }
+      //
+      // So, instead, at the end of class parsing (where we are now), we do some
+      // tricks to pretend that noteUsedName(".initializers") was called in the
+      // constructor.
+      if (!usedNames_.markAsAlwaysClosedOver(cx_, cx_->names().dotInitializers,
+                                             pc_->scriptId(),
+                                             pc_->innermostScope()->id())) {
+        return null();
+      }
+      if (!noteDeclaredName(cx_->names().dotInitializers, DeclarationKind::Let,
+                            namePos)) {
+        return null();
+      }
+    }
+
     if (numFieldKeys > 0) {
       if (!noteDeclaredName(cx_->names().dotFieldKeys, DeclarationKind::Let,
                             namePos)) {
@@ -7230,8 +7209,14 @@ GeneralParser<ParseHandler, Unit>::synthesizeConstructor(
     return null();
   }
 
-  if (!noteUsedName(cx_->names().dotInitializers)) {
-    return null();
+  // One might expect a noteUsedName(".initializers") here. See comment in
+  // GeneralParser<ParseHandler, Unit>::classDefinition on why it's not here.
+
+  if (hasHeritage == HasHeritage::Yes) {
+    if (!noteDeclaredName(cx_->names().dotLocalInitializers,
+                          DeclarationKind::Var, synthesizedBodyPos)) {
+      return null();
+    }
   }
 
   bool canSkipLazyClosedOverBindings = handler_.canSkipLazyClosedOverBindings();
@@ -7282,6 +7267,10 @@ GeneralParser<ParseHandler, Unit>::synthesizeConstructor(
       return null();
     }
 
+    if (!noteUsedName(cx_->names().dotLocalInitializers)) {
+      return null();
+    }
+
     UnaryNodeType exprStatement =
         handler_.newExprStatement(setThis, synthesizedBodyPos.end);
     if (!exprStatement) {
@@ -9039,7 +9028,7 @@ typename ParseHandler::Node GeneralParser<ParseHandler, Unit>::memberExpr(
           return null();
         }
 
-        if (!noteUsedName(cx_->names().dotInitializers)) {
+        if (!noteUsedName(cx_->names().dotLocalInitializers)) {
           return null();
         }
       } else {
diff --git a/js/src/frontend/SyntaxParseHandler.h b/js/src/frontend/SyntaxParseHandler.h
index 1491173dcd9c..9824d75431f3 100644
--- a/js/src/frontend/SyntaxParseHandler.h
+++ b/js/src/frontend/SyntaxParseHandler.h
@@ -348,17 +348,14 @@ class SyntaxParseHandler {
                                               AccessorType atype) {
     return true;
   }
-  MOZ_MUST_USE Node newClassMethodDefinition(Node key, FunctionNodeType funNode,
+  MOZ_MUST_USE bool addClassMethodDefinition(ListNodeType memberList, Node key,
+                                             FunctionNodeType funNode,
                                              AccessorType atype,
                                              bool isStatic) {
-    return NodeGeneric;
+    return true;
   }
-  MOZ_MUST_USE Node newClassFieldDefinition(Node name,
+  MOZ_MUST_USE bool addClassFieldDefinition(ListNodeType memberList, Node name,
                                             FunctionNodeType initializer) {
-    return NodeGeneric;
-  }
-  MOZ_MUST_USE bool addClassMemberDefinition(ListNodeType memberList,
-                                             Node member) {
     return true;
   }
   UnaryNodeType newYieldExpression(uint32_t begin, Node value) {
diff --git a/js/src/jit-test/tests/fields/bug1547467.js b/js/src/jit-test/tests/fields/bug1547467.js
deleted file mode 100644
index adc41435870b..000000000000
--- a/js/src/jit-test/tests/fields/bug1547467.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// |jit-test| --enable-experimental-fields
-
-load(libdir + "asserts.js");
-
-assertThrowsInstanceOf(() => {
-        class foo extends null {
-            constructor(a = class bar extends bar {}) {}
-        }
-        new foo();
-    },
-    ReferenceError
-)
-
-class B { }
-class C extends B {
-    constructor(a = class D { [super()] = 5; }) {
-    }
-}
-new C()
diff --git a/js/src/jit-test/tests/fields/bug1552229.js b/js/src/jit-test/tests/fields/bug1552229.js
deleted file mode 100644
index 649ea010df24..000000000000
--- a/js/src/jit-test/tests/fields/bug1552229.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// |jit-test| --enable-experimental-fields
-
-let i = 0;
-function f(x) {
-    assertEq(++i, x);
-    return x;
-}
-class C{
-    [f(1)](){}
-    [f(2)] = "hi";
-    [f(3)](){}
-    [f(4)] = "hi";
-}
-new C();
-
-if (typeof reportCompare === "function")
-  reportCompare(true, true);
diff --git a/js/src/jit-test/tests/fields/super.js b/js/src/jit-test/tests/fields/super.js
index 1bcd8c1ccb4a..a040fac79b4a 100644
--- a/js/src/jit-test/tests/fields/super.js
+++ b/js/src/jit-test/tests/fields/super.js
@@ -6,14 +6,12 @@ class Base {
 class C extends Base {
   field;
 }
-let c = new C();
-assertEq(true, "field" in c);
+new C();
 
 var D = class extends Base {
   field;
 };
-let d = new D();
-assertEq(true, "field" in d);
+new D();
 
 class E extends Base {
   field;
@@ -21,8 +19,7 @@ class E extends Base {
     super();
   }
 };
-let e = new E();
-assertEq(true, "field" in e);
+new E();
 
 class F extends Base {
   constructor() {
@@ -30,8 +27,7 @@ class F extends Base {
   }
   field;
 };
-let f = new F();
-assertEq(true, "field" in f);
+new F();
 
 class G extends Base {
   field2 = 2;
@@ -40,9 +36,7 @@ class G extends Base {
   }
   field3 = 3;
 };
-let g = new G();
-assertEq(2, g.field2);
-assertEq(3, g.field3);
+new G();
 
 class H extends Base {
   field = 2;
@@ -50,29 +44,14 @@ class H extends Base {
     eval("super()");
   }
 };
-let h = new H();
-assertEq(2, h.field);
+new H();
 
 class I extends Base {
   field = 2;
   constructor() {
       class Tmp {
-          field = 10;
           [super()];
       }
   }
 };
-let i = new I();
-assertEq(2, i.field);
-
-class J extends Base {
-  field = 2;
-  constructor() {
-      class Tmp {
-          field = 10;
-          [super()](){}
-      }
-  }
-};
-let j = new J();
-assertEq(2, j.field);
+new I();
diff --git a/js/src/vm/CommonPropertyNames.h b/js/src/vm/CommonPropertyNames.h
index ec272125a050..40a1c1e860ac 100644
--- a/js/src/vm/CommonPropertyNames.h
+++ b/js/src/vm/CommonPropertyNames.h
@@ -122,6 +122,7 @@
   MACRO(dotGenerator, dotGenerator, ".generator")                              \
   MACRO(dotThis, dotThis, ".this")                                             \
   MACRO(dotInitializers, dotInitializers, ".initializers")                     \
+  MACRO(dotLocalInitializers, dotLocalInitializers, ".localInitializers")      \
   MACRO(dotFieldKeys, dotFieldKeys, ".fieldKeys")                              \
   MACRO(each, each, "each")                                                    \
   MACRO(elementType, elementType, "elementType")                               \

From b8e7952af7b088cd6643a69936d7b72dcaa02362 Mon Sep 17 00:00:00 2001
From: Dorel Luca <dluca@mozilla.com>
Date: Tue, 21 May 2019 00:35:36 +0300
Subject: [PATCH 086/129] Backed out changeset 1efcba0d56db (bug 1542244) for
 Linting failure in
 /builds/worker/checkouts/gecko/testing/marionette/client/marionette_driver/geckoinstance.py.
 CLOSED TREE

---
 .../marionette/client/marionette_driver/geckoinstance.py    | 6 ------
 testing/marionette/prefs/marionette.js                      | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/testing/marionette/client/marionette_driver/geckoinstance.py b/testing/marionette/client/marionette_driver/geckoinstance.py
index f716914ec08d..208066a4edfb 100644
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -59,9 +59,6 @@ class GeckoInstance(object):
         "dom.max_chrome_script_run_time": 0,
         "dom.max_script_run_time": 0,
 
-        # DOM Push 
-        "dom.push.connection.enabled": False,
-
         # Only load extensions from the application and user profile
         # AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION
         "extensions.autoDisableScopes": 0,
@@ -119,9 +116,6 @@ class GeckoInstance(object):
         # Make sure SNTP requests don't hit the network
         "network.sntp.pools": "%(server)s",
 
-        # Privacy and Tracking Protection
-        "privacy.trackingprotection.enabled": False,
-
         # Don't do network connections for mitm priming
         "security.certerrors.mitm.priming.enabled": False,
 
diff --git a/testing/marionette/prefs/marionette.js b/testing/marionette/prefs/marionette.js
index 506f94bc846a..b423fa9dcfab 100644
--- a/testing/marionette/prefs/marionette.js
+++ b/testing/marionette/prefs/marionette.js
@@ -36,9 +36,3 @@ pref("marionette.prefs.recommended", true);
 // Deprecated and scheduled for removal
 // with https://bugzil.la/marionette-window-tracking
 pref("marionette.contentListener", false);
-
-// Turn off DOM Push
-pref("dom.push.connection.enabled", false);
-
-// Privacy and tracking protection
-pref("privacy.trackingprotection.enabled", false);

From c6aad4af4afcd4164fcc4c00ea86693b3984a305 Mon Sep 17 00:00:00 2001
From: David Burns <dburns@mozilla.com>
Date: Mon, 20 May 2019 21:49:19 +0000
Subject: [PATCH 087/129] Bug 1542244: Disable Privacy and tracking protection
 features during testing. r=webdriver-reviewers,ato,whimboo

When privacy and tracking protection is enabled there is a call home that
can break tests. This uses the relavant prefs to disable the features.

Differential Revision: https://phabricator.services.mozilla.com/D29644

--HG--
extra : moz-landing-system : lando
---
 .../marionette/client/marionette_driver/geckoinstance.py    | 6 ++++++
 testing/marionette/prefs/marionette.js                      | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/testing/marionette/client/marionette_driver/geckoinstance.py b/testing/marionette/client/marionette_driver/geckoinstance.py
index 208066a4edfb..8b8640655be0 100644
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -59,6 +59,9 @@ class GeckoInstance(object):
         "dom.max_chrome_script_run_time": 0,
         "dom.max_script_run_time": 0,
 
+        # DOM Push
+        "dom.push.connection.enabled": False,
+
         # Only load extensions from the application and user profile
         # AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION
         "extensions.autoDisableScopes": 0,
@@ -116,6 +119,9 @@ class GeckoInstance(object):
         # Make sure SNTP requests don't hit the network
         "network.sntp.pools": "%(server)s",
 
+        # Privacy and Tracking Protection
+        "privacy.trackingprotection.enabled": False,
+
         # Don't do network connections for mitm priming
         "security.certerrors.mitm.priming.enabled": False,
 
diff --git a/testing/marionette/prefs/marionette.js b/testing/marionette/prefs/marionette.js
index b423fa9dcfab..506f94bc846a 100644
--- a/testing/marionette/prefs/marionette.js
+++ b/testing/marionette/prefs/marionette.js
@@ -36,3 +36,9 @@ pref("marionette.prefs.recommended", true);
 // Deprecated and scheduled for removal
 // with https://bugzil.la/marionette-window-tracking
 pref("marionette.contentListener", false);
+
+// Turn off DOM Push
+pref("dom.push.connection.enabled", false);
+
+// Privacy and tracking protection
+pref("privacy.trackingprotection.enabled", false);

From 6efaa8b1cd5a146274ffcb6625142b070680744e Mon Sep 17 00:00:00 2001
From: David Major <dmajor@mozilla.com>
Date: Mon, 20 May 2019 17:25:30 +0000
Subject: [PATCH 088/129] Bug 1523526 - Don't allow CFG on old releases of
 Windows for arm64 r=bobowen,aklotz

There's a bug in ole32.dll on arm64 versions of Windows prior to 1809, that crashes our content processes if we enable CFG. We've reported the issue, but even if it gets fixed, we can't assume users will have the update.

This patch uses process mitigation policy flags to disable CFG on arm64 before 1809. Based on testing, we only need to do this in the sandbox for child processes, and it's not strictly necessary for the launcher stub to set the flag on the main process. But I've included that anyway as a guard against some yet-undiscovered scenario that might hit the issue and make the browser unusable.

The effects of this patch won't be visible until we actually enable CFG in a subsequent landing.

Differential Revision: https://phabricator.services.mozilla.com/D29474

--HG--
extra : moz-landing-system : lando
---
 .../app/winlauncher/LauncherProcessWin.cpp    | 13 ++++++
 .../sandbox/chromium-shim/base/win/sdkdecls.h | 11 +++++
 .../aarch64_control_flow_guard.patch          | 44 +++++++++++++++++++
 .../patches/with_update/patch_order.txt       |  1 +
 .../sandbox/win/src/process_mitigations.cc    |  5 +++
 .../chromium/sandbox/win/src/security_level.h |  9 ++++
 .../win/src/sandboxbroker/sandboxBroker.cpp   |  7 +++
 7 files changed, 90 insertions(+)
 create mode 100644 security/sandbox/chromium-shim/patches/with_update/aarch64_control_flow_guard.patch

diff --git a/browser/app/winlauncher/LauncherProcessWin.cpp b/browser/app/winlauncher/LauncherProcessWin.cpp
index f11c83a9e63d..e872ba327d62 100644
--- a/browser/app/winlauncher/LauncherProcessWin.cpp
+++ b/browser/app/winlauncher/LauncherProcessWin.cpp
@@ -60,6 +60,11 @@ static mozilla::LauncherVoidResult PostCreationSetup(
     (0x00000001ULL << 60)
 #endif  // !defined(PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON)
 
+#if !defined(PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF)
+#  define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF \
+    (0x00000002ULL << 40)
+#endif  // !defined(PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF)
+
 #if (_WIN32_WINNT < 0x0602)
 BOOL WINAPI
 SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY aMitigationPolicy,
@@ -76,6 +81,14 @@ static void SetMitigationPolicies(mozilla::ProcThreadAttributes& aAttrs,
     aAttrs.AddMitigationPolicy(
         PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON);
   }
+
+#if defined(_M_ARM64)
+  // Disable CFG on older versions of ARM64 Windows to avoid a crash in COM.
+  if (!mozilla::IsWin10Sep2018UpdateOrLater()) {
+    aAttrs.AddMitigationPolicy(
+        PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF);
+  }
+#endif  // defined(_M_ARM64)
 }
 
 static mozilla::LauncherFlags ProcessCmdLine(int& aArgc, wchar_t* aArgv[]) {
diff --git a/security/sandbox/chromium-shim/base/win/sdkdecls.h b/security/sandbox/chromium-shim/base/win/sdkdecls.h
index 60561a4e4e21..c2bf6670cefc 100644
--- a/security/sandbox/chromium-shim/base/win/sdkdecls.h
+++ b/security/sandbox/chromium-shim/base/win/sdkdecls.h
@@ -210,6 +210,17 @@ typedef struct _PROCESS_MITIGATION_EXTENSION_POINT_DISABLE_POLICY {
 #define PROCESS_CREATION_MITIGATION_POLICY_PROHIBIT_DYNAMIC_CODE_ALWAYS_OFF               (0x00000002uLL << 36)
 #define PROCESS_CREATION_MITIGATION_POLICY_PROHIBIT_DYNAMIC_CODE_ALWAYS_ON_ALLOW_OPT_OUT  (0x00000003uLL << 36)
 
+//
+// Define Control Flow Guard (CFG) mitigation policy options.  Control Flow
+// Guard allows indirect control transfers to be checked at runtime.
+//
+
+#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_MASK                        (0x00000003uLL << 40)
+#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_DEFER                       (0x00000000uLL << 40)
+#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_ON                   (0x00000001uLL << 40)
+#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF                  (0x00000002uLL << 40)
+#define PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_EXPORT_SUPPRESSION          (0x00000003uLL << 40)
+
 //
 // Define module signature options.  When enabled, this option will
 // block mapping of non-microsoft binaries.
diff --git a/security/sandbox/chromium-shim/patches/with_update/aarch64_control_flow_guard.patch b/security/sandbox/chromium-shim/patches/with_update/aarch64_control_flow_guard.patch
new file mode 100644
index 000000000000..725cfa966d25
--- /dev/null
+++ b/security/sandbox/chromium-shim/patches/with_update/aarch64_control_flow_guard.patch
@@ -0,0 +1,44 @@
+Bug 1523526: Don't allow CFG on old releases of Windows for arm64
+
+There's a bug in ole32.dll on arm64 versions of Windows prior to 1809, that crashes our content processes if we enable CFG. We've reported the issue, but even if it gets fixed, we can't assume users will have the update.
+
+This patch uses process mitigation policy flags to disable CFG on arm64 before 1809. Based on testing, we only need to do this in the sandbox for child processes, and it's not strictly necessary for the launcher stub to set the flag on the main process. But I've included that anyway as a guard against some yet-undiscovered scenario that might hit the issue and make the browser unusable.
+
+The effects of this patch won't be visible until we actually enable CFG in a subsequent landing.
+
+Differential Revision: https://phabricator.services.mozilla.com/D29474
+
+diff --git a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
+--- a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
++++ b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
+@@ -354,6 +354,11 @@ void ConvertProcessMitigationsToPolicy(M
+         PROCESS_CREATION_MITIGATION_POLICY_PROHIBIT_DYNAMIC_CODE_ALWAYS_ON;
+   }
+ 
++  if (flags & MITIGATION_CONTROL_FLOW_GUARD_DISABLE) {
++    *policy_flags |=
++        PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF;
++  }
++
+   if (version < base::win::VERSION_WIN10)
+     return;
+ 
+diff --git a/security/sandbox/chromium/sandbox/win/src/security_level.h b/security/sandbox/chromium/sandbox/win/src/security_level.h
+--- a/security/sandbox/chromium/sandbox/win/src/security_level.h
++++ b/security/sandbox/chromium/sandbox/win/src/security_level.h
+@@ -255,6 +255,15 @@ const MitigationFlags MITIGATION_IMAGE_L
+ // PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON.
+ const MitigationFlags MITIGATION_IMAGE_LOAD_PREFER_SYS32 = 0x00100000;
+ 
++// Begin Mozilla-added flags.
++// Working down from the high bit to avoid conflict with new upstream flags.
++
++// Disable Control Flow Guard. This may seem more like an anti-mitigation, but
++// this flag allows code to make targeted changes to CFG to avoid bugs, while
++// leaving it enabled in the common case. Corresponds to
++// PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_ON.
++const MitigationFlags MITIGATION_CONTROL_FLOW_GUARD_DISABLE = 0x80000000;
++
+ }  // namespace sandbox
+ 
+ #endif  // SANDBOX_SRC_SECURITY_LEVEL_H_
diff --git a/security/sandbox/chromium-shim/patches/with_update/patch_order.txt b/security/sandbox/chromium-shim/patches/with_update/patch_order.txt
index e6e5c901ac4b..527101105473 100755
--- a/security/sandbox/chromium-shim/patches/with_update/patch_order.txt
+++ b/security/sandbox/chromium-shim/patches/with_update/patch_order.txt
@@ -21,3 +21,4 @@ mingw_disable_one_try.patch
 mingw_noexports_casts.patch
 mingw_offsetof.patch
 add_aarch64_windows_support.patch
+aarch64_control_flow_guard.patch
diff --git a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
index 3084284fe49c..8b76b93b5956 100644
--- a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
+++ b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
@@ -354,6 +354,11 @@ void ConvertProcessMitigationsToPolicy(MitigationFlags flags,
         PROCESS_CREATION_MITIGATION_POLICY_PROHIBIT_DYNAMIC_CODE_ALWAYS_ON;
   }
 
+  if (flags & MITIGATION_CONTROL_FLOW_GUARD_DISABLE) {
+    *policy_flags |=
+        PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_OFF;
+  }
+
   if (version < base::win::VERSION_WIN10)
     return;
 
diff --git a/security/sandbox/chromium/sandbox/win/src/security_level.h b/security/sandbox/chromium/sandbox/win/src/security_level.h
index d01609bfd7fa..139212433a57 100644
--- a/security/sandbox/chromium/sandbox/win/src/security_level.h
+++ b/security/sandbox/chromium/sandbox/win/src/security_level.h
@@ -255,6 +255,15 @@ const MitigationFlags MITIGATION_IMAGE_LOAD_NO_LOW_LABEL = 0x00080000;
 // PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON.
 const MitigationFlags MITIGATION_IMAGE_LOAD_PREFER_SYS32 = 0x00100000;
 
+// Begin Mozilla-added flags.
+// Working down from the high bit to avoid conflict with new upstream flags.
+
+// Disable Control Flow Guard. This may seem more like an anti-mitigation, but
+// this flag allows code to make targeted changes to CFG to avoid bugs, while
+// leaving it enabled in the common case. Corresponds to
+// PROCESS_CREATION_MITIGATION_POLICY_CONTROL_FLOW_GUARD_ALWAYS_ON.
+const MitigationFlags MITIGATION_CONTROL_FLOW_GUARD_DISABLE = 0x80000000;
+
 }  // namespace sandbox
 
 #endif  // SANDBOX_SRC_SECURITY_LEVEL_H_
diff --git a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
index 1b137f0abb90..329d63858863 100644
--- a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
+++ b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
@@ -508,6 +508,13 @@ void SandboxBroker::SetSecurityLevelForContentProcess(int32_t aSandboxLevel,
       sandbox::MITIGATION_DEP | sandbox::MITIGATION_EXTENSION_POINT_DISABLE |
       sandbox::MITIGATION_IMAGE_LOAD_PREFER_SYS32;
 
+#if defined(_M_ARM64)
+  // Disable CFG on older versions of ARM64 Windows to avoid a crash in COM.
+  if (!IsWin10Sep2018UpdateOrLater()) {
+    mitigations |= sandbox::MITIGATION_CONTROL_FLOW_GUARD_DISABLE;
+  }
+#endif
+
   if (aSandboxLevel > 4) {
     result = mPolicy->SetAlternateDesktop(false);
     if (NS_WARN_IF(result != sandbox::SBOX_ALL_OK)) {

From 12a5d86407dbf7778833d7818479ad936168447c Mon Sep 17 00:00:00 2001
From: David Major <dmajor@mozilla.com>
Date: Mon, 20 May 2019 17:53:37 +0000
Subject: [PATCH 089/129] Bug 1526443 - Pick up LLVM fix for CFG on
 arm64-windows builds r=froydnj

Cherry-picks https://bugs.llvm.org/show_bug.cgi?id=39799 and enables CFG on aarch64-windows automation. It's keyed on an explicit --enable-hardening to avoid breaking the local builds of developers who haven't yet picked up the compiler patch.

Differential Revision: https://phabricator.services.mozilla.com/D28236

--HG--
extra : moz-landing-system : lando
---
 .../mozconfigs/win64-aarch64/common-win64     |   6 +
 build/build-clang/clang-win64.json            |   1 +
 build/build-clang/r355141-arm64-cfg.patch     | 112 ++++++++++++++++++
 build/moz.configure/toolchain.configure       |   5 +-
 4 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100644 build/build-clang/r355141-arm64-cfg.patch

diff --git a/browser/config/mozconfigs/win64-aarch64/common-win64 b/browser/config/mozconfigs/win64-aarch64/common-win64
index 191bb407fcea..a998da51fe5f 100644
--- a/browser/config/mozconfigs/win64-aarch64/common-win64
+++ b/browser/config/mozconfigs/win64-aarch64/common-win64
@@ -1,3 +1,9 @@
 # This file is used by all AArch64 Win64 builds
 
 ac_add_options --target=aarch64-windows-mingw32
+
+# Temporary signal to toolchain.configure that our compiler is patched to
+# support CFG, until such support can be assumed.
+if test -z "$USE_ARTIFACT"; then
+  ac_add_options --enable-hardening
+fi
diff --git a/build/build-clang/clang-win64.json b/build/build-clang/clang-win64.json
index 686b64ddf1e9..82ac64971d51 100644
--- a/build/build-clang/clang-win64.json
+++ b/build/build-clang/clang-win64.json
@@ -17,6 +17,7 @@
       "workaround-issue38586.patch",
       "unpoison-thread-stacks.patch",
       "downgrade-mangling-error.patch",
+      "r355141-arm64-cfg.patch",
       "loosen-msvc-detection.patch",
       "revert-r355311.patch"
     ]
diff --git a/build/build-clang/r355141-arm64-cfg.patch b/build/build-clang/r355141-arm64-cfg.patch
new file mode 100644
index 000000000000..50db8992d048
--- /dev/null
+++ b/build/build-clang/r355141-arm64-cfg.patch
@@ -0,0 +1,112 @@
+[COFF] Add address-taken import thunks to the fid table
+
+https://bugs.llvm.org/show_bug.cgi?id=39799
+https://reviews.llvm.org/D58739
+
+--- a/lld/COFF/Writer.cpp
++++ b/lld/COFF/Writer.cpp
+@@ -1390,19 +1390,47 @@
+ // symbol in an executable section.
+ static void maybeAddAddressTakenFunction(SymbolRVASet &AddressTakenSyms,
+                                          Symbol *S) {
+-  auto *D = dyn_cast_or_null<DefinedCOFF>(S);
+-
+-  // Ignore undefined symbols and references to non-functions (e.g. globals and
+-  // labels).
+-  if (!D ||
+-      D->getCOFFSymbol().getComplexType() != COFF::IMAGE_SYM_DTYPE_FUNCTION)
++  if (!S)
+     return;
+ 
+-  // Mark the symbol as address taken if it's in an executable section.
+-  Chunk *RefChunk = D->getChunk();
+-  OutputSection *OS = RefChunk ? RefChunk->getOutputSection() : nullptr;
+-  if (OS && OS->Header.Characteristics & IMAGE_SCN_MEM_EXECUTE)
+-    addSymbolToRVASet(AddressTakenSyms, D);
++  switch (S->kind()) {
++  case Symbol::DefinedLocalImportKind:
++  case Symbol::DefinedImportDataKind:
++    // Defines an __imp_ pointer, so it is data, so it is ignored.
++    break;
++  case Symbol::DefinedCommonKind:
++    // Common is always data, so it is ignored.
++    break;
++  case Symbol::DefinedAbsoluteKind:
++  case Symbol::DefinedSyntheticKind:
++    // Absolute is never code, synthetic generally isn't and usually isn't
++    // determinable.
++    break;
++  case Symbol::LazyKind:
++  case Symbol::UndefinedKind:
++    // Undefined symbols resolve to zero, so they don't have an RVA. Lazy
++    // symbols shouldn't have relocations.
++    break;
++
++  case Symbol::DefinedImportThunkKind:
++    // Thunks are always code, include them.
++    addSymbolToRVASet(AddressTakenSyms, cast<Defined>(S));
++    break;
++
++  case Symbol::DefinedRegularKind: {
++    // This is a regular, defined, symbol from a COFF file. Mark the symbol as
++    // address taken if the symbol type is function and it's in an executable
++    // section.
++    auto *D = cast<DefinedRegular>(S);
++    if (D->getCOFFSymbol().getComplexType() == COFF::IMAGE_SYM_DTYPE_FUNCTION) {
++      Chunk *RefChunk = D->getChunk();
++      OutputSection *OS = RefChunk ? RefChunk->getOutputSection() : nullptr;
++      if (OS && OS->Header.Characteristics & IMAGE_SCN_MEM_EXECUTE)
++        addSymbolToRVASet(AddressTakenSyms, D);
++    }
++    break;
++  }
++  }
+ }
+ 
+ // Visit all relocations from all section contributions of this object file and
+--- a/lld/test/COFF/guardcf-thunk.s
++++ b/lld/test/COFF/guardcf-thunk.s
+@@ -0,0 +1,43 @@
++# REQUIRES: x86
++
++# Make a DLL that exports exportfn1.
++# RUN: yaml2obj < %p/Inputs/export.yaml > %t.obj
++# RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1 /implib:%t.lib
++
++# Make an obj that takes the address of that exported function.
++# RUN: llvm-mc -filetype=obj -triple=x86_64-windows-msvc %s -o %t2.obj
++# RUN: lld-link -entry:main -guard:cf %t2.obj %t.lib -nodefaultlib -out:%t.exe
++# RUN: llvm-readobj -coff-load-config %t.exe | FileCheck %s
++
++# Check that the gfids table contains *exactly* two entries, one for exportfn1
++# and one for main.
++# CHECK: GuardFidTable [
++# CHECK-NEXT: 0x{{[0-9A-Fa-f]+0$}}
++# CHECK-NEXT: 0x{{[0-9A-Fa-f]+0$}}
++# CHECK-NEXT: ]
++
++
++        .def     @feat.00;
++        .scl    3;
++        .type   0;
++        .endef
++        .globl  @feat.00
++@feat.00 = 0x001
++
++        .section .text,"rx"
++        .def     main; .scl    2; .type   32; .endef
++        .global main
++main:
++        leaq exportfn1(%rip), %rax
++        retq
++
++        .section .rdata,"dr"
++.globl _load_config_used
++_load_config_used:
++        .long 256
++        .fill 124, 1, 0
++        .quad __guard_fids_table
++        .quad __guard_fids_count
++        .long __guard_flags
++        .fill 128, 1, 0
++
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index 611d5d52fe8c..6d8d548491ac 100755
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1666,9 +1666,10 @@ def security_hardening_cflags(hardening_flag, asan, optimize, c_compiler, target
             js_ldflags.append("-Wl,--dynamicbase")
 
         # Control Flow Guard (CFG) ----------------------------
-        # See Bug 1525588 for why this doesn't work on Windows ARM
+        # On aarch64, this is enabled only with explicit --enable-hardening
+        # (roughly: automation) due to a dependency on a patched clang-cl.
         if c_compiler.type == 'clang-cl' and c_compiler.version >= '8' and \
-           target.cpu != 'aarch64':
+           (target.cpu != 'aarch64' or hardening_flag):
             flags.append("-guard:cf")
             js_flags.append("-guard:cf")
             # nolongjmp is needed because clang doesn't emit the CFG tables of

From 98daf2fb95acd000cefe06cce6d15e6305ba29ec Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Fri, 17 May 2019 22:47:59 +0000
Subject: [PATCH 090/129] Bug 1550895 - Run geckoview wpt as tier-2 jobs
 r=jgraham

This patch runs wpt against opt and debug builds of geckoview as tier-2 jobs on mozilla-central and try.

Differential Revision: https://phabricator.services.mozilla.com/D31581

--HG--
extra : moz-landing-system : lando
---
 taskcluster/ci/test/test-sets.yml    |  4 ++--
 taskcluster/ci/test/web-platform.yml | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 3a20aaa33aea..10f0ffba0309 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -450,8 +450,6 @@ android-x86_64-opt-tests:
     - crashtest
     # geckoview-junit perma-fail on opt and debug; bug 1521195
     # - geckoview-junit
-    - web-platform-tests
-    - web-platform-tests-reftests
 
 android-x86_64-tests:
     - gtest
@@ -462,6 +460,8 @@ android-x86_64-tests:
     - mochitest-gpu
     # various reftest (plain) failures; bug 1501582
     # - reftest
+    - web-platform-tests
+    - web-platform-tests-reftests
     - xpcshell
 
 android-x86-tests:
diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index 19411256082a..b68439f59e0d 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -6,7 +6,10 @@ job-defaults:
     suite:
         category: web-platform-tests
     instance-size: xlarge
-    max-run-time: 5400
+    max-run-time:
+        by-test-platform:
+            android-em-7.0-x86_64/debug: 7200
+            default: 5400
     variants:
         by-test-platform:
             linux64/debug: ['serviceworker']
@@ -32,6 +35,7 @@ job-defaults:
     target:
         by-test-platform:
             android-em-7.0-x86_64/opt: geckoview-androidTest.apk
+            android-em-7.0-x86_64/debug: geckoview-androidTest.apk
             default: null
 
 web-platform-tests:
@@ -63,7 +67,6 @@ web-platform-tests:
             default: built-projects
     tier:
         by-test-platform:
-            android-em-7.0-x86_64/opt: 3
             android.*: 2
             linux64-asan/opt: 2
             windows10-aarch64.*: 2
@@ -127,7 +130,6 @@ web-platform-tests-reftests:
             default: built-projects
     tier:
         by-test-platform:
-            android-em-7.0-x86_64/opt: 3
             android.*: 2
             linux64-asan/opt: 2
             windows10-aarch64.*: 2
@@ -180,7 +182,7 @@ web-platform-tests-wdspec:
             default: built-projects
     tier:
         by-test-platform:
-            android.*: 3
+            android.*: 2
             linux64-asan/opt: 2
             .*-qr/.*: 2  # can't be tier-1 if it's not running on integration branches
             default: default

From c86f7ac7c384b68916f1f4b69ebc051df031f785 Mon Sep 17 00:00:00 2001
From: Coroiu Cristina <ccoroiu@mozilla.com>
Date: Tue, 21 May 2019 01:22:53 +0300
Subject: [PATCH 091/129] Backed out 5 changesets (bug 1550131) for
 browser-chrome failures at
 browser/components/aboutlogins/tests/browser/browser_masterPassword.js

Backed out changeset 95918413069f (bug 1550131)
Backed out changeset 8e7d6a1c30fa (bug 1550131)
Backed out changeset 97eabc062946 (bug 1550131)
Backed out changeset 32ff6a0b8436 (bug 1550131)
Backed out changeset b562886d574d (bug 1550131)

--HG--
extra : rebase_source : 542ffadbb47cbd1bfc90e7053af59c1e5ee385d7
---
 .../aboutlogins/AboutLoginsParent.jsm         | 74 +----------------
 .../aboutlogins/content/aboutLogins.ftl       |  6 --
 .../aboutlogins/tests/browser/browser.ini     |  1 -
 .../tests/browser/browser_masterPassword.js   | 82 -------------------
 4 files changed, 1 insertion(+), 162 deletions(-)
 delete mode 100644 browser/components/aboutlogins/tests/browser/browser_masterPassword.js

diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm
index 96cf6ba50bee..03d020a2ce8d 100644
--- a/browser/components/aboutlogins/AboutLoginsParent.jsm
+++ b/browser/components/aboutlogins/AboutLoginsParent.jsm
@@ -9,8 +9,6 @@ var EXPORTED_SYMBOLS = ["AboutLoginsParent"];
 const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.defineModuleGetter(this, "E10SUtils",
                                "resource://gre/modules/E10SUtils.jsm");
-ChromeUtils.defineModuleGetter(this, "Localization",
-                               "resource://gre/modules/Localization.jsm");
 ChromeUtils.defineModuleGetter(this, "LoginHelper",
                                "resource://gre/modules/LoginHelper.jsm");
 ChromeUtils.defineModuleGetter(this, "Services",
@@ -21,7 +19,6 @@ XPCOMUtils.defineLazyGetter(this, "log", () => {
 });
 
 const ABOUT_LOGINS_ORIGIN = "about:logins";
-const MASTER_PASSWORD_NOTIFICATION_ID = "master-password-login-required";
 
 const PRIVILEGED_PROCESS_PREF =
   "browser.tabs.remote.separatePrivilegedContentProcess";
@@ -48,7 +45,6 @@ const convertSubjectToLogin = subject => {
 };
 
 var AboutLoginsParent = {
-  _l10n: null,
   _subscribers: new WeakSet(),
 
   // Listeners are added in BrowserGlue.jsm
@@ -78,8 +74,6 @@ var AboutLoginsParent = {
       }
       case "AboutLogins:Subscribe": {
         if (!ChromeUtils.nondeterministicGetWeakSetKeys(this._subscribers).length) {
-          Services.obs.addObserver(this, "passwordmgr-crypto-login");
-          Services.obs.addObserver(this, "passwordmgr-crypto-loginCanceled");
           Services.obs.addObserver(this, "passwordmgr-storage-changed");
         }
         this._subscribers.add(message.target);
@@ -112,23 +106,10 @@ var AboutLoginsParent = {
 
   observe(subject, topic, type) {
     if (!ChromeUtils.nondeterministicGetWeakSetKeys(this._subscribers).length) {
-      Services.obs.removeObserver(this, "passwordmgr-crypto-login");
-      Services.obs.removeObserver(this, "passwordmgr-crypto-loginCanceled");
       Services.obs.removeObserver(this, "passwordmgr-storage-changed");
       return;
     }
 
-    if (topic == "passwordmgr-crypto-login") {
-      this.removeMasterPasswordLoginNotifications();
-      this.messageSubscribers("AboutLogins:AllLogins", this.getAllLogins());
-      return;
-    }
-
-    if (topic == "passwordmgr-crypto-loginCanceled") {
-      this.showMasterPasswordLoginNotifications();
-      return;
-    }
-
     switch (type) {
       case "addLogin": {
         const login = convertSubjectToLogin(subject);
@@ -160,54 +141,7 @@ var AboutLoginsParent = {
     }
   },
 
-  async showMasterPasswordLoginNotifications() {
-    if (!this._l10n) {
-      this._l10n = new Localization(["browser/aboutLogins.ftl"]);
-    }
-
-    let messageString = await this._l10n.formatValue("master-password-notification-message");
-    for (let subscriber of this._subscriberIterator()) {
-      // If there's already an existing notification bar, don't do anything.
-      let {gBrowser} = subscriber.ownerGlobal;
-      let browser = subscriber;
-      let notificationBox = gBrowser.getNotificationBox(browser);
-      let notification = notificationBox.getNotificationWithValue(MASTER_PASSWORD_NOTIFICATION_ID);
-      if (notification) {
-        continue;
-      }
-
-      // Configure the notification bar
-      let priority = notificationBox.PRIORITY_WARNING_MEDIUM;
-      let iconURL = "chrome://browser/skin/login.svg";
-      let reloadLabel = await this._l10n.formatValue("master-password-reload-button-label");
-      let reloadKey = await this._l10n.formatValue("master-password-reload-button-accesskey");
-
-      let buttons = [{
-        label: reloadLabel,
-        accessKey: reloadKey,
-        popup: null,
-        callback() { browser.reload(); },
-      }];
-
-      notification = notificationBox.appendNotification(messageString, MASTER_PASSWORD_NOTIFICATION_ID,
-                                                        iconURL, priority, buttons);
-    }
-  },
-
-  removeMasterPasswordLoginNotifications() {
-    for (let subscriber of this._subscriberIterator()) {
-      let {gBrowser} = subscriber.ownerGlobal;
-      let browser = subscriber;
-      let notificationBox = gBrowser.getNotificationBox(browser);
-      let notification = notificationBox.getNotificationWithValue(MASTER_PASSWORD_NOTIFICATION_ID);
-      if (!notification) {
-        continue;
-      }
-      notificationBox.removeNotification(notification);
-    }
-  },
-
-  * _subscriberIterator() {
+  messageSubscribers(name, details) {
     let subscribers = ChromeUtils.nondeterministicGetWeakSetKeys(this._subscribers);
     for (let subscriber of subscribers) {
       if (subscriber.remoteType != EXPECTED_ABOUTLOGINS_REMOTE_TYPE ||
@@ -216,12 +150,6 @@ var AboutLoginsParent = {
         this._subscribers.delete(subscriber);
         continue;
       }
-      yield subscriber;
-    }
-  },
-
-  messageSubscribers(name, details) {
-    for (let subscriber of this._subscriberIterator()) {
       try {
         subscriber.messageManager.sendAsyncMessage(name, details);
       } catch (ex) {}
diff --git a/browser/components/aboutlogins/content/aboutLogins.ftl b/browser/components/aboutlogins/content/aboutLogins.ftl
index a884c8b2cd78..8161cf2a3a1c 100644
--- a/browser/components/aboutlogins/content/aboutLogins.ftl
+++ b/browser/components/aboutlogins/content/aboutLogins.ftl
@@ -40,9 +40,3 @@ login-item =
   .time-changed = Last changed: { DATETIME($timeChanged, day: "numeric", month: "long", year: "numeric") }
   .time-used = Last used: { DATETIME($timeUsed, day: "numeric", month: "long", year: "numeric") }
   .username-label = Username
-
-master-password-notification-message = Please enter your master password to view saved logins & passwords
-# TODO: Not sure how to use formatValue with these as attributes on a single ID
-master-password-reload-button-label = Log in
-# TODO: Not sure how to use formatValue with these as attributes on a single ID
-master-password-reload-button-accesskey = L
diff --git a/browser/components/aboutlogins/tests/browser/browser.ini b/browser/components/aboutlogins/tests/browser/browser.ini
index 099a62080462..e0ad36550732 100644
--- a/browser/components/aboutlogins/tests/browser/browser.ini
+++ b/browser/components/aboutlogins/tests/browser/browser.ini
@@ -5,6 +5,5 @@ prefs =
 [browser_copyToClipboardButton.js]
 [browser_deleteLogin.js]
 [browser_loginListChanges.js]
-[browser_masterPassword.js]
 [browser_openSite.js]
 [browser_updateLogin.js]
diff --git a/browser/components/aboutlogins/tests/browser/browser_masterPassword.js b/browser/components/aboutlogins/tests/browser/browser_masterPassword.js
deleted file mode 100644
index a4aec4ae097e..000000000000
--- a/browser/components/aboutlogins/tests/browser/browser_masterPassword.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-ChromeUtils.import("resource://testing-common/LoginTestUtils.jsm", this);
-
-/**
- * Waits for the master password prompt and performs an action.
- * @param {string} action Set to "authenticate" to log in or "cancel" to
- *        close the dialog without logging in.
- */
-function waitForMPDialog(action) {
-  let dialogShown = TestUtils.topicObserved("common-dialog-loaded");
-  return dialogShown.then(function([subject]) {
-    let dialog = subject.Dialog;
-    is(dialog.args.title, "Password Required");
-    if (action == "authenticate") {
-      SpecialPowers.wrap(dialog.ui.password1Textbox)
-                   .setUserInput(LoginTestUtils.masterPassword.masterPassword);
-      dialog.ui.button0.click();
-    } else if (action == "cancel") {
-      dialog.ui.button1.click();
-    }
-    return BrowserTestUtils.waitForEvent(window, "DOMModalDialogClosed");
-  });
-}
-
-function getNumberOfLoginsDisplayed(browser) {
-  return ContentTask.spawn(browser, null, async () => {
-    let loginList = Cu.waiveXrays(content.document.querySelector("login-list"));
-    return loginList._logins.length;
-  });
-}
-
-add_task(async function test() {
-  let login = LoginTestUtils.testData.formLogin({
-    hostname: "https://example.com",
-    formSubmitURL: "https://example.com",
-    username: "username",
-    password: "password",
-  });
-
-  Services.logins.addLogin(login);
-  LoginTestUtils.masterPassword.enable();
-
-  let mpDialogShown = waitForMPDialog("cancel");
-  await BrowserTestUtils.openNewForegroundTab({gBrowser, url: "about:logins"});
-  await mpDialogShown;
-
-  registerCleanupFunction(function() {
-    LoginTestUtils.masterPassword.disable();
-    Services.logins.removeAllLogins();
-    BrowserTestUtils.removeTab(gBrowser.selectedTab);
-  });
-
-  let browser = gBrowser.selectedBrowser;
-  let logins = await getNumberOfLoginsDisplayed(browser);
-  is(logins, 0, "No logins should be displayed when MP is set and unauthenticated");
-
-  let notificationBox = gBrowser.getNotificationBox(browser);
-  let notification = notificationBox.currentNotification;
-
-  ok(notification, "Notification should be visible");
-  is(notification.getAttribute("value"), "master-password-login-required",
-     "Should be showing the right notification");
-
-  let buttons = notification.querySelectorAll(".notification-button");
-  is(buttons.length, 1, "Should have one button.");
-
-  let refreshPromise = BrowserTestUtils.browserLoaded(browser);
-  // Sign in with the Master Password this time the dialog is shown
-  mpDialogShown = waitForMPDialog("authenticate");
-  // Click the button to reload the page.
-  buttons[0].click();
-  await refreshPromise;
-  info("Page reloaded");
-
-  await mpDialogShown;
-  info("Master Password dialog shown and authenticated");
-
-  logins = await getNumberOfLoginsDisplayed(browser);
-  is(logins, 1, "Logins should be displayed when MP is set and authenticated");
-});

From f5080f76dccfabc419751b63ac9ebfb8f30f791b Mon Sep 17 00:00:00 2001
From: Dorel Luca <dluca@mozilla.com>
Date: Mon, 20 May 2019 22:32:44 +0000
Subject: [PATCH 092/129] Bug 1551729 - Revert changes made in Bug 1548432 in
 mozilla-test.html r=aryx

Differential Revision: https://phabricator.services.mozilla.com/D31878

--HG--
extra : moz-landing-system : lando
---
 .../web-platform/meta/cookies/http-state/mozilla-tests.html.ini | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 testing/web-platform/meta/cookies/http-state/mozilla-tests.html.ini

diff --git a/testing/web-platform/meta/cookies/http-state/mozilla-tests.html.ini b/testing/web-platform/meta/cookies/http-state/mozilla-tests.html.ini
new file mode 100644
index 000000000000..7bc48d3631de
--- /dev/null
+++ b/testing/web-platform/meta/cookies/http-state/mozilla-tests.html.ini
@@ -0,0 +1,2 @@
+[mozilla-tests.html]
+  disabled: Bug 1551729

From 92804b90dc6f419c56d19deda5c4970259a538da Mon Sep 17 00:00:00 2001
From: Brendan Dahl <bdahl@mozilla.com>
Date: Mon, 20 May 2019 16:50:28 +0000
Subject: [PATCH 093/129] Bug 1551320 - Don't allow CreateElement in XUL
 documents. r=bzbarsky

Soon XUL documents will be loaded as XHTML and createElement will create HTML
elements instead of XUL element by default. This restriction can be removed
once we migrate everything.

Differential Revision: https://phabricator.services.mozilla.com/D31294

--HG--
extra : moz-landing-system : lando
---
 dom/base/Document.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
index 423350f26e06..7e4cc9107c85 100644
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
@@ -5483,6 +5483,14 @@ already_AddRefed<Element> Document::CreateElement(
     return nullptr;
   }
 
+  // Temporary check until XULDocument has been removed.
+  if (IsXULDocument()) {
+    MOZ_DIAGNOSTIC_ASSERT(false,
+                          "CreateElement() not allowed in XUL document.");
+    rv.Throw(NS_ERROR_FAILURE);
+    return nullptr;
+  }
+
   bool needsLowercase = IsHTMLDocument() && !IsLowercaseASCII(aTagName);
   nsAutoString lcTagName;
   if (needsLowercase) {

From 505cced8b9da50f684b327e92421c2c7882a310f Mon Sep 17 00:00:00 2001
From: Tom Ritter <tom@mozilla.com>
Date: Fri, 17 May 2019 19:21:15 +0000
Subject: [PATCH 094/129] Bug 1471698 - Switch the mingw clang compiler to the
 8 branch r=froydnj

This will match the compiler version Tor would like. We backport several
llvm-objcopy patches that landed right after the 8 branch though. We
also grab some upstream changes from mingw-clang in the build script

Differential Revision: https://phabricator.services.mozilla.com/D31347

--HG--
extra : moz-landing-system : lando
---
 build/build-clang/clang-8-mingw.json          |  26 +-
 ...copy-COFF-Implement-add-gnu-debuglin.patch | 260 +++++++
 ...FF-Add-support-for-removing-sections.patch | 665 ++++++++++++++++++
 ...F-Clear-the-unwritten-tail-of-coff_s.patch |  28 +
 ...F-Error-out-on-use-of-unhandled-opti.patch |  43 ++
 ...F-Fix-handling-of-aux-symbols-for-bi.patch | 377 ++++++++++
 ...jcopy-COFF-Implement-only-keep-debug.patch | 222 ++++++
 ...-objcopy-COFF-Implement-only-section.patch |  61 ++
 ...m-objcopy-COFF-Implement-strip-debug.patch | 160 +++++
 ...F-Remove-a-superfluous-namespace-qua.patch |  27 +
 ...F-Update-symbol-indices-in-weak-exte.patch | 224 ++++++
 ...sistently-use-createStringError-inst.patch | 242 +++++++
 ...urn-Error-from-Buffer-allocate-ELF-W.patch | 330 +++++++++
 .../scripts/misc/build-clang-8-mingw.sh       |  14 +-
 14 files changed, 2668 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 build/build-clang/clang-8-mingw.json
 create mode 100644 build/build-clang/mingwclang-Reapply-llvm-objcopy-COFF-Implement-add-gnu-debuglin.patch
 create mode 100644 build/build-clang/mingwclang-llvm-objcopy-COFF-Add-support-for-removing-sections.patch
 create mode 100644 build/build-clang/mingwclang-llvm-objcopy-COFF-Clear-the-unwritten-tail-of-coff_s.patch
 create mode 100644 build/build-clang/mingwclang-llvm-objcopy-COFF-Error-out-on-use-of-unhandled-opti.patch
 create mode 100644 build/build-clang/mingwclang-llvm-objcopy-COFF-Fix-handling-of-aux-symbols-for-bi.patch
 create mode 100644 build/build-clang/mingwclang-llvm-objcopy-COFF-Implement-only-keep-debug.patch
 create mode 100644 build/build-clang/mingwclang-llvm-objcopy-COFF-Implement-only-section.patch
 create mode 100644 build/build-clang/mingwclang-llvm-objcopy-COFF-Implement-strip-debug.patch
 create mode 100644 build/build-clang/mingwclang-llvm-objcopy-COFF-Remove-a-superfluous-namespace-qua.patch
 create mode 100644 build/build-clang/mingwclang-llvm-objcopy-COFF-Update-symbol-indices-in-weak-exte.patch
 create mode 100644 build/build-clang/mingwclang-llvm-objcopy-Consistently-use-createStringError-inst.patch
 create mode 100644 build/build-clang/mingwclang-llvm-objcopy-Return-Error-from-Buffer-allocate-ELF-W.patch

diff --git a/build/build-clang/clang-8-mingw.json b/build/build-clang/clang-8-mingw.json
old mode 100644
new mode 100755
index 56bd27172244..2df9c80eb5bf
--- a/build/build-clang/clang-8-mingw.json
+++ b/build/build-clang/clang-8-mingw.json
@@ -1,20 +1,32 @@
 {
-    "llvm_revision": "348363",
+    "llvm_revision": "356265",
     "stages": "3",
     "build_libcxx": true,
     "build_type": "Release",
     "assertions": false,
-    "llvm_repo": "https://llvm.org/svn/llvm-project/llvm/trunk",
-    "clang_repo": "https://llvm.org/svn/llvm-project/cfe/trunk",
-    "lld_repo": "https://llvm.org/svn/llvm-project/lld/trunk",
-    "compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/trunk",
-    "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/trunk",
-    "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/trunk",
+    "llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_800/final",
+    "clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_800/final",
+    "lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_800/final",
+    "compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_800/final",
+    "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_800/final",
+    "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_800/final",
     "python_path": "/usr/bin/python2.7",
     "gcc_dir": "/builds/worker/workspace/build/src/gcc",
     "cc": "/builds/worker/workspace/build/src/gcc/bin/gcc",
     "cxx": "/builds/worker/workspace/build/src/gcc/bin/g++",
     "as": "/builds/worker/workspace/build/src/gcc/bin/gcc",
     "patches": [
+        "mingwclang-llvm-objcopy-COFF-Remove-a-superfluous-namespace-qua.patch",
+        "mingwclang-llvm-objcopy-COFF-Add-support-for-removing-sections.patch",
+        "mingwclang-llvm-objcopy-COFF-Implement-strip-debug.patch",
+        "mingwclang-llvm-objcopy-COFF-Implement-only-keep-debug.patch",
+        "mingwclang-llvm-objcopy-COFF-Implement-only-section.patch",
+        "mingwclang-llvm-objcopy-Consistently-use-createStringError-inst.patch",
+        "mingwclang-llvm-objcopy-COFF-Update-symbol-indices-in-weak-exte.patch",
+        "mingwclang-llvm-objcopy-Return-Error-from-Buffer-allocate-ELF-W.patch",
+        "mingwclang-Reapply-llvm-objcopy-COFF-Implement-add-gnu-debuglin.patch",
+        "mingwclang-llvm-objcopy-COFF-Clear-the-unwritten-tail-of-coff_s.patch",
+        "mingwclang-llvm-objcopy-COFF-Fix-handling-of-aux-symbols-for-bi.patch",
+        "mingwclang-llvm-objcopy-COFF-Error-out-on-use-of-unhandled-opti.patch"
     ]
 }
diff --git a/build/build-clang/mingwclang-Reapply-llvm-objcopy-COFF-Implement-add-gnu-debuglin.patch b/build/build-clang/mingwclang-Reapply-llvm-objcopy-COFF-Implement-add-gnu-debuglin.patch
new file mode 100644
index 000000000000..6cb4656de763
--- /dev/null
+++ b/build/build-clang/mingwclang-Reapply-llvm-objcopy-COFF-Implement-add-gnu-debuglin.patch
@@ -0,0 +1,260 @@
+From 840d70f854a1d550924ced1d00160efcc7b8549a Mon Sep 17 00:00:00 2001
+From: Martin Storsjo <martin@martin.st>
+Date: Wed, 23 Jan 2019 08:25:28 +0000
+Subject: [PATCH] Reapply: [llvm-objcopy] [COFF] Implement --add-gnu-debuglink
+
+This was reverted since it broke a couple buildbots. The reason
+for the breakage is not yet known, but this time, the test has
+got more diagnostics added, to hopefully allow figuring out
+what goes wrong.
+
+Differential Revision: https://reviews.llvm.org/D57007
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351931 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ .../llvm-objcopy/COFF/add-gnu-debuglink.test  | 48 +++++++++++++++
+ tools/llvm-objcopy/COFF/COFFObjcopy.cpp       | 61 +++++++++++++++++++
+ tools/llvm-objcopy/COFF/Object.cpp            |  2 +-
+ tools/llvm-objcopy/COFF/Object.h              | 26 +++++++-
+ tools/llvm-objcopy/COFF/Reader.cpp            |  4 +-
+ tools/llvm-objcopy/COFF/Writer.cpp            |  9 +--
+ 6 files changed, 143 insertions(+), 7 deletions(-)
+ create mode 100644 test/tools/llvm-objcopy/COFF/add-gnu-debuglink.test
+
+diff --git a/llvm/test/tools/llvm-objcopy/COFF/add-gnu-debuglink.test b/llvm/test/tools/llvm-objcopy/COFF/add-gnu-debuglink.test
+new file mode 100644
+index 00000000000..cf3a9bba920
+--- /dev/null
++++ b/llvm/test/tools/llvm-objcopy/COFF/add-gnu-debuglink.test
+@@ -0,0 +1,48 @@
++RUN: yaml2obj %p/Inputs/x86_64-exe.yaml > %t.in123.exe
++
++# Using a debuglink filename with a length that is a multiple of 4, to
++# showcase padding in CONTENTS below.
++
++RUN: llvm-objcopy --add-gnu-debuglink=%t.in123.exe %t.in123.exe %t.out.exe
++
++# Temporary debugging of issues with this test:
++RUN: ls -l %t.out.exe || true
++RUN: od -Ax -t x1 %t.out.exe || true
++RUN: llvm-readobj -sections %t.out.exe || true
++
++RUN: llvm-readobj -sections %t.out.exe | FileCheck %s --check-prefix=SECTIONS
++RUN: llvm-objdump -s %t.out.exe | FileCheck %s --check-prefix=CONTENTS
++
++# Show the last of the preexisting sections, which is used for choosing
++# a virtual address for the generated one.
++
++SECTIONS:        Section {
++SECTIONS:          Number: 4
++SECTIONS-NEXT:     Name: .pdata
++SECTIONS-NEXT:     VirtualSize: 0x18
++SECTIONS-NEXT:     VirtualAddress: 0x4000
++SECTIONS-NEXT:     RawDataSize: 512
++SECTIONS:        Section {
++SECTIONS-NEXT:     Number: 5
++SECTIONS-NEXT:     Name: .gnu_debuglink
++SECTIONS-NEXT:     VirtualSize: 0x2C
++SECTIONS-NEXT:     VirtualAddress: 0x5000
++SECTIONS-NEXT:     RawDataSize: 512
++SECTIONS-NEXT:     PointerToRawData:
++SECTIONS-NEXT:     PointerToRelocations:
++SECTIONS-NEXT:     PointerToLineNumbers:
++SECTIONS-NEXT:     RelocationCount:
++SECTIONS-NEXT:     LineNumberCount:
++SECTIONS-NEXT:     Characteristics [ (0x42000040)
++SECTIONS-NEXT:       IMAGE_SCN_CNT_INITIALIZED_DATA (0x40)
++SECTIONS-NEXT:       IMAGE_SCN_MEM_DISCARDABLE (0x2000000)
++SECTIONS-NEXT:       IMAGE_SCN_MEM_READ (0x40000000)
++SECTIONS-NEXT:     ]
++
++# Note: The last 4 bytes here are the crc of the referenced file - if the
++# yaml2obj generated file changes, this crc changes.
++
++CONTENTS: Contents of section .gnu_debuglink:
++CONTENTS:  40005000 6164642d 676e752d 64656275 676c696e  add-gnu-debuglin
++CONTENTS:  40005010 6b2e7465 73742e74 6d702e69 6e313233  k.test.tmp.in123
++CONTENTS:  40005020 2e657865 00000000 7929adc3           .exe
+diff --git a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+index 8d8f53d13d8..20adbe11e7a 100644
+--- a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+@@ -17,6 +17,8 @@
+ #include "llvm/Object/Binary.h"
+ #include "llvm/Object/COFF.h"
+ #include "llvm/Support/Errc.h"
++#include "llvm/Support/JamCRC.h"
++#include "llvm/Support/Path.h"
+ #include <cassert>
+ 
+ namespace llvm {
+@@ -30,6 +32,61 @@ static bool isDebugSection(const Section &Sec) {
+   return Sec.Name.startswith(".debug");
+ }
+ 
++static uint64_t getNextRVA(const Object &Obj) {
++  if (Obj.getSections().empty())
++    return 0;
++  const Section &Last = Obj.getSections().back();
++  return alignTo(Last.Header.VirtualAddress + Last.Header.VirtualSize,
++                 Obj.PeHeader.SectionAlignment);
++}
++
++static uint32_t getCRC32(StringRef Data) {
++  JamCRC CRC;
++  CRC.update(ArrayRef<char>(Data.data(), Data.size()));
++  // The CRC32 value needs to be complemented because the JamCRC dosn't
++  // finalize the CRC32 value. It also dosn't negate the initial CRC32 value
++  // but it starts by default at 0xFFFFFFFF which is the complement of zero.
++  return ~CRC.getCRC();
++}
++
++static std::vector<uint8_t> createGnuDebugLinkSectionContents(StringRef File) {
++  ErrorOr<std::unique_ptr<MemoryBuffer>> LinkTargetOrErr =
++      MemoryBuffer::getFile(File);
++  if (!LinkTargetOrErr)
++    error("'" + File + "': " + LinkTargetOrErr.getError().message());
++  auto LinkTarget = std::move(*LinkTargetOrErr);
++  uint32_t CRC32 = getCRC32(LinkTarget->getBuffer());
++
++  StringRef FileName = sys::path::filename(File);
++  size_t CRCPos = alignTo(FileName.size() + 1, 4);
++  std::vector<uint8_t> Data(CRCPos + 4);
++  memcpy(Data.data(), FileName.data(), FileName.size());
++  support::endian::write32le(Data.data() + CRCPos, CRC32);
++  return Data;
++}
++
++static void addGnuDebugLink(Object &Obj, StringRef DebugLinkFile) {
++  uint32_t StartRVA = getNextRVA(Obj);
++
++  std::vector<Section> Sections;
++  Section Sec;
++  Sec.setOwnedContents(createGnuDebugLinkSectionContents(DebugLinkFile));
++  Sec.Name = ".gnu_debuglink";
++  Sec.Header.VirtualSize = Sec.getContents().size();
++  Sec.Header.VirtualAddress = StartRVA;
++  Sec.Header.SizeOfRawData =
++      alignTo(Sec.Header.VirtualSize, Obj.PeHeader.FileAlignment);
++  // Sec.Header.PointerToRawData is filled in by the writer.
++  Sec.Header.PointerToRelocations = 0;
++  Sec.Header.PointerToLinenumbers = 0;
++  // Sec.Header.NumberOfRelocations is filled in by the writer.
++  Sec.Header.NumberOfLinenumbers = 0;
++  Sec.Header.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA |
++                               IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_DISCARDABLE;
++  Sections.push_back(Sec);
++  Obj.addSections(Sections);
++}
++
+ static Error handleArgs(const CopyConfig &Config, Object &Obj) {
+   // Perform the actual section removals.
+   Obj.removeSections([&Config](const Section &Sec) {
+@@ -109,6 +166,10 @@ static Error handleArgs(const CopyConfig &Config, Object &Obj) {
+ 
+     return false;
+   });
++
++  if (!Config.AddGnuDebugLink.empty())
++    addGnuDebugLink(Obj, Config.AddGnuDebugLink);
++
+   return Error::success();
+ }
+ 
+diff --git a/llvm/tools/llvm-objcopy/COFF/Object.cpp b/llvm/tools/llvm-objcopy/COFF/Object.cpp
+index 83435dffa98..8c382c1faef 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Object.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Object.cpp
+@@ -129,7 +129,7 @@ void Object::removeSections(function_ref<bool(const Section &)> ToRemove) {
+ void Object::truncateSections(function_ref<bool(const Section &)> ToTruncate) {
+   for (Section &Sec : Sections) {
+     if (ToTruncate(Sec)) {
+-      Sec.Contents = ArrayRef<uint8_t>();
++      Sec.clearContents();
+       Sec.Relocs.clear();
+       Sec.Header.SizeOfRawData = 0;
+     }
+diff --git a/llvm/tools/llvm-objcopy/COFF/Object.h b/llvm/tools/llvm-objcopy/COFF/Object.h
+index 0630f9c5ff8..afa272286ef 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Object.h
++++ b/llvm/tools/llvm-objcopy/COFF/Object.h
+@@ -35,11 +35,35 @@ struct Relocation {
+ 
+ struct Section {
+   object::coff_section Header;
+-  ArrayRef<uint8_t> Contents;
+   std::vector<Relocation> Relocs;
+   StringRef Name;
+   ssize_t UniqueId;
+   size_t Index;
++
++  ArrayRef<uint8_t> getContents() const {
++    if (!OwnedContents.empty())
++      return OwnedContents;
++    return ContentsRef;
++  }
++
++  void setContentsRef(ArrayRef<uint8_t> Data) {
++    OwnedContents.clear();
++    ContentsRef = Data;
++  }
++
++  void setOwnedContents(std::vector<uint8_t> &&Data) {
++    ContentsRef = ArrayRef<uint8_t>();
++    OwnedContents = std::move(Data);
++  }
++
++  void clearContents() {
++    ContentsRef = ArrayRef<uint8_t>();
++    OwnedContents.clear();
++  }
++
++private:
++  ArrayRef<uint8_t> ContentsRef;
++  std::vector<uint8_t> OwnedContents;
+ };
+ 
+ struct Symbol {
+diff --git a/llvm/tools/llvm-objcopy/COFF/Reader.cpp b/llvm/tools/llvm-objcopy/COFF/Reader.cpp
+index 2446277cc2b..87dd60a43cf 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Reader.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Reader.cpp
+@@ -69,8 +69,10 @@ Error COFFReader::readSections(Object &Obj) const {
+     Sections.push_back(Section());
+     Section &S = Sections.back();
+     S.Header = *Sec;
+-    if (auto EC = COFFObj.getSectionContents(Sec, S.Contents))
++    ArrayRef<uint8_t> Contents;
++    if (auto EC = COFFObj.getSectionContents(Sec, Contents))
+       return errorCodeToError(EC);
++    S.setContentsRef(Contents);
+     ArrayRef<coff_relocation> Relocs = COFFObj.getRelocations(Sec);
+     for (const coff_relocation &R : Relocs)
+       S.Relocs.push_back(R);
+diff --git a/llvm/tools/llvm-objcopy/COFF/Writer.cpp b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+index db3589bb119..05e46291c39 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Writer.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+@@ -286,14 +286,15 @@ void COFFWriter::writeHeaders(bool IsBigObj) {
+ void COFFWriter::writeSections() {
+   for (const auto &S : Obj.getSections()) {
+     uint8_t *Ptr = Buf.getBufferStart() + S.Header.PointerToRawData;
+-    std::copy(S.Contents.begin(), S.Contents.end(), Ptr);
++    ArrayRef<uint8_t> Contents = S.getContents();
++    std::copy(Contents.begin(), Contents.end(), Ptr);
+ 
+     // For executable sections, pad the remainder of the raw data size with
+     // 0xcc, which is int3 on x86.
+     if ((S.Header.Characteristics & IMAGE_SCN_CNT_CODE) &&
+-        S.Header.SizeOfRawData > S.Contents.size())
+-      memset(Ptr + S.Contents.size(), 0xcc,
+-             S.Header.SizeOfRawData - S.Contents.size());
++        S.Header.SizeOfRawData > Contents.size())
++      memset(Ptr + Contents.size(), 0xcc,
++             S.Header.SizeOfRawData - Contents.size());
+ 
+     Ptr += S.Header.SizeOfRawData;
+     for (const auto &R : S.Relocs) {
+-- 
+2.17.1
+
diff --git a/build/build-clang/mingwclang-llvm-objcopy-COFF-Add-support-for-removing-sections.patch b/build/build-clang/mingwclang-llvm-objcopy-COFF-Add-support-for-removing-sections.patch
new file mode 100644
index 000000000000..41e7a94e3bec
--- /dev/null
+++ b/build/build-clang/mingwclang-llvm-objcopy-COFF-Add-support-for-removing-sections.patch
@@ -0,0 +1,665 @@
+From 2ccafacb7ddd740054dbee06655749ebc55a4d86 Mon Sep 17 00:00:00 2001
+From: Martin Storsjo <martin@martin.st>
+Date: Sat, 19 Jan 2019 19:42:35 +0000
+Subject: [PATCH] [llvm-objcopy] [COFF] Add support for removing sections
+
+Differential Revision: https://reviews.llvm.org/D56683
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351660 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ .../llvm-objcopy/COFF/remove-section.test     | 210 ++++++++++++++++++
+ tools/llvm-objcopy/COFF/COFFObjcopy.cpp       |  10 +-
+ tools/llvm-objcopy/COFF/Object.cpp            |  63 ++++++
+ tools/llvm-objcopy/COFF/Object.h              |  27 ++-
+ tools/llvm-objcopy/COFF/Reader.cpp            |  31 ++-
+ tools/llvm-objcopy/COFF/Writer.cpp            |  68 ++++--
+ tools/llvm-objcopy/COFF/Writer.h              |   1 +
+ 7 files changed, 391 insertions(+), 19 deletions(-)
+ create mode 100644 test/tools/llvm-objcopy/COFF/remove-section.test
+
+diff --git a/llvm/test/tools/llvm-objcopy/COFF/remove-section.test b/llvm/test/tools/llvm-objcopy/COFF/remove-section.test
+new file mode 100644
+index 00000000000..b3dfb0b98cb
+--- /dev/null
++++ b/llvm/test/tools/llvm-objcopy/COFF/remove-section.test
+@@ -0,0 +1,210 @@
++# RUN: yaml2obj %s > %t.in.o
++#
++# RUN: llvm-objdump -section-headers %t.in.o | FileCheck %s --check-prefixes=SECTIONS-PRE
++# RUN: llvm-objdump -t %t.in.o | FileCheck %s --check-prefixes=SYMBOLS-PRE
++#
++# RUN: llvm-objcopy -R .bss %t.in.o %t.remove-bss.o
++# RUN: llvm-objdump -section-headers %t.remove-bss.o | FileCheck %s --check-prefix=SECTIONS-REMOVE-BSS
++# RUN: llvm-objdump -t %t.remove-bss.o | FileCheck %s --check-prefix=SYMBOLS-REMOVE-BSS
++#
++# RUN: llvm-objcopy --remove-section .bss %t.in.o %t.cmp.o
++# RUN: cmp %t.remove-bss.o %t.cmp.o
++#
++# RUN: llvm-objcopy -R .text %t.in.o %t.remove-text.o
++# RUN: llvm-objdump -section-headers %t.remove-text.o | FileCheck %s --check-prefix=SECTIONS-REMOVE-TEXT
++# RUN: llvm-objdump -t %t.remove-text.o | FileCheck %s --check-prefix=SYMBOLS-REMOVE-TEXT
++#
++# RUN: not llvm-objcopy -R .comdat %t.in.o %t.remove-comdat.o 2>&1 | FileCheck %s --check-prefix=ERROR-RELOC
++#
++# RUN: llvm-objcopy -R .text -R .comdat %t.in.o %t.remove-text-comdat.o
++# RUN: llvm-objdump -section-headers %t.remove-text-comdat.o | FileCheck %s --check-prefix=SECTIONS-REMOVE-TEXT-COMDAT
++# RUN: llvm-objdump -t %t.remove-text-comdat.o | FileCheck %s --check-prefix=SYMBOLS-REMOVE-TEXT-COMDAT
++#
++#
++# SECTIONS-PRE: Sections:
++# SECTIONS-PRE-NEXT: Idx Name
++# SECTIONS-PRE-NEXT: 0 .text
++# SECTIONS-PRE-NEXT: 1 .bss
++# SECTIONS-PRE-NEXT: 2 .comdat
++# SECTIONS-PRE-NEXT: 3 .associative
++# SECTIONS-PRE-EMPTY:
++#
++# SYMBOLS-PRE: SYMBOL TABLE:
++# SYMBOLS-PRE-NEXT: {{.*}}(sec -1){{.*}} @feat.00
++# SYMBOLS-PRE-NEXT: {{.*}}(sec 1){{.*}} .text
++# SYMBOLS-PRE-NEXT: AUX scnlen {{.*}} assoc 1 comdat 0
++# SYMBOLS-PRE-NEXT: {{.*}}(sec 2){{.*}} .bss
++# SYMBOLS-PRE-NEXT: AUX scnlen {{.*}} assoc 2 comdat 0
++# SYMBOLS-PRE-NEXT: {{.*}}(sec 4){{.*}} .associative
++# SYMBOLS-PRE-NEXT: AUX scnlen {{.*}} assoc 3 comdat 5
++# SYMBOLS-PRE-NEXT: {{.*}}(sec 3){{.*}} .comdat
++# SYMBOLS-PRE-NEXT: AUX scnlen {{.*}} assoc 3 comdat 2
++# SYMBOLS-PRE-NEXT: {{.*}}(sec 3){{.*}} foo
++# SYMBOLS-PRE-NEXT: {{.*}}(sec 1){{.*}} main
++# SYMBOLS-PRE-EMPTY:
++#
++#
++# Removing the .bss section removes one symbol and its aux symbol,
++# and updates the section indices in symbols pointing to later
++# symbols, including the aux section defintitions.
++#
++# Testing that the absolute symbol @feat.00 survives the section number
++# mangling.
++#
++# SECTIONS-REMOVE-BSS: Sections:
++# SECTIONS-REMOVE-BSS-NEXT: Idx Name
++# SECTIONS-REMOVE-BSS-NEXT: 0 .text
++# SECTIONS-REMOVE-BSS-NEXT: 1 .comdat
++# SECTIONS-REMOVE-BSS-NEXT: 2 .associative
++# SECTIONS-REMOVE-BSS-EMPTY:
++#
++# SYMBOLS-REMOVE-BSS: SYMBOL TABLE:
++# SYMBOLS-REMOVE-BSS-NEXT: {{.*}}(sec -1){{.*}} @feat.00
++# SYMBOLS-REMOVE-BSS-NEXT: {{.*}}(sec 1){{.*}} .text
++# SYMBOLS-REMOVE-BSS-NEXT: AUX scnlen {{.*}} assoc 1 comdat 0
++# SYMBOLS-REMOVE-BSS-NEXT: {{.*}}(sec 3){{.*}} .associative
++# SYMBOLS-REMOVE-BSS-NEXT: AUX scnlen {{.*}} assoc 2 comdat 5
++# SYMBOLS-REMOVE-BSS-NEXT: {{.*}}(sec 2){{.*}} .comdat
++# SYMBOLS-REMOVE-BSS-NEXT: AUX scnlen {{.*}} assoc 2 comdat 2
++# SYMBOLS-REMOVE-BSS-NEXT: {{.*}}(sec 2){{.*}} foo
++# SYMBOLS-REMOVE-BSS-NEXT: {{.*}}(sec 1){{.*}} main
++# SYMBOLS-REMOVE-BSS-EMPTY:
++#
++#
++# Removing the .text section is ok and just removes the external symbol
++# referring to it.
++#
++# SECTIONS-REMOVE-TEXT: Sections:
++# SECTIONS-REMOVE-TEXT-NEXT: Idx Name
++# SECTIONS-REMOVE-TEXT-NEXT: 0 .bss
++# SECTIONS-REMOVE-TEXT-NEXT: 1 .comdat
++# SECTIONS-REMOVE-TEXT-NEXT: 2 .associative
++# SECTIONS-REMOVE-TEXT-EMPTY:
++#
++# SYMBOLS-REMOVE-TEXT: SYMBOL TABLE:
++# SYMBOLS-REMOVE-TEXT-NEXT: {{.*}}(sec -1){{.*}} @feat.00
++# SYMBOLS-REMOVE-TEXT-NEXT: {{.*}}(sec 1){{.*}} .bss
++# SYMBOLS-REMOVE-TEXT-NEXT: AUX scnlen {{.*}} assoc 1 comdat 0
++# SYMBOLS-REMOVE-TEXT-NEXT: {{.*}}(sec 3){{.*}} .associative
++# SYMBOLS-REMOVE-TEXT-NEXT: AUX scnlen {{.*}} assoc 2 comdat 5
++# SYMBOLS-REMOVE-TEXT-NEXT: {{.*}}(sec 2){{.*}} .comdat
++# SYMBOLS-REMOVE-TEXT-NEXT: AUX scnlen {{.*}} assoc 2 comdat 2
++# SYMBOLS-REMOVE-TEXT-NEXT: {{.*}}(sec 2){{.*}} foo
++# SYMBOLS-REMOVE-TEXT-EMPTY:
++#
++#
++# Removing the .comdat section fails, since the .text section has relocations
++# against it.
++#
++# ERROR-RELOC: Relocation target foo ({{.*}}) not found
++#
++#
++# Removing the .comdat section and .text (with a relocation against .comdat)
++# works, as it also removes the .associative section transitively.
++#
++# SECTIONS-REMOVE-TEXT-COMDAT: Sections:
++# SECTIONS-REMOVE-TEXT-COMDAT-NEXT: Idx Name
++# SECTIONS-REMOVE-TEXT-COMDAT-NEXT: 0 .bss
++# SECTIONS-REMOVE-TEXT-COMDAT-EMPTY:
++#
++# SYMBOLS-REMOVE-TEXT-COMDAT: SYMBOL TABLE:
++# SYMBOLS-REMOVE-TEXT-COMDAT-NEXT: {{.*}}(sec -1){{.*}} @feat.00
++# SYMBOLS-REMOVE-TEXT-COMDAT-NEXT: {{.*}}(sec 1){{.*}} .bss
++# SYMBOLS-REMOVE-TEXT-COMDAT-NEXT: AUX scnlen {{.*}} assoc 1 comdat 0
++# SYMBOLS-REMOVE-TEXT-COMDAT-EMPTY:
++
++--- !COFF
++header:          
++  Machine:         IMAGE_FILE_MACHINE_AMD64
++  Characteristics: [  ]
++sections:        
++  - Name:            .text
++    Characteristics: [  ]
++    Alignment:       4
++    SectionData:     488B0500000000C3
++    Relocations:     
++      - VirtualAddress:  3
++        SymbolName:      foo
++        Type:            IMAGE_REL_AMD64_REL32
++  - Name:            .bss
++    Characteristics: [  ]
++    Alignment:       4
++    SectionData:     ''
++  - Name:            .comdat
++    Characteristics: [ IMAGE_SCN_LNK_COMDAT ]
++    Alignment:       1
++    SectionData:     '2A000000'
++  - Name:            .associative
++    Characteristics: [ IMAGE_SCN_LNK_COMDAT ]
++    Alignment:       1
++    SectionData:     '0000000000000000'
++symbols:         
++  - Name:            '@feat.00'
++    Value:           0
++    SectionNumber:   -1
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_NULL
++    StorageClass:    IMAGE_SYM_CLASS_STATIC
++  - Name:            .text
++    Value:           0
++    SectionNumber:   1
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_NULL
++    StorageClass:    IMAGE_SYM_CLASS_STATIC
++    SectionDefinition: 
++      Length:          8
++      NumberOfRelocations: 1
++      NumberOfLinenumbers: 0
++      CheckSum:        583624169
++      Number:          1
++  - Name:            .bss
++    Value:           0
++    SectionNumber:   2
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_NULL
++    StorageClass:    IMAGE_SYM_CLASS_STATIC
++    SectionDefinition: 
++      Length:          0
++      NumberOfRelocations: 0
++      NumberOfLinenumbers: 0
++      CheckSum:        0
++      Number:          2
++  - Name:            .associative
++    Value:           0
++    SectionNumber:   4
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_NULL
++    StorageClass:    IMAGE_SYM_CLASS_STATIC
++    SectionDefinition: 
++      Length:          8
++      NumberOfRelocations: 0
++      NumberOfLinenumbers: 0
++      CheckSum:        0
++      Number:          3
++      Selection:       IMAGE_COMDAT_SELECT_ASSOCIATIVE
++  - Name:            .comdat
++    Value:           0
++    SectionNumber:   3
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_NULL
++    StorageClass:    IMAGE_SYM_CLASS_STATIC
++    SectionDefinition: 
++      Length:          4
++      NumberOfRelocations: 0
++      NumberOfLinenumbers: 0
++      CheckSum:        3482275674
++      Number:          3
++      Selection:       IMAGE_COMDAT_SELECT_ANY
++  - Name:            foo
++    Value:           0
++    SectionNumber:   3
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_NULL
++    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
++  - Name:            main
++    Value:           0
++    SectionNumber:   1
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_NULL
++    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
++...
+diff --git a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+index 437dccbd3d5..dd2e4829218 100644
+--- a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+@@ -27,9 +27,17 @@ using namespace object;
+ using namespace COFF;
+ 
+ static Error handleArgs(const CopyConfig &Config, Object &Obj) {
++  // Perform the actual section removals.
++  Obj.removeSections([&Config](const Section &Sec) {
++    if (is_contained(Config.ToRemove, Sec.Name))
++      return true;
++
++    return false;
++  });
++
+   // StripAll removes all symbols and thus also removes all relocations.
+   if (Config.StripAll || Config.StripAllGNU)
+-    for (Section &Sec : Obj.Sections)
++    for (Section &Sec : Obj.getMutableSections())
+       Sec.Relocs.clear();
+ 
+   // If we need to do per-symbol removals, initialize the Referenced field.
+diff --git a/llvm/tools/llvm-objcopy/COFF/Object.cpp b/llvm/tools/llvm-objcopy/COFF/Object.cpp
+index e58e161e7d2..e19cea6aa9d 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Object.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Object.cpp
+@@ -7,6 +7,7 @@
+ //===----------------------------------------------------------------------===//
+ 
+ #include "Object.h"
++#include "llvm/ADT/DenseSet.h"
+ #include <algorithm>
+ 
+ namespace llvm {
+@@ -64,6 +65,68 @@ Error Object::markSymbols() {
+   return Error::success();
+ }
+ 
++void Object::addSections(ArrayRef<Section> NewSections) {
++  for (Section S : NewSections) {
++    S.UniqueId = NextSectionUniqueId++;
++    Sections.emplace_back(S);
++  }
++  updateSections();
++}
++
++void Object::updateSections() {
++  SectionMap = DenseMap<ssize_t, Section *>(Sections.size());
++  size_t Index = 1;
++  for (Section &S : Sections) {
++    SectionMap[S.UniqueId] = &S;
++    S.Index = Index++;
++  }
++}
++
++const Section *Object::findSection(ssize_t UniqueId) const {
++  auto It = SectionMap.find(UniqueId);
++  if (It == SectionMap.end())
++    return nullptr;
++  return It->second;
++}
++
++void Object::removeSections(function_ref<bool(const Section &)> ToRemove) {
++  DenseSet<ssize_t> AssociatedSections;
++  auto RemoveAssociated = [&AssociatedSections](const Section &Sec) {
++    return AssociatedSections.count(Sec.UniqueId) == 1;
++  };
++  do {
++    DenseSet<ssize_t> RemovedSections;
++    Sections.erase(
++        std::remove_if(std::begin(Sections), std::end(Sections),
++                       [ToRemove, &RemovedSections](const Section &Sec) {
++                         bool Remove = ToRemove(Sec);
++                         if (Remove)
++                           RemovedSections.insert(Sec.UniqueId);
++                         return Remove;
++                       }),
++        std::end(Sections));
++    // Remove all symbols referring to the removed sections.
++    AssociatedSections.clear();
++    Symbols.erase(
++        std::remove_if(
++            std::begin(Symbols), std::end(Symbols),
++            [&RemovedSections, &AssociatedSections](const Symbol &Sym) {
++              // If there are sections that are associative to a removed
++              // section,
++              // remove those as well as nothing will include them (and we can't
++              // leave them dangling).
++              if (RemovedSections.count(Sym.AssociativeComdatTargetSectionId) ==
++                  1)
++                AssociatedSections.insert(Sym.TargetSectionId);
++              return RemovedSections.count(Sym.TargetSectionId) == 1;
++            }),
++        std::end(Symbols));
++    ToRemove = RemoveAssociated;
++  } while (!AssociatedSections.empty());
++  updateSections();
++  updateSymbols();
++}
++
+ } // end namespace coff
+ } // end namespace objcopy
+ } // end namespace llvm
+diff --git a/llvm/tools/llvm-objcopy/COFF/Object.h b/llvm/tools/llvm-objcopy/COFF/Object.h
+index e6147c40b7c..a73e93620d3 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Object.h
++++ b/llvm/tools/llvm-objcopy/COFF/Object.h
+@@ -37,12 +37,16 @@ struct Section {
+   ArrayRef<uint8_t> Contents;
+   std::vector<Relocation> Relocs;
+   StringRef Name;
++  ssize_t UniqueId;
++  size_t Index;
+ };
+ 
+ struct Symbol {
+   object::coff_symbol32 Sym;
+   StringRef Name;
+-  ArrayRef<uint8_t> AuxData;
++  std::vector<uint8_t> AuxData;
++  ssize_t TargetSectionId;
++  ssize_t AssociativeComdatTargetSectionId = 0;
+   size_t UniqueId;
+   size_t RawIndex;
+   bool Referenced;
+@@ -61,7 +65,6 @@ struct Object {
+   uint32_t BaseOfData = 0; // pe32plus_header lacks this field.
+ 
+   std::vector<object::data_directory> DataDirectories;
+-  std::vector<Section> Sections;
+ 
+   ArrayRef<Symbol> getSymbols() const { return Symbols; }
+   // This allows mutating individual Symbols, but not mutating the list
+@@ -79,14 +82,34 @@ struct Object {
+   // all sections.
+   Error markSymbols();
+ 
++  ArrayRef<Section> getSections() const { return Sections; }
++  // This allows mutating individual Sections, but not mutating the list
++  // of symbols itself.
++  iterator_range<std::vector<Section>::iterator> getMutableSections() {
++    return make_range(Sections.begin(), Sections.end());
++  }
++
++  const Section *findSection(ssize_t UniqueId) const;
++
++  void addSections(ArrayRef<Section> NewSections);
++  void removeSections(function_ref<bool(const Section &)> ToRemove);
++
+ private:
+   std::vector<Symbol> Symbols;
+   DenseMap<size_t, Symbol *> SymbolMap;
+ 
+   size_t NextSymbolUniqueId = 0;
+ 
++  std::vector<Section> Sections;
++  DenseMap<ssize_t, Section *> SectionMap;
++
++  ssize_t NextSectionUniqueId = 1; // Allow a UniqueId 0 to mean undefined.
++
+   // Update SymbolMap and RawIndex in each Symbol.
+   void updateSymbols();
++
++  // Update SectionMap and Index in each Section.
++  void updateSections();
+ };
+ 
+ // Copy between coff_symbol16 and coff_symbol32.
+diff --git a/llvm/tools/llvm-objcopy/COFF/Reader.cpp b/llvm/tools/llvm-objcopy/COFF/Reader.cpp
+index d794042ae24..c8abe2913a2 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Reader.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Reader.cpp
+@@ -11,6 +11,7 @@
+ #include "llvm-objcopy.h"
+ #include "llvm/ADT/ArrayRef.h"
+ #include "llvm/ADT/StringRef.h"
++#include "llvm/BinaryFormat/COFF.h"
+ #include "llvm/Object/COFF.h"
+ #include "llvm/Support/ErrorHandling.h"
+ #include <cstddef>
+@@ -21,6 +22,7 @@ namespace objcopy {
+ namespace coff {
+ 
+ using namespace object;
++using namespace COFF;
+ 
+ Error COFFReader::readExecutableHeaders(Object &Obj) const {
+   const dos_header *DH = COFFObj.getDOSHeader();
+@@ -58,13 +60,14 @@ Error COFFReader::readExecutableHeaders(Object &Obj) const {
+ }
+ 
+ Error COFFReader::readSections(Object &Obj) const {
++  std::vector<Section> Sections;
+   // Section indexing starts from 1.
+   for (size_t I = 1, E = COFFObj.getNumberOfSections(); I <= E; I++) {
+     const coff_section *Sec;
+     if (auto EC = COFFObj.getSection(I, Sec))
+       return errorCodeToError(EC);
+-    Obj.Sections.push_back(Section());
+-    Section &S = Obj.Sections.back();
++    Sections.push_back(Section());
++    Section &S = Sections.back();
+     S.Header = *Sec;
+     if (auto EC = COFFObj.getSectionContents(Sec, S.Contents))
+       return errorCodeToError(EC);
+@@ -77,12 +80,14 @@ Error COFFReader::readSections(Object &Obj) const {
+       return make_error<StringError>("Extended relocations not supported yet",
+                                      object_error::parse_failed);
+   }
++  Obj.addSections(Sections);
+   return Error::success();
+ }
+ 
+ Error COFFReader::readSymbols(Object &Obj, bool IsBigObj) const {
+   std::vector<Symbol> Symbols;
+   Symbols.reserve(COFFObj.getRawNumberOfSymbols());
++  ArrayRef<Section> Sections = Obj.getSections();
+   for (uint32_t I = 0, E = COFFObj.getRawNumberOfSymbols(); I < E;) {
+     Expected<COFFSymbolRef> SymOrErr = COFFObj.getSymbol(I);
+     if (!SymOrErr)
+@@ -103,6 +108,26 @@ Error COFFReader::readSymbols(Object &Obj, bool IsBigObj) const {
+     Sym.AuxData = COFFObj.getSymbolAuxData(SymRef);
+     assert((Sym.AuxData.size() %
+             (IsBigObj ? sizeof(coff_symbol32) : sizeof(coff_symbol16))) == 0);
++    // Find the unique id of the section
++    if (SymRef.getSectionNumber() <=
++        0) // Special symbol (undefined/absolute/debug)
++      Sym.TargetSectionId = SymRef.getSectionNumber();
++    else if (static_cast<uint32_t>(SymRef.getSectionNumber() - 1) <
++             Sections.size())
++      Sym.TargetSectionId = Sections[SymRef.getSectionNumber() - 1].UniqueId;
++    else
++      return make_error<StringError>("Section number out of range",
++                                     object_error::parse_failed);
++    // For section definitions, check if it is comdat associative, and if
++    // it is, find the target section unique id.
++    const coff_aux_section_definition *SD = SymRef.getSectionDefinition();
++    if (SD && SD->Selection == IMAGE_COMDAT_SELECT_ASSOCIATIVE) {
++      int32_t Index = SD->getNumber(IsBigObj);
++      if (Index <= 0 || static_cast<uint32_t>(Index - 1) >= Sections.size())
++        return make_error<StringError>("Unexpected associative section index",
++                                       object_error::parse_failed);
++      Sym.AssociativeComdatTargetSectionId = Sections[Index - 1].UniqueId;
++    }
+     I += 1 + SymRef.getNumberOfAuxSymbols();
+   }
+   Obj.addSymbols(Symbols);
+@@ -116,7 +141,7 @@ Error COFFReader::setRelocTargets(Object &Obj) const {
+     for (size_t I = 0; I < Sym.Sym.NumberOfAuxSymbols; I++)
+       RawSymbolTable.push_back(nullptr);
+   }
+-  for (Section &Sec : Obj.Sections) {
++  for (Section &Sec : Obj.getMutableSections()) {
+     for (Relocation &R : Sec.Relocs) {
+       if (R.Reloc.SymbolTableIndex >= RawSymbolTable.size())
+         return make_error<StringError>("SymbolTableIndex out of range",
+diff --git a/llvm/tools/llvm-objcopy/COFF/Writer.cpp b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+index c347810dd24..9fb7812672b 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Writer.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+@@ -25,7 +25,7 @@ using namespace object;
+ using namespace COFF;
+ 
+ Error COFFWriter::finalizeRelocTargets() {
+-  for (Section &Sec : Obj.Sections) {
++  for (Section &Sec : Obj.getMutableSections()) {
+     for (Relocation &R : Sec.Relocs) {
+       const Symbol *Sym = Obj.findSymbol(R.Target);
+       if (Sym == nullptr)
+@@ -39,8 +39,48 @@ Error COFFWriter::finalizeRelocTargets() {
+   return Error::success();
+ }
+ 
++Error COFFWriter::finalizeSectionNumbers() {
++  for (Symbol &Sym : Obj.getMutableSymbols()) {
++    if (Sym.TargetSectionId <= 0) {
++      // Undefined, or a special kind of symbol. These negative values
++      // are stored in the SectionNumber field which is unsigned.
++      Sym.Sym.SectionNumber = static_cast<uint32_t>(Sym.TargetSectionId);
++    } else {
++      const Section *Sec = Obj.findSection(Sym.TargetSectionId);
++      if (Sec == nullptr)
++        return make_error<StringError>("Symbol " + Sym.Name +
++                                           " points to a removed section",
++                                       object_error::invalid_symbol_index);
++      Sym.Sym.SectionNumber = Sec->Index;
++
++      if (Sym.Sym.NumberOfAuxSymbols == 1 &&
++          Sym.Sym.StorageClass == IMAGE_SYM_CLASS_STATIC) {
++        coff_aux_section_definition *SD =
++            reinterpret_cast<coff_aux_section_definition *>(Sym.AuxData.data());
++        uint32_t SDSectionNumber;
++        if (Sym.AssociativeComdatTargetSectionId == 0) {
++          // Not a comdat associative section; just set the Number field to
++          // the number of the section itself.
++          SDSectionNumber = Sec->Index;
++        } else {
++          Sec = Obj.findSection(Sym.AssociativeComdatTargetSectionId);
++          if (Sec == nullptr)
++            return make_error<StringError>(
++                "Symbol " + Sym.Name + " is associative to a removed section",
++                object_error::invalid_symbol_index);
++          SDSectionNumber = Sec->Index;
++        }
++        // Update the section definition with the new section number.
++        SD->NumberLowPart = static_cast<uint16_t>(SDSectionNumber);
++        SD->NumberHighPart = static_cast<uint16_t>(SDSectionNumber >> 16);
++      }
++    }
++  }
++  return Error::success();
++}
++
+ void COFFWriter::layoutSections() {
+-  for (auto &S : Obj.Sections) {
++  for (auto &S : Obj.getMutableSections()) {
+     if (S.Header.SizeOfRawData > 0)
+       S.Header.PointerToRawData = FileSize;
+     FileSize += S.Header.SizeOfRawData; // For executables, this is already
+@@ -57,7 +97,7 @@ void COFFWriter::layoutSections() {
+ }
+ 
+ size_t COFFWriter::finalizeStringTable() {
+-  for (auto &S : Obj.Sections)
++  for (const auto &S : Obj.getSections())
+     if (S.Name.size() > COFF::NameSize)
+       StrTabBuilder.add(S.Name);
+ 
+@@ -67,7 +107,7 @@ size_t COFFWriter::finalizeStringTable() {
+ 
+   StrTabBuilder.finalize();
+ 
+-  for (auto &S : Obj.Sections) {
++  for (auto &S : Obj.getMutableSections()) {
+     if (S.Name.size() > COFF::NameSize) {
+       snprintf(S.Header.Name, sizeof(S.Header.Name), "/%d",
+                (int)StrTabBuilder.getOffset(S.Name));
+@@ -97,6 +137,8 @@ std::pair<size_t, size_t> COFFWriter::finalizeSymbolTable() {
+ Error COFFWriter::finalize(bool IsBigObj) {
+   if (Error E = finalizeRelocTargets())
+     return E;
++  if (Error E = finalizeSectionNumbers())
++    return E;
+ 
+   size_t SizeOfHeaders = 0;
+   FileAlignment = 1;
+@@ -113,10 +155,10 @@ Error COFFWriter::finalize(bool IsBigObj) {
+     SizeOfHeaders +=
+         PeHeaderSize + sizeof(data_directory) * Obj.DataDirectories.size();
+   }
+-  Obj.CoffFileHeader.NumberOfSections = Obj.Sections.size();
++  Obj.CoffFileHeader.NumberOfSections = Obj.getSections().size();
+   SizeOfHeaders +=
+       IsBigObj ? sizeof(coff_bigobj_file_header) : sizeof(coff_file_header);
+-  SizeOfHeaders += sizeof(coff_section) * Obj.Sections.size();
++  SizeOfHeaders += sizeof(coff_section) * Obj.getSections().size();
+   SizeOfHeaders = alignTo(SizeOfHeaders, FileAlignment);
+ 
+   Obj.CoffFileHeader.SizeOfOptionalHeader =
+@@ -131,8 +173,8 @@ Error COFFWriter::finalize(bool IsBigObj) {
+     Obj.PeHeader.SizeOfHeaders = SizeOfHeaders;
+     Obj.PeHeader.SizeOfInitializedData = SizeOfInitializedData;
+ 
+-    if (!Obj.Sections.empty()) {
+-      const Section &S = Obj.Sections.back();
++    if (!Obj.getSections().empty()) {
++      const Section &S = Obj.getSections().back();
+       Obj.PeHeader.SizeOfImage =
+           alignTo(S.Header.VirtualAddress + S.Header.VirtualSize,
+                   Obj.PeHeader.SectionAlignment);
+@@ -198,7 +240,7 @@ void COFFWriter::writeHeaders(bool IsBigObj) {
+     BigObjHeader.unused4 = 0;
+     // The value in Obj.CoffFileHeader.NumberOfSections is truncated, thus
+     // get the original one instead.
+-    BigObjHeader.NumberOfSections = Obj.Sections.size();
++    BigObjHeader.NumberOfSections = Obj.getSections().size();
+     BigObjHeader.PointerToSymbolTable = Obj.CoffFileHeader.PointerToSymbolTable;
+     BigObjHeader.NumberOfSymbols = Obj.CoffFileHeader.NumberOfSymbols;
+ 
+@@ -223,14 +265,14 @@ void COFFWriter::writeHeaders(bool IsBigObj) {
+       Ptr += sizeof(DD);
+     }
+   }
+-  for (const auto &S : Obj.Sections) {
++  for (const auto &S : Obj.getSections()) {
+     memcpy(Ptr, &S.Header, sizeof(S.Header));
+     Ptr += sizeof(S.Header);
+   }
+ }
+ 
+ void COFFWriter::writeSections() {
+-  for (const auto &S : Obj.Sections) {
++  for (const auto &S : Obj.getSections()) {
+     uint8_t *Ptr = Buf.getBufferStart() + S.Header.PointerToRawData;
+     std::copy(S.Contents.begin(), S.Contents.end(), Ptr);
+ 
+@@ -295,7 +337,7 @@ Error COFFWriter::patchDebugDirectory() {
+   const data_directory *Dir = &Obj.DataDirectories[DEBUG_DIRECTORY];
+   if (Dir->Size <= 0)
+     return Error::success();
+-  for (const auto &S : Obj.Sections) {
++  for (const auto &S : Obj.getSections()) {
+     if (Dir->RelativeVirtualAddress >= S.Header.VirtualAddress &&
+         Dir->RelativeVirtualAddress <
+             S.Header.VirtualAddress + S.Header.SizeOfRawData) {
+@@ -324,7 +366,7 @@ Error COFFWriter::patchDebugDirectory() {
+ }
+ 
+ Error COFFWriter::write() {
+-  bool IsBigObj = Obj.Sections.size() > MaxNumberOfSections16;
++  bool IsBigObj = Obj.getSections().size() > MaxNumberOfSections16;
+   if (IsBigObj && Obj.IsPE)
+     return make_error<StringError>("Too many sections for executable",
+                                    object_error::parse_failed);
+diff --git a/llvm/tools/llvm-objcopy/COFF/Writer.h b/llvm/tools/llvm-objcopy/COFF/Writer.h
+index 52fef385926..a967a103df9 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Writer.h
++++ b/llvm/tools/llvm-objcopy/COFF/Writer.h
+@@ -31,6 +31,7 @@ class COFFWriter {
+   StringTableBuilder StrTabBuilder;
+ 
+   Error finalizeRelocTargets();
++  Error finalizeSectionNumbers();
+   void layoutSections();
+   size_t finalizeStringTable();
+   template <class SymbolTy> std::pair<size_t, size_t> finalizeSymbolTable();
+-- 
+2.17.1
+
diff --git a/build/build-clang/mingwclang-llvm-objcopy-COFF-Clear-the-unwritten-tail-of-coff_s.patch b/build/build-clang/mingwclang-llvm-objcopy-COFF-Clear-the-unwritten-tail-of-coff_s.patch
new file mode 100644
index 000000000000..4aca91152f1f
--- /dev/null
+++ b/build/build-clang/mingwclang-llvm-objcopy-COFF-Clear-the-unwritten-tail-of-coff_s.patch
@@ -0,0 +1,28 @@
+From 1284ee3c47bab17ec081b5169633aea4f8abfd30 Mon Sep 17 00:00:00 2001
+From: Martin Storsjo <martin@martin.st>
+Date: Wed, 23 Jan 2019 09:12:53 +0000
+Subject: [PATCH] [llvm-objcopy] [COFF] Clear the unwritten tail of
+ coff_section::Header::Name
+
+This should fix the add-gnu-debuglink test on all buildbots.
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351934 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ tools/llvm-objcopy/COFF/Writer.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/llvm/tools/llvm-objcopy/COFF/Writer.cpp b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+index 05e46291c39..db897e2ff33 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Writer.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+@@ -121,6 +121,7 @@ size_t COFFWriter::finalizeStringTable() {
+ 
+   for (auto &S : Obj.getMutableSections()) {
+     if (S.Name.size() > COFF::NameSize) {
++      memset(S.Header.Name, 0, sizeof(S.Header.Name));
+       snprintf(S.Header.Name, sizeof(S.Header.Name), "/%d",
+                (int)StrTabBuilder.getOffset(S.Name));
+     } else {
+-- 
+2.17.1
+
diff --git a/build/build-clang/mingwclang-llvm-objcopy-COFF-Error-out-on-use-of-unhandled-opti.patch b/build/build-clang/mingwclang-llvm-objcopy-COFF-Error-out-on-use-of-unhandled-opti.patch
new file mode 100644
index 000000000000..35dec3096daa
--- /dev/null
+++ b/build/build-clang/mingwclang-llvm-objcopy-COFF-Error-out-on-use-of-unhandled-opti.patch
@@ -0,0 +1,43 @@
+From abacd83232acf69d7cbacd53fc2f9aae66c1a32e Mon Sep 17 00:00:00 2001
+From: Martin Storsjo <martin@martin.st>
+Date: Wed, 23 Jan 2019 11:54:55 +0000
+Subject: [PATCH] [llvm-objcopy] [COFF] Error out on use of unhandled options
+
+Prefer erroring out than silently not doing what was requested.
+
+Differential Revision: https://reviews.llvm.org/D57045
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351948 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ tools/llvm-objcopy/COFF/COFFObjcopy.cpp | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+index 64b4e79a4e0..b7b3d3cb629 100644
+--- a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+@@ -170,6 +170,21 @@ static Error handleArgs(const CopyConfig &Config, Object &Obj) {
+   if (!Config.AddGnuDebugLink.empty())
+     addGnuDebugLink(Obj, Config.AddGnuDebugLink);
+ 
++  if (!Config.BuildIdLinkDir.empty() || Config.BuildIdLinkInput ||
++      Config.BuildIdLinkOutput || !Config.SplitDWO.empty() ||
++      !Config.SymbolsPrefix.empty() || !Config.AddSection.empty() ||
++      !Config.DumpSection.empty() || !Config.KeepSection.empty() ||
++      !Config.SymbolsToGlobalize.empty() || !Config.SymbolsToKeep.empty() ||
++      !Config.SymbolsToLocalize.empty() || !Config.SymbolsToWeaken.empty() ||
++      !Config.SymbolsToKeepGlobal.empty() || !Config.SectionsToRename.empty() ||
++      !Config.SymbolsToRename.empty() || Config.ExtractDWO ||
++      Config.KeepFileSymbols || Config.LocalizeHidden || Config.PreserveDates ||
++      Config.StripDWO || Config.StripNonAlloc || Config.StripSections ||
++      Config.Weaken || Config.DecompressDebugSections) {
++    return createStringError(llvm::errc::invalid_argument,
++                             "Option not supported by llvm-objcopy for COFF");
++  }
++
+   return Error::success();
+ }
+ 
+-- 
+2.17.1
+
diff --git a/build/build-clang/mingwclang-llvm-objcopy-COFF-Fix-handling-of-aux-symbols-for-bi.patch b/build/build-clang/mingwclang-llvm-objcopy-COFF-Fix-handling-of-aux-symbols-for-bi.patch
new file mode 100644
index 000000000000..9534a08f60ad
--- /dev/null
+++ b/build/build-clang/mingwclang-llvm-objcopy-COFF-Fix-handling-of-aux-symbols-for-bi.patch
@@ -0,0 +1,377 @@
+From 74c7d422cba163635394ec32f2b243b1de502a18 Mon Sep 17 00:00:00 2001
+From: Martin Storsjo <martin@martin.st>
+Date: Wed, 23 Jan 2019 11:54:51 +0000
+Subject: [PATCH] [llvm-objcopy] [COFF] Fix handling of aux symbols for big
+ objects
+
+The aux symbols were stored in an opaque std::vector<uint8_t>,
+with contents interpreted according to the rest of the symbol.
+
+All aux symbol types but one fit in 18 bytes (sizeof(coff_symbol16)),
+and if written to a bigobj, two extra padding bytes are written (as
+sizeof(coff_symbol32) is 20). In the storage agnostic intermediate
+representation, store the aux symbols as a series of coff_symbol16
+sized opaque blobs. (In practice, all such aux symbols only consist
+of one aux symbol, so this is more flexible than what reality needs.)
+
+The special case is the file aux symbols, which are written in
+potentially more than one aux symbol slot, without any padding,
+as one single long string. This can't be stored in the same opaque
+vector of fixed sized aux symbol entries. The file aux symbols will
+occupy a different number of aux symbol slots depending on the type
+of output object file. As nothing in the intermediate process needs
+to have accurate raw symbol indices, updating that is moved into the
+writer class.
+
+Differential Revision: https://reviews.llvm.org/D57009
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351947 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ .../llvm-objcopy/COFF/Inputs/bigobj.o.gz      | Bin 0 -> 7841 bytes
+ test/tools/llvm-objcopy/COFF/bigobj.test      |  35 +++++++++++++
+ .../llvm-objcopy/ELF/auto-remove-shndx.test   |   2 +-
+ .../tools/llvm-objcopy/ELF/many-sections.test |   2 +-
+ test/tools/llvm-objcopy/ELF/remove-shndx.test |   2 +-
+ .../tools/llvm-objcopy/ELF/strict-no-add.test |   2 +-
+ .../llvm-objcopy/{ELF => }/Inputs/ungzip.py   |   0
+ tools/llvm-objcopy/COFF/COFFObjcopy.cpp       |   6 +--
+ tools/llvm-objcopy/COFF/Object.cpp            |   6 +--
+ tools/llvm-objcopy/COFF/Object.h              |  18 ++++++-
+ tools/llvm-objcopy/COFF/Reader.cpp            |  21 ++++++--
+ tools/llvm-objcopy/COFF/Writer.cpp            |  49 +++++++++++++-----
+ tools/llvm-objcopy/COFF/Writer.h              |   2 +-
+ 13 files changed, 115 insertions(+), 30 deletions(-)
+ create mode 100644 test/tools/llvm-objcopy/COFF/Inputs/bigobj.o.gz
+ create mode 100644 test/tools/llvm-objcopy/COFF/bigobj.test
+ rename test/tools/llvm-objcopy/{ELF => }/Inputs/ungzip.py (100%)
+
+diff --git a/llvm/test/tools/llvm-objcopy/COFF/Inputs/bigobj.o.gz b/llvm/test/tools/llvm-objcopy/COFF/Inputs/bigobj.o.gz
+new file mode 100644
+index 0000000000000000000000000000000000000000..6435f4785ff76e0c6bca12f3e57bc6ad8888bece
+GIT binary patch
+literal 7841
+zcmb2|=3r3v^@w3&etUMmo^zoH`-kGKM_vfJsF<z%6+Sz#g6qq)pf0Hj#_r`4B7DML
+zW(h1l`+!x)t@&W-R@I~lyKmU3Ti&1Z=iKur;uBMy1MR!_ywlsouYY&-*4H1mU!Qw=
+z`RpIDkw;!V4(WOF_)B3`(Vt|~S>?L-b)Wx@^wig`HIMAw|N8V<v65oeyETs611{)_
+zm27RwTe)ENN|7SLgM~83N6}~qjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
+zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kgRokHNw|D97mKRo|%+Z6Ym
+z*X{Ku$4#4*Vqm}gyYR^b^Sc?_E*<<cFE#Q=*rt6OBmJeLZ=aoe_u9R>-w!^l5biDe
+p{d@nvw*mU6<NG83=jxn4_wt_G?yUy#YeOF~KhH^=cj<;Y0{~9Br>p<~
+
+literal 0
+HcmV?d00001
+
+diff --git a/llvm/test/tools/llvm-objcopy/COFF/bigobj.test b/llvm/test/tools/llvm-objcopy/COFF/bigobj.test
+new file mode 100644
+index 00000000000..17968f12b8a
+--- /dev/null
++++ b/llvm/test/tools/llvm-objcopy/COFF/bigobj.test
+@@ -0,0 +1,35 @@
++RUN: %python %p/../Inputs/ungzip.py %p/Inputs/bigobj.o.gz > %t.in.o
++
++RUN: llvm-objdump -t %t.in.o | FileCheck %s --check-prefixes=SYMBOLS,SYMBOLS-BIG,SYMBOLS-ORIG
++
++# Do a plain copy, to check that section numbers in symbols referring
++# to sections outside of the small object format are handled correctly.
++RUN: llvm-objcopy -R '.text$4' %t.in.o %t.small.o
++RUN: llvm-objdump -t %t.in.o | FileCheck %s --check-prefixes=SYMBOLS,SYMBOLS-BIG,SYMBOLS-ORIG
++
++# Remove a section, making the section count fit into a small object.
++RUN: llvm-objcopy -R '.text$4' %t.in.o %t.small.o
++RUN: llvm-objdump -t %t.small.o | FileCheck %s --check-prefixes=SYMBOLS,SYMBOLS-SMALL,SYMBOLS-REMOVED-SMALL
++
++# Add a .gnu_debuglink section, forcing the object back to big format.
++RUN: llvm-objcopy --add-gnu-debuglink=%t.in.o %t.small.o %t.big.o
++ llvm-objdump -t %t.big.o | FileCheck %s --check-prefixes=SYMBOLS,SYMBOLS-BIG,SYMBOLS-REMOVED-BIG
++
++# In big object format, the .file symbol occupies one symbol table entry for
++# the auxillary data, but needs two entries in the small format, forcing the
++# raw symbol indices of later symbols to change.
++SYMBOLS:            SYMBOL TABLE:
++SYMBOLS-NEXT:       [ 0]{{.*}} (nx 1) {{.*}} .text
++SYMBOLS-NEXT:       AUX scnlen
++SYMBOLS-SMALL-NEXT: [ 2]{{.*}} (nx 2) {{.*}} .file
++SYMBOLS-BIG-NEXT:   [ 2]{{.*}} (nx 1) {{.*}} .file
++SYMBOLS-NEXT:       AUX abcdefghijklmnopqrs
++SYMBOLS-SMALL-NEXT: [ 5]{{.*}} (nx 0) {{.*}} foo
++SYMBOLS-BIG-NEXT:   [ 4]{{.*}} (nx 0) {{.*}} foo
++
++# Check that the section numbers outside of signed 16 bit int range
++# are represented properly. After removing one section, the section
++# numbers decrease.
++SYMBOLS-ORIG:          [ 5](sec 65280){{.*}} symbol65280
++SYMBOLS-REMOVED-SMALL: [ 6](sec 65279){{.*}} symbol65280
++SYMBOLS-REMOVED-BIG:   [ 5](sec 65279){{.*}} symbol65280
+diff --git a/llvm/test/tools/llvm-objcopy/ELF/auto-remove-shndx.test b/llvm/test/tools/llvm-objcopy/ELF/auto-remove-shndx.test
+index 5a23493fa94..8e6c788bf48 100644
+--- a/llvm/test/tools/llvm-objcopy/ELF/auto-remove-shndx.test
++++ b/llvm/test/tools/llvm-objcopy/ELF/auto-remove-shndx.test
+@@ -1,4 +1,4 @@
+-# RUN: %python %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t
++# RUN: %python %p/../Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t
+ # RUN: llvm-objcopy -R .text -R s0 -R s1 -R s2 -R s3 -R s4 -R s5 -R s6 %t %t2
+ # RUN: llvm-readobj --sections %t2 | FileCheck --check-prefix=SECS %s
+ 
+diff --git a/llvm/test/tools/llvm-objcopy/ELF/many-sections.test b/llvm/test/tools/llvm-objcopy/ELF/many-sections.test
+index 57239f32e4a..1dd41cfb10c 100644
+--- a/llvm/test/tools/llvm-objcopy/ELF/many-sections.test
++++ b/llvm/test/tools/llvm-objcopy/ELF/many-sections.test
+@@ -1,4 +1,4 @@
+-RUN: %python %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t
++RUN: %python %p/../Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t
+ RUN: llvm-objcopy %t %t2
+ RUN: llvm-readobj --file-headers %t2 | FileCheck --check-prefix=EHDR %s
+ RUN: llvm-readobj --sections %t2 | FileCheck --check-prefix=SECS %s
+diff --git a/llvm/test/tools/llvm-objcopy/ELF/remove-shndx.test b/llvm/test/tools/llvm-objcopy/ELF/remove-shndx.test
+index 6cc3a1a291f..53ca8e7f220 100644
+--- a/llvm/test/tools/llvm-objcopy/ELF/remove-shndx.test
++++ b/llvm/test/tools/llvm-objcopy/ELF/remove-shndx.test
+@@ -1,6 +1,6 @@
+ # This test checks to see that a .symtab_shndx section is added to any binary
+ # that needs it, even if the original was removed.
+-RUN: %python %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t
++RUN: %python %p/../Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t
+ RUN: llvm-objcopy -R .symtab_shndx %t %t2
+ RUN: llvm-readobj --sections %t2 | FileCheck %s
+ 
+diff --git a/llvm/test/tools/llvm-objcopy/ELF/strict-no-add.test b/llvm/test/tools/llvm-objcopy/ELF/strict-no-add.test
+index 4f24df31bf9..348ab7c4fbd 100644
+--- a/llvm/test/tools/llvm-objcopy/ELF/strict-no-add.test
++++ b/llvm/test/tools/llvm-objcopy/ELF/strict-no-add.test
+@@ -1,7 +1,7 @@
+ # This test makes sure that sections added at the end that don't have symbols
+ # defined in them don't trigger the creation of a large index table.
+ 
+-RUN: %python %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t.0
++RUN: %python %p/../Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t.0
+ RUN: cat %p/Inputs/alloc-symtab.o > %t
+ RUN: llvm-objcopy -R .text -R s0 -R s1 -R s2 -R s3 -R s4 -R s5 -R s6 %t.0 %t2
+ RUN: llvm-objcopy --add-section=.s0=%t --add-section=.s1=%t --add-section=.s2=%t %t2 %t2
+diff --git a/llvm/test/tools/llvm-objcopy/ELF/Inputs/ungzip.py b/llvm/test/tools/llvm-objcopy/Inputs/ungzip.py
+similarity index 100%
+rename from test/tools/llvm-objcopy/ELF/Inputs/ungzip.py
+rename to test/tools/llvm-objcopy/Inputs/ungzip.py
+diff --git a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+index 20adbe11e7a..64b4e79a4e0 100644
+--- a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+@@ -37,7 +37,7 @@ static uint64_t getNextRVA(const Object &Obj) {
+     return 0;
+   const Section &Last = Obj.getSections().back();
+   return alignTo(Last.Header.VirtualAddress + Last.Header.VirtualSize,
+-                 Obj.PeHeader.SectionAlignment);
++                 Obj.IsPE ? Obj.PeHeader.SectionAlignment : 1);
+ }
+ 
+ static uint32_t getCRC32(StringRef Data) {
+@@ -74,8 +74,8 @@ static void addGnuDebugLink(Object &Obj, StringRef DebugLinkFile) {
+   Sec.Name = ".gnu_debuglink";
+   Sec.Header.VirtualSize = Sec.getContents().size();
+   Sec.Header.VirtualAddress = StartRVA;
+-  Sec.Header.SizeOfRawData =
+-      alignTo(Sec.Header.VirtualSize, Obj.PeHeader.FileAlignment);
++  Sec.Header.SizeOfRawData = alignTo(Sec.Header.VirtualSize,
++                                     Obj.IsPE ? Obj.PeHeader.FileAlignment : 1);
+   // Sec.Header.PointerToRawData is filled in by the writer.
+   Sec.Header.PointerToRelocations = 0;
+   Sec.Header.PointerToLinenumbers = 0;
+diff --git a/llvm/tools/llvm-objcopy/COFF/Object.cpp b/llvm/tools/llvm-objcopy/COFF/Object.cpp
+index 8c382c1faef..0ad5a05a144 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Object.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Object.cpp
+@@ -26,12 +26,8 @@ void Object::addSymbols(ArrayRef<Symbol> NewSymbols) {
+ 
+ void Object::updateSymbols() {
+   SymbolMap = DenseMap<size_t, Symbol *>(Symbols.size());
+-  size_t RawSymIndex = 0;
+-  for (Symbol &Sym : Symbols) {
++  for (Symbol &Sym : Symbols)
+     SymbolMap[Sym.UniqueId] = &Sym;
+-    Sym.RawIndex = RawSymIndex;
+-    RawSymIndex += 1 + Sym.Sym.NumberOfAuxSymbols;
+-  }
+ }
+ 
+ const Symbol *Object::findSymbol(size_t UniqueId) const {
+diff --git a/llvm/tools/llvm-objcopy/COFF/Object.h b/llvm/tools/llvm-objcopy/COFF/Object.h
+index afa272286ef..21475b06862 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Object.h
++++ b/llvm/tools/llvm-objcopy/COFF/Object.h
+@@ -66,10 +66,24 @@ private:
+   std::vector<uint8_t> OwnedContents;
+ };
+ 
++struct AuxSymbol {
++  AuxSymbol(ArrayRef<uint8_t> In) {
++    assert(In.size() == sizeof(Opaque));
++    std::copy(In.begin(), In.end(), Opaque);
++  }
++
++  ArrayRef<uint8_t> getRef() const {
++    return ArrayRef<uint8_t>(Opaque, sizeof(Opaque));
++  }
++
++  uint8_t Opaque[sizeof(object::coff_symbol16)];
++};
++
+ struct Symbol {
+   object::coff_symbol32 Sym;
+   StringRef Name;
+-  std::vector<uint8_t> AuxData;
++  std::vector<AuxSymbol> AuxData;
++  StringRef AuxFile;
+   ssize_t TargetSectionId;
+   ssize_t AssociativeComdatTargetSectionId = 0;
+   Optional<size_t> WeakTargetSymbolId;
+@@ -132,7 +146,7 @@ private:
+ 
+   ssize_t NextSectionUniqueId = 1; // Allow a UniqueId 0 to mean undefined.
+ 
+-  // Update SymbolMap and RawIndex in each Symbol.
++  // Update SymbolMap.
+   void updateSymbols();
+ 
+   // Update SectionMap and Index in each Section.
+diff --git a/llvm/tools/llvm-objcopy/COFF/Reader.cpp b/llvm/tools/llvm-objcopy/COFF/Reader.cpp
+index 87dd60a43cf..7270bbf94de 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Reader.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Reader.cpp
+@@ -107,9 +107,24 @@ Error COFFReader::readSymbols(Object &Obj, bool IsBigObj) const {
+                  *reinterpret_cast<const coff_symbol16 *>(SymRef.getRawPtr()));
+     if (auto EC = COFFObj.getSymbolName(SymRef, Sym.Name))
+       return errorCodeToError(EC);
+-    Sym.AuxData = COFFObj.getSymbolAuxData(SymRef);
+-    assert((Sym.AuxData.size() %
+-            (IsBigObj ? sizeof(coff_symbol32) : sizeof(coff_symbol16))) == 0);
++
++    ArrayRef<uint8_t> AuxData = COFFObj.getSymbolAuxData(SymRef);
++    size_t SymSize = IsBigObj ? sizeof(coff_symbol32) : sizeof(coff_symbol16);
++    assert(AuxData.size() == SymSize * SymRef.getNumberOfAuxSymbols());
++    // The auxillary symbols are structs of sizeof(coff_symbol16) each.
++    // In the big object format (where symbols are coff_symbol32), each
++    // auxillary symbol is padded with 2 bytes at the end. Copy each
++    // auxillary symbol to the Sym.AuxData vector. For file symbols,
++    // the whole range of aux symbols are interpreted as one null padded
++    // string instead.
++    if (SymRef.isFileRecord())
++      Sym.AuxFile = StringRef(reinterpret_cast<const char *>(AuxData.data()),
++                              AuxData.size())
++                        .rtrim('\0');
++    else
++      for (size_t I = 0; I < SymRef.getNumberOfAuxSymbols(); I++)
++        Sym.AuxData.push_back(AuxData.slice(I * SymSize, sizeof(AuxSymbol)));
++
+     // Find the unique id of the section
+     if (SymRef.getSectionNumber() <=
+         0) // Special symbol (undefined/absolute/debug)
+diff --git a/llvm/tools/llvm-objcopy/COFF/Writer.cpp b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+index db897e2ff33..6e69c597217 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Writer.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+@@ -55,7 +55,8 @@ Error COFFWriter::finalizeSymbolContents() {
+       if (Sym.Sym.NumberOfAuxSymbols == 1 &&
+           Sym.Sym.StorageClass == IMAGE_SYM_CLASS_STATIC) {
+         coff_aux_section_definition *SD =
+-            reinterpret_cast<coff_aux_section_definition *>(Sym.AuxData.data());
++            reinterpret_cast<coff_aux_section_definition *>(
++                Sym.AuxData[0].Opaque);
+         uint32_t SDSectionNumber;
+         if (Sym.AssociativeComdatTargetSectionId == 0) {
+           // Not a comdat associative section; just set the Number field to
+@@ -79,7 +80,7 @@ Error COFFWriter::finalizeSymbolContents() {
+     // we want to set. Only >= 1 would be required, but only == 1 makes sense.
+     if (Sym.WeakTargetSymbolId && Sym.Sym.NumberOfAuxSymbols == 1) {
+       coff_aux_weak_external *WE =
+-          reinterpret_cast<coff_aux_weak_external *>(Sym.AuxData.data());
++          reinterpret_cast<coff_aux_weak_external *>(Sym.AuxData[0].Opaque);
+       const Symbol *Target = Obj.findSymbol(*Sym.WeakTargetSymbolId);
+       if (Target == nullptr)
+         return createStringError(object_error::invalid_symbol_index,
+@@ -141,13 +142,26 @@ size_t COFFWriter::finalizeStringTable() {
+ 
+ template <class SymbolTy>
+ std::pair<size_t, size_t> COFFWriter::finalizeSymbolTable() {
+-  size_t SymTabSize = Obj.getSymbols().size() * sizeof(SymbolTy);
+-  for (const auto &S : Obj.getSymbols())
+-    SymTabSize += S.AuxData.size();
+-  return std::make_pair(SymTabSize, sizeof(SymbolTy));
++  size_t RawSymIndex = 0;
++  for (auto &S : Obj.getMutableSymbols()) {
++    // Symbols normally have NumberOfAuxSymbols set correctly all the time.
++    // For file symbols, we need to know the output file's symbol size to be
++    // able to calculate the number of slots it occupies.
++    if (!S.AuxFile.empty())
++      S.Sym.NumberOfAuxSymbols =
++          alignTo(S.AuxFile.size(), sizeof(SymbolTy)) / sizeof(SymbolTy);
++    S.RawIndex = RawSymIndex;
++    RawSymIndex += 1 + S.Sym.NumberOfAuxSymbols;
++  }
++  return std::make_pair(RawSymIndex * sizeof(SymbolTy), sizeof(SymbolTy));
+ }
+ 
+ Error COFFWriter::finalize(bool IsBigObj) {
++  size_t SymTabSize, SymbolSize;
++  std::tie(SymTabSize, SymbolSize) = IsBigObj
++                                         ? finalizeSymbolTable<coff_symbol32>()
++                                         : finalizeSymbolTable<coff_symbol16>();
++
+   if (Error E = finalizeRelocTargets())
+     return E;
+   if (Error E = finalizeSymbolContents())
+@@ -199,10 +213,6 @@ Error COFFWriter::finalize(bool IsBigObj) {
+   }
+ 
+   size_t StrTabSize = finalizeStringTable();
+-  size_t SymTabSize, SymbolSize;
+-  std::tie(SymTabSize, SymbolSize) = IsBigObj
+-                                         ? finalizeSymbolTable<coff_symbol32>()
+-                                         : finalizeSymbolTable<coff_symbol16>();
+ 
+   size_t PointerToSymbolTable = FileSize;
+   // StrTabSize <= 4 is the size of an empty string table, only consisting
+@@ -312,8 +322,23 @@ template <class SymbolTy> void COFFWriter::writeSymbolStringTables() {
+     copySymbol<SymbolTy, coff_symbol32>(*reinterpret_cast<SymbolTy *>(Ptr),
+                                         S.Sym);
+     Ptr += sizeof(SymbolTy);
+-    std::copy(S.AuxData.begin(), S.AuxData.end(), Ptr);
+-    Ptr += S.AuxData.size();
++    if (!S.AuxFile.empty()) {
++      // For file symbols, just write the string into the aux symbol slots,
++      // assuming that the unwritten parts are initialized to zero in the memory
++      // mapped file.
++      std::copy(S.AuxFile.begin(), S.AuxFile.end(), Ptr);
++      Ptr += S.Sym.NumberOfAuxSymbols * sizeof(SymbolTy);
++    } else {
++      // For other auxillary symbols, write their opaque payload into one symbol
++      // table slot each. For big object files, the symbols are larger than the
++      // opaque auxillary symbol struct and we leave padding at the end of each
++      // entry.
++      for (const AuxSymbol &AuxSym : S.AuxData) {
++        ArrayRef<uint8_t> Ref = AuxSym.getRef();
++        std::copy(Ref.begin(), Ref.end(), Ptr);
++        Ptr += sizeof(SymbolTy);
++      }
++    }
+   }
+   if (StrTabBuilder.getSize() > 4 || !Obj.IsPE) {
+     // Always write a string table in object files, even an empty one.
+diff --git a/llvm/tools/llvm-objcopy/COFF/Writer.h b/llvm/tools/llvm-objcopy/COFF/Writer.h
+index 9b1cfa91d00..681a8d5e4a6 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Writer.h
++++ b/llvm/tools/llvm-objcopy/COFF/Writer.h
+@@ -30,11 +30,11 @@ class COFFWriter {
+   size_t SizeOfInitializedData;
+   StringTableBuilder StrTabBuilder;
+ 
++  template <class SymbolTy> std::pair<size_t, size_t> finalizeSymbolTable();
+   Error finalizeRelocTargets();
+   Error finalizeSymbolContents();
+   void layoutSections();
+   size_t finalizeStringTable();
+-  template <class SymbolTy> std::pair<size_t, size_t> finalizeSymbolTable();
+ 
+   Error finalize(bool IsBigObj);
+ 
+-- 
+2.17.1
+
diff --git a/build/build-clang/mingwclang-llvm-objcopy-COFF-Implement-only-keep-debug.patch b/build/build-clang/mingwclang-llvm-objcopy-COFF-Implement-only-keep-debug.patch
new file mode 100644
index 000000000000..e922384b48b3
--- /dev/null
+++ b/build/build-clang/mingwclang-llvm-objcopy-COFF-Implement-only-keep-debug.patch
@@ -0,0 +1,222 @@
+From 526aa2e94355b7feb3bf7774a6e1899f68e94ad8 Mon Sep 17 00:00:00 2001
+From: Martin Storsjo <martin@martin.st>
+Date: Sat, 19 Jan 2019 19:42:48 +0000
+Subject: [PATCH] [llvm-objcopy] [COFF] Implement --only-keep-debug
+
+Differential Revision: https://reviews.llvm.org/D56840
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351662 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ .../COFF/Inputs/only-keep-sections.yaml       | 77 +++++++++++++++++++
+ .../llvm-objcopy/COFF/only-keep-debug.test    | 58 ++++++++++++++
+ tools/llvm-objcopy/COFF/COFFObjcopy.cpp       | 10 +++
+ tools/llvm-objcopy/COFF/Object.cpp            | 10 +++
+ tools/llvm-objcopy/COFF/Object.h              |  1 +
+ 5 files changed, 156 insertions(+)
+ create mode 100644 test/tools/llvm-objcopy/COFF/Inputs/only-keep-sections.yaml
+ create mode 100644 test/tools/llvm-objcopy/COFF/only-keep-debug.test
+
+diff --git a/llvm/test/tools/llvm-objcopy/COFF/Inputs/only-keep-sections.yaml b/llvm/test/tools/llvm-objcopy/COFF/Inputs/only-keep-sections.yaml
+new file mode 100644
+index 00000000000..b5437e10763
+--- /dev/null
++++ b/llvm/test/tools/llvm-objcopy/COFF/Inputs/only-keep-sections.yaml
+@@ -0,0 +1,77 @@
++--- !COFF
++OptionalHeader:  
++  AddressOfEntryPoint: 4144
++  ImageBase:       1073741824
++  SectionAlignment: 4096
++  FileAlignment:   512
++  MajorOperatingSystemVersion: 6
++  MinorOperatingSystemVersion: 0
++  MajorImageVersion: 0
++  MinorImageVersion: 0
++  MajorSubsystemVersion: 6
++  MinorSubsystemVersion: 0
++  Subsystem:       IMAGE_SUBSYSTEM_WINDOWS_CUI
++  DLLCharacteristics: [  ]
++  SizeOfStackReserve: 1048576
++  SizeOfStackCommit: 4096
++  SizeOfHeapReserve: 1048576
++  SizeOfHeapCommit: 4096
++header:          
++  Machine:         IMAGE_FILE_MACHINE_AMD64
++  Characteristics: [  ]
++sections:        
++  - Name:            .text
++    Characteristics: [ IMAGE_SCN_CNT_CODE ]
++    VirtualAddress:  4096
++    VirtualSize:     4
++    SectionData:     C3C3C3C3
++  - Name:            .rdata
++    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA ]
++    VirtualAddress:  8192
++    VirtualSize:     4
++    SectionData:     2A000000
++  - Name:            .buildid
++    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA ]
++    VirtualAddress:  12288
++    VirtualSize:     4
++    SectionData:     2B000000
++  - Name:            .reloc
++    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE ]
++    VirtualAddress:  16384
++    VirtualSize:     4
++    SectionData:     2C000000
++  - Name:            .debug_discardable
++    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE ]
++    VirtualAddress:  20480
++    VirtualSize:     4
++    SectionData:     2D000000
++  - Name:            .debug_undiscardable
++    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA ]
++    VirtualAddress:  24576
++    VirtualSize:     4
++    SectionData:     2E000000
++  - Name:            .unflagged
++    Characteristics: [  ]
++    VirtualAddress:  28672
++    VirtualSize:     4
++    SectionData:     2F000000
++symbols:         
++  - Name:            main
++    Value:           2
++    SectionNumber:   1
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
++    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
++  - Name:            debug_discardable_sym
++    Value:           0
++    SectionNumber:   5
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
++    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
++  - Name:            debug_undiscardable_sym
++    Value:           0
++    SectionNumber:   6
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
++    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
++...
+diff --git a/llvm/test/tools/llvm-objcopy/COFF/only-keep-debug.test b/llvm/test/tools/llvm-objcopy/COFF/only-keep-debug.test
+new file mode 100644
+index 00000000000..5518d4000fc
+--- /dev/null
++++ b/llvm/test/tools/llvm-objcopy/COFF/only-keep-debug.test
+@@ -0,0 +1,58 @@
++RUN: yaml2obj %p/Inputs/only-keep-sections.yaml > %t.in.exe
++
++RUN: llvm-objcopy --only-keep-debug %t.in.exe %t.out.exe
++RUN: llvm-readobj --sections %t.out.exe | FileCheck %s --check-prefix=SECTIONS
++RUN: llvm-objdump -t %t.out.exe | FileCheck %s --check-prefix=SYMBOLS
++
++Check that all non-debug/buildid sections with IMAGE_SCN_CNT_CODE
++or IMAGE_SCN_CNT_INITIALIZED_DATA are truncated, and no others.
++
++SECTIONS:      Sections [
++SECTIONS-NEXT:  Section {
++SECTIONS-NEXT:   Number: 1
++SECTIONS-NEXT:   Name: .text
++SECTIONS-NEXT:   VirtualSize: 0x4
++SECTIONS-NEXT:   VirtualAddress:
++SECTIONS-NEXT:   RawDataSize: 0
++SECTIONS:       Section {
++SECTIONS-NEXT:   Number: 2
++SECTIONS-NEXT:   Name: .rdata
++SECTIONS-NEXT:   VirtualSize: 0x4
++SECTIONS-NEXT:   VirtualAddress:
++SECTIONS-NEXT:   RawDataSize: 0
++SECTIONS:       Section {
++SECTIONS-NEXT:   Number: 3
++SECTIONS-NEXT:   Name: .buildid
++SECTIONS-NEXT:   VirtualSize: 0x4
++SECTIONS-NEXT:   VirtualAddress:
++SECTIONS-NEXT:   RawDataSize: 512
++SECTIONS:       Section {
++SECTIONS-NEXT:   Number: 4
++SECTIONS-NEXT:   Name: .reloc
++SECTIONS-NEXT:   VirtualSize: 0x4
++SECTIONS-NEXT:   VirtualAddress:
++SECTIONS-NEXT:   RawDataSize: 0
++SECTIONS:       Section {
++SECTIONS-NEXT:   Number: 5
++SECTIONS-NEXT:   Name: .debug_discardable
++SECTIONS-NEXT:   VirtualSize: 0x4
++SECTIONS-NEXT:   VirtualAddress:
++SECTIONS-NEXT:   RawDataSize: 512
++SECTIONS:       Section {
++SECTIONS-NEXT:   Number: 6
++SECTIONS-NEXT:   Name: .debug_undiscardable
++SECTIONS-NEXT:   VirtualSize: 0x4
++SECTIONS-NEXT:   VirtualAddress:
++SECTIONS-NEXT:   RawDataSize: 512
++SECTIONS:       Section {
++SECTIONS-NEXT:   Number: 7
++SECTIONS-NEXT:   Name: .unflagged
++SECTIONS-NEXT:   VirtualSize: 0x4
++SECTIONS-NEXT:   VirtualAddress:
++SECTIONS-NEXT:   RawDataSize: 512
++
++SYMBOLS:      SYMBOL TABLE:
++SYMBOLS-NEXT: main
++SYMBOLS-NEXT: debug_discardable_sym
++SYMBOLS-NEXT: debug_undiscardable_sym
++SYMBOLS-EMPTY:
+diff --git a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+index 13d8efde37c..60afbf7bb54 100644
+--- a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+@@ -46,6 +46,16 @@ static Error handleArgs(const CopyConfig &Config, Object &Obj) {
+     return false;
+   });
+ 
++  if (Config.OnlyKeepDebug) {
++    // For --only-keep-debug, we keep all other sections, but remove their
++    // content. The VirtualSize field in the section header is kept intact.
++    Obj.truncateSections([](const Section &Sec) {
++      return !isDebugSection(Sec) && Sec.Name != ".buildid" &&
++             ((Sec.Header.Characteristics &
++               (IMAGE_SCN_CNT_CODE | IMAGE_SCN_CNT_INITIALIZED_DATA)) != 0);
++    });
++  }
++
+   // StripAll removes all symbols and thus also removes all relocations.
+   if (Config.StripAll || Config.StripAllGNU)
+     for (Section &Sec : Obj.getMutableSections())
+diff --git a/llvm/tools/llvm-objcopy/COFF/Object.cpp b/llvm/tools/llvm-objcopy/COFF/Object.cpp
+index e19cea6aa9d..fc87d9e574d 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Object.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Object.cpp
+@@ -127,6 +127,16 @@ void Object::removeSections(function_ref<bool(const Section &)> ToRemove) {
+   updateSymbols();
+ }
+ 
++void Object::truncateSections(function_ref<bool(const Section &)> ToTruncate) {
++  for (Section &Sec : Sections) {
++    if (ToTruncate(Sec)) {
++      Sec.Contents = ArrayRef<uint8_t>();
++      Sec.Relocs.clear();
++      Sec.Header.SizeOfRawData = 0;
++    }
++  }
++}
++
+ } // end namespace coff
+ } // end namespace objcopy
+ } // end namespace llvm
+diff --git a/llvm/tools/llvm-objcopy/COFF/Object.h b/llvm/tools/llvm-objcopy/COFF/Object.h
+index a73e93620d3..8e200369f0b 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Object.h
++++ b/llvm/tools/llvm-objcopy/COFF/Object.h
+@@ -93,6 +93,7 @@ struct Object {
+ 
+   void addSections(ArrayRef<Section> NewSections);
+   void removeSections(function_ref<bool(const Section &)> ToRemove);
++  void truncateSections(function_ref<bool(const Section &)> ToTruncate);
+ 
+ private:
+   std::vector<Symbol> Symbols;
+-- 
+2.17.1
+
diff --git a/build/build-clang/mingwclang-llvm-objcopy-COFF-Implement-only-section.patch b/build/build-clang/mingwclang-llvm-objcopy-COFF-Implement-only-section.patch
new file mode 100644
index 000000000000..657c72a80090
--- /dev/null
+++ b/build/build-clang/mingwclang-llvm-objcopy-COFF-Implement-only-section.patch
@@ -0,0 +1,61 @@
+From 17dcf25b3ade15605ca27150e4440bcc75caed65 Mon Sep 17 00:00:00 2001
+From: Martin Storsjo <martin@martin.st>
+Date: Sat, 19 Jan 2019 19:42:54 +0000
+Subject: [PATCH] [llvm-objcopy] [COFF] Implement --only-section
+
+Differential Revision: https://reviews.llvm.org/D56873
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351663 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ .../tools/llvm-objcopy/COFF/only-section.test | 21 +++++++++++++++++++
+ tools/llvm-objcopy/COFF/COFFObjcopy.cpp       |  6 ++++++
+ 2 files changed, 27 insertions(+)
+ create mode 100644 test/tools/llvm-objcopy/COFF/only-section.test
+
+diff --git a/llvm/test/tools/llvm-objcopy/COFF/only-section.test b/llvm/test/tools/llvm-objcopy/COFF/only-section.test
+new file mode 100644
+index 00000000000..42492ed80ff
+--- /dev/null
++++ b/llvm/test/tools/llvm-objcopy/COFF/only-section.test
+@@ -0,0 +1,21 @@
++RUN: yaml2obj %p/Inputs/only-keep-sections.yaml > %t.in.exe
++
++RUN: llvm-objcopy --only-section .debug_discardable %t.in.exe %t.out.exe
++RUN: llvm-objdump --section-headers -t %t.out.exe | FileCheck %s --check-prefixes=SECTIONS,SECTIONS-DEBUG,SYMBOLS,SYMBOLS-DEBUG
++
++Adding another section stripping option makes it return the intersection of
++kept sections - in this case keeping only .text.
++
++RUN: llvm-objcopy --only-section .debug_discardable --only-section .text --strip-debug %t.in.exe %t.combination.exe
++RUN: llvm-objdump --section-headers -t %t.combination.exe | FileCheck %s --check-prefixes=SECTIONS,SECTIONS-TEXT,SYMBOLS,SYMBOLS-TEXT
++
++SECTIONS:            Sections:
++SECTIONS-NEXT:       Idx Name
++SECTIONS-DEBUG-NEXT: .debug_discardable
++SECTIONS-TEXT-NEXT:  .text
++SECTIONS-EMPTY:
++
++SYMBOLS:            SYMBOL TABLE:
++SYMBOLS-DEBUG-NEXT: debug_discardable_sym
++SYMBOLS-TEXT-NEXT:  main
++SYMBOLS-EMPTY:
+diff --git a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+index 60afbf7bb54..99929d10a1f 100644
+--- a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+@@ -33,6 +33,12 @@ static bool isDebugSection(const Section &Sec) {
+ static Error handleArgs(const CopyConfig &Config, Object &Obj) {
+   // Perform the actual section removals.
+   Obj.removeSections([&Config](const Section &Sec) {
++    // Contrary to --only-keep-debug, --only-section fully removes sections that
++    // aren't mentioned.
++    if (!Config.OnlySection.empty() &&
++        !is_contained(Config.OnlySection, Sec.Name))
++      return true;
++
+     if (Config.StripDebug || Config.StripAll || Config.StripAllGNU ||
+         Config.DiscardAll || Config.StripUnneeded) {
+       if (isDebugSection(Sec) &&
+-- 
+2.17.1
+
diff --git a/build/build-clang/mingwclang-llvm-objcopy-COFF-Implement-strip-debug.patch b/build/build-clang/mingwclang-llvm-objcopy-COFF-Implement-strip-debug.patch
new file mode 100644
index 000000000000..6e303c0d3863
--- /dev/null
+++ b/build/build-clang/mingwclang-llvm-objcopy-COFF-Implement-strip-debug.patch
@@ -0,0 +1,160 @@
+From 2b6e1b7585d6bd997ea4e4233c904a6d2c11ad33 Mon Sep 17 00:00:00 2001
+From: Martin Storsjo <martin@martin.st>
+Date: Sat, 19 Jan 2019 19:42:41 +0000
+Subject: [PATCH] [llvm-objcopy] [COFF] Implement --strip-debug
+
+Also remove sections similarly for --strip-all, --discard-all,
+--strip-unneeded.
+
+Differential Revision: https://reviews.llvm.org/D56839
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351661 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ test/tools/llvm-objcopy/COFF/strip-debug.test | 109 ++++++++++++++++++
+ tools/llvm-objcopy/COFF/COFFObjcopy.cpp       |  11 ++
+ 2 files changed, 120 insertions(+)
+ create mode 100644 test/tools/llvm-objcopy/COFF/strip-debug.test
+
+diff --git a/llvm/test/tools/llvm-objcopy/COFF/strip-debug.test b/llvm/test/tools/llvm-objcopy/COFF/strip-debug.test
+new file mode 100644
+index 00000000000..97fa96aac70
+--- /dev/null
++++ b/llvm/test/tools/llvm-objcopy/COFF/strip-debug.test
+@@ -0,0 +1,109 @@
++# RUN: yaml2obj %s > %t.in.o
++#
++# RUN: llvm-objdump --section-headers %t.in.o | FileCheck %s --check-prefixes=SECTIONS,SECTIONS-PRE
++# RUN: llvm-objdump -t %t.in.o | FileCheck %s --check-prefixes=SYMBOLS,SYMBOLS-PRE
++#
++# RUN: llvm-objcopy --strip-debug %t.in.o %t.out.o
++# RUN: llvm-objdump --section-headers %t.out.o | FileCheck %s --check-prefixes=SECTIONS
++# RUN: llvm-objdump -t %t.out.o | FileCheck %s --check-prefixes=SYMBOLS
++#
++# Test that --strip-all, --strip-all-gnu, --discard-all and --strip-unneeded,
++# plus llvm-strip without arguments all produce a similiar set of sections
++# (while they remove symbols differently).
++#
++# RUN: llvm-objcopy --strip-all %t.in.o %t.strip-all.o
++# RUN: llvm-objdump --section-headers %t.strip-all.o | FileCheck %s --check-prefixes=SECTIONS
++#
++# RUN: llvm-objcopy --strip-all-gnu %t.in.o %t.strip-all-gnu.o
++# RUN: llvm-objdump --section-headers %t.strip-all-gnu.o | FileCheck %s --check-prefixes=SECTIONS
++#
++# RUN: llvm-objcopy --discard-all %t.in.o %t.discard-all.o
++# RUN: llvm-objdump --section-headers %t.discard-all.o | FileCheck %s --check-prefixes=SECTIONS
++#
++# RUN: llvm-objcopy --discard-all %t.in.o %t.strip-unneeded.o
++# RUN: llvm-objdump --section-headers %t.strip-unneeded.o | FileCheck %s --check-prefixes=SECTIONS
++#
++# SECTIONS:        Sections:
++# SECTIONS-NEXT:   Idx Name
++# SECTIONS-NEXT:     0      .text
++# SECTIONS-NEXT:     1      .data
++# SECTIONS-NEXT:     2      .bss
++# SECTIONS-NEXT:     3      .xdata
++# SECTIONS-NEXT:     4      .reloc
++# SECTIONS-PRE-NEXT: 5      .debug_discardable
++# SECTIONS-NEXT:     {{.*}} .debug_undiscardable
++# SECTIONS-NEXT:     {{.*}} .llvm_addrsig
++# SECTIONS-EMPTY:
++#
++# Test that --strip-debug doesn't remove e.g. unreferenced local symbols.
++#
++# SYMBOLS:          SYMBOL TABLE:
++# SYMBOLS-NEXT:     external
++# SYMBOLS-NEXT:     local_unreferenced
++# SYMBOLS-PRE-NEXT: debug_discardable_sym
++# SYMBOLS-NEXT:     debug_undiscardable_sym
++# SYMBOLS-EMPTY:
++
++--- !COFF
++header:          
++  Machine:         IMAGE_FILE_MACHINE_AMD64
++  Characteristics: [  ]
++sections:        
++  - Name:            .text
++    Characteristics: [  ]
++    Alignment:       4
++    SectionData:     00000000
++  - Name:            .data
++    Characteristics: [  ]
++    Alignment:       4
++    SectionData:     00000000
++  - Name:            .bss
++    Characteristics: [  ]
++    Alignment:       4
++    SectionData:     00000000
++  - Name:            .xdata
++    Characteristics: [  ]
++    Alignment:       4
++    SectionData:     00000000
++  - Name:            .reloc
++    Characteristics: [ IMAGE_SCN_MEM_DISCARDABLE ]
++    Alignment:       4
++    SectionData:     00000000
++  - Name:            .debug_discardable
++    Characteristics: [ IMAGE_SCN_MEM_DISCARDABLE ]
++    Alignment:       4
++    SectionData:     00000000
++  - Name:            .debug_undiscardable
++    Characteristics: [  ]
++    Alignment:       4
++    SectionData:     00000000
++  - Name:            .llvm_addrsig
++    Characteristics: [ IMAGE_SCN_LNK_REMOVE ]
++    Alignment:       4
++    SectionData:     00000000
++symbols:         
++  - Name:            external
++    Value:           0
++    SectionNumber:   1
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_NULL
++    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
++  - Name:            local_unreferenced
++    Value:           0
++    SectionNumber:   1
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_NULL
++    StorageClass:    IMAGE_SYM_CLASS_STATIC
++  - Name:            debug_discardable_sym
++    Value:           0
++    SectionNumber:   6
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_NULL
++    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
++  - Name:            debug_undiscardable_sym
++    Value:           0
++    SectionNumber:   7
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_NULL
++    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
++...
+diff --git a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+index dd2e4829218..13d8efde37c 100644
+--- a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+@@ -26,9 +26,20 @@ namespace coff {
+ using namespace object;
+ using namespace COFF;
+ 
++static bool isDebugSection(const Section &Sec) {
++  return Sec.Name.startswith(".debug");
++}
++
+ static Error handleArgs(const CopyConfig &Config, Object &Obj) {
+   // Perform the actual section removals.
+   Obj.removeSections([&Config](const Section &Sec) {
++    if (Config.StripDebug || Config.StripAll || Config.StripAllGNU ||
++        Config.DiscardAll || Config.StripUnneeded) {
++      if (isDebugSection(Sec) &&
++          (Sec.Header.Characteristics & IMAGE_SCN_MEM_DISCARDABLE) != 0)
++        return true;
++    }
++
+     if (is_contained(Config.ToRemove, Sec.Name))
+       return true;
+ 
+-- 
+2.17.1
+
diff --git a/build/build-clang/mingwclang-llvm-objcopy-COFF-Remove-a-superfluous-namespace-qua.patch b/build/build-clang/mingwclang-llvm-objcopy-COFF-Remove-a-superfluous-namespace-qua.patch
new file mode 100644
index 000000000000..9c9f25054610
--- /dev/null
+++ b/build/build-clang/mingwclang-llvm-objcopy-COFF-Remove-a-superfluous-namespace-qua.patch
@@ -0,0 +1,27 @@
+From a495c9ae6fb3367e6b59d8d245273ed3669754f0 Mon Sep 17 00:00:00 2001
+From: Martin Storsjo <martin@martin.st>
+Date: Sat, 19 Jan 2019 19:42:23 +0000
+Subject: [PATCH] [llvm-objcopy] [COFF] Remove a superfluous namespace
+ qualification. NFC.
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351658 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ tools/llvm-objcopy/COFF/COFFObjcopy.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+index ceebf600b3a..437dccbd3d5 100644
+--- a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+@@ -78,7 +78,7 @@ static Error handleArgs(const CopyConfig &Config, Object &Obj) {
+ }
+ 
+ void executeObjcopyOnBinary(const CopyConfig &Config,
+-                            object::COFFObjectFile &In, Buffer &Out) {
++                            COFFObjectFile &In, Buffer &Out) {
+   COFFReader Reader(In);
+   Expected<std::unique_ptr<Object>> ObjOrErr = Reader.create();
+   if (!ObjOrErr)
+-- 
+2.17.1
+
diff --git a/build/build-clang/mingwclang-llvm-objcopy-COFF-Update-symbol-indices-in-weak-exte.patch b/build/build-clang/mingwclang-llvm-objcopy-COFF-Update-symbol-indices-in-weak-exte.patch
new file mode 100644
index 000000000000..80e978564677
--- /dev/null
+++ b/build/build-clang/mingwclang-llvm-objcopy-COFF-Update-symbol-indices-in-weak-exte.patch
@@ -0,0 +1,224 @@
+From d37f67c7311cd371d9ff1afd398bc92f309e6baf Mon Sep 17 00:00:00 2001
+From: Martin Storsjo <martin@martin.st>
+Date: Tue, 22 Jan 2019 10:58:09 +0000
+Subject: [PATCH] [llvm-objcopy] [COFF] Update symbol indices in weak externals
+
+Differential Revision: https://reviews.llvm.org/D57006
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351800 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ .../llvm-objcopy/COFF/weak-external.test      | 49 +++++++++++++++++++
+ tools/llvm-objcopy/COFF/Object.h              |  2 +
+ tools/llvm-objcopy/COFF/Reader.cpp            | 24 ++++++++-
+ tools/llvm-objcopy/COFF/Reader.h              |  2 +-
+ tools/llvm-objcopy/COFF/Writer.cpp            | 16 +++++-
+ tools/llvm-objcopy/COFF/Writer.h              |  2 +-
+ 6 files changed, 89 insertions(+), 6 deletions(-)
+ create mode 100644 test/tools/llvm-objcopy/COFF/weak-external.test
+
+diff --git a/llvm/test/tools/llvm-objcopy/COFF/weak-external.test b/llvm/test/tools/llvm-objcopy/COFF/weak-external.test
+new file mode 100644
+index 00000000000..d36a53b4eb1
+--- /dev/null
++++ b/llvm/test/tools/llvm-objcopy/COFF/weak-external.test
+@@ -0,0 +1,49 @@
++# RUN: yaml2obj %s > %t.in.o
++
++# RUN: llvm-objdump -t %t.in.o | FileCheck %s --check-prefixes=SYMBOLS,SYMBOLS-PRE
++
++# RUN: llvm-objcopy -N func %t.in.o %t.out.o
++# RUN: llvm-objdump -t %t.out.o | FileCheck %s --check-prefixes=SYMBOLS,SYMBOLS-POST
++
++# RUN: not llvm-objcopy -N .weak.foobar.file1 %t.in.o %t.err.o 2>&1 | FileCheck %s --check-prefix=ERROR
++
++# SYMBOLS: SYMBOL TABLE:
++# SYMBOLS-PRE-NEXT: func
++# SYMBOLS-NEXT: .weak.foobar.file1
++# SYMBOLS-NEXT: foobar
++# SYMBOLS-PRE-NEXT: AUX indx 1
++# SYMBOLS-POST-NEXT: AUX indx 0
++# SYMBOLS-EMPTY:
++
++# ERROR: Symbol 'foobar' is missing its weak target
++
++--- !COFF
++header:          
++  Machine:         IMAGE_FILE_MACHINE_AMD64
++  Characteristics: [  ]
++sections:        
++  - Name:            .text
++    Characteristics: [  ]
++symbols:         
++  - Name:            func
++    Value:           0
++    SectionNumber:   1
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_NULL
++    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
++  - Name:            .weak.foobar.file1
++    Value:           1
++    SectionNumber:   1
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_NULL
++    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
++  - Name:            foobar
++    Value:           0
++    SectionNumber:   0
++    SimpleType:      IMAGE_SYM_TYPE_NULL
++    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
++    StorageClass:    IMAGE_SYM_CLASS_WEAK_EXTERNAL
++    WeakExternal:    
++      TagIndex:        1
++      Characteristics: IMAGE_WEAK_EXTERN_SEARCH_NOLIBRARY
++...
+diff --git a/llvm/tools/llvm-objcopy/COFF/Object.h b/llvm/tools/llvm-objcopy/COFF/Object.h
+index 8e200369f0b..0630f9c5ff8 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Object.h
++++ b/llvm/tools/llvm-objcopy/COFF/Object.h
+@@ -11,6 +11,7 @@
+ 
+ #include "llvm/ADT/ArrayRef.h"
+ #include "llvm/ADT/DenseMap.h"
++#include "llvm/ADT/Optional.h"
+ #include "llvm/ADT/StringRef.h"
+ #include "llvm/ADT/iterator_range.h"
+ #include "llvm/BinaryFormat/COFF.h"
+@@ -47,6 +48,7 @@ struct Symbol {
+   std::vector<uint8_t> AuxData;
+   ssize_t TargetSectionId;
+   ssize_t AssociativeComdatTargetSectionId = 0;
++  Optional<size_t> WeakTargetSymbolId;
+   size_t UniqueId;
+   size_t RawIndex;
+   bool Referenced;
+diff --git a/llvm/tools/llvm-objcopy/COFF/Reader.cpp b/llvm/tools/llvm-objcopy/COFF/Reader.cpp
+index 20ff32a59dc..2446277cc2b 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Reader.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Reader.cpp
+@@ -121,12 +121,18 @@ Error COFFReader::readSymbols(Object &Obj, bool IsBigObj) const {
+     // For section definitions, check if it is comdat associative, and if
+     // it is, find the target section unique id.
+     const coff_aux_section_definition *SD = SymRef.getSectionDefinition();
++    const coff_aux_weak_external *WE = SymRef.getWeakExternal();
+     if (SD && SD->Selection == IMAGE_COMDAT_SELECT_ASSOCIATIVE) {
+       int32_t Index = SD->getNumber(IsBigObj);
+       if (Index <= 0 || static_cast<uint32_t>(Index - 1) >= Sections.size())
+         return createStringError(object_error::parse_failed,
+                                  "Unexpected associative section index");
+       Sym.AssociativeComdatTargetSectionId = Sections[Index - 1].UniqueId;
++    } else if (WE) {
++      // This is a raw symbol index for now, but store it in the Symbol
++      // until we've added them to the Object, which assigns the final
++      // unique ids.
++      Sym.WeakTargetSymbolId = WE->TagIndex;
+     }
+     I += 1 + SymRef.getNumberOfAuxSymbols();
+   }
+@@ -134,13 +140,27 @@ Error COFFReader::readSymbols(Object &Obj, bool IsBigObj) const {
+   return Error::success();
+ }
+ 
+-Error COFFReader::setRelocTargets(Object &Obj) const {
++Error COFFReader::setSymbolTargets(Object &Obj) const {
+   std::vector<const Symbol *> RawSymbolTable;
+   for (const Symbol &Sym : Obj.getSymbols()) {
+     RawSymbolTable.push_back(&Sym);
+     for (size_t I = 0; I < Sym.Sym.NumberOfAuxSymbols; I++)
+       RawSymbolTable.push_back(nullptr);
+   }
++  for (Symbol &Sym : Obj.getMutableSymbols()) {
++    // Convert WeakTargetSymbolId from the original raw symbol index to
++    // a proper unique id.
++    if (Sym.WeakTargetSymbolId) {
++      if (*Sym.WeakTargetSymbolId >= RawSymbolTable.size())
++        return createStringError(object_error::parse_failed,
++                                 "Weak external reference out of range");
++      const Symbol *Target = RawSymbolTable[*Sym.WeakTargetSymbolId];
++      if (Target == nullptr)
++        return createStringError(object_error::parse_failed,
++                                 "Invalid SymbolTableIndex");
++      Sym.WeakTargetSymbolId = Target->UniqueId;
++    }
++  }
+   for (Section &Sec : Obj.getMutableSections()) {
+     for (Relocation &R : Sec.Relocs) {
+       if (R.Reloc.SymbolTableIndex >= RawSymbolTable.size())
+@@ -184,7 +204,7 @@ Expected<std::unique_ptr<Object>> COFFReader::create() const {
+     return std::move(E);
+   if (Error E = readSymbols(*Obj, IsBigObj))
+     return std::move(E);
+-  if (Error E = setRelocTargets(*Obj))
++  if (Error E = setSymbolTargets(*Obj))
+     return std::move(E);
+ 
+   return std::move(Obj);
+diff --git a/llvm/tools/llvm-objcopy/COFF/Reader.h b/llvm/tools/llvm-objcopy/COFF/Reader.h
+index 4493705e73c..ec15369db0b 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Reader.h
++++ b/llvm/tools/llvm-objcopy/COFF/Reader.h
+@@ -28,7 +28,7 @@ class COFFReader {
+   Error readExecutableHeaders(Object &Obj) const;
+   Error readSections(Object &Obj) const;
+   Error readSymbols(Object &Obj, bool IsBigObj) const;
+-  Error setRelocTargets(Object &Obj) const;
++  Error setSymbolTargets(Object &Obj) const;
+ 
+ public:
+   explicit COFFReader(const COFFObjectFile &O) : COFFObj(O) {}
+diff --git a/llvm/tools/llvm-objcopy/COFF/Writer.cpp b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+index 0321f94a896..4f57131d5ab 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Writer.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+@@ -38,7 +38,7 @@ Error COFFWriter::finalizeRelocTargets() {
+   return Error::success();
+ }
+ 
+-Error COFFWriter::finalizeSectionNumbers() {
++Error COFFWriter::finalizeSymbolContents() {
+   for (Symbol &Sym : Obj.getMutableSymbols()) {
+     if (Sym.TargetSectionId <= 0) {
+       // Undefined, or a special kind of symbol. These negative values
+@@ -75,6 +75,18 @@ Error COFFWriter::finalizeSectionNumbers() {
+         SD->NumberHighPart = static_cast<uint16_t>(SDSectionNumber >> 16);
+       }
+     }
++    // Check that we actually have got AuxData to match the weak symbol target
++    // we want to set. Only >= 1 would be required, but only == 1 makes sense.
++    if (Sym.WeakTargetSymbolId && Sym.Sym.NumberOfAuxSymbols == 1) {
++      coff_aux_weak_external *WE =
++          reinterpret_cast<coff_aux_weak_external *>(Sym.AuxData.data());
++      const Symbol *Target = Obj.findSymbol(*Sym.WeakTargetSymbolId);
++      if (Target == nullptr)
++        return createStringError(object_error::invalid_symbol_index,
++                                 "Symbol '%s' is missing its weak target",
++                                 Sym.Name.str().c_str());
++      WE->TagIndex = Target->RawIndex;
++    }
+   }
+   return Error::success();
+ }
+@@ -137,7 +149,7 @@ std::pair<size_t, size_t> COFFWriter::finalizeSymbolTable() {
+ Error COFFWriter::finalize(bool IsBigObj) {
+   if (Error E = finalizeRelocTargets())
+     return E;
+-  if (Error E = finalizeSectionNumbers())
++  if (Error E = finalizeSymbolContents())
+     return E;
+ 
+   size_t SizeOfHeaders = 0;
+diff --git a/llvm/tools/llvm-objcopy/COFF/Writer.h b/llvm/tools/llvm-objcopy/COFF/Writer.h
+index a967a103df9..9b1cfa91d00 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Writer.h
++++ b/llvm/tools/llvm-objcopy/COFF/Writer.h
+@@ -31,7 +31,7 @@ class COFFWriter {
+   StringTableBuilder StrTabBuilder;
+ 
+   Error finalizeRelocTargets();
+-  Error finalizeSectionNumbers();
++  Error finalizeSymbolContents();
+   void layoutSections();
+   size_t finalizeStringTable();
+   template <class SymbolTy> std::pair<size_t, size_t> finalizeSymbolTable();
+-- 
+2.17.1
+
diff --git a/build/build-clang/mingwclang-llvm-objcopy-Consistently-use-createStringError-inst.patch b/build/build-clang/mingwclang-llvm-objcopy-Consistently-use-createStringError-inst.patch
new file mode 100644
index 000000000000..e4f7ff0c41a5
--- /dev/null
+++ b/build/build-clang/mingwclang-llvm-objcopy-Consistently-use-createStringError-inst.patch
@@ -0,0 +1,242 @@
+From d3b89a1637cddee1c61e59257cfe92227ead29e5 Mon Sep 17 00:00:00 2001
+From: Martin Storsjo <martin@martin.st>
+Date: Tue, 22 Jan 2019 10:57:59 +0000
+Subject: [PATCH] [llvm-objcopy] Consistently use createStringError instead of
+ make_error<StringError>
+
+This was requested in the review of D57006.
+
+Also add missing quotes around symbol names in error messages.
+
+Differential Revision: https://reviews.llvm.org/D57014
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351799 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ .../llvm-objcopy/COFF/remove-section.test     |  2 +-
+ tools/llvm-objcopy/COFF/COFFObjcopy.cpp       |  8 ++---
+ tools/llvm-objcopy/COFF/Object.cpp            |  5 ++-
+ tools/llvm-objcopy/COFF/Reader.cpp            | 24 +++++++-------
+ tools/llvm-objcopy/COFF/Writer.cpp            | 33 +++++++++----------
+ tools/llvm-objcopy/ELF/ELFObjcopy.cpp         | 10 +++---
+ 6 files changed, 40 insertions(+), 42 deletions(-)
+
+diff --git a/llvm/test/tools/llvm-objcopy/COFF/remove-section.test b/llvm/test/tools/llvm-objcopy/COFF/remove-section.test
+index b3dfb0b98cb..6dc8f6a6c2e 100644
+--- a/test/tools/llvm-objcopy/COFF/remove-section.test
++++ b/llvm/test/tools/llvm-objcopy/COFF/remove-section.test
+@@ -96,7 +96,7 @@
+ # Removing the .comdat section fails, since the .text section has relocations
+ # against it.
+ #
+-# ERROR-RELOC: Relocation target foo ({{.*}}) not found
++# ERROR-RELOC: Relocation target 'foo' ({{.*}}) not found
+ #
+ #
+ # Removing the .comdat section and .text (with a relocation against .comdat)
+diff --git a/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+index 99929d10a1f..8d8f53d13d8 100644
+--- a/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp
+@@ -84,10 +84,10 @@ static Error handleArgs(const CopyConfig &Config, Object &Obj) {
+       // Explicitly removing a referenced symbol is an error.
+       if (Sym.Referenced)
+         reportError(Config.OutputFilename,
+-                    make_error<StringError>(
+-                        "not stripping symbol '" + Sym.Name +
+-                            "' because it is named in a relocation.",
+-                        llvm::errc::invalid_argument));
++                    createStringError(llvm::errc::invalid_argument,
++                                      "not stripping symbol '%s' because it is "
++                                      "named in a relocation.",
++                                      Sym.Name.str().c_str()));
+       return true;
+     }
+ 
+diff --git a/llvm/tools/llvm-objcopy/COFF/Object.cpp b/llvm/tools/llvm-objcopy/COFF/Object.cpp
+index fc87d9e574d..83435dffa98 100644
+--- a/tools/llvm-objcopy/COFF/Object.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Object.cpp
+@@ -56,9 +56,8 @@ Error Object::markSymbols() {
+     for (const Relocation &R : Sec.Relocs) {
+       auto It = SymbolMap.find(R.Target);
+       if (It == SymbolMap.end())
+-        return make_error<StringError>("Relocation target " + Twine(R.Target) +
+-                                           " not found",
+-                                       object_error::invalid_symbol_index);
++        return createStringError(object_error::invalid_symbol_index,
++                                 "Relocation target %zu not found", R.Target);
+       It->second->Referenced = true;
+     }
+   }
+diff --git a/llvm/tools/llvm-objcopy/COFF/Reader.cpp b/llvm/tools/llvm-objcopy/COFF/Reader.cpp
+index c8abe2913a2..20ff32a59dc 100644
+--- a/tools/llvm-objcopy/COFF/Reader.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Reader.cpp
+@@ -77,8 +77,8 @@ Error COFFReader::readSections(Object &Obj) const {
+     if (auto EC = COFFObj.getSectionName(Sec, S.Name))
+       return errorCodeToError(EC);
+     if (Sec->hasExtendedRelocations())
+-      return make_error<StringError>("Extended relocations not supported yet",
+-                                     object_error::parse_failed);
++      return createStringError(object_error::parse_failed,
++                               "Extended relocations not supported yet");
+   }
+   Obj.addSections(Sections);
+   return Error::success();
+@@ -116,16 +116,16 @@ Error COFFReader::readSymbols(Object &Obj, bool IsBigObj) const {
+              Sections.size())
+       Sym.TargetSectionId = Sections[SymRef.getSectionNumber() - 1].UniqueId;
+     else
+-      return make_error<StringError>("Section number out of range",
+-                                     object_error::parse_failed);
++      return createStringError(object_error::parse_failed,
++                               "Section number out of range");
+     // For section definitions, check if it is comdat associative, and if
+     // it is, find the target section unique id.
+     const coff_aux_section_definition *SD = SymRef.getSectionDefinition();
+     if (SD && SD->Selection == IMAGE_COMDAT_SELECT_ASSOCIATIVE) {
+       int32_t Index = SD->getNumber(IsBigObj);
+       if (Index <= 0 || static_cast<uint32_t>(Index - 1) >= Sections.size())
+-        return make_error<StringError>("Unexpected associative section index",
+-                                       object_error::parse_failed);
++        return createStringError(object_error::parse_failed,
++                                 "Unexpected associative section index");
+       Sym.AssociativeComdatTargetSectionId = Sections[Index - 1].UniqueId;
+     }
+     I += 1 + SymRef.getNumberOfAuxSymbols();
+@@ -144,12 +144,12 @@ Error COFFReader::setRelocTargets(Object &Obj) const {
+   for (Section &Sec : Obj.getMutableSections()) {
+     for (Relocation &R : Sec.Relocs) {
+       if (R.Reloc.SymbolTableIndex >= RawSymbolTable.size())
+-        return make_error<StringError>("SymbolTableIndex out of range",
+-                                       object_error::parse_failed);
++        return createStringError(object_error::parse_failed,
++                                 "SymbolTableIndex out of range");
+       const Symbol *Sym = RawSymbolTable[R.Reloc.SymbolTableIndex];
+       if (Sym == nullptr)
+-        return make_error<StringError>("Invalid SymbolTableIndex",
+-                                       object_error::parse_failed);
++        return createStringError(object_error::parse_failed,
++                                 "Invalid SymbolTableIndex");
+       R.Target = Sym->UniqueId;
+       R.TargetName = Sym->Name;
+     }
+@@ -169,8 +169,8 @@ Expected<std::unique_ptr<Object>> COFFReader::create() const {
+     Obj->CoffFileHeader = *CFH;
+   } else {
+     if (!CBFH)
+-      return make_error<StringError>("No COFF file header returned",
+-                                     object_error::parse_failed);
++      return createStringError(object_error::parse_failed,
++                               "No COFF file header returned");
+     // Only copying the few fields from the bigobj header that we need
+     // and won't recreate in the end.
+     Obj->CoffFileHeader.Machine = CBFH->Machine;
+diff --git a/llvm/tools/llvm-objcopy/COFF/Writer.cpp b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+index 9fb7812672b..0321f94a896 100644
+--- a/tools/llvm-objcopy/COFF/Writer.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+@@ -29,10 +29,9 @@ Error COFFWriter::finalizeRelocTargets() {
+     for (Relocation &R : Sec.Relocs) {
+       const Symbol *Sym = Obj.findSymbol(R.Target);
+       if (Sym == nullptr)
+-        return make_error<StringError>("Relocation target " + R.TargetName +
+-                                           " (" + Twine(R.Target) +
+-                                           ") not found",
+-                                       object_error::invalid_symbol_index);
++        return createStringError(object_error::invalid_symbol_index,
++                                 "Relocation target '%s' (%zu) not found",
++                                 R.TargetName.str().c_str(), R.Target);
+       R.Reloc.SymbolTableIndex = Sym->RawIndex;
+     }
+   }
+@@ -48,9 +47,9 @@ Error COFFWriter::finalizeSectionNumbers() {
+     } else {
+       const Section *Sec = Obj.findSection(Sym.TargetSectionId);
+       if (Sec == nullptr)
+-        return make_error<StringError>("Symbol " + Sym.Name +
+-                                           " points to a removed section",
+-                                       object_error::invalid_symbol_index);
++        return createStringError(object_error::invalid_symbol_index,
++                                 "Symbol '%s' points to a removed section",
++                                 Sym.Name.str().c_str());
+       Sym.Sym.SectionNumber = Sec->Index;
+ 
+       if (Sym.Sym.NumberOfAuxSymbols == 1 &&
+@@ -65,9 +64,10 @@ Error COFFWriter::finalizeSectionNumbers() {
+         } else {
+           Sec = Obj.findSection(Sym.AssociativeComdatTargetSectionId);
+           if (Sec == nullptr)
+-            return make_error<StringError>(
+-                "Symbol " + Sym.Name + " is associative to a removed section",
+-                object_error::invalid_symbol_index);
++            return createStringError(
++                object_error::invalid_symbol_index,
++                "Symbol '%s' is associative to a removed section",
++                Sym.Name.str().c_str());
+           SDSectionNumber = Sec->Index;
+         }
+         // Update the section definition with the new section number.
+@@ -343,9 +343,8 @@ Error COFFWriter::patchDebugDirectory() {
+             S.Header.VirtualAddress + S.Header.SizeOfRawData) {
+       if (Dir->RelativeVirtualAddress + Dir->Size >
+           S.Header.VirtualAddress + S.Header.SizeOfRawData)
+-        return make_error<StringError>(
+-            "Debug directory extends past end of section",
+-            object_error::parse_failed);
++        return createStringError(object_error::parse_failed,
++                                 "Debug directory extends past end of section");
+ 
+       size_t Offset = Dir->RelativeVirtualAddress - S.Header.VirtualAddress;
+       uint8_t *Ptr = Buf.getBufferStart() + S.Header.PointerToRawData + Offset;
+@@ -361,15 +360,15 @@ Error COFFWriter::patchDebugDirectory() {
+       return Error::success();
+     }
+   }
+-  return make_error<StringError>("Debug directory not found",
+-                                 object_error::parse_failed);
++  return createStringError(object_error::parse_failed,
++                           "Debug directory not found");
+ }
+ 
+ Error COFFWriter::write() {
+   bool IsBigObj = Obj.getSections().size() > MaxNumberOfSections16;
+   if (IsBigObj && Obj.IsPE)
+-    return make_error<StringError>("Too many sections for executable",
+-                                   object_error::parse_failed);
++    return createStringError(object_error::parse_failed,
++                             "Too many sections for executable");
+   return write(IsBigObj);
+ }
+ 
+diff --git a/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp b/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
+index db0cd76ced4..a2996395c1f 100644
+--- a/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
++++ b/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
+@@ -185,9 +185,10 @@ static Error dumpSectionToFile(StringRef SecName, StringRef Filename,
+   for (auto &Sec : Obj.sections()) {
+     if (Sec.Name == SecName) {
+       if (Sec.OriginalData.empty())
+-        return make_error<StringError>("Can't dump section \"" + SecName +
+-                                           "\": it has no contents",
+-                                       object_error::parse_failed);
++        return createStringError(
++            object_error::parse_failed,
++            "Can't dump section \"%s\": it has no contents",
++            SecName.str().c_str());
+       Expected<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
+           FileOutputBuffer::create(Filename, Sec.OriginalData.size());
+       if (!BufferOrErr)
+@@ -200,8 +201,7 @@ static Error dumpSectionToFile(StringRef SecName, StringRef Filename,
+       return Error::success();
+     }
+   }
+-  return make_error<StringError>("Section not found",
+-                                 object_error::parse_failed);
++  return createStringError(object_error::parse_failed, "Section not found");
+ }
+ 
+ static bool isCompressed(const SectionBase &Section) {
+-- 
+2.17.1
+
diff --git a/build/build-clang/mingwclang-llvm-objcopy-Return-Error-from-Buffer-allocate-ELF-W.patch b/build/build-clang/mingwclang-llvm-objcopy-Return-Error-from-Buffer-allocate-ELF-W.patch
new file mode 100644
index 000000000000..6fd9776d2170
--- /dev/null
+++ b/build/build-clang/mingwclang-llvm-objcopy-Return-Error-from-Buffer-allocate-ELF-W.patch
@@ -0,0 +1,330 @@
+From 8cf7aa39d7c9461e2d765f6d4fa7e0925571695f Mon Sep 17 00:00:00 2001
+From: Jordan Rupprecht <rupprecht@google.com>
+Date: Tue, 22 Jan 2019 23:49:16 +0000
+Subject: [PATCH] [llvm-objcopy] Return Error from Buffer::allocate(),
+ [ELF]Writer::finalize(), and [ELF]Writer::commit()
+
+Summary:
+This patch changes a few methods to return Error instead of manually calling error/reportError to abort. This will make it easier to extract into a library.
+
+Note that error() takes just a string (this patch also adds an overload that takes an Error), while reportError() takes string + [error/code]. To help unify things, use FileError to associate a given filename with an error. Note that this takes some special care (for now), e.g. calling reportError(FileName, <something that could be FileError>) will duplicate the filename. The goal is to eventually remove reportError() and have every error associated with a file to be a FileError, and just one error handling block at the tool level.
+
+This change was suggested in D56806. I took it a little further than suggested, but completely fixing llvm-objcopy will take a couple more patches. If this approach looks good, I'll commit this and apply similar patche(s) for the rest.
+
+This change is NFC in terms of non-error related code, although the error message changes in one context.
+
+Reviewers: alexshap, jhenderson, jakehehrlich, mstorsjo, espindola
+
+Reviewed By: alexshap, jhenderson
+
+Subscribers: llvm-commits, emaste, arichardson
+
+Differential Revision: https://reviews.llvm.org/D56930
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351896 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ .../ELF/fail-no-output-directory.test         |  2 +-
+ tools/llvm-objcopy/Buffer.cpp                 | 20 ++++++++++++-----
+ tools/llvm-objcopy/Buffer.h                   |  6 ++---
+ tools/llvm-objcopy/COFF/Writer.cpp            |  3 ++-
+ tools/llvm-objcopy/ELF/ELFObjcopy.cpp         | 18 ++++++++++-----
+ tools/llvm-objcopy/ELF/Object.cpp             | 22 ++++++++++---------
+ tools/llvm-objcopy/ELF/Object.h               | 12 +++++-----
+ tools/llvm-objcopy/llvm-objcopy.cpp           | 15 +++++++++++--
+ tools/llvm-objcopy/llvm-objcopy.h             |  1 +
+ 9 files changed, 64 insertions(+), 35 deletions(-)
+
+diff --git a/llvm/test/tools/llvm-objcopy/ELF/fail-no-output-directory.test b/llvm/test/tools/llvm-objcopy/ELF/fail-no-output-directory.test
+index f66b2e09fce..732046fa925 100644
+--- a/llvm/test/tools/llvm-objcopy/ELF/fail-no-output-directory.test
++++ b/llvm/test/tools/llvm-objcopy/ELF/fail-no-output-directory.test
+@@ -1,6 +1,6 @@
+ # RUN: yaml2obj %s > %t
+ # RUN: not llvm-objcopy %t no/such/dir 2>&1 | FileCheck %s
+-# CHECK: failed to open no/such/dir:
++# CHECK: error: 'no/such/dir': No such file or directory
+ 
+ !ELF
+ FileHeader:
+diff --git a/llvm/tools/llvm-objcopy/Buffer.cpp b/llvm/tools/llvm-objcopy/Buffer.cpp
+index 2da03dee1af..1789097f276 100644
+--- a/llvm/tools/llvm-objcopy/Buffer.cpp
++++ b/llvm/tools/llvm-objcopy/Buffer.cpp
+@@ -17,23 +17,31 @@ namespace objcopy {
+ 
+ Buffer::~Buffer() {}
+ 
+-void FileBuffer::allocate(size_t Size) {
++Error FileBuffer::allocate(size_t Size) {
+   Expected<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
+       FileOutputBuffer::create(getName(), Size, FileOutputBuffer::F_executable);
+-  handleAllErrors(BufferOrErr.takeError(), [this](const ErrorInfoBase &E) {
+-    error("failed to open " + getName() + ": " + E.message());
+-  });
++  // FileOutputBuffer::create() returns an Error that is just a wrapper around
++  // std::error_code. Wrap it in FileError to include the actual filename.
++  if (!BufferOrErr)
++    return createFileError(getName(), BufferOrErr.takeError());
+   Buf = std::move(*BufferOrErr);
++  return Error::success();
+ }
+ 
+-Error FileBuffer::commit() { return Buf->commit(); }
++Error FileBuffer::commit() {
++  Error Err = Buf->commit();
++  // FileOutputBuffer::commit() returns an Error that is just a wrapper around
++  // std::error_code. Wrap it in FileError to include the actual filename.
++  return Err ? createFileError(getName(), std::move(Err)) : std::move(Err);
++}
+ 
+ uint8_t *FileBuffer::getBufferStart() {
+   return reinterpret_cast<uint8_t *>(Buf->getBufferStart());
+ }
+ 
+-void MemBuffer::allocate(size_t Size) {
++Error MemBuffer::allocate(size_t Size) {
+   Buf = WritableMemoryBuffer::getNewMemBuffer(Size, getName());
++  return Error::success();
+ }
+ 
+ Error MemBuffer::commit() { return Error::success(); }
+diff --git a/llvm/tools/llvm-objcopy/Buffer.h b/llvm/tools/llvm-objcopy/Buffer.h
+index 482777fe05c..40670accac2 100644
+--- a/llvm/tools/llvm-objcopy/Buffer.h
++++ b/llvm/tools/llvm-objcopy/Buffer.h
+@@ -27,7 +27,7 @@ class Buffer {
+ 
+ public:
+   virtual ~Buffer();
+-  virtual void allocate(size_t Size) = 0;
++  virtual Error allocate(size_t Size) = 0;
+   virtual uint8_t *getBufferStart() = 0;
+   virtual Error commit() = 0;
+ 
+@@ -39,7 +39,7 @@ class FileBuffer : public Buffer {
+   std::unique_ptr<FileOutputBuffer> Buf;
+ 
+ public:
+-  void allocate(size_t Size) override;
++  Error allocate(size_t Size) override;
+   uint8_t *getBufferStart() override;
+   Error commit() override;
+ 
+@@ -50,7 +50,7 @@ class MemBuffer : public Buffer {
+   std::unique_ptr<WritableMemoryBuffer> Buf;
+ 
+ public:
+-  void allocate(size_t Size) override;
++  Error allocate(size_t Size) override;
+   uint8_t *getBufferStart() override;
+   Error commit() override;
+ 
+diff --git a/llvm/tools/llvm-objcopy/COFF/Writer.cpp b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+index 4f57131d5ab..db3589bb119 100644
+--- a/llvm/tools/llvm-objcopy/COFF/Writer.cpp
++++ b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+@@ -324,7 +324,8 @@ Error COFFWriter::write(bool IsBigObj) {
+   if (Error E = finalize(IsBigObj))
+     return E;
+ 
+-  Buf.allocate(FileSize);
++  if (Error E = Buf.allocate(FileSize))
++    return E;
+ 
+   writeHeaders(IsBigObj);
+   writeSections();
+diff --git a/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp b/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
+index a2996395c1f..2a52f1f9951 100644
+--- a/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
++++ b/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
+@@ -176,8 +176,10 @@ static void splitDWOToFile(const CopyConfig &Config, const Reader &Reader,
+     DWOFile->Machine = Config.OutputArch.getValue().EMachine;
+   FileBuffer FB(File);
+   auto Writer = createWriter(Config, *DWOFile, FB, OutputElfType);
+-  Writer->finalize();
+-  Writer->write();
++  if (Error E = Writer->finalize())
++    error(std::move(E));
++  if (Error E = Writer->write())
++    error(std::move(E));
+ }
+ 
+ static Error dumpSectionToFile(StringRef SecName, StringRef Filename,
+@@ -542,8 +544,10 @@ void executeObjcopyOnRawBinary(const CopyConfig &Config, MemoryBuffer &In,
+   handleArgs(Config, *Obj, Reader, OutputElfType);
+   std::unique_ptr<Writer> Writer =
+       createWriter(Config, *Obj, Out, OutputElfType);
+-  Writer->finalize();
+-  Writer->write();
++  if (Error E = Writer->finalize())
++    error(std::move(E));
++  if (Error E = Writer->write())
++    error(std::move(E));
+ }
+ 
+ void executeObjcopyOnBinary(const CopyConfig &Config,
+@@ -570,8 +574,10 @@ void executeObjcopyOnBinary(const CopyConfig &Config,
+   handleArgs(Config, *Obj, Reader, OutputElfType);
+   std::unique_ptr<Writer> Writer =
+       createWriter(Config, *Obj, Out, OutputElfType);
+-  Writer->finalize();
+-  Writer->write();
++  if (Error E = Writer->finalize())
++    error(std::move(E));
++  if (Error E = Writer->write())
++    error(std::move(E));
+   if (!Config.BuildIdLinkDir.empty() && Config.BuildIdLinkOutput) {
+     linkToBuildIdDir(Config, Config.OutputFilename,
+                      Config.BuildIdLinkOutput.getValue(), BuildIdBytes);
+diff --git a/llvm/tools/llvm-objcopy/ELF/Object.cpp b/llvm/tools/llvm-objcopy/ELF/Object.cpp
+index fecb752a39f..ef5dc5d7951 100644
+--- a/llvm/tools/llvm-objcopy/ELF/Object.cpp
++++ b/llvm/tools/llvm-objcopy/ELF/Object.cpp
+@@ -1488,17 +1488,16 @@ template <class ELFT> size_t ELFWriter<ELFT>::totalSize() const {
+          NullSectionSize;
+ }
+ 
+-template <class ELFT> void ELFWriter<ELFT>::write() {
++template <class ELFT> Error ELFWriter<ELFT>::write() {
+   writeEhdr();
+   writePhdrs();
+   writeSectionData();
+   if (WriteSectionHeaders)
+     writeShdrs();
+-  if (auto E = Buf.commit())
+-    reportError(Buf.getName(), errorToErrorCode(std::move(E)));
++  return Buf.commit();
+ }
+ 
+-template <class ELFT> void ELFWriter<ELFT>::finalize() {
++template <class ELFT> Error ELFWriter<ELFT>::finalize() {
+   // It could happen that SectionNames has been removed and yet the user wants
+   // a section header table output. We need to throw an error if a user tries
+   // to do that.
+@@ -1582,21 +1581,22 @@ template <class ELFT> void ELFWriter<ELFT>::finalize() {
+     Section.finalize();
+   }
+ 
+-  Buf.allocate(totalSize());
++  if (Error E = Buf.allocate(totalSize()))
++    return E;
+   SecWriter = llvm::make_unique<ELFSectionWriter<ELFT>>(Buf);
++  return Error::success();
+ }
+ 
+-void BinaryWriter::write() {
++Error BinaryWriter::write() {
+   for (auto &Section : Obj.sections()) {
+     if ((Section.Flags & SHF_ALLOC) == 0)
+       continue;
+     Section.accept(*SecWriter);
+   }
+-  if (auto E = Buf.commit())
+-    reportError(Buf.getName(), errorToErrorCode(std::move(E)));
++  return Buf.commit();
+ }
+ 
+-void BinaryWriter::finalize() {
++Error BinaryWriter::finalize() {
+   // TODO: Create a filter range to construct OrderedSegments from so that this
+   // code can be deduped with assignOffsets above. This should also solve the
+   // todo below for LayoutSections.
+@@ -1675,8 +1675,10 @@ void BinaryWriter::finalize() {
+       TotalSize = std::max(TotalSize, Section->Offset + Section->Size);
+   }
+ 
+-  Buf.allocate(TotalSize);
++  if (Error E = Buf.allocate(TotalSize))
++    return E;
+   SecWriter = llvm::make_unique<BinarySectionWriter>(Buf);
++  return Error::success();
+ }
+ 
+ template class ELFBuilder<ELF64LE>;
+diff --git a/llvm/tools/llvm-objcopy/ELF/Object.h b/llvm/tools/llvm-objcopy/ELF/Object.h
+index 0dcb0d888bc..9e2b64be9dc 100644
+--- a/llvm/tools/llvm-objcopy/ELF/Object.h
++++ b/llvm/tools/llvm-objcopy/ELF/Object.h
+@@ -193,8 +193,8 @@ protected:
+ 
+ public:
+   virtual ~Writer();
+-  virtual void finalize() = 0;
+-  virtual void write() = 0;
++  virtual Error finalize() = 0;
++  virtual Error write() = 0;
+ 
+   Writer(Object &O, Buffer &B) : Obj(O), Buf(B) {}
+ };
+@@ -226,8 +226,8 @@ public:
+   virtual ~ELFWriter() {}
+   bool WriteSectionHeaders = true;
+ 
+-  void finalize() override;
+-  void write() override;
++  Error finalize() override;
++  Error write() override;
+   ELFWriter(Object &Obj, Buffer &Buf, bool WSH)
+       : Writer(Obj, Buf), WriteSectionHeaders(WSH) {}
+ };
+@@ -240,8 +240,8 @@ private:
+ 
+ public:
+   ~BinaryWriter() {}
+-  void finalize() override;
+-  void write() override;
++  Error finalize() override;
++  Error write() override;
+   BinaryWriter(Object &Obj, Buffer &Buf) : Writer(Obj, Buf) {}
+ };
+ 
+diff --git a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
+index d27395f2ae0..75d513546b7 100644
+--- a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
++++ b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
+@@ -56,6 +56,16 @@ LLVM_ATTRIBUTE_NORETURN void error(Twine Message) {
+   exit(1);
+ }
+ 
++LLVM_ATTRIBUTE_NORETURN void error(Error E) {
++  assert(E);
++  std::string Buf;
++  raw_string_ostream OS(Buf);
++  logAllUnhandledErrors(std::move(E), OS);
++  OS.flush();
++  WithColor::error(errs(), ToolName) << Buf;
++  exit(1);
++}
++
+ LLVM_ATTRIBUTE_NORETURN void reportError(StringRef File, std::error_code EC) {
+   assert(EC);
+   WithColor::error(errs(), ToolName)
+@@ -100,10 +110,11 @@ static Error deepWriteArchive(StringRef ArcName,
+     // NewArchiveMember still requires them even though writeArchive does not
+     // write them on disk.
+     FileBuffer FB(Member.MemberName);
+-    FB.allocate(Member.Buf->getBufferSize());
++    if (Error E = FB.allocate(Member.Buf->getBufferSize()))
++      return E;
+     std::copy(Member.Buf->getBufferStart(), Member.Buf->getBufferEnd(),
+               FB.getBufferStart());
+-    if (auto E = FB.commit())
++    if (Error E = FB.commit())
+       return E;
+   }
+   return Error::success();
+diff --git a/llvm/tools/llvm-objcopy/llvm-objcopy.h b/llvm/tools/llvm-objcopy/llvm-objcopy.h
+index 46d8339576c..18a789ca1f8 100644
+--- a/llvm/tools/llvm-objcopy/llvm-objcopy.h
++++ b/llvm/tools/llvm-objcopy/llvm-objcopy.h
+@@ -19,6 +19,7 @@ namespace llvm {
+ namespace objcopy {
+ 
+ LLVM_ATTRIBUTE_NORETURN extern void error(Twine Message);
++LLVM_ATTRIBUTE_NORETURN extern void error(Error E);
+ LLVM_ATTRIBUTE_NORETURN extern void reportError(StringRef File, Error E);
+ LLVM_ATTRIBUTE_NORETURN extern void reportError(StringRef File,
+                                                 std::error_code EC);
+-- 
+2.17.1
+
diff --git a/taskcluster/scripts/misc/build-clang-8-mingw.sh b/taskcluster/scripts/misc/build-clang-8-mingw.sh
index eb24c4d7576a..3bba68e3a895 100755
--- a/taskcluster/scripts/misc/build-clang-8-mingw.sh
+++ b/taskcluster/scripts/misc/build-clang-8-mingw.sh
@@ -32,9 +32,9 @@ SRC_DIR=$TOOLCHAIN_DIR/src
 
 make_flags="-j$(nproc)"
 
-mingw_version=d539d36fd573e688ec7ad9dc840e3826a65419b1
-libunwind_version=1f89d78bb488bc71cfdee8281fc0834e9fbe5dce
-llvm_mingw_version=53db1c3a4c9c81972b70556a5ba5cd6ccd8e6e7d
+mingw_version=164990461720e0ed6ea5ea9f359d78595b1a459a
+libunwind_version=6ee92fcc97350ae32db3172a269e9afcc2bab686
+llvm_mingw_version=c3a16814bd26aa6702e1e5b482a3d9044bb0f725
 
 binutils_version=2.27
 binutils_ext=bz2
@@ -193,15 +193,18 @@ build_libcxx() {
       -DCMAKE_SYSTEM_NAME=Windows \
       -DCMAKE_C_COMPILER_WORKS=TRUE \
       -DCMAKE_CXX_COMPILER_WORKS=TRUE \
+      -DLLVM_COMPILER_CHECKED=TRUE \
       -DCMAKE_AR=$INSTALL_DIR/bin/llvm-ar \
       -DCMAKE_RANLIB=$INSTALL_DIR/bin/llvm-ranlib \
       -DLLVM_NO_OLD_LIBSTDCXX=TRUE \
       -DCXX_SUPPORTS_CXX11=TRUE \
+      -DCXX_SUPPORTS_CXX_STD=TRUE \
       -DLIBUNWIND_USE_COMPILER_RT=TRUE \
       -DLIBUNWIND_ENABLE_THREADS=TRUE \
       -DLIBUNWIND_ENABLE_SHARED=FALSE \
       -DLIBUNWIND_ENABLE_CROSS_UNWINDING=FALSE \
-      -DCMAKE_CXX_FLAGS="${DEBUG_FLAGS} -nostdinc++ -I$SRC_DIR/libcxx/include -DPSAPI_VERSION=2" \
+      -DCMAKE_CXX_FLAGS="${DEBUG_FLAGS} -Wno-dll-attribute-on-redeclaration -nostdinc++ -I$SRC_DIR/libcxx/include -DPSAPI_VERSION=2" \
+      -DCMAKE_C_FLAGS="-Wno-dll-attribute-on-redeclaration" \
       $SRC_DIR/libunwind
   make $make_flags
   make $make_flags install
@@ -219,6 +222,7 @@ build_libcxx() {
       -DCMAKE_C_COMPILER_WORKS=TRUE \
       -DCMAKE_CXX_COMPILER_WORKS=TRUE \
       -DCMAKE_SYSROOT=$CROSS_PREFIX_DIR \
+      -DLLVM_COMPILER_CHECKED=TRUE \
       -DCMAKE_AR=$INSTALL_DIR/bin/llvm-ar \
       -DCMAKE_RANLIB=$INSTALL_DIR/bin/llvm-ranlib \
       -DLIBCXXABI_USE_COMPILER_RT=ON \
@@ -229,6 +233,7 @@ build_libcxx() {
       -DLIBCXXABI_LIBCXX_INCLUDES=$SRC_DIR/libcxx/include \
       -DLLVM_NO_OLD_LIBSTDCXX=TRUE \
       -DCXX_SUPPORTS_CXX11=TRUE \
+      -DCXX_SUPPORTS_CXX_STD=TRUE \
       -DCMAKE_CXX_FLAGS="${DEBUG_FLAGS} -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_HAS_THREAD_API_WIN32" \
       $SRC_DIR/libcxxabi
   make $make_flags VERBOSE=1
@@ -245,6 +250,7 @@ build_libcxx() {
       -DCMAKE_SYSTEM_NAME=Windows \
       -DCMAKE_C_COMPILER_WORKS=TRUE \
       -DCMAKE_CXX_COMPILER_WORKS=TRUE \
+      -DLLVM_COMPILER_CHECKED=TRUE \
       -DCMAKE_AR=$INSTALL_DIR/bin/llvm-ar \
       -DCMAKE_RANLIB=$INSTALL_DIR/bin/llvm-ranlib \
       -DLIBCXX_USE_COMPILER_RT=ON \

From 0aa739c12ba465b11cb5f1df01c171b1a4ddfce3 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 19:54:45 +0000
Subject: [PATCH 095/129] Bug 1548381 - Add prefs to release and enable
 password generation. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31205

--HG--
extra : moz-landing-system : lando
---
 modules/libpref/init/all.js                    | 2 ++
 toolkit/components/passwordmgr/LoginHelper.jsm | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 09db78d7f808..3efd174b54e1 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4724,6 +4724,8 @@ pref("signon.autofillForms.autocompleteOff", true);
 pref("signon.autofillForms.http",           false);
 pref("signon.autologin.proxy",              false);
 pref("signon.formlessCapture.enabled",      true);
+pref("signon.generation.available",         false);
+pref("signon.generation.enabled",           false);
 pref("signon.privateBrowsingCapture.enabled", false);
 pref("signon.storeWhenAutocompleteOff",     true);
 pref("signon.debug",                        false);
diff --git a/toolkit/components/passwordmgr/LoginHelper.jsm b/toolkit/components/passwordmgr/LoginHelper.jsm
index 37c795cdec24..20a0ce42ff28 100644
--- a/toolkit/components/passwordmgr/LoginHelper.jsm
+++ b/toolkit/components/passwordmgr/LoginHelper.jsm
@@ -28,6 +28,8 @@ var LoginHelper = {
   debug: null,
   enabled: null,
   formlessCaptureEnabled: null,
+  generationAvailable: null,
+  generationEnabled: null,
   insecureAutofill: null,
   managementURI: null,
   privateBrowsingCaptureEnabled: null,
@@ -47,6 +49,8 @@ var LoginHelper = {
     this.debug = Services.prefs.getBoolPref("signon.debug");
     this.enabled = Services.prefs.getBoolPref("signon.rememberSignons");
     this.formlessCaptureEnabled = Services.prefs.getBoolPref("signon.formlessCapture.enabled");
+    this.generationAvailable = Services.prefs.getBoolPref("signon.generation.available");
+    this.generationEnabled = Services.prefs.getBoolPref("signon.generation.enabled");
     this.insecureAutofill = Services.prefs.getBoolPref("signon.autofillForms.http");
     this.managementURI = Services.prefs.getStringPref("signon.management.overrideURI", null);
     this.privateBrowsingCaptureEnabled =

From b491827097767d72efd95668cd2864c88ce4b34c Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 19:54:58 +0000
Subject: [PATCH 096/129] Bug 1548381 - Generate and cache a password for
 autocomplete="new-password" password fields. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31206

--HG--
extra : moz-landing-system : lando
---
 .../static/browser_all_files_referenced.js    |  2 -
 .../passwordmgr/LoginAutoCompleteResult.jsm   |  4 +-
 .../passwordmgr/LoginManagerContent.jsm       | 19 ++++---
 .../passwordmgr/LoginManagerParent.jsm        | 53 +++++++++++++++++--
 4 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
index 7c2391a76e86..b3c0b2e35b7a 100644
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -147,8 +147,6 @@ var whitelist = [
   {file: "chrome://pippki/content/resetpassword.xul"},
   // Bug 1337345
   {file: "resource://gre/modules/Manifest.jsm"},
-  // Bug 1548381
-  {file: "resource://gre/modules/PasswordGenerator.jsm"},
   // Bug 1351097
   {file: "resource://gre/modules/accessibility/AccessFu.jsm"},
   // Bug 1356043
diff --git a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
index 531197c48132..85f0ccc7906f 100644
--- a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
@@ -394,10 +394,8 @@ LoginAutoComplete.prototype = {
       previousResult = null;
     }
 
-    let rect = BrowserUtils.getElementBoundingScreenRect(aElement);
     let acLookupPromise = this._autoCompleteLookupPromise =
-      LoginManagerContent._autoCompleteSearchAsync(aSearchString, previousResult,
-                                                   aElement, rect);
+      LoginManagerContent._autoCompleteSearchAsync(aSearchString, previousResult, aElement);
     acLookupPromise.then(completeSearch.bind(this, acLookupPromise)).catch(log.error);
   },
 
diff --git a/toolkit/components/passwordmgr/LoginManagerContent.jsm b/toolkit/components/passwordmgr/LoginManagerContent.jsm
index f0a7d68c88a9..8db5e94865fe 100644
--- a/toolkit/components/passwordmgr/LoginManagerContent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerContent.jsm
@@ -345,13 +345,14 @@ var LoginManagerContent = {
   },
 
   _autoCompleteSearchAsync(aSearchString, aPreviousResult,
-                           aElement, aRect) {
+                           aElement) {
     let doc = aElement.ownerDocument;
     let form = LoginFormFactory.createFromField(aElement);
     let win = doc.defaultView;
 
     let formOrigin = LoginHelper.getLoginOrigin(doc.documentURI);
     let actionOrigin = LoginHelper.getFormActionOrigin(form);
+    let autocompleteInfo = aElement.getAutocompleteInfo();
 
     let messageManager = win.docShell.messageManager;
 
@@ -361,13 +362,15 @@ var LoginManagerContent = {
                            null;
 
     let requestData = {};
-    let messageData = { formOrigin,
-                        actionOrigin,
-                        searchString: aSearchString,
-                        previousResult,
-                        rect: aRect,
-                        isSecure: InsecurePasswordUtils.isFormSecure(form),
-                        isPasswordField: aElement.type == "password",
+    let messageData = {
+      autocompleteInfo,
+      browsingContextId: win.docShell.browsingContext.id,
+      formOrigin,
+      actionOrigin,
+      searchString: aSearchString,
+      previousResult,
+      isSecure: InsecurePasswordUtils.isFormSecure(form),
+      isPasswordField: aElement.type == "password",
     };
 
     if (LoginHelper.showAutoCompleteFooter) {
diff --git a/toolkit/components/passwordmgr/LoginManagerParent.jsm b/toolkit/components/passwordmgr/LoginManagerParent.jsm
index 892fbecb37e1..6d3bc7ad0659 100644
--- a/toolkit/components/passwordmgr/LoginManagerParent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerParent.jsm
@@ -15,6 +15,8 @@ ChromeUtils.defineModuleGetter(this, "DeferredTask",
                                "resource://gre/modules/DeferredTask.jsm");
 ChromeUtils.defineModuleGetter(this, "LoginHelper",
                                "resource://gre/modules/LoginHelper.jsm");
+ChromeUtils.defineModuleGetter(this, "PasswordGenerator",
+                               "resource://gre/modules/PasswordGenerator.jsm");
 ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
                                "resource://gre/modules/PrivateBrowsingUtils.jsm");
 
@@ -26,6 +28,15 @@ XPCOMUtils.defineLazyGetter(this, "log", () => {
 var EXPORTED_SYMBOLS = [ "LoginManagerParent" ];
 
 var LoginManagerParent = {
+  /**
+   * A map of a principal's origin (including suffixes) to a generated password string so that we
+   * can offer the same password later (e.g. in a confirmation field).
+   *
+   * We don't currently evict from this cache so entries should last until the end of the browser
+   * session. That may change later but for now a typical session would max out at a few entries.
+   */
+  _generatedPasswordsByPrincipalOrigin: new Map(),
+
   /**
    * Reference to the default LoginRecipesParent (instead of the initialization promise) for
    * synchronous access. This is a temporary hack and new consumers should yield on
@@ -244,9 +255,16 @@ var LoginManagerParent = {
     });
   },
 
-  doAutocompleteSearch({ formOrigin, actionOrigin,
-                         searchString, previousResult,
-                         rect, requestId, isSecure, isPasswordField,
+  doAutocompleteSearch({
+    autocompleteInfo,
+    browsingContextId,
+    formOrigin,
+    actionOrigin,
+    searchString,
+    previousResult,
+    requestId,
+    isSecure,
+    isPasswordField,
   }, target) {
     // Note: previousResult is a regular object, not an
     // nsIAutoCompleteResult.
@@ -288,22 +306,49 @@ var LoginManagerParent = {
 
       // Remove results that are too short, or have different prefix.
       // Also don't offer empty usernames as possible results except
-      // for password field.
+      // for on password fields.
       if (isPasswordField) {
         return true;
       }
       return match && match.toLowerCase().startsWith(searchStringLower);
     });
 
+    let generatedPassword = null;
+    if (isPasswordField && autocompleteInfo.fieldName == "new-password") {
+      generatedPassword = this.getGeneratedPassword(browsingContextId);
+    }
+
     // Convert the array of nsILoginInfo to vanilla JS objects since nsILoginInfo
     // doesn't support structured cloning.
     var jsLogins = LoginHelper.loginsToVanillaObjects(matchingLogins);
     target.messageManager.sendAsyncMessage("PasswordManager:loginsAutoCompleted", {
       requestId,
+      generatedPassword,
       logins: jsLogins,
     });
   },
 
+  getGeneratedPassword(browsingContextId) {
+    if (!LoginHelper.enabled || !LoginHelper.generationAvailable || !LoginHelper.generationEnabled) {
+      return null;
+    }
+
+    let browsingContext = BrowsingContext.get(browsingContextId);
+    if (!browsingContext) {
+      return null;
+    }
+    let framePrincipalOrigin = browsingContext.currentWindowGlobal.documentPrincipal.origin;
+    // Use the same password if we already generated one for this origin so that it doesn't change
+    // with each search/keystroke and the user can easily re-enter a password in a confirmation field.
+    let generatedPW = this._generatedPasswordsByPrincipalOrigin.get(framePrincipalOrigin);
+    if (generatedPW) {
+      return generatedPW;
+    }
+    generatedPW = PasswordGenerator.generatePassword();
+    this._generatedPasswordsByPrincipalOrigin.set(framePrincipalOrigin, generatedPW);
+    return generatedPW;
+  },
+
   onFormSubmit({hostname, formSubmitURL, autoFilledLoginGuid,
                 usernameField, newPasswordField,
                 oldPasswordField, openerTopWindowID,

From bae69b418ae8a89301dda95c10e00d9b4d09ee04 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 19:55:15 +0000
Subject: [PATCH 097/129] Bug 1548381 -
 LoginManagerParent.doAutocompleteSearch/getGeneratedPassword tests. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31207

--HG--
extra : moz-landing-system : lando
---
 .../passwordmgr/LoginManagerParent.jsm        |  7 ++
 ...LoginManagerParent_doAutocompleteSearch.js | 92 +++++++++++++++++++
 ...LoginManagerParent_getGeneratedPassword.js | 69 ++++++++++++++
 .../passwordmgr/test/unit/xpcshell.ini        |  2 +
 4 files changed, 170 insertions(+)
 create mode 100644 toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_doAutocompleteSearch.js
 create mode 100644 toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_getGeneratedPassword.js

diff --git a/toolkit/components/passwordmgr/LoginManagerParent.jsm b/toolkit/components/passwordmgr/LoginManagerParent.jsm
index 6d3bc7ad0659..a72169237682 100644
--- a/toolkit/components/passwordmgr/LoginManagerParent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerParent.jsm
@@ -328,6 +328,13 @@ var LoginManagerParent = {
     });
   },
 
+  /**
+   * Expose `BrowsingContext` so we can stub it in tests.
+   */
+  get _browsingContextGlobal() {
+    return BrowsingContext;
+  },
+
   getGeneratedPassword(browsingContextId) {
     if (!LoginHelper.enabled || !LoginHelper.generationAvailable || !LoginHelper.generationEnabled) {
       return null;
diff --git a/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_doAutocompleteSearch.js b/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_doAutocompleteSearch.js
new file mode 100644
index 000000000000..5d8586133ccb
--- /dev/null
+++ b/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_doAutocompleteSearch.js
@@ -0,0 +1,92 @@
+/**
+ * Test LoginManagerParent.doAutocompleteSearch()
+ */
+
+"use strict";
+
+const {sinon} = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const {LoginManagerParent: LMP} = ChromeUtils.import("resource://gre/modules/LoginManagerParent.jsm");
+
+add_task(async function test_doAutocompleteSearch_generated_noLogins() {
+  Services.prefs.setBoolPref("signon.generation.available", true); // TODO: test both with false
+  Services.prefs.setBoolPref("signon.generation.enabled", true);
+
+  ok(LMP.doAutocompleteSearch, "doAutocompleteSearch exists");
+
+  // Default to the happy path
+  let arg1 = {
+    autocompleteInfo: {
+      section: "",
+      addressType: "",
+      contactType: "",
+      fieldName: "new-password",
+      canAutomaticallyPersist: false,
+    },
+    browsingContextId: 123,
+    formOrigin: "https://example.com",
+    actionOrigin: "https://mozilla.org",
+    searchString: "",
+    previousResult: null,
+    requestId: "foo",
+    isSecure: true,
+    isPasswordField: true,
+  };
+
+  let sendMessageStub = sinon.stub();
+  let fakeBrowser = {
+    messageManager: {
+      sendAsyncMessage: sendMessageStub,
+    },
+  };
+
+  sinon.stub(LMP._browsingContextGlobal, "get").withArgs(123).callsFake(() => {
+    return {
+      currentWindowGlobal: {
+        documentPrincipal: Services.scriptSecurityManager.createCodebasePrincipalFromOrigin("https://www.example.com^userContextId=1"),
+      },
+    };
+  });
+
+  LMP.doAutocompleteSearch(arg1, fakeBrowser);
+  ok(sendMessageStub.calledOnce, "sendAsyncMessage was called");
+  let msg1 = sendMessageStub.firstCall.args[1];
+  equal(msg1.requestId, arg1.requestId, "requestId matches");
+  equal(msg1.logins.length, 0, "no logins");
+  ok(msg1.generatedPassword, "has a generated password");
+  equal(msg1.generatedPassword.length, 15, "generated password length");
+  sendMessageStub.resetHistory();
+
+  info("repeat the search and ensure the same password was used");
+  LMP.doAutocompleteSearch(arg1, fakeBrowser);
+  ok(sendMessageStub.calledOnce, "sendAsyncMessage was called");
+  let msg2 = sendMessageStub.firstCall.args[1];
+  equal(msg2.requestId, arg1.requestId, "requestId matches");
+  equal(msg2.logins.length, 0, "no logins");
+  equal(msg2.generatedPassword, msg1.generatedPassword, "same generated password");
+  sendMessageStub.resetHistory();
+
+  info("Check cases where a password shouldn't be generated");
+
+  LMP.doAutocompleteSearch({...arg1, ...{isPasswordField: false}}, fakeBrowser);
+  ok(sendMessageStub.calledOnce, "sendAsyncMessage was called");
+  let msg = sendMessageStub.firstCall.args[1];
+  equal(msg.requestId, arg1.requestId, "requestId matches");
+  equal(msg.generatedPassword, null, "no generated password when not a pw. field");
+  sendMessageStub.resetHistory();
+
+  let arg1_2 = {...arg1};
+  arg1_2.autocompleteInfo.fieldName = "";
+  LMP.doAutocompleteSearch(arg1_2, fakeBrowser);
+  ok(sendMessageStub.calledOnce, "sendAsyncMessage was called");
+  msg = sendMessageStub.firstCall.args[1];
+  equal(msg.requestId, arg1.requestId, "requestId matches");
+  equal(msg.generatedPassword, null, "no generated password when not autocomplete=new-password");
+  sendMessageStub.resetHistory();
+
+  LMP.doAutocompleteSearch({...arg1, ...{browsingContextId: 999}}, fakeBrowser);
+  ok(sendMessageStub.calledOnce, "sendAsyncMessage was called");
+  msg = sendMessageStub.firstCall.args[1];
+  equal(msg.requestId, arg1.requestId, "requestId matches");
+  equal(msg.generatedPassword, null, "no generated password with a missing browsingContextId");
+  sendMessageStub.resetHistory();
+});
diff --git a/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_getGeneratedPassword.js b/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_getGeneratedPassword.js
new file mode 100644
index 000000000000..9be1ffb75ca7
--- /dev/null
+++ b/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_getGeneratedPassword.js
@@ -0,0 +1,69 @@
+/**
+ * Test LoginManagerParent.getGeneratedPassword()
+ */
+
+"use strict";
+
+const {sinon} = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const {LoginManagerParent: LMP} = ChromeUtils.import("resource://gre/modules/LoginManagerParent.jsm");
+
+add_task(async function test_getGeneratedPassword() {
+  // Force the feature to be enabled.
+  Services.prefs.setBoolPref("signon.generation.available", true);
+  Services.prefs.setBoolPref("signon.generation.enabled", true);
+
+  ok(LMP.getGeneratedPassword, "LMP.getGeneratedPassword exists");
+  equal(LMP._generatedPasswordsByPrincipalOrigin.size, 0, "Empty cache to start");
+
+  equal(LMP.getGeneratedPassword(99), null, "Null with no BrowsingContext");
+
+  ok(LMP._browsingContextGlobal, "Check _browsingContextGlobal exists");
+  ok(!LMP._browsingContextGlobal.get(99), "BrowsingContext 99 shouldn't exist yet");
+  info("Stubbing BrowsingContext.get(99)");
+  sinon.stub(LMP._browsingContextGlobal, "get").withArgs(99).callsFake(() => {
+    return {
+      currentWindowGlobal: {
+        documentPrincipal: Services.scriptSecurityManager.createCodebasePrincipalFromOrigin("https://www.example.com^userContextId=6"),
+      },
+    };
+  });
+  ok(LMP._browsingContextGlobal.get(99), "Checking BrowsingContext.get(99) stub");
+
+  let password1 = LMP.getGeneratedPassword(99);
+  notEqual(password1, null, "Check password was returned");
+  equal(password1.length, 15, "Check password length");
+  equal(LMP._generatedPasswordsByPrincipalOrigin.size, 1, "1 added to cache");
+  equal(LMP._generatedPasswordsByPrincipalOrigin.get("https://www.example.com^userContextId=6"),
+        password1, "Cache key and value");
+  let password2 = LMP.getGeneratedPassword(99);
+  equal(password1, password2, "Same password should be returned for the same origin");
+
+  info("Changing the documentPrincipal to simulate a navigation in the frame");
+  LMP._browsingContextGlobal.get.restore();
+  sinon.stub(LMP._browsingContextGlobal, "get").withArgs(99).callsFake(() => {
+    return {
+      currentWindowGlobal: {
+        documentPrincipal: Services.scriptSecurityManager.createCodebasePrincipalFromOrigin("https://www.mozilla.org^userContextId=2"),
+      },
+    };
+  });
+  let password3 = LMP.getGeneratedPassword(99);
+  notEqual(password2, password3, "Different password for a different origin for the same BC");
+  equal(password3.length, 15, "Check password3 length");
+
+  info("Now checks cases where null should be returned");
+
+  Services.prefs.setBoolPref("signon.rememberSignons", false);
+  equal(LMP.getGeneratedPassword(99), null, "Prevented when pwmgr disabled");
+  Services.prefs.setBoolPref("signon.rememberSignons", true);
+
+  Services.prefs.setBoolPref("signon.generation.available", false);
+  equal(LMP.getGeneratedPassword(99), null, "Prevented when unavailable");
+  Services.prefs.setBoolPref("signon.generation.available", true);
+
+  Services.prefs.setBoolPref("signon.generation.enabled", false);
+  equal(LMP.getGeneratedPassword(99), null, "Prevented when disabled");
+  Services.prefs.setBoolPref("signon.generation.enabled", true);
+
+  equal(LMP.getGeneratedPassword(123), null, "Prevented when browsingContext is missing");
+});
diff --git a/toolkit/components/passwordmgr/test/unit/xpcshell.ini b/toolkit/components/passwordmgr/test/unit/xpcshell.ini
index 7f459174197a..978962d3d029 100644
--- a/toolkit/components/passwordmgr/test/unit/xpcshell.ini
+++ b/toolkit/components/passwordmgr/test/unit/xpcshell.ini
@@ -27,6 +27,8 @@ run-if = buildapp == "browser"
 [test_isOriginMatching.js]
 [test_isUsernameFieldType.js]
 [test_legacy_empty_formSubmitURL.js]
+[test_LoginManagerParent_doAutocompleteSearch.js]
+[test_LoginManagerParent_getGeneratedPassword.js]
 [test_legacy_validation.js]
 [test_login_autocomplete_result.js]
 skip-if = os == "android"

From b15dc4c26cc0e6d0d9a65d47fe7dcd2b4e143cc6 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 19:55:34 +0000
Subject: [PATCH 098/129] Bug 1548381 - Simplify login autocomplete footer
 result to avoid JSON. r=sfoster

We don't need to use JSON since we now support getCommentAt for extra data.

Also add unit tests that are missing.

Differential Revision: https://phabricator.services.mozilla.com/D31208

--HG--
extra : moz-landing-system : lando
---
 .../passwordmgr/LoginAutoCompleteResult.jsm   |   6 +-
 .../test/mochitest/pwmgr_common.js            |   5 +-
 .../unit/test_login_autocomplete_result.js    | 145 +++++++++++++++++-
 .../widgets/autocomplete-richlistitem.js      |  13 +-
 4 files changed, 148 insertions(+), 21 deletions(-)

diff --git a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
index 85f0ccc7906f..7d2a31714f79 100644
--- a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
@@ -142,12 +142,10 @@ class LoginAutocompleteItem extends AutocompleteItem {
 class LoginsFooterAutocompleteItem extends AutocompleteItem {
   constructor(hostname) {
     super("loginsFooter");
+    this.comment = hostname;
 
     XPCOMUtils.defineLazyGetter(this, "label", () => {
-      return JSON.stringify({
-        label: getLocalizedString("viewSavedLogins.label"),
-        hostname,
-      });
+      return getLocalizedString("viewSavedLogins.label");
     });
   }
 }
diff --git a/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js b/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js
index d38c96cbdfc4..b4a970c60ac9 100644
--- a/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js
+++ b/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js
@@ -40,7 +40,7 @@ function $_(formNum, name) {
 
 /**
  * Check autocomplete popup results to ensure that expected
- * values are being shown correctly as items in the popup.
+ * *labels* are being shown correctly as items in the popup.
  */
 function checkAutoCompleteResults(actualValues, expectedValues, hostname, msg) {
   if (hostname !== null) {
@@ -48,8 +48,7 @@ function checkAutoCompleteResults(actualValues, expectedValues, hostname, msg) {
 
     // Check the footer first.
     let footerResult = actualValues[actualValues.length - 1];
-    ok(footerResult.includes("View Saved Logins"), "the footer text is shown correctly");
-    ok(footerResult.includes(hostname), "the footer has the correct hostname attribute");
+    is(footerResult, "View Saved Logins", "the footer text is shown correctly");
   }
 
   if (hostname === null) {
diff --git a/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js b/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
index ae223b0bf38b..f39acdaf2f76 100644
--- a/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
+++ b/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
@@ -54,6 +54,26 @@ let expectedResults = [
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
+    }],
+  },
+  {
+    insecureFieldWarningEnabled: true,
+    insecureAutoFillFormsEnabled: true,
+    isSecure: false,
+    isPasswordField: false,
+    matchingLogins: [],
+    items: [{
+      value: "",
+      label: "This connection is not secure. Logins entered here could be compromised. Learn More",
+      style: "insecureWarning",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
     }],
   },
   {
@@ -86,6 +106,10 @@ let expectedResults = [
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
     }],
   },
   {
@@ -114,6 +138,10 @@ let expectedResults = [
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
     }],
   },
   {
@@ -146,6 +174,10 @@ let expectedResults = [
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
     }],
   },
   {
@@ -174,6 +206,10 @@ let expectedResults = [
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
     }],
   },
   {
@@ -202,6 +238,10 @@ let expectedResults = [
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
     }],
   },
   {
@@ -230,6 +270,10 @@ let expectedResults = [
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
     }],
   },
   {
@@ -258,6 +302,10 @@ let expectedResults = [
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
     }],
   },
   {
@@ -286,6 +334,10 @@ let expectedResults = [
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
     }],
   },
   {
@@ -318,6 +370,10 @@ let expectedResults = [
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
     }],
   },
   {
@@ -346,6 +402,10 @@ let expectedResults = [
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
     }],
   },
   {
@@ -378,6 +438,10 @@ let expectedResults = [
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
     }],
   },
   {
@@ -406,6 +470,22 @@ let expectedResults = [
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
+    }],
+  },
+  {
+    insecureFieldWarningEnabled: false,
+    insecureAutoFillFormsEnabled: false,
+    isSecure: false,
+    isPasswordField: false,
+    matchingLogins: [],
+    items: [{
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
     }],
   },
   {
@@ -414,7 +494,31 @@ let expectedResults = [
     isSecure: false,
     isPasswordField: false,
     matchingLogins,
-    items: [],
+    items: [{
+      value: "",
+      label: LABEL_NO_USERNAME,
+      style: "loginWithOrigin",
+    }, {
+      value: "tempuser1",
+      label: "tempuser1",
+      style: "loginWithOrigin",
+    }, {
+      value: "testuser2",
+      label: "testuser2",
+      style: "loginWithOrigin",
+    }, {
+      value: "testuser3",
+      label: "testuser3",
+      style: "loginWithOrigin",
+    }, {
+      value: "zzzuser4",
+      label: "zzzuser4",
+      style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
+    }],
   },
   {
     insecureFieldWarningEnabled: false,
@@ -442,6 +546,10 @@ let expectedResults = [
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
     }],
   },
   {
@@ -450,15 +558,41 @@ let expectedResults = [
     isSecure: false,
     isPasswordField: true,
     matchingLogins,
-    items: [],
+    items: [{
+      value: "emptypass1",
+      label: LABEL_NO_USERNAME,
+      style: "loginWithOrigin",
+    }, {
+      value: "temppass1",
+      label: "tempuser1",
+      style: "loginWithOrigin",
+    }, {
+      value: "testpass2",
+      label: "testuser2",
+      style: "loginWithOrigin",
+    }, {
+      value: "testpass3",
+      label: "testuser3",
+      style: "loginWithOrigin",
+    }, {
+      value: "zzzpass4",
+      label: "zzzuser4",
+      style: "loginWithOrigin",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
+    }],
   },
 ];
 
 add_task(async function test_all_patterns() {
   LoginHelper.createLogger("LoginAutoCompleteResult");
+  Services.prefs.setBoolPref("signon.showAutoCompleteFooter", true);
   Services.prefs.setBoolPref("signon.showAutoCompleteOrigins", true);
 
   expectedResults.forEach(pattern => {
+    info(JSON.stringify(pattern, null, 2));
     Services.prefs.setBoolPref(PREF_INSECURE_FIELD_WARNING_ENABLED,
                                pattern.insecureFieldWarningEnabled);
     Services.prefs.setBoolPref(PREF_INSECURE_AUTOFILLFORMS_ENABLED,
@@ -467,10 +601,11 @@ add_task(async function test_all_patterns() {
       isSecure: pattern.isSecure,
       isPasswordField: pattern.isPasswordField,
     });
+    equal(actual.matchCount, pattern.items.length, "Check matching row count");
     pattern.items.forEach((item, index) => {
-      equal(actual.getValueAt(index), item.value);
-      equal(actual.getLabelAt(index), item.label);
-      equal(actual.getStyleAt(index), item.style);
+      equal(actual.getValueAt(index), item.value, `Value ${index}`);
+      equal(actual.getLabelAt(index), item.label, `Label ${index}`);
+      equal(actual.getStyleAt(index), item.style, `Style ${index}`);
     });
 
     if (pattern.items.length != 0) {
diff --git a/toolkit/content/widgets/autocomplete-richlistitem.js b/toolkit/content/widgets/autocomplete-richlistitem.js
index f642186e5bcf..39313f5c7d57 100644
--- a/toolkit/content/widgets/autocomplete-richlistitem.js
+++ b/toolkit/content/widgets/autocomplete-richlistitem.js
@@ -988,22 +988,17 @@ class MozAutocompleteRichlistitemLoginsFooter extends MozElements.MozAutocomplet
         return;
       }
 
+      // ac-label gets populated from getCommentAt despite the attribute name.
+      // The "comment" is used to populate additional visible text.
+      let formHostname = this.getAttribute("ac-label");
       LoginHelper.openPasswordManager(this.ownerGlobal, {
-        filterString: this._data.hostname,
+        filterString: formHostname,
         entryPoint: "autocomplete",
       });
     }
 
     this.addEventListener("click", handleEvent);
   }
-
-  get _data() {
-    return JSON.parse(this.getAttribute("ac-value"));
-  }
-
-  _adjustAcItem() {
-    this._titleText.textContent = this._data.label;
-  }
 }
 
 class MozAutocompleteRichlistitemLoginWithOrigin extends MozElements.MozRichlistitem {

From 2d2499d36dbef0826a4a043214685094fad39b0b Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 19:55:42 +0000
Subject: [PATCH 099/129] Bug 1548381 - Password Generation Autocomplete
 Result. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31209

--HG--
extra : moz-landing-system : lando
---
 .../passwordmgr/LoginAutoCompleteResult.jsm   | 25 +++++-
 .../passwordmgr/LoginManagerContent.jsm       |  6 +-
 .../unit/test_login_autocomplete_result.js    | 80 ++++++++++++++-----
 .../chrome/passwordmgr/passwordmgr.properties |  5 ++
 4 files changed, 91 insertions(+), 25 deletions(-)

diff --git a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
index 7d2a31714f79..b4cd51e0920b 100644
--- a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
@@ -139,6 +139,17 @@ class LoginAutocompleteItem extends AutocompleteItem {
   }
 }
 
+class GeneratedPasswordAutocompleteItem extends AutocompleteItem {
+  constructor(generatedPassword) {
+    super("generatedPassword");
+    this.value = generatedPassword;
+
+    XPCOMUtils.defineLazyGetter(this, "label", () => {
+      return getLocalizedString("useGeneratedPassword");
+    });
+  }
+}
+
 class LoginsFooterAutocompleteItem extends AutocompleteItem {
   constructor(hostname) {
     super("loginsFooter");
@@ -153,6 +164,7 @@ class LoginsFooterAutocompleteItem extends AutocompleteItem {
 
 // nsIAutoCompleteResult implementation
 function LoginAutoCompleteResult(aSearchString, matchingLogins, {
+  generatedPassword,
   isSecure,
   messageManager,
   isPasswordField,
@@ -173,7 +185,8 @@ function LoginAutoCompleteResult(aSearchString, matchingLogins, {
       return false;
     }
 
-    if (!matchingLogins.length && isPasswordField && formFillController.passwordPopupAutomaticallyOpened) {
+    if (!matchingLogins.length && !generatedPassword && isPasswordField
+        && formFillController.passwordPopupAutomaticallyOpened) {
       hidingFooterOnPWFieldAutoOpened = true;
       log.debug("Hiding footer: no logins and the popup was opened upon focus of the pw. field");
       return false;
@@ -205,6 +218,9 @@ function LoginAutoCompleteResult(aSearchString, matchingLogins, {
 
   // The footer comes last if it's enabled
   if (isFooterEnabled()) {
+    if (generatedPassword) {
+      this._rows.push(new GeneratedPasswordAutocompleteItem(generatedPassword));
+    }
     this._rows.push(new LoginsFooterAutocompleteItem(hostname));
   }
 
@@ -342,7 +358,11 @@ LoginAutoComplete.prototype = {
     let isPasswordField = aElement.type == "password";
     let hostname = aElement.ownerDocument.documentURIObject.host;
 
-    let completeSearch = (autoCompleteLookupPromise, { logins, messageManager }) => {
+    let completeSearch = (autoCompleteLookupPromise, {
+      generatedPassword,
+      logins,
+      messageManager,
+    }) => {
       // If the search was canceled before we got our
       // results, don't bother reporting them.
       if (this._autoCompleteLookupPromise !== autoCompleteLookupPromise) {
@@ -351,6 +371,7 @@ LoginAutoComplete.prototype = {
 
       this._autoCompleteLookupPromise = null;
       let results = new LoginAutoCompleteResult(aSearchString, logins, {
+        generatedPassword,
         messageManager,
         isSecure,
         isPasswordField,
diff --git a/toolkit/components/passwordmgr/LoginManagerContent.jsm b/toolkit/components/passwordmgr/LoginManagerContent.jsm
index 8db5e94865fe..7b6a0b80dd50 100644
--- a/toolkit/components/passwordmgr/LoginManagerContent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerContent.jsm
@@ -293,7 +293,11 @@ var LoginManagerContent = {
         let loginsFound = LoginHelper.vanillaObjectsToLogins(msg.data.logins);
         let messageManager = msg.target;
         let request = this._takeRequest(msg);
-        request.promise.resolve({ logins: loginsFound, messageManager });
+        request.promise.resolve({
+          generatedPassword: msg.data.generatedPassword,
+          logins: loginsFound,
+          messageManager,
+        });
         break;
       }
 
diff --git a/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js b/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
index f39acdaf2f76..c7791e5923c5 100644
--- a/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
+++ b/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
@@ -3,7 +3,6 @@ var nsLoginInfo = Components.Constructor("@mozilla.org/login-manager/loginInfo;1
                                          Ci.nsILoginInfo, "init");
 
 const PREF_INSECURE_FIELD_WARNING_ENABLED = "security.insecure_field_warning.contextual.enabled";
-const PREF_INSECURE_AUTOFILLFORMS_ENABLED = "signon.autofillForms.http";
 
 let matchingLogins = [];
 matchingLogins.push(new nsLoginInfo("http://mochi.test:8888", "http://autocomplete:8888", null,
@@ -30,7 +29,6 @@ const LABEL_NO_USERNAME = "No username (" + time + ")";
 let expectedResults = [
   {
     insecureFieldWarningEnabled: true,
-    insecureAutoFillFormsEnabled: true,
     isSecure: true,
     isPasswordField: false,
     matchingLogins,
@@ -62,7 +60,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: true,
-    insecureAutoFillFormsEnabled: true,
     isSecure: false,
     isPasswordField: false,
     matchingLogins: [],
@@ -78,7 +75,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: true,
-    insecureAutoFillFormsEnabled: true,
     isSecure: false,
     isPasswordField: false,
     matchingLogins,
@@ -114,7 +110,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: true,
-    insecureAutoFillFormsEnabled: true,
     isSecure: true,
     isPasswordField: true,
     matchingLogins,
@@ -146,7 +141,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: true,
-    insecureAutoFillFormsEnabled: true,
     isSecure: false,
     isPasswordField: true,
     matchingLogins,
@@ -182,7 +176,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: false,
-    insecureAutoFillFormsEnabled: true,
     isSecure: true,
     isPasswordField: false,
     matchingLogins,
@@ -214,7 +207,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: false,
-    insecureAutoFillFormsEnabled: true,
     isSecure: false,
     isPasswordField: false,
     matchingLogins,
@@ -246,7 +238,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: false,
-    insecureAutoFillFormsEnabled: true,
     isSecure: true,
     isPasswordField: true,
     matchingLogins,
@@ -278,7 +269,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: false,
-    insecureAutoFillFormsEnabled: true,
     isSecure: false,
     isPasswordField: true,
     matchingLogins,
@@ -310,7 +300,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: true,
-    insecureAutoFillFormsEnabled: false,
     isSecure: true,
     isPasswordField: false,
     matchingLogins,
@@ -342,7 +331,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: true,
-    insecureAutoFillFormsEnabled: false,
     isSecure: false,
     isPasswordField: false,
     matchingLogins,
@@ -378,7 +366,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: true,
-    insecureAutoFillFormsEnabled: false,
     isSecure: true,
     isPasswordField: true,
     matchingLogins,
@@ -410,7 +397,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: true,
-    insecureAutoFillFormsEnabled: false,
     isSecure: false,
     isPasswordField: true,
     matchingLogins,
@@ -446,7 +432,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: false,
-    insecureAutoFillFormsEnabled: false,
     isSecure: true,
     isPasswordField: false,
     matchingLogins,
@@ -478,7 +463,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: false,
-    insecureAutoFillFormsEnabled: false,
     isSecure: false,
     isPasswordField: false,
     matchingLogins: [],
@@ -490,7 +474,18 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: false,
-    insecureAutoFillFormsEnabled: false,
+    isSecure: false,
+    isPasswordField: false,
+    matchingLogins: [],
+    searchString: "foo",
+    items: [{
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
+    }],
+  },
+  {
+    insecureFieldWarningEnabled: false,
     isSecure: false,
     isPasswordField: false,
     matchingLogins,
@@ -522,7 +517,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: false,
-    insecureAutoFillFormsEnabled: false,
     isSecure: true,
     isPasswordField: true,
     matchingLogins,
@@ -554,7 +548,6 @@ let expectedResults = [
   },
   {
     insecureFieldWarningEnabled: false,
-    insecureAutoFillFormsEnabled: false,
     isSecure: false,
     isPasswordField: true,
     matchingLogins,
@@ -584,6 +577,50 @@ let expectedResults = [
       style: "loginsFooter",
     }],
   },
+  {
+    insecureFieldWarningEnabled: true,
+    isSecure: true,
+    isPasswordField: true,
+    matchingLogins: [],
+    items: [{
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
+    }],
+  },
+  {
+    insecureFieldWarningEnabled: true,
+    isSecure: true,
+    isPasswordField: true,
+    matchingLogins: [],
+    searchString: "foo",
+    items: [],
+  },
+  {
+    generatedPassword: "9ljgfd4shyktb45",
+    insecureFieldWarningEnabled: true,
+    isSecure: true,
+    isPasswordField: true,
+    matchingLogins: [],
+    items: [{
+      value: "9ljgfd4shyktb45",
+      label: "Use Generated Password",
+      style: "generatedPassword",
+    }, {
+      value: "",
+      label: "View Saved Logins",
+      style: "loginsFooter",
+    }],
+  },
+  {
+    generatedPassword: "9ljgfd4shyktb45",
+    insecureFieldWarningEnabled: true,
+    isSecure: true,
+    isPasswordField: true,
+    matchingLogins: [],
+    searchString: "9ljgfd4shyktb45",
+    items: [],
+  },
 ];
 
 add_task(async function test_all_patterns() {
@@ -595,9 +632,8 @@ add_task(async function test_all_patterns() {
     info(JSON.stringify(pattern, null, 2));
     Services.prefs.setBoolPref(PREF_INSECURE_FIELD_WARNING_ENABLED,
                                pattern.insecureFieldWarningEnabled);
-    Services.prefs.setBoolPref(PREF_INSECURE_AUTOFILLFORMS_ENABLED,
-                               pattern.insecureAutoFillFormsEnabled);
-    let actual = new LoginAutoCompleteResult("", pattern.matchingLogins, {
+    let actual = new LoginAutoCompleteResult(pattern.searchString || "", pattern.matchingLogins, {
+      generatedPassword: pattern.generatedPassword,
       isSecure: pattern.isSecure,
       isPasswordField: pattern.isPasswordField,
     });
diff --git a/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties b/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
index 67f3a522d672..fbb2b3a3a625 100644
--- a/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
+++ b/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
@@ -45,6 +45,10 @@ userSelectText2 = Select which login to update:
 removeLoginPrompt=Are you sure you wish to remove this login?
 removeLoginTitle=Remove login
 loginsDescriptionAll2=Logins for the following sites are stored on your computer
+
+# LOCALIZATION NOTE (useGeneratedPassword):
+# Shown in the autocomplete popup to allow filling a generated password into a password field.
+useGeneratedPassword=Use Generated Password
 # LOCALIZATION NOTE (loginHostAge):
 # This is used to show the context menu login items with their age.
 # 1st string is the username for the login, 2nd is the login's age.
@@ -52,6 +56,7 @@ loginHostAge=%1$S (%2$S)
 # LOCALIZATION NOTE (noUsername):
 # String is used on the context menu when a login doesn't have a username.
 noUsername=No username
+
 duplicateLoginTitle=Login already exists
 duplicateLogin=A duplicate login already exists.
 

From 033f729066b857432a34c8fe1a2dc92865a638b5 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 19:55:54 +0000
Subject: [PATCH 100/129] Bug 1548381 - Make a generic two-line autocomplete
 richlistitem element. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31210

--HG--
extra : moz-landing-system : lando
---
 browser/themes/shared/autocomplete.inc.css    |  50 ++++-----
 .../passwordmgr/LoginAutoCompleteResult.jsm   |  11 +-
 .../unit/test_login_autocomplete_result.js    | 103 ++++++++++++++++++
 toolkit/content/widgets/autocomplete-popup.js |   2 +-
 .../widgets/autocomplete-richlistitem.js      |  27 ++---
 toolkit/content/widgets/autocomplete.xml      |   2 +-
 6 files changed, 148 insertions(+), 47 deletions(-)

diff --git a/browser/themes/shared/autocomplete.inc.css b/browser/themes/shared/autocomplete.inc.css
index 64d6cb86c01f..5924fa2b73cf 100644
--- a/browser/themes/shared/autocomplete.inc.css
+++ b/browser/themes/shared/autocomplete.inc.css
@@ -7,7 +7,6 @@
 /* General popup rules */
 
 #PopupAutoComplete > richlistbox > richlistitem {
-  height: 20px;
   min-height: 20px;
   border: 0;
   border-radius: 0;
@@ -39,39 +38,21 @@
   color: HighlightText;
 }
 
-/* Login form autocompletion with and without origin showing */
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .login-wrapper > .ac-site-icon,
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon {
-  display: initial;
-  list-style-image: url(chrome://browser/skin/login.svg);
-  -moz-context-properties: fill;
-  fill: GrayText;
-}
+/* Autocomplete richlistitem support for a two-line label display */
 
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"][selected] > .login-wrapper > .ac-site-icon,
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon[selected] {
-  fill: HighlightText;
-}
-
-/* Login form autocompletion with origin showing */
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] {
-  height: auto;
-  padding: 4px;
-}
-
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .login-wrapper {
+#PopupAutoComplete > richlistbox > richlistitem > .two-line-wrapper {
   box-sizing: border-box;
   display: flex;
   flex-direction: row;
   margin: 0;
 }
 
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .login-wrapper > .ac-site-icon {
+#PopupAutoComplete > richlistbox > richlistitem > .two-line-wrapper > .ac-site-icon {
   margin-inline-start: auto;
   margin-inline-end: 4px;
 }
 
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .login-wrapper > .login-text {
+#PopupAutoComplete > richlistbox > richlistitem > .two-line-wrapper > .labels-wrapper {
   /* The text should flex while the icon should not */
   flex: 1;
   /* width/min-width are needed to get the text-overflow: ellipsis to work for the children */
@@ -79,17 +60,36 @@
   width: 0;
 }
 
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .login-wrapper > .login-text > .login-row {
+#PopupAutoComplete > richlistbox > richlistitem > .two-line-wrapper > .labels-wrapper > .label-row {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .login-wrapper > .login-text > .login-origin {
+#PopupAutoComplete > richlistbox > richlistitem > .two-line-wrapper > .labels-wrapper > .line2-label {
   padding-top: 2px !important;
   opacity: .6;
 }
 
+/* Login form autocompletion with and without origin showing */
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .two-line-wrapper > .ac-site-icon,
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon {
+  display: initial;
+  list-style-image: url(chrome://browser/skin/login.svg);
+  -moz-context-properties: fill;
+  fill: GrayText;
+}
+
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"][selected] > .two-line-wrapper > .ac-site-icon,
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon[selected] {
+  fill: HighlightText;
+}
+
+/* Login form autocompletion with origin showing */
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] {
+  padding: 4px;
+}
+
 /* Insecure field warning */
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] {
   background-color: var(--arrowpanel-dimmed);
diff --git a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
index b4cd51e0920b..2614647f5900 100644
--- a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
@@ -122,9 +122,14 @@ class LoginAutocompleteItem extends AutocompleteItem {
     });
 
     XPCOMUtils.defineLazyGetter(this, "comment", () => {
-      return JSON.stringify({
-        loginOrigin: login.hostname,
-      });
+      try {
+        let uri = Services.io.newURI(login.hostname);
+        // Fallback to handle file: URIs
+        return uri.displayHostPort || login.hostname;
+      } catch (ex) {
+        // Fallback to origin below
+      }
+      return login.hostname;
     });
   }
 
diff --git a/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js b/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
index c7791e5923c5..c0e8803328bb 100644
--- a/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
+++ b/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
@@ -36,26 +36,32 @@ let expectedResults = [
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -71,6 +77,7 @@ let expectedResults = [
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -86,26 +93,32 @@ let expectedResults = [
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -117,26 +130,32 @@ let expectedResults = [
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "temppass1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -152,26 +171,32 @@ let expectedResults = [
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "temppass1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -183,26 +208,32 @@ let expectedResults = [
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -214,26 +245,32 @@ let expectedResults = [
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -245,26 +282,32 @@ let expectedResults = [
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "temppass1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -276,26 +319,32 @@ let expectedResults = [
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "temppass1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -307,26 +356,32 @@ let expectedResults = [
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -342,26 +397,32 @@ let expectedResults = [
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -373,26 +434,32 @@ let expectedResults = [
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "temppass1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -408,26 +475,32 @@ let expectedResults = [
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "temppass1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -439,26 +512,32 @@ let expectedResults = [
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -470,6 +549,7 @@ let expectedResults = [
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -482,6 +562,7 @@ let expectedResults = [
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -493,26 +574,32 @@ let expectedResults = [
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -524,26 +611,32 @@ let expectedResults = [
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "temppass1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -555,26 +648,32 @@ let expectedResults = [
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "temppass1",
       label: "tempuser1",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass2",
       label: "testuser2",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "testpass3",
       label: "testuser3",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
+      comment: "mochi.test:8888",
     }, {
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -586,6 +685,7 @@ let expectedResults = [
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -610,6 +710,7 @@ let expectedResults = [
       value: "",
       label: "View Saved Logins",
       style: "loginsFooter",
+      comment: "mochi.test",
     }],
   },
   {
@@ -633,6 +734,7 @@ add_task(async function test_all_patterns() {
     Services.prefs.setBoolPref(PREF_INSECURE_FIELD_WARNING_ENABLED,
                                pattern.insecureFieldWarningEnabled);
     let actual = new LoginAutoCompleteResult(pattern.searchString || "", pattern.matchingLogins, {
+      hostname: "mochi.test",
       generatedPassword: pattern.generatedPassword,
       isSecure: pattern.isSecure,
       isPasswordField: pattern.isPasswordField,
@@ -642,6 +744,7 @@ add_task(async function test_all_patterns() {
       equal(actual.getValueAt(index), item.value, `Value ${index}`);
       equal(actual.getLabelAt(index), item.label, `Label ${index}`);
       equal(actual.getStyleAt(index), item.style, `Style ${index}`);
+      equal(actual.getCommentAt(index), item.comment || "", `Comment ${index}`);
     });
 
     if (pattern.items.length != 0) {
diff --git a/toolkit/content/widgets/autocomplete-popup.js b/toolkit/content/widgets/autocomplete-popup.js
index 21a58b89db60..14306dc136b7 100644
--- a/toolkit/content/widgets/autocomplete-popup.js
+++ b/toolkit/content/widgets/autocomplete-popup.js
@@ -410,7 +410,7 @@ MozElements.MozAutocompleteRichlistboxPopup = class MozAutocompleteRichlistboxPo
             options = { is: "autocomplete-richlistitem-logins-footer" };
             break;
           case "loginWithOrigin":
-            options = { is: "autocomplete-richlistitem-login-with-origin" };
+            options = { is: "autocomplete-two-line-richlistitem" };
             break;
           default:
             options = { is: "autocomplete-richlistitem" };
diff --git a/toolkit/content/widgets/autocomplete-richlistitem.js b/toolkit/content/widgets/autocomplete-richlistitem.js
index 39313f5c7d57..34c6dbf10661 100644
--- a/toolkit/content/widgets/autocomplete-richlistitem.js
+++ b/toolkit/content/widgets/autocomplete-richlistitem.js
@@ -1001,7 +1001,7 @@ class MozAutocompleteRichlistitemLoginsFooter extends MozElements.MozAutocomplet
   }
 }
 
-class MozAutocompleteRichlistitemLoginWithOrigin extends MozElements.MozRichlistitem {
+class MozAutocompleteTwoLineRichlistitem extends MozElements.MozRichlistitem {
   connectedCallback() {
     if (this.delayConnectedCallback()) {
       return;
@@ -1016,7 +1016,10 @@ class MozAutocompleteRichlistitemLoginWithOrigin extends MozElements.MozRichlist
 
   static get inheritedAttributes() {
     return {
-      ".login-username": "text=ac-value",
+      // getLabelAt:
+      ".line1-label": "text=ac-value",
+      // getCommentAt:
+      ".line2-label": "text=ac-label",
     };
   }
 
@@ -1024,11 +1027,11 @@ class MozAutocompleteRichlistitemLoginWithOrigin extends MozElements.MozRichlist
     return `
       <div xmlns="http://www.w3.org/1999/xhtml"
            xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-           class="login-wrapper">
+           class="two-line-wrapper">
         <xul:image class="ac-site-icon"></xul:image>
-        <div class="login-text">
-          <div class="login-row login-username"></div>
-          <div class="login-row login-origin"></div>
+        <div class="labels-wrapper">
+          <div class="label-row line1-label"></div>
+          <div class="label-row line2-label"></div>
         </div>
       </div>
     `;
@@ -1040,16 +1043,6 @@ class MozAutocompleteRichlistitemLoginWithOrigin extends MozElements.MozRichlist
     // Make item fit in popup as XUL box could not constrain
     // item's width
     this.firstElementChild.style.width = outerBoxRect.width + "px";
-
-    let data = JSON.parse(this.getAttribute("ac-label"));
-    let originElement = this.querySelector(".login-origin");
-    try {
-      let uri = Services.io.newURI(data.loginOrigin);
-      // Fallback to handle file: URIs
-      originElement.textContent = uri.displayHostPort || data.loginOrigin;
-    } catch (ex) {
-      originElement.textContent = data.loginOrigin;
-    }
   }
 
   _onOverflow() {}
@@ -1071,7 +1064,7 @@ customElements.define("autocomplete-richlistitem-logins-footer", MozAutocomplete
   extends: "richlistitem",
 });
 
-customElements.define("autocomplete-richlistitem-login-with-origin", MozAutocompleteRichlistitemLoginWithOrigin, {
+customElements.define("autocomplete-two-line-richlistitem", MozAutocompleteTwoLineRichlistitem, {
   extends: "richlistitem",
 });
 }
diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml
index caf8fccc0aa9..10aebf7edda9 100644
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -1048,7 +1048,7 @@
                   options = { is: "autocomplete-richlistitem-logins-footer" };
                   break;
                 case "loginWithOrigin":
-                  options = { is: "autocomplete-richlistitem-login-with-origin" };
+                  options = { is: "autocomplete-two-line-richlistitem" };
                   break;
                 default:
                   options = { is: "autocomplete-richlistitem" };

From d89bb467c0882997eeb14f47563ba21f8098fde0 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 19:56:07 +0000
Subject: [PATCH 101/129] Bug 1548381 - Password generation autocomplete UI.
 r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31211

--HG--
extra : moz-landing-system : lando
---
 browser/themes/shared/autocomplete.inc.css         | 14 ++++++++++++--
 .../passwordmgr/LoginAutoCompleteResult.jsm        |  1 +
 .../test/unit/test_login_autocomplete_result.js    |  8 +++++++-
 toolkit/content/widgets/autocomplete-popup.js      |  2 ++
 toolkit/content/widgets/autocomplete.xml           |  2 ++
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/browser/themes/shared/autocomplete.inc.css b/browser/themes/shared/autocomplete.inc.css
index 5924fa2b73cf..11ad74a7326a 100644
--- a/browser/themes/shared/autocomplete.inc.css
+++ b/browser/themes/shared/autocomplete.inc.css
@@ -71,7 +71,8 @@
   opacity: .6;
 }
 
-/* Login form autocompletion with and without origin showing */
+/* Login form autocompletion (with and without origin showing) and generated passwords */
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="generatedPassword"] > .two-line-wrapper > .ac-site-icon,
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .two-line-wrapper > .ac-site-icon,
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon {
   display: initial;
@@ -80,16 +81,25 @@
   fill: GrayText;
 }
 
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="generatedPassword"][selected] > .two-line-wrapper > .ac-site-icon,
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"][selected] > .two-line-wrapper > .ac-site-icon,
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon[selected] {
   fill: HighlightText;
 }
 
-/* Login form autocompletion with origin showing */
+/* Login form autocompletion with origin showing and generated passwords */
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="generatedPassword"],
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] {
   padding: 4px;
 }
 
+
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] + richlistitem[originaltype="generatedPassword"],
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] + richlistitem[originaltype="generatedPassword"] {
+  /* Separator between logins and generated passwords */
+  border-top: 1px solid var(--panel-separator-color);
+}
+
 /* Insecure field warning */
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] {
   background-color: var(--arrowpanel-dimmed);
diff --git a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
index 2614647f5900..b37b566f0071 100644
--- a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
@@ -147,6 +147,7 @@ class LoginAutocompleteItem extends AutocompleteItem {
 class GeneratedPasswordAutocompleteItem extends AutocompleteItem {
   constructor(generatedPassword) {
     super("generatedPassword");
+    this.comment = generatedPassword;
     this.value = generatedPassword;
 
     XPCOMUtils.defineLazyGetter(this, "label", () => {
diff --git a/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js b/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
index c0e8803328bb..022eaccd4af8 100644
--- a/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
+++ b/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
@@ -73,6 +73,7 @@ let expectedResults = [
       value: "",
       label: "This connection is not secure. Logins entered here could be compromised. Learn More",
       style: "insecureWarning",
+      comment: "",
     }, {
       value: "",
       label: "View Saved Logins",
@@ -89,6 +90,7 @@ let expectedResults = [
       value: "",
       label: "This connection is not secure. Logins entered here could be compromised. Learn More",
       style: "insecureWarning",
+      comment: "",
     }, {
       value: "",
       label: LABEL_NO_USERNAME,
@@ -167,6 +169,7 @@ let expectedResults = [
       value: "",
       label: "This connection is not secure. Logins entered here could be compromised. Learn More",
       style: "insecureWarning",
+      comment: "",
     }, {
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
@@ -393,6 +396,7 @@ let expectedResults = [
       value: "",
       label: "This connection is not secure. Logins entered here could be compromised. Learn More",
       style: "insecureWarning",
+      comment: "",
     }, {
       value: "",
       label: LABEL_NO_USERNAME,
@@ -471,6 +475,7 @@ let expectedResults = [
       value: "",
       label: "This connection is not secure. Logins entered here could be compromised. Learn More",
       style: "insecureWarning",
+      comment: "",
     }, {
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
@@ -706,6 +711,7 @@ let expectedResults = [
       value: "9ljgfd4shyktb45",
       label: "Use Generated Password",
       style: "generatedPassword",
+      comment: "9ljgfd4shyktb45",
     }, {
       value: "",
       label: "View Saved Logins",
@@ -744,7 +750,7 @@ add_task(async function test_all_patterns() {
       equal(actual.getValueAt(index), item.value, `Value ${index}`);
       equal(actual.getLabelAt(index), item.label, `Label ${index}`);
       equal(actual.getStyleAt(index), item.style, `Style ${index}`);
-      equal(actual.getCommentAt(index), item.comment || "", `Comment ${index}`);
+      equal(actual.getCommentAt(index), item.comment, `Comment ${index}`);
     });
 
     if (pattern.items.length != 0) {
diff --git a/toolkit/content/widgets/autocomplete-popup.js b/toolkit/content/widgets/autocomplete-popup.js
index 14306dc136b7..f4ff338a55be 100644
--- a/toolkit/content/widgets/autocomplete-popup.js
+++ b/toolkit/content/widgets/autocomplete-popup.js
@@ -377,6 +377,7 @@ MozElements.MozAutocompleteRichlistboxPopup = class MozAutocompleteRichlistboxPo
           "autofill-footer",
           "autofill-clear-button",
           "autofill-insecureWarning",
+          "generatedPassword",
           "insecureWarning",
           "loginsFooter",
           "loginWithOrigin",
@@ -409,6 +410,7 @@ MozElements.MozAutocompleteRichlistboxPopup = class MozAutocompleteRichlistboxPo
           case "loginsFooter":
             options = { is: "autocomplete-richlistitem-logins-footer" };
             break;
+          case "generatedPassword":
           case "loginWithOrigin":
             options = { is: "autocomplete-two-line-richlistitem" };
             break;
diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml
index 10aebf7edda9..8f8094f57e14 100644
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -1015,6 +1015,7 @@
                 "autofill-footer",
                 "autofill-clear-button",
                 "autofill-insecureWarning",
+                "generatedPassword",
                 "insecureWarning",
                 "loginsFooter",
                 "loginWithOrigin",
@@ -1047,6 +1048,7 @@
                 case "loginsFooter":
                   options = { is: "autocomplete-richlistitem-logins-footer" };
                   break;
+                case "generatedPassword":
                 case "loginWithOrigin":
                   options = { is: "autocomplete-two-line-richlistitem" };
                   break;

From 8656cecc5f64d1a0a0ae777ce6b8b8928bc7298e Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 19:56:20 +0000
Subject: [PATCH 102/129] Bug 1548381 - Simplify test_autocomplete_new_password
 and use more common patterns. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31575

--HG--
extra : moz-landing-system : lando
---
 .../passwordmgr/test/mochitest/mochitest.ini  |  6 +--
 .../test/mochitest/pwmgr_common.js            | 19 +++++----
 .../test_autocomplete_new_password.html       | 39 ++++---------------
 3 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/toolkit/components/passwordmgr/test/mochitest/mochitest.ini b/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
index c3732d9bb26c..402e704e500b 100644
--- a/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
+++ b/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
@@ -32,6 +32,9 @@ scheme = https
 skip-if = toolkit == 'android' # autocomplete
 [test_autocomplete_https_upgrade.html]
 skip-if = toolkit == 'android' # autocomplete
+[test_autocomplete_new_password.html]
+scheme = https
+skip-if = toolkit == 'android' # autocomplete
 [test_autocomplete_password_open.html]
 scheme = https
 skip-if = toolkit == 'android' # autocomplete
@@ -111,9 +114,6 @@ support-files =
 [test_munged_username.html]
 scheme = https
 skip-if = toolkit == 'android' # bug 1527403
-[test_autocomplete_new_password.html]
-scheme = https
-skip-if = toolkit == 'android' # autocomplete
 [test_one_doorhanger_per_un_pw.html]
 scheme = https
 skip-if = toolkit == 'android' # bug 1535505
diff --git a/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js b/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js
index b4a970c60ac9..52856bff8b43 100644
--- a/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js
+++ b/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js
@@ -66,6 +66,17 @@ function checkAutoCompleteResults(actualValues, expectedValues, hostname, msg) {
   checkArrayValues(actualValues.slice(0, -1), expectedValues, msg);
 }
 
+/**
+ * Check for expected username/password in form.
+ * @see `checkForm` below for a similar function.
+ */
+function checkLoginForm(usernameField, expectedUsername, passwordField, expectedPassword) {
+  let formID = usernameField.parentNode.id;
+  is(usernameField.value, expectedUsername, "Checking " + formID + " username is: " + expectedUsername);
+  is(passwordField.value, expectedPassword, "Checking " + formID + " password is: " + expectedPassword);
+}
+
+
 /**
  * Check a form for expected values. If an argument is null, a field's
  * expected value will be the default value.
@@ -209,7 +220,7 @@ function logoutMasterPassword() {
 }
 
 /**
- * Resolves when a specified number of forms have been processed.
+ * Resolves when a specified number of forms have been processed for (potential) filling.
  */
 function promiseFormsProcessed(expectedCount = 1) {
   var processedCount = 0;
@@ -395,9 +406,3 @@ this.LoginManager = new Proxy({}, {
   },
 });
 
-// Check for expected username/password in form.
-function checkLoginForm(usernameField, expectedUsername, passwordField, expectedPassword) {
-  let formID = usernameField.parentNode.id;
-  is(usernameField.value, expectedUsername, "Checking " + formID + " username is: " + expectedUsername);
-  is(passwordField.value, expectedPassword, "Checking " + formID + " password is: " + expectedPassword);
-}
diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_new_password.html b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_new_password.html
index eba81cd213fe..6a4e806585ee 100644
--- a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_new_password.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_new_password.html
@@ -5,9 +5,9 @@
   <title>Test autofill with autocomplete=new-password fields</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <script src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="text/javascript" src="pwmgr_common.js"></script>
-  <script type="text/javascript" src="../../../satchel/test/satchel_common.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <script src="pwmgr_common.js"></script>
+  <script src="../../../satchel/test/satchel_common.js"></script>
+  <link rel="stylesheet" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: autofill with autocomplete=new-password fields
@@ -51,31 +51,12 @@ let readyPromise = registerRunTests();
 const {ContentTaskUtils} =
   SpecialPowers.Cu.import("resource://testing-common/ContentTaskUtils.jsm", {});
 
-async function getAutocompleteResult(input, expectedValues) {
-  input.focus();
-
+async function fillFirstAutocompleteResult(input) {
   const shownPromise = promiseACShown();
   synthesizeKey("KEY_ArrowDown");
   await shownPromise;
   synthesizeKey("KEY_ArrowDown");
   await synthesizeKey("KEY_Enter");
-
-  let didAutocomplete;
-  try {
-    await ContentTaskUtils.waitForCondition(() => {
-      for (let [selector, expectedValue] of Object.entries(expectedValues)) {
-        if (document.querySelector(selector).value !== expectedValue) {
-          return false;
-        }
-      }
-      return true;
-    });
-    didAutocomplete = true;
-  } catch (ex) {
-    info("waitForCondition exception: " + ex.message);
-    didAutocomplete = false;
-  }
-  return didAutocomplete;
 }
 
 add_task(async function setup() {
@@ -90,14 +71,10 @@ add_task(async function test_autofillAutocompleteNewPassword() {
   // 2nd form should not be filled
   checkForm(2, "", "");
 
-  let form = document.getElementById("form2");
-  let userInput = form.querySelector("[name='uname']");
-
-  const didAutocomplete = await getAutocompleteResult(userInput, {
-    "#form2 [name='uname']": "user1",
-    "#form2 [type='password']": "pass1",
-  });
-  ok(didAutocomplete, "Autocomplete of user and password fields should happen");
+  $_(2, "uname").focus();
+  await fillFirstAutocompleteResult();
+  await promiseFormsProcessed();
+  checkForm(2, "user1", "pass1");
 });
 
 </script>

From e9804085673bb4bdded7ab12d480e5aab65b27ae Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 20 May 2019 19:56:27 +0000
Subject: [PATCH 103/129] Bug 1548381 - Tests for the password generation
 autocomplete UI. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D31576

--HG--
extra : moz-landing-system : lando
---
 .../test/mochitest/pwmgr_common.js            |   3 +
 .../test_autocomplete_new_password.html       | 143 ++++++++++++++++--
 2 files changed, 133 insertions(+), 13 deletions(-)

diff --git a/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js b/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js
index 52856bff8b43..9dccb4835f96 100644
--- a/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js
+++ b/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js
@@ -4,6 +4,8 @@
 
 /* import-globals-from ../../../../../toolkit/components/satchel/test/satchel_common.js */
 
+const GENERATED_PASSWORD_LENGTH = 15;
+const GENERATED_PASSWORD_REGEX = /^[a-km-np-zA-HJ-NP-Z2-9]{15}$/;
 // Copied from LoginTestUtils.masterPassword.masterPassword to use from the content process.
 const MASTER_PASSWORD = "omgsecret!";
 const TESTS_DIR = "/tests/toolkit/components/passwordmgr/test/";
@@ -228,6 +230,7 @@ function promiseFormsProcessed(expectedCount = 1) {
     function onProcessedForm(subject, topic, data) {
       processedCount++;
       if (processedCount == expectedCount) {
+        info(`${processedCount} form(s) processed`);
         SpecialPowers.removeObserver(onProcessedForm, "passwordmgr-processed-form");
         resolve(SpecialPowers.Cu.waiveXrays(subject), data);
       }
diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_new_password.html b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_new_password.html
index 6a4e806585ee..b3259f231ecf 100644
--- a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_new_password.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_new_password.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>Test autofill with autocomplete=new-password fields</title>
+  <title>Test autofill and autocomplete on autocomplete=new-password fields</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <script src="/tests/SimpleTest/EventUtils.js"></script>
   <script src="pwmgr_common.js"></script>
@@ -38,10 +38,10 @@ let readyPromise = registerRunTests();
     <button type="submit">Submit</button>
   </form>
 
-  <!-- form2 uses the new-password field -->
+  <!-- form2 uses a new-password type=password field -->
   <form id="form2" action="https://autofill" onsubmit="return false;">
     <input type="text" name="uname">
-    <input type="password" autocomplete="new-password">
+    <input type="password" name="pword" autocomplete="new-password">
     <button type="submit">Submit</button>
   </form>
 </div>
@@ -51,20 +51,12 @@ let readyPromise = registerRunTests();
 const {ContentTaskUtils} =
   SpecialPowers.Cu.import("resource://testing-common/ContentTaskUtils.jsm", {});
 
-async function fillFirstAutocompleteResult(input) {
-  const shownPromise = promiseACShown();
-  synthesizeKey("KEY_ArrowDown");
-  await shownPromise;
-  synthesizeKey("KEY_ArrowDown");
-  await synthesizeKey("KEY_Enter");
-}
-
 add_task(async function setup() {
   ok(readyPromise, "check promise is available");
   await readyPromise;
 });
 
-add_task(async function test_autofillAutocompleteNewPassword() {
+add_task(async function test_autofillAutocompleteUsername_noGeneration() {
   // reference form was filled as expected?
   checkForm(1, "user1", "pass1");
 
@@ -72,11 +64,136 @@ add_task(async function test_autofillAutocompleteNewPassword() {
   checkForm(2, "", "");
 
   $_(2, "uname").focus();
-  await fillFirstAutocompleteResult();
+  const shownPromise = promiseACShown();
+  synthesizeKey("KEY_ArrowDown");
+  let results = await shownPromise;
+  let expectedACLabels = ["user1"];
+  checkAutoCompleteResults(results, expectedACLabels, "example.com", "Check all rows are correct");
+  synthesizeKey("KEY_ArrowDown");
+  synthesizeKey("KEY_Enter");
   await promiseFormsProcessed();
   checkForm(2, "user1", "pass1");
+
+  document.getElementById("form2").reset();
 });
 
+add_task(async function test_autofillAutocompletePassword_noGeneration() {
+  // 2nd form should not be filled
+  checkForm(2, "", "");
+
+  let pword = $_(2, "pword");
+  pword.focus();
+  const shownPromise = promiseACShown();
+  synthesizeKey("KEY_ArrowDown");
+  let results = await shownPromise;
+  let expectedACLabels = ["user1"];
+  checkAutoCompleteResults(results, expectedACLabels, "example.com", "Check all rows are correct");
+  synthesizeKey("KEY_ArrowDown");
+  synthesizeKey("KEY_Enter");
+  // Can't use promiseFormsProcessed() when autocomplete fills the field directly.
+  await SimpleTest.promiseWaitForCondition(() => pword.value == "pass1", "Check pw filled");
+  checkForm(2, "", "pass1");
+
+  // No autocomplete results should appear for non-empty pw fields.
+  synthesizeKey("KEY_ArrowDown");
+  await promiseNoUnexpectedPopupShown();
+
+  document.getElementById("form2").reset();
+});
+
+// All tests below this are with generation prefs enabled.
+
+add_task(async function test_autofillAutocompleteUsername_noGeneration() {
+  await SpecialPowers.pushPrefEnv({"set": [
+    ["signon.generation.available", true],
+    ["signon.generation.enabled", true],
+    ["signon.showAutoCompleteOrigins", true],
+  ]});
+
+  // 2nd form should not be filled
+  checkForm(2, "", "");
+
+  $_(2, "uname").focus();
+  const shownPromise = promiseACShown();
+  synthesizeKey("KEY_ArrowDown");
+  let results = await shownPromise;
+  // No generation option on username fields.
+  let expectedACLabels = ["user1"];
+  checkAutoCompleteResults(results, expectedACLabels, "example.com", "Check all rows are correct");
+  synthesizeKey("KEY_ArrowDown");
+  synthesizeKey("KEY_Enter");
+  await promiseFormsProcessed();
+  checkForm(2, "user1", "pass1");
+
+  document.getElementById("form2").reset();
+});
+
+add_task(async function test_autofillAutocompletePassword_withGeneration() {
+  // 2nd form should not be filled
+  checkForm(2, "", "");
+
+  let pword = $_(2, "pword");
+  pword.focus();
+  let shownPromise = promiseACShown();
+  synthesizeKey("KEY_ArrowDown");
+  let results = await shownPromise;
+  let expectedACLabels = [
+    "user1",
+    "Use Generated Password",
+  ];
+  checkAutoCompleteResults(results, expectedACLabels, "example.com", "Check all rows are correct");
+  synthesizeKey("KEY_ArrowDown");
+  synthesizeKey("KEY_Enter");
+  // Can't use promiseFormsProcessed() when autocomplete fills the field directly.
+  await SimpleTest.promiseWaitForCondition(() => pword.value == "pass1", "Check pw filled");
+  checkForm(2, "", "pass1");
+
+  // No autocomplete results should appear for non-empty pw fields.
+  synthesizeKey("KEY_ArrowDown");
+  await promiseNoUnexpectedPopupShown();
+
+  while (pword.value) {
+    synthesizeKey("KEY_Backspace");
+  }
+
+  info("This time select the generated password");
+  shownPromise = promiseACShown();
+  synthesizeKey("KEY_ArrowDown");
+  results = await shownPromise;
+  expectedACLabels = [
+    "user1",
+    "Use Generated Password",
+  ];
+  checkAutoCompleteResults(results, expectedACLabels, "example.com", "Check all rows are correct");
+  synthesizeKey("KEY_ArrowDown");
+  synthesizeKey("KEY_ArrowDown");
+  synthesizeKey("KEY_Enter");
+  await SimpleTest.promiseWaitForCondition(() => !!pword.value, "Check generated pw filled");
+  let generatedPW = pword.value;
+  is(generatedPW.length, GENERATED_PASSWORD_LENGTH, "Check generated password length");
+  ok(generatedPW.match(GENERATED_PASSWORD_REGEX), "Check generated password format");
+
+  while (pword.value) {
+    synthesizeKey("KEY_Backspace");
+  }
+
+  shownPromise = promiseACShown();
+  synthesizeKey("KEY_ArrowDown");
+  results = await shownPromise;
+  expectedACLabels = [
+    "user1",
+    "Use Generated Password",
+  ];
+  checkAutoCompleteResults(results, expectedACLabels, "example.com", "Check all rows are correct");
+  synthesizeKey("KEY_ArrowDown");
+  synthesizeKey("KEY_ArrowDown");
+  synthesizeKey("KEY_Enter");
+  await SimpleTest.promiseWaitForCondition(() => !!pword.value, "Check generated pw filled");
+  // Same generated password should be used.
+  checkForm(2, "", generatedPW);
+
+  document.getElementById("form2").reset();
+});
 </script>
 </pre>
 </body>

From a40b05d67d0480067241fbfd34d929a361baa8b0 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 20 May 2019 23:14:40 +0000
Subject: [PATCH 104/129] Bug 1409114 - Part 1: Remove current table item, as
 it's never set. r=miko

Differential Revision: https://phabricator.services.mozilla.com/D29272

--HG--
extra : moz-landing-system : lando
---
 layout/painting/nsDisplayList.cpp  |  2 --
 layout/painting/nsDisplayList.h    |  8 --------
 layout/tables/nsTableCellFrame.cpp |  5 -----
 layout/tables/nsTableFrame.cpp     | 12 ------------
 layout/tables/nsTableFrame.h       | 29 -----------------------------
 5 files changed, 56 deletions(-)

diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
index 9cc9128518d8..bfa1e05b28f0 100644
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -1136,7 +1136,6 @@ nsDisplayListBuilder::nsDisplayListBuilder(nsIFrame* aReferenceFrame,
                                            bool aRetainingDisplayList)
     : mReferenceFrame(aReferenceFrame),
       mIgnoreScrollFrame(nullptr),
-      mCurrentTableItem(nullptr),
       mCurrentActiveScrolledRoot(nullptr),
       mCurrentContainerASR(nullptr),
       mCurrentFrame(aReferenceFrame),
@@ -1398,7 +1397,6 @@ nsDisplayListBuilder::~nsDisplayListBuilder() {
                "All OOF data should have been removed");
   NS_ASSERTION(mPresShellStates.Length() == 0,
                "All presshells should have been exited");
-  NS_ASSERTION(!mCurrentTableItem, "No table item should be active");
 
   DisplayItemClipChain* c = mFirstClipChainToDestroy;
   while (c) {
diff --git a/layout/painting/nsDisplayList.h b/layout/painting/nsDisplayList.h
index dcc714f5ccc3..d113579ba131 100644
--- a/layout/painting/nsDisplayList.h
+++ b/layout/painting/nsDisplayList.h
@@ -1487,13 +1487,6 @@ class nsDisplayListBuilder {
     return mPreserves3DCtx.mAccumulatedRectLevels;
   }
 
-  // Helpers for tables
-  nsDisplayTableItem* GetCurrentTableItem() { return mCurrentTableItem; }
-
-  void SetCurrentTableItem(nsDisplayTableItem* aTableItem) {
-    mCurrentTableItem = aTableItem;
-  }
-
   struct OutOfFlowDisplayData {
     OutOfFlowDisplayData(
         const DisplayItemClipChain* aContainingBlockClipChain,
@@ -1866,7 +1859,6 @@ class nsDisplayListBuilder {
   AutoTArray<nsIFrame*, 20> mFramesWithOOFData;
   nsClassHashtable<nsPtrHashKey<nsDisplayItem>, nsTArray<ThemeGeometry>>
       mThemeGeometries;
-  nsDisplayTableItem* mCurrentTableItem;
   DisplayListClipState mClipState;
   const ActiveScrolledRoot* mCurrentActiveScrolledRoot;
   const ActiveScrolledRoot* mCurrentContainerASR;
diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp
index 551bd12ab7ae..4d680597aabb 100644
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -477,11 +477,6 @@ void nsTableCellFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
   // the 'empty-cells' property has no effect on 'outline'
   DisplayOutline(aBuilder, aLists);
 
-  // Push a null 'current table item' so that descendant tables can't
-  // accidentally mess with our table
-  nsAutoPushCurrentTableItem pushTableItem;
-  pushTableItem.Push(aBuilder, nullptr);
-
   nsIFrame* kid = mFrames.FirstChild();
   NS_ASSERTION(kid && !kid->GetNextSibling(),
                "Table cells should have just one child");
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index a73af2c33c80..e7a14fb77235 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -1392,18 +1392,6 @@ void nsTableFrame::DisplayGenericTablePart(
   bool isVisible = aFrame->IsVisibleForPainting();
   bool isTable = aFrame->IsTableFrame();
 
-  // Note that we UpdateForFrameBackground() even if we're not visible, unless
-  // we're a table frame, because our backgrounds may paint anyway if the _cell_
-  // is visible.
-  if (isVisible || !isTable) {
-    nsDisplayTableItem* currentItem = aBuilder->GetCurrentTableItem();
-    // currentItem may be null, when none of the table parts have a
-    // background or border
-    if (currentItem) {
-      currentItem->UpdateForFrameBackground(aFrame);
-    }
-  }
-
   if (isVisible) {
     // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
     // just because we're visible?  Or should it depend on the cell visibility
diff --git a/layout/tables/nsTableFrame.h b/layout/tables/nsTableFrame.h
index 818dba2d0c82..69692e79222f 100644
--- a/layout/tables/nsTableFrame.h
+++ b/layout/tables/nsTableFrame.h
@@ -70,35 +70,6 @@ class nsDisplayTableItem : public nsPaintedDisplayItem {
   bool mDrawsBackground;
 };
 
-class nsAutoPushCurrentTableItem {
- public:
-  nsAutoPushCurrentTableItem() : mBuilder(nullptr), mOldCurrentItem(nullptr) {}
-
-  void Push(nsDisplayListBuilder* aBuilder, nsDisplayTableItem* aPushItem) {
-    mBuilder = aBuilder;
-    mOldCurrentItem = aBuilder->GetCurrentTableItem();
-    aBuilder->SetCurrentTableItem(aPushItem);
-#ifdef DEBUG
-    mPushedItem = aPushItem;
-#endif
-  }
-  ~nsAutoPushCurrentTableItem() {
-    if (!mBuilder) return;
-#ifdef DEBUG
-    NS_ASSERTION(mBuilder->GetCurrentTableItem() == mPushedItem,
-                 "Someone messed with the current table item behind our back!");
-#endif
-    mBuilder->SetCurrentTableItem(mOldCurrentItem);
-  }
-
- private:
-  nsDisplayListBuilder* mBuilder;
-  nsDisplayTableItem* mOldCurrentItem;
-#ifdef DEBUG
-  nsDisplayTableItem* mPushedItem;
-#endif
-};
-
 /* ========================================================================== */
 
 enum nsTableColType {

From 1b955945aade5935eb5f2bd236b4f0da5f296c68 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 20 May 2019 23:14:45 +0000
Subject: [PATCH 105/129] Bug 1409114 - Part 2: Get rid of generic table
 painting code, and handle each class separately. r=dbaron

Most of the code in DisplayGenericTablePart was all within a per-class if statement, so it doesn't add much value, and makes the control flow harder to understand.

Differential Revision: https://phabricator.services.mozilla.com/D29273

--HG--
extra : moz-landing-system : lando
---
 layout/generic/nsFrame.cpp             |   4 +-
 layout/tables/nsTableColFrame.cpp      |  48 ++++-
 layout/tables/nsTableColGroupFrame.cpp |  54 +++++-
 layout/tables/nsTableFrame.cpp         | 252 ++++---------------------
 layout/tables/nsTableFrame.h           |  22 ---
 layout/tables/nsTableRowFrame.cpp      |  53 +++++-
 layout/tables/nsTableRowFrame.h        |   5 +
 layout/tables/nsTableRowGroupFrame.cpp |  76 +++++++-
 layout/tables/nsTableRowGroupFrame.h   |   6 +
 9 files changed, 275 insertions(+), 245 deletions(-)

diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 6fce870099e5..f41f4cca7d7a 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -2433,7 +2433,9 @@ void nsFrame::DisplayBorderBackgroundOutline(nsDisplayListBuilder* aBuilder,
 
   // If there's a themed background, we should not create a border item.
   // It won't be rendered.
-  if (!bgIsThemed && StyleBorder()->HasBorder()) {
+  // Don't paint borders for tables here, since they paint them in a different
+  // order.
+  if (!bgIsThemed && StyleBorder()->HasBorder() && !IsTableFrame()) {
     aLists.BorderBackground()->AppendNewToTop<nsDisplayBorder>(aBuilder, this);
   }
 
diff --git a/layout/tables/nsTableColFrame.cpp b/layout/tables/nsTableColFrame.cpp
index 515ab3d15608..c61539056912 100644
--- a/layout/tables/nsTableColFrame.cpp
+++ b/layout/tables/nsTableColFrame.cpp
@@ -114,7 +114,53 @@ void nsTableColFrame::Reflow(nsPresContext* aPresContext,
 
 void nsTableColFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                        const nsDisplayListSet& aLists) {
-  nsTableFrame::DisplayGenericTablePart(aBuilder, this, aLists);
+  if (IsVisibleForPainting()) {
+    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
+    // just because we're visible?  Or should it depend on the cell visibility
+    // when we're not the whole table?
+
+    // Paint the outset box-shadows for the table frames
+    if (StyleEffects()->mBoxShadow) {
+      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowOuter>(
+          aBuilder, this);
+    }
+  }
+
+  // Compute background rect by iterating all cell frame.
+  AutoTArray<uint32_t, 1> colIdx;
+  colIdx.AppendElement(GetColIndex());
+
+  nsTableFrame* table = GetTableFrame();
+  nsTableFrame::RowGroupArray rowGroups;
+  table->OrderRowGroups(rowGroups);
+  for (nsTableRowGroupFrame* rowGroup : rowGroups) {
+    auto offset = rowGroup->GetNormalPosition() - GetNormalPosition() -
+                  GetTableColGroupFrame()->GetNormalPosition();
+    if (!aBuilder->GetDirtyRect().Intersects(
+            nsRect(offset, rowGroup->GetSize()))) {
+      continue;
+    }
+    rowGroup->PaintCellBackgroundsForColumns(this, aBuilder, aLists, colIdx,
+                                             offset);
+  }
+
+  if (IsVisibleForPainting()) {
+    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
+    // just because we're visible?  Or should it depend on the cell visibility
+    // when we're not the whole table?
+
+    // Paint the inset box-shadows for the table frames
+    if (StyleEffects()->mBoxShadow) {
+      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowInner>(
+          aBuilder, this);
+    }
+  }
+
+  DisplayOutline(aBuilder, aLists);
+
+  for (nsIFrame* kid : PrincipalChildList()) {
+    BuildDisplayListForChild(aBuilder, kid, aLists);
+  }
 }
 
 int32_t nsTableColFrame::GetSpan() { return StyleTable()->mSpan; }
diff --git a/layout/tables/nsTableColGroupFrame.cpp b/layout/tables/nsTableColGroupFrame.cpp
index 7242d361e62a..1462d862a0e4 100644
--- a/layout/tables/nsTableColGroupFrame.cpp
+++ b/layout/tables/nsTableColGroupFrame.cpp
@@ -352,7 +352,59 @@ void nsTableColGroupFrame::Reflow(nsPresContext* aPresContext,
 
 void nsTableColGroupFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                             const nsDisplayListSet& aLists) {
-  nsTableFrame::DisplayGenericTablePart(aBuilder, this, aLists);
+  if (IsVisibleForPainting()) {
+    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
+    // just because we're visible?  Or should it depend on the cell visibility
+    // when we're not the whole table?
+
+    // Paint the outset box-shadows for the table frames
+    if (StyleEffects()->mBoxShadow) {
+      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowOuter>(
+          aBuilder, this);
+    }
+  }
+
+  // Collecting column index.
+  AutoTArray<uint32_t, 1> colIdx;
+  for (nsTableColFrame* col = GetFirstColumn(); col; col = col->GetNextCol()) {
+    MOZ_ASSERT(colIdx.IsEmpty() || static_cast<uint32_t>(col->GetColIndex()) >
+                                       colIdx.LastElement());
+    colIdx.AppendElement(col->GetColIndex());
+  }
+
+  if (!colIdx.IsEmpty()) {
+    // We have some actual cells that live inside this rowgroup.
+    nsTableFrame* table = GetTableFrame();
+    nsTableFrame::RowGroupArray rowGroups;
+    table->OrderRowGroups(rowGroups);
+    for (nsTableRowGroupFrame* rowGroup : rowGroups) {
+      auto offset = rowGroup->GetNormalPosition() - GetNormalPosition();
+      if (!aBuilder->GetDirtyRect().Intersects(
+              nsRect(offset, rowGroup->GetSize()))) {
+        continue;
+      }
+      rowGroup->PaintCellBackgroundsForColumns(this, aBuilder, aLists, colIdx,
+                                               offset);
+    }
+  }
+
+  if (IsVisibleForPainting()) {
+    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
+    // just because we're visible?  Or should it depend on the cell visibility
+    // when we're not the whole table?
+
+    // Paint the inset box-shadows for the table frames
+    if (StyleEffects()->mBoxShadow) {
+      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowInner>(
+          aBuilder, this);
+    }
+  }
+
+  DisplayOutline(aBuilder, aLists);
+
+  for (nsIFrame* kid : PrincipalChildList()) {
+    BuildDisplayListForChild(aBuilder, kid, aLists);
+  }
 }
 
 nsTableColFrame* nsTableColGroupFrame::GetFirstColumn() {
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index e7a14fb77235..295c131ff814 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -1215,106 +1215,6 @@ bool nsDisplayTableBorderCollapse::CreateWebRenderCommands(
   return true;
 }
 
-/* static */
-void nsTableFrame::GenericTraversal(nsDisplayListBuilder* aBuilder,
-                                    nsFrame* aFrame,
-                                    const nsDisplayListSet& aLists) {
-  // This is similar to what
-  // nsContainerFrame::BuildDisplayListForNonBlockChildren does, except that we
-  // allow the children's background and borders to go in our BorderBackground
-  // list. This doesn't really affect background painting --- the children won't
-  // actually draw their own backgrounds because the nsTableFrame already drew
-  // them, unless a child has its own stacking context, in which case the child
-  // won't use its passed-in BorderBackground list anyway. It does affect cell
-  // borders though; this lets us get cell borders into the nsTableFrame's
-  // BorderBackground list.
-  for (nsIFrame* kid : aFrame->GetChildList(kColGroupList)) {
-    aFrame->BuildDisplayListForChild(aBuilder, kid, aLists);
-  }
-
-  for (nsIFrame* kid : aFrame->PrincipalChildList()) {
-    aFrame->BuildDisplayListForChild(aBuilder, kid, aLists);
-  }
-}
-
-static void PaintRowBackground(nsTableRowFrame* aRow, nsIFrame* aFrame,
-                               nsDisplayListBuilder* aBuilder,
-                               const nsDisplayListSet& aLists,
-                               const nsPoint& aOffset = nsPoint()) {
-  // Compute background rect by iterating all cell frame.
-  for (nsTableCellFrame* cell = aRow->GetFirstCell(); cell;
-       cell = cell->GetNextCell()) {
-    if (!cell->ShouldPaintBackground(aBuilder)) {
-      continue;
-    }
-
-    auto cellRect =
-        cell->GetRectRelativeToSelf() + cell->GetNormalPosition() + aOffset;
-    if (!aBuilder->GetDirtyRect().Intersects(cellRect)) {
-      continue;
-    }
-    nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
-        aBuilder, aFrame, cellRect, aLists.BorderBackground(), true, nullptr,
-        aFrame->GetRectRelativeToSelf(), cell);
-  }
-}
-
-static void PaintRowGroupBackground(nsTableRowGroupFrame* aRowGroup,
-                                    nsIFrame* aFrame,
-                                    nsDisplayListBuilder* aBuilder,
-                                    const nsDisplayListSet& aLists) {
-  for (nsTableRowFrame* row = aRowGroup->GetFirstRow(); row;
-       row = row->GetNextRow()) {
-    if (!aBuilder->GetDirtyRect().Intersects(
-            nsRect(row->GetNormalPosition(), row->GetSize()))) {
-      continue;
-    }
-    PaintRowBackground(row, aFrame, aBuilder, aLists, row->GetNormalPosition());
-  }
-}
-
-static void PaintRowGroupBackgroundByColIdx(nsTableRowGroupFrame* aRowGroup,
-                                            nsIFrame* aFrame,
-                                            nsDisplayListBuilder* aBuilder,
-                                            const nsDisplayListSet& aLists,
-                                            const nsTArray<uint32_t>& aColIdx,
-                                            const nsPoint& aOffset) {
-  MOZ_DIAGNOSTIC_ASSERT(!aColIdx.IsEmpty(),
-                        "Must be painting backgrounds for something");
-
-  for (nsTableRowFrame* row = aRowGroup->GetFirstRow(); row;
-       row = row->GetNextRow()) {
-    auto rowPos = row->GetNormalPosition() + aOffset;
-    if (!aBuilder->GetDirtyRect().Intersects(nsRect(rowPos, row->GetSize()))) {
-      continue;
-    }
-    for (nsTableCellFrame* cell = row->GetFirstCell(); cell;
-         cell = cell->GetNextCell()) {
-      uint32_t curColIdx = cell->ColIndex();
-      if (!aColIdx.ContainsSorted(curColIdx)) {
-        if (curColIdx > aColIdx.LastElement()) {
-          // We can just stop looking at this row.
-          break;
-        }
-        continue;
-      }
-
-      if (!cell->ShouldPaintBackground(aBuilder)) {
-        continue;
-      }
-
-      auto cellPos = cell->GetNormalPosition() + rowPos;
-      auto cellRect = nsRect(cellPos, cell->GetSize());
-      if (!aBuilder->GetDirtyRect().Intersects(cellRect)) {
-        continue;
-      }
-      nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
-          aBuilder, aFrame, cellRect, aLists.BorderBackground(), false, nullptr,
-          aFrame->GetRectRelativeToSelf(), cell);
-    }
-  }
-}
-
 static inline bool FrameHasBorder(nsIFrame* f) {
   if (!f->StyleVisibility()->IsVisible()) {
     return false;
@@ -1384,130 +1284,46 @@ void nsTableFrame::CalcHasBCBorders() {
   SetHasBCBorders(false);
 }
 
-/* static */
-void nsTableFrame::DisplayGenericTablePart(
-    nsDisplayListBuilder* aBuilder, nsFrame* aFrame,
-    const nsDisplayListSet& aLists,
-    DisplayGenericTablePartTraversal aTraversal) {
-  bool isVisible = aFrame->IsVisibleForPainting();
-  bool isTable = aFrame->IsTableFrame();
-
-  if (isVisible) {
-    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
-    // just because we're visible?  Or should it depend on the cell visibility
-    // when we're not the whole table?
-
-    // Paint the outset box-shadows for the table frames
-    if (!aFrame->StyleEffects()->mBoxShadow.IsEmpty()) {
-      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowOuter>(
-          aBuilder, aFrame);
-    }
-  }
-
-  // Background visibility for rows, rowgroups, columns, colgroups depends on
-  // the visibility of the _cell_, not of the row/col(group).
-  if (aFrame->IsTableRowGroupFrame()) {
-    nsTableRowGroupFrame* rowGroup = static_cast<nsTableRowGroupFrame*>(aFrame);
-    PaintRowGroupBackground(rowGroup, aFrame, aBuilder, aLists);
-  } else if (aFrame->IsTableRowFrame()) {
-    nsTableRowFrame* row = static_cast<nsTableRowFrame*>(aFrame);
-    PaintRowBackground(row, aFrame, aBuilder, aLists);
-  } else if (aFrame->IsTableColGroupFrame()) {
-    // Compute background rect by iterating all cell frame.
-    nsTableColGroupFrame* colGroup = static_cast<nsTableColGroupFrame*>(aFrame);
-    // Collecting column index.
-    AutoTArray<uint32_t, 1> colIdx;
-    for (nsTableColFrame* col = colGroup->GetFirstColumn(); col;
-         col = col->GetNextCol()) {
-      MOZ_ASSERT(colIdx.IsEmpty() || static_cast<uint32_t>(col->GetColIndex()) >
-                                         colIdx.LastElement());
-      colIdx.AppendElement(col->GetColIndex());
-    }
-
-    if (!colIdx.IsEmpty()) {
-      // We have some actual cells that live inside this rowgroup.
-      nsTableFrame* table = colGroup->GetTableFrame();
-      RowGroupArray rowGroups;
-      table->OrderRowGroups(rowGroups);
-      for (nsTableRowGroupFrame* rowGroup : rowGroups) {
-        auto offset =
-            rowGroup->GetNormalPosition() - colGroup->GetNormalPosition();
-        if (!aBuilder->GetDirtyRect().Intersects(
-                nsRect(offset, rowGroup->GetSize()))) {
-          continue;
-        }
-        PaintRowGroupBackgroundByColIdx(rowGroup, aFrame, aBuilder, aLists,
-                                        colIdx, offset);
-      }
-    }
-  } else if (aFrame->IsTableColFrame()) {
-    // Compute background rect by iterating all cell frame.
-    nsTableColFrame* col = static_cast<nsTableColFrame*>(aFrame);
-    AutoTArray<uint32_t, 1> colIdx;
-    colIdx.AppendElement(col->GetColIndex());
-
-    nsTableFrame* table = col->GetTableFrame();
-    RowGroupArray rowGroups;
-    table->OrderRowGroups(rowGroups);
-    for (nsTableRowGroupFrame* rowGroup : rowGroups) {
-      auto offset = rowGroup->GetNormalPosition() - col->GetNormalPosition() -
-                    col->GetTableColGroupFrame()->GetNormalPosition();
-      if (!aBuilder->GetDirtyRect().Intersects(
-              nsRect(offset, rowGroup->GetSize()))) {
-        continue;
-      }
-      PaintRowGroupBackgroundByColIdx(rowGroup, aFrame, aBuilder, aLists,
-                                      colIdx, offset);
-    }
-  } else if (isVisible) {
-    nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
-        aBuilder, aFrame, aFrame->GetRectRelativeToSelf(),
-        aLists.BorderBackground());
-  }
-
-  if (isVisible) {
-    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
-    // just because we're visible?  Or should it depend on the cell visibility
-    // when we're not the whole table?
-
-    // Paint the inset box-shadows for the table frames
-    if (!aFrame->StyleEffects()->mBoxShadow.IsEmpty()) {
-      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowInner>(
-          aBuilder, aFrame);
-    }
-  }
-
-  aFrame->DisplayOutline(aBuilder, aLists);
-
-  aTraversal(aBuilder, aFrame, aLists);
-
-  if (isVisible) {
-    if (isTable) {
-      nsTableFrame* table = static_cast<nsTableFrame*>(aFrame);
-      // In the collapsed border model, overlay all collapsed borders.
-      if (table->IsBorderCollapse()) {
-        if (table->HasBCBorders()) {
-          aLists.BorderBackground()
-              ->AppendNewToTop<nsDisplayTableBorderCollapse>(aBuilder, table);
-        }
-      } else {
-        const nsStyleBorder* borderStyle = aFrame->StyleBorder();
-        if (borderStyle->HasBorder()) {
-          aLists.BorderBackground()->AppendNewToTop<nsDisplayBorder>(aBuilder,
-                                                                     table);
-        }
-      }
-    }
-  }
-}
-
 // table paint code is concerned primarily with borders and bg color
 // SEC: TODO: adjust the rect for captions
 void nsTableFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                     const nsDisplayListSet& aLists) {
   DO_GLOBAL_REFLOW_COUNT_DSP_COLOR("nsTableFrame", NS_RGB(255, 128, 255));
 
-  DisplayGenericTablePart(aBuilder, this, aLists);
+  DisplayBorderBackgroundOutline(aBuilder, aLists);
+
+  // This is similar to what
+  // nsContainerFrame::BuildDisplayListForNonBlockChildren does, except that we
+  // allow the children's background and borders to go in our BorderBackground
+  // list. This doesn't really affect background painting --- the children won't
+  // actually draw their own backgrounds because the nsTableFrame already drew
+  // them, unless a child has its own stacking context, in which case the child
+  // won't use its passed-in BorderBackground list anyway. It does affect cell
+  // borders though; this lets us get cell borders into the nsTableFrame's
+  // BorderBackground list.
+  for (nsIFrame* kid : GetChildList(kColGroupList)) {
+    BuildDisplayListForChild(aBuilder, kid, aLists);
+  }
+
+  for (nsIFrame* kid : PrincipalChildList()) {
+    BuildDisplayListForChild(aBuilder, kid, aLists);
+  }
+
+  if (IsVisibleForPainting()) {
+    // In the collapsed border model, overlay all collapsed borders.
+    if (IsBorderCollapse()) {
+      if (HasBCBorders()) {
+        aLists.BorderBackground()->AppendNewToTop<nsDisplayTableBorderCollapse>(
+            aBuilder, this);
+      }
+    } else {
+      const nsStyleBorder* borderStyle = StyleBorder();
+      if (borderStyle->HasBorder()) {
+        aLists.BorderBackground()->AppendNewToTop<nsDisplayBorder>(aBuilder,
+                                                                   this);
+      }
+    }
+  }
 }
 
 nsMargin nsTableFrame::GetDeflationForBackground(
diff --git a/layout/tables/nsTableFrame.h b/layout/tables/nsTableFrame.h
index 69692e79222f..61ab57e96232 100644
--- a/layout/tables/nsTableFrame.h
+++ b/layout/tables/nsTableFrame.h
@@ -186,28 +186,6 @@ class nsTableFrame : public nsContainerFrame {
                                                    nsIFrame* aSourceFrame,
                                                    bool* aDidPassThrough);
 
-  typedef void (*DisplayGenericTablePartTraversal)(
-      nsDisplayListBuilder* aBuilder, nsFrame* aFrame,
-      const nsDisplayListSet& aLists);
-  static void GenericTraversal(nsDisplayListBuilder* aBuilder, nsFrame* aFrame,
-                               const nsDisplayListSet& aLists);
-
-  /**
-   * Helper method to handle display common to table frames, rowgroup frames
-   * and row frames. It creates a background display item for handling events
-   * if necessary, an outline display item if necessary, and displays
-   * all the the frame's children.
-   * @param aDisplayItem the display item created for this part, or null
-   * if this part's border/background painting is delegated to an ancestor
-   * @param aTraversal a function that gets called to traverse the table
-   * part's child frames and add their display list items to a
-   * display list set.
-   */
-  static void DisplayGenericTablePart(
-      nsDisplayListBuilder* aBuilder, nsFrame* aFrame,
-      const nsDisplayListSet& aLists,
-      DisplayGenericTablePartTraversal aTraversal = GenericTraversal);
-
   // Return the closest sibling of aPriorChildFrame (including aPriroChildFrame)
   // of type aChildType.
   static nsIFrame* GetFrameAtOrBefore(nsIFrame* aParentFrame,
diff --git a/layout/tables/nsTableRowFrame.cpp b/layout/tables/nsTableRowFrame.cpp
index 406ba8479328..5e1ef7804e11 100644
--- a/layout/tables/nsTableRowFrame.cpp
+++ b/layout/tables/nsTableRowFrame.cpp
@@ -532,9 +532,60 @@ nscoord nsTableRowFrame::CalcBSize(const ReflowInput& aReflowInput) {
   return GetInitialBSize();
 }
 
+void nsTableRowFrame::PaintCellBackgroundsForFrame(
+    nsIFrame* aFrame, nsDisplayListBuilder* aBuilder,
+    const nsDisplayListSet& aLists, const nsPoint& aOffset) {
+  // Compute background rect by iterating all cell frame.
+  for (nsTableCellFrame* cell = GetFirstCell(); cell;
+       cell = cell->GetNextCell()) {
+    if (!cell->ShouldPaintBackground(aBuilder)) {
+      continue;
+    }
+
+    auto cellRect =
+        cell->GetRectRelativeToSelf() + cell->GetNormalPosition() + aOffset;
+    if (!aBuilder->GetDirtyRect().Intersects(cellRect)) {
+      continue;
+    }
+    nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
+        aBuilder, aFrame, cellRect, aLists.BorderBackground(), true, nullptr,
+        aFrame->GetRectRelativeToSelf(), cell);
+  }
+}
+
 void nsTableRowFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                        const nsDisplayListSet& aLists) {
-  nsTableFrame::DisplayGenericTablePart(aBuilder, this, aLists);
+  if (IsVisibleForPainting()) {
+    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
+    // just because we're visible?  Or should it depend on the cell visibility
+    // when we're not the whole table?
+
+    // Paint the outset box-shadows for the table frames
+    if (StyleEffects()->mBoxShadow) {
+      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowOuter>(
+          aBuilder, this);
+    }
+  }
+
+  PaintCellBackgroundsForFrame(this, aBuilder, aLists);
+
+  if (IsVisibleForPainting()) {
+    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
+    // just because we're visible?  Or should it depend on the cell visibility
+    // when we're not the whole table?
+
+    // Paint the inset box-shadows for the table frames
+    if (StyleEffects()->mBoxShadow) {
+      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowInner>(
+          aBuilder, this);
+    }
+  }
+
+  DisplayOutline(aBuilder, aLists);
+
+  for (nsIFrame* kid : PrincipalChildList()) {
+    BuildDisplayListForChild(aBuilder, kid, aLists);
+  }
 }
 
 nsIFrame::LogicalSides nsTableRowFrame::GetLogicalSkipSides(
diff --git a/layout/tables/nsTableRowFrame.h b/layout/tables/nsTableRowFrame.h
index d6d995087c29..85b328bc8065 100644
--- a/layout/tables/nsTableRowFrame.h
+++ b/layout/tables/nsTableRowFrame.h
@@ -76,6 +76,11 @@ class nsTableRowFrame : public nsContainerFrame {
   virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                 const nsDisplayListSet& aLists) override;
 
+  void PaintCellBackgroundsForFrame(nsIFrame* aFrame,
+                                    nsDisplayListBuilder* aBuilder,
+                                    const nsDisplayListSet& aLists,
+                                    const nsPoint& aOffset = nsPoint());
+
   // Implemented in nsTableCellFrame.h, because it needs to know about the
   // nsTableCellFrame class, but we can't include nsTableCellFrame.h here.
   inline nsTableCellFrame* GetFirstCell() const;
diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp
index 13823e121a3f..ed802820168d 100644
--- a/layout/tables/nsTableRowGroupFrame.cpp
+++ b/layout/tables/nsTableRowGroupFrame.cpp
@@ -236,9 +236,83 @@ static void DisplayRows(nsDisplayListBuilder* aBuilder, nsFrame* aFrame,
   }
 }
 
+void nsTableRowGroupFrame::PaintCellBackgroundsForColumns(
+    nsIFrame* aFrame, nsDisplayListBuilder* aBuilder,
+    const nsDisplayListSet& aLists, const nsTArray<uint32_t>& aColIdx,
+    const nsPoint& aOffset) {
+  MOZ_DIAGNOSTIC_ASSERT(!aColIdx.IsEmpty(),
+                        "Must be painting backgrounds for something");
+
+  for (nsTableRowFrame* row = GetFirstRow(); row; row = row->GetNextRow()) {
+    auto rowPos = row->GetNormalPosition() + aOffset;
+    if (!aBuilder->GetDirtyRect().Intersects(nsRect(rowPos, row->GetSize()))) {
+      continue;
+    }
+    for (nsTableCellFrame* cell = row->GetFirstCell(); cell;
+         cell = cell->GetNextCell()) {
+      uint32_t curColIdx = cell->ColIndex();
+      if (!aColIdx.ContainsSorted(curColIdx)) {
+        if (curColIdx > aColIdx.LastElement()) {
+          // We can just stop looking at this row.
+          break;
+        }
+        continue;
+      }
+
+      if (!cell->ShouldPaintBackground(aBuilder)) {
+        continue;
+      }
+
+      auto cellPos = cell->GetNormalPosition() + rowPos;
+      auto cellRect = nsRect(cellPos, cell->GetSize());
+      if (!aBuilder->GetDirtyRect().Intersects(cellRect)) {
+        continue;
+      }
+      nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
+          aBuilder, aFrame, cellRect, aLists.BorderBackground(), false, nullptr,
+          aFrame->GetRectRelativeToSelf(), cell);
+    }
+  }
+}
+
 void nsTableRowGroupFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                             const nsDisplayListSet& aLists) {
-  nsTableFrame::DisplayGenericTablePart(aBuilder, this, aLists, DisplayRows);
+  if (IsVisibleForPainting()) {
+    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
+    // just because we're visible?  Or should it depend on the cell visibility
+    // when we're not the whole table?
+
+    // Paint the outset box-shadows for the table frames
+    if (StyleEffects()->mBoxShadow) {
+      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowOuter>(
+          aBuilder, this);
+    }
+  }
+
+  for (nsTableRowFrame* row = GetFirstRow(); row; row = row->GetNextRow()) {
+    if (!aBuilder->GetDirtyRect().Intersects(
+            nsRect(row->GetNormalPosition(), row->GetSize()))) {
+      continue;
+    }
+    row->PaintCellBackgroundsForFrame(this, aBuilder, aLists,
+                                      row->GetNormalPosition());
+  }
+
+  if (IsVisibleForPainting()) {
+    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
+    // just because we're visible?  Or should it depend on the cell visibility
+    // when we're not the whole table?
+
+    // Paint the inset box-shadows for the table frames
+    if (StyleEffects()->mBoxShadow) {
+      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowInner>(
+          aBuilder, this);
+    }
+  }
+
+  DisplayOutline(aBuilder, aLists);
+
+  DisplayRows(aBuilder, this, aLists);
 }
 
 nsIFrame::LogicalSides nsTableRowGroupFrame::GetLogicalSkipSides(
diff --git a/layout/tables/nsTableRowGroupFrame.h b/layout/tables/nsTableRowGroupFrame.h
index a63bba192f75..c352653921f5 100644
--- a/layout/tables/nsTableRowGroupFrame.h
+++ b/layout/tables/nsTableRowGroupFrame.h
@@ -76,6 +76,12 @@ class nsTableRowGroupFrame final : public nsContainerFrame,
   virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                 const nsDisplayListSet& aLists) override;
 
+  void PaintCellBackgroundsForColumns(nsIFrame* aFrame,
+                                      nsDisplayListBuilder* aBuilder,
+                                      const nsDisplayListSet& aLists,
+                                      const nsTArray<uint32_t>& aColIdx,
+                                      const nsPoint& aOffset);
+
   /**
    * Calls Reflow for all of its child rows.
    *

From 7ddcc024a6061befad40a248235ab4d531a633e4 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 20 May 2019 23:14:52 +0000
Subject: [PATCH 106/129] Bug 1409114 - Part 3: Add helpers for box shadow
 creation. r=miko

Differential Revision: https://phabricator.services.mozilla.com/D29274

--HG--
extra : moz-landing-system : lando
---
 layout/forms/nsFieldSetFrame.cpp       |  5 +--
 layout/generic/nsFrame.cpp             | 47 +++++++++++++++++++++-----
 layout/generic/nsFrame.h               | 26 ++++++++++++++
 layout/tables/nsTableColFrame.cpp      | 24 ++-----------
 layout/tables/nsTableColGroupFrame.cpp | 24 ++-----------
 layout/tables/nsTableRowFrame.cpp      | 24 ++-----------
 layout/tables/nsTableRowGroupFrame.cpp | 24 ++-----------
 7 files changed, 73 insertions(+), 101 deletions(-)

diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index 7c09b0d648db..daa11da4d318 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -222,10 +222,7 @@ void nsFieldSetFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
   // empty, we need to paint the outline
   if (!(GetStateBits() & NS_FRAME_IS_OVERFLOW_CONTAINER) &&
       IsVisibleForPainting()) {
-    if (!StyleEffects()->mBoxShadow.IsEmpty()) {
-      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowOuter>(
-          aBuilder, this);
-    }
+    DisplayOutsetBoxShadowUnconditional(aBuilder, aLists.BorderBackground());
 
     nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
         aBuilder, this, VisualBorderRectRelativeToSelf(),
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index f41f4cca7d7a..d8fe6c57f35b 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -2381,6 +2381,42 @@ void nsFrame::DisplayOutline(nsDisplayListBuilder* aBuilder,
   DisplayOutlineUnconditional(aBuilder, aLists);
 }
 
+void nsFrame::DisplayInsetBoxShadowUnconditional(nsDisplayListBuilder* aBuilder,
+                                                 nsDisplayList* aList) {
+  // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
+  // just because we're visible?  Or should it depend on the cell visibility
+  // when we're not the whole table?
+  const auto* effects = StyleEffects();
+  if (effects->HasBoxShadowWithInset(true)) {
+    aList->AppendNewToTop<nsDisplayBoxShadowInner>(aBuilder, this);
+  }
+}
+
+void nsFrame::DisplayInsetBoxShadow(nsDisplayListBuilder* aBuilder,
+                                    nsDisplayList* aList) {
+  if (!IsVisibleForPainting()) return;
+
+  DisplayInsetBoxShadowUnconditional(aBuilder, aList);
+}
+
+void nsFrame::DisplayOutsetBoxShadowUnconditional(
+    nsDisplayListBuilder* aBuilder, nsDisplayList* aList) {
+  // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
+  // just because we're visible?  Or should it depend on the cell visibility
+  // when we're not the whole table?
+  const auto* effects = StyleEffects();
+  if (effects->HasBoxShadowWithInset(false)) {
+    aList->AppendNewToTop<nsDisplayBoxShadowOuter>(aBuilder, this);
+  }
+}
+
+void nsFrame::DisplayOutsetBoxShadow(nsDisplayListBuilder* aBuilder,
+                                     nsDisplayList* aList) {
+  if (!IsVisibleForPainting()) return;
+
+  DisplayOutsetBoxShadowUnconditional(aBuilder, aList);
+}
+
 void nsIFrame::DisplayCaret(nsDisplayListBuilder* aBuilder,
                             nsDisplayList* aList) {
   if (!IsVisibleForPainting()) return;
@@ -2417,19 +2453,12 @@ void nsFrame::DisplayBorderBackgroundOutline(nsDisplayListBuilder* aBuilder,
     return;
   }
 
-  const auto* effects = StyleEffects();
-  if (effects->HasBoxShadowWithInset(false)) {
-    aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowOuter>(aBuilder,
-                                                                       this);
-  }
+  DisplayOutsetBoxShadowUnconditional(aBuilder, aLists.BorderBackground());
 
   bool bgIsThemed =
       DisplayBackgroundUnconditional(aBuilder, aLists, aForceBackground);
 
-  if (effects->HasBoxShadowWithInset(true)) {
-    aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowInner>(aBuilder,
-                                                                       this);
-  }
+  DisplayInsetBoxShadowUnconditional(aBuilder, aLists.BorderBackground());
 
   // If there's a themed background, we should not create a border item.
   // It won't be rendered.
diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h
index c3bb694d5389..2f2e1a9c1b1d 100644
--- a/layout/generic/nsFrame.h
+++ b/layout/generic/nsFrame.h
@@ -530,6 +530,32 @@ class nsFrame : public nsBox {
   void DisplayOutline(nsDisplayListBuilder* aBuilder,
                       const nsDisplayListSet& aLists);
 
+  /**
+   * Add a display item for CSS inset box shadows. Does not check visibility.
+   */
+  void DisplayInsetBoxShadowUnconditional(nsDisplayListBuilder* aBuilder,
+                                          nsDisplayList* aList);
+
+  /**
+   * Add a display item for CSS inset box shadow, after calling
+   * IsVisibleForPainting to confirm we are visible.
+   */
+  void DisplayInsetBoxShadow(nsDisplayListBuilder* aBuilder,
+                             nsDisplayList* aList);
+
+  /**
+   * Add a display item for CSS outset box shadows. Does not check visibility.
+   */
+  void DisplayOutsetBoxShadowUnconditional(nsDisplayListBuilder* aBuilder,
+                                           nsDisplayList* aList);
+
+  /**
+   * Add a display item for CSS outset box shadow, after calling
+   * IsVisibleForPainting to confirm we are visible.
+   */
+  void DisplayOutsetBoxShadow(nsDisplayListBuilder* aBuilder,
+                              nsDisplayList* aList);
+
   /**
    * Adjust the given parent frame to the right ComputedStyle parent frame for
    * the child, given the pseudo-type of the prospective child.  This handles
diff --git a/layout/tables/nsTableColFrame.cpp b/layout/tables/nsTableColFrame.cpp
index c61539056912..b0def1942fbb 100644
--- a/layout/tables/nsTableColFrame.cpp
+++ b/layout/tables/nsTableColFrame.cpp
@@ -114,17 +114,7 @@ void nsTableColFrame::Reflow(nsPresContext* aPresContext,
 
 void nsTableColFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                        const nsDisplayListSet& aLists) {
-  if (IsVisibleForPainting()) {
-    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
-    // just because we're visible?  Or should it depend on the cell visibility
-    // when we're not the whole table?
-
-    // Paint the outset box-shadows for the table frames
-    if (StyleEffects()->mBoxShadow) {
-      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowOuter>(
-          aBuilder, this);
-    }
-  }
+  DisplayOutsetBoxShadow(aBuilder, aLists.BorderBackground());
 
   // Compute background rect by iterating all cell frame.
   AutoTArray<uint32_t, 1> colIdx;
@@ -144,17 +134,7 @@ void nsTableColFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                              offset);
   }
 
-  if (IsVisibleForPainting()) {
-    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
-    // just because we're visible?  Or should it depend on the cell visibility
-    // when we're not the whole table?
-
-    // Paint the inset box-shadows for the table frames
-    if (StyleEffects()->mBoxShadow) {
-      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowInner>(
-          aBuilder, this);
-    }
-  }
+  DisplayInsetBoxShadow(aBuilder, aLists.BorderBackground());
 
   DisplayOutline(aBuilder, aLists);
 
diff --git a/layout/tables/nsTableColGroupFrame.cpp b/layout/tables/nsTableColGroupFrame.cpp
index 1462d862a0e4..ed7f63f0d97f 100644
--- a/layout/tables/nsTableColGroupFrame.cpp
+++ b/layout/tables/nsTableColGroupFrame.cpp
@@ -352,17 +352,7 @@ void nsTableColGroupFrame::Reflow(nsPresContext* aPresContext,
 
 void nsTableColGroupFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                             const nsDisplayListSet& aLists) {
-  if (IsVisibleForPainting()) {
-    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
-    // just because we're visible?  Or should it depend on the cell visibility
-    // when we're not the whole table?
-
-    // Paint the outset box-shadows for the table frames
-    if (StyleEffects()->mBoxShadow) {
-      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowOuter>(
-          aBuilder, this);
-    }
-  }
+  DisplayOutsetBoxShadow(aBuilder, aLists.BorderBackground());
 
   // Collecting column index.
   AutoTArray<uint32_t, 1> colIdx;
@@ -388,17 +378,7 @@ void nsTableColGroupFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
     }
   }
 
-  if (IsVisibleForPainting()) {
-    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
-    // just because we're visible?  Or should it depend on the cell visibility
-    // when we're not the whole table?
-
-    // Paint the inset box-shadows for the table frames
-    if (StyleEffects()->mBoxShadow) {
-      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowInner>(
-          aBuilder, this);
-    }
-  }
+  DisplayInsetBoxShadow(aBuilder, aLists.BorderBackground());
 
   DisplayOutline(aBuilder, aLists);
 
diff --git a/layout/tables/nsTableRowFrame.cpp b/layout/tables/nsTableRowFrame.cpp
index 5e1ef7804e11..1d7793ffcf7f 100644
--- a/layout/tables/nsTableRowFrame.cpp
+++ b/layout/tables/nsTableRowFrame.cpp
@@ -555,31 +555,11 @@ void nsTableRowFrame::PaintCellBackgroundsForFrame(
 
 void nsTableRowFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                        const nsDisplayListSet& aLists) {
-  if (IsVisibleForPainting()) {
-    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
-    // just because we're visible?  Or should it depend on the cell visibility
-    // when we're not the whole table?
-
-    // Paint the outset box-shadows for the table frames
-    if (StyleEffects()->mBoxShadow) {
-      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowOuter>(
-          aBuilder, this);
-    }
-  }
+  DisplayOutsetBoxShadow(aBuilder, aLists.BorderBackground());
 
   PaintCellBackgroundsForFrame(this, aBuilder, aLists);
 
-  if (IsVisibleForPainting()) {
-    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
-    // just because we're visible?  Or should it depend on the cell visibility
-    // when we're not the whole table?
-
-    // Paint the inset box-shadows for the table frames
-    if (StyleEffects()->mBoxShadow) {
-      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowInner>(
-          aBuilder, this);
-    }
-  }
+  DisplayInsetBoxShadow(aBuilder, aLists.BorderBackground());
 
   DisplayOutline(aBuilder, aLists);
 
diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp
index ed802820168d..37fe242a305a 100644
--- a/layout/tables/nsTableRowGroupFrame.cpp
+++ b/layout/tables/nsTableRowGroupFrame.cpp
@@ -277,17 +277,7 @@ void nsTableRowGroupFrame::PaintCellBackgroundsForColumns(
 
 void nsTableRowGroupFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                             const nsDisplayListSet& aLists) {
-  if (IsVisibleForPainting()) {
-    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
-    // just because we're visible?  Or should it depend on the cell visibility
-    // when we're not the whole table?
-
-    // Paint the outset box-shadows for the table frames
-    if (StyleEffects()->mBoxShadow) {
-      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowOuter>(
-          aBuilder, this);
-    }
-  }
+  DisplayOutsetBoxShadow(aBuilder, aLists.BorderBackground());
 
   for (nsTableRowFrame* row = GetFirstRow(); row; row = row->GetNextRow()) {
     if (!aBuilder->GetDirtyRect().Intersects(
@@ -298,17 +288,7 @@ void nsTableRowGroupFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                       row->GetNormalPosition());
   }
 
-  if (IsVisibleForPainting()) {
-    // XXXbz should box-shadow for rows/rowgroups/columns/colgroups get painted
-    // just because we're visible?  Or should it depend on the cell visibility
-    // when we're not the whole table?
-
-    // Paint the inset box-shadows for the table frames
-    if (StyleEffects()->mBoxShadow) {
-      aLists.BorderBackground()->AppendNewToTop<nsDisplayBoxShadowInner>(
-          aBuilder, this);
-    }
-  }
+  DisplayInsetBoxShadow(aBuilder, aLists.BorderBackground());
 
   DisplayOutline(aBuilder, aLists);
 

From d45480f6728161ca8eb7977b0cc107d5d6217358 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 20 May 2019 23:14:59 +0000
Subject: [PATCH 107/129] Bug 1409114 - Part 4: Hoist outline skipping into
 col(group) frame code. r=dbaron

Differential Revision: https://phabricator.services.mozilla.com/D29275

--HG--
extra : moz-landing-system : lando
---
 layout/generic/nsFrame.cpp             | 14 ++++++--------
 layout/tables/nsTableColFrame.cpp      |  5 ++++-
 layout/tables/nsTableColGroupFrame.cpp |  5 ++++-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index d8fe6c57f35b..e6916c1dac60 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -2351,15 +2351,13 @@ void nsFrame::DisplaySelectionOverlay(nsDisplayListBuilder* aBuilder,
 
 void nsFrame::DisplayOutlineUnconditional(nsDisplayListBuilder* aBuilder,
                                           const nsDisplayListSet& aLists) {
-  if (!StyleOutline()->ShouldPaintOutline()) {
-    return;
-  }
+  // Per https://drafts.csswg.org/css-tables-3/#global-style-overrides:
+  // "All css properties of table-column and table-column-group boxes are
+  // ignored, except when explicitly specified by this specification."
+  // CSS outlines fall into this category, so we skip them on these boxes.
+  MOZ_ASSERT(!IsTableColGroupFrame() && !IsTableColFrame());
 
-  if (IsTableColGroupFrame() || IsTableColFrame()) {
-    // Per https://drafts.csswg.org/css-tables-3/#global-style-overrides:
-    // "All css properties of table-column and table-column-group boxes are
-    // ignored, except when explicitly specified by this specification."
-    // CSS outlines fall into this category, so we skip them on these boxes.
+  if (!StyleOutline()->ShouldPaintOutline()) {
     return;
   }
 
diff --git a/layout/tables/nsTableColFrame.cpp b/layout/tables/nsTableColFrame.cpp
index b0def1942fbb..f1436a3842d4 100644
--- a/layout/tables/nsTableColFrame.cpp
+++ b/layout/tables/nsTableColFrame.cpp
@@ -136,7 +136,10 @@ void nsTableColFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
 
   DisplayInsetBoxShadow(aBuilder, aLists.BorderBackground());
 
-  DisplayOutline(aBuilder, aLists);
+  // Per https://drafts.csswg.org/css-tables-3/#global-style-overrides:
+  // "All css properties of table-column and table-column-group boxes are
+  // ignored, except when explicitly specified by this specification."
+  // CSS outlines fall into this category, so we skip them on these boxes.
 
   for (nsIFrame* kid : PrincipalChildList()) {
     BuildDisplayListForChild(aBuilder, kid, aLists);
diff --git a/layout/tables/nsTableColGroupFrame.cpp b/layout/tables/nsTableColGroupFrame.cpp
index ed7f63f0d97f..8009d9caa38d 100644
--- a/layout/tables/nsTableColGroupFrame.cpp
+++ b/layout/tables/nsTableColGroupFrame.cpp
@@ -380,7 +380,10 @@ void nsTableColGroupFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
 
   DisplayInsetBoxShadow(aBuilder, aLists.BorderBackground());
 
-  DisplayOutline(aBuilder, aLists);
+  // Per https://drafts.csswg.org/css-tables-3/#global-style-overrides:
+  // "All css properties of table-column and table-column-group boxes are
+  // ignored, except when explicitly specified by this specification."
+  // CSS outlines fall into this category, so we skip them on these boxes.
 
   for (nsIFrame* kid : PrincipalChildList()) {
     BuildDisplayListForChild(aBuilder, kid, aLists);

From 1d7c011e9b25a845c76fbac7306ac556cc085fb4 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 20 May 2019 23:15:19 +0000
Subject: [PATCH 108/129] Bug 1409114 - Part 5: Skip box-shadow for table
 column and column groups. r=dbaron

This is a behaviour change, but I believe it matches the quoted spec text, and neither blink nor WebKit render these.

Differential Revision: https://phabricator.services.mozilla.com/D29276

--HG--
extra : moz-landing-system : lando
---
 layout/tables/nsTableColFrame.cpp      | 13 +++++--------
 layout/tables/nsTableColGroupFrame.cpp | 13 +++++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/layout/tables/nsTableColFrame.cpp b/layout/tables/nsTableColFrame.cpp
index f1436a3842d4..47004f0c21ea 100644
--- a/layout/tables/nsTableColFrame.cpp
+++ b/layout/tables/nsTableColFrame.cpp
@@ -114,7 +114,11 @@ void nsTableColFrame::Reflow(nsPresContext* aPresContext,
 
 void nsTableColFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                        const nsDisplayListSet& aLists) {
-  DisplayOutsetBoxShadow(aBuilder, aLists.BorderBackground());
+  // Per https://drafts.csswg.org/css-tables-3/#global-style-overrides:
+  // "All css properties of table-column and table-column-group boxes are
+  // ignored, except when explicitly specified by this specification."
+  // CSS outlines and box-shadows fall into this category, so we skip them
+  // on these boxes.
 
   // Compute background rect by iterating all cell frame.
   AutoTArray<uint32_t, 1> colIdx;
@@ -134,13 +138,6 @@ void nsTableColFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                              offset);
   }
 
-  DisplayInsetBoxShadow(aBuilder, aLists.BorderBackground());
-
-  // Per https://drafts.csswg.org/css-tables-3/#global-style-overrides:
-  // "All css properties of table-column and table-column-group boxes are
-  // ignored, except when explicitly specified by this specification."
-  // CSS outlines fall into this category, so we skip them on these boxes.
-
   for (nsIFrame* kid : PrincipalChildList()) {
     BuildDisplayListForChild(aBuilder, kid, aLists);
   }
diff --git a/layout/tables/nsTableColGroupFrame.cpp b/layout/tables/nsTableColGroupFrame.cpp
index 8009d9caa38d..74336abcb2d4 100644
--- a/layout/tables/nsTableColGroupFrame.cpp
+++ b/layout/tables/nsTableColGroupFrame.cpp
@@ -352,7 +352,11 @@ void nsTableColGroupFrame::Reflow(nsPresContext* aPresContext,
 
 void nsTableColGroupFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                             const nsDisplayListSet& aLists) {
-  DisplayOutsetBoxShadow(aBuilder, aLists.BorderBackground());
+  // Per https://drafts.csswg.org/css-tables-3/#global-style-overrides:
+  // "All css properties of table-column and table-column-group boxes are
+  // ignored, except when explicitly specified by this specification."
+  // CSS outlines and box-shadows fall into this category, so we skip them
+  // on these boxes.
 
   // Collecting column index.
   AutoTArray<uint32_t, 1> colIdx;
@@ -378,13 +382,6 @@ void nsTableColGroupFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
     }
   }
 
-  DisplayInsetBoxShadow(aBuilder, aLists.BorderBackground());
-
-  // Per https://drafts.csswg.org/css-tables-3/#global-style-overrides:
-  // "All css properties of table-column and table-column-group boxes are
-  // ignored, except when explicitly specified by this specification."
-  // CSS outlines fall into this category, so we skip them on these boxes.
-
   for (nsIFrame* kid : PrincipalChildList()) {
     BuildDisplayListForChild(aBuilder, kid, aLists);
   }

From 8bf47621c6aabf5d8f552cb82956b414505b5efe Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 20 May 2019 23:15:39 +0000
Subject: [PATCH 109/129] Bug 1409114 - Part 6: Store column and column group
 backgrounds separately, and then append then before the rest of the table
 contents. r=dbaron

This also changes behaviour a bit, previously we interleaved column and column group backgrounds. where we now put all the column group backgrounds behind all columns.
I believe this is the correct ordering as per CSS2.2 Appendix E.

Column backgrounds can overlap when using 'span', and we now render this in a different order, but this matches what other browsers do.

Differential Revision: https://phabricator.services.mozilla.com/D29278

--HG--
extra : moz-landing-system : lando
---
 layout/painting/nsDisplayList.cpp             |  1 +
 layout/painting/nsDisplayList.h               | 12 ++++++
 layout/reftests/table-background/reftest.list |  2 +
 .../table-col-overlapping-ref.html            | 27 +++++++++++++
 .../table-col-overlapping.html                | 27 +++++++++++++
 layout/tables/nsTableColFrame.cpp             |  5 ++-
 layout/tables/nsTableColGroupFrame.cpp        |  6 ++-
 layout/tables/nsTableFrame.cpp                | 10 ++++-
 layout/tables/nsTableFrame.h                  | 39 +++++++++++++++++++
 layout/tables/nsTableRowGroupFrame.cpp        |  7 ++--
 layout/tables/nsTableRowGroupFrame.h          |  2 +-
 11 files changed, 127 insertions(+), 11 deletions(-)
 create mode 100644 layout/reftests/table-background/table-col-overlapping-ref.html
 create mode 100644 layout/reftests/table-background/table-col-overlapping.html

diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
index bfa1e05b28f0..3a13c2266a69 100644
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -1151,6 +1151,7 @@ nsDisplayListBuilder::nsDisplayListBuilder(nsIFrame* aReferenceFrame,
       mFirstClipChainToDestroy(nullptr),
       mActiveScrolledRootForRootScrollframe(nullptr),
       mMode(aMode),
+      mTableBackgroundSet(nullptr),
       mCurrentScrollParentId(ScrollableLayerGuid::NULL_SCROLL_ID),
       mCurrentScrollbarTarget(ScrollableLayerGuid::NULL_SCROLL_ID),
       mSVGEffectsBuildingDepth(0),
diff --git a/layout/painting/nsDisplayList.h b/layout/painting/nsDisplayList.h
index d113579ba131..0b333ce8318f 100644
--- a/layout/painting/nsDisplayList.h
+++ b/layout/painting/nsDisplayList.h
@@ -63,6 +63,7 @@ class nsIScrollableFrame;
 class nsSubDocumentFrame;
 class nsDisplayCompositorHitTestInfo;
 class nsDisplayScrollInfoLayer;
+class nsDisplayTableBackgroundSet;
 class nsCaret;
 enum class nsDisplayOwnLayerFlags;
 struct WrFiltersHolder;
@@ -874,6 +875,16 @@ class nsDisplayListBuilder {
     mSyncDecodeImages = aSyncDecodeImages;
   }
 
+  nsDisplayTableBackgroundSet* SetTableBackgroundSet(
+      nsDisplayTableBackgroundSet* aTableSet) {
+    nsDisplayTableBackgroundSet* old = mTableBackgroundSet;
+    mTableBackgroundSet = aTableSet;
+    return old;
+  }
+  nsDisplayTableBackgroundSet* GetTableBackgroundSet() const {
+    return mTableBackgroundSet;
+  }
+
   void FreeClipChains();
 
   /*
@@ -1924,6 +1935,7 @@ class nsDisplayListBuilder {
   nsTArray<nsDisplayItem*> mTemporaryItems;
   const ActiveScrolledRoot* mActiveScrolledRootForRootScrollframe;
   nsDisplayListBuilderMode mMode;
+  nsDisplayTableBackgroundSet* mTableBackgroundSet;
   ViewID mCurrentScrollParentId;
   ViewID mCurrentScrollbarTarget;
   MaybeScrollDirection mCurrentScrollbarDirection;
diff --git a/layout/reftests/table-background/reftest.list b/layout/reftests/table-background/reftest.list
index 7464ec15c226..341cab342eee 100644
--- a/layout/reftests/table-background/reftest.list
+++ b/layout/reftests/table-background/reftest.list
@@ -64,3 +64,5 @@ fuzzy-if(OSX,0-1,0-113) fuzzy-if(winWidget,0-1,0-12) fuzzy-if(winWidget&&!layers
 == hidden-cells-1.html about:blank
 == hidden-cells-2.html about:blank
 == hidden-cells-3.html hidden-cells-3-ref.html
+
+== table-col-overlapping.html table-col-overlapping-ref.html
diff --git a/layout/reftests/table-background/table-col-overlapping-ref.html b/layout/reftests/table-background/table-col-overlapping-ref.html
new file mode 100644
index 000000000000..635fbe6574b2
--- /dev/null
+++ b/layout/reftests/table-background/table-col-overlapping-ref.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+  td {
+    width: 20px;
+    height: 20px;
+    background-color: green;
+  }
+  table {
+    border-collapse:separate;
+    border-spacing: 0px;
+  }
+</style>
+</head>
+<body>
+<table>
+  <tr>
+    <td></td>
+    <td style="background-color: blue"></td>
+  <tr>
+    <td></td>
+    <td></td>
+  </tr>
+</table>
+</body>
+</html>
diff --git a/layout/reftests/table-background/table-col-overlapping.html b/layout/reftests/table-background/table-col-overlapping.html
new file mode 100644
index 000000000000..219fd56b5772
--- /dev/null
+++ b/layout/reftests/table-background/table-col-overlapping.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+  td {
+    width: 20px;
+    height: 20px;
+  }
+  table {
+    border-collapse:separate;
+    border-spacing: 0px;
+  }
+</style>
+</head>
+<body>
+<table>
+  <col style="background: green"></col>
+  <col style="background: blue"></col>
+  <tr>
+    <td></td>
+    <td rowspan=2></td>
+  <tr>
+    <td colspan=2></td>
+  </tr>
+</table>
+</body>
+</html>
diff --git a/layout/tables/nsTableColFrame.cpp b/layout/tables/nsTableColFrame.cpp
index 47004f0c21ea..2a8d4befc36b 100644
--- a/layout/tables/nsTableColFrame.cpp
+++ b/layout/tables/nsTableColFrame.cpp
@@ -134,8 +134,9 @@ void nsTableColFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
             nsRect(offset, rowGroup->GetSize()))) {
       continue;
     }
-    rowGroup->PaintCellBackgroundsForColumns(this, aBuilder, aLists, colIdx,
-                                             offset);
+    rowGroup->PaintCellBackgroundsForColumns(
+        this, aBuilder, aBuilder->GetTableBackgroundSet()->ColBackgrounds(),
+        colIdx, offset);
   }
 
   for (nsIFrame* kid : PrincipalChildList()) {
diff --git a/layout/tables/nsTableColGroupFrame.cpp b/layout/tables/nsTableColGroupFrame.cpp
index 74336abcb2d4..800baf206e96 100644
--- a/layout/tables/nsTableColGroupFrame.cpp
+++ b/layout/tables/nsTableColGroupFrame.cpp
@@ -377,8 +377,10 @@ void nsTableColGroupFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
               nsRect(offset, rowGroup->GetSize()))) {
         continue;
       }
-      rowGroup->PaintCellBackgroundsForColumns(this, aBuilder, aLists, colIdx,
-                                               offset);
+      rowGroup->PaintCellBackgroundsForColumns(
+          this, aBuilder,
+          aBuilder->GetTableBackgroundSet()->ColGroupBackgrounds(), colIdx,
+          offset);
     }
   }
 
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index 295c131ff814..5f897fae7a2a 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -1292,6 +1292,9 @@ void nsTableFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
 
   DisplayBorderBackgroundOutline(aBuilder, aLists);
 
+  nsDisplayTableBackgroundSet tableBGs(aBuilder);
+  nsDisplayListCollection lists(aBuilder);
+
   // This is similar to what
   // nsContainerFrame::BuildDisplayListForNonBlockChildren does, except that we
   // allow the children's background and borders to go in our BorderBackground
@@ -1302,13 +1305,16 @@ void nsTableFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
   // borders though; this lets us get cell borders into the nsTableFrame's
   // BorderBackground list.
   for (nsIFrame* kid : GetChildList(kColGroupList)) {
-    BuildDisplayListForChild(aBuilder, kid, aLists);
+    BuildDisplayListForChild(aBuilder, kid, lists);
   }
 
   for (nsIFrame* kid : PrincipalChildList()) {
-    BuildDisplayListForChild(aBuilder, kid, aLists);
+    BuildDisplayListForChild(aBuilder, kid, lists);
   }
 
+  tableBGs.MoveTo(aLists);
+  lists.MoveTo(aLists);
+
   if (IsVisibleForPainting()) {
     // In the collapsed border model, overlay all collapsed borders.
     if (IsBorderCollapse()) {
diff --git a/layout/tables/nsTableFrame.h b/layout/tables/nsTableFrame.h
index 61ab57e96232..95f43fba61ea 100644
--- a/layout/tables/nsTableFrame.h
+++ b/layout/tables/nsTableFrame.h
@@ -70,6 +70,45 @@ class nsDisplayTableItem : public nsPaintedDisplayItem {
   bool mDrawsBackground;
 };
 
+class nsDisplayTableBackgroundSet {
+ public:
+  nsDisplayList* ColGroupBackgrounds() { return &mColGroupBackgrounds; }
+
+  nsDisplayList* ColBackgrounds() { return &mColBackgrounds; }
+
+  explicit nsDisplayTableBackgroundSet(nsDisplayListBuilder* aBuilder)
+      : mBuilder(aBuilder) {
+    mPrevTableBackgroundSet = mBuilder->SetTableBackgroundSet(this);
+  }
+
+  ~nsDisplayTableBackgroundSet() {
+    mozilla::DebugOnly<nsDisplayTableBackgroundSet*> result =
+        mBuilder->SetTableBackgroundSet(mPrevTableBackgroundSet);
+    MOZ_ASSERT(result == this);
+  }
+
+  /**
+   * Move all display items in our lists to top of the corresponding lists in
+   * the destination.
+   */
+  void MoveTo(const nsDisplayListSet& aDestination) {
+    aDestination.BorderBackground()->AppendToTop(ColGroupBackgrounds());
+    aDestination.BorderBackground()->AppendToTop(ColBackgrounds());
+  }
+
+ private:
+  // This class is only used on stack, so we don't have to worry about leaking
+  // it.  Don't let us be heap-allocated!
+  void* operator new(size_t sz) CPP_THROW_NEW;
+
+ protected:
+  nsDisplayListBuilder* mBuilder;
+  nsDisplayTableBackgroundSet* mPrevTableBackgroundSet;
+
+  nsDisplayList mColGroupBackgrounds;
+  nsDisplayList mColBackgrounds;
+};
+
 /* ========================================================================== */
 
 enum nsTableColType {
diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp
index 37fe242a305a..4f3de04cc220 100644
--- a/layout/tables/nsTableRowGroupFrame.cpp
+++ b/layout/tables/nsTableRowGroupFrame.cpp
@@ -237,9 +237,8 @@ static void DisplayRows(nsDisplayListBuilder* aBuilder, nsFrame* aFrame,
 }
 
 void nsTableRowGroupFrame::PaintCellBackgroundsForColumns(
-    nsIFrame* aFrame, nsDisplayListBuilder* aBuilder,
-    const nsDisplayListSet& aLists, const nsTArray<uint32_t>& aColIdx,
-    const nsPoint& aOffset) {
+    nsIFrame* aFrame, nsDisplayListBuilder* aBuilder, nsDisplayList* aList,
+    const nsTArray<uint32_t>& aColIdx, const nsPoint& aOffset) {
   MOZ_DIAGNOSTIC_ASSERT(!aColIdx.IsEmpty(),
                         "Must be painting backgrounds for something");
 
@@ -269,7 +268,7 @@ void nsTableRowGroupFrame::PaintCellBackgroundsForColumns(
         continue;
       }
       nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
-          aBuilder, aFrame, cellRect, aLists.BorderBackground(), false, nullptr,
+          aBuilder, aFrame, cellRect, aList, false, nullptr,
           aFrame->GetRectRelativeToSelf(), cell);
     }
   }
diff --git a/layout/tables/nsTableRowGroupFrame.h b/layout/tables/nsTableRowGroupFrame.h
index c352653921f5..57dc90c5fab6 100644
--- a/layout/tables/nsTableRowGroupFrame.h
+++ b/layout/tables/nsTableRowGroupFrame.h
@@ -78,7 +78,7 @@ class nsTableRowGroupFrame final : public nsContainerFrame,
 
   void PaintCellBackgroundsForColumns(nsIFrame* aFrame,
                                       nsDisplayListBuilder* aBuilder,
-                                      const nsDisplayListSet& aLists,
+                                      nsDisplayList* aList,
                                       const nsTArray<uint32_t>& aColIdx,
                                       const nsPoint& aOffset);
 

From 1f9adb1ed44c65e0d65ea7b5eef53a17f24f6656 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 20 May 2019 23:15:54 +0000
Subject: [PATCH 110/129] Bug 1409114 - Part 7: Pass rects in display list
 coordinates to AppendBackgroundItemsToTop. r=miko

This helps for the next patch, since some of the table backgrounds items want to compute this without position:relative taken into account.

Differential Revision: https://phabricator.services.mozilla.com/D29279

--HG--
extra : moz-landing-system : lando
---
 layout/forms/nsButtonFrameRenderer.cpp | 5 +++--
 layout/forms/nsFieldSetFrame.cpp       | 6 ++++--
 layout/generic/nsFrame.cpp             | 4 +++-
 layout/mathml/nsMathMLChar.cpp         | 3 ++-
 layout/painting/nsDisplayList.cpp      | 4 ++--
 layout/tables/nsTableCellFrame.cpp     | 4 +++-
 layout/tables/nsTableRowFrame.cpp      | 4 +++-
 layout/tables/nsTableRowGroupFrame.cpp | 6 ++++--
 layout/xul/nsGroupBoxFrame.cpp         | 3 ++-
 9 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/layout/forms/nsButtonFrameRenderer.cpp b/layout/forms/nsButtonFrameRenderer.cpp
index 3e7ea465deaa..027012c68c25 100644
--- a/layout/forms/nsButtonFrameRenderer.cpp
+++ b/layout/forms/nsButtonFrameRenderer.cpp
@@ -237,7 +237,7 @@ bool nsDisplayButtonBorder::CreateWebRenderCommands(
     nsDisplayListBuilder* aDisplayListBuilder) {
   // This is really a combination of paint box shadow inner +
   // paint border.
-  nsRect buttonRect = nsRect(ToReferenceFrame(), mFrame->GetSize());
+  const nsRect buttonRect = nsRect(ToReferenceFrame(), mFrame->GetSize());
   bool snap;
   nsRegion visible = GetBounds(aDisplayListBuilder, &snap);
   nsDisplayBoxShadowInner::CreateInsetBoxShadowWebRenderCommands(
@@ -394,7 +394,8 @@ nsresult nsButtonFrameRenderer::DisplayButton(nsDisplayListBuilder* aBuilder,
                                                                GetFrame());
   }
 
-  nsRect buttonRect = mFrame->GetRectRelativeToSelf();
+  nsRect buttonRect =
+      mFrame->GetRectRelativeToSelf() + aBuilder->ToReferenceFrame(mFrame);
 
   nsDisplayBackgroundImage::AppendBackgroundItemsToTop(aBuilder, mFrame,
                                                        buttonRect, aBackground);
diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index daa11da4d318..2d6d1e63ff1a 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -224,9 +224,11 @@ void nsFieldSetFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
       IsVisibleForPainting()) {
     DisplayOutsetBoxShadowUnconditional(aBuilder, aLists.BorderBackground());
 
+    const nsRect rect =
+        VisualBorderRectRelativeToSelf() + aBuilder->ToReferenceFrame(this);
+
     nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
-        aBuilder, this, VisualBorderRectRelativeToSelf(),
-        aLists.BorderBackground(),
+        aBuilder, this, rect, aLists.BorderBackground(),
         /* aAllowWillPaintBorderOptimization = */ false);
 
     aLists.BorderBackground()->AppendNewToTop<nsDisplayFieldSetBorder>(aBuilder,
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index e6916c1dac60..0585b916247f 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -2436,7 +2436,9 @@ bool nsFrame::DisplayBackgroundUnconditional(nsDisplayListBuilder* aBuilder,
       !StyleBackground()->IsTransparent(this) ||
       StyleDisplay()->HasAppearance()) {
     return nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
-        aBuilder, this, GetRectRelativeToSelf(), aLists.BorderBackground());
+        aBuilder, this,
+        GetRectRelativeToSelf() + aBuilder->ToReferenceFrame(this),
+        aLists.BorderBackground());
   }
   return false;
 }
diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp
index 697063dd90df..080c1eef8429 100644
--- a/layout/mathml/nsMathMLChar.cpp
+++ b/layout/mathml/nsMathMLChar.cpp
@@ -1837,7 +1837,8 @@ void nsMathMLChar::Display(nsDisplayListBuilder* aBuilder, nsIFrame* aForFrame,
         NS_GET_A(computedStyle->StyleBackground()->BackgroundColor(
             computedStyle)) > 0) {
       nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
-          aBuilder, aForFrame, mRect, aLists.BorderBackground(),
+          aBuilder, aForFrame, mRect + aBuilder->ToReferenceFrame(aForFrame),
+          aLists.BorderBackground(),
           /* aAllowWillPaintBorderOptimization */ true, computedStyle);
     }
     // else
diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
index 3a13c2266a69..bc3898ee4db0 100644
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -3820,10 +3820,10 @@ bool nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
     const nsRect& aBackgroundOriginRect, nsIFrame* aSecondaryReferenceFrame) {
   ComputedStyle* bgSC = aComputedStyle;
   const nsStyleBackground* bg = nullptr;
-  nsRect bgRect = aBackgroundRect + aBuilder->ToReferenceFrame(aFrame);
+  nsRect bgRect = aBackgroundRect;
   nsRect bgOriginRect = bgRect;
   if (!aBackgroundOriginRect.IsEmpty()) {
-    bgOriginRect = aBackgroundOriginRect + aBuilder->ToReferenceFrame(aFrame);
+    bgOriginRect = aBackgroundOriginRect;
   }
   nsPresContext* presContext = aFrame->PresContext();
   bool isThemed = aFrame->IsThemed();
diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp
index 4d680597aabb..444392472aa8 100644
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -450,12 +450,14 @@ void nsTableCellFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
           aBuilder, this);
     }
 
+    nsRect bgRect = GetRectRelativeToSelf() + aBuilder->ToReferenceFrame(this);
+
     // display background if we need to.
     if (aBuilder->IsForEventDelivery() ||
         !StyleBackground()->IsTransparent(this) ||
         StyleDisplay()->HasAppearance()) {
       nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
-          aBuilder, this, GetRectRelativeToSelf(), aLists.BorderBackground());
+          aBuilder, this, bgRect, aLists.BorderBackground());
     }
 
     // display inset box-shadows if we need to.
diff --git a/layout/tables/nsTableRowFrame.cpp b/layout/tables/nsTableRowFrame.cpp
index 1d7793ffcf7f..a97bb4b33337 100644
--- a/layout/tables/nsTableRowFrame.cpp
+++ b/layout/tables/nsTableRowFrame.cpp
@@ -536,6 +536,7 @@ void nsTableRowFrame::PaintCellBackgroundsForFrame(
     nsIFrame* aFrame, nsDisplayListBuilder* aBuilder,
     const nsDisplayListSet& aLists, const nsPoint& aOffset) {
   // Compute background rect by iterating all cell frame.
+  const nsPoint toReferenceFrame = aBuilder->ToReferenceFrame(aFrame);
   for (nsTableCellFrame* cell = GetFirstCell(); cell;
        cell = cell->GetNextCell()) {
     if (!cell->ShouldPaintBackground(aBuilder)) {
@@ -547,9 +548,10 @@ void nsTableRowFrame::PaintCellBackgroundsForFrame(
     if (!aBuilder->GetDirtyRect().Intersects(cellRect)) {
       continue;
     }
+    cellRect += toReferenceFrame;
     nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
         aBuilder, aFrame, cellRect, aLists.BorderBackground(), true, nullptr,
-        aFrame->GetRectRelativeToSelf(), cell);
+        aFrame->GetRectRelativeToSelf() + toReferenceFrame, cell);
   }
 }
 
diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp
index 4f3de04cc220..6f65c6adc946 100644
--- a/layout/tables/nsTableRowGroupFrame.cpp
+++ b/layout/tables/nsTableRowGroupFrame.cpp
@@ -262,14 +262,16 @@ void nsTableRowGroupFrame::PaintCellBackgroundsForColumns(
         continue;
       }
 
-      auto cellPos = cell->GetNormalPosition() + rowPos;
+      auto cellPos = cell->GetNormalPosition() + rowPos +
+                     aBuilder->ToReferenceFrame(aFrame);
       auto cellRect = nsRect(cellPos, cell->GetSize());
       if (!aBuilder->GetDirtyRect().Intersects(cellRect)) {
         continue;
       }
       nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
           aBuilder, aFrame, cellRect, aList, false, nullptr,
-          aFrame->GetRectRelativeToSelf(), cell);
+          aFrame->GetRectRelativeToSelf() + aBuilder->ToReferenceFrame(aFrame),
+          cell);
     }
   }
 }
diff --git a/layout/xul/nsGroupBoxFrame.cpp b/layout/xul/nsGroupBoxFrame.cpp
index f481f3332229..fc4f8d69d670 100644
--- a/layout/xul/nsGroupBoxFrame.cpp
+++ b/layout/xul/nsGroupBoxFrame.cpp
@@ -153,7 +153,8 @@ void nsGroupBoxFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
   // Paint our background and border
   if (IsVisibleForPainting()) {
     nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
-        aBuilder, this, GetBackgroundRectRelativeToSelf(),
+        aBuilder, this,
+        GetBackgroundRectRelativeToSelf() + aBuilder->ToReferenceFrame(this),
         aLists.BorderBackground());
     aLists.BorderBackground()->AppendNewToTop<nsDisplayXULGroupBorder>(aBuilder,
                                                                        this);

From 9f39c7b6085b5ede165fa195d255226c4e4e9842 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 20 May 2019 23:16:09 +0000
Subject: [PATCH 111/129] Bug 1409114 - Part 8: Create column and column group
 background display items as part of the cell's BuildDisplayList. r=dbaron

This is the main performance improvement, and means that we no longer have to iterate all the cells for each column.

It has a couple of behaviour changes:

The first is that we no longer apply stacking context effects (like opacity) to column and column group backgrounds.
I believe this is correct as per both CSS2.1 Appendix E, and css-tables-3 (quoted in nsTableColFrame::BuildDisplayList).
This matches the behaviour of blink and WebKit.

We also previously created items in column,row ordering, whereas now they will be in row,column. In cases where two cells
overlap (using rowspan and colspan to extend multiple neighbours in to the same place) this can render backgrounds in a
different order, but the new behaviour matches blink and WebKit.

Differential Revision: https://phabricator.services.mozilla.com/D29280

--HG--
extra : moz-landing-system : lando
---
 ...llapse-opacity-table-column-group-ref.html |  6 +--
 ...der-collapse-opacity-table-column-ref.html |  6 +--
 ...parate-opacity-table-column-group-ref.html |  6 +--
 ...der-separate-opacity-table-column-ref.html |  6 +--
 layout/reftests/table-background/reftest.list |  1 +
 .../table-col-span-1-ref.html                 | 15 +++++++
 .../table-background/table-col-span-1.html    | 14 +++++++
 layout/tables/nsTableCellFrame.cpp            | 35 ++++++++++++++++
 layout/tables/nsTableColFrame.cpp             | 24 +----------
 layout/tables/nsTableColGroupFrame.cpp        | 31 +-------------
 layout/tables/nsTableFrame.cpp                |  8 ++--
 layout/tables/nsTableFrame.h                  | 14 ++++++-
 layout/tables/nsTableRowGroupFrame.cpp        | 40 -------------------
 layout/tables/nsTableRowGroupFrame.h          |  6 ---
 14 files changed, 93 insertions(+), 119 deletions(-)
 create mode 100644 layout/reftests/table-background/table-col-span-1-ref.html
 create mode 100644 layout/reftests/table-background/table-col-span-1.html

diff --git a/layout/reftests/table-background/border-collapse-opacity-table-column-group-ref.html b/layout/reftests/table-background/border-collapse-opacity-table-column-group-ref.html
index bb03f15257df..9ec969236a41 100644
--- a/layout/reftests/table-background/border-collapse-opacity-table-column-group-ref.html
+++ b/layout/reftests/table-background/border-collapse-opacity-table-column-group-ref.html
@@ -10,8 +10,6 @@
 	html, body { margin: 0; padding: 0; border: 0; font-size: 16px; }
 	body { padding: 15px; }
 
-	.o { opacity: 0.5; }
-
 	/*
 	table { 
 		margin: 0px 3px 2px 4px;
@@ -55,8 +53,8 @@
 </head>
 <body>
 
-<div class="color o"></div>
-<div class="imagetl o"></div>
+<div class="color"></div>
+<div class="imagetl"></div>
 <div class="imagebr"></div>
 
 </body>
diff --git a/layout/reftests/table-background/border-collapse-opacity-table-column-ref.html b/layout/reftests/table-background/border-collapse-opacity-table-column-ref.html
index 7b7df902e5cb..82795ef8bebf 100644
--- a/layout/reftests/table-background/border-collapse-opacity-table-column-ref.html
+++ b/layout/reftests/table-background/border-collapse-opacity-table-column-ref.html
@@ -10,8 +10,6 @@
 	html, body { margin: 0; padding: 0; border: 0; font-size: 16px; }
 	body { padding: 15px; }
 
-	.o { opacity: 0.5; }
-
 	/*
 	table { 
 		margin: 0px 3px 2px 4px;
@@ -55,8 +53,8 @@
 </head>
 <body>
 
-<div class="color o"></div>
-<div class="imagetl o"></div>
+<div class="color"></div>
+<div class="imagetl"></div>
 <div class="imagebr"></div>
 
 </body>
diff --git a/layout/reftests/table-background/border-separate-opacity-table-column-group-ref.html b/layout/reftests/table-background/border-separate-opacity-table-column-group-ref.html
index ad6ca2453994..6985dae64deb 100644
--- a/layout/reftests/table-background/border-separate-opacity-table-column-group-ref.html
+++ b/layout/reftests/table-background/border-separate-opacity-table-column-group-ref.html
@@ -10,8 +10,6 @@
 	html, body { margin: 0; padding: 0; border: 0; font-size: 16px; }
 	body { padding: 15px; }
 
-	.o { opacity: 0.5; }
-
 	/*
 	table { 
 		margin: 0px 3px 2px 4px;
@@ -65,8 +63,8 @@
 <body>
 
 <div class="color"></div>
-<div class="imagetl o"></div>
-<div class="imagebr o"></div>
+<div class="imagetl"></div>
+<div class="imagebr"></div>
 
 <div class="hstripe" style="top: 46px"></div>
 <div class="hstripe" style="top: 70px"></div>
diff --git a/layout/reftests/table-background/border-separate-opacity-table-column-ref.html b/layout/reftests/table-background/border-separate-opacity-table-column-ref.html
index e00193dc3a15..a6629347d2bc 100644
--- a/layout/reftests/table-background/border-separate-opacity-table-column-ref.html
+++ b/layout/reftests/table-background/border-separate-opacity-table-column-ref.html
@@ -10,8 +10,6 @@
 	html, body { margin: 0; padding: 0; border: 0; font-size: 16px; }
 	body { padding: 15px; }
 
-	.o { opacity: 0.5; }
-
 	/*
 	table { 
 		margin: 0px 3px 2px 4px;
@@ -65,8 +63,8 @@
 <body>
 
 <div class="color"></div>
-<div class="imagetl o"></div>
-<div class="imagebr o"></div>
+<div class="imagetl"></div>
+<div class="imagebr"></div>
 
 <div class="hstripe" style="top: 46px"></div>
 <div class="hstripe" style="top: 70px"></div>
diff --git a/layout/reftests/table-background/reftest.list b/layout/reftests/table-background/reftest.list
index 341cab342eee..30078c778503 100644
--- a/layout/reftests/table-background/reftest.list
+++ b/layout/reftests/table-background/reftest.list
@@ -66,3 +66,4 @@ fuzzy-if(OSX,0-1,0-113) fuzzy-if(winWidget,0-1,0-12) fuzzy-if(winWidget&&!layers
 == hidden-cells-3.html hidden-cells-3-ref.html
 
 == table-col-overlapping.html table-col-overlapping-ref.html
+== table-col-span-1.html table-col-span-1-ref.html
diff --git a/layout/reftests/table-background/table-col-span-1-ref.html b/layout/reftests/table-background/table-col-span-1-ref.html
new file mode 100644
index 000000000000..12a7bc45f642
--- /dev/null
+++ b/layout/reftests/table-background/table-col-span-1-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<body>
+  <table border>
+    <col style="background:purple"></col>
+    <col style="background:purple"></col>
+    <col style="background:blue"></col>
+    <tr>
+      <td>x</td>
+      <td>y</td>
+      <td>z</td>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/layout/reftests/table-background/table-col-span-1.html b/layout/reftests/table-background/table-col-span-1.html
new file mode 100644
index 000000000000..b7e98b3decad
--- /dev/null
+++ b/layout/reftests/table-background/table-col-span-1.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<body>
+  <table border>
+    <col span=2 style="background:purple"></col>
+    <col style="background:blue"></col>
+    <tr>
+      <td>x</td>
+      <td>y</td>
+      <td>z</td>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp
index 444392472aa8..2c5333bf747b 100644
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -474,6 +474,41 @@ void nsTableCellFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
       aLists.BorderBackground()->AppendNewToTop<nsDisplayTableCellSelection>(
           aBuilder, this);
     }
+
+    // This can be null if display list building initiated in the middle
+    // of the table, which can happen with background-clip:text and
+    // -moz-element.
+    nsDisplayTableBackgroundSet* backgrounds =
+        aBuilder->GetTableBackgroundSet();
+    if (backgrounds) {
+      // Compute bgRect relative to reference frame, but using the
+      // normal (without position:relative offsets) positions for the
+      // cell, row and row group.
+      bgRect = GetRectRelativeToSelf() + GetNormalPosition();
+
+      nsTableRowFrame* row = GetTableRowFrame();
+      bgRect += row->GetNormalPosition();
+
+      nsTableRowGroupFrame* rowGroup = row->GetTableRowGroupFrame();
+      bgRect += rowGroup->GetNormalPosition();
+
+      bgRect += backgrounds->TableToReferenceFrame();
+
+      // Create backgrounds items as needed for the column and column
+      // group that this cell occupies.
+      nsTableColFrame* col = backgrounds->GetColForIndex(ColIndex());
+      nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
+          aBuilder, col, bgRect, backgrounds->ColBackgrounds(), false, nullptr,
+          col->GetRectRelativeToSelf() + aBuilder->ToReferenceFrame(col), this);
+
+      nsIFrame* colGroup = col->GetParent();
+      nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
+          aBuilder, colGroup, bgRect, backgrounds->ColGroupBackgrounds(), false,
+          nullptr,
+          colGroup->GetRectRelativeToSelf() +
+              aBuilder->ToReferenceFrame(colGroup),
+          this);
+    }
   }
 
   // the 'empty-cells' property has no effect on 'outline'
diff --git a/layout/tables/nsTableColFrame.cpp b/layout/tables/nsTableColFrame.cpp
index 2a8d4befc36b..1900220c9212 100644
--- a/layout/tables/nsTableColFrame.cpp
+++ b/layout/tables/nsTableColFrame.cpp
@@ -119,29 +119,7 @@ void nsTableColFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
   // ignored, except when explicitly specified by this specification."
   // CSS outlines and box-shadows fall into this category, so we skip them
   // on these boxes.
-
-  // Compute background rect by iterating all cell frame.
-  AutoTArray<uint32_t, 1> colIdx;
-  colIdx.AppendElement(GetColIndex());
-
-  nsTableFrame* table = GetTableFrame();
-  nsTableFrame::RowGroupArray rowGroups;
-  table->OrderRowGroups(rowGroups);
-  for (nsTableRowGroupFrame* rowGroup : rowGroups) {
-    auto offset = rowGroup->GetNormalPosition() - GetNormalPosition() -
-                  GetTableColGroupFrame()->GetNormalPosition();
-    if (!aBuilder->GetDirtyRect().Intersects(
-            nsRect(offset, rowGroup->GetSize()))) {
-      continue;
-    }
-    rowGroup->PaintCellBackgroundsForColumns(
-        this, aBuilder, aBuilder->GetTableBackgroundSet()->ColBackgrounds(),
-        colIdx, offset);
-  }
-
-  for (nsIFrame* kid : PrincipalChildList()) {
-    BuildDisplayListForChild(aBuilder, kid, aLists);
-  }
+  MOZ_ASSERT_UNREACHABLE("Cols don't paint themselves");
 }
 
 int32_t nsTableColFrame::GetSpan() { return StyleTable()->mSpan; }
diff --git a/layout/tables/nsTableColGroupFrame.cpp b/layout/tables/nsTableColGroupFrame.cpp
index 800baf206e96..9017fc1f921d 100644
--- a/layout/tables/nsTableColGroupFrame.cpp
+++ b/layout/tables/nsTableColGroupFrame.cpp
@@ -357,36 +357,7 @@ void nsTableColGroupFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
   // ignored, except when explicitly specified by this specification."
   // CSS outlines and box-shadows fall into this category, so we skip them
   // on these boxes.
-
-  // Collecting column index.
-  AutoTArray<uint32_t, 1> colIdx;
-  for (nsTableColFrame* col = GetFirstColumn(); col; col = col->GetNextCol()) {
-    MOZ_ASSERT(colIdx.IsEmpty() || static_cast<uint32_t>(col->GetColIndex()) >
-                                       colIdx.LastElement());
-    colIdx.AppendElement(col->GetColIndex());
-  }
-
-  if (!colIdx.IsEmpty()) {
-    // We have some actual cells that live inside this rowgroup.
-    nsTableFrame* table = GetTableFrame();
-    nsTableFrame::RowGroupArray rowGroups;
-    table->OrderRowGroups(rowGroups);
-    for (nsTableRowGroupFrame* rowGroup : rowGroups) {
-      auto offset = rowGroup->GetNormalPosition() - GetNormalPosition();
-      if (!aBuilder->GetDirtyRect().Intersects(
-              nsRect(offset, rowGroup->GetSize()))) {
-        continue;
-      }
-      rowGroup->PaintCellBackgroundsForColumns(
-          this, aBuilder,
-          aBuilder->GetTableBackgroundSet()->ColGroupBackgrounds(), colIdx,
-          offset);
-    }
-  }
-
-  for (nsIFrame* kid : PrincipalChildList()) {
-    BuildDisplayListForChild(aBuilder, kid, aLists);
-  }
+  MOZ_ASSERT_UNREACHABLE("Colgroups don't paint themselves");
 }
 
 nsTableColFrame* nsTableColGroupFrame::GetFirstColumn() {
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index 5f897fae7a2a..550b01973b9a 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -1292,7 +1292,7 @@ void nsTableFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
 
   DisplayBorderBackgroundOutline(aBuilder, aLists);
 
-  nsDisplayTableBackgroundSet tableBGs(aBuilder);
+  nsDisplayTableBackgroundSet tableBGs(aBuilder, this);
   nsDisplayListCollection lists(aBuilder);
 
   // This is similar to what
@@ -1304,8 +1304,10 @@ void nsTableFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
   // won't use its passed-in BorderBackground list anyway. It does affect cell
   // borders though; this lets us get cell borders into the nsTableFrame's
   // BorderBackground list.
-  for (nsIFrame* kid : GetChildList(kColGroupList)) {
-    BuildDisplayListForChild(aBuilder, kid, lists);
+  for (nsIFrame* colGroup : FirstContinuation()->GetChildList(kColGroupList)) {
+    for (nsIFrame* col : colGroup->PrincipalChildList()) {
+      tableBGs.AddColumn((nsTableColFrame*)col);
+    }
   }
 
   for (nsIFrame* kid : PrincipalChildList()) {
diff --git a/layout/tables/nsTableFrame.h b/layout/tables/nsTableFrame.h
index 95f43fba61ea..7fc475e441b4 100644
--- a/layout/tables/nsTableFrame.h
+++ b/layout/tables/nsTableFrame.h
@@ -76,9 +76,12 @@ class nsDisplayTableBackgroundSet {
 
   nsDisplayList* ColBackgrounds() { return &mColBackgrounds; }
 
-  explicit nsDisplayTableBackgroundSet(nsDisplayListBuilder* aBuilder)
+  nsDisplayTableBackgroundSet(nsDisplayListBuilder* aBuilder, nsIFrame* aTable)
       : mBuilder(aBuilder) {
     mPrevTableBackgroundSet = mBuilder->SetTableBackgroundSet(this);
+    mozilla::DebugOnly<const nsIFrame*> reference =
+        mBuilder->FindReferenceFrameFor(aTable, &mToReferenceFrame);
+    MOZ_ASSERT(nsLayoutUtils::IsAncestorFrameCrossDoc(reference, aTable));
   }
 
   ~nsDisplayTableBackgroundSet() {
@@ -96,6 +99,12 @@ class nsDisplayTableBackgroundSet {
     aDestination.BorderBackground()->AppendToTop(ColBackgrounds());
   }
 
+  void AddColumn(nsTableColFrame* aFrame) { mColumns.AppendElement(aFrame); }
+
+  nsTableColFrame* GetColForIndex(int32_t aIndex) { return mColumns[aIndex]; }
+
+  const nsPoint& TableToReferenceFrame() { return mToReferenceFrame; }
+
  private:
   // This class is only used on stack, so we don't have to worry about leaking
   // it.  Don't let us be heap-allocated!
@@ -107,6 +116,9 @@ class nsDisplayTableBackgroundSet {
 
   nsDisplayList mColGroupBackgrounds;
   nsDisplayList mColBackgrounds;
+
+  nsTArray<nsTableColFrame*> mColumns;
+  nsPoint mToReferenceFrame;
 };
 
 /* ========================================================================== */
diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp
index 6f65c6adc946..e74a2067ea1c 100644
--- a/layout/tables/nsTableRowGroupFrame.cpp
+++ b/layout/tables/nsTableRowGroupFrame.cpp
@@ -236,46 +236,6 @@ static void DisplayRows(nsDisplayListBuilder* aBuilder, nsFrame* aFrame,
   }
 }
 
-void nsTableRowGroupFrame::PaintCellBackgroundsForColumns(
-    nsIFrame* aFrame, nsDisplayListBuilder* aBuilder, nsDisplayList* aList,
-    const nsTArray<uint32_t>& aColIdx, const nsPoint& aOffset) {
-  MOZ_DIAGNOSTIC_ASSERT(!aColIdx.IsEmpty(),
-                        "Must be painting backgrounds for something");
-
-  for (nsTableRowFrame* row = GetFirstRow(); row; row = row->GetNextRow()) {
-    auto rowPos = row->GetNormalPosition() + aOffset;
-    if (!aBuilder->GetDirtyRect().Intersects(nsRect(rowPos, row->GetSize()))) {
-      continue;
-    }
-    for (nsTableCellFrame* cell = row->GetFirstCell(); cell;
-         cell = cell->GetNextCell()) {
-      uint32_t curColIdx = cell->ColIndex();
-      if (!aColIdx.ContainsSorted(curColIdx)) {
-        if (curColIdx > aColIdx.LastElement()) {
-          // We can just stop looking at this row.
-          break;
-        }
-        continue;
-      }
-
-      if (!cell->ShouldPaintBackground(aBuilder)) {
-        continue;
-      }
-
-      auto cellPos = cell->GetNormalPosition() + rowPos +
-                     aBuilder->ToReferenceFrame(aFrame);
-      auto cellRect = nsRect(cellPos, cell->GetSize());
-      if (!aBuilder->GetDirtyRect().Intersects(cellRect)) {
-        continue;
-      }
-      nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
-          aBuilder, aFrame, cellRect, aList, false, nullptr,
-          aFrame->GetRectRelativeToSelf() + aBuilder->ToReferenceFrame(aFrame),
-          cell);
-    }
-  }
-}
-
 void nsTableRowGroupFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                             const nsDisplayListSet& aLists) {
   DisplayOutsetBoxShadow(aBuilder, aLists.BorderBackground());
diff --git a/layout/tables/nsTableRowGroupFrame.h b/layout/tables/nsTableRowGroupFrame.h
index 57dc90c5fab6..a63bba192f75 100644
--- a/layout/tables/nsTableRowGroupFrame.h
+++ b/layout/tables/nsTableRowGroupFrame.h
@@ -76,12 +76,6 @@ class nsTableRowGroupFrame final : public nsContainerFrame,
   virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                 const nsDisplayListSet& aLists) override;
 
-  void PaintCellBackgroundsForColumns(nsIFrame* aFrame,
-                                      nsDisplayListBuilder* aBuilder,
-                                      nsDisplayList* aList,
-                                      const nsTArray<uint32_t>& aColIdx,
-                                      const nsPoint& aOffset);
-
   /**
    * Calls Reflow for all of its child rows.
    *

From 0b73d82714dfa369d6fd3eb339b928308b6582ac Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 20 May 2019 23:16:22 +0000
Subject: [PATCH 112/129] Bug 1409114 - Part 9: Used cached values instead of
 calling nsDisplayListBuilder::ToReferenceFrame when possible, since it can be
 expensive when the requested frame isn't the builder's current frame. r=miko

Differential Revision: https://phabricator.services.mozilla.com/D29281

--HG--
extra : moz-landing-system : lando
---
 layout/painting/nsDisplayList.cpp  |  8 +++-----
 layout/tables/nsTableCellFrame.cpp | 11 ++++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
index bc3898ee4db0..b32603fe8c24 100644
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -3764,8 +3764,8 @@ static nsIFrame* GetBackgroundComputedStyleFrame(nsIFrame* aFrame) {
 
 static void SetBackgroundClipRegion(
     DisplayListClipState::AutoSaveRestore& aClipState, nsIFrame* aFrame,
-    const nsPoint& aToReferenceFrame, const nsStyleImageLayers::Layer& aLayer,
-    const nsRect& aBackgroundRect, bool aWillPaintBorder) {
+    const nsStyleImageLayers::Layer& aLayer, const nsRect& aBackgroundRect,
+    bool aWillPaintBorder) {
   nsCSSRendering::ImageLayerClipState clip;
   nsCSSRendering::GetImageLayerClip(
       aLayer, aFrame, *aFrame->StyleBorder(), aBackgroundRect, aBackgroundRect,
@@ -3864,8 +3864,6 @@ bool nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
   bool willPaintBorder = aAllowWillPaintBorderOptimization && !isThemed &&
                          !hasInsetShadow && borderStyle->HasBorder();
 
-  nsPoint toRef = aBuilder->ToReferenceFrame(aFrame);
-
   // An auxiliary list is necessary in case we have background blending; if that
   // is the case, background items need to be wrapped by a blend container to
   // isolate blending to the background
@@ -3969,7 +3967,7 @@ bool nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
     DisplayListClipState::AutoSaveRestore clipState(aBuilder);
     if (!aBuilder->IsForEventDelivery()) {
       const nsStyleImageLayers::Layer& layer = bg->mImage.mLayers[i];
-      SetBackgroundClipRegion(clipState, aFrame, toRef, layer, bgRect,
+      SetBackgroundClipRegion(clipState, aFrame, layer, bgRect,
                               willPaintBorder);
     }
 
diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp
index 2c5333bf747b..c9ab298e172d 100644
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -497,16 +497,17 @@ void nsTableCellFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
       // Create backgrounds items as needed for the column and column
       // group that this cell occupies.
       nsTableColFrame* col = backgrounds->GetColForIndex(ColIndex());
+      nsTableColGroupFrame* colGroup = col->GetTableColGroupFrame();
+
       nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
           aBuilder, col, bgRect, backgrounds->ColBackgrounds(), false, nullptr,
-          col->GetRectRelativeToSelf() + aBuilder->ToReferenceFrame(col), this);
+          col->GetRect() + colGroup->GetPosition() +
+              backgrounds->TableToReferenceFrame(),
+          this);
 
-      nsIFrame* colGroup = col->GetParent();
       nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
           aBuilder, colGroup, bgRect, backgrounds->ColGroupBackgrounds(), false,
-          nullptr,
-          colGroup->GetRectRelativeToSelf() +
-              aBuilder->ToReferenceFrame(colGroup),
+          nullptr, colGroup->GetRect() + backgrounds->TableToReferenceFrame(),
           this);
     }
   }

From dfc3175e1c67147d34aac571d725705cc6c3bc91 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 20 May 2019 23:16:39 +0000
Subject: [PATCH 113/129] Bug 1409114 - Part 10: Make sure we build display
 items for table parts where only the normal position is visible, since we may
 need to create background items for ancestors at that position. r=dbaron

Differential Revision: https://phabricator.services.mozilla.com/D29447

--HG--
extra : moz-landing-system : lando
---
 layout/generic/nsFrame.cpp                    | 25 +++++++++++++++++++
 .../position-relative/1409114-1-ref.html      | 11 ++++++++
 .../reftests/position-relative/1409114-1.html | 11 ++++++++
 .../reftests/position-relative/1409114-2.html | 12 +++++++++
 .../reftests/position-relative/1409114-3.html | 13 ++++++++++
 .../reftests/position-relative/reftest.list   |  3 +++
 layout/tables/nsTableFrame.h                  |  4 +++
 layout/tables/nsTableRowGroupFrame.cpp        |  2 +-
 8 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 layout/reftests/position-relative/1409114-1-ref.html
 create mode 100644 layout/reftests/position-relative/1409114-1.html
 create mode 100644 layout/reftests/position-relative/1409114-2.html
 create mode 100644 layout/reftests/position-relative/1409114-3.html

diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 0585b916247f..fec960c5c973 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -3623,6 +3623,31 @@ static bool DescendIntoChild(nsDisplayListBuilder* aBuilder,
     return true;
   }
 
+  if (aChild->IsFrameOfType(nsIFrame::eTablePart)) {
+    // Relative positioning and transforms can cause table parts to move, but we
+    // will still paint the backgrounds for their ancestor parts under them at
+    // their 'normal' position. That means that we must consider the overflow
+    // rects at both positions.
+
+    // We convert the overflow rect into the nsTableFrame's coordinate
+    // space, applying the normal position offset at each step. Then we
+    // compare that against the builder's cached dirty rect in table
+    // coordinate space.
+    const nsIFrame* f = aChild;
+    nsRect normalPositionOverflowRelativeToTable = overflow;
+
+    while (f->IsFrameOfType(nsIFrame::eTablePart)) {
+      normalPositionOverflowRelativeToTable += f->GetNormalPosition();
+      f = f->GetParent();
+    }
+
+    nsDisplayTableBackgroundSet* tableBGs = aBuilder->GetTableBackgroundSet();
+    if (tableBGs &&
+        tableBGs->GetDirtyRect().Intersects(normalPositionOverflowRelativeToTable)) {
+      return true;
+    }
+  }
+
   return false;
 }
 
diff --git a/layout/reftests/position-relative/1409114-1-ref.html b/layout/reftests/position-relative/1409114-1-ref.html
new file mode 100644
index 000000000000..9271ec8b6df1
--- /dev/null
+++ b/layout/reftests/position-relative/1409114-1-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<body>
+<table>
+  <col style="background:green">
+  <tr>
+    <td style="width:20px; height:20px"></td>
+  </tr>
+</table>
+</body>
+</html>
diff --git a/layout/reftests/position-relative/1409114-1.html b/layout/reftests/position-relative/1409114-1.html
new file mode 100644
index 000000000000..988ecab1ef3e
--- /dev/null
+++ b/layout/reftests/position-relative/1409114-1.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<body>
+<table>
+  <col style="background:green">
+  <tr>
+    <td style="position:relative; left:-100px; width:20px; height:20px"></td>
+  </tr>
+</table>
+</body>
+</html>
diff --git a/layout/reftests/position-relative/1409114-2.html b/layout/reftests/position-relative/1409114-2.html
new file mode 100644
index 000000000000..06d644d5e4f1
--- /dev/null
+++ b/layout/reftests/position-relative/1409114-2.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<body style="overflow:hidden">
+<table style="position:relative; top:-50px">
+  <col style="background:green; width: 40px;">
+  <tr style="position:relative; left:-100px; height: 40px">
+    <td rowspan=2></td>
+  </tr>
+  <tr style="height: 40px"></tr>
+</table>
+</body>
+</html>
diff --git a/layout/reftests/position-relative/1409114-3.html b/layout/reftests/position-relative/1409114-3.html
new file mode 100644
index 000000000000..cfd01561d696
--- /dev/null
+++ b/layout/reftests/position-relative/1409114-3.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<body style="overflow:hidden">
+<table style="position:relative; top:-50px">
+  <tbody style="background:green">
+    <tr style="position:relative; left:-100px; height: 40px">
+      <td rowspan=2 style="width: 40px;"></td>
+    </tr>
+    <tr style="height: 40px"></tr>
+  </tbody>
+</table>
+</body>
+</html>
diff --git a/layout/reftests/position-relative/reftest.list b/layout/reftests/position-relative/reftest.list
index 880a38e8d544..495588ab7900 100644
--- a/layout/reftests/position-relative/reftest.list
+++ b/layout/reftests/position-relative/reftest.list
@@ -7,3 +7,6 @@
 == table-separate-3.html table-separate-3-ref.html
 == table-separate-4.html table-separate-4-ref.html
 == 1115999-1.html 1115999-1-ref.html
+== 1409114-1.html 1409114-1-ref.html
+!= 1409114-2.html about:blank
+!= 1409114-3.html about:blank
diff --git a/layout/tables/nsTableFrame.h b/layout/tables/nsTableFrame.h
index 7fc475e441b4..b95adb8e2e20 100644
--- a/layout/tables/nsTableFrame.h
+++ b/layout/tables/nsTableFrame.h
@@ -82,6 +82,7 @@ class nsDisplayTableBackgroundSet {
     mozilla::DebugOnly<const nsIFrame*> reference =
         mBuilder->FindReferenceFrameFor(aTable, &mToReferenceFrame);
     MOZ_ASSERT(nsLayoutUtils::IsAncestorFrameCrossDoc(reference, aTable));
+    mDirtyRect = mBuilder->GetDirtyRect();
   }
 
   ~nsDisplayTableBackgroundSet() {
@@ -105,6 +106,8 @@ class nsDisplayTableBackgroundSet {
 
   const nsPoint& TableToReferenceFrame() { return mToReferenceFrame; }
 
+  const nsRect& GetDirtyRect() { return mDirtyRect; }
+
  private:
   // This class is only used on stack, so we don't have to worry about leaking
   // it.  Don't let us be heap-allocated!
@@ -119,6 +122,7 @@ class nsDisplayTableBackgroundSet {
 
   nsTArray<nsTableColFrame*> mColumns;
   nsPoint mToReferenceFrame;
+  nsRect mDirtyRect;
 };
 
 /* ========================================================================== */
diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp
index e74a2067ea1c..96218da97949 100644
--- a/layout/tables/nsTableRowGroupFrame.cpp
+++ b/layout/tables/nsTableRowGroupFrame.cpp
@@ -242,7 +242,7 @@ void nsTableRowGroupFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
 
   for (nsTableRowFrame* row = GetFirstRow(); row; row = row->GetNextRow()) {
     if (!aBuilder->GetDirtyRect().Intersects(
-            nsRect(row->GetNormalPosition(), row->GetSize()))) {
+            row->GetVisualOverflowRect() + row->GetNormalPosition())) {
       continue;
     }
     row->PaintCellBackgroundsForFrame(this, aBuilder, aLists,

From 17a9052fe9ca675b1e1b31d1d2e49eb47f953a5b Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 20 May 2019 23:16:59 +0000
Subject: [PATCH 114/129] Bug 1409114 - Part 11: Create an
 AutoBuildingDisplayList when we create background items for table columns and
 column groups, so that we initialize the invalidation state correctly.
 r=kamidphish

Differential Revision: https://phabricator.services.mozilla.com/D31563

--HG--
extra : moz-landing-system : lando
---
 layout/painting/nsDisplayList.cpp  | 11 ++++++++++-
 layout/painting/nsDisplayList.h    |  4 +++-
 layout/tables/nsTableCellFrame.cpp | 14 ++++++++------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
index b32603fe8c24..bb2e8b743b2b 100644
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -3817,7 +3817,9 @@ bool nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
     nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
     const nsRect& aBackgroundRect, nsDisplayList* aList,
     bool aAllowWillPaintBorderOptimization, ComputedStyle* aComputedStyle,
-    const nsRect& aBackgroundOriginRect, nsIFrame* aSecondaryReferenceFrame) {
+    const nsRect& aBackgroundOriginRect, nsIFrame* aSecondaryReferenceFrame,
+    Maybe<nsDisplayListBuilder::AutoBuildingDisplayList>*
+        aAutoBuildingDisplayList) {
   ComputedStyle* bgSC = aComputedStyle;
   const nsStyleBackground* bg = nullptr;
   nsRect bgRect = aBackgroundRect;
@@ -3872,6 +3874,9 @@ bool nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
   // need to create an item for hit testing.
   if ((drawBackgroundColor && color != NS_RGBA(0, 0, 0, 0)) ||
       aBuilder->IsForEventDelivery()) {
+    if (aAutoBuildingDisplayList && !*aAutoBuildingDisplayList) {
+      aAutoBuildingDisplayList->emplace(aBuilder, aFrame);
+    }
     Maybe<DisplayListClipState::AutoSaveRestore> clipState;
     nsRect bgColorRect = bgRect;
     if (bg && !aBuilder->IsForEventDelivery()) {
@@ -3960,6 +3965,10 @@ bool nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
       continue;
     }
 
+    if (aAutoBuildingDisplayList && !*aAutoBuildingDisplayList) {
+      aAutoBuildingDisplayList->emplace(aBuilder, aFrame);
+    }
+
     if (bg->mImage.mLayers[i].mBlendMode != NS_STYLE_BLEND_NORMAL) {
       needBlendContainer = true;
     }
diff --git a/layout/painting/nsDisplayList.h b/layout/painting/nsDisplayList.h
index 0b333ce8318f..7a268dd74e1f 100644
--- a/layout/painting/nsDisplayList.h
+++ b/layout/painting/nsDisplayList.h
@@ -4465,7 +4465,9 @@ class nsDisplayBackgroundImage : public nsDisplayImageContainer {
       bool aAllowWillPaintBorderOptimization = true,
       mozilla::ComputedStyle* aComputedStyle = nullptr,
       const nsRect& aBackgroundOriginRect = nsRect(),
-      nsIFrame* aSecondaryReferenceFrame = nullptr);
+      nsIFrame* aSecondaryReferenceFrame = nullptr,
+      mozilla::Maybe<nsDisplayListBuilder::AutoBuildingDisplayList>*
+          aAutoBuildingDisplayList = nullptr);
 
   LayerState GetLayerState(
       nsDisplayListBuilder* aBuilder, LayerManager* aManager,
diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp
index c9ab298e172d..e3990c685d90 100644
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -499,16 +499,18 @@ void nsTableCellFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
       nsTableColFrame* col = backgrounds->GetColForIndex(ColIndex());
       nsTableColGroupFrame* colGroup = col->GetTableColGroupFrame();
 
+      Maybe<nsDisplayListBuilder::AutoBuildingDisplayList> buildingForColGroup;
+      nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
+          aBuilder, colGroup, bgRect, backgrounds->ColGroupBackgrounds(), false,
+          nullptr, colGroup->GetRect() + backgrounds->TableToReferenceFrame(),
+          this, &buildingForColGroup);
+
+      Maybe<nsDisplayListBuilder::AutoBuildingDisplayList> buildingForCol;
       nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
           aBuilder, col, bgRect, backgrounds->ColBackgrounds(), false, nullptr,
           col->GetRect() + colGroup->GetPosition() +
               backgrounds->TableToReferenceFrame(),
-          this);
-
-      nsDisplayBackgroundImage::AppendBackgroundItemsToTop(
-          aBuilder, colGroup, bgRect, backgrounds->ColGroupBackgrounds(), false,
-          nullptr, colGroup->GetRect() + backgrounds->TableToReferenceFrame(),
-          this);
+          this, &buildingForCol);
     }
   }
 

From cb6ab5e32f76a5ba809fa7b6666ebb468cf47cb5 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 20 May 2019 23:17:12 +0000
Subject: [PATCH 115/129] Bug 1528957 - Use the frame's rect to advance
 nsTableRowGroupFrame's cursor, since that's what the max overflow values are
 computed relative to. r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D29448

--HG--
extra : moz-landing-system : lando
---
 layout/tables/nsTableRowGroupFrame.cpp | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp
index 96218da97949..2d0346e37798 100644
--- a/layout/tables/nsTableRowGroupFrame.cpp
+++ b/layout/tables/nsTableRowGroupFrame.cpp
@@ -205,10 +205,9 @@ static void DisplayRows(nsDisplayListBuilder* aBuilder, nsFrame* aFrame,
     // have a cursor, use it
     while (kid) {
       if (kid->GetRect().y - overflowAbove >=
-              aBuilder->GetVisibleRect().YMost() &&
-          kid->GetNormalRect().y - overflowAbove >=
-              aBuilder->GetVisibleRect().YMost())
+          aBuilder->GetVisibleRect().YMost()) {
         break;
+      }
       f->BuildDisplayListForChild(aBuilder, kid, aLists);
       kid = kid->GetNextSibling();
     }
@@ -1914,13 +1913,12 @@ nsIFrame* nsTableRowGroupFrame::GetFirstRowContaining(nscoord aY,
   // encountering a row whose overflowArea.YMost() is <= aY but which has
   // a row above it containing cell(s) that span to include aY.
   while (cursorIndex > 0 &&
-         cursorFrame->GetNormalRect().YMost() + property->mOverflowBelow > aY) {
+         cursorFrame->GetRect().YMost() + property->mOverflowBelow > aY) {
     --cursorIndex;
     cursorFrame = property->mFrames[cursorIndex];
   }
   while (cursorIndex + 1 < frameCount &&
-         cursorFrame->GetNormalRect().YMost() + property->mOverflowBelow <=
-             aY) {
+         cursorFrame->GetRect().YMost() + property->mOverflowBelow <= aY) {
     ++cursorIndex;
     cursorFrame = property->mFrames[cursorIndex];
   }
@@ -1931,13 +1929,12 @@ nsIFrame* nsTableRowGroupFrame::GetFirstRowContaining(nscoord aY,
 }
 
 bool nsTableRowGroupFrame::FrameCursorData::AppendFrame(nsIFrame* aFrame) {
-  // Relative positioning can cause table parts to move, but we will still paint
-  // the backgrounds for the parts under them at their 'normal' position. That
-  // means that we must consider the overflow rects at both positions. For
-  // example, if we use relative positioning to move a row-spanning cell, we
-  // will still paint the row background for that cell at its normal position,
-  // which will overflow the row.
-  // XXX(seth): This probably isn't correct in the presence of transforms.
+  // The cursor requires a monotonically increasing sequence in order to
+  // identify which rows can be skipped, and position:relative can move
+  // rows around such that the overflow areas don't provide this.
+  // We take the union of the overflow rect, and the frame's 'normal' position
+  // (excluding position:relative changes) and record the max difference between
+  // this combined overflow and the frame's rect.
   nsRect positionedOverflowRect = aFrame->GetVisualOverflowRect();
   nsPoint positionedToNormal =
       aFrame->GetNormalPosition() - aFrame->GetPosition();

From d51a3cc85ca15658b164079b1c1591d555a4c9d4 Mon Sep 17 00:00:00 2001
From: Boris Chiou <boris.chiou@gmail.com>
Date: Mon, 20 May 2019 23:42:40 +0000
Subject: [PATCH 116/129] Bug 1429299 - Reorder nsStyleDisplay members to
 minimize padding. r=emilio

In order to use cbindgen for offset-path and add offset-distance in the
following patches, we need to repack nsStyleDisplay to make sure
nsStyleDisplay doesn't exceeds 512 bytes. (Actually, we still use 504
bytes after applying the following patch series.)

Note:
1. Use cbindgen for offset-path (i.e. StyleOffsetPath): the size becomes
   16 bytes. (The original size of UniquePtr<...> is 8 bytes.)
2. Add offset-distance: the size of LengthPercentage is 12 bytes.

Differential Revision: https://phabricator.services.mozilla.com/D31869

--HG--
extra : moz-landing-system : lando
---
 layout/style/nsStyleStruct.cpp | 79 ++++++++++++++++------------------
 layout/style/nsStyleStruct.h   | 58 +++++++++++--------------
 2 files changed, 64 insertions(+), 73 deletions(-)

diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 768274f7d26b..f2347d3fcb60 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -2933,7 +2933,24 @@ bool StyleAnimation::operator==(const StyleAnimation& aOther) const {
 // nsStyleDisplay
 //
 nsStyleDisplay::nsStyleDisplay(const Document& aDocument)
-    : mDisplay(StyleDisplay::Inline),
+    : mTransitions(
+          nsStyleAutoArray<StyleTransition>::WITH_SINGLE_INITIAL_ELEMENT),
+      mTransitionTimingFunctionCount(1),
+      mTransitionDurationCount(1),
+      mTransitionDelayCount(1),
+      mTransitionPropertyCount(1),
+      mAnimations(
+          nsStyleAutoArray<StyleAnimation>::WITH_SINGLE_INITIAL_ELEMENT),
+      mAnimationTimingFunctionCount(1),
+      mAnimationDurationCount(1),
+      mAnimationDelayCount(1),
+      mAnimationNameCount(1),
+      mAnimationDirectionCount(1),
+      mAnimationFillModeCount(1),
+      mAnimationPlayStateCount(1),
+      mAnimationIterationCountCount(1),
+      mWillChange{{}, {0}},
+      mDisplay(StyleDisplay::Inline),
       mOriginalDisplay(StyleDisplay::Inline),
       mContain(StyleContain_NONE),
       mAppearance(StyleAppearance::None),
@@ -2952,7 +2969,6 @@ nsStyleDisplay::nsStyleDisplay(const Document& aDocument)
       mOrient(StyleOrient::Inline),
       mIsolation(NS_STYLE_ISOLATION_AUTO),
       mTopLayer(NS_STYLE_TOP_LAYER_NONE),
-      mWillChange{{}, {0}},
       mTouchAction(StyleTouchAction_AUTO),
       mScrollBehavior(NS_STYLE_SCROLL_BEHAVIOR_AUTO),
       mOverscrollBehaviorX(StyleOverscrollBehavior::Auto),
@@ -2960,11 +2976,11 @@ nsStyleDisplay::nsStyleDisplay(const Document& aDocument)
       mOverflowAnchor(StyleOverflowAnchor::Auto),
       mScrollSnapType(
           {StyleScrollSnapAxis::Both, StyleScrollSnapStrictness::None}),
+      mLineClamp(0),
       mScrollSnapPointsX(eStyleUnit_None),
       mScrollSnapPointsY(eStyleUnit_None),
       mScrollSnapDestination(
           {LengthPercentage::Zero(), LengthPercentage::Zero()}),
-      mLineClamp(0),
       mBackfaceVisibility(NS_STYLE_BACKFACE_VISIBILITY_VISIBLE),
       mTransformStyle(NS_STYLE_TRANSFORM_STYLE_FLAT),
       mTransformBox(StyleGeometryBox::BorderBox),
@@ -2975,22 +2991,6 @@ nsStyleDisplay::nsStyleDisplay(const Document& aDocument)
       mPerspectiveOrigin(Position::FromPercentage(0.5f)),
       mVerticalAlign(
           StyleVerticalAlign::Keyword(StyleVerticalAlignKeyword::Baseline)),
-      mTransitions(
-          nsStyleAutoArray<StyleTransition>::WITH_SINGLE_INITIAL_ELEMENT),
-      mTransitionTimingFunctionCount(1),
-      mTransitionDurationCount(1),
-      mTransitionDelayCount(1),
-      mTransitionPropertyCount(1),
-      mAnimations(
-          nsStyleAutoArray<StyleAnimation>::WITH_SINGLE_INITIAL_ELEMENT),
-      mAnimationTimingFunctionCount(1),
-      mAnimationDurationCount(1),
-      mAnimationDelayCount(1),
-      mAnimationNameCount(1),
-      mAnimationDirectionCount(1),
-      mAnimationFillModeCount(1),
-      mAnimationPlayStateCount(1),
-      mAnimationIterationCountCount(1),
       mShapeMargin(LengthPercentage::Zero()) {
   MOZ_COUNT_CTOR(nsStyleDisplay);
 
@@ -3000,6 +3000,21 @@ nsStyleDisplay::nsStyleDisplay(const Document& aDocument)
 
 nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource)
     : mBinding(aSource.mBinding),
+      mTransitions(aSource.mTransitions),
+      mTransitionTimingFunctionCount(aSource.mTransitionTimingFunctionCount),
+      mTransitionDurationCount(aSource.mTransitionDurationCount),
+      mTransitionDelayCount(aSource.mTransitionDelayCount),
+      mTransitionPropertyCount(aSource.mTransitionPropertyCount),
+      mAnimations(aSource.mAnimations),
+      mAnimationTimingFunctionCount(aSource.mAnimationTimingFunctionCount),
+      mAnimationDurationCount(aSource.mAnimationDurationCount),
+      mAnimationDelayCount(aSource.mAnimationDelayCount),
+      mAnimationNameCount(aSource.mAnimationNameCount),
+      mAnimationDirectionCount(aSource.mAnimationDirectionCount),
+      mAnimationFillModeCount(aSource.mAnimationFillModeCount),
+      mAnimationPlayStateCount(aSource.mAnimationPlayStateCount),
+      mAnimationIterationCountCount(aSource.mAnimationIterationCountCount),
+      mWillChange(aSource.mWillChange),
       mDisplay(aSource.mDisplay),
       mOriginalDisplay(aSource.mOriginalDisplay),
       mContain(aSource.mContain),
@@ -3019,47 +3034,29 @@ nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource)
       mOrient(aSource.mOrient),
       mIsolation(aSource.mIsolation),
       mTopLayer(aSource.mTopLayer),
-      mWillChange(aSource.mWillChange),
       mTouchAction(aSource.mTouchAction),
       mScrollBehavior(aSource.mScrollBehavior),
       mOverscrollBehaviorX(aSource.mOverscrollBehaviorX),
       mOverscrollBehaviorY(aSource.mOverscrollBehaviorY),
       mScrollSnapType(aSource.mScrollSnapType),
+      mLineClamp(aSource.mLineClamp),
       mScrollSnapPointsX(aSource.mScrollSnapPointsX),
       mScrollSnapPointsY(aSource.mScrollSnapPointsY),
       mScrollSnapDestination(aSource.mScrollSnapDestination),
       mScrollSnapCoordinate(aSource.mScrollSnapCoordinate),
-      mLineClamp(aSource.mLineClamp),
-      mBackfaceVisibility(aSource.mBackfaceVisibility),
-      mTransformStyle(aSource.mTransformStyle),
-      mTransformBox(aSource.mTransformBox),
       mTransform(aSource.mTransform),
       mRotate(aSource.mRotate),
       mTranslate(aSource.mTranslate),
       mScale(aSource.mScale),
-      // We intentionally leave mIndividualTransform as null, is the caller's
-      // responsibility to call GenerateCombinedIndividualTransform when
-      // appropriate.
+      mBackfaceVisibility(aSource.mBackfaceVisibility),
+      mTransformStyle(aSource.mTransformStyle),
+      mTransformBox(aSource.mTransformBox),
       mMotion(aSource.mMotion ? MakeUnique<StyleMotion>(*aSource.mMotion)
                               : nullptr),
       mTransformOrigin(aSource.mTransformOrigin),
       mChildPerspective(aSource.mChildPerspective),
       mPerspectiveOrigin(aSource.mPerspectiveOrigin),
       mVerticalAlign(aSource.mVerticalAlign),
-      mTransitions(aSource.mTransitions),
-      mTransitionTimingFunctionCount(aSource.mTransitionTimingFunctionCount),
-      mTransitionDurationCount(aSource.mTransitionDurationCount),
-      mTransitionDelayCount(aSource.mTransitionDelayCount),
-      mTransitionPropertyCount(aSource.mTransitionPropertyCount),
-      mAnimations(aSource.mAnimations),
-      mAnimationTimingFunctionCount(aSource.mAnimationTimingFunctionCount),
-      mAnimationDurationCount(aSource.mAnimationDurationCount),
-      mAnimationDelayCount(aSource.mAnimationDelayCount),
-      mAnimationNameCount(aSource.mAnimationNameCount),
-      mAnimationDirectionCount(aSource.mAnimationDirectionCount),
-      mAnimationFillModeCount(aSource.mAnimationFillModeCount),
-      mAnimationPlayStateCount(aSource.mAnimationPlayStateCount),
-      mAnimationIterationCountCount(aSource.mAnimationIterationCountCount),
       mShapeImageThreshold(aSource.mShapeImageThreshold),
       mShapeMargin(aSource.mShapeMargin),
       mShapeOutside(aSource.mShapeOutside) {
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index 3826de8c6ac4..d5f8e6f6d921 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -1703,6 +1703,27 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
   // We guarantee that if mBinding is non-null, so are mBinding->GetURI() and
   // mBinding->mOriginPrincipal.
   RefPtr<mozilla::css::URLValue> mBinding;
+
+  nsStyleAutoArray<mozilla::StyleTransition> mTransitions;
+  // The number of elements in mTransitions that are not from repeating
+  // a list due to another property being longer.
+  uint32_t mTransitionTimingFunctionCount;
+  uint32_t mTransitionDurationCount;
+  uint32_t mTransitionDelayCount;
+  uint32_t mTransitionPropertyCount;
+  nsStyleAutoArray<mozilla::StyleAnimation> mAnimations;
+  // The number of elements in mAnimations that are not from repeating
+  // a list due to another property being longer.
+  uint32_t mAnimationTimingFunctionCount;
+  uint32_t mAnimationDurationCount;
+  uint32_t mAnimationDelayCount;
+  uint32_t mAnimationNameCount;
+  uint32_t mAnimationDirectionCount;
+  uint32_t mAnimationFillModeCount;
+  uint32_t mAnimationPlayStateCount;
+  uint32_t mAnimationIterationCountCount;
+
+  mozilla::StyleWillChange mWillChange;
   mozilla::StyleDisplay mDisplay;
   mozilla::StyleDisplay mOriginalDisplay;  // saved mDisplay for
                                            //         position:absolute/fixed
@@ -1729,7 +1750,6 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
   mozilla::StyleOrient mOrient;
   uint8_t mIsolation;  // NS_STYLE_ISOLATION_*
   uint8_t mTopLayer;   // NS_STYLE_TOP_LAYER_*
-  mozilla::StyleWillChange mWillChange;
 
   mozilla::StyleTouchAction mTouchAction;
   uint8_t mScrollBehavior;  // NS_STYLE_SCROLL_BEHAVIOR_*
@@ -1738,25 +1758,21 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
   mozilla::StyleOverflowAnchor mOverflowAnchor;
   mozilla::StyleScrollSnapAlign mScrollSnapAlign;
   mozilla::StyleScrollSnapType mScrollSnapType;
+  uint32_t mLineClamp;
   nsStyleCoord mScrollSnapPointsX;
   nsStyleCoord mScrollSnapPointsY;
   mozilla::Position mScrollSnapDestination;
   nsTArray<mozilla::Position> mScrollSnapCoordinate;
-  uint32_t mLineClamp;
-
-  // mSpecifiedTransform is the list of transform functions as
-  // specified, or null to indicate there is no transform.  (inherit or
-  // initial are replaced by an actual list of transform functions, or
-  // null, as appropriate.)
-  uint8_t mBackfaceVisibility;
-  uint8_t mTransformStyle;
-  StyleGeometryBox mTransformBox;
 
   mozilla::StyleTransform mTransform;
   mozilla::StyleRotate mRotate;
   mozilla::StyleTranslate mTranslate;
   mozilla::StyleScale mScale;
 
+  uint8_t mBackfaceVisibility;
+  uint8_t mTransformStyle;
+  StyleGeometryBox mTransformBox;
+
   mozilla::UniquePtr<mozilla::StyleMotion> mMotion;
 
   mozilla::StyleTransformOrigin mTransformOrigin;
@@ -1765,15 +1781,6 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
 
   mozilla::StyleVerticalAlign mVerticalAlign;
 
-  nsStyleAutoArray<mozilla::StyleTransition> mTransitions;
-
-  // The number of elements in mTransitions that are not from repeating
-  // a list due to another property being longer.
-  uint32_t mTransitionTimingFunctionCount;
-  uint32_t mTransitionDurationCount;
-  uint32_t mTransitionDelayCount;
-  uint32_t mTransitionPropertyCount;
-
   nsCSSPropertyID GetTransitionProperty(uint32_t aIndex) const {
     return mTransitions[aIndex % mTransitionPropertyCount].GetProperty();
   }
@@ -1795,19 +1802,6 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
            mTransitions[aIndex % mTransitionDelayCount].GetDelay();
   }
 
-  nsStyleAutoArray<mozilla::StyleAnimation> mAnimations;
-
-  // The number of elements in mAnimations that are not from repeating
-  // a list due to another property being longer.
-  uint32_t mAnimationTimingFunctionCount;
-  uint32_t mAnimationDurationCount;
-  uint32_t mAnimationDelayCount;
-  uint32_t mAnimationNameCount;
-  uint32_t mAnimationDirectionCount;
-  uint32_t mAnimationFillModeCount;
-  uint32_t mAnimationPlayStateCount;
-  uint32_t mAnimationIterationCountCount;
-
   nsAtom* GetAnimationName(uint32_t aIndex) const {
     return mAnimations[aIndex % mAnimationNameCount].GetName();
   }

From 718aaf17f962b51a25bf189614263a85880c87f5 Mon Sep 17 00:00:00 2001
From: Boris Chiou <boris.chiou@gmail.com>
Date: Mon, 20 May 2019 23:42:50 +0000
Subject: [PATCH 117/129] Bug 1429299 - Part 1: Unpack StyleMotion and use
 cbindgen for OffsetPath. r=emilio

Unpack StyleMotion and move its members into nsStyleDisplay, use
cbindgen to generate StyleOffsetPath.

Differential Revision: https://phabricator.services.mozilla.com/D31164

--HG--
extra : moz-landing-system : lando
---
 layout/base/nsLayoutUtils.cpp                 |  9 +++--
 layout/painting/ActiveLayerTracker.cpp        |  2 +-
 layout/style/GeckoBindings.cpp                | 14 --------
 layout/style/GeckoBindings.h                  |  8 -----
 layout/style/ServoBindings.toml               |  1 +
 layout/style/nsStyleStruct.cpp                | 31 ++++++++--------
 layout/style/nsStyleStruct.h                  | 25 ++-----------
 .../components/style/properties/gecko.mako.rs | 36 +------------------
 .../style/values/specified/motion.rs          |  2 ++
 servo/ports/geckolib/cbindgen.toml            | 12 +++++--
 10 files changed, 37 insertions(+), 103 deletions(-)

diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index ba6ab24856c3..3dbb0463b6ea 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -9955,17 +9955,16 @@ Maybe<MotionPathData> nsLayoutUtils::ResolveMotionPath(const nsIFrame* aFrame) {
   MOZ_ASSERT(aFrame);
 
   const nsStyleDisplay* display = aFrame->StyleDisplay();
-  if (!display->mMotion || !display->mMotion->HasPath()) {
+  if (display->mOffsetPath.IsNone()) {
     return Nothing();
   }
 
-  const UniquePtr<StyleMotion>& motion = display->mMotion;
   // Bug 1429299 - Implement offset-distance for motion path. For now, we use
   // the default value, i.e. 0%.
   float distance = 0.0;
   float angle = 0.0;
   Point point;
-  if (motion->OffsetPath().GetType() == StyleShapeSourceType::Path) {
+  if (display->mOffsetPath.IsPath()) {
     // Build the path and compute the point and angle for creating the
     // equivalent translate and rotate.
     // Here we only need to build a valid path for motion path, so
@@ -9980,8 +9979,8 @@ Maybe<MotionPathData> nsLayoutUtils::ResolveMotionPath(const nsIFrame* aFrame) {
     RefPtr<PathBuilder> builder =
         drawTarget->CreatePathBuilder(FillRule::FILL_WINDING);
     RefPtr<gfx::Path> gfxPath =
-        SVGPathData::BuildPath(motion->OffsetPath().Path().Path(), builder,
-                               NS_STYLE_STROKE_LINECAP_BUTT, 0.0);
+        SVGPathData::BuildPath(display->mOffsetPath.AsPath()._0.AsSpan(),
+                               builder, NS_STYLE_STROKE_LINECAP_BUTT, 0.0);
     if (!gfxPath) {
       return Nothing();
     }
diff --git a/layout/painting/ActiveLayerTracker.cpp b/layout/painting/ActiveLayerTracker.cpp
index 195338803318..7b871e95f011 100644
--- a/layout/painting/ActiveLayerTracker.cpp
+++ b/layout/painting/ActiveLayerTracker.cpp
@@ -265,7 +265,7 @@ static void IncrementScaleRestyleCountIfNeeded(nsIFrame* aFrame,
                                                LayerActivity* aActivity) {
   const nsStyleDisplay* display = aFrame->StyleDisplay();
   if (!display->HasTransformProperty() && !display->HasIndividualTransform() &&
-      !(display->mMotion && display->mMotion->HasPath())) {
+      display->mOffsetPath.IsNone()) {
     // The transform was removed.
     aActivity->mPreviousTransformScale = Nothing();
     IncrementMutationCount(
diff --git a/layout/style/GeckoBindings.cpp b/layout/style/GeckoBindings.cpp
index dac2abd19a57..e55311943547 100644
--- a/layout/style/GeckoBindings.cpp
+++ b/layout/style/GeckoBindings.cpp
@@ -1556,20 +1556,6 @@ void Gecko_SetToSVGPath(StyleShapeSource* aShape,
   aShape->SetPath(MakeUnique<StyleSVGPath>(aCommands, aFill));
 }
 
-void Gecko_SetStyleMotion(UniquePtr<StyleMotion>* aMotion,
-                          StyleMotion* aValue) {
-  MOZ_ASSERT(aMotion);
-  aMotion->reset(aValue);
-}
-
-StyleMotion* Gecko_NewStyleMotion() { return new StyleMotion(); }
-
-void Gecko_CopyStyleMotions(UniquePtr<StyleMotion>* aMotion,
-                            const StyleMotion* aOther) {
-  MOZ_ASSERT(aMotion);
-  *aMotion = aOther ? MakeUnique<StyleMotion>(*aOther) : nullptr;
-}
-
 void Gecko_ResetFilters(nsStyleEffects* effects, size_t new_len) {
   effects->mFilters.Clear();
   effects->mFilters.SetLength(new_len);
diff --git a/layout/style/GeckoBindings.h b/layout/style/GeckoBindings.h
index 02830210ca18..294a514f55c1 100644
--- a/layout/style/GeckoBindings.h
+++ b/layout/style/GeckoBindings.h
@@ -533,14 +533,6 @@ void Gecko_SetToSVGPath(
     mozilla::StyleForgottenArcSlicePtr<mozilla::StylePathCommand>,
     mozilla::StyleFillRule);
 
-void Gecko_SetStyleMotion(mozilla::UniquePtr<mozilla::StyleMotion>* aMotion,
-                          mozilla::StyleMotion* aValue);
-
-mozilla::StyleMotion* Gecko_NewStyleMotion();
-
-void Gecko_CopyStyleMotions(mozilla::UniquePtr<mozilla::StyleMotion>* motion,
-                            const mozilla::StyleMotion* other);
-
 void Gecko_ResetFilters(nsStyleEffects* effects, size_t new_len);
 
 void Gecko_CopyFiltersFrom(nsStyleEffects* aSrc, nsStyleEffects* aDest);
diff --git a/layout/style/ServoBindings.toml b/layout/style/ServoBindings.toml
index f669a0ce528f..6efb202e61a7 100644
--- a/layout/style/ServoBindings.toml
+++ b/layout/style/ServoBindings.toml
@@ -408,6 +408,7 @@ cbindgen-types = [
     { gecko = "StyleFontDisplay", servo = "font_face::FontDisplay" },
     { gecko = "StyleFontFaceSourceListComponent", servo = "font_face::FontFaceSourceListComponent" },
     { gecko = "StyleFontLanguageOverride", servo = "values::computed::font::FontLanguageOverride" },
+    { gecko = "StyleOffsetPath", servo = "values::computed::motion::OffsetPath" },
     { gecko = "StylePathCommand", servo = "values::specified::svg_path::PathCommand" },
     { gecko = "StyleUnicodeRange", servo = "cssparser::UnicodeRange" },
     { gecko = "StyleOverflowWrap", servo = "values::computed::OverflowWrap" },
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index f2347d3fcb60..46a260973c9c 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -2984,6 +2984,7 @@ nsStyleDisplay::nsStyleDisplay(const Document& aDocument)
       mBackfaceVisibility(NS_STYLE_BACKFACE_VISIBILITY_VISIBLE),
       mTransformStyle(NS_STYLE_TRANSFORM_STYLE_FLAT),
       mTransformBox(StyleGeometryBox::BorderBox),
+      mOffsetPath(StyleOffsetPath::None()),
       mTransformOrigin{LengthPercentage::FromPercentage(0.5),
                        LengthPercentage::FromPercentage(0.5),
                        {0.}},
@@ -3051,8 +3052,7 @@ nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource)
       mBackfaceVisibility(aSource.mBackfaceVisibility),
       mTransformStyle(aSource.mTransformStyle),
       mTransformBox(aSource.mTransformBox),
-      mMotion(aSource.mMotion ? MakeUnique<StyleMotion>(*aSource.mMotion)
-                              : nullptr),
+      mOffsetPath(aSource.mOffsetPath),
       mTransformOrigin(aSource.mTransformOrigin),
       mChildPerspective(aSource.mChildPerspective),
       mPerspectiveOrigin(aSource.mPerspectiveOrigin),
@@ -3094,22 +3094,23 @@ static inline nsChangeHint CompareTransformValues(
   return result;
 }
 
-static inline nsChangeHint CompareMotionValues(const StyleMotion* aMotion,
-                                               const StyleMotion* aNewMotion) {
+static inline nsChangeHint CompareMotionValues(
+    const StyleOffsetPath& aOffsetPath, const StyleOffsetPath& aNewOffsetPath) {
   nsChangeHint result = nsChangeHint(0);
 
+  if (aOffsetPath == aNewOffsetPath) {
+    return result;
+  }
+
   // TODO: Bug 1482737: This probably doesn't need to UpdateOverflow
   // (or UpdateTransformLayer) if there's already a transform.
-  if (!aMotion != !aNewMotion || (aMotion && *aMotion != *aNewMotion)) {
-    // Set the same hints as what we use for transform because motion path is
-    // a kind of transform and will be combined with other transforms.
-    result |= nsChangeHint_UpdateTransformLayer;
-    if ((aMotion && aMotion->HasPath()) &&
-        (aNewMotion && aNewMotion->HasPath())) {
-      result |= nsChangeHint_UpdatePostTransformOverflow;
-    } else {
-      result |= nsChangeHint_UpdateOverflow;
-    }
+  // Set the same hints as what we use for transform because motion path is
+  // a kind of transform and will be combined with other transforms.
+  result |= nsChangeHint_UpdateTransformLayer;
+  if (!aOffsetPath.IsNone() && !aNewOffsetPath.IsNone()) {
+    result |= nsChangeHint_UpdatePostTransformOverflow;
+  } else {
+    result |= nsChangeHint_UpdateOverflow;
   }
   return result;
 }
@@ -3237,7 +3238,7 @@ nsChangeHint nsStyleDisplay::CalcDifference(
     transformHint |= CompareTransformValues(mRotate, aNewData.mRotate);
     transformHint |= CompareTransformValues(mTranslate, aNewData.mTranslate);
     transformHint |= CompareTransformValues(mScale, aNewData.mScale);
-    transformHint |= CompareMotionValues(mMotion.get(), aNewData.mMotion.get());
+    transformHint |= CompareMotionValues(mOffsetPath, aNewData.mOffsetPath);
 
     if (mTransformOrigin != aNewData.mTransformOrigin) {
       transformHint |= nsChangeHint_UpdateTransformLayer |
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index d5f8e6f6d921..0e5ac459344d 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -1665,27 +1665,6 @@ struct StyleShapeSource final {
   StyleGeometryBox mReferenceBox = StyleGeometryBox::NoBox;
 };
 
-struct StyleMotion final {
-  bool operator==(const StyleMotion& aOther) const {
-    return mOffsetPath == aOther.mOffsetPath;
-  }
-
-  bool operator!=(const StyleMotion& aOther) const {
-    return !(*this == aOther);
-  }
-
-  const StyleShapeSource& OffsetPath() const { return mOffsetPath; }
-
-  bool HasPath() const {
-    // Bug 1186329: We have to check other acceptable types after supporting
-    // different values of offset-path. e.g. basic-shapes, ray.
-    return mOffsetPath.GetType() == StyleShapeSourceType::Path;
-  }
-
- private:
-  StyleShapeSource mOffsetPath;
-};
-
 }  // namespace mozilla
 
 struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
@@ -1773,7 +1752,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
   uint8_t mTransformStyle;
   StyleGeometryBox mTransformBox;
 
-  mozilla::UniquePtr<mozilla::StyleMotion> mMotion;
+  mozilla::StyleOffsetPath mOffsetPath;
 
   mozilla::StyleTransformOrigin mTransformOrigin;
   mozilla::StylePerspective mChildPerspective;
@@ -1997,7 +1976,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
     return HasTransformProperty() || HasIndividualTransform() ||
            mTransformStyle == NS_STYLE_TRANSFORM_STYLE_PRESERVE_3D ||
            (mWillChange.bits & mozilla::StyleWillChangeBits_TRANSFORM) ||
-           (mMotion && mMotion->HasPath());
+           !mOffsetPath.IsNone();
   }
 
   bool HasTransformProperty() const { return !mTransform._0.IsEmpty(); }
diff --git a/servo/components/style/properties/gecko.mako.rs b/servo/components/style/properties/gecko.mako.rs
index 8c629bc44cec..21e0c8d75fc5 100644
--- a/servo/components/style/properties/gecko.mako.rs
+++ b/servo/components/style/properties/gecko.mako.rs
@@ -2205,8 +2205,7 @@ fn static_assert() {
                           transition-timing-function transition-property
                           transform-style scroll-snap-points-x
                           scroll-snap-points-y scroll-snap-coordinate
-                          -moz-binding offset-path shape-outside
-                          -webkit-line-clamp""" %>
+                          -moz-binding shape-outside -webkit-line-clamp""" %>
 <%self:impl_trait style_struct_name="Box" skip_longhands="${skip_box_longhands}">
     #[inline]
     pub fn set_display(&mut self, v: longhands::display::computed_value::T) {
@@ -2513,39 +2512,6 @@ fn static_assert() {
 
     <% impl_shape_source("shape_outside", "mShapeOutside") %>
 
-    pub fn set_offset_path(&mut self, v: longhands::offset_path::computed_value::T) {
-        use crate::gecko_bindings::bindings::{Gecko_NewStyleMotion, Gecko_SetStyleMotion};
-        use crate::gecko_bindings::structs::StyleShapeSourceType;
-        use crate::values::generics::basic_shape::FillRule;
-        use crate::values::specified::OffsetPath;
-
-        let motion = unsafe { Gecko_NewStyleMotion().as_mut().unwrap() };
-        match v {
-            OffsetPath::None => motion.mOffsetPath.mType = StyleShapeSourceType::None,
-            OffsetPath::Path(p) => {
-                set_style_svg_path(&mut motion.mOffsetPath, p, FillRule::Nonzero)
-            },
-        }
-        unsafe { Gecko_SetStyleMotion(&mut self.gecko.mMotion, motion) };
-    }
-
-    pub fn clone_offset_path(&self) -> longhands::offset_path::computed_value::T {
-        use crate::values::specified::OffsetPath;
-        match unsafe { self.gecko.mMotion.mPtr.as_ref() } {
-            None => OffsetPath::none(),
-            Some(v) => (&v.mOffsetPath).into()
-        }
-    }
-
-    pub fn copy_offset_path_from(&mut self, other: &Self) {
-        use crate::gecko_bindings::bindings::Gecko_CopyStyleMotions;
-        unsafe { Gecko_CopyStyleMotions(&mut self.gecko.mMotion, other.gecko.mMotion.mPtr) };
-    }
-
-    pub fn reset_offset_path(&mut self, other: &Self) {
-        self.copy_offset_path_from(other);
-    }
-
     #[allow(non_snake_case)]
     pub fn set__webkit_line_clamp(&mut self, v: longhands::_webkit_line_clamp::computed_value::T) {
         self.gecko.mLineClamp = match v {
diff --git a/servo/components/style/values/specified/motion.rs b/servo/components/style/values/specified/motion.rs
index 7d72796397e2..73072ac61991 100644
--- a/servo/components/style/values/specified/motion.rs
+++ b/servo/components/style/values/specified/motion.rs
@@ -12,6 +12,7 @@ use style_traits::{ParseError, StyleParseErrorKind};
 /// The offset-path value.
 ///
 /// https://drafts.fxtf.org/motion-1/#offset-path-property
+/// cbindgen:derive-tagged-enum-copy-constructor=true
 #[derive(
     Animate,
     Clone,
@@ -26,6 +27,7 @@ use style_traits::{ParseError, StyleParseErrorKind};
     ToResolvedValue,
     ToShmem,
 )]
+#[repr(C, u8)]
 pub enum OffsetPath {
     // We could merge SVGPathData into ShapeSource, so we could reuse them. However,
     // we don't want to support other value for offset-path, so use SVGPathData only for now.
diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml
index df4a99aa62e6..59569168085c 100644
--- a/servo/ports/geckolib/cbindgen.toml
+++ b/servo/ports/geckolib/cbindgen.toml
@@ -69,7 +69,7 @@ include = [
   "FontFamilyNameSyntax",
   "OverflowWrap",
   "TimingFunction",
-  "PathCommand",
+  "OffsetPath",
   "UnicodeRange",
   "UserSelect",
   "Float",
@@ -437,9 +437,17 @@ renaming_overrides_prefixing = true
  public:
 """
 
-
 "Angle" = """
   inline static StyleAngle Zero();
   inline float ToDegrees() const;
   inline double ToRadians() const;
 """
+
+"OffsetPath" = """
+ private:
+  // Private default constructor without initialization so that the helper
+  // constructor functions still work as expected. They take care of
+  // initializing the fields properly.
+  StyleOffsetPath() {}
+ public:
+"""

From ce15d305e28cf8c98e5c52258342ea6db62ce48d Mon Sep 17 00:00:00 2001
From: Boris Chiou <boris.chiou@gmail.com>
Date: Mon, 20 May 2019 23:42:52 +0000
Subject: [PATCH 118/129] Bug 1429299 - Part 2: Implement offset-distance.
 r=emilio

Define the offset-distance property in style system.

Differential Revision: https://phabricator.services.mozilla.com/D30582

--HG--
extra : moz-landing-system : lando
---
 .../server/actors/animation-type-longhand.js  |  1 +
 .../shared/css/generated/properties-db.js     | 18 +++++++++++++
 layout/style/nsStyleStruct.cpp                | 22 +++++++++++-----
 layout/style/nsStyleStruct.h                  |  1 +
 layout/style/test/mochitest.ini               |  1 +
 layout/style/test/property_database.js        |  9 +++++++
 .../style/properties/longhands/box.mako.rs    | 13 ++++++++++
 .../offset-distance-interpolation.html.ini    |  9 -------
 .../offset-distance-parsing-valid.html.ini    | 25 -------------------
 .../offset-distance-parsing-valid.html        |  2 +-
 10 files changed, 60 insertions(+), 41 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/motion/parsing/offset-distance-parsing-valid.html.ini

diff --git a/devtools/server/actors/animation-type-longhand.js b/devtools/server/actors/animation-type-longhand.js
index d862490542a7..0a794b81392c 100644
--- a/devtools/server/actors/animation-type-longhand.js
+++ b/devtools/server/actors/animation-type-longhand.js
@@ -311,6 +311,7 @@ exports.ANIMATION_TYPE_FOR_LONGHANDS = [
     "-moz-outline-radius-bottomright",
     "-moz-outline-radius-topleft",
     "-moz-outline-radius-topright",
+    "offset-distance",
     "padding-bottom",
     "padding-left",
     "padding-right",
diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js
index 0bf3897795e6..3c1c2be407d9 100644
--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@@ -3093,6 +3093,7 @@ exports.CSS_PROPERTIES = {
       "scale",
       "translate",
       "offset-path",
+      "offset-distance",
       "scroll-behavior",
       "scroll-snap-align",
       "scroll-snap-type",
@@ -8251,6 +8252,19 @@ exports.CSS_PROPERTIES = {
       "unset"
     ]
   },
+  "offset-distance": {
+    "isInherited": false,
+    "subproperties": [
+      "offset-distance"
+    ],
+    "supports": [],
+    "values": [
+      "inherit",
+      "initial",
+      "revert",
+      "unset"
+    ]
+  },
   "offset-path": {
     "isInherited": false,
     "subproperties": [
@@ -10617,6 +10631,10 @@ exports.PREFERENCES = [
     "translate",
     "layout.css.individual-transform.enabled"
   ],
+  [
+    "offset-distance",
+    "layout.css.motion-path.enabled"
+  ],
   [
     "scroll-snap-points-x",
     "layout.css.scroll-snap.enabled"
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 46a260973c9c..b3255f06ba13 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -2985,6 +2985,7 @@ nsStyleDisplay::nsStyleDisplay(const Document& aDocument)
       mTransformStyle(NS_STYLE_TRANSFORM_STYLE_FLAT),
       mTransformBox(StyleGeometryBox::BorderBox),
       mOffsetPath(StyleOffsetPath::None()),
+      mOffsetDistance(LengthPercentage::Zero()),
       mTransformOrigin{LengthPercentage::FromPercentage(0.5),
                        LengthPercentage::FromPercentage(0.5),
                        {0.}},
@@ -3053,6 +3054,7 @@ nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource)
       mTransformStyle(aSource.mTransformStyle),
       mTransformBox(aSource.mTransformBox),
       mOffsetPath(aSource.mOffsetPath),
+      mOffsetDistance(aSource.mOffsetDistance),
       mTransformOrigin(aSource.mTransformOrigin),
       mChildPerspective(aSource.mChildPerspective),
       mPerspectiveOrigin(aSource.mPerspectiveOrigin),
@@ -3095,18 +3097,24 @@ static inline nsChangeHint CompareTransformValues(
 }
 
 static inline nsChangeHint CompareMotionValues(
-    const StyleOffsetPath& aOffsetPath, const StyleOffsetPath& aNewOffsetPath) {
-  nsChangeHint result = nsChangeHint(0);
-
+    const StyleOffsetPath& aOffsetPath, const LengthPercentage& aOffsetDistance,
+    const StyleOffsetPath& aNewOffsetPath,
+    const LengthPercentage& aNewOffsetDistance) {
   if (aOffsetPath == aNewOffsetPath) {
-    return result;
+    if (aOffsetDistance == aNewOffsetDistance) {
+      return nsChangeHint(0);
+    }
+
+    if (aOffsetPath.IsNone()) {
+      return nsChangeHint_NeutralChange;
+    }
   }
 
   // TODO: Bug 1482737: This probably doesn't need to UpdateOverflow
   // (or UpdateTransformLayer) if there's already a transform.
   // Set the same hints as what we use for transform because motion path is
   // a kind of transform and will be combined with other transforms.
-  result |= nsChangeHint_UpdateTransformLayer;
+  nsChangeHint result = nsChangeHint_UpdateTransformLayer;
   if (!aOffsetPath.IsNone() && !aNewOffsetPath.IsNone()) {
     result |= nsChangeHint_UpdatePostTransformOverflow;
   } else {
@@ -3238,7 +3246,9 @@ nsChangeHint nsStyleDisplay::CalcDifference(
     transformHint |= CompareTransformValues(mRotate, aNewData.mRotate);
     transformHint |= CompareTransformValues(mTranslate, aNewData.mTranslate);
     transformHint |= CompareTransformValues(mScale, aNewData.mScale);
-    transformHint |= CompareMotionValues(mOffsetPath, aNewData.mOffsetPath);
+    transformHint |=
+        CompareMotionValues(mOffsetPath, mOffsetDistance, aNewData.mOffsetPath,
+                            aNewData.mOffsetDistance);
 
     if (mTransformOrigin != aNewData.mTransformOrigin) {
       transformHint |= nsChangeHint_UpdateTransformLayer |
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index 0e5ac459344d..ed344954a60d 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -1753,6 +1753,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
   StyleGeometryBox mTransformBox;
 
   mozilla::StyleOffsetPath mOffsetPath;
+  mozilla::LengthPercentage mOffsetDistance;
 
   mozilla::StyleTransformOrigin mTransformOrigin;
   mozilla::StylePerspective mChildPerspective;
diff --git a/layout/style/test/mochitest.ini b/layout/style/test/mochitest.ini
index 1ffe7f7ace23..516fc49dca56 100644
--- a/layout/style/test/mochitest.ini
+++ b/layout/style/test/mochitest.ini
@@ -7,6 +7,7 @@ prefs =
   dom.animations-api.timelines.enabled=true
   gfx.omta.background-color=true
   layout.css.individual-transform.enabled=true
+  layout.css.motion-path.enabled=true
   layout.css.step-position-jump.enabled=true
 support-files =
   animation_utils.js
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index c8094f1eeeeb..6501450f3327 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -8745,6 +8745,15 @@ if (IsCSSPropertyPrefEnabled("layout.css.motion-path.enabled")) {
     invalid_values: [ "path('')", "path()", "path(a)", "path('M 10 Z')" ,
                       "path('M 10-10 20')", "path('M 10 10 C 20 20 40 20')" ]
   };
+
+  gCSSProperties["offset-distance"] = {
+    domProp: "offsetDistance",
+    inherited: false,
+    type: CSS_TYPE_LONGHAND,
+    initial_values: [ "0" ],
+    other_values: [ "10px", "10%", "190%", "-280%", "calc(30px + 40%)" ],
+    invalid_values: [ "none", "45deg" ]
+  };
 }
 
 if (IsCSSPropertyPrefEnabled("layout.css.clip-path-path.enabled")) {
diff --git a/servo/components/style/properties/longhands/box.mako.rs b/servo/components/style/properties/longhands/box.mako.rs
index 0324062740ff..a5c3b38b34d1 100644
--- a/servo/components/style/properties/longhands/box.mako.rs
+++ b/servo/components/style/properties/longhands/box.mako.rs
@@ -404,6 +404,19 @@ ${helpers.predefined_type(
     gecko_pref="layout.css.motion-path.enabled",
     flags="CREATES_STACKING_CONTEXT FIXPOS_CB",
     spec="https://drafts.fxtf.org/motion-1/#offset-path-property",
+    servo_restyle_damage="reflow_out_of_flow"
+)}
+
+// Motion Path Module Level 1
+${helpers.predefined_type(
+    "offset-distance",
+    "LengthPercentage",
+    "computed::LengthPercentage::zero()",
+    products="gecko",
+    animation_value_type="none",
+    gecko_pref="layout.css.motion-path.enabled",
+    spec="https://drafts.fxtf.org/motion-1/#offset-distance-property",
+    servo_restyle_damage="reflow_out_of_flow"
 )}
 
 // CSSOM View Module
diff --git a/testing/web-platform/meta/css/motion/animation/offset-distance-interpolation.html.ini b/testing/web-platform/meta/css/motion/animation/offset-distance-interpolation.html.ini
index 9ef9833ea715..ab32de3fc8ac 100644
--- a/testing/web-platform/meta/css/motion/animation/offset-distance-interpolation.html.ini
+++ b/testing/web-platform/meta/css/motion/animation/offset-distance-interpolation.html.ini
@@ -1,7 +1,4 @@
 [offset-distance-interpolation.html]
-  ["-30px" and "50px" are valid offset-distance values]
-    expected: FAIL
-
   [Animation between "-30px" and "50px" at progress -1]
     expected: FAIL
 
@@ -20,9 +17,6 @@
   [Animation between "-30px" and "50px" at progress 2]
     expected: FAIL
 
-  ["20%" and "100%" are valid offset-distance values]
-    expected: FAIL
-
   [Animation between "20%" and "100%" at progress -1]
     expected: FAIL
 
@@ -41,9 +35,6 @@
   [Animation between "20%" and "100%" at progress 2]
     expected: FAIL
 
-  ["calc(20% - 30px)" and "calc(50px + 100%)" are valid offset-distance values]
-    expected: FAIL
-
   [Animation between "calc(20% - 30px)" and "calc(50px + 100%)" at progress -1]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/css/motion/parsing/offset-distance-parsing-valid.html.ini b/testing/web-platform/meta/css/motion/parsing/offset-distance-parsing-valid.html.ini
deleted file mode 100644
index 180fa7fc4414..000000000000
--- a/testing/web-platform/meta/css/motion/parsing/offset-distance-parsing-valid.html.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[offset-distance-parsing-valid.html]
-  [Serialization should round-trip after setting e.style['offset-distance'\] = "0"]
-    expected: FAIL
-
-  [e.style['offset-distance'\] = "10px" should set the property value]
-    expected: FAIL
-
-  [Serialization should round-trip after setting e.style['offset-distance'\] = "10px"]
-    expected: FAIL
-
-  [e.style['offset-distance'\] = "20%" should set the property value]
-    expected: FAIL
-
-  [Serialization should round-trip after setting e.style['offset-distance'\] = "20%"]
-    expected: FAIL
-
-  [e.style['offset-distance'\] = "calc(30px + 40%)" should set the property value]
-    expected: FAIL
-
-  [Serialization should round-trip after setting e.style['offset-distance'\] = "calc(30px + 40%)"]
-    expected: FAIL
-
-  [e.style['offset-distance'\] = "0" should set the property value]
-    expected: FAIL
-
diff --git a/testing/web-platform/tests/css/motion/parsing/offset-distance-parsing-valid.html b/testing/web-platform/tests/css/motion/parsing/offset-distance-parsing-valid.html
index 5b081bcaab7e..fa5fdd04e54f 100644
--- a/testing/web-platform/tests/css/motion/parsing/offset-distance-parsing-valid.html
+++ b/testing/web-platform/tests/css/motion/parsing/offset-distance-parsing-valid.html
@@ -14,7 +14,7 @@
 <script>
 test_valid_value("offset-distance", "10px");
 test_valid_value("offset-distance", "20%");
-test_valid_value("offset-distance", "calc(30px + 40%)");
+test_valid_value("offset-distance", "calc(40% + 30px)");
 test_valid_value("offset-distance", "0", "0px");
 </script>
 </body>

From 184265899202512cb6e2ed59b885d960d3827187 Mon Sep 17 00:00:00 2001
From: Boris Chiou <boris.chiou@gmail.com>
Date: Mon, 20 May 2019 23:42:54 +0000
Subject: [PATCH 119/129] Bug 1429299 - Part 3: Layout update for
 offset-distance. r=birtles

Just need to take offset-distance into account to get the final matrix.

Differential Revision: https://phabricator.services.mozilla.com/D30583

--HG--
extra : moz-landing-system : lando
---
 layout/base/nsLayoutUtils.cpp                 | 39 ++++++++++++++-----
 .../motion/offset-path-string-001.html.ini    |  3 --
 2 files changed, 29 insertions(+), 13 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/motion/offset-path-string-001.html.ini

diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 3dbb0463b6ea..d126ba378319 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -9959,12 +9959,11 @@ Maybe<MotionPathData> nsLayoutUtils::ResolveMotionPath(const nsIFrame* aFrame) {
     return Nothing();
   }
 
-  // Bug 1429299 - Implement offset-distance for motion path. For now, we use
-  // the default value, i.e. 0%.
-  float distance = 0.0;
-  float angle = 0.0;
+  gfx::Float angle = 0.0;
   Point point;
   if (display->mOffsetPath.IsPath()) {
+    const Span<const StylePathCommand>& path =
+        display->mOffsetPath.AsPath()._0.AsSpan();
     // Build the path and compute the point and angle for creating the
     // equivalent translate and rotate.
     // Here we only need to build a valid path for motion path, so
@@ -9978,16 +9977,36 @@ Maybe<MotionPathData> nsLayoutUtils::ResolveMotionPath(const nsIFrame* aFrame) {
         gfxPlatform::GetPlatform()->ScreenReferenceDrawTarget();
     RefPtr<PathBuilder> builder =
         drawTarget->CreatePathBuilder(FillRule::FILL_WINDING);
-    RefPtr<gfx::Path> gfxPath =
-        SVGPathData::BuildPath(display->mOffsetPath.AsPath()._0.AsSpan(),
-                               builder, NS_STYLE_STROKE_LINECAP_BUTT, 0.0);
+    RefPtr<gfx::Path> gfxPath = SVGPathData::BuildPath(
+        path, builder, NS_STYLE_STROKE_LINECAP_BUTT, 0.0);
     if (!gfxPath) {
       return Nothing();
     }
-    float pathLength = gfxPath->ComputeLength();
-    float computedDistance = distance * pathLength;
+
+    // Per the spec, we have to convert offset distance to pixels, with 100%
+    // being converted to total length. So here |gfxPath| is built with CSS
+    // pixel, and we calculate |pathLength| and |computedDistance| with CSS
+    // pixel as well.
+    gfx::Float pathLength = gfxPath->ComputeLength();
+    gfx::Float usedDistance =
+      display->mOffsetDistance.ResolveToCSSPixels(CSSCoord(pathLength));
+    if (!path.empty() && path.rbegin()->IsClosePath()) {
+      // Per the spec, let used offset distance be equal to offset distance
+      // modulus the total length of the path. If the total length of the path
+      // is 0, used offset distance is also 0.
+      usedDistance = pathLength > 0.0 ? fmod(usedDistance, pathLength) : 0.0;
+      // We make sure |usedDistance| is 0.0 or a positive value.
+      // https://github.com/w3c/fxtf-drafts/issues/339
+      if (usedDistance < 0.0) {
+        usedDistance += pathLength;
+      }
+    } else {
+      // Per the spec, for unclosed interval, let used offset distance be equal
+      // to offset distance clamped by 0 and the total length of the path.
+      usedDistance = clamped(usedDistance, 0.0f, pathLength);
+    }
     Point tangent;
-    point = gfxPath->ComputePointAtLength(computedDistance, &tangent);
+    point = gfxPath->ComputePointAtLength(usedDistance, &tangent);
     // Bug 1429301 - Implement offset-rotate for motion path.
     // After implement offset-rotate, |angle| will be adjusted more.
     // For now, the default value of offset-rotate is "auto", so we use the
diff --git a/testing/web-platform/meta/css/motion/offset-path-string-001.html.ini b/testing/web-platform/meta/css/motion/offset-path-string-001.html.ini
deleted file mode 100644
index 5931951b8baf..000000000000
--- a/testing/web-platform/meta/css/motion/offset-path-string-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[offset-path-string-001.html]
-  expected: FAIL
-  bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1429299

From 6f268e49800bbe3118824217dbf25bb2afad60f2 Mon Sep 17 00:00:00 2001
From: Boris Chiou <boris.chiou@gmail.com>
Date: Mon, 20 May 2019 23:42:56 +0000
Subject: [PATCH 120/129] Bug 1429299 - Part 4: Make offset-distance
 animatable. r=hiro

Use ComputedValue to animate offset-distance.

Differential Revision: https://phabricator.services.mozilla.com/D30584

--HG--
extra : moz-landing-system : lando
---
 .../test/test_transitions_per_property.html   | 63 ++++++++++++++++++-
 .../style/properties/longhands/box.mako.rs    |  2 +-
 .../offset-distance-interpolation.html.ini    | 55 ----------------
 .../animation-types/property-list.js          |  4 ++
 4 files changed, 65 insertions(+), 59 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/motion/animation/offset-distance-interpolation.html.ini

diff --git a/layout/style/test/test_transitions_per_property.html b/layout/style/test/test_transitions_per_property.html
index 09ecbbb687b9..fd3895297c8d 100644
--- a/layout/style/test/test_transitions_per_property.html
+++ b/layout/style/test/test_transitions_per_property.html
@@ -307,6 +307,12 @@ var supported_properties = {
 
 if (IsCSSPropertyPrefEnabled("layout.css.motion-path.enabled")) {
   supported_properties["offset-path"] = [ test_path_function ];
+  supported_properties["offset-distance"] =
+    [ test_length_transition,
+      test_percent_transition,
+      test_length_unclamped,
+      test_percent_unclamped,
+      test_calc_wrapped_calc_transition ];
 }
 
 if (IsCSSPropertyPrefEnabled("layout.css.clip-path-path.enabled")) {
@@ -1479,6 +1485,57 @@ function test_length_percent_calc_transition(prop) {
                        "calc(50% + 50px)");
 }
 
+// This can deal well with properties for which the computed value
+// is not the used value, e.g. offset-distance, translate.
+function test_calc_wrapped_calc_transition(prop) {
+  // Test interpolation that computes to calc() (transition from % to px)
+  div.style.setProperty("transition-property", "none", "");
+  div.style.setProperty(prop, "20%", "");
+  is(cs.getPropertyValue(prop), "20%",
+     "property " + prop + ": computed value before transition");
+  div.style.setProperty("transition-property", prop, "");
+  div.style.setProperty(prop, "12px", "");
+  is(cs.getPropertyValue(prop), "calc(15% + 3px)",
+     "property " + prop + ": interpolation that computes to calc()");
+
+  check_distance(prop, "20%", "calc(15% + 3px)", "12px");
+
+  // Test interpolation that computes to calc() (transition from px to %)
+  div.style.setProperty("transition-property", "none", "");
+  div.style.setProperty(prop, "12px", "");
+  is(cs.getPropertyValue(prop), "12px",
+     "property " + prop + ": computed value before transition");
+  div.style.setProperty("transition-property", prop, "");
+  div.style.setProperty(prop, "20%", "");
+  is(cs.getPropertyValue(prop), "calc(5% + 9px)",
+     "property " + prop + ": interpolation that computes to calc()");
+
+  check_distance(prop, "12px", "calc(5% + 9px)", "20%");
+
+  // Test interpolation between calc() and non-calc()
+  div.style.setProperty("transition-property", "none", "");
+  div.style.setProperty(prop, "calc(40px + 10%)", "");
+  is(cs.getPropertyValue(prop), "calc(10% + 40px)",
+     "property " + prop + ": computed value before transition");
+  div.style.setProperty("transition-property", prop, "");
+  div.style.setProperty(prop, "30%", "");
+  is(cs.getPropertyValue(prop), "calc(15% + 30px)",
+     "property " + prop + ": interpolation between calc() and non-calc()");
+
+  check_distance(prop, "calc(40px + 10%)", "calc(30px + 15%)", "30%");
+
+  div.style.setProperty("transition-property", "none", "");
+  div.style.setProperty(prop, "16px", "");
+  is(cs.getPropertyValue(prop), "16px",
+     "property " + prop + ": computed value before transition");
+  div.style.setProperty("transition-property", prop, "");
+  div.style.setProperty(prop, "calc(8px + 60%)", "");
+  is(cs.getPropertyValue(prop), "calc(15% + 14px)",
+     "property " + prop + ": interpolation between calc() and non-calc()");
+
+  check_distance(prop, "16px", "calc(14px + 15%)", "calc(8px + 60%)");
+}
+
 function test_number_transition(prop) {
   div.style.transitionProperty = 'none';
   div.style[prop] = '10';
@@ -2890,11 +2947,11 @@ function test_translate_transition(prop) {
   test_length_unclamped(prop);
   test_percent_transition(prop);
   test_percent_unclamped(prop);
+  test_calc_wrapped_calc_transition(prop);
 
   // Two values: <length-percentage> <length-percentage>
-  // Note: Cannot use test_length_percent_pair_transition(prop) and
-  // test_length_percent_calc_transition(prop) because we don't resolve the
-  // percentage.
+  // Note: Cannot use test_length_percent_pair_transition(prop) because we
+  // don't resolve the percentage.
   test_length_pair_transition(prop);
 
   div.style.setProperty("transition-property", "none", "");
diff --git a/servo/components/style/properties/longhands/box.mako.rs b/servo/components/style/properties/longhands/box.mako.rs
index a5c3b38b34d1..bddc56da8480 100644
--- a/servo/components/style/properties/longhands/box.mako.rs
+++ b/servo/components/style/properties/longhands/box.mako.rs
@@ -413,7 +413,7 @@ ${helpers.predefined_type(
     "LengthPercentage",
     "computed::LengthPercentage::zero()",
     products="gecko",
-    animation_value_type="none",
+    animation_value_type="ComputedValue",
     gecko_pref="layout.css.motion-path.enabled",
     spec="https://drafts.fxtf.org/motion-1/#offset-distance-property",
     servo_restyle_damage="reflow_out_of_flow"
diff --git a/testing/web-platform/meta/css/motion/animation/offset-distance-interpolation.html.ini b/testing/web-platform/meta/css/motion/animation/offset-distance-interpolation.html.ini
deleted file mode 100644
index ab32de3fc8ac..000000000000
--- a/testing/web-platform/meta/css/motion/animation/offset-distance-interpolation.html.ini
+++ /dev/null
@@ -1,55 +0,0 @@
-[offset-distance-interpolation.html]
-  [Animation between "-30px" and "50px" at progress -1]
-    expected: FAIL
-
-  [Animation between "-30px" and "50px" at progress 0]
-    expected: FAIL
-
-  [Animation between "-30px" and "50px" at progress 0.125]
-    expected: FAIL
-
-  [Animation between "-30px" and "50px" at progress 0.875]
-    expected: FAIL
-
-  [Animation between "-30px" and "50px" at progress 1]
-    expected: FAIL
-
-  [Animation between "-30px" and "50px" at progress 2]
-    expected: FAIL
-
-  [Animation between "20%" and "100%" at progress -1]
-    expected: FAIL
-
-  [Animation between "20%" and "100%" at progress 0]
-    expected: FAIL
-
-  [Animation between "20%" and "100%" at progress 0.125]
-    expected: FAIL
-
-  [Animation between "20%" and "100%" at progress 0.875]
-    expected: FAIL
-
-  [Animation between "20%" and "100%" at progress 1]
-    expected: FAIL
-
-  [Animation between "20%" and "100%" at progress 2]
-    expected: FAIL
-
-  [Animation between "calc(20% - 30px)" and "calc(50px + 100%)" at progress -1]
-    expected: FAIL
-
-  [Animation between "calc(20% - 30px)" and "calc(50px + 100%)" at progress 0]
-    expected: FAIL
-
-  [Animation between "calc(20% - 30px)" and "calc(50px + 100%)" at progress 0.125]
-    expected: FAIL
-
-  [Animation between "calc(20% - 30px)" and "calc(50px + 100%)" at progress 0.875]
-    expected: FAIL
-
-  [Animation between "calc(20% - 30px)" and "calc(50px + 100%)" at progress 1]
-    expected: FAIL
-
-  [Animation between "calc(20% - 30px)" and "calc(50px + 100%)" at progress 2]
-    expected: FAIL
-
diff --git a/testing/web-platform/tests/web-animations/animation-model/animation-types/property-list.js b/testing/web-platform/tests/web-animations/animation-model/animation-types/property-list.js
index 3ac142e62785..7b14797d962d 100644
--- a/testing/web-platform/tests/web-animations/animation-model/animation-types/property-list.js
+++ b/testing/web-platform/tests/web-animations/animation-model/animation-types/property-list.js
@@ -993,6 +993,10 @@ const gCSSProperties = {
     types: [
     ]
   },
+  'offset-distance': {
+    // https://drafts.fxtf.org/motion-1/#offset-distance-property
+    types: [ 'lengthPercentageOrCalc' ]
+  },
   'offset-path': {
     // https://drafts.fxtf.org/motion-1/#offset-path-property
     types: [

From 0deab8288dfa4d91622d331d7e48c643c9e5c179 Mon Sep 17 00:00:00 2001
From: Dorel Luca <dluca@mozilla.com>
Date: Tue, 21 May 2019 03:05:12 +0300
Subject: [PATCH 121/129] Backed out changeset b8b69c177520 (bug 1551320) for
 Browser-chrome failures on CreateElement in XUL documents

---
 dom/base/Document.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
index 7e4cc9107c85..423350f26e06 100644
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
@@ -5483,14 +5483,6 @@ already_AddRefed<Element> Document::CreateElement(
     return nullptr;
   }
 
-  // Temporary check until XULDocument has been removed.
-  if (IsXULDocument()) {
-    MOZ_DIAGNOSTIC_ASSERT(false,
-                          "CreateElement() not allowed in XUL document.");
-    rv.Throw(NS_ERROR_FAILURE);
-    return nullptr;
-  }
-
   bool needsLowercase = IsHTMLDocument() && !IsLowercaseASCII(aTagName);
   nsAutoString lcTagName;
   if (needsLowercase) {

From dc2ad25275d7b6b466b3baeb56b4ebb5c7dd2edf Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Wed, 15 May 2019 21:13:17 +0000
Subject: [PATCH 122/129] Bug 1551690 - be more specific about the LLVM target
 on OS X; r=nalexander

Our current OS X builds use `--target=x86_64-darwin11` (which
corresponds to OS X 10.7).  This target is problematic for two reasons:

* We're actually targeting for OS X 10.9 (`MACOSX_DEPLOYMENT_TARGET`);
* It's slightly different from the default Rust target.

Let's address these problems in reverse order: differences from the Rust
target are bad, because the `--target` we provide to `clang` and the
Rust target find their way into LLVM bitcode files and the linker will
refuse to link together bitcode files that have incompatible targets.

Why are the two incompatible?  The current `--target` doesn't have a
"vendor" in triple-speak, whereas the Rust one has "apple" as the
vendor (`x86_64-apple-darwin`) We therefore need to change the
`--target` we pass to `clang` to have a vendor of "apple".

This need is behind the {init,toolchain}.configure changes,
but it has ramifications elsewhere, because `clang` looks for
`--target`-prefixed build tools.  So we have to change the `--target`
for cctools to get the right tool prefixes and we have to change the
`--target` for building clang ourselves so that *those* builds can find
the newly renamed cctools.

Once we've done, that's really enough; we don't *need to address the
first problem: While the `--target` might be `x86_64-apple-darwin11`,
both `clang` and `rustc` will dynamically choose the target triple that
eventually lands in LLVM bitcode files based on
`MACOSX_DEPLOYMENT_TARGET`, which we set in all builds.  But the current
target is slightly misleading, and the cctools don't need to be prefixed
with a particular Darwin version, since they work for all Darwin
targets.  Let's just drop the "11" from the `--target` and eliminate a
little bit of confusion.

Differential Revision: https://phabricator.services.mozilla.com/D31128

--HG--
extra : moz-landing-system : lando
---
 build/build-clang/build-clang.py                    |  4 ++--
 build/build-clang/clang-8-macosx64.json             |  6 +++---
 build/build-clang/clang-tidy-macosx64.json          |  6 +++---
 build/build-clang/compiler-rt-cross-compile.patch   |  4 ++--
 build/macosx/cross-mozconfig.common                 |  2 +-
 build/moz.configure/init.configure                  | 13 ++++++++++---
 .../test/configure/test_toolchain_configure.py      |  8 ++++----
 taskcluster/scripts/misc/build-cctools-port.sh      |  6 +++---
 8 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
index e6f60f836f70..e25b55fea4ff 100755
--- a/build/build-clang/build-clang.py
+++ b/build/build-clang/build-clang.py
@@ -294,7 +294,7 @@ def build_one_stage(cc, cxx, asm, ld, ar, ranlib, libtool,
                 "-DCMAKE_OSX_ARCHITECTURES=x86_64",
                 "-DDARWIN_osx_ARCHS=x86_64",
                 "-DDARWIN_osx_SYSROOT=%s" % slashify_path(os.getenv("CROSS_SYSROOT")),
-                "-DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-darwin11"
+                "-DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin"
             ]
         return cmake_args
 
@@ -786,7 +786,7 @@ if __name__ == "__main__":
         extra_cxxflags = ["-stdlib=libc++"]
         extra_cxxflags2 = ["-stdlib=libc++"]
 
-        extra_flags = ["-target", "x86_64-darwin11", "-mlinker-version=137",
+        extra_flags = ["-target", "x86_64-apple-darwin", "-mlinker-version=137",
                        "-B", "%s/bin" % os.getenv("CROSS_CCTOOLS_PATH"),
                        "-isysroot", os.getenv("CROSS_SYSROOT"),
                        # technically the sysroot flag there should be enough to deduce this,
diff --git a/build/build-clang/clang-8-macosx64.json b/build/build-clang/clang-8-macosx64.json
index e81714d01318..434c99563f9f 100644
--- a/build/build-clang/clang-8-macosx64.json
+++ b/build/build-clang/clang-8-macosx64.json
@@ -16,9 +16,9 @@
     "cc": "/builds/worker/workspace/build/src/clang/bin/clang",
     "cxx": "/builds/worker/workspace/build/src/clang/bin/clang++",
     "as": "/builds/worker/workspace/build/src/clang/bin/clang",
-    "ar": "/builds/worker/workspace/build/src/cctools/bin/x86_64-darwin11-ar",
-    "ranlib": "/builds/worker/workspace/build/src/cctools/bin/x86_64-darwin11-ranlib",
-    "libtool": "/builds/worker/workspace/build/src/cctools/bin/x86_64-darwin11-libtool",
+    "ar": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin-ar",
+    "ranlib": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin-ranlib",
+    "libtool": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin-libtool",
     "ld": "/builds/worker/workspace/build/src/clang/bin/clang",
     "patches": [
       "static-llvm-symbolizer.patch",
diff --git a/build/build-clang/clang-tidy-macosx64.json b/build/build-clang/clang-tidy-macosx64.json
index 8226b6f6f2da..588f4f6c7d25 100644
--- a/build/build-clang/clang-tidy-macosx64.json
+++ b/build/build-clang/clang-tidy-macosx64.json
@@ -16,9 +16,9 @@
     "cc": "/builds/worker/workspace/build/src/clang/bin/clang",
     "cxx": "/builds/worker/workspace/build/src/clang/bin/clang++",
     "as": "/builds/worker/workspace/build/src/clang/bin/clang",
-    "ar": "/builds/worker/workspace/build/src/cctools/bin/x86_64-darwin11-ar",
-    "ranlib": "/builds/worker/workspace/build/src/cctools/bin/x86_64-darwin11-ranlib",
-    "libtool": "/builds/worker/workspace/build/src/cctools/bin/x86_64-darwin11-libtool",
+    "ar": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin-ar",
+    "ranlib": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin-ranlib",
+    "libtool": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin-libtool",
     "ld": "/builds/worker/workspace/build/src/clang/bin/clang",
     "patches": [
       "clang-tidy-8.patch"
diff --git a/build/build-clang/compiler-rt-cross-compile.patch b/build/build-clang/compiler-rt-cross-compile.patch
index f293438178b1..4ab24952ac70 100644
--- a/build/build-clang/compiler-rt-cross-compile.patch
+++ b/build/build-clang/compiler-rt-cross-compile.patch
@@ -1,4 +1,4 @@
-Add `-target x86_64-darwin11' to the compiler-rt overridden CFLAGS
+Add `-target x86_64-apple-darwin' to the compiler-rt overridden CFLAGS
 
 diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
 index 28d398672..aac68bf36 100644
@@ -9,7 +9,7 @@ index 28d398672..aac68bf36 100644
    set(DARWIN_EXCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Darwin-excludes)
  
 -  set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer")
-+  set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer -target x86_64-darwin11 -isysroot ${CMAKE_OSX_SYSROOT} -I${CMAKE_OSX_SYSROOT}/usr/include")
++  set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer -target x86_64-apple-darwin -isysroot ${CMAKE_OSX_SYSROOT} -I${CMAKE_OSX_SYSROOT}/usr/include")
    set(CMAKE_C_FLAGS "")
    set(CMAKE_CXX_FLAGS "")
    set(CMAKE_ASM_FLAGS "")
diff --git a/build/macosx/cross-mozconfig.common b/build/macosx/cross-mozconfig.common
index 51badd89bdbc..1404260a5ab6 100644
--- a/build/macosx/cross-mozconfig.common
+++ b/build/macosx/cross-mozconfig.common
@@ -37,7 +37,7 @@ export HOST_CFLAGS="-g"
 export HOST_CXXFLAGS="-g"
 export HOST_LDFLAGS="-g"
 
-ac_add_options --target=x86_64-apple-darwin11
+ac_add_options --target=x86_64-apple-darwin
 export MACOS_SDK_DIR=$CROSS_SYSROOT
 export MACOS_PRIVATE_FRAMEWORKS_DIR=$CROSS_PRIVATE_FRAMEWORKS
 
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index 7573e6b5b6a6..f28a5849e1da 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -750,6 +750,15 @@ def split_triplet(triplet, allow_unknown=False):
     def bitness(cpu):
         return CPU_bitness[cpu]
 
+    # Toolchains, most notably for cross compilation may use cpu-os
+    # prefixes. We need to be more specific about the LLVM target on Mac
+    # so cross-language LTO will work correctly.
+
+    if os.startswith('darwin'):
+        toolchain = '%s-apple-%s' % (cpu, os)
+    else:
+        toolchain='%s-%s' % (cpu, os),
+
     return namespace(
         alias=triplet,
         cpu=sanitize(CPU, canonical_cpu),
@@ -759,9 +768,7 @@ def split_triplet(triplet, allow_unknown=False):
         endianness=sanitize(Endianness, endianness),
         raw_cpu=cpu,
         raw_os=os,
-        # Toolchains, most notably for cross compilation may use cpu-os
-        # prefixes.
-        toolchain='%s-%s' % (cpu, os),
+        toolchain=toolchain,
     )
 
 
diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
index 997a29626802..773b31bcec8b 100755
--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
@@ -206,9 +206,9 @@ DEFAULT_CLANGXX = CLANGXX_3_6
 def CLANG_PLATFORM(gcc_platform):
     base = {
         '--target=x86_64-linux-gnu': GCC_PLATFORM_X86_64_LINUX[None],
-        '--target=x86_64-darwin11.2.0': GCC_PLATFORM_X86_64_OSX[None],
+        '--target=x86_64-apple-darwin11.2.0': GCC_PLATFORM_X86_64_OSX[None],
         '--target=i686-linux-gnu': GCC_PLATFORM_X86_LINUX[None],
-        '--target=i686-darwin11.2.0': GCC_PLATFORM_X86_OSX[None],
+        '--target=i686-apple-darwin11.2.0': GCC_PLATFORM_X86_OSX[None],
         '--target=arm-linux-gnu': GCC_PLATFORM_ARM_LINUX[None],
     }
     undo_gcc_platform = {
@@ -1332,10 +1332,10 @@ class OSXCrossToolchainTest(BaseToolchainTest):
     def test_osx_cross(self):
         self.do_toolchain_test(self.PATHS, {
             'c_compiler': self.DEFAULT_CLANG_RESULT + {
-                'flags': ['--target=i686-darwin11.2.0'],
+                'flags': ['--target=i686-apple-darwin11.2.0'],
             },
             'cxx_compiler': self.DEFAULT_CLANGXX_RESULT + {
-                'flags': ['--target=i686-darwin11.2.0'],
+                'flags': ['--target=i686-apple-darwin11.2.0'],
             },
             'host_c_compiler': self.DEFAULT_CLANG_RESULT,
             'host_cxx_compiler': self.DEFAULT_CLANGXX_RESULT,
diff --git a/taskcluster/scripts/misc/build-cctools-port.sh b/taskcluster/scripts/misc/build-cctools-port.sh
index ae289ab2d7d1..9d16f48504a4 100755
--- a/taskcluster/scripts/misc/build-cctools-port.sh
+++ b/taskcluster/scripts/misc/build-cctools-port.sh
@@ -42,15 +42,15 @@ export CC=$CLANG_DIR/bin/clang
 export CXX=$CLANG_DIR/bin/clang++
 export LDFLAGS="-lpthread -Wl,-rpath-link,$CLANG_DIR/lib"
 ./autogen.sh
-./configure --prefix=$CROSSTOOLS_BUILD_DIR --target=x86_64-darwin11 --with-llvm-config=$CLANG_DIR/bin/llvm-config
+./configure --prefix=$CROSSTOOLS_BUILD_DIR --target=x86_64-apple-darwin --with-llvm-config=$CLANG_DIR/bin/llvm-config
 
 # Build cctools
 make -j `nproc --all` install
 strip $CROSSTOOLS_BUILD_DIR/bin/*
 # cctools-port doesn't include dsymutil but clang will need to find it.
-cp $CLANG_DIR/bin/dsymutil $CROSSTOOLS_BUILD_DIR/bin/x86_64-darwin11-dsymutil
+cp $CLANG_DIR/bin/dsymutil $CROSSTOOLS_BUILD_DIR/bin/x86_64-apple-darwin-dsymutil
 # various build scripts based on cmake want to find `lipo` without a prefix
-cp $CROSSTOOLS_BUILD_DIR/bin/x86_64-darwin11-lipo $CROSSTOOLS_BUILD_DIR/bin/lipo
+cp $CROSSTOOLS_BUILD_DIR/bin/x86_64-apple-darwin-lipo $CROSSTOOLS_BUILD_DIR/bin/lipo
 
 # Put a tarball in the artifacts dir
 mkdir -p $UPLOAD_DIR

From 02d3c96faea90b5a19888a25dea66ec82ce60588 Mon Sep 17 00:00:00 2001
From: Dorel Luca <dluca@mozilla.com>
Date: Tue, 21 May 2019 03:19:42 +0300
Subject: [PATCH 123/129] Backed out 9 changesets (bug 1548381) for XPCShell
 failures in 
 toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_doAutocompleteSearch.js

Backed out changeset 0e7d8f96bf12 (bug 1548381)
Backed out changeset 738ce5e88e05 (bug 1548381)
Backed out changeset 38e35b6d8d80 (bug 1548381)
Backed out changeset cddbcd92ec10 (bug 1548381)
Backed out changeset 60ff6e363acf (bug 1548381)
Backed out changeset 1e2300b95a59 (bug 1548381)
Backed out changeset e0cf735bdcf5 (bug 1548381)
Backed out changeset fde90ccfb570 (bug 1548381)
Backed out changeset 426750b88fc2 (bug 1548381)

--HG--
extra : rebase_source : af00f81d952ed46b6f140e3a1dd6b5ca5bf638ec
---
 .../static/browser_all_files_referenced.js    |   2 +
 browser/themes/shared/autocomplete.inc.css    |  78 ++--
 modules/libpref/init/all.js                   |   2 -
 .../passwordmgr/LoginAutoCompleteResult.jsm   |  47 +--
 .../components/passwordmgr/LoginHelper.jsm    |   4 -
 .../passwordmgr/LoginManagerContent.jsm       |  25 +-
 .../passwordmgr/LoginManagerParent.jsm        |  60 +--
 .../passwordmgr/test/mochitest/mochitest.ini  |   6 +-
 .../test/mochitest/pwmgr_common.js            |  27 +-
 .../test_autocomplete_new_password.html       | 176 ++-------
 ...LoginManagerParent_doAutocompleteSearch.js |  92 -----
 ...LoginManagerParent_getGeneratedPassword.js |  69 ----
 .../unit/test_login_autocomplete_result.js    | 372 +++---------------
 .../passwordmgr/test/unit/xpcshell.ini        |   2 -
 toolkit/content/widgets/autocomplete-popup.js |   4 +-
 .../widgets/autocomplete-richlistitem.js      |  40 +-
 toolkit/content/widgets/autocomplete.xml      |   4 +-
 .../chrome/passwordmgr/passwordmgr.properties |   5 -
 18 files changed, 189 insertions(+), 826 deletions(-)
 delete mode 100644 toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_doAutocompleteSearch.js
 delete mode 100644 toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_getGeneratedPassword.js

diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
index b3c0b2e35b7a..7c2391a76e86 100644
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -147,6 +147,8 @@ var whitelist = [
   {file: "chrome://pippki/content/resetpassword.xul"},
   // Bug 1337345
   {file: "resource://gre/modules/Manifest.jsm"},
+  // Bug 1548381
+  {file: "resource://gre/modules/PasswordGenerator.jsm"},
   // Bug 1351097
   {file: "resource://gre/modules/accessibility/AccessFu.jsm"},
   // Bug 1356043
diff --git a/browser/themes/shared/autocomplete.inc.css b/browser/themes/shared/autocomplete.inc.css
index 11ad74a7326a..64d6cb86c01f 100644
--- a/browser/themes/shared/autocomplete.inc.css
+++ b/browser/themes/shared/autocomplete.inc.css
@@ -7,6 +7,7 @@
 /* General popup rules */
 
 #PopupAutoComplete > richlistbox > richlistitem {
+  height: 20px;
   min-height: 20px;
   border: 0;
   border-radius: 0;
@@ -38,42 +39,8 @@
   color: HighlightText;
 }
 
-/* Autocomplete richlistitem support for a two-line label display */
-
-#PopupAutoComplete > richlistbox > richlistitem > .two-line-wrapper {
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: row;
-  margin: 0;
-}
-
-#PopupAutoComplete > richlistbox > richlistitem > .two-line-wrapper > .ac-site-icon {
-  margin-inline-start: auto;
-  margin-inline-end: 4px;
-}
-
-#PopupAutoComplete > richlistbox > richlistitem > .two-line-wrapper > .labels-wrapper {
-  /* The text should flex while the icon should not */
-  flex: 1;
-  /* width/min-width are needed to get the text-overflow: ellipsis to work for the children */
-  min-width: 0;
-  width: 0;
-}
-
-#PopupAutoComplete > richlistbox > richlistitem > .two-line-wrapper > .labels-wrapper > .label-row {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-#PopupAutoComplete > richlistbox > richlistitem > .two-line-wrapper > .labels-wrapper > .line2-label {
-  padding-top: 2px !important;
-  opacity: .6;
-}
-
-/* Login form autocompletion (with and without origin showing) and generated passwords */
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="generatedPassword"] > .two-line-wrapper > .ac-site-icon,
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .two-line-wrapper > .ac-site-icon,
+/* Login form autocompletion with and without origin showing */
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .login-wrapper > .ac-site-icon,
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon {
   display: initial;
   list-style-image: url(chrome://browser/skin/login.svg);
@@ -81,23 +48,46 @@
   fill: GrayText;
 }
 
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="generatedPassword"][selected] > .two-line-wrapper > .ac-site-icon,
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"][selected] > .two-line-wrapper > .ac-site-icon,
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"][selected] > .login-wrapper > .ac-site-icon,
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon[selected] {
   fill: HighlightText;
 }
 
-/* Login form autocompletion with origin showing and generated passwords */
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="generatedPassword"],
+/* Login form autocompletion with origin showing */
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] {
+  height: auto;
   padding: 4px;
 }
 
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .login-wrapper {
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: row;
+  margin: 0;
+}
 
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] + richlistitem[originaltype="generatedPassword"],
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] + richlistitem[originaltype="generatedPassword"] {
-  /* Separator between logins and generated passwords */
-  border-top: 1px solid var(--panel-separator-color);
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .login-wrapper > .ac-site-icon {
+  margin-inline-start: auto;
+  margin-inline-end: 4px;
+}
+
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .login-wrapper > .login-text {
+  /* The text should flex while the icon should not */
+  flex: 1;
+  /* width/min-width are needed to get the text-overflow: ellipsis to work for the children */
+  min-width: 0;
+  width: 0;
+}
+
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .login-wrapper > .login-text > .login-row {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .login-wrapper > .login-text > .login-origin {
+  padding-top: 2px !important;
+  opacity: .6;
 }
 
 /* Insecure field warning */
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 3efd174b54e1..09db78d7f808 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4724,8 +4724,6 @@ pref("signon.autofillForms.autocompleteOff", true);
 pref("signon.autofillForms.http",           false);
 pref("signon.autologin.proxy",              false);
 pref("signon.formlessCapture.enabled",      true);
-pref("signon.generation.available",         false);
-pref("signon.generation.enabled",           false);
 pref("signon.privateBrowsingCapture.enabled", false);
 pref("signon.storeWhenAutocompleteOff",     true);
 pref("signon.debug",                        false);
diff --git a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
index b37b566f0071..531197c48132 100644
--- a/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoCompleteResult.jsm
@@ -122,14 +122,9 @@ class LoginAutocompleteItem extends AutocompleteItem {
     });
 
     XPCOMUtils.defineLazyGetter(this, "comment", () => {
-      try {
-        let uri = Services.io.newURI(login.hostname);
-        // Fallback to handle file: URIs
-        return uri.displayHostPort || login.hostname;
-      } catch (ex) {
-        // Fallback to origin below
-      }
-      return login.hostname;
+      return JSON.stringify({
+        loginOrigin: login.hostname,
+      });
     });
   }
 
@@ -144,25 +139,15 @@ class LoginAutocompleteItem extends AutocompleteItem {
   }
 }
 
-class GeneratedPasswordAutocompleteItem extends AutocompleteItem {
-  constructor(generatedPassword) {
-    super("generatedPassword");
-    this.comment = generatedPassword;
-    this.value = generatedPassword;
-
-    XPCOMUtils.defineLazyGetter(this, "label", () => {
-      return getLocalizedString("useGeneratedPassword");
-    });
-  }
-}
-
 class LoginsFooterAutocompleteItem extends AutocompleteItem {
   constructor(hostname) {
     super("loginsFooter");
-    this.comment = hostname;
 
     XPCOMUtils.defineLazyGetter(this, "label", () => {
-      return getLocalizedString("viewSavedLogins.label");
+      return JSON.stringify({
+        label: getLocalizedString("viewSavedLogins.label"),
+        hostname,
+      });
     });
   }
 }
@@ -170,7 +155,6 @@ class LoginsFooterAutocompleteItem extends AutocompleteItem {
 
 // nsIAutoCompleteResult implementation
 function LoginAutoCompleteResult(aSearchString, matchingLogins, {
-  generatedPassword,
   isSecure,
   messageManager,
   isPasswordField,
@@ -191,8 +175,7 @@ function LoginAutoCompleteResult(aSearchString, matchingLogins, {
       return false;
     }
 
-    if (!matchingLogins.length && !generatedPassword && isPasswordField
-        && formFillController.passwordPopupAutomaticallyOpened) {
+    if (!matchingLogins.length && isPasswordField && formFillController.passwordPopupAutomaticallyOpened) {
       hidingFooterOnPWFieldAutoOpened = true;
       log.debug("Hiding footer: no logins and the popup was opened upon focus of the pw. field");
       return false;
@@ -224,9 +207,6 @@ function LoginAutoCompleteResult(aSearchString, matchingLogins, {
 
   // The footer comes last if it's enabled
   if (isFooterEnabled()) {
-    if (generatedPassword) {
-      this._rows.push(new GeneratedPasswordAutocompleteItem(generatedPassword));
-    }
     this._rows.push(new LoginsFooterAutocompleteItem(hostname));
   }
 
@@ -364,11 +344,7 @@ LoginAutoComplete.prototype = {
     let isPasswordField = aElement.type == "password";
     let hostname = aElement.ownerDocument.documentURIObject.host;
 
-    let completeSearch = (autoCompleteLookupPromise, {
-      generatedPassword,
-      logins,
-      messageManager,
-    }) => {
+    let completeSearch = (autoCompleteLookupPromise, { logins, messageManager }) => {
       // If the search was canceled before we got our
       // results, don't bother reporting them.
       if (this._autoCompleteLookupPromise !== autoCompleteLookupPromise) {
@@ -377,7 +353,6 @@ LoginAutoComplete.prototype = {
 
       this._autoCompleteLookupPromise = null;
       let results = new LoginAutoCompleteResult(aSearchString, logins, {
-        generatedPassword,
         messageManager,
         isSecure,
         isPasswordField,
@@ -419,8 +394,10 @@ LoginAutoComplete.prototype = {
       previousResult = null;
     }
 
+    let rect = BrowserUtils.getElementBoundingScreenRect(aElement);
     let acLookupPromise = this._autoCompleteLookupPromise =
-      LoginManagerContent._autoCompleteSearchAsync(aSearchString, previousResult, aElement);
+      LoginManagerContent._autoCompleteSearchAsync(aSearchString, previousResult,
+                                                   aElement, rect);
     acLookupPromise.then(completeSearch.bind(this, acLookupPromise)).catch(log.error);
   },
 
diff --git a/toolkit/components/passwordmgr/LoginHelper.jsm b/toolkit/components/passwordmgr/LoginHelper.jsm
index 20a0ce42ff28..37c795cdec24 100644
--- a/toolkit/components/passwordmgr/LoginHelper.jsm
+++ b/toolkit/components/passwordmgr/LoginHelper.jsm
@@ -28,8 +28,6 @@ var LoginHelper = {
   debug: null,
   enabled: null,
   formlessCaptureEnabled: null,
-  generationAvailable: null,
-  generationEnabled: null,
   insecureAutofill: null,
   managementURI: null,
   privateBrowsingCaptureEnabled: null,
@@ -49,8 +47,6 @@ var LoginHelper = {
     this.debug = Services.prefs.getBoolPref("signon.debug");
     this.enabled = Services.prefs.getBoolPref("signon.rememberSignons");
     this.formlessCaptureEnabled = Services.prefs.getBoolPref("signon.formlessCapture.enabled");
-    this.generationAvailable = Services.prefs.getBoolPref("signon.generation.available");
-    this.generationEnabled = Services.prefs.getBoolPref("signon.generation.enabled");
     this.insecureAutofill = Services.prefs.getBoolPref("signon.autofillForms.http");
     this.managementURI = Services.prefs.getStringPref("signon.management.overrideURI", null);
     this.privateBrowsingCaptureEnabled =
diff --git a/toolkit/components/passwordmgr/LoginManagerContent.jsm b/toolkit/components/passwordmgr/LoginManagerContent.jsm
index 7b6a0b80dd50..f0a7d68c88a9 100644
--- a/toolkit/components/passwordmgr/LoginManagerContent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerContent.jsm
@@ -293,11 +293,7 @@ var LoginManagerContent = {
         let loginsFound = LoginHelper.vanillaObjectsToLogins(msg.data.logins);
         let messageManager = msg.target;
         let request = this._takeRequest(msg);
-        request.promise.resolve({
-          generatedPassword: msg.data.generatedPassword,
-          logins: loginsFound,
-          messageManager,
-        });
+        request.promise.resolve({ logins: loginsFound, messageManager });
         break;
       }
 
@@ -349,14 +345,13 @@ var LoginManagerContent = {
   },
 
   _autoCompleteSearchAsync(aSearchString, aPreviousResult,
-                           aElement) {
+                           aElement, aRect) {
     let doc = aElement.ownerDocument;
     let form = LoginFormFactory.createFromField(aElement);
     let win = doc.defaultView;
 
     let formOrigin = LoginHelper.getLoginOrigin(doc.documentURI);
     let actionOrigin = LoginHelper.getFormActionOrigin(form);
-    let autocompleteInfo = aElement.getAutocompleteInfo();
 
     let messageManager = win.docShell.messageManager;
 
@@ -366,15 +361,13 @@ var LoginManagerContent = {
                            null;
 
     let requestData = {};
-    let messageData = {
-      autocompleteInfo,
-      browsingContextId: win.docShell.browsingContext.id,
-      formOrigin,
-      actionOrigin,
-      searchString: aSearchString,
-      previousResult,
-      isSecure: InsecurePasswordUtils.isFormSecure(form),
-      isPasswordField: aElement.type == "password",
+    let messageData = { formOrigin,
+                        actionOrigin,
+                        searchString: aSearchString,
+                        previousResult,
+                        rect: aRect,
+                        isSecure: InsecurePasswordUtils.isFormSecure(form),
+                        isPasswordField: aElement.type == "password",
     };
 
     if (LoginHelper.showAutoCompleteFooter) {
diff --git a/toolkit/components/passwordmgr/LoginManagerParent.jsm b/toolkit/components/passwordmgr/LoginManagerParent.jsm
index a72169237682..892fbecb37e1 100644
--- a/toolkit/components/passwordmgr/LoginManagerParent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerParent.jsm
@@ -15,8 +15,6 @@ ChromeUtils.defineModuleGetter(this, "DeferredTask",
                                "resource://gre/modules/DeferredTask.jsm");
 ChromeUtils.defineModuleGetter(this, "LoginHelper",
                                "resource://gre/modules/LoginHelper.jsm");
-ChromeUtils.defineModuleGetter(this, "PasswordGenerator",
-                               "resource://gre/modules/PasswordGenerator.jsm");
 ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
                                "resource://gre/modules/PrivateBrowsingUtils.jsm");
 
@@ -28,15 +26,6 @@ XPCOMUtils.defineLazyGetter(this, "log", () => {
 var EXPORTED_SYMBOLS = [ "LoginManagerParent" ];
 
 var LoginManagerParent = {
-  /**
-   * A map of a principal's origin (including suffixes) to a generated password string so that we
-   * can offer the same password later (e.g. in a confirmation field).
-   *
-   * We don't currently evict from this cache so entries should last until the end of the browser
-   * session. That may change later but for now a typical session would max out at a few entries.
-   */
-  _generatedPasswordsByPrincipalOrigin: new Map(),
-
   /**
    * Reference to the default LoginRecipesParent (instead of the initialization promise) for
    * synchronous access. This is a temporary hack and new consumers should yield on
@@ -255,16 +244,9 @@ var LoginManagerParent = {
     });
   },
 
-  doAutocompleteSearch({
-    autocompleteInfo,
-    browsingContextId,
-    formOrigin,
-    actionOrigin,
-    searchString,
-    previousResult,
-    requestId,
-    isSecure,
-    isPasswordField,
+  doAutocompleteSearch({ formOrigin, actionOrigin,
+                         searchString, previousResult,
+                         rect, requestId, isSecure, isPasswordField,
   }, target) {
     // Note: previousResult is a regular object, not an
     // nsIAutoCompleteResult.
@@ -306,56 +288,22 @@ var LoginManagerParent = {
 
       // Remove results that are too short, or have different prefix.
       // Also don't offer empty usernames as possible results except
-      // for on password fields.
+      // for password field.
       if (isPasswordField) {
         return true;
       }
       return match && match.toLowerCase().startsWith(searchStringLower);
     });
 
-    let generatedPassword = null;
-    if (isPasswordField && autocompleteInfo.fieldName == "new-password") {
-      generatedPassword = this.getGeneratedPassword(browsingContextId);
-    }
-
     // Convert the array of nsILoginInfo to vanilla JS objects since nsILoginInfo
     // doesn't support structured cloning.
     var jsLogins = LoginHelper.loginsToVanillaObjects(matchingLogins);
     target.messageManager.sendAsyncMessage("PasswordManager:loginsAutoCompleted", {
       requestId,
-      generatedPassword,
       logins: jsLogins,
     });
   },
 
-  /**
-   * Expose `BrowsingContext` so we can stub it in tests.
-   */
-  get _browsingContextGlobal() {
-    return BrowsingContext;
-  },
-
-  getGeneratedPassword(browsingContextId) {
-    if (!LoginHelper.enabled || !LoginHelper.generationAvailable || !LoginHelper.generationEnabled) {
-      return null;
-    }
-
-    let browsingContext = BrowsingContext.get(browsingContextId);
-    if (!browsingContext) {
-      return null;
-    }
-    let framePrincipalOrigin = browsingContext.currentWindowGlobal.documentPrincipal.origin;
-    // Use the same password if we already generated one for this origin so that it doesn't change
-    // with each search/keystroke and the user can easily re-enter a password in a confirmation field.
-    let generatedPW = this._generatedPasswordsByPrincipalOrigin.get(framePrincipalOrigin);
-    if (generatedPW) {
-      return generatedPW;
-    }
-    generatedPW = PasswordGenerator.generatePassword();
-    this._generatedPasswordsByPrincipalOrigin.set(framePrincipalOrigin, generatedPW);
-    return generatedPW;
-  },
-
   onFormSubmit({hostname, formSubmitURL, autoFilledLoginGuid,
                 usernameField, newPasswordField,
                 oldPasswordField, openerTopWindowID,
diff --git a/toolkit/components/passwordmgr/test/mochitest/mochitest.ini b/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
index 402e704e500b..c3732d9bb26c 100644
--- a/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
+++ b/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
@@ -32,9 +32,6 @@ scheme = https
 skip-if = toolkit == 'android' # autocomplete
 [test_autocomplete_https_upgrade.html]
 skip-if = toolkit == 'android' # autocomplete
-[test_autocomplete_new_password.html]
-scheme = https
-skip-if = toolkit == 'android' # autocomplete
 [test_autocomplete_password_open.html]
 scheme = https
 skip-if = toolkit == 'android' # autocomplete
@@ -114,6 +111,9 @@ support-files =
 [test_munged_username.html]
 scheme = https
 skip-if = toolkit == 'android' # bug 1527403
+[test_autocomplete_new_password.html]
+scheme = https
+skip-if = toolkit == 'android' # autocomplete
 [test_one_doorhanger_per_un_pw.html]
 scheme = https
 skip-if = toolkit == 'android' # bug 1535505
diff --git a/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js b/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js
index 9dccb4835f96..d38c96cbdfc4 100644
--- a/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js
+++ b/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js
@@ -4,8 +4,6 @@
 
 /* import-globals-from ../../../../../toolkit/components/satchel/test/satchel_common.js */
 
-const GENERATED_PASSWORD_LENGTH = 15;
-const GENERATED_PASSWORD_REGEX = /^[a-km-np-zA-HJ-NP-Z2-9]{15}$/;
 // Copied from LoginTestUtils.masterPassword.masterPassword to use from the content process.
 const MASTER_PASSWORD = "omgsecret!";
 const TESTS_DIR = "/tests/toolkit/components/passwordmgr/test/";
@@ -42,7 +40,7 @@ function $_(formNum, name) {
 
 /**
  * Check autocomplete popup results to ensure that expected
- * *labels* are being shown correctly as items in the popup.
+ * values are being shown correctly as items in the popup.
  */
 function checkAutoCompleteResults(actualValues, expectedValues, hostname, msg) {
   if (hostname !== null) {
@@ -50,7 +48,8 @@ function checkAutoCompleteResults(actualValues, expectedValues, hostname, msg) {
 
     // Check the footer first.
     let footerResult = actualValues[actualValues.length - 1];
-    is(footerResult, "View Saved Logins", "the footer text is shown correctly");
+    ok(footerResult.includes("View Saved Logins"), "the footer text is shown correctly");
+    ok(footerResult.includes(hostname), "the footer has the correct hostname attribute");
   }
 
   if (hostname === null) {
@@ -68,17 +67,6 @@ function checkAutoCompleteResults(actualValues, expectedValues, hostname, msg) {
   checkArrayValues(actualValues.slice(0, -1), expectedValues, msg);
 }
 
-/**
- * Check for expected username/password in form.
- * @see `checkForm` below for a similar function.
- */
-function checkLoginForm(usernameField, expectedUsername, passwordField, expectedPassword) {
-  let formID = usernameField.parentNode.id;
-  is(usernameField.value, expectedUsername, "Checking " + formID + " username is: " + expectedUsername);
-  is(passwordField.value, expectedPassword, "Checking " + formID + " password is: " + expectedPassword);
-}
-
-
 /**
  * Check a form for expected values. If an argument is null, a field's
  * expected value will be the default value.
@@ -222,7 +210,7 @@ function logoutMasterPassword() {
 }
 
 /**
- * Resolves when a specified number of forms have been processed for (potential) filling.
+ * Resolves when a specified number of forms have been processed.
  */
 function promiseFormsProcessed(expectedCount = 1) {
   var processedCount = 0;
@@ -230,7 +218,6 @@ function promiseFormsProcessed(expectedCount = 1) {
     function onProcessedForm(subject, topic, data) {
       processedCount++;
       if (processedCount == expectedCount) {
-        info(`${processedCount} form(s) processed`);
         SpecialPowers.removeObserver(onProcessedForm, "passwordmgr-processed-form");
         resolve(SpecialPowers.Cu.waiveXrays(subject), data);
       }
@@ -409,3 +396,9 @@ this.LoginManager = new Proxy({}, {
   },
 });
 
+// Check for expected username/password in form.
+function checkLoginForm(usernameField, expectedUsername, passwordField, expectedPassword) {
+  let formID = usernameField.parentNode.id;
+  is(usernameField.value, expectedUsername, "Checking " + formID + " username is: " + expectedUsername);
+  is(passwordField.value, expectedPassword, "Checking " + formID + " password is: " + expectedPassword);
+}
diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_new_password.html b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_new_password.html
index b3259f231ecf..eba81cd213fe 100644
--- a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_new_password.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_new_password.html
@@ -2,12 +2,12 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>Test autofill and autocomplete on autocomplete=new-password fields</title>
+  <title>Test autofill with autocomplete=new-password fields</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <script src="/tests/SimpleTest/EventUtils.js"></script>
-  <script src="pwmgr_common.js"></script>
-  <script src="../../../satchel/test/satchel_common.js"></script>
-  <link rel="stylesheet" href="/tests/SimpleTest/test.css" />
+  <script type="text/javascript" src="pwmgr_common.js"></script>
+  <script type="text/javascript" src="../../../satchel/test/satchel_common.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: autofill with autocomplete=new-password fields
@@ -38,10 +38,10 @@ let readyPromise = registerRunTests();
     <button type="submit">Submit</button>
   </form>
 
-  <!-- form2 uses a new-password type=password field -->
+  <!-- form2 uses the new-password field -->
   <form id="form2" action="https://autofill" onsubmit="return false;">
     <input type="text" name="uname">
-    <input type="password" name="pword" autocomplete="new-password">
+    <input type="password" autocomplete="new-password">
     <button type="submit">Submit</button>
   </form>
 </div>
@@ -51,149 +51,55 @@ let readyPromise = registerRunTests();
 const {ContentTaskUtils} =
   SpecialPowers.Cu.import("resource://testing-common/ContentTaskUtils.jsm", {});
 
+async function getAutocompleteResult(input, expectedValues) {
+  input.focus();
+
+  const shownPromise = promiseACShown();
+  synthesizeKey("KEY_ArrowDown");
+  await shownPromise;
+  synthesizeKey("KEY_ArrowDown");
+  await synthesizeKey("KEY_Enter");
+
+  let didAutocomplete;
+  try {
+    await ContentTaskUtils.waitForCondition(() => {
+      for (let [selector, expectedValue] of Object.entries(expectedValues)) {
+        if (document.querySelector(selector).value !== expectedValue) {
+          return false;
+        }
+      }
+      return true;
+    });
+    didAutocomplete = true;
+  } catch (ex) {
+    info("waitForCondition exception: " + ex.message);
+    didAutocomplete = false;
+  }
+  return didAutocomplete;
+}
+
 add_task(async function setup() {
   ok(readyPromise, "check promise is available");
   await readyPromise;
 });
 
-add_task(async function test_autofillAutocompleteUsername_noGeneration() {
+add_task(async function test_autofillAutocompleteNewPassword() {
   // reference form was filled as expected?
   checkForm(1, "user1", "pass1");
 
   // 2nd form should not be filled
   checkForm(2, "", "");
 
-  $_(2, "uname").focus();
-  const shownPromise = promiseACShown();
-  synthesizeKey("KEY_ArrowDown");
-  let results = await shownPromise;
-  let expectedACLabels = ["user1"];
-  checkAutoCompleteResults(results, expectedACLabels, "example.com", "Check all rows are correct");
-  synthesizeKey("KEY_ArrowDown");
-  synthesizeKey("KEY_Enter");
-  await promiseFormsProcessed();
-  checkForm(2, "user1", "pass1");
+  let form = document.getElementById("form2");
+  let userInput = form.querySelector("[name='uname']");
 
-  document.getElementById("form2").reset();
+  const didAutocomplete = await getAutocompleteResult(userInput, {
+    "#form2 [name='uname']": "user1",
+    "#form2 [type='password']": "pass1",
+  });
+  ok(didAutocomplete, "Autocomplete of user and password fields should happen");
 });
 
-add_task(async function test_autofillAutocompletePassword_noGeneration() {
-  // 2nd form should not be filled
-  checkForm(2, "", "");
-
-  let pword = $_(2, "pword");
-  pword.focus();
-  const shownPromise = promiseACShown();
-  synthesizeKey("KEY_ArrowDown");
-  let results = await shownPromise;
-  let expectedACLabels = ["user1"];
-  checkAutoCompleteResults(results, expectedACLabels, "example.com", "Check all rows are correct");
-  synthesizeKey("KEY_ArrowDown");
-  synthesizeKey("KEY_Enter");
-  // Can't use promiseFormsProcessed() when autocomplete fills the field directly.
-  await SimpleTest.promiseWaitForCondition(() => pword.value == "pass1", "Check pw filled");
-  checkForm(2, "", "pass1");
-
-  // No autocomplete results should appear for non-empty pw fields.
-  synthesizeKey("KEY_ArrowDown");
-  await promiseNoUnexpectedPopupShown();
-
-  document.getElementById("form2").reset();
-});
-
-// All tests below this are with generation prefs enabled.
-
-add_task(async function test_autofillAutocompleteUsername_noGeneration() {
-  await SpecialPowers.pushPrefEnv({"set": [
-    ["signon.generation.available", true],
-    ["signon.generation.enabled", true],
-    ["signon.showAutoCompleteOrigins", true],
-  ]});
-
-  // 2nd form should not be filled
-  checkForm(2, "", "");
-
-  $_(2, "uname").focus();
-  const shownPromise = promiseACShown();
-  synthesizeKey("KEY_ArrowDown");
-  let results = await shownPromise;
-  // No generation option on username fields.
-  let expectedACLabels = ["user1"];
-  checkAutoCompleteResults(results, expectedACLabels, "example.com", "Check all rows are correct");
-  synthesizeKey("KEY_ArrowDown");
-  synthesizeKey("KEY_Enter");
-  await promiseFormsProcessed();
-  checkForm(2, "user1", "pass1");
-
-  document.getElementById("form2").reset();
-});
-
-add_task(async function test_autofillAutocompletePassword_withGeneration() {
-  // 2nd form should not be filled
-  checkForm(2, "", "");
-
-  let pword = $_(2, "pword");
-  pword.focus();
-  let shownPromise = promiseACShown();
-  synthesizeKey("KEY_ArrowDown");
-  let results = await shownPromise;
-  let expectedACLabels = [
-    "user1",
-    "Use Generated Password",
-  ];
-  checkAutoCompleteResults(results, expectedACLabels, "example.com", "Check all rows are correct");
-  synthesizeKey("KEY_ArrowDown");
-  synthesizeKey("KEY_Enter");
-  // Can't use promiseFormsProcessed() when autocomplete fills the field directly.
-  await SimpleTest.promiseWaitForCondition(() => pword.value == "pass1", "Check pw filled");
-  checkForm(2, "", "pass1");
-
-  // No autocomplete results should appear for non-empty pw fields.
-  synthesizeKey("KEY_ArrowDown");
-  await promiseNoUnexpectedPopupShown();
-
-  while (pword.value) {
-    synthesizeKey("KEY_Backspace");
-  }
-
-  info("This time select the generated password");
-  shownPromise = promiseACShown();
-  synthesizeKey("KEY_ArrowDown");
-  results = await shownPromise;
-  expectedACLabels = [
-    "user1",
-    "Use Generated Password",
-  ];
-  checkAutoCompleteResults(results, expectedACLabels, "example.com", "Check all rows are correct");
-  synthesizeKey("KEY_ArrowDown");
-  synthesizeKey("KEY_ArrowDown");
-  synthesizeKey("KEY_Enter");
-  await SimpleTest.promiseWaitForCondition(() => !!pword.value, "Check generated pw filled");
-  let generatedPW = pword.value;
-  is(generatedPW.length, GENERATED_PASSWORD_LENGTH, "Check generated password length");
-  ok(generatedPW.match(GENERATED_PASSWORD_REGEX), "Check generated password format");
-
-  while (pword.value) {
-    synthesizeKey("KEY_Backspace");
-  }
-
-  shownPromise = promiseACShown();
-  synthesizeKey("KEY_ArrowDown");
-  results = await shownPromise;
-  expectedACLabels = [
-    "user1",
-    "Use Generated Password",
-  ];
-  checkAutoCompleteResults(results, expectedACLabels, "example.com", "Check all rows are correct");
-  synthesizeKey("KEY_ArrowDown");
-  synthesizeKey("KEY_ArrowDown");
-  synthesizeKey("KEY_Enter");
-  await SimpleTest.promiseWaitForCondition(() => !!pword.value, "Check generated pw filled");
-  // Same generated password should be used.
-  checkForm(2, "", generatedPW);
-
-  document.getElementById("form2").reset();
-});
 </script>
 </pre>
 </body>
diff --git a/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_doAutocompleteSearch.js b/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_doAutocompleteSearch.js
deleted file mode 100644
index 5d8586133ccb..000000000000
--- a/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_doAutocompleteSearch.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Test LoginManagerParent.doAutocompleteSearch()
- */
-
-"use strict";
-
-const {sinon} = ChromeUtils.import("resource://testing-common/Sinon.jsm");
-const {LoginManagerParent: LMP} = ChromeUtils.import("resource://gre/modules/LoginManagerParent.jsm");
-
-add_task(async function test_doAutocompleteSearch_generated_noLogins() {
-  Services.prefs.setBoolPref("signon.generation.available", true); // TODO: test both with false
-  Services.prefs.setBoolPref("signon.generation.enabled", true);
-
-  ok(LMP.doAutocompleteSearch, "doAutocompleteSearch exists");
-
-  // Default to the happy path
-  let arg1 = {
-    autocompleteInfo: {
-      section: "",
-      addressType: "",
-      contactType: "",
-      fieldName: "new-password",
-      canAutomaticallyPersist: false,
-    },
-    browsingContextId: 123,
-    formOrigin: "https://example.com",
-    actionOrigin: "https://mozilla.org",
-    searchString: "",
-    previousResult: null,
-    requestId: "foo",
-    isSecure: true,
-    isPasswordField: true,
-  };
-
-  let sendMessageStub = sinon.stub();
-  let fakeBrowser = {
-    messageManager: {
-      sendAsyncMessage: sendMessageStub,
-    },
-  };
-
-  sinon.stub(LMP._browsingContextGlobal, "get").withArgs(123).callsFake(() => {
-    return {
-      currentWindowGlobal: {
-        documentPrincipal: Services.scriptSecurityManager.createCodebasePrincipalFromOrigin("https://www.example.com^userContextId=1"),
-      },
-    };
-  });
-
-  LMP.doAutocompleteSearch(arg1, fakeBrowser);
-  ok(sendMessageStub.calledOnce, "sendAsyncMessage was called");
-  let msg1 = sendMessageStub.firstCall.args[1];
-  equal(msg1.requestId, arg1.requestId, "requestId matches");
-  equal(msg1.logins.length, 0, "no logins");
-  ok(msg1.generatedPassword, "has a generated password");
-  equal(msg1.generatedPassword.length, 15, "generated password length");
-  sendMessageStub.resetHistory();
-
-  info("repeat the search and ensure the same password was used");
-  LMP.doAutocompleteSearch(arg1, fakeBrowser);
-  ok(sendMessageStub.calledOnce, "sendAsyncMessage was called");
-  let msg2 = sendMessageStub.firstCall.args[1];
-  equal(msg2.requestId, arg1.requestId, "requestId matches");
-  equal(msg2.logins.length, 0, "no logins");
-  equal(msg2.generatedPassword, msg1.generatedPassword, "same generated password");
-  sendMessageStub.resetHistory();
-
-  info("Check cases where a password shouldn't be generated");
-
-  LMP.doAutocompleteSearch({...arg1, ...{isPasswordField: false}}, fakeBrowser);
-  ok(sendMessageStub.calledOnce, "sendAsyncMessage was called");
-  let msg = sendMessageStub.firstCall.args[1];
-  equal(msg.requestId, arg1.requestId, "requestId matches");
-  equal(msg.generatedPassword, null, "no generated password when not a pw. field");
-  sendMessageStub.resetHistory();
-
-  let arg1_2 = {...arg1};
-  arg1_2.autocompleteInfo.fieldName = "";
-  LMP.doAutocompleteSearch(arg1_2, fakeBrowser);
-  ok(sendMessageStub.calledOnce, "sendAsyncMessage was called");
-  msg = sendMessageStub.firstCall.args[1];
-  equal(msg.requestId, arg1.requestId, "requestId matches");
-  equal(msg.generatedPassword, null, "no generated password when not autocomplete=new-password");
-  sendMessageStub.resetHistory();
-
-  LMP.doAutocompleteSearch({...arg1, ...{browsingContextId: 999}}, fakeBrowser);
-  ok(sendMessageStub.calledOnce, "sendAsyncMessage was called");
-  msg = sendMessageStub.firstCall.args[1];
-  equal(msg.requestId, arg1.requestId, "requestId matches");
-  equal(msg.generatedPassword, null, "no generated password with a missing browsingContextId");
-  sendMessageStub.resetHistory();
-});
diff --git a/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_getGeneratedPassword.js b/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_getGeneratedPassword.js
deleted file mode 100644
index 9be1ffb75ca7..000000000000
--- a/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_getGeneratedPassword.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Test LoginManagerParent.getGeneratedPassword()
- */
-
-"use strict";
-
-const {sinon} = ChromeUtils.import("resource://testing-common/Sinon.jsm");
-const {LoginManagerParent: LMP} = ChromeUtils.import("resource://gre/modules/LoginManagerParent.jsm");
-
-add_task(async function test_getGeneratedPassword() {
-  // Force the feature to be enabled.
-  Services.prefs.setBoolPref("signon.generation.available", true);
-  Services.prefs.setBoolPref("signon.generation.enabled", true);
-
-  ok(LMP.getGeneratedPassword, "LMP.getGeneratedPassword exists");
-  equal(LMP._generatedPasswordsByPrincipalOrigin.size, 0, "Empty cache to start");
-
-  equal(LMP.getGeneratedPassword(99), null, "Null with no BrowsingContext");
-
-  ok(LMP._browsingContextGlobal, "Check _browsingContextGlobal exists");
-  ok(!LMP._browsingContextGlobal.get(99), "BrowsingContext 99 shouldn't exist yet");
-  info("Stubbing BrowsingContext.get(99)");
-  sinon.stub(LMP._browsingContextGlobal, "get").withArgs(99).callsFake(() => {
-    return {
-      currentWindowGlobal: {
-        documentPrincipal: Services.scriptSecurityManager.createCodebasePrincipalFromOrigin("https://www.example.com^userContextId=6"),
-      },
-    };
-  });
-  ok(LMP._browsingContextGlobal.get(99), "Checking BrowsingContext.get(99) stub");
-
-  let password1 = LMP.getGeneratedPassword(99);
-  notEqual(password1, null, "Check password was returned");
-  equal(password1.length, 15, "Check password length");
-  equal(LMP._generatedPasswordsByPrincipalOrigin.size, 1, "1 added to cache");
-  equal(LMP._generatedPasswordsByPrincipalOrigin.get("https://www.example.com^userContextId=6"),
-        password1, "Cache key and value");
-  let password2 = LMP.getGeneratedPassword(99);
-  equal(password1, password2, "Same password should be returned for the same origin");
-
-  info("Changing the documentPrincipal to simulate a navigation in the frame");
-  LMP._browsingContextGlobal.get.restore();
-  sinon.stub(LMP._browsingContextGlobal, "get").withArgs(99).callsFake(() => {
-    return {
-      currentWindowGlobal: {
-        documentPrincipal: Services.scriptSecurityManager.createCodebasePrincipalFromOrigin("https://www.mozilla.org^userContextId=2"),
-      },
-    };
-  });
-  let password3 = LMP.getGeneratedPassword(99);
-  notEqual(password2, password3, "Different password for a different origin for the same BC");
-  equal(password3.length, 15, "Check password3 length");
-
-  info("Now checks cases where null should be returned");
-
-  Services.prefs.setBoolPref("signon.rememberSignons", false);
-  equal(LMP.getGeneratedPassword(99), null, "Prevented when pwmgr disabled");
-  Services.prefs.setBoolPref("signon.rememberSignons", true);
-
-  Services.prefs.setBoolPref("signon.generation.available", false);
-  equal(LMP.getGeneratedPassword(99), null, "Prevented when unavailable");
-  Services.prefs.setBoolPref("signon.generation.available", true);
-
-  Services.prefs.setBoolPref("signon.generation.enabled", false);
-  equal(LMP.getGeneratedPassword(99), null, "Prevented when disabled");
-  Services.prefs.setBoolPref("signon.generation.enabled", true);
-
-  equal(LMP.getGeneratedPassword(123), null, "Prevented when browsingContext is missing");
-});
diff --git a/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js b/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
index 022eaccd4af8..ae223b0bf38b 100644
--- a/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
+++ b/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
@@ -3,6 +3,7 @@ var nsLoginInfo = Components.Constructor("@mozilla.org/login-manager/loginInfo;1
                                          Ci.nsILoginInfo, "init");
 
 const PREF_INSECURE_FIELD_WARNING_ENABLED = "security.insecure_field_warning.contextual.enabled";
+const PREF_INSECURE_AUTOFILLFORMS_ENABLED = "signon.autofillForms.http";
 
 let matchingLogins = [];
 matchingLogins.push(new nsLoginInfo("http://mochi.test:8888", "http://autocomplete:8888", null,
@@ -29,6 +30,7 @@ const LABEL_NO_USERNAME = "No username (" + time + ")";
 let expectedResults = [
   {
     insecureFieldWarningEnabled: true,
+    insecureAutoFillFormsEnabled: true,
     isSecure: true,
     isPasswordField: false,
     matchingLogins,
@@ -36,53 +38,27 @@ let expectedResults = [
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
-    }],
-  },
-  {
-    insecureFieldWarningEnabled: true,
-    isSecure: false,
-    isPasswordField: false,
-    matchingLogins: [],
-    items: [{
-      value: "",
-      label: "This connection is not secure. Logins entered here could be compromised. Learn More",
-      style: "insecureWarning",
-      comment: "",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
     }],
   },
   {
     insecureFieldWarningEnabled: true,
+    insecureAutoFillFormsEnabled: true,
     isSecure: false,
     isPasswordField: false,
     matchingLogins,
@@ -90,41 +66,31 @@ let expectedResults = [
       value: "",
       label: "This connection is not secure. Logins entered here could be compromised. Learn More",
       style: "insecureWarning",
-      comment: "",
     }, {
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
     }],
   },
   {
     insecureFieldWarningEnabled: true,
+    insecureAutoFillFormsEnabled: true,
     isSecure: true,
     isPasswordField: true,
     matchingLogins,
@@ -132,36 +98,27 @@ let expectedResults = [
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "temppass1",
       label: "tempuser1",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testpass2",
       label: "testuser2",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testpass3",
       label: "testuser3",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
     }],
   },
   {
     insecureFieldWarningEnabled: true,
+    insecureAutoFillFormsEnabled: true,
     isSecure: false,
     isPasswordField: true,
     matchingLogins,
@@ -169,41 +126,31 @@ let expectedResults = [
       value: "",
       label: "This connection is not secure. Logins entered here could be compromised. Learn More",
       style: "insecureWarning",
-      comment: "",
     }, {
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "temppass1",
       label: "tempuser1",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testpass2",
       label: "testuser2",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testpass3",
       label: "testuser3",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
     }],
   },
   {
     insecureFieldWarningEnabled: false,
+    insecureAutoFillFormsEnabled: true,
     isSecure: true,
     isPasswordField: false,
     matchingLogins,
@@ -211,36 +158,27 @@ let expectedResults = [
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
     }],
   },
   {
     insecureFieldWarningEnabled: false,
+    insecureAutoFillFormsEnabled: true,
     isSecure: false,
     isPasswordField: false,
     matchingLogins,
@@ -248,36 +186,27 @@ let expectedResults = [
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
     }],
   },
   {
     insecureFieldWarningEnabled: false,
+    insecureAutoFillFormsEnabled: true,
     isSecure: true,
     isPasswordField: true,
     matchingLogins,
@@ -285,36 +214,27 @@ let expectedResults = [
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "temppass1",
       label: "tempuser1",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testpass2",
       label: "testuser2",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testpass3",
       label: "testuser3",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
     }],
   },
   {
     insecureFieldWarningEnabled: false,
+    insecureAutoFillFormsEnabled: true,
     isSecure: false,
     isPasswordField: true,
     matchingLogins,
@@ -322,36 +242,27 @@ let expectedResults = [
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "temppass1",
       label: "tempuser1",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testpass2",
       label: "testuser2",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testpass3",
       label: "testuser3",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
     }],
   },
   {
     insecureFieldWarningEnabled: true,
+    insecureAutoFillFormsEnabled: false,
     isSecure: true,
     isPasswordField: false,
     matchingLogins,
@@ -359,36 +270,27 @@ let expectedResults = [
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
     }],
   },
   {
     insecureFieldWarningEnabled: true,
+    insecureAutoFillFormsEnabled: false,
     isSecure: false,
     isPasswordField: false,
     matchingLogins,
@@ -396,41 +298,31 @@ let expectedResults = [
       value: "",
       label: "This connection is not secure. Logins entered here could be compromised. Learn More",
       style: "insecureWarning",
-      comment: "",
     }, {
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
     }],
   },
   {
     insecureFieldWarningEnabled: true,
+    insecureAutoFillFormsEnabled: false,
     isSecure: true,
     isPasswordField: true,
     matchingLogins,
@@ -438,36 +330,27 @@ let expectedResults = [
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "temppass1",
       label: "tempuser1",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testpass2",
       label: "testuser2",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testpass3",
       label: "testuser3",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
     }],
   },
   {
     insecureFieldWarningEnabled: true,
+    insecureAutoFillFormsEnabled: false,
     isSecure: false,
     isPasswordField: true,
     matchingLogins,
@@ -475,41 +358,31 @@ let expectedResults = [
       value: "",
       label: "This connection is not secure. Logins entered here could be compromised. Learn More",
       style: "insecureWarning",
-      comment: "",
     }, {
       value: "emptypass1",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "temppass1",
       label: "tempuser1",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testpass2",
       label: "testuser2",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testpass3",
       label: "testuser3",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "zzzpass4",
       label: "zzzuser4",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
     }],
   },
   {
     insecureFieldWarningEnabled: false,
+    insecureAutoFillFormsEnabled: false,
     isSecure: true,
     isPasswordField: false,
     matchingLogins,
@@ -517,240 +390,87 @@ let expectedResults = [
       value: "",
       label: LABEL_NO_USERNAME,
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "tempuser1",
       label: "tempuser1",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testuser2",
       label: "testuser2",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "testuser3",
       label: "testuser3",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
     }, {
       value: "zzzuser4",
       label: "zzzuser4",
       style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
-    }],
-  },
-  {
-    insecureFieldWarningEnabled: false,
-    isSecure: false,
-    isPasswordField: false,
-    matchingLogins: [],
-    items: [{
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
-    }],
-  },
-  {
-    insecureFieldWarningEnabled: false,
-    isSecure: false,
-    isPasswordField: false,
-    matchingLogins: [],
-    searchString: "foo",
-    items: [{
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
     }],
   },
   {
     insecureFieldWarningEnabled: false,
+    insecureAutoFillFormsEnabled: false,
     isSecure: false,
     isPasswordField: false,
     matchingLogins,
-    items: [{
-      value: "",
-      label: LABEL_NO_USERNAME,
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "tempuser1",
-      label: "tempuser1",
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "testuser2",
-      label: "testuser2",
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "testuser3",
-      label: "testuser3",
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "zzzuser4",
-      label: "zzzuser4",
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
-    }],
-  },
-  {
-    insecureFieldWarningEnabled: false,
-    isSecure: true,
-    isPasswordField: true,
-    matchingLogins,
-    items: [{
-      value: "emptypass1",
-      label: LABEL_NO_USERNAME,
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "temppass1",
-      label: "tempuser1",
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "testpass2",
-      label: "testuser2",
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "testpass3",
-      label: "testuser3",
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "zzzpass4",
-      label: "zzzuser4",
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
-    }],
-  },
-  {
-    insecureFieldWarningEnabled: false,
-    isSecure: false,
-    isPasswordField: true,
-    matchingLogins,
-    items: [{
-      value: "emptypass1",
-      label: LABEL_NO_USERNAME,
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "temppass1",
-      label: "tempuser1",
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "testpass2",
-      label: "testuser2",
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "testpass3",
-      label: "testuser3",
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "zzzpass4",
-      label: "zzzuser4",
-      style: "loginWithOrigin",
-      comment: "mochi.test:8888",
-    }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
-    }],
-  },
-  {
-    insecureFieldWarningEnabled: true,
-    isSecure: true,
-    isPasswordField: true,
-    matchingLogins: [],
-    items: [{
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
-    }],
-  },
-  {
-    insecureFieldWarningEnabled: true,
-    isSecure: true,
-    isPasswordField: true,
-    matchingLogins: [],
-    searchString: "foo",
     items: [],
   },
   {
-    generatedPassword: "9ljgfd4shyktb45",
-    insecureFieldWarningEnabled: true,
+    insecureFieldWarningEnabled: false,
+    insecureAutoFillFormsEnabled: false,
     isSecure: true,
     isPasswordField: true,
-    matchingLogins: [],
+    matchingLogins,
     items: [{
-      value: "9ljgfd4shyktb45",
-      label: "Use Generated Password",
-      style: "generatedPassword",
-      comment: "9ljgfd4shyktb45",
+      value: "emptypass1",
+      label: LABEL_NO_USERNAME,
+      style: "loginWithOrigin",
     }, {
-      value: "",
-      label: "View Saved Logins",
-      style: "loginsFooter",
-      comment: "mochi.test",
+      value: "temppass1",
+      label: "tempuser1",
+      style: "loginWithOrigin",
+    }, {
+      value: "testpass2",
+      label: "testuser2",
+      style: "loginWithOrigin",
+    }, {
+      value: "testpass3",
+      label: "testuser3",
+      style: "loginWithOrigin",
+    }, {
+      value: "zzzpass4",
+      label: "zzzuser4",
+      style: "loginWithOrigin",
     }],
   },
   {
-    generatedPassword: "9ljgfd4shyktb45",
-    insecureFieldWarningEnabled: true,
-    isSecure: true,
+    insecureFieldWarningEnabled: false,
+    insecureAutoFillFormsEnabled: false,
+    isSecure: false,
     isPasswordField: true,
-    matchingLogins: [],
-    searchString: "9ljgfd4shyktb45",
+    matchingLogins,
     items: [],
   },
 ];
 
 add_task(async function test_all_patterns() {
   LoginHelper.createLogger("LoginAutoCompleteResult");
-  Services.prefs.setBoolPref("signon.showAutoCompleteFooter", true);
   Services.prefs.setBoolPref("signon.showAutoCompleteOrigins", true);
 
   expectedResults.forEach(pattern => {
-    info(JSON.stringify(pattern, null, 2));
     Services.prefs.setBoolPref(PREF_INSECURE_FIELD_WARNING_ENABLED,
                                pattern.insecureFieldWarningEnabled);
-    let actual = new LoginAutoCompleteResult(pattern.searchString || "", pattern.matchingLogins, {
-      hostname: "mochi.test",
-      generatedPassword: pattern.generatedPassword,
+    Services.prefs.setBoolPref(PREF_INSECURE_AUTOFILLFORMS_ENABLED,
+                               pattern.insecureAutoFillFormsEnabled);
+    let actual = new LoginAutoCompleteResult("", pattern.matchingLogins, {
       isSecure: pattern.isSecure,
       isPasswordField: pattern.isPasswordField,
     });
-    equal(actual.matchCount, pattern.items.length, "Check matching row count");
     pattern.items.forEach((item, index) => {
-      equal(actual.getValueAt(index), item.value, `Value ${index}`);
-      equal(actual.getLabelAt(index), item.label, `Label ${index}`);
-      equal(actual.getStyleAt(index), item.style, `Style ${index}`);
-      equal(actual.getCommentAt(index), item.comment, `Comment ${index}`);
+      equal(actual.getValueAt(index), item.value);
+      equal(actual.getLabelAt(index), item.label);
+      equal(actual.getStyleAt(index), item.style);
     });
 
     if (pattern.items.length != 0) {
diff --git a/toolkit/components/passwordmgr/test/unit/xpcshell.ini b/toolkit/components/passwordmgr/test/unit/xpcshell.ini
index 978962d3d029..7f459174197a 100644
--- a/toolkit/components/passwordmgr/test/unit/xpcshell.ini
+++ b/toolkit/components/passwordmgr/test/unit/xpcshell.ini
@@ -27,8 +27,6 @@ run-if = buildapp == "browser"
 [test_isOriginMatching.js]
 [test_isUsernameFieldType.js]
 [test_legacy_empty_formSubmitURL.js]
-[test_LoginManagerParent_doAutocompleteSearch.js]
-[test_LoginManagerParent_getGeneratedPassword.js]
 [test_legacy_validation.js]
 [test_login_autocomplete_result.js]
 skip-if = os == "android"
diff --git a/toolkit/content/widgets/autocomplete-popup.js b/toolkit/content/widgets/autocomplete-popup.js
index f4ff338a55be..21a58b89db60 100644
--- a/toolkit/content/widgets/autocomplete-popup.js
+++ b/toolkit/content/widgets/autocomplete-popup.js
@@ -377,7 +377,6 @@ MozElements.MozAutocompleteRichlistboxPopup = class MozAutocompleteRichlistboxPo
           "autofill-footer",
           "autofill-clear-button",
           "autofill-insecureWarning",
-          "generatedPassword",
           "insecureWarning",
           "loginsFooter",
           "loginWithOrigin",
@@ -410,9 +409,8 @@ MozElements.MozAutocompleteRichlistboxPopup = class MozAutocompleteRichlistboxPo
           case "loginsFooter":
             options = { is: "autocomplete-richlistitem-logins-footer" };
             break;
-          case "generatedPassword":
           case "loginWithOrigin":
-            options = { is: "autocomplete-two-line-richlistitem" };
+            options = { is: "autocomplete-richlistitem-login-with-origin" };
             break;
           default:
             options = { is: "autocomplete-richlistitem" };
diff --git a/toolkit/content/widgets/autocomplete-richlistitem.js b/toolkit/content/widgets/autocomplete-richlistitem.js
index 34c6dbf10661..f642186e5bcf 100644
--- a/toolkit/content/widgets/autocomplete-richlistitem.js
+++ b/toolkit/content/widgets/autocomplete-richlistitem.js
@@ -988,20 +988,25 @@ class MozAutocompleteRichlistitemLoginsFooter extends MozElements.MozAutocomplet
         return;
       }
 
-      // ac-label gets populated from getCommentAt despite the attribute name.
-      // The "comment" is used to populate additional visible text.
-      let formHostname = this.getAttribute("ac-label");
       LoginHelper.openPasswordManager(this.ownerGlobal, {
-        filterString: formHostname,
+        filterString: this._data.hostname,
         entryPoint: "autocomplete",
       });
     }
 
     this.addEventListener("click", handleEvent);
   }
+
+  get _data() {
+    return JSON.parse(this.getAttribute("ac-value"));
+  }
+
+  _adjustAcItem() {
+    this._titleText.textContent = this._data.label;
+  }
 }
 
-class MozAutocompleteTwoLineRichlistitem extends MozElements.MozRichlistitem {
+class MozAutocompleteRichlistitemLoginWithOrigin extends MozElements.MozRichlistitem {
   connectedCallback() {
     if (this.delayConnectedCallback()) {
       return;
@@ -1016,10 +1021,7 @@ class MozAutocompleteTwoLineRichlistitem extends MozElements.MozRichlistitem {
 
   static get inheritedAttributes() {
     return {
-      // getLabelAt:
-      ".line1-label": "text=ac-value",
-      // getCommentAt:
-      ".line2-label": "text=ac-label",
+      ".login-username": "text=ac-value",
     };
   }
 
@@ -1027,11 +1029,11 @@ class MozAutocompleteTwoLineRichlistitem extends MozElements.MozRichlistitem {
     return `
       <div xmlns="http://www.w3.org/1999/xhtml"
            xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-           class="two-line-wrapper">
+           class="login-wrapper">
         <xul:image class="ac-site-icon"></xul:image>
-        <div class="labels-wrapper">
-          <div class="label-row line1-label"></div>
-          <div class="label-row line2-label"></div>
+        <div class="login-text">
+          <div class="login-row login-username"></div>
+          <div class="login-row login-origin"></div>
         </div>
       </div>
     `;
@@ -1043,6 +1045,16 @@ class MozAutocompleteTwoLineRichlistitem extends MozElements.MozRichlistitem {
     // Make item fit in popup as XUL box could not constrain
     // item's width
     this.firstElementChild.style.width = outerBoxRect.width + "px";
+
+    let data = JSON.parse(this.getAttribute("ac-label"));
+    let originElement = this.querySelector(".login-origin");
+    try {
+      let uri = Services.io.newURI(data.loginOrigin);
+      // Fallback to handle file: URIs
+      originElement.textContent = uri.displayHostPort || data.loginOrigin;
+    } catch (ex) {
+      originElement.textContent = data.loginOrigin;
+    }
   }
 
   _onOverflow() {}
@@ -1064,7 +1076,7 @@ customElements.define("autocomplete-richlistitem-logins-footer", MozAutocomplete
   extends: "richlistitem",
 });
 
-customElements.define("autocomplete-two-line-richlistitem", MozAutocompleteTwoLineRichlistitem, {
+customElements.define("autocomplete-richlistitem-login-with-origin", MozAutocompleteRichlistitemLoginWithOrigin, {
   extends: "richlistitem",
 });
 }
diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml
index 8f8094f57e14..caf8fccc0aa9 100644
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -1015,7 +1015,6 @@
                 "autofill-footer",
                 "autofill-clear-button",
                 "autofill-insecureWarning",
-                "generatedPassword",
                 "insecureWarning",
                 "loginsFooter",
                 "loginWithOrigin",
@@ -1048,9 +1047,8 @@
                 case "loginsFooter":
                   options = { is: "autocomplete-richlistitem-logins-footer" };
                   break;
-                case "generatedPassword":
                 case "loginWithOrigin":
-                  options = { is: "autocomplete-two-line-richlistitem" };
+                  options = { is: "autocomplete-richlistitem-login-with-origin" };
                   break;
                 default:
                   options = { is: "autocomplete-richlistitem" };
diff --git a/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties b/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
index fbb2b3a3a625..67f3a522d672 100644
--- a/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
+++ b/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
@@ -45,10 +45,6 @@ userSelectText2 = Select which login to update:
 removeLoginPrompt=Are you sure you wish to remove this login?
 removeLoginTitle=Remove login
 loginsDescriptionAll2=Logins for the following sites are stored on your computer
-
-# LOCALIZATION NOTE (useGeneratedPassword):
-# Shown in the autocomplete popup to allow filling a generated password into a password field.
-useGeneratedPassword=Use Generated Password
 # LOCALIZATION NOTE (loginHostAge):
 # This is used to show the context menu login items with their age.
 # 1st string is the username for the login, 2nd is the login's age.
@@ -56,7 +52,6 @@ loginHostAge=%1$S (%2$S)
 # LOCALIZATION NOTE (noUsername):
 # String is used on the context menu when a login doesn't have a username.
 noUsername=No username
-
 duplicateLoginTitle=Login already exists
 duplicateLogin=A duplicate login already exists.
 

From 4e71ffdf9d4ea64cb2e1e482aaa41ad47f657ad1 Mon Sep 17 00:00:00 2001
From: Mike Shal <mshal@mozilla.com>
Date: Tue, 21 May 2019 00:19:47 +0000
Subject: [PATCH 124/129] Bug 1552672 - Use is_tarfile() rather than
 is_zipfile() in mar repackaging; r=Callek

The zipfile.is_zipfile() function is overly lenient, in that non-zip
files that contain the four bytes "PK\005\006" near the end of the file
are reported as zip files even if the zip structure is not valid.
Occasionally, our target.tar.bz2 files randomly contain those 4 bytes at
the expected location, which causes the mar repackaging code to try to
process the package as a zip file instead of a tar file.

The tarfile.is_tarfile() logic looks a little more robust in that it
actually tries to open the file, so if we try tar first before falling
back to zip we should be a little more resilient.

Differential Revision: https://phabricator.services.mozilla.com/D31908

--HG--
extra : moz-landing-system : lando
---
 python/mozbuild/mozbuild/repackaging/mar.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/python/mozbuild/mozbuild/repackaging/mar.py b/python/mozbuild/mozbuild/repackaging/mar.py
index 6ddac41c8a0a..157e87c71102 100644
--- a/python/mozbuild/mozbuild/repackaging/mar.py
+++ b/python/mozbuild/mozbuild/repackaging/mar.py
@@ -31,16 +31,16 @@ def repackage_mar(topsrcdir, package, mar, output, mar_format='lzma', arch=None)
     ensureParentDir(output)
     tmpdir = tempfile.mkdtemp()
     try:
-        if zipfile.is_zipfile(package):
-            z = zipfile.ZipFile(package)
-            z.extractall(tmpdir)
-            filelist = z.namelist()
-            z.close()
-        else:
+        if tarfile.is_tarfile(package):
             z = tarfile.open(package)
             z.extractall(tmpdir)
             filelist = z.getnames()
             z.close()
+        else:
+            z = zipfile.ZipFile(package)
+            z.extractall(tmpdir)
+            filelist = z.namelist()
+            z.close()
 
         toplevel_dirs = set([mozpath.split(f)[0] for f in filelist])
         excluded_stuff = set([' ', '.background', '.DS_Store', '.VolumeIcon.icns'])

From e454136cb19a3efc7683df2f670ca1689d55e9f4 Mon Sep 17 00:00:00 2001
From: Bryce Van Dyk <bvandyk@mozilla.com>
Date: Thu, 16 May 2019 07:01:02 +0000
Subject: [PATCH 125/129] Bug 1547757 - Use a RefPtr to hold owner element ref
 when moving media resource load to background. r=cpearce

Differential Revision: https://phabricator.services.mozilla.com/D31019

--HG--
extra : moz-landing-system : lando
---
 dom/media/BaseMediaResource.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/media/BaseMediaResource.cpp b/dom/media/BaseMediaResource.cpp
index 1dcf2d7080ac..4a36d7c20de1 100644
--- a/dom/media/BaseMediaResource.cpp
+++ b/dom/media/BaseMediaResource.cpp
@@ -114,7 +114,7 @@ void BaseMediaResource::SetLoadInBackground(bool aLoadInBackground) {
     NS_WARNING("Null owner in MediaResource::SetLoadInBackground()");
     return;
   }
-  dom::HTMLMediaElement* element = owner->GetMediaElement();
+  RefPtr<dom::HTMLMediaElement> element = owner->GetMediaElement();
   if (!element) {
     NS_WARNING("Null element in MediaResource::SetLoadInBackground()");
     return;

From c4361da40f4045c68f157f1f40404cf35bcda4fc Mon Sep 17 00:00:00 2001
From: Coroiu Cristina <ccoroiu@mozilla.com>
Date: Tue, 21 May 2019 03:51:56 +0300
Subject: [PATCH 126/129] Backed out changeset 2e560a9e4bcf (bug 1551690) for
 build bustages

---
 build/build-clang/build-clang.py                    |  4 ++--
 build/build-clang/clang-8-macosx64.json             |  6 +++---
 build/build-clang/clang-tidy-macosx64.json          |  6 +++---
 build/build-clang/compiler-rt-cross-compile.patch   |  4 ++--
 build/macosx/cross-mozconfig.common                 |  2 +-
 build/moz.configure/init.configure                  | 13 +++----------
 .../test/configure/test_toolchain_configure.py      |  8 ++++----
 taskcluster/scripts/misc/build-cctools-port.sh      |  6 +++---
 8 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
index e25b55fea4ff..e6f60f836f70 100755
--- a/build/build-clang/build-clang.py
+++ b/build/build-clang/build-clang.py
@@ -294,7 +294,7 @@ def build_one_stage(cc, cxx, asm, ld, ar, ranlib, libtool,
                 "-DCMAKE_OSX_ARCHITECTURES=x86_64",
                 "-DDARWIN_osx_ARCHS=x86_64",
                 "-DDARWIN_osx_SYSROOT=%s" % slashify_path(os.getenv("CROSS_SYSROOT")),
-                "-DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin"
+                "-DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-darwin11"
             ]
         return cmake_args
 
@@ -786,7 +786,7 @@ if __name__ == "__main__":
         extra_cxxflags = ["-stdlib=libc++"]
         extra_cxxflags2 = ["-stdlib=libc++"]
 
-        extra_flags = ["-target", "x86_64-apple-darwin", "-mlinker-version=137",
+        extra_flags = ["-target", "x86_64-darwin11", "-mlinker-version=137",
                        "-B", "%s/bin" % os.getenv("CROSS_CCTOOLS_PATH"),
                        "-isysroot", os.getenv("CROSS_SYSROOT"),
                        # technically the sysroot flag there should be enough to deduce this,
diff --git a/build/build-clang/clang-8-macosx64.json b/build/build-clang/clang-8-macosx64.json
index 434c99563f9f..e81714d01318 100644
--- a/build/build-clang/clang-8-macosx64.json
+++ b/build/build-clang/clang-8-macosx64.json
@@ -16,9 +16,9 @@
     "cc": "/builds/worker/workspace/build/src/clang/bin/clang",
     "cxx": "/builds/worker/workspace/build/src/clang/bin/clang++",
     "as": "/builds/worker/workspace/build/src/clang/bin/clang",
-    "ar": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin-ar",
-    "ranlib": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin-ranlib",
-    "libtool": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin-libtool",
+    "ar": "/builds/worker/workspace/build/src/cctools/bin/x86_64-darwin11-ar",
+    "ranlib": "/builds/worker/workspace/build/src/cctools/bin/x86_64-darwin11-ranlib",
+    "libtool": "/builds/worker/workspace/build/src/cctools/bin/x86_64-darwin11-libtool",
     "ld": "/builds/worker/workspace/build/src/clang/bin/clang",
     "patches": [
       "static-llvm-symbolizer.patch",
diff --git a/build/build-clang/clang-tidy-macosx64.json b/build/build-clang/clang-tidy-macosx64.json
index 588f4f6c7d25..8226b6f6f2da 100644
--- a/build/build-clang/clang-tidy-macosx64.json
+++ b/build/build-clang/clang-tidy-macosx64.json
@@ -16,9 +16,9 @@
     "cc": "/builds/worker/workspace/build/src/clang/bin/clang",
     "cxx": "/builds/worker/workspace/build/src/clang/bin/clang++",
     "as": "/builds/worker/workspace/build/src/clang/bin/clang",
-    "ar": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin-ar",
-    "ranlib": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin-ranlib",
-    "libtool": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin-libtool",
+    "ar": "/builds/worker/workspace/build/src/cctools/bin/x86_64-darwin11-ar",
+    "ranlib": "/builds/worker/workspace/build/src/cctools/bin/x86_64-darwin11-ranlib",
+    "libtool": "/builds/worker/workspace/build/src/cctools/bin/x86_64-darwin11-libtool",
     "ld": "/builds/worker/workspace/build/src/clang/bin/clang",
     "patches": [
       "clang-tidy-8.patch"
diff --git a/build/build-clang/compiler-rt-cross-compile.patch b/build/build-clang/compiler-rt-cross-compile.patch
index 4ab24952ac70..f293438178b1 100644
--- a/build/build-clang/compiler-rt-cross-compile.patch
+++ b/build/build-clang/compiler-rt-cross-compile.patch
@@ -1,4 +1,4 @@
-Add `-target x86_64-apple-darwin' to the compiler-rt overridden CFLAGS
+Add `-target x86_64-darwin11' to the compiler-rt overridden CFLAGS
 
 diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
 index 28d398672..aac68bf36 100644
@@ -9,7 +9,7 @@ index 28d398672..aac68bf36 100644
    set(DARWIN_EXCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Darwin-excludes)
  
 -  set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer")
-+  set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer -target x86_64-apple-darwin -isysroot ${CMAKE_OSX_SYSROOT} -I${CMAKE_OSX_SYSROOT}/usr/include")
++  set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer -target x86_64-darwin11 -isysroot ${CMAKE_OSX_SYSROOT} -I${CMAKE_OSX_SYSROOT}/usr/include")
    set(CMAKE_C_FLAGS "")
    set(CMAKE_CXX_FLAGS "")
    set(CMAKE_ASM_FLAGS "")
diff --git a/build/macosx/cross-mozconfig.common b/build/macosx/cross-mozconfig.common
index 1404260a5ab6..51badd89bdbc 100644
--- a/build/macosx/cross-mozconfig.common
+++ b/build/macosx/cross-mozconfig.common
@@ -37,7 +37,7 @@ export HOST_CFLAGS="-g"
 export HOST_CXXFLAGS="-g"
 export HOST_LDFLAGS="-g"
 
-ac_add_options --target=x86_64-apple-darwin
+ac_add_options --target=x86_64-apple-darwin11
 export MACOS_SDK_DIR=$CROSS_SYSROOT
 export MACOS_PRIVATE_FRAMEWORKS_DIR=$CROSS_PRIVATE_FRAMEWORKS
 
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index f28a5849e1da..7573e6b5b6a6 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -750,15 +750,6 @@ def split_triplet(triplet, allow_unknown=False):
     def bitness(cpu):
         return CPU_bitness[cpu]
 
-    # Toolchains, most notably for cross compilation may use cpu-os
-    # prefixes. We need to be more specific about the LLVM target on Mac
-    # so cross-language LTO will work correctly.
-
-    if os.startswith('darwin'):
-        toolchain = '%s-apple-%s' % (cpu, os)
-    else:
-        toolchain='%s-%s' % (cpu, os),
-
     return namespace(
         alias=triplet,
         cpu=sanitize(CPU, canonical_cpu),
@@ -768,7 +759,9 @@ def split_triplet(triplet, allow_unknown=False):
         endianness=sanitize(Endianness, endianness),
         raw_cpu=cpu,
         raw_os=os,
-        toolchain=toolchain,
+        # Toolchains, most notably for cross compilation may use cpu-os
+        # prefixes.
+        toolchain='%s-%s' % (cpu, os),
     )
 
 
diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
index 773b31bcec8b..997a29626802 100755
--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
@@ -206,9 +206,9 @@ DEFAULT_CLANGXX = CLANGXX_3_6
 def CLANG_PLATFORM(gcc_platform):
     base = {
         '--target=x86_64-linux-gnu': GCC_PLATFORM_X86_64_LINUX[None],
-        '--target=x86_64-apple-darwin11.2.0': GCC_PLATFORM_X86_64_OSX[None],
+        '--target=x86_64-darwin11.2.0': GCC_PLATFORM_X86_64_OSX[None],
         '--target=i686-linux-gnu': GCC_PLATFORM_X86_LINUX[None],
-        '--target=i686-apple-darwin11.2.0': GCC_PLATFORM_X86_OSX[None],
+        '--target=i686-darwin11.2.0': GCC_PLATFORM_X86_OSX[None],
         '--target=arm-linux-gnu': GCC_PLATFORM_ARM_LINUX[None],
     }
     undo_gcc_platform = {
@@ -1332,10 +1332,10 @@ class OSXCrossToolchainTest(BaseToolchainTest):
     def test_osx_cross(self):
         self.do_toolchain_test(self.PATHS, {
             'c_compiler': self.DEFAULT_CLANG_RESULT + {
-                'flags': ['--target=i686-apple-darwin11.2.0'],
+                'flags': ['--target=i686-darwin11.2.0'],
             },
             'cxx_compiler': self.DEFAULT_CLANGXX_RESULT + {
-                'flags': ['--target=i686-apple-darwin11.2.0'],
+                'flags': ['--target=i686-darwin11.2.0'],
             },
             'host_c_compiler': self.DEFAULT_CLANG_RESULT,
             'host_cxx_compiler': self.DEFAULT_CLANGXX_RESULT,
diff --git a/taskcluster/scripts/misc/build-cctools-port.sh b/taskcluster/scripts/misc/build-cctools-port.sh
index 9d16f48504a4..ae289ab2d7d1 100755
--- a/taskcluster/scripts/misc/build-cctools-port.sh
+++ b/taskcluster/scripts/misc/build-cctools-port.sh
@@ -42,15 +42,15 @@ export CC=$CLANG_DIR/bin/clang
 export CXX=$CLANG_DIR/bin/clang++
 export LDFLAGS="-lpthread -Wl,-rpath-link,$CLANG_DIR/lib"
 ./autogen.sh
-./configure --prefix=$CROSSTOOLS_BUILD_DIR --target=x86_64-apple-darwin --with-llvm-config=$CLANG_DIR/bin/llvm-config
+./configure --prefix=$CROSSTOOLS_BUILD_DIR --target=x86_64-darwin11 --with-llvm-config=$CLANG_DIR/bin/llvm-config
 
 # Build cctools
 make -j `nproc --all` install
 strip $CROSSTOOLS_BUILD_DIR/bin/*
 # cctools-port doesn't include dsymutil but clang will need to find it.
-cp $CLANG_DIR/bin/dsymutil $CROSSTOOLS_BUILD_DIR/bin/x86_64-apple-darwin-dsymutil
+cp $CLANG_DIR/bin/dsymutil $CROSSTOOLS_BUILD_DIR/bin/x86_64-darwin11-dsymutil
 # various build scripts based on cmake want to find `lipo` without a prefix
-cp $CROSSTOOLS_BUILD_DIR/bin/x86_64-apple-darwin-lipo $CROSSTOOLS_BUILD_DIR/bin/lipo
+cp $CROSSTOOLS_BUILD_DIR/bin/x86_64-darwin11-lipo $CROSSTOOLS_BUILD_DIR/bin/lipo
 
 # Put a tarball in the artifacts dir
 mkdir -p $UPLOAD_DIR

From 1e8a4f44fd42158a90bcd26d942e62a570ad7128 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Tue, 21 May 2019 00:57:38 +0000
Subject: [PATCH 127/129] Bug 1553001 - Move module APIs out of jsapi.{cpp,h}
 into js/public/Modules.h and js/src/vm/Modules.cpp for better isolation of
 module-related APIs.  r=arai

Differential Revision: https://phabricator.services.mozilla.com/D31917

--HG--
rename : js/src/jsapi.h => js/public/Modules.h
rename : js/src/jsapi.cpp => js/src/vm/Modules.cpp
extra : moz-landing-system : lando
---
 dom/base/nsJSUtils.cpp          |   1 +
 dom/script/LoadedScript.cpp     |   1 +
 dom/script/ScriptLoader.cpp     |   1 +
 js/public/Modules.h             | 162 ++++++++++++++++++++++++++++++++
 js/src/builtin/ModuleObject.cpp |   1 +
 js/src/jsapi.cpp                | 120 -----------------------
 js/src/jsapi.h                  | 126 -------------------------
 js/src/moz.build                |   2 +
 js/src/shell/js.cpp             |   1 +
 js/src/vm/Modules.cpp           | 160 +++++++++++++++++++++++++++++++
 js/src/vm/Runtime.h             |   1 +
 js/src/vm/SelfHosting.cpp       |   1 +
 12 files changed, 331 insertions(+), 246 deletions(-)
 create mode 100644 js/public/Modules.h
 create mode 100644 js/src/vm/Modules.cpp

diff --git a/dom/base/nsJSUtils.cpp b/dom/base/nsJSUtils.cpp
index 97c9eb8199be..53c06fa03425 100644
--- a/dom/base/nsJSUtils.cpp
+++ b/dom/base/nsJSUtils.cpp
@@ -15,6 +15,7 @@
 #include "jsapi.h"
 #include "jsfriendapi.h"
 #include "js/CompilationAndEvaluation.h"
+#include "js/Modules.h"  // JS::CompileModule, JS::GetModuleScript, JS::Module{Instantiate,Evaluate}
 #include "js/OffThreadScriptCompilation.h"
 #include "js/SourceText.h"
 #include "nsIScriptContext.h"
diff --git a/dom/script/LoadedScript.cpp b/dom/script/LoadedScript.cpp
index 8b9b686182b5..1cfb96abd053 100644
--- a/dom/script/LoadedScript.cpp
+++ b/dom/script/LoadedScript.cpp
@@ -9,6 +9,7 @@
 #include "mozilla/HoldDropJSObjects.h"
 
 #include "jsfriendapi.h"
+#include "js/Modules.h"  // JS::{Get,Set}ModulePrivate
 #include "ScriptLoader.h"
 
 namespace mozilla {
diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp
index 1ce18cb0b2f0..a4a7ea9a27e9 100644
--- a/dom/script/ScriptLoader.cpp
+++ b/dom/script/ScriptLoader.cpp
@@ -16,6 +16,7 @@
 #include "jsfriendapi.h"
 #include "js/CompilationAndEvaluation.h"
 #include "js/MemoryFunctions.h"
+#include "js/Modules.h"  // JS::CompileModule, JS::FinishDynamicModuleImport, JS::{G,S}etModuleResolveHook, JS::Get{ModulePrivate,ModuleScript,RequestedModule{s,Specifier,SourcePos}}, JS::SetModule{DynamicImport,Metadata}Hook
 #include "js/OffThreadScriptCompilation.h"
 #include "js/Realm.h"
 #include "js/SourceText.h"
diff --git a/js/public/Modules.h b/js/public/Modules.h
new file mode 100644
index 000000000000..b96b21b4fb3d
--- /dev/null
+++ b/js/public/Modules.h
@@ -0,0 +1,162 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: set ts=8 sts=2 et sw=2 tw=80:
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* JavaScript module (as in, the syntactic construct) operations. */
+
+#ifndef js_Modules_h
+#define js_Modules_h
+
+#include <stdint.h>  // uint32_t
+
+#include "jstypes.h"  // JS_PUBLIC_API
+
+#include "js/CompileOptions.h"  // JS::ReadOnlyCompileOptions
+#include "js/RootingAPI.h"      // JS::{Mutable,}Handle
+#include "js/Value.h"           // JS::Value
+
+struct JSContext;
+class JSObject;
+struct JSRuntime;
+class JSString;
+
+namespace JS {
+template <typename UnitT>
+class SourceText;
+}  // namespace JS
+
+namespace JS {
+
+using ModuleResolveHook = JSObject* (*)(JSContext*, Handle<Value>,
+                                        Handle<JSString*>);
+
+/**
+ * Get the HostResolveImportedModule hook for the runtime.
+ */
+extern JS_PUBLIC_API ModuleResolveHook GetModuleResolveHook(JSRuntime* rt);
+
+/**
+ * Set the HostResolveImportedModule hook for the runtime to the given function.
+ */
+extern JS_PUBLIC_API void SetModuleResolveHook(JSRuntime* rt,
+                                               ModuleResolveHook func);
+
+using ModuleMetadataHook = bool (*)(JSContext*, Handle<Value>,
+                                    Handle<JSObject*>);
+
+/**
+ * Get the hook for populating the import.meta metadata object.
+ */
+extern JS_PUBLIC_API ModuleMetadataHook GetModuleMetadataHook(JSRuntime* rt);
+
+/**
+ * Set the hook for populating the import.meta metadata object to the given
+ * function.
+ */
+extern JS_PUBLIC_API void SetModuleMetadataHook(JSRuntime* rt,
+                                                ModuleMetadataHook func);
+
+using ModuleDynamicImportHook = bool (*)(JSContext* cx,
+                                         Handle<Value> referencingPrivate,
+                                         Handle<JSString*> specifier,
+                                         Handle<JSObject*> promise);
+
+/**
+ * Get the HostImportModuleDynamically hook for the runtime.
+ */
+extern JS_PUBLIC_API ModuleDynamicImportHook
+GetModuleDynamicImportHook(JSRuntime* rt);
+
+/**
+ * Set the HostImportModuleDynamically hook for the runtime to the given
+ * function.
+ *
+ * If this hook is not set (or set to nullptr) then the JS engine will throw an
+ * exception if dynamic module import is attempted.
+ */
+extern JS_PUBLIC_API void SetModuleDynamicImportHook(
+    JSRuntime* rt, ModuleDynamicImportHook func);
+
+extern JS_PUBLIC_API bool FinishDynamicModuleImport(
+    JSContext* cx, Handle<Value> referencingPrivate,
+    Handle<JSString*> specifier, Handle<JSObject*> promise);
+
+/**
+ * Parse the given source buffer as a module in the scope of the current global
+ * of cx and return a source text module record.
+ */
+extern JS_PUBLIC_API bool CompileModule(JSContext* cx,
+                                        const ReadOnlyCompileOptions& options,
+                                        SourceText<char16_t>& srcBuf,
+                                        MutableHandle<JSObject*> moduleRecord);
+
+/**
+ * Set a private value associated with a source text module record.
+ */
+extern JS_PUBLIC_API void SetModulePrivate(JSObject* module,
+                                           const Value& value);
+
+/**
+ * Get the private value associated with a source text module record.
+ */
+extern JS_PUBLIC_API Value GetModulePrivate(JSObject* module);
+
+/*
+ * Perform the ModuleInstantiate operation on the given source text module
+ * record.
+ *
+ * This transitively resolves all module dependencies (calling the
+ * HostResolveImportedModule hook) and initializes the environment record for
+ * the module.
+ */
+extern JS_PUBLIC_API bool ModuleInstantiate(JSContext* cx,
+                                            Handle<JSObject*> moduleRecord);
+
+/*
+ * Perform the ModuleEvaluate operation on the given source text module record.
+ *
+ * This does nothing if this module has already been evaluated. Otherwise, it
+ * transitively evaluates all dependences of this module and then evaluates this
+ * module.
+ *
+ * ModuleInstantiate must have completed prior to calling this.
+ */
+extern JS_PUBLIC_API bool ModuleEvaluate(JSContext* cx,
+                                         Handle<JSObject*> moduleRecord);
+
+/*
+ * Get a list of the module specifiers used by a source text module
+ * record to request importation of modules.
+ *
+ * The result is a JavaScript array of object values.  To extract the individual
+ * values use only JS_GetArrayLength and JS_GetElement with indices 0 to length
+ * - 1.
+ *
+ * The element values are objects with the following properties:
+ *  - moduleSpecifier: the module specifier string
+ *  - lineNumber: the line number of the import in the source text
+ *  - columnNumber: the column number of the import in the source text
+ *
+ * These property values can be extracted with GetRequestedModuleSpecifier() and
+ * GetRequestedModuleSourcePos()
+ */
+extern JS_PUBLIC_API JSObject* GetRequestedModules(
+    JSContext* cx, Handle<JSObject*> moduleRecord);
+
+extern JS_PUBLIC_API JSString* GetRequestedModuleSpecifier(
+    JSContext* cx, Handle<Value> requestedModuleObject);
+
+extern JS_PUBLIC_API void GetRequestedModuleSourcePos(
+    JSContext* cx, Handle<Value> requestedModuleObject, uint32_t* lineNumber,
+    uint32_t* columnNumber);
+
+/*
+ * Get the top-level script for a module which has not yet been executed.
+ */
+extern JS_PUBLIC_API JSScript* GetModuleScript(Handle<JSObject*> moduleRecord);
+
+}  // namespace JS
+
+#endif  // js_Modules_h
diff --git a/js/src/builtin/ModuleObject.cpp b/js/src/builtin/ModuleObject.cpp
index 6241284754fb..e0cf814d4e22 100644
--- a/js/src/builtin/ModuleObject.cpp
+++ b/js/src/builtin/ModuleObject.cpp
@@ -16,6 +16,7 @@
 #include "gc/FreeOp.h"
 #include "gc/Policy.h"
 #include "gc/Tracer.h"
+#include "js/Modules.h"  // JS::GetModulePrivate, JS::ModuleDynamicImportHook
 #include "js/PropertySpec.h"
 #include "vm/AsyncFunction.h"
 #include "vm/AsyncIteration.h"
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 66f15ec5985b..ba07226f1af5 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -3689,74 +3689,6 @@ JS_PUBLIC_API JSString* JS_DecompileFunction(JSContext* cx,
   return FunctionToString(cx, fun, /* isToSource = */ false);
 }
 
-JS_PUBLIC_API JS::ModuleResolveHook JS::GetModuleResolveHook(JSRuntime* rt) {
-  AssertHeapIsIdle();
-  return rt->moduleResolveHook;
-}
-
-JS_PUBLIC_API void JS::SetModuleResolveHook(JSRuntime* rt,
-                                            JS::ModuleResolveHook func) {
-  AssertHeapIsIdle();
-  rt->moduleResolveHook = func;
-}
-
-JS_PUBLIC_API JS::ModuleMetadataHook JS::GetModuleMetadataHook(JSRuntime* rt) {
-  AssertHeapIsIdle();
-  return rt->moduleMetadataHook;
-}
-
-JS_PUBLIC_API void JS::SetModuleMetadataHook(JSRuntime* rt,
-                                             JS::ModuleMetadataHook func) {
-  AssertHeapIsIdle();
-  rt->moduleMetadataHook = func;
-}
-
-JS_PUBLIC_API JS::ModuleDynamicImportHook JS::GetModuleDynamicImportHook(
-    JSRuntime* rt) {
-  AssertHeapIsIdle();
-  return rt->moduleDynamicImportHook;
-}
-
-JS_PUBLIC_API void JS::SetModuleDynamicImportHook(
-    JSRuntime* rt, JS::ModuleDynamicImportHook func) {
-  AssertHeapIsIdle();
-  rt->moduleDynamicImportHook = func;
-}
-
-JS_PUBLIC_API bool JS::FinishDynamicModuleImport(JSContext* cx,
-                                                 HandleValue referencingPrivate,
-                                                 HandleString specifier,
-                                                 HandleObject promise) {
-  AssertHeapIsIdle();
-  CHECK_THREAD(cx);
-  cx->check(referencingPrivate, promise);
-
-  return js::FinishDynamicModuleImport(cx, referencingPrivate, specifier,
-                                       promise);
-}
-
-JS_PUBLIC_API bool JS::CompileModule(JSContext* cx,
-                                     const ReadOnlyCompileOptions& options,
-                                     SourceText<char16_t>& srcBuf,
-                                     JS::MutableHandleObject module) {
-  MOZ_ASSERT(!cx->zone()->isAtomsZone());
-  AssertHeapIsIdle();
-  CHECK_THREAD(cx);
-
-  module.set(frontend::CompileModule(cx, options, srcBuf));
-  return !!module;
-}
-
-JS_PUBLIC_API void JS::SetModulePrivate(JSObject* module,
-                                        const JS::Value& value) {
-  JSRuntime* rt = module->zone()->runtimeFromMainThread();
-  module->as<ModuleObject>().scriptSourceObject()->setPrivate(rt, value);
-}
-
-JS_PUBLIC_API JS::Value JS::GetModulePrivate(JSObject* module) {
-  return module->as<ModuleObject>().scriptSourceObject()->canonicalPrivate();
-}
-
 JS_PUBLIC_API void JS::SetScriptPrivate(JSScript* script,
                                         const JS::Value& value) {
   JSRuntime* rt = script->zone()->runtimeFromMainThread();
@@ -3787,58 +3719,6 @@ JS_PUBLIC_API void JS::SetScriptPrivateReferenceHooks(
   rt->scriptPrivateReleaseHook = releaseHook;
 }
 
-JS_PUBLIC_API bool JS::ModuleInstantiate(JSContext* cx,
-                                         JS::HandleObject moduleArg) {
-  AssertHeapIsIdle();
-  CHECK_THREAD(cx);
-  cx->releaseCheck(moduleArg);
-  return ModuleObject::Instantiate(cx, moduleArg.as<ModuleObject>());
-}
-
-JS_PUBLIC_API bool JS::ModuleEvaluate(JSContext* cx,
-                                      JS::HandleObject moduleArg) {
-  AssertHeapIsIdle();
-  CHECK_THREAD(cx);
-  cx->releaseCheck(moduleArg);
-  return ModuleObject::Evaluate(cx, moduleArg.as<ModuleObject>());
-}
-
-JS_PUBLIC_API JSObject* JS::GetRequestedModules(JSContext* cx,
-                                                JS::HandleObject moduleArg) {
-  AssertHeapIsIdle();
-  CHECK_THREAD(cx);
-  cx->check(moduleArg);
-  return &moduleArg->as<ModuleObject>().requestedModules();
-}
-
-JS_PUBLIC_API JSString* JS::GetRequestedModuleSpecifier(JSContext* cx,
-                                                        JS::HandleValue value) {
-  AssertHeapIsIdle();
-  CHECK_THREAD(cx);
-  cx->check(value);
-  JSObject* obj = &value.toObject();
-  return obj->as<RequestedModuleObject>().moduleSpecifier();
-}
-
-JS_PUBLIC_API void JS::GetRequestedModuleSourcePos(JSContext* cx,
-                                                   JS::HandleValue value,
-                                                   uint32_t* lineNumber,
-                                                   uint32_t* columnNumber) {
-  AssertHeapIsIdle();
-  CHECK_THREAD(cx);
-  cx->check(value);
-  MOZ_ASSERT(lineNumber);
-  MOZ_ASSERT(columnNumber);
-  auto& requested = value.toObject().as<RequestedModuleObject>();
-  *lineNumber = requested.lineNumber();
-  *columnNumber = requested.columnNumber();
-}
-
-JS_PUBLIC_API JSScript* JS::GetModuleScript(JS::HandleObject moduleRecord) {
-  AssertHeapIsIdle();
-  return moduleRecord->as<ModuleObject>().script();
-}
-
 JS_PUBLIC_API JSObject* JS_New(JSContext* cx, HandleObject ctor,
                                const JS::HandleValueArray& inputArgs) {
   AssertHeapIsIdle();
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 21908759fa73..6148d4b41e28 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1905,78 +1905,6 @@ extern JS_PUBLIC_API JSString* JS_DecompileFunction(
 
 namespace JS {
 
-using ModuleResolveHook = JSObject* (*)(JSContext*, HandleValue, HandleString);
-
-/**
- * Get the HostResolveImportedModule hook for the runtime.
- */
-extern JS_PUBLIC_API ModuleResolveHook GetModuleResolveHook(JSRuntime* rt);
-
-/**
- * Set the HostResolveImportedModule hook for the runtime to the given function.
- */
-extern JS_PUBLIC_API void SetModuleResolveHook(JSRuntime* rt,
-                                               ModuleResolveHook func);
-
-using ModuleMetadataHook = bool (*)(JSContext*, HandleValue, HandleObject);
-
-/**
- * Get the hook for populating the import.meta metadata object.
- */
-extern JS_PUBLIC_API ModuleMetadataHook GetModuleMetadataHook(JSRuntime* rt);
-
-/**
- * Set the hook for populating the import.meta metadata object to the given
- * function.
- */
-extern JS_PUBLIC_API void SetModuleMetadataHook(JSRuntime* rt,
-                                                ModuleMetadataHook func);
-
-using ModuleDynamicImportHook = bool (*)(JSContext* cx,
-                                         HandleValue referencingPrivate,
-                                         HandleString specifier,
-                                         HandleObject promise);
-
-/**
- * Get the HostImportModuleDynamically hook for the runtime.
- */
-extern JS_PUBLIC_API ModuleDynamicImportHook
-GetModuleDynamicImportHook(JSRuntime* rt);
-
-/**
- * Set the HostImportModuleDynamically hook for the runtime to the given
- * function.
- *
- * If this hook is not set (or set to nullptr) then the JS engine will throw an
- * exception if dynamic module import is attempted.
- */
-extern JS_PUBLIC_API void SetModuleDynamicImportHook(
-    JSRuntime* rt, ModuleDynamicImportHook func);
-
-extern JS_PUBLIC_API bool FinishDynamicModuleImport(
-    JSContext* cx, HandleValue referencingPrivate, HandleString specifier,
-    HandleObject promise);
-
-/**
- * Parse the given source buffer as a module in the scope of the current global
- * of cx and return a source text module record.
- */
-extern JS_PUBLIC_API bool CompileModule(JSContext* cx,
-                                        const ReadOnlyCompileOptions& options,
-                                        SourceText<char16_t>& srcBuf,
-                                        JS::MutableHandleObject moduleRecord);
-
-/**
- * Set a private value associated with a source text module record.
- */
-extern JS_PUBLIC_API void SetModulePrivate(JSObject* module,
-                                           const JS::Value& value);
-
-/**
- * Get the private value associated with a source text module record.
- */
-extern JS_PUBLIC_API JS::Value GetModulePrivate(JSObject* module);
-
 /**
  * Set a private value associated with a script. Note that this value is shared
  * by all nested scripts compiled from a single source file.
@@ -2010,60 +1938,6 @@ extern JS_PUBLIC_API void SetScriptPrivateReferenceHooks(
     JSRuntime* rt, ScriptPrivateReferenceHook addRefHook,
     ScriptPrivateReferenceHook releaseHook);
 
-/*
- * Perform the ModuleInstantiate operation on the given source text module
- * record.
- *
- * This transitively resolves all module dependencies (calling the
- * HostResolveImportedModule hook) and initializes the environment record for
- * the module.
- */
-extern JS_PUBLIC_API bool ModuleInstantiate(JSContext* cx,
-                                            JS::HandleObject moduleRecord);
-
-/*
- * Perform the ModuleEvaluate operation on the given source text module record.
- *
- * This does nothing if this module has already been evaluated. Otherwise, it
- * transitively evaluates all dependences of this module and then evaluates this
- * module.
- *
- * ModuleInstantiate must have completed prior to calling this.
- */
-extern JS_PUBLIC_API bool ModuleEvaluate(JSContext* cx,
-                                         JS::HandleObject moduleRecord);
-
-/*
- * Get a list of the module specifiers used by a source text module
- * record to request importation of modules.
- *
- * The result is a JavaScript array of object values.  To extract the individual
- * values use only JS_GetArrayLength and JS_GetElement with indices 0 to length
- * - 1.
- *
- * The element values are objects with the following properties:
- *  - moduleSpecifier: the module specifier string
- *  - lineNumber: the line number of the import in the source text
- *  - columnNumber: the column number of the import in the source text
- *
- * These property values can be extracted with GetRequestedModuleSpecifier() and
- * GetRequestedModuleSourcePos()
- */
-extern JS_PUBLIC_API JSObject* GetRequestedModules(
-    JSContext* cx, JS::HandleObject moduleRecord);
-
-extern JS_PUBLIC_API JSString* GetRequestedModuleSpecifier(
-    JSContext* cx, JS::HandleValue requestedModuleObject);
-
-extern JS_PUBLIC_API void GetRequestedModuleSourcePos(
-    JSContext* cx, JS::HandleValue requestedModuleObject, uint32_t* lineNumber,
-    uint32_t* columnNumber);
-
-/*
- * Get the top-level script for a module which has not yet been executed.
- */
-extern JS_PUBLIC_API JSScript* GetModuleScript(JS::HandleObject moduleRecord);
-
 } /* namespace JS */
 
 #if defined(JS_BUILD_BINAST)
diff --git a/js/src/moz.build b/js/src/moz.build
index b898fe3c3a53..0c05e108ee78 100755
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -146,6 +146,7 @@ EXPORTS.js += [
     '../public/LocaleSensitive.h',
     '../public/MemoryFunctions.h',
     '../public/MemoryMetrics.h',
+    '../public/Modules.h',
     '../public/OffThreadScriptCompilation.h',
     '../public/Principals.h',
     '../public/Printf.h',
@@ -304,6 +305,7 @@ UNIFIED_SOURCES += [
     'vm/JSScript.cpp',
     'vm/List.cpp',
     'vm/MemoryMetrics.cpp',
+    'vm/Modules.cpp',
     'vm/NativeObject.cpp',
     'vm/ObjectGroup.cpp',
     'vm/OffThreadScriptCompilation.cpp',
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 944e918f2aa4..bbdee264bf07 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -98,6 +98,7 @@
 #include "js/Initialization.h"
 #include "js/JSON.h"
 #include "js/MemoryFunctions.h"
+#include "js/Modules.h"  // JS::GetModulePrivate, JS::SetModule{DynamicImport,Metadata,Resolve}Hook, JS::SetModulePrivate
 #include "js/Printf.h"
 #include "js/PropertySpec.h"
 #include "js/Realm.h"
diff --git a/js/src/vm/Modules.cpp b/js/src/vm/Modules.cpp
new file mode 100644
index 000000000000..059c12e38fb4
--- /dev/null
+++ b/js/src/vm/Modules.cpp
@@ -0,0 +1,160 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: set ts=8 sts=2 et sw=2 tw=80:
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* JavaScript modules (as in, the syntactic construct) implementation. */
+
+#include "js/Modules.h"
+
+#include "mozilla/Assertions.h"  // MOZ_ASSERT
+
+#include <stdint.h>  // uint32_t
+
+#include "jsapi.h"    // js::AssertHeapIsIdle
+#include "jstypes.h"  // JS_PUBLIC_API
+
+#include "builtin/ModuleObject.h"  // js::FinishDynamicModuleImport, js::{,Requested}ModuleObject
+#include "frontend/BytecodeCompiler.h"  // js::frontend::CompileModule
+#include "js/RootingAPI.h"              // JS::MutableHandle
+#include "js/Value.h"                   // JS::Value
+#include "vm/JSContext.h"               // CHECK_THREAD, JSContext
+#include "vm/JSObject.h"                // JSObject
+#include "vm/Runtime.h"                 // JSRuntime
+
+#include "vm/JSContext-inl.h"  // JSContext::{c,releaseC}heck
+
+using js::AssertHeapIsIdle;
+using js::ModuleObject;
+using js::RequestedModuleObject;
+
+JS_PUBLIC_API JS::ModuleResolveHook JS::GetModuleResolveHook(JSRuntime* rt) {
+  AssertHeapIsIdle();
+
+  return rt->moduleResolveHook;
+}
+
+JS_PUBLIC_API void JS::SetModuleResolveHook(JSRuntime* rt,
+                                            ModuleResolveHook func) {
+  AssertHeapIsIdle();
+
+  rt->moduleResolveHook = func;
+}
+
+JS_PUBLIC_API JS::ModuleMetadataHook JS::GetModuleMetadataHook(JSRuntime* rt) {
+  AssertHeapIsIdle();
+
+  return rt->moduleMetadataHook;
+}
+
+JS_PUBLIC_API void JS::SetModuleMetadataHook(JSRuntime* rt,
+                                             ModuleMetadataHook func) {
+  AssertHeapIsIdle();
+
+  rt->moduleMetadataHook = func;
+}
+
+JS_PUBLIC_API JS::ModuleDynamicImportHook JS::GetModuleDynamicImportHook(
+    JSRuntime* rt) {
+  AssertHeapIsIdle();
+
+  return rt->moduleDynamicImportHook;
+}
+
+JS_PUBLIC_API void JS::SetModuleDynamicImportHook(
+    JSRuntime* rt, ModuleDynamicImportHook func) {
+  AssertHeapIsIdle();
+
+  rt->moduleDynamicImportHook = func;
+}
+
+JS_PUBLIC_API bool JS::FinishDynamicModuleImport(
+    JSContext* cx, Handle<Value> referencingPrivate,
+    Handle<JSString*> specifier, Handle<JSObject*> promise) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+  cx->check(referencingPrivate, promise);
+
+  return js::FinishDynamicModuleImport(cx, referencingPrivate, specifier,
+                                       promise);
+}
+
+JS_PUBLIC_API bool JS::CompileModule(JSContext* cx,
+                                     const ReadOnlyCompileOptions& options,
+                                     SourceText<char16_t>& srcBuf,
+                                     MutableHandle<JSObject*> module) {
+  MOZ_ASSERT(!cx->zone()->isAtomsZone());
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+
+  module.set(js::frontend::CompileModule(cx, options, srcBuf));
+  return !!module;
+}
+
+JS_PUBLIC_API void JS::SetModulePrivate(JSObject* module, const Value& value) {
+  JSRuntime* rt = module->zone()->runtimeFromMainThread();
+  module->as<ModuleObject>().scriptSourceObject()->setPrivate(rt, value);
+}
+
+JS_PUBLIC_API JS::Value JS::GetModulePrivate(JSObject* module) {
+  return module->as<ModuleObject>().scriptSourceObject()->canonicalPrivate();
+}
+
+JS_PUBLIC_API bool JS::ModuleInstantiate(JSContext* cx,
+                                         Handle<JSObject*> moduleArg) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+  cx->releaseCheck(moduleArg);
+
+  return ModuleObject::Instantiate(cx, moduleArg.as<ModuleObject>());
+}
+
+JS_PUBLIC_API bool JS::ModuleEvaluate(JSContext* cx,
+                                      Handle<JSObject*> moduleArg) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+  cx->releaseCheck(moduleArg);
+
+  return ModuleObject::Evaluate(cx, moduleArg.as<ModuleObject>());
+}
+
+JS_PUBLIC_API JSObject* JS::GetRequestedModules(JSContext* cx,
+                                                Handle<JSObject*> moduleArg) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+  cx->check(moduleArg);
+
+  return &moduleArg->as<ModuleObject>().requestedModules();
+}
+
+JS_PUBLIC_API JSString* JS::GetRequestedModuleSpecifier(JSContext* cx,
+                                                        Handle<Value> value) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+  cx->check(value);
+
+  JSObject* obj = &value.toObject();
+  return obj->as<RequestedModuleObject>().moduleSpecifier();
+}
+
+JS_PUBLIC_API void JS::GetRequestedModuleSourcePos(JSContext* cx,
+                                                   JS::HandleValue value,
+                                                   uint32_t* lineNumber,
+                                                   uint32_t* columnNumber) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+  cx->check(value);
+  MOZ_ASSERT(lineNumber);
+  MOZ_ASSERT(columnNumber);
+
+  auto& requested = value.toObject().as<RequestedModuleObject>();
+  *lineNumber = requested.lineNumber();
+  *columnNumber = requested.columnNumber();
+}
+
+JS_PUBLIC_API JSScript* JS::GetModuleScript(JS::HandleObject moduleRecord) {
+  AssertHeapIsIdle();
+
+  return moduleRecord->as<ModuleObject>().script();
+}
diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h
index 0ed459ffff2f..541b8f52b7d3 100644
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -34,6 +34,7 @@
 #include "js/experimental/SourceHook.h"  // js::SourceHook
 #include "js/GCVector.h"
 #include "js/HashTable.h"
+#include "js/Modules.h"  // JS::Module{DynamicImport,Metadata,Resolve}Hook
 #ifdef DEBUG
 #  include "js/Proxy.h"  // For AutoEnterPolicy
 #endif
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index 442bbdfa16c1..055c98aa25c3 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -44,6 +44,7 @@
 #include "js/CharacterEncoding.h"
 #include "js/CompilationAndEvaluation.h"
 #include "js/Date.h"
+#include "js/Modules.h"  // JS::GetModulePrivate
 #include "js/PropertySpec.h"
 #include "js/SourceText.h"  // JS::SourceText
 #include "js/StableStringChars.h"

From 1fe446e00c5073e31de7131fef8966b3add56893 Mon Sep 17 00:00:00 2001
From: Bryce Van Dyk <bvandyk@mozilla.com>
Date: Thu, 16 May 2019 05:08:12 +0000
Subject: [PATCH 128/129] Bug 1533625 - Add crashtest for MP4 with missing cenc
 aux info. r=jya

Mp4s using the 'cenc' encryption scheme should contain auxiliary information
containing the initialization vector to be used to decode that sample. However,
it's possible for malformed mp4s to contain other relevant crypto information,
but to omit this aux info. This adds such a file to our crashtests.

Differential Revision: https://phabricator.services.mozilla.com/D30025

--HG--
extra : moz-landing-system : lando
---
 dom/media/test/crashtests/crashtests.list      |   1 +
 ...pted-track-with-sample-missing-cenc-aux.mp4 | Bin 0 -> 152132 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 dom/media/test/crashtests/encrypted-track-with-sample-missing-cenc-aux.mp4

diff --git a/dom/media/test/crashtests/crashtests.list b/dom/media/test/crashtests/crashtests.list
index 68717ffd2345..94c5bf6b1fb5 100644
--- a/dom/media/test/crashtests/crashtests.list
+++ b/dom/media/test/crashtests/crashtests.list
@@ -119,6 +119,7 @@ load 1494073.html
 skip-if(Android) load 1526044.html # Bug 1528391
 skip-if(Android&&AndroidVersion<21) load encrypted-track-with-bad-sample-description-index.mp4 # Bug 1533211, unkip after bug 1550912
 load encrypted-track-without-tenc.mp4 # Bug 1533215
+load encrypted-track-with-sample-missing-cenc-aux.mp4 # Bug 1533625
 load 1533909.html
 load 1538727.html
 load empty-samples.webm # Bug 1540580
diff --git a/dom/media/test/crashtests/encrypted-track-with-sample-missing-cenc-aux.mp4 b/dom/media/test/crashtests/encrypted-track-with-sample-missing-cenc-aux.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..875c5dca766d9f34773318c6ac634258496e87a5
GIT binary patch
literal 152132
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
V5OL!VkyM@3&TX9qAP%&RCqngdoxcD8

literal 0
HcmV?d00001


From 46e5b04e715998dd1ad35180b3dea38fd3cea04d Mon Sep 17 00:00:00 2001
From: Bryce Van Dyk <bvandyk@mozilla.com>
Date: Thu, 16 May 2019 06:40:17 +0000
Subject: [PATCH 129/129] Bug 1533625 - Replace assert with early return for
 mp4 missing IV data. r=jya

This assert could be triggered with malformed files, so replace it with an early
return.

Differential Revision: https://phabricator.services.mozilla.com/D30027

--HG--
extra : moz-landing-system : lando
---
 dom/media/mp4/Index.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/dom/media/mp4/Index.cpp b/dom/media/mp4/Index.cpp
index d19256b48cfc..4eb2bd75616c 100644
--- a/dom/media/mp4/Index.cpp
+++ b/dom/media/mp4/Index.cpp
@@ -193,11 +193,16 @@ already_AddRefed<MediaRawData> SampleIterator::GetNext() {
           moofParser->mSinf.mDefaultConstantIV);
     }
 
-    MOZ_ASSERT((writer->mCrypto.mIVSize == 0 &&
-                !writer->mCrypto.mConstantIV.IsEmpty()) ||
-                   !s->mCencRange.IsEmpty(),
-               "Crypto information should contain either a constant IV, or "
-               "have auxiliary information that will contain an IV");
+    if ((writer->mCrypto.mIVSize == 0 &&
+         writer->mCrypto.mConstantIV.IsEmpty()) ||
+        (writer->mCrypto.mIVSize != 0 && s->mCencRange.IsEmpty())) {
+      // If mIVSize == 0, this indicates that a constant IV is in use, thus we
+      // should have a non empty constant IV. Alternatively if IV size is non
+      // zero, we should have an IV for this sample, which we need to look up
+      // in mCencRange (which must then be non empty). If neither of these are
+      // true we have bad crypto data, so bail.
+      return nullptr;
+    }
     // Parse auxiliary information if present
     if (!s->mCencRange.IsEmpty()) {
       // The size comes from an 8 bit field