From 80d4c17873efdaa270b86d01fd0c5b348d6a6d65 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 3 Mar 2019 14:08:46 +0100
Subject: [PATCH 001/473] Mozilla release 60.5.2

---
 .gitignore  |  1 +
 icecat.spec | 13 +++++++++++--
 sources     |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6de5154..0b2d2f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@
 /icecat-60.4.0-gnu1.tar.bz2
 /icecat-60.5.0-gnu1.tar.bz2
 /icecat-60.5.1-gnu1.tar.bz2
+/icecat-60.5.2-gnu1.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index 5bbce05..4170ec7 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -80,7 +80,7 @@
 %global hardened_build    1
 
 Name:    icecat
-Version: 60.5.1
+Version: 60.5.2
 Release: 1%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -98,7 +98,7 @@ Source2: %{name}.png
 Source3: %{name}-mozconfig-common
 
 ##Language files downloaded by source7 script
-%if 0%{build_langpacks}
+%if 0%{?build_langpacks}
 Source4:  %{name}-%{version}-langpacks.tar.gz
 %endif
 
@@ -503,7 +503,12 @@ MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
 # for some sources
 # Explicitly force the hardening flags for Firefox so it passes the checksec test;
 # See also https://fedoraproject.org/wiki/Changes/Harden_All_Packages
+%if 0%{?fedora} < 30
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
+%else
+# Workaround for mozbz#1531309
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//')
+%endif
 # Disable null pointer gcc6 optimization in gcc6 (rhbz#1328045)
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fno-delete-null-pointer-checks"
 # Use hardened build?
@@ -734,6 +739,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Sun Mar 03 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.5.2-1
+- Mozilla release 60.5.2
+- Disable Werror-format-security flags
+
 * Thu Feb 14 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.5.1-1
 - Mozilla release 60.5.1
 - Conditional macro for libvpx support
diff --git a/sources b/sources
index 9ffec47..dec668d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (icecat-60.5.1-gnu1.tar.bz2) = 6867681f5b4d65f78160a7686530975861d08c99a1f5e8d79448c2add3d9886144d3daefdb4d732dbda8ea14870086a41749a4de5e991b06199b66b3a0e6b677
+SHA512 (icecat-60.5.2-gnu1.tar.bz2) = c4c12506f2f270d9e3bcc2007870583cac9e23219c7e0524e90aafde414ec7d4b61fe397d268d35ad480f9217316cae0e83e8c1a8179dbb8184da4131700594a
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From d13ed8c5d3d34ed28e2e497d6663fd87736d5358 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 3 Mar 2019 17:40:46 +0100
Subject: [PATCH 002/473] Add -fpermissive for building on f31

---
 icecat.spec | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 4170ec7..d335604 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -490,13 +490,6 @@ echo "Generate big endian version of config/external/icu/data/icud58l.dat"
 # Update the various config.guess to upstream release for aarch64 support
 find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
 
-# -fpermissive is needed to build with gcc 4.6+ which has become stricter
-#
-# Mozilla builds with -Wall with exception of a few warnings which show up
-# everywhere in the code; so, don't override that.
-#
-# Disable C++ exceptions since Mozilla code is not exception-safe
-#
 MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
 #rhbz#1037063
 # -Werror=format-security causes build failures when -Wno-format is explicitly given
@@ -509,8 +502,12 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security
 # Workaround for mozbz#1531309
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//')
 %endif
-# Disable null pointer gcc6 optimization in gcc6 (rhbz#1328045)
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fno-delete-null-pointer-checks"
+# Add -fpermissive for building on f31:
+# In file included from /builddir/build/BUILD/icecat-60.5.2/tools/profiler/core/shared-libraries-linux.cc:17:
+# /icecat-60.5.2/tools/profiler/core/platform.h:50:21: error: 'pid_t gettid()' was declared 'extern' and later 'static' [-fpermissive]
+%if 0%{?fedora} > 30
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive"
+%endif
 # Use hardened build?
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
 

From 365f306ca5cec7df3e10292e560d8d81ebf1edc4 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 4 Mar 2019 11:45:38 +0100
Subject: [PATCH 003/473] Try to fix libevent LD path

---
 icecat.spec | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index d335604..681d51a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -405,7 +405,7 @@ echo "ac_add_options --disable-system-sqlite" >> .mozconfig
 %endif
 echo "ac_add_options --with-system-zlib" >> .mozconfig
 echo "ac_add_options --with-system-bz2" >> .mozconfig
-echo "ac_add_options --with-system-libevent=%{_prefix}" >> .mozconfig
+echo "ac_add_options --with-system-libevent=%{_prefix}/../%{_lib}" >> .mozconfig
 echo "ac_add_options --enable-llvm-hacks" >> .mozconfig
 %if %{?with_vpx}
 echo "ac_add_options --with-system-libvpx" >> .mozconfig
@@ -450,6 +450,9 @@ echo 'ac_add_options --enable-optimize' >> .mozconfig
 %endif
 echo "ac_add_options --disable-debug" >> .mozconfig
 %endif
+%ifarch %{arm}
+echo "ac_add_options --enable-linker=gold" >> .mozconfig
+%endif
 
 echo "ac_add_options --disable-strip" >> .mozconfig
 echo "ac_add_options --disable-install-strip" >> .mozconfig
@@ -521,10 +524,10 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/' -e 's/-O2/-O1/')
 # (OOM when linking, rhbz#1238225)
 export MOZ_DEBUG_FLAGS=" "
 %endif
-%ifarch s390x %{arm} %{power64} aarch64 %{arm} %{ix86}
+%ifarch s390x %{arm} %{power64} aarch64 %{ix86}
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
-%ifarch %{arm}
+%ifarch %{arm} %{ix86}
 export RUSTFLAGS="-Cdebuginfo=0"
 %endif
 export CFLAGS=$MOZ_OPT_FLAGS
@@ -739,6 +742,8 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 * Sun Mar 03 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.5.2-1
 - Mozilla release 60.5.2
 - Disable Werror-format-security flags
+- Enable linker=gold on ARM
+- Try to fix libevent LD path
 
 * Thu Feb 14 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.5.1-1
 - Mozilla release 60.5.1

From 1eff813f6802426ae002e8af521dd3d7119f892a Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 4 Mar 2019 12:19:30 +0100
Subject: [PATCH 004/473] Set CXXFLAGS

---
 icecat.spec | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 681d51a..be17988 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -128,6 +128,7 @@ Source15: %{name}-x11.sh.in
 Source16: %{name}-x11.desktop
 
 # Build patches
+Patch2: %{name}-libevent_linkflag.patch
 Patch3:   mozilla-build-arm.patch
 
 # Unrecognized file?
@@ -322,6 +323,7 @@ tar -xf %{SOURCE5}
 ##Prevent HTTPS-everywhere addon's installation
 sed '/https-everywhere/d' -i ./browser/installer/package-manifest.in
 
+%patch2 -p0 -b .libevent_linkflag
 %patch3 -p1 -b .arm
 %patch7 -p0
 %patch8 -p0
@@ -405,7 +407,7 @@ echo "ac_add_options --disable-system-sqlite" >> .mozconfig
 %endif
 echo "ac_add_options --with-system-zlib" >> .mozconfig
 echo "ac_add_options --with-system-bz2" >> .mozconfig
-echo "ac_add_options --with-system-libevent=%{_prefix}/../%{_lib}" >> .mozconfig
+echo "ac_add_options --with-system-libevent=%{_prefix}" >> .mozconfig
 echo "ac_add_options --enable-llvm-hacks" >> .mozconfig
 %if %{?with_vpx}
 echo "ac_add_options --with-system-libvpx" >> .mozconfig
@@ -505,12 +507,6 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security
 # Workaround for mozbz#1531309
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//')
 %endif
-# Add -fpermissive for building on f31:
-# In file included from /builddir/build/BUILD/icecat-60.5.2/tools/profiler/core/shared-libraries-linux.cc:17:
-# /icecat-60.5.2/tools/profiler/core/platform.h:50:21: error: 'pid_t gettid()' was declared 'extern' and later 'static' [-fpermissive]
-%if 0%{?fedora} > 30
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive"
-%endif
 # Use hardened build?
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
 
@@ -531,7 +527,16 @@ MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 export RUSTFLAGS="-Cdebuginfo=0"
 %endif
 export CFLAGS=$MOZ_OPT_FLAGS
-export CXXFLAGS=$MOZ_OPT_FLAGS
+
+# Add -fpermissive for building on f31:
+# In file included from /builddir/build/BUILD/icecat-60.5.2/tools/profiler/core/shared-libraries-linux.cc:17:
+# /icecat-60.5.2/tools/profiler/core/platform.h:50:21: error: 'pid_t gettid()' was declared 'extern' and later 'static' [-fpermissive]
+%if 0%{?fedora} > 30
+export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive"
+%else
+export CXXFLAGS="$MOZ_OPT_FLAGS"
+%endif
+
 export LDFLAGS=$MOZ_LINK_FLAGS
 
 export PREFIX='%{_prefix}'

From 39f7d271b43d5b5b5e2e4467648c6e70902e068b Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 4 Mar 2019 12:20:35 +0100
Subject: [PATCH 005/473] Add libevent link patch

---
 icecat-libevent_linkflag.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 icecat-libevent_linkflag.patch

diff --git a/icecat-libevent_linkflag.patch b/icecat-libevent_linkflag.patch
new file mode 100644
index 0000000..918c7e4
--- /dev/null
+++ b/icecat-libevent_linkflag.patch
@@ -0,0 +1,20 @@
+--- old-configure.orig.in	2019-03-02 21:49:16.000000000 +0100
++++ old-configure.in	2019-03-04 12:14:23.842685662 +0100
+@@ -1715,7 +1715,7 @@
+     MOZ_SYSTEM_LIBEVENT=
+ elif test -z "$MOZ_SYSTEM_LIBEVENT"; then
+     CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
+-    LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
++    LDFLAGS="-L${LIBDIR} $LDFLAGS"
+     MOZ_CHECK_HEADER(event.h,
+         [if test ! -f "${LIBEVENT_DIR}/include/event.h"; then
+              AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include])
+@@ -1724,7 +1724,7 @@
+     AC_CHECK_LIB(event, event_init,
+                  [MOZ_SYSTEM_LIBEVENT=1
+                   MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
+-                  MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
++                  MOZ_LIBEVENT_LIBS="-L${LIBDIR} -levent"],
+                  [MOZ_SYSTEM_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
+ fi
+ CFLAGS=$_SAVE_CFLAGS

From 2a63573f46c9d8d085cc37721c826a9e308893a0 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 4 Mar 2019 18:07:47 +0100
Subject: [PATCH 006/473] Fix gold linker flag on ARM

---
 icecat.spec | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index be17988..c7ad70d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -520,23 +520,17 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/' -e 's/-O2/-O1/')
 # (OOM when linking, rhbz#1238225)
 export MOZ_DEBUG_FLAGS=" "
 %endif
-%ifarch s390x %{arm} %{power64} aarch64 %{ix86}
+%ifarch s390x %{power64} aarch64 %{ix86}
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
+%ifarch %{arm}
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory"
+%endif
 %ifarch %{arm} %{ix86}
 export RUSTFLAGS="-Cdebuginfo=0"
 %endif
 export CFLAGS=$MOZ_OPT_FLAGS
-
-# Add -fpermissive for building on f31:
-# In file included from /builddir/build/BUILD/icecat-60.5.2/tools/profiler/core/shared-libraries-linux.cc:17:
-# /icecat-60.5.2/tools/profiler/core/platform.h:50:21: error: 'pid_t gettid()' was declared 'extern' and later 'static' [-fpermissive]
-%if 0%{?fedora} > 30
-export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive"
-%else
 export CXXFLAGS="$MOZ_OPT_FLAGS"
-%endif
-
 export LDFLAGS=$MOZ_LINK_FLAGS
 
 export PREFIX='%{_prefix}'

From a0ff91c47931399cef1d40064611cf824f1b67cf Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 19 Mar 2019 15:55:11 +0100
Subject: [PATCH 007/473] Mozilla release 60.6.0

---
 .gitignore              |  2 ++
 icecat-lang_download.sh | 20 ++++++++++++--------
 icecat.spec             |  9 ++++++---
 sources                 |  3 ++-
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0b2d2f9..42e32d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,5 @@
 /icecat-60.5.0-gnu1.tar.bz2
 /icecat-60.5.1-gnu1.tar.bz2
 /icecat-60.5.2-gnu1.tar.bz2
+/icecat-60.6.0-gnu1.tar.bz2
+/icecat-60.6.0-langpacks.tar.gz
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 6319089..1d3aa9d 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,18 +1,22 @@
 #!/bin/bash
 
-VERSION=60.2.0
-URL=http://alpha.gnu.org/gnu/gnuzilla/$VERSION/langpacks/
+VERSION=60.6.0
+URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
-mkdir -p langpacks && cd langpacks
-wget -erobots=off -c -r -l1 -nd -nc -A.xpi -U langpacks $u
-rm -f icecat-$VERSION.ja-JP-mac.langpack.xpi icecat-$VERSION.compare-locales.langpack.xpi
+  mkdir -p langpacks && pushd langpacks
+  wget -erobots=off -c -r -l1 -nd -nc -A.xpi -U langpacks $u
+popd
+done
+pushd langpacks
+for u in `ls *.xpi`; do
+  mv $u icecat-${VERSION}.$u
 done
 find . -type f -name '*.xpi' | while read FILE ; do
-  newfile="$(echo ${FILE} |sed -e 's/60.2.0.//g' -e 's/icecat-//g')" ;
+  newfile="$(echo ${FILE} |sed -e 's/.xpi/.langpack.xpi/g')" ;
   mv "${FILE}" "${newfile}" ;
 done
-cd ..
-tar -zcvf icecat-$VERSION-langpacks.tar.gz langpacks
+popd
+tar -zcvf icecat-${VERSION}-langpacks.tar.gz langpacks
 rm -rf langpacks
 exit 0
diff --git a/icecat.spec b/icecat.spec
index c7ad70d..e35f010 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -11,7 +11,7 @@
 #
 
 ##Active/Deactive language files handling
-%global build_langpacks 0
+%global build_langpacks 1
 
 %define default_bookmarks_file  %{_datadir}/bookmarks/default-bookmarks.html
 
@@ -80,7 +80,7 @@
 %global hardened_build    1
 
 Name:    icecat
-Version: 60.5.2
+Version: 60.6.0
 Release: 1%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -92,7 +92,6 @@ URL:     http://www.gnu.org/software/gnuzilla/
 ## Modified files are hosted in a dedicated fork repository:
 ## https://fedorapeople.org/cgit/sagitter/public_git/icecat.git/
 Source0: https://sagitter.fedorapeople.org/icecat/v%{version}/%{name}-%{version}-gnu1.tar.bz2
-#Source0: http://alpha.gnu.org/gnu/gnuzilla/%%{version}/icecat-%%{version}-gnu1.tar.bz2
 
 Source2: %{name}.png
 Source3: %{name}-mozconfig-common
@@ -738,6 +737,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Tue Mar 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-1
+- Mozilla release 60.6.0
+- Enable languages
+
 * Sun Mar 03 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.5.2-1
 - Mozilla release 60.5.2
 - Disable Werror-format-security flags
diff --git a/sources b/sources
index dec668d..95e7be1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-SHA512 (icecat-60.5.2-gnu1.tar.bz2) = c4c12506f2f270d9e3bcc2007870583cac9e23219c7e0524e90aafde414ec7d4b61fe397d268d35ad480f9217316cae0e83e8c1a8179dbb8184da4131700594a
+SHA512 (icecat-60.6.0-gnu1.tar.bz2) = a31ee52e0f8c69542a141fa432411f23225d40226f9e976b074cdf9f36b57c48984dfc7cf177d1f12de40c4250161232768e5b673be348623a8b7f5b33819dd3
+SHA512 (icecat-60.6.0-langpacks.tar.gz) = c8949951e3333110c1a0762bd6e9accb15111bb4d7c454d842d99416789e2d74e904f08bcc5a0bd6f255875fe78d80b7d2ab284ea267041edee5d83337af121f
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 498a6e2a85fc99cfaeca5bc67853027d488979dc Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 19 Mar 2019 20:40:03 +0100
Subject: [PATCH 008/473] Patched for building with newer glibc (2.29.9000-4)
 (mozilla #1533969)

---
 icecat-60.6.0-mozilla-1533969.patch | 32 +++++++++++++++++++++++++++++
 icecat.spec                         | 10 ++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 icecat-60.6.0-mozilla-1533969.patch

diff --git a/icecat-60.6.0-mozilla-1533969.patch b/icecat-60.6.0-mozilla-1533969.patch
new file mode 100644
index 0000000..cdf62c5
--- /dev/null
+++ b/icecat-60.6.0-mozilla-1533969.patch
@@ -0,0 +1,32 @@
+--- a/js/src/util/NativeStack.cpp
++++ b/js/src/util/NativeStack.cpp
+@@ -16,6 +16,7 @@
+ #if defined(ANDROID) && !defined(__aarch64__)
+ #include <sys/types.h>
+ #include <unistd.h>
++#   define gettid() static_cast<pid_t>(syscall(__NR_gettid))
+ #endif
+ #else
+ #error "Unsupported platform"
+--- a/tools/profiler/core/platform.h
++++ b/tools/profiler/core/platform.h
+@@ -42,16 +42,16 @@
+ #include "PlatformMacros.h"
+ #include <vector>
+ 
+-// We need a definition of gettid(), but glibc doesn't provide a
++// We need a definition of gettid(), but old glibc versions don't provide a
+ // wrapper for it.
+ #if defined(__GLIBC__)
+ #include <unistd.h>
+ #include <sys/syscall.h>
+-static inline pid_t gettid() { return (pid_t)syscall(SYS_gettid); }
++#  define gettid() static_cast<pid_t>(syscall(SYS_gettid))
+ #elif defined(GP_OS_darwin)
+ #include <unistd.h>
+ #include <sys/syscall.h>
+-static inline pid_t gettid() { return (pid_t)syscall(SYS_thread_selfid); }
++#  define gettid() static_cast<pid_t>(syscall(SYS_thread_selfid))
+ #elif defined(GP_OS_android)
+ #include <unistd.h>
+ #elif defined(GP_OS_windows)
diff --git a/icecat.spec b/icecat.spec
index e35f010..c81cd4e 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -81,7 +81,7 @@
 
 Name:    icecat
 Version: 60.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -164,6 +164,7 @@ Patch417: bug1375074-save-restore-x28.patch
 Patch418: mozilla-1436242.patch
 Patch420: %{name}-disable-dbus-remote.patch
 Patch421: %{name}-bz1445383.patch
+Patch422: %{name}-%{version}-mozilla-1533969.patch
 
 # Wayland specific upstream patches
 Patch565: firefox-pipewire.patch
@@ -357,6 +358,10 @@ sed '/https-everywhere/d' -i ./browser/installer/package-manifest.in
 %patch420 -p1 -b .%{name}-disable-dbus-remote
 %patch421 -p1 -b .%{name}-update-ccache-stats-parser
 
+%if 0%{?fedora} > 30
+%patch422 -p1 -b .%{name}-%{version}-mozilla-1533969
+%endif
+
 # Wayland specific upstream patches
 dos2unix %{PATCH565}
 %patch565 -p1 -b .firefox-pipewire
@@ -737,6 +742,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Tue Mar 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-2
+- Patched for building with newer glibc (2.29.9000-4) (mozilla #1533969)
+
 * Tue Mar 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-1
 - Mozilla release 60.6.0
 - Enable languages

From 034aedacb4ba4b1e1a0a5f99d5b34cdfbc5710de Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 20 Mar 2019 12:41:49 +0100
Subject: [PATCH 009/473] Patched for building on ARM (rhbz #1658940)

---
 ...--fix-mozillaSignalTrampoline-to-work.patch | 12 ++++++++++++
 icecat-lang_download.sh                        | 18 +++++++++---------
 icecat.spec                                    | 16 ++++++++++++----
 sources                                        |  2 +-
 4 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 Bug-1238661-2---fix-mozillaSignalTrampoline-to-work.patch

diff --git a/Bug-1238661-2---fix-mozillaSignalTrampoline-to-work.patch b/Bug-1238661-2---fix-mozillaSignalTrampoline-to-work.patch
new file mode 100644
index 0000000..ccec54a
--- /dev/null
+++ b/Bug-1238661-2---fix-mozillaSignalTrampoline-to-work.patch
@@ -0,0 +1,12 @@
+diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h
+--- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661	2018-04-27 08:55:38.848241768 +0200
++++ firefox-60.0/mfbt/LinuxSignal.h	2018-04-27 09:06:47.946769859 +0200
+@@ -22,7 +22,7 @@
+                                              void* aContext) {
+   asm volatile("nop; nop; nop; nop" : : : "memory");
+ 
+-  asm volatile("b %0" : : "X"(H) : "memory");
++  H(aSignal, aInfo, aContext);
+ }
+ 
+ #define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 1d3aa9d..767e093 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -8,15 +8,15 @@ for u in $URL; do
   wget -erobots=off -c -r -l1 -nd -nc -A.xpi -U langpacks $u
 popd
 done
-pushd langpacks
-for u in `ls *.xpi`; do
-  mv $u icecat-${VERSION}.$u
-done
-find . -type f -name '*.xpi' | while read FILE ; do
-  newfile="$(echo ${FILE} |sed -e 's/.xpi/.langpack.xpi/g')" ;
-  mv "${FILE}" "${newfile}" ;
-done
-popd
+#pushd langpacks
+#for u in `ls *.xpi`; do
+#  mv $u icecat-${VERSION}.$u
+#done
+#find . -type f -name '*.xpi' | while read FILE ; do
+#  newfile="$(echo ${FILE} |sed -e 's/.xpi/.langpack.xpi/g')" ;
+#  mv "${FILE}" "${newfile}" ;
+#done
+#popd
 tar -zcvf icecat-${VERSION}-langpacks.tar.gz langpacks
 rm -rf langpacks
 exit 0
diff --git a/icecat.spec b/icecat.spec
index c81cd4e..a42940f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -158,7 +158,8 @@ Patch226: rhbz-1354671.patch
 # Upstream patches
 Patch406: mozilla-256180.patch
 Patch413: mozilla-1353817.patch
-Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+Patch414: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+Patch415: Bug-1238661-2---fix-mozillaSignalTrampoline-to-work.patch
 Patch416: mozilla-1424422.patch
 Patch417: bug1375074-save-restore-x28.patch
 Patch418: mozilla-1436242.patch
@@ -342,7 +343,8 @@ sed '/https-everywhere/d' -i ./browser/installer/package-manifest.in
 %patch406 -p0 -b .256180
 %patch413 -p1 -b .1353817
 %ifarch %{arm}
-%patch415 -p1 -b .mozilla-1238661
+#%%patch414 -p1 -b .Bug-1238661---fix-mozillaSignalTrampoline-to-work
+%patch415 -p1 -b .Bug-1238661-2---fix-mozillaSignalTrampoline-to-work
 %endif
 %patch416 -p1 -b .1424422
 %patch417 -p1 -b .bug1375074-save-restore-x28
@@ -458,6 +460,9 @@ echo "ac_add_options --disable-debug" >> .mozconfig
 %endif
 %ifarch %{arm}
 echo "ac_add_options --enable-linker=gold" >> .mozconfig
+
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1658940#c19
+sed -i -e "s/MOZILLA_MAY_SUPPORT_NEON/MOZILLA_MAY_SUPPORT_NEONXXXX/g" gfx/ycbcr/*
 %endif
 
 echo "ac_add_options --disable-strip" >> .mozconfig
@@ -528,10 +533,11 @@ export MOZ_DEBUG_FLAGS=" "
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
 %ifarch %{arm}
-MOZ_LINK_FLAGS="-Wl,--no-keep-memory"
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--no-keep-files-mapped -Wl,--no-map-whole-files -Wl,--no-mmap-output-file"
 %endif
 %ifarch %{arm} %{ix86}
 export RUSTFLAGS="-Cdebuginfo=0"
+export MOZ_RUST_DEFAULT_FLAGS="-Cdebuginfo=0 -Copt-level=0"
 %endif
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS="$MOZ_OPT_FLAGS"
@@ -742,8 +748,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
-* Tue Mar 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-2
+* Wed Mar 20 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-2
 - Patched for building with newer glibc (2.29.9000-4) (mozilla #1533969)
+- Patched for building on ARM (rhbz #1658940)
+- Language files re-based
 
 * Tue Mar 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-1
 - Mozilla release 60.6.0
diff --git a/sources b/sources
index 95e7be1..b3a3d08 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (icecat-60.6.0-gnu1.tar.bz2) = a31ee52e0f8c69542a141fa432411f23225d40226f9e976b074cdf9f36b57c48984dfc7cf177d1f12de40c4250161232768e5b673be348623a8b7f5b33819dd3
-SHA512 (icecat-60.6.0-langpacks.tar.gz) = c8949951e3333110c1a0762bd6e9accb15111bb4d7c454d842d99416789e2d74e904f08bcc5a0bd6f255875fe78d80b7d2ab284ea267041edee5d83337af121f
+SHA512 (icecat-60.6.0-langpacks.tar.gz) = e694a1d587af77adb2c7f1d91f7a3f51b90d18fef1fd3247ad837022901b81e879369fb6025a45acfa07544ba356901fc80f9a5f93dfc9b7b09613a1cee8ab41
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From f865a4ca1061decd3159c074fdaaca16ec34d8d4 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 20 Mar 2019 13:10:17 +0100
Subject: [PATCH 010/473] Change LD flags

---
 icecat.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index a42940f..278563f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -530,10 +530,10 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/' -e 's/-O2/-O1/')
 export MOZ_DEBUG_FLAGS=" "
 %endif
 %ifarch s390x %{power64} aarch64 %{ix86}
-MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--print-memory-usage"
 %endif
 %ifarch %{arm}
-MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--no-keep-files-mapped -Wl,--no-map-whole-files -Wl,--no-mmap-output-file"
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-mmap-output-file -Wl,--print-memory-usage"
 %endif
 %ifarch %{arm} %{ix86}
 export RUSTFLAGS="-Cdebuginfo=0"

From 8ed873edc4144f9a5f3334517947c8c4873e1372 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 20 Mar 2019 14:20:09 +0100
Subject: [PATCH 011/473] Use -Wl,-fuse-ld=gold on ARM

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 278563f..2b4b46c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -533,7 +533,7 @@ export MOZ_DEBUG_FLAGS=" "
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--print-memory-usage"
 %endif
 %ifarch %{arm}
-MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-mmap-output-file -Wl,--print-memory-usage"
+MOZ_LINK_FLAGS="-Wl,-fuse-ld=gold -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-mmap-output-file -Wl,--print-memory-usage"
 %endif
 %ifarch %{arm} %{ix86}
 export RUSTFLAGS="-Cdebuginfo=0"

From 7dd2a2a88187e9b909a2cf6df93c01a02b1afeda Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 20 Mar 2019 16:05:51 +0100
Subject: [PATCH 012/473] Remove -Wl,--print-memory-usage option

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 2b4b46c..8a87a8d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -533,7 +533,7 @@ export MOZ_DEBUG_FLAGS=" "
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--print-memory-usage"
 %endif
 %ifarch %{arm}
-MOZ_LINK_FLAGS="-Wl,-fuse-ld=gold -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-mmap-output-file -Wl,--print-memory-usage"
+MOZ_LINK_FLAGS="-Wl,-fuse-ld=gold -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-mmap-output-file"
 %endif
 %ifarch %{arm} %{ix86}
 export RUSTFLAGS="-Cdebuginfo=0"

From 715b11c212427a42e7b44a1edcaa7094a4ba94cd Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 21 Mar 2019 10:54:49 +0100
Subject: [PATCH 013/473] Undo latest changes for ARM | Exclude ARM builds

---
 icecat.spec | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 8a87a8d..d53d707 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -79,6 +79,9 @@
 # Use mozilla hardening option?
 %global hardened_build    1
 
+# Exclude ARM builds for rhbz #1658940
+ExcludeArch: %{arm}
+
 Name:    icecat
 Version: 60.6.0
 Release: 2%{?dist}
@@ -159,7 +162,6 @@ Patch226: rhbz-1354671.patch
 Patch406: mozilla-256180.patch
 Patch413: mozilla-1353817.patch
 Patch414: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
-Patch415: Bug-1238661-2---fix-mozillaSignalTrampoline-to-work.patch
 Patch416: mozilla-1424422.patch
 Patch417: bug1375074-save-restore-x28.patch
 Patch418: mozilla-1436242.patch
@@ -343,8 +345,7 @@ sed '/https-everywhere/d' -i ./browser/installer/package-manifest.in
 %patch406 -p0 -b .256180
 %patch413 -p1 -b .1353817
 %ifarch %{arm}
-#%%patch414 -p1 -b .Bug-1238661---fix-mozillaSignalTrampoline-to-work
-%patch415 -p1 -b .Bug-1238661-2---fix-mozillaSignalTrampoline-to-work
+%patch414 -p1 -b .Bug-1238661---fix-mozillaSignalTrampoline-to-work
 %endif
 %patch416 -p1 -b .1424422
 %patch417 -p1 -b .bug1375074-save-restore-x28
@@ -460,9 +461,6 @@ echo "ac_add_options --disable-debug" >> .mozconfig
 %endif
 %ifarch %{arm}
 echo "ac_add_options --enable-linker=gold" >> .mozconfig
-
-# See https://bugzilla.redhat.com/show_bug.cgi?id=1658940#c19
-sed -i -e "s/MOZILLA_MAY_SUPPORT_NEON/MOZILLA_MAY_SUPPORT_NEONXXXX/g" gfx/ycbcr/*
 %endif
 
 echo "ac_add_options --disable-strip" >> .mozconfig
@@ -748,9 +746,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
-* Wed Mar 20 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-2
+* Thu Mar 21 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-2
 - Patched for building with newer glibc (2.29.9000-4) (mozilla #1533969)
-- Patched for building on ARM (rhbz #1658940)
+- Excluded on ARM (rhbz #1658940)
 - Language files re-based
 
 * Tue Mar 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-1

From dc2b379d3c7d9a31155af82fc09518b280ddfbc0 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 23 Mar 2019 18:23:43 +0100
Subject: [PATCH 014/473] Mozilla release 60.6.1

---
 .gitignore                                          |  2 ++
 ...61-2---fix-mozillaSignalTrampoline-to-work.patch | 12 ------------
 ...969.patch => icecat-60.6.1-mozilla-1533969.patch |  0
 icecat-lang_download.sh                             |  2 +-
 icecat.spec                                         | 13 ++++++++++---
 sources                                             |  4 ++--
 6 files changed, 15 insertions(+), 18 deletions(-)
 delete mode 100644 Bug-1238661-2---fix-mozillaSignalTrampoline-to-work.patch
 rename icecat-60.6.0-mozilla-1533969.patch => icecat-60.6.1-mozilla-1533969.patch (100%)

diff --git a/.gitignore b/.gitignore
index 42e32d5..afea17a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,5 @@
 /icecat-60.5.2-gnu1.tar.bz2
 /icecat-60.6.0-gnu1.tar.bz2
 /icecat-60.6.0-langpacks.tar.gz
+/icecat-60.6.1-gnu1.tar.bz2
+/icecat-60.6.1-langpacks.tar.gz
diff --git a/Bug-1238661-2---fix-mozillaSignalTrampoline-to-work.patch b/Bug-1238661-2---fix-mozillaSignalTrampoline-to-work.patch
deleted file mode 100644
index ccec54a..0000000
--- a/Bug-1238661-2---fix-mozillaSignalTrampoline-to-work.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h
---- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661	2018-04-27 08:55:38.848241768 +0200
-+++ firefox-60.0/mfbt/LinuxSignal.h	2018-04-27 09:06:47.946769859 +0200
-@@ -22,7 +22,7 @@
-                                              void* aContext) {
-   asm volatile("nop; nop; nop; nop" : : : "memory");
- 
--  asm volatile("b %0" : : "X"(H) : "memory");
-+  H(aSignal, aInfo, aContext);
- }
- 
- #define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
diff --git a/icecat-60.6.0-mozilla-1533969.patch b/icecat-60.6.1-mozilla-1533969.patch
similarity index 100%
rename from icecat-60.6.0-mozilla-1533969.patch
rename to icecat-60.6.1-mozilla-1533969.patch
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 767e093..9dd3738 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=60.6.0
+VERSION=60.6.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index d53d707..d15fd6e 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -70,12 +70,15 @@
 %bcond_without jack
 
 %if 0%{?fedora} > 29
-%global wayland_backend_default 1
 %global with_vpx      0
 %else
 %global with_vpx      1
 %endif
 
+%if 0%{?fedora} > 30
+%global wayland_backend_default 1
+%endif
+
 # Use mozilla hardening option?
 %global hardened_build    1
 
@@ -83,8 +86,8 @@
 ExcludeArch: %{arm}
 
 Name:    icecat
-Version: 60.6.0
-Release: 2%{?dist}
+Version: 60.6.1
+Release: 1%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -746,6 +749,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Fri Mar 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.1-1
+- Mozilla release 60.6.1
+- Wayland backend made default starting from Fedora 31 (rhbz#1691852)
+
 * Thu Mar 21 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-2
 - Patched for building with newer glibc (2.29.9000-4) (mozilla #1533969)
 - Excluded on ARM (rhbz #1658940)
diff --git a/sources b/sources
index b3a3d08..d8ad96b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (icecat-60.6.0-gnu1.tar.bz2) = a31ee52e0f8c69542a141fa432411f23225d40226f9e976b074cdf9f36b57c48984dfc7cf177d1f12de40c4250161232768e5b673be348623a8b7f5b33819dd3
-SHA512 (icecat-60.6.0-langpacks.tar.gz) = e694a1d587af77adb2c7f1d91f7a3f51b90d18fef1fd3247ad837022901b81e879369fb6025a45acfa07544ba356901fc80f9a5f93dfc9b7b09613a1cee8ab41
+SHA512 (icecat-60.6.1-gnu1.tar.bz2) = 7b07d752c31f28ed0f7b3d35dbc23c878fa9a8262174a5b5396e0a9eb9a64b9ba224707f1d466d484534441e5a60931825d47b501f1bcc26c8adffd1c43360cf
+SHA512 (icecat-60.6.1-langpacks.tar.gz) = 1acaac68119381df7fd25189ec53786b2f962781157a9e3399bbe130cd6accb7db062345c7da2380df08a119acd22ab1a1b79eae3a7c8903a94723f34371071a
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 7dd67032d5be1533cdfc95d73e4a23e8efe39791 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 28 Mar 2019 17:55:46 +0100
Subject: [PATCH 015/473] Test-1 for using locale files correctly

---
 icecat.spec | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index d15fd6e..30becc0 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -87,7 +87,7 @@ ExcludeArch: %{arm}
 
 Name:    icecat
 Version: 60.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -469,7 +469,7 @@ echo "ac_add_options --enable-linker=gold" >> .mozconfig
 echo "ac_add_options --disable-strip" >> .mozconfig
 echo "ac_add_options --disable-install-strip" >> .mozconfig
 echo "ac_add_options --disable-tests" >> .mozconfig
-echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
+#echo "ac_add_options --with-l10n-base=" >> .mozconfig
 
 echo "ac_add_options --disable-rust-tests" >> .mozconfig
 echo "ac_add_options --disable-gtest-in-build" >> .mozconfig
@@ -613,9 +613,10 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1/
 
 ##Make sure locale works for langpacks
-cat > objdir/dist/bin/browser/defaults/preferences/icecat-l10n.js << EOF
-pref("general.useragent.locale", "chrome://global/locale/intl.properties");
-EOF
+tree -L 4 objdir/dist/bin/browser/chrome/
+#cat > objdir/dist/bin/browser/chrome/defaults/preferences/icecat-l10n.js << EOF
+#pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+#EOF
 
 ##Extract langpacks, make any mods needed, repack the langpack, and install it.
 %if 0%{?build_langpacks}
@@ -749,6 +750,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Thu Mar 28 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.1-2
+- Test-1 for using locale files correctly
+
 * Fri Mar 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.1-1
 - Mozilla release 60.6.1
 - Wayland backend made default starting from Fedora 31 (rhbz#1691852)

From 3986e2a985648f39cb526e57e5c0e191afaa3ff0 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 28 Mar 2019 19:53:18 +0100
Subject: [PATCH 016/473] Add tree

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 30becc0..94e29d7 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -248,7 +248,7 @@ BuildRequires:  pulseaudio-libs-devel
 %if %{with jack}
 BuildRequires:  jack-audio-connection-kit-devel
 %endif
-BuildRequires:  yasm
+BuildRequires:  yasm, tree
 BuildRequires:  llvm
 BuildRequires:  llvm-devel
 BuildRequires:  clang

From 24238bac1de0f218ce8369a249a558f7124790f8 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 28 Mar 2019 20:51:59 +0100
Subject: [PATCH 017/473] Test-2 for using locale files correctly

---
 icecat.spec | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 94e29d7..a9c3a16 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -248,7 +248,7 @@ BuildRequires:  pulseaudio-libs-devel
 %if %{with jack}
 BuildRequires:  jack-audio-connection-kit-devel
 %endif
-BuildRequires:  yasm, tree
+BuildRequires:  yasm
 BuildRequires:  llvm
 BuildRequires:  llvm-devel
 BuildRequires:  clang
@@ -613,10 +613,9 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1/
 
 ##Make sure locale works for langpacks
-tree -L 4 objdir/dist/bin/browser/chrome/
-#cat > objdir/dist/bin/browser/chrome/defaults/preferences/icecat-l10n.js << EOF
-#pref("general.useragent.locale", "chrome://global/locale/intl.properties");
-#EOF
+cat > objdir/dist/bin/browser/chrome/en-US/locale/browser/preferences/icecat-l10n.js << EOF
+pref("general.useragent.locale", "chrome://en-US/locale/en-US/global-platform/unix/intl.properties");
+EOF
 
 ##Extract langpacks, make any mods needed, repack the langpack, and install it.
 %if 0%{?build_langpacks}

From 2608d61ffe2057f5d43ba7786df5261d70b7aaa3 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 30 Mar 2019 17:19:36 +0100
Subject: [PATCH 018/473] Test-2 for using locale files correctly

---
 icecat.spec | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index a9c3a16..ac1fe98 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -469,7 +469,12 @@ echo "ac_add_options --enable-linker=gold" >> .mozconfig
 echo "ac_add_options --disable-strip" >> .mozconfig
 echo "ac_add_options --disable-install-strip" >> .mozconfig
 echo "ac_add_options --disable-tests" >> .mozconfig
-#echo "ac_add_options --with-l10n-base=" >> .mozconfig
+
+# Localization
+%if 0%{?build_langpacks}
+echo "ac_add_options --enable-ui-locale=ISOcode" >> .mozconfig
+echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
+%endif
 
 echo "ac_add_options --disable-rust-tests" >> .mozconfig
 echo "ac_add_options --disable-gtest-in-build" >> .mozconfig
@@ -612,11 +617,6 @@ chmod 755 %{buildroot}%{_bindir}/%{name}-wayland
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1/
 
-##Make sure locale works for langpacks
-cat > objdir/dist/bin/browser/chrome/en-US/locale/browser/preferences/icecat-l10n.js << EOF
-pref("general.useragent.locale", "chrome://en-US/locale/en-US/global-platform/unix/intl.properties");
-EOF
-
 ##Extract langpacks, make any mods needed, repack the langpack, and install it.
 %if 0%{?build_langpacks}
 echo > %{name}.lang

From 39dd1233801b86e58598c1e4611f0fcd03643088 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 30 Mar 2019 19:11:04 +0100
Subject: [PATCH 019/473] Test-3 for using locale files correctly

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index ac1fe98..f92d9a8 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -472,7 +472,7 @@ echo "ac_add_options --disable-tests" >> .mozconfig
 
 # Localization
 %if 0%{?build_langpacks}
-echo "ac_add_options --enable-ui-locale=ISOcode" >> .mozconfig
+echo "ac_add_options --enable-ui-locale="ach af an ar ast as az be bg bn-BD bn-IN br bs cak ca cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM ia id is it ja kab ka kk km kn ko lij lt lv mai mk ml mr ms my nb-NO ne-NP nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" >> .mozconfig
 echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 %endif
 

From c8d3f6d3b960b7cb3103430418a3aa083457c73f Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 30 Mar 2019 19:22:55 +0100
Subject: [PATCH 020/473] Fix typo

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index f92d9a8..9d40e76 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -472,7 +472,7 @@ echo "ac_add_options --disable-tests" >> .mozconfig
 
 # Localization
 %if 0%{?build_langpacks}
-echo "ac_add_options --enable-ui-locale="ach af an ar ast as az be bg bn-BD bn-IN br bs cak ca cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM ia id is it ja kab ka kk km kn ko lij lt lv mai mk ml mr ms my nb-NO ne-NP nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW" >> .mozconfig
+echo "ac_add_options --enable-ui-locale="ach af an ar ast as az be bg bn-BD bn-IN br bs cak ca cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM ia id is it ja kab ka kk km kn ko lij lt lv mai mk ml mr ms my nb-NO ne-NP nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW"" >> .mozconfig
 echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 %endif
 

From 22cd89f4bc5a5a174ad963eaf8575d3f271fc3e2 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 30 Mar 2019 20:09:19 +0100
Subject: [PATCH 021/473] Undo last chenages

---
 icecat.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 9d40e76..1c60aec 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -472,7 +472,6 @@ echo "ac_add_options --disable-tests" >> .mozconfig
 
 # Localization
 %if 0%{?build_langpacks}
-echo "ac_add_options --enable-ui-locale="ach af an ar ast as az be bg bn-BD bn-IN br bs cak ca cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM ia id is it ja kab ka kk km kn ko lij lt lv mai mk ml mr ms my nb-NO ne-NP nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW"" >> .mozconfig
 echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 %endif
 

From d628ecf467614a4ccee9d2ede248ed025b8765e6 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 6 Apr 2019 21:20:41 +0200
Subject: [PATCH 022/473] Release 60.6.1-gnu2

---
 .gitignore           |  1 +
 icecat-wayland.sh.in |  4 ++--
 icecat-x11.sh.in     |  4 ++--
 icecat.sh.in         | 13 +++++-----
 icecat.spec          | 56 +++++++++++++++++++++++++-------------------
 sources              |  2 +-
 6 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index afea17a..eed362d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,4 @@
 /icecat-60.6.0-langpacks.tar.gz
 /icecat-60.6.1-gnu1.tar.bz2
 /icecat-60.6.1-langpacks.tar.gz
+/icecat-60.6.1-gnu2.tar.bz2
diff --git a/icecat-wayland.sh.in b/icecat-wayland.sh.in
index 5c6c9d7..d04465c 100644
--- a/icecat-wayland.sh.in
+++ b/icecat-wayland.sh.in
@@ -3,5 +3,5 @@
 # Run GNU IceCat under Wayland
 #
 
-export GDK_BACKEND=wayland
-exec /usr/bin/icecat "$@"
+export MOZ_ENABLE_WAYLAND=1
+exec /__PREFIX__/bin/icecat "$@"
diff --git a/icecat-x11.sh.in b/icecat-x11.sh.in
index f7173e5..e80fad2 100644
--- a/icecat-x11.sh.in
+++ b/icecat-x11.sh.in
@@ -3,5 +3,5 @@
 # Run GNU IceCat on X11 backend	
 #
 
-export GDK_BACKEND=x11
-exec /usr/bin/icecat "$@"
+export MOZ_DISABLE_WAYLAND=1
+exec /__PREFIX__/bin/icecat "$@"
diff --git a/icecat.sh.in b/icecat.sh.in
index 704cccc..e4c1a24 100644
--- a/icecat.sh.in
+++ b/icecat.sh.in
@@ -69,10 +69,10 @@ MOZ_LAUNCHER="$MOZ_DIST_BIN/run-icecat.sh"
 ##
 ## Enable X11 backend by default?	
 ##
-if __DEFAULT_X11__; then
-    if ! [ "$GDK_BACKEND" ]; then
-      export GDK_BACKEND=x11
-    fi	
+if __DEFAULT_WAYLAND__ && ! [ $MOZ_DISABLE_WAYLAND ]; then
+  if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ]; then
+    export MOZ_ENABLE_WAYLAND=1
+  fi
 fi
 
 ##
@@ -107,7 +107,8 @@ export MOZ_PLUGIN_PATH
 ##
 ## Set MOZ_APP_LAUNCHER for gnome-session
 ##
-export MOZ_APP_LAUNCHER="/usr/bin/icecat"
+export MOZ_APP_LAUNCHER="/__PREFIX__/bin/icecat"
+
 
 ##
 ## Set FONTCONFIG_PATH for Xft/fontconfig
@@ -148,7 +149,7 @@ export MOZ_USE_XINPUT2=1
 
 
 ##
-## To disable the use of Firefox localization, set MOZ_DISABLE_LANGPACKS=1
+## To disable the use of IceCat localization, set MOZ_DISABLE_LANGPACKS=1
 ## in your environment before launching Firefox.
 ##
 #
diff --git a/icecat.spec b/icecat.spec
index 1c60aec..26292c4 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -18,6 +18,7 @@
 ##Define installation directories
 %global icecatappdir    %{_libdir}/%{name}
 %global icecat_ver      %{name}-%{version}
+%global gnu_ver         gnu2
 %global icecat_devel    %{name}-devel-%{version}
 
 ##Define language files directory
@@ -45,11 +46,7 @@
 %endif
 
 # Use system libicu?
-%if 0%{?fedora} > 28
 %global system_libicu      1
-%else
-%global system_libicu      0
-%endif
 
 # Use system nspr/nss?
 %global system_nss        1
@@ -87,7 +84,7 @@ ExcludeArch: %{arm}
 
 Name:    icecat
 Version: 60.6.1
-Release: 2%{?dist}
+Release: 2.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -97,7 +94,7 @@ URL:     http://www.gnu.org/software/gnuzilla/
 ## Source archive created by scripts based on Gnuzilla files.
 ## Modified files are hosted in a dedicated fork repository:
 ## https://fedorapeople.org/cgit/sagitter/public_git/icecat.git/
-Source0: https://sagitter.fedorapeople.org/icecat/v%{version}/%{name}-%{version}-gnu1.tar.bz2
+Source0: https://sagitter.fedorapeople.org/icecat/v%{version}/%{name}-%{version}-gnu2.tar.bz2
 
 Source2: %{name}.png
 Source3: %{name}-mozconfig-common
@@ -270,10 +267,10 @@ Requires:       nspr >= %{nspr_build_version}
 Requires:       nss >= %{nss_build_version}
 %endif
 Requires:       fedora-bookmarks
-Suggests:       mozilla-https-everywhere
 Suggests:       mozilla-ublock-origin
 
 Provides:       webclient
+Provides:       mozilla-https-everywhere = 20190131
 
 %description
 GNUZilla Icecat is a fully-free fork of Mozilla Firefox ESR.
@@ -326,9 +323,6 @@ find . -type f -name "*.c" -exec chmod 0644 '{}' \;
 ##Copy license files
 tar -xf %{SOURCE5}
 
-##Prevent HTTPS-everywhere addon's installation
-sed '/https-everywhere/d' -i ./browser/installer/package-manifest.in
-
 %patch2 -p0 -b .libevent_linkflag
 %patch3 -p1 -b .arm
 %patch7 -p0
@@ -586,29 +580,26 @@ done
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE14}
 
+# set up the IceCat start script
 %if 0%{?wayland_backend_default}
-desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE16}
+%global wayland_default true
 %else
-desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE9}
-%endif
-
-# set up the firefox start script
-%if 0%{?wayland_backend_default}
-%global x11_state false
-%else
-%global x11_state true
+%global wayland_default false
 %endif
 
 rm -rf $RPM_BUILD_ROOT%{_bindir}/%{name}
-sed -e 's/__DEFAULT_X11__/%{x11_state}/' %{SOURCE13} > %{buildroot}%{_bindir}/%{name}
+%{__sed} -e 's/__DEFAULT_WAYLAND__/%{wayland_default}/' \
+         -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE13} > %{buildroot}%{_bindir}/%{name}
 chmod 755 %{buildroot}%{_bindir}/%{name}
 
 %if 0%{?wayland_backend_default}
-cat %{SOURCE15} > %{buildroot}%{_bindir}/%{name}-x11
+%{__sed} -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE15} > %{buildroot}%{_bindir}/%{name}-x11
 chmod 755 %{buildroot}%{_bindir}/%{name}-x11
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE16}
 %else
-cat %{SOURCE12} > %{buildroot}%{_bindir}/%{name}-wayland
+%{__sed} -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE12} > %{buildroot}%{_bindir}/%{name}-wayland
 chmod 755 %{buildroot}%{_bindir}/%{name}-wayland
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE9}
 %endif
 #
 
@@ -647,6 +638,21 @@ ln -s langpack-$language_long@icecat.mozilla.org.xpi langpack-$language_short@ic
 cd -
 echo "%%lang($language_short) %{langpackdir}/langpack-$language_short@icecat.mozilla.org.xpi" >> %{name}.lang
 }
+
+# Table of fallbacks for each language
+create_default_langpack "bn-IN" "bn"
+create_default_langpack "es-AR" "es"
+create_default_langpack "fy-NL" "fy"
+create_default_langpack "ga-IE" "ga"
+create_default_langpack "gu-IN" "gu"
+create_default_langpack "hi-IN" "hi"
+create_default_langpack "hy-AM" "hy"
+create_default_langpack "nb-NO" "nb"
+create_default_langpack "nn-NO" "nn"
+create_default_langpack "pa-IN" "pa"
+create_default_langpack "pt-PT" "pt"
+create_default_langpack "sv-SE" "sv"
+create_default_langpack "zh-TW" "zh"
 %endif
 
 # Remove copied libraries to speed up build
@@ -748,8 +754,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
-* Thu Mar 28 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.1-2
-- Test-1 for using locale files correctly
+* Sat Apr 06 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.1-2.gnu2
+- Source archive rebuilt (gnu2)
+- Update extensions
+- Use bundled https-everywhere extension
 
 * Fri Mar 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.1-1
 - Mozilla release 60.6.1
diff --git a/sources b/sources
index d8ad96b..1d13a07 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (icecat-60.6.1-gnu1.tar.bz2) = 7b07d752c31f28ed0f7b3d35dbc23c878fa9a8262174a5b5396e0a9eb9a64b9ba224707f1d466d484534441e5a60931825d47b501f1bcc26c8adffd1c43360cf
+SHA512 (icecat-60.6.1-gnu2.tar.bz2) = cea5f60eb1d6ca27b9482331fe57f6ea982adcc9ea0c4e2f1fc7dab902c40e2b219c9fb3fa12931c020c3496229df07b727567745b085486e663a33192928518
 SHA512 (icecat-60.6.1-langpacks.tar.gz) = 1acaac68119381df7fd25189ec53786b2f962781157a9e3399bbe130cd6accb7db062345c7da2380df08a119acd22ab1a1b79eae3a7c8903a94723f34371071a
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 7053f56d1a1307044ebb83ff16dbc8fd1f74b6d3 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 6 May 2019 12:11:18 +0200
Subject: [PATCH 023/473] Mozilla release 60.6.2 (bugfix mozb #1549061)

---
 .gitignore              |  1 +
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 17 +++++++++--------
 sources                 |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index eed362d..6667793 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@
 /icecat-60.6.1-gnu1.tar.bz2
 /icecat-60.6.1-langpacks.tar.gz
 /icecat-60.6.1-gnu2.tar.bz2
+/icecat-60.6.2-gnu1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 9dd3738..8f457a4 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=60.6.1
+VERSION=60.6.2
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 26292c4..751bb35 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -18,7 +18,7 @@
 ##Define installation directories
 %global icecatappdir    %{_libdir}/%{name}
 %global icecat_ver      %{name}-%{version}
-%global gnu_ver         gnu2
+%global gnu_ver         gnu1
 %global icecat_devel    %{name}-devel-%{version}
 
 ##Define language files directory
@@ -83,8 +83,8 @@
 ExcludeArch: %{arm}
 
 Name:    icecat
-Version: 60.6.1
-Release: 2.%{gnu_ver}%{?dist}
+Version: 60.6.2
+Release: 1.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -94,14 +94,14 @@ URL:     http://www.gnu.org/software/gnuzilla/
 ## Source archive created by scripts based on Gnuzilla files.
 ## Modified files are hosted in a dedicated fork repository:
 ## https://fedorapeople.org/cgit/sagitter/public_git/icecat.git/
-Source0: https://sagitter.fedorapeople.org/icecat/v%{version}/%{name}-%{version}-gnu2.tar.bz2
+Source0: https://sagitter.fedorapeople.org/icecat/v%{version}/%{name}-%{version}-gnu1.tar.bz2
 
 Source2: %{name}.png
 Source3: %{name}-mozconfig-common
 
 ##Language files downloaded by source7 script
 %if 0%{?build_langpacks}
-Source4:  %{name}-%{version}-langpacks.tar.gz
+Source4:  %{name}-60.6.1-langpacks.tar.gz
 %endif
 
 ##All license files
@@ -167,7 +167,7 @@ Patch417: bug1375074-save-restore-x28.patch
 Patch418: mozilla-1436242.patch
 Patch420: %{name}-disable-dbus-remote.patch
 Patch421: %{name}-bz1445383.patch
-Patch422: %{name}-%{version}-mozilla-1533969.patch
+Patch422: %{name}-60.6.1-mozilla-1533969.patch
 
 # Wayland specific upstream patches
 Patch565: firefox-pipewire.patch
@@ -194,8 +194,6 @@ BuildRequires:  pkgconfig(gtk+-3.0)
 %endif
 BuildRequires:  gstreamer1-devel
 BuildRequires:  gstreamer1-plugins-base-devel
-BuildRequires:  gstreamer-devel
-BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  hunspell-devel
 BuildRequires:  ImageMagick, autotrace
 BuildRequires:  java-1.8.0-openjdk-headless
@@ -754,6 +752,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Mon May 06 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.2-1
+- Mozilla release 60.6.2 (bugfix mozb #1549061)
+
 * Sat Apr 06 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.1-2.gnu2
 - Source archive rebuilt (gnu2)
 - Update extensions
diff --git a/sources b/sources
index 1d13a07..ce2a089 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (icecat-60.6.1-gnu2.tar.bz2) = cea5f60eb1d6ca27b9482331fe57f6ea982adcc9ea0c4e2f1fc7dab902c40e2b219c9fb3fa12931c020c3496229df07b727567745b085486e663a33192928518
 SHA512 (icecat-60.6.1-langpacks.tar.gz) = 1acaac68119381df7fd25189ec53786b2f962781157a9e3399bbe130cd6accb7db062345c7da2380df08a119acd22ab1a1b79eae3a7c8903a94723f34371071a
+SHA512 (icecat-60.6.2-gnu1.tar.bz2) = a7497ff83b77218e696095d14dce68d3f4c9661fd6540c7cda00ec3f44e119be4dfb86c7e9041f36d15eb5444c593303c5312a94c46f94f2a487ff40dd6ffe59
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From d2194b6f84b8765c3e84034e4ff5e0b1dc34de01 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 9 May 2019 19:40:04 +0200
Subject: [PATCH 024/473] Mozilla release 60.6.3 (bugfix mozb #1549249)

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 17 ++++++++++-------
 sources                 |  4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6667793..5aca4d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,5 @@
 /icecat-60.6.1-langpacks.tar.gz
 /icecat-60.6.1-gnu2.tar.bz2
 /icecat-60.6.2-gnu1.tar.bz2
+/icecat-60.6.3-gnu1.tar.bz2
+/icecat-60.6.3-langpacks.tar.gz
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 8f457a4..04a9585 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=60.6.2
+VERSION=60.6.3
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 751bb35..bea73c5 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -83,7 +83,7 @@
 ExcludeArch: %{arm}
 
 Name:    icecat
-Version: 60.6.2
+Version: 60.6.3
 Release: 1.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -101,7 +101,7 @@ Source3: %{name}-mozconfig-common
 
 ##Language files downloaded by source7 script
 %if 0%{?build_langpacks}
-Source4:  %{name}-60.6.1-langpacks.tar.gz
+Source4:  %{name}-%{version}-langpacks.tar.gz
 %endif
 
 ##All license files
@@ -277,14 +277,14 @@ Extensions included to this version of IceCat:
  * AboutIceCat
    Adds a custom "about:icecat" homepage with links to information about the
    free software and privacy features in IceCat, and check-boxes to enable
-   and disable the ones more prone to break websites.
+   and disable the ones more prone to break websites
 
  * LibreJS
    GNU LibreJS aims to address the JavaScript problem described in Richard
-   Stallman's article The JavaScript Trap.
+   Stallman's article The JavaScript Trap
 
- * HTML5-video-everywhere
-   Uses the native video player to play embedded videos from different sources
+ * HTTPS Everywhere
+   HTTPS Everywhere is an extension that encrypts your communications with many major websites, making your browsing more secure
 
  * Tor™ Browser Button
    Simple TOR network integration
@@ -752,7 +752,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
-* Mon May 06 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.2-1
+* Thu May 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.3-1.gnu1
+- Mozilla release 60.6.3 (bugfix mozb #1549249)
+
+* Mon May 06 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.2-1.gnu1
 - Mozilla release 60.6.2 (bugfix mozb #1549061)
 
 * Sat Apr 06 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.1-2.gnu2
diff --git a/sources b/sources
index ce2a089..5e245db 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (icecat-60.6.1-langpacks.tar.gz) = 1acaac68119381df7fd25189ec53786b2f962781157a9e3399bbe130cd6accb7db062345c7da2380df08a119acd22ab1a1b79eae3a7c8903a94723f34371071a
-SHA512 (icecat-60.6.2-gnu1.tar.bz2) = a7497ff83b77218e696095d14dce68d3f4c9661fd6540c7cda00ec3f44e119be4dfb86c7e9041f36d15eb5444c593303c5312a94c46f94f2a487ff40dd6ffe59
+SHA512 (icecat-60.6.3-gnu1.tar.bz2) = bf3172dbf8cac6c5ec399171e9e5e321c6931423d7d8352e628418d450f8694cbab5b46a129ea225646f1b63d7bd9410142040108fdfd36c89f24c0d1762517e
+SHA512 (icecat-60.6.3-langpacks.tar.gz) = 3aced9e73a1a7198c50e9ccddfdc7b72fe41ced88d0b1a62976135ebb42ad1e36f0c4470dda0b8b0bea8d94ecc25a31d93071dcc00fa896e3f09646a11ef9f9e
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 77083c2bf61183835fc0653a742b4698497a59cf Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 11 May 2019 18:48:53 +0200
Subject: [PATCH 025/473] New source archive

---
 icecat.spec | 2 +-
 sources     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index bea73c5..0f305f7 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -324,7 +324,7 @@ tar -xf %{SOURCE5}
 %patch2 -p0 -b .libevent_linkflag
 %patch3 -p1 -b .arm
 %patch7 -p0
-%patch8 -p0
+%patch8 -p0 -b .fix_installer
 
 %patch37 -p1 -b .jit-atomic-lucky
 
diff --git a/sources b/sources
index 5e245db..99cd8c3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (icecat-60.6.3-gnu1.tar.bz2) = bf3172dbf8cac6c5ec399171e9e5e321c6931423d7d8352e628418d450f8694cbab5b46a129ea225646f1b63d7bd9410142040108fdfd36c89f24c0d1762517e
+SHA512 (icecat-60.6.3-gnu1.tar.bz2) = 66bfaad3131c6c9bbbade8a52c94bc77056b8bc02b384ead49f028e85e5d5878e46ede2f9f23a700c80dfeeb5be0aa4dbdd31ee57150d2b47dbb70e655655284
 SHA512 (icecat-60.6.3-langpacks.tar.gz) = 3aced9e73a1a7198c50e9ccddfdc7b72fe41ced88d0b1a62976135ebb42ad1e36f0c4470dda0b8b0bea8d94ecc25a31d93071dcc00fa896e3f09646a11ef9f9e
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 4ea503fe7038df0a51959984aacdfeca4b4d96a3 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 12 May 2019 15:54:22 +0200
Subject: [PATCH 026/473] Build release 60.6.3-gnu2

---
 .gitignore         |  1 +
 icecat.appdata.xml |  4 ++--
 icecat.spec        | 11 +++++++----
 sources            |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5aca4d1..d18befc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,3 +73,4 @@
 /icecat-60.6.2-gnu1.tar.bz2
 /icecat-60.6.3-gnu1.tar.bz2
 /icecat-60.6.3-langpacks.tar.gz
+/icecat-60.6.3-gnu2.tar.bz2
diff --git a/icecat.appdata.xml b/icecat.appdata.xml
index e30c55f..69d0ec2 100644
--- a/icecat.appdata.xml
+++ b/icecat.appdata.xml
@@ -34,8 +34,8 @@
           and disable the ones more prone to break websites.
        </p>
        <p>
-       HTML5-video-everywhere
-          Uses the native video player to play embedded videos from different sources
+       HTTPS Everywhere
+          HTTPS Everywhere is an extension that encrypts your communications with many major websites, making your browsing more secure
        </p>
        <p>
        A set of companion extensions for LibreJS by Nathan Nichols (https://addons.mozilla.org/en-US/firefox/user/NateN1222/)
diff --git a/icecat.spec b/icecat.spec
index 0f305f7..f26ae2b 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -18,7 +18,7 @@
 ##Define installation directories
 %global icecatappdir    %{_libdir}/%{name}
 %global icecat_ver      %{name}-%{version}
-%global gnu_ver         gnu1
+%global gnu_ver         gnu2
 %global icecat_devel    %{name}-devel-%{version}
 
 ##Define language files directory
@@ -84,7 +84,7 @@ ExcludeArch: %{arm}
 
 Name:    icecat
 Version: 60.6.3
-Release: 1.%{gnu_ver}%{?dist}
+Release: 2.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -93,8 +93,8 @@ URL:     http://www.gnu.org/software/gnuzilla/
 
 ## Source archive created by scripts based on Gnuzilla files.
 ## Modified files are hosted in a dedicated fork repository:
-## https://fedorapeople.org/cgit/sagitter/public_git/icecat.git/
-Source0: https://sagitter.fedorapeople.org/icecat/v%{version}/%{name}-%{version}-gnu1.tar.bz2
+## https://gitlab.com/anto.trande/icecat
+Source0: https://sagitter.fedorapeople.org/%{name}/v%{version}/%{name}-%{version}-%{gnu_ver}.tar.bz2
 
 Source2: %{name}.png
 Source3: %{name}-mozconfig-common
@@ -752,6 +752,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Sun May 12 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.3-1.gnu2
+- Build release 60.6.3-gnu2
+
 * Thu May 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.3-1.gnu1
 - Mozilla release 60.6.3 (bugfix mozb #1549249)
 
diff --git a/sources b/sources
index 99cd8c3..91f0349 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (icecat-60.6.3-gnu1.tar.bz2) = 66bfaad3131c6c9bbbade8a52c94bc77056b8bc02b384ead49f028e85e5d5878e46ede2f9f23a700c80dfeeb5be0aa4dbdd31ee57150d2b47dbb70e655655284
+SHA512 (icecat-60.6.3-gnu2.tar.bz2) = 5a925a1de91ec09eda9dd9c0d3825cf6f6997f3ba0c4887f464549e5cc6846d5f9ac3106141c138aa5309d4aafb2729794a668920128b6cd35297792fdc1f777
 SHA512 (icecat-60.6.3-langpacks.tar.gz) = 3aced9e73a1a7198c50e9ccddfdc7b72fe41ced88d0b1a62976135ebb42ad1e36f0c4470dda0b8b0bea8d94ecc25a31d93071dcc00fa896e3f09646a11ef9f9e
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 29641326f07474b4c86776d5a41fb7e820b62960 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 12 May 2019 16:12:30 +0200
Subject: [PATCH 027/473] Fix Changelog entry

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index f26ae2b..9456319 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -752,7 +752,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
-* Sun May 12 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.3-1.gnu2
+* Sun May 12 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.3-2.gnu2
 - Build release 60.6.3-gnu2
 
 * Thu May 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.3-1.gnu1

From 1710db4a34a16bf8ad361e3e66744fcb77ad8d54 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 21 May 2019 18:06:08 +0200
Subject: [PATCH 028/473] Mozilla release 60.7.0

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 12 ++++++++----
 sources                 |  4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index d18befc..1d905dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,5 @@
 /icecat-60.6.3-gnu1.tar.bz2
 /icecat-60.6.3-langpacks.tar.gz
 /icecat-60.6.3-gnu2.tar.bz2
+/icecat-60.7.0-gnu1.tar.bz2
+/icecat-60.7.0-langpacks.tar.gz
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 04a9585..0ce70cd 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=60.6.3
+VERSION=60.7.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 9456319..fe2e753 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -18,7 +18,7 @@
 ##Define installation directories
 %global icecatappdir    %{_libdir}/%{name}
 %global icecat_ver      %{name}-%{version}
-%global gnu_ver         gnu2
+%global gnu_ver         gnu1
 %global icecat_devel    %{name}-devel-%{version}
 
 ##Define language files directory
@@ -83,8 +83,8 @@
 ExcludeArch: %{arm}
 
 Name:    icecat
-Version: 60.6.3
-Release: 2.%{gnu_ver}%{?dist}
+Version: 60.7.0
+Release: 1.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -284,7 +284,8 @@ Extensions included to this version of IceCat:
    Stallman's article The JavaScript Trap
 
  * HTTPS Everywhere
-   HTTPS Everywhere is an extension that encrypts your communications with many major websites, making your browsing more secure
+   HTTPS Everywhere is an extension that encrypts your communications with many major websites,
+   making your browsing more secure
 
  * Tor™ Browser Button
    Simple TOR network integration
@@ -752,6 +753,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Mon May 20 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.0-1.gnu1
+- Mozilla release 60.7.0
+
 * Sun May 12 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.3-2.gnu2
 - Build release 60.6.3-gnu2
 
diff --git a/sources b/sources
index 91f0349..2106d99 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (icecat-60.6.3-gnu2.tar.bz2) = 5a925a1de91ec09eda9dd9c0d3825cf6f6997f3ba0c4887f464549e5cc6846d5f9ac3106141c138aa5309d4aafb2729794a668920128b6cd35297792fdc1f777
-SHA512 (icecat-60.6.3-langpacks.tar.gz) = 3aced9e73a1a7198c50e9ccddfdc7b72fe41ced88d0b1a62976135ebb42ad1e36f0c4470dda0b8b0bea8d94ecc25a31d93071dcc00fa896e3f09646a11ef9f9e
+SHA512 (icecat-60.7.0-gnu1.tar.bz2) = 4269de3b02ed2c7a97b197e3df23499e650e7c1d7e45a5749f03a7bac00f3a80a89f90e395a81ad3d0a224500312e69dbe51922dc2f5a3e96fd13918e0f5da7e
+SHA512 (icecat-60.7.0-langpacks.tar.gz) = 8bb509ebae69eb8b97c664960e0798f322b02a9d4da747e68898ace3ae92e02d00ba928489bddf908f5df36b910e7dc4e562b80a906d013d234119f9f1b83242
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From d121f1ecfed2095b3040ffd049819d807a707742 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 28 May 2019 21:47:44 +0200
Subject: [PATCH 029/473] Build release 60.7.0-gnu2

---
 .gitignore             |  1 +
 icecat-wayland.desktop |  4 ++--
 icecat.appdata.xml     | 34 ++++++++++++++++++++++------------
 icecat.spec            | 12 ++++++++++--
 sources                |  2 +-
 5 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1d905dc..bf4f378 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@
 /icecat-60.6.3-gnu2.tar.bz2
 /icecat-60.7.0-gnu1.tar.bz2
 /icecat-60.7.0-langpacks.tar.gz
+/icecat-60.7.0-gnu2.tar.bz2
diff --git a/icecat-wayland.desktop b/icecat-wayland.desktop
index 411d7da..44e6c47 100644
--- a/icecat-wayland.desktop
+++ b/icecat-wayland.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Version=1.0
-Name=GNU IceCat\n on Wayland
+Name=GNU IceCat on Wayland
 Comment=Browse the World Wide Web
 GenericName=Web Browser
 Keywords=Internet;WWW;Browser;Web;Explorer;
@@ -11,7 +11,7 @@ Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
 Categories=Network;WebBrowser;
 StartupNotify=true
-Name[en_US]=GNU IceCat\n on Wayland
+Name[en_US]=GNU IceCat on Wayland
 Actions=new-window;new-private-window;
 
 [Desktop Action new-window]
diff --git a/icecat.appdata.xml b/icecat.appdata.xml
index 69d0ec2..686c9e7 100644
--- a/icecat.appdata.xml
+++ b/icecat.appdata.xml
@@ -22,35 +22,45 @@
     <p>
        Extensions included to this version of IceCat:
     </p>
-       <p>
+     <ul>
+       <li>
        LibreJS
           GNU LibreJS aims to address the JavaScript problem described in Richard
           Stallman's article The JavaScript Trap.
-       </p>
-       <p>
+       </li>
+       <li>
        AboutIceCat
           Adds a custom "about:icecat" homepage with links to information about the
           free software and privacy features in IceCat, and check-boxes to enable
           and disable the ones more prone to break websites.
-       </p>
-       <p>
+       </li>
+       <li>
        HTTPS Everywhere
           HTTPS Everywhere is an extension that encrypts your communications with many major websites, making your browsing more secure
-       </p>
-       <p>
+       </li>
+       <li>
        A set of companion extensions for LibreJS by Nathan Nichols (https://addons.mozilla.org/en-US/firefox/user/NateN1222/)
        are pre-installed, and provide workarounds to use some services at USPS, RSF.org, SumOfUs.org, pay.gov, McDonald's, goteo.org
        and Google Docs without using nonfree JavaScript.
-       </p>
-       <p>
+       </li>
+       <li>
        A series of configuration changes and tweaks were applied to ensure that IceCat does not initiate network connections
        that the user has not explicitly requested. This implies not downloading feeds, updates, blacklists or any other similar
        data needed during startup.
-       </p>
-       <p>
+       </li>
+       <li>
        Tor™ Browser Button
           Simple TOR network integration (requires running TOR separately at the operating system level)
-       </p>
+       </li>
+       <li>
+       Searxes
+          Third-party Request Blocker
+       </li>
+       <li>
+       View Tube
+          Watch videos from video sharing websites with extra options
+       </li>
+      </ul>
   </description>
   <url type="homepage">http://www.gnu.org/software/gnuzilla/</url>
   <screenshots>
diff --git a/icecat.spec b/icecat.spec
index fe2e753..23f9123 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -18,7 +18,6 @@
 ##Define installation directories
 %global icecatappdir    %{_libdir}/%{name}
 %global icecat_ver      %{name}-%{version}
-%global gnu_ver         gnu1
 %global icecat_devel    %{name}-devel-%{version}
 
 ##Define language files directory
@@ -82,9 +81,12 @@
 # Exclude ARM builds for rhbz #1658940
 ExcludeArch: %{arm}
 
+# Set new source-code build version
+%global gnu_ver         gnu2
+
 Name:    icecat
 Version: 60.7.0
-Release: 1.%{gnu_ver}%{?dist}
+Release: 2.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -294,6 +296,9 @@ Extensions included to this version of IceCat:
  * Searxes
    Third-party Request Blocker
 
+ * View Tube
+   Watch videos from video sharing websites with extra options
+
 %if 0%{?wayland_backend_default}
 %package x11
 Summary: GNU IceCat X11 launcher
@@ -753,6 +758,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Tue May 28 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.0-2.gnu2
+- Build release 60.7.0-gnu2
+
 * Mon May 20 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.0-1.gnu1
 - Mozilla release 60.7.0
 
diff --git a/sources b/sources
index 2106d99..d9d2a9d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (icecat-60.7.0-gnu1.tar.bz2) = 4269de3b02ed2c7a97b197e3df23499e650e7c1d7e45a5749f03a7bac00f3a80a89f90e395a81ad3d0a224500312e69dbe51922dc2f5a3e96fd13918e0f5da7e
+SHA512 (icecat-60.7.0-gnu2.tar.bz2) = 1c13e3715f3131fb44346cc2c0418ddeeb7ae6e9bd83d0f11ba2504e014f33aeff2484768dc508ab5e7aec18bc6025a84bde11aac12274eba559fbf9864bf478
 SHA512 (icecat-60.7.0-langpacks.tar.gz) = 8bb509ebae69eb8b97c664960e0798f322b02a9d4da747e68898ace3ae92e02d00ba928489bddf908f5df36b910e7dc4e562b80a906d013d234119f9f1b83242
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 0a24cb56658553189e5954cbea174232d16ea847 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 19 Jun 2019 15:02:08 +0200
Subject: [PATCH 030/473] Mozilla release 60.7.1

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.rpmlintrc        | 38 --------------------------------------
 icecat.spec             | 14 +++++++-------
 sources                 |  4 ++--
 5 files changed, 12 insertions(+), 48 deletions(-)
 delete mode 100644 icecat.rpmlintrc

diff --git a/.gitignore b/.gitignore
index bf4f378..a220e0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,5 @@
 /icecat-60.7.0-gnu1.tar.bz2
 /icecat-60.7.0-langpacks.tar.gz
 /icecat-60.7.0-gnu2.tar.bz2
+/icecat-60.7.1-gnu1.tar.bz2
+/icecat-60.7.1-langpacks.tar.gz
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 0ce70cd..08d9a1f 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=60.7.0
+VERSION=60.7.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
deleted file mode 100644
index 22effff..0000000
--- a/icecat.rpmlintrc
+++ /dev/null
@@ -1,38 +0,0 @@
-# Edited by sagitter (sagitter AT fedoraproject dot org)
-
-# KNOWN BUGS:
-#
-
-# TESTS:
-##### SRPMs #####
-
-# ifarch applied patches are okay
-# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
-addFilter(r'(%ifarch-applied-patch) Patch*')
-
-# ERRORS:
-##### RPMs  #####
-
-# chroot function (??)
-addFilter(r'(missing-call-to-chdir-with-chroot) %{_libdir}/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) %{_libdir}/icecat/libxul.so')
-
-# Expected on FF browser
-# https://support.mozilla.org/en-US/questions/1045418
-addFilter(r'(zero-length) %{_libdir}/icecat/chrome.manifest')
-addFilter(r'(zero-length) %{_libdir}/icecat/browser/chrome.manifest')
-
-# False positive
-addFilter(r'(dangling-symlink) %{_libdir}/icecat/dictionaries %{_datadir}/myspell')
-addFilter(r'(unversioned-explicit-provides) webclient')
-
-# WARNINGS:
-##### RPMs  #####
-
-addFilter(r'(no-manual-page-for-binary) icecat-wayland')
-
-##### SRPMs #####
-# Different file size due to the signature of the source code tarbz archive
-addFilter(r'file-size-mismatch')
-
-addFilter(r'(invalid-url) Source*')
diff --git a/icecat.spec b/icecat.spec
index 23f9123..ccbd697 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -82,11 +82,11 @@
 ExcludeArch: %{arm}
 
 # Set new source-code build version
-%global gnu_ver         gnu2
+%global gnu_ver         gnu1
 
 Name:    icecat
-Version: 60.7.0
-Release: 2.%{gnu_ver}%{?dist}
+Version: 60.7.1
+Release: 1.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -117,10 +117,6 @@ Source6: %{name}.1
 
 Source7: %{name}-lang_download.sh
 
-# Whitelisting errors
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-Source8: %{name}.rpmlintrc
-
 # Desktop files
 Source9:  %{name}-wayland.desktop
 Source10: %{name}.appdata.xml
@@ -758,6 +754,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Wed Jun 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.1-1.gnu1
+- Mozilla release 60.7.1
+- Do not list Git-tracked COPASI.rpmlintrc as source
+
 * Tue May 28 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.0-2.gnu2
 - Build release 60.7.0-gnu2
 
diff --git a/sources b/sources
index d9d2a9d..00f8554 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (icecat-60.7.0-gnu2.tar.bz2) = 1c13e3715f3131fb44346cc2c0418ddeeb7ae6e9bd83d0f11ba2504e014f33aeff2484768dc508ab5e7aec18bc6025a84bde11aac12274eba559fbf9864bf478
-SHA512 (icecat-60.7.0-langpacks.tar.gz) = 8bb509ebae69eb8b97c664960e0798f322b02a9d4da747e68898ace3ae92e02d00ba928489bddf908f5df36b910e7dc4e562b80a906d013d234119f9f1b83242
+SHA512 (icecat-60.7.1-gnu1.tar.bz2) = d556774544b8eae1184724a61afeb41bd063108ea37fd541dc92dc1de6b313c4904a9272c0281035f21d9ff63394653ae744282c9b6499ed5993fa9ec6469004
+SHA512 (icecat-60.7.1-langpacks.tar.gz) = 36f620450b203cca812229b9fcd5cf1676cc0a791c7ac895f7ca9027bd4170aff8a6cb5f88cc4ed0e695e1064b2cfce0013ae4ab782833859793a7b8b6e06969
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 9e28db2e7b17f139dd9066c964c681e68523a63c Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 19 Jun 2019 15:05:13 +0200
Subject: [PATCH 031/473] Push icecat.rpmlintrc

---
 icecat.rpmlintrc | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 icecat.rpmlintrc

diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
new file mode 100644
index 0000000..c2c8f6f
--- /dev/null
+++ b/icecat.rpmlintrc
@@ -0,0 +1,40 @@
+# Whitelisting errors
+# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
+# Edited by sagitter (sagitter AT fedoraproject dot org)
+
+# KNOWN BUGS:
+#
+
+# TESTS:
+##### SRPMs #####
+
+# ifarch applied patches are okay
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
+addFilter(r'(%ifarch-applied-patch) Patch*')
+
+# ERRORS:
+##### RPMs  #####
+
+# chroot function (??)
+addFilter(r'(missing-call-to-chdir-with-chroot) %{_libdir}/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) %{_libdir}/icecat/libxul.so')
+
+# Expected on FF browser
+# https://support.mozilla.org/en-US/questions/1045418
+addFilter(r'(zero-length) %{_libdir}/icecat/chrome.manifest')
+addFilter(r'(zero-length) %{_libdir}/icecat/browser/chrome.manifest')
+
+# False positive
+addFilter(r'(dangling-symlink) %{_libdir}/icecat/dictionaries %{_datadir}/myspell')
+addFilter(r'(unversioned-explicit-provides) webclient')
+
+# WARNINGS:
+##### RPMs  #####
+
+addFilter(r'(no-manual-page-for-binary) icecat-wayland')
+
+##### SRPMs #####
+# Different file size due to the signature of the source code tarbz archive
+addFilter(r'file-size-mismatch')
+
+addFilter(r'(invalid-url) Source*')

From 6c6066e05458325e9258199fee0d3b8bec3e9087 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 20 Jun 2019 11:35:56 +0200
Subject: [PATCH 032/473] Fix Changelog

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index ccbd697..0a2a9f3 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -756,7 +756,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %changelog
 * Wed Jun 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.1-1.gnu1
 - Mozilla release 60.7.1
-- Do not list Git-tracked COPASI.rpmlintrc as source
+- Do not list Git-tracked icecat.rpmlintrc as source
 
 * Tue May 28 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.0-2.gnu2
 - Build release 60.7.0-gnu2

From 6056d3b5ec5dd548542c24cca04c5f4110514b00 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 22 Jun 2019 22:03:39 +0200
Subject: [PATCH 033/473] Mozilla release 60.7.2

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.rpmlintrc        | 40 ----------------------------------------
 icecat.spec             |  5 ++++-
 sources                 |  4 ++--
 5 files changed, 9 insertions(+), 44 deletions(-)
 delete mode 100644 icecat.rpmlintrc

diff --git a/.gitignore b/.gitignore
index a220e0e..f122d94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,3 +79,5 @@
 /icecat-60.7.0-gnu2.tar.bz2
 /icecat-60.7.1-gnu1.tar.bz2
 /icecat-60.7.1-langpacks.tar.gz
+/icecat-60.7.2-gnu1.tar.bz2
+/icecat-60.7.2-langpacks.tar.gz
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 08d9a1f..c474a61 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=60.7.1
+VERSION=60.7.2
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
deleted file mode 100644
index c2c8f6f..0000000
--- a/icecat.rpmlintrc
+++ /dev/null
@@ -1,40 +0,0 @@
-# Whitelisting errors
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-# Edited by sagitter (sagitter AT fedoraproject dot org)
-
-# KNOWN BUGS:
-#
-
-# TESTS:
-##### SRPMs #####
-
-# ifarch applied patches are okay
-# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
-addFilter(r'(%ifarch-applied-patch) Patch*')
-
-# ERRORS:
-##### RPMs  #####
-
-# chroot function (??)
-addFilter(r'(missing-call-to-chdir-with-chroot) %{_libdir}/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) %{_libdir}/icecat/libxul.so')
-
-# Expected on FF browser
-# https://support.mozilla.org/en-US/questions/1045418
-addFilter(r'(zero-length) %{_libdir}/icecat/chrome.manifest')
-addFilter(r'(zero-length) %{_libdir}/icecat/browser/chrome.manifest')
-
-# False positive
-addFilter(r'(dangling-symlink) %{_libdir}/icecat/dictionaries %{_datadir}/myspell')
-addFilter(r'(unversioned-explicit-provides) webclient')
-
-# WARNINGS:
-##### RPMs  #####
-
-addFilter(r'(no-manual-page-for-binary) icecat-wayland')
-
-##### SRPMs #####
-# Different file size due to the signature of the source code tarbz archive
-addFilter(r'file-size-mismatch')
-
-addFilter(r'(invalid-url) Source*')
diff --git a/icecat.spec b/icecat.spec
index 0a2a9f3..cb4cad6 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -85,7 +85,7 @@ ExcludeArch: %{arm}
 %global gnu_ver         gnu1
 
 Name:    icecat
-Version: 60.7.1
+Version: 60.7.2
 Release: 1.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -754,6 +754,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Sat Jun 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.2-1.gnu1
+- Mozilla release 60.7.2
+
 * Wed Jun 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.1-1.gnu1
 - Mozilla release 60.7.1
 - Do not list Git-tracked icecat.rpmlintrc as source
diff --git a/sources b/sources
index 00f8554..df5d83f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (icecat-60.7.1-gnu1.tar.bz2) = d556774544b8eae1184724a61afeb41bd063108ea37fd541dc92dc1de6b313c4904a9272c0281035f21d9ff63394653ae744282c9b6499ed5993fa9ec6469004
-SHA512 (icecat-60.7.1-langpacks.tar.gz) = 36f620450b203cca812229b9fcd5cf1676cc0a791c7ac895f7ca9027bd4170aff8a6cb5f88cc4ed0e695e1064b2cfce0013ae4ab782833859793a7b8b6e06969
+SHA512 (icecat-60.7.2-gnu1.tar.bz2) = 230a1f3516eda6d1d63ca2cacfbea15b3e2d7e7a4a51c04af288a8204b9cc4a58f3accc06d4ab8d7e2947977955f77b2db3c7b6bdeee7ea741042bf8a32bf97a
+SHA512 (icecat-60.7.2-langpacks.tar.gz) = 69ffdfb2dd3fb82b028627404599e4e12a3ac7100941862dd2afe07755dda7d41370d50efda78e852360ea8862933aebfdde4c29907190077cf2b04ac26ea820
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From e1bbc1917f1e1028b945706a16fde6004ca82003 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 22 Jun 2019 22:33:21 +0200
Subject: [PATCH 034/473] Add rpmlintrc file

---
 icecat.rpmlintrc | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 icecat.rpmlintrc

diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
new file mode 100644
index 0000000..c2c8f6f
--- /dev/null
+++ b/icecat.rpmlintrc
@@ -0,0 +1,40 @@
+# Whitelisting errors
+# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
+# Edited by sagitter (sagitter AT fedoraproject dot org)
+
+# KNOWN BUGS:
+#
+
+# TESTS:
+##### SRPMs #####
+
+# ifarch applied patches are okay
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
+addFilter(r'(%ifarch-applied-patch) Patch*')
+
+# ERRORS:
+##### RPMs  #####
+
+# chroot function (??)
+addFilter(r'(missing-call-to-chdir-with-chroot) %{_libdir}/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) %{_libdir}/icecat/libxul.so')
+
+# Expected on FF browser
+# https://support.mozilla.org/en-US/questions/1045418
+addFilter(r'(zero-length) %{_libdir}/icecat/chrome.manifest')
+addFilter(r'(zero-length) %{_libdir}/icecat/browser/chrome.manifest')
+
+# False positive
+addFilter(r'(dangling-symlink) %{_libdir}/icecat/dictionaries %{_datadir}/myspell')
+addFilter(r'(unversioned-explicit-provides) webclient')
+
+# WARNINGS:
+##### RPMs  #####
+
+addFilter(r'(no-manual-page-for-binary) icecat-wayland')
+
+##### SRPMs #####
+# Different file size due to the signature of the source code tarbz archive
+addFilter(r'file-size-mismatch')
+
+addFilter(r'(invalid-url) Source*')

From a832830f5293e2b75cdee763702e1798588132fb Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 10 Jul 2019 13:04:01 +0200
Subject: [PATCH 035/473] Mozilla release 60.8.0

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             |  8 +++++++-
 mozilla-1512162.patch   | 26 ++++++++++++++++++++++++++
 sources                 |  4 ++--
 5 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 mozilla-1512162.patch

diff --git a/.gitignore b/.gitignore
index f122d94..0e7fd6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,5 @@
 /icecat-60.7.1-langpacks.tar.gz
 /icecat-60.7.2-gnu1.tar.bz2
 /icecat-60.7.2-langpacks.tar.gz
+/icecat-60.8.0-gnu1.tar.bz2
+/icecat-60.8.0-langpacks.tar.gz
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index c474a61..832a09b 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=60.7.2
+VERSION=60.8.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index cb4cad6..8f137fa 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -85,7 +85,7 @@ ExcludeArch: %{arm}
 %global gnu_ver         gnu1
 
 Name:    icecat
-Version: 60.7.2
+Version: 60.8.0
 Release: 1.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -166,6 +166,8 @@ Patch418: mozilla-1436242.patch
 Patch420: %{name}-disable-dbus-remote.patch
 Patch421: %{name}-bz1445383.patch
 Patch422: %{name}-60.6.1-mozilla-1533969.patch
+# Fix crash on ppc64le (mozilla#1512162)
+Patch423: mozilla-1512162.patch
 
 # Wayland specific upstream patches
 Patch565: firefox-pipewire.patch
@@ -361,6 +363,7 @@ tar -xf %{SOURCE5}
 %if 0%{?fedora} > 30
 %patch422 -p1 -b .%{name}-%{version}-mozilla-1533969
 %endif
+%patch423 -p1 -b .mozilla-1512162.patch
 
 # Wayland specific upstream patches
 dos2unix %{PATCH565}
@@ -754,6 +757,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Tue Jul 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-1.gnu1
+- Mozilla release 60.8.0
+
 * Sat Jun 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.2-1.gnu1
 - Mozilla release 60.7.2
 
diff --git a/mozilla-1512162.patch b/mozilla-1512162.patch
new file mode 100644
index 0000000..85e4abe
--- /dev/null
+++ b/mozilla-1512162.patch
@@ -0,0 +1,26 @@
+diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
+--- a/js/xpconnect/src/XPCWrappedNative.cpp
++++ b/js/xpconnect/src/XPCWrappedNative.cpp
+@@ -1145,6 +1145,10 @@
+   return CallMethodHelper(ccx).Call();
+ }
+ 
++#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
++// Work around a compiler bug on ppc64le (bug 1512162).
++__attribute__ ((noinline,noclone))
++#endif
+ bool CallMethodHelper::Call() {
+   mCallContext.SetRetVal(JS::UndefinedValue());
+ 
+@@ -1315,6 +1319,10 @@
+   return true;
+ }
+ 
++#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
++// Work around a compiler bug on ppc64le (bug 1512162).
++__attribute__ ((noinline,noclone))
++#endif
+ bool CallMethodHelper::GatherAndConvertResults() {
+   // now we iterate through the native params to gather and convert results
+   uint8_t paramCount = mMethodInfo->GetParamCount();
+
diff --git a/sources b/sources
index df5d83f..e5e5f07 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (icecat-60.7.2-gnu1.tar.bz2) = 230a1f3516eda6d1d63ca2cacfbea15b3e2d7e7a4a51c04af288a8204b9cc4a58f3accc06d4ab8d7e2947977955f77b2db3c7b6bdeee7ea741042bf8a32bf97a
-SHA512 (icecat-60.7.2-langpacks.tar.gz) = 69ffdfb2dd3fb82b028627404599e4e12a3ac7100941862dd2afe07755dda7d41370d50efda78e852360ea8862933aebfdde4c29907190077cf2b04ac26ea820
+SHA512 (icecat-60.8.0-gnu1.tar.bz2) = 31900c921102ccaa736b8be20210d16b7bae9c797d2529e9f38e803d834c72bacfe6e586934e21c48ca7097cc0bbc56adccc6beefc5f42b1e7ee4a3d93e9f223
+SHA512 (icecat-60.8.0-langpacks.tar.gz) = 82f63a5c0e7b4af8ed616d94f99274c4a54fa092147bcce3eb4f77026b562a8109cc289fec18abdf0e350484a8645eb32f173fbbe3e20cb12f8fb79cea52554b
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 56b1192bbe40956f34b656f836aeade51829e7cc Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 10 Jul 2019 21:50:39 +0200
Subject: [PATCH 036/473] Use mozilla-1512162.patch on Fedora 30+ only (GCC-9)

---
 icecat.spec           | 7 ++++++-
 mozilla-1512162.patch | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 8f137fa..45ab644 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -86,7 +86,7 @@ ExcludeArch: %{arm}
 
 Name:    icecat
 Version: 60.8.0
-Release: 1.%{gnu_ver}%{?dist}
+Release: 2.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -363,7 +363,9 @@ tar -xf %{SOURCE5}
 %if 0%{?fedora} > 30
 %patch422 -p1 -b .%{name}-%{version}-mozilla-1533969
 %endif
+%if 0%{?fedora} > 29
 %patch423 -p1 -b .mozilla-1512162.patch
+%endif
 
 # Wayland specific upstream patches
 dos2unix %{PATCH565}
@@ -757,6 +759,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Wed Jul 10 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-2.gnu1
+- Use mozilla-1512162.patch on Fedora 30+ only (GCC-9)
+
 * Tue Jul 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-1.gnu1
 - Mozilla release 60.8.0
 
diff --git a/mozilla-1512162.patch b/mozilla-1512162.patch
index 85e4abe..a324372 100644
--- a/mozilla-1512162.patch
+++ b/mozilla-1512162.patch
@@ -12,7 +12,7 @@ diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrapped
  bool CallMethodHelper::Call() {
    mCallContext.SetRetVal(JS::UndefinedValue());
  
-@@ -1315,6 +1319,10 @@
+@@ -1318,6 +1322,10 @@
    return true;
  }
  
@@ -23,4 +23,3 @@ diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrapped
  bool CallMethodHelper::GatherAndConvertResults() {
    // now we iterate through the native params to gather and convert results
    uint8_t paramCount = mMethodInfo->GetParamCount();
-

From 7af2f47be204c2d07e50e6389f890e9ec20a9349 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 11 Jul 2019 21:39:21 +0200
Subject: [PATCH 037/473] Enable webrtc on %%{ix86} x86_64 only| Remove
 filtering of private libraries

---
 icecat.spec | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 45ab644..0ad3784 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,15 +1,3 @@
-# Filtering of private libraries
-%global privlibs libbrowsercomps
-%global privlibs %{privlibs}|libclearkey
-%global privlibs %{privlibs}|libdbusservice
-%global privlibs %{privlibs}|libmozalloc
-%global privlibs %{privlibs}|libmozgnome
-%global privlibs %{privlibs}|liblgpllibs
-
-%global __provides_exclude ^(%{privlibs})\\.so
-%global __requires_exclude ^(%{privlibs})\\.so
-#
-
 ##Active/Deactive language files handling
 %global build_langpacks 1
 
@@ -86,7 +74,7 @@ ExcludeArch: %{arm}
 
 Name:    icecat
 Version: 60.8.0
-Release: 2.%{gnu_ver}%{?dist}
+Release: 3.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -378,10 +366,10 @@ cp -p %{SOURCE3} .mozconfig
 echo "ac_add_options --enable-default-toolkit=cairo-gtk3-wayland" >> .mozconfig
 echo "ac_add_options --enable-official-branding" >> .mozconfig
 
-%ifarch %{ix86} x86_64
-echo "ac_add_options --enable-webrtc" >> .mozconfig
-%else
+%ifnarch %{ix86} x86_64
 echo "ac_add_options --disable-webrtc" >> .mozconfig
+%else
+echo "ac_add_options --enable-webrtc" >> .mozconfig
 %endif
 
 %if %{with pulseaudio}
@@ -759,6 +747,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Thu Jul 11 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-3.gnu1
+- Remove filtering of private libraries
+- Enable webrtc on %%{ix86} x86_64 only
+
 * Wed Jul 10 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-2.gnu1
 - Use mozilla-1512162.patch on Fedora 30+ only (GCC-9)
 

From 53ba7d160f12e79e6f0f24111bfcd28c211140ec Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 12 Jul 2019 18:54:55 +0200
Subject: [PATCH 038/473] Remove redundant Python2 dependencies

---
 icecat.spec | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 0ad3784..dae34ef 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -74,7 +74,7 @@ ExcludeArch: %{arm}
 
 Name:    icecat
 Version: 60.8.0
-Release: 3.%{gnu_ver}%{?dist}
+Release: 4.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -218,8 +218,6 @@ BuildRequires:  openjpeg-devel
 BuildRequires:  pango-devel
 BuildRequires:  pipewire-devel
 BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-virtualenv
 BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(libstartup-notification-1.0)
@@ -747,6 +745,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Fri Jul 12 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-4.gnu1
+- Remove redundant Python2 dependencies 
+
 * Thu Jul 11 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-3.gnu1
 - Remove filtering of private libraries
 - Enable webrtc on %%{ix86} x86_64 only

From 0807c29735dc39025e7c7805fb81d5908c43e459 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 23 Jul 2019 10:26:04 +0200
Subject: [PATCH 039/473] Enable WebRTC on ppc64le

---
 icecat.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index dae34ef..d082ede 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -74,7 +74,7 @@ ExcludeArch: %{arm}
 
 Name:    icecat
 Version: 60.8.0
-Release: 4.%{gnu_ver}%{?dist}
+Release: 5.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -364,7 +364,7 @@ cp -p %{SOURCE3} .mozconfig
 echo "ac_add_options --enable-default-toolkit=cairo-gtk3-wayland" >> .mozconfig
 echo "ac_add_options --enable-official-branding" >> .mozconfig
 
-%ifnarch %{ix86} x86_64
+%ifnarch %{ix86} x86_64 ppc64le
 echo "ac_add_options --disable-webrtc" >> .mozconfig
 %else
 echo "ac_add_options --enable-webrtc" >> .mozconfig
@@ -745,6 +745,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Tue Jul 23 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-5.gnu1
+- Enable WebRTC on ppc64le
+
 * Fri Jul 12 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-4.gnu1
 - Remove redundant Python2 dependencies 
 

From 5a3172c7bb2151edf0a8ccbdcc975be0db86cb99 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jul 2019 09:19:01 +0000
Subject: [PATCH 040/473] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 icecat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index d082ede..8ef2ac9 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -74,7 +74,7 @@ ExcludeArch: %{arm}
 
 Name:    icecat
 Version: 60.8.0
-Release: 5.%{gnu_ver}%{?dist}
+Release: 6.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -745,6 +745,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 60.8.0-6.gnu1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Tue Jul 23 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-5.gnu1
 - Enable WebRTC on ppc64le
 

From aadd0f7984d281bd38f0acab97dde18772444dd9 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 28 Jul 2019 12:55:24 +0200
Subject: [PATCH 041/473] Add patch to fix the addon installation

---
 icecat-fix_addon_installation.patch | 36 +++++++++++++++++++++++++++++
 icecat.spec                         | 11 +++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 icecat-fix_addon_installation.patch

diff --git a/icecat-fix_addon_installation.patch b/icecat-fix_addon_installation.patch
new file mode 100644
index 0000000..fd83f72
--- /dev/null
+++ b/icecat-fix_addon_installation.patch
@@ -0,0 +1,36 @@
+# Fixes installation of those addons which don't have ID on IceCat ("Cannot find id for addon" error).
+--- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm
++++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
+@@ -885,8 +885,30 @@
+         throw new Error(`Webextension is signed with an invalid id (${addon.id})`);
+       }
+     }
+-    if (!addon.id && aInstallLocation.name == KEY_APP_TEMPORARY) {
+-      addon.id = generateTemporaryInstallID(aZipReader.file);
++    if (!addon.id) {
++      if (aInstallLocation.name == KEY_APP_TEMPORARY) {
++        addon.id = generateTemporaryInstallID(aZipReader.file);
++      } else {
++        try {
++          let sigInput = aZipReader.getInputStream("META-INF/cose.sig");
++          let sigBinary = Cc['@mozilla.org/binaryinputstream;1']
++            .createInstance(Ci.nsIBinaryInputStream);
++          sigBinary.setInputStream(sigInput);
++          var sig = ''
++          var sigCount;
++          while ((sigCount = sigBinary.available()) > 0) {
++            sig += sigBinary.readBytes(sigCount);
++          }
++          let sigMatch = sig.match(/\{\w{8}-\w{4}-\w{4}-\w{4}-\w{12}\}/g)
++          if (sigMatch && sigMatch.length == 1) {
++            addon.id = sigMatch[0]
++          } else {
++            logger.warn("Failed to find addon id");
++          }
++        } catch (e) {
++          logger.warn("Failed to process META-INF/cose.sig");
++        }
++      }
+     }
+   }
+   addon.updateBlocklistState();
diff --git a/icecat.spec b/icecat.spec
index 8ef2ac9..532c4dd 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -116,7 +116,10 @@ Source15: %{name}-x11.sh.in
 Source16: %{name}-x11.desktop
 
 # Build patches
-Patch2: %{name}-libevent_linkflag.patch
+# Fixes installation of those addons which don't have ID on IceCat ("Cannot find id for addon" error).
+Patch1:   %{name}-fix_addon_installation.patch
+
+Patch2:   %{name}-libevent_linkflag.patch
 Patch3:   mozilla-build-arm.patch
 
 # Unrecognized file?
@@ -311,6 +314,7 @@ find . -type f -name "*.c" -exec chmod 0644 '{}' \;
 ##Copy license files
 tar -xf %{SOURCE5}
 
+%patch1 -p1 -b .fix_addon_installation
 %patch2 -p0 -b .libevent_linkflag
 %patch3 -p1 -b .arm
 %patch7 -p0
@@ -631,7 +635,7 @@ echo "%%lang($language_short) %{langpackdir}/langpack-$language_short@icecat.moz
 }
 
 # Table of fallbacks for each language
-create_default_langpack "bn-IN" "bn"
+#create_default_langpack "bn-IN" "bn"
 create_default_langpack "es-AR" "es"
 create_default_langpack "fy-NL" "fy"
 create_default_langpack "ga-IE" "ga"
@@ -745,6 +749,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Sun Jul 28 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-6.gnu1
+- Add patch to fix the addon installation
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 60.8.0-6.gnu1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 664509a3dee237ab707f7d61f77229fc1d9070b5 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 16 Aug 2019 22:12:46 +0200
Subject: [PATCH 042/473] Mozilla release 68.0.2

---
 .gitignore                          |    3 +
 bug1375074-save-restore-x28.patch   |   50 +-
 build-jit-atomic-always-lucky.patch |   12 +-
 build-rust-ppc64le.patch            |   25 +
 firefox-pipewire.patch              | 2550 +--------------------------
 icecat-60.6.1-mozilla-1533969.patch |   32 -
 icecat-bz1445383.patch              |  131 --
 icecat-disable-dbus-remote.patch    |   12 -
 icecat-fix_addon_installation.patch |   10 +-
 icecat-fix_jar.patch                |   12 +-
 icecat-lang_download.sh             |    2 +-
 icecat-mozconfig-common             |    3 -
 icecat.rpmlintrc                    |   40 -
 icecat.spec                         |  179 +-
 mozilla-1005640-accept-lang.patch   |   30 -
 mozilla-1353817.patch               |   27 -
 mozilla-1424422.patch               |  188 --
 mozilla-1436242.patch               |   56 -
 mozilla-1512162.patch               |   30 +-
 mozilla-1566876-webrtc-ind.patch    |   36 +
 mozilla-1568569.patch               |   73 +
 mozilla-256180.patch                |   11 -
 node-stdout-nonblocking-wrapper     |    2 +
 rhbz-1354671.patch                  |    8 +-
 sources                             |    5 +-
 25 files changed, 346 insertions(+), 3181 deletions(-)
 create mode 100644 build-rust-ppc64le.patch
 delete mode 100644 icecat-60.6.1-mozilla-1533969.patch
 delete mode 100644 icecat-bz1445383.patch
 delete mode 100644 icecat-disable-dbus-remote.patch
 delete mode 100644 icecat.rpmlintrc
 delete mode 100644 mozilla-1005640-accept-lang.patch
 delete mode 100644 mozilla-1353817.patch
 delete mode 100644 mozilla-1424422.patch
 delete mode 100644 mozilla-1436242.patch
 create mode 100644 mozilla-1566876-webrtc-ind.patch
 create mode 100644 mozilla-1568569.patch
 delete mode 100644 mozilla-256180.patch
 create mode 100755 node-stdout-nonblocking-wrapper

diff --git a/.gitignore b/.gitignore
index 0e7fd6c..1039629 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,6 @@
 /icecat-60.7.2-langpacks.tar.gz
 /icecat-60.8.0-gnu1.tar.bz2
 /icecat-60.8.0-langpacks.tar.gz
+/cbindgen-vendor.tar.xz
+/icecat-68.0.2-gnu1.tar.bz2
+/icecat-68.0.2-langpacks.tar.gz
diff --git a/bug1375074-save-restore-x28.patch b/bug1375074-save-restore-x28.patch
index b622604..4db683b 100644
--- a/bug1375074-save-restore-x28.patch
+++ b/bug1375074-save-restore-x28.patch
@@ -32,44 +32,44 @@ new file mode 100644
 diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp
 --- a/js/src/vm/UnboxedObject.cpp
 +++ b/js/src/vm/UnboxedObject.cpp
-@@ -86,8 +86,15 @@
+@@ -95,7 +95,15 @@ UnboxedLayout::makeConstructorCode(JSCon
  #endif
  
  #ifdef JS_CODEGEN_ARM64
--  // ARM64 communicates stack address via sp, but uses a pseudo-sp for
--  // addressing.
-+  // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
-+  // addressing.  The register we use for PSP may however also be used by
-+  // calling code, and it is nonvolatile, so save it.  Do this as a special
-+  // case first because the generic save/restore code needs the PSP to be
-+  // initialized already.
-+  MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
-+  masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
+-    // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.
++    // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
++    // addressing.  The register we use for PSP may however also be used by
++    // calling code, and it is nonvolatile, so save it.  Do this as a special
++    // case first because the generic save/restore code needs the PSP to be
++    // initialized already.
++    MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
++    masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
 +
 +    // Initialize the PSP from the SP.
-   masm.initStackPtr();
+     masm.initStackPtr();
  #endif
  
-@@ -239,7 +246,22 @@
-   if (ScratchDoubleReg.volatile_()) masm.pop(ScratchDoubleReg);
-   masm.PopRegsInMask(savedNonVolatileRegisters);
+@@ -233,7 +241,22 @@ UnboxedLayout::makeConstructorCode(JSCon
+         masm.pop(ScratchDoubleReg);
+     masm.PopRegsInMask(savedNonVolatileRegisters);
  
 +#ifdef JS_CODEGEN_ARM64
-+  // Now restore the value that was in the PSP register on entry, and return.
++    // Now restore the value that was in the PSP register on entry, and return.
 +
-+  // Obtain the correct SP from the PSP.
-+  masm.Mov(sp, PseudoStackPointer64);
++    // Obtain the correct SP from the PSP.
++    masm.Mov(sp, PseudoStackPointer64);
 +
-+ // Restore the saved value of the PSP register, this value is whatever the
-+ // caller had saved in it, not any actual SP value, and it must not be
-+ // overwritten subsequently.
-+  masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
++    // Restore the saved value of the PSP register, this value is whatever the
++    // caller had saved in it, not any actual SP value, and it must not be
++    // overwritten subsequently.
++    masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
 +
-+ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
-+  masm.Ret(vixl::lr);
++    // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
++    masm.Ret(vixl::lr);
 +#else
-   masm.abiret();
+     masm.abiret();
 +#endif
  
-   masm.bind(&failureStoreOther);
+     masm.bind(&failureStoreOther);
  
+
diff --git a/build-jit-atomic-always-lucky.patch b/build-jit-atomic-always-lucky.patch
index 50d1c9d..d693d0c 100644
--- a/build-jit-atomic-always-lucky.patch
+++ b/build-jit-atomic-always-lucky.patch
@@ -1,11 +1,11 @@
-diff -up firefox-57.0b5/js/src/jit/AtomicOperations.h.jit-atomic-lucky firefox-57.0b5/js/src/jit/AtomicOperations.h
---- firefox-57.0b5/js/src/jit/AtomicOperations.h.jit-atomic-lucky	2017-10-06 12:34:02.338973607 +0200
-+++ firefox-57.0b5/js/src/jit/AtomicOperations.h	2017-10-06 12:38:24.632622215 +0200
+diff -up firefox-68.0.2/js/src/jit/AtomicOperations.h.jit-atomic-lucky firefox-60.5.0/js/src/jit/AtomicOperations.h
+--- firefox-68.0.2/js/src/jit/AtomicOperations.h.jit-atomic-lucky	2019-01-22 10:20:27.993697161 +0100
++++ firefox-68.0.2/js/src/jit/AtomicOperations.h	2019-01-22 10:23:15.337873762 +0100
 @@ -394,7 +394,7 @@
- #elif defined(__s390__) || defined(__s390x__)
- #include "jit/none/AtomicOperations-feeling-lucky.h"
+     defined(__sh__) || defined(__s390__) || defined(__s390x__)
+ #  include "jit/shared/AtomicOperations-feeling-lucky.h"
  #else
--#error "No AtomicOperations support provided for this platform"
+-#  error "No AtomicOperations support provided for this platform"
 +#include "jit/none/AtomicOperations-feeling-lucky.h"
  #endif
  
diff --git a/build-rust-ppc64le.patch b/build-rust-ppc64le.patch
new file mode 100644
index 0000000..2474c35
--- /dev/null
+++ b/build-rust-ppc64le.patch
@@ -0,0 +1,25 @@
+diff -up firefox-55.0/build/moz.configure/rust.configure.rust-ppc64le firefox-55.0/build/moz.configure/rust.configure
+--- firefox-55.0/build/moz.configure/rust.configure.rust-ppc64le	2017-07-31 18:20:49.000000000 +0200
++++ firefox-55.0/build/moz.configure/rust.configure	2017-08-02 10:19:03.254220003 +0200
+@@ -151,6 +151,9 @@ def rust_triple_alias(host_or_target):
+             ('sparc64', 'Linux'): 'sparc64-unknown-linux-gnu',
+             ('x86', 'Linux'): 'i686-unknown-linux-gnu',
+             ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu',
++            ('ppc64le', 'Linux'): 'powerpc64le-unknown-linux-gnu',
++            ('ppc64', 'Linux'): 'powerpc64-unknown-linux-gnu',
++            ('s390x', 'Linux'): 's390x-unknown-linux-gnu',
+             # OS X
+             ('x86', 'OSX'): 'i686-apple-darwin',
+             ('x86_64', 'OSX'): 'x86_64-apple-darwin',
+@@ -174,8 +177,10 @@ def rust_triple_alias(host_or_target):
+             ('sparc64', 'SunOS'): 'sparcv9-sun-solaris',
+         }.get((host_or_target.cpu, os_or_kernel), None)
+ 
++        if (rustc_target == 'powerpc64-unknown-linux-gnu' and host_or_target.endianness == 'little'):
++           rustc_target = 'powerpc64le-unknown-linux-gnu'
+         if rustc_target is None:
+-            die("Don't know how to translate {} for rustc".format(host_or_target.alias))
++            die("Don't know how to translate {} for rustc, cpu: {}, os: {}".format(target.alias, target.cpu, os_or_kernel))
+ 
+         # Check to see whether our rustc has a reasonably functional stdlib
+         # for our chosen target.
diff --git a/firefox-pipewire.patch b/firefox-pipewire.patch
index 0ed09c6..7233a73 100644
--- a/firefox-pipewire.patch
+++ b/firefox-pipewire.patch
@@ -1,7 +1,7 @@
-diff -ENwbur firefox-64.0/config/system-headers.mozbuild firefox-webrtc/config/system-headers.mozbuild
---- firefox-64.0/config/system-headers.mozbuild	2019-01-07 13:18:29.367461827 +0100
-+++ firefox-webrtc/config/system-headers.mozbuild	2019-01-07 13:19:30.043067979 +0100
-@@ -314,6 +314,7 @@
+diff -up firefox-68.0/config/system-headers.mozbuild.firefox-pipewire firefox-68.0/config/system-headers.mozbuild
+--- firefox-68.0/config/system-headers.mozbuild.firefox-pipewire	2019-07-01 22:30:26.000000000 +0200
++++ firefox-68.0/config/system-headers.mozbuild	2019-07-08 15:26:15.397161627 +0200
+@@ -314,6 +314,7 @@ system_headers = [
      'Gestalt.h',
      'getopt.h',
      'gio/gio.h',
@@ -9,7 +9,7 @@ diff -ENwbur firefox-64.0/config/system-headers.mozbuild firefox-webrtc/config/s
      'glibconfig.h',
      'glib.h',
      'glib-object.h',
-@@ -607,6 +608,7 @@
+@@ -607,6 +608,7 @@ system_headers = [
      'Pgenerr.h',
      'PGenErr.h',
      'Ph.h',
@@ -17,1398 +17,11 @@ diff -ENwbur firefox-64.0/config/system-headers.mozbuild firefox-webrtc/config/s
      'pixman.h',
      'pk11func.h',
      'pk11pqg.h',
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_linux.cc firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_linux.cc
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_linux.cc	1970-01-01 01:00:00.000000000 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_linux.cc	2019-01-07 13:20:40.141768272 +0100
-@@ -0,0 +1,39 @@
-+/*
-+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
-+ *
-+ *  Use of this source code is governed by a BSD-style license
-+ *  that can be found in the LICENSE file in the root of the source
-+ *  tree. An additional intellectual property rights grant can be found
-+ *  in the file PATENTS.  All contributing project authors may
-+ *  be found in the AUTHORS file in the root of the source tree.
-+ */
-+
-+#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
-+#include "webrtc/modules/desktop_capture/desktop_capturer.h"
-+
-+#if defined(USE_X11)
-+#include "webrtc/modules/desktop_capture/app_capturer_x11.h"
-+#endif // defined(USE_X11)
-+
-+namespace webrtc {
-+
-+// static
-+AppCapturer* AppCapturer::Create(const DesktopCaptureOptions& options) {
-+#if defined(USE_X11)
-+    return AppCapturerX11::Create(options);
-+#endif // defined(USE_X11)
-+
-+  return nullptr;
-+}
-+
-+// static
-+std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawAppCapturer(
-+    const DesktopCaptureOptions& options) {
-+#if defined(USE_X11)
-+  return AppCapturerX11::CreateRawAppCapturer(options);
-+#endif // defined(USE_X11)
-+
-+  return nullptr;
-+}
-+
-+}  // namespace webrtc
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.cc firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.cc
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.cc	2019-01-07 13:16:46.374432920 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.cc	2019-01-07 13:20:40.142768282 +0100
-@@ -7,9 +7,6 @@
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
--#include "webrtc/modules/desktop_capture/app_capturer.h"
--#include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
--#include "webrtc/modules/desktop_capture/x11/shared_x_util.h"
- 
- #include <assert.h>
- #include <string.h>
-@@ -21,80 +18,19 @@
- 
- #include <algorithm>
- 
-+#include "webrtc/modules/desktop_capture/app_capturer_x11.h"
-+
- #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
- #include "webrtc/modules/desktop_capture/desktop_frame.h"
- #include "webrtc/modules/desktop_capture/x11/shared_x_display.h"
-+#include "webrtc/modules/desktop_capture/x11/shared_x_util.h"
- #include "webrtc/modules/desktop_capture/x11/x_error_trap.h"
- #include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h"
- #include "webrtc/system_wrappers/include/logging.h"
- 
- namespace webrtc {
- 
--namespace {
--
--class ScreenCapturerProxy : DesktopCapturer::Callback {
--public:
--  ScreenCapturerProxy()
--    : screen_capturer_(DesktopCapturer::CreateScreenCapturer(DesktopCaptureOptions::CreateDefault())) {
--    screen_capturer_->SelectSource(kFullDesktopScreenId);
--    screen_capturer_->Start(this);
--  }
--  void CaptureFrame() { screen_capturer_->CaptureFrame(); }
--  std::unique_ptr<DesktopFrame> GetFrame() { return std::move(frame_); }
--
--   // Callback interface
--  virtual void OnCaptureResult(DesktopCapturer::Result result,
--                               std::unique_ptr<DesktopFrame> frame) {
--    frame_ = std::move(frame);
--  }
--
--protected:
--  std::unique_ptr<DesktopCapturer> screen_capturer_;
--  std::unique_ptr<DesktopFrame> frame_;
--};
--
--class AppCapturerLinux : public AppCapturer {
--public:
--  AppCapturerLinux(const DesktopCaptureOptions& options);
--  virtual ~AppCapturerLinux();
--
--  // AppCapturer interface.
--  virtual bool GetAppList(AppList* apps) override;
--  virtual bool SelectApp(ProcessId processId) override;
--  virtual bool BringAppToFront() override;
--
--  // DesktopCapturer interface.
--  virtual void Start(Callback* callback) override;
--  virtual void Stop() override;
--  virtual void CaptureFrame() override;
--  virtual bool SelectSource(SourceId id) override
--  {
--    return SelectApp(static_cast<ProcessId>(id));
--  }
--
--protected:
--  Display* GetDisplay() { return x_display_->display(); }
--  bool UpdateRegions();
--
--  void FillDesktopFrameRegionWithColor(DesktopFrame* pDesktopFrame,Region rgn, uint32_t color);
--private:
--  Callback* callback_;
--  ProcessId selected_process_;
--
--  // Sample Mode
--  ScreenCapturerProxy screen_capturer_proxy_;
--  // Mask of foreground (non-app windows in front of selected)
--  Region rgn_mask_;
--  // Region of selected windows
--  Region rgn_visual_;
--  // Mask of background (desktop, non-app windows behind selected)
--  Region rgn_background_;
--
--  rtc::scoped_refptr<SharedXDisplay> x_display_;
--  RTC_DISALLOW_COPY_AND_ASSIGN(AppCapturerLinux);
--};
--
--AppCapturerLinux::AppCapturerLinux(const DesktopCaptureOptions& options)
-+AppCapturerX11::AppCapturerX11(const DesktopCaptureOptions& options)
-     : callback_(NULL),
-       selected_process_(0),
-       x_display_(options.x_display()) {
-@@ -103,7 +39,7 @@
-   rgn_background_ = XCreateRegion();
- }
- 
--AppCapturerLinux::~AppCapturerLinux() {
-+AppCapturerX11::~AppCapturerX11() {
-   if (rgn_mask_) {
-     XDestroyRegion(rgn_mask_);
-   }
-@@ -116,32 +52,32 @@
- }
- 
- // AppCapturer interface.
--bool AppCapturerLinux::GetAppList(AppList* apps) {
-+bool AppCapturerX11::GetAppList(AppList* apps) {
-   // Implemented in DesktopDeviceInfo
-   return true;
- }
--bool AppCapturerLinux::SelectApp(ProcessId processId) {
-+bool AppCapturerX11::SelectApp(ProcessId processId) {
-   selected_process_ = processId;
-   return true;
- }
--bool AppCapturerLinux::BringAppToFront() {
-+bool AppCapturerX11::BringAppToFront() {
-   // Not implemented yet: See Bug 1036653
-   return true;
- }
- 
- // DesktopCapturer interface.
--void AppCapturerLinux::Start(Callback* callback) {
-+void AppCapturerX11::Start(Callback* callback) {
-   assert(!callback_);
-   assert(callback);
- 
-   callback_ = callback;
- }
- 
--void AppCapturerLinux::Stop() {
-+void AppCapturerX11::Stop() {
-   callback_ = NULL;
- }
- 
--void AppCapturerLinux::CaptureFrame() {
-+void AppCapturerX11::CaptureFrame() {
-   XErrorTrap error_trap(GetDisplay());
- 
-   //Capture screen >> set root window as capture window
-@@ -169,7 +105,7 @@
-   }
- }
- 
--void AppCapturerLinux::FillDesktopFrameRegionWithColor(DesktopFrame* pDesktopFrame, Region rgn, uint32_t color) {
-+void AppCapturerX11::FillDesktopFrameRegionWithColor(DesktopFrame* pDesktopFrame, Region rgn, uint32_t color) {
-   XErrorTrap error_trap(GetDisplay());
- 
-   if (!pDesktopFrame) {
-@@ -192,7 +128,7 @@
-   }
- }
- 
--bool AppCapturerLinux::UpdateRegions() {
-+bool AppCapturerX11::UpdateRegions() {
-   XErrorTrap error_trap(GetDisplay());
- 
-   XSubtractRegion(rgn_visual_, rgn_visual_, rgn_visual_);
-@@ -269,21 +205,19 @@
-   return true;
- }
- 
--}  // namespace
--
- // static
--AppCapturer* AppCapturer::Create(const DesktopCaptureOptions& options) {
--  return new AppCapturerLinux(options);
-+AppCapturer* AppCapturerX11::Create(const DesktopCaptureOptions& options) {
-+  return new AppCapturerX11(options);
- }
- 
- // static
--std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawAppCapturer(
-+std::unique_ptr<DesktopCapturer> AppCapturerX11::CreateRawAppCapturer(
-     const DesktopCaptureOptions& options) {
- 
-   if (!options.x_display())
-     return nullptr;
- 
--  std::unique_ptr<AppCapturerLinux> capturer(new AppCapturerLinux(options));
-+  std::unique_ptr<AppCapturerX11> capturer(new AppCapturerX11(options));
- 
-   return std::unique_ptr<DesktopCapturer>(std::move(capturer));
- }
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.h firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.h
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.h	1970-01-01 01:00:00.000000000 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.h	2019-01-07 13:20:40.203768892 +0100
-@@ -0,0 +1,98 @@
-+/*
-+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
-+ *
-+ *  Use of this source code is governed by a BSD-style license
-+ *  that can be found in the LICENSE file in the root of the source
-+ *  tree. An additional intellectual property rights grant can be found
-+ *  in the file PATENTS.  All contributing project authors may
-+ *  be found in the AUTHORS file in the root of the source tree.
-+ */
-+
-+#ifndef MODULES_DESKTOP_CAPTURE_APP_CAPTURER_X11_H_
-+#define MODULES_DESKTOP_CAPTURE_APP_CAPTURER_X11_H_
-+
-+#include <X11/X.h>
-+#include <X11/Xlib.h>
-+#include <memory>
-+#include <string>
-+
-+#include "webrtc/modules/desktop_capture/app_capturer.h"
-+#include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
-+#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
-+#include "webrtc/modules/desktop_capture/desktop_capturer.h"
-+#include "webrtc/modules/desktop_capture/desktop_geometry.h"
-+#include "webrtc/modules/desktop_capture/x11/shared_x_display.h"
-+#include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h"
-+#include "webrtc/base/constructormagic.h"
-+#include "webrtc/base/scoped_ref_ptr.h"
-+
-+namespace webrtc {
-+
-+class ScreenCapturerProxy : DesktopCapturer::Callback {
-+public:
-+  ScreenCapturerProxy()
-+    : screen_capturer_(DesktopCapturer::CreateScreenCapturer(DesktopCaptureOptions::CreateDefault())) {
-+    screen_capturer_->SelectSource(kFullDesktopScreenId);
-+    screen_capturer_->Start(this);
-+  }
-+  void CaptureFrame() { screen_capturer_->CaptureFrame(); }
-+  std::unique_ptr<DesktopFrame> GetFrame() { return std::move(frame_); }
-+
-+   // Callback interface
-+  virtual void OnCaptureResult(DesktopCapturer::Result result,
-+                               std::unique_ptr<DesktopFrame> frame) {
-+    frame_ = std::move(frame);
-+  }
-+
-+protected:
-+  std::unique_ptr<DesktopCapturer> screen_capturer_;
-+  std::unique_ptr<DesktopFrame> frame_;
-+};
-+
-+class AppCapturerX11 : public AppCapturer {
-+public:
-+  AppCapturerX11(const DesktopCaptureOptions& options);
-+  virtual ~AppCapturerX11();
-+
-+  static AppCapturer* Create(const DesktopCaptureOptions& options);
-+  static std::unique_ptr<DesktopCapturer> CreateRawAppCapturer(const DesktopCaptureOptions& options);
-+
-+  // AppCapturer interface.
-+  virtual bool GetAppList(AppList* apps) override;
-+  virtual bool SelectApp(ProcessId processId) override;
-+  virtual bool BringAppToFront() override;
-+
-+  // DesktopCapturer interface.
-+  virtual void Start(Callback* callback) override;
-+  virtual void Stop() override;
-+  virtual void CaptureFrame() override;
-+  virtual bool SelectSource(SourceId id) override
-+  {
-+    return SelectApp(static_cast<ProcessId>(id));
-+  }
-+
-+protected:
-+  Display* GetDisplay() { return x_display_->display(); }
-+  bool UpdateRegions();
-+
-+  void FillDesktopFrameRegionWithColor(DesktopFrame* pDesktopFrame,Region rgn, uint32_t color);
-+private:
-+  Callback* callback_;
-+  ProcessId selected_process_;
-+
-+  // Sample Mode
-+  ScreenCapturerProxy screen_capturer_proxy_;
-+  // Mask of foreground (non-app windows in front of selected)
-+  Region rgn_mask_;
-+  // Region of selected windows
-+  Region rgn_visual_;
-+  // Mask of background (desktop, non-app windows behind selected)
-+  Region rgn_background_;
-+
-+  rtc::scoped_refptr<SharedXDisplay> x_display_;
-+  RTC_DISALLOW_COPY_AND_ASSIGN(AppCapturerX11);
-+};
-+
-+}  // namespace webrtc
-+
-+#endif  // MODULES_DESKTOP_CAPTURE_APP_CAPTURER_X11_H_
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/base_capturer_pipewire.cc firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/base_capturer_pipewire.cc
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/base_capturer_pipewire.cc	1970-01-01 01:00:00.000000000 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/base_capturer_pipewire.cc	2019-01-07 13:20:40.143768292 +0100
-@@ -0,0 +1,849 @@
-+/*
-+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
-+ *
-+ *  Use of this source code is governed by a BSD-style license
-+ *  that can be found in the LICENSE file in the root of the source
-+ *  tree. An additional intellectual property rights grant can be found
-+ *  in the file PATENTS.  All contributing project authors may
-+ *  be found in the AUTHORS file in the root of the source tree.
-+ */
-+
-+#include <cstring>
-+#include <gio/gunixfdlist.h>
-+#include <glib-object.h>
-+
-+#include <spa/param/format-utils.h>
-+#include <spa/param/props.h>
-+#include <spa/param/video/raw-utils.h>
-+#include <spa/support/type-map.h>
-+
-+#include "webrtc/modules/desktop_capture/base_capturer_pipewire.h"
-+
-+#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
-+#include "webrtc/modules/desktop_capture/desktop_capturer.h"
-+#include "webrtc/base/checks.h"
-+#include "webrtc/base/logging.h"
-+
-+namespace webrtc {
-+
-+const char kDesktopBusName[] = "org.freedesktop.portal.Desktop";
-+const char kDesktopObjectPath[] = "/org/freedesktop/portal/desktop";
-+const char kDesktopRequestObjectPath[] =
-+    "/org/freedesktop/portal/desktop/request";
-+const char kSessionInterfaceName[] = "org.freedesktop.portal.Session";
-+const char kRequestInterfaceName[] = "org.freedesktop.portal.Request";
-+const char kScreenCastInterfaceName[] = "org.freedesktop.portal.ScreenCast";
-+
-+const int kBytesPerPixelPw = 4;
-+
-+// static
-+void BaseCapturerPipeWire::OnStateChanged(void* data,
-+                                            pw_remote_state old_state,
-+                                            pw_remote_state state,
-+                                            const char* error_message) {
-+  BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
-+  RTC_DCHECK(that);
-+
-+  switch (state) {
-+    case PW_REMOTE_STATE_ERROR:
-+      LOG(LS_ERROR) << "PipeWire remote state error: " << error_message;
-+      break;
-+    case PW_REMOTE_STATE_CONNECTED:
-+      LOG(LS_INFO) << "PipeWire remote state: connected.";
-+      that->CreateReceivingStream();
-+      break;
-+    case PW_REMOTE_STATE_CONNECTING:
-+      LOG(LS_INFO) << "PipeWire remote state: connecting.";
-+      break;
-+    case PW_REMOTE_STATE_UNCONNECTED:
-+      LOG(LS_INFO) << "PipeWire remote state: unconnected.";
-+      break;
-+  }
-+}
-+
-+// static
-+void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
-+                                                  pw_stream_state old_state,
-+                                                  pw_stream_state state,
-+                                                  const char* error_message) {
-+  BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
-+  RTC_DCHECK(that);
-+
-+  switch (state) {
-+    case PW_STREAM_STATE_ERROR:
-+      LOG(LS_ERROR) << "PipeWire stream state error: " << error_message;
-+      break;
-+    case PW_STREAM_STATE_CONFIGURE:
-+      pw_stream_set_active(that->pw_stream_, true);
-+      break;
-+    case PW_STREAM_STATE_UNCONNECTED:
-+    case PW_STREAM_STATE_CONNECTING:
-+    case PW_STREAM_STATE_READY:
-+    case PW_STREAM_STATE_PAUSED:
-+    case PW_STREAM_STATE_STREAMING:
-+      break;
-+  }
-+}
-+
-+// static
-+void BaseCapturerPipeWire::OnStreamFormatChanged(
-+    void* data,
-+    const struct spa_pod* format) {
-+  BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
-+  RTC_DCHECK(that);
-+
-+  LOG(LS_INFO) << "PipeWire stream format changed.";
-+
-+  if (!format) {
-+    pw_stream_finish_format(that->pw_stream_, /*res=*/0, /*params=*/nullptr,
-+                            /*n_params=*/0);
-+    return;
-+  }
-+
-+  that->spa_video_format_ = new spa_video_info_raw();
-+  spa_format_video_raw_parse(format, that->spa_video_format_,
-+                             &that->pw_type_->format_video);
-+
-+  auto width = that->spa_video_format_->size.width;
-+  auto height = that->spa_video_format_->size.height;
-+  auto stride = SPA_ROUND_UP_N(width * kBytesPerPixelPw, 4);
-+  auto size = height * stride;
-+
-+  uint8_t buffer[1024] = {};
-+  auto builder = spa_pod_builder{buffer, sizeof(buffer)};
-+
-+  // Setup buffers and meta header for new format.
-+  const struct spa_pod* params[2];
-+  params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
-+      &builder,
-+      // id to enumerate buffer requirements
-+      that->pw_core_type_->param.idBuffers,
-+      that->pw_core_type_->param_buffers.Buffers,
-+      // Size: specified as integer (i) and set to specified size
-+      ":", that->pw_core_type_->param_buffers.size, "i", size,
-+      // Stride: specified as integer (i) and set to specified stride
-+      ":", that->pw_core_type_->param_buffers.stride, "i", stride,
-+      // Buffers: specifies how many buffers we want to deal with, set as
-+      // integer (i) where preferred number is 8, then allowed number is defined
-+      // as range (r) from min and max values and it is undecided (u) to allow
-+      // negotiation
-+      ":", that->pw_core_type_->param_buffers.buffers, "iru", 8,
-+      SPA_POD_PROP_MIN_MAX(1, 32),
-+      // Align: memory alignment of the buffer, set as integer (i) to specified
-+      // value
-+      ":", that->pw_core_type_->param_buffers.align, "i", 16));
-+  params[1] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
-+      &builder,
-+      // id to enumerate supported metadata
-+      that->pw_core_type_->param.idMeta, that->pw_core_type_->param_meta.Meta,
-+      // Type: specified as id or enum (I)
-+      ":", that->pw_core_type_->param_meta.type, "I",
-+      that->pw_core_type_->meta.Header,
-+      // Size: size of the metadata, specified as integer (i)
-+      ":", that->pw_core_type_->param_meta.size, "i",
-+      sizeof(struct spa_meta_header)));
-+
-+  pw_stream_finish_format(that->pw_stream_, /*res=*/0, params, /*n_params=*/2);
-+}
-+
-+// static
-+void BaseCapturerPipeWire::OnStreamProcess(void* data) {
-+  BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
-+  RTC_DCHECK(that);
-+
-+  pw_buffer* buf = nullptr;
-+
-+  if (!(buf = pw_stream_dequeue_buffer(that->pw_stream_))) {
-+    return;
-+  }
-+
-+  that->HandleBuffer(buf);
-+
-+  pw_stream_queue_buffer(that->pw_stream_, buf);
-+}
-+
-+BaseCapturerPipeWire::BaseCapturerPipeWire(CaptureSourceType source_type)
-+    : capture_source_type_(source_type) {}
-+
-+BaseCapturerPipeWire::~BaseCapturerPipeWire() {
-+  if (pw_main_loop_) {
-+    pw_thread_loop_stop(pw_main_loop_);
-+  }
-+
-+  if (pw_type_) {
-+    delete pw_type_;
-+  }
-+
-+  if (spa_video_format_) {
-+    delete spa_video_format_;
-+  }
-+
-+  if (pw_stream_) {
-+    pw_stream_destroy(pw_stream_);
-+  }
-+
-+  if (pw_remote_) {
-+    pw_remote_destroy(pw_remote_);
-+  }
-+
-+  if (pw_core_) {
-+    pw_core_destroy(pw_core_);
-+  }
-+
-+  if (pw_main_loop_) {
-+    pw_thread_loop_destroy(pw_main_loop_);
-+  }
-+
-+  if (pw_loop_) {
-+    pw_loop_destroy(pw_loop_);
-+  }
-+
-+  if (current_frame_) {
-+    free(current_frame_);
-+  }
-+
-+  if (start_request_signal_id_) {
-+    g_dbus_connection_signal_unsubscribe(connection_, start_request_signal_id_);
-+  }
-+  if (sources_request_signal_id_) {
-+    g_dbus_connection_signal_unsubscribe(connection_,
-+                                         sources_request_signal_id_);
-+  }
-+  if (session_request_signal_id_) {
-+    g_dbus_connection_signal_unsubscribe(connection_,
-+                                         session_request_signal_id_);
-+  }
-+
-+  if (session_handle_) {
-+    GDBusMessage* message = g_dbus_message_new_method_call(
-+        kDesktopBusName, session_handle_, kSessionInterfaceName, "Close");
-+    if (message) {
-+      GError* error = nullptr;
-+      g_dbus_connection_send_message(connection_, message,
-+                                     G_DBUS_SEND_MESSAGE_FLAGS_NONE,
-+                                     /*out_serial=*/nullptr, &error);
-+      if (error) {
-+        LOG(LS_ERROR) << "Failed to close the session: " << error->message;
-+        g_error_free(error);
-+      }
-+      g_object_unref(message);
-+    }
-+  }
-+
-+  g_free(start_handle_);
-+  g_free(sources_handle_);
-+  g_free(session_handle_);
-+  g_free(portal_handle_);
-+
-+  if (proxy_) {
-+    g_clear_object(&proxy_);
-+  }
-+}
-+
-+void BaseCapturerPipeWire::InitPortals() {
-+  g_dbus_proxy_new_for_bus(
-+      G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_NONE, /*info=*/nullptr,
-+      kDesktopBusName, kDesktopObjectPath, kScreenCastInterfaceName,
-+      /*cancellable=*/nullptr,
-+      reinterpret_cast<GAsyncReadyCallback>(OnProxyRequested), this);
-+}
-+
-+void BaseCapturerPipeWire::InitPipeWire() {
-+  pw_init(/*argc=*/nullptr, /*argc=*/nullptr);
-+
-+  pw_loop_ = pw_loop_new(/*properties=*/nullptr);
-+  pw_main_loop_ = pw_thread_loop_new(pw_loop_, "pipewire-main-loop");
-+
-+  pw_core_ = pw_core_new(pw_loop_, /*properties=*/nullptr);
-+  pw_core_type_ = pw_core_get_type(pw_core_);
-+  pw_remote_ = pw_remote_new(pw_core_, nullptr, /*user_data_size=*/0);
-+
-+  InitPipeWireTypes();
-+
-+  // Initialize event handlers, remote end and stream-related.
-+  pw_remote_events_.version = PW_VERSION_REMOTE_EVENTS;
-+  pw_remote_events_.state_changed = &OnStateChanged;
-+
-+  pw_stream_events_.version = PW_VERSION_STREAM_EVENTS;
-+  pw_stream_events_.state_changed = &OnStreamStateChanged;
-+  pw_stream_events_.format_changed = &OnStreamFormatChanged;
-+  pw_stream_events_.process = &OnStreamProcess;
-+
-+  pw_remote_add_listener(pw_remote_, &spa_remote_listener_, &pw_remote_events_,
-+                         this);
-+  pw_remote_connect_fd(pw_remote_, pw_fd_);
-+
-+  if (pw_thread_loop_start(pw_main_loop_) < 0) {
-+    LOG(LS_ERROR) << "Failed to start main PipeWire loop";
-+    portal_init_failed_ = true;
-+  }
-+}
-+
-+void BaseCapturerPipeWire::InitPipeWireTypes() {
-+  spa_type_map* map = pw_core_type_->map;
-+  pw_type_ = new PipeWireType();
-+
-+  spa_type_media_type_map(map, &pw_type_->media_type);
-+  spa_type_media_subtype_map(map, &pw_type_->media_subtype);
-+  spa_type_format_video_map(map, &pw_type_->format_video);
-+  spa_type_video_format_map(map, &pw_type_->video_format);
-+}
-+
-+void BaseCapturerPipeWire::CreateReceivingStream() {
-+  spa_rectangle pwMinScreenBounds = spa_rectangle{1, 1};
-+  spa_rectangle pwScreenBounds =
-+      spa_rectangle{static_cast<uint32_t>(desktop_size_.width()),
-+                    static_cast<uint32_t>(desktop_size_.height())};
-+
-+  spa_fraction pwFrameRateMin = spa_fraction{0, 1};
-+  spa_fraction pwFrameRateMax = spa_fraction{60, 1};
-+
-+  pw_properties* reuseProps = pw_properties_new("pipewire.client.reuse", "1",
-+                                                /*end of varargs*/ nullptr);
-+  pw_stream_ = pw_stream_new(pw_remote_, "webrtc-consume-stream", reuseProps);
-+
-+  uint8_t buffer[1024] = {};
-+  const spa_pod* params[1];
-+  spa_pod_builder builder = spa_pod_builder{buffer, sizeof(buffer)};
-+  params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
-+      &builder,
-+      // id to enumerate formats
-+      pw_core_type_->param.idEnumFormat, pw_core_type_->spa_format, "I",
-+      pw_type_->media_type.video, "I", pw_type_->media_subtype.raw,
-+      // Video format: specified as id or enum (I), preferred format is BGRx,
-+      // then allowed formats are enumerated (e) and the format is undecided (u)
-+      // to allow negotiation
-+      ":", pw_type_->format_video.format, "Ieu", pw_type_->video_format.BGRx,
-+      SPA_POD_PROP_ENUM(2, pw_type_->video_format.RGBx,
-+                        pw_type_->video_format.BGRx),
-+      // Video size: specified as rectangle (R), preferred size is specified as
-+      // first parameter, then allowed size is defined as range (r) from min and
-+      // max values and the format is undecided (u) to allow negotiation
-+      ":", pw_type_->format_video.size, "Rru", &pwScreenBounds, 2,
-+      &pwMinScreenBounds, &pwScreenBounds,
-+      // Frame rate: specified as fraction (F) and set to minimum frame rate
-+      // value
-+      ":", pw_type_->format_video.framerate, "F", &pwFrameRateMin,
-+      // Max frame rate: specified as fraction (F), preferred frame rate is set
-+      // to maximum value, then allowed frame rate is defined as range (r) from
-+      // min and max values and it is undecided (u) to allow negotiation
-+      ":", pw_type_->format_video.max_framerate, "Fru", &pwFrameRateMax, 2,
-+      &pwFrameRateMin, &pwFrameRateMax));
-+
-+  pw_stream_add_listener(pw_stream_, &spa_stream_listener_, &pw_stream_events_,
-+                         this);
-+  pw_stream_flags flags = static_cast<pw_stream_flags>(
-+      PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE |
-+      PW_STREAM_FLAG_MAP_BUFFERS);
-+  if (pw_stream_connect(pw_stream_, PW_DIRECTION_INPUT, /*port_path=*/nullptr,
-+                        flags, params,
-+                        /*n_params=*/1) != 0) {
-+    LOG(LS_ERROR) << "Could not connect receiving stream.";
-+    portal_init_failed_ = true;
-+    return;
-+  }
-+}
-+
-+void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
-+  spa_buffer* spaBuffer = buffer->buffer;
-+  void* src = nullptr;
-+
-+  if (!(src = spaBuffer->datas[0].data)) {
-+    return;
-+  }
-+
-+  uint32_t maxSize = spaBuffer->datas[0].maxsize;
-+  int32_t srcStride = spaBuffer->datas[0].chunk->stride;
-+  if (srcStride != (desktop_size_.width() * kBytesPerPixelPw)) {
-+    LOG(LS_ERROR) << "Got buffer with stride different from screen stride: "
-+                      << srcStride
-+                      << " != " << (desktop_size_.width() * kBytesPerPixelPw);
-+    portal_init_failed_ = true;
-+    return;
-+  }
-+
-+  if (!current_frame_) {
-+    current_frame_ = static_cast<uint8_t*>(malloc(maxSize));
-+  }
-+  RTC_DCHECK(current_frame_ != nullptr);
-+
-+  // If both sides decided to go with the RGBx format we need to convert it to
-+  // BGRx to match color format expected by WebRTC.
-+  if (spa_video_format_->format == pw_type_->video_format.RGBx) {
-+    uint8_t* tempFrame = static_cast<uint8_t*>(malloc(maxSize));
-+    std::memcpy(tempFrame, src, maxSize);
-+    ConvertRGBxToBGRx(tempFrame, maxSize);
-+    std::memcpy(current_frame_, tempFrame, maxSize);
-+    free(tempFrame);
-+  } else {
-+    std::memcpy(current_frame_, src, maxSize);
-+  }
-+}
-+
-+void BaseCapturerPipeWire::ConvertRGBxToBGRx(uint8_t* frame, uint32_t size) {
-+  // Change color format for KDE KWin which uses RGBx and not BGRx
-+  for (uint32_t i = 0; i < size; i += 4) {
-+    uint8_t tempR = frame[i];
-+    uint8_t tempB = frame[i + 2];
-+    frame[i] = tempB;
-+    frame[i + 2] = tempR;
-+  }
-+}
-+
-+guint BaseCapturerPipeWire::SetupRequestResponseSignal(
-+    const gchar* object_path,
-+    GDBusSignalCallback callback) {
-+  return g_dbus_connection_signal_subscribe(
-+      connection_, kDesktopBusName, kRequestInterfaceName, "Response",
-+      object_path, /*arg0=*/nullptr, G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE,
-+      callback, this, /*user_data_free_func=*/nullptr);
-+}
-+
-+// static
-+void BaseCapturerPipeWire::OnProxyRequested(GObject* /*object*/,
-+                                              GAsyncResult* result,
-+                                              gpointer user_data) {
-+  BaseCapturerPipeWire* that =
-+      static_cast<BaseCapturerPipeWire*>(user_data);
-+  RTC_DCHECK(that);
-+
-+  GError* error = nullptr;
-+  that->proxy_ = g_dbus_proxy_new_finish(result, &error);
-+  if (!that->proxy_) {
-+    LOG(LS_ERROR) << "Failed to create a proxy for the screen cast portal: "
-+                      << error->message;
-+    g_error_free(error);
-+    that->portal_init_failed_ = true;
-+    return;
-+  }
-+  that->connection_ = g_dbus_proxy_get_connection(that->proxy_);
-+
-+  LOG(LS_INFO) << "Created proxy for the screen cast portal.";
-+  that->SessionRequest();
-+}
-+
-+// static
-+gchar* BaseCapturerPipeWire::PrepareSignalHandle(GDBusConnection* connection,
-+                                                   const gchar* token) {
-+  gchar* sender = g_strdup(g_dbus_connection_get_unique_name(connection) + 1);
-+  for (int i = 0; sender[i]; i++) {
-+    if (sender[i] == '.') {
-+      sender[i] = '_';
-+    }
-+  }
-+
-+  gchar* handle = g_strconcat(kDesktopRequestObjectPath, "/", sender, "/",
-+                              token, /*end of varargs*/ nullptr);
-+  g_free(sender);
-+
-+  return handle;
-+}
-+
-+void BaseCapturerPipeWire::SessionRequest() {
-+  GVariantBuilder builder;
-+  gchar* variant_string;
-+
-+  g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
-+  variant_string =
-+      g_strdup_printf("webrtc_session%d", g_random_int_range(0, G_MAXINT));
-+  g_variant_builder_add(&builder, "{sv}", "session_handle_token",
-+                        g_variant_new_string(variant_string));
-+  g_free(variant_string);
-+  variant_string = g_strdup_printf("webrtc%d", g_random_int_range(0, G_MAXINT));
-+  g_variant_builder_add(&builder, "{sv}", "handle_token",
-+                        g_variant_new_string(variant_string));
-+
-+  portal_handle_ = PrepareSignalHandle(connection_, variant_string);
-+  session_request_signal_id_ = SetupRequestResponseSignal(
-+      portal_handle_, OnSessionRequestResponseSignal);
-+  g_free(variant_string);
-+
-+  LOG(LS_INFO) << "Screen cast session requested.";
-+  g_dbus_proxy_call(
-+      proxy_, "CreateSession", g_variant_new("(a{sv})", &builder),
-+      G_DBUS_CALL_FLAGS_NONE, /*timeout=*/-1, /*cancellable=*/nullptr,
-+      reinterpret_cast<GAsyncReadyCallback>(OnSessionRequested), this);
-+}
-+
-+// static
-+void BaseCapturerPipeWire::OnSessionRequested(GDBusConnection* connection,
-+                                                GAsyncResult* result,
-+                                                gpointer user_data) {
-+  BaseCapturerPipeWire* that =
-+      static_cast<BaseCapturerPipeWire*>(user_data);
-+  RTC_DCHECK(that);
-+
-+  GError* error = nullptr;
-+  GVariant* variant = g_dbus_proxy_call_finish(that->proxy_, result, &error);
-+  if (!variant) {
-+    LOG(LS_ERROR) << "Failed to create a screen cast session: "
-+                      << error->message;
-+    g_error_free(error);
-+    that->portal_init_failed_ = true;
-+    return;
-+  }
-+  LOG(LS_INFO) << "Initializing the screen cast session.";
-+
-+  gchar* handle = nullptr;
-+  g_variant_get_child(variant, 0, "o", &handle);
-+  g_variant_unref(variant);
-+  if (!handle) {
-+    LOG(LS_ERROR) << "Failed to initialize the screen cast session.";
-+    if (that->session_request_signal_id_) {
-+      g_dbus_connection_signal_unsubscribe(connection,
-+                                           that->session_request_signal_id_);
-+      that->session_request_signal_id_ = 0;
-+    }
-+    that->portal_init_failed_ = true;
-+    return;
-+  }
-+
-+  g_free(handle);
-+
-+  LOG(LS_INFO) << "Subscribing to the screen cast session.";
-+}
-+
-+// static
-+void BaseCapturerPipeWire::OnSessionRequestResponseSignal(
-+    GDBusConnection* connection,
-+    const gchar* sender_name,
-+    const gchar* object_path,
-+    const gchar* interface_name,
-+    const gchar* signal_name,
-+    GVariant* parameters,
-+    gpointer user_data) {
-+  BaseCapturerPipeWire* that =
-+      static_cast<BaseCapturerPipeWire*>(user_data);
-+  RTC_DCHECK(that);
-+
-+
-+  LOG(LS_INFO)
-+      << "Received response for the screen cast session subscription.";
-+
-+  guint32 portal_response;
-+  GVariant* response_data;
-+  g_variant_get(parameters, "(u@a{sv})", &portal_response, &response_data);
-+  g_variant_lookup(response_data, "session_handle", "s",
-+                   &that->session_handle_);
-+  g_variant_unref(response_data);
-+
-+  if (!that->session_handle_ || portal_response) {
-+    LOG(LS_ERROR)
-+        << "Failed to request the screen cast session subscription.";
-+    that->portal_init_failed_ = true;
-+    return;
-+  }
-+
-+  that->SourcesRequest();
-+}
-+
-+void BaseCapturerPipeWire::SourcesRequest() {
-+  GVariantBuilder builder;
-+  gchar* variant_string;
-+
-+  g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
-+  // We want to record monitor content.
-+  g_variant_builder_add(&builder, "{sv}", "types",
-+                        g_variant_new_uint32(capture_source_type_));
-+  // We don't want to allow selection of multiple sources.
-+  g_variant_builder_add(&builder, "{sv}", "multiple",
-+                        g_variant_new_boolean(false));
-+  variant_string = g_strdup_printf("webrtc%d", g_random_int_range(0, G_MAXINT));
-+  g_variant_builder_add(&builder, "{sv}", "handle_token",
-+                        g_variant_new_string(variant_string));
-+
-+  sources_handle_ = PrepareSignalHandle(connection_, variant_string);
-+  sources_request_signal_id_ = SetupRequestResponseSignal(
-+      sources_handle_, OnSourcesRequestResponseSignal);
-+  g_free(variant_string);
-+
-+  LOG(LS_INFO) << "Requesting sources from the screen cast session.";
-+  g_dbus_proxy_call(
-+      proxy_, "SelectSources",
-+      g_variant_new("(oa{sv})", session_handle_, &builder),
-+      G_DBUS_CALL_FLAGS_NONE, /*timeout=*/-1, /*cancellable=*/nullptr,
-+      reinterpret_cast<GAsyncReadyCallback>(OnSourcesRequested), this);
-+}
-+
-+// static
-+void BaseCapturerPipeWire::OnSourcesRequested(GDBusConnection* connection,
-+                                                GAsyncResult* result,
-+                                                gpointer user_data) {
-+  BaseCapturerPipeWire* that =
-+      static_cast<BaseCapturerPipeWire*>(user_data);
-+  RTC_DCHECK(that);
-+
-+  GError* error = nullptr;
-+  GVariant* variant = g_dbus_proxy_call_finish(that->proxy_, result, &error);
-+  if (!variant) {
-+    LOG(LS_ERROR) << "Failed to request the sources: " << error->message;
-+    g_error_free(error);
-+    that->portal_init_failed_ = true;
-+    return;
-+  }
-+
-+  LOG(LS_INFO) << "Sources requested from the screen cast session.";
-+
-+  gchar* handle = nullptr;
-+  g_variant_get_child(variant, 0, "o", &handle);
-+  g_variant_unref(variant);
-+  if (!handle) {
-+    LOG(LS_ERROR) << "Failed to initialize the screen cast session.";
-+    if (that->sources_request_signal_id_) {
-+      g_dbus_connection_signal_unsubscribe(connection,
-+                                           that->sources_request_signal_id_);
-+      that->sources_request_signal_id_ = 0;
-+    }
-+    that->portal_init_failed_ = true;
-+    return;
-+  }
-+
-+  g_free(handle);
-+
-+  LOG(LS_INFO) << "Subscribed to sources signal.";
-+}
-+
-+// static
-+void BaseCapturerPipeWire::OnSourcesRequestResponseSignal(
-+    GDBusConnection* connection,
-+    const gchar* sender_name,
-+    const gchar* object_path,
-+    const gchar* interface_name,
-+    const gchar* signal_name,
-+    GVariant* parameters,
-+    gpointer user_data) {
-+  BaseCapturerPipeWire* that =
-+      static_cast<BaseCapturerPipeWire*>(user_data);
-+  RTC_DCHECK(that);
-+
-+  guint32 portal_response;
-+  g_variant_get(parameters, "(u@a{sv})", &portal_response, nullptr);
-+  if (portal_response) {
-+    LOG(LS_ERROR)
-+        << "Failed to select sources for the screen cast session.";
-+    that->portal_init_failed_ = true;
-+    return;
-+  }
-+
-+  LOG(LS_INFO) << "Received sources signal from session.";
-+  that->StartRequest();
-+}
-+
-+void BaseCapturerPipeWire::StartRequest() {
-+  GVariantBuilder builder;
-+  gchar* variant_string;
-+
-+  g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
-+  variant_string = g_strdup_printf("webrtc%d", g_random_int_range(0, G_MAXINT));
-+  g_variant_builder_add(&builder, "{sv}", "handle_token",
-+                        g_variant_new_string(variant_string));
-+
-+  start_handle_ = PrepareSignalHandle(connection_, variant_string);
-+  start_request_signal_id_ =
-+      SetupRequestResponseSignal(start_handle_, OnStartRequestResponseSignal);
-+  g_free(variant_string);
-+
-+  // "Identifier for the application window", this is Wayland, so not "x11:...".
-+  const gchar parent_window[] = "";
-+
-+  LOG(LS_INFO) << "Starting the screen cast session.";
-+  g_dbus_proxy_call(
-+      proxy_, "Start",
-+      g_variant_new("(osa{sv})", session_handle_, parent_window, &builder),
-+      G_DBUS_CALL_FLAGS_NONE, /*timeout=*/-1, /*cancellable=*/nullptr,
-+      reinterpret_cast<GAsyncReadyCallback>(OnStartRequested), this);
-+}
-+
-+// static
-+void BaseCapturerPipeWire::OnStartRequested(GDBusConnection* connection,
-+                                              GAsyncResult* result,
-+                                              gpointer user_data) {
-+  BaseCapturerPipeWire* that =
-+      static_cast<BaseCapturerPipeWire*>(user_data);
-+  RTC_DCHECK(that);
-+
-+  GError* error = nullptr;
-+  GVariant* variant = g_dbus_proxy_call_finish(that->proxy_, result, &error);
-+  if (!variant) {
-+    LOG(LS_ERROR) << "Failed to start the screen cast session: "
-+                      << error->message;
-+    g_error_free(error);
-+    that->portal_init_failed_ = true;
-+    return;
-+  }
-+
-+  LOG(LS_INFO) << "Initializing the start of the screen cast session.";
-+
-+  gchar* handle = nullptr;
-+  g_variant_get_child(variant, 0, "o", &handle);
-+  g_variant_unref(variant);
-+  if (!handle) {
-+    LOG(LS_ERROR)
-+        << "Failed to initialize the start of the screen cast session.";
-+    if (that->start_request_signal_id_) {
-+      g_dbus_connection_signal_unsubscribe(connection,
-+                                           that->start_request_signal_id_);
-+      that->start_request_signal_id_ = 0;
-+    }
-+    that->portal_init_failed_ = true;
-+    return;
-+  }
-+
-+  g_free(handle);
-+
-+  LOG(LS_INFO) << "Subscribed to the start signal.";
-+}
-+
-+// static
-+void BaseCapturerPipeWire::OnStartRequestResponseSignal(
-+    GDBusConnection* connection,
-+    const gchar* sender_name,
-+    const gchar* object_path,
-+    const gchar* interface_name,
-+    const gchar* signal_name,
-+    GVariant* parameters,
-+    gpointer user_data) {
-+  BaseCapturerPipeWire* that =
-+      static_cast<BaseCapturerPipeWire*>(user_data);
-+  RTC_DCHECK(that);
-+
-+  LOG(LS_INFO) << "Start signal received.";
-+  guint32 portal_response;
-+  GVariant* response_data;
-+  GVariantIter* iter = nullptr;
-+  g_variant_get(parameters, "(u@a{sv})", &portal_response, &response_data);
-+  if (portal_response || !response_data) {
-+    LOG(LS_ERROR) << "Failed to start the screen cast session.";
-+    that->portal_init_failed_ = true;
-+    return;
-+  }
-+
-+  // Array of PipeWire streams. See
-+  // https://github.com/flatpak/xdg-desktop-portal/blob/master/data/org.freedesktop.portal.ScreenCast.xml
-+  // documentation for <method name="Start">.
-+  if (g_variant_lookup(response_data, "streams", "a(ua{sv})", &iter)) {
-+    GVariant* variant;
-+
-+    while (g_variant_iter_next(iter, "@(ua{sv})", &variant)) {
-+      guint32 stream_id;
-+      gint32 width;
-+      gint32 height;
-+      GVariant* options;
-+
-+      g_variant_get(variant, "(u@a{sv})", &stream_id, &options);
-+      RTC_DCHECK(options != nullptr);
-+
-+      g_variant_lookup(options, "size", "(ii)", &width, &height);
-+
-+      that->desktop_size_.set(width, height);
-+
-+      g_variant_unref(options);
-+      g_variant_unref(variant);
-+    }
-+  }
-+  g_variant_iter_free(iter);
-+  g_variant_unref(response_data);
-+
-+  that->OpenPipeWireRemote();
-+}
-+
-+void BaseCapturerPipeWire::OpenPipeWireRemote() {
-+  GVariantBuilder builder;
-+  g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
-+
-+  LOG(LS_INFO) << "Opening the PipeWire remote.";
-+
-+  g_dbus_proxy_call_with_unix_fd_list(
-+      proxy_, "OpenPipeWireRemote",
-+      g_variant_new("(oa{sv})", session_handle_, &builder),
-+      G_DBUS_CALL_FLAGS_NONE, /*timeout=*/-1, /*fd_list=*/nullptr,
-+      /*cancellable=*/nullptr,
-+      reinterpret_cast<GAsyncReadyCallback>(OnOpenPipeWireRemoteRequested),
-+      this);
-+}
-+
-+// static
-+void BaseCapturerPipeWire::OnOpenPipeWireRemoteRequested(
-+    GDBusConnection* connection,
-+    GAsyncResult* result,
-+    gpointer user_data) {
-+  BaseCapturerPipeWire* that =
-+      static_cast<BaseCapturerPipeWire*>(user_data);
-+  RTC_DCHECK(that);
-+
-+  GError* error = nullptr;
-+  GUnixFDList* outlist = nullptr;
-+  GVariant* variant = g_dbus_proxy_call_with_unix_fd_list_finish(
-+      that->proxy_, &outlist, result, &error);
-+  if (!variant) {
-+    LOG(LS_ERROR) << "Failed to open the PipeWire remote: "
-+                      << error->message;
-+    g_error_free(error);
-+    that->portal_init_failed_ = true;
-+    return;
-+  }
-+
-+  gint32 index;
-+  g_variant_get(variant, "(h)", &index);
-+
-+  if ((that->pw_fd_ = g_unix_fd_list_get(outlist, index, &error)) == -1) {
-+    LOG(LS_ERROR) << "Failed to get file descriptor from the list: "
-+                      << error->message;
-+    g_error_free(error);
-+    g_variant_unref(variant);
-+    that->portal_init_failed_ = true;
-+    return;
-+  }
-+
-+  g_variant_unref(variant);
-+  g_object_unref(outlist);
-+
-+  that->InitPipeWire();
-+  LOG(LS_INFO) << "PipeWire remote opened.";
-+}
-+
-+void BaseCapturerPipeWire::Start(Callback* callback) {
-+  RTC_DCHECK(!callback_);
-+  RTC_DCHECK(callback);
-+
-+  InitPortals();
-+
-+  callback_ = callback;
-+}
-+
-+void BaseCapturerPipeWire::CaptureFrame() {
-+  if (portal_init_failed_) {
-+    callback_->OnCaptureResult(Result::ERROR_PERMANENT, nullptr);
-+    return;
-+  }
-+
-+  if (!current_frame_) {
-+    callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
-+    return;
-+  }
-+
-+  std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(desktop_size_));
-+  result->CopyPixelsFrom(
-+      current_frame_, (desktop_size_.width() * kBytesPerPixelPw),
-+      DesktopRect::MakeWH(desktop_size_.width(), desktop_size_.height()));
-+  if (!result) {
-+    callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
-+    return;
-+  }
-+  callback_->OnCaptureResult(Result::SUCCESS, std::move(result));
-+}
-+
-+bool BaseCapturerPipeWire::GetSourceList(SourceList* sources) {
-+  RTC_DCHECK(sources->size() == 0);
-+  // List of available screens is already presented by the xdg-desktop-portal.
-+  // But we have to add an empty source as the code expects it.
-+  sources->push_back({0});
-+  return true;
-+}
-+
-+bool BaseCapturerPipeWire::SelectSource(SourceId id) {
-+  // Screen selection is handled by the xdg-desktop-portal.
-+  return true;
-+}
-+
-+}  // namespace webrtc
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/base_capturer_pipewire.h firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/base_capturer_pipewire.h
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/base_capturer_pipewire.h	1970-01-01 01:00:00.000000000 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/base_capturer_pipewire.h	2019-01-07 13:20:40.141768272 +0100
-@@ -0,0 +1,167 @@
-+/*
-+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
-+ *
-+ *  Use of this source code is governed by a BSD-style license
-+ *  that can be found in the LICENSE file in the root of the source
-+ *  tree. An additional intellectual property rights grant can be found
-+ *  in the file PATENTS.  All contributing project authors may
-+ *  be found in the AUTHORS file in the root of the source tree.
-+ */
-+
-+#ifndef MODULES_DESKTOP_CAPTURE_BASE_CAPTURER_PIPEWIRE_H_
-+#define MODULES_DESKTOP_CAPTURE_BASE_CAPTURER_PIPEWIRE_H_
-+
-+#include <gio/gio.h>
-+#define typeof __typeof__
-+#include <pipewire/pipewire.h>
-+#include <spa/param/video/format-utils.h>
-+
-+#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
-+#include "webrtc/modules/desktop_capture/desktop_capturer.h"
-+
-+namespace webrtc {
-+
-+class PipeWireType {
-+ public:
-+  spa_type_media_type media_type;
-+  spa_type_media_subtype media_subtype;
-+  spa_type_format_video format_video;
-+  spa_type_video_format video_format;
-+};
-+
-+class BaseCapturerPipeWire : public DesktopCapturer {
-+ public:
-+  enum CaptureSourceType { Screen = 1, Window };
-+
-+  explicit BaseCapturerPipeWire(CaptureSourceType source_type);
-+  ~BaseCapturerPipeWire() override;
-+
-+  // DesktopCapturer interface.
-+  void Start(Callback* delegate) override;
-+  void Stop() override { callback_ = nullptr; }
-+  void CaptureFrame() override;
-+  bool GetSourceList(SourceList* sources) override;
-+  bool SelectSource(SourceId id) override;
-+
-+ private:
-+  // PipeWire types -->
-+  pw_core* pw_core_ = nullptr;
-+  pw_type* pw_core_type_ = nullptr;
-+  pw_stream* pw_stream_ = nullptr;
-+  pw_remote* pw_remote_ = nullptr;
-+  pw_loop* pw_loop_ = nullptr;
-+  pw_thread_loop* pw_main_loop_ = nullptr;
-+  PipeWireType* pw_type_ = nullptr;
-+
-+  spa_hook spa_stream_listener_ = {};
-+  spa_hook spa_remote_listener_ = {};
-+
-+  pw_stream_events pw_stream_events_ = {};
-+  pw_remote_events pw_remote_events_ = {};
-+
-+  spa_video_info_raw* spa_video_format_ = nullptr;
-+
-+  gint32 pw_fd_ = -1;
-+
-+  CaptureSourceType capture_source_type_ =
-+      BaseCapturerPipeWire::CaptureSourceType::Screen;
-+
-+  // <-- end of PipeWire types
-+
-+  GDBusConnection* connection_ = nullptr;
-+  GDBusProxy* proxy_ = nullptr;
-+  gchar* portal_handle_ = nullptr;
-+  gchar* session_handle_ = nullptr;
-+  gchar* sources_handle_ = nullptr;
-+  gchar* start_handle_ = nullptr;
-+  guint session_request_signal_id_ = 0;
-+  guint sources_request_signal_id_ = 0;
-+  guint start_request_signal_id_ = 0;
-+
-+  DesktopSize desktop_size_ = {};
-+  DesktopCaptureOptions options_ = {};
-+
-+  uint8_t* current_frame_ = nullptr;
-+  Callback* callback_ = nullptr;
-+
-+  bool portal_init_failed_ = false;
-+
-+  void InitPortals();
-+  void InitPipeWire();
-+  void InitPipeWireTypes();
-+
-+  void CreateReceivingStream();
-+  void HandleBuffer(pw_buffer* buffer);
-+
-+  void ConvertRGBxToBGRx(uint8_t* frame, uint32_t size);
-+
-+  static void OnStateChanged(void* data,
-+                             pw_remote_state old_state,
-+                             pw_remote_state state,
-+                             const char* error);
-+  static void OnStreamStateChanged(void* data,
-+                                   pw_stream_state old_state,
-+                                   pw_stream_state state,
-+                                   const char* error_message);
-+
-+  static void OnStreamFormatChanged(void* data, const struct spa_pod* format);
-+  static void OnStreamProcess(void* data);
-+  static void OnNewBuffer(void* data, uint32_t id);
-+
-+  guint SetupRequestResponseSignal(const gchar* object_path,
-+                                   GDBusSignalCallback callback);
-+
-+  static void OnProxyRequested(GObject* object,
-+                               GAsyncResult* result,
-+                               gpointer user_data);
-+
-+  static gchar* PrepareSignalHandle(GDBusConnection* connection,
-+                                    const gchar* token);
-+
-+  void SessionRequest();
-+  static void OnSessionRequested(GDBusConnection* connection,
-+                                 GAsyncResult* result,
-+                                 gpointer user_data);
-+  static void OnSessionRequestResponseSignal(GDBusConnection* connection,
-+                                             const gchar* sender_name,
-+                                             const gchar* object_path,
-+                                             const gchar* interface_name,
-+                                             const gchar* signal_name,
-+                                             GVariant* parameters,
-+                                             gpointer user_data);
-+
-+  void SourcesRequest();
-+  static void OnSourcesRequested(GDBusConnection* connection,
-+                                 GAsyncResult* result,
-+                                 gpointer user_data);
-+  static void OnSourcesRequestResponseSignal(GDBusConnection* connection,
-+                                             const gchar* sender_name,
-+                                             const gchar* object_path,
-+                                             const gchar* interface_name,
-+                                             const gchar* signal_name,
-+                                             GVariant* parameters,
-+                                             gpointer user_data);
-+
-+  void StartRequest();
-+  static void OnStartRequested(GDBusConnection* connection,
-+                               GAsyncResult* result,
-+                               gpointer user_data);
-+  static void OnStartRequestResponseSignal(GDBusConnection* connection,
-+                                           const gchar* sender_name,
-+                                           const gchar* object_path,
-+                                           const gchar* interface_name,
-+                                           const gchar* signal_name,
-+                                           GVariant* parameters,
-+                                           gpointer user_data);
-+
-+  void OpenPipeWireRemote();
-+  static void OnOpenPipeWireRemoteRequested(GDBusConnection* connection,
-+                                            GAsyncResult* result,
-+                                            gpointer user_data);
-+
-+  RTC_DISALLOW_COPY_AND_ASSIGN(BaseCapturerPipeWire);
-+};
-+
-+}  // namespace webrtc
-+
-+#endif  // MODULES_DESKTOP_CAPTURE_BASE_CAPTURER_PIPEWIRE_H_
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn/moz.build firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn/moz.build
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn/moz.build	2019-01-07 13:16:46.410433280 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn/moz.build	2019-01-07 13:20:40.146768322 +0100
-@@ -143,14 +143,26 @@
-         "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc"
-     ]
- 
-+# Common Linux stuff between X11 and PipeWire
- if CONFIG["OS_TARGET"] == "Linux":
- 
-     DEFINES["USE_NSS_CERTS"] = "1"
--    DEFINES["USE_X11"] = "1"
-     DEFINES["WEBRTC_LINUX"] = True
-     DEFINES["WEBRTC_POSIX"] = True
-     DEFINES["_FILE_OFFSET_BITS"] = "64"
- 
-+    UNIFIED_SOURCES += [
-+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_linux.cc",
-+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc",
-+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc",
-+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc",
-+    ]
-+
-+# X11 specific files
-+if CONFIG["OS_TARGET"] == "Linux":
-+
-+    DEFINES["USE_X11"] = "1"
-+
-     OS_LIBS += [
-         "rt",
-         "X11",
-@@ -177,6 +189,27 @@
-         "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc"
+diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
+--- firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire	2019-07-01 22:30:33.000000000 +0200
++++ firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build	2019-07-08 15:26:15.397161627 +0200
+@@ -194,6 +194,28 @@ if CONFIG["OS_TARGET"] == "Linux":
+         "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
      ]
  
 +# PipeWire specific files
@@ -1427,1145 +40,24 @@ diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desk
 +    CXXFLAGS += CONFIG['TK_CFLAGS']
 +
 +    UNIFIED_SOURCES += [
-+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/base_capturer_pipewire.cc",
-+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_pipewire.cc",
-+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_pipewire.cc"
++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
 +    ]
++
 +
  if CONFIG["OS_TARGET"] == "NetBSD":
  
      DEFINES["USE_X11"] = "1"
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h	2019-01-07 13:16:46.361432790 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h	2019-01-07 13:20:40.144768302 +0100
-@@ -107,6 +107,11 @@
-   }
- #endif
- 
-+#if defined(WEBRTC_USE_PIPEWIRE)
-+  bool allow_pipewire() const { return allow_pipewire_; }
-+  void set_allow_pipewire(bool allow) { allow_pipewire_ = allow; }
-+#endif
-+
-  private:
- #if defined(USE_X11)
-   rtc::scoped_refptr<SharedXDisplay> x_display_;
-@@ -129,6 +134,9 @@
- #endif
+diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
+--- firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire	2019-07-08 16:42:13.936254926 +0200
++++ firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h	2019-07-08 16:42:17.509264974 +0200
+@@ -141,7 +141,7 @@ class DesktopCaptureOptions {
    bool disable_effects_ = true;
    bool detect_updated_region_ = false;
-+#if defined(WEBRTC_USE_PIPEWIRE)
+ #if defined(WEBRTC_USE_PIPEWIRE)
+-  bool allow_pipewire_ = false;
 +  bool allow_pipewire_ = true;
-+#endif
+ #endif
  };
  
- }  // namespace webrtc
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capturer.cc firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capturer.cc
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capturer.cc	2019-01-07 13:16:46.389433070 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capturer.cc	2019-01-07 13:20:40.148768342 +0100
-@@ -66,4 +66,17 @@
-   return capturer;
- }
- 
-+#if defined(WEBRTC_USE_PIPEWIRE) || defined(USE_X11)
-+bool DesktopCapturer::IsRunningUnderWayland() {
-+  const char* xdg_session_type = getenv("XDG_SESSION_TYPE");
-+  if (!xdg_session_type || strncmp(xdg_session_type, "wayland", 7) != 0)
-+    return false;
-+
-+  if (!(getenv("WAYLAND_DISPLAY")))
-+    return false;
-+
-+  return true;
-+}
-+#endif
-+
- }  // namespace webrtc
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capturer.h firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capturer.h
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capturer.h	2019-01-07 13:16:46.394433120 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capturer.h	2019-01-07 13:20:40.147768332 +0100
-@@ -129,6 +129,10 @@
-   static std::unique_ptr<DesktopCapturer> CreateAppCapturer(
-       const DesktopCaptureOptions& options);
- 
-+#if defined(WEBRTC_USE_PIPEWIRE) || defined(USE_X11)
-+  static bool IsRunningUnderWayland();
-+#endif
-+
-  protected:
-   // CroppingWindowCapturer needs to create raw capturers without wrappers, so
-   // the following two functions are protected.
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc	1970-01-01 01:00:00.000000000 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc	2019-01-07 13:20:40.165768512 +0100
-@@ -0,0 +1,40 @@
-+/*
-+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
-+ *
-+ *  Use of this source code is governed by a BSD-style license
-+ *  that can be found in the LICENSE file in the root of the source
-+ *  tree. An additional intellectual property rights grant can be found
-+ *  in the file PATENTS.  All contributing project authors may
-+ *  be found in the AUTHORS file in the root of the source tree.
-+ */
-+
-+#include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
-+
-+#if defined(USE_X11)
-+#include "webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.h"
-+#endif // defined(USE_X11)
-+
-+namespace webrtc {
-+
-+// static
-+MouseCursorMonitor* MouseCursorMonitor::CreateForWindow(
-+    const DesktopCaptureOptions& options, WindowId window) {
-+#if defined(USE_X11)
-+  return MouseCursorMonitorX11::CreateForWindow(options, window);
-+#else
-+  return nullptr;
-+#endif // defined(USE_X11)
-+}
-+
-+// static
-+MouseCursorMonitor* MouseCursorMonitor::CreateForScreen(
-+    const DesktopCaptureOptions& options,
-+    ScreenId screen) {
-+#if defined(USE_X11)
-+  return MouseCursorMonitorX11::CreateForScreen(options, screen);
-+#else
-+  return nullptr;
-+#endif // defined(USE_X11)
-+}
-+
-+}  // namespace webrtc
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc	2019-01-07 13:16:46.368432860 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc	2019-01-07 13:20:40.166768522 +0100
-@@ -16,6 +16,8 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- 
-+#include "webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.h"
-+
- #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
- #include "webrtc/modules/desktop_capture/desktop_frame.h"
- #include "webrtc/modules/desktop_capture/mouse_cursor.h"
-@@ -59,38 +61,6 @@
- 
- namespace webrtc {
- 
--class MouseCursorMonitorX11 : public MouseCursorMonitor,
--                              public SharedXDisplay::XEventHandler {
-- public:
--  MouseCursorMonitorX11(const DesktopCaptureOptions& options, Window window, Window inner_window);
--  ~MouseCursorMonitorX11() override;
--
--  void Start(Callback* callback, Mode mode) override;
--  void Stop() override;
--  void Capture() override;
--
-- private:
--  // SharedXDisplay::XEventHandler interface.
--  bool HandleXEvent(const XEvent& event) override;
--
--  Display* display() { return x_display_->display(); }
--
--  // Captures current cursor shape and stores it in |cursor_shape_|.
--  void CaptureCursor();
--
--  rtc::scoped_refptr<SharedXDisplay> x_display_;
--  Callback* callback_;
--  Mode mode_;
--  Window window_;
--  Window inner_window_;
--
--  bool have_xfixes_;
--  int xfixes_event_base_;
--  int xfixes_error_base_;
--
--  std::unique_ptr<MouseCursor> cursor_shape_;
--};
--
- MouseCursorMonitorX11::MouseCursorMonitorX11(
-     const DesktopCaptureOptions& options,
-     Window window, Window inner_window)
-@@ -244,7 +214,7 @@
- }
- 
- // static
--MouseCursorMonitor* MouseCursorMonitor::CreateForWindow(
-+MouseCursorMonitor* MouseCursorMonitorX11::CreateForWindow(
-     const DesktopCaptureOptions& options, WindowId window) {
-   if (!options.x_display())
-     return NULL;
-@@ -254,7 +224,7 @@
-   return new MouseCursorMonitorX11(options, outer_window, window);
- }
- 
--MouseCursorMonitor* MouseCursorMonitor::CreateForScreen(
-+MouseCursorMonitor* MouseCursorMonitorX11::CreateForScreen(
-     const DesktopCaptureOptions& options,
-     ScreenId screen) {
-   if (!options.x_display())
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.h firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.h
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.h	1970-01-01 01:00:00.000000000 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.h	2019-01-07 13:20:40.164768502 +0100
-@@ -0,0 +1,63 @@
-+/*
-+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
-+ *
-+ *  Use of this source code is governed by a BSD-style license
-+ *  that can be found in the LICENSE file in the root of the source
-+ *  tree. An additional intellectual property rights grant can be found
-+ *  in the file PATENTS.  All contributing project authors may
-+ *  be found in the AUTHORS file in the root of the source tree.
-+ */
-+
-+#ifndef MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_MONITOR_X11_H_
-+#define MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_MONITOR_X11_H_
-+
-+#include <X11/X.h>
-+#include <memory>
-+
-+#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
-+#include "webrtc/modules/desktop_capture/desktop_capture_types.h"
-+#include "webrtc/modules/desktop_capture/x11/shared_x_display.h"
-+#include "webrtc/modules/desktop_capture/mouse_cursor.h"
-+#include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
-+#include "webrtc/base/scoped_ref_ptr.h"
-+
-+namespace webrtc {
-+
-+class MouseCursorMonitorX11 : public MouseCursorMonitor,
-+                              public SharedXDisplay::XEventHandler {
-+ public:
-+  MouseCursorMonitorX11(const DesktopCaptureOptions& options, Window window, Window inner_window);
-+  ~MouseCursorMonitorX11() override;
-+
-+  void Start(Callback* callback, Mode mode) override;
-+  void Stop() override;
-+  void Capture() override;
-+
-+  static MouseCursorMonitor* CreateForWindow(const DesktopCaptureOptions& options, WindowId window);
-+  static MouseCursorMonitor* CreateForScreen(const DesktopCaptureOptions& options, ScreenId screen);
-+
-+ private:
-+  // SharedXDisplay::XEventHandler interface.
-+  bool HandleXEvent(const XEvent& event) override;
-+
-+  Display* display() { return x_display_->display(); }
-+
-+  // Captures current cursor shape and stores it in |cursor_shape_|.
-+  void CaptureCursor();
-+
-+  rtc::scoped_refptr<SharedXDisplay> x_display_;
-+  Callback* callback_;
-+  Mode mode_;
-+  Window window_;
-+  Window inner_window_;
-+
-+  bool have_xfixes_;
-+  int xfixes_event_base_;
-+  int xfixes_error_base_;
-+
-+  std::unique_ptr<MouseCursor> cursor_shape_;
-+};
-+
-+}  // namespace webrtc
-+
-+#endif  // MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_MONITOR_X11_H_
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc	1970-01-01 01:00:00.000000000 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc	2019-01-07 13:20:40.170768562 +0100
-@@ -0,0 +1,40 @@
-+/*
-+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
-+ *
-+ *  Use of this source code is governed by a BSD-style license
-+ *  that can be found in the LICENSE file in the root of the source
-+ *  tree. An additional intellectual property rights grant can be found
-+ *  in the file PATENTS.  All contributing project authors may
-+ *  be found in the AUTHORS file in the root of the source tree.
-+ */
-+
-+#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
-+#include "webrtc/modules/desktop_capture/desktop_capturer.h"
-+
-+#if defined(WEBRTC_USE_PIPEWIRE)
-+#include "webrtc/modules/desktop_capture/screen_capturer_pipewire.h"
-+#endif  // defined(WEBRTC_USE_PIPEWIRE)
-+
-+#if defined(USE_X11)
-+#include "webrtc/modules/desktop_capture/screen_capturer_x11.h"
-+#endif  // defined(USE_X11)
-+
-+namespace webrtc {
-+
-+// static
-+std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
-+    const DesktopCaptureOptions& options) {
-+#if defined(WEBRTC_USE_PIPEWIRE)
-+  if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
-+    return ScreenCapturerPipeWire::CreateRawScreenCapturer(options);
-+  }
-+#endif  // defined(WEBRTC_USE_PIPEWIRE)
-+
-+#if defined(USE_X11)
-+  return ScreenCapturerX11::CreateRawScreenCapturer(options);
-+#endif  // defined(USE_X11)
-+
-+  return nullptr;
-+}
-+
-+}  // namespace webrtc
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_pipewire.cc firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_pipewire.cc
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_pipewire.cc	1970-01-01 01:00:00.000000000 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_pipewire.cc	2019-01-07 13:20:40.171768572 +0100
-@@ -0,0 +1,31 @@
-+/*
-+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
-+ *
-+ *  Use of this source code is governed by a BSD-style license
-+ *  that can be found in the LICENSE file in the root of the source
-+ *  tree. An additional intellectual property rights grant can be found
-+ *  in the file PATENTS.  All contributing project authors may
-+ *  be found in the AUTHORS file in the root of the source tree.
-+ */
-+
-+#include "webrtc/modules/desktop_capture/screen_capturer_pipewire.h"
-+
-+#include <memory>
-+
-+namespace webrtc {
-+
-+ScreenCapturerPipeWire::ScreenCapturerPipeWire()
-+    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Screen) {}
-+ScreenCapturerPipeWire::~ScreenCapturerPipeWire() {}
-+
-+// static
-+std::unique_ptr<DesktopCapturer>
-+ScreenCapturerPipeWire::CreateRawScreenCapturer(
-+    const DesktopCaptureOptions& options) {
-+  std::unique_ptr<ScreenCapturerPipeWire> capturer(
-+      new ScreenCapturerPipeWire());
-+
-+  return std::move(capturer);
-+}
-+
-+}  // namespace webrtc
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_pipewire.h firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_pipewire.h
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_pipewire.h	1970-01-01 01:00:00.000000000 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_pipewire.h	2019-01-07 13:20:40.168768542 +0100
-@@ -0,0 +1,33 @@
-+/*
-+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
-+ *
-+ *  Use of this source code is governed by a BSD-style license
-+ *  that can be found in the LICENSE file in the root of the source
-+ *  tree. An additional intellectual property rights grant can be found
-+ *  in the file PATENTS.  All contributing project authors may
-+ *  be found in the AUTHORS file in the root of the source tree.
-+ */
-+
-+#ifndef MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_PIPEWIRE_H_
-+#define MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_PIPEWIRE_H_
-+
-+#include <memory>
-+
-+#include "webrtc/modules/desktop_capture/base_capturer_pipewire.h"
-+
-+namespace webrtc {
-+
-+class ScreenCapturerPipeWire : public BaseCapturerPipeWire {
-+ public:
-+  ScreenCapturerPipeWire();
-+  ~ScreenCapturerPipeWire() override;
-+
-+  static std::unique_ptr<DesktopCapturer> CreateRawScreenCapturer(
-+      const DesktopCaptureOptions& options);
-+
-+  RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerPipeWire);
-+};
-+
-+}  // namespace webrtc
-+
-+#endif  // MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_PIPEWIRE_H_
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.cc firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.cc
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.cc	2019-01-07 13:16:46.376432940 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.cc	2019-01-07 13:20:40.173768592 +0100
-@@ -19,6 +19,8 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- 
-+#include "webrtc/modules/desktop_capture/screen_capturer_x11.h"
-+
- #include "webrtc/base/checks.h"
- #include "webrtc/base/constructormagic.h"
- #include "webrtc/base/timeutils.h"
-@@ -32,100 +34,12 @@
- #include "webrtc/system_wrappers/include/logging.h"
- 
- namespace webrtc {
--namespace {
--
--// A class to perform video frame capturing for Linux.
--//
--// If XDamage is used, this class sets DesktopFrame::updated_region() according
--// to the areas reported by XDamage. Otherwise this class does not detect
--// DesktopFrame::updated_region(), the field is always set to the entire frame
--// rectangle. ScreenCapturerDifferWrapper should be used if that functionality
--// is necessary.
--class ScreenCapturerLinux : public DesktopCapturer,
--                            public SharedXDisplay::XEventHandler {
-- public:
--  ScreenCapturerLinux();
--  ~ScreenCapturerLinux() override;
--
--  // TODO(ajwong): Do we really want this to be synchronous?
--  bool Init(const DesktopCaptureOptions& options);
--
--  // DesktopCapturer interface.
--  void Start(Callback* delegate) override;
--  void Stop() override;
--  void CaptureFrame() override;
--  bool GetSourceList(SourceList* sources) override;
--  bool SelectSource(SourceId id) override;
--
-- private:
--  Display* display() { return options_.x_display()->display(); }
--
--  // SharedXDisplay::XEventHandler interface.
--  bool HandleXEvent(const XEvent& event) override;
--
--  void InitXDamage();
--
--  // Capture screen pixels to the current buffer in the queue. In the DAMAGE
--  // case, the ScreenCapturerHelper already holds the list of invalid rectangles
--  // from HandleXEvent(). In the non-DAMAGE case, this captures the
--  // whole screen, then calculates some invalid rectangles that include any
--  // differences between this and the previous capture.
--  std::unique_ptr<DesktopFrame> CaptureScreen();
--
--  // Called when the screen configuration is changed.
--  void ScreenConfigurationChanged();
--
--  // Synchronize the current buffer with |last_buffer_|, by copying pixels from
--  // the area of |last_invalid_rects|.
--  // Note this only works on the assumption that kNumBuffers == 2, as
--  // |last_invalid_rects| holds the differences from the previous buffer and
--  // the one prior to that (which will then be the current buffer).
--  void SynchronizeFrame();
--
--  void DeinitXlib();
--
--  DesktopCaptureOptions options_;
--
--  Callback* callback_ = nullptr;
--
--  // X11 graphics context.
--  GC gc_ = nullptr;
--  Window root_window_ = BadValue;
--
--  // XFixes.
--  bool has_xfixes_ = false;
--  int xfixes_event_base_ = -1;
--  int xfixes_error_base_ = -1;
--
--  // XDamage information.
--  bool use_damage_ = false;
--  Damage damage_handle_ = 0;
--  int damage_event_base_ = -1;
--  int damage_error_base_ = -1;
--  XserverRegion damage_region_ = 0;
--
--  // Access to the X Server's pixel buffer.
--  XServerPixelBuffer x_server_pixel_buffer_;
--
--  // A thread-safe list of invalid rectangles, and the size of the most
--  // recently captured screen.
--  ScreenCapturerHelper helper_;
--
--  // Queue of the frames buffers.
--  ScreenCaptureFrameQueue<SharedDesktopFrame> queue_;
--
--  // Invalid region from the previous capture. This is used to synchronize the
--  // current with the last buffer used.
--  DesktopRegion last_invalid_region_;
--
--  RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerLinux);
--};
- 
--ScreenCapturerLinux::ScreenCapturerLinux() {
-+ScreenCapturerX11::ScreenCapturerX11() {
-   helper_.SetLogGridSize(4);
- }
- 
--ScreenCapturerLinux::~ScreenCapturerLinux() {
-+ScreenCapturerX11::~ScreenCapturerX11() {
-   options_.x_display()->RemoveEventHandler(ConfigureNotify, this);
-   if (use_damage_) {
-     options_.x_display()->RemoveEventHandler(
-@@ -134,7 +48,7 @@
-   DeinitXlib();
- }
- 
--bool ScreenCapturerLinux::Init(const DesktopCaptureOptions& options) {
-+bool ScreenCapturerX11::Init(const DesktopCaptureOptions& options) {
-   options_ = options;
- 
-   root_window_ = RootWindow(display(), DefaultScreen(display()));
-@@ -177,7 +91,7 @@
-   return true;
- }
- 
--void ScreenCapturerLinux::InitXDamage() {
-+void ScreenCapturerX11::InitXDamage() {
-   // Our use of XDamage requires XFixes.
-   if (!has_xfixes_) {
-     return;
-@@ -218,18 +132,18 @@
-   LOG(LS_INFO) << "Using XDamage extension.";
- }
- 
--void ScreenCapturerLinux::Start(Callback* callback) {
-+void ScreenCapturerX11::Start(Callback* callback) {
-   RTC_DCHECK(!callback_);
-   RTC_DCHECK(callback);
- 
-   callback_ = callback;
- }
- 
--void ScreenCapturerLinux::Stop() {
-+void ScreenCapturerX11::Stop() {
-   callback_ = NULL;
- }
- 
--void ScreenCapturerLinux::CaptureFrame() {
-+void ScreenCapturerX11::CaptureFrame() {
-   int64_t capture_start_time_nanos = rtc::TimeNanos();
- 
-   queue_.MoveToNextFrame();
-@@ -243,6 +157,7 @@
-   // in a good shape.
-   if (!x_server_pixel_buffer_.is_initialized()) {
-      // We failed to initialize pixel buffer.
-+     LOG(LS_ERROR) << "Pixel buffer is not initialized.";
-      callback_->OnCaptureResult(Result::ERROR_PERMANENT, nullptr);
-      return;
-   }
-@@ -258,6 +173,7 @@
- 
-   std::unique_ptr<DesktopFrame> result = CaptureScreen();
-   if (!result) {
-+    LOG(LS_WARNING) << "Temporarily failed to capture screen.";
-     callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
-     return;
-   }
-@@ -268,19 +184,19 @@
-   callback_->OnCaptureResult(Result::SUCCESS, std::move(result));
- }
- 
--bool ScreenCapturerLinux::GetSourceList(SourceList* sources) {
-+bool ScreenCapturerX11::GetSourceList(SourceList* sources) {
-   RTC_DCHECK(sources->size() == 0);
-   // TODO(jiayl): implement screen enumeration.
-   sources->push_back({0});
-   return true;
- }
- 
--bool ScreenCapturerLinux::SelectSource(SourceId id) {
-+bool ScreenCapturerX11::SelectSource(SourceId id) {
-   // TODO(jiayl): implement screen selection.
-   return true;
- }
- 
--bool ScreenCapturerLinux::HandleXEvent(const XEvent& event) {
-+bool ScreenCapturerX11::HandleXEvent(const XEvent& event) {
-   if (use_damage_ && (event.type == damage_event_base_ + XDamageNotify)) {
-     const XDamageNotifyEvent* damage_event =
-         reinterpret_cast<const XDamageNotifyEvent*>(&event);
-@@ -295,7 +211,7 @@
-   return false;
- }
- 
--std::unique_ptr<DesktopFrame> ScreenCapturerLinux::CaptureScreen() {
-+std::unique_ptr<DesktopFrame> ScreenCapturerX11::CaptureScreen() {
-   std::unique_ptr<SharedDesktopFrame> frame = queue_.current_frame()->Share();
-   RTC_DCHECK(x_server_pixel_buffer_.window_size().equals(frame->size()));
- 
-@@ -345,14 +261,15 @@
-     // Doing full-screen polling, or this is the first capture after a
-     // screen-resolution change.  In either case, need a full-screen capture.
-     DesktopRect screen_rect = DesktopRect::MakeSize(frame->size());
--    x_server_pixel_buffer_.CaptureRect(screen_rect, frame.get());
-+    if (!x_server_pixel_buffer_.CaptureRect(screen_rect, frame.get()))
-+      return nullptr;
-     updated_region->SetRect(screen_rect);
-   }
- 
-   return std::move(frame);
- }
- 
--void ScreenCapturerLinux::ScreenConfigurationChanged() {
-+void ScreenCapturerX11::ScreenConfigurationChanged() {
-   // Make sure the frame buffers will be reallocated.
-   queue_.Reset();
- 
-@@ -363,7 +280,7 @@
-   }
- }
- 
--void ScreenCapturerLinux::SynchronizeFrame() {
-+void ScreenCapturerX11::SynchronizeFrame() {
-   // Synchronize the current buffer with the previous one since we do not
-   // capture the entire desktop. Note that encoder may be reading from the
-   // previous buffer at this time so thread access complaints are false
-@@ -383,7 +300,7 @@
-   }
- }
- 
--void ScreenCapturerLinux::DeinitXlib() {
-+void ScreenCapturerX11::DeinitXlib() {
-   if (gc_) {
-     XFreeGC(display(), gc_);
-     gc_ = nullptr;
-@@ -404,20 +321,18 @@
-   }
- }
- 
--}  // namespace
--
- // static
--std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
-+std::unique_ptr<DesktopCapturer> ScreenCapturerX11::CreateRawScreenCapturer(
-     const DesktopCaptureOptions& options) {
-   if (!options.x_display())
-     return nullptr;
- 
--  std::unique_ptr<ScreenCapturerLinux> capturer(new ScreenCapturerLinux());
-+  std::unique_ptr<ScreenCapturerX11> capturer(new ScreenCapturerX11());
-   if (!capturer.get()->Init(options)) {
-     return nullptr;
-   }
- 
--  return std::unique_ptr<DesktopCapturer>(capturer.release());
-+  return std::move(capturer);
- }
- 
- }  // namespace webrtc
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.h firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.h
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.h	1970-01-01 01:00:00.000000000 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.h	2019-01-07 13:20:40.169768552 +0100
-@@ -0,0 +1,124 @@
-+/*
-+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
-+ *
-+ *  Use of this source code is governed by a BSD-style license
-+ *  that can be found in the LICENSE file in the root of the source
-+ *  tree. An additional intellectual property rights grant can be found
-+ *  in the file PATENTS.  All contributing project authors may
-+ *  be found in the AUTHORS file in the root of the source tree.
-+ */
-+
-+#ifndef MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_X11_H_
-+#define MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_X11_H_
-+
-+#include <X11/X.h>
-+#include <X11/Xlib.h>
-+#include <X11/extensions/Xdamage.h>
-+#include <X11/extensions/Xfixes.h>
-+#include <memory>
-+
-+#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
-+#include "webrtc/modules/desktop_capture/desktop_capturer.h"
-+#include "webrtc/modules/desktop_capture/desktop_frame.h"
-+#include "webrtc/modules/desktop_capture/desktop_region.h"
-+#include "webrtc/modules/desktop_capture/x11/shared_x_display.h"
-+#include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h"
-+#include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h"
-+#include "webrtc/modules/desktop_capture/screen_capturer_helper.h"
-+#include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
-+#include "webrtc/base/constructormagic.h"
-+
-+namespace webrtc {
-+
-+// A class to perform video frame capturing for Linux on X11.
-+//
-+// If XDamage is used, this class sets DesktopFrame::updated_region() according
-+// to the areas reported by XDamage. Otherwise this class does not detect
-+// DesktopFrame::updated_region(), the field is always set to the entire frame
-+// rectangle. ScreenCapturerDifferWrapper should be used if that functionality
-+// is necessary.
-+class ScreenCapturerX11 : public DesktopCapturer,
-+                          public SharedXDisplay::XEventHandler {
-+ public:
-+  ScreenCapturerX11();
-+  ~ScreenCapturerX11() override;
-+
-+  static std::unique_ptr<DesktopCapturer> CreateRawScreenCapturer(const DesktopCaptureOptions& options);
-+
-+  // TODO(ajwong): Do we really want this to be synchronous?
-+  bool Init(const DesktopCaptureOptions& options);
-+
-+  // DesktopCapturer interface.
-+  void Start(Callback* delegate) override;
-+  void Stop() override;
-+  void CaptureFrame() override;
-+  bool GetSourceList(SourceList* sources) override;
-+  bool SelectSource(SourceId id) override;
-+
-+ private:
-+  Display* display() { return options_.x_display()->display(); }
-+
-+  // SharedXDisplay::XEventHandler interface.
-+  bool HandleXEvent(const XEvent& event) override;
-+
-+  void InitXDamage();
-+
-+  // Capture screen pixels to the current buffer in the queue. In the DAMAGE
-+  // case, the ScreenCapturerHelper already holds the list of invalid rectangles
-+  // from HandleXEvent(). In the non-DAMAGE case, this captures the
-+  // whole screen, then calculates some invalid rectangles that include any
-+  // differences between this and the previous capture.
-+  std::unique_ptr<DesktopFrame> CaptureScreen();
-+
-+  // Called when the screen configuration is changed.
-+  void ScreenConfigurationChanged();
-+
-+  // Synchronize the current buffer with |last_buffer_|, by copying pixels from
-+  // the area of |last_invalid_rects|.
-+  // Note this only works on the assumption that kNumBuffers == 2, as
-+  // |last_invalid_rects| holds the differences from the previous buffer and
-+  // the one prior to that (which will then be the current buffer).
-+  void SynchronizeFrame();
-+
-+  void DeinitXlib();
-+
-+  DesktopCaptureOptions options_;
-+
-+  Callback* callback_ = nullptr;
-+
-+  // X11 graphics context.
-+  GC gc_ = nullptr;
-+  Window root_window_ = BadValue;
-+
-+  // XFixes.
-+  bool has_xfixes_ = false;
-+  int xfixes_event_base_ = -1;
-+  int xfixes_error_base_ = -1;
-+
-+  // XDamage information.
-+  bool use_damage_ = false;
-+  Damage damage_handle_ = 0;
-+  int damage_event_base_ = -1;
-+  int damage_error_base_ = -1;
-+  XserverRegion damage_region_ = 0;
-+
-+  // Access to the X Server's pixel buffer.
-+  XServerPixelBuffer x_server_pixel_buffer_;
-+
-+  // A thread-safe list of invalid rectangles, and the size of the most
-+  // recently captured screen.
-+  ScreenCapturerHelper helper_;
-+
-+  // Queue of the frames buffers.
-+  ScreenCaptureFrameQueue<SharedDesktopFrame> queue_;
-+
-+  // Invalid region from the previous capture. This is used to synchronize the
-+  // current with the last buffer used.
-+  DesktopRegion last_invalid_region_;
-+
-+  RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerX11);
-+};
-+
-+}  // namespace webrtc
-+
-+#endif  // MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_X11_H_
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc	1970-01-01 01:00:00.000000000 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc	2019-01-07 13:20:40.196768822 +0100
-@@ -0,0 +1,40 @@
-+/*
-+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
-+ *
-+ *  Use of this source code is governed by a BSD-style license
-+ *  that can be found in the LICENSE file in the root of the source
-+ *  tree. An additional intellectual property rights grant can be found
-+ *  in the file PATENTS.  All contributing project authors may
-+ *  be found in the AUTHORS file in the root of the source tree.
-+ */
-+
-+#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
-+#include "webrtc/modules/desktop_capture/desktop_capturer.h"
-+
-+#if defined(WEBRTC_USE_PIPEWIRE)
-+#include "webrtc/modules/desktop_capture/window_capturer_pipewire.h"
-+#endif  // defined(WEBRTC_USE_PIPEWIRE)
-+
-+#if defined(USE_X11)
-+#include "webrtc/modules/desktop_capture/window_capturer_x11.h"
-+#endif  // defined(USE_X11)
-+
-+namespace webrtc {
-+
-+// static
-+std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawWindowCapturer(
-+    const DesktopCaptureOptions& options) {
-+#if defined(WEBRTC_USE_PIPEWIRE)
-+  if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
-+    return WindowCapturerPipeWire::CreateRawWindowCapturer(options);
-+  }
-+#endif  // defined(WEBRTC_USE_PIPEWIRE)
-+
-+#if defined(USE_X11)
-+  return WindowCapturerX11::CreateRawWindowCapturer(options);
-+#endif  // defined(USE_X11)
-+
-+  return nullptr;
-+}
-+
-+}  // namespace webrtc
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_pipewire.cc firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_pipewire.cc
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_pipewire.cc	1970-01-01 01:00:00.000000000 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_pipewire.cc	2019-01-07 13:20:40.197768832 +0100
-@@ -0,0 +1,28 @@
-+/*
-+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
-+ *
-+ *  Use of this source code is governed by a BSD-style license
-+ *  that can be found in the LICENSE file in the root of the source
-+ *  tree. An additional intellectual property rights grant can be found
-+ *  in the file PATENTS.  All contributing project authors may
-+ *  be found in the AUTHORS file in the root of the source tree.
-+ */
-+
-+#include "webrtc/modules/desktop_capture/window_capturer_pipewire.h"
-+
-+namespace webrtc {
-+
-+WindowCapturerPipeWire::WindowCapturerPipeWire()
-+    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Window) {}
-+WindowCapturerPipeWire::~WindowCapturerPipeWire() {}
-+
-+// static
-+std::unique_ptr<DesktopCapturer>
-+WindowCapturerPipeWire::CreateRawWindowCapturer(
-+    const DesktopCaptureOptions& options) {
-+  std::unique_ptr<WindowCapturerPipeWire> capturer(
-+      new WindowCapturerPipeWire());
-+
-+  return std::move(capturer);
-+}
-+}  // namespace webrtc
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_pipewire.h firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_pipewire.h
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_pipewire.h	1970-01-01 01:00:00.000000000 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_pipewire.h	2019-01-07 13:20:40.177768632 +0100
-@@ -0,0 +1,33 @@
-+/*
-+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
-+ *
-+ *  Use of this source code is governed by a BSD-style license
-+ *  that can be found in the LICENSE file in the root of the source
-+ *  tree. An additional intellectual property rights grant can be found
-+ *  in the file PATENTS.  All contributing project authors may
-+ *  be found in the AUTHORS file in the root of the source tree.
-+ */
-+
-+#ifndef MODULES_DESKTOP_CAPTURE_WINDOW_CAPTURER_PIPEWIRE_H_
-+#define MODULES_DESKTOP_CAPTURE_WINDOW_CAPTURER_PIPEWIRE_H_
-+
-+#include <memory>
-+
-+#include "webrtc/modules/desktop_capture/base_capturer_pipewire.h"
-+
-+namespace webrtc {
-+
-+class WindowCapturerPipeWire : public BaseCapturerPipeWire {
-+ public:
-+  WindowCapturerPipeWire();
-+  ~WindowCapturerPipeWire() override;
-+
-+  static std::unique_ptr<DesktopCapturer> CreateRawWindowCapturer(
-+      const DesktopCaptureOptions& options);
-+
-+  RTC_DISALLOW_COPY_AND_ASSIGN(WindowCapturerPipeWire);
-+};
-+
-+}  // namespace webrtc
-+
-+#endif  // MODULES_DESKTOP_CAPTURE_WINDOW_CAPTURER_PIPEWIRE_H_
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.cc firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.cc
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.cc	2019-01-07 13:16:46.375432930 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.cc	2019-01-07 13:20:40.198768842 +0100
-@@ -17,6 +17,8 @@
- 
- #include <algorithm>
- 
-+#include "webrtc/modules/desktop_capture/window_capturer_x11.h"
-+
- #include "webrtc/base/constructormagic.h"
- #include "webrtc/base/scoped_ref_ptr.h"
- #include "webrtc/modules/desktop_capture/desktop_capturer.h"
-@@ -30,58 +32,7 @@
- 
- namespace webrtc {
- 
--namespace {
--
--class WindowCapturerLinux : public DesktopCapturer,
--                            public SharedXDisplay::XEventHandler {
-- public:
--  WindowCapturerLinux(const DesktopCaptureOptions& options);
--  ~WindowCapturerLinux() override;
--
--  // DesktopCapturer interface.
--  void Start(Callback* callback) override;
--  void Stop() override;
--  void CaptureFrame() override;
--  bool GetSourceList(SourceList* sources) override;
--  bool SelectSource(SourceId id) override;
--  bool FocusOnSelectedSource() override;
--
--  // SharedXDisplay::XEventHandler interface.
--  bool HandleXEvent(const XEvent& event) override;
--
-- private:
--  Display* display() { return x_display_->display(); }
--
--  // Iterates through |window| hierarchy to find first visible window, i.e. one
--  // that has WM_STATE property set to NormalState.
--  // See http://tronche.com/gui/x/icccm/sec-4.html#s-4.1.3.1 .
--  ::Window GetApplicationWindow(::Window window);
--
--  // Returns true if the |window| is a desktop element.
--  bool IsDesktopElement(::Window window);
--
--  // Returns window title for the specified X |window|.
--  bool GetWindowTitle(::Window window, std::string* title);
--
--  // Returns the id of the owning process.
--  int GetWindowProcessID(::Window window);
--
--  Callback* callback_ = nullptr;
--
--  rtc::scoped_refptr<SharedXDisplay> x_display_;
--
--  Atom wm_state_atom_;
--  Atom window_type_atom_;
--  Atom normal_window_type_atom_;
--  bool has_composite_extension_ = false;
--
--  ::Window selected_window_ = 0;
--  XServerPixelBuffer x_server_pixel_buffer_;
--
--  RTC_DISALLOW_COPY_AND_ASSIGN(WindowCapturerLinux);
--};
--
--WindowCapturerLinux::WindowCapturerLinux(const DesktopCaptureOptions& options)
-+WindowCapturerX11::WindowCapturerX11(const DesktopCaptureOptions& options)
-     : x_display_(options.x_display()) {
-   // Create Atoms so we don't need to do it every time they are used.
-   wm_state_atom_ = XInternAtom(display(), "WM_STATE", True);
-@@ -102,11 +53,11 @@
-   x_display_->AddEventHandler(ConfigureNotify, this);
- }
- 
--WindowCapturerLinux::~WindowCapturerLinux() {
-+WindowCapturerX11::~WindowCapturerX11() {
-   x_display_->RemoveEventHandler(ConfigureNotify, this);
- }
- 
--bool WindowCapturerLinux::GetSourceList(SourceList* sources) {
-+bool WindowCapturerX11::GetSourceList(SourceList* sources) {
-   SourceList result;
- 
-   XErrorTrap error_trap(display());
-@@ -159,7 +110,7 @@
-   return true;
- }
- 
--bool WindowCapturerLinux::SelectSource(SourceId id) {
-+bool WindowCapturerX11::SelectSource(SourceId id) {
-   if (!x_server_pixel_buffer_.Init(display(), id))
-     return false;
- 
-@@ -180,7 +131,7 @@
-   return true;
- }
- 
--bool WindowCapturerLinux::FocusOnSelectedSource() {
-+bool WindowCapturerX11::FocusOnSelectedSource() {
-   if (!selected_window_)
-     return false;
- 
-@@ -229,18 +180,18 @@
-   return true;
- }
- 
--void WindowCapturerLinux::Start(Callback* callback) {
-+void WindowCapturerX11::Start(Callback* callback) {
-   assert(!callback_);
-   assert(callback);
- 
-   callback_ = callback;
- }
- 
--void WindowCapturerLinux::Stop() {
-+void WindowCapturerX11::Stop() {
-   callback_ = NULL;
- }
- 
--void WindowCapturerLinux::CaptureFrame() {
-+void WindowCapturerX11::CaptureFrame() {
-   x_display_->ProcessPendingXEvents();
- 
-   if (!x_server_pixel_buffer_.IsWindowValid()) {
-@@ -274,7 +225,7 @@
-   callback_->OnCaptureResult(Result::SUCCESS, std::move(frame));
- }
- 
--bool WindowCapturerLinux::HandleXEvent(const XEvent& event) {
-+bool WindowCapturerX11::HandleXEvent(const XEvent& event) {
-   if (event.type == ConfigureNotify) {
-     XConfigureEvent xce = event.xconfigure;
-     if (!DesktopSize(xce.width, xce.height).equals(
-@@ -288,7 +239,7 @@
-   return false;
- }
- 
--::Window WindowCapturerLinux::GetApplicationWindow(::Window window) {
-+::Window WindowCapturerX11::GetApplicationWindow(::Window window) {
-   // Get WM_STATE property of the window.
-   XWindowProperty<uint32_t> window_state(display(), window, wm_state_atom_);
- 
-@@ -326,7 +277,7 @@
-   return app_window;
- }
- 
--bool WindowCapturerLinux::IsDesktopElement(::Window window) {
-+bool WindowCapturerX11::IsDesktopElement(::Window window) {
-   if (window == 0)
-     return false;
- 
-@@ -361,7 +312,7 @@
-   return result;
- }
- 
--bool WindowCapturerLinux::GetWindowTitle(::Window window, std::string* title) {
-+bool WindowCapturerX11::GetWindowTitle(::Window window, std::string* title) {
-   int status;
-   bool result = false;
-   XTextProperty window_name;
-@@ -390,9 +341,7 @@
-   return result;
- }
- 
--}  // namespace
--
--int WindowCapturerLinux::GetWindowProcessID(::Window window) {
-+int WindowCapturerX11::GetWindowProcessID(::Window window) {
-   // Get _NET_WM_PID property of the window.
-   Atom process_atom = XInternAtom(display(), "_NET_WM_PID", True);
-   XWindowProperty<uint32_t> process_id(display(), window, process_atom);
-@@ -401,11 +350,11 @@
- }
- 
- // static
--std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawWindowCapturer(
-+std::unique_ptr<DesktopCapturer> WindowCapturerX11::CreateRawWindowCapturer(
-     const DesktopCaptureOptions& options) {
-   if (!options.x_display())
-     return nullptr;
--  return std::unique_ptr<DesktopCapturer>(new WindowCapturerLinux(options));
-+  return std::unique_ptr<DesktopCapturer>(new WindowCapturerX11(options));
- }
- 
- }  // namespace webrtc
-diff -ENwbur firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.h firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.h
---- firefox-64.0/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.h	1970-01-01 01:00:00.000000000 +0100
-+++ firefox-webrtc/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.h	2019-01-07 13:20:40.177768632 +0100
-@@ -0,0 +1,83 @@
-+/*
-+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
-+ *
-+ *  Use of this source code is governed by a BSD-style license
-+ *  that can be found in the LICENSE file in the root of the source
-+ *  tree. An additional intellectual property rights grant can be found
-+ *  in the file PATENTS.  All contributing project authors may
-+ *  be found in the AUTHORS file in the root of the source tree.
-+ */
-+
-+#ifndef MODULES_DESKTOP_CAPTURE_WINDOW_CAPTURER_X11_H_
-+#define MODULES_DESKTOP_CAPTURE_WINDOW_CAPTURER_X11_H_
-+
-+#include <X11/X.h>
-+#include <X11/Xlib.h>
-+#include <memory>
-+#include <string>
-+
-+#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
-+#include "webrtc/modules/desktop_capture/desktop_capturer.h"
-+#include "webrtc/modules/desktop_capture/desktop_geometry.h"
-+#include "webrtc/modules/desktop_capture/x11/shared_x_display.h"
-+#include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h"
-+#include "webrtc/base/constructormagic.h"
-+#include "webrtc/base/scoped_ref_ptr.h"
-+
-+namespace webrtc {
-+
-+class WindowCapturerX11 : public DesktopCapturer,
-+                          public SharedXDisplay::XEventHandler {
-+ public:
-+  explicit WindowCapturerX11(const DesktopCaptureOptions& options);
-+  ~WindowCapturerX11() override;
-+
-+  static std::unique_ptr<DesktopCapturer> CreateRawWindowCapturer(
-+      const DesktopCaptureOptions& options);
-+
-+  // DesktopCapturer interface.
-+  void Start(Callback* callback) override;
-+  void Stop() override;
-+  void CaptureFrame() override;
-+  bool GetSourceList(SourceList* sources) override;
-+  bool SelectSource(SourceId id) override;
-+  bool FocusOnSelectedSource() override;
-+
-+  // SharedXDisplay::XEventHandler interface.
-+  bool HandleXEvent(const XEvent& event) override;
-+
-+ private:
-+  Display* display() { return x_display_->display(); }
-+
-+  // Iterates through |window| hierarchy to find first visible window, i.e. one
-+  // that has WM_STATE property set to NormalState.
-+  // See http://tronche.com/gui/x/icccm/sec-4.html#s-4.1.3.1 .
-+  ::Window GetApplicationWindow(::Window window);
-+
-+  // Returns true if the |window| is a desktop element.
-+  bool IsDesktopElement(::Window window);
-+
-+  // Returns window title for the specified X |window|.
-+  bool GetWindowTitle(::Window window, std::string* title);
-+
-+  // Returns the id of the owning process.
-+  int GetWindowProcessID(::Window window);
-+
-+  Callback* callback_ = nullptr;
-+
-+  rtc::scoped_refptr<SharedXDisplay> x_display_;
-+
-+  Atom wm_state_atom_;
-+  Atom window_type_atom_;
-+  Atom normal_window_type_atom_;
-+  bool has_composite_extension_ = false;
-+
-+  ::Window selected_window_ = 0;
-+  XServerPixelBuffer x_server_pixel_buffer_;
-+
-+  RTC_DISALLOW_COPY_AND_ASSIGN(WindowCapturerX11);
-+};
-+
-+}  // namespace webrtc
-+
-+#endif  // MODULES_DESKTOP_CAPTURE_WINDOW_CAPTURER_X11_H_
diff --git a/icecat-60.6.1-mozilla-1533969.patch b/icecat-60.6.1-mozilla-1533969.patch
deleted file mode 100644
index cdf62c5..0000000
--- a/icecat-60.6.1-mozilla-1533969.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/js/src/util/NativeStack.cpp
-+++ b/js/src/util/NativeStack.cpp
-@@ -16,6 +16,7 @@
- #if defined(ANDROID) && !defined(__aarch64__)
- #include <sys/types.h>
- #include <unistd.h>
-+#   define gettid() static_cast<pid_t>(syscall(__NR_gettid))
- #endif
- #else
- #error "Unsupported platform"
---- a/tools/profiler/core/platform.h
-+++ b/tools/profiler/core/platform.h
-@@ -42,16 +42,16 @@
- #include "PlatformMacros.h"
- #include <vector>
- 
--// We need a definition of gettid(), but glibc doesn't provide a
-+// We need a definition of gettid(), but old glibc versions don't provide a
- // wrapper for it.
- #if defined(__GLIBC__)
- #include <unistd.h>
- #include <sys/syscall.h>
--static inline pid_t gettid() { return (pid_t)syscall(SYS_gettid); }
-+#  define gettid() static_cast<pid_t>(syscall(SYS_gettid))
- #elif defined(GP_OS_darwin)
- #include <unistd.h>
- #include <sys/syscall.h>
--static inline pid_t gettid() { return (pid_t)syscall(SYS_thread_selfid); }
-+#  define gettid() static_cast<pid_t>(syscall(SYS_thread_selfid))
- #elif defined(GP_OS_android)
- #include <unistd.h>
- #elif defined(GP_OS_windows)
diff --git a/icecat-bz1445383.patch b/icecat-bz1445383.patch
deleted file mode 100644
index 97fd5dc..0000000
--- a/icecat-bz1445383.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-# HG changeset patch
-# User Peter Simonyi <pts@petersimonyi.ca>
-# Date 1528570546 14400
-# Node ID 643dfdce06c805659dbfd4f3d8a6e46ee8d3fe9d
-# Parent  04cc917f68c5d554e5b9542cb3745c9453bba58d
-Bug 1445383 - update ccache stats parser for ccache 3.4 and 3.5
-
-MozReview-Commit-ID: KTr9RhkJN5B
-
-diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
---- a/python/mozbuild/mozbuild/controller/building.py
-+++ b/python/mozbuild/mozbuild/controller/building.py
-@@ -752,16 +752,18 @@ class CCacheStats(object):
-     Instances can be subtracted from each other to obtain differences.
-     print() or str() the object to show a ``ccache -s`` like output
-     of the captured stats.
- 
-     """
-     STATS_KEYS = [
-         # (key, description)
-         # Refer to stats.c in ccache project for all the descriptions.
-+        ('stats_zero_time', 'stats zero time'),
-+        ('stats_updated', 'stats updated'),
-         ('cache_hit_direct', 'cache hit (direct)'),
-         ('cache_hit_preprocessed', 'cache hit (preprocessed)'),
-         ('cache_hit_rate', 'cache hit rate'),
-         ('cache_miss', 'cache miss'),
-         ('link', 'called for link'),
-         ('preprocessing', 'called for preprocessing'),
-         ('multiple', 'multiple source files'),
-         ('stdout', 'compiler produced stdout'),
-@@ -833,16 +835,23 @@ class CCacheStats(object):
-                 raise ValueError('Failed to parse ccache stats output: %s' % line)
- 
-     @staticmethod
-     def _strip_prefix(line, prefix):
-         return line[len(prefix):].strip() if line.startswith(prefix) else line
- 
-     @staticmethod
-     def _parse_value(raw_value):
-+        try:
-+            # ccache calls strftime with '%c' (src/stats.c)
-+            ts = time.strptime(raw_value, '%c')
-+            return int(time.mktime(ts))
-+        except ValueError:
-+            pass
-+
-         value = raw_value.split()
-         unit = ''
-         if len(value) == 1:
-             numeric = value[0]
-         elif len(value) == 2:
-             numeric, unit = value
-         else:
-             raise ValueError('Failed to parse ccache stats value: %s' % raw_value)
-diff --git a/python/mozbuild/mozbuild/test/controller/test_ccachestats.py b/python/mozbuild/mozbuild/test/controller/test_ccachestats.py
---- a/python/mozbuild/mozbuild/test/controller/test_ccachestats.py
-+++ b/python/mozbuild/mozbuild/test/controller/test_ccachestats.py
-@@ -1,14 +1,15 @@
- # 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/.
- 
- from __future__ import unicode_literals
- 
-+import time
- import unittest
- 
- from mozunit import main
- 
- from mozbuild.controller.building import CCacheStats
- 
- 
- class TestCcacheStats(unittest.TestCase):
-@@ -169,16 +170,40 @@ class TestCcacheStats(unittest.TestCase)
-     unsupported code directive             2
-     no input file                       2378
-     cleanups performed                  1792
-     files in cache                      3479
-     cache size                           4.4 GB
-     max cache size                       5.0 GB
-     """
- 
-+    # Substitute a locally-generated timestamp because the timestamp format is
-+    # locale-dependent.
-+    STAT8 = """
-+    cache directory                     /home/psimonyi/.ccache
-+    primary config                      /home/psimonyi/.ccache/ccache.conf
-+    secondary config      (readonly)    /etc/ccache.conf
-+    stats zero time                     {timestamp}
-+    cache hit (direct)                   571
-+    cache hit (preprocessed)            1203
-+    cache miss                         11747
-+    cache hit rate                     13.12 %
-+    called for link                      623
-+    called for preprocessing            7194
-+    compile failed                        32
-+    preprocessor error                   137
-+    bad compiler arguments                 4
-+    autoconf compile/link                348
-+    no input file                        162
-+    cleanups performed                    77
-+    files in cache                     13464
-+    cache size                           6.2 GB
-+    max cache size                       7.0 GB
-+    """.format(timestamp=time.strftime('%c'))
-+
-     def test_parse_garbage_stats_message(self):
-         self.assertRaises(ValueError, CCacheStats, self.STAT_GARBAGE)
- 
-     def test_parse_zero_stats_message(self):
-         stats = CCacheStats(self.STAT0)
-         self.assertEqual(stats.cache_dir, "/home/tlin/.ccache")
-         self.assertEqual(stats.hit_rates(), (0, 0, 0))
- 
-@@ -226,10 +251,15 @@ class TestCcacheStats(unittest.TestCase)
-         self.assertTrue(stat6)
-         self.assertTrue(stat3)
-         self.assertTrue(stats_diff)
- 
-         # Test stats for 3.3.3.
-         stat7 = CCacheStats(self.STAT7)
-         self.assertTrue(stat7)
- 
-+    def test_stats_version34(self):
-+        # Test parsing 3.4 output.
-+        stat8 = CCacheStats(self.STAT8)
-+        self.assertTrue(stat8)
-+
- if __name__ == '__main__':
-     main()
diff --git a/icecat-disable-dbus-remote.patch b/icecat-disable-dbus-remote.patch
deleted file mode 100644
index 2b9f3a0..0000000
--- a/icecat-disable-dbus-remote.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up icecat-60.4.0/toolkit/components/remote/nsRemoteService.cpp.old icecat-60.4.0/toolkit/components/remote/nsRemoteService.cpp
---- icecat-60.4.0/toolkit/components/remote/nsRemoteService.cpp.old	2018-11-06 11:25:46.634929894 +0100
-+++ icecat-60.4.0/toolkit/components/remote/nsRemoteService.cpp	2018-11-06 11:21:49.617828440 +0100
-@@ -31,7 +31,7 @@
- 
- NS_IMETHODIMP
- nsRemoteService::Startup(const char* aAppName, const char* aProfileName) {
--#if defined(MOZ_ENABLE_DBUS)
-+#if 0
-   nsresult rv;
-   mDBusRemoteService = new nsDBusRemoteService();
-   rv = mDBusRemoteService->Startup(aAppName, aProfileName);
diff --git a/icecat-fix_addon_installation.patch b/icecat-fix_addon_installation.patch
index fd83f72..5cc140d 100644
--- a/icecat-fix_addon_installation.patch
+++ b/icecat-fix_addon_installation.patch
@@ -1,12 +1,12 @@
 # Fixes installation of those addons which don't have ID on IceCat ("Cannot find id for addon" error).
 --- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm
 +++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
-@@ -885,8 +885,30 @@
-         throw new Error(`Webextension is signed with an invalid id (${addon.id})`);
+@@ -627,8 +627,30 @@
+         throw new Error(`Extension is signed with an invalid id (${addon.id})`);
        }
      }
--    if (!addon.id && aInstallLocation.name == KEY_APP_TEMPORARY) {
--      addon.id = generateTemporaryInstallID(aZipReader.file);
+-    if (!addon.id && aLocation.isTemporary) {
+-      addon.id = generateTemporaryInstallID(aPackage.file);
 +    if (!addon.id) {
 +      if (aInstallLocation.name == KEY_APP_TEMPORARY) {
 +        addon.id = generateTemporaryInstallID(aZipReader.file);
@@ -33,4 +33,4 @@
 +      }
      }
    }
-   addon.updateBlocklistState();
+ 
diff --git a/icecat-fix_jar.patch b/icecat-fix_jar.patch
index 418b5b9..9a64fab 100644
--- a/icecat-fix_jar.patch
+++ b/icecat-fix_jar.patch
@@ -1,11 +1,11 @@
 --- browser/locales/jar.orig.mn	2017-03-19 19:59:09.000000000 +0100
 +++ browser/locales/jar.mn	2017-03-22 19:49:57.602190867 +0100
-@@ -12,7 +12,7 @@
- 
+@@ -14,7 +14,7 @@
  @AB_CD@.jar:
  % locale browser @AB_CD@ %locale/browser/
--*   locale/browser/bookmarks.html                  (generic/profile/bookmarks.html.in)
+ # bookmarks.html is produced by LOCALIZED_GENERATED_FILES.
+-    locale/browser/bookmarks.html                  (bookmarks.html)
 +    locale/browser/bookmarks.html                  (generic/profile/bookmarks.html.in)
-     locale/browser/aboutDialog.dtd                 (%chrome/browser/aboutDialog.dtd)
-     locale/browser/aboutPrivateBrowsing.dtd        (%chrome/browser/aboutPrivateBrowsing.dtd)
-     locale/browser/aboutPrivateBrowsing.properties (%chrome/browser/aboutPrivateBrowsing.properties)
+ 
+     locale/browser/accounts.properties             (%chrome/browser/accounts.properties)
+     locale/browser/app-extension-fields.properties (%chrome/browser/app-extension-fields.properties)
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 832a09b..d785ca1 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=60.8.0
+VERSION=68.0.2
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat-mozconfig-common b/icecat-mozconfig-common
index c5a3241..ceab223 100644
--- a/icecat-mozconfig-common
+++ b/icecat-mozconfig-common
@@ -9,13 +9,10 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 ac_add_options --prefix="$PREFIX"
 ac_add_options --libdir="$LIBDIR"
-ac_add_options --with-pthreads
 ac_add_options --enable-necko-wifi
 ac_add_options --enable-startup-notification
 ac_add_options --disable-updater
 ac_add_options --enable-chrome-format=omni
 ac_add_options --enable-release
-ac_add_options --enable-pie
-ac_add_options --disable-stylo
 # Workaround for mozbz#1341234
 ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
deleted file mode 100644
index c2c8f6f..0000000
--- a/icecat.rpmlintrc
+++ /dev/null
@@ -1,40 +0,0 @@
-# Whitelisting errors
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-# Edited by sagitter (sagitter AT fedoraproject dot org)
-
-# KNOWN BUGS:
-#
-
-# TESTS:
-##### SRPMs #####
-
-# ifarch applied patches are okay
-# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
-addFilter(r'(%ifarch-applied-patch) Patch*')
-
-# ERRORS:
-##### RPMs  #####
-
-# chroot function (??)
-addFilter(r'(missing-call-to-chdir-with-chroot) %{_libdir}/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) %{_libdir}/icecat/libxul.so')
-
-# Expected on FF browser
-# https://support.mozilla.org/en-US/questions/1045418
-addFilter(r'(zero-length) %{_libdir}/icecat/chrome.manifest')
-addFilter(r'(zero-length) %{_libdir}/icecat/browser/chrome.manifest')
-
-# False positive
-addFilter(r'(dangling-symlink) %{_libdir}/icecat/dictionaries %{_datadir}/myspell')
-addFilter(r'(unversioned-explicit-provides) webclient')
-
-# WARNINGS:
-##### RPMs  #####
-
-addFilter(r'(no-manual-page-for-binary) icecat-wayland')
-
-##### SRPMs #####
-# Different file size due to the signature of the source code tarbz archive
-addFilter(r'file-size-mismatch')
-
-addFilter(r'(invalid-url) Source*')
diff --git a/icecat.spec b/icecat.spec
index 532c4dd..cd4bb55 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -24,28 +24,29 @@
 %endif
 
 # Use system sqlite?
+# sqlite > 3.28.0 unavailable on Fedora < 31
+%if 0%{?fedora} < 31
+%global system_sqlite     0
+%else
 %global system_sqlite     1
+%endif
 
 %if 0%{?system_sqlite}
-%global sqlite_version 3.8.4.2
+%global sqlite_version 3.28.0
 # The actual sqlite version (see #480989):
 %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
 %endif
 
 # Use system libicu?
-%global system_libicu      1
+%global system_libicu     1
 
 # Use system nspr/nss?
 %global system_nss        1
 
 %if 0%{?system_nss}
-%global nspr_version 4.17.0
-# NSS/NSPR quite often ends in build override, so as requirement the version
-# we're building against could bring us some broken dependencies from time to time.
-#%%global nspr_build_version %%(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
+%global nspr_version 4.19
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.34
-#%%global nss_build_version %%(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
+%global nss_version 3.40.1
 %global nss_build_version %{nss_version}
 %endif
 
@@ -66,18 +67,24 @@
 # Use mozilla hardening option?
 %global hardened_build    1
 
+# cbingen
+%global use_bundled_cbindgen  1
+
+# Use clang?
+%global build_with_clang  0
+
 # Exclude ARM builds for rhbz #1658940
 ExcludeArch: %{arm}
 
 # Set new source-code build version
-%global gnu_ver         gnu1
+%global gnu_ver gnu1
 
 Name:    icecat
-Version: 60.8.0
-Release: 6.%{gnu_ver}%{?dist}
+Version: 68.0.2
+Release: 1.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
-## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
+# Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
 License: (MPLv1.1 or GPLv2+ or LGPLv2+) and GPLv3+ and MIT and BSD and ISC and ASL 2.0 and MPLv2.0
 URL:     http://www.gnu.org/software/gnuzilla/
 
@@ -89,18 +96,18 @@ Source0: https://sagitter.fedorapeople.org/%{name}/v%{version}/%{name}-%{version
 Source2: %{name}.png
 Source3: %{name}-mozconfig-common
 
-##Language files downloaded by source7 script
+# Language files downloaded by source7 script
 %if 0%{?build_langpacks}
 Source4:  %{name}-%{version}-langpacks.tar.gz
 %endif
 
-##All license files
-##Download from http://www.gnu.org/licenses
-##Download from http://www.mozilla.org/MPL/1.1/index.txt
-##Download from https://www.mozilla.org/MPL/2.0/index.txt
+# All license files
+# Download from http://www.gnu.org/licenses
+# Download from http://www.mozilla.org/MPL/1.1/index.txt
+# Download from https://www.mozilla.org/MPL/2.0/index.txt
 Source5: %{name}-COPYING-licensefiles.tar.gz
 
-##manpage file
+# manpage file
 Source6: %{name}.1
 
 Source7: %{name}-lang_download.sh
@@ -115,12 +122,17 @@ Source14: %{name}.desktop
 Source15: %{name}-x11.sh.in
 Source16: %{name}-x11.desktop
 
+# cbingen
+Source17: cbindgen-vendor.tar.xz
+
+Source18: node-stdout-nonblocking-wrapper
+
 # Build patches
 # Fixes installation of those addons which don't have ID on IceCat ("Cannot find id for addon" error).
 Patch1:   %{name}-fix_addon_installation.patch
-
 Patch2:   %{name}-libevent_linkflag.patch
 Patch3:   mozilla-build-arm.patch
+Patch4:   build-rust-ppc64le.patch
 
 # Unrecognized file?
 Patch7:   %{name}-fix_jar.patch
@@ -142,23 +154,19 @@ Patch37:  build-jit-atomic-always-lucky.patch
 
 # Fedora specific patches
 Patch219: rhbz-1173156.patch
-Patch225: mozilla-1005640-accept-lang.patch
 
 #ARM run-time patch
 Patch226: rhbz-1354671.patch
 
 # Upstream patches
-Patch406: mozilla-256180.patch
-Patch413: mozilla-1353817.patch
+#Patch413: mozilla-1353817.patch
 Patch414: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
-Patch416: mozilla-1424422.patch
 Patch417: bug1375074-save-restore-x28.patch
-Patch418: mozilla-1436242.patch
-Patch420: %{name}-disable-dbus-remote.patch
-Patch421: %{name}-bz1445383.patch
-Patch422: %{name}-60.6.1-mozilla-1533969.patch
+
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
+Patch424: mozilla-1566876-webrtc-ind.patch
+Patch425: mozilla-1568569.patch
 
 # Wayland specific upstream patches
 Patch565: firefox-pipewire.patch
@@ -168,6 +176,10 @@ BuildRequires:  alsa-lib-devel
 BuildRequires:  autoconf213
 BuildRequires:  bzip2-devel
 BuildRequires:  cairo-devel
+BuildRequires:  cargo
+%if !0%{?use_bundled_cbindgen}
+BuildRequires:  cbindgen	
+%endif
 BuildRequires:  ccache
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-glib-devel
@@ -180,7 +192,7 @@ BuildRequires:  freetype-devel
 BuildRequires:  gdk-pixbuf2
 BuildRequires:  glib2-devel
 BuildRequires:  pkgconfig(gtk+-2.0)
-%if %{?toolkit_gtk3}
+%if 0%{?toolkit_gtk3}
 BuildRequires:  pkgconfig(gtk+-3.0)
 %endif
 BuildRequires:  gstreamer1-devel
@@ -203,20 +215,20 @@ BuildRequires:  libXinerama-devel
 BuildRequires:  libffi-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  libpng-devel
-%if %{?with_vpx}
+%if 0%{?with_vpx}
 BuildRequires:  libvpx-devel
 %endif
 BuildRequires:  libzip-devel
 BuildRequires:  mesa-libGL-devel
-%if %{?system_nss}
+BuildRequires:  nodejs
+BuildRequires:  nasm >= 1.13
+BuildRequires:  strace
+%if 0%{?system_nss}
 BuildRequires:  pkgconfig(nspr) >= %{nspr_version}
 BuildRequires:  pkgconfig(nss) >= %{nss_version}
 BuildRequires:  nss-static >= %{nss_version}
 %endif
 
-# xlocale.h not provided by glibc-headers > 2.24
-# Set path of libcxx-devel
-BuildRequires:  libcxx-devel
 BuildRequires:  openjpeg-devel
 BuildRequires:  pango-devel
 BuildRequires:  pipewire-devel
@@ -237,10 +249,13 @@ BuildRequires:  llvm
 BuildRequires:  llvm-devel
 BuildRequires:  clang
 BuildRequires:  clang-libs
+BuildRequires:  clang-devel
+%if 0%{?build_with_clang}
+BuildRequires:  lld
+%endif
 BuildRequires:  rust
-BuildRequires:  cargo
 
-%if %{?system_sqlite}
+%if 0%{?system_sqlite}
 BuildRequires:  pkgconfig(sqlite3) >= %{sqlite_version}
 Requires:       sqlite >= %{sqlite_build_version}
 %endif
@@ -249,7 +264,7 @@ Requires:       dconf
 Requires:       mozilla-filesystem
 Requires:       p11-kit-trust
 
-%if %{?system_nss}
+%if 0%{?system_nss}
 Requires:       nspr >= %{nspr_build_version}
 Requires:       nss >= %{nss_build_version}
 %endif
@@ -303,13 +318,13 @@ to run GNU IceCat natively on Wayland.
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}
+%autosetup -N -n %{name}-%{version}
 
 #Fix permissions
-find . -type f -name "*.h" -exec chmod 0644 '{}' \;
-find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
-find . -type f -name "*.cc" -exec chmod 0644 '{}' \;
-find . -type f -name "*.c" -exec chmod 0644 '{}' \;
+#find . -type f -name "*.h" -exec chmod 0644 '{}' \;
+#find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
+#find . -type f -name "*.cc" -exec chmod 0644 '{}' \;
+#find . -type f -name "*.c" -exec chmod 0644 '{}' \;
 
 ##Copy license files
 tar -xf %{SOURCE5}
@@ -317,28 +332,24 @@ tar -xf %{SOURCE5}
 %patch1 -p1 -b .fix_addon_installation
 %patch2 -p0 -b .libevent_linkflag
 %patch3 -p1 -b .arm
-%patch7 -p0
+%patch7 -p0 -b .fix_jar
 %patch8 -p0 -b .fix_installer
 
 %patch37 -p1 -b .jit-atomic-lucky
 
 # Fedora patches
 %patch219 -p1 -b .rhbz-1173156
-%patch225 -p1 -b .1005640-accept-lang
 
 #ARM run-time patch
 %ifarch aarch64
 %patch226 -p1 -b .1354671
 %endif
 
-%patch406 -p0 -b .256180
-%patch413 -p1 -b .1353817
+#%%patch413 -p1 -b .1353817
 %ifarch %{arm}
 %patch414 -p1 -b .Bug-1238661---fix-mozillaSignalTrampoline-to-work
 %endif
-%patch416 -p1 -b .1424422
-%patch417 -p1 -b .bug1375074-save-restore-x28
-%patch418 -p1 -b .mozilla-1436242
+#%%patch417 -p1 -b .bug1375074-save-restore-x28
 
 # Patch for big endian platforms only
 %if 0%{?big_endian}
@@ -347,18 +358,14 @@ tar -xf %{SOURCE5}
 %patch29 -p1 -b .big-endian
 %endif
 
-%patch420 -p1 -b .%{name}-disable-dbus-remote
-%patch421 -p1 -b .%{name}-update-ccache-stats-parser
+%ifarch ppc64 ppc64le
+%patch423 -p1 -b .1512162
+%endif
+%patch424 -p1 -b .mozilla-1566876-webrtc-ind
+%patch425 -p1 -b .mozilla-1568569
 
-%if 0%{?fedora} > 30
-%patch422 -p1 -b .%{name}-%{version}-mozilla-1533969
-%endif
-%if 0%{?fedora} > 29
-%patch423 -p1 -b .mozilla-1512162.patch
-%endif
 
 # Wayland specific upstream patches
-dos2unix %{PATCH565}
 %patch565 -p1 -b .firefox-pipewire
 
 ##Remove default configuration and copy the customized one
@@ -397,7 +404,6 @@ echo "ac_add_options --with-system-icu" >> .mozconfig
 echo "ac_add_options --without-system-icu" >> .mozconfig
 %endif
 echo "ac_add_options --disable-system-cairo" >> .mozconfig
-echo "ac_add_options --enable-system-hunspell" >> .mozconfig
 echo "ac_add_options --enable-system-pixman" >> .mozconfig
 %if 0%{?system_sqlite}
 echo "ac_add_options --enable-system-sqlite" >> .mozconfig
@@ -471,21 +477,36 @@ echo "ac_add_options --disable-gtest-in-build" >> .mozconfig
 echo "ac_add_options --enable-hardening" >> .mozconfig
 %endif
 
+%ifarch s390 s390x
+echo "ac_add_options --disable-ion" >> .mozconfig
+%endif
+
+echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig
+
 # Remove executable bit to make brp-mangle-shebangs happy.
 chmod -x third_party/rust/itertools/src/lib.rs
 
 #---------------------------------------------------------------------
 
 %build
-%if 0%{?system_sqlite}
-# Do not proceed with build if the sqlite require would be broken:
-# make sure the minimum requirement is non-empty, ...
-sqlite_version=$(expr "%{sqlite_version}" : '\([0-9]*\.\)[0-9]*\.') || exit 1
-# ... and that major number of the computed build-time version matches:
-case "%{sqlite_build_version}" in
-  "$sqlite_version"*) ;;
-  *) exit 1 ;;
-esac
+# cbindgen
+%if 0%{?use_bundled_cbindgen}
+
+mkdir -p my_rust_vendor
+cd my_rust_vendor
+%{__tar} xf %{SOURCE17}
+cd -
+mkdir -p .cargo
+cat > .cargo/config <<EOL
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "`pwd`/my_rust_vendor"
+EOL
+
+env CARGO_HOME=.cargo cargo install cbindgen
+export PATH=`pwd`/.cargo/bin:$PATH
 %endif
 
 echo "Generate big endian version of config/external/icu/data/icud58l.dat"
@@ -495,6 +516,9 @@ echo "Generate big endian version of config/external/icu/data/icud58l.dat"
   rm -f config/external/icu/data/icudt*l.dat
 %endif
 
+mkdir %{_buildrootdir}/bin || :
+cp %{SOURCE18} %{_buildrootdir}/bin || :
+
 # Update the various config.guess to upstream release for aarch64 support
 find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
 
@@ -523,12 +547,14 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/' -e 's/-O2/-O1/')
 # (OOM when linking, rhbz#1238225)
 export MOZ_DEBUG_FLAGS=" "
 %endif
+%if !0%{?build_with_clang}
 %ifarch s390x %{power64} aarch64 %{ix86}
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--print-memory-usage"
 %endif
 %ifarch %{arm}
 MOZ_LINK_FLAGS="-Wl,-fuse-ld=gold -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-mmap-output-file"
 %endif
+%endif
 %ifarch %{arm} %{ix86}
 export RUSTFLAGS="-Cdebuginfo=0"
 export MOZ_RUST_DEFAULT_FLAGS="-Cdebuginfo=0 -Copt-level=0"
@@ -542,6 +568,20 @@ export LIBDIR='%{_libdir}'
 export PKG_CONFIG='%{_bindir}/pkg-config'
 export PYTHON='%{__python2}'
 
+%if 0%{?build_with_clang}
+export LLVM_PROFDATA="llvm-profdata"
+export AR="llvm-ar"
+export NM="llvm-nm"
+export RANLIB="llvm-ranlib"
+echo "ac_add_options --enable-linker=lld" >> .mozconfig
+%else
+export CC=gcc
+export CXX=g++
+export AR="gcc-ar"
+export NM="gcc-nm"
+export RANLIB="gcc-ranlib"
+%endif
+
 MOZ_SMP_FLAGS=-j1
 # On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
 # however builds tend to fail on other arches when building in parallel.
@@ -749,6 +789,11 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Thu Aug 15 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-1.gnu1
+- Mozilla release 68.0.2
+- Import cbindgen stuff from Firefox package
+- Do not use sqlite from system
+
 * Sun Jul 28 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-6.gnu1
 - Add patch to fix the addon installation
 
diff --git a/mozilla-1005640-accept-lang.patch b/mozilla-1005640-accept-lang.patch
deleted file mode 100644
index 29d3833..0000000
--- a/mozilla-1005640-accept-lang.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up firefox-51.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm.1005640-accept-lang firefox-51.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm
---- firefox-51.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm.1005640-accept-lang	2017-01-16 17:16:52.000000000 +0100
-+++ firefox-51.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2017-01-18 12:35:29.380394216 +0100
-@@ -2852,6 +2852,11 @@ this.XPIProvider = {
-         this.addAddonsToCrashReporter();
-       }
- 
-+      // Save locale settings to compare it later to check whenever some addon
-+      // changed it.
-+      var previousLocale = Cc["@mozilla.org/chrome/chrome-registry;1"]
-+                          .getService(Ci.nsIXULChromeRegistry).getSelectedLocale("global");
-+
-       try {
-         AddonManagerPrivate.recordTimestamp("XPI_bootstrap_addons_begin");
- 
-@@ -2880,6 +2885,14 @@ this.XPIProvider = {
-         AddonManagerPrivate.recordException("XPI-BOOTSTRAP", "startup failed", e);
-       }
- 
-+      var currentLocale = Cc["@mozilla.org/chrome/chrome-registry;1"]
-+                         .getService(Ci.nsIXULChromeRegistry).getSelectedLocale("global");
-+      if (currentLocale != previousLocale) {
-+        // We have to flush string cache if the locale was changed during loading
-+        // of addons
-+        Services.obs.notifyObservers(null, "chrome-flush-caches", null);
-+      }
-+
-       // Let these shutdown a little earlier when they still have access to most
-       // of XPCOM
-       Services.obs.addObserver({
diff --git a/mozilla-1353817.patch b/mozilla-1353817.patch
deleted file mode 100644
index dc8d8f8..0000000
--- a/mozilla-1353817.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1cc652f5525f458b0b4ceb12af24bf5a4367db32 Mon Sep 17 00:00:00 2001
-From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
-Date: Tue, 23 May 2017 13:09:48 -0400
-Subject: [PATCH] Bug 1353817: Include SkNx_neon.h for ARM64 too
-
-This fixes build errors as arm_neon.h was missing along with some
-missing converters.
----
- gfx/skia/skia/src/core/SkNx.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gfx/skia/skia/src/core/SkNx.h b/gfx/skia/skia/src/core/SkNx.h
-index 6bca856..b0427aa 100644
---- a/gfx/skia/skia/src/core/SkNx.h
-+++ b/gfx/skia/skia/src/core/SkNx.h
-@@ -299,7 +299,7 @@ typedef SkNx<4, uint32_t> Sk4u;
- // Include platform specific specializations if available.
- #if !defined(SKNX_NO_SIMD) && SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
-     #include "../opts/SkNx_sse.h"
--#elif !defined(SKNX_NO_SIMD) && defined(SK_ARM_HAS_NEON)
-+#elif !defined(SKNX_NO_SIMD) && (defined(SK_ARM_HAS_NEON) || defined(SK_CPU_ARM64))
-     #include "../opts/SkNx_neon.h"
- #else
- 
--- 
-2.9.4
-
diff --git a/mozilla-1424422.patch b/mozilla-1424422.patch
deleted file mode 100644
index cc8b31f..0000000
--- a/mozilla-1424422.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-diff -up firefox-60.0/browser/base/content/browser.js.1424422 firefox-60.0/browser/base/content/browser.js
---- firefox-60.0/browser/base/content/browser.js.1424422	2018-04-26 22:07:20.000000000 +0200
-+++ firefox-60.0/browser/base/content/browser.js	2018-04-30 11:49:51.609458857 +0200
-@@ -1259,6 +1259,9 @@ var gBrowserInit = {
- 
-     if (AppConstants.CAN_DRAW_IN_TITLEBAR) {
-       gDragSpaceObserver.init();
-+      if (AppConstants.platform == "linux") {
-+        gLightThemeObserver.init();
-+      }      
-     }
- 
-     BrowserSearch.initPlaceHolder();
-@@ -1826,6 +1829,9 @@ var gBrowserInit = {
- 
-     if (AppConstants.CAN_DRAW_IN_TITLEBAR) {
-       gDragSpaceObserver.uninit();
-+      if (AppConstants.platform == "linux") {
-+        gLightThemeObserver.uninit();
-+      }
-     }
- 
-     TabsInTitlebar.uninit();
-@@ -5781,6 +5787,24 @@ var gDragSpaceObserver = {
-   },
- };
- 
-+var gLightThemeObserver = {
-+  init() {
-+    Services.obs.addObserver(this, "lightweight-theme-styling-update");
-+  },
-+
-+  uninit() {
-+    Services.obs.removeObserver(this, "lightweight-theme-styling-update");
-+  },
-+
-+  observe(aSubject, aTopic, aData) {
-+    switch (aTopic) {
-+      case "lightweight-theme-styling-update":
-+        TabsInTitlebar.updateAppearance(true);
-+        break;
-+    }
-+  },
-+};
-+
- // Updates the UI density (for touch and compact mode) based on the uidensity pref.
- var gUIDensity = {
-   MODE_NORMAL: 0,
-diff -up firefox-60.0/browser/themes/linux/browser.css.1424422 firefox-60.0/browser/themes/linux/browser.css
---- firefox-60.0/browser/themes/linux/browser.css.1424422	2018-04-26 22:07:21.000000000 +0200
-+++ firefox-60.0/browser/themes/linux/browser.css	2018-04-30 11:45:40.388172492 +0200
-@@ -691,12 +691,34 @@ notification[value="translation"] menuli
-     padding-bottom: 2px;
-   }
- 
-+  /* When default theme is used render titlebar command buttons
-+   * according to system config.
-+   *
-+   * When -moz-lwtheme is enabled use similar approach as on Windows platform.
-+   */
-+  .titlebar-button:-moz-lwtheme {
-+    border: none;
-+    margin: 0 !important;
-+    padding: 8px 17px;
-+  }
-+  .titlebar-button:-moz-lwtheme > .toolbarbutton-icon {
-+    width: 12px;
-+    height: 12px;
-+  }
-+  .titlebar-button:hover:-moz-lwtheme {
-+    background-color: Highlight;
-+  }
-+
-   /* Render titlebar command buttons according to system config.
-    * Use full scale icons here as the Gtk+ does.
-    */
-   @media (-moz-gtk-csd-minimize-button) {
--    #titlebar-min {
--      -moz-appearance: -moz-window-button-minimize;
-+    #titlebar-min:not(:-moz-lwtheme) {
-+     -moz-appearance: -moz-window-button-minimize;
-+   }
-+    #titlebar-min:-moz-lwtheme {
-+      -moz-appearance: none !important;
-+      list-style-image: url(chrome://browser/skin/window-controls/minimize-themes.svg);
-     }
-   }
-   @media (-moz-gtk-csd-minimize-button: 0) {
-@@ -706,12 +728,20 @@ notification[value="translation"] menuli
-   }
- 
-   @media (-moz-gtk-csd-maximize-button) {
--    #titlebar-max {
-+    #titlebar-max:not(:-moz-lwtheme) {
-       -moz-appearance: -moz-window-button-maximize;
-     }
--    :root[sizemode="maximized"] #titlebar-max {
-+    #titlebar-max:-moz-lwtheme {
-+      -moz-appearance: none !important;
-+      list-style-image: url(chrome://browser/skin/window-controls/maximize-themes.svg);
-+    }
-+    :root[sizemode="maximized"] #titlebar-max:not(:-moz-lwtheme) {
-       -moz-appearance: -moz-window-button-restore;
-     }
-+    :root[sizemode="maximized"] #titlebar-max:-moz-lwtheme {
-+      -moz-appearance: none !important;
-+      list-style-image: url(chrome://browser/skin/window-controls/restore-themes.svg);
-+    }
-   }
-   @media (-moz-gtk-csd-maximize-button: 0) {
-     #titlebar-max {
-@@ -720,9 +750,13 @@ notification[value="translation"] menuli
-   }
- 
-   @media (-moz-gtk-csd-close-button) {
--    #titlebar-close {
-+    #titlebar-close:not(:-moz-lwtheme) {
-       -moz-appearance: -moz-window-button-close;
-     }
-+    #titlebar-close:-moz-lwtheme {
-+      -moz-appearance: none !important;
-+      list-style-image: url(chrome://browser/skin/window-controls/close-themes.svg);
-+    }
-   }
-   @media (-moz-gtk-csd-close-button: 0) {
-     #titlebar-close {
-diff -up firefox-60.0/browser/themes/linux/jar.mn.1424422 firefox-60.0/browser/themes/linux/jar.mn
---- firefox-60.0/browser/themes/linux/jar.mn.1424422	2018-04-26 22:07:20.000000000 +0200
-+++ firefox-60.0/browser/themes/linux/jar.mn	2018-04-30 11:45:40.388172492 +0200
-@@ -49,9 +49,12 @@ browser.jar:
- * skin/classic/browser/preferences/in-content/dialog.css      (preferences/in-content/dialog.css)
-   skin/classic/browser/preferences/applications.css   (preferences/applications.css)
-   skin/classic/browser/tabbrowser/tabDragIndicator.png      (tabbrowser/tabDragIndicator.png)
--
-   skin/classic/browser/sync-desktopIcon.svg  (../shared/sync-desktopIcon.svg)
-   skin/classic/browser/sync-mobileIcon.svg  (../shared/sync-mobileIcon.svg)
-+  skin/classic/browser/window-controls/close-themes.svg     (window-controls/close-themes.svg)
-+  skin/classic/browser/window-controls/maximize-themes.svg  (window-controls/maximize-themes.svg)
-+  skin/classic/browser/window-controls/minimize-themes.svg  (window-controls/minimize-themes.svg)
-+  skin/classic/browser/window-controls/restore-themes.svg   (window-controls/restore-themes.svg)
-   skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
- 
- [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
-diff -up firefox-60.0/browser/themes/linux/window-controls/close-themes.svg.1424422 firefox-60.0/browser/themes/linux/window-controls/close-themes.svg
---- firefox-60.0/browser/themes/linux/window-controls/close-themes.svg.1424422	2018-04-30 11:45:40.388172492 +0200
-+++ firefox-60.0/browser/themes/linux/window-controls/close-themes.svg	2018-04-30 11:45:40.388172492 +0200
-@@ -0,0 +1,7 @@
-+<!-- 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/. -->
-+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg">
-+  <path stroke="black" stroke-width="3.6" stroke-opacity=".75" d="M1,1 l 10,10 M1,11 l 10,-10"/>
-+  <path stroke="white" stroke-width="1.9" d="M1.75,1.75 l 8.5,8.5 M1.75,10.25 l 8.5,-8.5"/>
-+</svg>
-diff -up firefox-60.0/browser/themes/linux/window-controls/maximize-themes.svg.1424422 firefox-60.0/browser/themes/linux/window-controls/maximize-themes.svg
---- firefox-60.0/browser/themes/linux/window-controls/maximize-themes.svg.1424422	2018-04-30 11:45:40.388172492 +0200
-+++ firefox-60.0/browser/themes/linux/window-controls/maximize-themes.svg	2018-04-30 11:45:40.388172492 +0200
-@@ -0,0 +1,7 @@
-+<!-- 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/. -->
-+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" shape-rendering="crispEdges" fill="none">
-+  <rect stroke="black" stroke-width="3.6" stroke-opacity=".75" x="2" y="2" width="8" height="8"/>
-+  <rect stroke="white" stroke-width="1.9" x="2" y="2" width="8" height="8"/>
-+</svg>
-diff -up firefox-60.0/browser/themes/linux/window-controls/minimize-themes.svg.1424422 firefox-60.0/browser/themes/linux/window-controls/minimize-themes.svg
---- firefox-60.0/browser/themes/linux/window-controls/minimize-themes.svg.1424422	2018-04-30 11:45:40.388172492 +0200
-+++ firefox-60.0/browser/themes/linux/window-controls/minimize-themes.svg	2018-04-30 11:45:40.388172492 +0200
-@@ -0,0 +1,7 @@
-+<!-- 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/. -->
-+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" shape-rendering="crispEdges">
-+  <line stroke="black" stroke-width="3.6" stroke-opacity=".75" x1="0" y1="6" x2="12" y2="6"/>
-+  <line stroke="white" stroke-width="1.9" x1="1" y1="6" x2="11" y2="6"/>
-+</svg>
-diff -up firefox-60.0/browser/themes/linux/window-controls/restore-themes.svg.1424422 firefox-60.0/browser/themes/linux/window-controls/restore-themes.svg
---- firefox-60.0/browser/themes/linux/window-controls/restore-themes.svg.1424422	2018-04-30 11:45:40.388172492 +0200
-+++ firefox-60.0/browser/themes/linux/window-controls/restore-themes.svg	2018-04-30 11:45:40.388172492 +0200
-@@ -0,0 +1,8 @@
-+<!-- 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/. -->
-+<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" shape-rendering="crispEdges" fill="none" stroke="white">
-+  <path stroke="black" stroke-width="3.6" stroke-opacity=".75" d="M2,4 l 6,0 l 0,6 l -6,0z M2.5,1.5 l 8,0 l 0,8"/>
-+  <rect stroke-width="1.9" x="2" y="4" width="6" height="6"/>
-+  <polyline stroke-width=".9" points="3.5,1.5 10.5,1.5 10.5,8.5"/>
-+</svg>
diff --git a/mozilla-1436242.patch b/mozilla-1436242.patch
deleted file mode 100644
index 570b7c5..0000000
--- a/mozilla-1436242.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-
-# HG changeset patch
-# User Jed Davis <jld@mozilla.com>
-# Date 1526943705 21600
-# Node ID 6bb3adfa15c6877f7874429462dad88f8c978c4f
-# Parent  4c71c8454879c841871ecf3afb7dbdc96bad97fc
-Bug 1436242 - Avoid undefined behavior in IPC fd-passing code.  r=froydnj
-
-MozReview-Commit-ID: 3szIPUssgF5
-
-diff --git a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
---- a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
-+++ b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
-@@ -418,20 +418,37 @@ bool Channel::ChannelImpl::ProcessIncomi
-     const int* fds;
-     unsigned num_fds;
-     unsigned fds_i = 0;  // the index of the first unused descriptor
- 
-     if (input_overflow_fds_.empty()) {
-       fds = wire_fds;
-       num_fds = num_wire_fds;
-     } else {
--      const size_t prev_size = input_overflow_fds_.size();
--      input_overflow_fds_.resize(prev_size + num_wire_fds);
--      memcpy(&input_overflow_fds_[prev_size], wire_fds,
--             num_wire_fds * sizeof(int));
-+      // This code may look like a no-op in the case where
-+      // num_wire_fds == 0, but in fact:
-+      //
-+      // 1. wire_fds will be nullptr, so passing it to memcpy is
-+      // undefined behavior according to the C standard, even though
-+      // the memcpy length is 0.
-+      //
-+      // 2. prev_size will be an out-of-bounds index for
-+      // input_overflow_fds_; this is undefined behavior according to
-+      // the C++ standard, even though the element only has its
-+      // pointer taken and isn't accessed (and the corresponding
-+      // operation on a C array would be defined).
-+      //
-+      // UBSan makes #1 a fatal error, and assertions in libstdc++ do
-+      // the same for #2 if enabled.
-+      if (num_wire_fds > 0) {
-+        const size_t prev_size = input_overflow_fds_.size();
-+        input_overflow_fds_.resize(prev_size + num_wire_fds);
-+        memcpy(&input_overflow_fds_[prev_size], wire_fds,
-+               num_wire_fds * sizeof(int));
-+      }
-       fds = &input_overflow_fds_[0];
-       num_fds = input_overflow_fds_.size();
-     }
- 
-     // The data for the message we're currently reading consists of any data
-     // stored in incoming_message_ followed by data in input_buf_ (followed by
-     // other messages).
- 
-
diff --git a/mozilla-1512162.patch b/mozilla-1512162.patch
index a324372..99a0b14 100644
--- a/mozilla-1512162.patch
+++ b/mozilla-1512162.patch
@@ -1,8 +1,26 @@
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- a/js/xpconnect/src/XPCWrappedNative.cpp
-+++ b/js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1145,6 +1145,10 @@
-   return CallMethodHelper(ccx).Call();
+diff -up firefox-68.0.1/js/xpconnect/src/XPCWrappedNative.cpp.1512162 firefox-68.0.1/js/xpconnect/src/XPCWrappedNative.cpp
+--- firefox-68.0.1/js/xpconnect/src/XPCWrappedNative.cpp.1512162	2019-07-17 22:51:30.000000000 +0200
++++ firefox-68.0.1/js/xpconnect/src/XPCWrappedNative.cpp	2019-07-25 08:08:18.512528313 +0200
+@@ -1092,7 +1092,7 @@ class MOZ_STACK_CLASS CallMethodHelper f
+   MOZ_ALWAYS_INLINE bool GetOutParamSource(uint8_t paramIndex,
+                                            MutableHandleValue srcp) const;
+ 
+-  MOZ_ALWAYS_INLINE bool GatherAndConvertResults();
++  bool GatherAndConvertResults();
+ 
+   MOZ_ALWAYS_INLINE bool QueryInterfaceFastPath();
+ 
+@@ -1139,7 +1139,7 @@ class MOZ_STACK_CLASS CallMethodHelper f
+ 
+   ~CallMethodHelper();
+ 
+-  MOZ_ALWAYS_INLINE bool Call();
++  bool Call();
+ 
+   // Trace implementation so we can put our CallMethodHelper in a Rooted<T>.
+   void trace(JSTracer* aTrc);
+@@ -1157,6 +1157,10 @@ bool XPCWrappedNative::CallMethod(XPCCal
+   return helper.get().Call();
  }
  
 +#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
@@ -12,7 +30,7 @@ diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrapped
  bool CallMethodHelper::Call() {
    mCallContext.SetRetVal(JS::UndefinedValue());
  
-@@ -1318,6 +1322,10 @@
+@@ -1315,6 +1319,10 @@ bool CallMethodHelper::GetOutParamSource
    return true;
  }
  
diff --git a/mozilla-1566876-webrtc-ind.patch b/mozilla-1566876-webrtc-ind.patch
new file mode 100644
index 0000000..598f58f
--- /dev/null
+++ b/mozilla-1566876-webrtc-ind.patch
@@ -0,0 +1,36 @@
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
++++ b/widget/gtk/nsWindow.cpp
+@@ -3504,12 +3504,6 @@
+   mBounds = aRect;
+   ConstrainSize(&mBounds.width, &mBounds.height);
+ 
+-  // eWindowType_child is not supported on Wayland. Just switch to toplevel
+-  // as a workaround.
+-  if (!mIsX11Display && mWindowType == eWindowType_child) {
+-    mWindowType = eWindowType_toplevel;
+-  }
+-
+   // figure out our parent window
+   GtkWidget* parentMozContainer = nullptr;
+   GtkContainer* parentGtkContainer = nullptr;
+@@ -3543,6 +3537,18 @@
+     topLevelParent = GTK_WINDOW(gtk_widget_get_toplevel(parentMozContainer));
+   }
+ 
++  if (!mIsX11Display) {
++    if (mWindowType == eWindowType_child) {
++      // eWindowType_child is not supported on Wayland. Just switch to toplevel
++      // as a workaround.
++      mWindowType = eWindowType_toplevel;
++    } else if (mWindowType == eWindowType_popup && !topLevelParent) {
++      // Workaround for Wayland where the popup windows always need to have
++      // parent window. For example webrtc ui is a popup window without parent.
++      mWindowType = eWindowType_toplevel;
++    }
++  }
++
+   // ok, create our windows
+   switch (mWindowType) {
+     case eWindowType_dialog:
+
diff --git a/mozilla-1568569.patch b/mozilla-1568569.patch
new file mode 100644
index 0000000..ab6225a
--- /dev/null
+++ b/mozilla-1568569.patch
@@ -0,0 +1,73 @@
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
++++ b/widget/gtk/nsWindow.cpp
+@@ -3238,16 +3238,18 @@ void nsWindow::OnWindowStateEvent(GtkWid
+   // We don't care about anything but changes in the maximized/icon/fullscreen
+   // states
+   if ((aEvent->changed_mask &
+        (GDK_WINDOW_STATE_ICONIFIED | GDK_WINDOW_STATE_MAXIMIZED |
+         GDK_WINDOW_STATE_FULLSCREEN)) == 0) {
+     return;
+   }
+ 
++  nsSizeMode lastSizeState = mSizeState;
++
+   if (aEvent->new_window_state & GDK_WINDOW_STATE_ICONIFIED) {
+     LOG(("\tIconified\n"));
+     mSizeState = nsSizeMode_Minimized;
+ #ifdef ACCESSIBILITY
+     DispatchMinimizeEventAccessible();
+ #endif  // ACCESSIBILITY
+   } else if (aEvent->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) {
+     LOG(("\tFullscreen\n"));
+@@ -3261,16 +3263,28 @@ void nsWindow::OnWindowStateEvent(GtkWid
+   } else {
+     LOG(("\tNormal\n"));
+     mSizeState = nsSizeMode_Normal;
+ #ifdef ACCESSIBILITY
+     DispatchRestoreEventAccessible();
+ #endif  // ACCESSIBILITY
+   }
+ 
++  // Fullscreen video playback may generate bogus alpha values which blends
++  // with desktop background in fullscreen video playback (Bug 1568569).
++  // As a workaround enable to draw mShell background in fullscreen mode
++  // if we draw to mContainer.
++  if (gtk_widget_get_has_window(GTK_WIDGET(mContainer))) {
++    if (mSizeState == nsSizeMode_Fullscreen) {
++      gtk_widget_set_app_paintable(mShell, FALSE);
++    } else if (lastSizeState == nsSizeMode_Fullscreen) {
++      gtk_widget_set_app_paintable(mShell, TRUE);
++    }
++  }
++
+   if (mWidgetListener) {
+     mWidgetListener->SizeModeChanged(mSizeState);
+     if (aEvent->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
+       mWidgetListener->FullscreenChanged(aEvent->new_window_state &
+                                          GDK_WINDOW_STATE_FULLSCREEN);
+     }
+   }
+ 
+@@ -3787,16 +3801,21 @@ nsresult nsWindow::Create(nsIWidget* aPa
+       eventWidget = (drawToContainer) ? container : mShell;
+ 
+       // Prevent GtkWindow from painting a background to avoid flickering.
+       gtk_widget_set_app_paintable(eventWidget, TRUE);
+ 
+       gtk_widget_add_events(eventWidget, kEvents);
+       if (drawToContainer) {
+         gtk_widget_add_events(mShell, GDK_PROPERTY_CHANGE_MASK);
++        // Don't paint mShell background when we draw to mContainer.
++        // Otherwise we see mShell backround to shine through
++        // mContainer (Bug 1507608).
++        // But it may also lead to various bugs where mContainer has unintended
++        // transparent parts which blend with underlying desktop (Bug 1516224).
+         gtk_widget_set_app_paintable(mShell, TRUE);
+       }
+       if (mTransparencyBitmapForTitlebar) {
+         moz_container_force_default_visual(mContainer);
+       }
+ 
+       // If we draw to mContainer window then configure it now because
+       // gtk_container_add() realizes the child widget.
diff --git a/mozilla-256180.patch b/mozilla-256180.patch
deleted file mode 100644
index a6b3320..0000000
--- a/mozilla-256180.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- layout/generic/nsIFrame.h.old	2016-07-11 13:41:39.688276559 +0200
-+++ layout/generic/nsIFrame.h	2016-07-11 13:42:12.791406976 +0200
-@@ -13,7 +13,7 @@
- #error This header/class should only be used within GNU code. It should not be used by extensions.
- #endif
- 
--#define MAX_REFLOW_DEPTH 200
-+#define MAX_REFLOW_DEPTH 1000
- 
- /* nsIFrame is in the process of being deCOMtaminated, i.e., this file is
-    eventually going to be eliminated, and all callers will use nsFrame instead.
diff --git a/node-stdout-nonblocking-wrapper b/node-stdout-nonblocking-wrapper
new file mode 100755
index 0000000..b2814b8
--- /dev/null
+++ b/node-stdout-nonblocking-wrapper
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/node "$@" 2>&1 | cat -
diff --git a/rhbz-1354671.patch b/rhbz-1354671.patch
index f45f7e9..1f867eb 100644
--- a/rhbz-1354671.patch
+++ b/rhbz-1354671.patch
@@ -1,7 +1,7 @@
-diff -up firefox-53.0/layout/base/nsIPresShell.h.1354671 firefox-53.0/layout/base/nsIPresShell.h
---- firefox-53.0/layout/base/nsIPresShell.h.1354671	2017-04-27 13:07:43.808653320 +0200
-+++ firefox-53.0/layout/base/nsIPresShell.h	2017-04-27 13:09:40.404427641 +0200
-@@ -204,7 +204,7 @@
+diff -up firefox-65.0/layout/base/PresShell.h.1354671 firefox-65.0/layout/base/PresShell.h
+--- firefox-65.0/layout/base/PresShell.h.1354671	2019-01-29 11:50:08.516649643 +0100
++++ firefox-65.0/layout/base/PresShell.h	2019-01-29 11:51:48.930258629 +0100
+@@ -205,7 +205,7 @@ class nsIPresShell : public nsStubDocume
     * to the same aSize value.  AllocateFrame is infallible and will abort
     * on out-of-memory.
     */
diff --git a/sources b/sources
index e5e5f07..94b72d4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
-SHA512 (icecat-60.8.0-gnu1.tar.bz2) = 31900c921102ccaa736b8be20210d16b7bae9c797d2529e9f38e803d834c72bacfe6e586934e21c48ca7097cc0bbc56adccc6beefc5f42b1e7ee4a3d93e9f223
-SHA512 (icecat-60.8.0-langpacks.tar.gz) = 82f63a5c0e7b4af8ed616d94f99274c4a54fa092147bcce3eb4f77026b562a8109cc289fec18abdf0e350484a8645eb32f173fbbe3e20cb12f8fb79cea52554b
+SHA512 (cbindgen-vendor.tar.xz) = b0df3a8624efc488726211c99ac8a69c928d0bef24c2f7eafc6971be7ce2fafd54fba9330afd7e61ffe3a0d799bc5d994fa9f11f2da88cd93924c9347bfc4355
+SHA512 (icecat-68.0.2-gnu1.tar.bz2) = d19750166d1f68c6a4c6de6a73515954c17c325dff92352b77fa73f535cfcb9452502d62f74d5f9deee172b71aa81617d691600dd56a24cc4b35e4acc30a7946
+SHA512 (icecat-68.0.2-langpacks.tar.gz) = 4361c78b48ef0a9792d0fdba03c2ea7c4f880ba083d62e5ca83c9f65ec4cc3917b4020ebe16bb1a07faa780633c8e25aa7369f289ff54c0472158f993e703f1f
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 86ee812901a4aa7cd80fd7fe1accba429465cf27 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 16 Aug 2019 22:45:35 +0200
Subject: [PATCH 043/473] Conditional arch macro for --disable-eme option

---
 icecat.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index cd4bb55..84cbf70 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -422,7 +422,9 @@ echo "ac_add_options --without-system-libvpx" >> .mozconfig
 echo "ac_add_options --disable-libjpeg-turbo" >> .mozconfig
 echo "ac_add_options --with-system-jpeg" >> .mozconfig
 echo "ac_add_options --disable-crashreporter" >> .mozconfig
+%ifnarch %{power64} aarch64
 echo "ac_add_options --disable-eme" >> .mozconfig
+%endif
 
 # This option works on these architectures only
 %ifarch %{ix86} x86_64 %{arm}

From b52d6c52285496e8a98290bff848b338b1cd5f3e Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 16 Aug 2019 23:01:41 +0200
Subject: [PATCH 044/473] Disable s390x builds

---
 icecat.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 84cbf70..1ff75e3 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -75,6 +75,8 @@
 
 # Exclude ARM builds for rhbz #1658940
 ExcludeArch: %{arm}
+# Disabled due to https://pagure.io/fedora-infrastructure/issue/7581
+ExcludeArch: s390x
 
 # Set new source-code build version
 %global gnu_ver gnu1

From 017c32fd9f6786fdd0b48c678beb66935866a563 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 17 Aug 2019 12:26:06 +0200
Subject: [PATCH 045/473] Add --with-system-nspr option explicitely

---
 icecat.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 1ff75e3..d6b3804 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -398,7 +398,11 @@ echo "ac_add_options --disable-jemalloc" >> .mozconfig
 %if 0%{?system_nss}
 echo "ac_add_options --with-nspr-cflags='%(%{_bindir}/nspr-config --cflags)'" >> .mozconfig
 echo "ac_add_options --with-nspr-libs='%(%{_bindir}/nspr-config --libs)'" >> .mozconfig
+echo "ac_add_options --with-system-nspr" >> .mozconfig
 echo "ac_add_options --with-system-nss" >>.mozconfig
+%else
+echo "ac_add_options --without-system-nspr" >> .mozconfig
+echo "ac_add_options --without-system-nss" >>.mozconfig
 %endif
 %if 0%{?system_libicu}
 echo "ac_add_options --with-system-icu" >> .mozconfig

From 6e889e0b5fc7e03230604d4fcfb5cea8f076a9f8 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 17 Aug 2019 12:51:12 +0200
Subject: [PATCH 046/473] Remove NSPR flags specifications

---
 icecat.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index d6b3804..c71a0de 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -396,13 +396,11 @@ echo "ac_add_options --disable-jemalloc" >> .mozconfig
 %endif
 
 %if 0%{?system_nss}
-echo "ac_add_options --with-nspr-cflags='%(%{_bindir}/nspr-config --cflags)'" >> .mozconfig
-echo "ac_add_options --with-nspr-libs='%(%{_bindir}/nspr-config --libs)'" >> .mozconfig
 echo "ac_add_options --with-system-nspr" >> .mozconfig
-echo "ac_add_options --with-system-nss" >>.mozconfig
+echo "ac_add_options --with-system-nss" >> .mozconfig
 %else
 echo "ac_add_options --without-system-nspr" >> .mozconfig
-echo "ac_add_options --without-system-nss" >>.mozconfig
+echo "ac_add_options --without-system-nss" >> .mozconfig
 %endif
 %if 0%{?system_libicu}
 echo "ac_add_options --with-system-icu" >> .mozconfig

From 8ef0a9f8e136b0a909978034deb06b507dfe35e2 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 17 Aug 2019 14:24:44 +0200
Subject: [PATCH 047/473] Exclude build-jit-atomic-always-lucky patch

---
 icecat.spec | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index c71a0de..57f3976 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -135,6 +135,7 @@ Patch1:   %{name}-fix_addon_installation.patch
 Patch2:   %{name}-libevent_linkflag.patch
 Patch3:   mozilla-build-arm.patch
 Patch4:   build-rust-ppc64le.patch
+Patch5:  rhbz-1219542-s390-build.patch
 
 # Unrecognized file?
 Patch7:   %{name}-fix_jar.patch
@@ -323,10 +324,10 @@ to run GNU IceCat natively on Wayland.
 %autosetup -N -n %{name}-%{version}
 
 #Fix permissions
-#find . -type f -name "*.h" -exec chmod 0644 '{}' \;
-#find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
-#find . -type f -name "*.cc" -exec chmod 0644 '{}' \;
-#find . -type f -name "*.c" -exec chmod 0644 '{}' \;
+find . -type f -name "*.h" -exec chmod 0644 '{}' \;
+find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
+find . -type f -name "*.cc" -exec chmod 0644 '{}' \;
+find . -type f -name "*.c" -exec chmod 0644 '{}' \;
 
 ##Copy license files
 tar -xf %{SOURCE5}
@@ -334,10 +335,13 @@ tar -xf %{SOURCE5}
 %patch1 -p1 -b .fix_addon_installation
 %patch2 -p0 -b .libevent_linkflag
 %patch3 -p1 -b .arm
+%ifarch s390
+%patch5 -p1 -b .rhbz-1219542-s390
+%endif
 %patch7 -p0 -b .fix_jar
 %patch8 -p0 -b .fix_installer
 
-%patch37 -p1 -b .jit-atomic-lucky
+#%%patch37 -p1 -b .jit-atomic-lucky
 
 # Fedora patches
 %patch219 -p1 -b .rhbz-1173156

From 77430088e3ffee7aef18f78e034f8678a122125c Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 17 Aug 2019 15:06:10 +0200
Subject: [PATCH 048/473] Push rhbz-1219542-s390-build patch

---
 icecat.spec                   | 34 +++++++++++++++++-----------------
 rhbz-1219542-s390-build.patch | 23 +++++++++++++++++++++++
 2 files changed, 40 insertions(+), 17 deletions(-)
 create mode 100644 rhbz-1219542-s390-build.patch

diff --git a/icecat.spec b/icecat.spec
index 57f3976..dce78c7 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,34 +1,34 @@
 ##Active/Deactive language files handling
 %global build_langpacks 1
 
-%define default_bookmarks_file  %{_datadir}/bookmarks/default-bookmarks.html
+%global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
 ##Define installation directories
-%global icecatappdir    %{_libdir}/%{name}
-%global icecat_ver      %{name}-%{version}
-%global icecat_devel    %{name}-devel-%{version}
+%global icecatappdir %{_libdir}/%{name}
+%global icecat_ver   %{name}-%{version}
+%global icecat_devel %{name}-devel-%{version}
 
 ##Define language files directory
-%global langpackdir     %{icecatappdir}/langpacks
+%global langpackdir  %{icecatappdir}/langpacks
 
-%global toolkit_gtk3      1
+%global toolkit_gtk3  1
 
 # Builds for debugging
-%global debug_build       0
+%global debug_build   0
 
 # Big endian platforms
 %ifarch ppc64 s390x
 # Javascript Intl API is not supported on big endian platforms right now:
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1322212
-%global big_endian        1
+%global big_endian    1
 %endif
 
 # Use system sqlite?
 # sqlite > 3.28.0 unavailable on Fedora < 31
 %if 0%{?fedora} < 31
-%global system_sqlite     0
+%global system_sqlite 0
 %else
-%global system_sqlite     1
+%global system_sqlite 1
 %endif
 
 %if 0%{?system_sqlite}
@@ -38,10 +38,10 @@
 %endif
 
 # Use system libicu?
-%global system_libicu     1
+%global system_libicu 1
 
 # Use system nspr/nss?
-%global system_nss        1
+%global system_nss    1
 
 %if 0%{?system_nss}
 %global nspr_version 4.19
@@ -65,10 +65,10 @@
 %endif
 
 # Use mozilla hardening option?
-%global hardened_build    1
+%global hardened_build 1
 
 # cbingen
-%global use_bundled_cbindgen  1
+%global use_bundled_cbindgen 1
 
 # Use clang?
 %global build_with_clang  0
@@ -81,14 +81,14 @@ ExcludeArch: s390x
 # Set new source-code build version
 %global gnu_ver gnu1
 
-Name:    icecat
+Name: icecat
 Version: 68.0.2
 Release: 1.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
 License: (MPLv1.1 or GPLv2+ or LGPLv2+) and GPLv3+ and MIT and BSD and ISC and ASL 2.0 and MPLv2.0
-URL:     http://www.gnu.org/software/gnuzilla/
+URL:   http://www.gnu.org/software/gnuzilla/
 
 ## Source archive created by scripts based on Gnuzilla files.
 ## Modified files are hosted in a dedicated fork repository:
@@ -135,7 +135,7 @@ Patch1:   %{name}-fix_addon_installation.patch
 Patch2:   %{name}-libevent_linkflag.patch
 Patch3:   mozilla-build-arm.patch
 Patch4:   build-rust-ppc64le.patch
-Patch5:  rhbz-1219542-s390-build.patch
+Patch5:   rhbz-1219542-s390-build.patch
 
 # Unrecognized file?
 Patch7:   %{name}-fix_jar.patch
diff --git a/rhbz-1219542-s390-build.patch b/rhbz-1219542-s390-build.patch
new file mode 100644
index 0000000..f94e43a
--- /dev/null
+++ b/rhbz-1219542-s390-build.patch
@@ -0,0 +1,23 @@
+diff -up firefox-55.0/js/src/old-configure.in.rhbz-1219542-s390 firefox-55.0/js/src/old-configure.in
+--- firefox-55.0/js/src/old-configure.in.rhbz-1219542-s390	2017-07-31 18:20:48.000000000 +0200
++++ firefox-55.0/js/src/old-configure.in	2017-08-02 14:31:32.190243669 +0200
+@@ -541,7 +541,7 @@ case "$host" in
+ 
+ *-linux*|*-kfreebsd*-gnu|*-gnu*)
+     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
+-    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
++    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O1}"
+     ;;
+ 
+ *)
+@@ -617,8 +617,8 @@ case "$target" in
+ 
+ *-*linux*)
+     if test "$GNU_CC" -o "$GNU_CXX"; then
+-        MOZ_PGO_OPTIMIZE_FLAGS="-O3"
+-        MOZ_OPTIMIZE_FLAGS="-O3"
++        MOZ_PGO_OPTIMIZE_FLAGS="-O1"
++        MOZ_OPTIMIZE_FLAGS="-O1"
+         if test -z "$CLANG_CC"; then
+            MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS"
+         fi

From 9c9a59feb457e08ba84a99d0d599c52897b6b3b3 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 17 Aug 2019 18:52:27 +0200
Subject: [PATCH 049/473] Some superfluous changes

---
 icecat.spec | 180 ++++++++++++++++++++++++++--------------------------
 1 file changed, 90 insertions(+), 90 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index dce78c7..6a2c207 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -131,29 +131,29 @@ Source18: node-stdout-nonblocking-wrapper
 
 # Build patches
 # Fixes installation of those addons which don't have ID on IceCat ("Cannot find id for addon" error).
-Patch1:   %{name}-fix_addon_installation.patch
-Patch2:   %{name}-libevent_linkflag.patch
-Patch3:   mozilla-build-arm.patch
-Patch4:   build-rust-ppc64le.patch
-Patch5:   rhbz-1219542-s390-build.patch
+Patch1: %{name}-fix_addon_installation.patch
+Patch2: %{name}-libevent_linkflag.patch
+Patch3: mozilla-build-arm.patch
+Patch4: build-rust-ppc64le.patch
+Patch5: rhbz-1219542-s390-build.patch
 
 # Unrecognized file?
-Patch7:   %{name}-fix_jar.patch
+Patch7: %{name}-fix_jar.patch
 
 # Fix files list for installer
-Patch8:   %{name}-fix_installer.patch
+Patch8: %{name}-fix_installer.patch
 
 # xlocale.h not provided by glibc-headers
 # Set path of libcxx-devel
-Patch9:   %{name}-locale.patch
+Patch9: %{name}-locale.patch
 
-Patch26:  build-icu-big-endian.patch
+Patch26: build-icu-big-endian.patch
 
 # Also fixes s390x: https://bugzilla.mozilla.org/show_bug.cgi?id=1376268
-Patch29:  build-big-endian.patch
+Patch29: build-big-endian.patch
 # Always feel lucky for unsupported platforms:
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
-Patch37:  build-jit-atomic-always-lucky.patch
+Patch37: build-jit-atomic-always-lucky.patch
 
 # Fedora specific patches
 Patch219: rhbz-1173156.patch
@@ -175,107 +175,107 @@ Patch425: mozilla-1568569.patch
 Patch565: firefox-pipewire.patch
 #
 
-BuildRequires:  alsa-lib-devel
-BuildRequires:  autoconf213
-BuildRequires:  bzip2-devel
-BuildRequires:  cairo-devel
-BuildRequires:  cargo
+BuildRequires: alsa-lib-devel
+BuildRequires: autoconf213
+BuildRequires: bzip2-devel
+BuildRequires: cairo-devel
+BuildRequires: cargo
 %if !0%{?use_bundled_cbindgen}
-BuildRequires:  cbindgen	
+BuildRequires: cbindgen	
 %endif
-BuildRequires:  ccache
-BuildRequires:  dbus-devel
-BuildRequires:  dbus-glib-devel
-BuildRequires:  dconf
-BuildRequires:  desktop-file-utils
-BuildRequires:  dos2unix
-BuildRequires:  gcc, gcc-c++
-BuildRequires:  fedora-bookmarks
-BuildRequires:  freetype-devel
-BuildRequires:  gdk-pixbuf2
-BuildRequires:  glib2-devel
-BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires: ccache
+BuildRequires: dbus-devel
+BuildRequires: dbus-glib-devel
+BuildRequires: dconf
+BuildRequires: desktop-file-utils
+BuildRequires: dos2unix
+BuildRequires: gcc, gcc-c++
+BuildRequires: fedora-bookmarks
+BuildRequires: freetype-devel
+BuildRequires: gdk-pixbuf2
+BuildRequires: glib2-devel
+BuildRequires: pkgconfig(gtk+-2.0)
 %if 0%{?toolkit_gtk3}
-BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(gtk+-3.0)
 %endif
-BuildRequires:  gstreamer1-devel
-BuildRequires:  gstreamer1-plugins-base-devel
-BuildRequires:  hunspell-devel
-BuildRequires:  ImageMagick, autotrace
-BuildRequires:  java-1.8.0-openjdk-headless
-BuildRequires:  intltool
-BuildRequires:  libappstream-glib
-BuildRequires:  libevent-devel
-BuildRequires:  libicu-devel
-BuildRequires:  libIDL-devel
-BuildRequires:  libjpeg-turbo-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libX11-devel
-BuildRequires:  libXt-devel
-BuildRequires:  libXrender-devel
-BuildRequires:  libyuv-devel
-BuildRequires:  libXinerama-devel
-BuildRequires:  libffi-devel
-BuildRequires:  libnotify-devel
-BuildRequires:  libpng-devel
+BuildRequires: gstreamer1-devel
+BuildRequires: gstreamer1-plugins-base-devel
+BuildRequires: hunspell-devel
+BuildRequires: ImageMagick, autotrace
+BuildRequires: java-1.8.0-openjdk-headless
+BuildRequires: intltool
+BuildRequires: libappstream-glib
+BuildRequires: libevent-devel
+BuildRequires: libicu-devel
+BuildRequires: libIDL-devel
+BuildRequires: libjpeg-turbo-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libX11-devel
+BuildRequires: libXt-devel
+BuildRequires: libXrender-devel
+BuildRequires: libyuv-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libffi-devel
+BuildRequires: libnotify-devel
+BuildRequires: libpng-devel
 %if 0%{?with_vpx}
-BuildRequires:  libvpx-devel
+BuildRequires: libvpx-devel
 %endif
-BuildRequires:  libzip-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:  nodejs
-BuildRequires:  nasm >= 1.13
-BuildRequires:  strace
+BuildRequires: libzip-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: nodejs
+BuildRequires: nasm >= 1.13
+BuildRequires: strace
 %if 0%{?system_nss}
-BuildRequires:  pkgconfig(nspr) >= %{nspr_version}
-BuildRequires:  pkgconfig(nss) >= %{nss_version}
-BuildRequires:  nss-static >= %{nss_version}
+BuildRequires: pkgconfig(nspr) >= %{nspr_version}
+BuildRequires: pkgconfig(nss) >= %{nss_version}
+BuildRequires: nss-static >= %{nss_version}
 %endif
 
-BuildRequires:  openjpeg-devel
-BuildRequires:  pango-devel
-BuildRequires:  pipewire-devel
-BuildRequires:  python2-devel
-BuildRequires:  pkgconfig(gconf-2.0)
-BuildRequires:  pkgconfig(xrender)
-BuildRequires:  pkgconfig(libstartup-notification-1.0)
-BuildRequires:  pkgconfig(dri)
-BuildRequires:  pkgconfig(libcurl)
+BuildRequires: openjpeg-devel
+BuildRequires: pango-devel
+BuildRequires: pipewire-devel
+BuildRequires: python2-devel
+BuildRequires: pkgconfig(gconf-2.0)
+BuildRequires: pkgconfig(xrender)
+BuildRequires: pkgconfig(libstartup-notification-1.0)
+BuildRequires: pkgconfig(dri)
+BuildRequires: pkgconfig(libcurl)
 %if %{with pulseaudio}
-BuildRequires:  pulseaudio-libs-devel
+BuildRequires: pulseaudio-libs-devel
 %endif
 %if %{with jack}
-BuildRequires:  jack-audio-connection-kit-devel
+BuildRequires: jack-audio-connection-kit-devel
 %endif
-BuildRequires:  yasm
-BuildRequires:  llvm
-BuildRequires:  llvm-devel
-BuildRequires:  clang
-BuildRequires:  clang-libs
-BuildRequires:  clang-devel
+BuildRequires: yasm
+BuildRequires: llvm
+BuildRequires: llvm-devel
+BuildRequires: clang
+BuildRequires: clang-libs
+BuildRequires: clang-devel
 %if 0%{?build_with_clang}
-BuildRequires:  lld
+BuildRequires: lld
 %endif
-BuildRequires:  rust
+BuildRequires: rust
 
 %if 0%{?system_sqlite}
-BuildRequires:  pkgconfig(sqlite3) >= %{sqlite_version}
-Requires:       sqlite >= %{sqlite_build_version}
+BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version}
+Requires: sqlite >= %{sqlite_build_version}
 %endif
 
-Requires:       dconf
-Requires:       mozilla-filesystem
-Requires:       p11-kit-trust
+Requires: dconf
+Requires: mozilla-filesystem
+Requires: p11-kit-trust
 
 %if 0%{?system_nss}
-Requires:       nspr >= %{nspr_build_version}
-Requires:       nss >= %{nss_build_version}
+Requires: nspr >= %{nspr_build_version}
+Requires: nss >= %{nss_build_version}
 %endif
-Requires:       fedora-bookmarks
-Suggests:       mozilla-ublock-origin
+Requires: fedora-bookmarks
+Suggests: mozilla-ublock-origin
 
-Provides:       webclient
-Provides:       mozilla-https-everywhere = 20190131
+Provides: webclient
+Provides: mozilla-https-everywhere = 20190131
 
 %description
 GNUZilla Icecat is a fully-free fork of Mozilla Firefox ESR.
@@ -360,7 +360,7 @@ tar -xf %{SOURCE5}
 # Patch for big endian platforms only
 %if 0%{?big_endian}
 %patch26 -p1 -b .icu
-%patch9  -p0 -b .locale
+%patch9 -p0 -b .locale
 %patch29 -p1 -b .big-endian
 %endif
 

From ab140500192ae8a63071145107dc9fbbfb5d19f3 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 17 Aug 2019 19:11:36 +0200
Subject: [PATCH 050/473] Rebuilt source archive

---
 icecat.spec | 8 ++++----
 sources     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 6a2c207..704e612 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -324,10 +324,10 @@ to run GNU IceCat natively on Wayland.
 %autosetup -N -n %{name}-%{version}
 
 #Fix permissions
-find . -type f -name "*.h" -exec chmod 0644 '{}' \;
-find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
-find . -type f -name "*.cc" -exec chmod 0644 '{}' \;
-find . -type f -name "*.c" -exec chmod 0644 '{}' \;
+#find . -type f -name "*.h" -exec chmod 0644 '{}' \;
+#find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
+#find . -type f -name "*.cc" -exec chmod 0644 '{}' \;
+#find . -type f -name "*.c" -exec chmod 0644 '{}' \;
 
 ##Copy license files
 tar -xf %{SOURCE5}
diff --git a/sources b/sources
index 94b72d4..f2b66d0 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = b0df3a8624efc488726211c99ac8a69c928d0bef24c2f7eafc6971be7ce2fafd54fba9330afd7e61ffe3a0d799bc5d994fa9f11f2da88cd93924c9347bfc4355
-SHA512 (icecat-68.0.2-gnu1.tar.bz2) = d19750166d1f68c6a4c6de6a73515954c17c325dff92352b77fa73f535cfcb9452502d62f74d5f9deee172b71aa81617d691600dd56a24cc4b35e4acc30a7946
+SHA512 (icecat-68.0.2-gnu1.tar.bz2) = 4709eff6cf6a94a50c326c74955d8732960f459831b14d245853e336d966c341f724b16e1c52ab2c60daa8cb0b15460c67c36fd62847fb936665d9cc799fc56c
 SHA512 (icecat-68.0.2-langpacks.tar.gz) = 4361c78b48ef0a9792d0fdba03c2ea7c4f880ba083d62e5ca83c9f65ec4cc3917b4020ebe16bb1a07faa780633c8e25aa7369f289ff54c0472158f993e703f1f
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 692ae9d0fee6585895c4324ca7b39c7d0a8c25b9 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 17 Aug 2019 21:58:54 +0200
Subject: [PATCH 051/473] Change fix-installer patch

---
 icecat-fix_installer.patch | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/icecat-fix_installer.patch b/icecat-fix_installer.patch
index a56a880..1443996 100644
--- a/icecat-fix_installer.patch
+++ b/icecat-fix_installer.patch
@@ -1,6 +1,6 @@
 --- browser/installer/package-manifest.orig.in	2017-03-24 21:09:39.027022000 +0100
 +++ browser/installer/package-manifest.in	2017-03-24 23:07:21.881504771 +0100
-@@ -74,9 +74,9 @@
+@@ -71,9 +71,9 @@
  #endif
  #ifndef MOZ_SYSTEM_NSPR
  #ifndef MOZ_FOLD_LIBS
@@ -13,23 +13,27 @@
  #endif
  #endif
  #ifdef XP_MACOSX
-@@ -610,11 +610,11 @@
+@@ -239,6 +239,7 @@
+ #endif # MOZ_ANGLE_RENDERER
+ 
+ ; [Browser Chrome Files]
++@BINPATH@/browser/extensions
+ @BINPATH@/browser/extensions/viewtube@extension/*
+ @BINPATH@/browser/extensions/tprb.addon@searxes.danwin1210.me/*
+ @BINPATH@/browser/extensions/tortm-browser-button@jeremybenthum/*
+@@ -263,9 +264,9 @@
  @RESPATH@/chrome/recording.manifest
  @RESPATH@/chrome/recording/*
  #ifdef MOZ_GTK
 -@RESPATH@/browser/chrome/icons/default/default16.png
 -@RESPATH@/browser/chrome/icons/default/default32.png
 -@RESPATH@/browser/chrome/icons/default/default48.png
--@RESPATH@/browser/chrome/icons/default/default64.png
--@RESPATH@/browser/chrome/icons/default/default128.png
 +#@RESPATH@/browser/chrome/icons/default/default16.png
 +#@RESPATH@/browser/chrome/icons/default/default32.png
 +#@RESPATH@/browser/chrome/icons/default/default48.png
-+@RESPATH@/browser/chrome/icons/default/default64.png
-+@RESPATH@/browser/chrome/icons/default/default128.png
+ @RESPATH@/browser/chrome/icons/default/default64.png
+ @RESPATH@/browser/chrome/icons/default/default128.png
  #endif
- @RESPATH@/browser/features/*
- 
 --- browser/installer/allowed-dupes.orig.mn	2017-03-19 19:59:09.000000000 +0100
 +++ browser/installer/allowed-dupes.mn	2017-03-24 23:15:37.026964374 +0100
 @@ -752,3 +752,19 @@

From 8ac4fe3cd60b938bf20d5f21eac75df6acbed60f Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 17 Aug 2019 22:00:10 +0200
Subject: [PATCH 052/473] Remove permission commands

---
 icecat.spec | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 704e612..e3a650d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -323,13 +323,7 @@ to run GNU IceCat natively on Wayland.
 %prep
 %autosetup -N -n %{name}-%{version}
 
-#Fix permissions
-#find . -type f -name "*.h" -exec chmod 0644 '{}' \;
-#find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
-#find . -type f -name "*.cc" -exec chmod 0644 '{}' \;
-#find . -type f -name "*.c" -exec chmod 0644 '{}' \;
-
-##Copy license files
+# Copy license files
 tar -xf %{SOURCE5}
 
 %patch1 -p1 -b .fix_addon_installation

From bf11b85687f647a98d5e4bbdbf66eba941dc0060 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 17 Aug 2019 23:55:41 +0200
Subject: [PATCH 053/473] Rebuilt source archive

---
 icecat-fix_installer.patch | 20 ++++++++------------
 sources                    |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/icecat-fix_installer.patch b/icecat-fix_installer.patch
index 1443996..a56a880 100644
--- a/icecat-fix_installer.patch
+++ b/icecat-fix_installer.patch
@@ -1,6 +1,6 @@
 --- browser/installer/package-manifest.orig.in	2017-03-24 21:09:39.027022000 +0100
 +++ browser/installer/package-manifest.in	2017-03-24 23:07:21.881504771 +0100
-@@ -71,9 +71,9 @@
+@@ -74,9 +74,9 @@
  #endif
  #ifndef MOZ_SYSTEM_NSPR
  #ifndef MOZ_FOLD_LIBS
@@ -13,27 +13,23 @@
  #endif
  #endif
  #ifdef XP_MACOSX
-@@ -239,6 +239,7 @@
- #endif # MOZ_ANGLE_RENDERER
- 
- ; [Browser Chrome Files]
-+@BINPATH@/browser/extensions
- @BINPATH@/browser/extensions/viewtube@extension/*
- @BINPATH@/browser/extensions/tprb.addon@searxes.danwin1210.me/*
- @BINPATH@/browser/extensions/tortm-browser-button@jeremybenthum/*
-@@ -263,9 +264,9 @@
+@@ -610,11 +610,11 @@
  @RESPATH@/chrome/recording.manifest
  @RESPATH@/chrome/recording/*
  #ifdef MOZ_GTK
 -@RESPATH@/browser/chrome/icons/default/default16.png
 -@RESPATH@/browser/chrome/icons/default/default32.png
 -@RESPATH@/browser/chrome/icons/default/default48.png
+-@RESPATH@/browser/chrome/icons/default/default64.png
+-@RESPATH@/browser/chrome/icons/default/default128.png
 +#@RESPATH@/browser/chrome/icons/default/default16.png
 +#@RESPATH@/browser/chrome/icons/default/default32.png
 +#@RESPATH@/browser/chrome/icons/default/default48.png
- @RESPATH@/browser/chrome/icons/default/default64.png
- @RESPATH@/browser/chrome/icons/default/default128.png
++@RESPATH@/browser/chrome/icons/default/default64.png
++@RESPATH@/browser/chrome/icons/default/default128.png
  #endif
+ @RESPATH@/browser/features/*
+ 
 --- browser/installer/allowed-dupes.orig.mn	2017-03-19 19:59:09.000000000 +0100
 +++ browser/installer/allowed-dupes.mn	2017-03-24 23:15:37.026964374 +0100
 @@ -752,3 +752,19 @@
diff --git a/sources b/sources
index f2b66d0..9444413 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = b0df3a8624efc488726211c99ac8a69c928d0bef24c2f7eafc6971be7ce2fafd54fba9330afd7e61ffe3a0d799bc5d994fa9f11f2da88cd93924c9347bfc4355
-SHA512 (icecat-68.0.2-gnu1.tar.bz2) = 4709eff6cf6a94a50c326c74955d8732960f459831b14d245853e336d966c341f724b16e1c52ab2c60daa8cb0b15460c67c36fd62847fb936665d9cc799fc56c
+SHA512 (icecat-68.0.2-gnu1.tar.bz2) = 3d1874097c7f1282b771d43d338949d422d03b7c97bb1f2cdaf089559ec0f20f4efbb2bfc661a6177d00a2254d3d16d78e78c0b8e18ac33f12dd56c9b7e33544
 SHA512 (icecat-68.0.2-langpacks.tar.gz) = 4361c78b48ef0a9792d0fdba03c2ea7c4f880ba083d62e5ca83c9f65ec4cc3917b4020ebe16bb1a07faa780633c8e25aa7369f289ff54c0472158f993e703f1f
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 29f088f455408297ca4bead49b167c54bcbcb981 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 18 Aug 2019 10:22:27 +0200
Subject: [PATCH 054/473] Remove missing font

---
 icecat.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index e3a650d..64517bd 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -323,6 +323,12 @@ to run GNU IceCat natively on Wayland.
 %prep
 %autosetup -N -n %{name}-%{version}
 
+# Fix permissions
+find . -type f -name "*.h" -exec chmod 0644 '{}' \;
+find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
+find . -type f -name "*.cc" -exec chmod 0644 '{}' \;
+find . -type f -name "*.c" -exec chmod 0644 '{}' \; 
+
 # Copy license files
 tar -xf %{SOURCE5}
 
@@ -771,7 +777,6 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %{icecatappdir}/pingsender
 %{icecatappdir}/gmp-clearkey/
 %{icecatappdir}/chrome.manifest
-%{icecatappdir}/fonts/EmojiOneMozilla.ttf
 %{icecatappdir}/gtk2/*.so
 %if !%{?system_nss}
 %{icecatappdir}/libfreeblpriv3.chk

From 14ef8c00d1d57b5fc9b2dcaff57af847b55ddf12 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 18 Aug 2019 11:19:22 +0200
Subject: [PATCH 055/473] Add fonts directory under IceCat's private libdir

---
 icecat.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/icecat.spec b/icecat.spec
index 64517bd..1dbcffa 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -768,6 +768,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %{icecatappdir}/defaults/
 %{icecatappdir}/dictionaries
 %{icecatappdir}/icecat*
+%{icecatappdir}/fonts/
 %{icecatappdir}/*.so
 %{icecatappdir}/*.ini
 %{icecatappdir}/omni.ja

From 746e53f56a2c152dd2e9c89d2e2de90bc575d480 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 18 Aug 2019 15:11:04 +0200
Subject: [PATCH 056/473] Add patches for ARMs builds

---
 build-aarch64-skia.patch       | 46 ++++++++++++++++++++++++++++++++++
 build-arm-libopus.patch        | 12 +++++++++
 build-cacheFlush-missing.patch | 13 ++++++++++
 build-disable-elfhack.patch    | 12 +++++++++
 icecat.spec                    | 18 ++++++++++---
 5 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 build-aarch64-skia.patch
 create mode 100644 build-arm-libopus.patch
 create mode 100644 build-cacheFlush-missing.patch
 create mode 100644 build-disable-elfhack.patch

diff --git a/build-aarch64-skia.patch b/build-aarch64-skia.patch
new file mode 100644
index 0000000..a00ee70
--- /dev/null
+++ b/build-aarch64-skia.patch
@@ -0,0 +1,46 @@
+diff -up firefox-68.0/gfx/skia/skia/include/private/SkHalf.h.old firefox-68.0/gfx/skia/skia/include/private/SkHalf.h
+--- firefox-68.0/gfx/skia/skia/include/private/SkHalf.h.old	2019-07-11 12:33:40.471936951 +0200
++++ firefox-68.0/gfx/skia/skia/include/private/SkHalf.h	2019-07-11 12:33:50.527913736 +0200
+@@ -40,7 +40,7 @@ static inline Sk4h SkFloatToHalf_finite_
+ 
+ static inline Sk4f SkHalfToFloat_finite_ftz(uint64_t rgba) {
+     Sk4h hs = Sk4h::Load(&rgba);
+-#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
++#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
+     float32x4_t fs;
+     asm ("fcvtl %[fs].4s, %[hs].4h   \n"   // vcvt_f32_f16(...)
+         : [fs] "=w" (fs)                   // =w: write-only NEON register
+@@ -62,7 +62,7 @@ static inline Sk4f SkHalfToFloat_finite_
+ }
+ 
+ static inline Sk4h SkFloatToHalf_finite_ftz(const Sk4f& fs) {
+-#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
++#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
+     float32x4_t vec = fs.fVec;
+     asm ("fcvtn %[vec].4h, %[vec].4s  \n"   // vcvt_f16_f32(vec)
+         : [vec] "+w" (vec));                // +w: read-write NEON register
+
+diff -up firefox-68.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.old firefox-68.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
+--- firefox-68.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.old	2019-07-11 12:39:08.694166900 +0200
++++ firefox-68.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2019-07-11 12:39:21.572136328 +0200
+@@ -830,7 +830,7 @@ SI F from_half(U16 h) {
+ }
+ 
+ SI U16 to_half(F f) {
+-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
++#if 0 // defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
+     return vcvt_f16_f32(f);
+ 
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
+diff -up firefox-68.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.old firefox-68.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
+--- firefox-68.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.old	2019-07-11 12:38:45.285222428 +0200
++++ firefox-68.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h	2019-07-11 12:38:57.414193679 +0200
+@@ -163,7 +163,7 @@ SI F F_from_Half(U16 half) {
+     __attribute__((no_sanitize("unsigned-integer-overflow")))
+ #endif
+ SI U16 Half_from_F(F f) {
+-#if defined(USING_NEON_F16C)
++#if 0 // defined(USING_NEON_F16C)
+     return (U16)vcvt_f16_f32(f);
+ #elif defined(__AVX512F__)
+     return (U16)_mm512_cvtps_ph((__m512 )f, _MM_FROUND_CUR_DIRECTION );
diff --git a/build-arm-libopus.patch b/build-arm-libopus.patch
new file mode 100644
index 0000000..1b3f31b
--- /dev/null
+++ b/build-arm-libopus.patch
@@ -0,0 +1,12 @@
+diff -up firefox-66.0/media/libopus/silk/arm/arm_silk_map.c.old firefox-66.0/media/libopus/silk/arm/arm_silk_map.c
+--- firefox-66.0/media/libopus/silk/arm/arm_silk_map.c.old	2019-03-12 21:07:35.356677522 +0100
++++ firefox-66.0/media/libopus/silk/arm/arm_silk_map.c	2019-03-12 21:07:42.937693394 +0100
+@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
+ # include "config.h"
+ #endif
+ 
+-#include "main_FIX.h"
++#include "fixed/main_FIX.h"
+ #include "NSQ.h"
+ #include "SigProc_FIX.h"
+ 
diff --git a/build-cacheFlush-missing.patch b/build-cacheFlush-missing.patch
new file mode 100644
index 0000000..51c368c
--- /dev/null
+++ b/build-cacheFlush-missing.patch
@@ -0,0 +1,13 @@
+diff -up firefox-55.0.3/js/src/jit/ExecutableAllocator.h.wasm firefox-55.0.3/js/src/jit/ExecutableAllocator.h
+--- firefox-55.0.3/js/src/jit/ExecutableAllocator.h.wasm	2017-09-05 11:32:12.235909468 +0200
++++ firefox-55.0.3/js/src/jit/ExecutableAllocator.h	2017-09-05 11:32:46.157916575 +0200
+@@ -219,7 +219,7 @@ class ExecutableAllocator
+ 
+     static void poisonCode(JSRuntime* rt, JitPoisonRangeVector& ranges);
+ 
+-#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) || defined(JS_SIMULATOR_ARM64)
++#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) || defined(JS_SIMULATOR_ARM64) || defined(JS_CODEGEN_NONE)
+     static void cacheFlush(void*, size_t)
+     {
+     }
+diff -up firefox-55.0.3/js/src/jit-test/tests/wasm/bench/wasm_box2d.wasm firefox-55.0.3/js/src/jit-test/tests/wasm/bench/wasm_box2d
diff --git a/build-disable-elfhack.patch b/build-disable-elfhack.patch
new file mode 100644
index 0000000..a80c551
--- /dev/null
+++ b/build-disable-elfhack.patch
@@ -0,0 +1,12 @@
+diff -up firefox-65.0/toolkit/moz.configure.disable-elfhack firefox-65.0/toolkit/moz.configure
+--- firefox-65.0/toolkit/moz.configure.disable-elfhack	2019-01-28 14:16:48.530345132 +0100
++++ firefox-65.0/toolkit/moz.configure	2019-01-28 14:18:03.231029682 +0100
+@@ -1036,7 +1036,7 @@ with only_when('--enable-compile-environ
+                help='{Enable|Disable} elf hacks')
+ 
+         set_config('USE_ELF_HACK',
+-                   depends_if('--enable-elf-hack')(lambda _: True))
++                   depends_if('--enable-elf-hack')(lambda _: False))
+ 
+ 
+ @depends(check_build_environment)
diff --git a/icecat.spec b/icecat.spec
index 1dbcffa..a7a95f4 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -63,6 +63,7 @@
 %if 0%{?fedora} > 30
 %global wayland_backend_default 1
 %endif
+%global disable_elfhack 1
 
 # Use mozilla hardening option?
 %global hardened_build 1
@@ -154,6 +155,11 @@ Patch29: build-big-endian.patch
 # Always feel lucky for unsupported platforms:
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
 Patch37: build-jit-atomic-always-lucky.patch
+# Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x)
+Patch38:        build-cacheFlush-missing.patch
+Patch40:        build-aarch64-skia.patch
+Patch41:        build-disable-elfhack.patch
+Patch44:        build-arm-libopus.patch
 
 # Fedora specific patches
 Patch219: rhbz-1173156.patch
@@ -342,11 +348,17 @@ tar -xf %{SOURCE5}
 %patch8 -p0 -b .fix_installer
 
 #%%patch37 -p1 -b .jit-atomic-lucky
+%ifarch aarch64
+%patch40 -p1 -b .aarch64-skia
+%endif
+%if 0%{?disable_elfhack}
+%patch41 -p1 -b .disable-elfhack
+%endif
 
 # Fedora patches
 %patch219 -p1 -b .rhbz-1173156
 
-#ARM run-time patch
+# ARM run-time patch
 %ifarch aarch64
 %patch226 -p1 -b .1354671
 %endif
@@ -354,6 +366,7 @@ tar -xf %{SOURCE5}
 #%%patch413 -p1 -b .1353817
 %ifarch %{arm}
 %patch414 -p1 -b .Bug-1238661---fix-mozillaSignalTrampoline-to-work
+%patch44 -p1 -b .build-arm-libopus
 %endif
 #%%patch417 -p1 -b .bug1375074-save-restore-x28
 
@@ -370,11 +383,10 @@ tar -xf %{SOURCE5}
 %patch424 -p1 -b .mozilla-1566876-webrtc-ind
 %patch425 -p1 -b .mozilla-1568569
 
-
 # Wayland specific upstream patches
 %patch565 -p1 -b .firefox-pipewire
 
-##Remove default configuration and copy the customized one
+# Remove default configuration and copy the customized one
 rm -f .mozconfig
 cp -p %{SOURCE3} .mozconfig
 

From c2b920677066040c1361b5631dadcc1e038a6586 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 20 Aug 2019 11:58:52 +0200
Subject: [PATCH 057/473] WebRTC always disabled| Do not build langpacks

---
 .gitignore  |   1 +
 icecat.1    | 151 ----------------------------------------------------
 icecat.spec |  29 +++++-----
 sources     |   3 +-
 4 files changed, 15 insertions(+), 169 deletions(-)
 delete mode 100644 icecat.1

diff --git a/.gitignore b/.gitignore
index 1039629..0d7fb8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,3 +86,4 @@
 /cbindgen-vendor.tar.xz
 /icecat-68.0.2-gnu1.tar.bz2
 /icecat-68.0.2-langpacks.tar.gz
+/icecat-68.0.2-gnu2.tar.bz2
diff --git a/icecat.1 b/icecat.1
deleted file mode 100644
index ec21e5e..0000000
--- a/icecat.1
+++ /dev/null
@@ -1,151 +0,0 @@
-.TH ICECAT 1 "December 12, 2018" icecat "Linux User's Manual"
-.SH NAME
-IceCat \- GNU version of Firefox browser
-
-.SH SYNOPSIS
-.B icecat
-[\fIOPTIONS\fR ...] [\fIURL\fR]
-
-.B icecat-bin
-[\fIOPTIONS\fR] [\fIURL\fR]
-
-.SH DESCRIPTION
-\fBGnuzilla IceCat\fR is an open-source web browser, designed for standards compliance, performance and portability.
-
-GNUzilla is the GNU version of the Mozilla suite, and GNU IceCat is the GNU version of the Firefox browser. Its main advantage is an ethical one: it is entirely free software. While the Firefox source code from the Mozilla project is free software, they distribute and recommend non-free software as plug-ins and addons.
-
-In addition, GNU IceCat includes some privacy protection features, included in a separate addon:
-
-Some sites refer to zero-size images on other hosts to keep track of cookies. When IceCat detects this mechanism it blocks cookies from the site hosting the zero-length image file. (It is possible to re-enable such a site by removing it from the blocked hosts list.)
-Other sites rewrite the host name in links redirecting the user to another site, mainly to "spy" on clicks. When this behavior is detected, IceCat shows a message alerting the user.
-
-Origin of the name
-
-The name IceCat was coined to show our relationship to the Mozilla Firefox browser. Ice isn't Fire and a Cat isn't a Fox, so it is clearly a different package (we don't want Mozilla blamed for our mistakes, nor cause confusion with their trademarks), but is equally clearly intimately related (of course nearly all of the work comes from the Mozilla foundation effort, so we want to give credit).
-
-.SH USAGE
-\fBicecat\fR is a simple shell script that will set up the
-environment for the actual executable, \fBicecat-bin\fR.
-
-.SH OPTIONS
-A summary of the options supported by \fBicecat\fR is included below.
-
-.SS "X11 options"
-.TP
-.BI \-\-display= DISPLAY
-X display to use
-.TP
-.B \--sync
-Make X calls synchronous
-.TP
-.B \-\-g-fatal-warnings
-Make all warnings fatal
-
-.SS "IceCat options"
-.TP
-.B \-h, \-help
-Show summary of options.
-.TP
-.B \-v, \-version
-Print IceCat version.
-.TP
-\fB\-P\fR \fIprofile\fR
-Start with \fIprofile\fR.
-.TP
-\fB\-\-profile\fR \fIpath\fR
-Start with profile at \fIpath\fR.
-.TP
-\fB\-\-migration\fR
-Start with migration wizard.
-.TP
-.B \-\-ProfileManager
-Start with ProfileManager.
-.TP
-\fB\-\-no\-remote\fR
-Do not accept or send remote commands; implies \fB--new-instance\fR.
-.TP
-\fB\-\-new\-instance\fR
-Open new instance, not a new window in running instance.
-.TP
-\fB\-\-UILocale\fR \fIlocale\fR
-Start with \fIlocale\fR resources as UI Locale.
-.TP
-\fB\-\-save\-mode\fR
-Disables extensions and themes for this session.
-.TP
-\fB\-\-headless\fR
-Run without a GUI.
-.TP
-\fB\-\-marionette\fR
-Enable remote control server.
-.TP
-\fB\-\-browser\fR
-Open a browser window.
-.TP
-\fB\-\-new-window\fR \fIurl\fR
-Open \fIurl\fR in a new window.
-.TP
-\fB\-\-new-tab\fR \fIurl\fR
-Open \fIurl\fR in a new tab.
-.TP
-\fB\-\-private-window\fR \fIurl\fR
-Open \fIurl\fR in a new private window.
-.TP
-\fB\-\-preferences\fR
-Open Preferences dialog.
-.TP
-\fB\-\-screenshot\fR [\fIpath\fR]
-Save screenshot to \fIpath\fR or in working directory.
-.TP
-\fB\-\-window-size\fR \fIwidth\fR[,\fIheight\fR]
-Width and optionally height of screenshot.
-.TP
-\fB\-\-search\fR \fIterm\fR
-Search \fIterm\fR with your default search engine.
-.TP
-
-
-\fB\-\-jsconsole\fR
-Open the Browser Console.
-.TP
-\fB\-\-jsdebugger\fR
-Open the Browser Toolbox.
-.TP
-\fB\-\-wait-for-jsdebugger\fR
-Spin event loop until JS debugger connects.  Enables debugging (some) application startup code paths.  Only has an effect when \fI--jsdebugger\fR is also supplied.
-.TP
-\fB\-\-devtools\fR
-Open DevTools on initial load.
-.TP
-\fB\-\-start-debugger-server\fR [ws:][\fIport\fR|\fIpath\fR]
-Start the debugger server on a TCP port or Unix domain socket path. Defaults to TCP port 6000. Use WebSocket protocol if ws: prefix is specified.
-.TP
-\fB\-\-recording\fR \fIfile\fR
-Record drawing for a given URL.
-.TP
-\fB\-\-recording-output\fR \fIfile\fR
-Specify destination file for a drawing recording.
-.TP
-\fB\-\-setDefaultBrowser\fR
-Set this app as the default browser.
-
-.SH FILES
-\fI/usr/bin/icecat\fR - shell script wrapping
-\fBicecat\fR
-.br
-\fI/usr/lib64/icecat/icecat-bin\fR - \fBicecat\fR
-executable
-
-.SH VERSION
-60.x
-
-.SH BUGS
-To report a bug, please mail to bug-gnuzilla@gnu.org/\fR
-
-.SH AUTHORS
-.TP
-.B For a full list of the people who are credited with making a contribution to Mozilla, see http://www.mozilla.org/credits/ .
-.I http://www.mozilla.org/about.html
-.TP
-.B Tobias Girstmair
-.I https://www.gnu.org/software/gnuzilla/
diff --git a/icecat.spec b/icecat.spec
index a7a95f4..76f9940 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,5 +1,5 @@
 ##Active/Deactive language files handling
-%global build_langpacks 1
+%global build_langpacks 0
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
@@ -80,11 +80,11 @@ ExcludeArch: %{arm}
 ExcludeArch: s390x
 
 # Set new source-code build version
-%global gnu_ver gnu1
+%global gnu_ver gnu2
 
 Name: icecat
 Version: 68.0.2
-Release: 1.%{gnu_ver}%{?dist}
+Release: 2.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -110,9 +110,6 @@ Source4:  %{name}-%{version}-langpacks.tar.gz
 # Download from https://www.mozilla.org/MPL/2.0/index.txt
 Source5: %{name}-COPYING-licensefiles.tar.gz
 
-# manpage file
-Source6: %{name}.1
-
 Source7: %{name}-lang_download.sh
 
 # Desktop files
@@ -156,10 +153,10 @@ Patch29: build-big-endian.patch
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
 Patch37: build-jit-atomic-always-lucky.patch
 # Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x)
-Patch38:        build-cacheFlush-missing.patch
-Patch40:        build-aarch64-skia.patch
-Patch41:        build-disable-elfhack.patch
-Patch44:        build-arm-libopus.patch
+Patch38: build-cacheFlush-missing.patch
+Patch40: build-aarch64-skia.patch
+Patch41: build-disable-elfhack.patch
+Patch44: build-arm-libopus.patch
 
 # Fedora specific patches
 Patch219: rhbz-1173156.patch
@@ -392,12 +389,7 @@ cp -p %{SOURCE3} .mozconfig
 
 echo "ac_add_options --enable-default-toolkit=cairo-gtk3-wayland" >> .mozconfig
 echo "ac_add_options --enable-official-branding" >> .mozconfig
-
-%ifnarch %{ix86} x86_64 ppc64le
 echo "ac_add_options --disable-webrtc" >> .mozconfig
-%else
-echo "ac_add_options --enable-webrtc" >> .mozconfig
-%endif
 
 %if %{with pulseaudio}
 echo "ac_add_options --enable-pulseaudio" >> .mozconfig
@@ -662,7 +654,7 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE9}
 
 ##Install man page
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1/
+install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 ##Extract langpacks, make any mods needed, repack the langpack, and install it.
 %if 0%{?build_langpacks}
@@ -811,6 +803,11 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Mon Aug 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-2.gnu2
+- WebRTC always disabled
+- Do not build langpacks
+- gnu2 build release
+
 * Thu Aug 15 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-1.gnu1
 - Mozilla release 68.0.2
 - Import cbindgen stuff from Firefox package
diff --git a/sources b/sources
index 9444413..a9d6a69 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 SHA512 (cbindgen-vendor.tar.xz) = b0df3a8624efc488726211c99ac8a69c928d0bef24c2f7eafc6971be7ce2fafd54fba9330afd7e61ffe3a0d799bc5d994fa9f11f2da88cd93924c9347bfc4355
-SHA512 (icecat-68.0.2-gnu1.tar.bz2) = 3d1874097c7f1282b771d43d338949d422d03b7c97bb1f2cdaf089559ec0f20f4efbb2bfc661a6177d00a2254d3d16d78e78c0b8e18ac33f12dd56c9b7e33544
-SHA512 (icecat-68.0.2-langpacks.tar.gz) = 4361c78b48ef0a9792d0fdba03c2ea7c4f880ba083d62e5ca83c9f65ec4cc3917b4020ebe16bb1a07faa780633c8e25aa7369f289ff54c0472158f993e703f1f
+SHA512 (icecat-68.0.2-gnu2.tar.bz2) = 55d99ccc924109671448d1e5fee04e281da508e5c78a3c79a8a556ca66167d4b704652a4bf38a5f0c3a6584ba455f6cb8bf1595b0503743597ec312c56f1ce3e
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 1418806b60c7218168727c97487d4997e54b8a6c Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 20 Aug 2019 12:00:39 +0200
Subject: [PATCH 058/473] Disable MOZ_SERVICES_SYNC

---
 icecat.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 76f9940..563e87e 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -608,7 +608,7 @@ MOZ_SMP_FLAGS=-j1
 %endif
 
 export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
-export MOZ_SERVICES_SYNC="1"
+export MOZ_SERVICES_SYNC="0"
 export MOZ_OPTIMIZE_FLAGS=" -freorder-blocks -fno-reorder-functions"
 export STRIP=/bin/true
 MOZ_RUN_GTEST=0 ./mach -v build
@@ -807,6 +807,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - WebRTC always disabled
 - Do not build langpacks
 - gnu2 build release
+- Disable MOZ_SERVICES_SYNC
 
 * Thu Aug 15 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-1.gnu1
 - Mozilla release 68.0.2

From 180168f9d804d83fc05bfdcc9c550f140b2b700e Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 20 Aug 2019 12:23:12 +0200
Subject: [PATCH 059/473] Remove MOZ_SERVICES_SYNC flag

---
 icecat.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 563e87e..61f0e05 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -608,7 +608,6 @@ MOZ_SMP_FLAGS=-j1
 %endif
 
 export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
-export MOZ_SERVICES_SYNC="0"
 export MOZ_OPTIMIZE_FLAGS=" -freorder-blocks -fno-reorder-functions"
 export STRIP=/bin/true
 MOZ_RUN_GTEST=0 ./mach -v build

From 544344b80acb4497ccd43f59e58db9c2be027eeb Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 23 Aug 2019 18:14:56 +0200
Subject: [PATCH 060/473] Build release 38.0.2-gnu3

---
 .gitignore                 |  1 +
 icecat-fix_installer.patch | 22 ----------------------
 icecat.spec                | 10 ++++++++--
 sources                    |  2 +-
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0d7fb8a..0d81c9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,4 @@
 /icecat-68.0.2-gnu1.tar.bz2
 /icecat-68.0.2-langpacks.tar.gz
 /icecat-68.0.2-gnu2.tar.bz2
+/icecat-68.0.2-gnu3.tar.bz2
diff --git a/icecat-fix_installer.patch b/icecat-fix_installer.patch
index a56a880..cefa8e5 100644
--- a/icecat-fix_installer.patch
+++ b/icecat-fix_installer.patch
@@ -30,25 +30,3 @@
  #endif
  @RESPATH@/browser/features/*
  
---- browser/installer/allowed-dupes.orig.mn	2017-03-19 19:59:09.000000000 +0100
-+++ browser/installer/allowed-dupes.mn	2017-03-24 23:15:37.026964374 +0100
-@@ -752,3 +752,19 @@
- browser/extensions/tprb.addon@searxes.danwin1210.me/manifest.json
- browser/extensions/tprb.addon@searxes.danwin1210.me/tprb_dlg.html
- browser/extensions/tprb.addon@searxes.danwin1210.me/style.css
-+#
-+browser/extensions/abouticecat@gnu.org/defaults/preferences/preferences.js
-+browser/extensions/html5-video-everywhere@lejenome.me/bootstrap.js
-+browser/chrome/browser/content/browser/aboutaccounts/images/fox.png
-+browser/extensions/spyblock@gnu.org/chrome/content/ui/ext/common.js
-+browser/extensions/spyblock@gnu.org/lib/ext_common.js
-+browser/extensions/html5-video-everywhere@lejenome.me/LICENSE
-+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-break/LICENSE
-+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-dailymotion/LICENSE
-+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-facebook/LICENSE
-+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-metacafe/LICENSE
-+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-vimeo/LICENSE
-+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-youtube/LICENSE
-+browser/extensions/spyblock@gnu.org/chrome/content/ui/skin/abp-128.png
-+browser/extensions/spyblock@gnu.org/chrome/skin/abp-icon-big.png
-+#
diff --git a/icecat.spec b/icecat.spec
index 61f0e05..07cb442 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -80,11 +80,11 @@ ExcludeArch: %{arm}
 ExcludeArch: s390x
 
 # Set new source-code build version
-%global gnu_ver gnu2
+%global gnu_ver gnu3
 
 Name: icecat
 Version: 68.0.2
-Release: 2.%{gnu_ver}%{?dist}
+Release: 3.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -500,6 +500,9 @@ echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .
 # Remove executable bit to make brp-mangle-shebangs happy.
 chmod -x third_party/rust/itertools/src/lib.rs
 
+# Remove unrecognized files
+find extensions/gnu -name cose.manifest -delete
+
 #---------------------------------------------------------------------
 
 %build
@@ -802,6 +805,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Wed Aug 21 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-3.gnu3
+- gnu3 build release
+
 * Mon Aug 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-2.gnu2
 - WebRTC always disabled
 - Do not build langpacks
diff --git a/sources b/sources
index a9d6a69..eca32d4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (cbindgen-vendor.tar.xz) = b0df3a8624efc488726211c99ac8a69c928d0bef24c2f7eafc6971be7ce2fafd54fba9330afd7e61ffe3a0d799bc5d994fa9f11f2da88cd93924c9347bfc4355
-SHA512 (icecat-68.0.2-gnu2.tar.bz2) = 55d99ccc924109671448d1e5fee04e281da508e5c78a3c79a8a556ca66167d4b704652a4bf38a5f0c3a6584ba455f6cb8bf1595b0503743597ec312c56f1ce3e
+SHA512 (icecat-68.0.2-gnu3.tar.bz2) = 88cb18f8097c3581ef9cecad21a682e23512549bac411217fcbd4789d57f21744aab165d52aa2e5c1538ce877e58fd2f3b3d802d9ad8f47bf37b867bcbc4b28f
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From dd0cd4439486b764db292fe93e2f500c98f53817 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 23 Aug 2019 19:00:52 +0200
Subject: [PATCH 061/473] Enable langpacks

---
 icecat.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 07cb442..9ab2fb7 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,5 +1,5 @@
 ##Active/Deactive language files handling
-%global build_langpacks 0
+%global build_langpacks 1
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
@@ -84,7 +84,7 @@ ExcludeArch: s390x
 
 Name: icecat
 Version: 68.0.2
-Release: 3.%{gnu_ver}%{?dist}
+Release: 4.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -805,6 +805,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Fri Aug 23 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-4.gnu3
+- Enable langpacks
+
 * Wed Aug 21 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-3.gnu3
 - gnu3 build release
 

From 100ccf28ea30927b9b01c7cba877d6e4eb583248 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 23 Aug 2019 19:04:47 +0200
Subject: [PATCH 062/473] New source for langpacks

---
 sources | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sources b/sources
index eca32d4..1bfcc4b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = b0df3a8624efc488726211c99ac8a69c928d0bef24c2f7eafc6971be7ce2fafd54fba9330afd7e61ffe3a0d799bc5d994fa9f11f2da88cd93924c9347bfc4355
 SHA512 (icecat-68.0.2-gnu3.tar.bz2) = 88cb18f8097c3581ef9cecad21a682e23512549bac411217fcbd4789d57f21744aab165d52aa2e5c1538ce877e58fd2f3b3d802d9ad8f47bf37b867bcbc4b28f
+SHA512 (icecat-68.0.2-langpacks.tar.gz) = 4361c78b48ef0a9792d0fdba03c2ea7c4f880ba083d62e5ca83c9f65ec4cc3917b4020ebe16bb1a07faa780633c8e25aa7369f289ff54c0472158f993e703f1f
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 022f9383f0106ba5b475f96e1ac029a3d09af3cd Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 23 Aug 2019 19:07:19 +0200
Subject: [PATCH 063/473] Upload rpmlintrc file

---
 icecat.rpmlintrc | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 icecat.rpmlintrc

diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
new file mode 100644
index 0000000..c2c8f6f
--- /dev/null
+++ b/icecat.rpmlintrc
@@ -0,0 +1,40 @@
+# Whitelisting errors
+# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
+# Edited by sagitter (sagitter AT fedoraproject dot org)
+
+# KNOWN BUGS:
+#
+
+# TESTS:
+##### SRPMs #####
+
+# ifarch applied patches are okay
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
+addFilter(r'(%ifarch-applied-patch) Patch*')
+
+# ERRORS:
+##### RPMs  #####
+
+# chroot function (??)
+addFilter(r'(missing-call-to-chdir-with-chroot) %{_libdir}/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) %{_libdir}/icecat/libxul.so')
+
+# Expected on FF browser
+# https://support.mozilla.org/en-US/questions/1045418
+addFilter(r'(zero-length) %{_libdir}/icecat/chrome.manifest')
+addFilter(r'(zero-length) %{_libdir}/icecat/browser/chrome.manifest')
+
+# False positive
+addFilter(r'(dangling-symlink) %{_libdir}/icecat/dictionaries %{_datadir}/myspell')
+addFilter(r'(unversioned-explicit-provides) webclient')
+
+# WARNINGS:
+##### RPMs  #####
+
+addFilter(r'(no-manual-page-for-binary) icecat-wayland')
+
+##### SRPMs #####
+# Different file size due to the signature of the source code tarbz archive
+addFilter(r'file-size-mismatch')
+
+addFilter(r'(invalid-url) Source*')

From 19fd855d427f3ce92907dadb270bd442661fe048 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 1 Sep 2019 11:22:48 +0200
Subject: [PATCH 064/473] Rebuild after retiring of Python2

---
 icecat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 9ab2fb7..41f3e4e 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -84,7 +84,7 @@ ExcludeArch: s390x
 
 Name: icecat
 Version: 68.0.2
-Release: 4.%{gnu_ver}%{?dist}
+Release: 5.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -805,6 +805,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Sun Sep 01 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-5.gnu3
+- Rebuild after retiring of Python2
+
 * Fri Aug 23 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-4.gnu3
 - Enable langpacks
 

From 2b48fe50b94fd23566e164101887830edbf550cf Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 2 Sep 2019 20:29:50 +0200
Subject: [PATCH 065/473] Mozilla release 60.9.0

---
 .gitignore                 |  2 ++
 icecat-fix_installer.patch | 21 ++++----------------
 icecat-lang_download.sh    |  2 +-
 icecat.rpmlintrc           | 40 --------------------------------------
 icecat.spec                |  7 +++++--
 sources                    |  4 ++--
 6 files changed, 14 insertions(+), 62 deletions(-)
 delete mode 100644 icecat.rpmlintrc

diff --git a/.gitignore b/.gitignore
index 0e7fd6c..43b3979 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,5 @@
 /icecat-60.7.2-langpacks.tar.gz
 /icecat-60.8.0-gnu1.tar.bz2
 /icecat-60.8.0-langpacks.tar.gz
+/icecat-60.9.0-gnu1.tar.bz2
+/icecat-60.9.0-langpacks.tar.gz
diff --git a/icecat-fix_installer.patch b/icecat-fix_installer.patch
index a56a880..6ed1704 100644
--- a/icecat-fix_installer.patch
+++ b/icecat-fix_installer.patch
@@ -32,23 +32,10 @@
  
 --- browser/installer/allowed-dupes.orig.mn	2017-03-19 19:59:09.000000000 +0100
 +++ browser/installer/allowed-dupes.mn	2017-03-24 23:15:37.026964374 +0100
-@@ -752,3 +752,19 @@
- browser/extensions/tprb.addon@searxes.danwin1210.me/manifest.json
- browser/extensions/tprb.addon@searxes.danwin1210.me/tprb_dlg.html
- browser/extensions/tprb.addon@searxes.danwin1210.me/style.css
+@@ -771,3 +771,6 @@
+ browser/extensions/SubmitMe@0xbeef.coffee/License
+ browser/extensions/SubmitMe@0xbeef.coffee/manifest.json
+ browser/extensions/SubmitMe@0xbeef.coffee/improve_css.js
 +#
 +browser/extensions/abouticecat@gnu.org/defaults/preferences/preferences.js
-+browser/extensions/html5-video-everywhere@lejenome.me/bootstrap.js
 +browser/chrome/browser/content/browser/aboutaccounts/images/fox.png
-+browser/extensions/spyblock@gnu.org/chrome/content/ui/ext/common.js
-+browser/extensions/spyblock@gnu.org/lib/ext_common.js
-+browser/extensions/html5-video-everywhere@lejenome.me/LICENSE
-+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-break/LICENSE
-+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-dailymotion/LICENSE
-+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-facebook/LICENSE
-+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-metacafe/LICENSE
-+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-vimeo/LICENSE
-+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-youtube/LICENSE
-+browser/extensions/spyblock@gnu.org/chrome/content/ui/skin/abp-128.png
-+browser/extensions/spyblock@gnu.org/chrome/skin/abp-icon-big.png
-+#
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 832a09b..2832b59 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=60.8.0
+VERSION=60.9.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
deleted file mode 100644
index c2c8f6f..0000000
--- a/icecat.rpmlintrc
+++ /dev/null
@@ -1,40 +0,0 @@
-# Whitelisting errors
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-# Edited by sagitter (sagitter AT fedoraproject dot org)
-
-# KNOWN BUGS:
-#
-
-# TESTS:
-##### SRPMs #####
-
-# ifarch applied patches are okay
-# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
-addFilter(r'(%ifarch-applied-patch) Patch*')
-
-# ERRORS:
-##### RPMs  #####
-
-# chroot function (??)
-addFilter(r'(missing-call-to-chdir-with-chroot) %{_libdir}/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) %{_libdir}/icecat/libxul.so')
-
-# Expected on FF browser
-# https://support.mozilla.org/en-US/questions/1045418
-addFilter(r'(zero-length) %{_libdir}/icecat/chrome.manifest')
-addFilter(r'(zero-length) %{_libdir}/icecat/browser/chrome.manifest')
-
-# False positive
-addFilter(r'(dangling-symlink) %{_libdir}/icecat/dictionaries %{_datadir}/myspell')
-addFilter(r'(unversioned-explicit-provides) webclient')
-
-# WARNINGS:
-##### RPMs  #####
-
-addFilter(r'(no-manual-page-for-binary) icecat-wayland')
-
-##### SRPMs #####
-# Different file size due to the signature of the source code tarbz archive
-addFilter(r'file-size-mismatch')
-
-addFilter(r'(invalid-url) Source*')
diff --git a/icecat.spec b/icecat.spec
index 532c4dd..7cef988 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -73,8 +73,8 @@ ExcludeArch: %{arm}
 %global gnu_ver         gnu1
 
 Name:    icecat
-Version: 60.8.0
-Release: 6.%{gnu_ver}%{?dist}
+Version: 60.9.0
+Release: 1.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -749,6 +749,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Mon Sep 02 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.9.0-1.gnu1
+- Mozilla release 60.9.0
+
 * Sun Jul 28 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-6.gnu1
 - Add patch to fix the addon installation
 
diff --git a/sources b/sources
index e5e5f07..cccd512 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (icecat-60.8.0-gnu1.tar.bz2) = 31900c921102ccaa736b8be20210d16b7bae9c797d2529e9f38e803d834c72bacfe6e586934e21c48ca7097cc0bbc56adccc6beefc5f42b1e7ee4a3d93e9f223
-SHA512 (icecat-60.8.0-langpacks.tar.gz) = 82f63a5c0e7b4af8ed616d94f99274c4a54fa092147bcce3eb4f77026b562a8109cc289fec18abdf0e350484a8645eb32f173fbbe3e20cb12f8fb79cea52554b
+SHA512 (icecat-60.9.0-gnu1.tar.bz2) = 6080c41bf1235b9d13ecb0f62e41af42d8180854a140420552128c1707f639fd73623910410ac0ce20f289e4c3ea010b70559d750ac0fb4f93b9642ff2c2cadb
+SHA512 (icecat-60.9.0-langpacks.tar.gz) = 14117477b4be24445326f78022ba40d1972e4f82ff888e8dcbba032afede0eb52e43ae6bc1354955fa0ba46fbfe3b668fe3e925fccb2a4769eb7476be8b30737
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From dc2006f0fb493f348466cd84cda5f44bf59f8706 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 3 Sep 2019 13:31:53 +0200
Subject: [PATCH 066/473] Mozilla release 68.1.0

---
 .gitignore              |   2 +
 icecat-lang_download.sh |   2 +-
 icecat.rpmlintrc        |  40 --------
 icecat.spec             |  24 +++--
 mozilla-1548475.patch   |  34 +++++++
 mozilla-1562827.patch   | 141 +++++++++++++++++++++++++++
 mozilla-1567434-1.patch | 205 ++++++++++++++++++++++++++++++++++++++++
 mozilla-1567434-2.patch |  35 +++++++
 mozilla-1573813.patch   |  29 ++++++
 sources                 |   6 +-
 10 files changed, 468 insertions(+), 50 deletions(-)
 delete mode 100644 icecat.rpmlintrc
 create mode 100644 mozilla-1548475.patch
 create mode 100644 mozilla-1562827.patch
 create mode 100644 mozilla-1567434-1.patch
 create mode 100644 mozilla-1567434-2.patch
 create mode 100644 mozilla-1573813.patch

diff --git a/.gitignore b/.gitignore
index 0d81c9b..722505b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,5 @@
 /icecat-68.0.2-langpacks.tar.gz
 /icecat-68.0.2-gnu2.tar.bz2
 /icecat-68.0.2-gnu3.tar.bz2
+/icecat-68.1.0-gnu1.tar.bz2
+/icecat-68.1.0-langpacks.tar.gz
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index d785ca1..87c6659 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=68.0.2
+VERSION=68.1.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
deleted file mode 100644
index c2c8f6f..0000000
--- a/icecat.rpmlintrc
+++ /dev/null
@@ -1,40 +0,0 @@
-# Whitelisting errors
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-# Edited by sagitter (sagitter AT fedoraproject dot org)
-
-# KNOWN BUGS:
-#
-
-# TESTS:
-##### SRPMs #####
-
-# ifarch applied patches are okay
-# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
-addFilter(r'(%ifarch-applied-patch) Patch*')
-
-# ERRORS:
-##### RPMs  #####
-
-# chroot function (??)
-addFilter(r'(missing-call-to-chdir-with-chroot) %{_libdir}/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) %{_libdir}/icecat/libxul.so')
-
-# Expected on FF browser
-# https://support.mozilla.org/en-US/questions/1045418
-addFilter(r'(zero-length) %{_libdir}/icecat/chrome.manifest')
-addFilter(r'(zero-length) %{_libdir}/icecat/browser/chrome.manifest')
-
-# False positive
-addFilter(r'(dangling-symlink) %{_libdir}/icecat/dictionaries %{_datadir}/myspell')
-addFilter(r'(unversioned-explicit-provides) webclient')
-
-# WARNINGS:
-##### RPMs  #####
-
-addFilter(r'(no-manual-page-for-binary) icecat-wayland')
-
-##### SRPMs #####
-# Different file size due to the signature of the source code tarbz archive
-addFilter(r'file-size-mismatch')
-
-addFilter(r'(invalid-url) Source*')
diff --git a/icecat.spec b/icecat.spec
index 41f3e4e..ee400de 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -80,11 +80,11 @@ ExcludeArch: %{arm}
 ExcludeArch: s390x
 
 # Set new source-code build version
-%global gnu_ver gnu3
+%global gnu_ver gnu1
 
 Name: icecat
-Version: 68.0.2
-Release: 5.%{gnu_ver}%{?dist}
+Version: 68.1.0
+Release: 1.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -176,6 +176,12 @@ Patch425: mozilla-1568569.patch
 
 # Wayland specific upstream patches
 Patch565: firefox-pipewire.patch
+
+Patch575: mozilla-1548475.patch
+Patch576: mozilla-1562827.patch
+Patch578: mozilla-1567434-1.patch
+Patch579: mozilla-1567434-2.patch
+Patch580: mozilla-1573813.patch
 #
 
 BuildRequires: alsa-lib-devel
@@ -304,9 +310,6 @@ Extensions included to this version of IceCat:
  * Searxes
    Third-party Request Blocker
 
- * View Tube
-   Watch videos from video sharing websites with extra options
-
 %if 0%{?wayland_backend_default}
 %package x11
 Summary: GNU IceCat X11 launcher
@@ -382,6 +385,11 @@ tar -xf %{SOURCE5}
 
 # Wayland specific upstream patches
 %patch565 -p1 -b .firefox-pipewire
+%patch575 -p1 -b .mozilla-1548475
+%patch576 -p1 -b .mozilla-1562827
+%patch578 -p1 -b .mozilla-1567434-1
+%patch579 -p1 -b .mozilla-1567434-2
+%patch580 -p1 -b .mozilla-1573813
 
 # Remove default configuration and copy the customized one
 rm -f .mozconfig
@@ -805,6 +813,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Tue Sep 03 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.1.0-1.gnu1
+- Mozilla release 68.1.0
+- Inglobe Wayland patches from Firefox 68
+
 * Sun Sep 01 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-5.gnu3
 - Rebuild after retiring of Python2
 
diff --git a/mozilla-1548475.patch b/mozilla-1548475.patch
new file mode 100644
index 0000000..b325683
--- /dev/null
+++ b/mozilla-1548475.patch
@@ -0,0 +1,34 @@
+diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
+--- a/dom/plugins/base/nsPluginHost.cpp
++++ b/dom/plugins/base/nsPluginHost.cpp
+@@ -105,6 +105,10 @@
+ #  include "windows.h"
+ #  include "winbase.h"
+ #endif
++#if (MOZ_WIDGET_GTK)
++#  include <gdk/gdk.h>
++#  include <gdk/gdkx.h>
++#endif
+ 
+ #include "npapi.h"
+ 
+@@ -358,9 +362,15 @@
+   mOverrideInternalTypes =
+       Preferences::GetBool("plugin.override_internal_types", false);
+ 
+-  mPluginsDisabled = Preferences::GetBool("plugin.disable", false);
+-
+-  Preferences::AddStrongObserver(this, "plugin.disable");
++  bool waylandBackend = false;
++#if MOZ_WIDGET_GTK
++  waylandBackend = !GDK_IS_X11_DISPLAY(gdk_display_get_default());
++#endif
++  mPluginsDisabled =
++      Preferences::GetBool("plugin.disable", false) || waylandBackend;
++  if (!waylandBackend) {
++    Preferences::AddStrongObserver(this, "plugin.disable");
++  }
+ 
+   nsCOMPtr<nsIObserverService> obsService =
+       mozilla::services::GetObserverService();
+
diff --git a/mozilla-1562827.patch b/mozilla-1562827.patch
new file mode 100644
index 0000000..497133c
--- /dev/null
+++ b/mozilla-1562827.patch
@@ -0,0 +1,141 @@
+diff -up firefox-69.0/widget/gtk/nsWindow.cpp.mozilla-1562827 firefox-69.0/widget/gtk/nsWindow.cpp
+--- firefox-69.0/widget/gtk/nsWindow.cpp.mozilla-1562827	2019-09-02 15:16:15.031528276 +0200
++++ firefox-69.0/widget/gtk/nsWindow.cpp	2019-09-02 15:16:15.037528254 +0200
+@@ -818,7 +818,6 @@ void nsWindow::SetParent(nsIWidget* aNew
+   if (mParent) {
+     mParent->RemoveChild(this);
+   }
+-
+   mParent = aNewParent;
+ 
+   GtkWidget* oldContainer = GetMozContainerWidget();
+@@ -830,88 +829,73 @@ void nsWindow::SetParent(nsIWidget* aNew
+     return;
+   }
+ 
++  nsWindow* newParent = static_cast<nsWindow*>(aNewParent);
++  GdkWindow* newParentWindow = nullptr;
++  GtkWidget* newContainer = nullptr;
+   if (aNewParent) {
+     aNewParent->AddChild(this);
+-    ReparentNativeWidget(aNewParent);
++    newParentWindow = newParent->mGdkWindow;
++    newContainer = newParent->GetMozContainerWidget();
+   } else {
+     // aNewParent is nullptr, but reparent to a hidden window to avoid
+     // destroying the GdkWindow and its descendants.
+     // An invisible container widget is needed to hold descendant
+     // GtkWidgets.
+-    GtkWidget* newContainer = EnsureInvisibleContainer();
+-    GdkWindow* newParentWindow = gtk_widget_get_window(newContainer);
+-    ReparentNativeWidgetInternal(aNewParent, newContainer, newParentWindow,
+-                                 oldContainer);
+-  }
+-}
+-
+-bool nsWindow::WidgetTypeSupportsAcceleration() { return !IsSmallPopup(); }
+-
+-void nsWindow::ReparentNativeWidget(nsIWidget* aNewParent) {
+-  MOZ_ASSERT(aNewParent, "null widget");
+-  NS_ASSERTION(!mIsDestroyed, "");
+-  NS_ASSERTION(!static_cast<nsWindow*>(aNewParent)->mIsDestroyed, "");
+-
+-  GtkWidget* oldContainer = GetMozContainerWidget();
+-  if (!oldContainer) {
+-    // The GdkWindows have been destroyed so there is nothing else to
+-    // reparent.
+-    MOZ_ASSERT(gdk_window_is_destroyed(mGdkWindow),
+-               "live GdkWindow with no widget");
+-    return;
++    newContainer = EnsureInvisibleContainer();
++    newParentWindow = gtk_widget_get_window(newContainer);
+   }
+-  MOZ_ASSERT(!gdk_window_is_destroyed(mGdkWindow),
+-             "destroyed GdkWindow with widget");
+ 
+-  auto* newParent = static_cast<nsWindow*>(aNewParent);
+-  GdkWindow* newParentWindow = newParent->mGdkWindow;
+-  GtkWidget* newContainer = newParent->GetMozContainerWidget();
+-  GtkWindow* shell = GTK_WINDOW(mShell);
+-
+-  if (shell && gtk_window_get_transient_for(shell)) {
+-    GtkWindow* topLevelParent =
+-        GTK_WINDOW(gtk_widget_get_toplevel(newContainer));
+-    gtk_window_set_transient_for(shell, topLevelParent);
+-  }
+-
+-  ReparentNativeWidgetInternal(aNewParent, newContainer, newParentWindow,
+-                               oldContainer);
+-}
+-
+-void nsWindow::ReparentNativeWidgetInternal(nsIWidget* aNewParent,
+-                                            GtkWidget* aNewContainer,
+-                                            GdkWindow* aNewParentWindow,
+-                                            GtkWidget* aOldContainer) {
+-  if (!aNewContainer) {
++  if (!newContainer) {
+     // The new parent GdkWindow has been destroyed.
+-    MOZ_ASSERT(!aNewParentWindow || gdk_window_is_destroyed(aNewParentWindow),
++    MOZ_ASSERT(!newParentWindow || gdk_window_is_destroyed(newParentWindow),
+                "live GdkWindow with no widget");
+     Destroy();
+   } else {
+-    if (aNewContainer != aOldContainer) {
+-      MOZ_ASSERT(!gdk_window_is_destroyed(aNewParentWindow),
++    if (newContainer != oldContainer) {
++      MOZ_ASSERT(!gdk_window_is_destroyed(newParentWindow),
+                  "destroyed GdkWindow with widget");
+-      SetWidgetForHierarchy(mGdkWindow, aOldContainer, aNewContainer);
++      SetWidgetForHierarchy(mGdkWindow, oldContainer, newContainer);
+ 
+-      if (aOldContainer == gInvisibleContainer) {
++      if (oldContainer == gInvisibleContainer) {
+         CheckDestroyInvisibleContainer();
+       }
+     }
+ 
+-    if (!mIsTopLevel) {
+-      gdk_window_reparent(mGdkWindow, aNewParentWindow,
+-                          DevicePixelsToGdkCoordRoundDown(mBounds.x),
+-                          DevicePixelsToGdkCoordRoundDown(mBounds.y));
+-    }
++    gdk_window_reparent(mGdkWindow, newParentWindow,
++                        DevicePixelsToGdkCoordRoundDown(mBounds.x),
++                        DevicePixelsToGdkCoordRoundDown(mBounds.y));
++    mToplevelParentWindow = GTK_WINDOW(gtk_widget_get_toplevel(newContainer));
+   }
+ 
+-  auto* newParent = static_cast<nsWindow*>(aNewParent);
+   bool parentHasMappedToplevel = newParent && newParent->mHasMappedToplevel;
+   if (mHasMappedToplevel != parentHasMappedToplevel) {
+     SetHasMappedToplevel(parentHasMappedToplevel);
+   }
+ }
+ 
++bool nsWindow::WidgetTypeSupportsAcceleration() { return !IsSmallPopup(); }
++
++void nsWindow::ReparentNativeWidget(nsIWidget* aNewParent) {
++  MOZ_ASSERT(aNewParent, "null widget");
++  MOZ_ASSERT(!mIsDestroyed, "");
++  MOZ_ASSERT(!static_cast<nsWindow*>(aNewParent)->mIsDestroyed, "");
++  MOZ_ASSERT(!gdk_window_is_destroyed(mGdkWindow),
++             "destroyed GdkWindow with widget");
++
++  MOZ_ASSERT(
++      !mParent,
++      "nsWindow::ReparentNativeWidget() works on toplevel windows only.");
++
++  auto* newParent = static_cast<nsWindow*>(aNewParent);
++  GtkWindow* newParentWidget = GTK_WINDOW(newParent->GetGtkWidget());
++  GtkWindow* shell = GTK_WINDOW(mShell);
++
++  if (shell && gtk_window_get_transient_for(shell)) {
++    gtk_window_set_transient_for(shell, newParentWidget);
++    mToplevelParentWindow = newParentWidget;
++  }
++}
++
+ void nsWindow::SetModal(bool aModal) {
+   LOG(("nsWindow::SetModal [%p] %d\n", (void*)this, aModal));
+   if (mIsDestroyed) return;
+diff -up firefox-69.0/widget/gtk/nsWindow.h.mozilla-1562827 firefox-69.0/widget/gtk/nsWindow.h
diff --git a/mozilla-1567434-1.patch b/mozilla-1567434-1.patch
new file mode 100644
index 0000000..631645b
--- /dev/null
+++ b/mozilla-1567434-1.patch
@@ -0,0 +1,205 @@
+diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
+--- a/widget/gtk/nsWindow.h
++++ b/widget/gtk/nsWindow.h
+@@ -487,6 +487,7 @@
+   GtkWidget* mShell;
+   MozContainer* mContainer;
+   GdkWindow* mGdkWindow;
++  GtkWindow* mToplevelParentWindow;
+   bool mWindowShouldStartDragging = false;
+   PlatformCompositorWidgetDelegate* mCompositorWidgetDelegate;
+ 
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
++++ b/widget/gtk/nsWindow.cpp
+@@ -401,6 +401,7 @@
+   mContainer = nullptr;
+   mGdkWindow = nullptr;
+   mShell = nullptr;
++  mToplevelParentWindow = nullptr;
+   mCompositorWidgetDelegate = nullptr;
+   mHasMappedToplevel = false;
+   mIsFullyObscured = false;
+@@ -1144,6 +1145,8 @@
+     nsWindow* window =
+         static_cast<nsWindow*>(gVisibleWaylandPopupWindows->data);
+     if (window->mPopupType != ePopupTypeTooltip) break;
++    LOG(("nsWindow::HideWaylandTooltips [%p] hidding tooltip [%p].\n",
++         (void*)this, window));
+     window->HideWaylandWindow();
+     gVisibleWaylandPopupWindows = g_list_delete_link(
+         gVisibleWaylandPopupWindows, gVisibleWaylandPopupWindows);
+@@ -1172,9 +1175,12 @@
+ // before we open another one on that level. It means that every open
+ // popup needs to have an unique parent.
+ GtkWidget* nsWindow::ConfigureWaylandPopupWindows() {
++  LOG(("nsWindow::ConfigureWaylandPopupWindows [%p]\n", (void*)this));
++
+   // Check if we're already configured.
+   if (gVisibleWaylandPopupWindows &&
+       g_list_find(gVisibleWaylandPopupWindows, this)) {
++    LOG(("...[%p] is already configured.\n", (void*)this));
+     return GTK_WIDGET(gtk_window_get_transient_for(GTK_WINDOW(mShell)));
+   }
+ 
+@@ -1182,9 +1188,15 @@
+   // as it's short lived temporary window.
+   HideWaylandTooltips();
+ 
+-  GtkWindow* parentWidget = nullptr;
++  GtkWindow* parentWidget = mToplevelParentWindow;
+   if (gVisibleWaylandPopupWindows) {
++    LOG(("... there's visible active popup [%p]\n",
++         gVisibleWaylandPopupWindows->data));
++
+     if (mPopupType == ePopupTypeTooltip) {
++      LOG(("...[%p] is tooltip, parent [%p]\n", (void*)this,
++           gVisibleWaylandPopupWindows->data));
++
+       // Attach tooltip window to the latest popup window
+       // to have both visible.
+       nsWindow* window =
+@@ -1200,12 +1212,19 @@
+       // nsWindow::Create()) or we're toplevel popup without parent.
+       // In both cases just use parent which was passed to nsWindow::Create().
+       if (!menuPopupFrame) {
+-        return GTK_WIDGET(gtk_window_get_transient_for(GTK_WINDOW(mShell)));
++        LOG(("...[%p] menuPopupFrame = null, using given parent widget [%p]\n",
++             (void*)this, parentWidget));
++        return GTK_WIDGET(parentWidget);
+       }
+ 
+       nsWindow* parentWindow =
+           static_cast<nsWindow*>(menuPopupFrame->GetParentMenuWidget());
++      LOG(("...[%p] GetParentMenuWidget() = %p\n", (void*)this, parentWindow));
++
+       if (!parentWindow) {
++        LOG(("...[%p] using active/visible popups as a parent [%p]\n",
++             (void*)this, gVisibleWaylandPopupWindows->data));
++
+         // We're toplevel popup menu attached to another menu. Just use our
+         // latest popup as a parent.
+         parentWindow =
+@@ -1234,10 +1253,10 @@
+     }
+   }
+ 
++  MOZ_ASSERT(parentWidget, "Missing parent widget for wayland popup!");
+   if (parentWidget) {
++    LOG(("...[%p] set parent widget [%p]\n", (void*)this, parentWidget));
+     gtk_window_set_transient_for(GTK_WINDOW(mShell), parentWidget);
+-  } else {
+-    parentWidget = gtk_window_get_transient_for(GTK_WINDOW(mShell));
+   }
+   gVisibleWaylandPopupWindows =
+       g_list_prepend(gVisibleWaylandPopupWindows, this);
+@@ -1248,9 +1267,11 @@
+ static void NativeMoveResizeWaylandPopupCallback(
+     GdkWindow* window, const GdkRectangle* flipped_rect,
+     const GdkRectangle* final_rect, gboolean flipped_x, gboolean flipped_y,
+-    void* unused) {
+-  LOG(("%s flipped %d %d\n", __FUNCTION__, flipped_rect->x, flipped_rect->y));
+-  LOG(("%s final %d %d\n", __FUNCTION__, final_rect->x, final_rect->y));
++    void* aWindow) {
++  LOG(("%s [%p] flipped %d %d\n", __FUNCTION__, aWindow, flipped_rect->x,
++       flipped_rect->y));
++  LOG(("%s [%p] final %d %d\n", __FUNCTION__, aWindow, final_rect->x,
++       final_rect->y));
+ }
+ #endif
+ 
+@@ -1264,6 +1285,8 @@
+   // Compositor may be confused by windows with width/height = 0
+   // and positioning such windows leads to Bug 1555866.
+   if (!AreBoundsSane()) {
++    LOG(("nsWindow::NativeMoveResizeWaylandPopup [%p] Bounds are not sane\n",
++         (void*)this));
+     return;
+   }
+ 
+@@ -1277,6 +1300,8 @@
+   // - gdk_window_move_to_rect() is not available
+   // - the widget doesn't have a valid GdkWindow
+   if (!sGdkWindowMoveToRect || !gdkWindow) {
++    LOG(("nsWindow::NativeMoveResizeWaylandPopup [%p] use gtk_window_move()\n",
++         (void*)this));
+     gtk_window_move(GTK_WINDOW(mShell), aPosition->x, aPosition->y);
+     return;
+   }
+@@ -1302,8 +1327,12 @@
+   }
+   LOG(("  request result %d %d\n", rect.x, rect.y));
+ #ifdef DEBUG
+-  g_signal_connect(gdkWindow, "moved-to-rect",
+-                   G_CALLBACK(NativeMoveResizeWaylandPopupCallback), this);
++  if (!g_signal_handler_find(
++          gdkWindow, G_SIGNAL_MATCH_FUNC, 0, 0, nullptr,
++          FuncToGpointer(NativeMoveResizeWaylandPopupCallback), this)) {
++    g_signal_connect(gdkWindow, "moved-to-rect",
++                     G_CALLBACK(NativeMoveResizeWaylandPopupCallback), this);
++  }
+ #endif
+ 
+   GdkGravity rectAnchor = GDK_GRAVITY_NORTH_WEST;
+@@ -3508,7 +3537,6 @@
+   GtkWidget* parentMozContainer = nullptr;
+   GtkContainer* parentGtkContainer = nullptr;
+   GdkWindow* parentGdkWindow = nullptr;
+-  GtkWindow* topLevelParent = nullptr;
+   nsWindow* parentnsWindow = nullptr;
+   GtkWidget* eventWidget = nullptr;
+   bool drawToContainer = false;
+@@ -3534,7 +3562,8 @@
+ 
+     // get the toplevel window just in case someone needs to use it
+     // for setting transients or whatever.
+-    topLevelParent = GTK_WINDOW(gtk_widget_get_toplevel(parentMozContainer));
++    mToplevelParentWindow =
++        GTK_WINDOW(gtk_widget_get_toplevel(parentMozContainer));
+   }
+ 
+   if (!mIsX11Display) {
+@@ -3542,7 +3571,7 @@
+       // eWindowType_child is not supported on Wayland. Just switch to toplevel
+       // as a workaround.
+       mWindowType = eWindowType_toplevel;
+-    } else if (mWindowType == eWindowType_popup && !topLevelParent) {
++    } else if (mWindowType == eWindowType_popup && !mToplevelParentWindow) {
+       // Workaround for Wayland where the popup windows always need to have
+       // parent window. For example webrtc ui is a popup window without parent.
+       mWindowType = eWindowType_toplevel;
+@@ -3677,7 +3706,7 @@
+                                gdk_get_program_class());
+         gtk_window_set_type_hint(GTK_WINDOW(mShell),
+                                  GDK_WINDOW_TYPE_HINT_DIALOG);
+-        gtk_window_set_transient_for(GTK_WINDOW(mShell), topLevelParent);
++        gtk_window_set_transient_for(GTK_WINDOW(mShell), mToplevelParentWindow);
+       } else if (mWindowType == eWindowType_popup) {
+         gtk_window_set_wmclass(GTK_WINDOW(mShell), "Popup",
+                                gdk_get_program_class());
+@@ -3730,10 +3759,11 @@
+         }
+         gtk_window_set_type_hint(GTK_WINDOW(mShell), gtkTypeHint);
+ 
+-        if (topLevelParent) {
++        if (mToplevelParentWindow) {
+           LOG(("nsWindow::Create [%p] Set popup parent %p\n", (void*)this,
+-               topLevelParent));
+-          gtk_window_set_transient_for(GTK_WINDOW(mShell), topLevelParent);
++               mToplevelParentWindow));
++          gtk_window_set_transient_for(GTK_WINDOW(mShell),
++                                       mToplevelParentWindow);
+         }
+ 
+         // We need realized mShell at NativeMove().
+@@ -4011,7 +4041,8 @@
+ #endif
+   }
+ 
+-  LOG(("nsWindow [%p]\n", (void*)this));
++  LOG(("nsWindow [%p] %s\n", (void*)this,
++       mWindowType == eWindowType_toplevel ? "Toplevel" : "Popup"));
+   if (mShell) {
+     LOG(("\tmShell %p mContainer %p mGdkWindow %p 0x%lx\n", mShell, mContainer,
+          mGdkWindow, mIsX11Display ? gdk_x11_window_get_xid(mGdkWindow) : 0));
+
diff --git a/mozilla-1567434-2.patch b/mozilla-1567434-2.patch
new file mode 100644
index 0000000..966118a
--- /dev/null
+++ b/mozilla-1567434-2.patch
@@ -0,0 +1,35 @@
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
++++ b/widget/gtk/nsWindow.cpp
+@@ -1208,6 +1208,7 @@
+       if (frame) {
+         menuPopupFrame = do_QueryFrame(frame);
+       }
++
+       // The popup is not fully created yet (we're called from
+       // nsWindow::Create()) or we're toplevel popup without parent.
+       // In both cases just use parent which was passed to nsWindow::Create().
+@@ -1217,10 +1218,22 @@
+         return GTK_WIDGET(parentWidget);
+       }
+ 
++      LOG(("...[%p] is %s\n", (void*)this,
++           menuPopupFrame->IsContextMenu() ? "context menu" : "popup"));
++
+       nsWindow* parentWindow =
+           static_cast<nsWindow*>(menuPopupFrame->GetParentMenuWidget());
+       LOG(("...[%p] GetParentMenuWidget() = %p\n", (void*)this, parentWindow));
+ 
++      // If the popup is a regular menu but GetParentMenuWidget() returns
++      // nullptr which means it's connected non-menu parent
++      // (bookmark toolbar for instance).
++      // In this case use a parent given at nsWindow::Create().
++      if (!parentWindow && !menuPopupFrame->IsContextMenu()) {
++        parentWindow =
++            get_window_for_gtk_widget(GTK_WIDGET(mToplevelParentWindow));
++      }
++
+       if (!parentWindow) {
+         LOG(("...[%p] using active/visible popups as a parent [%p]\n",
+              (void*)this, gVisibleWaylandPopupWindows->data));
+
diff --git a/mozilla-1573813.patch b/mozilla-1573813.patch
new file mode 100644
index 0000000..e9fca07
--- /dev/null
+++ b/mozilla-1573813.patch
@@ -0,0 +1,29 @@
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
++++ b/widget/gtk/nsWindow.cpp
+@@ -6577,11 +6577,22 @@
+ }
+ 
+ gint nsWindow::GdkScaleFactor() {
++  // For popup windows with parent window we need to get scale factor of the
++  // parent window. Otherwise the scale factor of the popup is not updated
++  // during it's hidden.
++  GdkWindow* scaledGdkWindow = mGdkWindow;
++  if (mToplevelParentWindow) {
++    scaledGdkWindow = gtk_widget_get_window(GTK_WIDGET(mToplevelParentWindow));
++    // Fallback for windows which parent has been unrealized.
++    if (!scaledGdkWindow) {
++      scaledGdkWindow = mGdkWindow;
++    }
++  }
+   // Available as of GTK 3.10+
+   static auto sGdkWindowGetScaleFactorPtr =
+       (gint(*)(GdkWindow*))dlsym(RTLD_DEFAULT, "gdk_window_get_scale_factor");
+-  if (sGdkWindowGetScaleFactorPtr && mGdkWindow)
+-    return (*sGdkWindowGetScaleFactorPtr)(mGdkWindow);
++  if (sGdkWindowGetScaleFactorPtr && scaledGdkWindow)
++    return (*sGdkWindowGetScaleFactorPtr)(scaledGdkWindow);
+   return ScreenHelperGTK::GetGTKMonitorScaleFactor();
+ }
+ 
+
diff --git a/sources b/sources
index 1bfcc4b..e77e6c4 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = b0df3a8624efc488726211c99ac8a69c928d0bef24c2f7eafc6971be7ce2fafd54fba9330afd7e61ffe3a0d799bc5d994fa9f11f2da88cd93924c9347bfc4355
-SHA512 (icecat-68.0.2-gnu3.tar.bz2) = 88cb18f8097c3581ef9cecad21a682e23512549bac411217fcbd4789d57f21744aab165d52aa2e5c1538ce877e58fd2f3b3d802d9ad8f47bf37b867bcbc4b28f
-SHA512 (icecat-68.0.2-langpacks.tar.gz) = 4361c78b48ef0a9792d0fdba03c2ea7c4f880ba083d62e5ca83c9f65ec4cc3917b4020ebe16bb1a07faa780633c8e25aa7369f289ff54c0472158f993e703f1f
+SHA512 (cbindgen-vendor.tar.xz) = 2daac8505b71c9672020b6d407f8ec826cc978629a2e44857f5e80a8cedc79162aea2fb01179683542e505148249827523e59e58e9c54ab0d298c5d07a555f10
+SHA512 (icecat-68.1.0-gnu1.tar.bz2) = b04cb30a1a40c97fc1a38e67836c401230612645dfe2815ac634977362c4ef2883d6b15eaa094092ea44d75de768ac7c725c4897cb1210334081781f61d843e0
+SHA512 (icecat-68.1.0-langpacks.tar.gz) = ecda5e45c39ebcb366aa13e1d58d849acf8b8b21066ef5e0784c0e46e0900fe96e48f88a7fb1877f2778dac0300d792663eac00d516cd65eef51736d7f9880b1
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From c0c70fa2c937dac5921096c1e359bc3bf8ce6d92 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 3 Sep 2019 14:03:13 +0200
Subject: [PATCH 067/473] Do not patch (1512162) PPC64 builds

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index ee400de..42f5aff 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -378,7 +378,7 @@ tar -xf %{SOURCE5}
 %endif
 
 %ifarch ppc64 ppc64le
-%patch423 -p1 -b .1512162
+#%%patch423 -p1 -b .1512162
 %endif
 %patch424 -p1 -b .mozilla-1566876-webrtc-ind
 %patch425 -p1 -b .mozilla-1568569

From 34038568c190f0a7b656811a9d060161b38a2072 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 3 Sep 2019 18:38:38 +0200
Subject: [PATCH 068/473] Fix latest changelog entry

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 42f5aff..d015b21 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -815,7 +815,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %changelog
 * Tue Sep 03 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.1.0-1.gnu1
 - Mozilla release 68.1.0
-- Inglobe Wayland patches from Firefox 68
+- Incorporate Wayland patches from Firefox 68
 
 * Sun Sep 01 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-5.gnu3
 - Rebuild after retiring of Python2

From 06e06c631a88a7b1bb5f2ed0a653e11c09ca03e4 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 4 Sep 2019 12:47:51 +0200
Subject: [PATCH 069/473] Reintroduce icecat.rpmlintrc

---
 icecat.rpmlintrc | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 icecat.rpmlintrc

diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
new file mode 100644
index 0000000..c2c8f6f
--- /dev/null
+++ b/icecat.rpmlintrc
@@ -0,0 +1,40 @@
+# Whitelisting errors
+# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
+# Edited by sagitter (sagitter AT fedoraproject dot org)
+
+# KNOWN BUGS:
+#
+
+# TESTS:
+##### SRPMs #####
+
+# ifarch applied patches are okay
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
+addFilter(r'(%ifarch-applied-patch) Patch*')
+
+# ERRORS:
+##### RPMs  #####
+
+# chroot function (??)
+addFilter(r'(missing-call-to-chdir-with-chroot) %{_libdir}/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) %{_libdir}/icecat/libxul.so')
+
+# Expected on FF browser
+# https://support.mozilla.org/en-US/questions/1045418
+addFilter(r'(zero-length) %{_libdir}/icecat/chrome.manifest')
+addFilter(r'(zero-length) %{_libdir}/icecat/browser/chrome.manifest')
+
+# False positive
+addFilter(r'(dangling-symlink) %{_libdir}/icecat/dictionaries %{_datadir}/myspell')
+addFilter(r'(unversioned-explicit-provides) webclient')
+
+# WARNINGS:
+##### RPMs  #####
+
+addFilter(r'(no-manual-page-for-binary) icecat-wayland')
+
+##### SRPMs #####
+# Different file size due to the signature of the source code tarbz archive
+addFilter(r'file-size-mismatch')
+
+addFilter(r'(invalid-url) Source*')

From 43d5b0d92fc46881b7411ca8fd879fea961e12e7 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 4 Sep 2019 12:49:49 +0200
Subject: [PATCH 070/473] Reintroduce icecat.rpmlintrc

---
 icecat.rpmlintrc | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 icecat.rpmlintrc

diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
new file mode 100644
index 0000000..c2c8f6f
--- /dev/null
+++ b/icecat.rpmlintrc
@@ -0,0 +1,40 @@
+# Whitelisting errors
+# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
+# Edited by sagitter (sagitter AT fedoraproject dot org)
+
+# KNOWN BUGS:
+#
+
+# TESTS:
+##### SRPMs #####
+
+# ifarch applied patches are okay
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
+addFilter(r'(%ifarch-applied-patch) Patch*')
+
+# ERRORS:
+##### RPMs  #####
+
+# chroot function (??)
+addFilter(r'(missing-call-to-chdir-with-chroot) %{_libdir}/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) %{_libdir}/icecat/libxul.so')
+
+# Expected on FF browser
+# https://support.mozilla.org/en-US/questions/1045418
+addFilter(r'(zero-length) %{_libdir}/icecat/chrome.manifest')
+addFilter(r'(zero-length) %{_libdir}/icecat/browser/chrome.manifest')
+
+# False positive
+addFilter(r'(dangling-symlink) %{_libdir}/icecat/dictionaries %{_datadir}/myspell')
+addFilter(r'(unversioned-explicit-provides) webclient')
+
+# WARNINGS:
+##### RPMs  #####
+
+addFilter(r'(no-manual-page-for-binary) icecat-wayland')
+
+##### SRPMs #####
+# Different file size due to the signature of the source code tarbz archive
+addFilter(r'file-size-mismatch')
+
+addFilter(r'(invalid-url) Source*')

From 89598c0f2bf5a3c9e6a605b1824ec2bfee10c759 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 23 Oct 2019 12:04:08 +0200
Subject: [PATCH 071/473] Mozilla release 68.2.0

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.rpmlintrc        | 40 ----------------------------------------
 icecat.spec             |  5 ++++-
 sources                 |  4 ++--
 5 files changed, 9 insertions(+), 44 deletions(-)
 delete mode 100644 icecat.rpmlintrc

diff --git a/.gitignore b/.gitignore
index 722505b..654d0b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,5 @@
 /icecat-68.0.2-gnu3.tar.bz2
 /icecat-68.1.0-gnu1.tar.bz2
 /icecat-68.1.0-langpacks.tar.gz
+/icecat-68.2.0-gnu1.tar.bz2
+/icecat-68.2.0-langpacks.tar.gz
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 87c6659..9a8708d 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=68.1.0
+VERSION=68.2.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
deleted file mode 100644
index c2c8f6f..0000000
--- a/icecat.rpmlintrc
+++ /dev/null
@@ -1,40 +0,0 @@
-# Whitelisting errors
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-# Edited by sagitter (sagitter AT fedoraproject dot org)
-
-# KNOWN BUGS:
-#
-
-# TESTS:
-##### SRPMs #####
-
-# ifarch applied patches are okay
-# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
-addFilter(r'(%ifarch-applied-patch) Patch*')
-
-# ERRORS:
-##### RPMs  #####
-
-# chroot function (??)
-addFilter(r'(missing-call-to-chdir-with-chroot) %{_libdir}/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) %{_libdir}/icecat/libxul.so')
-
-# Expected on FF browser
-# https://support.mozilla.org/en-US/questions/1045418
-addFilter(r'(zero-length) %{_libdir}/icecat/chrome.manifest')
-addFilter(r'(zero-length) %{_libdir}/icecat/browser/chrome.manifest')
-
-# False positive
-addFilter(r'(dangling-symlink) %{_libdir}/icecat/dictionaries %{_datadir}/myspell')
-addFilter(r'(unversioned-explicit-provides) webclient')
-
-# WARNINGS:
-##### RPMs  #####
-
-addFilter(r'(no-manual-page-for-binary) icecat-wayland')
-
-##### SRPMs #####
-# Different file size due to the signature of the source code tarbz archive
-addFilter(r'file-size-mismatch')
-
-addFilter(r'(invalid-url) Source*')
diff --git a/icecat.spec b/icecat.spec
index d015b21..5c9284f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -83,7 +83,7 @@ ExcludeArch: s390x
 %global gnu_ver gnu1
 
 Name: icecat
-Version: 68.1.0
+Version: 68.2.0
 Release: 1.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -813,6 +813,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Tue Oct 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-1.gnu1
+- Mozilla release 68.2.0
+
 * Tue Sep 03 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.1.0-1.gnu1
 - Mozilla release 68.1.0
 - Incorporate Wayland patches from Firefox 68
diff --git a/sources b/sources
index e77e6c4..c867c07 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 2daac8505b71c9672020b6d407f8ec826cc978629a2e44857f5e80a8cedc79162aea2fb01179683542e505148249827523e59e58e9c54ab0d298c5d07a555f10
-SHA512 (icecat-68.1.0-gnu1.tar.bz2) = b04cb30a1a40c97fc1a38e67836c401230612645dfe2815ac634977362c4ef2883d6b15eaa094092ea44d75de768ac7c725c4897cb1210334081781f61d843e0
-SHA512 (icecat-68.1.0-langpacks.tar.gz) = ecda5e45c39ebcb366aa13e1d58d849acf8b8b21066ef5e0784c0e46e0900fe96e48f88a7fb1877f2778dac0300d792663eac00d516cd65eef51736d7f9880b1
+SHA512 (icecat-68.2.0-gnu1.tar.bz2) = b478af0c0c618108e5995f857eda44da0d33c83bc19870d020f25177a35235d3353af3257b60435dd6a1b8721728537de2f06e5da80ed260c56afac40012f511
+SHA512 (icecat-68.2.0-langpacks.tar.gz) = a13a29071114438795c0a6c8bf5bd2cecc50e18a0d9298641cacc27989bfc1613c0632b66da71895cc48db76a1e7e5b10cdccd96a262f4af9d5e6844461a4c7c
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 6dd5e95df7f949057b640899ef489601215e5be3 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 23 Oct 2019 12:05:17 +0200
Subject: [PATCH 072/473] Include icecat.rpmlintrc

---
 icecat.rpmlintrc | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 icecat.rpmlintrc

diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
new file mode 100644
index 0000000..c2c8f6f
--- /dev/null
+++ b/icecat.rpmlintrc
@@ -0,0 +1,40 @@
+# Whitelisting errors
+# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
+# Edited by sagitter (sagitter AT fedoraproject dot org)
+
+# KNOWN BUGS:
+#
+
+# TESTS:
+##### SRPMs #####
+
+# ifarch applied patches are okay
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
+addFilter(r'(%ifarch-applied-patch) Patch*')
+
+# ERRORS:
+##### RPMs  #####
+
+# chroot function (??)
+addFilter(r'(missing-call-to-chdir-with-chroot) %{_libdir}/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) %{_libdir}/icecat/libxul.so')
+
+# Expected on FF browser
+# https://support.mozilla.org/en-US/questions/1045418
+addFilter(r'(zero-length) %{_libdir}/icecat/chrome.manifest')
+addFilter(r'(zero-length) %{_libdir}/icecat/browser/chrome.manifest')
+
+# False positive
+addFilter(r'(dangling-symlink) %{_libdir}/icecat/dictionaries %{_datadir}/myspell')
+addFilter(r'(unversioned-explicit-provides) webclient')
+
+# WARNINGS:
+##### RPMs  #####
+
+addFilter(r'(no-manual-page-for-binary) icecat-wayland')
+
+##### SRPMs #####
+# Different file size due to the signature of the source code tarbz archive
+addFilter(r'file-size-mismatch')
+
+addFilter(r'(invalid-url) Source*')

From 5ca740adb9f347016dd8923af562451245990553 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 2 Nov 2019 13:59:27 +0100
Subject: [PATCH 073/473] Modify icecat.rpmlintrc

---
 icecat.rpmlintrc | 26 ++++++++++++++++----------
 icecat.spec      | 10 +++++-----
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
index c2c8f6f..4d7dde1 100644
--- a/icecat.rpmlintrc
+++ b/icecat.rpmlintrc
@@ -1,5 +1,6 @@
 # Whitelisting errors
 # https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
+# https://src.fedoraproject.org/rpms/python3/blob/master/f/python3.rpmlintrc
 # Edited by sagitter (sagitter AT fedoraproject dot org)
 
 # KNOWN BUGS:
@@ -11,30 +12,35 @@
 # ifarch applied patches are okay
 # https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
 addFilter(r'(%ifarch-applied-patch) Patch*')
+# Different file size due to the signature of the source code tarbz archive
+addFilter(r'file-size-mismatch')
+
+addFilter(r'(invalid-url) Source4')
+addFilter(r'(invalid-url) Source5')
+addFilter(r'(invalid-url) Source17')
 
 # ERRORS:
 ##### RPMs  #####
 
 # chroot function (??)
-addFilter(r'(missing-call-to-chdir-with-chroot) %{_libdir}/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) %{_libdir}/icecat/libxul.so')
+addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib(64)?/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib(64)?/icecat/libxul.so')
 
 # Expected on FF browser
 # https://support.mozilla.org/en-US/questions/1045418
-addFilter(r'(zero-length) %{_libdir}/icecat/chrome.manifest')
-addFilter(r'(zero-length) %{_libdir}/icecat/browser/chrome.manifest')
+addFilter(r'(zero-length) /usr/lib(64)?/icecat/chrome.manifest')
+addFilter(r'(zero-length) /usr/lib(64)?/icecat/browser/chrome.manifest')
+
+addFilter(r'E:library-not-linked-against-libc /usr/lib(64)?/icecat/gtk2/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib(64)?/icecat/libmozgtk.so')
 
 # False positive
-addFilter(r'(dangling-symlink) %{_libdir}/icecat/dictionaries %{_datadir}/myspell')
+addFilter(r'(dangling-symlink) /usr/lib(64)?/icecat/dictionaries /usr/share/myspell')
 addFilter(r'(unversioned-explicit-provides) webclient')
 
 # WARNINGS:
 ##### RPMs  #####
 
 addFilter(r'(no-manual-page-for-binary) icecat-wayland')
+addFilter(r'(no-manual-page-for-binary) icecat-x11')
 
-##### SRPMs #####
-# Different file size due to the signature of the source code tarbz archive
-addFilter(r'file-size-mismatch')
-
-addFilter(r'(invalid-url) Source*')
diff --git a/icecat.spec b/icecat.spec
index 5c9284f..d79f640 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -300,8 +300,8 @@ Extensions included to this version of IceCat:
    Stallman's article The JavaScript Trap
 
  * HTTPS Everywhere
-   HTTPS Everywhere is an extension that encrypts your communications with many major websites,
-   making your browsing more secure
+   HTTPS Everywhere is an extension that encrypts your communications with
+   many major websites, making your browsing more secure
 
  * Tor™ Browser Button
    Simple TOR network integration
@@ -316,14 +316,14 @@ Summary: GNU IceCat X11 launcher
 Requires: %{name}
 %description x11
 The %{name}-x11 package contains launcher and desktop file
-to run GNU IceCat natively on X11.
+to run GNU IceCat native on X11.
 %else
 %package wayland
 Summary: GNU IceCat Wayland launcher
 Requires: %{name}
 %description wayland
 The icecat-wayland package contains launcher and desktop file
-to run GNU IceCat natively on Wayland.
+to run GNU IceCat native on Wayland.
 %endif
 
 %prep
@@ -648,7 +648,7 @@ desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE14}
 
 rm -rf $RPM_BUILD_ROOT%{_bindir}/%{name}
 %{__sed} -e 's/__DEFAULT_WAYLAND__/%{wayland_default}/' \
-         -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE13} > %{buildroot}%{_bindir}/%{name}
+ -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE13} > %{buildroot}%{_bindir}/%{name}
 chmod 755 %{buildroot}%{_bindir}/%{name}
 
 %if 0%{?wayland_backend_default}

From 035510be6dd6a462c0f4a0bf790c1f8abafc3f6a Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 9 Nov 2019 15:39:09 +0100
Subject: [PATCH 074/473] Build release 68.2.0-gnu2

---
 .gitignore         |  1 +
 icecat.appdata.xml |  8 --------
 icecat.spec        | 23 ++++++++++-------------
 sources            |  2 +-
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 654d0b0..ce0d722 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,3 +92,4 @@
 /icecat-68.1.0-langpacks.tar.gz
 /icecat-68.2.0-gnu1.tar.bz2
 /icecat-68.2.0-langpacks.tar.gz
+/icecat-68.2.0-gnu2.tar.bz2
diff --git a/icecat.appdata.xml b/icecat.appdata.xml
index 686c9e7..c5eda54 100644
--- a/icecat.appdata.xml
+++ b/icecat.appdata.xml
@@ -49,17 +49,9 @@
        data needed during startup.
        </li>
        <li>
-       Tor™ Browser Button
-          Simple TOR network integration (requires running TOR separately at the operating system level)
-       </li>
-       <li>
        Searxes
           Third-party Request Blocker
        </li>
-       <li>
-       View Tube
-          Watch videos from video sharing websites with extra options
-       </li>
       </ul>
   </description>
   <url type="homepage">http://www.gnu.org/software/gnuzilla/</url>
diff --git a/icecat.spec b/icecat.spec
index d79f640..3fa1725 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -44,9 +44,9 @@
 %global system_nss    1
 
 %if 0%{?system_nss}
-%global nspr_version 4.19
+%global nspr_version 4.21
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.40.1
+%global nss_version 3.45
 %global nss_build_version %{nss_version}
 %endif
 
@@ -54,11 +54,7 @@
 %bcond_without pulseaudio
 %bcond_without jack
 
-%if 0%{?fedora} > 29
-%global with_vpx      0
-%else
 %global with_vpx      1
-%endif
 
 %if 0%{?fedora} > 30
 %global wayland_backend_default 1
@@ -80,11 +76,11 @@ ExcludeArch: %{arm}
 ExcludeArch: s390x
 
 # Set new source-code build version
-%global gnu_ver gnu1
+%global gnu_ver gnu2
 
 Name: icecat
 Version: 68.2.0
-Release: 1.%{gnu_ver}%{?dist}
+Release: 2.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -284,7 +280,7 @@ Requires: fedora-bookmarks
 Suggests: mozilla-ublock-origin
 
 Provides: webclient
-Provides: mozilla-https-everywhere = 20190131
+Provides: mozilla-https-everywhere = 20191107
 
 %description
 GNUZilla Icecat is a fully-free fork of Mozilla Firefox ESR.
@@ -303,10 +299,6 @@ Extensions included to this version of IceCat:
    HTTPS Everywhere is an extension that encrypts your communications with
    many major websites, making your browsing more secure
 
- * Tor™ Browser Button
-   Simple TOR network integration
-   (requires running TOR separately at the operating system level)
-
  * Searxes
    Third-party Request Blocker
 
@@ -813,6 +805,11 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Fri Nov 08 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-2.gnu2
+- Build release 68.2.0-gnu2
+- HTTPS-Everywhere 2019_11_7
+- Use always system vpx (Fedora 30+)
+
 * Tue Oct 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-1.gnu1
 - Mozilla release 68.2.0
 
diff --git a/sources b/sources
index c867c07..53c7dd8 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 2daac8505b71c9672020b6d407f8ec826cc978629a2e44857f5e80a8cedc79162aea2fb01179683542e505148249827523e59e58e9c54ab0d298c5d07a555f10
-SHA512 (icecat-68.2.0-gnu1.tar.bz2) = b478af0c0c618108e5995f857eda44da0d33c83bc19870d020f25177a35235d3353af3257b60435dd6a1b8721728537de2f06e5da80ed260c56afac40012f511
+SHA512 (icecat-68.2.0-gnu2.tar.bz2) = 1db3e55f774b30552cd7bf94de1ebe27e8ceedcac349f2e7419626d818aeaff53de2257064a79070a9324c6635b417f74b33e482d2c4d860f11c9b22dce4949d
 SHA512 (icecat-68.2.0-langpacks.tar.gz) = a13a29071114438795c0a6c8bf5bd2cecc50e18a0d9298641cacc27989bfc1613c0632b66da71895cc48db76a1e7e5b10cdccd96a262f4af9d5e6844461a4c7c
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From e4f3aeecf8f94166e91589e2dcd60037a4ebab82 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 9 Nov 2019 18:15:31 +0100
Subject: [PATCH 075/473] Patched for Mozilla bug #1556602

---
 icecat.spec           |    3 +
 mozilla-1556602.patch | 1154 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1157 insertions(+)
 create mode 100644 mozilla-1556602.patch

diff --git a/icecat.spec b/icecat.spec
index 3fa1725..68da9e8 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -164,6 +164,7 @@ Patch226: rhbz-1354671.patch
 #Patch413: mozilla-1353817.patch
 Patch414: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
 Patch417: bug1375074-save-restore-x28.patch
+Patch418: mozilla-1556602.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
@@ -372,6 +373,7 @@ tar -xf %{SOURCE5}
 %ifarch ppc64 ppc64le
 #%%patch423 -p1 -b .1512162
 %endif
+%patch418 -p1 -b .mozilla-1556602
 %patch424 -p1 -b .mozilla-1566876-webrtc-ind
 %patch425 -p1 -b .mozilla-1568569
 
@@ -809,6 +811,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - Build release 68.2.0-gnu2
 - HTTPS-Everywhere 2019_11_7
 - Use always system vpx (Fedora 30+)
+- Patched for Mozilla bug #1556602
 
 * Tue Oct 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-1.gnu1
 - Mozilla release 68.2.0
diff --git a/mozilla-1556602.patch b/mozilla-1556602.patch
new file mode 100644
index 0000000..d3f07bf
--- /dev/null
+++ b/mozilla-1556602.patch
@@ -0,0 +1,1154 @@
+
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio@crisal.io>
+# Date 1560893536 0
+# Node ID 046dd0da3b8e606ae33895248cd41e4ef03a4fcc
+# Parent  8567a308ac7a8e2087903aedd1d92032c9c7eb60
+Bug 1556602 - Fix various warnings with rust 1.37 nightly. r=froydnj
+
+In particular:
+
+ * trait objects without an explicit `dyn` are deprecated
+ * `...` range patterns are deprecated
+
+I think these shouldn't really warn by default and should be clippy / opt-in
+lints, but anyway, doesn't hurt.
+
+Differential Revision: https://phabricator.services.mozilla.com/D35135
+
+diff --git a/media/webrtc/signaling/src/sdp/rsdparsa_capi/src/lib.rs b/media/webrtc/signaling/src/sdp/rsdparsa_capi/src/lib.rs
+--- a/media/webrtc/signaling/src/sdp/rsdparsa_capi/src/lib.rs
++++ b/media/webrtc/signaling/src/sdp/rsdparsa_capi/src/lib.rs
+@@ -180,17 +180,17 @@ pub unsafe extern "C" fn sdp_add_media_s
+       }
+     };
+ 
+     // Check that the provided address type is valid. The rust parser will find out
+     // on his own which address type was provided
+     match addr_type {
+       // enum AddrType { kAddrTypeNone, kIPv4, kIPv6 };
+       // kAddrTypeNone is explicitly not covered as it is an 'invalid' flag
+-      1...2 => (),
++      1 | 2 => (),
+       _ => {
+           return NS_ERROR_INVALID_ARG;
+       }
+     }
+ 
+     match (*session).add_media(media_type, direction, port as u32, protocol, addr_str) {
+         Ok(_) => NS_OK,
+         Err(_) => NS_ERROR_INVALID_ARG
+diff --git a/servo/components/malloc_size_of/lib.rs b/servo/components/malloc_size_of/lib.rs
+--- a/servo/components/malloc_size_of/lib.rs
++++ b/servo/components/malloc_size_of/lib.rs
+@@ -87,17 +87,17 @@ use std::ops::Range;
+ use std::ops::{Deref, DerefMut};
+ use std::os::raw::c_void;
+ use void::Void;
+ 
+ /// A C function that takes a pointer to a heap allocation and returns its size.
+ type VoidPtrToSizeFn = unsafe extern "C" fn(ptr: *const c_void) -> usize;
+ 
+ /// A closure implementing a stateful predicate on pointers.
+-type VoidPtrToBoolFnMut = FnMut(*const c_void) -> bool;
++type VoidPtrToBoolFnMut = dyn FnMut(*const c_void) -> bool;
+ 
+ /// Operations used when measuring heap usage of data structures.
+ pub struct MallocSizeOfOps {
+     /// A function that returns the size of a heap allocation.
+     size_of_op: VoidPtrToSizeFn,
+ 
+     /// Like `size_of_op`, but can take an interior pointer. Optional because
+     /// not all allocators support this operation. If it's not provided, some
+diff --git a/servo/components/selectors/context.rs b/servo/components/selectors/context.rs
+--- a/servo/components/selectors/context.rs
++++ b/servo/components/selectors/context.rs
+@@ -129,17 +129,17 @@ where
+     /// MatchingContext immutable again.
+     nesting_level: usize,
+ 
+     /// Whether we're inside a negation or not.
+     in_negation: bool,
+ 
+     /// An optional hook function for checking whether a pseudo-element
+     /// should match when matching_mode is ForStatelessPseudoElement.
+-    pub pseudo_element_matching_fn: Option<&'a Fn(&Impl::PseudoElement) -> bool>,
++    pub pseudo_element_matching_fn: Option<&'a dyn Fn(&Impl::PseudoElement) -> bool>,
+ 
+     /// Extra implementation-dependent matching data.
+     pub extra_data: Impl::ExtraMatchingData,
+ 
+     quirks_mode: QuirksMode,
+     classes_and_ids_case_sensitivity: CaseSensitivity,
+     _impl: ::std::marker::PhantomData<Impl>,
+ }
+diff --git a/servo/components/style/animation.rs b/servo/components/style/animation.rs
+--- a/servo/components/style/animation.rs
++++ b/servo/components/style/animation.rs
+@@ -483,17 +483,17 @@ pub fn start_transitions_if_applicable(
+     had_animations
+ }
+ 
+ fn compute_style_for_animation_step<E>(
+     context: &SharedStyleContext,
+     step: &KeyframesStep,
+     previous_style: &ComputedValues,
+     style_from_cascade: &Arc<ComputedValues>,
+-    font_metrics_provider: &FontMetricsProvider,
++    font_metrics_provider: &dyn FontMetricsProvider,
+ ) -> Arc<ComputedValues>
+ where
+     E: TElement,
+ {
+     match step.value {
+         KeyframesStepValue::ComputedValues => style_from_cascade.clone(),
+         KeyframesStepValue::Declarations {
+             block: ref declarations,
+@@ -668,17 +668,17 @@ pub enum AnimationUpdate {
+ /// transitions in response to a style change (that is,
+ /// consider_starting_transitions + maybe_start_animations, but handling
+ /// canceled animations, duration changes, etc, there instead of here), and this
+ /// function should be only about the style update in response of a transition.
+ pub fn update_style_for_animation<E>(
+     context: &SharedStyleContext,
+     animation: &Animation,
+     style: &mut Arc<ComputedValues>,
+-    font_metrics_provider: &FontMetricsProvider,
++    font_metrics_provider: &dyn FontMetricsProvider,
+ ) -> AnimationUpdate
+ where
+     E: TElement,
+ {
+     debug!("update_style_for_animation: {:?}", animation);
+     debug_assert!(!animation.is_expired());
+ 
+     match *animation {
+diff --git a/servo/components/style/parser.rs b/servo/components/style/parser.rs
+--- a/servo/components/style/parser.rs
++++ b/servo/components/style/parser.rs
+@@ -46,33 +46,33 @@ pub struct ParserContext<'a> {
+     pub url_data: &'a UrlExtraData,
+     /// The current rule type, if any.
+     pub rule_type: Option<CssRuleType>,
+     /// The mode to use when parsing.
+     pub parsing_mode: ParsingMode,
+     /// The quirks mode of this stylesheet.
+     pub quirks_mode: QuirksMode,
+     /// The active error reporter, or none if error reporting is disabled.
+-    error_reporter: Option<&'a ParseErrorReporter>,
++    error_reporter: Option<&'a dyn ParseErrorReporter>,
+     /// The currently active namespaces.
+     pub namespaces: Option<&'a Namespaces>,
+     /// The use counters we want to record while parsing style rules, if any.
+     pub use_counters: Option<&'a UseCounters>,
+ }
+ 
+ impl<'a> ParserContext<'a> {
+     /// Create a parser context.
+     #[inline]
+     pub fn new(
+         stylesheet_origin: Origin,
+         url_data: &'a UrlExtraData,
+         rule_type: Option<CssRuleType>,
+         parsing_mode: ParsingMode,
+         quirks_mode: QuirksMode,
+-        error_reporter: Option<&'a ParseErrorReporter>,
++        error_reporter: Option<&'a dyn ParseErrorReporter>,
+         use_counters: Option<&'a UseCounters>,
+     ) -> Self {
+         Self {
+             stylesheet_origin,
+             url_data,
+             rule_type,
+             parsing_mode,
+             quirks_mode,
+@@ -84,17 +84,17 @@ impl<'a> ParserContext<'a> {
+ 
+     /// Create a parser context for on-the-fly parsing in CSSOM
+     #[inline]
+     pub fn new_for_cssom(
+         url_data: &'a UrlExtraData,
+         rule_type: Option<CssRuleType>,
+         parsing_mode: ParsingMode,
+         quirks_mode: QuirksMode,
+-        error_reporter: Option<&'a ParseErrorReporter>,
++        error_reporter: Option<&'a dyn ParseErrorReporter>,
+         use_counters: Option<&'a UseCounters>,
+     ) -> Self {
+         Self::new(
+             Origin::Author,
+             url_data,
+             rule_type,
+             parsing_mode,
+             quirks_mode,
+diff --git a/servo/components/style/properties/cascade.rs b/servo/components/style/properties/cascade.rs
+--- a/servo/components/style/properties/cascade.rs
++++ b/servo/components/style/properties/cascade.rs
+@@ -77,17 +77,17 @@ pub fn cascade<E>(
+     device: &Device,
+     pseudo: Option<&PseudoElement>,
+     rule_node: &StrongRuleNode,
+     guards: &StylesheetGuards,
+     parent_style: Option<&ComputedValues>,
+     parent_style_ignoring_first_line: Option<&ComputedValues>,
+     layout_parent_style: Option<&ComputedValues>,
+     visited_rules: Option<&StrongRuleNode>,
+-    font_metrics_provider: &FontMetricsProvider,
++    font_metrics_provider: &dyn FontMetricsProvider,
+     quirks_mode: QuirksMode,
+     rule_cache: Option<&RuleCache>,
+     rule_cache_conditions: &mut RuleCacheConditions,
+     element: Option<E>,
+ ) -> Arc<ComputedValues>
+ where
+     E: TElement,
+ {
+@@ -111,17 +111,17 @@ where
+ fn cascade_rules<E>(
+     device: &Device,
+     pseudo: Option<&PseudoElement>,
+     rule_node: &StrongRuleNode,
+     guards: &StylesheetGuards,
+     parent_style: Option<&ComputedValues>,
+     parent_style_ignoring_first_line: Option<&ComputedValues>,
+     layout_parent_style: Option<&ComputedValues>,
+-    font_metrics_provider: &FontMetricsProvider,
++    font_metrics_provider: &dyn FontMetricsProvider,
+     cascade_mode: CascadeMode,
+     quirks_mode: QuirksMode,
+     rule_cache: Option<&RuleCache>,
+     rule_cache_conditions: &mut RuleCacheConditions,
+     element: Option<E>,
+ ) -> Arc<ComputedValues>
+ where
+     E: TElement,
+@@ -208,17 +208,17 @@ pub fn apply_declarations<'a, E, F, I>(
+     device: &Device,
+     pseudo: Option<&PseudoElement>,
+     rules: &StrongRuleNode,
+     guards: &StylesheetGuards,
+     iter_declarations: F,
+     parent_style: Option<&ComputedValues>,
+     parent_style_ignoring_first_line: Option<&ComputedValues>,
+     layout_parent_style: Option<&ComputedValues>,
+-    font_metrics_provider: &FontMetricsProvider,
++    font_metrics_provider: &dyn FontMetricsProvider,
+     cascade_mode: CascadeMode,
+     quirks_mode: QuirksMode,
+     rule_cache: Option<&RuleCache>,
+     rule_cache_conditions: &mut RuleCacheConditions,
+     element: Option<E>,
+ ) -> Arc<ComputedValues>
+ where
+     E: TElement,
+diff --git a/servo/components/style/properties/declaration_block.rs b/servo/components/style/properties/declaration_block.rs
+--- a/servo/components/style/properties/declaration_block.rs
++++ b/servo/components/style/properties/declaration_block.rs
+@@ -1194,17 +1194,17 @@ where
+ /// A helper to parse the style attribute of an element, in order for this to be
+ /// shared between Servo and Gecko.
+ ///
+ /// Inline because we call this cross-crate.
+ #[inline]
+ pub fn parse_style_attribute(
+     input: &str,
+     url_data: &UrlExtraData,
+-    error_reporter: Option<&ParseErrorReporter>,
++    error_reporter: Option<&dyn ParseErrorReporter>,
+     quirks_mode: QuirksMode,
+ ) -> PropertyDeclarationBlock {
+     let context = ParserContext::new(
+         Origin::Author,
+         url_data,
+         Some(CssRuleType::Style),
+         ParsingMode::DEFAULT,
+         quirks_mode,
+@@ -1221,17 +1221,17 @@ pub fn parse_style_attribute(
+ ///
+ /// This does not attempt to parse !important at all.
+ #[inline]
+ pub fn parse_one_declaration_into(
+     declarations: &mut SourcePropertyDeclaration,
+     id: PropertyId,
+     input: &str,
+     url_data: &UrlExtraData,
+-    error_reporter: Option<&ParseErrorReporter>,
++    error_reporter: Option<&dyn ParseErrorReporter>,
+     parsing_mode: ParsingMode,
+     quirks_mode: QuirksMode
+ ) -> Result<(), ()> {
+     let context = ParserContext::new(
+         Origin::Author,
+         url_data,
+         Some(CssRuleType::Style),
+         parsing_mode,
+diff --git a/servo/components/style/str.rs b/servo/components/style/str.rs
+--- a/servo/components/style/str.rs
++++ b/servo/components/style/str.rs
+@@ -55,17 +55,17 @@ pub fn split_html_space_chars<'a>(
+ #[inline]
+ pub fn split_commas<'a>(s: &'a str) -> Filter<Split<'a, char>, fn(&&str) -> bool> {
+     s.split(',').filter(not_empty as fn(&&str) -> bool)
+ }
+ 
+ /// Character is ascii digit
+ pub fn is_ascii_digit(c: &char) -> bool {
+     match *c {
+-        '0'...'9' => true,
++        '0'..='9' => true,
+         _ => false,
+     }
+ }
+ 
+ fn is_decimal_point(c: char) -> bool {
+     c == '.'
+ }
+ 
+@@ -156,17 +156,17 @@ where
+ /// Returns true if a given string has a given prefix with case-insensitive match.
+ pub fn starts_with_ignore_ascii_case(string: &str, prefix: &str) -> bool {
+     string.len() >= prefix.len() &&
+         string.as_bytes()[0..prefix.len()].eq_ignore_ascii_case(prefix.as_bytes())
+ }
+ 
+ /// Returns an ascii lowercase version of a string, only allocating if needed.
+ pub fn string_as_ascii_lowercase<'a>(input: &'a str) -> Cow<'a, str> {
+-    if input.bytes().any(|c| matches!(c, b'A'...b'Z')) {
++    if input.bytes().any(|c| matches!(c, b'A'..=b'Z')) {
+         input.to_ascii_lowercase().into()
+     } else {
+         // Already ascii lowercase.
+         Cow::Borrowed(input)
+     }
+ }
+ 
+ /// To avoid accidentally instantiating multiple monomorphizations of large
+diff --git a/servo/components/style/stylesheets/mod.rs b/servo/components/style/stylesheets/mod.rs
+--- a/servo/components/style/stylesheets/mod.rs
++++ b/servo/components/style/stylesheets/mod.rs
+@@ -347,17 +347,17 @@ impl CssRule {
+     ///
+     /// Input state is None for a nested rule
+     pub fn parse(
+         css: &str,
+         insert_rule_context: InsertRuleContext,
+         parent_stylesheet_contents: &StylesheetContents,
+         shared_lock: &SharedRwLock,
+         state: State,
+-        loader: Option<&StylesheetLoader>,
++        loader: Option<&dyn StylesheetLoader>,
+     ) -> Result<Self, RulesMutateError> {
+         let url_data = parent_stylesheet_contents.url_data.read();
+         let context = ParserContext::new(
+             parent_stylesheet_contents.origin,
+             &url_data,
+             None,
+             ParsingMode::DEFAULT,
+             parent_stylesheet_contents.quirks_mode,
+diff --git a/servo/components/style/stylesheets/rule_list.rs b/servo/components/style/stylesheets/rule_list.rs
+--- a/servo/components/style/stylesheets/rule_list.rs
++++ b/servo/components/style/stylesheets/rule_list.rs
+@@ -122,29 +122,29 @@ pub trait CssRulesHelpers {
+     /// instead, but that seems overkill.
+     fn insert_rule(
+         &self,
+         lock: &SharedRwLock,
+         rule: &str,
+         parent_stylesheet_contents: &StylesheetContents,
+         index: usize,
+         nested: bool,
+-        loader: Option<&StylesheetLoader>,
++        loader: Option<&dyn StylesheetLoader>,
+     ) -> Result<CssRule, RulesMutateError>;
+ }
+ 
+ impl CssRulesHelpers for RawOffsetArc<Locked<CssRules>> {
+     fn insert_rule(
+         &self,
+         lock: &SharedRwLock,
+         rule: &str,
+         parent_stylesheet_contents: &StylesheetContents,
+         index: usize,
+         nested: bool,
+-        loader: Option<&StylesheetLoader>,
++        loader: Option<&dyn StylesheetLoader>,
+     ) -> Result<CssRule, RulesMutateError> {
+         let new_rule = {
+             let read_guard = lock.read();
+             let rules = self.read_with(&read_guard);
+ 
+             // Step 1, 2
+             if index > rules.0.len() {
+                 return Err(RulesMutateError::IndexSize);
+diff --git a/servo/components/style/stylesheets/rule_parser.rs b/servo/components/style/stylesheets/rule_parser.rs
+--- a/servo/components/style/stylesheets/rule_parser.rs
++++ b/servo/components/style/stylesheets/rule_parser.rs
+@@ -39,17 +39,17 @@ pub struct InsertRuleContext<'a> {
+     pub index: usize,
+ }
+ 
+ /// The parser for the top-level rules in a stylesheet.
+ pub struct TopLevelRuleParser<'a> {
+     /// A reference to the lock we need to use to create rules.
+     pub shared_lock: &'a SharedRwLock,
+     /// A reference to a stylesheet loader if applicable, for `@import` rules.
+-    pub loader: Option<&'a StylesheetLoader>,
++    pub loader: Option<&'a dyn StylesheetLoader>,
+     /// The top-level parser context.
+     ///
+     /// This won't contain any namespaces, and only nested parsers created with
+     /// `ParserContext::new_with_rule_type` will.
+     pub context: ParserContext<'a>,
+     /// The current state of the parser.
+     pub state: State,
+     /// Whether we have tried to parse was invalid due to being in the wrong
+diff --git a/servo/components/style/stylesheets/stylesheet.rs b/servo/components/style/stylesheets/stylesheet.rs
+--- a/servo/components/style/stylesheets/stylesheet.rs
++++ b/servo/components/style/stylesheets/stylesheet.rs
+@@ -71,18 +71,18 @@ pub struct StylesheetContents {
+ impl StylesheetContents {
+     /// Parse a given CSS string, with a given url-data, origin, and
+     /// quirks mode.
+     pub fn from_str(
+         css: &str,
+         url_data: UrlExtraData,
+         origin: Origin,
+         shared_lock: &SharedRwLock,
+-        stylesheet_loader: Option<&StylesheetLoader>,
+-        error_reporter: Option<&ParseErrorReporter>,
++        stylesheet_loader: Option<&dyn StylesheetLoader>,
++        error_reporter: Option<&dyn ParseErrorReporter>,
+         quirks_mode: QuirksMode,
+         line_number_offset: u32,
+         use_counters: Option<&UseCounters>,
+     ) -> Self {
+         let namespaces = RwLock::new(Namespaces::default());
+         let (rules, source_map_url, source_url) = Stylesheet::parse_rules(
+             css,
+             &url_data,
+@@ -338,18 +338,18 @@ impl StylesheetInDocument for DocumentSt
+ }
+ 
+ impl Stylesheet {
+     /// Updates an empty stylesheet from a given string of text.
+     pub fn update_from_str(
+         existing: &Stylesheet,
+         css: &str,
+         url_data: UrlExtraData,
+-        stylesheet_loader: Option<&StylesheetLoader>,
+-        error_reporter: Option<&ParseErrorReporter>,
++        stylesheet_loader: Option<&dyn StylesheetLoader>,
++        error_reporter: Option<&dyn ParseErrorReporter>,
+         line_number_offset: u32,
+     ) {
+         let namespaces = RwLock::new(Namespaces::default());
+ 
+         // FIXME: Consider adding use counters to Servo?
+         let (rules, source_map_url, source_url) = Self::parse_rules(
+             css,
+             &url_data,
+@@ -377,18 +377,18 @@ impl Stylesheet {
+     }
+ 
+     fn parse_rules(
+         css: &str,
+         url_data: &UrlExtraData,
+         origin: Origin,
+         namespaces: &mut Namespaces,
+         shared_lock: &SharedRwLock,
+-        stylesheet_loader: Option<&StylesheetLoader>,
+-        error_reporter: Option<&ParseErrorReporter>,
++        stylesheet_loader: Option<&dyn StylesheetLoader>,
++        error_reporter: Option<&dyn ParseErrorReporter>,
+         quirks_mode: QuirksMode,
+         line_number_offset: u32,
+         use_counters: Option<&UseCounters>,
+     ) -> (Vec<CssRule>, Option<String>, Option<String>) {
+         let mut rules = Vec::new();
+         let mut input = ParserInput::new_with_line_number_offset(css, line_number_offset);
+         let mut input = Parser::new(&mut input);
+ 
+@@ -445,18 +445,18 @@ impl Stylesheet {
+     /// Effectively creates a new stylesheet and forwards the hard work to
+     /// `Stylesheet::update_from_str`.
+     pub fn from_str(
+         css: &str,
+         url_data: UrlExtraData,
+         origin: Origin,
+         media: Arc<Locked<MediaList>>,
+         shared_lock: SharedRwLock,
+-        stylesheet_loader: Option<&StylesheetLoader>,
+-        error_reporter: Option<&ParseErrorReporter>,
++        stylesheet_loader: Option<&dyn StylesheetLoader>,
++        error_reporter: Option<&dyn ParseErrorReporter>,
+         quirks_mode: QuirksMode,
+         line_number_offset: u32,
+     ) -> Self {
+         // FIXME: Consider adding use counters to Servo?
+         let contents = StylesheetContents::from_str(
+             css,
+             url_data,
+             origin,
+diff --git a/servo/components/style/stylist.rs b/servo/components/style/stylist.rs
+--- a/servo/components/style/stylist.rs
++++ b/servo/components/style/stylist.rs
+@@ -646,17 +646,17 @@ impl Stylist {
+ 
+     /// Computes the style for a given "precomputed" pseudo-element, taking the
+     /// universal rules and applying them.
+     pub fn precomputed_values_for_pseudo<E>(
+         &self,
+         guards: &StylesheetGuards,
+         pseudo: &PseudoElement,
+         parent: Option<&ComputedValues>,
+-        font_metrics: &FontMetricsProvider,
++        font_metrics: &dyn FontMetricsProvider,
+     ) -> Arc<ComputedValues>
+     where
+         E: TElement,
+     {
+         debug_assert!(pseudo.is_precomputed());
+ 
+         let rule_node = self.rule_node_for_precomputed_pseudo(guards, pseudo, None);
+ 
+@@ -674,17 +674,17 @@ impl Stylist {
+     ///
+     /// TODO(emilio): The type parameter could go away with a void type
+     /// implementing TElement.
+     pub fn precomputed_values_for_pseudo_with_rule_node<E>(
+         &self,
+         guards: &StylesheetGuards,
+         pseudo: &PseudoElement,
+         parent: Option<&ComputedValues>,
+-        font_metrics: &FontMetricsProvider,
++        font_metrics: &dyn FontMetricsProvider,
+         rules: StrongRuleNode,
+     ) -> Arc<ComputedValues>
+     where
+         E: TElement,
+     {
+         self.compute_pseudo_element_style_with_inputs::<E>(
+             CascadeInputs {
+                 rules: Some(rules),
+@@ -769,18 +769,18 @@ impl Stylist {
+     pub fn lazily_compute_pseudo_element_style<E>(
+         &self,
+         guards: &StylesheetGuards,
+         element: E,
+         pseudo: &PseudoElement,
+         rule_inclusion: RuleInclusion,
+         parent_style: &ComputedValues,
+         is_probe: bool,
+-        font_metrics: &FontMetricsProvider,
+-        matching_fn: Option<&Fn(&PseudoElement) -> bool>,
++        font_metrics: &dyn FontMetricsProvider,
++        matching_fn: Option<&dyn Fn(&PseudoElement) -> bool>,
+     ) -> Option<Arc<ComputedValues>>
+     where
+         E: TElement,
+     {
+         let cascade_inputs = self.lazy_pseudo_rules(
+             guards,
+             element,
+             parent_style,
+@@ -805,17 +805,17 @@ impl Stylist {
+     /// selector matching for eager pseudo-elements when we need to recompute
+     /// their style with a new parent style.
+     pub fn compute_pseudo_element_style_with_inputs<E>(
+         &self,
+         inputs: CascadeInputs,
+         pseudo: &PseudoElement,
+         guards: &StylesheetGuards,
+         parent_style: Option<&ComputedValues>,
+-        font_metrics: &FontMetricsProvider,
++        font_metrics: &dyn FontMetricsProvider,
+         element: Option<E>,
+     ) -> Arc<ComputedValues>
+     where
+         E: TElement,
+     {
+         // FIXME(emilio): The lack of layout_parent_style here could be
+         // worrying, but we're probably dropping the display fixup for
+         // pseudos other than before and after, so it's probably ok.
+@@ -858,17 +858,17 @@ impl Stylist {
+         &self,
+         element: Option<E>,
+         pseudo: Option<&PseudoElement>,
+         inputs: CascadeInputs,
+         guards: &StylesheetGuards,
+         parent_style: Option<&ComputedValues>,
+         parent_style_ignoring_first_line: Option<&ComputedValues>,
+         layout_parent_style: Option<&ComputedValues>,
+-        font_metrics: &FontMetricsProvider,
++        font_metrics: &dyn FontMetricsProvider,
+         rule_cache: Option<&RuleCache>,
+         rule_cache_conditions: &mut RuleCacheConditions,
+     ) -> Arc<ComputedValues>
+     where
+         E: TElement,
+     {
+         debug_assert!(pseudo.is_some() || element.is_some(), "Huh?");
+ 
+@@ -915,17 +915,17 @@ impl Stylist {
+     fn lazy_pseudo_rules<E>(
+         &self,
+         guards: &StylesheetGuards,
+         element: E,
+         parent_style: &ComputedValues,
+         pseudo: &PseudoElement,
+         is_probe: bool,
+         rule_inclusion: RuleInclusion,
+-        matching_fn: Option<&Fn(&PseudoElement) -> bool>,
++        matching_fn: Option<&dyn Fn(&PseudoElement) -> bool>,
+     ) -> Option<CascadeInputs>
+     where
+         E: TElement,
+     {
+         debug_assert!(pseudo.is_lazy());
+ 
+         // Apply the selector flags. We should be in sequential mode
+         // already, so we can directly apply the parent flags.
+diff --git a/servo/components/style/values/computed/mod.rs b/servo/components/style/values/computed/mod.rs
+--- a/servo/components/style/values/computed/mod.rs
++++ b/servo/components/style/values/computed/mod.rs
+@@ -142,17 +142,17 @@ pub struct Context<'a> {
+     /// painful.
+     ///
+     /// TODO(emilio): Make constructors for Context, and drop this.
+     #[cfg(feature = "servo")]
+     pub cached_system_font: Option<()>,
+ 
+     /// A font metrics provider, used to access font metrics to implement
+     /// font-relative units.
+-    pub font_metrics_provider: &'a FontMetricsProvider,
++    pub font_metrics_provider: &'a dyn FontMetricsProvider,
+ 
+     /// Whether or not we are computing the media list in a media query
+     pub in_media_query: bool,
+ 
+     /// The quirks mode of this context.
+     pub quirks_mode: QuirksMode,
+ 
+     /// Whether this computation is being done for a SMIL animation.
+diff --git a/servo/components/style_traits/specified_value_info.rs b/servo/components/style_traits/specified_value_info.rs
+--- a/servo/components/style_traits/specified_value_info.rs
++++ b/servo/components/style_traits/specified_value_info.rs
+@@ -22,17 +22,17 @@ pub mod CssType {
+     pub const COLOR: u8 = 1 << 0;
+     /// <gradient>
+     pub const GRADIENT: u8 = 1 << 1;
+     /// <timing-function>
+     pub const TIMING_FUNCTION: u8 = 1 << 2;
+ }
+ 
+ /// See SpecifiedValueInfo::collect_completion_keywords.
+-pub type KeywordsCollectFn<'a> = &'a mut FnMut(&[&'static str]);
++pub type KeywordsCollectFn<'a> = &'a mut dyn FnMut(&[&'static str]);
+ 
+ /// Information of values of a given specified value type.
+ ///
+ /// This trait is derivable with `#[derive(SpecifiedValueInfo)]`.
+ ///
+ /// The algorithm traverses the type definition. For `SUPPORTED_TYPES`,
+ /// it puts an or'ed value of `SUPPORTED_TYPES` of all types it finds.
+ /// For `collect_completion_keywords`, it recursively invokes this
+diff --git a/servo/ports/geckolib/glue.rs b/servo/ports/geckolib/glue.rs
+--- a/servo/ports/geckolib/glue.rs
++++ b/servo/ports/geckolib/glue.rs
+@@ -1378,28 +1378,28 @@ pub extern "C" fn Servo_StyleSheet_FromU
+             loader,
+             stylesheet,
+             load_data,
+             reusable_sheets,
+         ))
+     };
+ 
+     // FIXME(emilio): loader.as_ref() doesn't typecheck for some reason?
+-    let loader: Option<&StyleStylesheetLoader> = match loader {
++    let loader: Option<&dyn StyleStylesheetLoader> = match loader {
+         None => None,
+         Some(ref s) => Some(s),
+     };
+ 
+     Arc::new(StylesheetContents::from_str(
+         input,
+         url_data.clone(),
+         mode_to_origin(mode),
+         &global_style_data.shared_lock,
+         loader,
+-        reporter.as_ref().map(|r| r as &ParseErrorReporter),
++        reporter.as_ref().map(|r| r as &dyn ParseErrorReporter),
+         quirks_mode.into(),
+         line_number_offset,
+         use_counters,
+     ))
+     .into_strong()
+ }
+ 
+ #[no_mangle]
+@@ -1903,17 +1903,17 @@ pub extern "C" fn Servo_CssRules_InsertR
+             loader,
+             gecko_stylesheet,
+             ptr::null_mut(),
+             ptr::null_mut(),
+         ))
+     };
+     let loader = loader
+         .as_ref()
+-        .map(|loader| loader as &StyleStylesheetLoader);
++        .map(|loader| loader as &dyn StyleStylesheetLoader);
+     let rule = unsafe { rule.as_ref().unwrap().as_str_unchecked() };
+ 
+     let global_style_data = &*GLOBAL_STYLE_DATA;
+     let contents = StylesheetContents::as_arc(&contents);
+     let result = Locked::<CssRules>::as_arc(&rules).insert_rule(
+         &global_style_data.shared_lock,
+         rule,
+         contents,
+@@ -3583,17 +3583,17 @@ fn get_pseudo_style(
+     guard: &SharedRwLockReadGuard,
+     element: GeckoElement,
+     pseudo: &PseudoElement,
+     rule_inclusion: RuleInclusion,
+     styles: &ElementStyles,
+     inherited_styles: Option<&ComputedValues>,
+     doc_data: &PerDocumentStyleDataImpl,
+     is_probe: bool,
+-    matching_func: Option<&Fn(&PseudoElement) -> bool>,
++    matching_func: Option<&dyn Fn(&PseudoElement) -> bool>,
+ ) -> Option<Arc<ComputedValues>> {
+     let style = match pseudo.cascade_type() {
+         PseudoElementCascadeType::Eager => {
+             match *pseudo {
+                 PseudoElement::FirstLetter => {
+                     styles.pseudos.get(&pseudo).map(|pseudo_styles| {
+                         // inherited_styles can be None when doing lazy resolution
+                         // (e.g. for computed style) or when probing.  In that case
+@@ -3772,17 +3772,17 @@ pub unsafe extern "C" fn Servo_StyleSet_
+ 
+ fn parse_property_into(
+     declarations: &mut SourcePropertyDeclaration,
+     property_id: PropertyId,
+     value: *const nsACString,
+     data: *mut URLExtraData,
+     parsing_mode: structs::ParsingMode,
+     quirks_mode: QuirksMode,
+-    reporter: Option<&ParseErrorReporter>,
++    reporter: Option<&dyn ParseErrorReporter>,
+ ) -> Result<(), ()> {
+     let value = unsafe { value.as_ref().unwrap().as_str_unchecked() };
+     let url_data = unsafe { UrlExtraData::from_ptr_ref(&data) };
+     let parsing_mode = ParsingMode::from_bits_truncate(parsing_mode);
+ 
+     parse_one_declaration_into(
+         declarations,
+         property_id,
+@@ -3809,17 +3809,17 @@ pub extern "C" fn Servo_ParseProperty(
+     let reporter = ErrorReporter::new(ptr::null_mut(), loader, data);
+     let result = parse_property_into(
+         &mut declarations,
+         id,
+         value,
+         data,
+         parsing_mode,
+         quirks_mode.into(),
+-        reporter.as_ref().map(|r| r as &ParseErrorReporter),
++        reporter.as_ref().map(|r| r as &dyn ParseErrorReporter),
+     );
+ 
+     match result {
+         Ok(()) => {
+             let global_style_data = &*GLOBAL_STYLE_DATA;
+             let mut block = PropertyDeclarationBlock::new();
+             block.extend(declarations.drain(), Importance::Normal);
+             Arc::new(global_style_data.shared_lock.wrap(block)).into_strong()
+@@ -3961,17 +3961,17 @@ pub unsafe extern "C" fn Servo_ParseStyl
+ ) -> Strong<RawServoDeclarationBlock> {
+     let global_style_data = &*GLOBAL_STYLE_DATA;
+     let value = (*data).as_str_unchecked();
+     let reporter = ErrorReporter::new(ptr::null_mut(), loader, raw_extra_data);
+     let url_data = UrlExtraData::from_ptr_ref(&raw_extra_data);
+     Arc::new(global_style_data.shared_lock.wrap(parse_style_attribute(
+         value,
+         url_data,
+-        reporter.as_ref().map(|r| r as &ParseErrorReporter),
++        reporter.as_ref().map(|r| r as &dyn ParseErrorReporter),
+         quirks_mode.into(),
+     )))
+     .into_strong()
+ }
+ 
+ #[no_mangle]
+ pub extern "C" fn Servo_DeclarationBlock_CreateEmpty() -> Strong<RawServoDeclarationBlock> {
+     let global_style_data = &*GLOBAL_STYLE_DATA;
+@@ -4190,17 +4190,17 @@ fn set_property(
+     let reporter = ErrorReporter::new(ptr::null_mut(), loader, data);
+     let result = parse_property_into(
+         &mut source_declarations,
+         property_id,
+         value,
+         data,
+         parsing_mode,
+         quirks_mode,
+-        reporter.as_ref().map(|r| r as &ParseErrorReporter),
++        reporter.as_ref().map(|r| r as &dyn ParseErrorReporter),
+     );
+ 
+     if result.is_err() {
+         return false;
+     }
+ 
+     let importance = if is_important {
+         Importance::Important
+@@ -5224,17 +5224,17 @@ fn simulate_compute_values_failure(prope
+ 
+ #[cfg(not(feature = "gecko_debug"))]
+ fn simulate_compute_values_failure(_: &PropertyValuePair) -> bool {
+     false
+ }
+ 
+ fn create_context_for_animation<'a>(
+     per_doc_data: &'a PerDocumentStyleDataImpl,
+-    font_metrics_provider: &'a FontMetricsProvider,
++    font_metrics_provider: &'a dyn FontMetricsProvider,
+     style: &'a ComputedValues,
+     parent_style: Option<&'a ComputedValues>,
+     for_smil_animation: bool,
+     rule_cache_conditions: &'a mut RuleCacheConditions,
+ ) -> Context<'a> {
+     Context {
+         is_root_element: false,
+         builder: StyleBuilder::for_animation(per_doc_data.stylist.device(), style, parent_style),
+@@ -6158,17 +6158,17 @@ pub unsafe extern "C" fn Servo_SelectorL
+ 
+ #[no_mangle]
+ pub unsafe extern "C" fn Servo_SelectorList_Drop(list: *mut RawServoSelectorList) {
+     SelectorList::drop_ffi(list)
+ }
+ 
+ fn parse_color(
+     value: &str,
+-    error_reporter: Option<&ParseErrorReporter>,
++    error_reporter: Option<&dyn ParseErrorReporter>,
+ ) -> Result<specified::Color, ()> {
+     let mut input = ParserInput::new(value);
+     let mut parser = Parser::new(&mut input);
+     let url_data = unsafe { dummy_url_data() };
+     let context = ParserContext::new(
+         Origin::Author,
+         url_data,
+         Some(CssRuleType::Style),
+@@ -6222,17 +6222,17 @@ pub extern "C" fn Servo_ComputeColor(
+     let value = unsafe { (*value).to_string() };
+     let result_color = unsafe { result_color.as_mut().unwrap() };
+ 
+     let reporter = unsafe { loader.as_mut() }.and_then(|loader| {
+         // Make an ErrorReporter that will report errors as being "from DOM".
+         ErrorReporter::new(ptr::null_mut(), loader, ptr::null_mut())
+     });
+ 
+-    match parse_color(&value, reporter.as_ref().map(|r| r as &ParseErrorReporter)) {
++    match parse_color(&value, reporter.as_ref().map(|r| r as &dyn ParseErrorReporter)) {
+         Ok(specified_color) => {
+             let computed_color = match raw_data {
+                 Some(raw_data) => {
+                     let data = PerDocumentStyleData::from_ffi(raw_data).borrow();
+                     let device = data.stylist.device();
+                     let quirks_mode = data.stylist.quirks_mode();
+                     Context::for_media_query_evaluation(device, quirks_mode, |context| {
+                         specified_color.to_computed_color(Some(&context))
+diff --git a/testing/geckodriver/src/marionette.rs b/testing/geckodriver/src/marionette.rs
+--- a/testing/geckodriver/src/marionette.rs
++++ b/testing/geckodriver/src/marionette.rs
+@@ -1273,17 +1273,17 @@ impl MarionetteConnection {
+                         ErrorKind::Other,
+                         "EOF reading marionette message",
+                     ))
+                 }
+                 1 => buf[0] as char,
+                 _ => panic!("Expected one byte got more"),
+             };
+             match byte {
+-                '0'...'9' => {
++                '0'..='9' => {
+                     bytes = bytes * 10;
+                     bytes += byte as usize - '0' as usize;
+                 }
+                 ':' => break,
+                 _ => {}
+             }
+         }
+ 
+diff --git a/testing/mozbase/rust/mozprofile/src/prefreader.rs b/testing/mozbase/rust/mozprofile/src/prefreader.rs
+--- a/testing/mozbase/rust/mozprofile/src/prefreader.rs
++++ b/testing/mozbase/rust/mozprofile/src/prefreader.rs
+@@ -9,17 +9,17 @@ use std::iter::Iterator;
+ use std::mem;
+ use std::ops::Deref;
+ use std::str;
+ 
+ impl PrefReaderError {
+     fn new(
+         message: &'static str,
+         position: Position,
+-        parent: Option<Box<Error>>,
++        parent: Option<Box<dyn Error>>,
+     ) -> PrefReaderError {
+         PrefReaderError {
+             message,
+             position,
+             parent,
+         }
+     }
+ }
+@@ -34,17 +34,17 @@ impl fmt::Display for PrefReaderError {
+     }
+ }
+ 
+ impl Error for PrefReaderError {
+     fn description(&self) -> &str {
+         self.message
+     }
+ 
+-    fn cause(&self) -> Option<&Error> {
++    fn cause(&self) -> Option<&dyn Error> {
+         match self.parent {
+             None => None,
+             Some(ref cause) => Some(cause.deref()),
+         }
+     }
+ }
+ 
+ impl From<io::Error> for PrefReaderError {
+@@ -138,17 +138,17 @@ impl<'a> PrefToken<'a> {
+         }
+     }
+ }
+ 
+ #[derive(Debug)]
+ pub struct PrefReaderError {
+     message: &'static str,
+     position: Position,
+-    parent: Option<Box<Error>>,
++    parent: Option<Box<dyn Error>>,
+ }
+ 
+ struct TokenData<'a> {
+     token_type: TokenType,
+     complete: bool,
+     position: Position,
+     data: Cow<'a, str>,
+     start_pos: usize,
+@@ -353,19 +353,19 @@ impl<'a> PrefTokenizer<'a> {
+ 
+     fn read_hex_escape(&mut self, hex_chars: isize, first: bool) -> Result<u32, PrefReaderError> {
+         let mut value = 0;
+         for _ in 0..hex_chars {
+             match self.get_char() {
+                 Some(x) => {
+                     value = value << 4;
+                     match x {
+-                        '0'...'9' => value += x as u32 - '0' as u32,
+-                        'a'...'f' => value += x as u32 - 'a' as u32,
+-                        'A'...'F' => value += x as u32 - 'A' as u32,
++                        '0'..='9' => value += x as u32 - '0' as u32,
++                        'a'..='f' => value += x as u32 - 'a' as u32,
++                        'A'..='F' => value += x as u32 - 'A' as u32,
+                         _ => {
+                             return Err(PrefReaderError::new(
+                                 "Unexpected character in escape",
+                                 self.position,
+                                 None,
+                             ))
+                         }
+                     }
+@@ -589,17 +589,17 @@ impl<'a> PrefTokenizer<'a> {
+                         token_data.start(&self, TokenType::String);
+                         token_data.start_pos = self.pos + 1;
+                         TokenizerState::SingleQuotedString
+                     }
+                     't' | 'f' => {
+                         self.unget_char();
+                         TokenizerState::Bool
+                     }
+-                    '0'...'9' | '-' | '+' => {
++                    '0'..='9' | '-' | '+' => {
+                         token_data.start(&self, TokenType::Int);
+                         TokenizerState::Number
+                     }
+                     _ => {
+                         return Err(PrefReaderError::new(
+                             "Invalid character at start of function argument",
+                             self.position,
+                             None,
+@@ -640,17 +640,17 @@ impl<'a> PrefTokenizer<'a> {
+                     }
+                     '\\' => {
+                         self.consume_escape(&mut token_data)?;
+                         TokenizerState::SingleQuotedString
+                     }
+                     _ => TokenizerState::SingleQuotedString,
+                 },
+                 TokenizerState::Number => match c {
+-                    '0'...'9' => TokenizerState::Number,
++                    '0'..='9' => TokenizerState::Number,
+                     ')' | ',' => {
+                         token_data.end(&self.data, self.pos)?;
+                         self.unget_char();
+                         self.next_state = Some(TokenizerState::AfterFunctionArg);
+                         TokenizerState::Junk
+                     }
+                     x if PrefTokenizer::is_space(x) => {
+                         token_data.end(&self.data, self.pos)?;
+diff --git a/testing/mozbase/rust/mozrunner/src/bin/icecat-default-path.rs b/testing/mozbase/rust/mozrunner/src/bin/icecat-default-path.rs
+--- a/testing/mozbase/rust/mozrunner/src/bin/icecat-default-path.rs
++++ b/testing/mozbase/rust/mozrunner/src/bin/icecat-default-path.rs
+@@ -8,7 +8,7 @@
+         .map(|x| (x.to_string_lossy().into_owned(), 0))
+         .unwrap_or(("IceCat binary not found".to_owned(), 1));
+ 
+-    let mut writer: Box<Write> = match code {
++    let mut writer: Box<dyn Write> = match code {
+         0 => Box::new(std::io::stdout()),
+         _ => Box::new(std::io::stderr())
+     };
+diff --git a/testing/mozbase/rust/mozrunner/src/runner.rs b/testing/mozbase/rust/mozrunner/src/runner.rs
+--- a/testing/mozbase/rust/mozrunner/src/runner.rs
++++ b/testing/mozbase/rust/mozrunner/src/runner.rs
+@@ -101,20 +101,20 @@ impl Error for RunnerError {
+                     ErrorKind::NotFound => "no such file or directory",
+                     _ => err.description(),
+                 }
+             }
+             RunnerError::PrefReader(ref err) => err.description(),
+         }
+     }
+ 
+-    fn cause(&self) -> Option<&Error> {
++    fn cause(&self) -> Option<&dyn Error> {
+         Some(match *self {
+-            RunnerError::Io(ref err) => err as &Error,
+-            RunnerError::PrefReader(ref err) => err as &Error,
++            RunnerError::Io(ref err) => err as &dyn Error,
++            RunnerError::PrefReader(ref err) => err as &dyn Error,
+         })
+     }
+ }
+ 
+ impl From<io::Error> for RunnerError {
+     fn from(value: io::Error) -> RunnerError {
+         RunnerError::Io(value)
+     }
+diff --git a/testing/webdriver/src/error.rs b/testing/webdriver/src/error.rs
+--- a/testing/webdriver/src/error.rs
++++ b/testing/webdriver/src/error.rs
+@@ -320,17 +320,17 @@ impl WebDriverError {
+     }
+ }
+ 
+ impl Error for WebDriverError {
+     fn description(&self) -> &str {
+         self.error_code()
+     }
+ 
+-    fn cause(&self) -> Option<&Error> {
++    fn cause(&self) -> Option<&dyn Error> {
+         None
+     }
+ }
+ 
+ impl fmt::Display for WebDriverError {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         self.message.fmt(f)
+     }
+@@ -349,18 +349,18 @@ impl From<io::Error> for WebDriverError 
+ }
+ 
+ impl From<DecodeError> for WebDriverError {
+     fn from(err: DecodeError) -> WebDriverError {
+         WebDriverError::new(ErrorStatus::UnknownError, err.description().to_string())
+     }
+ }
+ 
+-impl From<Box<Error>> for WebDriverError {
+-    fn from(err: Box<Error>) -> WebDriverError {
++impl From<Box<dyn Error>> for WebDriverError {
++    fn from(err: Box<dyn Error>) -> WebDriverError {
+         WebDriverError::new(ErrorStatus::UnknownError, err.description().to_string())
+     }
+ }
+ 
+ #[cfg(test)]
+ mod tests {
+     use super::*;
+     use crate::test::check_serialize;
+diff --git a/testing/webdriver/src/server.rs b/testing/webdriver/src/server.rs
+--- a/testing/webdriver/src/server.rs
++++ b/testing/webdriver/src/server.rs
+@@ -171,17 +171,17 @@ impl<U: WebDriverExtensionRoute> HttpHan
+     }
+ }
+ 
+ impl<U: WebDriverExtensionRoute + 'static> Service for HttpHandler<U> {
+     type ReqBody = Body;
+     type ResBody = Body;
+ 
+     type Error = hyper::Error;
+-    type Future = Box<future::Future<Item = Response<Self::ResBody>, Error = hyper::Error> + Send>;
++    type Future = Box<dyn future::Future<Item = Response<Self::ResBody>, Error = hyper::Error> + Send>;
+ 
+     fn call(&mut self, req: Request<Self::ReqBody>) -> Self::Future {
+         let uri = req.uri().clone();
+         let method = req.method().clone();
+         let api = self.api.clone();
+         let chan = self.chan.clone();
+ 
+         Box::new(req.into_body().concat2().and_then(move |body| {
+diff --git a/xpcom/rust/xpcom/xpcom_macros/src/lib.rs b/xpcom/rust/xpcom/xpcom_macros/src/lib.rs
+--- a/xpcom/rust/xpcom/xpcom_macros/src/lib.rs
++++ b/xpcom/rust/xpcom/xpcom_macros/src/lib.rs
+@@ -192,7 +192,7 @@
+ }
+ 
+ impl Interface {
+-    fn base(&self) -> Result<Option<&'static Interface>, Box<Error>> {
++    fn base(&self) -> Result<Option<&'static Interface>, Box<dyn Error>> {
+         Ok(if let Some(base) = self.base {
+             Some(*IFACES.get(base).ok_or_else(
+                 || format!("Base interface {} does not exist", base)
+@@ -238,7 +238,7 @@
+ }
+ 
+ /// Scans through the attributes on a struct, and extracts the type of the refcount to use.
+-fn get_refcnt_kind(attrs: &[Attribute]) -> Result<RefcntKind, Box<Error>> {
++fn get_refcnt_kind(attrs: &[Attribute]) -> Result<RefcntKind, Box<dyn Error>> {
+     for attr in attrs {
+         if let Some(Meta::NameValue(ref attr)) = attr.interpret_meta() {
+             if attr.ident.as_ref() != "refcnt" {
+@@ -268,7 +268,7 @@
+ /// Scan the attributes looking for an #[xpimplements] attribute. The identifier
+ /// arguments passed to this attribute are the interfaces which the type wants to
+ /// directly implement.
+-fn get_bases(attrs: &[Attribute]) -> Result<Vec<&'static Interface>, Box<Error>> {
++fn get_bases(attrs: &[Attribute]) -> Result<Vec<&'static Interface>, Box<dyn Error>> {
+     let mut inherits = Vec::new();
+     for attr in attrs {
+         if let Some(Meta::List(ref attr)) = attr.interpret_meta() {
+@@ -294,7 +294,7 @@
+ }
+ 
+ /// Extract the fields list from the input struct.
+-fn get_fields(di: &DeriveInput) -> Result<&Punctuated<Field, Token![,]>, Box<Error>> {
++fn get_fields(di: &DeriveInput) -> Result<&Punctuated<Field, Token![,]>, Box<dyn Error>> {
+     match di.data {
+         Data::Struct(DataStruct {
+             fields: Fields::Named(ref named), ..
+@@ -305,7 +305,7 @@
+ }
+ 
+ /// Takes the `Init*` struct in, and generates a `DeriveInput` for the "real" struct.
+-fn gen_real_struct(init: &DeriveInput, bases: &[&Interface], refcnt_ty: RefcntKind) -> Result<DeriveInput, Box<Error>> {
++fn gen_real_struct(init: &DeriveInput, bases: &[&Interface], refcnt_ty: RefcntKind) -> Result<DeriveInput, Box<dyn 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") {

From 5b3e6318c9862091fe1a98c47a3ad4944733ad02 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 10 Nov 2019 12:15:18 +0100
Subject: [PATCH 076/473] Do not remove cose.manifest files

---
 icecat.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 68da9e8..9da57a7 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -80,7 +80,7 @@ ExcludeArch: s390x
 
 Name: icecat
 Version: 68.2.0
-Release: 2.%{gnu_ver}%{?dist}
+Release: 3.%{gnu_ver}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -503,7 +503,7 @@ echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .
 chmod -x third_party/rust/itertools/src/lib.rs
 
 # Remove unrecognized files
-find extensions/gnu -name cose.manifest -delete
+#find extensions/gnu -name cose.manifest -delete
 
 #---------------------------------------------------------------------
 
@@ -807,6 +807,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Sun Nov 10 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-3.gnu2
+- Do not remove cose.manifest files
+
 * Fri Nov 08 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-2.gnu2
 - Build release 68.2.0-gnu2
 - HTTPS-Everywhere 2019_11_7

From 8ca9e9c1c19872ffe180133e90c3435872fe3b8b Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 13 Nov 2019 18:39:02 +0100
Subject: [PATCH 077/473] Patched for mozilla bug #1595212

---
 icecat.spec           | 18 +++++++++--
 mozilla-1595212.patch | 74 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 mozilla-1595212.patch

diff --git a/icecat.spec b/icecat.spec
index 9da57a7..2308eea 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,3 +1,6 @@
+# Set to true if it's going to be submitted as update.	
+%global release_build 1
+
 ##Active/Deactive language files handling
 %global build_langpacks 1
 
@@ -78,9 +81,13 @@ ExcludeArch: s390x
 # Set new source-code build version
 %global gnu_ver gnu2
 
+%if !%{release_build}
+%global pre_tag .test
+%endif
+
 Name: icecat
 Version: 68.2.0
-Release: 3.%{gnu_ver}%{?dist}
+Release: 4.%{gnu_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -165,6 +172,8 @@ Patch226: rhbz-1354671.patch
 Patch414: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
 Patch417: bug1375074-save-restore-x28.patch
 Patch418: mozilla-1556602.patch
+# Patch for rust-1.39+
+Patch419: mozilla-1595212.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
@@ -374,6 +383,7 @@ tar -xf %{SOURCE5}
 #%%patch423 -p1 -b .1512162
 %endif
 %patch418 -p1 -b .mozilla-1556602
+%patch419 -p1 -b .mozilla-1595212
 %patch424 -p1 -b .mozilla-1566876-webrtc-ind
 %patch425 -p1 -b .mozilla-1568569
 
@@ -503,7 +513,7 @@ echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .
 chmod -x third_party/rust/itertools/src/lib.rs
 
 # Remove unrecognized files
-#find extensions/gnu -name cose.manifest -delete
+find extensions/gnu -name cose.manifest -delete
 
 #---------------------------------------------------------------------
 
@@ -807,6 +817,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Wed Nov 13 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-4.gnu2
+- Undo latest change
+- Patched for mozilla bug #1595212
+
 * Sun Nov 10 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-3.gnu2
 - Do not remove cose.manifest files
 
diff --git a/mozilla-1595212.patch b/mozilla-1595212.patch
new file mode 100644
index 0000000..605d40f
--- /dev/null
+++ b/mozilla-1595212.patch
@@ -0,0 +1,74 @@
+diff --git a/xpcom/rust/nsstring/src/lib.rs b/xpcom/rust/nsstring/src/lib.rs
+--- a/xpcom/rust/nsstring/src/lib.rs
++++ b/xpcom/rust/nsstring/src/lib.rs
+@@ -1370,25 +1370,6 @@
+     /// This method can trigger Undefined Behavior if the accessing the member
+     /// $member on a given type would use that type's `Deref` implementation.
+     macro_rules! member_check {
+-        ($T:ty, $member:ident, $method:ident) => {
+-            #[no_mangle]
+-            #[allow(non_snake_case)]
+-            pub extern fn $method(size: *mut usize,
+-                                  align: *mut usize,
+-                                  offset: *mut usize) {
+-                unsafe {
+-                    // Create a temporary value of type T to get offsets, sizes
+-                    // and aligns off of
+-                    let tmp: $T = mem::zeroed();
+-                    *size = mem::size_of_val(&tmp.$member);
+-                    *align = mem::align_of_val(&tmp.$member);
+-                    *offset =
+-                        (&tmp.$member as *const _ as usize) -
+-                        (&tmp as *const _ as usize);
+-                    mem::forget(tmp);
+-                }
+-            }
+-        };
+         ($T:ty, $U:ty, $V:ty, $member:ident, $method:ident) => {
+             #[no_mangle]
+             #[allow(non_snake_case)]
+@@ -1398,29 +1379,33 @@
+                 unsafe {
+                     // Create a temporary value of type T to get offsets, sizes
+                     // and alignments from.
+-                    let tmp: $T = mem::zeroed();
++                    let tmp: mem::MaybeUninit<$T> = mem::MaybeUninit::uninit();
++                    // FIXME: This should use &raw references when available,
++                    // this is technically UB as it creates a reference to
++                    // uninitialized memory, but there's no better way to do
++                    // this right now.
++                    let tmp = &*tmp.as_ptr();
+                     *size = mem::size_of_val(&tmp.$member);
+                     *align = mem::align_of_val(&tmp.$member);
+                     *offset =
+                         (&tmp.$member as *const _ as usize) -
+-                        (&tmp as *const _ as usize);
+-                    mem::forget(tmp);
++                        (tmp as *const $T as usize);
+ 
+-                    let tmp: $U = mem::zeroed();
++                    let tmp: mem::MaybeUninit<$U> = mem::MaybeUninit::uninit();
++                    let tmp = &*tmp.as_ptr();
+                     assert_eq!(*size, mem::size_of_val(&tmp.hdr.$member));
+                     assert_eq!(*align, mem::align_of_val(&tmp.hdr.$member));
+                     assert_eq!(*offset,
+                                (&tmp.hdr.$member as *const _ as usize) -
+-                               (&tmp as *const _ as usize));
+-                    mem::forget(tmp);
++                               (tmp as *const $U as usize));
+ 
+-                    let tmp: $V = mem::zeroed();
++                    let tmp: mem::MaybeUninit<$V> = mem::MaybeUninit::uninit();
++                    let tmp = &*tmp.as_ptr();
+                     assert_eq!(*size, mem::size_of_val(&tmp.hdr.$member));
+                     assert_eq!(*align, mem::align_of_val(&tmp.hdr.$member));
+                     assert_eq!(*offset,
+                                (&tmp.hdr.$member as *const _ as usize) -
+-                               (&tmp as *const _ as usize));
+-                    mem::forget(tmp);
++                               (tmp as *const $V as usize));
+                 }
+             }
+         }
+
+

From 9fa6161642664e5e040a28811918128ac560f816 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 14 Nov 2019 12:06:33 +0100
Subject: [PATCH 078/473] Enable ALSA support

---
 icecat.spec | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 2308eea..606c30a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,17 +1,17 @@
-# Set to true if it's going to be submitted as update.	
+# Set to true if it's going to be submitted as update.
 %global release_build 1
 
-##Active/Deactive language files handling
+# Active/Deactive language files handling
 %global build_langpacks 1
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
-##Define installation directories
+# Define installation directories
 %global icecatappdir %{_libdir}/%{name}
 %global icecat_ver   %{name}-%{version}
 %global icecat_devel %{name}-devel-%{version}
 
-##Define language files directory
+# Define language files directory
 %global langpackdir  %{icecatappdir}/langpacks
 
 %global toolkit_gtk3  1
@@ -53,9 +53,10 @@
 %global nss_build_version %{nss_version}
 %endif
 
-## Audio backends
+# Audio backends
 %bcond_without pulseaudio
 %bcond_without jack
+%bcond_without alsa
 
 %global with_vpx      1
 
@@ -411,6 +412,10 @@ echo "ac_add_options --enable-pulseaudio" >> .mozconfig
 echo "ac_add_options --enable-jack" >> .mozconfig
 %endif
 
+%if %{with alsa}
+echo "ac_add_options --enable-alsa" >> .mozconfig
+%endif
+
 %ifarch s390x
 echo "ac_add_options --disable-jemalloc" >> .mozconfig
 %endif
@@ -820,6 +825,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 * Wed Nov 13 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-4.gnu2
 - Undo latest change
 - Patched for mozilla bug #1595212
+- Enable ALSA support
 
 * Sun Nov 10 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-3.gnu2
 - Do not remove cose.manifest files

From a7c0ab2713945cc35487b420cc649f89514aafe9 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 20 Nov 2019 11:48:16 +0100
Subject: [PATCH 079/473] Add patches for Rust-1.39 | Build test

---
 icecat.spec           |  24 ++++--
 mozilla-1564873.patch | 183 ++++++++++++++++++++++++++++++++++++++++++
 mozilla-1595218.patch |  95 ++++++++++++++++++++++
 3 files changed, 294 insertions(+), 8 deletions(-)
 create mode 100644 mozilla-1564873.patch
 create mode 100644 mozilla-1595218.patch

diff --git a/icecat.spec b/icecat.spec
index 606c30a..7aab675 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,5 +1,5 @@
 # Set to true if it's going to be submitted as update.
-%global release_build 1
+%global release_build 0
 
 # Active/Deactive language files handling
 %global build_langpacks 1
@@ -56,7 +56,7 @@
 # Audio backends
 %bcond_without pulseaudio
 %bcond_without jack
-%bcond_without alsa
+%bcond_with alsa
 
 %global with_vpx      1
 
@@ -173,8 +173,10 @@ Patch226: rhbz-1354671.patch
 Patch414: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
 Patch417: bug1375074-save-restore-x28.patch
 Patch418: mozilla-1556602.patch
-# Patch for rust-1.39+
+# Patches for rust-1.39+
 Patch419: mozilla-1595212.patch
+Patch420: mozilla-1564873.patch
+Patch421: mozilla-1595218.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
@@ -369,14 +371,14 @@ tar -xf %{SOURCE5}
 #%%patch413 -p1 -b .1353817
 %ifarch %{arm}
 %patch414 -p1 -b .Bug-1238661---fix-mozillaSignalTrampoline-to-work
-%patch44 -p1 -b .build-arm-libopus
+%patch44  -p1 -b .build-arm-libopus
 %endif
 #%%patch417 -p1 -b .bug1375074-save-restore-x28
 
 # Patch for big endian platforms only
 %if 0%{?big_endian}
 %patch26 -p1 -b .icu
-%patch9 -p0 -b .locale
+%patch9  -p0 -b .locale
 %patch29 -p1 -b .big-endian
 %endif
 
@@ -384,7 +386,14 @@ tar -xf %{SOURCE5}
 #%%patch423 -p1 -b .1512162
 %endif
 %patch418 -p1 -b .mozilla-1556602
+
+# Patches for rust-1.39+
 %patch419 -p1 -b .mozilla-1595212
+%patch420 -p1 -b .mozilla-1564873
+%patch421 -p1 -b .mozilla-1595218
+#
+
+%patch423 -p1 -b .mozilla-1596503
 %patch424 -p1 -b .mozilla-1566876-webrtc-ind
 %patch425 -p1 -b .mozilla-1568569
 
@@ -822,10 +831,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
-* Wed Nov 13 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-4.gnu2
+* Wed Nov 20 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-4.gnu2.test
 - Undo latest change
-- Patched for mozilla bug #1595212
-- Enable ALSA support
+- Patched for rust-1.39+
 
 * Sun Nov 10 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-3.gnu2
 - Do not remove cose.manifest files
diff --git a/mozilla-1564873.patch b/mozilla-1564873.patch
new file mode 100644
index 0000000..3c362df
--- /dev/null
+++ b/mozilla-1564873.patch
@@ -0,0 +1,183 @@
+
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio@crisal.io>
+# Date 1574168632 0
+# Node ID 82e4062e839a57c0dbcb08df9965883c162eb8d1
+# Parent  ff37a98047d63550c77052e7dfecbda14b188e0d
+Bug 1564873 - Fix straight-forward uses of mem::uninitialized in webrender. r=nical
+
+Differential Revision: https://phabricator.services.mozilla.com/D53359
+
+diff --git a/gfx/wr/webrender/src/platform/unix/font.rs b/gfx/wr/webrender/src/platform/unix/font.rs
+--- a/gfx/wr/webrender/src/platform/unix/font.rs
++++ b/gfx/wr/webrender/src/platform/unix/font.rs
+@@ -530,26 +530,26 @@ impl FontContext {
+     // Get the bounding box for a glyph, accounting for sub-pixel positioning.
+     fn get_bounding_box(
+         &self,
+         slot: FT_GlyphSlot,
+         font: &FontInstance,
+         glyph: &GlyphKey,
+         scale: f32,
+     ) -> FT_BBox {
+-        let mut cbox: FT_BBox = unsafe { mem::uninitialized() };
++        // Get the estimated bounding box from FT (control points).
++        let mut cbox = FT_BBox { xMin: 0, yMin: 0, xMax: 0, yMax: 0 };
+ 
+-        // Get the estimated bounding box from FT (control points).
+         unsafe {
+             FT_Outline_Get_CBox(&(*slot).outline, &mut cbox);
++        }
+ 
+-            // For spaces and other non-printable characters, early out.
+-            if (*slot).outline.n_contours == 0 {
+-                return cbox;
+-            }
++        // For spaces and other non-printable characters, early out.
++        if unsafe { (*slot).outline.n_contours } == 0 {
++            return cbox;
+         }
+ 
+         self.pad_bounding_box(font, &mut cbox);
+ 
+         // Offset the bounding box by subpixel positioning.
+         // Convert to 26.6 fixed point format for FT.
+         let (dx, dy) = font.get_subpx_offset(glyph);
+         let (dx, dy) = (
+@@ -713,17 +713,17 @@ impl FontContext {
+             (dx / scale as f64 * 64.0 + 0.5) as FT_Pos,
+             -(dy / scale as f64 * 64.0 + 0.5) as FT_Pos,
+         );
+ 
+         // Move the outline curves to be at the origin, taking
+         // into account the subpixel positioning.
+         unsafe {
+             let outline = &(*slot).outline;
+-            let mut cbox: FT_BBox = mem::uninitialized();
++            let mut cbox = FT_BBox { xMin: 0, yMin: 0, xMax: 0, yMax: 0 };
+             FT_Outline_Get_CBox(outline, &mut cbox);
+             self.pad_bounding_box(font, &mut cbox);
+             FT_Outline_Translate(
+                 outline,
+                 dx - ((cbox.xMin + dx) & !63),
+                 dy - ((cbox.yMin + dy) & !63),
+             );
+         }
+diff --git a/gfx/wr/webrender/src/prim_store/gradient.rs b/gfx/wr/webrender/src/prim_store/gradient.rs
+--- a/gfx/wr/webrender/src/prim_store/gradient.rs
++++ b/gfx/wr/webrender/src/prim_store/gradient.rs
+@@ -18,7 +18,7 @@
+ use crate::prim_store::{PrimKeyCommonData, PrimTemplateCommonData, PrimitiveStore};
+ use crate::prim_store::{NinePatchDescriptor, PointKey, SizeKey, InternablePrimitive};
+ use crate::render_task::RenderTaskCacheEntryHandle;
+-use std::{hash, ops::{Deref, DerefMut}, mem};
++use std::{hash, ops::{Deref, DerefMut}};
+ use crate::util::pack_as_float;
+ 
+ /// The maximum number of stops a gradient may have to use the fast path.
+@@ -575,22 +575,32 @@ pub const GRADIENT_DATA_TABLE_BEGIN: usi
+ // The exclusive bound of the gradient data table
+ pub const GRADIENT_DATA_TABLE_END: usize = GRADIENT_DATA_LAST_STOP;
+ // The number of entries in the gradient data table.
+ pub const GRADIENT_DATA_TABLE_SIZE: usize = 128;
+ 
+ // The number of entries in a gradient data: GRADIENT_DATA_TABLE_SIZE + first stop entry + last stop entry
+ pub const GRADIENT_DATA_SIZE: usize = GRADIENT_DATA_TABLE_SIZE + 2;
+ 
+-#[derive(Debug)]
++/// An entry in a gradient data table representing a segment of the gradient
++/// color space.
++#[derive(Debug, Copy, Clone)]
+ #[repr(C)]
+-// An entry in a gradient data table representing a segment of the gradient color space.
+-pub struct GradientDataEntry {
+-    pub start_color: PremultipliedColorF,
+-    pub end_color: PremultipliedColorF,
++struct GradientDataEntry {
++    start_color: PremultipliedColorF,
++    end_color: PremultipliedColorF,
++}
++
++impl GradientDataEntry {
++    fn white() -> Self {
++        Self {
++            start_color: PremultipliedColorF::WHITE,
++            end_color: PremultipliedColorF::WHITE,
++        }
++    }
+ }
+ 
+ // TODO(gw): Tidy this up to be a free function / module?
+ struct GradientGpuBlockBuilder {}
+ 
+ impl GradientGpuBlockBuilder {
+     /// Generate a color ramp filling the indices in [start_idx, end_idx) and interpolating
+     /// from start_color to end_color.
+@@ -657,17 +667,17 @@ impl GradientGpuBlockBuilder {
+         // within the segment of the gradient space represented by that entry. To lookup a gradient result,
+         // first the entry index is calculated to determine which two colors to interpolate between, then
+         // the offset within that entry bucket is used to interpolate between the two colors in that entry.
+         // This layout preserves hard stops, as the end color for a given entry can differ from the start
+         // color for the following entry, despite them being adjacent. Colors are stored within in BGRA8
+         // format for texture upload. This table requires the gradient color stops to be normalized to the
+         // range [0, 1]. The first and last entries hold the first and last color stop colors respectively,
+         // while the entries in between hold the interpolated color stop values for the range [0, 1].
+-        let mut entries: [GradientDataEntry; GRADIENT_DATA_SIZE] = unsafe { mem::uninitialized() };
++        let mut entries = [GradientDataEntry::white(); GRADIENT_DATA_SIZE];
+ 
+         if reverse_stops {
+             // Fill in the first entry (for reversed stops) with the first color stop
+             GradientGpuBlockBuilder::fill_colors(
+                 GRADIENT_DATA_LAST_STOP,
+                 GRADIENT_DATA_LAST_STOP + 1,
+                 &cur_color,
+                 &cur_color,
+@@ -692,23 +702,16 @@ impl GradientGpuBlockBuilder {
+                     );
+                     cur_idx = next_idx;
+                 }
+ 
+                 cur_color = next_color;
+             }
+             if cur_idx != GRADIENT_DATA_TABLE_BEGIN {
+                 error!("Gradient stops abruptly at {}, auto-completing to white", cur_idx);
+-                GradientGpuBlockBuilder::fill_colors(
+-                    GRADIENT_DATA_TABLE_BEGIN,
+-                    cur_idx,
+-                    &PremultipliedColorF::WHITE,
+-                    &cur_color,
+-                    &mut entries,
+-                );
+             }
+ 
+             // Fill in the last entry (for reversed stops) with the last color stop
+             GradientGpuBlockBuilder::fill_colors(
+                 GRADIENT_DATA_FIRST_STOP,
+                 GRADIENT_DATA_FIRST_STOP + 1,
+                 &cur_color,
+                 &cur_color,
+@@ -742,23 +745,16 @@ impl GradientGpuBlockBuilder {
+                     );
+                     cur_idx = next_idx;
+                 }
+ 
+                 cur_color = next_color;
+             }
+             if cur_idx != GRADIENT_DATA_TABLE_END {
+                 error!("Gradient stops abruptly at {}, auto-completing to white", cur_idx);
+-                GradientGpuBlockBuilder::fill_colors(
+-                    cur_idx,
+-                    GRADIENT_DATA_TABLE_END,
+-                    &PremultipliedColorF::WHITE,
+-                    &cur_color,
+-                    &mut entries,
+-                );
+             }
+ 
+             // Fill in the last entry with the last color stop
+             GradientGpuBlockBuilder::fill_colors(
+                 GRADIENT_DATA_LAST_STOP,
+                 GRADIENT_DATA_LAST_STOP + 1,
+                 &cur_color,
+                 &cur_color,
+
diff --git a/mozilla-1595218.patch b/mozilla-1595218.patch
new file mode 100644
index 0000000..f90df39
--- /dev/null
+++ b/mozilla-1595218.patch
@@ -0,0 +1,95 @@
+diff --git a/taskcluster/ci/toolchain/misc.yml b/taskcluster/ci/toolchain/misc.yml
+--- a/taskcluster/ci/toolchain/misc.yml
++++ b/taskcluster/ci/toolchain/misc.yml
+@@ -117,4 +117,4 @@
+             - 'taskcluster/scripts/misc/tooltool-download.sh'
+         toolchain-artifact: public/build/wrench-deps.tar.bz2
+     toolchains:
+-        - linux64-rust-1.34  # whatever m-c is built with
++        - linux64-rust-1.39  # whatever m-c is built with
+diff --git a/taskcluster/ci/toolchain/rust.yml b/taskcluster/ci/toolchain/rust.yml
+--- a/taskcluster/ci/toolchain/rust.yml
++++ b/taskcluster/ci/toolchain/rust.yml
+@@ -47,12 +47,24 @@
+             '--target', 'aarch64-unknown-linux-gnu',
+         ]
+ 
+-linux64-rust-1.34:
++linux64-rust-1.38:
++    treeherder:
++        symbol: TL(rust-1.38.0)
++    run:
++        arguments: [
++            '--channel', '1.38.0',
++            '--host', 'x86_64-unknown-linux-gnu',
++            '--target', 'x86_64-unknown-linux-gnu',
++            '--target', 'i686-unknown-linux-gnu',
++            '--target', 'aarch64-unknown-linux-gnu',
++        ]
++
++linux64-rust-1.39:
+     treeherder:
+         symbol: TL(rust)
+     run:
+         arguments: [
+-            '--channel', '1.34.0',
++            '--channel', '1.39.0',
+             '--host', 'x86_64-unknown-linux-gnu',
+             '--target', 'x86_64-unknown-linux-gnu',
+             '--target', 'i686-unknown-linux-gnu',
+diff --git a/python/mozboot/mozboot/base.py b/python/mozboot/mozboot/base.py
+--- a/python/mozboot/mozboot/base.py
++++ b/python/mozboot/mozboot/base.py
+@@ -158,7 +158,7 @@
+ MODERN_PYTHON_VERSION = LooseVersion('2.7.3')
+ 
+ # Upgrade rust older than this.
+-MODERN_RUST_VERSION = LooseVersion('1.34.0')
++MODERN_RUST_VERSION = LooseVersion('1.39.0')
+ 
+ # Upgrade nasm older than this.
+ MODERN_NASM_VERSION = LooseVersion('2.14')
+
+
+diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
++++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+@@ -1522,15 +1522,22 @@
+                 'x86_64-unknown-openbsd',
+                 'x86_64-unknown-redox',
+             ]
+-            # Additional targets from 1.33
+-            if Version(version) >= '1.33.0':
++            # Additional targets from 1.38
++            if Version(version) >= '1.39.0':
+                 rust_targets += [
+-                    'thumbv7neon-linux-androideabi',
+-                    'thumbv7neon-unknown-linux-gnueabihf',
+-                    'x86_64-unknown-uefi',
+-                    'thumbv8m.main-none-eabi',
+-                    'thumbv8m.main-none-eabihf',
++                    'aarch64-uwp-windows-msvc',
++                    'armv7-wrs-vxworks-eabihf',
++                    'i686-unknown-uefi',
++                    'i686-uwp-windows-msvc',
++                    'mips64-unknown-linux-muslabi64',
++                    'mips64el-unknown-linux-muslabi64',
++                    'sparc64-unknown-openbsd',
++                    'x86_64-linux-kernel',
++                    'x86_64-uwp-windows-msvc',
+                 ]
++                rust_targets.remove('armv7-wrs-vxworks')
++                rust_targets.remove('i586-wrs-vxworks')
++
+             return 0, '\n'.join(sorted(rust_targets)), ''
+         if (len(args) == 6 and args[:2] == ('--crate-type', 'staticlib') and
+             args[2].startswith('--target=') and args[3] == '-o'):
+@@ -1671,7 +1687,7 @@
+ 
+ 
+ class RustTest(BaseConfigureTest):
+-    def get_rust_target(self, target, compiler_type='gcc', version='1.33.0',
++    def get_rust_target(self, target, compiler_type='gcc', version='1.39.0',
+                         arm_target=None):
+         environ = {
+             'PATH': os.pathsep.join(

From 622a5d2419844a2a9c8d5e7b14fcffbdf56df36a Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 27 Nov 2019 14:27:24 +0100
Subject: [PATCH 080/473] Mozilla release candidate 68.3.0ESR

---
 .gitignore            |   1 +
 icecat.appdata.xml    |   4 +-
 icecat.spec           |  79 +++++++++---------
 mozilla-1564873.patch | 183 ------------------------------------------
 mozilla-1595212.patch |  74 -----------------
 mozilla-1595218.patch |  95 ----------------------
 sources               |   3 +-
 7 files changed, 46 insertions(+), 393 deletions(-)
 delete mode 100644 mozilla-1564873.patch
 delete mode 100644 mozilla-1595212.patch
 delete mode 100644 mozilla-1595218.patch

diff --git a/.gitignore b/.gitignore
index ce0d722..1775fde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,4 @@
 /icecat-68.2.0-gnu1.tar.bz2
 /icecat-68.2.0-langpacks.tar.gz
 /icecat-68.2.0-gnu2.tar.bz2
+/icecat-68.3.0-gnu1.tar.bz2
diff --git a/icecat.appdata.xml b/icecat.appdata.xml
index c5eda54..9896394 100644
--- a/icecat.appdata.xml
+++ b/icecat.appdata.xml
@@ -49,8 +49,8 @@
        data needed during startup.
        </li>
        <li>
-       Searxes
-          Third-party Request Blocker
+       LibrifyJS
+          Libre replacement for JavaScript blocked by GNU LibreJS on libgen.me
        </li>
       </ul>
   </description>
diff --git a/icecat.spec b/icecat.spec
index 7aab675..e2b9bc1 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,8 +1,8 @@
 # Set to true if it's going to be submitted as update.
-%global release_build 0
+%global release_build 1
 
 # Active/Deactive language files handling
-%global build_langpacks 1
+%global build_langpacks 0
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
@@ -80,15 +80,19 @@ ExcludeArch: %{arm}
 ExcludeArch: s390x
 
 # Set new source-code build version
-%global gnu_ver gnu2
+%global gnu_ver gnu1
+
+# Set extra version tag
+%global extra_ver .rc2
+#%%global extra_ver %%{nil}
 
 %if !%{release_build}
 %global pre_tag .test
 %endif
 
 Name: icecat
-Version: 68.2.0
-Release: 4.%{gnu_ver}%{?pre_tag}%{?dist}
+Version: 68.3.0
+Release: 0.1%{extra_ver}.%{gnu_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -174,9 +178,6 @@ Patch414: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
 Patch417: bug1375074-save-restore-x28.patch
 Patch418: mozilla-1556602.patch
 # Patches for rust-1.39+
-Patch419: mozilla-1595212.patch
-Patch420: mozilla-1564873.patch
-Patch421: mozilla-1595218.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
@@ -312,8 +313,8 @@ Extensions included to this version of IceCat:
    HTTPS Everywhere is an extension that encrypts your communications with
    many major websites, making your browsing more secure
 
- * Searxes
-   Third-party Request Blocker
+ * LibrifyJS: libgen.me
+   Libre replacement for JavaScript blocked by GNU LibreJS on libgen.me
 
 %if 0%{?wayland_backend_default}
 %package x11
@@ -378,7 +379,7 @@ tar -xf %{SOURCE5}
 # Patch for big endian platforms only
 %if 0%{?big_endian}
 %patch26 -p1 -b .icu
-%patch9  -p0 -b .locale
+%patch9 -p0 -b .locale
 %patch29 -p1 -b .big-endian
 %endif
 
@@ -388,9 +389,7 @@ tar -xf %{SOURCE5}
 %patch418 -p1 -b .mozilla-1556602
 
 # Patches for rust-1.39+
-%patch419 -p1 -b .mozilla-1595212
-%patch420 -p1 -b .mozilla-1564873
-%patch421 -p1 -b .mozilla-1595218
+
 #
 
 %patch423 -p1 -b .mozilla-1596503
@@ -409,6 +408,11 @@ tar -xf %{SOURCE5}
 rm -f .mozconfig
 cp -p %{SOURCE3} .mozconfig
 
+echo "ac_add_options --enable-stdcxx-compat" >> .mozconfig
+
+# Disable signature checking for extensions that are bundled with IceCat
+echo "ac_add_options --with-unsigned-addon-scopes=app" >> .mozconfig
+
 echo "ac_add_options --enable-default-toolkit=cairo-gtk3-wayland" >> .mozconfig
 echo "ac_add_options --enable-official-branding" >> .mozconfig
 echo "ac_add_options --disable-webrtc" >> .mozconfig
@@ -571,12 +575,9 @@ MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
 # for some sources
 # Explicitly force the hardening flags for Firefox so it passes the checksec test;
 # See also https://fedoraproject.org/wiki/Changes/Harden_All_Packages
-%if 0%{?fedora} < 30
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
-%else
 # Workaround for mozbz#1531309
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//')
-%endif
+
 # Use hardened build?
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
 
@@ -831,7 +832,11 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
-* Wed Nov 20 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-4.gnu2.test
+* Wed Nov 27 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.3.0-0.1.rc2.gnu1
+- Mozilla release candidate 68.3.0ESR
+
+* Fri Nov 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-4.gnu3.test
+- Build release 68.2.0-gnu3
 - Undo latest change
 - Patched for rust-1.39+
 
@@ -845,10 +850,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - Patched for Mozilla bug #1556602
 
 * Tue Oct 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-1.gnu1
-- Mozilla release 68.2.0
+- Mozilla release 68.2.0ESR
 
 * Tue Sep 03 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.1.0-1.gnu1
-- Mozilla release 68.1.0
+- Mozilla release 68.1.0ESR
 - Incorporate Wayland patches from Firefox 68
 
 * Sun Sep 01 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-5.gnu3
@@ -867,7 +872,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - Disable MOZ_SERVICES_SYNC
 
 * Thu Aug 15 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-1.gnu1
-- Mozilla release 68.0.2
+- Mozilla release 68.0.2ESR
 - Import cbindgen stuff from Firefox package
 - Do not use sqlite from system
 
@@ -891,29 +896,29 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - Use mozilla-1512162.patch on Fedora 30+ only (GCC-9)
 
 * Tue Jul 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-1.gnu1
-- Mozilla release 60.8.0
+- Mozilla release 60.8.0ESR
 
 * Sat Jun 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.2-1.gnu1
-- Mozilla release 60.7.2
+- Mozilla release 60.7.2ESR
 
 * Wed Jun 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.1-1.gnu1
-- Mozilla release 60.7.1
+- Mozilla release 60.7.1ESR
 - Do not list Git-tracked icecat.rpmlintrc as source
 
 * Tue May 28 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.0-2.gnu2
 - Build release 60.7.0-gnu2
 
 * Mon May 20 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.0-1.gnu1
-- Mozilla release 60.7.0
+- Mozilla release 60.7.0ESR
 
 * Sun May 12 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.3-2.gnu2
 - Build release 60.6.3-gnu2
 
 * Thu May 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.3-1.gnu1
-- Mozilla release 60.6.3 (bugfix mozb #1549249)
+- Mozilla release 60.6.3ESR (bugfix mozb #1549249)
 
 * Mon May 06 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.2-1.gnu1
-- Mozilla release 60.6.2 (bugfix mozb #1549061)
+- Mozilla release 60.6.2ESR (bugfix mozb #1549061)
 
 * Sat Apr 06 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.1-2.gnu2
 - Source archive rebuilt (gnu2)
@@ -921,7 +926,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - Use bundled https-everywhere extension
 
 * Fri Mar 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.1-1
-- Mozilla release 60.6.1
+- Mozilla release 60.6.1ESR
 - Wayland backend made default starting from Fedora 31 (rhbz#1691852)
 
 * Thu Mar 21 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-2
@@ -930,24 +935,24 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - Language files re-based
 
 * Tue Mar 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-1
-- Mozilla release 60.6.0
+- Mozilla release 60.6.0ESR
 - Enable languages
 
 * Sun Mar 03 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.5.2-1
-- Mozilla release 60.5.2
+- Mozilla release 60.5.2ESR
 - Disable Werror-format-security flags
 - Enable linker=gold on ARM
 - Try to fix libevent LD path
 
 * Thu Feb 14 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.5.1-1
-- Mozilla release 60.5.1
+- Mozilla release 60.5.1ESR
 - Conditional macro for libvpx support
 
 * Tue Feb 05 2019 Björn Esser <besser82@fedoraproject.org> - 60.5.0-2
 - rebuilt (libvpx)
 
 * Tue Jan 29 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.5.0-1
-- Mozilla release 60.5.0
+- Mozilla release 60.5.0ESR
 
 * Sun Jan 13 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.4.0-2
 - Make Wayland support default on fedora 30+
@@ -957,7 +962,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - Added fix for mozbz#1507475 - crash when display changes 
 
 * Wed Dec 12 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.4.0-1
-- Upstream release 60.4.0
+- Upstream release 60.4.0ESR
 
 * Tue Nov 13 2018 Caolán McNamara <caolanm@redhat.com> - 60.3.0-4
 - rebuild for hunspell-1.7.0
@@ -969,19 +974,19 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - Drop UserAgent patch (rhbz#1644898)
 
 * Wed Oct 24 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.3.0-1
-- Upstream release 60.3.0
+- Upstream release 60.3.0ESR
 
 * Wed Oct 03 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.2.2-2
 - Drop UserAgent patch (rhbz#1644898)
 
 * Wed Oct 03 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.2.2-1
-- Upstream release 60.2.2
+- Upstream release 60.2.2ESR
 
 * Fri Sep 28 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.2.1-1
 - Upstream release 60.2.1
 
 * Fri Sep 14 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.2.0-0.1
-- Pre-release 60.2.0
+- Pre-release 60.2.0ESR
 - Integrate firefox patches for wayland (disabled)
 - Setting of upstream patches for ESR60
 - Manpage updated
diff --git a/mozilla-1564873.patch b/mozilla-1564873.patch
deleted file mode 100644
index 3c362df..0000000
--- a/mozilla-1564873.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1574168632 0
-# Node ID 82e4062e839a57c0dbcb08df9965883c162eb8d1
-# Parent  ff37a98047d63550c77052e7dfecbda14b188e0d
-Bug 1564873 - Fix straight-forward uses of mem::uninitialized in webrender. r=nical
-
-Differential Revision: https://phabricator.services.mozilla.com/D53359
-
-diff --git a/gfx/wr/webrender/src/platform/unix/font.rs b/gfx/wr/webrender/src/platform/unix/font.rs
---- a/gfx/wr/webrender/src/platform/unix/font.rs
-+++ b/gfx/wr/webrender/src/platform/unix/font.rs
-@@ -530,26 +530,26 @@ impl FontContext {
-     // Get the bounding box for a glyph, accounting for sub-pixel positioning.
-     fn get_bounding_box(
-         &self,
-         slot: FT_GlyphSlot,
-         font: &FontInstance,
-         glyph: &GlyphKey,
-         scale: f32,
-     ) -> FT_BBox {
--        let mut cbox: FT_BBox = unsafe { mem::uninitialized() };
-+        // Get the estimated bounding box from FT (control points).
-+        let mut cbox = FT_BBox { xMin: 0, yMin: 0, xMax: 0, yMax: 0 };
- 
--        // Get the estimated bounding box from FT (control points).
-         unsafe {
-             FT_Outline_Get_CBox(&(*slot).outline, &mut cbox);
-+        }
- 
--            // For spaces and other non-printable characters, early out.
--            if (*slot).outline.n_contours == 0 {
--                return cbox;
--            }
-+        // For spaces and other non-printable characters, early out.
-+        if unsafe { (*slot).outline.n_contours } == 0 {
-+            return cbox;
-         }
- 
-         self.pad_bounding_box(font, &mut cbox);
- 
-         // Offset the bounding box by subpixel positioning.
-         // Convert to 26.6 fixed point format for FT.
-         let (dx, dy) = font.get_subpx_offset(glyph);
-         let (dx, dy) = (
-@@ -713,17 +713,17 @@ impl FontContext {
-             (dx / scale as f64 * 64.0 + 0.5) as FT_Pos,
-             -(dy / scale as f64 * 64.0 + 0.5) as FT_Pos,
-         );
- 
-         // Move the outline curves to be at the origin, taking
-         // into account the subpixel positioning.
-         unsafe {
-             let outline = &(*slot).outline;
--            let mut cbox: FT_BBox = mem::uninitialized();
-+            let mut cbox = FT_BBox { xMin: 0, yMin: 0, xMax: 0, yMax: 0 };
-             FT_Outline_Get_CBox(outline, &mut cbox);
-             self.pad_bounding_box(font, &mut cbox);
-             FT_Outline_Translate(
-                 outline,
-                 dx - ((cbox.xMin + dx) & !63),
-                 dy - ((cbox.yMin + dy) & !63),
-             );
-         }
-diff --git a/gfx/wr/webrender/src/prim_store/gradient.rs b/gfx/wr/webrender/src/prim_store/gradient.rs
---- a/gfx/wr/webrender/src/prim_store/gradient.rs
-+++ b/gfx/wr/webrender/src/prim_store/gradient.rs
-@@ -18,7 +18,7 @@
- use crate::prim_store::{PrimKeyCommonData, PrimTemplateCommonData, PrimitiveStore};
- use crate::prim_store::{NinePatchDescriptor, PointKey, SizeKey, InternablePrimitive};
- use crate::render_task::RenderTaskCacheEntryHandle;
--use std::{hash, ops::{Deref, DerefMut}, mem};
-+use std::{hash, ops::{Deref, DerefMut}};
- use crate::util::pack_as_float;
- 
- /// The maximum number of stops a gradient may have to use the fast path.
-@@ -575,22 +575,32 @@ pub const GRADIENT_DATA_TABLE_BEGIN: usi
- // The exclusive bound of the gradient data table
- pub const GRADIENT_DATA_TABLE_END: usize = GRADIENT_DATA_LAST_STOP;
- // The number of entries in the gradient data table.
- pub const GRADIENT_DATA_TABLE_SIZE: usize = 128;
- 
- // The number of entries in a gradient data: GRADIENT_DATA_TABLE_SIZE + first stop entry + last stop entry
- pub const GRADIENT_DATA_SIZE: usize = GRADIENT_DATA_TABLE_SIZE + 2;
- 
--#[derive(Debug)]
-+/// An entry in a gradient data table representing a segment of the gradient
-+/// color space.
-+#[derive(Debug, Copy, Clone)]
- #[repr(C)]
--// An entry in a gradient data table representing a segment of the gradient color space.
--pub struct GradientDataEntry {
--    pub start_color: PremultipliedColorF,
--    pub end_color: PremultipliedColorF,
-+struct GradientDataEntry {
-+    start_color: PremultipliedColorF,
-+    end_color: PremultipliedColorF,
-+}
-+
-+impl GradientDataEntry {
-+    fn white() -> Self {
-+        Self {
-+            start_color: PremultipliedColorF::WHITE,
-+            end_color: PremultipliedColorF::WHITE,
-+        }
-+    }
- }
- 
- // TODO(gw): Tidy this up to be a free function / module?
- struct GradientGpuBlockBuilder {}
- 
- impl GradientGpuBlockBuilder {
-     /// Generate a color ramp filling the indices in [start_idx, end_idx) and interpolating
-     /// from start_color to end_color.
-@@ -657,17 +667,17 @@ impl GradientGpuBlockBuilder {
-         // within the segment of the gradient space represented by that entry. To lookup a gradient result,
-         // first the entry index is calculated to determine which two colors to interpolate between, then
-         // the offset within that entry bucket is used to interpolate between the two colors in that entry.
-         // This layout preserves hard stops, as the end color for a given entry can differ from the start
-         // color for the following entry, despite them being adjacent. Colors are stored within in BGRA8
-         // format for texture upload. This table requires the gradient color stops to be normalized to the
-         // range [0, 1]. The first and last entries hold the first and last color stop colors respectively,
-         // while the entries in between hold the interpolated color stop values for the range [0, 1].
--        let mut entries: [GradientDataEntry; GRADIENT_DATA_SIZE] = unsafe { mem::uninitialized() };
-+        let mut entries = [GradientDataEntry::white(); GRADIENT_DATA_SIZE];
- 
-         if reverse_stops {
-             // Fill in the first entry (for reversed stops) with the first color stop
-             GradientGpuBlockBuilder::fill_colors(
-                 GRADIENT_DATA_LAST_STOP,
-                 GRADIENT_DATA_LAST_STOP + 1,
-                 &cur_color,
-                 &cur_color,
-@@ -692,23 +702,16 @@ impl GradientGpuBlockBuilder {
-                     );
-                     cur_idx = next_idx;
-                 }
- 
-                 cur_color = next_color;
-             }
-             if cur_idx != GRADIENT_DATA_TABLE_BEGIN {
-                 error!("Gradient stops abruptly at {}, auto-completing to white", cur_idx);
--                GradientGpuBlockBuilder::fill_colors(
--                    GRADIENT_DATA_TABLE_BEGIN,
--                    cur_idx,
--                    &PremultipliedColorF::WHITE,
--                    &cur_color,
--                    &mut entries,
--                );
-             }
- 
-             // Fill in the last entry (for reversed stops) with the last color stop
-             GradientGpuBlockBuilder::fill_colors(
-                 GRADIENT_DATA_FIRST_STOP,
-                 GRADIENT_DATA_FIRST_STOP + 1,
-                 &cur_color,
-                 &cur_color,
-@@ -742,23 +745,16 @@ impl GradientGpuBlockBuilder {
-                     );
-                     cur_idx = next_idx;
-                 }
- 
-                 cur_color = next_color;
-             }
-             if cur_idx != GRADIENT_DATA_TABLE_END {
-                 error!("Gradient stops abruptly at {}, auto-completing to white", cur_idx);
--                GradientGpuBlockBuilder::fill_colors(
--                    cur_idx,
--                    GRADIENT_DATA_TABLE_END,
--                    &PremultipliedColorF::WHITE,
--                    &cur_color,
--                    &mut entries,
--                );
-             }
- 
-             // Fill in the last entry with the last color stop
-             GradientGpuBlockBuilder::fill_colors(
-                 GRADIENT_DATA_LAST_STOP,
-                 GRADIENT_DATA_LAST_STOP + 1,
-                 &cur_color,
-                 &cur_color,
-
diff --git a/mozilla-1595212.patch b/mozilla-1595212.patch
deleted file mode 100644
index 605d40f..0000000
--- a/mozilla-1595212.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/xpcom/rust/nsstring/src/lib.rs b/xpcom/rust/nsstring/src/lib.rs
---- a/xpcom/rust/nsstring/src/lib.rs
-+++ b/xpcom/rust/nsstring/src/lib.rs
-@@ -1370,25 +1370,6 @@
-     /// This method can trigger Undefined Behavior if the accessing the member
-     /// $member on a given type would use that type's `Deref` implementation.
-     macro_rules! member_check {
--        ($T:ty, $member:ident, $method:ident) => {
--            #[no_mangle]
--            #[allow(non_snake_case)]
--            pub extern fn $method(size: *mut usize,
--                                  align: *mut usize,
--                                  offset: *mut usize) {
--                unsafe {
--                    // Create a temporary value of type T to get offsets, sizes
--                    // and aligns off of
--                    let tmp: $T = mem::zeroed();
--                    *size = mem::size_of_val(&tmp.$member);
--                    *align = mem::align_of_val(&tmp.$member);
--                    *offset =
--                        (&tmp.$member as *const _ as usize) -
--                        (&tmp as *const _ as usize);
--                    mem::forget(tmp);
--                }
--            }
--        };
-         ($T:ty, $U:ty, $V:ty, $member:ident, $method:ident) => {
-             #[no_mangle]
-             #[allow(non_snake_case)]
-@@ -1398,29 +1379,33 @@
-                 unsafe {
-                     // Create a temporary value of type T to get offsets, sizes
-                     // and alignments from.
--                    let tmp: $T = mem::zeroed();
-+                    let tmp: mem::MaybeUninit<$T> = mem::MaybeUninit::uninit();
-+                    // FIXME: This should use &raw references when available,
-+                    // this is technically UB as it creates a reference to
-+                    // uninitialized memory, but there's no better way to do
-+                    // this right now.
-+                    let tmp = &*tmp.as_ptr();
-                     *size = mem::size_of_val(&tmp.$member);
-                     *align = mem::align_of_val(&tmp.$member);
-                     *offset =
-                         (&tmp.$member as *const _ as usize) -
--                        (&tmp as *const _ as usize);
--                    mem::forget(tmp);
-+                        (tmp as *const $T as usize);
- 
--                    let tmp: $U = mem::zeroed();
-+                    let tmp: mem::MaybeUninit<$U> = mem::MaybeUninit::uninit();
-+                    let tmp = &*tmp.as_ptr();
-                     assert_eq!(*size, mem::size_of_val(&tmp.hdr.$member));
-                     assert_eq!(*align, mem::align_of_val(&tmp.hdr.$member));
-                     assert_eq!(*offset,
-                                (&tmp.hdr.$member as *const _ as usize) -
--                               (&tmp as *const _ as usize));
--                    mem::forget(tmp);
-+                               (tmp as *const $U as usize));
- 
--                    let tmp: $V = mem::zeroed();
-+                    let tmp: mem::MaybeUninit<$V> = mem::MaybeUninit::uninit();
-+                    let tmp = &*tmp.as_ptr();
-                     assert_eq!(*size, mem::size_of_val(&tmp.hdr.$member));
-                     assert_eq!(*align, mem::align_of_val(&tmp.hdr.$member));
-                     assert_eq!(*offset,
-                                (&tmp.hdr.$member as *const _ as usize) -
--                               (&tmp as *const _ as usize));
--                    mem::forget(tmp);
-+                               (tmp as *const $V as usize));
-                 }
-             }
-         }
-
-
diff --git a/mozilla-1595218.patch b/mozilla-1595218.patch
deleted file mode 100644
index f90df39..0000000
--- a/mozilla-1595218.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/taskcluster/ci/toolchain/misc.yml b/taskcluster/ci/toolchain/misc.yml
---- a/taskcluster/ci/toolchain/misc.yml
-+++ b/taskcluster/ci/toolchain/misc.yml
-@@ -117,4 +117,4 @@
-             - 'taskcluster/scripts/misc/tooltool-download.sh'
-         toolchain-artifact: public/build/wrench-deps.tar.bz2
-     toolchains:
--        - linux64-rust-1.34  # whatever m-c is built with
-+        - linux64-rust-1.39  # whatever m-c is built with
-diff --git a/taskcluster/ci/toolchain/rust.yml b/taskcluster/ci/toolchain/rust.yml
---- a/taskcluster/ci/toolchain/rust.yml
-+++ b/taskcluster/ci/toolchain/rust.yml
-@@ -47,12 +47,24 @@
-             '--target', 'aarch64-unknown-linux-gnu',
-         ]
- 
--linux64-rust-1.34:
-+linux64-rust-1.38:
-+    treeherder:
-+        symbol: TL(rust-1.38.0)
-+    run:
-+        arguments: [
-+            '--channel', '1.38.0',
-+            '--host', 'x86_64-unknown-linux-gnu',
-+            '--target', 'x86_64-unknown-linux-gnu',
-+            '--target', 'i686-unknown-linux-gnu',
-+            '--target', 'aarch64-unknown-linux-gnu',
-+        ]
-+
-+linux64-rust-1.39:
-     treeherder:
-         symbol: TL(rust)
-     run:
-         arguments: [
--            '--channel', '1.34.0',
-+            '--channel', '1.39.0',
-             '--host', 'x86_64-unknown-linux-gnu',
-             '--target', 'x86_64-unknown-linux-gnu',
-             '--target', 'i686-unknown-linux-gnu',
-diff --git a/python/mozboot/mozboot/base.py b/python/mozboot/mozboot/base.py
---- a/python/mozboot/mozboot/base.py
-+++ b/python/mozboot/mozboot/base.py
-@@ -158,7 +158,7 @@
- MODERN_PYTHON_VERSION = LooseVersion('2.7.3')
- 
- # Upgrade rust older than this.
--MODERN_RUST_VERSION = LooseVersion('1.34.0')
-+MODERN_RUST_VERSION = LooseVersion('1.39.0')
- 
- # Upgrade nasm older than this.
- MODERN_NASM_VERSION = LooseVersion('2.14')
-
-
-diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
---- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
-+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
-@@ -1522,15 +1522,22 @@
-                 'x86_64-unknown-openbsd',
-                 'x86_64-unknown-redox',
-             ]
--            # Additional targets from 1.33
--            if Version(version) >= '1.33.0':
-+            # Additional targets from 1.38
-+            if Version(version) >= '1.39.0':
-                 rust_targets += [
--                    'thumbv7neon-linux-androideabi',
--                    'thumbv7neon-unknown-linux-gnueabihf',
--                    'x86_64-unknown-uefi',
--                    'thumbv8m.main-none-eabi',
--                    'thumbv8m.main-none-eabihf',
-+                    'aarch64-uwp-windows-msvc',
-+                    'armv7-wrs-vxworks-eabihf',
-+                    'i686-unknown-uefi',
-+                    'i686-uwp-windows-msvc',
-+                    'mips64-unknown-linux-muslabi64',
-+                    'mips64el-unknown-linux-muslabi64',
-+                    'sparc64-unknown-openbsd',
-+                    'x86_64-linux-kernel',
-+                    'x86_64-uwp-windows-msvc',
-                 ]
-+                rust_targets.remove('armv7-wrs-vxworks')
-+                rust_targets.remove('i586-wrs-vxworks')
-+
-             return 0, '\n'.join(sorted(rust_targets)), ''
-         if (len(args) == 6 and args[:2] == ('--crate-type', 'staticlib') and
-             args[2].startswith('--target=') and args[3] == '-o'):
-@@ -1671,7 +1687,7 @@
- 
- 
- class RustTest(BaseConfigureTest):
--    def get_rust_target(self, target, compiler_type='gcc', version='1.33.0',
-+    def get_rust_target(self, target, compiler_type='gcc', version='1.39.0',
-                         arm_target=None):
-         environ = {
-             'PATH': os.pathsep.join(
diff --git a/sources b/sources
index 53c7dd8..47900eb 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 SHA512 (cbindgen-vendor.tar.xz) = 2daac8505b71c9672020b6d407f8ec826cc978629a2e44857f5e80a8cedc79162aea2fb01179683542e505148249827523e59e58e9c54ab0d298c5d07a555f10
-SHA512 (icecat-68.2.0-gnu2.tar.bz2) = 1db3e55f774b30552cd7bf94de1ebe27e8ceedcac349f2e7419626d818aeaff53de2257064a79070a9324c6635b417f74b33e482d2c4d860f11c9b22dce4949d
-SHA512 (icecat-68.2.0-langpacks.tar.gz) = a13a29071114438795c0a6c8bf5bd2cecc50e18a0d9298641cacc27989bfc1613c0632b66da71895cc48db76a1e7e5b10cdccd96a262f4af9d5e6844461a4c7c
+SHA512 (icecat-68.3.0-gnu1.tar.bz2) = 282f9865772feb1573f46e46407d6255f6be25809477beda07870e20d7cd4c248f02da0fa0f555a5d81fdaee913f974c696cab297bf51e340d24b45a5486a88b
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 1d3ff34aa1c4c4d2bed0c37e4b1dbef1db3c94be Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 27 Nov 2019 14:52:12 +0100
Subject: [PATCH 081/473] Remove --enable-stdcxx-compat build option

---
 icecat.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index e2b9bc1..b826150 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -408,8 +408,6 @@ tar -xf %{SOURCE5}
 rm -f .mozconfig
 cp -p %{SOURCE3} .mozconfig
 
-echo "ac_add_options --enable-stdcxx-compat" >> .mozconfig
-
 # Disable signature checking for extensions that are bundled with IceCat
 echo "ac_add_options --with-unsigned-addon-scopes=app" >> .mozconfig
 

From 9367da609edd219778828bce29c8bf02bbdb99c5 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 2 Dec 2019 20:16:29 +0100
Subject: [PATCH 082/473]  Mozilla release 68.3.0ESR

---
 .gitignore              |  1 +
 icecat-lang_download.sh |  2 +-
 icecat.rpmlintrc        | 46 -----------------------------------------
 icecat.spec             | 16 +++++++-------
 sources                 |  3 ++-
 5 files changed, 11 insertions(+), 57 deletions(-)
 delete mode 100644 icecat.rpmlintrc

diff --git a/.gitignore b/.gitignore
index 1775fde..ba2e9fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,3 +94,4 @@
 /icecat-68.2.0-langpacks.tar.gz
 /icecat-68.2.0-gnu2.tar.bz2
 /icecat-68.3.0-gnu1.tar.bz2
+/icecat-68.3.0-langpacks.tar.gz
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 9a8708d..d7bbfe7 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=68.2.0
+VERSION=68.3.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
deleted file mode 100644
index 4d7dde1..0000000
--- a/icecat.rpmlintrc
+++ /dev/null
@@ -1,46 +0,0 @@
-# Whitelisting errors
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-# https://src.fedoraproject.org/rpms/python3/blob/master/f/python3.rpmlintrc
-# Edited by sagitter (sagitter AT fedoraproject dot org)
-
-# KNOWN BUGS:
-#
-
-# TESTS:
-##### SRPMs #####
-
-# ifarch applied patches are okay
-# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
-addFilter(r'(%ifarch-applied-patch) Patch*')
-# Different file size due to the signature of the source code tarbz archive
-addFilter(r'file-size-mismatch')
-
-addFilter(r'(invalid-url) Source4')
-addFilter(r'(invalid-url) Source5')
-addFilter(r'(invalid-url) Source17')
-
-# ERRORS:
-##### RPMs  #####
-
-# chroot function (??)
-addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib(64)?/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib(64)?/icecat/libxul.so')
-
-# Expected on FF browser
-# https://support.mozilla.org/en-US/questions/1045418
-addFilter(r'(zero-length) /usr/lib(64)?/icecat/chrome.manifest')
-addFilter(r'(zero-length) /usr/lib(64)?/icecat/browser/chrome.manifest')
-
-addFilter(r'E:library-not-linked-against-libc /usr/lib(64)?/icecat/gtk2/libmozgtk.so')
-addFilter(r'E:library-not-linked-against-libc /usr/lib(64)?/icecat/libmozgtk.so')
-
-# False positive
-addFilter(r'(dangling-symlink) /usr/lib(64)?/icecat/dictionaries /usr/share/myspell')
-addFilter(r'(unversioned-explicit-provides) webclient')
-
-# WARNINGS:
-##### RPMs  #####
-
-addFilter(r'(no-manual-page-for-binary) icecat-wayland')
-addFilter(r'(no-manual-page-for-binary) icecat-x11')
-
diff --git a/icecat.spec b/icecat.spec
index b826150..b78cd25 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -2,7 +2,7 @@
 %global release_build 1
 
 # Active/Deactive language files handling
-%global build_langpacks 0
+%global build_langpacks 1
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
@@ -83,8 +83,8 @@ ExcludeArch: s390x
 %global gnu_ver gnu1
 
 # Set extra version tag
-%global extra_ver .rc2
-#%%global extra_ver %%{nil}
+#%%global extra_ver .rc2
+%global extra_ver %%{nil}
 
 %if !%{release_build}
 %global pre_tag .test
@@ -92,7 +92,7 @@ ExcludeArch: s390x
 
 Name: icecat
 Version: 68.3.0
-Release: 0.1%{extra_ver}.%{gnu_ver}%{?pre_tag}%{?dist}
+Release: 1%{extra_ver}.%{gnu_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -177,7 +177,6 @@ Patch226: rhbz-1354671.patch
 Patch414: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
 Patch417: bug1375074-save-restore-x28.patch
 Patch418: mozilla-1556602.patch
-# Patches for rust-1.39+
 
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
@@ -388,10 +387,6 @@ tar -xf %{SOURCE5}
 %endif
 %patch418 -p1 -b .mozilla-1556602
 
-# Patches for rust-1.39+
-
-#
-
 %patch423 -p1 -b .mozilla-1596503
 %patch424 -p1 -b .mozilla-1566876-webrtc-ind
 %patch425 -p1 -b .mozilla-1568569
@@ -830,6 +825,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Mon Dec 02 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.3.0-1.gnu1
+- Mozilla release 68.3.0ESR
+
 * Wed Nov 27 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.3.0-0.1.rc2.gnu1
 - Mozilla release candidate 68.3.0ESR
 
diff --git a/sources b/sources
index 47900eb..cea1c3a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 2daac8505b71c9672020b6d407f8ec826cc978629a2e44857f5e80a8cedc79162aea2fb01179683542e505148249827523e59e58e9c54ab0d298c5d07a555f10
-SHA512 (icecat-68.3.0-gnu1.tar.bz2) = 282f9865772feb1573f46e46407d6255f6be25809477beda07870e20d7cd4c248f02da0fa0f555a5d81fdaee913f974c696cab297bf51e340d24b45a5486a88b
+SHA512 (icecat-68.3.0-gnu1.tar.bz2) = f2d8bfb12f9eeb2426ef38f9849bfcb95d2d56f4374651e65d06654f9b0379b5c11d4df03973a68c65b29b8e3c7f9712c04e67f56a91a82b309c8bb405cbb964
+SHA512 (icecat-68.3.0-langpacks.tar.gz) = c65d0170f110fe4afcaf0074e7c799a1226d87231a77d67ae170290933175aa3a2f68401c99e752126e96b3de87a77512d6573daf7c3019aae26434bc6b83e58
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From fdcd79908da42d051b3baedcada5ae59de6b34a4 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 2 Dec 2019 20:18:17 +0100
Subject: [PATCH 083/473] Add icecat.rpmlintrc

---
 icecat.rpmlintrc | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 icecat.rpmlintrc

diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
new file mode 100644
index 0000000..4d7dde1
--- /dev/null
+++ b/icecat.rpmlintrc
@@ -0,0 +1,46 @@
+# Whitelisting errors
+# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
+# https://src.fedoraproject.org/rpms/python3/blob/master/f/python3.rpmlintrc
+# Edited by sagitter (sagitter AT fedoraproject dot org)
+
+# KNOWN BUGS:
+#
+
+# TESTS:
+##### SRPMs #####
+
+# ifarch applied patches are okay
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
+addFilter(r'(%ifarch-applied-patch) Patch*')
+# Different file size due to the signature of the source code tarbz archive
+addFilter(r'file-size-mismatch')
+
+addFilter(r'(invalid-url) Source4')
+addFilter(r'(invalid-url) Source5')
+addFilter(r'(invalid-url) Source17')
+
+# ERRORS:
+##### RPMs  #####
+
+# chroot function (??)
+addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib(64)?/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib(64)?/icecat/libxul.so')
+
+# Expected on FF browser
+# https://support.mozilla.org/en-US/questions/1045418
+addFilter(r'(zero-length) /usr/lib(64)?/icecat/chrome.manifest')
+addFilter(r'(zero-length) /usr/lib(64)?/icecat/browser/chrome.manifest')
+
+addFilter(r'E:library-not-linked-against-libc /usr/lib(64)?/icecat/gtk2/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib(64)?/icecat/libmozgtk.so')
+
+# False positive
+addFilter(r'(dangling-symlink) /usr/lib(64)?/icecat/dictionaries /usr/share/myspell')
+addFilter(r'(unversioned-explicit-provides) webclient')
+
+# WARNINGS:
+##### RPMs  #####
+
+addFilter(r'(no-manual-page-for-binary) icecat-wayland')
+addFilter(r'(no-manual-page-for-binary) icecat-x11')
+

From 695e7b44d531027e26ffa491ad803045b7c7cc6e Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 3 Dec 2019 09:33:31 +0100
Subject: [PATCH 084/473] Add mozilla-1564873 patch

---
 icecat.spec           |   4 +
 mozilla-1564873.patch | 184 ++++++++++++++++++++++++++++++++++++++++++
 sources               |   2 +-
 3 files changed, 189 insertions(+), 1 deletion(-)
 create mode 100644 mozilla-1564873.patch

diff --git a/icecat.spec b/icecat.spec
index b78cd25..3d77aa3 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -178,6 +178,8 @@ Patch414: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
 Patch417: bug1375074-save-restore-x28.patch
 Patch418: mozilla-1556602.patch
 
+Patch419: mozilla-1564873.patch
+
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
 Patch424: mozilla-1566876-webrtc-ind.patch
@@ -387,6 +389,8 @@ tar -xf %{SOURCE5}
 %endif
 %patch418 -p1 -b .mozilla-1556602
 
+%patch419 -p1 -b .mozilla-1564873
+
 %patch423 -p1 -b .mozilla-1596503
 %patch424 -p1 -b .mozilla-1566876-webrtc-ind
 %patch425 -p1 -b .mozilla-1568569
diff --git a/mozilla-1564873.patch b/mozilla-1564873.patch
new file mode 100644
index 0000000..de159c1
--- /dev/null
+++ b/mozilla-1564873.patch
@@ -0,0 +1,184 @@
+
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio@crisal.io>
+# Date 1574168632 0
+# Node ID 82e4062e839a57c0dbcb08df9965883c162eb8d1
+# Parent  ff37a98047d63550c77052e7dfecbda14b188e0d
+Bug 1564873 - Fix straight-forward uses of mem::uninitialized in webrender. r=nical
+
+Differential Revision: https://phabricator.services.mozilla.com/D53359
+
+diff --git a/gfx/wr/webrender/src/platform/unix/font.rs b/gfx/wr/webrender/src/platform/unix/font.rs
+--- a/gfx/wr/webrender/src/platform/unix/font.rs
++++ b/gfx/wr/webrender/src/platform/unix/font.rs
+@@ -530,26 +530,26 @@ impl FontContext {
+     // Get the bounding box for a glyph, accounting for sub-pixel positioning.
+     fn get_bounding_box(
+         &self,
+         slot: FT_GlyphSlot,
+         font: &FontInstance,
+         glyph: &GlyphKey,
+         scale: f32,
+     ) -> FT_BBox {
+-        let mut cbox: FT_BBox = unsafe { mem::uninitialized() };
++        // Get the estimated bounding box from FT (control points).
++        let mut cbox = FT_BBox { xMin: 0, yMin: 0, xMax: 0, yMax: 0 };
+ 
+-        // Get the estimated bounding box from FT (control points).
+         unsafe {
+             FT_Outline_Get_CBox(&(*slot).outline, &mut cbox);
++        }
+ 
+-            // For spaces and other non-printable characters, early out.
+-            if (*slot).outline.n_contours == 0 {
+-                return cbox;
+-            }
++        // For spaces and other non-printable characters, early out.
++        if unsafe { (*slot).outline.n_contours } == 0 {
++            return cbox;
+         }
+ 
+         self.pad_bounding_box(font, &mut cbox);
+ 
+         // Offset the bounding box by subpixel positioning.
+         // Convert to 26.6 fixed point format for FT.
+         let (dx, dy) = font.get_subpx_offset(glyph);
+         let (dx, dy) = (
+@@ -713,17 +713,17 @@ impl FontContext {
+             (dx / scale as f64 * 64.0 + 0.5) as FT_Pos,
+             -(dy / scale as f64 * 64.0 + 0.5) as FT_Pos,
+         );
+ 
+         // Move the outline curves to be at the origin, taking
+         // into account the subpixel positioning.
+         unsafe {
+             let outline = &(*slot).outline;
+-            let mut cbox: FT_BBox = mem::uninitialized();
++            let mut cbox = FT_BBox { xMin: 0, yMin: 0, xMax: 0, yMax: 0 };
+             FT_Outline_Get_CBox(outline, &mut cbox);
+             self.pad_bounding_box(font, &mut cbox);
+             FT_Outline_Translate(
+                 outline,
+                 dx - ((cbox.xMin + dx) & !63),
+                 dy - ((cbox.yMin + dy) & !63),
+             );
+         }
+diff --git a/gfx/wr/webrender/src/prim_store/gradient.rs b/gfx/wr/webrender/src/prim_store/gradient.rs
+--- a/gfx/wr/webrender/src/prim_store/gradient.rs
++++ b/gfx/wr/webrender/src/prim_store/gradient.rs
+@@ -18,7 +18,7 @@
+ use crate::prim_store::{PrimKeyCommonData, PrimTemplateCommonData, PrimitiveStore};
+ use crate::prim_store::{NinePatchDescriptor, PointKey, SizeKey, InternablePrimitive};
+ use crate::render_task::RenderTaskCacheEntryHandle;
+-use std::{hash, ops::{Deref, DerefMut}, mem};
++use std::{hash, ops::{Deref, DerefMut}};
+ use crate::util::pack_as_float;
+ 
+ /// The maximum number of stops a gradient may have to use the fast path.
+@@ -575,22 +575,32 @@ pub const GRADIENT_DATA_TABLE_BEGIN: usi
+ // The exclusive bound of the gradient data table
+ pub const GRADIENT_DATA_TABLE_END: usize = GRADIENT_DATA_LAST_STOP;
+ // The number of entries in the gradient data table.
+ pub const GRADIENT_DATA_TABLE_SIZE: usize = 128;
+ 
+ // The number of entries in a gradient data: GRADIENT_DATA_TABLE_SIZE + first stop entry + last stop entry
+ pub const GRADIENT_DATA_SIZE: usize = GRADIENT_DATA_TABLE_SIZE + 2;
+ 
+-#[derive(Debug)]
++/// An entry in a gradient data table representing a segment of the gradient
++/// color space.
++#[derive(Debug, Copy, Clone)]
+ #[repr(C)]
+-// An entry in a gradient data table representing a segment of the gradient color space.
+-pub struct GradientDataEntry {
+-    pub start_color: PremultipliedColorF,
+-    pub end_color: PremultipliedColorF,
++struct GradientDataEntry {
++    start_color: PremultipliedColorF,
++    end_color: PremultipliedColorF,
++}
++
++impl GradientDataEntry {
++    fn white() -> Self {
++        Self {
++            start_color: PremultipliedColorF::WHITE,
++            end_color: PremultipliedColorF::WHITE,
++        }
++    }
+ }
+ 
+ // TODO(gw): Tidy this up to be a free function / module?
+ struct GradientGpuBlockBuilder {}
+ 
+ impl GradientGpuBlockBuilder {
+     /// Generate a color ramp filling the indices in [start_idx, end_idx) and interpolating
+     /// from start_color to end_color.
+@@ -657,17 +667,17 @@ impl GradientGpuBlockBuilder {
+         // within the segment of the gradient space represented by that entry. To lookup a gradient result,
+         // first the entry index is calculated to determine which two colors to interpolate between, then
+         // the offset within that entry bucket is used to interpolate between the two colors in that entry.
+         // This layout preserves hard stops, as the end color for a given entry can differ from the start
+         // color for the following entry, despite them being adjacent. Colors are stored within in BGRA8
+         // format for texture upload. This table requires the gradient color stops to be normalized to the
+         // range [0, 1]. The first and last entries hold the first and last color stop colors respectively,
+         // while the entries in between hold the interpolated color stop values for the range [0, 1].
+-        let mut entries: [GradientDataEntry; GRADIENT_DATA_SIZE] = unsafe { mem::uninitialized() };
++        let mut entries = [GradientDataEntry::white(); GRADIENT_DATA_SIZE];
+ 
+         if reverse_stops {
+             // Fill in the first entry (for reversed stops) with the first color stop
+             GradientGpuBlockBuilder::fill_colors(
+                 GRADIENT_DATA_LAST_STOP,
+                 GRADIENT_DATA_LAST_STOP + 1,
+                 &cur_color,
+                 &cur_color,
+@@ -692,23 +702,16 @@ impl GradientGpuBlockBuilder {
+                     );
+                     cur_idx = next_idx;
+                 }
+ 
+                 cur_color = next_color;
+             }
+             if cur_idx != GRADIENT_DATA_TABLE_BEGIN {
+                 error!("Gradient stops abruptly at {}, auto-completing to white", cur_idx);
+-                GradientGpuBlockBuilder::fill_colors(
+-                    GRADIENT_DATA_TABLE_BEGIN,
+-                    cur_idx,
+-                    &PremultipliedColorF::WHITE,
+-                    &cur_color,
+-                    &mut entries,
+-                );
+             }
+ 
+             // Fill in the last entry (for reversed stops) with the last color stop
+             GradientGpuBlockBuilder::fill_colors(
+                 GRADIENT_DATA_FIRST_STOP,
+                 GRADIENT_DATA_FIRST_STOP + 1,
+                 &cur_color,
+                 &cur_color,
+@@ -742,23 +745,16 @@ impl GradientGpuBlockBuilder {
+                     );
+                     cur_idx = next_idx;
+                 }
+ 
+                 cur_color = next_color;
+             }
+             if cur_idx != GRADIENT_DATA_TABLE_END {
+                 error!("Gradient stops abruptly at {}, auto-completing to white", cur_idx);
+-                GradientGpuBlockBuilder::fill_colors(
+-                    cur_idx,
+-                    GRADIENT_DATA_TABLE_END,
+-                    &PremultipliedColorF::WHITE,
+-                    &cur_color,
+-                    &mut entries,
+-                );
+             }
+ 
+             // Fill in the last entry with the last color stop
+             GradientGpuBlockBuilder::fill_colors(
+                 GRADIENT_DATA_LAST_STOP,
+                 GRADIENT_DATA_LAST_STOP + 1,
+                 &cur_color,
+                 &cur_color,
+
+
diff --git a/sources b/sources
index cea1c3a..bb25126 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = 2daac8505b71c9672020b6d407f8ec826cc978629a2e44857f5e80a8cedc79162aea2fb01179683542e505148249827523e59e58e9c54ab0d298c5d07a555f10
+SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
 SHA512 (icecat-68.3.0-gnu1.tar.bz2) = f2d8bfb12f9eeb2426ef38f9849bfcb95d2d56f4374651e65d06654f9b0379b5c11d4df03973a68c65b29b8e3c7f9712c04e67f56a91a82b309c8bb405cbb964
 SHA512 (icecat-68.3.0-langpacks.tar.gz) = c65d0170f110fe4afcaf0074e7c799a1226d87231a77d67ae170290933175aa3a2f68401c99e752126e96b3de87a77512d6573daf7c3019aae26434bc6b83e58
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 3b557ce43106226a9e1336d7bfbb7834ea0d333d Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 4 Dec 2019 20:06:31 +0100
Subject: [PATCH 085/473] Patch for cbindgen/rust-1.39

---
 icecat-68.3.0-cbindgen_for_rust139.patch | 172 +++++++++++++++++++++++
 icecat.spec                              |   6 +-
 2 files changed, 177 insertions(+), 1 deletion(-)
 create mode 100644 icecat-68.3.0-cbindgen_for_rust139.patch

diff --git a/icecat-68.3.0-cbindgen_for_rust139.patch b/icecat-68.3.0-cbindgen_for_rust139.patch
new file mode 100644
index 0000000..f150066
--- /dev/null
+++ b/icecat-68.3.0-cbindgen_for_rust139.patch
@@ -0,0 +1,172 @@
+diff -up a/third_party/rust/bindgen/.cargo-checksum.json.bindgen b/third_party/rust/bindgen/.cargo-checksum.json
+--- a/third_party/rust/bindgen/.cargo-checksum.json.bindgen	2019-12-01 15:29:26.000000000 +0100
++++ b/third_party/rust/bindgen/.cargo-checksum.json	2019-12-04 11:38:42.878975886 +0100
+@@ -1 +1 @@
+-{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"8dc10043d872e68e660ef96edca4d9733f95be45cdad4893462fa929b335014f","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"}
+\ No newline at end of file
++{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"71f1a37f75b971ea5b0d8457473cc410947dbf706cb6d2c0338916910b78a675","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"}
+diff -up a/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs.bindgen b/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs
+--- a/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs.bindgen	2019-12-01 15:29:26.000000000 +0100
++++ b/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs	2019-12-04 11:33:09.631921359 +0100
+@@ -9,17 +9,17 @@ use std::ops;
+ use {HashMap, Entry};
+ 
+ /// The result of the `HasVtableAnalysis` for an individual item.
+-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+ pub enum HasVtableResult {
+-    /// The item has a vtable, but the actual vtable pointer is in a base
+-    /// member.
+-    BaseHasVtable,
++    /// The item does not have a vtable pointer.
++    No,
+ 
+     /// The item has a vtable and the actual vtable pointer is within this item.
+     SelfHasVtable,
+ 
+-    /// The item does not have a vtable pointer.
+-    No
++    /// The item has a vtable, but the actual vtable pointer is in a base
++    /// member.
++    BaseHasVtable,
+ }
+ 
+ impl Default for HasVtableResult {
+@@ -28,21 +28,6 @@ impl Default for HasVtableResult {
+     }
+ }
+ 
+-impl cmp::PartialOrd for HasVtableResult {
+-    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
+-        use self::HasVtableResult::*;
+-
+-        match (*self, *rhs) {
+-            (x, y) if x == y => Some(cmp::Ordering::Equal),
+-            (BaseHasVtable, _) => Some(cmp::Ordering::Greater),
+-            (_, BaseHasVtable) => Some(cmp::Ordering::Less),
+-            (SelfHasVtable, _) => Some(cmp::Ordering::Greater),
+-            (_, SelfHasVtable) => Some(cmp::Ordering::Less),
+-            _ => unreachable!(),
+-        }
+-    }
+-}
+-
+ impl HasVtableResult {
+     /// Take the least upper bound of `self` and `rhs`.
+     pub fn join(self, rhs: Self) -> Self {
+diff -up a/third_party/rust/bindgen/src/ir/analysis/sizedness.rs.bindgen b/third_party/rust/bindgen/src/ir/analysis/sizedness.rs
+--- a/third_party/rust/bindgen/src/ir/analysis/sizedness.rs.bindgen	2019-12-01 15:29:26.000000000 +0100
++++ b/third_party/rust/bindgen/src/ir/analysis/sizedness.rs	2019-12-04 11:33:09.632921362 +0100
+@@ -22,13 +22,14 @@ use {HashMap, Entry};
+ ///
+ /// We initially assume that all types are `ZeroSized` and then update our
+ /// understanding as we learn more about each type.
+-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
++#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+ pub enum SizednessResult {
+-    /// Has some size that is known to be greater than zero. That doesn't mean
+-    /// it has a static size, but it is not zero sized for sure. In other words,
+-    /// it might contain an incomplete array or some other dynamically sized
+-    /// type.
+-    NonZeroSized,
++    /// The type is zero-sized.
++    ///
++    /// This means that if it is a C++ type, and is not being used as a base
++    /// member, then we must add an `_address` byte to enforce the
++    /// unique-address-per-distinct-object-instance rule.
++    ZeroSized,
+ 
+     /// Whether this type is zero-sized or not depends on whether a type
+     /// parameter is zero-sized or not.
+@@ -52,12 +53,11 @@ pub enum SizednessResult {
+     /// https://github.com/rust-lang-nursery/rust-bindgen/issues/586
+     DependsOnTypeParam,
+ 
+-    /// The type is zero-sized.
+-    ///
+-    /// This means that if it is a C++ type, and is not being used as a base
+-    /// member, then we must add an `_address` byte to enforce the
+-    /// unique-address-per-distinct-object-instance rule.
+-    ZeroSized,
++    /// Has some size that is known to be greater than zero. That doesn't mean
++    /// it has a static size, but it is not zero sized for sure. In other words,
++    /// it might contain an incomplete array or some other dynamically sized
++    /// type.
++    NonZeroSized,
+ }
+ 
+ impl Default for SizednessResult {
+@@ -66,21 +66,6 @@ impl Default for SizednessResult {
+     }
+ }
+ 
+-impl cmp::PartialOrd for SizednessResult {
+-    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
+-        use self::SizednessResult::*;
+-
+-        match (*self, *rhs) {
+-            (x, y) if x == y => Some(cmp::Ordering::Equal),
+-            (NonZeroSized, _) => Some(cmp::Ordering::Greater),
+-            (_, NonZeroSized) => Some(cmp::Ordering::Less),
+-            (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater),
+-            (_, DependsOnTypeParam) => Some(cmp::Ordering::Less),
+-            _ => unreachable!(),
+-        }
+-    }
+-}
+-
+ impl SizednessResult {
+     /// Take the least upper bound of `self` and `rhs`.
+     pub fn join(self, rhs: Self) -> Self {
+diff -up a/third_party/rust/bindgen/src/ir/derive.rs.bindgen b/third_party/rust/bindgen/src/ir/derive.rs
+--- a/third_party/rust/bindgen/src/ir/derive.rs.bindgen	2019-12-01 15:29:26.000000000 +0100
++++ b/third_party/rust/bindgen/src/ir/derive.rs	2019-12-04 11:33:09.632921362 +0100
+@@ -92,10 +92,10 @@ pub trait CanDeriveOrd {
+ ///
+ /// Initially we assume that we can derive trait for all types and then
+ /// update our understanding as we learn more about each type.
+-#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)]
++#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
+ pub enum CanDerive {
+-    /// No, we cannot.
+-    No,
++    /// Yes, we can derive automatically.
++    Yes,
+ 
+     /// The only thing that stops us from automatically deriving is that
+     /// array with more than maximum number of elements is used.
+@@ -103,8 +103,8 @@ pub enum CanDerive {
+     /// This means we probably can "manually" implement such trait.
+     Manually,
+ 
+-    /// Yes, we can derive automatically.
+-    Yes,
++    /// No, we cannot.
++    No,
+ }
+ 
+ impl Default for CanDerive {
+@@ -113,22 +113,6 @@ impl Default for CanDerive {
+     }
+ }
+ 
+-impl cmp::PartialOrd for CanDerive {
+-    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
+-        use self::CanDerive::*;
+-
+-        let ordering = match (*self, *rhs) {
+-            (x, y) if x == y => cmp::Ordering::Equal,
+-            (No, _) => cmp::Ordering::Greater,
+-            (_, No) => cmp::Ordering::Less,
+-            (Manually, _) => cmp::Ordering::Greater,
+-            (_, Manually) => cmp::Ordering::Less,
+-            _ => unreachable!()
+-        };
+-        Some(ordering)
+-    }
+-}
+-
+ impl CanDerive {
+     /// Take the least upper bound of `self` and `rhs`.
+     pub fn join(self, rhs: Self) -> Self {
+
diff --git a/icecat.spec b/icecat.spec
index 3d77aa3..2a9ceb4 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -178,7 +178,9 @@ Patch414: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
 Patch417: bug1375074-save-restore-x28.patch
 Patch418: mozilla-1556602.patch
 
+# Patches for compatibility with Rust-1.39
 Patch419: mozilla-1564873.patch
+Patch420: icecat-68.3.0-cbindgen_for_rust139.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
@@ -390,6 +392,7 @@ tar -xf %{SOURCE5}
 %patch418 -p1 -b .mozilla-1556602
 
 %patch419 -p1 -b .mozilla-1564873
+%patch420 -p1 -b .icecat-68.3.0-cbindgen_for_rust139
 
 %patch423 -p1 -b .mozilla-1596503
 %patch424 -p1 -b .mozilla-1566876-webrtc-ind
@@ -829,8 +832,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
-* Mon Dec 02 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.3.0-1.gnu1
+* Wed Dec 04 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.3.0-1.gnu1
 - Mozilla release 68.3.0ESR
+- Patch for cbindgen/rust-1.39
 
 * Wed Nov 27 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.3.0-0.1.rc2.gnu1
 - Mozilla release candidate 68.3.0ESR

From 4612a383fce1e0e9be9fecf230633f3f800b7a30 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 5 Dec 2019 10:20:28 +0100
Subject: [PATCH 086/473] Update appdata file

---
 icecat.appdata.xml | 27 ++++++++++++++++++++++-----
 icecat.spec        | 17 ++++++++++++++---
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/icecat.appdata.xml b/icecat.appdata.xml
index 9896394..7cc9151 100644
--- a/icecat.appdata.xml
+++ b/icecat.appdata.xml
@@ -11,7 +11,7 @@
   </categories>
   <description>
     <p>
-      GNUzilla is the GNU version of the Mozilla suite, and GNU IceCat is the GNU version of the Firefox ESR browser.
+      GNUZilla Icecat is a fully-free fork of Mozilla Firefox ESR browser.
     </p>  
     <p>
        Its main advantage is an ethical one: it is entirely free software:
@@ -35,10 +35,27 @@
           and disable the ones more prone to break websites.
        </li>
        <li>
+       LibreJS
+          GNU LibreJS aims to address the JavaScript problem described in Richard
+          Stallman's article The JavaScript Trap
+       </li>
+       <li>
+       LibrifyJS: libgen.me
+          Libre replacement for JavaScript blocked by GNU LibreJS on libgen.me
+       </li>
+       <li>
        HTTPS Everywhere
           HTTPS Everywhere is an extension that encrypts your communications with many major websites, making your browsing more secure
        </li>
        <li>
+       Onion Browser Button
+          Easily browse the internet using TOR proxy with just one click
+       </li>
+       <li>
+       ViewTube
+          Watch videos from video sharing websites with extra options
+       </li>
+       <li>
        A set of companion extensions for LibreJS by Nathan Nichols (https://addons.mozilla.org/en-US/firefox/user/NateN1222/)
        are pre-installed, and provide workarounds to use some services at USPS, RSF.org, SumOfUs.org, pay.gov, McDonald's, goteo.org
        and Google Docs without using nonfree JavaScript.
@@ -57,16 +74,16 @@
   <url type="homepage">http://www.gnu.org/software/gnuzilla/</url>
   <screenshots>
     <screenshot type="default">
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat1.png</image>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat68-1.png</image>
     </screenshot>
     <screenshot>
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat2.png</image>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat68-2.png</image>
     </screenshot>
     <screenshot>
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat3.png</image>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat68-3.png</image>
     </screenshot>
     <screenshot>
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat4.png</image>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat68-4.png</image>
     </screenshot>
   </screenshots>
   <updatecontact>sagitter_at_fedoraproject.org</updatecontact>
diff --git a/icecat.spec b/icecat.spec
index 2a9ceb4..114fd6d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -92,7 +92,7 @@ ExcludeArch: s390x
 
 Name: icecat
 Version: 68.3.0
-Release: 1%{extra_ver}.%{gnu_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{gnu_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -181,6 +181,7 @@ Patch418: mozilla-1556602.patch
 # Patches for compatibility with Rust-1.39
 Patch419: mozilla-1564873.patch
 Patch420: icecat-68.3.0-cbindgen_for_rust139.patch
+#
 
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
@@ -312,12 +313,18 @@ Extensions included to this version of IceCat:
    GNU LibreJS aims to address the JavaScript problem described in Richard
    Stallman's article The JavaScript Trap
 
+ * LibrifyJS: libgen.me
+   Libre replacement for JavaScript blocked by GNU LibreJS on libgen.me
+
  * HTTPS Everywhere
    HTTPS Everywhere is an extension that encrypts your communications with
    many major websites, making your browsing more secure
 
- * LibrifyJS: libgen.me
-   Libre replacement for JavaScript blocked by GNU LibreJS on libgen.me
+ * Onion Browser Button
+   Easily browse the internet using TOR proxy with just one click
+
+ * ViewTube
+   Watch videos from video sharing websites with extra options
 
 %if 0%{?wayland_backend_default}
 %package x11
@@ -832,6 +839,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Thu Dec 05 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.3.0-2.gnu1
+- Appdata file updated
+- Description updated
+
 * Wed Dec 04 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.3.0-1.gnu1
 - Mozilla release 68.3.0ESR
 - Patch for cbindgen/rust-1.39

From 6bb399e61e4f3013e09ef2d389d95cc9d2e0365f Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 1 Jan 2020 13:17:43 +0100
Subject: [PATCH 087/473] Mozilla pre release 68.4.0

---
 .gitignore                        |    1 +
 bug1375074-save-restore-x28.patch |   75 --
 icecat-lang_download.sh           |    2 +-
 icecat.spec                       |  354 +++++----
 mozilla-1556602.patch             | 1154 -----------------------------
 sources                           |    3 +-
 6 files changed, 179 insertions(+), 1410 deletions(-)
 delete mode 100644 bug1375074-save-restore-x28.patch
 delete mode 100644 mozilla-1556602.patch

diff --git a/.gitignore b/.gitignore
index ba2e9fc..d1610d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,3 +95,4 @@
 /icecat-68.2.0-gnu2.tar.bz2
 /icecat-68.3.0-gnu1.tar.bz2
 /icecat-68.3.0-langpacks.tar.gz
+/icecat-68.4.0-gnu1.tar.bz2
diff --git a/bug1375074-save-restore-x28.patch b/bug1375074-save-restore-x28.patch
deleted file mode 100644
index 4db683b..0000000
--- a/bug1375074-save-restore-x28.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-# HG changeset patch
-# User Lars T Hansen <lhansen@mozilla.com>
-# Date 1519822672 -3600
-#      Wed Feb 28 13:57:52 2018 +0100
-# Node ID 672f0415217b202ae59a930769dffd9d6ba6b87c
-# Parent  825fd04dacc6297d3a980ec4184079405950b35d
-Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object constructor.
-
-diff --git a/js/src/jit-test/tests/bug1375074.js b/js/src/jit-test/tests/bug1375074.js
-new file mode 100644
---- /dev/null
-+++ b/js/src/jit-test/tests/bug1375074.js
-@@ -0,0 +1,18 @@
-+// This forces the VM to start creating unboxed objects and thus stresses a
-+// particular path into generated code for a specialized unboxed object
-+// constructor.
-+
-+var K = 2000;			// 2000 should be plenty
-+var s = "[";
-+var i;
-+for ( i=0; i < K-1; i++ )
-+    s = s + `{"i":${i}},`;
-+s += `{"i":${i}}]`;
-+var v = JSON.parse(s);
-+
-+assertEq(v.length == K, true);
-+
-+for ( i=0; i < K; i++) {
-+    assertEq(v[i] instanceof Object, true);
-+    assertEq(v[i].i, i);
-+}
-diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp
---- a/js/src/vm/UnboxedObject.cpp
-+++ b/js/src/vm/UnboxedObject.cpp
-@@ -95,7 +95,15 @@ UnboxedLayout::makeConstructorCode(JSCon
- #endif
- 
- #ifdef JS_CODEGEN_ARM64
--    // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.
-+    // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
-+    // addressing.  The register we use for PSP may however also be used by
-+    // calling code, and it is nonvolatile, so save it.  Do this as a special
-+    // case first because the generic save/restore code needs the PSP to be
-+    // initialized already.
-+    MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
-+    masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
-+
-+    // Initialize the PSP from the SP.
-     masm.initStackPtr();
- #endif
- 
-@@ -233,7 +241,22 @@ UnboxedLayout::makeConstructorCode(JSCon
-         masm.pop(ScratchDoubleReg);
-     masm.PopRegsInMask(savedNonVolatileRegisters);
- 
-+#ifdef JS_CODEGEN_ARM64
-+    // Now restore the value that was in the PSP register on entry, and return.
-+
-+    // Obtain the correct SP from the PSP.
-+    masm.Mov(sp, PseudoStackPointer64);
-+
-+    // Restore the saved value of the PSP register, this value is whatever the
-+    // caller had saved in it, not any actual SP value, and it must not be
-+    // overwritten subsequently.
-+    masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
-+
-+    // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
-+    masm.Ret(vixl::lr);
-+#else
-     masm.abiret();
-+#endif
- 
-     masm.bind(&failureStoreOther);
- 
-
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index d7bbfe7..a3c7bd5 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=68.3.0
+VERSION=68.4.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 114fd6d..e1d8e06 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,8 +1,11 @@
-# Set to true if it's going to be submitted as update.
+# Set to true if it's going to be submitted as update
 %global release_build 1
 
+# Set to true if it's going to be submitted as release candidate
+%global release_candidate 1
+
 # Active/Deactive language files handling
-%global build_langpacks 1
+%global build_langpacks 0
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
@@ -83,16 +86,17 @@ ExcludeArch: s390x
 %global gnu_ver gnu1
 
 # Set extra version tag
-#%%global extra_ver .rc2
-%global extra_ver %%{nil}
+%if 0%{?release_candidate}
+%global extra_ver .rc1
+%endif
 
 %if !%{release_build}
 %global pre_tag .test
 %endif
 
 Name: icecat
-Version: 68.3.0
-Release: 2%{extra_ver}.%{gnu_ver}%{?pre_tag}%{?dist}
+Version: 68.4.0
+Release: 0.1%{extra_ver}.%{gnu_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -173,10 +177,7 @@ Patch219: rhbz-1173156.patch
 Patch226: rhbz-1354671.patch
 
 # Upstream patches
-#Patch413: mozilla-1353817.patch
 Patch414: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
-Patch417: bug1375074-save-restore-x28.patch
-Patch418: mozilla-1556602.patch
 
 # Patches for compatibility with Rust-1.39
 Patch419: mozilla-1564873.patch
@@ -379,12 +380,10 @@ tar -xf %{SOURCE5}
 %patch226 -p1 -b .1354671
 %endif
 
-#%%patch413 -p1 -b .1353817
 %ifarch %{arm}
 %patch414 -p1 -b .Bug-1238661---fix-mozillaSignalTrampoline-to-work
 %patch44  -p1 -b .build-arm-libopus
 %endif
-#%%patch417 -p1 -b .bug1375074-save-restore-x28
 
 # Patch for big endian platforms only
 %if 0%{?big_endian}
@@ -393,13 +392,8 @@ tar -xf %{SOURCE5}
 %patch29 -p1 -b .big-endian
 %endif
 
-%ifarch ppc64 ppc64le
-#%%patch423 -p1 -b .1512162
-%endif
-%patch418 -p1 -b .mozilla-1556602
-
 %patch419 -p1 -b .mozilla-1564873
-%patch420 -p1 -b .icecat-68.3.0-cbindgen_for_rust139
+#%%patch420 -p1 -b .icecat-68.3.0-cbindgen_for_rust139
 
 %patch423 -p1 -b .mozilla-1596503
 %patch424 -p1 -b .mozilla-1566876-webrtc-ind
@@ -839,168 +833,172 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
-* Thu Dec 05 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.3.0-2.gnu1
+* Wed Jan 01 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-0.1.rc1.gnu1
+- Mozilla release candidate 68.4.0ESR
+- Fix rhbz#1785956
+
+* Thu Dec 05 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.3.0-2.gnu1
 - Appdata file updated
 - Description updated
 
-* Wed Dec 04 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.3.0-1.gnu1
+* Wed Dec 04 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.3.0-1.gnu1
 - Mozilla release 68.3.0ESR
 - Patch for cbindgen/rust-1.39
 
-* Wed Nov 27 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.3.0-0.1.rc2.gnu1
+* Wed Nov 27 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.3.0-0.1.rc2.gnu1
 - Mozilla release candidate 68.3.0ESR
 
-* Fri Nov 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-4.gnu3.test
+* Fri Nov 22 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.2.0-4.gnu3.test
 - Build release 68.2.0-gnu3
 - Undo latest change
 - Patched for rust-1.39+
 
-* Sun Nov 10 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-3.gnu2
+* Sun Nov 10 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.2.0-3.gnu2
 - Do not remove cose.manifest files
 
-* Fri Nov 08 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-2.gnu2
+* Fri Nov 08 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.2.0-2.gnu2
 - Build release 68.2.0-gnu2
 - HTTPS-Everywhere 2019_11_7
 - Use always system vpx (Fedora 30+)
 - Patched for Mozilla bug #1556602
 
-* Tue Oct 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.2.0-1.gnu1
+* Tue Oct 22 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.2.0-1.gnu1
 - Mozilla release 68.2.0ESR
 
-* Tue Sep 03 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.1.0-1.gnu1
+* Tue Sep 03 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.1.0-1.gnu1
 - Mozilla release 68.1.0ESR
 - Incorporate Wayland patches from Firefox 68
 
-* Sun Sep 01 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-5.gnu3
+* Sun Sep 01 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.0.2-5.gnu3
 - Rebuild after retiring of Python2
 
-* Fri Aug 23 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-4.gnu3
+* Fri Aug 23 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.0.2-4.gnu3
 - Enable langpacks
 
-* Wed Aug 21 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-3.gnu3
+* Wed Aug 21 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.0.2-3.gnu3
 - gnu3 build release
 
-* Mon Aug 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-2.gnu2
+* Mon Aug 19 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.0.2-2.gnu2
 - WebRTC always disabled
 - Do not build langpacks
 - gnu2 build release
 - Disable MOZ_SERVICES_SYNC
 
-* Thu Aug 15 2019 Antonio Trande <sagitterATfedoraproject.org> - 68.0.2-1.gnu1
+* Thu Aug 15 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.0.2-1.gnu1
 - Mozilla release 68.0.2ESR
 - Import cbindgen stuff from Firefox package
 - Do not use sqlite from system
 
-* Sun Jul 28 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-6.gnu1
+* Sun Jul 28 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.8.0-6.gnu1
 - Add patch to fix the addon installation
 
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 60.8.0-6.gnu1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
-* Tue Jul 23 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-5.gnu1
+* Tue Jul 23 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.8.0-5.gnu1
 - Enable WebRTC on ppc64le
 
-* Fri Jul 12 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-4.gnu1
+* Fri Jul 12 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.8.0-4.gnu1
 - Remove redundant Python2 dependencies 
 
-* Thu Jul 11 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-3.gnu1
+* Thu Jul 11 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.8.0-3.gnu1
 - Remove filtering of private libraries
 - Enable webrtc on %%{ix86} x86_64 only
 
-* Wed Jul 10 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-2.gnu1
+* Wed Jul 10 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.8.0-2.gnu1
 - Use mozilla-1512162.patch on Fedora 30+ only (GCC-9)
 
-* Tue Jul 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-1.gnu1
+* Tue Jul 09 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.8.0-1.gnu1
 - Mozilla release 60.8.0ESR
 
-* Sat Jun 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.2-1.gnu1
+* Sat Jun 22 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.7.2-1.gnu1
 - Mozilla release 60.7.2ESR
 
-* Wed Jun 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.1-1.gnu1
+* Wed Jun 19 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.7.1-1.gnu1
 - Mozilla release 60.7.1ESR
 - Do not list Git-tracked icecat.rpmlintrc as source
 
-* Tue May 28 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.0-2.gnu2
+* Tue May 28 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.7.0-2.gnu2
 - Build release 60.7.0-gnu2
 
-* Mon May 20 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.7.0-1.gnu1
+* Mon May 20 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.7.0-1.gnu1
 - Mozilla release 60.7.0ESR
 
-* Sun May 12 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.3-2.gnu2
+* Sun May 12 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.3-2.gnu2
 - Build release 60.6.3-gnu2
 
-* Thu May 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.3-1.gnu1
+* Thu May 09 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.3-1.gnu1
 - Mozilla release 60.6.3ESR (bugfix mozb #1549249)
 
-* Mon May 06 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.2-1.gnu1
+* Mon May 06 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.2-1.gnu1
 - Mozilla release 60.6.2ESR (bugfix mozb #1549061)
 
-* Sat Apr 06 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.1-2.gnu2
+* Sat Apr 06 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.1-2.gnu2
 - Source archive rebuilt (gnu2)
 - Update extensions
 - Use bundled https-everywhere extension
 
-* Fri Mar 22 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.1-1
+* Fri Mar 22 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.1-1
 - Mozilla release 60.6.1ESR
 - Wayland backend made default starting from Fedora 31 (rhbz#1691852)
 
-* Thu Mar 21 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-2
+* Thu Mar 21 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.0-2
 - Patched for building with newer glibc (2.29.9000-4) (mozilla #1533969)
 - Excluded on ARM (rhbz #1658940)
 - Language files re-based
 
-* Tue Mar 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-1
+* Tue Mar 19 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.0-1
 - Mozilla release 60.6.0ESR
 - Enable languages
 
-* Sun Mar 03 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.5.2-1
+* Sun Mar 03 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.5.2-1
 - Mozilla release 60.5.2ESR
 - Disable Werror-format-security flags
 - Enable linker=gold on ARM
 - Try to fix libevent LD path
 
-* Thu Feb 14 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.5.1-1
+* Thu Feb 14 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.5.1-1
 - Mozilla release 60.5.1ESR
 - Conditional macro for libvpx support
 
 * Tue Feb 05 2019 Björn Esser <besser82@fedoraproject.org> - 60.5.0-2
 - rebuilt (libvpx)
 
-* Tue Jan 29 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.5.0-1
+* Tue Jan 29 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.5.0-1
 - Mozilla release 60.5.0ESR
 
-* Sun Jan 13 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.4.0-2
+* Sun Jan 13 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.4.0-2
 - Make Wayland support default on fedora 30+
 - Enable Wayland support
 - Drop old patches
 - Backported Wayland related code from Firefox 63
 - Added fix for mozbz#1507475 - crash when display changes 
 
-* Wed Dec 12 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.4.0-1
+* Wed Dec 12 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.4.0-1
 - Upstream release 60.4.0ESR
 
 * Tue Nov 13 2018 Caolán McNamara <caolanm@redhat.com> - 60.3.0-4
 - rebuild for hunspell-1.7.0
 
-* Sat Nov 10 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.3.0-3
+* Sat Nov 10 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.3.0-3
 - Rebuild with latest changes from Gnuzilla
 
-* Wed Oct 31 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.3.0-2
+* Wed Oct 31 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.3.0-2
 - Drop UserAgent patch (rhbz#1644898)
 
-* Wed Oct 24 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.3.0-1
+* Wed Oct 24 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.3.0-1
 - Upstream release 60.3.0ESR
 
-* Wed Oct 03 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.2.2-2
+* Wed Oct 03 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.2.2-2
 - Drop UserAgent patch (rhbz#1644898)
 
-* Wed Oct 03 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.2.2-1
+* Wed Oct 03 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.2.2-1
 - Upstream release 60.2.2ESR
 
-* Fri Sep 28 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.2.1-1
+* Fri Sep 28 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.2.1-1
 - Upstream release 60.2.1
 
-* Fri Sep 14 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.2.0-0.1
+* Fri Sep 14 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.2.0-0.1
 - Pre-release 60.2.0ESR
 - Integrate firefox patches for wayland (disabled)
 - Setting of upstream patches for ESR60
@@ -1008,7 +1006,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - Include languages
 - Use options to reduce memory requirements at ld runtime on ix86
 
-* Sun Aug 05 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.9.0-1
+* Sun Aug 05 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.9.0-1
 - Update to 52.9.0
 
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 52.8.1-3
@@ -1017,70 +1015,70 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 * Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 52.8.1-2
 - Rebuild for ICU 62
 
-* Thu Jun 07 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.8.1-1
+* Thu Jun 07 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.8.1-1
 - Update to 52.8.1
 - Add icecat.rpmlintrc
 
-* Wed Jun 06 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.8.0-3
+* Wed Jun 06 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.8.0-3
 - Source tarball re-created without non-free code
 
 * Tue Jun  5 2018 Tom Callaway <spot@fedoraproject.org> - 52.8.0-2
 - remove non-free files from tarball
 
-* Sat May 12 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.8.0-1
+* Sat May 12 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.8.0-1
 - Update to 52.8.0
 
 * Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 52.7.3-2
 - Rebuild for ICU 61.1
 
-* Tue Mar 27 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.7.3-1
+* Tue Mar 27 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.7.3-1
 - Update to 52.7.3
 
-* Tue Mar 20 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.7.2-1
+* Tue Mar 20 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.7.2-1
 - Update to 52.7.2
 
-* Sat Mar 10 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.7.0-1
+* Sat Mar 10 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.7.0-1
 - Update to 52.7.0
 
-* Tue Feb 27 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.6.0-7
+* Tue Feb 27 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.6.0-7
 - HTTPS Everywhere updated to 2018.1.11
 - "goteo.org payments with free JS" updated to 1.1
 - "LibreJS compatible Pay.gov" updated to 1.3
 - "Reveal hidden HTML" updated to 1.6
 - Enabled WebRTC, but prevent leaking the LAN ip
 
-* Sun Feb 18 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.6.0-6
+* Sun Feb 18 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.6.0-6
 - Add gcc gcc-c++ BR
 
-* Sun Feb 18 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.6.0-5
+* Sun Feb 18 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.6.0-5
 - Rebuild for libevent-2.1.8
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 52.6.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
-* Sun Jan 28 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.6.0-3
+* Sun Jan 28 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.6.0-3
 - Rebuild for libvpx again
 
 * Fri Jan 26 2018 Tom Callaway <spot@fedoraproject.org> - 52.6.0-2
 - rebuild for new libvpx
 
-* Wed Jan 24 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.6.0-1
+* Wed Jan 24 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.6.0-1
 - Update to 52.6.0
 
 * Thu Jan 11 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 52.5.3-4
 - Remove obsolete scriptlets
 
-* Sun Jan 07 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.5.3-3
+* Sun Jan 07 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.5.3-3
 - Set build against NSS-3.34/NSPR-4.17.0 at least
 
-* Sun Jan 07 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.5.3-2
+* Sun Jan 07 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.5.3-2
 - Patched for mozilla bug-1427870
 
-* Sun Dec 31 2017 Antonio Trande <sagitterATfedoraproject.org> - 52.5.3-1
+* Sun Dec 31 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.5.3-1
 - Update to 52.5.3
 - Use 'with-l10n' option
 
-* Fri Dec 29 2017 Antonio Trande <sagitterATfedoraproject.org> - 52.5.2-1
+* Fri Dec 29 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.5.2-1
 - Update to 52.5.2
 - WebRTC is always disabled
 - Add JACK audio backend (bz#1528742)
@@ -1091,13 +1089,13 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 * Mon Dec 04 2017 Caolán McNamara <caolanm@redhat.com> - 52.3.0-3
 - rebuild for hunspell-1.5.2
 
-* Sat Sep 02 2017 Antonio Trande <sagitterATfedoraproject.org> - 52.3.0-2
+* Sat Sep 02 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.3.0-2
 - Enable language files
 
-* Wed Aug 16 2017 Antonio Trande <sagitterATfedoraproject.org> - 52.3.0-1
+* Wed Aug 16 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.3.0-1
 - Update to 52.3.0
 
-* Thu Aug 03 2017 Antonio Trande <sagitterATfedoraproject.org> - 52.2.1-1
+* Thu Aug 03 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.2.1-1
 - Update to 52.2.1
 - ICU source code patched to work on big-endian architectures
 
@@ -1107,7 +1105,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 * Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 52.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
 
-* Sat May 06 2017 Antonio Trande <sagitterATfedoraproject.org> - 52.1.0-2
+* Sat May 06 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.1.0-2
 - Fix language files
 
 * Sat May 06 2017 Jens Lody <fedora@jenslody.de> - 52.1.0-1
@@ -1115,28 +1113,28 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - Remove obsolete firefox-debug.patch
 - Spec-file: fix typo in description
 
-* Sun Apr 16 2017 Antonio Trande <sagitterATfedoraproject.org> - 52.0.2-3
+* Sun Apr 16 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.0.2-3
 - Enable languages
 
-* Fri Apr 14 2017 Antonio Trande <sagitterATfedoraproject.org> - 52.0.2-2
+* Fri Apr 14 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.0.2-2
 - Update to 52.0.2
 - Add patch for mozbz#1158076 - enable dark theme by pref
 
-* Sun Mar 26 2017 Antonio Trande <sagitterATfedoraproject.org> - 52.0.1-5
+* Sun Mar 26 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.0.1-5
 - Skia support disabled on ARM/ix86 builds (failed for memory exhausted)
 
-* Sun Mar 26 2017 Antonio Trande <sagitterATfedoraproject.org> - 52.0.1-4
+* Sun Mar 26 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.0.1-4
 - Downgrade optimization level on ARM builds (failed for memory exhausted)
 - Use one job with Make on ix86
 
-* Wed Mar 22 2017 Antonio Trande <sagitterATfedoraproject.org> - 52.0.1-3
+* Wed Mar 22 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.0.1-3
 - Added fix for mozbz#1158076
 
-* Mon Mar 20 2017 Antonio Trande <sagitterATfedoraproject.org> - 52.0.1-2
+* Mon Mar 20 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.0.1-2
 - Set cflags/libs options for NSS/NSPR
 - Add --disable-elf-hack
 
-* Sun Mar 19 2017 Antonio Trande <sagitterATfedoraproject.org> - 52.0.1-1
+* Sun Mar 19 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.0.1-1
 - Update to 52.0.1
 - All patches synchronized with firefox
 
@@ -1144,7 +1142,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - aarch64build-fix (taken from mozjs45)
 - include aarch64 again
 
-* Sun Mar 05 2017 Antonio Trande <sagitterATfedoraproject.org> - 45.7.0-7
+* Sun Mar 05 2017 Antonio Trande <sagitter@fedoraproject.org> - 45.7.0-7
 - Build with language files
 - Use new source archive
 - Exclude aarch64
@@ -1156,7 +1154,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - (Re-)add language-download.script and make Source-tag unconditional.
 - Fix debug build.
 
-* Sat Feb 18 2017 Antonio Trande <sagitterATfedoraproject.org> - 45.7.0-3
+* Sat Feb 18 2017 Antonio Trande <sagitter@fedoraproject.org> - 45.7.0-3
 - Optimization flags disabled on arm/arm64
 
 * Thu Feb 16 2017 Jens Lody <fedora@jenslody.de> - - 45.7.0-3
@@ -1165,49 +1163,49 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 45.7.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
-* Sat Feb 04 2017 Antonio Trande <sagitterATfedoraproject.org> - 45.7.0-1
+* Sat Feb 04 2017 Antonio Trande <sagitter@fedoraproject.org> - 45.7.0-1
 - Update to 45.7.0
 
-* Sat Jan 21 2017 Antonio Trande <sagitterATfedoraproject.org> - 45.5.1-7
+* Sat Jan 21 2017 Antonio Trande <sagitter@fedoraproject.org> - 45.5.1-7
 - Test for trying ICU patch
 
-* Fri Jan 20 2017 Antonio Trande <sagitterATfedoraproject.org> - 45.5.1-6
+* Fri Jan 20 2017 Antonio Trande <sagitter@fedoraproject.org> - 45.5.1-6
 - System ICU disabled on Fedora > 25
 
-* Fri Jan 20 2017 Antonio Trande <sagitterATfedoraproject.org> - 45.5.1-5
+* Fri Jan 20 2017 Antonio Trande <sagitter@fedoraproject.org> - 45.5.1-5
 - Patched to make compatible with NSS 3.28.1 (bz#1414987)
 
-* Thu Jan 05 2017 Antonio Trande <sagitterATfedoraproject.org> - 45.5.1-4
+* Thu Jan 05 2017 Antonio Trande <sagitter@fedoraproject.org> - 45.5.1-4
 - Conformed to new rules for scriptlets
 
 * Tue Dec 13 2016 Caolán McNamara <caolanm@redhat.com> - 45.5.1-3
 - rebuild for hunspell-1.5.4
 
-* Fri Dec 02 2016 Antonio Trande <sagitterATfedoraproject.org> - 45.5.1-2
+* Fri Dec 02 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.5.1-2
 - Keep workaround for bz#1332926
 
-* Fri Dec 02 2016 Antonio Trande <sagitterATfedoraproject.org> - 45.5.1-1
+* Fri Dec 02 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.5.1-1
 - Update to 45.5.1
 
-* Sun Nov 27 2016 Antonio Trande <sagitterATfedoraproject.org> - 45.3.0-0.6.beta
+* Sun Nov 27 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.3.0-0.6.beta
 - Debug build
 - Debug builds patched (mozb#1013882)
 - Patched for removing unnecessary warns
 
-* Sun Sep 04 2016 Antonio Trande <sagitterATfedoraproject.org> - 45.3.0-0.5.beta
+* Sun Sep 04 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.3.0-0.5.beta
 - Drop obsolete patch
 
-* Sat Sep 03 2016 Antonio Trande <sagitterATfedoraproject.org> - 45.3.0-0.4.beta
+* Sat Sep 03 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.3.0-0.4.beta
 - Use MOZ_SMP_FLAGS instead of MOZ_MAKE_FLAGS
 
-* Thu Sep 01 2016 Antonio Trande <sagitterATfedoraproject.org> - 45.3.0-0.3.beta
+* Thu Sep 01 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.3.0-0.3.beta
 - Update desktop file's translations
 - Enable jemalloc
 
-* Thu Sep 01 2016 Antonio Trande <sagitterATfedoraproject.org> - 45.3.0-0.2.beta
+* Thu Sep 01 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.3.0-0.2.beta
 - Disable optimization on ARM
 
-* Mon Aug 29 2016 Antonio Trande <sagitterATfedoraproject.org> - 45.3.0-0.1.beta
+* Mon Aug 29 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.3.0-0.1.beta
 - Update to 45.3.0 (beta)
 - Drop old patches
 - Reset default compiler flags
@@ -1216,41 +1214,41 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 * Fri Jul 22 2016 Tom Callaway <spot@fedoraproject.org> - 38.8.0-13
 - rebuild for libvpx 1.6.0
 
-* Wed Jun 29 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.8.0-12
+* Wed Jun 29 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-12
 - Optimization level increased to -O1
 
-* Tue Jun 28 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.8.0-11
+* Tue Jun 28 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-11
 - Fix appadata file's tags
 
-* Sun Jun 26 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.8.0-10
+* Sun Jun 26 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-10
 - Rebuild with newest icecat-38.8.0-gnu2 source archive (24 June)
 
 * Sun Jun 26 2016 Jens Lody <fedora@jenslody.de> - 38.8.0-9
 - Workaround for #1332926
 
-* Sat Jun 18 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.8.0-8
+* Sat Jun 18 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-8
 - Set MOZ_SMP_FLAGS
 
-* Sat Jun 18 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.8.0-7
+* Sat Jun 18 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-7
 - Undo latest change
 
-* Sat Jun 18 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.8.0-6
+* Sat Jun 18 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-6
 - Set C++14 standard flag
 
-* Fri Jun 17 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.8.0-5
+* Fri Jun 17 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-5
 - Set C++ standard flag
 
-* Fri Jun 17 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.8.0-4
+* Fri Jun 17 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-4
 - Disable install stripping
 - Disable builds for debugging
 
-* Fri Jun 17 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.8.0-3
+* Fri Jun 17 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-3
 - Enable builds for debugging
 
-* Fri May 13 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.8.0-2
+* Fri May 13 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-2
 - Remove additional flag
 
-* Fri May 13 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.8.0-1
+* Fri May 13 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-1
 - Update to 38.8.0
 
 * Mon Apr 18 2016 Caolán McNamara <caolanm@redhat.com> - 38.7.1-4
@@ -1259,13 +1257,13 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 * Fri Apr 15 2016 David Tardon <dtardon@redhat.com> - 38.7.1-3
 - rebuild for ICU 57.1
 
-* Sat Apr 09 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.7.1-2
+* Sat Apr 09 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.7.1-2
 - Downgrade optimization level on ARM
 
-* Fri Apr 08 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.7.1-1
+* Fri Apr 08 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.7.1-1
 - Update to 38.7.1
 
-* Thu Feb 04 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.6.0-1
+* Thu Feb 04 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.6.0-1
 - Update to 38.6.0
 - Patched for GCC6 builds
 - Cut off Provides bundled libraries except xulrunner
@@ -1273,137 +1271,137 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 38.5.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 
 
-* Mon Jan 04 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.5.2-4
+* Mon Jan 04 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.5.2-4
 - Fix description of appdata file
 
-* Mon Jan 04 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.5.2-3
+* Mon Jan 04 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.5.2-3
 - Fix validating of desktop file
 
-* Sun Jan 03 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.5.2-2
+* Sun Jan 03 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.5.2-2
 - .desktop .appdata and .metainfo files renamed (bz#1295234)
 
-* Fri Jan 01 2016 Antonio Trande <sagitterATfedoraproject.org> - 38.5.2-1
+* Fri Jan 01 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.5.2-1
 - Update to 38.5.2
 
-* Fri Dec 18 2015 Antonio Trande <sagitterATfedoraproject.org> - 38.5.0-1
+* Fri Dec 18 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.5.0-1
 - Update to 38.5.0
 
-* Tue Dec 08 2015 Antonio Trande <sagitterATfedoraproject.org> - 38.4.0-3
+* Tue Dec 08 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.4.0-3
 - Force -fstack-protector-all flag (bz#1283307)
 
 * Tue Dec  1 2015 Tom Callaway <spot@fedoraproject.org> - 38.4.0-2
 - rebuild for libvpx 1.5.0
 
-* Tue Nov 17 2015 Antonio Trande <sagitterATfedoraproject.org> - 38.4.0-1
+* Tue Nov 17 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.4.0-1
 - Update to 38.4.0
 
-* Tue Nov 03 2015 Antonio Trande <sagitterATfedoraproject.org> - 38.3.0-12
+* Tue Nov 03 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-12
 - ARM neon support disabled on aarch64
 
-* Sat Oct 31 2015 Antonio Trande <sagitterATfedoraproject.org> - 38.3.0-11
+* Sat Oct 31 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-11
 - Rebuild for ICU 56
 
-* Wed Oct 28 2015 Antonio Trande <sagitterATfedoraproject.org> - 38.3.0-10
+* Wed Oct 28 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-10
 - Rebuild with RPM_LD_FLAGS
 
 * Wed Oct 28 2015 David Tardon <dtardon@redhat.com> - 38.3.0-9
 - rebuild for ICU 56.1
 
-* Tue Oct 20 2015 Antonio Trande <sagitterATfedoraproject.org> - 38.3.0-8
+* Tue Oct 20 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-8
 - Active hardened_build
 
-* Tue Oct 13 2015 Antonio Trande <sagitterATfedoraproject.org> - 38.3.0-7
+* Tue Oct 13 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-7
 - Rebuilt with updated Addons
 
-* Mon Oct 12 2015 Antonio Trande <sagitterATfedoraproject.org> - 38.3.0-6
+* Mon Oct 12 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-6
 - Fixed header files directory for freetype-2.6.1
 
-* Mon Oct 12 2015 Antonio Trande <sagitterATfedoraproject.org> - 38.3.0-5
+* Mon Oct 12 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-5
 - Languages packaged
 
-* Tue Oct 06 2015 Antonio Trande <sagitterATfedoraproject.org> - 38.3.0-4
+* Tue Oct 06 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-4
 - WebRTC disabled on extra arches
 
-* Tue Oct 06 2015 Antonio Trande <sagitterATfedoraproject.org> - 38.3.0-3
+* Tue Oct 06 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-3
 - Updated appdata and manpage files
 
-* Mon Oct 05 2015 Antonio Trande <sagitterATfedoraproject.org> - 38.3.0-2
+* Mon Oct 05 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-2
 - Disabled crashreporter on F22+
 
-* Sat Oct 03 2015 Antonio Trande <sagitterATfedoraproject.org> - 38.3.0-1
+* Sat Oct 03 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-1
 - Update to 38.3.0
 - Patches updated
 - Language files not packaged
 - Build defined for Gtk3 
 
-* Thu Aug 13 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.8.0-5
+* Thu Aug 13 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.8.0-5
 - Added backported patch for CVE-2015-4473_4482_4488_4489_4491_4492 vulnerabilities
 
-* Thu Aug 13 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.8.0-4
+* Thu Aug 13 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.8.0-4
 - Added backported patch for CVE-2015-4495 vulnerability
 
-* Tue Jul 21 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.8.0-3
+* Tue Jul 21 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.8.0-3
 - Fixed on secondary arches
 
-* Mon Jul 20 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.8.0-2
+* Mon Jul 20 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.8.0-2
 - Un-bundle libvpx-1.4
 
-* Fri Jul 17 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.8.0-1
+* Fri Jul 17 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.8.0-1
 - Update to 31.8.0
 
-* Sun Jul 12 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.7.0-8
+* Sun Jul 12 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.7.0-8
 - Packaged IceCat 31.7 in Fedora 21
 
-* Fri Jul 03 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.7.0-7
+* Fri Jul 03 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.7.0-7
 - Fix .metainfo.xml file
 
-* Thu Jul 02 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.7.0-6
+* Thu Jul 02 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.7.0-6
 - Added .metainfo.xml file
 
-* Thu Jun 18 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.7.0-5
+* Thu Jun 18 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.7.0-5
 - Added options --enable-tree-freetype --enable-stdcxx-compat
 - Added patch for Freetype-2.6 headers
 
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 31.7.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-* Sun Jun 14 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.7.0-3
+* Sun Jun 14 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.7.0-3
 - Re-built locale files
 - Re-organized mozconfig options
 - Compiled with ccache
 
-* Wed Jun 10 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.7.0-2
+* Wed Jun 10 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.7.0-2
 - Unpacked files found
 
-* Mon Jun 08 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.7.0-1
+* Mon Jun 08 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.7.0-1
 - Update to 31.7.0
 - Make sure locale works for langpacks
 - Set default bookmarks
 - Made appdata file
 - devel package obsoleted
 
-* Mon May 04 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.6.0-6
+* Mon May 04 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.6.0-6
 - Required VPX from system for < F23
 
-* Sun May 03 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.6.0-5
+* Sun May 03 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.6.0-5
 - libvpx-1.3.0 bundled only in >= F23
 
-* Tue Apr 07 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.6.0-4
+* Tue Apr 07 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.6.0-4
 - Disable optimization flags (when GCC5 compiles) on ARM
 
-* Tue Apr 07 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.6.0-3
+* Tue Apr 07 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.6.0-3
 - Compiled against bundle libvpx-1.3.0
 
 * Mon Apr 06 2015 Tom Callaway <spot@fedoraproject.org> - 31.6.0-2
 - Rebuild for libvpx 1.4.0
 
-* Sat Apr 04 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.6.0-1
+* Sat Apr 04 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.6.0-1
 - Update to 31.6.0
 
-* Mon Mar 16 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.5.0-2
+* Mon Mar 16 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.5.0-2
 - New rebuild to fix profile's storage problem
 
-* Thu Mar 12 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.5.0-1
+* Thu Mar 12 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.5.0-1
 - Update to 31.5.0
 - Patched to fix Mozilla Bug1021171
 - crashreporter disabled on > F21
@@ -1412,16 +1410,16 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 * Wed Feb 04 2015 Petr Machata <pmachata@redhat.com> - 31.4.0-5
 - Bump for rebuild.
 
-* Mon Feb 02 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.4.0-4
+* Mon Feb 02 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.4.0-4
 - Desktop file missing %%u (bz#1188078)
 
-* Sat Jan 31 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.4.0-3
+* Sat Jan 31 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.4.0-3
 - Annulled the user-agent string customization
 
-* Thu Jan 29 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.4.0-2
+* Thu Jan 29 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.4.0-2
 - Added %%license macro
 
-* Thu Jan 29 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.4.0-1
+* Thu Jan 29 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.4.0-1
 - Update to 31.4.0
 - Added MPLv2.0 license of HTML5-video-everywhere extension
 - Description updated
@@ -1429,77 +1427,77 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 * Mon Jan 26 2015 David Tardon <dtardon@redhat.com> - 31.2.0-8
 - rebuild for ICU 54.1
 
-* Wed Jan 21 2015 Antonio Trande <sagitterATfedoraproject.org> - 31.2.0-7
+* Wed Jan 21 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.2.0-7
 - Package now requires system-bookmarks (bz#1184297)
 
-* Wed Nov 26 2014 Antonio Trande <sagitterATfedoraproject.org> - 31.2.0-6
+* Wed Nov 26 2014 Antonio Trande <sagitter@fedoraproject.org> - 31.2.0-6
 - libjpeg-turbo unbundled (bz#1164815)
 
-* Thu Nov 06 2014 Antonio Trande <sagitterATfedoraproject.org> - 31.2.0-5
+* Thu Nov 06 2014 Antonio Trande <sagitter@fedoraproject.org> - 31.2.0-5
 - Added -Wno-error=declaration-after-statement
 - Built against GStreamer-1.0
 - Package compiled against bundled JPEG
 
-* Sat Oct 25 2014 Antonio Trande <sagitterATfedoraproject.org> - 31.2.0-4
+* Sat Oct 25 2014 Antonio Trande <sagitter@fedoraproject.org> - 31.2.0-4
 - Removed -fexceptions flags from Fedora optflags
 
-* Thu Oct 23 2014 Antonio Trande <sagitterATfedoraproject.org> - 31.2.0-3
+* Thu Oct 23 2014 Antonio Trande <sagitter@fedoraproject.org> - 31.2.0-3
 - Added -Wformat-security flags
 - Added special link flags for ARM
 
-* Wed Oct 22 2014 Antonio Trande <sagitterATfedoraproject.org> - 31.2.0-2
+* Wed Oct 22 2014 Antonio Trande <sagitter@fedoraproject.org> - 31.2.0-2
 - Fixed compiler flags
 
-* Tue Oct 21 2014 Antonio Trande <sagitterATfedoraproject.org> - 31.2.0-1
+* Tue Oct 21 2014 Antonio Trande <sagitter@fedoraproject.org> - 31.2.0-1
 - Update to 31.2.0
 - Added 'configure' options
 - Built against system NSS/NSPR
 
-* Thu Oct 16 2014 Antonio Trande <sagitterATfedoraproject.org> - 31.1.1-1
+* Thu Oct 16 2014 Antonio Trande <sagitter@fedoraproject.org> - 31.1.1-1
 - Update to 31.1.1
 - New bundled files (bz#1153135)
 - Static sub-package is not built anymore
 - Man-page updated
 - Spyblock addon included
 
-* Tue Aug 26 2014 Antonio Trande <sagitterATfedoraproject.org> - 24.0-14
+* Tue Aug 26 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-14
 - Added "Provides: webclient"
 - Installed manpage file
 
-* Tue Aug 19 2014 Antonio Trande <sagitterATfedoraproject.org> - 24.0-13
+* Tue Aug 19 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-13
 - Removed system xulrunner conditional
 - Ghosted all .xpi language files (handled by %%find_lang)
 - Added BSD, ISC, MIT, Apache2.0 licenses
 
-* Sat Aug 09 2014 Antonio Trande <sagitterATfedoraproject.org> - 24.0-12
+* Sat Aug 09 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-12
 - Removed HTTPS-everywhere RequestPolicy extensions (patch7)
 
-* Thu Jul 24 2014 Antonio Trande <sagitterATfedoraproject.org> - 24.0-11
+* Thu Jul 24 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-11
 - Remove precompiled .egg files
 - Remove bundled jar/class files
 - Delete chrpaths
 - Added 'Public Domain' license
 - Added a patch for using system Python Virtualenv (patch6)
 
-* Wed Jul 16 2014 Antonio Trande <sagitterATfedoraproject.org> - 24.0-10
+* Wed Jul 16 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-10
 - Added freetype2 system-headers list for Fedora>=21 (patch5)
 
-* Fri Apr 04 2014 Antonio Trande <sagitterATfedoraproject.org> - 24.0-9
+* Fri Apr 04 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-9
 - Defined other bundled() Provides
 
-* Sat Mar 29 2014 Antonio Trande <sagitterATfedoraproject.org> - 24.0-8
+* Sat Mar 29 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-8
 - Use system nspr
 
-* Wed Mar 26 2014 Antonio Trande <sagitterATfedoraproject.org> - 24.0-7
+* Wed Mar 26 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-7
 - Removed much more bundled files (added related BR packages)
 - Build browser and xulrunner
 - Added freetype2 reference patch
 
-* Thu Feb 27 2014 Antonio Trande <sagitterATfedoraproject.org> - 24.0-6
+* Thu Feb 27 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-6
 - Sources patched to use system ogg/opus/vorbis libraries
 - Build browser alone
 
-* Wed Feb 05 2014 Antonio Trande <sagitterATfedoraproject.org> - 24.0-5
+* Wed Feb 05 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-5
 - Fix some executable permissions
 - Added some tricks
 - Build browser and xulrunner
@@ -1508,21 +1506,21 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - Added COPYING separated license files
 - Added bundled() Provides
 
-* Mon Jan 27 2014 Antonio Trande <sagitterATfedoraproject.org> - 24.0-4
+* Mon Jan 27 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-4
 - Build browser alone
 - Added libffi/libpng linkage from system to .mozconfig file
 - Added a patch to exclude APNG support missing error for libpng
 - Added libpng-devel BR
 
-* Tue Jan 14 2014 Antonio Trande <sagitterATfedoraproject.org> - 24.0-3
+* Tue Jan 14 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-3
 - Removed bundled files
 - Added nspr/nss Requires
 
-* Wed Jan 08 2014 Antonio Trande <sagitterATfedoraproject.org> - 24.0-2
+* Wed Jan 08 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-2
 - Timestamp preserving for the 'install' commands
 - Added a comment interpretation to the License tag
 - Defined all command calls in normal mode 
 
-* Sun Jan 05 2014 Antonio Trande <sagitterATfedoraproject.org> - 24.0-1
+* Sun Jan 05 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-1
 - Initial package
 
diff --git a/mozilla-1556602.patch b/mozilla-1556602.patch
deleted file mode 100644
index d3f07bf..0000000
--- a/mozilla-1556602.patch
+++ /dev/null
@@ -1,1154 +0,0 @@
-
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1560893536 0
-# Node ID 046dd0da3b8e606ae33895248cd41e4ef03a4fcc
-# Parent  8567a308ac7a8e2087903aedd1d92032c9c7eb60
-Bug 1556602 - Fix various warnings with rust 1.37 nightly. r=froydnj
-
-In particular:
-
- * trait objects without an explicit `dyn` are deprecated
- * `...` range patterns are deprecated
-
-I think these shouldn't really warn by default and should be clippy / opt-in
-lints, but anyway, doesn't hurt.
-
-Differential Revision: https://phabricator.services.mozilla.com/D35135
-
-diff --git a/media/webrtc/signaling/src/sdp/rsdparsa_capi/src/lib.rs b/media/webrtc/signaling/src/sdp/rsdparsa_capi/src/lib.rs
---- a/media/webrtc/signaling/src/sdp/rsdparsa_capi/src/lib.rs
-+++ b/media/webrtc/signaling/src/sdp/rsdparsa_capi/src/lib.rs
-@@ -180,17 +180,17 @@ pub unsafe extern "C" fn sdp_add_media_s
-       }
-     };
- 
-     // Check that the provided address type is valid. The rust parser will find out
-     // on his own which address type was provided
-     match addr_type {
-       // enum AddrType { kAddrTypeNone, kIPv4, kIPv6 };
-       // kAddrTypeNone is explicitly not covered as it is an 'invalid' flag
--      1...2 => (),
-+      1 | 2 => (),
-       _ => {
-           return NS_ERROR_INVALID_ARG;
-       }
-     }
- 
-     match (*session).add_media(media_type, direction, port as u32, protocol, addr_str) {
-         Ok(_) => NS_OK,
-         Err(_) => NS_ERROR_INVALID_ARG
-diff --git a/servo/components/malloc_size_of/lib.rs b/servo/components/malloc_size_of/lib.rs
---- a/servo/components/malloc_size_of/lib.rs
-+++ b/servo/components/malloc_size_of/lib.rs
-@@ -87,17 +87,17 @@ use std::ops::Range;
- use std::ops::{Deref, DerefMut};
- use std::os::raw::c_void;
- use void::Void;
- 
- /// A C function that takes a pointer to a heap allocation and returns its size.
- type VoidPtrToSizeFn = unsafe extern "C" fn(ptr: *const c_void) -> usize;
- 
- /// A closure implementing a stateful predicate on pointers.
--type VoidPtrToBoolFnMut = FnMut(*const c_void) -> bool;
-+type VoidPtrToBoolFnMut = dyn FnMut(*const c_void) -> bool;
- 
- /// Operations used when measuring heap usage of data structures.
- pub struct MallocSizeOfOps {
-     /// A function that returns the size of a heap allocation.
-     size_of_op: VoidPtrToSizeFn,
- 
-     /// Like `size_of_op`, but can take an interior pointer. Optional because
-     /// not all allocators support this operation. If it's not provided, some
-diff --git a/servo/components/selectors/context.rs b/servo/components/selectors/context.rs
---- a/servo/components/selectors/context.rs
-+++ b/servo/components/selectors/context.rs
-@@ -129,17 +129,17 @@ where
-     /// MatchingContext immutable again.
-     nesting_level: usize,
- 
-     /// Whether we're inside a negation or not.
-     in_negation: bool,
- 
-     /// An optional hook function for checking whether a pseudo-element
-     /// should match when matching_mode is ForStatelessPseudoElement.
--    pub pseudo_element_matching_fn: Option<&'a Fn(&Impl::PseudoElement) -> bool>,
-+    pub pseudo_element_matching_fn: Option<&'a dyn Fn(&Impl::PseudoElement) -> bool>,
- 
-     /// Extra implementation-dependent matching data.
-     pub extra_data: Impl::ExtraMatchingData,
- 
-     quirks_mode: QuirksMode,
-     classes_and_ids_case_sensitivity: CaseSensitivity,
-     _impl: ::std::marker::PhantomData<Impl>,
- }
-diff --git a/servo/components/style/animation.rs b/servo/components/style/animation.rs
---- a/servo/components/style/animation.rs
-+++ b/servo/components/style/animation.rs
-@@ -483,17 +483,17 @@ pub fn start_transitions_if_applicable(
-     had_animations
- }
- 
- fn compute_style_for_animation_step<E>(
-     context: &SharedStyleContext,
-     step: &KeyframesStep,
-     previous_style: &ComputedValues,
-     style_from_cascade: &Arc<ComputedValues>,
--    font_metrics_provider: &FontMetricsProvider,
-+    font_metrics_provider: &dyn FontMetricsProvider,
- ) -> Arc<ComputedValues>
- where
-     E: TElement,
- {
-     match step.value {
-         KeyframesStepValue::ComputedValues => style_from_cascade.clone(),
-         KeyframesStepValue::Declarations {
-             block: ref declarations,
-@@ -668,17 +668,17 @@ pub enum AnimationUpdate {
- /// transitions in response to a style change (that is,
- /// consider_starting_transitions + maybe_start_animations, but handling
- /// canceled animations, duration changes, etc, there instead of here), and this
- /// function should be only about the style update in response of a transition.
- pub fn update_style_for_animation<E>(
-     context: &SharedStyleContext,
-     animation: &Animation,
-     style: &mut Arc<ComputedValues>,
--    font_metrics_provider: &FontMetricsProvider,
-+    font_metrics_provider: &dyn FontMetricsProvider,
- ) -> AnimationUpdate
- where
-     E: TElement,
- {
-     debug!("update_style_for_animation: {:?}", animation);
-     debug_assert!(!animation.is_expired());
- 
-     match *animation {
-diff --git a/servo/components/style/parser.rs b/servo/components/style/parser.rs
---- a/servo/components/style/parser.rs
-+++ b/servo/components/style/parser.rs
-@@ -46,33 +46,33 @@ pub struct ParserContext<'a> {
-     pub url_data: &'a UrlExtraData,
-     /// The current rule type, if any.
-     pub rule_type: Option<CssRuleType>,
-     /// The mode to use when parsing.
-     pub parsing_mode: ParsingMode,
-     /// The quirks mode of this stylesheet.
-     pub quirks_mode: QuirksMode,
-     /// The active error reporter, or none if error reporting is disabled.
--    error_reporter: Option<&'a ParseErrorReporter>,
-+    error_reporter: Option<&'a dyn ParseErrorReporter>,
-     /// The currently active namespaces.
-     pub namespaces: Option<&'a Namespaces>,
-     /// The use counters we want to record while parsing style rules, if any.
-     pub use_counters: Option<&'a UseCounters>,
- }
- 
- impl<'a> ParserContext<'a> {
-     /// Create a parser context.
-     #[inline]
-     pub fn new(
-         stylesheet_origin: Origin,
-         url_data: &'a UrlExtraData,
-         rule_type: Option<CssRuleType>,
-         parsing_mode: ParsingMode,
-         quirks_mode: QuirksMode,
--        error_reporter: Option<&'a ParseErrorReporter>,
-+        error_reporter: Option<&'a dyn ParseErrorReporter>,
-         use_counters: Option<&'a UseCounters>,
-     ) -> Self {
-         Self {
-             stylesheet_origin,
-             url_data,
-             rule_type,
-             parsing_mode,
-             quirks_mode,
-@@ -84,17 +84,17 @@ impl<'a> ParserContext<'a> {
- 
-     /// Create a parser context for on-the-fly parsing in CSSOM
-     #[inline]
-     pub fn new_for_cssom(
-         url_data: &'a UrlExtraData,
-         rule_type: Option<CssRuleType>,
-         parsing_mode: ParsingMode,
-         quirks_mode: QuirksMode,
--        error_reporter: Option<&'a ParseErrorReporter>,
-+        error_reporter: Option<&'a dyn ParseErrorReporter>,
-         use_counters: Option<&'a UseCounters>,
-     ) -> Self {
-         Self::new(
-             Origin::Author,
-             url_data,
-             rule_type,
-             parsing_mode,
-             quirks_mode,
-diff --git a/servo/components/style/properties/cascade.rs b/servo/components/style/properties/cascade.rs
---- a/servo/components/style/properties/cascade.rs
-+++ b/servo/components/style/properties/cascade.rs
-@@ -77,17 +77,17 @@ pub fn cascade<E>(
-     device: &Device,
-     pseudo: Option<&PseudoElement>,
-     rule_node: &StrongRuleNode,
-     guards: &StylesheetGuards,
-     parent_style: Option<&ComputedValues>,
-     parent_style_ignoring_first_line: Option<&ComputedValues>,
-     layout_parent_style: Option<&ComputedValues>,
-     visited_rules: Option<&StrongRuleNode>,
--    font_metrics_provider: &FontMetricsProvider,
-+    font_metrics_provider: &dyn FontMetricsProvider,
-     quirks_mode: QuirksMode,
-     rule_cache: Option<&RuleCache>,
-     rule_cache_conditions: &mut RuleCacheConditions,
-     element: Option<E>,
- ) -> Arc<ComputedValues>
- where
-     E: TElement,
- {
-@@ -111,17 +111,17 @@ where
- fn cascade_rules<E>(
-     device: &Device,
-     pseudo: Option<&PseudoElement>,
-     rule_node: &StrongRuleNode,
-     guards: &StylesheetGuards,
-     parent_style: Option<&ComputedValues>,
-     parent_style_ignoring_first_line: Option<&ComputedValues>,
-     layout_parent_style: Option<&ComputedValues>,
--    font_metrics_provider: &FontMetricsProvider,
-+    font_metrics_provider: &dyn FontMetricsProvider,
-     cascade_mode: CascadeMode,
-     quirks_mode: QuirksMode,
-     rule_cache: Option<&RuleCache>,
-     rule_cache_conditions: &mut RuleCacheConditions,
-     element: Option<E>,
- ) -> Arc<ComputedValues>
- where
-     E: TElement,
-@@ -208,17 +208,17 @@ pub fn apply_declarations<'a, E, F, I>(
-     device: &Device,
-     pseudo: Option<&PseudoElement>,
-     rules: &StrongRuleNode,
-     guards: &StylesheetGuards,
-     iter_declarations: F,
-     parent_style: Option<&ComputedValues>,
-     parent_style_ignoring_first_line: Option<&ComputedValues>,
-     layout_parent_style: Option<&ComputedValues>,
--    font_metrics_provider: &FontMetricsProvider,
-+    font_metrics_provider: &dyn FontMetricsProvider,
-     cascade_mode: CascadeMode,
-     quirks_mode: QuirksMode,
-     rule_cache: Option<&RuleCache>,
-     rule_cache_conditions: &mut RuleCacheConditions,
-     element: Option<E>,
- ) -> Arc<ComputedValues>
- where
-     E: TElement,
-diff --git a/servo/components/style/properties/declaration_block.rs b/servo/components/style/properties/declaration_block.rs
---- a/servo/components/style/properties/declaration_block.rs
-+++ b/servo/components/style/properties/declaration_block.rs
-@@ -1194,17 +1194,17 @@ where
- /// A helper to parse the style attribute of an element, in order for this to be
- /// shared between Servo and Gecko.
- ///
- /// Inline because we call this cross-crate.
- #[inline]
- pub fn parse_style_attribute(
-     input: &str,
-     url_data: &UrlExtraData,
--    error_reporter: Option<&ParseErrorReporter>,
-+    error_reporter: Option<&dyn ParseErrorReporter>,
-     quirks_mode: QuirksMode,
- ) -> PropertyDeclarationBlock {
-     let context = ParserContext::new(
-         Origin::Author,
-         url_data,
-         Some(CssRuleType::Style),
-         ParsingMode::DEFAULT,
-         quirks_mode,
-@@ -1221,17 +1221,17 @@ pub fn parse_style_attribute(
- ///
- /// This does not attempt to parse !important at all.
- #[inline]
- pub fn parse_one_declaration_into(
-     declarations: &mut SourcePropertyDeclaration,
-     id: PropertyId,
-     input: &str,
-     url_data: &UrlExtraData,
--    error_reporter: Option<&ParseErrorReporter>,
-+    error_reporter: Option<&dyn ParseErrorReporter>,
-     parsing_mode: ParsingMode,
-     quirks_mode: QuirksMode
- ) -> Result<(), ()> {
-     let context = ParserContext::new(
-         Origin::Author,
-         url_data,
-         Some(CssRuleType::Style),
-         parsing_mode,
-diff --git a/servo/components/style/str.rs b/servo/components/style/str.rs
---- a/servo/components/style/str.rs
-+++ b/servo/components/style/str.rs
-@@ -55,17 +55,17 @@ pub fn split_html_space_chars<'a>(
- #[inline]
- pub fn split_commas<'a>(s: &'a str) -> Filter<Split<'a, char>, fn(&&str) -> bool> {
-     s.split(',').filter(not_empty as fn(&&str) -> bool)
- }
- 
- /// Character is ascii digit
- pub fn is_ascii_digit(c: &char) -> bool {
-     match *c {
--        '0'...'9' => true,
-+        '0'..='9' => true,
-         _ => false,
-     }
- }
- 
- fn is_decimal_point(c: char) -> bool {
-     c == '.'
- }
- 
-@@ -156,17 +156,17 @@ where
- /// Returns true if a given string has a given prefix with case-insensitive match.
- pub fn starts_with_ignore_ascii_case(string: &str, prefix: &str) -> bool {
-     string.len() >= prefix.len() &&
-         string.as_bytes()[0..prefix.len()].eq_ignore_ascii_case(prefix.as_bytes())
- }
- 
- /// Returns an ascii lowercase version of a string, only allocating if needed.
- pub fn string_as_ascii_lowercase<'a>(input: &'a str) -> Cow<'a, str> {
--    if input.bytes().any(|c| matches!(c, b'A'...b'Z')) {
-+    if input.bytes().any(|c| matches!(c, b'A'..=b'Z')) {
-         input.to_ascii_lowercase().into()
-     } else {
-         // Already ascii lowercase.
-         Cow::Borrowed(input)
-     }
- }
- 
- /// To avoid accidentally instantiating multiple monomorphizations of large
-diff --git a/servo/components/style/stylesheets/mod.rs b/servo/components/style/stylesheets/mod.rs
---- a/servo/components/style/stylesheets/mod.rs
-+++ b/servo/components/style/stylesheets/mod.rs
-@@ -347,17 +347,17 @@ impl CssRule {
-     ///
-     /// Input state is None for a nested rule
-     pub fn parse(
-         css: &str,
-         insert_rule_context: InsertRuleContext,
-         parent_stylesheet_contents: &StylesheetContents,
-         shared_lock: &SharedRwLock,
-         state: State,
--        loader: Option<&StylesheetLoader>,
-+        loader: Option<&dyn StylesheetLoader>,
-     ) -> Result<Self, RulesMutateError> {
-         let url_data = parent_stylesheet_contents.url_data.read();
-         let context = ParserContext::new(
-             parent_stylesheet_contents.origin,
-             &url_data,
-             None,
-             ParsingMode::DEFAULT,
-             parent_stylesheet_contents.quirks_mode,
-diff --git a/servo/components/style/stylesheets/rule_list.rs b/servo/components/style/stylesheets/rule_list.rs
---- a/servo/components/style/stylesheets/rule_list.rs
-+++ b/servo/components/style/stylesheets/rule_list.rs
-@@ -122,29 +122,29 @@ pub trait CssRulesHelpers {
-     /// instead, but that seems overkill.
-     fn insert_rule(
-         &self,
-         lock: &SharedRwLock,
-         rule: &str,
-         parent_stylesheet_contents: &StylesheetContents,
-         index: usize,
-         nested: bool,
--        loader: Option<&StylesheetLoader>,
-+        loader: Option<&dyn StylesheetLoader>,
-     ) -> Result<CssRule, RulesMutateError>;
- }
- 
- impl CssRulesHelpers for RawOffsetArc<Locked<CssRules>> {
-     fn insert_rule(
-         &self,
-         lock: &SharedRwLock,
-         rule: &str,
-         parent_stylesheet_contents: &StylesheetContents,
-         index: usize,
-         nested: bool,
--        loader: Option<&StylesheetLoader>,
-+        loader: Option<&dyn StylesheetLoader>,
-     ) -> Result<CssRule, RulesMutateError> {
-         let new_rule = {
-             let read_guard = lock.read();
-             let rules = self.read_with(&read_guard);
- 
-             // Step 1, 2
-             if index > rules.0.len() {
-                 return Err(RulesMutateError::IndexSize);
-diff --git a/servo/components/style/stylesheets/rule_parser.rs b/servo/components/style/stylesheets/rule_parser.rs
---- a/servo/components/style/stylesheets/rule_parser.rs
-+++ b/servo/components/style/stylesheets/rule_parser.rs
-@@ -39,17 +39,17 @@ pub struct InsertRuleContext<'a> {
-     pub index: usize,
- }
- 
- /// The parser for the top-level rules in a stylesheet.
- pub struct TopLevelRuleParser<'a> {
-     /// A reference to the lock we need to use to create rules.
-     pub shared_lock: &'a SharedRwLock,
-     /// A reference to a stylesheet loader if applicable, for `@import` rules.
--    pub loader: Option<&'a StylesheetLoader>,
-+    pub loader: Option<&'a dyn StylesheetLoader>,
-     /// The top-level parser context.
-     ///
-     /// This won't contain any namespaces, and only nested parsers created with
-     /// `ParserContext::new_with_rule_type` will.
-     pub context: ParserContext<'a>,
-     /// The current state of the parser.
-     pub state: State,
-     /// Whether we have tried to parse was invalid due to being in the wrong
-diff --git a/servo/components/style/stylesheets/stylesheet.rs b/servo/components/style/stylesheets/stylesheet.rs
---- a/servo/components/style/stylesheets/stylesheet.rs
-+++ b/servo/components/style/stylesheets/stylesheet.rs
-@@ -71,18 +71,18 @@ pub struct StylesheetContents {
- impl StylesheetContents {
-     /// Parse a given CSS string, with a given url-data, origin, and
-     /// quirks mode.
-     pub fn from_str(
-         css: &str,
-         url_data: UrlExtraData,
-         origin: Origin,
-         shared_lock: &SharedRwLock,
--        stylesheet_loader: Option<&StylesheetLoader>,
--        error_reporter: Option<&ParseErrorReporter>,
-+        stylesheet_loader: Option<&dyn StylesheetLoader>,
-+        error_reporter: Option<&dyn ParseErrorReporter>,
-         quirks_mode: QuirksMode,
-         line_number_offset: u32,
-         use_counters: Option<&UseCounters>,
-     ) -> Self {
-         let namespaces = RwLock::new(Namespaces::default());
-         let (rules, source_map_url, source_url) = Stylesheet::parse_rules(
-             css,
-             &url_data,
-@@ -338,18 +338,18 @@ impl StylesheetInDocument for DocumentSt
- }
- 
- impl Stylesheet {
-     /// Updates an empty stylesheet from a given string of text.
-     pub fn update_from_str(
-         existing: &Stylesheet,
-         css: &str,
-         url_data: UrlExtraData,
--        stylesheet_loader: Option<&StylesheetLoader>,
--        error_reporter: Option<&ParseErrorReporter>,
-+        stylesheet_loader: Option<&dyn StylesheetLoader>,
-+        error_reporter: Option<&dyn ParseErrorReporter>,
-         line_number_offset: u32,
-     ) {
-         let namespaces = RwLock::new(Namespaces::default());
- 
-         // FIXME: Consider adding use counters to Servo?
-         let (rules, source_map_url, source_url) = Self::parse_rules(
-             css,
-             &url_data,
-@@ -377,18 +377,18 @@ impl Stylesheet {
-     }
- 
-     fn parse_rules(
-         css: &str,
-         url_data: &UrlExtraData,
-         origin: Origin,
-         namespaces: &mut Namespaces,
-         shared_lock: &SharedRwLock,
--        stylesheet_loader: Option<&StylesheetLoader>,
--        error_reporter: Option<&ParseErrorReporter>,
-+        stylesheet_loader: Option<&dyn StylesheetLoader>,
-+        error_reporter: Option<&dyn ParseErrorReporter>,
-         quirks_mode: QuirksMode,
-         line_number_offset: u32,
-         use_counters: Option<&UseCounters>,
-     ) -> (Vec<CssRule>, Option<String>, Option<String>) {
-         let mut rules = Vec::new();
-         let mut input = ParserInput::new_with_line_number_offset(css, line_number_offset);
-         let mut input = Parser::new(&mut input);
- 
-@@ -445,18 +445,18 @@ impl Stylesheet {
-     /// Effectively creates a new stylesheet and forwards the hard work to
-     /// `Stylesheet::update_from_str`.
-     pub fn from_str(
-         css: &str,
-         url_data: UrlExtraData,
-         origin: Origin,
-         media: Arc<Locked<MediaList>>,
-         shared_lock: SharedRwLock,
--        stylesheet_loader: Option<&StylesheetLoader>,
--        error_reporter: Option<&ParseErrorReporter>,
-+        stylesheet_loader: Option<&dyn StylesheetLoader>,
-+        error_reporter: Option<&dyn ParseErrorReporter>,
-         quirks_mode: QuirksMode,
-         line_number_offset: u32,
-     ) -> Self {
-         // FIXME: Consider adding use counters to Servo?
-         let contents = StylesheetContents::from_str(
-             css,
-             url_data,
-             origin,
-diff --git a/servo/components/style/stylist.rs b/servo/components/style/stylist.rs
---- a/servo/components/style/stylist.rs
-+++ b/servo/components/style/stylist.rs
-@@ -646,17 +646,17 @@ impl Stylist {
- 
-     /// Computes the style for a given "precomputed" pseudo-element, taking the
-     /// universal rules and applying them.
-     pub fn precomputed_values_for_pseudo<E>(
-         &self,
-         guards: &StylesheetGuards,
-         pseudo: &PseudoElement,
-         parent: Option<&ComputedValues>,
--        font_metrics: &FontMetricsProvider,
-+        font_metrics: &dyn FontMetricsProvider,
-     ) -> Arc<ComputedValues>
-     where
-         E: TElement,
-     {
-         debug_assert!(pseudo.is_precomputed());
- 
-         let rule_node = self.rule_node_for_precomputed_pseudo(guards, pseudo, None);
- 
-@@ -674,17 +674,17 @@ impl Stylist {
-     ///
-     /// TODO(emilio): The type parameter could go away with a void type
-     /// implementing TElement.
-     pub fn precomputed_values_for_pseudo_with_rule_node<E>(
-         &self,
-         guards: &StylesheetGuards,
-         pseudo: &PseudoElement,
-         parent: Option<&ComputedValues>,
--        font_metrics: &FontMetricsProvider,
-+        font_metrics: &dyn FontMetricsProvider,
-         rules: StrongRuleNode,
-     ) -> Arc<ComputedValues>
-     where
-         E: TElement,
-     {
-         self.compute_pseudo_element_style_with_inputs::<E>(
-             CascadeInputs {
-                 rules: Some(rules),
-@@ -769,18 +769,18 @@ impl Stylist {
-     pub fn lazily_compute_pseudo_element_style<E>(
-         &self,
-         guards: &StylesheetGuards,
-         element: E,
-         pseudo: &PseudoElement,
-         rule_inclusion: RuleInclusion,
-         parent_style: &ComputedValues,
-         is_probe: bool,
--        font_metrics: &FontMetricsProvider,
--        matching_fn: Option<&Fn(&PseudoElement) -> bool>,
-+        font_metrics: &dyn FontMetricsProvider,
-+        matching_fn: Option<&dyn Fn(&PseudoElement) -> bool>,
-     ) -> Option<Arc<ComputedValues>>
-     where
-         E: TElement,
-     {
-         let cascade_inputs = self.lazy_pseudo_rules(
-             guards,
-             element,
-             parent_style,
-@@ -805,17 +805,17 @@ impl Stylist {
-     /// selector matching for eager pseudo-elements when we need to recompute
-     /// their style with a new parent style.
-     pub fn compute_pseudo_element_style_with_inputs<E>(
-         &self,
-         inputs: CascadeInputs,
-         pseudo: &PseudoElement,
-         guards: &StylesheetGuards,
-         parent_style: Option<&ComputedValues>,
--        font_metrics: &FontMetricsProvider,
-+        font_metrics: &dyn FontMetricsProvider,
-         element: Option<E>,
-     ) -> Arc<ComputedValues>
-     where
-         E: TElement,
-     {
-         // FIXME(emilio): The lack of layout_parent_style here could be
-         // worrying, but we're probably dropping the display fixup for
-         // pseudos other than before and after, so it's probably ok.
-@@ -858,17 +858,17 @@ impl Stylist {
-         &self,
-         element: Option<E>,
-         pseudo: Option<&PseudoElement>,
-         inputs: CascadeInputs,
-         guards: &StylesheetGuards,
-         parent_style: Option<&ComputedValues>,
-         parent_style_ignoring_first_line: Option<&ComputedValues>,
-         layout_parent_style: Option<&ComputedValues>,
--        font_metrics: &FontMetricsProvider,
-+        font_metrics: &dyn FontMetricsProvider,
-         rule_cache: Option<&RuleCache>,
-         rule_cache_conditions: &mut RuleCacheConditions,
-     ) -> Arc<ComputedValues>
-     where
-         E: TElement,
-     {
-         debug_assert!(pseudo.is_some() || element.is_some(), "Huh?");
- 
-@@ -915,17 +915,17 @@ impl Stylist {
-     fn lazy_pseudo_rules<E>(
-         &self,
-         guards: &StylesheetGuards,
-         element: E,
-         parent_style: &ComputedValues,
-         pseudo: &PseudoElement,
-         is_probe: bool,
-         rule_inclusion: RuleInclusion,
--        matching_fn: Option<&Fn(&PseudoElement) -> bool>,
-+        matching_fn: Option<&dyn Fn(&PseudoElement) -> bool>,
-     ) -> Option<CascadeInputs>
-     where
-         E: TElement,
-     {
-         debug_assert!(pseudo.is_lazy());
- 
-         // Apply the selector flags. We should be in sequential mode
-         // already, so we can directly apply the parent flags.
-diff --git a/servo/components/style/values/computed/mod.rs b/servo/components/style/values/computed/mod.rs
---- a/servo/components/style/values/computed/mod.rs
-+++ b/servo/components/style/values/computed/mod.rs
-@@ -142,17 +142,17 @@ pub struct Context<'a> {
-     /// painful.
-     ///
-     /// TODO(emilio): Make constructors for Context, and drop this.
-     #[cfg(feature = "servo")]
-     pub cached_system_font: Option<()>,
- 
-     /// A font metrics provider, used to access font metrics to implement
-     /// font-relative units.
--    pub font_metrics_provider: &'a FontMetricsProvider,
-+    pub font_metrics_provider: &'a dyn FontMetricsProvider,
- 
-     /// Whether or not we are computing the media list in a media query
-     pub in_media_query: bool,
- 
-     /// The quirks mode of this context.
-     pub quirks_mode: QuirksMode,
- 
-     /// Whether this computation is being done for a SMIL animation.
-diff --git a/servo/components/style_traits/specified_value_info.rs b/servo/components/style_traits/specified_value_info.rs
---- a/servo/components/style_traits/specified_value_info.rs
-+++ b/servo/components/style_traits/specified_value_info.rs
-@@ -22,17 +22,17 @@ pub mod CssType {
-     pub const COLOR: u8 = 1 << 0;
-     /// <gradient>
-     pub const GRADIENT: u8 = 1 << 1;
-     /// <timing-function>
-     pub const TIMING_FUNCTION: u8 = 1 << 2;
- }
- 
- /// See SpecifiedValueInfo::collect_completion_keywords.
--pub type KeywordsCollectFn<'a> = &'a mut FnMut(&[&'static str]);
-+pub type KeywordsCollectFn<'a> = &'a mut dyn FnMut(&[&'static str]);
- 
- /// Information of values of a given specified value type.
- ///
- /// This trait is derivable with `#[derive(SpecifiedValueInfo)]`.
- ///
- /// The algorithm traverses the type definition. For `SUPPORTED_TYPES`,
- /// it puts an or'ed value of `SUPPORTED_TYPES` of all types it finds.
- /// For `collect_completion_keywords`, it recursively invokes this
-diff --git a/servo/ports/geckolib/glue.rs b/servo/ports/geckolib/glue.rs
---- a/servo/ports/geckolib/glue.rs
-+++ b/servo/ports/geckolib/glue.rs
-@@ -1378,28 +1378,28 @@ pub extern "C" fn Servo_StyleSheet_FromU
-             loader,
-             stylesheet,
-             load_data,
-             reusable_sheets,
-         ))
-     };
- 
-     // FIXME(emilio): loader.as_ref() doesn't typecheck for some reason?
--    let loader: Option<&StyleStylesheetLoader> = match loader {
-+    let loader: Option<&dyn StyleStylesheetLoader> = match loader {
-         None => None,
-         Some(ref s) => Some(s),
-     };
- 
-     Arc::new(StylesheetContents::from_str(
-         input,
-         url_data.clone(),
-         mode_to_origin(mode),
-         &global_style_data.shared_lock,
-         loader,
--        reporter.as_ref().map(|r| r as &ParseErrorReporter),
-+        reporter.as_ref().map(|r| r as &dyn ParseErrorReporter),
-         quirks_mode.into(),
-         line_number_offset,
-         use_counters,
-     ))
-     .into_strong()
- }
- 
- #[no_mangle]
-@@ -1903,17 +1903,17 @@ pub extern "C" fn Servo_CssRules_InsertR
-             loader,
-             gecko_stylesheet,
-             ptr::null_mut(),
-             ptr::null_mut(),
-         ))
-     };
-     let loader = loader
-         .as_ref()
--        .map(|loader| loader as &StyleStylesheetLoader);
-+        .map(|loader| loader as &dyn StyleStylesheetLoader);
-     let rule = unsafe { rule.as_ref().unwrap().as_str_unchecked() };
- 
-     let global_style_data = &*GLOBAL_STYLE_DATA;
-     let contents = StylesheetContents::as_arc(&contents);
-     let result = Locked::<CssRules>::as_arc(&rules).insert_rule(
-         &global_style_data.shared_lock,
-         rule,
-         contents,
-@@ -3583,17 +3583,17 @@ fn get_pseudo_style(
-     guard: &SharedRwLockReadGuard,
-     element: GeckoElement,
-     pseudo: &PseudoElement,
-     rule_inclusion: RuleInclusion,
-     styles: &ElementStyles,
-     inherited_styles: Option<&ComputedValues>,
-     doc_data: &PerDocumentStyleDataImpl,
-     is_probe: bool,
--    matching_func: Option<&Fn(&PseudoElement) -> bool>,
-+    matching_func: Option<&dyn Fn(&PseudoElement) -> bool>,
- ) -> Option<Arc<ComputedValues>> {
-     let style = match pseudo.cascade_type() {
-         PseudoElementCascadeType::Eager => {
-             match *pseudo {
-                 PseudoElement::FirstLetter => {
-                     styles.pseudos.get(&pseudo).map(|pseudo_styles| {
-                         // inherited_styles can be None when doing lazy resolution
-                         // (e.g. for computed style) or when probing.  In that case
-@@ -3772,17 +3772,17 @@ pub unsafe extern "C" fn Servo_StyleSet_
- 
- fn parse_property_into(
-     declarations: &mut SourcePropertyDeclaration,
-     property_id: PropertyId,
-     value: *const nsACString,
-     data: *mut URLExtraData,
-     parsing_mode: structs::ParsingMode,
-     quirks_mode: QuirksMode,
--    reporter: Option<&ParseErrorReporter>,
-+    reporter: Option<&dyn ParseErrorReporter>,
- ) -> Result<(), ()> {
-     let value = unsafe { value.as_ref().unwrap().as_str_unchecked() };
-     let url_data = unsafe { UrlExtraData::from_ptr_ref(&data) };
-     let parsing_mode = ParsingMode::from_bits_truncate(parsing_mode);
- 
-     parse_one_declaration_into(
-         declarations,
-         property_id,
-@@ -3809,17 +3809,17 @@ pub extern "C" fn Servo_ParseProperty(
-     let reporter = ErrorReporter::new(ptr::null_mut(), loader, data);
-     let result = parse_property_into(
-         &mut declarations,
-         id,
-         value,
-         data,
-         parsing_mode,
-         quirks_mode.into(),
--        reporter.as_ref().map(|r| r as &ParseErrorReporter),
-+        reporter.as_ref().map(|r| r as &dyn ParseErrorReporter),
-     );
- 
-     match result {
-         Ok(()) => {
-             let global_style_data = &*GLOBAL_STYLE_DATA;
-             let mut block = PropertyDeclarationBlock::new();
-             block.extend(declarations.drain(), Importance::Normal);
-             Arc::new(global_style_data.shared_lock.wrap(block)).into_strong()
-@@ -3961,17 +3961,17 @@ pub unsafe extern "C" fn Servo_ParseStyl
- ) -> Strong<RawServoDeclarationBlock> {
-     let global_style_data = &*GLOBAL_STYLE_DATA;
-     let value = (*data).as_str_unchecked();
-     let reporter = ErrorReporter::new(ptr::null_mut(), loader, raw_extra_data);
-     let url_data = UrlExtraData::from_ptr_ref(&raw_extra_data);
-     Arc::new(global_style_data.shared_lock.wrap(parse_style_attribute(
-         value,
-         url_data,
--        reporter.as_ref().map(|r| r as &ParseErrorReporter),
-+        reporter.as_ref().map(|r| r as &dyn ParseErrorReporter),
-         quirks_mode.into(),
-     )))
-     .into_strong()
- }
- 
- #[no_mangle]
- pub extern "C" fn Servo_DeclarationBlock_CreateEmpty() -> Strong<RawServoDeclarationBlock> {
-     let global_style_data = &*GLOBAL_STYLE_DATA;
-@@ -4190,17 +4190,17 @@ fn set_property(
-     let reporter = ErrorReporter::new(ptr::null_mut(), loader, data);
-     let result = parse_property_into(
-         &mut source_declarations,
-         property_id,
-         value,
-         data,
-         parsing_mode,
-         quirks_mode,
--        reporter.as_ref().map(|r| r as &ParseErrorReporter),
-+        reporter.as_ref().map(|r| r as &dyn ParseErrorReporter),
-     );
- 
-     if result.is_err() {
-         return false;
-     }
- 
-     let importance = if is_important {
-         Importance::Important
-@@ -5224,17 +5224,17 @@ fn simulate_compute_values_failure(prope
- 
- #[cfg(not(feature = "gecko_debug"))]
- fn simulate_compute_values_failure(_: &PropertyValuePair) -> bool {
-     false
- }
- 
- fn create_context_for_animation<'a>(
-     per_doc_data: &'a PerDocumentStyleDataImpl,
--    font_metrics_provider: &'a FontMetricsProvider,
-+    font_metrics_provider: &'a dyn FontMetricsProvider,
-     style: &'a ComputedValues,
-     parent_style: Option<&'a ComputedValues>,
-     for_smil_animation: bool,
-     rule_cache_conditions: &'a mut RuleCacheConditions,
- ) -> Context<'a> {
-     Context {
-         is_root_element: false,
-         builder: StyleBuilder::for_animation(per_doc_data.stylist.device(), style, parent_style),
-@@ -6158,17 +6158,17 @@ pub unsafe extern "C" fn Servo_SelectorL
- 
- #[no_mangle]
- pub unsafe extern "C" fn Servo_SelectorList_Drop(list: *mut RawServoSelectorList) {
-     SelectorList::drop_ffi(list)
- }
- 
- fn parse_color(
-     value: &str,
--    error_reporter: Option<&ParseErrorReporter>,
-+    error_reporter: Option<&dyn ParseErrorReporter>,
- ) -> Result<specified::Color, ()> {
-     let mut input = ParserInput::new(value);
-     let mut parser = Parser::new(&mut input);
-     let url_data = unsafe { dummy_url_data() };
-     let context = ParserContext::new(
-         Origin::Author,
-         url_data,
-         Some(CssRuleType::Style),
-@@ -6222,17 +6222,17 @@ pub extern "C" fn Servo_ComputeColor(
-     let value = unsafe { (*value).to_string() };
-     let result_color = unsafe { result_color.as_mut().unwrap() };
- 
-     let reporter = unsafe { loader.as_mut() }.and_then(|loader| {
-         // Make an ErrorReporter that will report errors as being "from DOM".
-         ErrorReporter::new(ptr::null_mut(), loader, ptr::null_mut())
-     });
- 
--    match parse_color(&value, reporter.as_ref().map(|r| r as &ParseErrorReporter)) {
-+    match parse_color(&value, reporter.as_ref().map(|r| r as &dyn ParseErrorReporter)) {
-         Ok(specified_color) => {
-             let computed_color = match raw_data {
-                 Some(raw_data) => {
-                     let data = PerDocumentStyleData::from_ffi(raw_data).borrow();
-                     let device = data.stylist.device();
-                     let quirks_mode = data.stylist.quirks_mode();
-                     Context::for_media_query_evaluation(device, quirks_mode, |context| {
-                         specified_color.to_computed_color(Some(&context))
-diff --git a/testing/geckodriver/src/marionette.rs b/testing/geckodriver/src/marionette.rs
---- a/testing/geckodriver/src/marionette.rs
-+++ b/testing/geckodriver/src/marionette.rs
-@@ -1273,17 +1273,17 @@ impl MarionetteConnection {
-                         ErrorKind::Other,
-                         "EOF reading marionette message",
-                     ))
-                 }
-                 1 => buf[0] as char,
-                 _ => panic!("Expected one byte got more"),
-             };
-             match byte {
--                '0'...'9' => {
-+                '0'..='9' => {
-                     bytes = bytes * 10;
-                     bytes += byte as usize - '0' as usize;
-                 }
-                 ':' => break,
-                 _ => {}
-             }
-         }
- 
-diff --git a/testing/mozbase/rust/mozprofile/src/prefreader.rs b/testing/mozbase/rust/mozprofile/src/prefreader.rs
---- a/testing/mozbase/rust/mozprofile/src/prefreader.rs
-+++ b/testing/mozbase/rust/mozprofile/src/prefreader.rs
-@@ -9,17 +9,17 @@ use std::iter::Iterator;
- use std::mem;
- use std::ops::Deref;
- use std::str;
- 
- impl PrefReaderError {
-     fn new(
-         message: &'static str,
-         position: Position,
--        parent: Option<Box<Error>>,
-+        parent: Option<Box<dyn Error>>,
-     ) -> PrefReaderError {
-         PrefReaderError {
-             message,
-             position,
-             parent,
-         }
-     }
- }
-@@ -34,17 +34,17 @@ impl fmt::Display for PrefReaderError {
-     }
- }
- 
- impl Error for PrefReaderError {
-     fn description(&self) -> &str {
-         self.message
-     }
- 
--    fn cause(&self) -> Option<&Error> {
-+    fn cause(&self) -> Option<&dyn Error> {
-         match self.parent {
-             None => None,
-             Some(ref cause) => Some(cause.deref()),
-         }
-     }
- }
- 
- impl From<io::Error> for PrefReaderError {
-@@ -138,17 +138,17 @@ impl<'a> PrefToken<'a> {
-         }
-     }
- }
- 
- #[derive(Debug)]
- pub struct PrefReaderError {
-     message: &'static str,
-     position: Position,
--    parent: Option<Box<Error>>,
-+    parent: Option<Box<dyn Error>>,
- }
- 
- struct TokenData<'a> {
-     token_type: TokenType,
-     complete: bool,
-     position: Position,
-     data: Cow<'a, str>,
-     start_pos: usize,
-@@ -353,19 +353,19 @@ impl<'a> PrefTokenizer<'a> {
- 
-     fn read_hex_escape(&mut self, hex_chars: isize, first: bool) -> Result<u32, PrefReaderError> {
-         let mut value = 0;
-         for _ in 0..hex_chars {
-             match self.get_char() {
-                 Some(x) => {
-                     value = value << 4;
-                     match x {
--                        '0'...'9' => value += x as u32 - '0' as u32,
--                        'a'...'f' => value += x as u32 - 'a' as u32,
--                        'A'...'F' => value += x as u32 - 'A' as u32,
-+                        '0'..='9' => value += x as u32 - '0' as u32,
-+                        'a'..='f' => value += x as u32 - 'a' as u32,
-+                        'A'..='F' => value += x as u32 - 'A' as u32,
-                         _ => {
-                             return Err(PrefReaderError::new(
-                                 "Unexpected character in escape",
-                                 self.position,
-                                 None,
-                             ))
-                         }
-                     }
-@@ -589,17 +589,17 @@ impl<'a> PrefTokenizer<'a> {
-                         token_data.start(&self, TokenType::String);
-                         token_data.start_pos = self.pos + 1;
-                         TokenizerState::SingleQuotedString
-                     }
-                     't' | 'f' => {
-                         self.unget_char();
-                         TokenizerState::Bool
-                     }
--                    '0'...'9' | '-' | '+' => {
-+                    '0'..='9' | '-' | '+' => {
-                         token_data.start(&self, TokenType::Int);
-                         TokenizerState::Number
-                     }
-                     _ => {
-                         return Err(PrefReaderError::new(
-                             "Invalid character at start of function argument",
-                             self.position,
-                             None,
-@@ -640,17 +640,17 @@ impl<'a> PrefTokenizer<'a> {
-                     }
-                     '\\' => {
-                         self.consume_escape(&mut token_data)?;
-                         TokenizerState::SingleQuotedString
-                     }
-                     _ => TokenizerState::SingleQuotedString,
-                 },
-                 TokenizerState::Number => match c {
--                    '0'...'9' => TokenizerState::Number,
-+                    '0'..='9' => TokenizerState::Number,
-                     ')' | ',' => {
-                         token_data.end(&self.data, self.pos)?;
-                         self.unget_char();
-                         self.next_state = Some(TokenizerState::AfterFunctionArg);
-                         TokenizerState::Junk
-                     }
-                     x if PrefTokenizer::is_space(x) => {
-                         token_data.end(&self.data, self.pos)?;
-diff --git a/testing/mozbase/rust/mozrunner/src/bin/icecat-default-path.rs b/testing/mozbase/rust/mozrunner/src/bin/icecat-default-path.rs
---- a/testing/mozbase/rust/mozrunner/src/bin/icecat-default-path.rs
-+++ b/testing/mozbase/rust/mozrunner/src/bin/icecat-default-path.rs
-@@ -8,7 +8,7 @@
-         .map(|x| (x.to_string_lossy().into_owned(), 0))
-         .unwrap_or(("IceCat binary not found".to_owned(), 1));
- 
--    let mut writer: Box<Write> = match code {
-+    let mut writer: Box<dyn Write> = match code {
-         0 => Box::new(std::io::stdout()),
-         _ => Box::new(std::io::stderr())
-     };
-diff --git a/testing/mozbase/rust/mozrunner/src/runner.rs b/testing/mozbase/rust/mozrunner/src/runner.rs
---- a/testing/mozbase/rust/mozrunner/src/runner.rs
-+++ b/testing/mozbase/rust/mozrunner/src/runner.rs
-@@ -101,20 +101,20 @@ impl Error for RunnerError {
-                     ErrorKind::NotFound => "no such file or directory",
-                     _ => err.description(),
-                 }
-             }
-             RunnerError::PrefReader(ref err) => err.description(),
-         }
-     }
- 
--    fn cause(&self) -> Option<&Error> {
-+    fn cause(&self) -> Option<&dyn Error> {
-         Some(match *self {
--            RunnerError::Io(ref err) => err as &Error,
--            RunnerError::PrefReader(ref err) => err as &Error,
-+            RunnerError::Io(ref err) => err as &dyn Error,
-+            RunnerError::PrefReader(ref err) => err as &dyn Error,
-         })
-     }
- }
- 
- impl From<io::Error> for RunnerError {
-     fn from(value: io::Error) -> RunnerError {
-         RunnerError::Io(value)
-     }
-diff --git a/testing/webdriver/src/error.rs b/testing/webdriver/src/error.rs
---- a/testing/webdriver/src/error.rs
-+++ b/testing/webdriver/src/error.rs
-@@ -320,17 +320,17 @@ impl WebDriverError {
-     }
- }
- 
- impl Error for WebDriverError {
-     fn description(&self) -> &str {
-         self.error_code()
-     }
- 
--    fn cause(&self) -> Option<&Error> {
-+    fn cause(&self) -> Option<&dyn Error> {
-         None
-     }
- }
- 
- impl fmt::Display for WebDriverError {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         self.message.fmt(f)
-     }
-@@ -349,18 +349,18 @@ impl From<io::Error> for WebDriverError 
- }
- 
- impl From<DecodeError> for WebDriverError {
-     fn from(err: DecodeError) -> WebDriverError {
-         WebDriverError::new(ErrorStatus::UnknownError, err.description().to_string())
-     }
- }
- 
--impl From<Box<Error>> for WebDriverError {
--    fn from(err: Box<Error>) -> WebDriverError {
-+impl From<Box<dyn Error>> for WebDriverError {
-+    fn from(err: Box<dyn Error>) -> WebDriverError {
-         WebDriverError::new(ErrorStatus::UnknownError, err.description().to_string())
-     }
- }
- 
- #[cfg(test)]
- mod tests {
-     use super::*;
-     use crate::test::check_serialize;
-diff --git a/testing/webdriver/src/server.rs b/testing/webdriver/src/server.rs
---- a/testing/webdriver/src/server.rs
-+++ b/testing/webdriver/src/server.rs
-@@ -171,17 +171,17 @@ impl<U: WebDriverExtensionRoute> HttpHan
-     }
- }
- 
- impl<U: WebDriverExtensionRoute + 'static> Service for HttpHandler<U> {
-     type ReqBody = Body;
-     type ResBody = Body;
- 
-     type Error = hyper::Error;
--    type Future = Box<future::Future<Item = Response<Self::ResBody>, Error = hyper::Error> + Send>;
-+    type Future = Box<dyn future::Future<Item = Response<Self::ResBody>, Error = hyper::Error> + Send>;
- 
-     fn call(&mut self, req: Request<Self::ReqBody>) -> Self::Future {
-         let uri = req.uri().clone();
-         let method = req.method().clone();
-         let api = self.api.clone();
-         let chan = self.chan.clone();
- 
-         Box::new(req.into_body().concat2().and_then(move |body| {
-diff --git a/xpcom/rust/xpcom/xpcom_macros/src/lib.rs b/xpcom/rust/xpcom/xpcom_macros/src/lib.rs
---- a/xpcom/rust/xpcom/xpcom_macros/src/lib.rs
-+++ b/xpcom/rust/xpcom/xpcom_macros/src/lib.rs
-@@ -192,7 +192,7 @@
- }
- 
- impl Interface {
--    fn base(&self) -> Result<Option<&'static Interface>, Box<Error>> {
-+    fn base(&self) -> Result<Option<&'static Interface>, Box<dyn Error>> {
-         Ok(if let Some(base) = self.base {
-             Some(*IFACES.get(base).ok_or_else(
-                 || format!("Base interface {} does not exist", base)
-@@ -238,7 +238,7 @@
- }
- 
- /// Scans through the attributes on a struct, and extracts the type of the refcount to use.
--fn get_refcnt_kind(attrs: &[Attribute]) -> Result<RefcntKind, Box<Error>> {
-+fn get_refcnt_kind(attrs: &[Attribute]) -> Result<RefcntKind, Box<dyn Error>> {
-     for attr in attrs {
-         if let Some(Meta::NameValue(ref attr)) = attr.interpret_meta() {
-             if attr.ident.as_ref() != "refcnt" {
-@@ -268,7 +268,7 @@
- /// Scan the attributes looking for an #[xpimplements] attribute. The identifier
- /// arguments passed to this attribute are the interfaces which the type wants to
- /// directly implement.
--fn get_bases(attrs: &[Attribute]) -> Result<Vec<&'static Interface>, Box<Error>> {
-+fn get_bases(attrs: &[Attribute]) -> Result<Vec<&'static Interface>, Box<dyn Error>> {
-     let mut inherits = Vec::new();
-     for attr in attrs {
-         if let Some(Meta::List(ref attr)) = attr.interpret_meta() {
-@@ -294,7 +294,7 @@
- }
- 
- /// Extract the fields list from the input struct.
--fn get_fields(di: &DeriveInput) -> Result<&Punctuated<Field, Token![,]>, Box<Error>> {
-+fn get_fields(di: &DeriveInput) -> Result<&Punctuated<Field, Token![,]>, Box<dyn Error>> {
-     match di.data {
-         Data::Struct(DataStruct {
-             fields: Fields::Named(ref named), ..
-@@ -305,7 +305,7 @@
- }
- 
- /// Takes the `Init*` struct in, and generates a `DeriveInput` for the "real" struct.
--fn gen_real_struct(init: &DeriveInput, bases: &[&Interface], refcnt_ty: RefcntKind) -> Result<DeriveInput, Box<Error>> {
-+fn gen_real_struct(init: &DeriveInput, bases: &[&Interface], refcnt_ty: RefcntKind) -> Result<DeriveInput, Box<dyn 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") {
diff --git a/sources b/sources
index bb25126..5ee9838 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
-SHA512 (icecat-68.3.0-gnu1.tar.bz2) = f2d8bfb12f9eeb2426ef38f9849bfcb95d2d56f4374651e65d06654f9b0379b5c11d4df03973a68c65b29b8e3c7f9712c04e67f56a91a82b309c8bb405cbb964
-SHA512 (icecat-68.3.0-langpacks.tar.gz) = c65d0170f110fe4afcaf0074e7c799a1226d87231a77d67ae170290933175aa3a2f68401c99e752126e96b3de87a77512d6573daf7c3019aae26434bc6b83e58
+SHA512 (icecat-68.4.0-gnu1.tar.bz2) = d919169a96e47a71dd2d3bf8dd38a0dba79e2721d66ea584ceda9de71644644f923d10a1786eb06305d507f5d5172b233b19222be1f46a5d325b196417aee178
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 2f44dcd3d0e97934eebab22bcde085b1dcda7322 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 4 Jan 2020 18:54:22 +0100
Subject: [PATCH 088/473] New rebuild of source archive (extensions updated)|
 Use rh prefix instead of gnu

---
 .gitignore                               |   1 +
 icecat-68.3.0-cbindgen_for_rust139.patch | 172 -----------------------
 icecat.rpmlintrc                         |  46 ------
 icecat.spec                              |  14 +-
 sources                                  |   2 +-
 5 files changed, 11 insertions(+), 224 deletions(-)
 delete mode 100644 icecat-68.3.0-cbindgen_for_rust139.patch
 delete mode 100644 icecat.rpmlintrc

diff --git a/.gitignore b/.gitignore
index d1610d7..eef7b50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,3 +96,4 @@
 /icecat-68.3.0-gnu1.tar.bz2
 /icecat-68.3.0-langpacks.tar.gz
 /icecat-68.4.0-gnu1.tar.bz2
+/icecat-68.4.0-rh1.tar.bz2
diff --git a/icecat-68.3.0-cbindgen_for_rust139.patch b/icecat-68.3.0-cbindgen_for_rust139.patch
deleted file mode 100644
index f150066..0000000
--- a/icecat-68.3.0-cbindgen_for_rust139.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-diff -up a/third_party/rust/bindgen/.cargo-checksum.json.bindgen b/third_party/rust/bindgen/.cargo-checksum.json
---- a/third_party/rust/bindgen/.cargo-checksum.json.bindgen	2019-12-01 15:29:26.000000000 +0100
-+++ b/third_party/rust/bindgen/.cargo-checksum.json	2019-12-04 11:38:42.878975886 +0100
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"8dc10043d872e68e660ef96edca4d9733f95be45cdad4893462fa929b335014f","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"71f1a37f75b971ea5b0d8457473cc410947dbf706cb6d2c0338916910b78a675","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"}
-diff -up a/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs.bindgen b/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs
---- a/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs.bindgen	2019-12-01 15:29:26.000000000 +0100
-+++ b/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs	2019-12-04 11:33:09.631921359 +0100
-@@ -9,17 +9,17 @@ use std::ops;
- use {HashMap, Entry};
- 
- /// The result of the `HasVtableAnalysis` for an individual item.
--#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
-+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
- pub enum HasVtableResult {
--    /// The item has a vtable, but the actual vtable pointer is in a base
--    /// member.
--    BaseHasVtable,
-+    /// The item does not have a vtable pointer.
-+    No,
- 
-     /// The item has a vtable and the actual vtable pointer is within this item.
-     SelfHasVtable,
- 
--    /// The item does not have a vtable pointer.
--    No
-+    /// The item has a vtable, but the actual vtable pointer is in a base
-+    /// member.
-+    BaseHasVtable,
- }
- 
- impl Default for HasVtableResult {
-@@ -28,21 +28,6 @@ impl Default for HasVtableResult {
-     }
- }
- 
--impl cmp::PartialOrd for HasVtableResult {
--    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
--        use self::HasVtableResult::*;
--
--        match (*self, *rhs) {
--            (x, y) if x == y => Some(cmp::Ordering::Equal),
--            (BaseHasVtable, _) => Some(cmp::Ordering::Greater),
--            (_, BaseHasVtable) => Some(cmp::Ordering::Less),
--            (SelfHasVtable, _) => Some(cmp::Ordering::Greater),
--            (_, SelfHasVtable) => Some(cmp::Ordering::Less),
--            _ => unreachable!(),
--        }
--    }
--}
--
- impl HasVtableResult {
-     /// Take the least upper bound of `self` and `rhs`.
-     pub fn join(self, rhs: Self) -> Self {
-diff -up a/third_party/rust/bindgen/src/ir/analysis/sizedness.rs.bindgen b/third_party/rust/bindgen/src/ir/analysis/sizedness.rs
---- a/third_party/rust/bindgen/src/ir/analysis/sizedness.rs.bindgen	2019-12-01 15:29:26.000000000 +0100
-+++ b/third_party/rust/bindgen/src/ir/analysis/sizedness.rs	2019-12-04 11:33:09.632921362 +0100
-@@ -22,13 +22,14 @@ use {HashMap, Entry};
- ///
- /// We initially assume that all types are `ZeroSized` and then update our
- /// understanding as we learn more about each type.
--#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
-+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
- pub enum SizednessResult {
--    /// Has some size that is known to be greater than zero. That doesn't mean
--    /// it has a static size, but it is not zero sized for sure. In other words,
--    /// it might contain an incomplete array or some other dynamically sized
--    /// type.
--    NonZeroSized,
-+    /// The type is zero-sized.
-+    ///
-+    /// This means that if it is a C++ type, and is not being used as a base
-+    /// member, then we must add an `_address` byte to enforce the
-+    /// unique-address-per-distinct-object-instance rule.
-+    ZeroSized,
- 
-     /// Whether this type is zero-sized or not depends on whether a type
-     /// parameter is zero-sized or not.
-@@ -52,12 +53,11 @@ pub enum SizednessResult {
-     /// https://github.com/rust-lang-nursery/rust-bindgen/issues/586
-     DependsOnTypeParam,
- 
--    /// The type is zero-sized.
--    ///
--    /// This means that if it is a C++ type, and is not being used as a base
--    /// member, then we must add an `_address` byte to enforce the
--    /// unique-address-per-distinct-object-instance rule.
--    ZeroSized,
-+    /// Has some size that is known to be greater than zero. That doesn't mean
-+    /// it has a static size, but it is not zero sized for sure. In other words,
-+    /// it might contain an incomplete array or some other dynamically sized
-+    /// type.
-+    NonZeroSized,
- }
- 
- impl Default for SizednessResult {
-@@ -66,21 +66,6 @@ impl Default for SizednessResult {
-     }
- }
- 
--impl cmp::PartialOrd for SizednessResult {
--    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
--        use self::SizednessResult::*;
--
--        match (*self, *rhs) {
--            (x, y) if x == y => Some(cmp::Ordering::Equal),
--            (NonZeroSized, _) => Some(cmp::Ordering::Greater),
--            (_, NonZeroSized) => Some(cmp::Ordering::Less),
--            (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater),
--            (_, DependsOnTypeParam) => Some(cmp::Ordering::Less),
--            _ => unreachable!(),
--        }
--    }
--}
--
- impl SizednessResult {
-     /// Take the least upper bound of `self` and `rhs`.
-     pub fn join(self, rhs: Self) -> Self {
-diff -up a/third_party/rust/bindgen/src/ir/derive.rs.bindgen b/third_party/rust/bindgen/src/ir/derive.rs
---- a/third_party/rust/bindgen/src/ir/derive.rs.bindgen	2019-12-01 15:29:26.000000000 +0100
-+++ b/third_party/rust/bindgen/src/ir/derive.rs	2019-12-04 11:33:09.632921362 +0100
-@@ -92,10 +92,10 @@ pub trait CanDeriveOrd {
- ///
- /// Initially we assume that we can derive trait for all types and then
- /// update our understanding as we learn more about each type.
--#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)]
-+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
- pub enum CanDerive {
--    /// No, we cannot.
--    No,
-+    /// Yes, we can derive automatically.
-+    Yes,
- 
-     /// The only thing that stops us from automatically deriving is that
-     /// array with more than maximum number of elements is used.
-@@ -103,8 +103,8 @@ pub enum CanDerive {
-     /// This means we probably can "manually" implement such trait.
-     Manually,
- 
--    /// Yes, we can derive automatically.
--    Yes,
-+    /// No, we cannot.
-+    No,
- }
- 
- impl Default for CanDerive {
-@@ -113,22 +113,6 @@ impl Default for CanDerive {
-     }
- }
- 
--impl cmp::PartialOrd for CanDerive {
--    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
--        use self::CanDerive::*;
--
--        let ordering = match (*self, *rhs) {
--            (x, y) if x == y => cmp::Ordering::Equal,
--            (No, _) => cmp::Ordering::Greater,
--            (_, No) => cmp::Ordering::Less,
--            (Manually, _) => cmp::Ordering::Greater,
--            (_, Manually) => cmp::Ordering::Less,
--            _ => unreachable!()
--        };
--        Some(ordering)
--    }
--}
--
- impl CanDerive {
-     /// Take the least upper bound of `self` and `rhs`.
-     pub fn join(self, rhs: Self) -> Self {
-
diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
deleted file mode 100644
index 4d7dde1..0000000
--- a/icecat.rpmlintrc
+++ /dev/null
@@ -1,46 +0,0 @@
-# Whitelisting errors
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-# https://src.fedoraproject.org/rpms/python3/blob/master/f/python3.rpmlintrc
-# Edited by sagitter (sagitter AT fedoraproject dot org)
-
-# KNOWN BUGS:
-#
-
-# TESTS:
-##### SRPMs #####
-
-# ifarch applied patches are okay
-# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
-addFilter(r'(%ifarch-applied-patch) Patch*')
-# Different file size due to the signature of the source code tarbz archive
-addFilter(r'file-size-mismatch')
-
-addFilter(r'(invalid-url) Source4')
-addFilter(r'(invalid-url) Source5')
-addFilter(r'(invalid-url) Source17')
-
-# ERRORS:
-##### RPMs  #####
-
-# chroot function (??)
-addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib(64)?/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib(64)?/icecat/libxul.so')
-
-# Expected on FF browser
-# https://support.mozilla.org/en-US/questions/1045418
-addFilter(r'(zero-length) /usr/lib(64)?/icecat/chrome.manifest')
-addFilter(r'(zero-length) /usr/lib(64)?/icecat/browser/chrome.manifest')
-
-addFilter(r'E:library-not-linked-against-libc /usr/lib(64)?/icecat/gtk2/libmozgtk.so')
-addFilter(r'E:library-not-linked-against-libc /usr/lib(64)?/icecat/libmozgtk.so')
-
-# False positive
-addFilter(r'(dangling-symlink) /usr/lib(64)?/icecat/dictionaries /usr/share/myspell')
-addFilter(r'(unversioned-explicit-provides) webclient')
-
-# WARNINGS:
-##### RPMs  #####
-
-addFilter(r'(no-manual-page-for-binary) icecat-wayland')
-addFilter(r'(no-manual-page-for-binary) icecat-x11')
-
diff --git a/icecat.spec b/icecat.spec
index e1d8e06..a0e111a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -83,9 +83,11 @@ ExcludeArch: %{arm}
 ExcludeArch: s390x
 
 # Set new source-code build version
-%global gnu_ver gnu1
+# This tag indicates a new rebuild for Fedora
+%global redhat_ver rh1
 
 # Set extra version tag
+# This tag comes from Mozilla's releases
 %if 0%{?release_candidate}
 %global extra_ver .rc1
 %endif
@@ -96,7 +98,7 @@ ExcludeArch: s390x
 
 Name: icecat
 Version: 68.4.0
-Release: 0.1%{extra_ver}.%{gnu_ver}%{?pre_tag}%{?dist}
+Release: 0.2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -106,7 +108,7 @@ URL:   http://www.gnu.org/software/gnuzilla/
 ## Source archive created by scripts based on Gnuzilla files.
 ## Modified files are hosted in a dedicated fork repository:
 ## https://gitlab.com/anto.trande/icecat
-Source0: https://sagitter.fedorapeople.org/%{name}/v%{version}/%{name}-%{version}-%{gnu_ver}.tar.bz2
+Source0: https://sagitter.fedorapeople.org/%{name}/v%{version}/%{name}-%{version}-%{redhat_ver}.tar.bz2
 
 Source2: %{name}.png
 Source3: %{name}-mozconfig-common
@@ -181,7 +183,6 @@ Patch414: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
 
 # Patches for compatibility with Rust-1.39
 Patch419: mozilla-1564873.patch
-Patch420: icecat-68.3.0-cbindgen_for_rust139.patch
 #
 
 # Fix crash on ppc64le (mozilla#1512162)
@@ -393,7 +394,6 @@ tar -xf %{SOURCE5}
 %endif
 
 %patch419 -p1 -b .mozilla-1564873
-#%%patch420 -p1 -b .icecat-68.3.0-cbindgen_for_rust139
 
 %patch423 -p1 -b .mozilla-1596503
 %patch424 -p1 -b .mozilla-1566876-webrtc-ind
@@ -833,6 +833,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Fri Jan 03 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-0.2.rc1.rh1
+- New rebuild of source archive (extensions updated)
+- Use rh prefix instead of gnu
+
 * Wed Jan 01 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-0.1.rc1.gnu1
 - Mozilla release candidate 68.4.0ESR
 - Fix rhbz#1785956
diff --git a/sources b/sources
index 5ee9838..15138e3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
-SHA512 (icecat-68.4.0-gnu1.tar.bz2) = d919169a96e47a71dd2d3bf8dd38a0dba79e2721d66ea584ceda9de71644644f923d10a1786eb06305d507f5d5172b233b19222be1f46a5d325b196417aee178
+SHA512 (icecat-68.4.0-rh1.tar.bz2) = c2e113afc24721cfa36628ddc432ee9c84725d6d7b5b540c6e6f2cd6782d75ba9319f69c73518b70ef3cfcbd647ff59eaad6fefc3a6c4eb00504700fd1b69312
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 930eaa6a30d75668b5b1a91e753982083882df79 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 4 Jan 2020 20:34:59 +0100
Subject: [PATCH 089/473] Add icecat.rpmlintrc

---
 icecat.rpmlintrc | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 icecat.rpmlintrc

diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
new file mode 100644
index 0000000..4d7dde1
--- /dev/null
+++ b/icecat.rpmlintrc
@@ -0,0 +1,46 @@
+# Whitelisting errors
+# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
+# https://src.fedoraproject.org/rpms/python3/blob/master/f/python3.rpmlintrc
+# Edited by sagitter (sagitter AT fedoraproject dot org)
+
+# KNOWN BUGS:
+#
+
+# TESTS:
+##### SRPMs #####
+
+# ifarch applied patches are okay
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
+addFilter(r'(%ifarch-applied-patch) Patch*')
+# Different file size due to the signature of the source code tarbz archive
+addFilter(r'file-size-mismatch')
+
+addFilter(r'(invalid-url) Source4')
+addFilter(r'(invalid-url) Source5')
+addFilter(r'(invalid-url) Source17')
+
+# ERRORS:
+##### RPMs  #####
+
+# chroot function (??)
+addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib(64)?/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib(64)?/icecat/libxul.so')
+
+# Expected on FF browser
+# https://support.mozilla.org/en-US/questions/1045418
+addFilter(r'(zero-length) /usr/lib(64)?/icecat/chrome.manifest')
+addFilter(r'(zero-length) /usr/lib(64)?/icecat/browser/chrome.manifest')
+
+addFilter(r'E:library-not-linked-against-libc /usr/lib(64)?/icecat/gtk2/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib(64)?/icecat/libmozgtk.so')
+
+# False positive
+addFilter(r'(dangling-symlink) /usr/lib(64)?/icecat/dictionaries /usr/share/myspell')
+addFilter(r'(unversioned-explicit-provides) webclient')
+
+# WARNINGS:
+##### RPMs  #####
+
+addFilter(r'(no-manual-page-for-binary) icecat-wayland')
+addFilter(r'(no-manual-page-for-binary) icecat-x11')
+

From 2e134ee817591a55456636396875ff7cf0bc7e35 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 7 Jan 2020 20:09:21 +0100
Subject: [PATCH 090/473] Mozilla stable release 68.4.0ESR| Test build for ARM
 and s390x

---
 .gitignore  |  2 ++
 icecat.spec | 27 ++++++++++++++++++---------
 sources     |  3 ++-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index eef7b50..25c57fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,3 +97,5 @@
 /icecat-68.3.0-langpacks.tar.gz
 /icecat-68.4.0-gnu1.tar.bz2
 /icecat-68.4.0-rh1.tar.bz2
+/icecat-68.4.0-langpacks.tar.gz
+/icecat-68.4.0-rh2.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index a0e111a..85b9392 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,11 +1,11 @@
 # Set to true if it's going to be submitted as update
-%global release_build 1
+%global release_build 0
 
 # Set to true if it's going to be submitted as release candidate
-%global release_candidate 1
+%global release_candidate 0
 
 # Active/Deactive language files handling
-%global build_langpacks 0
+%global build_langpacks 1
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
@@ -61,7 +61,10 @@
 %bcond_without jack
 %bcond_with alsa
 
-%global with_vpx      1
+%global with_vpx 1
+%if 0%{?with_vpx}
+%global libvpx_version 1.4.0	
+%endif
 
 %if 0%{?fedora} > 30
 %global wayland_backend_default 1
@@ -78,18 +81,20 @@
 %global build_with_clang  0
 
 # Exclude ARM builds for rhbz #1658940
-ExcludeArch: %{arm}
+#ExcludeArch: %%{arm}
 # Disabled due to https://pagure.io/fedora-infrastructure/issue/7581
-ExcludeArch: s390x
+#ExcludeArch: s390x
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh1
+%global redhat_ver rh2
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
 %if 0%{?release_candidate}
 %global extra_ver .rc1
+%else
+%global extra_ver %{nil}
 %endif
 
 %if !%{release_build}
@@ -98,7 +103,7 @@ ExcludeArch: s390x
 
 Name: icecat
 Version: 68.4.0
-Release: 0.2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -244,7 +249,7 @@ BuildRequires: libffi-devel
 BuildRequires: libnotify-devel
 BuildRequires: libpng-devel
 %if 0%{?with_vpx}
-BuildRequires: libvpx-devel
+BuildRequires: libvpx-devel >= %{libvpx_version}
 %endif
 BuildRequires: libzip-devel
 BuildRequires: mesa-libGL-devel
@@ -833,6 +838,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Tue Jan 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-1.rh2.test
+- Mozilla stable release 68.4.0ESR
+- Test build for ARM and s390x
+
 * Fri Jan 03 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-0.2.rc1.rh1
 - New rebuild of source archive (extensions updated)
 - Use rh prefix instead of gnu
diff --git a/sources b/sources
index 15138e3..3fd45cb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
-SHA512 (icecat-68.4.0-rh1.tar.bz2) = c2e113afc24721cfa36628ddc432ee9c84725d6d7b5b540c6e6f2cd6782d75ba9319f69c73518b70ef3cfcbd647ff59eaad6fefc3a6c4eb00504700fd1b69312
+SHA512 (icecat-68.4.0-langpacks.tar.gz) = e7bedd13dd1e381c54d425f2af0b80a70c28cb911794efc91ee94e66097cf135764bd1809bc7063e132e50a1bf05775522470f25359b82be0f18b59ea4b9d36a
+SHA512 (icecat-68.4.0-rh2.tar.bz2) = e2b952e2187e27b344788810c3053a6be08f7495ae312d03328cbbd126f8c4d7d16e99dc60698c7488979c26f93d00b5fdd22bdec1d83a762fba2568665216a5
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From b95faf3cf2fb76e9aff126c5be5cff1be125e455 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 7 Jan 2020 20:52:56 +0100
Subject: [PATCH 091/473] Drop obsolete patches

---
 ...fix-mozillaSignalTrampoline-to-work-.patch |  2 +-
 build-big-endian.patch                        | 84 -------------------
 ...> icecat-68.4.0-build-icu-big-endian.patch |  4 +-
 icecat-locale.patch                           | 11 ---
 icecat.spec                                   | 13 +--
 5 files changed, 5 insertions(+), 109 deletions(-)
 rename Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch => Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch (88%)
 delete mode 100644 build-big-endian.patch
 rename build-icu-big-endian.patch => icecat-68.4.0-build-icu-big-endian.patch (94%)
 delete mode 100644 icecat-locale.patch

diff --git a/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
similarity index 88%
rename from Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
rename to Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
index be4a7fb..1e358a8 100644
--- a/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+++ b/Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
@@ -9,4 +9,4 @@ diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/Linux
 +  asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory");
  }
  
- #define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
+ #  define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
diff --git a/build-big-endian.patch b/build-big-endian.patch
deleted file mode 100644
index e8ec439..0000000
--- a/build-big-endian.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -up firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h
---- firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian	2018-04-09 22:50:48.000000000 +0200
-+++ firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h	2018-04-18 11:51:38.748680174 +0200
-@@ -54,18 +54,19 @@ static inline U8CPU SkUnitScalarClampToB
-  *
-  *  Here we enforce this constraint.
-  */
--
-+/*
- #ifdef SK_CPU_BENDIAN
-     #define SK_RGBA_R32_SHIFT   24
-     #define SK_RGBA_G32_SHIFT   16
-     #define SK_RGBA_B32_SHIFT   8
-     #define SK_RGBA_A32_SHIFT   0
- #else
-+*/
-     #define SK_RGBA_R32_SHIFT   0
-     #define SK_RGBA_G32_SHIFT   8
-     #define SK_RGBA_B32_SHIFT   16
-     #define SK_RGBA_A32_SHIFT   24
--#endif
-+/*#endif*/
- 
- #define SkGetPackedA32(packed)      ((uint32_t)((packed) << (24 - SK_A32_SHIFT)) >> 24)
- #define SkGetPackedR32(packed)      ((uint32_t)((packed) << (24 - SK_R32_SHIFT)) >> 24)
-diff -up firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h
---- firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian	2018-04-09 22:50:48.000000000 +0200
-+++ firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h	2018-04-18 11:51:38.748680174 +0200
-@@ -84,7 +84,8 @@ enum SkColorType {
- #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
-     kN32_SkColorType = kRGBA_8888_SkColorType,
- #else
--    #error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order"
-+    //#error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order"
-+    kN32_SkColorType = kBGRA_8888_SkColorType
- #endif
- };
- 
-diff -up firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h
---- firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian	2018-04-09 22:50:48.000000000 +0200
-+++ firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h	2018-04-18 11:51:38.748680174 +0200
-@@ -344,15 +344,13 @@ enum GrPixelConfig {
- static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
- 
- // Aliases for pixel configs that match skia's byte order.
--#ifndef SK_CPU_LENDIAN
--    #error "Skia gpu currently assumes little endian"
--#endif
- #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
-     static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
- #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
-     static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig;
- #else
--    #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format."
-+    static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
-+    static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSBGRA_8888_GrPixelConfig;
- #endif
- 
- /**
-diff -up firefox-60.0/gfx/skia/skia/src/core/SkColorData.h.big-endian firefox-60.0/gfx/skia/skia/src/core/SkColorData.h
---- firefox-60.0/gfx/skia/skia/src/core/SkColorData.h.big-endian	2018-04-18 13:42:06.980476156 +0200
-+++ firefox-60.0/gfx/skia/skia/src/core/SkColorData.h	2018-04-18 13:42:50.493520552 +0200
-@@ -31,18 +31,19 @@
-  *
-  *  Here we enforce this constraint.
-  */
--
-+/*
- #ifdef SK_CPU_BENDIAN
-     #define SK_BGRA_B32_SHIFT   24
-     #define SK_BGRA_G32_SHIFT   16
-     #define SK_BGRA_R32_SHIFT   8
-     #define SK_BGRA_A32_SHIFT   0
- #else
-+*/
-     #define SK_BGRA_B32_SHIFT   0
-     #define SK_BGRA_G32_SHIFT   8
-     #define SK_BGRA_R32_SHIFT   16
-     #define SK_BGRA_A32_SHIFT   24
--#endif
-+//#endif
- 
- #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)
-     #error "can't define PMCOLOR to be RGBA and BGRA"
diff --git a/build-icu-big-endian.patch b/icecat-68.4.0-build-icu-big-endian.patch
similarity index 94%
rename from build-icu-big-endian.patch
rename to icecat-68.4.0-build-icu-big-endian.patch
index aaa0e3b..c9d16d8 100644
--- a/build-icu-big-endian.patch
+++ b/icecat-68.4.0-build-icu-big-endian.patch
@@ -7,6 +7,6 @@ diff -up a/build/autoconf/icu.orig.m4 b/build/autoconf/icu.m4
      # but we'd need to check in a big-endian version of the file.
 -    ICU_DATA_FILE="icudt${version}l.dat"
 +    ICU_DATA_FILE="icudt${version}b.dat"
- 
-     MOZ_ICU_DATA_ARCHIVE=
  fi
+ 
+ AC_SUBST(MOZ_ICU_VERSION)
diff --git a/icecat-locale.patch b/icecat-locale.patch
deleted file mode 100644
index 7bdcbac..0000000
--- a/icecat-locale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- intl/icu/source/i18n/digitlst.orig.cpp	2017-07-25 16:08:42.000000000 +0000
-+++ intl/icu/source/i18n/digitlst.cpp	2017-08-03 19:20:54.808813010 +0000
-@@ -63,7 +63,7 @@
- 
- #if U_USE_STRTOD_L
- # if U_HAVE_XLOCALE_H
--#   include <xlocale.h>
-+#   include <c++/v1/support/xlocale/xlocale.h>
- # else
- #   include <locale.h>
- # endif
diff --git a/icecat.spec b/icecat.spec
index 85b9392..a458a90 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -160,14 +160,8 @@ Patch7: %{name}-fix_jar.patch
 # Fix files list for installer
 Patch8: %{name}-fix_installer.patch
 
-# xlocale.h not provided by glibc-headers
-# Set path of libcxx-devel
-Patch9: %{name}-locale.patch
+Patch26: %{name}-68.4.0-build-icu-big-endian.patch
 
-Patch26: build-icu-big-endian.patch
-
-# Also fixes s390x: https://bugzilla.mozilla.org/show_bug.cgi?id=1376268
-Patch29: build-big-endian.patch
 # Always feel lucky for unsupported platforms:
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
 Patch37: build-jit-atomic-always-lucky.patch
@@ -184,7 +178,7 @@ Patch219: rhbz-1173156.patch
 Patch226: rhbz-1354671.patch
 
 # Upstream patches
-Patch414: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
 
 # Patches for compatibility with Rust-1.39
 Patch419: mozilla-1564873.patch
@@ -370,7 +364,6 @@ tar -xf %{SOURCE5}
 %patch7 -p0 -b .fix_jar
 %patch8 -p0 -b .fix_installer
 
-#%%patch37 -p1 -b .jit-atomic-lucky
 %ifarch aarch64
 %patch40 -p1 -b .aarch64-skia
 %endif
@@ -394,8 +387,6 @@ tar -xf %{SOURCE5}
 # Patch for big endian platforms only
 %if 0%{?big_endian}
 %patch26 -p1 -b .icu
-%patch9 -p0 -b .locale
-%patch29 -p1 -b .big-endian
 %endif
 
 %patch419 -p1 -b .mozilla-1564873

From 805001b27fc81ffdaaa597e09ce6b13e3a4db48a Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 7 Jan 2020 21:32:39 +0100
Subject: [PATCH 092/473] Fix build options for ARM and s390x

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index a458a90..fb8dac2 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -461,7 +461,7 @@ echo "ac_add_options --without-system-libvpx" >> .mozconfig
 echo "ac_add_options --disable-libjpeg-turbo" >> .mozconfig
 echo "ac_add_options --with-system-jpeg" >> .mozconfig
 echo "ac_add_options --disable-crashreporter" >> .mozconfig
-%ifnarch %{power64} aarch64
+%ifnarch %{power64} aarch64 s390x %{arm}
 echo "ac_add_options --disable-eme" >> .mozconfig
 %endif
 

From c38e668039aa8cb9ac6f98a3d95ab77a461e9751 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 8 Jan 2020 11:45:03 +0100
Subject: [PATCH 093/473] Patched for mzbz#1526653 to disable wasm on ARM

---
 icecat-68.4.0-mozilla-1526653_arm_disable_wasm.patch | 11 +++++++++++
 icecat.spec                                          |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 icecat-68.4.0-mozilla-1526653_arm_disable_wasm.patch

diff --git a/icecat-68.4.0-mozilla-1526653_arm_disable_wasm.patch b/icecat-68.4.0-mozilla-1526653_arm_disable_wasm.patch
new file mode 100644
index 0000000..a58cb6f
--- /dev/null
+++ b/icecat-68.4.0-mozilla-1526653_arm_disable_wasm.patch
@@ -0,0 +1,11 @@
+--- a/js/src/wasm/WasmSignalHandlers.cpp	2019-05-16 11:25:13.260881532 +0200
++++ b/js/src/wasm/WasmSignalHandlers.cpp	2019-05-16 11:24:35.164589301 +0200
+@@ -243,7 +243,7 @@ using mozilla::DebugOnly;
+ // emulation here.
+ 
+ #if defined(__linux__) && defined(__arm__)
+-#  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
++// #  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+ #endif
+ 
+ #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
diff --git a/icecat.spec b/icecat.spec
index fb8dac2..8cc270c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -165,16 +165,19 @@ Patch26: %{name}-68.4.0-build-icu-big-endian.patch
 # Always feel lucky for unsupported platforms:
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
 Patch37: build-jit-atomic-always-lucky.patch
+
 # Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x)
 Patch38: build-cacheFlush-missing.patch
+
 Patch40: build-aarch64-skia.patch
 Patch41: build-disable-elfhack.patch
 Patch44: build-arm-libopus.patch
+Patch45: %{name}-68.4.0-mozilla-1526653_arm_disable_wasm.patch
 
 # Fedora specific patches
 Patch219: rhbz-1173156.patch
 
-#ARM run-time patch
+# ARM run-time patch
 Patch226: rhbz-1354671.patch
 
 # Upstream patches
@@ -382,6 +385,7 @@ tar -xf %{SOURCE5}
 %ifarch %{arm}
 %patch414 -p1 -b .Bug-1238661---fix-mozillaSignalTrampoline-to-work
 %patch44  -p1 -b .build-arm-libopus
+%patch45  -p1 -b .mozilla-1526653_arm
 %endif
 
 # Patch for big endian platforms only
@@ -832,6 +836,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 * Tue Jan 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-1.rh2.test
 - Mozilla stable release 68.4.0ESR
 - Test build for ARM and s390x
+- Patched for mzbz#1526653 to disable wasm on ARM
 
 * Fri Jan 03 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-0.2.rc1.rh1
 - New rebuild of source archive (extensions updated)

From 090cafe7db5ef6a19244e78b5ac0def39314a7fe Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 8 Jan 2020 12:02:16 +0100
Subject: [PATCH 094/473] Update patch #45

---
 ...4.0-mozilla-1526653_arm_disable_wasm.patch | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/icecat-68.4.0-mozilla-1526653_arm_disable_wasm.patch b/icecat-68.4.0-mozilla-1526653_arm_disable_wasm.patch
index a58cb6f..86d0c08 100644
--- a/icecat-68.4.0-mozilla-1526653_arm_disable_wasm.patch
+++ b/icecat-68.4.0-mozilla-1526653_arm_disable_wasm.patch
@@ -1,11 +1,23 @@
---- a/js/src/wasm/WasmSignalHandlers.cpp	2019-05-16 11:25:13.260881532 +0200
-+++ b/js/src/wasm/WasmSignalHandlers.cpp	2019-05-16 11:24:35.164589301 +0200
-@@ -243,7 +243,7 @@ using mozilla::DebugOnly;
- // emulation here.
- 
- #if defined(__linux__) && defined(__arm__)
--#  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
-+// #  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
+index 636537f847862ef693dd6582e2783de4e3d403c5..383c380f04ceb6a111dbfe9a046e3454a56e31b4 100644
+--- a/js/src/wasm/WasmSignalHandlers.cpp
++++ b/js/src/wasm/WasmSignalHandlers.cpp
+@@ -248,7 +248,16 @@ using mozilla::DebugOnly;
  #endif
  
  #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+-#  include <sys/user.h>
++struct user_vfp {
++  unsigned long long fpregs[32];
++  unsigned long fpscr;
++};
++
++struct user_vfp_exc {
++  unsigned long fpexc;
++  unsigned long fpinst;
++  unsigned long fpinst2;
++};
+ #endif
+ 
+ #if defined(ANDROID)
+

From e1038d9735f3c5ff40f3a4103b6cf29979c86b67 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 8 Jan 2020 14:21:22 +0100
Subject: [PATCH 095/473] Add --disable-av1 build option for ARM

---
 icecat.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 8cc270c..be26d88 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -504,6 +504,8 @@ echo "ac_add_options --disable-debug" >> .mozconfig
 %endif
 %ifarch %{arm}
 echo "ac_add_options --enable-linker=gold" >> .mozconfig
+# mzbz #1436511
+echo "ac_add_options --disable-av1" >> .mozconfig
 %endif
 
 echo "ac_add_options --disable-strip" >> .mozconfig
@@ -837,6 +839,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 - Mozilla stable release 68.4.0ESR
 - Test build for ARM and s390x
 - Patched for mzbz#1526653 to disable wasm on ARM
+- Add --disable-av1 build option for ARM
 
 * Fri Jan 03 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-0.2.rc1.rh1
 - New rebuild of source archive (extensions updated)

From 9086c49c7863103ade825ba739630d26a09484d9 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 8 Jan 2020 20:18:44 +0100
Subject: [PATCH 096/473] Release build

---
 icecat.spec | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index be26d88..1d62e52 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,5 +1,5 @@
 # Set to true if it's going to be submitted as update
-%global release_build 0
+%global release_build 1
 
 # Set to true if it's going to be submitted as release candidate
 %global release_candidate 0
@@ -80,11 +80,6 @@
 # Use clang?
 %global build_with_clang  0
 
-# Exclude ARM builds for rhbz #1658940
-#ExcludeArch: %%{arm}
-# Disabled due to https://pagure.io/fedora-infrastructure/issue/7581
-#ExcludeArch: s390x
-
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
 %global redhat_ver rh2
@@ -103,7 +98,7 @@
 
 Name: icecat
 Version: 68.4.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -835,6 +830,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Wed Jan 08 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-2.rh2
+- Mozilla stable release 68.4.0ESR (release build)
+
 * Tue Jan 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-1.rh2.test
 - Mozilla stable release 68.4.0ESR
 - Test build for ARM and s390x

From 8841e528d62c079608dc2a1807c8ceeba27b8e05 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 8 Jan 2020 20:24:21 +0100
Subject: [PATCH 097/473] Release build| Fix description

---
 icecat.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 1d62e52..abc9cc3 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -309,8 +309,8 @@ Extensions included to this version of IceCat:
    and disable the ones more prone to break websites
 
  * LibreJS
-   GNU LibreJS aims to address the JavaScript problem described in Richard
-   Stallman's article The JavaScript Trap
+   GNU LibreJS aims to address the JavaScript problem described in the article
+   "The JavaScript Trap" of Richard Stallman
 
  * LibrifyJS: libgen.me
    Libre replacement for JavaScript blocked by GNU LibreJS on libgen.me

From dde449738aa76e7d0f07343b09e8fc59856d4c7d Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 8 Jan 2020 21:08:20 +0100
Subject: [PATCH 098/473] Release build| ARM excluded

---
 icecat.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index abc9cc3..6e0eab6 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -4,6 +4,9 @@
 # Set to true if it's going to be submitted as release candidate
 %global release_candidate 0
 
+# Exclude ARM builds for rhbz #1658940
+ExcludeArch: %{arm}
+
 # Active/Deactive language files handling
 %global build_langpacks 1
 

From 055c49058178a929b868ea446f06ed82c10b27ce Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 11 Jan 2020 19:15:13 +0100
Subject: [PATCH 099/473] Mozilla release 68.4.1ESR

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 13 ++++++++-----
 sources                 |  4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 25c57fb..f974c4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,5 @@
 /icecat-68.4.0-rh1.tar.bz2
 /icecat-68.4.0-langpacks.tar.gz
 /icecat-68.4.0-rh2.tar.bz2
+/icecat-68.4.1-langpacks.tar.gz
+/icecat-68.4.1-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index a3c7bd5..3d45192 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=68.4.0
+VERSION=68.4.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 6e0eab6..567316d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -85,7 +85,7 @@ ExcludeArch: %{arm}
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh2
+%global redhat_ver rh1
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -100,8 +100,8 @@ ExcludeArch: %{arm}
 %endif
 
 Name: icecat
-Version: 68.4.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 68.4.1
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -833,11 +833,14 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Sat Jan 11 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.1-1.rh1
+- Mozilla release 68.4.1ESR (release build)
+
 * Wed Jan 08 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-2.rh2
-- Mozilla stable release 68.4.0ESR (release build)
+- Mozilla release 68.4.0ESR (release build)
 
 * Tue Jan 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-1.rh2.test
-- Mozilla stable release 68.4.0ESR
+- Mozilla release 68.4.0ESR
 - Test build for ARM and s390x
 - Patched for mzbz#1526653 to disable wasm on ARM
 - Add --disable-av1 build option for ARM
diff --git a/sources b/sources
index 3fd45cb..efd798b 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
-SHA512 (icecat-68.4.0-langpacks.tar.gz) = e7bedd13dd1e381c54d425f2af0b80a70c28cb911794efc91ee94e66097cf135764bd1809bc7063e132e50a1bf05775522470f25359b82be0f18b59ea4b9d36a
-SHA512 (icecat-68.4.0-rh2.tar.bz2) = e2b952e2187e27b344788810c3053a6be08f7495ae312d03328cbbd126f8c4d7d16e99dc60698c7488979c26f93d00b5fdd22bdec1d83a762fba2568665216a5
+SHA512 (icecat-68.4.1-langpacks.tar.gz) = 2a931ba00c9ec6dba7b3f311963e528b9c1d59dfde0a5c28656c4a4b7745690933852264f1fb1c3d631030bf675e8414fbddaaf97de82de3ee5267e1e0e54092
+SHA512 (icecat-68.4.1-rh1.tar.bz2) = c789bebabe39461179194b949413d6f0cfcac14346d099ca8314281eb8123d131742a369b41aad6ab081407235ab3a7def2aaadb721bd60dd850cf766ea5d5e2
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From e53c76e18752af644132d884ae4532207c73f87c Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 12 Jan 2020 13:03:28 +0100
Subject: [PATCH 100/473] Remove Changelog.IceCat file

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 567316d..f89827a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -789,7 +789,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %else
 %files
 %endif
-%doc Changelog.IceCat README.* AUTHORS
+%doc README.* AUTHORS
 %license LICENSE LEGAL COPYING-*
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop

From 99de7eafbe70b252626d142ace7f5a9c30bb05f1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jan 2020 05:14:21 +0000
Subject: [PATCH 101/473] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 icecat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index f89827a..9b7e9e5 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -101,7 +101,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 68.4.1
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -833,6 +833,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 68.4.1-2.rh1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Sat Jan 11 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.1-1.rh1
 - Mozilla release 68.4.1ESR (release build)
 

From 4590edc6c6f495e955d82514bbd6d856dfee6244 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 7 Feb 2020 16:22:48 +0100
Subject: [PATCH 102/473] Undefine strict symbol checks on s390x

---
 icecat.spec | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 9b7e9e5..d2788e9 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -7,6 +7,12 @@
 # Exclude ARM builds for rhbz #1658940
 ExcludeArch: %{arm}
 
+# /usr/bin/ld: libxul.so: hidden symbol
+# https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md
+%ifarch s390x
+%undefine _strict_symbol_defs_build
+%endif
+
 # Active/Deactive language files handling
 %global build_langpacks 1
 
@@ -835,6 +841,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %changelog
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 68.4.1-2.rh1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+- Undefine strict symbol checks on s390x
 
 * Sat Jan 11 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.1-1.rh1
 - Mozilla release 68.4.1ESR (release build)

From 95a13976753f9979f17e721cbbaa634875032c96 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 7 Feb 2020 22:10:41 +0100
Subject: [PATCH 103/473] Undo latest change| Set opt flags on s390x

---
 icecat.spec | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index d2788e9..1a5f02b 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -7,12 +7,6 @@
 # Exclude ARM builds for rhbz #1658940
 ExcludeArch: %{arm}
 
-# /usr/bin/ld: libxul.so: hidden symbol
-# https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md
-%ifarch s390x
-%undefine _strict_symbol_defs_build
-%endif
-
 # Active/Deactive language files handling
 %global build_langpacks 1
 
@@ -487,15 +481,17 @@ echo "ac_add_options --enable-debug" >> .mozconfig
 echo "ac_add_options --disable-optimize" >> .mozconfig
 echo "ac_add_options --enable-dtrace" >> .mozconfig
 %else
-%define optimize_flags "none"
-# Fedora with GCC-7 needs to disable default build flags (mozbz#1342344)
+%global optimize_flags "none"
 %ifnarch s390x
 %define optimize_flags "-g -O2"
 %endif
-%ifarch %{arm} s390x
+%ifarch %{arm}
 # ARMv7 need that (rhbz#1426850)
 %define optimize_flags "-g -O2 -fno-schedule-insns"
 %endif
+%ifarch s390x
+%define optimize_flags "-g1 -O1 -fno-schedule-insns"
+%endif
 %ifarch ppc64le aarch64
 %define optimize_flags "-g -O2"
 %endif
@@ -611,7 +607,7 @@ export RUSTFLAGS="-Cdebuginfo=0"
 export MOZ_RUST_DEFAULT_FLAGS="-Cdebuginfo=0 -Copt-level=0"
 %endif
 export CFLAGS=$MOZ_OPT_FLAGS
-export CXXFLAGS="$MOZ_OPT_FLAGS"
+export CXXFLAGS=$MOZ_OPT_FLAGS
 export LDFLAGS=$MOZ_LINK_FLAGS
 
 export PREFIX='%{_prefix}'

From c580e516c99a1cfaa72699c0356ba2d19fd1bdc3 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 10 Feb 2020 19:44:39 +0100
Subject: [PATCH 104/473] Mozilla release 68.5.0ESR (Mozilla release)

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.appdata.xml      | 8 ++++----
 icecat.spec             | 7 +++++--
 sources                 | 4 ++--
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index f974c4e..f0fdb4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,3 +101,5 @@
 /icecat-68.4.0-rh2.tar.bz2
 /icecat-68.4.1-langpacks.tar.gz
 /icecat-68.4.1-rh1.tar.bz2
+/icecat-68.5.0-langpacks.tar.gz
+/icecat-68.5.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 3d45192..c2f2255 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=68.4.1
+VERSION=68.5.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.appdata.xml b/icecat.appdata.xml
index 7cc9151..e6d0036 100644
--- a/icecat.appdata.xml
+++ b/icecat.appdata.xml
@@ -74,16 +74,16 @@
   <url type="homepage">http://www.gnu.org/software/gnuzilla/</url>
   <screenshots>
     <screenshot type="default">
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat68-1.png</image>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat681.png</image>
     </screenshot>
     <screenshot>
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat68-2.png</image>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat682.png</image>
     </screenshot>
     <screenshot>
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat68-3.png</image>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat683.png</image>
     </screenshot>
     <screenshot>
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat68-4.png</image>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat684.png</image>
     </screenshot>
   </screenshots>
   <updatecontact>sagitter_at_fedoraproject.org</updatecontact>
diff --git a/icecat.spec b/icecat.spec
index 1a5f02b..1dcd4cf 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -100,8 +100,8 @@ ExcludeArch: %{arm}
 %endif
 
 Name: icecat
-Version: 68.4.1
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 68.5.0
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -835,6 +835,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Mon Feb 10 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.5.0-1.rh1
+- Mozilla release 68.5.0ESR (Mozilla release)
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 68.4.1-2.rh1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 - Undefine strict symbol checks on s390x
diff --git a/sources b/sources
index efd798b..401beee 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
-SHA512 (icecat-68.4.1-langpacks.tar.gz) = 2a931ba00c9ec6dba7b3f311963e528b9c1d59dfde0a5c28656c4a4b7745690933852264f1fb1c3d631030bf675e8414fbddaaf97de82de3ee5267e1e0e54092
-SHA512 (icecat-68.4.1-rh1.tar.bz2) = c789bebabe39461179194b949413d6f0cfcac14346d099ca8314281eb8123d131742a369b41aad6ab081407235ab3a7def2aaadb721bd60dd850cf766ea5d5e2
+SHA512 (icecat-68.5.0-langpacks.tar.gz) = 267ab3d3db6aa9b09d168696579527bf026ffb2cca717e56afa3f8b195d1a21fa34bfeff4df147de2fe535fd1bd78fccee57c474755125127bb284aa5c3b391a
+SHA512 (icecat-68.5.0-rh1.tar.bz2) = 451658de72bf473866ee7fe79d5f3700605bdf33712d318d8eae8578e38ebda1fd3de8be8ca9b66daeeb0c5495592e103f50c102566ecd0c1b6c0a516791c7be
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 08daf9d33073bcc5bd587114a3bc6c2902256ea1 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 7 Mar 2020 19:35:53 +0100
Subject: [PATCH 105/473] Mozilla release candidate 68.6.0ESR

---
 .gitignore              |  1 +
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 16 +++++++---------
 sources                 |  3 +--
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index f0fdb4f..8b1203f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,4 @@
 /icecat-68.4.1-rh1.tar.bz2
 /icecat-68.5.0-langpacks.tar.gz
 /icecat-68.5.0-rh1.tar.bz2
+/icecat-68.6.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index c2f2255..324946f 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=68.5.0
+VERSION=68.6.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 1dcd4cf..9c2c4ef 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -2,13 +2,13 @@
 %global release_build 1
 
 # Set to true if it's going to be submitted as release candidate
-%global release_candidate 0
+%global release_candidate 1
 
 # Exclude ARM builds for rhbz #1658940
 ExcludeArch: %{arm}
 
 # Active/Deactive language files handling
-%global build_langpacks 1
+%global build_langpacks 0
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
@@ -33,12 +33,7 @@ ExcludeArch: %{arm}
 %endif
 
 # Use system sqlite?
-# sqlite > 3.28.0 unavailable on Fedora < 31
-%if 0%{?fedora} < 31
-%global system_sqlite 0
-%else
 %global system_sqlite 1
-%endif
 
 %if 0%{?system_sqlite}
 %global sqlite_version 3.28.0
@@ -100,8 +95,8 @@ ExcludeArch: %{arm}
 %endif
 
 Name: icecat
-Version: 68.5.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 68.6.0
+Release: 0.1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -835,6 +830,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Sat Mar 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-0.1.rc1.rh1
+- Mozilla release candidate 68.6.0ESR
+
 * Mon Feb 10 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.5.0-1.rh1
 - Mozilla release 68.5.0ESR (Mozilla release)
 
diff --git a/sources b/sources
index 401beee..e4e9cff 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
-SHA512 (icecat-68.5.0-langpacks.tar.gz) = 267ab3d3db6aa9b09d168696579527bf026ffb2cca717e56afa3f8b195d1a21fa34bfeff4df147de2fe535fd1bd78fccee57c474755125127bb284aa5c3b391a
-SHA512 (icecat-68.5.0-rh1.tar.bz2) = 451658de72bf473866ee7fe79d5f3700605bdf33712d318d8eae8578e38ebda1fd3de8be8ca9b66daeeb0c5495592e103f50c102566ecd0c1b6c0a516791c7be
+SHA512 (icecat-68.6.0-rh1.tar.bz2) = 30e6074bf11ea4813c13810ee19039e2101499ff0af0b75d83ca1b11f6b65258c9280e369b78b01be7570507ec48441c00714258fbc298256f16b7b2553fa7a5
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 7aca9891f411e67ea22c195ba68d151d1e1e8f58 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 10 Mar 2020 18:31:03 +0100
Subject: [PATCH 106/473] Mozilla release 68.6.0ESR

---
 .gitignore  |  2 ++
 icecat.spec | 15 +++++++++------
 sources     |  3 ++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8b1203f..6092c21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,3 +104,5 @@
 /icecat-68.5.0-langpacks.tar.gz
 /icecat-68.5.0-rh1.tar.bz2
 /icecat-68.6.0-rh1.tar.bz2
+/icecat-68.6.0-langpacks.tar.gz
+/icecat-68.6.0-rh2.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index 9c2c4ef..7415402 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -2,13 +2,13 @@
 %global release_build 1
 
 # Set to true if it's going to be submitted as release candidate
-%global release_candidate 1
+%global release_candidate 0
 
 # Exclude ARM builds for rhbz #1658940
 ExcludeArch: %{arm}
 
 # Active/Deactive language files handling
-%global build_langpacks 0
+%global build_langpacks 1
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
@@ -50,7 +50,7 @@ ExcludeArch: %{arm}
 %if 0%{?system_nss}
 %global nspr_version 4.21
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.45
+%global nss_version 3.50
 %global nss_build_version %{nss_version}
 %endif
 
@@ -61,7 +61,7 @@ ExcludeArch: %{arm}
 
 %global with_vpx 1
 %if 0%{?with_vpx}
-%global libvpx_version 1.4.0	
+%global libvpx_version 1.8.2
 %endif
 
 %if 0%{?fedora} > 30
@@ -80,7 +80,7 @@ ExcludeArch: %{arm}
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh1
+%global redhat_ver rh2
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 68.6.0
-Release: 0.1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -830,6 +830,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Tue Mar 10 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-1.rh2
+- Mozilla release 68.6.0ESR
+
 * Sat Mar 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-0.1.rc1.rh1
 - Mozilla release candidate 68.6.0ESR
 
diff --git a/sources b/sources
index e4e9cff..1415722 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
-SHA512 (icecat-68.6.0-rh1.tar.bz2) = 30e6074bf11ea4813c13810ee19039e2101499ff0af0b75d83ca1b11f6b65258c9280e369b78b01be7570507ec48441c00714258fbc298256f16b7b2553fa7a5
+SHA512 (icecat-68.6.0-langpacks.tar.gz) = acddb20eb433f56f8ec6a33c5b198dedc1736a1816260930f8f07dea8601bb2a6b15764b6a134934663ddd5c5c0dccca0201a6161c3853074a9e27b41fc2aa51
+SHA512 (icecat-68.6.0-rh2.tar.bz2) = 752ec3fd6e2bec0408d45a49555fcf1ffa540dbb34e85ac0d7837b9317bfeb4d714c485810ca0ae0f28957dcce2b810160b585511e66ba8d0d02262fdfc353c3
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 88eae5901641d2f6d4b781e063d84f7c81589d12 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 11 Mar 2020 11:28:02 +0100
Subject: [PATCH 107/473] Remove useless build dependency

---
 icecat.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 7415402..2794fc3 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 68.6.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -227,7 +227,6 @@ BuildRequires: intltool
 BuildRequires: libappstream-glib
 BuildRequires: libevent-devel
 BuildRequires: libicu-devel
-BuildRequires: libIDL-devel
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libX11-devel
@@ -780,6 +779,7 @@ end
 
 %check
 appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
 %if 0%{?build_langpacks}
 %files -f %{name}.lang
@@ -830,6 +830,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %endif
 
 %changelog
+* Wed Mar 11 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-2.rh2
+- Remove useless build dependency
+
 * Tue Mar 10 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-1.rh2
 - Mozilla release 68.6.0ESR
 

From 28c6e64f8d5ed0a74773ea511a11c802bc91616b Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 21 Mar 2020 14:15:38 +0100
Subject: [PATCH 108/473] HTTPS-everywhere updated to the 2020.3.16

---
 .gitignore  |  1 +
 icecat.spec | 10 +++++++---
 sources     |  2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6092c21..05a64d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,3 +106,4 @@
 /icecat-68.6.0-rh1.tar.bz2
 /icecat-68.6.0-langpacks.tar.gz
 /icecat-68.6.0-rh2.tar.bz2
+/icecat-68.6.0-rh3.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index 2794fc3..9f4dc8c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -80,7 +80,7 @@ ExcludeArch: %{arm}
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh2
+%global redhat_ver rh3
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 68.6.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -106,7 +106,7 @@ URL:   http://www.gnu.org/software/gnuzilla/
 ## Source archive created by scripts based on Gnuzilla files.
 ## Modified files are hosted in a dedicated fork repository:
 ## https://gitlab.com/anto.trande/icecat
-Source0: https://sagitter.fedorapeople.org/%{name}/v%{version}/%{name}-%{version}-%{redhat_ver}.tar.bz2
+Source0: %{name}-%{version}-%{redhat_ver}.tar.bz2
 
 Source2: %{name}.png
 Source3: %{name}-mozconfig-common
@@ -830,6 +830,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Sat Mar 21 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-3.rh3
+- Source code archive regenerated
+- HTTPS-everywhere updated to the 2020.3.16
+
 * Wed Mar 11 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-2.rh2
 - Remove useless build dependency
 
diff --git a/sources b/sources
index 1415722..2a984f8 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
 SHA512 (icecat-68.6.0-langpacks.tar.gz) = acddb20eb433f56f8ec6a33c5b198dedc1736a1816260930f8f07dea8601bb2a6b15764b6a134934663ddd5c5c0dccca0201a6161c3853074a9e27b41fc2aa51
-SHA512 (icecat-68.6.0-rh2.tar.bz2) = 752ec3fd6e2bec0408d45a49555fcf1ffa540dbb34e85ac0d7837b9317bfeb4d714c485810ca0ae0f28957dcce2b810160b585511e66ba8d0d02262fdfc353c3
+SHA512 (icecat-68.6.0-rh3.tar.bz2) = 9c7517e3c37e11c035cab49ae40fb7517965060d9c9c6deeec3ce039cf1b91ebe49f9f02ddfc100d3ab3fabb887b8fc8d89c79f2a63c2a67cb7f7ef713fde33f
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 4a62320b8dab9dca06e2fb76f1fdc883db851a41 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 21 Mar 2020 14:44:00 +0100
Subject: [PATCH 109/473] Update icecat.rpmlintrc

---
 icecat.rpmlintrc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
index 4d7dde1..845802b 100644
--- a/icecat.rpmlintrc
+++ b/icecat.rpmlintrc
@@ -1,7 +1,7 @@
 # Whitelisting errors
 # https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
 # https://src.fedoraproject.org/rpms/python3/blob/master/f/python3.rpmlintrc
-# Edited by sagitter (sagitter AT fedoraproject dot org)
+# Edited by sagitter (sagitter@fedoraproject.org)
 
 # KNOWN BUGS:
 #
@@ -15,10 +15,14 @@ addFilter(r'(%ifarch-applied-patch) Patch*')
 # Different file size due to the signature of the source code tarbz archive
 addFilter(r'file-size-mismatch')
 
+addFilter(r'(invalid-url) Source0')
 addFilter(r'(invalid-url) Source4')
 addFilter(r'(invalid-url) Source5')
 addFilter(r'(invalid-url) Source17')
 
+addFilter(r'(strange-permission) icecat-lang_download.sh')
+addFilter(r'(strange-permission) node-stdout-nonblocking-wrapper')
+
 # ERRORS:
 ##### RPMs  #####
 
@@ -31,8 +35,10 @@ addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib(64)?/icecat/libxu
 addFilter(r'(zero-length) /usr/lib(64)?/icecat/chrome.manifest')
 addFilter(r'(zero-length) /usr/lib(64)?/icecat/browser/chrome.manifest')
 
-addFilter(r'E:library-not-linked-against-libc /usr/lib(64)?/icecat/gtk2/libmozgtk.so')
-addFilter(r'E:library-not-linked-against-libc /usr/lib(64)?/icecat/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib64/icecat/gtk2/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib64/icecat/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib/icecat/gtk2/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib/icecat/libmozgtk.so')
 
 # False positive
 addFilter(r'(dangling-symlink) /usr/lib(64)?/icecat/dictionaries /usr/share/myspell')

From dd11b19128b8207b70930cf4b314d3c8d0683cb1 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 21 Mar 2020 19:57:17 +0100
Subject: [PATCH 110/473] Other changes of icecat.rpmlintrc

---
 icecat.rpmlintrc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
index 845802b..562f383 100644
--- a/icecat.rpmlintrc
+++ b/icecat.rpmlintrc
@@ -27,8 +27,10 @@ addFilter(r'(strange-permission) node-stdout-nonblocking-wrapper')
 ##### RPMs  #####
 
 # chroot function (??)
-addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib(64)?/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib(64)?/icecat/libxul.so')
+addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib64/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib64/icecat/libxul.so')
+addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib/icecat/libxul.so')
 
 # Expected on FF browser
 # https://support.mozilla.org/en-US/questions/1045418

From 459bd130dbcc40d15dbd723418902c464915c7c3 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 29 Mar 2020 12:49:59 +0200
Subject: [PATCH 111/473] =?UTF-8?q?Remove=20LibGen=20extension=20as=20infr?=
 =?UTF-8?q?inging=20the=20Mozilla=E2=80=99s=20Digital=20Millennium=20Copyr?=
 =?UTF-8?q?ight?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore  | 1 +
 icecat.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 05a64d9..fb420d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,3 +107,4 @@
 /icecat-68.6.0-langpacks.tar.gz
 /icecat-68.6.0-rh2.tar.bz2
 /icecat-68.6.0-rh3.tar.bz2
+/icecat-68.6.0-rh4.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index 9f4dc8c..ddd208f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -80,7 +80,7 @@ ExcludeArch: %{arm}
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh3
+%global redhat_ver rh4
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 68.6.0
-Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 4%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -830,6 +830,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Sun Mar 29 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-4.rh4
+- Remove libgen addon
+
 * Sat Mar 21 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-3.rh3
 - Source code archive regenerated
 - HTTPS-everywhere updated to the 2020.3.16
diff --git a/sources b/sources
index 2a984f8..01b2d7f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
 SHA512 (icecat-68.6.0-langpacks.tar.gz) = acddb20eb433f56f8ec6a33c5b198dedc1736a1816260930f8f07dea8601bb2a6b15764b6a134934663ddd5c5c0dccca0201a6161c3853074a9e27b41fc2aa51
-SHA512 (icecat-68.6.0-rh3.tar.bz2) = 9c7517e3c37e11c035cab49ae40fb7517965060d9c9c6deeec3ce039cf1b91ebe49f9f02ddfc100d3ab3fabb887b8fc8d89c79f2a63c2a67cb7f7ef713fde33f
+SHA512 (icecat-68.6.0-rh4.tar.bz2) = 2615042197fe8b9a1c74bc39d6d91511c94660143209644ab075021f559e7fe205dd35183d6449e35125bad87d109dc0c9d3c967fc285ad74ccca74adeee31f9
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 616d4c54954900c6f0f0b4df3dbc3ffa7dae1a78 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 7 Apr 2020 12:36:18 +0200
Subject: [PATCH 112/473] Mozilla release 68.7.0ESR

---
 .gitignore                          |   3 +++
 build-cacheFlush-missing.patch      |  13 -------------
 build-jit-atomic-always-lucky.patch |  12 ------------
 build-rust-ppc64le.patch            |  25 -------------------------
 icecat-lang_download.sh             |   2 +-
 icecat.png                          | Bin 181551 -> 0 bytes
 icecat.spec                         |  17 ++++++-----------
 sources                             |   5 +++--
 8 files changed, 13 insertions(+), 64 deletions(-)
 delete mode 100644 build-cacheFlush-missing.patch
 delete mode 100644 build-jit-atomic-always-lucky.patch
 delete mode 100644 build-rust-ppc64le.patch
 delete mode 100644 icecat.png

diff --git a/.gitignore b/.gitignore
index fb420d0..7d16b5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,3 +108,6 @@
 /icecat-68.6.0-rh2.tar.bz2
 /icecat-68.6.0-rh3.tar.bz2
 /icecat-68.6.0-rh4.tar.bz2
+/icecat-68.7.0-langpacks.tar.gz
+/icecat-68.7.0-rh1.tar.bz2
+/icecat.png
diff --git a/build-cacheFlush-missing.patch b/build-cacheFlush-missing.patch
deleted file mode 100644
index 51c368c..0000000
--- a/build-cacheFlush-missing.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up firefox-55.0.3/js/src/jit/ExecutableAllocator.h.wasm firefox-55.0.3/js/src/jit/ExecutableAllocator.h
---- firefox-55.0.3/js/src/jit/ExecutableAllocator.h.wasm	2017-09-05 11:32:12.235909468 +0200
-+++ firefox-55.0.3/js/src/jit/ExecutableAllocator.h	2017-09-05 11:32:46.157916575 +0200
-@@ -219,7 +219,7 @@ class ExecutableAllocator
- 
-     static void poisonCode(JSRuntime* rt, JitPoisonRangeVector& ranges);
- 
--#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) || defined(JS_SIMULATOR_ARM64)
-+#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) || defined(JS_SIMULATOR_ARM64) || defined(JS_CODEGEN_NONE)
-     static void cacheFlush(void*, size_t)
-     {
-     }
-diff -up firefox-55.0.3/js/src/jit-test/tests/wasm/bench/wasm_box2d.wasm firefox-55.0.3/js/src/jit-test/tests/wasm/bench/wasm_box2d
diff --git a/build-jit-atomic-always-lucky.patch b/build-jit-atomic-always-lucky.patch
deleted file mode 100644
index d693d0c..0000000
--- a/build-jit-atomic-always-lucky.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-68.0.2/js/src/jit/AtomicOperations.h.jit-atomic-lucky firefox-60.5.0/js/src/jit/AtomicOperations.h
---- firefox-68.0.2/js/src/jit/AtomicOperations.h.jit-atomic-lucky	2019-01-22 10:20:27.993697161 +0100
-+++ firefox-68.0.2/js/src/jit/AtomicOperations.h	2019-01-22 10:23:15.337873762 +0100
-@@ -394,7 +394,7 @@
-     defined(__sh__) || defined(__s390__) || defined(__s390x__)
- #  include "jit/shared/AtomicOperations-feeling-lucky.h"
- #else
--#  error "No AtomicOperations support provided for this platform"
-+#include "jit/none/AtomicOperations-feeling-lucky.h"
- #endif
- 
- #endif  // jit_AtomicOperations_h
diff --git a/build-rust-ppc64le.patch b/build-rust-ppc64le.patch
deleted file mode 100644
index 2474c35..0000000
--- a/build-rust-ppc64le.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up firefox-55.0/build/moz.configure/rust.configure.rust-ppc64le firefox-55.0/build/moz.configure/rust.configure
---- firefox-55.0/build/moz.configure/rust.configure.rust-ppc64le	2017-07-31 18:20:49.000000000 +0200
-+++ firefox-55.0/build/moz.configure/rust.configure	2017-08-02 10:19:03.254220003 +0200
-@@ -151,6 +151,9 @@ def rust_triple_alias(host_or_target):
-             ('sparc64', 'Linux'): 'sparc64-unknown-linux-gnu',
-             ('x86', 'Linux'): 'i686-unknown-linux-gnu',
-             ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu',
-+            ('ppc64le', 'Linux'): 'powerpc64le-unknown-linux-gnu',
-+            ('ppc64', 'Linux'): 'powerpc64-unknown-linux-gnu',
-+            ('s390x', 'Linux'): 's390x-unknown-linux-gnu',
-             # OS X
-             ('x86', 'OSX'): 'i686-apple-darwin',
-             ('x86_64', 'OSX'): 'x86_64-apple-darwin',
-@@ -174,8 +177,10 @@ def rust_triple_alias(host_or_target):
-             ('sparc64', 'SunOS'): 'sparcv9-sun-solaris',
-         }.get((host_or_target.cpu, os_or_kernel), None)
- 
-+        if (rustc_target == 'powerpc64-unknown-linux-gnu' and host_or_target.endianness == 'little'):
-+           rustc_target = 'powerpc64le-unknown-linux-gnu'
-         if rustc_target is None:
--            die("Don't know how to translate {} for rustc".format(host_or_target.alias))
-+            die("Don't know how to translate {} for rustc, cpu: {}, os: {}".format(target.alias, target.cpu, os_or_kernel))
- 
-         # Check to see whether our rustc has a reasonably functional stdlib
-         # for our chosen target.
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 324946f..6dcc9d1 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=68.6.0
+VERSION=68.7.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.png b/icecat.png
deleted file mode 100644
index aac883edb30254d3193e50838f5d665cb225b8f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 181551
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

diff --git a/icecat.spec b/icecat.spec
index ddd208f..9108ac1 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -80,7 +80,7 @@ ExcludeArch: %{arm}
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh4
+%global redhat_ver rh1
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -95,8 +95,8 @@ ExcludeArch: %{arm}
 %endif
 
 Name: icecat
-Version: 68.6.0
-Release: 4%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 68.7.0
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -144,7 +144,6 @@ Source18: node-stdout-nonblocking-wrapper
 Patch1: %{name}-fix_addon_installation.patch
 Patch2: %{name}-libevent_linkflag.patch
 Patch3: mozilla-build-arm.patch
-Patch4: build-rust-ppc64le.patch
 Patch5: rhbz-1219542-s390-build.patch
 
 # Unrecognized file?
@@ -155,13 +154,6 @@ Patch8: %{name}-fix_installer.patch
 
 Patch26: %{name}-68.4.0-build-icu-big-endian.patch
 
-# Always feel lucky for unsupported platforms:
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
-Patch37: build-jit-atomic-always-lucky.patch
-
-# Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x)
-Patch38: build-cacheFlush-missing.patch
-
 Patch40: build-aarch64-skia.patch
 Patch41: build-disable-elfhack.patch
 Patch44: build-arm-libopus.patch
@@ -830,6 +822,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Tue Apr 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.7.0-1.rh1
+- Mozilla release 68.7.0ESR
+
 * Sun Mar 29 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-4.rh4
 - Remove libgen addon
 
diff --git a/sources b/sources
index 01b2d7f..c9d6412 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
-SHA512 (icecat-68.6.0-langpacks.tar.gz) = acddb20eb433f56f8ec6a33c5b198dedc1736a1816260930f8f07dea8601bb2a6b15764b6a134934663ddd5c5c0dccca0201a6161c3853074a9e27b41fc2aa51
-SHA512 (icecat-68.6.0-rh4.tar.bz2) = 2615042197fe8b9a1c74bc39d6d91511c94660143209644ab075021f559e7fe205dd35183d6449e35125bad87d109dc0c9d3c967fc285ad74ccca74adeee31f9
+SHA512 (icecat-68.7.0-langpacks.tar.gz) = 93a9fa9aa6b22e8a151b80e19144c806aa5ce156f9179c808ec4b6a4156ca3e2306428f84efbd5ccf65cee4d3853625b6306c2b939e5a3dc002306c610e826ef
+SHA512 (icecat-68.7.0-rh1.tar.bz2) = a9575170b4f4b44992f3cfdd0d15e762aae74a885905039296446b0efec00ad8798900a71a16f560d0d50e0c8669b9d40f2f65fd4c21ecd0e953c36b84611220
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
+SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From b6a408142470849847d31ff505793c982e3cc52d Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 4 May 2020 19:03:50 +0200
Subject: [PATCH 113/473] Mozilla release 68.8.0ESR

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 6 ++++--
 sources                 | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7d16b5f..d6eb261 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,3 +111,5 @@
 /icecat-68.7.0-langpacks.tar.gz
 /icecat-68.7.0-rh1.tar.bz2
 /icecat.png
+/icecat-68.8.0-langpacks.tar.gz
+/icecat-68.8.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 6dcc9d1..a1eced1 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=68.7.0
+VERSION=68.8.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 9108ac1..80fab44 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -95,7 +95,7 @@ ExcludeArch: %{arm}
 %endif
 
 Name: icecat
-Version: 68.7.0
+Version: 68.8.0
 Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -179,7 +179,6 @@ Patch425: mozilla-1568569.patch
 
 # Wayland specific upstream patches
 Patch565: firefox-pipewire.patch
-
 Patch575: mozilla-1548475.patch
 Patch576: mozilla-1562827.patch
 Patch578: mozilla-1567434-1.patch
@@ -822,6 +821,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Mon May 04 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-1.rh1
+- Mozilla release 68.8.0ESR
+
 * Tue Apr 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.7.0-1.rh1
 - Mozilla release 68.7.0ESR
 
diff --git a/sources b/sources
index c9d6412..12b95e5 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
-SHA512 (icecat-68.7.0-langpacks.tar.gz) = 93a9fa9aa6b22e8a151b80e19144c806aa5ce156f9179c808ec4b6a4156ca3e2306428f84efbd5ccf65cee4d3853625b6306c2b939e5a3dc002306c610e826ef
-SHA512 (icecat-68.7.0-rh1.tar.bz2) = a9575170b4f4b44992f3cfdd0d15e762aae74a885905039296446b0efec00ad8798900a71a16f560d0d50e0c8669b9d40f2f65fd4c21ecd0e953c36b84611220
+SHA512 (icecat-68.8.0-langpacks.tar.gz) = fafce5b6cfe3ce9bc575bfea8e0b940360b87f16f9914d6e9b84ae907ed7cfa2df09980eca603fb40c5e9ee525b92b48e32b9b3fc4f4902ccaa35c21ab62a083
+SHA512 (icecat-68.8.0-rh1.tar.bz2) = f476f42425aa155de82544684f3d10555f4e791af6a918d56d97f967fb6b97ad82d062c70e66e1e9594b9348711831ff8326a8768d4d7410f21a88bc3cbaf4d3
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 193748f027244abfd858921d89e096ef9ef615d3 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 5 May 2020 12:08:28 +0200
Subject: [PATCH 114/473] Exclude s390x architecture

---
 icecat.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 80fab44..6f4c73d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -5,7 +5,8 @@
 %global release_candidate 0
 
 # Exclude ARM builds for rhbz #1658940
-ExcludeArch: %{arm}
+# Exclude s390x for https://pagure.io/koji/issue/1974
+ExcludeArch: %{arm} s390x
 
 # Active/Deactive language files handling
 %global build_langpacks 1
@@ -821,8 +822,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
-* Mon May 04 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-1.rh1
+* Tue May 05 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-1.rh1
 - Mozilla release 68.8.0ESR
+- Exclude s390x architecture
 
 * Tue Apr 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.7.0-1.rh1
 - Mozilla release 68.7.0ESR

From a56fbdc2bad14bac58869d04715ce1aa14f24ed5 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 5 May 2020 12:15:48 +0200
Subject: [PATCH 115/473] Exclude aarch64 architecture on Fedora 32
 (rhbz#1830472)

---
 icecat.spec | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 6f4c73d..297f898 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -8,6 +8,11 @@
 # Exclude s390x for https://pagure.io/koji/issue/1974
 ExcludeArch: %{arm} s390x
 
+# rhbz #1830472
+%if 0%{?fedora} == 32
+ExcludeArch: aarch64
+%endif
+
 # Active/Deactive language files handling
 %global build_langpacks 1
 
@@ -825,6 +830,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 * Tue May 05 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-1.rh1
 - Mozilla release 68.8.0ESR
 - Exclude s390x architecture
+- Exclude aarch64 architecture on Fedora 32 (rhbz#1830472)
 
 * Tue Apr 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.7.0-1.rh1
 - Mozilla release 68.7.0ESR

From 99f51d572487732547fe22b23f79a884920a6aa6 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Fri, 8 May 2020 09:13:13 +0100
Subject: [PATCH 116/473] Revert "Exclude aarch64 architecture on Fedora 32
 (rhbz#1830472)"

This reverts commit a56fbdc2bad14bac58869d04715ce1aa14f24ed5.

The gcc should never have been pushed to stable and it's not a reason
to disable an architecture in a package
---
 icecat.spec | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 297f898..6f4c73d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -8,11 +8,6 @@
 # Exclude s390x for https://pagure.io/koji/issue/1974
 ExcludeArch: %{arm} s390x
 
-# rhbz #1830472
-%if 0%{?fedora} == 32
-ExcludeArch: aarch64
-%endif
-
 # Active/Deactive language files handling
 %global build_langpacks 1
 
@@ -830,7 +825,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 * Tue May 05 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-1.rh1
 - Mozilla release 68.8.0ESR
 - Exclude s390x architecture
-- Exclude aarch64 architecture on Fedora 32 (rhbz#1830472)
 
 * Tue Apr 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.7.0-1.rh1
 - Mozilla release 68.7.0ESR

From f8f92b1dfd2cc3a0f93064aaac6df081a8c8d921 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Fri, 8 May 2020 09:18:04 +0100
Subject: [PATCH 117/473] Don't exclude aarch64 architecture as it makes those
 users vulnerable

---
 icecat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 6f4c73d..08387b8 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -97,7 +97,7 @@ ExcludeArch: %{arm} s390x
 
 Name: icecat
 Version: 68.8.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -822,6 +822,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Fri May 08 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 68.8.0-2.rh1
+- Don't exclude aarch64 architecture
+
 * Tue May 05 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-1.rh1
 - Mozilla release 68.8.0ESR
 - Exclude s390x architecture

From c0a3953d72314ff2f65c128e96fa5e4cffc82aa6 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 8 May 2020 11:05:17 +0200
Subject: [PATCH 118/473] Remove libgen references

---
 icecat.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 297f898..c7384d5 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -102,7 +102,7 @@ ExcludeArch: aarch64
 
 Name: icecat
 Version: 68.8.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -306,9 +306,6 @@ Extensions included to this version of IceCat:
    GNU LibreJS aims to address the JavaScript problem described in the article
    "The JavaScript Trap" of Richard Stallman
 
- * LibrifyJS: libgen.me
-   Libre replacement for JavaScript blocked by GNU LibreJS on libgen.me
-
  * HTTPS Everywhere
    HTTPS Everywhere is an extension that encrypts your communications with
    many major websites, making your browsing more secure
@@ -827,6 +824,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Fri May 08 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-2.rh1
+- Remove libgen references
+
 * Tue May 05 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-1.rh1
 - Mozilla release 68.8.0ESR
 - Exclude s390x architecture

From 34109fc0272f2990408c3f4de97eeb48847afe6d Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 8 May 2020 11:12:39 +0200
Subject: [PATCH 119/473] Modify appdata file

---
 icecat.appdata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/icecat.appdata.xml b/icecat.appdata.xml
index e6d0036..7f93010 100644
--- a/icecat.appdata.xml
+++ b/icecat.appdata.xml
@@ -65,10 +65,6 @@
        that the user has not explicitly requested. This implies not downloading feeds, updates, blacklists or any other similar
        data needed during startup.
        </li>
-       <li>
-       LibrifyJS
-          Libre replacement for JavaScript blocked by GNU LibreJS on libgen.me
-       </li>
       </ul>
   </description>
   <url type="homepage">http://www.gnu.org/software/gnuzilla/</url>

From bdc2eac9b4324fbfed0f7300ac868c1ab7945fe7 Mon Sep 17 00:00:00 2001
From: Pete Walter <pwalter@fedoraproject.org>
Date: Sat, 16 May 2020 08:13:20 +0100
Subject: [PATCH 120/473] Rebuild for ICU 67

---
 icecat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 4360e78..1f5802a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -97,7 +97,7 @@ ExcludeArch: %{arm} s390x
 
 Name: icecat
 Version: 68.8.0
-Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 4%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -819,6 +819,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 68.8.0-4.rh1
+- Rebuild for ICU 67
+
 * Fri May 08 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-3.rh1
 - Remove libgen references
 

From 8d64ce2bd80126447908ee50b08af6c7ffe5bfd2 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 16 May 2020 11:26:01 +0200
Subject: [PATCH 121/473] Unify last changes into same build release

---
 icecat.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 1f5802a..ebad2b6 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -97,7 +97,7 @@ ExcludeArch: %{arm} s390x
 
 Name: icecat
 Version: 68.8.0
-Release: 4%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -819,10 +819,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
-* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 68.8.0-4.rh1
+* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 68.8.0-3.rh1
 - Rebuild for ICU 67
-
-* Fri May 08 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-3.rh1
 - Remove libgen references
 
 * Fri May 08 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 68.8.0-2.rh1

From fe88e0f2bfa6ab7af6136b3012eca3722c654425 Mon Sep 17 00:00:00 2001
From: Pete Walter <pwalter@fedoraproject.org>
Date: Sat, 16 May 2020 18:11:13 +0100
Subject: [PATCH 122/473] Rebuild for ICU 67

---
 icecat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index ebad2b6..37264a1 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -97,7 +97,7 @@ ExcludeArch: %{arm} s390x
 
 Name: icecat
 Version: 68.8.0
-Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 4%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -819,6 +819,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 68.8.0-4.rh1
+- Rebuild for ICU 67
+
 * Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 68.8.0-3.rh1
 - Rebuild for ICU 67
 - Remove libgen references

From a3622eca8eacc3f07c1f94a10ddd4b9a0f77eb47 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 20 May 2020 19:19:06 +0200
Subject: [PATCH 123/473] Explicit perl-interpreter BR dependency

---
 icecat.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 37264a1..6af9e97 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -65,9 +65,7 @@ ExcludeArch: %{arm} s390x
 %global libvpx_version 1.8.2
 %endif
 
-%if 0%{?fedora} > 30
 %global wayland_backend_default 1
-%endif
 %global disable_elfhack 1
 
 # Use mozilla hardening option?
@@ -97,7 +95,7 @@ ExcludeArch: %{arm} s390x
 
 Name: icecat
 Version: 68.8.0
-Release: 4%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 5%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -247,7 +245,7 @@ BuildRequires: openjpeg-devel
 BuildRequires: pango-devel
 BuildRequires: pipewire-devel
 BuildRequires: python2-devel
-BuildRequires: pkgconfig(gconf-2.0)
+BuildRequires: perl-interpreter
 BuildRequires: pkgconfig(xrender)
 BuildRequires: pkgconfig(libstartup-notification-1.0)
 BuildRequires: pkgconfig(dri)
@@ -819,6 +817,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Wed May 20 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-5.rh1
+- Explicit perl-interpreter BR dependency
+
 * Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 68.8.0-4.rh1
 - Rebuild for ICU 67
 

From dde0ec2e79488ce01510d9123714a7d6bbd4c630 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 28 May 2020 17:37:15 +0200
Subject: [PATCH 124/473] Mozilla release candidate 68.9.0ESR build1

---
 .gitignore  |  1 +
 icecat.spec | 11 +++++++----
 sources     |  3 +--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index d6eb261..0da332d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,3 +113,4 @@
 /icecat.png
 /icecat-68.8.0-langpacks.tar.gz
 /icecat-68.8.0-rh1.tar.bz2
+/icecat-68.9.0-rh1.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index 6af9e97..7f09a1a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -2,14 +2,14 @@
 %global release_build 1
 
 # Set to true if it's going to be submitted as release candidate
-%global release_candidate 0
+%global release_candidate 1
 
 # Exclude ARM builds for rhbz #1658940
 # Exclude s390x for https://pagure.io/koji/issue/1974
 ExcludeArch: %{arm} s390x
 
 # Active/Deactive language files handling
-%global build_langpacks 1
+%global build_langpacks 0
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
@@ -94,8 +94,8 @@ ExcludeArch: %{arm} s390x
 %endif
 
 Name: icecat
-Version: 68.8.0
-Release: 5%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 68.9.0
+Release: 0.1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -817,6 +817,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Thu May 28 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-0.1.rc1.rh1
+- Mozilla release candidate 68.9.0ESR build1
+
 * Wed May 20 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-5.rh1
 - Explicit perl-interpreter BR dependency
 
diff --git a/sources b/sources
index 12b95e5..f974a72 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
-SHA512 (icecat-68.8.0-langpacks.tar.gz) = fafce5b6cfe3ce9bc575bfea8e0b940360b87f16f9914d6e9b84ae907ed7cfa2df09980eca603fb40c5e9ee525b92b48e32b9b3fc4f4902ccaa35c21ab62a083
-SHA512 (icecat-68.8.0-rh1.tar.bz2) = f476f42425aa155de82544684f3d10555f4e791af6a918d56d97f967fb6b97ad82d062c70e66e1e9594b9348711831ff8326a8768d4d7410f21a88bc3cbaf4d3
+SHA512 (icecat-68.9.0-rh1.tar.bz2) = 07e962f022b31d18d305b1d5372eeb1843576d08b6ffcb54421730c7aad2e548e6d3a725fd152bdaa25c1680af1dd1bceee6722acd9e3c7b2671456d14357bac
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From e6acac314e1a0a07287f686b4083e438802d13c6 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 2 Jun 2020 12:50:46 +0200
Subject: [PATCH 125/473] Release 68.9.0-rh2

---
 .gitignore              |  1 +
 icecat-lang_download.sh |  2 +-
 icecat.appdata.xml      | 15 ---------------
 icecat.spec             | 16 +++++++---------
 sources                 |  2 +-
 5 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0da332d..daf1e40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,3 +114,4 @@
 /icecat-68.8.0-langpacks.tar.gz
 /icecat-68.8.0-rh1.tar.bz2
 /icecat-68.9.0-rh1.tar.bz2
+/icecat-68.9.0-rh2.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index a1eced1..98e58f8 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=68.8.0
+VERSION=68.9.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.appdata.xml b/icecat.appdata.xml
index 7f93010..49f4021 100644
--- a/icecat.appdata.xml
+++ b/icecat.appdata.xml
@@ -23,27 +23,12 @@
        Extensions included to this version of IceCat:
     </p>
      <ul>
-       <li>
-       LibreJS
-          GNU LibreJS aims to address the JavaScript problem described in Richard
-          Stallman's article The JavaScript Trap.
-       </li>
-       <li>
-       AboutIceCat
-          Adds a custom "about:icecat" homepage with links to information about the
-          free software and privacy features in IceCat, and check-boxes to enable
-          and disable the ones more prone to break websites.
-       </li>
        <li>
        LibreJS
           GNU LibreJS aims to address the JavaScript problem described in Richard
           Stallman's article The JavaScript Trap
        </li>
        <li>
-       LibrifyJS: libgen.me
-          Libre replacement for JavaScript blocked by GNU LibreJS on libgen.me
-       </li>
-       <li>
        HTTPS Everywhere
           HTTPS Everywhere is an extension that encrypts your communications with many major websites, making your browsing more secure
        </li>
diff --git a/icecat.spec b/icecat.spec
index 7f09a1a..944a481 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -2,7 +2,7 @@
 %global release_build 1
 
 # Set to true if it's going to be submitted as release candidate
-%global release_candidate 1
+%global release_candidate 0
 
 # Exclude ARM builds for rhbz #1658940
 # Exclude s390x for https://pagure.io/koji/issue/1974
@@ -79,7 +79,7 @@ ExcludeArch: %{arm} s390x
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh1
+%global redhat_ver rh2
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -95,7 +95,7 @@ ExcludeArch: %{arm} s390x
 
 Name: icecat
 Version: 68.9.0
-Release: 0.1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -290,11 +290,6 @@ Provides: mozilla-https-everywhere = 20191107
 GNUZilla Icecat is a fully-free fork of Mozilla Firefox ESR.
 Extensions included to this version of IceCat:
 
- * AboutIceCat
-   Adds a custom "about:icecat" homepage with links to information about the
-   free software and privacy features in IceCat, and check-boxes to enable
-   and disable the ones more prone to break websites
-
  * LibreJS
    GNU LibreJS aims to address the JavaScript problem described in the article
    "The JavaScript Trap" of Richard Stallman
@@ -817,7 +812,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
-* Thu May 28 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-0.1.rc1.rh1
+* Tue Jun 02 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.9.0-1.rh2
+- Mozilla release 68.9.0ESR
+
+* Thu May 28 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.9.0-0.1.rc1.rh1
 - Mozilla release candidate 68.9.0ESR build1
 
 * Wed May 20 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-5.rh1
diff --git a/sources b/sources
index f974a72..8a7606e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
-SHA512 (icecat-68.9.0-rh1.tar.bz2) = 07e962f022b31d18d305b1d5372eeb1843576d08b6ffcb54421730c7aad2e548e6d3a725fd152bdaa25c1680af1dd1bceee6722acd9e3c7b2671456d14357bac
+SHA512 (icecat-68.9.0-rh2.tar.bz2) = 080e9765850ece232f1888a2c59f8a65ffeeeea7aeeb9b4fdc6dd6c88bdc3dda2fd0b5585b61c5cbb57d860b85ede59f3c2c6d75be80cb58aaf0b0d501603af5
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 7650c02a136bad7e416360f02d13db9d3f5cad79 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 2 Jun 2020 12:55:32 +0200
Subject: [PATCH 126/473] Push language pack

---
 .gitignore  | 1 +
 icecat.spec | 2 +-
 sources     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index daf1e40..978d442 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,3 +115,4 @@
 /icecat-68.8.0-rh1.tar.bz2
 /icecat-68.9.0-rh1.tar.bz2
 /icecat-68.9.0-rh2.tar.bz2
+/icecat-68.9.0-langpacks.tar.gz
diff --git a/icecat.spec b/icecat.spec
index 944a481..36d5eac 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -9,7 +9,7 @@
 ExcludeArch: %{arm} s390x
 
 # Active/Deactive language files handling
-%global build_langpacks 0
+%global build_langpacks 1
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
diff --git a/sources b/sources
index 8a7606e..a8a1d25 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
+SHA512 (icecat-68.9.0-langpacks.tar.gz) = d3f1acf7505193e587338ffdf3d542dad9b04289d3a87de16e5a36a77624d5ad9d4a3366166fdf2e58066b0bf3bb86adbd66f241f3080a5a395960da806a2f94
 SHA512 (icecat-68.9.0-rh2.tar.bz2) = 080e9765850ece232f1888a2c59f8a65ffeeeea7aeeb9b4fdc6dd6c88bdc3dda2fd0b5585b61c5cbb57d860b85ede59f3c2c6d75be80cb58aaf0b0d501603af5
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 91d1df5da9708f716370c0565772dca1c4780f34 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 1 Jul 2020 18:35:03 +0200
Subject: [PATCH 127/473] Release 78.0 rh1-test

---
 .gitignore                                    |   2 +
 build-aarch64-skia.patch                      |  41 +-
 firefox-disable-ffvpx-with-vapi.patch         |  41 +
 firefox-nss-version.patch                     |  12 +
 firefox-pipewire.patch                        | 805 +++++++++++++++++-
 firefox-vaapi-extra-frames.patch              |  14 +
 ...4.0-mozilla-1526653_arm_disable_wasm.patch |  23 -
 ... => icecat-78.0-build-icu-big-endian.patch |   0
 icecat-lang_download.sh                       |   2 +-
 icecat-mozconfig-common                       |   4 +-
 icecat.spec                                   | 139 ++-
 mozilla-1196777.patch                         |  13 +
 mozilla-1337988.patch                         | 496 +++++++++++
 mozilla-1548475.patch                         |  34 -
 mozilla-1562827.patch                         | 141 ---
 mozilla-1564873.patch                         | 184 ----
 mozilla-1566876-webrtc-ind.patch              |  36 -
 mozilla-1567434-1.patch                       | 205 -----
 mozilla-1567434-2.patch                       |  35 -
 mozilla-1568569.patch                         |  73 --
 mozilla-1573813.patch                         |  29 -
 mozilla-1580174-webrtc-popup.patch            |  51 ++
 mozilla-1634213.patch                         |  96 +++
 rhbz-1354671.patch                            |  13 +-
 sources                                       |   6 +-
 25 files changed, 1612 insertions(+), 883 deletions(-)
 create mode 100644 firefox-disable-ffvpx-with-vapi.patch
 create mode 100644 firefox-nss-version.patch
 create mode 100644 firefox-vaapi-extra-frames.patch
 delete mode 100644 icecat-68.4.0-mozilla-1526653_arm_disable_wasm.patch
 rename icecat-68.4.0-build-icu-big-endian.patch => icecat-78.0-build-icu-big-endian.patch (100%)
 create mode 100644 mozilla-1196777.patch
 create mode 100644 mozilla-1337988.patch
 delete mode 100644 mozilla-1548475.patch
 delete mode 100644 mozilla-1562827.patch
 delete mode 100644 mozilla-1564873.patch
 delete mode 100644 mozilla-1566876-webrtc-ind.patch
 delete mode 100644 mozilla-1567434-1.patch
 delete mode 100644 mozilla-1567434-2.patch
 delete mode 100644 mozilla-1568569.patch
 delete mode 100644 mozilla-1573813.patch
 create mode 100644 mozilla-1580174-webrtc-popup.patch
 create mode 100644 mozilla-1634213.patch

diff --git a/.gitignore b/.gitignore
index 978d442..6602ef9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,3 +116,5 @@
 /icecat-68.9.0-rh1.tar.bz2
 /icecat-68.9.0-rh2.tar.bz2
 /icecat-68.9.0-langpacks.tar.gz
+/icecat-78.0-langpacks.tar.gz
+/icecat-78.0-rh1.tar.bz2
diff --git a/build-aarch64-skia.patch b/build-aarch64-skia.patch
index a00ee70..a63e3e8 100644
--- a/build-aarch64-skia.patch
+++ b/build-aarch64-skia.patch
@@ -1,6 +1,6 @@
-diff -up firefox-68.0/gfx/skia/skia/include/private/SkHalf.h.old firefox-68.0/gfx/skia/skia/include/private/SkHalf.h
---- firefox-68.0/gfx/skia/skia/include/private/SkHalf.h.old	2019-07-11 12:33:40.471936951 +0200
-+++ firefox-68.0/gfx/skia/skia/include/private/SkHalf.h	2019-07-11 12:33:50.527913736 +0200
+diff -up firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia firefox-72.0/gfx/skia/skia/include/private/SkHalf.h
+--- firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia	2020-01-02 22:33:02.000000000 +0100
++++ firefox-72.0/gfx/skia/skia/include/private/SkHalf.h	2020-01-03 09:00:37.537296105 +0100
 @@ -40,7 +40,7 @@ static inline Sk4h SkFloatToHalf_finite_
  
  static inline Sk4f SkHalfToFloat_finite_ftz(uint64_t rgba) {
@@ -19,28 +19,27 @@ diff -up firefox-68.0/gfx/skia/skia/include/private/SkHalf.h.old firefox-68.0/gf
      float32x4_t vec = fs.fVec;
      asm ("fcvtn %[vec].4h, %[vec].4s  \n"   // vcvt_f16_f32(vec)
          : [vec] "+w" (vec));                // +w: read-write NEON register
-
-diff -up firefox-68.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.old firefox-68.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
---- firefox-68.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.old	2019-07-11 12:39:08.694166900 +0200
-+++ firefox-68.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2019-07-11 12:39:21.572136328 +0200
-@@ -830,7 +830,7 @@ SI F from_half(U16 h) {
+diff -up firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
+--- firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia	2020-01-03 09:00:37.538296107 +0100
++++ firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2020-01-03 10:11:41.259219508 +0100
+@@ -1087,7 +1087,7 @@ SI F from_half(U16 h) {
  }
  
  SI U16 to_half(F f) {
--#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-+#if 0 // defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
+-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
++#if 0 //defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
+     && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
      return vcvt_f16_f32(f);
  
- #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
-diff -up firefox-68.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.old firefox-68.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
---- firefox-68.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.old	2019-07-11 12:38:45.285222428 +0200
-+++ firefox-68.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h	2019-07-11 12:38:57.414193679 +0200
-@@ -163,7 +163,7 @@ SI F F_from_Half(U16 half) {
-     __attribute__((no_sanitize("unsigned-integer-overflow")))
- #endif
+diff -up firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
+--- firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia	2020-01-03 09:00:37.538296107 +0100
++++ firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h	2020-01-03 10:11:53.513250979 +0100
+@@ -183,8 +183,6 @@ SI F F_from_Half(U16 half) {
  SI U16 Half_from_F(F f) {
--#if defined(USING_NEON_F16C)
-+#if 0 // defined(USING_NEON_F16C)
-     return (U16)vcvt_f16_f32(f);
- #elif defined(__AVX512F__)
+ #if defined(USING_NEON_FP16)
+     return bit_pun<U16>(f);
+-#elif defined(USING_NEON_F16C)
+-    return (U16)vcvt_f16_f32(f);
+ #elif defined(USING_AVX512F)
      return (U16)_mm512_cvtps_ph((__m512 )f, _MM_FROUND_CUR_DIRECTION );
+ #elif defined(USING_AVX_F16C)
diff --git a/firefox-disable-ffvpx-with-vapi.patch b/firefox-disable-ffvpx-with-vapi.patch
new file mode 100644
index 0000000..df179b0
--- /dev/null
+++ b/firefox-disable-ffvpx-with-vapi.patch
@@ -0,0 +1,41 @@
+diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory.cpp
+--- a/dom/media/platforms/PDMFactory.cpp
++++ b/dom/media/platforms/PDMFactory.cpp
+@@ -21,16 +21,17 @@
+ #include "mozilla/GpuDecoderModule.h"
+ #include "mozilla/RemoteDecoderModule.h"
+ #include "mozilla/SharedThreadPool.h"
+ #include "mozilla/StaticPrefs_media.h"
+ #include "mozilla/StaticPtr.h"
+ #include "mozilla/SyncRunnable.h"
+ #include "mozilla/TaskQueue.h"
+ #include "mozilla/gfx/gfxVars.h"
++#include "gfxPlatformGtk.h"
+ 
+ #ifdef XP_WIN
+ #  include "WMFDecoderModule.h"
+ #  include "mozilla/WindowsVersion.h"
+ #endif
+ #ifdef MOZ_FFVPX
+ #  include "FFVPXRuntimeLinker.h"
+ #endif
+@@ -362,17 +363,18 @@ void PDMFactory::CreatePDMs() {
+ #endif
+ #ifdef MOZ_OMX
+   if (StaticPrefs::media_omx_enabled()) {
+     m = OmxDecoderModule::Create();
+     StartupPDM(m);
+   }
+ #endif
+ #ifdef MOZ_FFVPX
+-  if (StaticPrefs::media_ffvpx_enabled()) {
++  if (StaticPrefs::media_ffvpx_enabled() &&
++      !gfxPlatformGtk::GetPlatform()->UseWaylandHardwareVideoDecoding()) {
+     m = FFVPXRuntimeLinker::CreateDecoderModule();
+     StartupPDM(m);
+   }
+ #endif
+ #ifdef MOZ_FFMPEG
+   if (StaticPrefs::media_ffmpeg_enabled()) {
+     m = FFmpegRuntimeLinker::CreateDecoderModule();
+     mFFmpegFailedToLoad = !StartupPDM(m);
diff --git a/firefox-nss-version.patch b/firefox-nss-version.patch
new file mode 100644
index 0000000..fee93bb
--- /dev/null
+++ b/firefox-nss-version.patch
@@ -0,0 +1,12 @@
+diff -up firefox-78.0/toolkit/moz.configure.nss-version firefox-78.0/toolkit/moz.configure
+--- firefox-78.0/toolkit/moz.configure.nss-version	2020-06-30 08:47:09.657501414 +0200
++++ firefox-78.0/toolkit/moz.configure	2020-06-30 08:47:12.652510169 +0200
+@@ -2089,7 +2089,7 @@ option('--with-system-nss', help='Use sy
+ 
+ imply_option('--with-system-nspr', True, when='--with-system-nss')
+ 
+-nss_pkg = pkg_check_modules('NSS', 'nss >= 3.53.1', when='--with-system-nss', config=False)
++nss_pkg = pkg_check_modules('NSS', 'nss >= 3.53.0', when='--with-system-nss', config=False)
+ 
+ set_config('MOZ_SYSTEM_NSS', True, when='--with-system-nss')
+ 
diff --git a/firefox-pipewire.patch b/firefox-pipewire.patch
index 7233a73..0844209 100644
--- a/firefox-pipewire.patch
+++ b/firefox-pipewire.patch
@@ -1,6 +1,7 @@
-diff -up firefox-68.0/config/system-headers.mozbuild.firefox-pipewire firefox-68.0/config/system-headers.mozbuild
---- firefox-68.0/config/system-headers.mozbuild.firefox-pipewire	2019-07-01 22:30:26.000000000 +0200
-+++ firefox-68.0/config/system-headers.mozbuild	2019-07-08 15:26:15.397161627 +0200
+diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
+index 2081d0c683a4..641133bf1ea4 100644
+--- a/config/system-headers.mozbuild
++++ b/config/system-headers.mozbuild
 @@ -314,6 +314,7 @@ system_headers = [
      'Gestalt.h',
      'getopt.h',
@@ -17,10 +18,24 @@ diff -up firefox-68.0/config/system-headers.mozbuild.firefox-pipewire firefox-68
      'pixman.h',
      'pk11func.h',
      'pk11pqg.h',
-diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
---- firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire	2019-07-01 22:30:33.000000000 +0200
-+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build	2019-07-08 15:26:15.397161627 +0200
-@@ -194,6 +194,28 @@ if CONFIG["OS_TARGET"] == "Linux":
+diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
+index ba885217b3ba..201d3b755221 100644
+--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
++++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
+@@ -158,7 +158,7 @@ if (rtc_include_tests) {
+ if (is_linux) {
+   if (rtc_use_pipewire) {
+     pkg_config("pipewire") {
+-      packages = [ "libpipewire-0.2" ]
++      packages = [ "libpipewire-0.3" ]
+ 
+       defines = [ "WEBRTC_USE_PIPEWIRE" ]
+     }
+diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
+index 90b40431c7e4..d844aa79d591 100644
+--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
++++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
+@@ -194,6 +194,30 @@ if CONFIG["OS_TARGET"] == "Linux":
          "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
      ]
  
@@ -31,13 +46,15 @@ diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_
 +
 +    OS_LIBS += [
 +        "rt",
-+        "pipewire-0.2",
++        "pipewire-0.3",
 +        "glib-2.0",
 +        "gio-2.0",
 +        "gobject-2.0"
 +    ]
 +
 +    CXXFLAGS += CONFIG['TK_CFLAGS']
++    CXXFLAGS += [ "-I/usr/include/pipewire-0.3" ]
++    CXXFLAGS += [ "-I/usr/include/spa-0.2" ]
 +
 +    UNIFIED_SOURCES += [
 +        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
@@ -49,9 +66,10 @@ diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_
  if CONFIG["OS_TARGET"] == "NetBSD":
  
      DEFINES["USE_X11"] = "1"
-diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
---- firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire	2019-07-08 16:42:13.936254926 +0200
-+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h	2019-07-08 16:42:17.509264974 +0200
+diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
+index 1eb8ead26efa..316468eed1fc 100644
+--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
++++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
 @@ -141,7 +141,7 @@ class DesktopCaptureOptions {
    bool disable_effects_ = true;
    bool detect_updated_region_ = false;
@@ -61,3 +79,768 @@ diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_
  #endif
  };
  
+diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
+index 379341c833de..76349f1fbd4d 100644
+--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
++++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
+@@ -15,8 +15,11 @@
+ 
+ #include <spa/param/format-utils.h>
+ #include <spa/param/props.h>
+-#include <spa/param/video/raw-utils.h>
+-#include <spa/support/type-map.h>
++
++#include <linux/dma-buf.h>
++#include <sys/mman.h>
++#include <sys/ioctl.h>
++#include <sys/syscall.h>
+ 
+ #include <memory>
+ #include <utility>
+@@ -36,31 +39,36 @@ const char kSessionInterfaceName[] = "org.freedesktop.portal.Session";
+ const char kRequestInterfaceName[] = "org.freedesktop.portal.Request";
+ const char kScreenCastInterfaceName[] = "org.freedesktop.portal.ScreenCast";
+ 
+-// static
+-void BaseCapturerPipeWire::OnStateChanged(void* data,
+-                                          pw_remote_state old_state,
+-                                          pw_remote_state state,
+-                                          const char* error_message) {
+-  BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
+-  RTC_DCHECK(that);
+ 
+-  switch (state) {
+-    case PW_REMOTE_STATE_ERROR:
+-      RTC_LOG(LS_ERROR) << "PipeWire remote state error: " << error_message;
+-      break;
+-    case PW_REMOTE_STATE_CONNECTED:
+-      RTC_LOG(LS_INFO) << "PipeWire remote state: connected.";
+-      that->CreateReceivingStream();
+-      break;
+-    case PW_REMOTE_STATE_CONNECTING:
+-      RTC_LOG(LS_INFO) << "PipeWire remote state: connecting.";
++// static
++void BaseCapturerPipeWire::SyncDmaBuf(int fd, uint64_t start_or_end) {
++  struct dma_buf_sync sync = { 0 };
++
++  sync.flags = start_or_end | DMA_BUF_SYNC_READ;
++
++  while(true) {
++    int ret;
++    ret = ioctl (fd, DMA_BUF_IOCTL_SYNC, &sync);
++    if (ret == -1 && errno == EINTR) {
++      continue;
++    } else if (ret == -1) {
++      RTC_LOG(LS_ERROR) << "Failed to synchronize DMA buffer: " << g_strerror(errno);
+       break;
+-    case PW_REMOTE_STATE_UNCONNECTED:
+-      RTC_LOG(LS_INFO) << "PipeWire remote state: unconnected.";
++    } else {
+       break;
++    }
+   }
+ }
+ 
++// static
++void BaseCapturerPipeWire::OnCoreError(void *data,
++                                       uint32_t id,
++                                       int seq,
++                                       int res,
++                                       const char *message) {
++  RTC_LOG(LS_ERROR) << "core error: " << message;
++}
++
+ // static
+ void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
+                                                 pw_stream_state old_state,
+@@ -73,76 +81,54 @@ void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
+     case PW_STREAM_STATE_ERROR:
+       RTC_LOG(LS_ERROR) << "PipeWire stream state error: " << error_message;
+       break;
+-    case PW_STREAM_STATE_CONFIGURE:
+-      pw_stream_set_active(that->pw_stream_, true);
+-      break;
+-    case PW_STREAM_STATE_UNCONNECTED:
+-    case PW_STREAM_STATE_CONNECTING:
+-    case PW_STREAM_STATE_READY:
+     case PW_STREAM_STATE_PAUSED:
+     case PW_STREAM_STATE_STREAMING:
++    case PW_STREAM_STATE_UNCONNECTED:
++    case PW_STREAM_STATE_CONNECTING:
+       break;
+   }
+ }
+ 
+ // static
+-void BaseCapturerPipeWire::OnStreamFormatChanged(void* data,
+-                                                 const struct spa_pod* format) {
++void BaseCapturerPipeWire::OnStreamParamChanged(void *data, uint32_t id,
++                                                const struct spa_pod *format) {
+   BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
+   RTC_DCHECK(that);
+ 
+-  RTC_LOG(LS_INFO) << "PipeWire stream format changed.";
++  RTC_LOG(LS_INFO) << "PipeWire stream param changed.";
+ 
+-  if (!format) {
+-    pw_stream_finish_format(that->pw_stream_, /*res=*/0, /*params=*/nullptr,
+-                            /*n_params=*/0);
++  if (!format || id != SPA_PARAM_Format) {
+     return;
+   }
+ 
+-  that->spa_video_format_ = new spa_video_info_raw();
+-  spa_format_video_raw_parse(format, that->spa_video_format_,
+-                             &that->pw_type_->format_video);
++  spa_format_video_raw_parse(format, &that->spa_video_format_);
+ 
+-  auto width = that->spa_video_format_->size.width;
+-  auto height = that->spa_video_format_->size.height;
++  auto width = that->spa_video_format_.size.width;
++  auto height = that->spa_video_format_.size.height;
+   auto stride = SPA_ROUND_UP_N(width * kBytesPerPixel, 4);
+   auto size = height * stride;
+ 
++  that->desktop_size_ = DesktopSize(width, height);
++
+   uint8_t buffer[1024] = {};
+   auto builder = spa_pod_builder{buffer, sizeof(buffer)};
+ 
+   // Setup buffers and meta header for new format.
+-  const struct spa_pod* params[2];
+-  params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
+-      &builder,
+-      // id to enumerate buffer requirements
+-      that->pw_core_type_->param.idBuffers,
+-      that->pw_core_type_->param_buffers.Buffers,
+-      // Size: specified as integer (i) and set to specified size
+-      ":", that->pw_core_type_->param_buffers.size, "i", size,
+-      // Stride: specified as integer (i) and set to specified stride
+-      ":", that->pw_core_type_->param_buffers.stride, "i", stride,
+-      // Buffers: specifies how many buffers we want to deal with, set as
+-      // integer (i) where preferred number is 8, then allowed number is defined
+-      // as range (r) from min and max values and it is undecided (u) to allow
+-      // negotiation
+-      ":", that->pw_core_type_->param_buffers.buffers, "iru", 8,
+-      SPA_POD_PROP_MIN_MAX(1, 32),
+-      // Align: memory alignment of the buffer, set as integer (i) to specified
+-      // value
+-      ":", that->pw_core_type_->param_buffers.align, "i", 16));
+-  params[1] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
+-      &builder,
+-      // id to enumerate supported metadata
+-      that->pw_core_type_->param.idMeta, that->pw_core_type_->param_meta.Meta,
+-      // Type: specified as id or enum (I)
+-      ":", that->pw_core_type_->param_meta.type, "I",
+-      that->pw_core_type_->meta.Header,
+-      // Size: size of the metadata, specified as integer (i)
+-      ":", that->pw_core_type_->param_meta.size, "i",
+-      sizeof(struct spa_meta_header)));
+-
+-  pw_stream_finish_format(that->pw_stream_, /*res=*/0, params, /*n_params=*/2);
++  const struct spa_pod* params[3];
++  params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
++              SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
++              SPA_PARAM_BUFFERS_size, SPA_POD_Int(size),
++              SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride),
++              SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(8, 1, 32)));
++  params[1] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
++              SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
++              SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),
++              SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header))));
++  params[2] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
++              SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
++              SPA_PARAM_META_type, SPA_POD_Id (SPA_META_VideoCrop),
++              SPA_PARAM_META_size, SPA_POD_Int (sizeof(struct spa_meta_region))));
++  pw_stream_update_params(that->pw_stream_, params, 3);
+ }
+ 
+ // static
+@@ -150,15 +136,25 @@ void BaseCapturerPipeWire::OnStreamProcess(void* data) {
+   BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
+   RTC_DCHECK(that);
+ 
+-  pw_buffer* buf = nullptr;
++  struct pw_buffer *next_buffer;
++  struct pw_buffer *buffer = nullptr;
++
++  next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
++  while (next_buffer) {
++    buffer = next_buffer;
++    next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
+ 
+-  if (!(buf = pw_stream_dequeue_buffer(that->pw_stream_))) {
++    if (next_buffer)
++      pw_stream_queue_buffer (that->pw_stream_, buffer);
++  }
++
++  if (!buffer) {
+     return;
+   }
+ 
+-  that->HandleBuffer(buf);
++  that->HandleBuffer(buffer);
+ 
+-  pw_stream_queue_buffer(that->pw_stream_, buf);
++  pw_stream_queue_buffer(that->pw_stream_, buffer);
+ }
+ 
+ BaseCapturerPipeWire::BaseCapturerPipeWire(CaptureSourceType source_type)
+@@ -169,38 +165,22 @@ BaseCapturerPipeWire::~BaseCapturerPipeWire() {
+     pw_thread_loop_stop(pw_main_loop_);
+   }
+ 
+-  if (pw_type_) {
+-    delete pw_type_;
+-  }
+-
+-  if (spa_video_format_) {
+-    delete spa_video_format_;
+-  }
+-
+   if (pw_stream_) {
+     pw_stream_destroy(pw_stream_);
+   }
+ 
+-  if (pw_remote_) {
+-    pw_remote_destroy(pw_remote_);
++  if (pw_core_) {
++    pw_core_disconnect(pw_core_);
+   }
+ 
+-  if (pw_core_) {
+-    pw_core_destroy(pw_core_);
++  if (pw_context_) {
++    pw_context_destroy(pw_context_);
+   }
+ 
+   if (pw_main_loop_) {
+     pw_thread_loop_destroy(pw_main_loop_);
+   }
+ 
+-  if (pw_loop_) {
+-    pw_loop_destroy(pw_loop_);
+-  }
+-
+-  if (current_frame_) {
+-    free(current_frame_);
+-  }
+-
+   if (start_request_signal_id_) {
+     g_dbus_connection_signal_unsubscribe(connection_, start_request_signal_id_);
+   }
+@@ -250,27 +230,35 @@ void BaseCapturerPipeWire::InitPortal() {
+ void BaseCapturerPipeWire::InitPipeWire() {
+   pw_init(/*argc=*/nullptr, /*argc=*/nullptr);
+ 
+-  pw_loop_ = pw_loop_new(/*properties=*/nullptr);
+-  pw_main_loop_ = pw_thread_loop_new(pw_loop_, "pipewire-main-loop");
+-
+-  pw_core_ = pw_core_new(pw_loop_, /*properties=*/nullptr);
+-  pw_core_type_ = pw_core_get_type(pw_core_);
+-  pw_remote_ = pw_remote_new(pw_core_, nullptr, /*user_data_size=*/0);
++  pw_main_loop_ = pw_thread_loop_new("pipewire-main-loop", nullptr);
++  pw_context_ = pw_context_new(pw_thread_loop_get_loop(pw_main_loop_), nullptr, 0);
++  if (!pw_context_) {
++    RTC_LOG(LS_ERROR) << "Failed to create PipeWire context";
++    return;
++  }
+ 
+-  InitPipeWireTypes();
++  pw_core_ = pw_context_connect(pw_context_, nullptr, 0);
++  if (!pw_core_) {
++    RTC_LOG(LS_ERROR) << "Failed to connect PipeWire context";
++    return;
++  }
+ 
+   // Initialize event handlers, remote end and stream-related.
+-  pw_remote_events_.version = PW_VERSION_REMOTE_EVENTS;
+-  pw_remote_events_.state_changed = &OnStateChanged;
++  pw_core_events_.version = PW_VERSION_CORE_EVENTS;
++  pw_core_events_.error = &OnCoreError;
+ 
+   pw_stream_events_.version = PW_VERSION_STREAM_EVENTS;
+   pw_stream_events_.state_changed = &OnStreamStateChanged;
+-  pw_stream_events_.format_changed = &OnStreamFormatChanged;
++  pw_stream_events_.param_changed = &OnStreamParamChanged;
+   pw_stream_events_.process = &OnStreamProcess;
+ 
+-  pw_remote_add_listener(pw_remote_, &spa_remote_listener_, &pw_remote_events_,
+-                         this);
+-  pw_remote_connect_fd(pw_remote_, pw_fd_);
++  pw_core_add_listener(pw_core_, &spa_core_listener_, &pw_core_events_, this);
++
++  pw_stream_ = CreateReceivingStream();
++  if (!pw_stream_) {
++    RTC_LOG(LS_ERROR) << "Failed to create PipeWire stream";
++    return;
++  }
+ 
+   if (pw_thread_loop_start(pw_main_loop_) < 0) {
+     RTC_LOG(LS_ERROR) << "Failed to start main PipeWire loop";
+@@ -278,81 +266,132 @@ void BaseCapturerPipeWire::InitPipeWire() {
+   }
+ }
+ 
+-void BaseCapturerPipeWire::InitPipeWireTypes() {
+-  spa_type_map* map = pw_core_type_->map;
+-  pw_type_ = new PipeWireType();
+-
+-  spa_type_media_type_map(map, &pw_type_->media_type);
+-  spa_type_media_subtype_map(map, &pw_type_->media_subtype);
+-  spa_type_format_video_map(map, &pw_type_->format_video);
+-  spa_type_video_format_map(map, &pw_type_->video_format);
+-}
+-
+-void BaseCapturerPipeWire::CreateReceivingStream() {
++pw_stream* BaseCapturerPipeWire::CreateReceivingStream() {
+   spa_rectangle pwMinScreenBounds = spa_rectangle{1, 1};
+-  spa_rectangle pwScreenBounds =
+-      spa_rectangle{static_cast<uint32_t>(desktop_size_.width()),
+-                    static_cast<uint32_t>(desktop_size_.height())};
++  spa_rectangle pwMaxScreenBounds = spa_rectangle{INT32_MAX, INT32_MAX};
+ 
+-  spa_fraction pwFrameRateMin = spa_fraction{0, 1};
+-  spa_fraction pwFrameRateMax = spa_fraction{60, 1};
++  auto stream = pw_stream_new(pw_core_, "webrtc-pipewire-stream", nullptr);
+ 
+-  pw_properties* reuseProps = pw_properties_new("pipewire.client.reuse", "1",
+-                                                /*end of varargs*/ nullptr);
+-  pw_stream_ = pw_stream_new(pw_remote_, "webrtc-consume-stream", reuseProps);
++  if (!stream) {
++    RTC_LOG(LS_ERROR) << "Could not create receiving stream.";
++    return nullptr;
++  }
+ 
+   uint8_t buffer[1024] = {};
+-  const spa_pod* params[1];
+-  spa_pod_builder builder = spa_pod_builder{buffer, sizeof(buffer)};
+-  params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
+-      &builder,
+-      // id to enumerate formats
+-      pw_core_type_->param.idEnumFormat, pw_core_type_->spa_format, "I",
+-      pw_type_->media_type.video, "I", pw_type_->media_subtype.raw,
+-      // Video format: specified as id or enum (I), preferred format is BGRx,
+-      // then allowed formats are enumerated (e) and the format is undecided (u)
+-      // to allow negotiation
+-      ":", pw_type_->format_video.format, "Ieu", pw_type_->video_format.BGRx,
+-      SPA_POD_PROP_ENUM(2, pw_type_->video_format.RGBx,
+-                        pw_type_->video_format.BGRx),
+-      // Video size: specified as rectangle (R), preferred size is specified as
+-      // first parameter, then allowed size is defined as range (r) from min and
+-      // max values and the format is undecided (u) to allow negotiation
+-      ":", pw_type_->format_video.size, "Rru", &pwScreenBounds, 2,
+-      &pwMinScreenBounds, &pwScreenBounds,
+-      // Frame rate: specified as fraction (F) and set to minimum frame rate
+-      // value
+-      ":", pw_type_->format_video.framerate, "F", &pwFrameRateMin,
+-      // Max frame rate: specified as fraction (F), preferred frame rate is set
+-      // to maximum value, then allowed frame rate is defined as range (r) from
+-      // min and max values and it is undecided (u) to allow negotiation
+-      ":", pw_type_->format_video.max_framerate, "Fru", &pwFrameRateMax, 2,
+-      &pwFrameRateMin, &pwFrameRateMax));
+-
+-  pw_stream_add_listener(pw_stream_, &spa_stream_listener_, &pw_stream_events_,
+-                         this);
++  const spa_pod* params[2];
++  spa_pod_builder builder = SPA_POD_BUILDER_INIT(buffer, sizeof (buffer));
++
++  params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
++              SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
++              SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video),
++              SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
++              SPA_FORMAT_VIDEO_format, SPA_POD_CHOICE_ENUM_Id(5, SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_RGBx, SPA_VIDEO_FORMAT_RGBA,
++                                                                 SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_BGRA),
++              SPA_FORMAT_VIDEO_size, SPA_POD_CHOICE_RANGE_Rectangle(&pwMinScreenBounds,
++                                                                    &pwMinScreenBounds,
++                                                                    &pwMaxScreenBounds),
++              0));
++  pw_stream_add_listener(stream, &spa_stream_listener_, &pw_stream_events_, this);
++
+   pw_stream_flags flags = static_cast<pw_stream_flags>(
+-      PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE |
+-      PW_STREAM_FLAG_MAP_BUFFERS);
+-  if (pw_stream_connect(pw_stream_, PW_DIRECTION_INPUT, /*port_path=*/nullptr,
+-                        flags, params,
+-                        /*n_params=*/1) != 0) {
++      PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE);
++
++  if (pw_stream_connect(stream, PW_DIRECTION_INPUT, pw_stream_node_id_, PW_STREAM_FLAG_AUTOCONNECT, params, 1) != 0) {
+     RTC_LOG(LS_ERROR) << "Could not connect receiving stream.";
+     portal_init_failed_ = true;
+-    return;
+   }
++
++  return stream;
+ }
+ 
+ void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
++  struct spa_meta_region* video_crop;
+   spa_buffer* spaBuffer = buffer->buffer;
+-  void* src = nullptr;
++  uint8_t *map = nullptr;
++  uint8_t* src = nullptr;
++  uint8_t* dst = nullptr;
++
++  if (spaBuffer->datas[0].chunk->size == 0) {
++    map = nullptr;
++    src = nullptr;
++  } else if (spaBuffer->datas[0].type == SPA_DATA_MemFd) {
++    map = static_cast<uint8_t*>(mmap(
++        nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
++        PROT_READ, MAP_PRIVATE, spaBuffer->datas[0].fd, 0));
++
++    if (map == MAP_FAILED) {
++      RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno);
++      return;
++    }
++
++    src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
++  } else if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
++    int fd;
++    fd = spaBuffer->datas[0].fd;
+ 
+-  if (!(src = spaBuffer->datas[0].data)) {
++    map = static_cast<uint8_t*>(mmap(
++        nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
++        PROT_READ, MAP_PRIVATE, fd, 0));
++
++    if (map == MAP_FAILED) {
++      RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno);
++      return;
++    }
++
++    SyncDmaBuf(fd, DMA_BUF_SYNC_START);
++
++    src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
++  } else if (spaBuffer->datas[0].type == SPA_DATA_MemPtr) {
++    map = nullptr;
++    src = static_cast<uint8_t*>(spaBuffer->datas[0].data);
++  } else {
+     return;
+   }
+ 
+-  uint32_t maxSize = spaBuffer->datas[0].maxsize;
+-  int32_t srcStride = spaBuffer->datas[0].chunk->stride;
++  if (!src) {
++    return;
++  }
++
++  DesktopSize prev_crop_size = DesktopSize(0, 0);
++  if (video_crop_size_initialized_) {
++    prev_crop_size = video_crop_size_;
++  }  
++
++  if ((video_crop = static_cast<struct spa_meta_region*>(
++           spa_buffer_find_meta_data(spaBuffer, SPA_META_VideoCrop, sizeof(*video_crop))))) {
++    RTC_DCHECK(video_crop->region.size.width <= desktop_size_.width() &&
++               video_crop->region.size.height <= desktop_size_.height());
++    if ((video_crop->region.size.width != desktop_size_.width() ||
++        video_crop->region.size.height != desktop_size_.height()) && video_crop->region.size.width && video_crop->region.size.height) {
++      video_crop_size_ = DesktopSize(video_crop->region.size.width, video_crop->region.size.height);
++      video_crop_size_initialized_ = true;
++    } else {
++      video_crop_size_initialized_ = false;
++    }
++  } else {
++    video_crop_size_initialized_ = false;
++  }
++
++  size_t frame_size;
++  if (video_crop_size_initialized_) {
++    frame_size =
++        video_crop_size_.width() * video_crop_size_.height() * kBytesPerPixel;
++  } else {
++    frame_size =
++        desktop_size_.width() * desktop_size_.height() * kBytesPerPixel;
++  }
++
++  if (!current_frame_ ||
++      (video_crop_size_initialized_ && !video_crop_size_.equals(prev_crop_size))) {
++    current_frame_ = std::make_unique<uint8_t[]>(frame_size);
++  }
++  RTC_DCHECK(current_frame_ != nullptr);
++
++  const int32_t dstStride = video_crop_size_initialized_
++                                ? video_crop_size_.width() * kBytesPerPixel
++                                : desktop_size_.width() * kBytesPerPixel;
++  const int32_t srcStride = spaBuffer->datas[0].chunk->stride;
++
+   if (srcStride != (desktop_size_.width() * kBytesPerPixel)) {
+     RTC_LOG(LS_ERROR) << "Got buffer with stride different from screen stride: "
+                       << srcStride
+@@ -361,21 +400,40 @@ void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
+     return;
+   }
+ 
+-  if (!current_frame_) {
+-    current_frame_ = static_cast<uint8_t*>(malloc(maxSize));
++  dst = current_frame_.get();
++
++  // Adjust source content based on crop video position
++  if (video_crop_size_initialized_ &&
++      (video_crop->region.position.y + video_crop_size_.height() <= desktop_size_.height())) {
++    for (int i = 0; i < video_crop->region.position.y; ++i) {
++      src += srcStride;
++    }
++  }
++  const int xOffset =
++      video_crop_size_initialized_ && (video_crop->region.position.x + video_crop_size_.width() <=
++                           desktop_size_.width())
++          ? video_crop->region.position.x * kBytesPerPixel
++          : 0;
++  const int height = video_crop_size_initialized_ ? video_crop_size_.height() : desktop_size_.height();
++  for (int i = 0; i < height; ++i) {
++    // Adjust source content based on crop video position if needed
++    src += xOffset;
++    std::memcpy(dst, src, dstStride);
++    // If both sides decided to go with the RGBx format we need to convert it to
++    // BGRx to match color format expected by WebRTC.
++    if (spa_video_format_.format == SPA_VIDEO_FORMAT_RGBx ||
++        spa_video_format_.format == SPA_VIDEO_FORMAT_RGBA) {
++      ConvertRGBxToBGRx(dst, dstStride);
++    }
++    src += srcStride - xOffset;
++    dst += dstStride;
+   }
+-  RTC_DCHECK(current_frame_ != nullptr);
+ 
+-  // If both sides decided to go with the RGBx format we need to convert it to
+-  // BGRx to match color format expected by WebRTC.
+-  if (spa_video_format_->format == pw_type_->video_format.RGBx) {
+-    uint8_t* tempFrame = static_cast<uint8_t*>(malloc(maxSize));
+-    std::memcpy(tempFrame, src, maxSize);
+-    ConvertRGBxToBGRx(tempFrame, maxSize);
+-    std::memcpy(current_frame_, tempFrame, maxSize);
+-    free(tempFrame);
+-  } else {
+-    std::memcpy(current_frame_, src, maxSize);
++  if (map) {
++    if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
++      SyncDmaBuf(spaBuffer->datas[0].fd, DMA_BUF_SYNC_END);
++    }
++    munmap(map, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset);
+   }
+ }
+ 
+@@ -725,10 +783,7 @@ void BaseCapturerPipeWire::OnStartRequestResponseSignal(
+       g_variant_get(variant, "(u@a{sv})", &stream_id, &options);
+       RTC_DCHECK(options != nullptr);
+ 
+-      g_variant_lookup(options, "size", "(ii)", &width, &height);
+-
+-      that->desktop_size_.set(width, height);
+-
++      that->pw_stream_node_id_ = stream_id;
+       g_variant_unref(options);
+       g_variant_unref(variant);
+     }
+@@ -813,10 +868,15 @@ void BaseCapturerPipeWire::CaptureFrame() {
+     return;
+   }
+ 
+-  std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(desktop_size_));
++  DesktopSize frame_size = desktop_size_;
++  if (video_crop_size_initialized_) {
++    frame_size = video_crop_size_;
++  }
++  
++  std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(frame_size));
+   result->CopyPixelsFrom(
+-      current_frame_, (desktop_size_.width() * kBytesPerPixel),
+-      DesktopRect::MakeWH(desktop_size_.width(), desktop_size_.height()));
++      current_frame_.get(), (frame_size.width() * kBytesPerPixel),
++      DesktopRect::MakeWH(frame_size.width(), frame_size.height()));
+   if (!result) {
+     callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
+     return;
+@@ -837,4 +897,22 @@ bool BaseCapturerPipeWire::SelectSource(SourceId id) {
+   return true;
+ }
+ 
++// static
++std::unique_ptr<DesktopCapturer>
++BaseCapturerPipeWire::CreateRawScreenCapturer(
++    const DesktopCaptureOptions& options) {
++  std::unique_ptr<BaseCapturerPipeWire> capturer =
++      std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny);
++  return std::move(capturer);}
++
++// static
++std::unique_ptr<DesktopCapturer>
++BaseCapturerPipeWire::CreateRawWindowCapturer(
++    const DesktopCaptureOptions& options) {
++
++  std::unique_ptr<BaseCapturerPipeWire> capturer =
++      std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny);
++  return std::move(capturer);
++}
++
+ }  // namespace webrtc
+diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
+index 56b101acbaa6..de54157d1a2a 100644
+--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
++++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
+@@ -22,17 +22,13 @@
+ 
+ namespace webrtc {
+ 
+-class PipeWireType {
+- public:
+-  spa_type_media_type media_type;
+-  spa_type_media_subtype media_subtype;
+-  spa_type_format_video format_video;
+-  spa_type_video_format video_format;
+-};
+-
+ class BaseCapturerPipeWire : public DesktopCapturer {
+  public:
+-  enum CaptureSourceType { Screen = 1, Window };
++  enum CaptureSourceType : uint32_t {
++    kScreen = 0b01,
++    kWindow = 0b10,
++    kAny = 0b11
++  };
+ 
+   explicit BaseCapturerPipeWire(CaptureSourceType source_type);
+   ~BaseCapturerPipeWire() override;
+@@ -43,28 +39,32 @@ class BaseCapturerPipeWire : public DesktopCapturer {
+   bool GetSourceList(SourceList* sources) override;
+   bool SelectSource(SourceId id) override;
+ 
++  static std::unique_ptr<DesktopCapturer> CreateRawScreenCapturer(
++      const DesktopCaptureOptions& options);
++
++  static std::unique_ptr<DesktopCapturer> CreateRawWindowCapturer(
++      const DesktopCaptureOptions& options);
++
+  private:
+   // PipeWire types -->
++  pw_context* pw_context_ = nullptr;
+   pw_core* pw_core_ = nullptr;
+-  pw_type* pw_core_type_ = nullptr;
+   pw_stream* pw_stream_ = nullptr;
+-  pw_remote* pw_remote_ = nullptr;
+-  pw_loop* pw_loop_ = nullptr;
+   pw_thread_loop* pw_main_loop_ = nullptr;
+-  PipeWireType* pw_type_ = nullptr;
+ 
++  spa_hook spa_core_listener_ = {};
+   spa_hook spa_stream_listener_ = {};
+-  spa_hook spa_remote_listener_ = {};
+ 
++  pw_core_events pw_core_events_ = {};
+   pw_stream_events pw_stream_events_ = {};
+-  pw_remote_events pw_remote_events_ = {};
+ 
+-  spa_video_info_raw* spa_video_format_ = nullptr;
++  struct spa_video_info_raw spa_video_format_;
+ 
++  guint32 pw_stream_node_id_ = 0;
+   gint32 pw_fd_ = -1;
+ 
+   CaptureSourceType capture_source_type_ =
+-      BaseCapturerPipeWire::CaptureSourceType::Screen;
++      BaseCapturerPipeWire::CaptureSourceType::kAny;
+ 
+   // <-- end of PipeWire types
+ 
+@@ -78,33 +78,37 @@ class BaseCapturerPipeWire : public DesktopCapturer {
+   guint sources_request_signal_id_ = 0;
+   guint start_request_signal_id_ = 0;
+ 
++  bool video_crop_size_initialized_ = false;
++  DesktopSize video_crop_size_;;
+   DesktopSize desktop_size_ = {};
+   DesktopCaptureOptions options_ = {};
+ 
+-  uint8_t* current_frame_ = nullptr;
++  std::unique_ptr<uint8_t[]> current_frame_;
+   Callback* callback_ = nullptr;
+ 
+   bool portal_init_failed_ = false;
+ 
+   void InitPortal();
+   void InitPipeWire();
+-  void InitPipeWireTypes();
+ 
+-  void CreateReceivingStream();
++  pw_stream* CreateReceivingStream();
+   void HandleBuffer(pw_buffer* buffer);
+ 
+   void ConvertRGBxToBGRx(uint8_t* frame, uint32_t size);
+ 
+-  static void OnStateChanged(void* data,
+-                             pw_remote_state old_state,
+-                             pw_remote_state state,
+-                             const char* error);
++  static void SyncDmaBuf(int fd, uint64_t start_or_end);
++  static void OnCoreError(void *data,
++                          uint32_t id,
++                          int seq,
++                          int res,
++                          const char *message);
++  static void OnStreamParamChanged(void *data,
++                                   uint32_t id,
++                                   const struct spa_pod *format);
+   static void OnStreamStateChanged(void* data,
+                                    pw_stream_state old_state,
+                                    pw_stream_state state,
+                                    const char* error_message);
+-
+-  static void OnStreamFormatChanged(void* data, const struct spa_pod* format);
+   static void OnStreamProcess(void* data);
+   static void OnNewBuffer(void* data, uint32_t id);
+ 
+diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
+index 26956fc67dc8..3813d697bb38 100644
+--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
++++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
+@@ -15,7 +15,7 @@
+ namespace webrtc {
+ 
+ ScreenCapturerPipeWire::ScreenCapturerPipeWire()
+-    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Screen) {}
++    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kScreen) {}
+ ScreenCapturerPipeWire::~ScreenCapturerPipeWire() {}
+ 
+ // static
+diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
+index 35436475cb4d..c43a1f1a0c4e 100644
+--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
++++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
+@@ -15,7 +15,7 @@
+ namespace webrtc {
+ 
+ WindowCapturerPipeWire::WindowCapturerPipeWire()
+-    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Window) {}
++    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kWindow) {}
+ WindowCapturerPipeWire::~WindowCapturerPipeWire() {}
+ 
+ // static
+diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
+index cf8a9dd0e0db..d27fab8d28d9 100644
+--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
++++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
+@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
+     const DesktopCaptureOptions& options) {
+ #if defined(WEBRTC_USE_PIPEWIRE)
+   if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
+-    return ScreenCapturerPipeWire::CreateRawScreenCapturer(options);
++    return BaseCapturerPipeWire::CreateRawScreenCapturer(options);
+   }
+ #endif  // defined(WEBRTC_USE_PIPEWIRE)
+ 
+diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
+index 82359e50c2db..bb9724cf7cc2 100644
+--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
++++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
+@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawWindowCapturer(
+     const DesktopCaptureOptions& options) {
+ #if defined(WEBRTC_USE_PIPEWIRE)
+   if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
+-    return WindowCapturerPipeWire::CreateRawWindowCapturer(options);
++    return BaseCapturerPipeWire::CreateRawWindowCapturer(options);
+   }
+ #endif  // defined(WEBRTC_USE_PIPEWIRE)
+ 
diff --git a/firefox-vaapi-extra-frames.patch b/firefox-vaapi-extra-frames.patch
new file mode 100644
index 0000000..c2ed7a2
--- /dev/null
+++ b/firefox-vaapi-extra-frames.patch
@@ -0,0 +1,14 @@
+diff -up firefox-76.0.1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp.old firefox-76.0.1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
+--- firefox-76.0.1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp.old	2020-05-13 14:28:26.556800474 +0200
++++ firefox-76.0.1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp	2020-05-13 14:28:31.562768959 +0200
+@@ -43,7 +43,7 @@ typedef int VAStatus;
+ #endif
+ 
+ // Use some extra HW frames for potential rendering lags.
+-#define EXTRA_HW_FRAMES 6
++#define EXTRA_HW_FRAMES 20
+ 
+ typedef mozilla::layers::Image Image;
+ typedef mozilla::layers::PlanarYCbCrImage PlanarYCbCrImage;
+diff -up firefox-76.0.1/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-76.0.1/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
+diff -up firefox-76.0.1/media/webrtc/trunk/Makefile.old firefox-76.0.1/media/webrtc/trunk/Makefile
diff --git a/icecat-68.4.0-mozilla-1526653_arm_disable_wasm.patch b/icecat-68.4.0-mozilla-1526653_arm_disable_wasm.patch
deleted file mode 100644
index 86d0c08..0000000
--- a/icecat-68.4.0-mozilla-1526653_arm_disable_wasm.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
-index 636537f847862ef693dd6582e2783de4e3d403c5..383c380f04ceb6a111dbfe9a046e3454a56e31b4 100644
---- a/js/src/wasm/WasmSignalHandlers.cpp
-+++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -248,7 +248,16 @@ using mozilla::DebugOnly;
- #endif
- 
- #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
--#  include <sys/user.h>
-+struct user_vfp {
-+  unsigned long long fpregs[32];
-+  unsigned long fpscr;
-+};
-+
-+struct user_vfp_exc {
-+  unsigned long fpexc;
-+  unsigned long fpinst;
-+  unsigned long fpinst2;
-+};
- #endif
- 
- #if defined(ANDROID)
-
diff --git a/icecat-68.4.0-build-icu-big-endian.patch b/icecat-78.0-build-icu-big-endian.patch
similarity index 100%
rename from icecat-68.4.0-build-icu-big-endian.patch
rename to icecat-78.0-build-icu-big-endian.patch
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 98e58f8..cdd7849 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=68.9.0
+VERSION=78.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat-mozconfig-common b/icecat-mozconfig-common
index ceab223..9a8f1ff 100644
--- a/icecat-mozconfig-common
+++ b/icecat-mozconfig-common
@@ -2,7 +2,7 @@
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
+export MOZ_TELEMETRY_REPORTING= 
 mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
@@ -10,9 +10,9 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 ac_add_options --prefix="$PREFIX"
 ac_add_options --libdir="$LIBDIR"
 ac_add_options --enable-necko-wifi
-ac_add_options --enable-startup-notification
 ac_add_options --disable-updater
 ac_add_options --enable-chrome-format=omni
 ac_add_options --enable-release
 # Workaround for mozbz#1341234
 ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
+ac_add_options --allow-addon-sideload
diff --git a/icecat.spec b/icecat.spec
index 36d5eac..8e0be4e 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,5 +1,5 @@
 # Set to true if it's going to be submitted as update
-%global release_build 1
+%global release_build 0
 
 # Set to true if it's going to be submitted as release candidate
 %global release_candidate 0
@@ -43,17 +43,23 @@ ExcludeArch: %{arm} s390x
 %endif
 
 # Use system libicu?
+%if 0%{?fedora} > 32
 %global system_libicu 1
+%else
+%global system_libicu 0
+%endif
 
 # Use system nspr/nss?
-%global system_nss    1
+%global system_nss    0
 
 %if 0%{?system_nss}
-%global nspr_version 4.21
+%global nspr_version 4.25.0
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.50
+%global nss_version 3.53.0
 %global nss_build_version %{nss_version}
 %endif
+%global nspr_version 4.25.0
+%global nspr_build_version %{nspr_version}
 
 # Audio backends
 %bcond_without pulseaudio
@@ -79,12 +85,12 @@ ExcludeArch: %{arm} s390x
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh2
+%global redhat_ver rh1
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
 %if 0%{?release_candidate}
-%global extra_ver .rc1
+%global extra_ver .rc3
 %else
 %global extra_ver %{nil}
 %endif
@@ -94,7 +100,7 @@ ExcludeArch: %{arm} s390x
 %endif
 
 Name: icecat
-Version: 68.9.0
+Version: 78.0
 Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -151,40 +157,37 @@ Patch7: %{name}-fix_jar.patch
 # Fix files list for installer
 Patch8: %{name}-fix_installer.patch
 
-Patch26: %{name}-68.4.0-build-icu-big-endian.patch
+Patch26: %{name}-78.0-build-icu-big-endian.patch
 
 Patch40: build-aarch64-skia.patch
 Patch41: build-disable-elfhack.patch
 Patch44: build-arm-libopus.patch
-Patch45: %{name}-68.4.0-mozilla-1526653_arm_disable_wasm.patch
 
 # Fedora specific patches
 Patch219: rhbz-1173156.patch
+Patch220: firefox-nss-version.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
 
 # Upstream patches
+Patch402: mozilla-1196777.patch
+Patch412: mozilla-1337988.patch
 Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
-
-# Patches for compatibility with Rust-1.39
-Patch419: mozilla-1564873.patch
-#
+Patch422: mozilla-1580174-webrtc-popup.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
-Patch424: mozilla-1566876-webrtc-ind.patch
-Patch425: mozilla-1568569.patch
 
 # Wayland specific upstream patches
 Patch565: firefox-pipewire.patch
-Patch575: mozilla-1548475.patch
-Patch576: mozilla-1562827.patch
-Patch578: mozilla-1567434-1.patch
-Patch579: mozilla-1567434-2.patch
-Patch580: mozilla-1573813.patch
 #
 
+#VA-API patches
+Patch584: firefox-disable-ffvpx-with-vapi.patch
+Patch585: firefox-vaapi-extra-frames.patch
+Patch589: mozilla-1634213.patch
+
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf213
 BuildRequires: bzip2-devel
@@ -235,11 +238,12 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: nodejs
 BuildRequires: nasm >= 1.13
 BuildRequires: strace
+
 %if 0%{?system_nss}
-BuildRequires: pkgconfig(nspr) >= %{nspr_version}
 BuildRequires: pkgconfig(nss) >= %{nss_version}
 BuildRequires: nss-static >= %{nss_version}
 %endif
+BuildRequires: pkgconfig(nspr) >= %{nspr_version}
 
 BuildRequires: openjpeg-devel
 BuildRequires: pango-devel
@@ -277,9 +281,10 @@ Requires: mozilla-filesystem
 Requires: p11-kit-trust
 
 %if 0%{?system_nss}
-Requires: nspr >= %{nspr_build_version}
 Requires: nss >= %{nss_build_version}
 %endif
+Requires: nspr >= %{nspr_build_version}
+
 Requires: fedora-bookmarks
 Suggests: mozilla-ublock-origin
 
@@ -327,7 +332,7 @@ to run GNU IceCat native on Wayland.
 find . -type f -name "*.h" -exec chmod 0644 '{}' \;
 find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
 find . -type f -name "*.cc" -exec chmod 0644 '{}' \;
-find . -type f -name "*.c" -exec chmod 0644 '{}' \; 
+find . -type f -name "*.c" -exec chmod 0644 '{}' \;
 
 # Copy license files
 tar -xf %{SOURCE5}
@@ -341,45 +346,39 @@ tar -xf %{SOURCE5}
 %patch7 -p0 -b .fix_jar
 %patch8 -p0 -b .fix_installer
 
-%ifarch aarch64
-%patch40 -p1 -b .aarch64-skia
-%endif
 %if 0%{?disable_elfhack}
 %patch41 -p1 -b .disable-elfhack
 %endif
 
 # Fedora patches
 %patch219 -p1 -b .rhbz-1173156
+%patch220 -p1 -b .nss-version
 
 # ARM run-time patch
 %ifarch aarch64
+%patch40 -p1 -b .aarch64-skia
 %patch226 -p1 -b .1354671
 %endif
 
 %ifarch %{arm}
 %patch414 -p1 -b .Bug-1238661---fix-mozillaSignalTrampoline-to-work
 %patch44  -p1 -b .build-arm-libopus
-%patch45  -p1 -b .mozilla-1526653_arm
 %endif
 
 # Patch for big endian platforms only
 %if 0%{?big_endian}
-%patch26 -p1 -b .icu
+#%%patch26 -p1 -b .icu
 %endif
 
-%patch419 -p1 -b .mozilla-1564873
-
+%patch402 -p1 -b .1196777
 %patch423 -p1 -b .mozilla-1596503
-%patch424 -p1 -b .mozilla-1566876-webrtc-ind
-%patch425 -p1 -b .mozilla-1568569
 
 # Wayland specific upstream patches
 %patch565 -p1 -b .firefox-pipewire
-%patch575 -p1 -b .mozilla-1548475
-%patch576 -p1 -b .mozilla-1562827
-%patch578 -p1 -b .mozilla-1567434-1
-%patch579 -p1 -b .mozilla-1567434-2
-%patch580 -p1 -b .mozilla-1573813
+
+%patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
+%patch585 -p1 -b .firefox-vaapi-extra-frames
+%patch589 -p1 -b .mozilla-1634213
 
 # Remove default configuration and copy the customized one
 rm -f .mozconfig
@@ -415,6 +414,7 @@ echo "ac_add_options --with-system-nss" >> .mozconfig
 echo "ac_add_options --without-system-nspr" >> .mozconfig
 echo "ac_add_options --without-system-nss" >> .mozconfig
 %endif
+
 %if 0%{?system_libicu}
 echo "ac_add_options --with-system-icu" >> .mozconfig
 %else
@@ -422,40 +422,22 @@ echo "ac_add_options --without-system-icu" >> .mozconfig
 %endif
 echo "ac_add_options --disable-system-cairo" >> .mozconfig
 echo "ac_add_options --enable-system-pixman" >> .mozconfig
-%if 0%{?system_sqlite}
-echo "ac_add_options --enable-system-sqlite" >> .mozconfig
-%else
-echo "ac_add_options --disable-system-sqlite" >> .mozconfig
-%endif
-echo "ac_add_options --with-system-zlib" >> .mozconfig
-echo "ac_add_options --with-system-bz2" >> .mozconfig
 echo "ac_add_options --with-system-libevent=%{_prefix}" >> .mozconfig
-echo "ac_add_options --enable-llvm-hacks" >> .mozconfig
 %if %{?with_vpx}
 echo "ac_add_options --with-system-libvpx" >> .mozconfig
 %else
 echo "ac_add_options --without-system-libvpx" >> .mozconfig
 %endif
-echo "ac_add_options --disable-libjpeg-turbo" >> .mozconfig
 echo "ac_add_options --with-system-jpeg" >> .mozconfig
-echo "ac_add_options --disable-crashreporter" >> .mozconfig
-%ifnarch %{power64} aarch64 s390x %{arm}
-echo "ac_add_options --disable-eme" >> .mozconfig
-%endif
 
 # This option works on these architectures only
-%ifarch %{ix86} x86_64 %{arm}
+%ifarch %{arm}
 echo "ac_add_options --disable-elf-hack" >> .mozconfig
 %endif
 
-%ifarch aarch64 ppc64 s390x %{arm} %{ix86}
-#echo "ac_add_options --disable-skia" >> .mozconfig
-%endif
-
 %if 0%{?debug_build}
 echo "ac_add_options --enable-debug" >> .mozconfig
 echo "ac_add_options --disable-optimize" >> .mozconfig
-echo "ac_add_options --enable-dtrace" >> .mozconfig
 %else
 %global optimize_flags "none"
 %ifnarch s390x
@@ -480,10 +462,8 @@ echo "ac_add_options --disable-debug" >> .mozconfig
 %endif
 %ifarch %{arm}
 echo "ac_add_options --enable-linker=gold" >> .mozconfig
-# mzbz #1436511
-echo "ac_add_options --disable-av1" >> .mozconfig
 %endif
-
+echo "ac_add_options --enable-av1" >> .mozconfig
 echo "ac_add_options --disable-strip" >> .mozconfig
 echo "ac_add_options --disable-install-strip" >> .mozconfig
 echo "ac_add_options --disable-tests" >> .mozconfig
@@ -493,14 +473,7 @@ echo "ac_add_options --disable-tests" >> .mozconfig
 echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 %endif
 
-echo "ac_add_options --disable-rust-tests" >> .mozconfig
-echo "ac_add_options --disable-gtest-in-build" >> .mozconfig
-
-%if 0%{?hardened_build}
-echo "ac_add_options --enable-hardening" >> .mozconfig
-%endif
-
-%ifarch s390 s390x
+%ifarch s390x
 echo "ac_add_options --disable-ion" >> .mozconfig
 %endif
 
@@ -508,6 +481,10 @@ echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .
 
 # Remove executable bit to make brp-mangle-shebangs happy.
 chmod -x third_party/rust/itertools/src/lib.rs
+chmod a-x third_party/rust/gfx-backend-vulkan/src/*.rs
+chmod a-x third_party/rust/gfx-hal/src/*.rs
+chmod a-x third_party/rust/ash/src/extensions/ext/*.rs
+chmod a-x third_party/rust/ash/src/extensions/khr/*.rs
 
 # Remove unrecognized files
 find extensions/gnu -name cose.manifest -delete
@@ -558,7 +535,9 @@ MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//')
 
 # Use hardened build?
+%if %{?hardened_build}
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
+%endif
 
 %if %{?debug_build}
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
@@ -606,9 +585,14 @@ export RANLIB="gcc-ranlib"
 %endif
 
 MOZ_SMP_FLAGS=-j1
-# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
+# On x86_64 architectures, Mozilla can build up to 4 jobs at once in parallel,
 # however builds tend to fail on other arches when building in parallel.
-%ifarch x86_64 %{power64} aarch64
+%ifarch %{ix86}
+[ -z "$RPM_BUILD_NCPUS" ] && \
+     RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
+[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
+%endif
+%ifarch x86_64 ppc %{power64} aarch64
 [ -z "$RPM_BUILD_NCPUS" ] && \
      RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
@@ -616,9 +600,8 @@ MOZ_SMP_FLAGS=-j1
 [ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
 %endif
 
-export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
-export MOZ_OPTIMIZE_FLAGS=" -freorder-blocks -fno-reorder-functions"
-export STRIP=/bin/true
+echo "export MOZ_MAKE_FLAGS=\"$MOZ_SMP_FLAGS\"" >> .mozconfig
+echo "export STRIP=/bin/true" >> .mozconfig
 MOZ_RUN_GTEST=0 ./mach -v build
 
 %install
@@ -790,13 +773,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{icecatappdir}/plugin-container
 %{icecatappdir}/pingsender
 %{icecatappdir}/gmp-clearkey/
-%{icecatappdir}/chrome.manifest
 %{icecatappdir}/gtk2/*.so
-%if !%{?system_nss}
-%{icecatappdir}/libfreeblpriv3.chk
-%{icecatappdir}/libnssdbm3.chk
-%{icecatappdir}/libsoftokn3.chk
-%endif
+%{icecatappdir}/Throbber-small.gif
+%{icecatappdir}/crashreporter
+%{icecatappdir}/minidump-analyzer
 %if 0%{?build_langpacks}
 %dir %{langpackdir}
 %endif
@@ -812,6 +792,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Wed Jul 01 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0-1.rh1.test
+- Mozilla Release 78.0ESR
+
 * Tue Jun 02 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.9.0-1.rh2
 - Mozilla release 68.9.0ESR
 
diff --git a/mozilla-1196777.patch b/mozilla-1196777.patch
new file mode 100644
index 0000000..ed3ab16
--- /dev/null
+++ b/mozilla-1196777.patch
@@ -0,0 +1,13 @@
+diff -up firefox-68.0/widget/gtk/nsWindow.cpp.1196777 firefox-68.0/widget/gtk/nsWindow.cpp
+--- firefox-68.0/widget/gtk/nsWindow.cpp.1196777	2019-07-02 11:47:06.864726826 +0200
++++ firefox-68.0/widget/gtk/nsWindow.cpp	2019-07-02 11:48:09.896544339 +0200
+@@ -156,7 +156,8 @@ const gint kEvents =
+ #if GTK_CHECK_VERSION(3, 4, 0)
+     GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK |
+ #endif
+-    GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
++    GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
++    GDK_FOCUS_CHANGE_MASK;
+ 
+ #if !GTK_CHECK_VERSION(3, 22, 0)
+ typedef enum {
diff --git a/mozilla-1337988.patch b/mozilla-1337988.patch
new file mode 100644
index 0000000..8c40445
--- /dev/null
+++ b/mozilla-1337988.patch
@@ -0,0 +1,496 @@
+diff -up firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp.1337988 firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp
+--- firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp.1337988	2017-09-14 22:15:56.000000000 +0200
++++ firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp	2017-09-25 10:34:11.205611698 +0200
+@@ -1719,7 +1719,7 @@ NPObjWrapper_ObjectMoved(JSObject *obj,
+   auto entry =
+     static_cast<NPObjWrapperHashEntry*>(sNPObjWrappers->Search(npobj));
+   MOZ_ASSERT(entry && entry->mJSObj);
+-  MOZ_ASSERT(entry->mJSObj == old);
++  MOZ_ASSERT(entry->mJSObj.unbarrieredGetPtr() == old);
+   entry->mJSObj = obj;
+ }
+ 
+diff -up firefox-56.0/js/ipc/JavaScriptShared.cpp.1337988 firefox-56.0/js/ipc/JavaScriptShared.cpp
+--- firefox-56.0/js/ipc/JavaScriptShared.cpp.1337988	2017-07-31 18:20:47.000000000 +0200
++++ firefox-56.0/js/ipc/JavaScriptShared.cpp	2017-09-25 10:34:11.205611698 +0200
+@@ -101,7 +101,7 @@ IdToObjectMap::has(const ObjectId& id, c
+     auto p = table_.lookup(id);
+     if (!p)
+         return false;
+-    return p->value() == obj;
++    return p->value().unbarrieredGet() == obj;
+ }
+ #endif
+ 
+diff -up firefox-56.0/js/public/RootingAPI.h.1337988 firefox-56.0/js/public/RootingAPI.h
+--- firefox-56.0/js/public/RootingAPI.h.1337988	2017-07-31 18:20:47.000000000 +0200
++++ firefox-56.0/js/public/RootingAPI.h	2017-09-25 10:34:11.206611695 +0200
+@@ -148,6 +148,10 @@ template<typename T>
+ struct PersistentRootedMarker;
+ } /* namespace gc */
+ 
++#define DECLARE_POINTER_COMPARISON_OPS(T)                                                         \
++    bool operator==(const T& other) const { return get() == other; }                              \
++    bool operator!=(const T& other) const { return get() != other; }
++
+ // Important: Return a reference so passing a Rooted<T>, etc. to
+ // something that takes a |const T&| is not a GC hazard.
+ #define DECLARE_POINTER_CONSTREF_OPS(T)                                                           \
+@@ -237,8 +241,6 @@ class Heap : public js::HeapBase<T, Heap
+     static_assert(js::IsHeapConstructibleType<T>::value,
+                   "Type T must be a public GC pointer type");
+   public:
+-    using ElementType = T;
+-
+     Heap() {
+         static_assert(sizeof(T) == sizeof(Heap<T>),
+                       "Heap<T> must be binary compatible with T.");
+@@ -385,8 +387,6 @@ template <typename T>
+ class TenuredHeap : public js::HeapBase<T, TenuredHeap<T>>
+ {
+   public:
+-    using ElementType = T;
+-
+     TenuredHeap() : bits(0) {
+         static_assert(sizeof(T) == sizeof(TenuredHeap<T>),
+                       "TenuredHeap<T> must be binary compatible with T.");
+@@ -394,6 +394,9 @@ class TenuredHeap : public js::HeapBase<
+     explicit TenuredHeap(T p) : bits(0) { setPtr(p); }
+     explicit TenuredHeap(const TenuredHeap<T>& p) : bits(0) { setPtr(p.getPtr()); }
+ 
++    bool operator==(const TenuredHeap<T>& other) { return bits == other.bits; }
++    bool operator!=(const TenuredHeap<T>& other) { return bits != other.bits; }
++
+     void setPtr(T newPtr) {
+         MOZ_ASSERT((reinterpret_cast<uintptr_t>(newPtr) & flagsMask) == 0);
+         if (newPtr)
+@@ -470,8 +473,6 @@ class MOZ_NONHEAP_CLASS Handle : public
+     friend class JS::MutableHandle<T>;
+ 
+   public:
+-    using ElementType = T;
+-
+     /* Creates a handle from a handle of a type convertible to T. */
+     template <typename S>
+     MOZ_IMPLICIT Handle(Handle<S> handle,
+@@ -533,6 +534,7 @@ class MOZ_NONHEAP_CLASS Handle : public
+     MOZ_IMPLICIT Handle(MutableHandle<S>& root,
+                         typename mozilla::EnableIf<mozilla::IsConvertible<S, T>::value, int>::Type dummy = 0);
+ 
++    DECLARE_POINTER_COMPARISON_OPS(T);
+     DECLARE_POINTER_CONSTREF_OPS(T);
+     DECLARE_NONPOINTER_ACCESSOR_METHODS(*ptr);
+ 
+@@ -559,8 +561,6 @@ template <typename T>
+ class MOZ_STACK_CLASS MutableHandle : public js::MutableHandleBase<T, MutableHandle<T>>
+ {
+   public:
+-    using ElementType = T;
+-
+     inline MOZ_IMPLICIT MutableHandle(Rooted<T>* root);
+     inline MOZ_IMPLICIT MutableHandle(PersistentRooted<T>* root);
+ 
+@@ -589,6 +589,7 @@ class MOZ_STACK_CLASS MutableHandle : pu
+         return h;
+     }
+ 
++    DECLARE_POINTER_COMPARISON_OPS(T);
+     DECLARE_POINTER_CONSTREF_OPS(T);
+     DECLARE_NONPOINTER_ACCESSOR_METHODS(*ptr);
+     DECLARE_NONPOINTER_MUTABLE_ACCESSOR_METHODS(*ptr);
+@@ -805,8 +806,6 @@ class MOZ_RAII Rooted : public js::Roote
+     }
+ 
+   public:
+-    using ElementType = T;
+-
+     template <typename RootingContext>
+     explicit Rooted(const RootingContext& cx)
+       : ptr(GCPolicy<T>::initial())
+@@ -839,6 +838,7 @@ class MOZ_RAII Rooted : public js::Roote
+         ptr = mozilla::Move(value);
+     }
+ 
++    DECLARE_POINTER_COMPARISON_OPS(T);
+     DECLARE_POINTER_CONSTREF_OPS(T);
+     DECLARE_POINTER_ASSIGN_OPS(Rooted, T);
+     DECLARE_NONPOINTER_ACCESSOR_METHODS(ptr);
+@@ -903,14 +903,13 @@ template <typename T>
+ class MOZ_RAII FakeRooted : public RootedBase<T, FakeRooted<T>>
+ {
+   public:
+-    using ElementType = T;
+-
+     template <typename CX>
+     explicit FakeRooted(CX* cx) : ptr(JS::GCPolicy<T>::initial()) {}
+ 
+     template <typename CX>
+     FakeRooted(CX* cx, T initial) : ptr(initial) {}
+ 
++    DECLARE_POINTER_COMPARISON_OPS(T);
+     DECLARE_POINTER_CONSTREF_OPS(T);
+     DECLARE_POINTER_ASSIGN_OPS(FakeRooted, T);
+     DECLARE_NONPOINTER_ACCESSOR_METHODS(ptr);
+@@ -931,8 +930,6 @@ template <typename T>
+ class FakeMutableHandle : public js::MutableHandleBase<T, FakeMutableHandle<T>>
+ {
+   public:
+-    using ElementType = T;
+-
+     MOZ_IMPLICIT FakeMutableHandle(T* t) {
+         ptr = t;
+     }
+@@ -1124,8 +1121,6 @@ class PersistentRooted : public js::Root
+     }
+ 
+   public:
+-    using ElementType = T;
+-
+     PersistentRooted() : ptr(GCPolicy<T>::initial()) {}
+ 
+     explicit PersistentRooted(RootingContext* cx)
+@@ -1203,6 +1198,7 @@ class PersistentRooted : public js::Root
+         }
+     }
+ 
++    DECLARE_POINTER_COMPARISON_OPS(T);
+     DECLARE_POINTER_CONSTREF_OPS(T);
+     DECLARE_POINTER_ASSIGN_OPS(PersistentRooted, T);
+     DECLARE_NONPOINTER_ACCESSOR_METHODS(ptr);
+@@ -1234,8 +1230,6 @@ class JS_PUBLIC_API(ObjectPtr)
+     Heap<JSObject*> value;
+ 
+   public:
+-    using ElementType = JSObject*;
+-
+     ObjectPtr() : value(nullptr) {}
+ 
+     explicit ObjectPtr(JSObject* obj) : value(obj) {}
+@@ -1342,177 +1336,6 @@ Swap(JS::TenuredHeap<T>& aX, JS::Tenured
+ 
+ } /* namespace mozilla */
+ 
+-namespace js {
+-namespace detail {
+-
+-// DefineComparisonOps is a trait which selects which wrapper classes to define
+-// operator== and operator!= for. It supplies a getter function to extract the
+-// value to compare. This is used to avoid triggering the automatic read
+-// barriers where appropriate.
+-//
+-// If DefineComparisonOps is not specialized for a particular wrapper you may
+-// get errors such as 'invalid operands to binary expression' or 'no match for
+-// operator==' when trying to compare against instances of the wrapper.
+-
+-template <typename T>
+-struct DefineComparisonOps : mozilla::FalseType {};
+-
+-template <typename T>
+-struct DefineComparisonOps<JS::Heap<T>> : mozilla::TrueType {
+-    static const T& get(const JS::Heap<T>& v) { return v.unbarrieredGet(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<JS::TenuredHeap<T>> : mozilla::TrueType {
+-    static const T get(const JS::TenuredHeap<T>& v) { return v.unbarrieredGetPtr(); }
+-};
+-
+-template <>
+-struct DefineComparisonOps<JS::ObjectPtr> : mozilla::TrueType {
+-    static const JSObject* get(const JS::ObjectPtr& v) { return v.unbarrieredGet(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<JS::Rooted<T>> : mozilla::TrueType {
+-    static const T& get(const JS::Rooted<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<JS::Handle<T>> : mozilla::TrueType {
+-    static const T& get(const JS::Handle<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<JS::MutableHandle<T>> : mozilla::TrueType {
+-    static const T& get(const JS::MutableHandle<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<JS::PersistentRooted<T>> : mozilla::TrueType {
+-    static const T& get(const JS::PersistentRooted<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<js::FakeRooted<T>> : mozilla::TrueType {
+-    static const T& get(const js::FakeRooted<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<js::FakeMutableHandle<T>> : mozilla::TrueType {
+-    static const T& get(const js::FakeMutableHandle<T>& v) { return v.get(); }
+-};
+-
+-} /* namespace detail */
+-} /* namespace js */
+-
+-// Overload operator== and operator!= for all types with the DefineComparisonOps
+-// trait using the supplied getter.
+-//
+-// There are four cases:
+-
+-// Case 1: comparison between two wrapper objects.
+-
+-template <typename T, typename U>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           js::detail::DefineComparisonOps<U>::value, bool>::Type
+-operator==(const T& a, const U& b) {
+-    return js::detail::DefineComparisonOps<T>::get(a) == js::detail::DefineComparisonOps<U>::get(b);
+-}
+-
+-template <typename T, typename U>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           js::detail::DefineComparisonOps<U>::value, bool>::Type
+-operator!=(const T& a, const U& b) {
+-    return !(a == b);
+-}
+-
+-// Case 2: comparison between a wrapper object and its unwrapped element type.
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value, bool>::Type
+-operator==(const T& a, const typename T::ElementType& b) {
+-    return js::detail::DefineComparisonOps<T>::get(a) == b;
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value, bool>::Type
+-operator!=(const T& a, const typename T::ElementType& b) {
+-    return !(a == b);
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value, bool>::Type
+-operator==(const typename T::ElementType& a, const T& b) {
+-    return a == js::detail::DefineComparisonOps<T>::get(b);
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value, bool>::Type
+-operator!=(const typename T::ElementType& a, const T& b) {
+-    return !(a == b);
+-}
+-
+-// Case 3: For pointer wrappers, comparison between the wrapper and a const
+-// element pointer.
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator==(const typename mozilla::RemovePointer<typename T::ElementType>::Type* a, const T& b) {
+-    return a == js::detail::DefineComparisonOps<T>::get(b);
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator!=(const typename mozilla::RemovePointer<typename T::ElementType>::Type* a, const T& b) {
+-    return !(a == b);
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator==(const T& a, const typename mozilla::RemovePointer<typename T::ElementType>::Type* b) {
+-    return js::detail::DefineComparisonOps<T>::get(a) == b;
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator!=(const T& a, const typename mozilla::RemovePointer<typename T::ElementType>::Type* b) {
+-    return !(a == b);
+-}
+-
+-// Case 4: For pointer wrappers, comparison between the wrapper and nullptr.
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator==(std::nullptr_t a, const T& b) {
+-    return a == js::detail::DefineComparisonOps<T>::get(b);
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator!=(std::nullptr_t a, const T& b) {
+-    return !(a == b);
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator==(const T& a, std::nullptr_t b) {
+-    return js::detail::DefineComparisonOps<T>::get(a) == b;
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator!=(const T& a, std::nullptr_t b) {
+-    return !(a == b);
+-}
+-
+ #undef DELETE_ASSIGNMENT_OPS
+ 
+ #endif  /* js_RootingAPI_h */
+diff -up firefox-56.0/js/src/gc/Barrier.h.1337988 firefox-56.0/js/src/gc/Barrier.h
+--- firefox-56.0/js/src/gc/Barrier.h.1337988	2017-09-14 22:16:01.000000000 +0200
++++ firefox-56.0/js/src/gc/Barrier.h	2017-09-25 10:34:11.206611695 +0200
+@@ -353,8 +353,8 @@ class WriteBarrieredBase : public Barrie
+     explicit WriteBarrieredBase(const T& v) : BarrieredBase<T>(v) {}
+ 
+   public:
+-    using ElementType = T;
+ 
++    DECLARE_POINTER_COMPARISON_OPS(T);
+     DECLARE_POINTER_CONSTREF_OPS(T);
+ 
+     // Use this if the automatic coercion to T isn't working.
+@@ -612,13 +612,14 @@ class ReadBarriered : public ReadBarrier
+         return *this;
+     }
+ 
+-    const T& get() const {
+-        if (InternalBarrierMethods<T>::isMarkable(this->value))
+-            this->read();
++    const T get() const {
++        if (!InternalBarrierMethods<T>::isMarkable(this->value))
++            return JS::GCPolicy<T>::initial();
++        this->read();
+         return this->value;
+     }
+ 
+-    const T& unbarrieredGet() const {
++    const T unbarrieredGet() const {
+         return this->value;
+     }
+ 
+@@ -626,9 +627,9 @@ class ReadBarriered : public ReadBarrier
+         return bool(this->value);
+     }
+ 
+-    operator const T&() const { return get(); }
++    operator const T() const { return get(); }
+ 
+-    const T& operator->() const { return get(); }
++    const T operator->() const { return get(); }
+ 
+     T* unsafeGet() { return &this->value; }
+     T const* unsafeGet() const { return &this->value; }
+@@ -955,35 +956,6 @@ typedef ReadBarriered<WasmTableObject*>
+ 
+ typedef ReadBarriered<Value> ReadBarrieredValue;
+ 
+-namespace detail {
+-
+-template <typename T>
+-struct DefineComparisonOps<PreBarriered<T>> : mozilla::TrueType {
+-    static const T& get(const PreBarriered<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<GCPtr<T>> : mozilla::TrueType {
+-    static const T& get(const GCPtr<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<HeapPtr<T>> : mozilla::TrueType {
+-    static const T& get(const HeapPtr<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<ReadBarriered<T>> : mozilla::TrueType {
+-    static const T& get(const ReadBarriered<T>& v) { return v.unbarrieredGet(); }
+-};
+-
+-template <>
+-struct DefineComparisonOps<HeapSlot> : mozilla::TrueType {
+-    static const Value& get(const HeapSlot& v) { return v.get(); }
+-};
+-
+-} /* namespace detail */
+-
+ } /* namespace js */
+ 
+ #endif /* gc_Barrier_h */
+diff -up firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp.1337988 firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp
+--- firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp.1337988	2017-09-14 22:16:02.000000000 +0200
++++ firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp	2017-09-25 10:34:11.206611695 +0200
+@@ -5,7 +5,6 @@
+  * 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/. */
+ 
+-#include "mozilla/TypeTraits.h"
+ #include "mozilla/UniquePtr.h"
+ 
+ #include "js/RootingAPI.h"
+diff -up firefox-56.0/js/src/vm/SharedMem.h.1337988 firefox-56.0/js/src/vm/SharedMem.h
+--- firefox-56.0/js/src/vm/SharedMem.h.1337988	2017-06-15 22:52:29.000000000 +0200
++++ firefox-56.0/js/src/vm/SharedMem.h	2017-09-25 10:34:11.206611695 +0200
+@@ -12,8 +12,8 @@
+ template<typename T>
+ class SharedMem
+ {
+-    // static_assert(mozilla::IsPointer<T>::value,
+-    //               "SharedMem encapsulates pointer types");
++    static_assert(mozilla::IsPointer<T>::value,
++                  "SharedMem encapsulates pointer types");
+ 
+     enum Sharedness {
+         IsUnshared,
+diff -up firefox-56.0/js/xpconnect/src/XPCInlines.h.1337988 firefox-56.0/js/xpconnect/src/XPCInlines.h
+--- firefox-56.0/js/xpconnect/src/XPCInlines.h.1337988	2017-09-14 22:16:03.000000000 +0200
++++ firefox-56.0/js/xpconnect/src/XPCInlines.h	2017-09-25 10:34:11.206611695 +0200
+@@ -465,7 +465,7 @@ inline
+ void XPCWrappedNativeTearOff::JSObjectMoved(JSObject* obj, const JSObject* old)
+ {
+     MOZ_ASSERT(!IsMarked());
+-    MOZ_ASSERT(mJSObject == old);
++    MOZ_ASSERT(mJSObject.unbarrieredGetPtr() == old);
+     mJSObject = obj;
+ }
+ 
+diff -up firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp.1337988 firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp
+--- firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp.1337988	2017-09-14 22:16:03.000000000 +0200
++++ firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp	2017-09-25 10:34:11.207611692 +0200
+@@ -874,7 +874,7 @@ void
+ XPCWrappedNative::FlatJSObjectMoved(JSObject* obj, const JSObject* old)
+ {
+     JS::AutoAssertGCCallback inCallback;
+-    MOZ_ASSERT(mFlatJSObject == old);
++    MOZ_ASSERT(mFlatJSObject.unbarrieredGetPtr() == old);
+ 
+     nsWrapperCache* cache = nullptr;
+     CallQueryInterface(mIdentity, &cache);
+diff -up firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp.1337988 firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp
+--- firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp.1337988	2017-07-31 18:20:47.000000000 +0200
++++ firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp	2017-09-25 10:34:11.207611692 +0200
+@@ -101,7 +101,7 @@ XPCWrappedNativeProto::CallPostCreatePro
+ void
+ XPCWrappedNativeProto::JSProtoObjectFinalized(js::FreeOp* fop, JSObject* obj)
+ {
+-    MOZ_ASSERT(obj == mJSProtoObject, "huh?");
++    MOZ_ASSERT(obj == mJSProtoObject.unbarrieredGet(), "huh?");
+ 
+ #ifdef DEBUG
+     // Check that this object has already been swept from the map.
+@@ -117,7 +117,7 @@ XPCWrappedNativeProto::JSProtoObjectFina
+ void
+ XPCWrappedNativeProto::JSProtoObjectMoved(JSObject* obj, const JSObject* old)
+ {
+-    MOZ_ASSERT(mJSProtoObject == old);
++    MOZ_ASSERT(mJSProtoObject.unbarrieredGet() == old);
+     mJSProtoObject.init(obj); // Update without triggering barriers.
+ }
+ 
diff --git a/mozilla-1548475.patch b/mozilla-1548475.patch
deleted file mode 100644
index b325683..0000000
--- a/mozilla-1548475.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
---- a/dom/plugins/base/nsPluginHost.cpp
-+++ b/dom/plugins/base/nsPluginHost.cpp
-@@ -105,6 +105,10 @@
- #  include "windows.h"
- #  include "winbase.h"
- #endif
-+#if (MOZ_WIDGET_GTK)
-+#  include <gdk/gdk.h>
-+#  include <gdk/gdkx.h>
-+#endif
- 
- #include "npapi.h"
- 
-@@ -358,9 +362,15 @@
-   mOverrideInternalTypes =
-       Preferences::GetBool("plugin.override_internal_types", false);
- 
--  mPluginsDisabled = Preferences::GetBool("plugin.disable", false);
--
--  Preferences::AddStrongObserver(this, "plugin.disable");
-+  bool waylandBackend = false;
-+#if MOZ_WIDGET_GTK
-+  waylandBackend = !GDK_IS_X11_DISPLAY(gdk_display_get_default());
-+#endif
-+  mPluginsDisabled =
-+      Preferences::GetBool("plugin.disable", false) || waylandBackend;
-+  if (!waylandBackend) {
-+    Preferences::AddStrongObserver(this, "plugin.disable");
-+  }
- 
-   nsCOMPtr<nsIObserverService> obsService =
-       mozilla::services::GetObserverService();
-
diff --git a/mozilla-1562827.patch b/mozilla-1562827.patch
deleted file mode 100644
index 497133c..0000000
--- a/mozilla-1562827.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -up firefox-69.0/widget/gtk/nsWindow.cpp.mozilla-1562827 firefox-69.0/widget/gtk/nsWindow.cpp
---- firefox-69.0/widget/gtk/nsWindow.cpp.mozilla-1562827	2019-09-02 15:16:15.031528276 +0200
-+++ firefox-69.0/widget/gtk/nsWindow.cpp	2019-09-02 15:16:15.037528254 +0200
-@@ -818,7 +818,6 @@ void nsWindow::SetParent(nsIWidget* aNew
-   if (mParent) {
-     mParent->RemoveChild(this);
-   }
--
-   mParent = aNewParent;
- 
-   GtkWidget* oldContainer = GetMozContainerWidget();
-@@ -830,88 +829,73 @@ void nsWindow::SetParent(nsIWidget* aNew
-     return;
-   }
- 
-+  nsWindow* newParent = static_cast<nsWindow*>(aNewParent);
-+  GdkWindow* newParentWindow = nullptr;
-+  GtkWidget* newContainer = nullptr;
-   if (aNewParent) {
-     aNewParent->AddChild(this);
--    ReparentNativeWidget(aNewParent);
-+    newParentWindow = newParent->mGdkWindow;
-+    newContainer = newParent->GetMozContainerWidget();
-   } else {
-     // aNewParent is nullptr, but reparent to a hidden window to avoid
-     // destroying the GdkWindow and its descendants.
-     // An invisible container widget is needed to hold descendant
-     // GtkWidgets.
--    GtkWidget* newContainer = EnsureInvisibleContainer();
--    GdkWindow* newParentWindow = gtk_widget_get_window(newContainer);
--    ReparentNativeWidgetInternal(aNewParent, newContainer, newParentWindow,
--                                 oldContainer);
--  }
--}
--
--bool nsWindow::WidgetTypeSupportsAcceleration() { return !IsSmallPopup(); }
--
--void nsWindow::ReparentNativeWidget(nsIWidget* aNewParent) {
--  MOZ_ASSERT(aNewParent, "null widget");
--  NS_ASSERTION(!mIsDestroyed, "");
--  NS_ASSERTION(!static_cast<nsWindow*>(aNewParent)->mIsDestroyed, "");
--
--  GtkWidget* oldContainer = GetMozContainerWidget();
--  if (!oldContainer) {
--    // The GdkWindows have been destroyed so there is nothing else to
--    // reparent.
--    MOZ_ASSERT(gdk_window_is_destroyed(mGdkWindow),
--               "live GdkWindow with no widget");
--    return;
-+    newContainer = EnsureInvisibleContainer();
-+    newParentWindow = gtk_widget_get_window(newContainer);
-   }
--  MOZ_ASSERT(!gdk_window_is_destroyed(mGdkWindow),
--             "destroyed GdkWindow with widget");
- 
--  auto* newParent = static_cast<nsWindow*>(aNewParent);
--  GdkWindow* newParentWindow = newParent->mGdkWindow;
--  GtkWidget* newContainer = newParent->GetMozContainerWidget();
--  GtkWindow* shell = GTK_WINDOW(mShell);
--
--  if (shell && gtk_window_get_transient_for(shell)) {
--    GtkWindow* topLevelParent =
--        GTK_WINDOW(gtk_widget_get_toplevel(newContainer));
--    gtk_window_set_transient_for(shell, topLevelParent);
--  }
--
--  ReparentNativeWidgetInternal(aNewParent, newContainer, newParentWindow,
--                               oldContainer);
--}
--
--void nsWindow::ReparentNativeWidgetInternal(nsIWidget* aNewParent,
--                                            GtkWidget* aNewContainer,
--                                            GdkWindow* aNewParentWindow,
--                                            GtkWidget* aOldContainer) {
--  if (!aNewContainer) {
-+  if (!newContainer) {
-     // The new parent GdkWindow has been destroyed.
--    MOZ_ASSERT(!aNewParentWindow || gdk_window_is_destroyed(aNewParentWindow),
-+    MOZ_ASSERT(!newParentWindow || gdk_window_is_destroyed(newParentWindow),
-                "live GdkWindow with no widget");
-     Destroy();
-   } else {
--    if (aNewContainer != aOldContainer) {
--      MOZ_ASSERT(!gdk_window_is_destroyed(aNewParentWindow),
-+    if (newContainer != oldContainer) {
-+      MOZ_ASSERT(!gdk_window_is_destroyed(newParentWindow),
-                  "destroyed GdkWindow with widget");
--      SetWidgetForHierarchy(mGdkWindow, aOldContainer, aNewContainer);
-+      SetWidgetForHierarchy(mGdkWindow, oldContainer, newContainer);
- 
--      if (aOldContainer == gInvisibleContainer) {
-+      if (oldContainer == gInvisibleContainer) {
-         CheckDestroyInvisibleContainer();
-       }
-     }
- 
--    if (!mIsTopLevel) {
--      gdk_window_reparent(mGdkWindow, aNewParentWindow,
--                          DevicePixelsToGdkCoordRoundDown(mBounds.x),
--                          DevicePixelsToGdkCoordRoundDown(mBounds.y));
--    }
-+    gdk_window_reparent(mGdkWindow, newParentWindow,
-+                        DevicePixelsToGdkCoordRoundDown(mBounds.x),
-+                        DevicePixelsToGdkCoordRoundDown(mBounds.y));
-+    mToplevelParentWindow = GTK_WINDOW(gtk_widget_get_toplevel(newContainer));
-   }
- 
--  auto* newParent = static_cast<nsWindow*>(aNewParent);
-   bool parentHasMappedToplevel = newParent && newParent->mHasMappedToplevel;
-   if (mHasMappedToplevel != parentHasMappedToplevel) {
-     SetHasMappedToplevel(parentHasMappedToplevel);
-   }
- }
- 
-+bool nsWindow::WidgetTypeSupportsAcceleration() { return !IsSmallPopup(); }
-+
-+void nsWindow::ReparentNativeWidget(nsIWidget* aNewParent) {
-+  MOZ_ASSERT(aNewParent, "null widget");
-+  MOZ_ASSERT(!mIsDestroyed, "");
-+  MOZ_ASSERT(!static_cast<nsWindow*>(aNewParent)->mIsDestroyed, "");
-+  MOZ_ASSERT(!gdk_window_is_destroyed(mGdkWindow),
-+             "destroyed GdkWindow with widget");
-+
-+  MOZ_ASSERT(
-+      !mParent,
-+      "nsWindow::ReparentNativeWidget() works on toplevel windows only.");
-+
-+  auto* newParent = static_cast<nsWindow*>(aNewParent);
-+  GtkWindow* newParentWidget = GTK_WINDOW(newParent->GetGtkWidget());
-+  GtkWindow* shell = GTK_WINDOW(mShell);
-+
-+  if (shell && gtk_window_get_transient_for(shell)) {
-+    gtk_window_set_transient_for(shell, newParentWidget);
-+    mToplevelParentWindow = newParentWidget;
-+  }
-+}
-+
- void nsWindow::SetModal(bool aModal) {
-   LOG(("nsWindow::SetModal [%p] %d\n", (void*)this, aModal));
-   if (mIsDestroyed) return;
-diff -up firefox-69.0/widget/gtk/nsWindow.h.mozilla-1562827 firefox-69.0/widget/gtk/nsWindow.h
diff --git a/mozilla-1564873.patch b/mozilla-1564873.patch
deleted file mode 100644
index de159c1..0000000
--- a/mozilla-1564873.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1574168632 0
-# Node ID 82e4062e839a57c0dbcb08df9965883c162eb8d1
-# Parent  ff37a98047d63550c77052e7dfecbda14b188e0d
-Bug 1564873 - Fix straight-forward uses of mem::uninitialized in webrender. r=nical
-
-Differential Revision: https://phabricator.services.mozilla.com/D53359
-
-diff --git a/gfx/wr/webrender/src/platform/unix/font.rs b/gfx/wr/webrender/src/platform/unix/font.rs
---- a/gfx/wr/webrender/src/platform/unix/font.rs
-+++ b/gfx/wr/webrender/src/platform/unix/font.rs
-@@ -530,26 +530,26 @@ impl FontContext {
-     // Get the bounding box for a glyph, accounting for sub-pixel positioning.
-     fn get_bounding_box(
-         &self,
-         slot: FT_GlyphSlot,
-         font: &FontInstance,
-         glyph: &GlyphKey,
-         scale: f32,
-     ) -> FT_BBox {
--        let mut cbox: FT_BBox = unsafe { mem::uninitialized() };
-+        // Get the estimated bounding box from FT (control points).
-+        let mut cbox = FT_BBox { xMin: 0, yMin: 0, xMax: 0, yMax: 0 };
- 
--        // Get the estimated bounding box from FT (control points).
-         unsafe {
-             FT_Outline_Get_CBox(&(*slot).outline, &mut cbox);
-+        }
- 
--            // For spaces and other non-printable characters, early out.
--            if (*slot).outline.n_contours == 0 {
--                return cbox;
--            }
-+        // For spaces and other non-printable characters, early out.
-+        if unsafe { (*slot).outline.n_contours } == 0 {
-+            return cbox;
-         }
- 
-         self.pad_bounding_box(font, &mut cbox);
- 
-         // Offset the bounding box by subpixel positioning.
-         // Convert to 26.6 fixed point format for FT.
-         let (dx, dy) = font.get_subpx_offset(glyph);
-         let (dx, dy) = (
-@@ -713,17 +713,17 @@ impl FontContext {
-             (dx / scale as f64 * 64.0 + 0.5) as FT_Pos,
-             -(dy / scale as f64 * 64.0 + 0.5) as FT_Pos,
-         );
- 
-         // Move the outline curves to be at the origin, taking
-         // into account the subpixel positioning.
-         unsafe {
-             let outline = &(*slot).outline;
--            let mut cbox: FT_BBox = mem::uninitialized();
-+            let mut cbox = FT_BBox { xMin: 0, yMin: 0, xMax: 0, yMax: 0 };
-             FT_Outline_Get_CBox(outline, &mut cbox);
-             self.pad_bounding_box(font, &mut cbox);
-             FT_Outline_Translate(
-                 outline,
-                 dx - ((cbox.xMin + dx) & !63),
-                 dy - ((cbox.yMin + dy) & !63),
-             );
-         }
-diff --git a/gfx/wr/webrender/src/prim_store/gradient.rs b/gfx/wr/webrender/src/prim_store/gradient.rs
---- a/gfx/wr/webrender/src/prim_store/gradient.rs
-+++ b/gfx/wr/webrender/src/prim_store/gradient.rs
-@@ -18,7 +18,7 @@
- use crate::prim_store::{PrimKeyCommonData, PrimTemplateCommonData, PrimitiveStore};
- use crate::prim_store::{NinePatchDescriptor, PointKey, SizeKey, InternablePrimitive};
- use crate::render_task::RenderTaskCacheEntryHandle;
--use std::{hash, ops::{Deref, DerefMut}, mem};
-+use std::{hash, ops::{Deref, DerefMut}};
- use crate::util::pack_as_float;
- 
- /// The maximum number of stops a gradient may have to use the fast path.
-@@ -575,22 +575,32 @@ pub const GRADIENT_DATA_TABLE_BEGIN: usi
- // The exclusive bound of the gradient data table
- pub const GRADIENT_DATA_TABLE_END: usize = GRADIENT_DATA_LAST_STOP;
- // The number of entries in the gradient data table.
- pub const GRADIENT_DATA_TABLE_SIZE: usize = 128;
- 
- // The number of entries in a gradient data: GRADIENT_DATA_TABLE_SIZE + first stop entry + last stop entry
- pub const GRADIENT_DATA_SIZE: usize = GRADIENT_DATA_TABLE_SIZE + 2;
- 
--#[derive(Debug)]
-+/// An entry in a gradient data table representing a segment of the gradient
-+/// color space.
-+#[derive(Debug, Copy, Clone)]
- #[repr(C)]
--// An entry in a gradient data table representing a segment of the gradient color space.
--pub struct GradientDataEntry {
--    pub start_color: PremultipliedColorF,
--    pub end_color: PremultipliedColorF,
-+struct GradientDataEntry {
-+    start_color: PremultipliedColorF,
-+    end_color: PremultipliedColorF,
-+}
-+
-+impl GradientDataEntry {
-+    fn white() -> Self {
-+        Self {
-+            start_color: PremultipliedColorF::WHITE,
-+            end_color: PremultipliedColorF::WHITE,
-+        }
-+    }
- }
- 
- // TODO(gw): Tidy this up to be a free function / module?
- struct GradientGpuBlockBuilder {}
- 
- impl GradientGpuBlockBuilder {
-     /// Generate a color ramp filling the indices in [start_idx, end_idx) and interpolating
-     /// from start_color to end_color.
-@@ -657,17 +667,17 @@ impl GradientGpuBlockBuilder {
-         // within the segment of the gradient space represented by that entry. To lookup a gradient result,
-         // first the entry index is calculated to determine which two colors to interpolate between, then
-         // the offset within that entry bucket is used to interpolate between the two colors in that entry.
-         // This layout preserves hard stops, as the end color for a given entry can differ from the start
-         // color for the following entry, despite them being adjacent. Colors are stored within in BGRA8
-         // format for texture upload. This table requires the gradient color stops to be normalized to the
-         // range [0, 1]. The first and last entries hold the first and last color stop colors respectively,
-         // while the entries in between hold the interpolated color stop values for the range [0, 1].
--        let mut entries: [GradientDataEntry; GRADIENT_DATA_SIZE] = unsafe { mem::uninitialized() };
-+        let mut entries = [GradientDataEntry::white(); GRADIENT_DATA_SIZE];
- 
-         if reverse_stops {
-             // Fill in the first entry (for reversed stops) with the first color stop
-             GradientGpuBlockBuilder::fill_colors(
-                 GRADIENT_DATA_LAST_STOP,
-                 GRADIENT_DATA_LAST_STOP + 1,
-                 &cur_color,
-                 &cur_color,
-@@ -692,23 +702,16 @@ impl GradientGpuBlockBuilder {
-                     );
-                     cur_idx = next_idx;
-                 }
- 
-                 cur_color = next_color;
-             }
-             if cur_idx != GRADIENT_DATA_TABLE_BEGIN {
-                 error!("Gradient stops abruptly at {}, auto-completing to white", cur_idx);
--                GradientGpuBlockBuilder::fill_colors(
--                    GRADIENT_DATA_TABLE_BEGIN,
--                    cur_idx,
--                    &PremultipliedColorF::WHITE,
--                    &cur_color,
--                    &mut entries,
--                );
-             }
- 
-             // Fill in the last entry (for reversed stops) with the last color stop
-             GradientGpuBlockBuilder::fill_colors(
-                 GRADIENT_DATA_FIRST_STOP,
-                 GRADIENT_DATA_FIRST_STOP + 1,
-                 &cur_color,
-                 &cur_color,
-@@ -742,23 +745,16 @@ impl GradientGpuBlockBuilder {
-                     );
-                     cur_idx = next_idx;
-                 }
- 
-                 cur_color = next_color;
-             }
-             if cur_idx != GRADIENT_DATA_TABLE_END {
-                 error!("Gradient stops abruptly at {}, auto-completing to white", cur_idx);
--                GradientGpuBlockBuilder::fill_colors(
--                    cur_idx,
--                    GRADIENT_DATA_TABLE_END,
--                    &PremultipliedColorF::WHITE,
--                    &cur_color,
--                    &mut entries,
--                );
-             }
- 
-             // Fill in the last entry with the last color stop
-             GradientGpuBlockBuilder::fill_colors(
-                 GRADIENT_DATA_LAST_STOP,
-                 GRADIENT_DATA_LAST_STOP + 1,
-                 &cur_color,
-                 &cur_color,
-
-
diff --git a/mozilla-1566876-webrtc-ind.patch b/mozilla-1566876-webrtc-ind.patch
deleted file mode 100644
index 598f58f..0000000
--- a/mozilla-1566876-webrtc-ind.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
---- a/widget/gtk/nsWindow.cpp
-+++ b/widget/gtk/nsWindow.cpp
-@@ -3504,12 +3504,6 @@
-   mBounds = aRect;
-   ConstrainSize(&mBounds.width, &mBounds.height);
- 
--  // eWindowType_child is not supported on Wayland. Just switch to toplevel
--  // as a workaround.
--  if (!mIsX11Display && mWindowType == eWindowType_child) {
--    mWindowType = eWindowType_toplevel;
--  }
--
-   // figure out our parent window
-   GtkWidget* parentMozContainer = nullptr;
-   GtkContainer* parentGtkContainer = nullptr;
-@@ -3543,6 +3537,18 @@
-     topLevelParent = GTK_WINDOW(gtk_widget_get_toplevel(parentMozContainer));
-   }
- 
-+  if (!mIsX11Display) {
-+    if (mWindowType == eWindowType_child) {
-+      // eWindowType_child is not supported on Wayland. Just switch to toplevel
-+      // as a workaround.
-+      mWindowType = eWindowType_toplevel;
-+    } else if (mWindowType == eWindowType_popup && !topLevelParent) {
-+      // Workaround for Wayland where the popup windows always need to have
-+      // parent window. For example webrtc ui is a popup window without parent.
-+      mWindowType = eWindowType_toplevel;
-+    }
-+  }
-+
-   // ok, create our windows
-   switch (mWindowType) {
-     case eWindowType_dialog:
-
diff --git a/mozilla-1567434-1.patch b/mozilla-1567434-1.patch
deleted file mode 100644
index 631645b..0000000
--- a/mozilla-1567434-1.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
---- a/widget/gtk/nsWindow.h
-+++ b/widget/gtk/nsWindow.h
-@@ -487,6 +487,7 @@
-   GtkWidget* mShell;
-   MozContainer* mContainer;
-   GdkWindow* mGdkWindow;
-+  GtkWindow* mToplevelParentWindow;
-   bool mWindowShouldStartDragging = false;
-   PlatformCompositorWidgetDelegate* mCompositorWidgetDelegate;
- 
-diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
---- a/widget/gtk/nsWindow.cpp
-+++ b/widget/gtk/nsWindow.cpp
-@@ -401,6 +401,7 @@
-   mContainer = nullptr;
-   mGdkWindow = nullptr;
-   mShell = nullptr;
-+  mToplevelParentWindow = nullptr;
-   mCompositorWidgetDelegate = nullptr;
-   mHasMappedToplevel = false;
-   mIsFullyObscured = false;
-@@ -1144,6 +1145,8 @@
-     nsWindow* window =
-         static_cast<nsWindow*>(gVisibleWaylandPopupWindows->data);
-     if (window->mPopupType != ePopupTypeTooltip) break;
-+    LOG(("nsWindow::HideWaylandTooltips [%p] hidding tooltip [%p].\n",
-+         (void*)this, window));
-     window->HideWaylandWindow();
-     gVisibleWaylandPopupWindows = g_list_delete_link(
-         gVisibleWaylandPopupWindows, gVisibleWaylandPopupWindows);
-@@ -1172,9 +1175,12 @@
- // before we open another one on that level. It means that every open
- // popup needs to have an unique parent.
- GtkWidget* nsWindow::ConfigureWaylandPopupWindows() {
-+  LOG(("nsWindow::ConfigureWaylandPopupWindows [%p]\n", (void*)this));
-+
-   // Check if we're already configured.
-   if (gVisibleWaylandPopupWindows &&
-       g_list_find(gVisibleWaylandPopupWindows, this)) {
-+    LOG(("...[%p] is already configured.\n", (void*)this));
-     return GTK_WIDGET(gtk_window_get_transient_for(GTK_WINDOW(mShell)));
-   }
- 
-@@ -1182,9 +1188,15 @@
-   // as it's short lived temporary window.
-   HideWaylandTooltips();
- 
--  GtkWindow* parentWidget = nullptr;
-+  GtkWindow* parentWidget = mToplevelParentWindow;
-   if (gVisibleWaylandPopupWindows) {
-+    LOG(("... there's visible active popup [%p]\n",
-+         gVisibleWaylandPopupWindows->data));
-+
-     if (mPopupType == ePopupTypeTooltip) {
-+      LOG(("...[%p] is tooltip, parent [%p]\n", (void*)this,
-+           gVisibleWaylandPopupWindows->data));
-+
-       // Attach tooltip window to the latest popup window
-       // to have both visible.
-       nsWindow* window =
-@@ -1200,12 +1212,19 @@
-       // nsWindow::Create()) or we're toplevel popup without parent.
-       // In both cases just use parent which was passed to nsWindow::Create().
-       if (!menuPopupFrame) {
--        return GTK_WIDGET(gtk_window_get_transient_for(GTK_WINDOW(mShell)));
-+        LOG(("...[%p] menuPopupFrame = null, using given parent widget [%p]\n",
-+             (void*)this, parentWidget));
-+        return GTK_WIDGET(parentWidget);
-       }
- 
-       nsWindow* parentWindow =
-           static_cast<nsWindow*>(menuPopupFrame->GetParentMenuWidget());
-+      LOG(("...[%p] GetParentMenuWidget() = %p\n", (void*)this, parentWindow));
-+
-       if (!parentWindow) {
-+        LOG(("...[%p] using active/visible popups as a parent [%p]\n",
-+             (void*)this, gVisibleWaylandPopupWindows->data));
-+
-         // We're toplevel popup menu attached to another menu. Just use our
-         // latest popup as a parent.
-         parentWindow =
-@@ -1234,10 +1253,10 @@
-     }
-   }
- 
-+  MOZ_ASSERT(parentWidget, "Missing parent widget for wayland popup!");
-   if (parentWidget) {
-+    LOG(("...[%p] set parent widget [%p]\n", (void*)this, parentWidget));
-     gtk_window_set_transient_for(GTK_WINDOW(mShell), parentWidget);
--  } else {
--    parentWidget = gtk_window_get_transient_for(GTK_WINDOW(mShell));
-   }
-   gVisibleWaylandPopupWindows =
-       g_list_prepend(gVisibleWaylandPopupWindows, this);
-@@ -1248,9 +1267,11 @@
- static void NativeMoveResizeWaylandPopupCallback(
-     GdkWindow* window, const GdkRectangle* flipped_rect,
-     const GdkRectangle* final_rect, gboolean flipped_x, gboolean flipped_y,
--    void* unused) {
--  LOG(("%s flipped %d %d\n", __FUNCTION__, flipped_rect->x, flipped_rect->y));
--  LOG(("%s final %d %d\n", __FUNCTION__, final_rect->x, final_rect->y));
-+    void* aWindow) {
-+  LOG(("%s [%p] flipped %d %d\n", __FUNCTION__, aWindow, flipped_rect->x,
-+       flipped_rect->y));
-+  LOG(("%s [%p] final %d %d\n", __FUNCTION__, aWindow, final_rect->x,
-+       final_rect->y));
- }
- #endif
- 
-@@ -1264,6 +1285,8 @@
-   // Compositor may be confused by windows with width/height = 0
-   // and positioning such windows leads to Bug 1555866.
-   if (!AreBoundsSane()) {
-+    LOG(("nsWindow::NativeMoveResizeWaylandPopup [%p] Bounds are not sane\n",
-+         (void*)this));
-     return;
-   }
- 
-@@ -1277,6 +1300,8 @@
-   // - gdk_window_move_to_rect() is not available
-   // - the widget doesn't have a valid GdkWindow
-   if (!sGdkWindowMoveToRect || !gdkWindow) {
-+    LOG(("nsWindow::NativeMoveResizeWaylandPopup [%p] use gtk_window_move()\n",
-+         (void*)this));
-     gtk_window_move(GTK_WINDOW(mShell), aPosition->x, aPosition->y);
-     return;
-   }
-@@ -1302,8 +1327,12 @@
-   }
-   LOG(("  request result %d %d\n", rect.x, rect.y));
- #ifdef DEBUG
--  g_signal_connect(gdkWindow, "moved-to-rect",
--                   G_CALLBACK(NativeMoveResizeWaylandPopupCallback), this);
-+  if (!g_signal_handler_find(
-+          gdkWindow, G_SIGNAL_MATCH_FUNC, 0, 0, nullptr,
-+          FuncToGpointer(NativeMoveResizeWaylandPopupCallback), this)) {
-+    g_signal_connect(gdkWindow, "moved-to-rect",
-+                     G_CALLBACK(NativeMoveResizeWaylandPopupCallback), this);
-+  }
- #endif
- 
-   GdkGravity rectAnchor = GDK_GRAVITY_NORTH_WEST;
-@@ -3508,7 +3537,6 @@
-   GtkWidget* parentMozContainer = nullptr;
-   GtkContainer* parentGtkContainer = nullptr;
-   GdkWindow* parentGdkWindow = nullptr;
--  GtkWindow* topLevelParent = nullptr;
-   nsWindow* parentnsWindow = nullptr;
-   GtkWidget* eventWidget = nullptr;
-   bool drawToContainer = false;
-@@ -3534,7 +3562,8 @@
- 
-     // get the toplevel window just in case someone needs to use it
-     // for setting transients or whatever.
--    topLevelParent = GTK_WINDOW(gtk_widget_get_toplevel(parentMozContainer));
-+    mToplevelParentWindow =
-+        GTK_WINDOW(gtk_widget_get_toplevel(parentMozContainer));
-   }
- 
-   if (!mIsX11Display) {
-@@ -3542,7 +3571,7 @@
-       // eWindowType_child is not supported on Wayland. Just switch to toplevel
-       // as a workaround.
-       mWindowType = eWindowType_toplevel;
--    } else if (mWindowType == eWindowType_popup && !topLevelParent) {
-+    } else if (mWindowType == eWindowType_popup && !mToplevelParentWindow) {
-       // Workaround for Wayland where the popup windows always need to have
-       // parent window. For example webrtc ui is a popup window without parent.
-       mWindowType = eWindowType_toplevel;
-@@ -3677,7 +3706,7 @@
-                                gdk_get_program_class());
-         gtk_window_set_type_hint(GTK_WINDOW(mShell),
-                                  GDK_WINDOW_TYPE_HINT_DIALOG);
--        gtk_window_set_transient_for(GTK_WINDOW(mShell), topLevelParent);
-+        gtk_window_set_transient_for(GTK_WINDOW(mShell), mToplevelParentWindow);
-       } else if (mWindowType == eWindowType_popup) {
-         gtk_window_set_wmclass(GTK_WINDOW(mShell), "Popup",
-                                gdk_get_program_class());
-@@ -3730,10 +3759,11 @@
-         }
-         gtk_window_set_type_hint(GTK_WINDOW(mShell), gtkTypeHint);
- 
--        if (topLevelParent) {
-+        if (mToplevelParentWindow) {
-           LOG(("nsWindow::Create [%p] Set popup parent %p\n", (void*)this,
--               topLevelParent));
--          gtk_window_set_transient_for(GTK_WINDOW(mShell), topLevelParent);
-+               mToplevelParentWindow));
-+          gtk_window_set_transient_for(GTK_WINDOW(mShell),
-+                                       mToplevelParentWindow);
-         }
- 
-         // We need realized mShell at NativeMove().
-@@ -4011,7 +4041,8 @@
- #endif
-   }
- 
--  LOG(("nsWindow [%p]\n", (void*)this));
-+  LOG(("nsWindow [%p] %s\n", (void*)this,
-+       mWindowType == eWindowType_toplevel ? "Toplevel" : "Popup"));
-   if (mShell) {
-     LOG(("\tmShell %p mContainer %p mGdkWindow %p 0x%lx\n", mShell, mContainer,
-          mGdkWindow, mIsX11Display ? gdk_x11_window_get_xid(mGdkWindow) : 0));
-
diff --git a/mozilla-1567434-2.patch b/mozilla-1567434-2.patch
deleted file mode 100644
index 966118a..0000000
--- a/mozilla-1567434-2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
---- a/widget/gtk/nsWindow.cpp
-+++ b/widget/gtk/nsWindow.cpp
-@@ -1208,6 +1208,7 @@
-       if (frame) {
-         menuPopupFrame = do_QueryFrame(frame);
-       }
-+
-       // The popup is not fully created yet (we're called from
-       // nsWindow::Create()) or we're toplevel popup without parent.
-       // In both cases just use parent which was passed to nsWindow::Create().
-@@ -1217,10 +1218,22 @@
-         return GTK_WIDGET(parentWidget);
-       }
- 
-+      LOG(("...[%p] is %s\n", (void*)this,
-+           menuPopupFrame->IsContextMenu() ? "context menu" : "popup"));
-+
-       nsWindow* parentWindow =
-           static_cast<nsWindow*>(menuPopupFrame->GetParentMenuWidget());
-       LOG(("...[%p] GetParentMenuWidget() = %p\n", (void*)this, parentWindow));
- 
-+      // If the popup is a regular menu but GetParentMenuWidget() returns
-+      // nullptr which means it's connected non-menu parent
-+      // (bookmark toolbar for instance).
-+      // In this case use a parent given at nsWindow::Create().
-+      if (!parentWindow && !menuPopupFrame->IsContextMenu()) {
-+        parentWindow =
-+            get_window_for_gtk_widget(GTK_WIDGET(mToplevelParentWindow));
-+      }
-+
-       if (!parentWindow) {
-         LOG(("...[%p] using active/visible popups as a parent [%p]\n",
-              (void*)this, gVisibleWaylandPopupWindows->data));
-
diff --git a/mozilla-1568569.patch b/mozilla-1568569.patch
deleted file mode 100644
index ab6225a..0000000
--- a/mozilla-1568569.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
---- a/widget/gtk/nsWindow.cpp
-+++ b/widget/gtk/nsWindow.cpp
-@@ -3238,16 +3238,18 @@ void nsWindow::OnWindowStateEvent(GtkWid
-   // We don't care about anything but changes in the maximized/icon/fullscreen
-   // states
-   if ((aEvent->changed_mask &
-        (GDK_WINDOW_STATE_ICONIFIED | GDK_WINDOW_STATE_MAXIMIZED |
-         GDK_WINDOW_STATE_FULLSCREEN)) == 0) {
-     return;
-   }
- 
-+  nsSizeMode lastSizeState = mSizeState;
-+
-   if (aEvent->new_window_state & GDK_WINDOW_STATE_ICONIFIED) {
-     LOG(("\tIconified\n"));
-     mSizeState = nsSizeMode_Minimized;
- #ifdef ACCESSIBILITY
-     DispatchMinimizeEventAccessible();
- #endif  // ACCESSIBILITY
-   } else if (aEvent->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) {
-     LOG(("\tFullscreen\n"));
-@@ -3261,16 +3263,28 @@ void nsWindow::OnWindowStateEvent(GtkWid
-   } else {
-     LOG(("\tNormal\n"));
-     mSizeState = nsSizeMode_Normal;
- #ifdef ACCESSIBILITY
-     DispatchRestoreEventAccessible();
- #endif  // ACCESSIBILITY
-   }
- 
-+  // Fullscreen video playback may generate bogus alpha values which blends
-+  // with desktop background in fullscreen video playback (Bug 1568569).
-+  // As a workaround enable to draw mShell background in fullscreen mode
-+  // if we draw to mContainer.
-+  if (gtk_widget_get_has_window(GTK_WIDGET(mContainer))) {
-+    if (mSizeState == nsSizeMode_Fullscreen) {
-+      gtk_widget_set_app_paintable(mShell, FALSE);
-+    } else if (lastSizeState == nsSizeMode_Fullscreen) {
-+      gtk_widget_set_app_paintable(mShell, TRUE);
-+    }
-+  }
-+
-   if (mWidgetListener) {
-     mWidgetListener->SizeModeChanged(mSizeState);
-     if (aEvent->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
-       mWidgetListener->FullscreenChanged(aEvent->new_window_state &
-                                          GDK_WINDOW_STATE_FULLSCREEN);
-     }
-   }
- 
-@@ -3787,16 +3801,21 @@ nsresult nsWindow::Create(nsIWidget* aPa
-       eventWidget = (drawToContainer) ? container : mShell;
- 
-       // Prevent GtkWindow from painting a background to avoid flickering.
-       gtk_widget_set_app_paintable(eventWidget, TRUE);
- 
-       gtk_widget_add_events(eventWidget, kEvents);
-       if (drawToContainer) {
-         gtk_widget_add_events(mShell, GDK_PROPERTY_CHANGE_MASK);
-+        // Don't paint mShell background when we draw to mContainer.
-+        // Otherwise we see mShell backround to shine through
-+        // mContainer (Bug 1507608).
-+        // But it may also lead to various bugs where mContainer has unintended
-+        // transparent parts which blend with underlying desktop (Bug 1516224).
-         gtk_widget_set_app_paintable(mShell, TRUE);
-       }
-       if (mTransparencyBitmapForTitlebar) {
-         moz_container_force_default_visual(mContainer);
-       }
- 
-       // If we draw to mContainer window then configure it now because
-       // gtk_container_add() realizes the child widget.
diff --git a/mozilla-1573813.patch b/mozilla-1573813.patch
deleted file mode 100644
index e9fca07..0000000
--- a/mozilla-1573813.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
---- a/widget/gtk/nsWindow.cpp
-+++ b/widget/gtk/nsWindow.cpp
-@@ -6577,11 +6577,22 @@
- }
- 
- gint nsWindow::GdkScaleFactor() {
-+  // For popup windows with parent window we need to get scale factor of the
-+  // parent window. Otherwise the scale factor of the popup is not updated
-+  // during it's hidden.
-+  GdkWindow* scaledGdkWindow = mGdkWindow;
-+  if (mToplevelParentWindow) {
-+    scaledGdkWindow = gtk_widget_get_window(GTK_WIDGET(mToplevelParentWindow));
-+    // Fallback for windows which parent has been unrealized.
-+    if (!scaledGdkWindow) {
-+      scaledGdkWindow = mGdkWindow;
-+    }
-+  }
-   // Available as of GTK 3.10+
-   static auto sGdkWindowGetScaleFactorPtr =
-       (gint(*)(GdkWindow*))dlsym(RTLD_DEFAULT, "gdk_window_get_scale_factor");
--  if (sGdkWindowGetScaleFactorPtr && mGdkWindow)
--    return (*sGdkWindowGetScaleFactorPtr)(mGdkWindow);
-+  if (sGdkWindowGetScaleFactorPtr && scaledGdkWindow)
-+    return (*sGdkWindowGetScaleFactorPtr)(scaledGdkWindow);
-   return ScreenHelperGTK::GetGTKMonitorScaleFactor();
- }
- 
-
diff --git a/mozilla-1580174-webrtc-popup.patch b/mozilla-1580174-webrtc-popup.patch
new file mode 100644
index 0000000..2d154eb
--- /dev/null
+++ b/mozilla-1580174-webrtc-popup.patch
@@ -0,0 +1,51 @@
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
++++ b/widget/gtk/nsWindow.cpp
+@@ -1155,6 +1155,28 @@
+   }
+ }
+ 
++bool IsPopupWithoutToplevelParent(nsMenuPopupFrame* aMenuPopupFrame) {
++  // Check if the popup is autocomplete (like tags autocomplete
++  // in the bookmark edit popup).
++  nsAtom* popupId = aMenuPopupFrame->GetContent()->GetID();
++  if (popupId && popupId->Equals(NS_LITERAL_STRING("PopupAutoComplete"))) {
++    return true;
++  }
++
++  // Check if the popup is in popupnotificationcontent (like choosing capture
++  // device when starting webrtc session).
++  nsIFrame* parentFrame = aMenuPopupFrame->GetParent();
++  if (!parentFrame) {
++    return false;
++  }
++  parentFrame = parentFrame->GetParent();
++  if (parentFrame && parentFrame->GetContent()->NodeName().EqualsLiteral(
++                         "popupnotificationcontent")) {
++    return true;
++  }
++  return false;
++}
++
+ // Wayland keeps strong popup window hierarchy. We need to track active
+ // (visible) popup windows and make sure we hide popup on the same level
+ // before we open another one on that level. It means that every open
+@@ -1211,10 +1233,14 @@
+       LOG(("...[%p] GetParentMenuWidget() = %p\n", (void*)this, parentWindow));
+ 
+       // If the popup is a regular menu but GetParentMenuWidget() returns
+-      // nullptr which means it's connected non-menu parent
+-      // (bookmark toolbar for instance).
++      // nullptr which means is not a submenu of any other menu.
+       // In this case use a parent given at nsWindow::Create().
+-      if (!parentWindow && !menuPopupFrame->IsContextMenu()) {
++      // But we have to avoid using mToplevelParentWindow in case the popup
++      // is in 'popupnotificationcontent' element or autocomplete popup,
++      //  otherwise the popupnotification would disappear when for
++      // example opening a popup with microphone selection.
++      if (!parentWindow && !menuPopupFrame->IsContextMenu() &&
++          !IsPopupWithoutToplevelParent(menuPopupFrame)) {
+         parentWindow =
+             get_window_for_gtk_widget(GTK_WIDGET(mToplevelParentWindow));
+       }
+
diff --git a/mozilla-1634213.patch b/mozilla-1634213.patch
new file mode 100644
index 0000000..d2a4138
--- /dev/null
+++ b/mozilla-1634213.patch
@@ -0,0 +1,96 @@
+diff --git a/gfx/gl/GLScreenBuffer.cpp b/gfx/gl/GLScreenBuffer.cpp
+--- a/gfx/gl/GLScreenBuffer.cpp
++++ b/gfx/gl/GLScreenBuffer.cpp
+@@ -88,10 +88,14 @@
+ #if defined(XP_MACOSX)
+     factory = SurfaceFactory_IOSurface::Create(gl, caps, ipcChannel, flags);
+ #elif defined(MOZ_WAYLAND)
+-    if (gl->GetContextType() == GLContextType::EGL) {
+-      if (gfxPlatformGtk::GetPlatform()->UseWaylandDMABufWebGL()) {
+-        factory =
+-            MakeUnique<SurfaceFactory_DMABUF>(gl, caps, ipcChannel, flags);
++    if (gl->GetContextType() == GLContextType::EGL &&
++        gfxPlatformGtk::GetPlatform()->UseWaylandDMABufWebGL()) {
++      auto DMABUFFactory =
++          MakeUnique<SurfaceFactory_DMABUF>(gl, caps, ipcChannel, flags);
++      if (DMABUFFactory && DMABUFFactory->CanCreateSurface()) {
++        factory = std::move(DMABUFFactory);
++      } else {
++        gfxPlatformGtk::GetPlatform()->DisableWaylandDMABufWebGL();
+       }
+     }
+ #elif defined(MOZ_X11)
+diff --git a/gfx/gl/SharedSurfaceDMABUF.h b/gfx/gl/SharedSurfaceDMABUF.h
+--- a/gfx/gl/SharedSurfaceDMABUF.h
++++ b/gfx/gl/SharedSurfaceDMABUF.h
+@@ -71,6 +71,11 @@
+     bool hasAlpha = mReadCaps.alpha;
+     return SharedSurface_DMABUF::Create(mGL, mFormats, size, hasAlpha);
+   }
++
++  bool CanCreateSurface() {
++    UniquePtr<SharedSurface> test = CreateShared(gfx::IntSize(1, 1));
++    return test != nullptr;
++  }
+ };
+ 
+ }  // namespace gl
+diff --git a/gfx/thebes/gfxPlatformGtk.h b/gfx/thebes/gfxPlatformGtk.h
+--- a/gfx/thebes/gfxPlatformGtk.h
++++ b/gfx/thebes/gfxPlatformGtk.h
+@@ -88,7 +88,8 @@
+ 
+ #ifdef MOZ_WAYLAND
+   bool UseWaylandDMABufTextures();
+-  bool UseWaylandDMABufWebGL();
++  bool UseWaylandDMABufWebGL() { return mUseWebGLDmabufBackend; }
++  void DisableWaylandDMABufWebGL() { mUseWebGLDmabufBackend = false; }
+   bool UseWaylandHardwareVideoDecoding();
+ #endif
+ 
+@@ -110,6 +111,9 @@
+ #ifdef MOZ_X11
+   Display* mCompositorDisplay;
+ #endif
++#ifdef MOZ_WAYLAND
++  bool mUseWebGLDmabufBackend;
++#endif
+ };
+ 
+ #endif /* GFX_PLATFORM_GTK_H */
+diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp
+--- a/gfx/thebes/gfxPlatformGtk.cpp
++++ b/gfx/thebes/gfxPlatformGtk.cpp
+@@ -116,6 +116,9 @@
+ 
+   Factory::ReleaseFTLibrary(gPlatformFTLibrary);
+   gPlatformFTLibrary = nullptr;
++
++  mUseWebGLDmabufBackend =
++      IsWaylandDisplay() && nsWaylandDisplay::IsDMABufWebGLEnabled();
+ }
+ 
+ void gfxPlatformGtk::FlushContentDrawing() {
+@@ -725,9 +728,6 @@
+ bool gfxPlatformGtk::UseWaylandDMABufTextures() {
+   return IsWaylandDisplay() && nsWaylandDisplay::IsDMABufTexturesEnabled();
+ }
+-bool gfxPlatformGtk::UseWaylandDMABufWebGL() {
+-  return IsWaylandDisplay() && nsWaylandDisplay::IsDMABufWebGLEnabled();
+-}
+ bool gfxPlatformGtk::UseWaylandHardwareVideoDecoding() {
+   return IsWaylandDisplay() && nsWaylandDisplay::IsDMABufVAAPIEnabled() &&
+          gfxPlatform::CanUseHardwareVideoDecoding();
+diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
+--- a/modules/libpref/init/StaticPrefList.yaml
++++ b/modules/libpref/init/StaticPrefList.yaml
+@@ -9111,7 +9111,7 @@
+ # Use DMABuf backend for WebGL on Wayland.
+ - name: widget.wayland-dmabuf-webgl.enabled
+   type: RelaxedAtomicBool
+-  value: false
++  value: true
+   mirror: always
+ 
+ # Use VA-API for video playback on Wayland.
+
diff --git a/rhbz-1354671.patch b/rhbz-1354671.patch
index 1f867eb..9770fa6 100644
--- a/rhbz-1354671.patch
+++ b/rhbz-1354671.patch
@@ -1,12 +1,11 @@
-diff -up firefox-65.0/layout/base/PresShell.h.1354671 firefox-65.0/layout/base/PresShell.h
---- firefox-65.0/layout/base/PresShell.h.1354671	2019-01-29 11:50:08.516649643 +0100
-+++ firefox-65.0/layout/base/PresShell.h	2019-01-29 11:51:48.930258629 +0100
-@@ -205,7 +205,7 @@ class nsIPresShell : public nsStubDocume
+--- firefox-78.0/layout/base/PresShell.orig.h	2020-06-26 20:10:50.168878803 +0200
++++ firefox-78.0/layout/base/PresShell.h	2020-06-26 23:13:24.174571951 +0200
+@@ -257,7 +257,7 @@
     * to the same aSize value.  AllocateFrame is infallible and will abort
     * on out-of-memory.
     */
 -  void* AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize) {
 +  void* __attribute__((optimize("no-lifetime-dse"))) AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize) {
-     void* result = mFrameArena.AllocateByFrameID(aID, aSize);
-     RecordAlloc(result);
-     return result;
+ #define FRAME_ID(classname, ...)                                  \
+   static_assert(size_t(nsQueryFrame::FrameIID::classname##_id) == \
+                     size_t(eArenaObjectID_##classname),           \
diff --git a/sources b/sources
index a8a1d25..0771cfc 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
-SHA512 (icecat-68.9.0-langpacks.tar.gz) = d3f1acf7505193e587338ffdf3d542dad9b04289d3a87de16e5a36a77624d5ad9d4a3366166fdf2e58066b0bf3bb86adbd66f241f3080a5a395960da806a2f94
-SHA512 (icecat-68.9.0-rh2.tar.bz2) = 080e9765850ece232f1888a2c59f8a65ffeeeea7aeeb9b4fdc6dd6c88bdc3dda2fd0b5585b61c5cbb57d860b85ede59f3c2c6d75be80cb58aaf0b0d501603af5
+SHA512 (cbindgen-vendor.tar.xz) = facde286af6f508db9f8e7658460a92a005c82d135a7c190f7f97a28e01df83b76f26a73a7f3a5be76cda5bdd2263f62dbf75ab1385f6d2185aa372ada336283
+SHA512 (icecat-78.0-langpacks.tar.gz) = be646eda0bda77e6fde10851ee7bef75ba702ab50c54dc95275e9f205d17165dbcbdda0947646483ad03a629fe3b99b680ae78f97945b4ec2cb41418a5011d97
+SHA512 (icecat-78.0-rh1.tar.bz2) = 10c03d4934dadc9e21b0e651ff39c89be0f5ebccfe5807c885cffda0a3391bfd9cb6af9626096ab8e0fca7a8de83b39063a6d5bda0f8a4c9e85518fdf00ecd1d
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 63834300ecf05eb22246494ec99f09dd4b65d7bc Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 2 Jul 2020 13:58:04 +0200
Subject: [PATCH 128/473] Mozilla Release 78.0.1ESR| Disable crash reporter

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 30 +++++++++++++++---------------
 sources                 |  4 ++--
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6602ef9..d058049 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,3 +118,5 @@
 /icecat-68.9.0-langpacks.tar.gz
 /icecat-78.0-langpacks.tar.gz
 /icecat-78.0-rh1.tar.bz2
+/icecat-78.0.1-langpacks.tar.gz
+/icecat-78.0.1-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index cdd7849..458df61 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.0
+VERSION=78.0.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 8e0be4e..114e7db 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -50,16 +50,14 @@ ExcludeArch: %{arm} s390x
 %endif
 
 # Use system nspr/nss?
-%global system_nss    0
+%global system_nss    1
 
-%if 0%{?system_nss}
+%if %{?system_nss}
 %global nspr_version 4.25.0
 %global nspr_build_version %{nspr_version}
 %global nss_version 3.53.0
 %global nss_build_version %{nss_version}
 %endif
-%global nspr_version 4.25.0
-%global nspr_build_version %{nspr_version}
 
 # Audio backends
 %bcond_without pulseaudio
@@ -67,7 +65,7 @@ ExcludeArch: %{arm} s390x
 %bcond_with alsa
 
 %global with_vpx 1
-%if 0%{?with_vpx}
+%if %{?with_vpx}
 %global libvpx_version 1.8.2
 %endif
 
@@ -100,7 +98,7 @@ ExcludeArch: %{arm} s390x
 %endif
 
 Name: icecat
-Version: 78.0
+Version: 78.0.1
 Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -230,7 +228,7 @@ BuildRequires: libXinerama-devel
 BuildRequires: libffi-devel
 BuildRequires: libnotify-devel
 BuildRequires: libpng-devel
-%if 0%{?with_vpx}
+%if %{?with_vpx}
 BuildRequires: libvpx-devel >= %{libvpx_version}
 %endif
 BuildRequires: libzip-devel
@@ -239,11 +237,11 @@ BuildRequires: nodejs
 BuildRequires: nasm >= 1.13
 BuildRequires: strace
 
-%if 0%{?system_nss}
+%if %{?system_nss}
+BuildRequires: pkgconfig(nspr) >= %{nspr_version}
 BuildRequires: pkgconfig(nss) >= %{nss_version}
 BuildRequires: nss-static >= %{nss_version}
 %endif
-BuildRequires: pkgconfig(nspr) >= %{nspr_version}
 
 BuildRequires: openjpeg-devel
 BuildRequires: pango-devel
@@ -280,10 +278,10 @@ Requires: dconf
 Requires: mozilla-filesystem
 Requires: p11-kit-trust
 
-%if 0%{?system_nss}
+%if %{?system_nss}
+Requires: nspr >= %{nspr_build_version}
 Requires: nss >= %{nss_build_version}
 %endif
-Requires: nspr >= %{nspr_build_version}
 
 Requires: fedora-bookmarks
 Suggests: mozilla-ublock-origin
@@ -407,7 +405,7 @@ echo "ac_add_options --enable-alsa" >> .mozconfig
 echo "ac_add_options --disable-jemalloc" >> .mozconfig
 %endif
 
-%if 0%{?system_nss}
+%if %{?system_nss}
 echo "ac_add_options --with-system-nspr" >> .mozconfig
 echo "ac_add_options --with-system-nss" >> .mozconfig
 %else
@@ -467,6 +465,7 @@ echo "ac_add_options --enable-av1" >> .mozconfig
 echo "ac_add_options --disable-strip" >> .mozconfig
 echo "ac_add_options --disable-install-strip" >> .mozconfig
 echo "ac_add_options --disable-tests" >> .mozconfig
+echo "ac_add_options --disable-crashreporter" >> .mozconfig
 
 # Localization
 %if 0%{?build_langpacks}
@@ -774,9 +773,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{icecatappdir}/pingsender
 %{icecatappdir}/gmp-clearkey/
 %{icecatappdir}/gtk2/*.so
-%{icecatappdir}/Throbber-small.gif
-%{icecatappdir}/crashreporter
-%{icecatappdir}/minidump-analyzer
 %if 0%{?build_langpacks}
 %dir %{langpackdir}
 %endif
@@ -792,6 +788,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Thu Jul 02 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0.1-1.rh1.test
+- Mozilla Release 78.0.1ESR
+- Disable crash reporter
+
 * Wed Jul 01 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0-1.rh1.test
 - Mozilla Release 78.0ESR
 
diff --git a/sources b/sources
index 0771cfc..ef5a6ba 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = facde286af6f508db9f8e7658460a92a005c82d135a7c190f7f97a28e01df83b76f26a73a7f3a5be76cda5bdd2263f62dbf75ab1385f6d2185aa372ada336283
-SHA512 (icecat-78.0-langpacks.tar.gz) = be646eda0bda77e6fde10851ee7bef75ba702ab50c54dc95275e9f205d17165dbcbdda0947646483ad03a629fe3b99b680ae78f97945b4ec2cb41418a5011d97
-SHA512 (icecat-78.0-rh1.tar.bz2) = 10c03d4934dadc9e21b0e651ff39c89be0f5ebccfe5807c885cffda0a3391bfd9cb6af9626096ab8e0fca7a8de83b39063a6d5bda0f8a4c9e85518fdf00ecd1d
+SHA512 (icecat-78.0.1-langpacks.tar.gz) = 98ad35ece7e62c8ae64b7925ece81fd495e192cecc3562a880539cd745afd3c6fe66925cb7fbccf45922f6476af9e065b66fdcbb193eb0660cabdbd035a53a33
+SHA512 (icecat-78.0.1-rh1.tar.bz2) = c54eb11612689105ee4b3c1463cb736deb5ce890995eae03bdfc91b02acf922660da8f47e8e03aec9bcb1cbb761beb9066c0ad258abc38dd676ae8fd92e41d8c
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 6aa999d7b8a107ea1b454c7ac5ae0c3aed1c2cf6 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 2 Jul 2020 14:45:40 +0200
Subject: [PATCH 129/473] Add -DNSS_PKCS11_3_0_STRICT optimization flag

---
 icecat.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 114e7db..c46334c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -548,6 +548,10 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/' -e 's/-O2/-O1/')
 # (OOM when linking, rhbz#1238225)
 export MOZ_DEBUG_FLAGS=" "
 %endif
+
+# We don't wantfirefox to use CK_GCM_PARAMS_V3 in nss
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -DNSS_PKCS11_3_0_STRICT"
+
 %if !0%{?build_with_clang}
 %ifarch s390x %{power64} aarch64 %{ix86}
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--print-memory-usage"

From 53eacc74b7adcfa2923c495f6c7c635f9fc511e7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jul 2020 01:37:42 +0000
Subject: [PATCH 130/473] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 icecat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index c46334c..1642c23 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -99,7 +99,7 @@ ExcludeArch: %{arm} s390x
 
 Name: icecat
 Version: 78.0.1
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -792,6 +792,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 78.0.1-2.rh1.test
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Thu Jul 02 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0.1-1.rh1.test
 - Mozilla Release 78.0.1ESR
 - Disable crash reporter

From 6fa78889ab1ca88bf1bc3a079ad7453dc0c4308a Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 29 Jul 2020 12:36:45 +0200
Subject: [PATCH 131/473] Try to pass Rust cflags (mozilla bug 1640982#c18)

---
 icecat.spec           |  6 +++++-
 mozilla-1640982.patch | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 mozilla-1640982.patch

diff --git a/icecat.spec b/icecat.spec
index 1642c23..7a7a0a2 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -172,6 +172,7 @@ Patch226: rhbz-1354671.patch
 Patch402: mozilla-1196777.patch
 Patch412: mozilla-1337988.patch
 Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
+Patch415: mozilla-1640982.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
@@ -368,6 +369,8 @@ tar -xf %{SOURCE5}
 #%%patch26 -p1 -b .icu
 %endif
 
+%patch415 -p1 -b .mozilla-1640982
+
 %patch402 -p1 -b .1196777
 %patch423 -p1 -b .mozilla-1596503
 
@@ -792,8 +795,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 78.0.1-2.rh1.test
+* Wed Jul 29 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0.1-2.rh1.test
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+- Try to pass Rust cflags (mozilla bug 1640982#c18)
 
 * Thu Jul 02 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0.1-1.rh1.test
 - Mozilla Release 78.0.1ESR
diff --git a/mozilla-1640982.patch b/mozilla-1640982.patch
new file mode 100644
index 0000000..b63ba3b
--- /dev/null
+++ b/mozilla-1640982.patch
@@ -0,0 +1,16 @@
+diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk
++++ b/config/makefiles/rust.mk
+@@ -61,7 +61,11 @@
+ # Enable link-time optimization for release builds, but not when linking
+ # gkrust_gtest.
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
++# Pass -Clto for older versions of rust, and CARGO_PROFILE_RELEASE_LTO=true
++# for newer ones that support it. Combining the latter with -Clto works, so
++# set both everywhere.
+ cargo_rustc_flags += -Clto
++export CARGO_PROFILE_RELEASE_LTO=true
+ endif
+ endif
+ endif
+

From 190868b00d4f0fef5c0d2fc4210dc5df58c93d28 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 29 Jul 2020 20:26:57 +0200
Subject: [PATCH 132/473] Update cbindgen-vendor

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index ef5a6ba..5fbe1b2 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = facde286af6f508db9f8e7658460a92a005c82d135a7c190f7f97a28e01df83b76f26a73a7f3a5be76cda5bdd2263f62dbf75ab1385f6d2185aa372ada336283
+SHA512 (cbindgen-vendor.tar.xz) = fdd85f10476c90ae73c6b8ca9aa162ae96f481697cb1f36687dbc6ff6202e9507dff96d0b6103c9be684bd6e9db3c767835f9478266ce48cc4cad03b23107ede
 SHA512 (icecat-78.0.1-langpacks.tar.gz) = 98ad35ece7e62c8ae64b7925ece81fd495e192cecc3562a880539cd745afd3c6fe66925cb7fbccf45922f6476af9e065b66fdcbb193eb0660cabdbd035a53a33
 SHA512 (icecat-78.0.1-rh1.tar.bz2) = c54eb11612689105ee4b3c1463cb736deb5ce890995eae03bdfc91b02acf922660da8f47e8e03aec9bcb1cbb761beb9066c0ad258abc38dd676ae8fd92e41d8c
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From b89d2160d4ad7257c983425341d94de2bbbf2817 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 30 Jul 2020 20:11:51 +0200
Subject: [PATCH 133/473] Try to disable webrender

---
 icecat.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/icecat.spec b/icecat.spec
index 7a7a0a2..149f54e 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -391,6 +391,7 @@ echo "ac_add_options --with-unsigned-addon-scopes=app" >> .mozconfig
 echo "ac_add_options --enable-default-toolkit=cairo-gtk3-wayland" >> .mozconfig
 echo "ac_add_options --enable-official-branding" >> .mozconfig
 echo "ac_add_options --disable-webrtc" >> .mozconfig
+echo "ac_add_options --disable-webrender" >> .mozconfig
 
 %if %{with pulseaudio}
 echo "ac_add_options --enable-pulseaudio" >> .mozconfig

From 4d145c97bfb0c7a22017a5c599ba0b3826e8d274 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 30 Jul 2020 20:31:01 +0200
Subject: [PATCH 134/473] Undo latest change

---
 icecat.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 149f54e..7a7a0a2 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -391,7 +391,6 @@ echo "ac_add_options --with-unsigned-addon-scopes=app" >> .mozconfig
 echo "ac_add_options --enable-default-toolkit=cairo-gtk3-wayland" >> .mozconfig
 echo "ac_add_options --enable-official-branding" >> .mozconfig
 echo "ac_add_options --disable-webrtc" >> .mozconfig
-echo "ac_add_options --disable-webrender" >> .mozconfig
 
 %if %{with pulseaudio}
 echo "ac_add_options --enable-pulseaudio" >> .mozconfig

From 4efcdf6f0e3b22245cfeca22c471e2375c3e654c Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 4 Aug 2020 12:29:41 +0200
Subject: [PATCH 135/473] Debug build

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 7a7a0a2..58e5a29 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -24,7 +24,7 @@ ExcludeArch: %{arm} s390x
 %global toolkit_gtk3  1
 
 # Builds for debugging
-%global debug_build   0
+%global debug_build   1
 
 # Big endian platforms
 %ifarch ppc64 s390x

From 3d0e11c3a6a587d6625075a339753acde488aba0 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 23 Aug 2020 19:23:02 +0200
Subject: [PATCH 136/473] Mozilla Release Candidate 78.2.0ESR

---
 .gitignore              |   1 +
 icecat-lang_download.sh |   2 +-
 icecat.rpmlintrc        |  54 ---------------------
 icecat.spec             | 104 ++++++++++++++++++++++------------------
 mozilla-1640982.patch   |  16 -------
 sources                 |   3 +-
 6 files changed, 60 insertions(+), 120 deletions(-)
 delete mode 100644 icecat.rpmlintrc
 delete mode 100644 mozilla-1640982.patch

diff --git a/.gitignore b/.gitignore
index d058049..837aba1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,3 +120,4 @@
 /icecat-78.0-rh1.tar.bz2
 /icecat-78.0.1-langpacks.tar.gz
 /icecat-78.0.1-rh1.tar.bz2
+/icecat-78.2.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 458df61..91a0a13 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.0.1
+VERSION=78.2.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
deleted file mode 100644
index 562f383..0000000
--- a/icecat.rpmlintrc
+++ /dev/null
@@ -1,54 +0,0 @@
-# Whitelisting errors
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-# https://src.fedoraproject.org/rpms/python3/blob/master/f/python3.rpmlintrc
-# Edited by sagitter (sagitter@fedoraproject.org)
-
-# KNOWN BUGS:
-#
-
-# TESTS:
-##### SRPMs #####
-
-# ifarch applied patches are okay
-# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
-addFilter(r'(%ifarch-applied-patch) Patch*')
-# Different file size due to the signature of the source code tarbz archive
-addFilter(r'file-size-mismatch')
-
-addFilter(r'(invalid-url) Source0')
-addFilter(r'(invalid-url) Source4')
-addFilter(r'(invalid-url) Source5')
-addFilter(r'(invalid-url) Source17')
-
-addFilter(r'(strange-permission) icecat-lang_download.sh')
-addFilter(r'(strange-permission) node-stdout-nonblocking-wrapper')
-
-# ERRORS:
-##### RPMs  #####
-
-# chroot function (??)
-addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib64/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib64/icecat/libxul.so')
-addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib/icecat/libxul.so')
-
-# Expected on FF browser
-# https://support.mozilla.org/en-US/questions/1045418
-addFilter(r'(zero-length) /usr/lib(64)?/icecat/chrome.manifest')
-addFilter(r'(zero-length) /usr/lib(64)?/icecat/browser/chrome.manifest')
-
-addFilter(r'E:library-not-linked-against-libc /usr/lib64/icecat/gtk2/libmozgtk.so')
-addFilter(r'E:library-not-linked-against-libc /usr/lib64/icecat/libmozgtk.so')
-addFilter(r'E:library-not-linked-against-libc /usr/lib/icecat/gtk2/libmozgtk.so')
-addFilter(r'E:library-not-linked-against-libc /usr/lib/icecat/libmozgtk.so')
-
-# False positive
-addFilter(r'(dangling-symlink) /usr/lib(64)?/icecat/dictionaries /usr/share/myspell')
-addFilter(r'(unversioned-explicit-provides) webclient')
-
-# WARNINGS:
-##### RPMs  #####
-
-addFilter(r'(no-manual-page-for-binary) icecat-wayland')
-addFilter(r'(no-manual-page-for-binary) icecat-x11')
-
diff --git a/icecat.spec b/icecat.spec
index 58e5a29..fc83e62 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,15 +1,46 @@
+### Naming ###
 # Set to true if it's going to be submitted as update
 %global release_build 0
 
 # Set to true if it's going to be submitted as release candidate
-%global release_candidate 0
+%global release_candidate 1
+
+# Set new source-code build version
+# This tag indicates a new rebuild for Fedora
+%global redhat_ver rh1
+
+# Set extra version tag
+# This tag comes from Mozilla's releases
+%if 0%{?release_candidate}
+%global extra_ver .rc1
+%else
+%global extra_ver %{nil}
+%endif
+
+%if !%{release_build}
+%global pre_tag .test
+%endif
+####################
+
+### Optimization ###
+# Builds for debugging
+%global debug_build   0
+
+# Downgrade optimization
+%global less_optbuild 1
+
+# Use mozilla hardening option?
+%global hardened_build 1
+####################
 
 # Exclude ARM builds for rhbz #1658940
 # Exclude s390x for https://pagure.io/koji/issue/1974
 ExcludeArch: %{arm} s390x
 
+%define _lto_cflags %{nil}
+
 # Active/Deactive language files handling
-%global build_langpacks 1
+%global build_langpacks 0
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
@@ -23,9 +54,6 @@ ExcludeArch: %{arm} s390x
 
 %global toolkit_gtk3  1
 
-# Builds for debugging
-%global debug_build   1
-
 # Big endian platforms
 %ifarch ppc64 s390x
 # Javascript Intl API is not supported on big endian platforms right now:
@@ -72,34 +100,15 @@ ExcludeArch: %{arm} s390x
 %global wayland_backend_default 1
 %global disable_elfhack 1
 
-# Use mozilla hardening option?
-%global hardened_build 1
-
 # cbingen
 %global use_bundled_cbindgen 1
 
 # Use clang?
 %global build_with_clang  0
 
-# Set new source-code build version
-# This tag indicates a new rebuild for Fedora
-%global redhat_ver rh1
-
-# Set extra version tag
-# This tag comes from Mozilla's releases
-%if 0%{?release_candidate}
-%global extra_ver .rc3
-%else
-%global extra_ver %{nil}
-%endif
-
-%if !%{release_build}
-%global pre_tag .test
-%endif
-
 Name: icecat
-Version: 78.0.1
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.2.0
+Release: 0.1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -172,7 +181,6 @@ Patch226: rhbz-1354671.patch
 Patch402: mozilla-1196777.patch
 Patch412: mozilla-1337988.patch
 Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
-Patch415: mozilla-1640982.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
@@ -369,8 +377,6 @@ tar -xf %{SOURCE5}
 #%%patch26 -p1 -b .icu
 %endif
 
-%patch415 -p1 -b .mozilla-1640982
-
 %patch402 -p1 -b .1196777
 %patch423 -p1 -b .mozilla-1596503
 
@@ -441,18 +447,9 @@ echo "ac_add_options --enable-debug" >> .mozconfig
 echo "ac_add_options --disable-optimize" >> .mozconfig
 %else
 %global optimize_flags "none"
-%ifnarch s390x
-%define optimize_flags "-g -O2"
-%endif
-%ifarch %{arm}
+%ifarch %{arm} s390x
 # ARMv7 need that (rhbz#1426850)
-%define optimize_flags "-g -O2 -fno-schedule-insns"
-%endif
-%ifarch s390x
-%define optimize_flags "-g1 -O1 -fno-schedule-insns"
-%endif
-%ifarch ppc64le aarch64
-%define optimize_flags "-g -O2"
+%define optimize_flags " -fno-schedule-insns"
 %endif
 %if %{?optimize_flags} != "none"
 echo 'ac_add_options --enable-optimize=%{?optimize_flags}' >> .mozconfig
@@ -479,6 +476,8 @@ echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 echo "ac_add_options --disable-ion" >> .mozconfig
 %endif
 
+echo "ac_add_options --disable-lto" >> .mozconfig
+
 echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig
 
 # Remove executable bit to make brp-mangle-shebangs happy.
@@ -528,6 +527,10 @@ cp %{SOURCE18} %{_buildrootdir}/bin || :
 find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
 
 MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
+%if %{?less_optbuild}
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2/-O1/')
+%endif
+
 #rhbz#1037063
 # -Werror=format-security causes build failures when -Wno-format is explicitly given
 # for some sources
@@ -541,8 +544,8 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
 %endif
 
-%if %{?debug_build}
-MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
+%if %{?debug_build} || !0%{?less_optbuild}
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2/-O0/')
 %endif
 %ifarch s390x %{arm}
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/' -e 's/-O2/-O1/')
@@ -563,12 +566,12 @@ MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--print-m
 MOZ_LINK_FLAGS="-Wl,-fuse-ld=gold -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-mmap-output-file"
 %endif
 %endif
-%ifarch %{arm} %{ix86}
+%ifarch %{arm} %{ix86} %{power64}
 export RUSTFLAGS="-Cdebuginfo=0"
 export MOZ_RUST_DEFAULT_FLAGS="-Cdebuginfo=0 -Copt-level=0"
 %endif
 export CFLAGS=$MOZ_OPT_FLAGS
-export CXXFLAGS=$MOZ_OPT_FLAGS
+export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive"
 export LDFLAGS=$MOZ_LINK_FLAGS
 
 export PREFIX='%{_prefix}'
@@ -590,6 +593,9 @@ export NM="gcc-nm"
 export RANLIB="gcc-ranlib"
 %endif
 
+%if %{?less_optbuild}
+MOZ_SMP_FLAGS=-j1
+%else
 MOZ_SMP_FLAGS=-j1
 # On x86_64 architectures, Mozilla can build up to 4 jobs at once in parallel,
 # however builds tend to fail on other arches when building in parallel.
@@ -598,15 +604,17 @@ MOZ_SMP_FLAGS=-j1
      RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
 %endif
-%ifarch x86_64 ppc %{power64} aarch64
+%ifarch x86_64 %{power64} aarch64
 [ -z "$RPM_BUILD_NCPUS" ] && \
      RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
 [ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
 [ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
 %endif
+%endif
 
-echo "export MOZ_MAKE_FLAGS=\"$MOZ_SMP_FLAGS\"" >> .mozconfig
+echo "mk_add_options MOZ_MAKE_FLAGS=\"$MOZ_SMP_FLAGS\"" >> .mozconfig
+echo "mk_add_options MOZ_SERVICES_SYNC=1" >> .mozconfig
 echo "export STRIP=/bin/true" >> .mozconfig
 MOZ_RUN_GTEST=0 ./mach -v build
 
@@ -795,9 +803,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Sun Aug 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-0.1.rc1.rh1.test
+- Mozilla Release 78.2.0ESR
+
 * Wed Jul 29 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0.1-2.rh1.test
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-- Try to pass Rust cflags (mozilla bug 1640982#c18)
 
 * Thu Jul 02 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0.1-1.rh1.test
 - Mozilla Release 78.0.1ESR
diff --git a/mozilla-1640982.patch b/mozilla-1640982.patch
deleted file mode 100644
index b63ba3b..0000000
--- a/mozilla-1640982.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
---- a/config/makefiles/rust.mk
-+++ b/config/makefiles/rust.mk
-@@ -61,7 +61,11 @@
- # Enable link-time optimization for release builds, but not when linking
- # gkrust_gtest.
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
-+# Pass -Clto for older versions of rust, and CARGO_PROFILE_RELEASE_LTO=true
-+# for newer ones that support it. Combining the latter with -Clto works, so
-+# set both everywhere.
- cargo_rustc_flags += -Clto
-+export CARGO_PROFILE_RELEASE_LTO=true
- endif
- endif
- endif
-
diff --git a/sources b/sources
index 5fbe1b2..c9b38ce 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = fdd85f10476c90ae73c6b8ca9aa162ae96f481697cb1f36687dbc6ff6202e9507dff96d0b6103c9be684bd6e9db3c767835f9478266ce48cc4cad03b23107ede
-SHA512 (icecat-78.0.1-langpacks.tar.gz) = 98ad35ece7e62c8ae64b7925ece81fd495e192cecc3562a880539cd745afd3c6fe66925cb7fbccf45922f6476af9e065b66fdcbb193eb0660cabdbd035a53a33
-SHA512 (icecat-78.0.1-rh1.tar.bz2) = c54eb11612689105ee4b3c1463cb736deb5ce890995eae03bdfc91b02acf922660da8f47e8e03aec9bcb1cbb761beb9066c0ad258abc38dd676ae8fd92e41d8c
+SHA512 (icecat-78.2.0-rh1.tar.bz2) = 7cd7c26ca0c5b0ec0907354c94e3ee80997b21dc95ee93614440430f767829ceab0d5f5638b56286f0a71bb11f3070e2e76ee7a354500ecf02159717cc907d7d
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 360e74f38f83110360b9bdd8b8ac46b383645dbb Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 23 Aug 2020 19:24:10 +0200
Subject: [PATCH 137/473] Mozilla Release Candidate 78.2.0ESR |Add
 icecat.rpmlintrc

---
 icecat.rpmlintrc | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 icecat.rpmlintrc

diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
new file mode 100644
index 0000000..562f383
--- /dev/null
+++ b/icecat.rpmlintrc
@@ -0,0 +1,54 @@
+# Whitelisting errors
+# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
+# https://src.fedoraproject.org/rpms/python3/blob/master/f/python3.rpmlintrc
+# Edited by sagitter (sagitter@fedoraproject.org)
+
+# KNOWN BUGS:
+#
+
+# TESTS:
+##### SRPMs #####
+
+# ifarch applied patches are okay
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
+addFilter(r'(%ifarch-applied-patch) Patch*')
+# Different file size due to the signature of the source code tarbz archive
+addFilter(r'file-size-mismatch')
+
+addFilter(r'(invalid-url) Source0')
+addFilter(r'(invalid-url) Source4')
+addFilter(r'(invalid-url) Source5')
+addFilter(r'(invalid-url) Source17')
+
+addFilter(r'(strange-permission) icecat-lang_download.sh')
+addFilter(r'(strange-permission) node-stdout-nonblocking-wrapper')
+
+# ERRORS:
+##### RPMs  #####
+
+# chroot function (??)
+addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib64/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib64/icecat/libxul.so')
+addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib/icecat/libxul.so')
+
+# Expected on FF browser
+# https://support.mozilla.org/en-US/questions/1045418
+addFilter(r'(zero-length) /usr/lib(64)?/icecat/chrome.manifest')
+addFilter(r'(zero-length) /usr/lib(64)?/icecat/browser/chrome.manifest')
+
+addFilter(r'E:library-not-linked-against-libc /usr/lib64/icecat/gtk2/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib64/icecat/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib/icecat/gtk2/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib/icecat/libmozgtk.so')
+
+# False positive
+addFilter(r'(dangling-symlink) /usr/lib(64)?/icecat/dictionaries /usr/share/myspell')
+addFilter(r'(unversioned-explicit-provides) webclient')
+
+# WARNINGS:
+##### RPMs  #####
+
+addFilter(r'(no-manual-page-for-binary) icecat-wayland')
+addFilter(r'(no-manual-page-for-binary) icecat-x11')
+

From 763f6acf6cfaef66fd9fb6c4b6af9ecce334dc42 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 23 Aug 2020 21:40:54 +0200
Subject: [PATCH 138/473] Exclude ppc64le

---
 icecat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index fc83e62..1799e52 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -33,9 +33,12 @@
 %global hardened_build 1
 ####################
 
+# Temporary disabled, filed as rhbz#1862012	
+ExcludeArch: ppc64le
+
 # Exclude ARM builds for rhbz #1658940
 # Exclude s390x for https://pagure.io/koji/issue/1974
-ExcludeArch: %{arm} s390x
+ExcludeArch: s390x
 
 %define _lto_cflags %{nil}
 

From 004113fa5e116b0e892e05e7d5eb04d7eb251970 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 24 Aug 2020 15:55:48 +0200
Subject: [PATCH 139/473] Restore upstream patch #1556653 for ARM

---
 icecat.spec           |  2 ++
 mozilla-1526653.patch | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 mozilla-1526653.patch

diff --git a/icecat.spec b/icecat.spec
index 1799e52..531e3e7 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -181,6 +181,7 @@ Patch220: firefox-nss-version.patch
 Patch226: rhbz-1354671.patch
 
 # Upstream patches
+Patch401: mozilla-1526653.patch
 Patch402: mozilla-1196777.patch
 Patch412: mozilla-1337988.patch
 Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
@@ -371,6 +372,7 @@ tar -xf %{SOURCE5}
 %endif
 
 %ifarch %{arm}
+%patch401 -p1 -b .1526653
 %patch414 -p1 -b .Bug-1238661---fix-mozillaSignalTrampoline-to-work
 %patch44  -p1 -b .build-arm-libopus
 %endif
diff --git a/mozilla-1526653.patch b/mozilla-1526653.patch
new file mode 100644
index 0000000..31631d5
--- /dev/null
+++ b/mozilla-1526653.patch
@@ -0,0 +1,22 @@
+diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
+index 636537f847862ef693dd6582e2783de4e3d403c5..383c380f04ceb6a111dbfe9a046e3454a56e31b4 100644
+--- a/js/src/wasm/WasmSignalHandlers.cpp
++++ b/js/src/wasm/WasmSignalHandlers.cpp
+@@ -248,7 +248,16 @@ using mozilla::DebugOnly;
+ #endif
+ 
+ #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+-#  include <sys/user.h>
++struct user_vfp {
++  unsigned long long fpregs[32];
++  unsigned long fpscr;
++};
++
++struct user_vfp_exc {
++  unsigned long fpexc;
++  unsigned long fpinst;
++  unsigned long fpinst2;
++};
+ #endif
+ 
+ #if defined(ANDROID)

From 79660189fa3f34ac4ce0be64cb1f36fc92eb5bb6 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 24 Aug 2020 21:11:13 +0200
Subject: [PATCH 140/473] Change linker flags for ARM

---
 icecat.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 531e3e7..e7e0384 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -463,9 +463,6 @@ echo 'ac_add_options --enable-optimize' >> .mozconfig
 %endif
 echo "ac_add_options --disable-debug" >> .mozconfig
 %endif
-%ifarch %{arm}
-echo "ac_add_options --enable-linker=gold" >> .mozconfig
-%endif
 echo "ac_add_options --enable-av1" >> .mozconfig
 echo "ac_add_options --disable-strip" >> .mozconfig
 echo "ac_add_options --disable-install-strip" >> .mozconfig
@@ -568,7 +565,8 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -DNSS_PKCS11_3_0_STRICT"
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--print-memory-usage"
 %endif
 %ifarch %{arm}
-MOZ_LINK_FLAGS="-Wl,-fuse-ld=gold -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-mmap-output-file"
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--strip-debug"
+echo "ac_add_options --enable-linker=gold" >> .mozconfig
 %endif
 %endif
 %ifarch %{arm} %{ix86} %{power64}

From 652a78e6d46630de9e3bba76f68eae280bdfd4b9 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 25 Aug 2020 15:22:06 +0200
Subject: [PATCH 141/473] Disable av1 in ARM

---
 icecat.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index e7e0384..f7df504 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -446,6 +446,9 @@ echo "ac_add_options --with-system-jpeg" >> .mozconfig
 %ifarch %{arm}
 echo "ac_add_options --disable-elf-hack" >> .mozconfig
 %endif
+%ifnarch %{arm}
+echo "ac_add_options --enable-av1" >> .mozconfig
+%endif
 
 %if 0%{?debug_build}
 echo "ac_add_options --enable-debug" >> .mozconfig
@@ -463,7 +466,6 @@ echo 'ac_add_options --enable-optimize' >> .mozconfig
 %endif
 echo "ac_add_options --disable-debug" >> .mozconfig
 %endif
-echo "ac_add_options --enable-av1" >> .mozconfig
 echo "ac_add_options --disable-strip" >> .mozconfig
 echo "ac_add_options --disable-install-strip" >> .mozconfig
 echo "ac_add_options --disable-tests" >> .mozconfig

From 3f82021ecfbcd54ec4ea7034288dbc9cd5d58ca1 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 25 Aug 2020 18:45:14 +0200
Subject: [PATCH 142/473] Disable av1 in ARM explicitly

---
 icecat.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/icecat.spec b/icecat.spec
index f7df504..7d6fd57 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -445,6 +445,7 @@ echo "ac_add_options --with-system-jpeg" >> .mozconfig
 # This option works on these architectures only
 %ifarch %{arm}
 echo "ac_add_options --disable-elf-hack" >> .mozconfig
+echo "ac_add_options --disable-av1" >> .mozconfig
 %endif
 %ifnarch %{arm}
 echo "ac_add_options --enable-av1" >> .mozconfig

From bb6dd4e63cf6a77daba861a7db2b58097770ff10 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 26 Aug 2020 07:50:41 +0200
Subject: [PATCH 143/473] Remove stripping of debug files in ARM

---
 icecat.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 7d6fd57..73e32fd 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -564,11 +564,10 @@ export MOZ_DEBUG_FLAGS=" "
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -DNSS_PKCS11_3_0_STRICT"
 
 %if !0%{?build_with_clang}
-%ifarch s390x %{power64} aarch64 %{ix86}
+%ifarch s390x %{power64} aarch64 %{ix86} %{arm}
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--print-memory-usage"
 %endif
 %ifarch %{arm}
-MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--strip-debug"
 echo "ac_add_options --enable-linker=gold" >> .mozconfig
 %endif
 %endif

From db3ceaeba519156bd1319543bbc5132c9cf7c63b Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 26 Aug 2020 08:08:43 +0200
Subject: [PATCH 144/473] Fix linker flags in ARM

---
 icecat.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 73e32fd..484b614 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -564,10 +564,11 @@ export MOZ_DEBUG_FLAGS=" "
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -DNSS_PKCS11_3_0_STRICT"
 
 %if !0%{?build_with_clang}
-%ifarch s390x %{power64} aarch64 %{ix86} %{arm}
+%ifarch s390x %{power64} aarch64 %{ix86}
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--print-memory-usage"
 %endif
 %ifarch %{arm}
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory"
 echo "ac_add_options --enable-linker=gold" >> .mozconfig
 %endif
 %endif

From 003a2d86da04d8f5cf727abdc60825cb98d8685c Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 26 Aug 2020 20:27:34 +0200
Subject: [PATCH 145/473] Mozilla Release 78.2.0ESR

---
 .gitignore  |  2 ++
 icecat.spec | 17 ++++++++++-------
 sources     |  3 ++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 837aba1..5694977 100644
--- a/.gitignore
+++ b/.gitignore
@@ -121,3 +121,5 @@
 /icecat-78.0.1-langpacks.tar.gz
 /icecat-78.0.1-rh1.tar.bz2
 /icecat-78.2.0-rh1.tar.bz2
+/icecat-78.2.0-langpacks.tar.gz
+/icecat-78.2.0-rh2.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index 484b614..bfa0e3c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,13 +1,13 @@
 ### Naming ###
 # Set to true if it's going to be submitted as update
-%global release_build 0
+%global release_build 1
 
 # Set to true if it's going to be submitted as release candidate
-%global release_candidate 1
+%global release_candidate 0
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh1
+%global redhat_ver rh2
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -43,7 +43,7 @@ ExcludeArch: s390x
 %define _lto_cflags %{nil}
 
 # Active/Deactive language files handling
-%global build_langpacks 0
+%global build_langpacks 1
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
@@ -111,7 +111,7 @@ ExcludeArch: s390x
 
 Name: icecat
 Version: 78.2.0
-Release: 0.1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -549,7 +549,7 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
 %endif
 
-%if %{?debug_build} || !0%{?less_optbuild}
+%if %{?debug_build} || !%{less_optbuild}
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2/-O0/')
 %endif
 %ifarch s390x %{arm}
@@ -809,9 +809,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
-* Sun Aug 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-0.1.rc1.rh1.test
+* Tue Aug 25 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-1.rh2
 - Mozilla Release 78.2.0ESR
 
+* Sun Aug 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-0.1.rc1.rh1.test
+- Mozilla Release Candidate 78.2.0ESR
+
 * Wed Jul 29 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0.1-2.rh1.test
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index c9b38ce..c227d2a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = fdd85f10476c90ae73c6b8ca9aa162ae96f481697cb1f36687dbc6ff6202e9507dff96d0b6103c9be684bd6e9db3c767835f9478266ce48cc4cad03b23107ede
-SHA512 (icecat-78.2.0-rh1.tar.bz2) = 7cd7c26ca0c5b0ec0907354c94e3ee80997b21dc95ee93614440430f767829ceab0d5f5638b56286f0a71bb11f3070e2e76ee7a354500ecf02159717cc907d7d
+SHA512 (icecat-78.2.0-langpacks.tar.gz) = 68e5c20ee494fdf2221cdda3bed042e26ecaf4724f972c033e8f2001ca1e6cd86b504f1ec648cb9eeae4ec82491ce2f05dc925d9e883340dcae091b5bb708d5b
+SHA512 (icecat-78.2.0-rh2.tar.bz2) = 9118bf7f7a5d94aa26841a18494b02c1f475899bd5420960155b17cff5ae037b44d46da0564e815862e70c6b3e50be77ed8752a8698ec979dd775925e2df8b54
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 0412dc3920136ee1bae8cdd12422347a102510d3 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 3 Sep 2020 21:51:07 +0200
Subject: [PATCH 146/473] Build Release 78.2.0ESR-rh3| Reintroduce PPC64LE
 builds

---
 .gitignore  |  1 +
 icecat.spec | 12 ++++++++----
 sources     |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5694977..429b6b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,3 +123,4 @@
 /icecat-78.2.0-rh1.tar.bz2
 /icecat-78.2.0-langpacks.tar.gz
 /icecat-78.2.0-rh2.tar.bz2
+/icecat-78.2.0-rh3.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index bfa0e3c..1f20fba 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -7,7 +7,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh2
+%global redhat_ver rh3
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -27,14 +27,14 @@
 %global debug_build   0
 
 # Downgrade optimization
-%global less_optbuild 1
+%global less_optbuild 0
 
 # Use mozilla hardening option?
 %global hardened_build 1
 ####################
 
 # Temporary disabled, filed as rhbz#1862012	
-ExcludeArch: ppc64le
+#ExcludeArch: ppc64le
 
 # Exclude ARM builds for rhbz #1658940
 # Exclude s390x for https://pagure.io/koji/issue/1974
@@ -111,7 +111,7 @@ ExcludeArch: s390x
 
 Name: icecat
 Version: 78.2.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -809,6 +809,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Thu Sep 03 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-2.rh3
+- Build Release 78.2.0ESR-rh3
+- Reintroduce PPC64LE builds
+
 * Tue Aug 25 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-1.rh2
 - Mozilla Release 78.2.0ESR
 
diff --git a/sources b/sources
index c227d2a..9041283 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = fdd85f10476c90ae73c6b8ca9aa162ae96f481697cb1f36687dbc6ff6202e9507dff96d0b6103c9be684bd6e9db3c767835f9478266ce48cc4cad03b23107ede
 SHA512 (icecat-78.2.0-langpacks.tar.gz) = 68e5c20ee494fdf2221cdda3bed042e26ecaf4724f972c033e8f2001ca1e6cd86b504f1ec648cb9eeae4ec82491ce2f05dc925d9e883340dcae091b5bb708d5b
-SHA512 (icecat-78.2.0-rh2.tar.bz2) = 9118bf7f7a5d94aa26841a18494b02c1f475899bd5420960155b17cff5ae037b44d46da0564e815862e70c6b3e50be77ed8752a8698ec979dd775925e2df8b54
+SHA512 (icecat-78.2.0-rh3.tar.bz2) = bfe7109315dfb2f1c4e4328013c275bf9321bf18e7e1693426e35d1c343a1b8e9305bea58a3203dccb649b929cde2237e94aef6dcb70b436a533c173aba17b93
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 0967831236f81d278644eacf40d630f398de8de6 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 4 Sep 2020 08:12:58 +0200
Subject: [PATCH 147/473] Build Release 78.2.0ESR-rh3| Reload source archive

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index 9041283..9a54abc 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = fdd85f10476c90ae73c6b8ca9aa162ae96f481697cb1f36687dbc6ff6202e9507dff96d0b6103c9be684bd6e9db3c767835f9478266ce48cc4cad03b23107ede
 SHA512 (icecat-78.2.0-langpacks.tar.gz) = 68e5c20ee494fdf2221cdda3bed042e26ecaf4724f972c033e8f2001ca1e6cd86b504f1ec648cb9eeae4ec82491ce2f05dc925d9e883340dcae091b5bb708d5b
-SHA512 (icecat-78.2.0-rh3.tar.bz2) = bfe7109315dfb2f1c4e4328013c275bf9321bf18e7e1693426e35d1c343a1b8e9305bea58a3203dccb649b929cde2237e94aef6dcb70b436a533c173aba17b93
+SHA512 (icecat-78.2.0-rh3.tar.bz2) = e123e1c98764d5a6179f6f535562d3ec426f2b5fa290aec93f0dc382fc7278710dc9f8652e1fc528dd12a5c050d7a4bcf80964c3861e2e8528f4f2c6d0a8e91f
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 4003b9aea5322baa2f81c672a7ed58df26d1d81e Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 4 Sep 2020 09:11:32 +0200
Subject: [PATCH 148/473] Build Release 78.2.0ESR-rh3| Fix less_optbuild macros

---
 icecat.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 1f20fba..e0e581a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -532,7 +532,7 @@ cp %{SOURCE18} %{_buildrootdir}/bin || :
 find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
 
 MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
-%if %{?less_optbuild}
+%if 0%{?less_optbuild}
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2/-O1/')
 %endif
 
@@ -549,7 +549,7 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
 %endif
 
-%if %{?debug_build} || !%{less_optbuild}
+%if %{?debug_build} || !0%{?less_optbuild}
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2/-O0/')
 %endif
 %ifarch s390x %{arm}
@@ -599,7 +599,7 @@ export NM="gcc-nm"
 export RANLIB="gcc-ranlib"
 %endif
 
-%if %{?less_optbuild}
+%if 0%{?less_optbuild}
 MOZ_SMP_FLAGS=-j1
 %else
 MOZ_SMP_FLAGS=-j1

From da37eaabdd9e6cd290a61b17fe944b856abb7b06 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 4 Sep 2020 11:58:10 +0200
Subject: [PATCH 149/473] Build Release 78.2.0ESR-rh3| Fix less_optbuild
 macros/2

---
 icecat.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index e0e581a..822c1cc 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -532,9 +532,12 @@ cp %{SOURCE18} %{_buildrootdir}/bin || :
 find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
 
 MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
-%if 0%{?less_optbuild}
+%if %{?less_optbuild}
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2/-O1/')
 %endif
+%if %{?debug_build}
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2/-O0/')
+%endif
 
 #rhbz#1037063
 # -Werror=format-security causes build failures when -Wno-format is explicitly given
@@ -549,9 +552,6 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
 %endif
 
-%if %{?debug_build} || !0%{?less_optbuild}
-MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2/-O0/')
-%endif
 %ifarch s390x %{arm}
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/' -e 's/-O2/-O1/')
 # If MOZ_DEBUG_FLAGS is empty, firefox's build will default it to "-g" which
@@ -599,7 +599,7 @@ export NM="gcc-nm"
 export RANLIB="gcc-ranlib"
 %endif
 
-%if 0%{?less_optbuild}
+%if %{?less_optbuild}
 MOZ_SMP_FLAGS=-j1
 %else
 MOZ_SMP_FLAGS=-j1

From 327e0f499af6a92d82d182feb4e6a0b48415b5c9 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 6 Sep 2020 20:26:30 +0200
Subject: [PATCH 150/473] Build Release 78.2.0ESR-rh4| PPC64le build disabled
 on Fedora 33

---
 .gitignore  |  1 +
 icecat.spec | 17 ++++++++++++-----
 sources     |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 429b6b8..d7409f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,3 +124,4 @@
 /icecat-78.2.0-langpacks.tar.gz
 /icecat-78.2.0-rh2.tar.bz2
 /icecat-78.2.0-rh3.tar.bz2
+/icecat-78.2.0-rh4.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index 822c1cc..6f35cf8 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -7,7 +7,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh3
+%global redhat_ver rh4
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -33,13 +33,16 @@
 %global hardened_build 1
 ####################
 
-# Temporary disabled, filed as rhbz#1862012	
-#ExcludeArch: ppc64le
-
 # Exclude ARM builds for rhbz #1658940
 # Exclude s390x for https://pagure.io/koji/issue/1974
 ExcludeArch: s390x
 
+# PPC64le does not compile on Fedora 33 yet.
+# Temporarily disabled, filed as rhbz#1862012
+%if 0%{?fedora} == 33
+ExcludeArch: ppc64le
+%endif
+
 %define _lto_cflags %{nil}
 
 # Active/Deactive language files handling
@@ -111,7 +114,7 @@ ExcludeArch: s390x
 
 Name: icecat
 Version: 78.2.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -809,6 +812,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Sun Sep 06 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-3.rh4
+- Build Release 78.2.0ESR-rh4
+- PPC64le build disabled on Fedora 33
+
 * Thu Sep 03 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-2.rh3
 - Build Release 78.2.0ESR-rh3
 - Reintroduce PPC64LE builds
diff --git a/sources b/sources
index 9a54abc..33e2abb 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = fdd85f10476c90ae73c6b8ca9aa162ae96f481697cb1f36687dbc6ff6202e9507dff96d0b6103c9be684bd6e9db3c767835f9478266ce48cc4cad03b23107ede
 SHA512 (icecat-78.2.0-langpacks.tar.gz) = 68e5c20ee494fdf2221cdda3bed042e26ecaf4724f972c033e8f2001ca1e6cd86b504f1ec648cb9eeae4ec82491ce2f05dc925d9e883340dcae091b5bb708d5b
-SHA512 (icecat-78.2.0-rh3.tar.bz2) = e123e1c98764d5a6179f6f535562d3ec426f2b5fa290aec93f0dc382fc7278710dc9f8652e1fc528dd12a5c050d7a4bcf80964c3861e2e8528f4f2c6d0a8e91f
+SHA512 (icecat-78.2.0-rh4.tar.bz2) = 868b5931220aa55ec5f85ac5425ddab7e04964c953601941e41f14ec686c5a3d805459fb49e2d2870eae15d93ee8623c5bde65dbe88760689bd9ba13475ab55c
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 6644f01d3c06c475f50174d5e4f3982a521a73aa Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 7 Sep 2020 12:17:43 +0200
Subject: [PATCH 151/473] Build Release 78.2.0ESR-rh5

---
 .gitignore  | 1 +
 icecat.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d7409f2..2d7ae9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,3 +125,4 @@
 /icecat-78.2.0-rh2.tar.bz2
 /icecat-78.2.0-rh3.tar.bz2
 /icecat-78.2.0-rh4.tar.bz2
+/icecat-78.2.0-rh5.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index 6f35cf8..13ff476 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -7,7 +7,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh4
+%global redhat_ver rh5
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -114,7 +114,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.2.0
-Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 4%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -812,6 +812,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Sun Sep 06 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-4.rh5
+- Build Release 78.2.0ESR-rh5
+
 * Sun Sep 06 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-3.rh4
 - Build Release 78.2.0ESR-rh4
 - PPC64le build disabled on Fedora 33
diff --git a/sources b/sources
index 33e2abb..a7e7347 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = fdd85f10476c90ae73c6b8ca9aa162ae96f481697cb1f36687dbc6ff6202e9507dff96d0b6103c9be684bd6e9db3c767835f9478266ce48cc4cad03b23107ede
 SHA512 (icecat-78.2.0-langpacks.tar.gz) = 68e5c20ee494fdf2221cdda3bed042e26ecaf4724f972c033e8f2001ca1e6cd86b504f1ec648cb9eeae4ec82491ce2f05dc925d9e883340dcae091b5bb708d5b
-SHA512 (icecat-78.2.0-rh4.tar.bz2) = 868b5931220aa55ec5f85ac5425ddab7e04964c953601941e41f14ec686c5a3d805459fb49e2d2870eae15d93ee8623c5bde65dbe88760689bd9ba13475ab55c
+SHA512 (icecat-78.2.0-rh5.tar.bz2) = 325e468f52eb553a0b378190fbe2a1a1589e6ca88fe22668244bb9d5f2162759eb63f94404fd71bbe38cc0712eded44fa1435d6b53ab625ba0ee2402461f2403
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 1badc0d5255ade8a8377f9a970bb64485e431b6c Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 8 Sep 2020 17:06:24 +0200
Subject: [PATCH 152/473] Add configure options to allow loading unsigned
 bundled addons

---
 icecat.spec | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 13ff476..e7430e0 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -114,7 +114,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.2.0
-Release: 4%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 5%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -399,8 +399,10 @@ tar -xf %{SOURCE5}
 rm -f .mozconfig
 cp -p %{SOURCE3} .mozconfig
 
-# Disable signature checking for extensions that are bundled with IceCat
-echo "ac_add_options --with-unsigned-addon-scopes=app" >> .mozconfig
+# Disable signature checking for extensions that are bundled with IceCat.
+# Add these options to allow loading unsigned add-ons in app and system scopes.
+echo "ac_add_options --with-unsigned-addon-scopes=app,system" >> .mozconfig
+echo "ac_add_options --allow-addon-sideload" >> .mozconfig
 
 echo "ac_add_options --enable-default-toolkit=cairo-gtk3-wayland" >> .mozconfig
 echo "ac_add_options --enable-official-branding" >> .mozconfig
@@ -812,6 +814,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Tue Sep 08 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-5.rh5
+- Add configure options to allow loading unsigned bundled addons
+
 * Sun Sep 06 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-4.rh5
 - Build Release 78.2.0ESR-rh5
 

From 06564d148e345359ce1a2e1d107affd6f36996eb Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 10 Sep 2020 00:52:57 +0200
Subject: [PATCH 153/473] Build Release 78.2.0ESR-rh6

---
 .gitignore         |  1 +
 icecat.appdata.xml |  6 +-----
 icecat.spec        | 28 +++++++++++++++++++---------
 sources            |  2 +-
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2d7ae9d..071b1ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,3 +126,4 @@
 /icecat-78.2.0-rh3.tar.bz2
 /icecat-78.2.0-rh4.tar.bz2
 /icecat-78.2.0-rh5.tar.bz2
+/icecat-78.2.0-rh6.tar.bz2
diff --git a/icecat.appdata.xml b/icecat.appdata.xml
index 49f4021..6e1f7ab 100644
--- a/icecat.appdata.xml
+++ b/icecat.appdata.xml
@@ -11,7 +11,7 @@
   </categories>
   <description>
     <p>
-      GNUZilla Icecat is a fully-free fork of Mozilla Firefox ESR browser.
+      GNU IceCat is the GNU version of the Firefox ESR browser.
     </p>  
     <p>
        Its main advantage is an ethical one: it is entirely free software:
@@ -33,10 +33,6 @@
           HTTPS Everywhere is an extension that encrypts your communications with many major websites, making your browsing more secure
        </li>
        <li>
-       Onion Browser Button
-          Easily browse the internet using TOR proxy with just one click
-       </li>
-       <li>
        ViewTube
           Watch videos from video sharing websites with extra options
        </li>
diff --git a/icecat.spec b/icecat.spec
index e7430e0..92d154c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -7,7 +7,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh5
+%global redhat_ver rh6
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -114,7 +114,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.2.0
-Release: 5%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 6%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -306,22 +306,29 @@ Provides: webclient
 Provides: mozilla-https-everywhere = 20191107
 
 %description
-GNUZilla Icecat is a fully-free fork of Mozilla Firefox ESR.
+GNU IceCat is the GNU version of the Firefox ESR browser.
 Extensions included to this version of IceCat:
 
  * LibreJS
    GNU LibreJS aims to address the JavaScript problem described in the article
-   "The JavaScript Trap" of Richard Stallman
+   "The JavaScript Trap" of Richard Stallman.
 
  * HTTPS Everywhere
    HTTPS Everywhere is an extension that encrypts your communications with
-   many major websites, making your browsing more secure
-
- * Onion Browser Button
-   Easily browse the internet using TOR proxy with just one click
+   many major websites, making your browsing more secure.
 
  * ViewTube
-   Watch videos from video sharing websites with extra options
+   Watch videos from video sharing websites with extra options.
+
+ * A set of companion extensions for LibreJS by Nathan Nichols
+   are pre-installed, and provide workarounds to use some services at USPS,
+   RSF.org, SumOfUs.org, pay.gov, McDonald's, goteo.org and Google Docs
+   without using nonfree JavaScript.
+
+ * A series of configuration changes and tweaks were applied to ensure that
+   IceCat does not initiate network connections that the user has not explicitly
+   requested. This implies not downloading feeds, updates, blacklists or any
+   other similar data needed during startup.
 
 %if 0%{?wayland_backend_default}
 %package x11
@@ -814,6 +821,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Wed Sep 09 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-6.rh6
+- Build Release 78.2.0ESR-rh6
+
 * Tue Sep 08 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-5.rh5
 - Add configure options to allow loading unsigned bundled addons
 
diff --git a/sources b/sources
index a7e7347..6dfaa33 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = fdd85f10476c90ae73c6b8ca9aa162ae96f481697cb1f36687dbc6ff6202e9507dff96d0b6103c9be684bd6e9db3c767835f9478266ce48cc4cad03b23107ede
 SHA512 (icecat-78.2.0-langpacks.tar.gz) = 68e5c20ee494fdf2221cdda3bed042e26ecaf4724f972c033e8f2001ca1e6cd86b504f1ec648cb9eeae4ec82491ce2f05dc925d9e883340dcae091b5bb708d5b
-SHA512 (icecat-78.2.0-rh5.tar.bz2) = 325e468f52eb553a0b378190fbe2a1a1589e6ca88fe22668244bb9d5f2162759eb63f94404fd71bbe38cc0712eded44fa1435d6b53ab625ba0ee2402461f2403
+SHA512 (icecat-78.2.0-rh6.tar.bz2) = bfc3abb21e3093e4315eb179a8b25088d773463529725d7cd987a6ea72144335260f42225f76853b9d13a8e3207d2ab1718aced423010e82b095ddaa40441204
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 6f918a102ee0bebbc1e048316aaa2a663e5aea4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Sat, 19 Sep 2020 00:31:47 +0200
Subject: [PATCH 154/473] Use python3 instead of python2 for build

---
 icecat.spec | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 92d154c..ecde3c3 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -114,7 +114,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.2.0
-Release: 6%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 7%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -262,7 +262,7 @@ BuildRequires: nss-static >= %{nss_version}
 BuildRequires: openjpeg-devel
 BuildRequires: pango-devel
 BuildRequires: pipewire-devel
-BuildRequires: python2-devel
+BuildRequires: python3-devel
 BuildRequires: perl-interpreter
 BuildRequires: pkgconfig(xrender)
 BuildRequires: pkgconfig(libstartup-notification-1.0)
@@ -290,6 +290,10 @@ BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version}
 Requires: sqlite >= %{sqlite_build_version}
 %endif
 
+%if 0%{?big_endian}
+BuildRequires: icu
+%endif
+
 Requires: dconf
 Requires: mozilla-filesystem
 Requires: p11-kit-trust
@@ -530,9 +534,9 @@ env CARGO_HOME=.cargo cargo install cbindgen
 export PATH=`pwd`/.cargo/bin:$PATH
 %endif
 
-echo "Generate big endian version of config/external/icu/data/icud58l.dat"
+echo "Generate big endian version of config/external/icu/data/icudt67l.dat"
 %if 0%{?big_endian}
-  ./mach python intl/icu_sources_data.py .
+  icupkg -tb config/external/icu/data/icudt67l.dat config/external/icu/data/icudt67b.dat
   ls -l config/external/icu/data
   rm -f config/external/icu/data/icudt*l.dat
 %endif
@@ -821,6 +825,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Fri Sep 18 2020 Miro Hrončok <mhroncok@redhat.com> - 78.2.0-7.rh6
+- Use python3 instead of python2 for build
+
 * Wed Sep 09 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-6.rh6
 - Build Release 78.2.0ESR-rh6
 

From f2082f91a5f4b71806438a482903c73f47c3f6d9 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sat, 19 Sep 2020 11:38:36 +0200
Subject: [PATCH 155/473] Fix the variable of Python3 executable

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index ecde3c3..101d456 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -599,7 +599,7 @@ export LDFLAGS=$MOZ_LINK_FLAGS
 export PREFIX='%{_prefix}'
 export LIBDIR='%{_libdir}'
 export PKG_CONFIG='%{_bindir}/pkg-config'
-export PYTHON='%{__python2}'
+export PYTHON='%{__python3}'
 
 %if 0%{?build_with_clang}
 export LLVM_PROFDATA="llvm-profdata"

From ee476941caf0313f0a02fe23c6cfd7019b54bf42 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 21 Sep 2020 18:42:01 +0200
Subject: [PATCH 156/473] Mozilla Release 78.3.0ESR-rh1

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 9 ++++++---
 sources                 | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 071b1ff..e16e816 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,3 +127,5 @@
 /icecat-78.2.0-rh4.tar.bz2
 /icecat-78.2.0-rh5.tar.bz2
 /icecat-78.2.0-rh6.tar.bz2
+/icecat-78.3.0-langpacks.tar.gz
+/icecat-78.3.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 91a0a13..eb3b8f1 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.2.0
+VERSION=78.3.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 101d456..67ee4f8 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -7,7 +7,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh6
+%global redhat_ver rh1
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -113,8 +113,8 @@ ExcludeArch: ppc64le
 %global build_with_clang  0
 
 Name: icecat
-Version: 78.2.0
-Release: 7%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.3.0
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -825,6 +825,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Mon Sep 21 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.0-1.rh1
+- Mozilla Release 78.3.0ESR-rh1
+
 * Fri Sep 18 2020 Miro Hrončok <mhroncok@redhat.com> - 78.2.0-7.rh6
 - Use python3 instead of python2 for build
 
diff --git a/sources b/sources
index 6dfaa33..c103911 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = fdd85f10476c90ae73c6b8ca9aa162ae96f481697cb1f36687dbc6ff6202e9507dff96d0b6103c9be684bd6e9db3c767835f9478266ce48cc4cad03b23107ede
-SHA512 (icecat-78.2.0-langpacks.tar.gz) = 68e5c20ee494fdf2221cdda3bed042e26ecaf4724f972c033e8f2001ca1e6cd86b504f1ec648cb9eeae4ec82491ce2f05dc925d9e883340dcae091b5bb708d5b
-SHA512 (icecat-78.2.0-rh6.tar.bz2) = bfc3abb21e3093e4315eb179a8b25088d773463529725d7cd987a6ea72144335260f42225f76853b9d13a8e3207d2ab1718aced423010e82b095ddaa40441204
+SHA512 (icecat-78.3.0-langpacks.tar.gz) = e585d16c45ff60e895c06d79efdd3c4a56a62dd27b9e61234dbebff331e8634058d93a2938ccf6b01758e055f08211f0b47178b2c7d314a27d2c4863fac7f7ee
+SHA512 (icecat-78.3.0-rh1.tar.bz2) = 07a8a7e339ebbe101be154480bb8ef5b667ea23a949237c5b4417d986b3f8659a8c5b329bce6c78247a5280e567a49575f3d96b070508011b019e4d1e42385f4
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From c425df3128d29c26897c869c24da0147ab2e644e Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 23 Sep 2020 14:23:53 +0200
Subject: [PATCH 157/473] Rebuild for libevent-2.1.12

---
 icecat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 67ee4f8..04a4e4c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -114,7 +114,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.3.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -825,6 +825,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Wed Sep 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.0-2.rh1
+- Rebuild for libevent-2.1.12
+
 * Mon Sep 21 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.0-1.rh1
 - Mozilla Release 78.3.0ESR-rh1
 

From 6e5b0b7f1e0f674a7d1a1c47bfb27f6e70f18e0c Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 2 Oct 2020 10:49:21 +0200
Subject: [PATCH 158/473] Mozilla Release 78.3.1ESR-rh1| Patched for
 mzbz#1640567

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 30 ++++++++++++++++++++++++++----
 mozilla-1640567.patch   | 18 ++++++++++++++++++
 sources                 |  4 ++--
 5 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 mozilla-1640567.patch

diff --git a/.gitignore b/.gitignore
index e16e816..5eb0675 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,3 +129,5 @@
 /icecat-78.2.0-rh6.tar.bz2
 /icecat-78.3.0-langpacks.tar.gz
 /icecat-78.3.0-rh1.tar.bz2
+/icecat-78.3.1-langpacks.tar.gz
+/icecat-78.3.1-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index eb3b8f1..cb5f586 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.3.0
+VERSION=78.3.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 04a4e4c..d969b00 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -33,6 +33,15 @@
 %global hardened_build 1
 ####################
 
+# Use PGO/LTO
+%if %{release_build}
+%global build_with_pgo 0
+%endif
+
+# Disable LTO to work around rhbz#1883904
+%define _lto_cflags %{nil}
+####################
+
 # Exclude ARM builds for rhbz #1658940
 # Exclude s390x for https://pagure.io/koji/issue/1974
 ExcludeArch: s390x
@@ -43,8 +52,6 @@ ExcludeArch: s390x
 ExcludeArch: ppc64le
 %endif
 
-%define _lto_cflags %{nil}
-
 # Active/Deactive language files handling
 %global build_langpacks 1
 
@@ -113,8 +120,8 @@ ExcludeArch: ppc64le
 %global build_with_clang  0
 
 Name: icecat
-Version: 78.3.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.3.1
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -186,6 +193,7 @@ Patch226: rhbz-1354671.patch
 # Upstream patches
 Patch401: mozilla-1526653.patch
 Patch402: mozilla-1196777.patch
+Patch403: mozilla-1640567.patch
 Patch412: mozilla-1337988.patch
 Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
@@ -397,6 +405,7 @@ tar -xf %{SOURCE5}
 %endif
 
 %patch402 -p1 -b .1196777
+%patch403 -p1 -b .1640567
 %patch423 -p1 -b .mozilla-1596503
 
 # Wayland specific upstream patches
@@ -497,7 +506,12 @@ echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 echo "ac_add_options --disable-ion" >> .mozconfig
 %endif
 
+%if 0%{?build_with_pgo}
+echo "ac_add_options MOZ_PGO=1" >> .mozconfig
+echo "ac_add_options --enable-lto" >> .mozconfig
+%else
 echo "ac_add_options --disable-lto" >> .mozconfig
+%endif
 
 echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig
 
@@ -614,6 +628,10 @@ export AR="gcc-ar"
 export NM="gcc-nm"
 export RANLIB="gcc-ranlib"
 %endif
+%if 0%{?build_with_pgo}
+# PGO build doesn't work with ccache
+export CCACHE_DISABLE=1
+%endif
 
 %if %{?less_optbuild}
 MOZ_SMP_FLAGS=-j1
@@ -825,6 +843,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Thu Oct 01 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.1-1.rh1
+- Mozilla Release 78.3.1ESR-rh1
+- Patched for mzbz#1640567
+
 * Wed Sep 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.0-2.rh1
 - Rebuild for libevent-2.1.12
 
diff --git a/mozilla-1640567.patch b/mozilla-1640567.patch
new file mode 100644
index 0000000..c1f3f44
--- /dev/null
+++ b/mozilla-1640567.patch
@@ -0,0 +1,18 @@
+diff --git a/layout/xul/nsMenuPopupFrame.cpp b/layout/xul/nsMenuPopupFrame.cpp
+--- a/layout/xul/nsMenuPopupFrame.cpp
++++ b/layout/xul/nsMenuPopupFrame.cpp
+@@ -1422,11 +1422,9 @@
+           !GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
+         screenPoint = nsPoint(anchorRect.x, anchorRect.y);
+         mAnchorRect = anchorRect;
+-      } else
++      }
+ #endif
+-      {
+-        screenPoint = AdjustPositionForAnchorAlign(anchorRect, hFlip, vFlip);
+-      }
++      screenPoint = AdjustPositionForAnchorAlign(anchorRect, hFlip, vFlip);
+     } else {
+       // with no anchor, the popup is positioned relative to the root frame
+       anchorRect = rootScreenRect;
+
diff --git a/sources b/sources
index c103911..6adcfa1 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = fdd85f10476c90ae73c6b8ca9aa162ae96f481697cb1f36687dbc6ff6202e9507dff96d0b6103c9be684bd6e9db3c767835f9478266ce48cc4cad03b23107ede
-SHA512 (icecat-78.3.0-langpacks.tar.gz) = e585d16c45ff60e895c06d79efdd3c4a56a62dd27b9e61234dbebff331e8634058d93a2938ccf6b01758e055f08211f0b47178b2c7d314a27d2c4863fac7f7ee
-SHA512 (icecat-78.3.0-rh1.tar.bz2) = 07a8a7e339ebbe101be154480bb8ef5b667ea23a949237c5b4417d986b3f8659a8c5b329bce6c78247a5280e567a49575f3d96b070508011b019e4d1e42385f4
+SHA512 (icecat-78.3.1-langpacks.tar.gz) = 08ab241459f1142c3d334933689dfbc21c8a44de78d415745df9488f8e49bc33614d39ba288b398cfcac74c1e1fb73ec7016041a7652d3b047f13c9a570d828d
+SHA512 (icecat-78.3.1-rh1.tar.bz2) = 9b824888ae0a8c3a3e152739c579f11bab8ec2096f736e9763ce664beacc2cb47a0d2b2584d4ce4329a74237ccf2466d2f9217e48516712187801ee02ded3a8c
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 42bafbe14edefad963c300446f06ae46002ce712 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 4 Oct 2020 18:08:38 +0200
Subject: [PATCH 159/473] PGO build test

---
 icecat-pgo.patch      | 129 ++++++++++++++++++++++++++++++++++++++++++
 icecat.spec           |  34 +++++++++--
 mozilla-1516081.patch |  21 +++++++
 mozilla-1516803.patch |  16 ++++++
 4 files changed, 194 insertions(+), 6 deletions(-)
 create mode 100644 icecat-pgo.patch
 create mode 100644 mozilla-1516081.patch
 create mode 100644 mozilla-1516803.patch

diff --git a/icecat-pgo.patch b/icecat-pgo.patch
new file mode 100644
index 0000000..b63917c
--- /dev/null
+++ b/icecat-pgo.patch
@@ -0,0 +1,129 @@
+diff -up a/build/moz.configure/lto-pgo.configure.pgo b/build/moz.configure/lto-pgo.configure
+--- a/build/moz.configure/lto-pgo.configure.pgo	2020-09-30 19:41:10.000000000 +0200
++++ b/build/moz.configure/lto-pgo.configure	2020-10-01 14:48:15.459225300 +0200
+@@ -69,12 +69,14 @@ set_config('PGO_PROFILE_PATH', pgo_profi
+ @imports(_from='__builtin__', _import='min')
+ def pgo_flags(compiler, profdata, target_is_windows):
+     if compiler.type == 'gcc':
++        #profile_use = '-fprofile-use=$(topobjdir)'
++        profile_use = '-fprofile-use'
+         return namespace(
+             gen_cflags=['-fprofile-generate'],
+             gen_ldflags=['-fprofile-generate'],
+-            use_cflags=['-fprofile-use', '-fprofile-correction',
++            use_cflags=[profile_use, '-fprofile-correction',
+                         '-Wcoverage-mismatch'],
+-            use_ldflags=['-fprofile-use'],
++            use_ldflags=[profile_use],
+         )
+ 
+     if compiler.type in ('clang-cl', 'clang'):
+@@ -192,13 +194,13 @@ def lto(value, c_compiler, ld64_known_go
+                 cflags.append("-flto")
+                 ldflags.append("-flto")
+             else:
+-                cflags.append("-flto=thin")
+-                ldflags.append("-flto=thin")
++                cflags.append("-flto")
++                ldflags.append("-flto")
+         elif c_compiler.type == 'clang-cl':
+             if len(value) and value[0].lower() == 'full':
+                 cflags.append("-flto")
+             else:
+-                cflags.append("-flto=thin")
++                cflags.append("-flto")
+             # With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
+             # AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
+             cflags.append("-fuse-ld=lld");
+diff -up a/build/pgo/profileserver.py.pgo b/build/pgo/profileserver.py
+--- a/build/pgo/profileserver.py.pgo	2020-09-30 19:41:10.000000000 +0200
++++ b/build/pgo/profileserver.py	2020-10-01 13:54:58.535312905 +0200
+@@ -11,7 +11,7 @@
+ import subprocess
+ 
+ import mozcrash
+-from mozbuild.base import MozbuildObject, BinaryNotFoundException
++from mozbuild.base import MozbuildObject, BinaryNotFoundException, BuildEnvironmentNotFoundException
+ from mozfile import TemporaryDirectory
+ from mozhttpd import MozHttpd
+ from mozprofile import IceCatProfile, Preferences
+@@ -84,9 +84,22 @@ if __name__ == '__main__':
+                        port=PORT,
+                        options='primary,privileged')
+ 
+-    old_profraw_files = glob.glob('*.profraw')
+-    for f in old_profraw_files:
+-        os.remove(f)
++    using_gcc = False
++    try:
++        if build.config_environment.substs.get('CC_TYPE') == 'gcc':
++            using_gcc = True
++    except BuildEnvironmentNotFoundException:
++        pass
++
++    if using_gcc:
++        for dirpath, _, filenames in os.walk('.'):
++            for f in filenames:
++                if f.endswith('.gcda'):
++                    os.remove(os.path.join(dirpath, f))
++    else:
++        old_profraw_files = glob.glob('*.profraw')
++        for f in old_profraw_files:
++            os.remove(f)
+ 
+     with TemporaryDirectory() as profilePath:
+         # TODO: refactor this into mozprofile
+@@ -191,6 +204,11 @@
+             print("IceCat exited successfully, but produced a crashreport")
+             sys.exit(1)
+ 
++
++        print('Copying profile data....')
++        os.system('pwd');
++        os.system('tar cf profdata.tar.gz `find . -name "*.gcda"`; cd ..; tar xf instrumented/profdata.tar.gz;');
++
+         llvm_profdata = env.get('LLVM_PROFDATA')
+         if llvm_profdata:
+             profraw_files = glob.glob('*.profraw')
+diff -up a/build/unix/mozconfig.unix.pgo b/build/unix/mozconfig.unix
+--- a/build/unix/mozconfig.unix.pgo	2020-09-30 19:41:10.000000000 +0200
++++ b/build/unix/mozconfig.unix	2020-10-01 13:54:58.535312905 +0200
+@@ -6,6 +6,15 @@ if [ -n "$FORCE_GCC" ]; then
+     CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
+     CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
+ 
++    if [ -n "$MOZ_PGO" ]; then
++        if [ -z "$USE_ARTIFACT" ]; then
++            ac_add_options --enable-lto
++        fi
++        export AR="$topsrcdir/gcc/bin/gcc-ar"
++        export NM="$topsrcdir/gcc/bin/gcc-nm"
++        export RANLIB="$topsrcdir/gcc/bin/gcc-ranlib"
++    fi
++
+     # We want to make sure we use binutils and other binaries in the tooltool
+     # package.
+     mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
+diff -up a/extensions/spellcheck/src/moz.build.pgo b/extensions/spellcheck/src/moz.build
+--- a/extensions/spellcheck/src/moz.build.pgo	2020-09-30 19:41:17.000000000 +0200
++++ b/extensions/spellcheck/src/moz.build	2020-10-01 13:54:58.535312905 +0200
+@@ -31,3 +31,5 @@ EXPORTS.mozilla += [
+ 
+ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+     CXXFLAGS += ['-Wno-error=shadow']
++
++CXXFLAGS += ['-fno-devirtualize']
+\ No newline at end of file
+diff -up a/python/mozbuild/mozbuild/build_commands.py.pgo b/python/mozbuild/mozbuild/build_commands.py
+--- a/python/mozbuild/mozbuild/build_commands.py.pgo	2020-09-30 19:41:46.000000000 +0200
++++ b/python/mozbuild/mozbuild/build_commands.py	2020-10-01 13:54:58.535312905 +0200
+@@ -108,7 +108,8 @@ class Build(MachCommandBase):
+                 return status
+ 
+             pgo_env = os.environ.copy()
+-            pgo_env['LLVM_PROFDATA'] = instr.config_environment.substs.get('LLVM_PROFDATA')
++            if instr.config_environment.substs.get('CC_TYPE') != 'gcc':
++                pgo_env['LLVM_PROFDATA'] = instr.config_environment.substs.get('LLVM_PROFDATA')
+             pgo_env['JARLOG_FILE'] = mozpath.join(orig_topobjdir, 'jarlog/en-US.log')
+             pgo_cmd = [
+                 instr.virtualenv_manager.python_path,
diff --git a/icecat.spec b/icecat.spec
index d969b00..148e461 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -17,9 +17,8 @@
 %global extra_ver %{nil}
 %endif
 
-%if !%{release_build}
 %global pre_tag .test
-%endif
+
 ####################
 
 ### Optimization ###
@@ -33,10 +32,15 @@
 %global hardened_build 1
 ####################
 
-# Use PGO/LTO
+# Build PGO+LTO on x86_64 and aarch64 only due to build issues
+# on other arches.
+%ifarch x86_64
 %if %{release_build}
+%global build_with_pgo 1
+%else
 %global build_with_pgo 0
 %endif
+%endif
 
 # Disable LTO to work around rhbz#1883904
 %define _lto_cflags %{nil}
@@ -121,7 +125,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.3.1
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -198,6 +202,11 @@ Patch412: mozilla-1337988.patch
 Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
 
+# PGO/LTO patches
+Patch600:        %{name}-pgo.patch
+Patch601:        mozilla-1516081.patch
+Patch602:        mozilla-1516803.patch
+
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
 
@@ -415,6 +424,16 @@ tar -xf %{SOURCE5}
 %patch585 -p1 -b .firefox-vaapi-extra-frames
 %patch589 -p1 -b .mozilla-1634213
 
+# PGO patches
+%if %{build_with_pgo}
+%if !%{build_with_clang}
+%patch600 -p1 -b .pgo
+#fix
+#%patch601 -p1 -b .1516081
+%patch602 -p1 -b .1516803
+%endif
+%endif
+
 # Remove default configuration and copy the customized one
 rm -f .mozconfig
 cp -p %{SOURCE3} .mozconfig
@@ -843,15 +862,18 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Sun Oct 04 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.1-2.rh1.test
+- PGO build test
+
 * Thu Oct 01 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.1-1.rh1
-- Mozilla Release 78.3.1ESR-rh1
+- Mozilla Release 78.3.1ESR (rh1)
 - Patched for mzbz#1640567
 
 * Wed Sep 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.0-2.rh1
 - Rebuild for libevent-2.1.12
 
 * Mon Sep 21 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.0-1.rh1
-- Mozilla Release 78.3.0ESR-rh1
+- Mozilla Release 78.3.0ESR (rh1)
 
 * Fri Sep 18 2020 Miro Hrončok <mhroncok@redhat.com> - 78.2.0-7.rh6
 - Use python3 instead of python2 for build
diff --git a/mozilla-1516081.patch b/mozilla-1516081.patch
new file mode 100644
index 0000000..a15facd
--- /dev/null
+++ b/mozilla-1516081.patch
@@ -0,0 +1,21 @@
+diff -up firefox-71.0/build/moz.configure/lto-pgo.configure.1516081 firefox-71.0/build/moz.configure/lto-pgo.configure
+--- firefox-71.0/build/moz.configure/lto-pgo.configure.1516081	2019-11-26 01:02:19.000000000 +0100
++++ firefox-71.0/build/moz.configure/lto-pgo.configure	2019-11-26 11:04:10.993077232 +0100
+@@ -71,7 +71,7 @@ set_config('PGO_PROFILE_PATH', pgo_profi
+ def pgo_flags(compiler, target, profdata):
+     if compiler.type == 'gcc':
+         return namespace(
+-            gen_cflags=['-fprofile-generate'],
++            gen_cflags=['-fprofile-generate', '-DMOZ_PROFILE_INSTRUMENTATION'],
+             gen_ldflags=['-fprofile-generate'],
+             use_cflags=['-fprofile-use', '-fprofile-correction',
+                         '-Wcoverage-mismatch'],
+@@ -92,7 +92,7 @@ def pgo_flags(compiler, target, profdata
+             gen_ldflags = ['-fprofile-generate']
+ 
+         return namespace(
+-            gen_cflags=[prefix + '-fprofile-generate'],
++            gen_cflags=[prefix + '-fprofile-generate', '-DMOZ_PROFILE_INSTRUMENTATION'],
+             gen_ldflags=gen_ldflags,
+             use_cflags=[prefix + '-fprofile-use=%s' % profdata,
+                         # Some error messages about mismatched profile data
diff --git a/mozilla-1516803.patch b/mozilla-1516803.patch
new file mode 100644
index 0000000..f1f37f4
--- /dev/null
+++ b/mozilla-1516803.patch
@@ -0,0 +1,16 @@
+diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
+--- a/security/sandbox/linux/moz.build
++++ b/security/sandbox/linux/moz.build
+@@ -99,9 +99,8 @@
+ # gcc lto likes to put the top level asm in syscall.cc in a different partition
+ # from the function using it which breaks the build.  Work around that by
+ # forcing there to be only one partition.
+-for f in CONFIG['OS_CXXFLAGS']:
+-    if f.startswith('-flto') and CONFIG['CC_TYPE'] != 'clang':
+-        LDFLAGS += ['--param lto-partitions=1']
++if CONFIG['CC_TYPE'] != 'clang':
++    LDFLAGS += ['--param', 'lto-partitions=1']
+ 
+ DEFINES['NS_NO_XPCOM'] = True
+ DisableStlWrapping()
+

From 10e8270a46ff79a8b4c1e754b957cf04607a167d Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sun, 4 Oct 2020 18:14:25 +0200
Subject: [PATCH 160/473] PGO build test| Fix macro

---
 icecat.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 148e461..468dfc9 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -35,7 +35,7 @@
 # Build PGO+LTO on x86_64 and aarch64 only due to build issues
 # on other arches.
 %ifarch x86_64
-%if %{release_build}
+%if 0%{?release_build}
 %global build_with_pgo 1
 %else
 %global build_with_pgo 0
@@ -425,7 +425,7 @@ tar -xf %{SOURCE5}
 %patch589 -p1 -b .mozilla-1634213
 
 # PGO patches
-%if %{build_with_pgo}
+%if 0%{?build_with_pgo}
 %if !%{build_with_clang}
 %patch600 -p1 -b .pgo
 #fix

From 67032735c3849f3afb887886ee47bc54524ae20c Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 5 Oct 2020 18:50:06 +0200
Subject: [PATCH 161/473] BuildRequires python3-setuptools explicitly

---
 icecat.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/icecat.spec b/icecat.spec
index 468dfc9..98ca625 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -280,6 +280,7 @@ BuildRequires: openjpeg-devel
 BuildRequires: pango-devel
 BuildRequires: pipewire-devel
 BuildRequires: python3-devel
+BuildRequires: python3-setuptools
 BuildRequires: perl-interpreter
 BuildRequires: pkgconfig(xrender)
 BuildRequires: pkgconfig(libstartup-notification-1.0)

From ba3d3fd48c714fc587854a52384d3b8e165ae5d5 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 7 Oct 2020 21:21:00 +0200
Subject: [PATCH 162/473] Fix PGO patches

---
 icecat-78.0-build-icu-big-endian.patch | 12 ------------
 icecat-pgo.patch                       | 14 ++++++++++++++
 icecat.spec                            | 16 ++++++----------
 mozilla-1516081.patch                  | 21 ---------------------
 mozilla-1669442.patch                  | 13 +++++++++++++
 mozilla-1669639.patch                  | 15 +++++++++++++++
 6 files changed, 48 insertions(+), 43 deletions(-)
 delete mode 100644 icecat-78.0-build-icu-big-endian.patch
 delete mode 100644 mozilla-1516081.patch
 create mode 100644 mozilla-1669442.patch
 create mode 100644 mozilla-1669639.patch

diff --git a/icecat-78.0-build-icu-big-endian.patch b/icecat-78.0-build-icu-big-endian.patch
deleted file mode 100644
index c9d16d8..0000000
--- a/icecat-78.0-build-icu-big-endian.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up a/build/autoconf/icu.orig.m4 b/build/autoconf/icu.m4
---- a/build/autoconf/icu.orig.m4	2016-12-09 09:11:01.227317790 +0100
-+++ b/build/autoconf/icu.m4	2016-12-09 09:18:40.608712247 +0100
-@@ -78,7 +78,7 @@
-     # TODO: the l is actually endian-dependent
-     # We could make this set as 'l' or 'b' for little or big, respectively,
-     # but we'd need to check in a big-endian version of the file.
--    ICU_DATA_FILE="icudt${version}l.dat"
-+    ICU_DATA_FILE="icudt${version}b.dat"
- fi
- 
- AC_SUBST(MOZ_ICU_VERSION)
diff --git a/icecat-pgo.patch b/icecat-pgo.patch
index b63917c..66a5e2a 100644
--- a/icecat-pgo.patch
+++ b/icecat-pgo.patch
@@ -127,3 +127,17 @@ diff -up a/python/mozbuild/mozbuild/build_commands.py.pgo b/python/mozbuild/mozb
              pgo_env['JARLOG_FILE'] = mozpath.join(orig_topobjdir, 'jarlog/en-US.log')
              pgo_cmd = [
                  instr.virtualenv_manager.python_path,
+--- a/toolkit/components/terminator/nsTerminator.cpp.pgo	2020-10-07 09:22:26.698243673 +0200
++++ b/toolkit/components/terminator/nsTerminator.cpp	2020-10-07 09:22:43.026312999 +0200
+@@ -418,6 +418,11 @@ void nsTerminator::StartWatchdog() {
+   }
+ #endif
+ 
++  // Disable watchdog for PGO train builds - writting profile information at
++  // exit may take time and it is better to make build hang rather than
++  // silently produce poorly performing binary.
++  crashAfterMS = INT32_MAX;
++
+   UniquePtr<Options> options(new Options());
+   const PRIntervalTime ticksDuration = PR_MillisecondsToInterval(1000);
+   options->crashAfterTicks = crashAfterMS / ticksDuration;
diff --git a/icecat.spec b/icecat.spec
index 98ca625..b811892 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -181,12 +181,13 @@ Patch7: %{name}-fix_jar.patch
 # Fix files list for installer
 Patch8: %{name}-fix_installer.patch
 
-Patch26: %{name}-78.0-build-icu-big-endian.patch
-
 Patch40: build-aarch64-skia.patch
 Patch41: build-disable-elfhack.patch
 Patch44: build-arm-libopus.patch
 
+Patch54: mozilla-1669639.patch
+Patch55: mozilla-1669442.patch
+
 # Fedora specific patches
 Patch219: rhbz-1173156.patch
 Patch220: firefox-nss-version.patch
@@ -204,7 +205,6 @@ Patch422: mozilla-1580174-webrtc-popup.patch
 
 # PGO/LTO patches
 Patch600:        %{name}-pgo.patch
-Patch601:        mozilla-1516081.patch
 Patch602:        mozilla-1516803.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
@@ -409,11 +409,6 @@ tar -xf %{SOURCE5}
 %patch44  -p1 -b .build-arm-libopus
 %endif
 
-# Patch for big endian platforms only
-%if 0%{?big_endian}
-#%%patch26 -p1 -b .icu
-%endif
-
 %patch402 -p1 -b .1196777
 %patch403 -p1 -b .1640567
 %patch423 -p1 -b .mozilla-1596503
@@ -425,12 +420,13 @@ tar -xf %{SOURCE5}
 %patch585 -p1 -b .firefox-vaapi-extra-frames
 %patch589 -p1 -b .mozilla-1634213
 
+%patch54 -p1 -b .1669639
+%patch55 -p1 -b .1669442
+
 # PGO patches
 %if 0%{?build_with_pgo}
 %if !%{build_with_clang}
 %patch600 -p1 -b .pgo
-#fix
-#%patch601 -p1 -b .1516081
 %patch602 -p1 -b .1516803
 %endif
 %endif
diff --git a/mozilla-1516081.patch b/mozilla-1516081.patch
deleted file mode 100644
index a15facd..0000000
--- a/mozilla-1516081.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up firefox-71.0/build/moz.configure/lto-pgo.configure.1516081 firefox-71.0/build/moz.configure/lto-pgo.configure
---- firefox-71.0/build/moz.configure/lto-pgo.configure.1516081	2019-11-26 01:02:19.000000000 +0100
-+++ firefox-71.0/build/moz.configure/lto-pgo.configure	2019-11-26 11:04:10.993077232 +0100
-@@ -71,7 +71,7 @@ set_config('PGO_PROFILE_PATH', pgo_profi
- def pgo_flags(compiler, target, profdata):
-     if compiler.type == 'gcc':
-         return namespace(
--            gen_cflags=['-fprofile-generate'],
-+            gen_cflags=['-fprofile-generate', '-DMOZ_PROFILE_INSTRUMENTATION'],
-             gen_ldflags=['-fprofile-generate'],
-             use_cflags=['-fprofile-use', '-fprofile-correction',
-                         '-Wcoverage-mismatch'],
-@@ -92,7 +92,7 @@ def pgo_flags(compiler, target, profdata
-             gen_ldflags = ['-fprofile-generate']
- 
-         return namespace(
--            gen_cflags=[prefix + '-fprofile-generate'],
-+            gen_cflags=[prefix + '-fprofile-generate', '-DMOZ_PROFILE_INSTRUMENTATION'],
-             gen_ldflags=gen_ldflags,
-             use_cflags=[prefix + '-fprofile-use=%s' % profdata,
-                         # Some error messages about mismatched profile data
diff --git a/mozilla-1669442.patch b/mozilla-1669442.patch
new file mode 100644
index 0000000..6373816
--- /dev/null
+++ b/mozilla-1669442.patch
@@ -0,0 +1,13 @@
+diff --git a/config/recurse.mk b/config/recurse.mk
+--- a/config/recurse.mk
++++ b/config/recurse.mk
+@@ -206,7 +206,7 @@
+ # Interdependencies that moz.build world don't know about yet for compilation.
+ # Note some others are hardcoded or "guessed" in recursivemake.py and emitter.py
+ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
+-toolkit/library/target: widget/gtk/mozgtk/gtk3/target
++toolkit/library/build/target: widget/gtk/mozgtk/gtk3/target
+ endif
+ 
+ ifndef MOZ_FOLD_LIBS
+
diff --git a/mozilla-1669639.patch b/mozilla-1669639.patch
new file mode 100644
index 0000000..2d79542
--- /dev/null
+++ b/mozilla-1669639.patch
@@ -0,0 +1,15 @@
+diff -up firefox-81.0.1/build/mach_bootstrap.py.old firefox-81.0.1/build/mach_bootstrap.py
+--- firefox-81.0.1/build/mach_bootstrap.py.old	2020-10-06 14:16:06.212974910 +0200
++++ firefox-81.0.1/build/mach_bootstrap.py	2020-10-06 14:19:03.313179557 +0200
+@@ -507,7 +507,10 @@ class ImportHook(object):
+         # doesn't happen or because it doesn't matter).
+         if not os.path.exists(module.__file__[:-1]):
+             if os.path.exists(module.__file__):
+-                os.remove(module.__file__)
++                try:
++                    os.remove(module.__file__)
++                except:
++                    pass
+             del sys.modules[module.__name__]
+             module = self(name, globals, locals, fromlist, level)
+ 

From 1f611d5b195afc6a525ef7de5abe22ce70934d25 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 8 Oct 2020 19:24:26 +0200
Subject: [PATCH 163/473] Include PGO wayland builds

---
 icecat.spec | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index b811892..89722ae 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -37,10 +37,12 @@
 %ifarch x86_64
 %if 0%{?release_build}
 %global build_with_pgo 1
+%global pgo_wayland    1
 %else
 %global build_with_pgo 0
 %endif
 %endif
+%global wayland_backend_default 1
 
 # Disable LTO to work around rhbz#1883904
 %define _lto_cflags %{nil}
@@ -114,7 +116,6 @@ ExcludeArch: ppc64le
 %global libvpx_version 1.8.2
 %endif
 
-%global wayland_backend_default 1
 %global disable_elfhack 1
 
 # cbingen
@@ -302,6 +303,15 @@ BuildRequires: clang-devel
 BuildRequires: lld
 %endif
 BuildRequires: rust
+%if 0%{?pgo_wayland}
+BuildRequires:  mutter
+BuildRequires:  gsettings-desktop-schemas
+BuildRequires:  gnome-settings-daemon
+BuildRequires:  mesa-dri-drivers
+%endif
+%if 0%{?build_with_pgo}
+BuildRequires:  xorg-x11-server-Xvfb
+%endif
 
 %if 0%{?system_sqlite}
 BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version}
@@ -672,7 +682,26 @@ MOZ_SMP_FLAGS=-j1
 echo "mk_add_options MOZ_MAKE_FLAGS=\"$MOZ_SMP_FLAGS\"" >> .mozconfig
 echo "mk_add_options MOZ_SERVICES_SYNC=1" >> .mozconfig
 echo "export STRIP=/bin/true" >> .mozconfig
-MOZ_RUN_GTEST=0 ./mach -v build
+
+export MACH_USE_SYSTEM_PYTHON=1
+%if %{?build_with_pgo}
+%if %{?pgo_wayland}
+if [ -z "$XDG_RUNTIME_DIR" ]; then
+  export XDG_RUNTIME_DIR=$HOME
+fi
+xvfb-run mutter --wayland --nested &
+if [ -z "$WAYLAND_DISPLAY" ]; then
+  export WAYLAND_DISPLAY=wayland-0
+else
+  export WAYLAND_DISPLAY=wayland-1
+fi
+MOZ_ENABLE_WAYLAND=1 ./mach build  2>&1 | cat -
+%else
+GDK_BACKEND=x11 xvfb-run ./mach build  2>&1 | cat -
+%endif
+%else
+./mach build -v 2>&1 | cat -
+%endif
 
 %install
 # set up our default bookmarks
@@ -859,7 +888,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
-* Sun Oct 04 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.1-2.rh1.test
+* Wed Oct 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.1-2.rh1.test
 - PGO build test
 
 * Thu Oct 01 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.1-1.rh1

From 7fccc772ce51cafaec3461b9f4cfc6fa77812bf1 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 8 Oct 2020 19:25:32 +0200
Subject: [PATCH 164/473] Disable PGO wayland builds

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 89722ae..9ed2f7a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -37,7 +37,7 @@
 %ifarch x86_64
 %if 0%{?release_build}
 %global build_with_pgo 1
-%global pgo_wayland    1
+%global pgo_wayland    0
 %else
 %global build_with_pgo 0
 %endif

From 3a6cd7a2a5b97610f73461de2674117e7578be60 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Thu, 8 Oct 2020 19:36:34 +0200
Subject: [PATCH 165/473] Fix macros

---
 icecat.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 9ed2f7a..3c6451f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -684,8 +684,8 @@ echo "mk_add_options MOZ_SERVICES_SYNC=1" >> .mozconfig
 echo "export STRIP=/bin/true" >> .mozconfig
 
 export MACH_USE_SYSTEM_PYTHON=1
-%if %{?build_with_pgo}
-%if %{?pgo_wayland}
+%if 0%{?build_with_pgo}
+%if 0%{?pgo_wayland}
 if [ -z "$XDG_RUNTIME_DIR" ]; then
   export XDG_RUNTIME_DIR=$HOME
 fi

From b160413ae5f78e694b45fc1390de49237aa63c17 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 19 Oct 2020 12:45:59 +0200
Subject: [PATCH 166/473] Mozilla Release 78.4.0ESR

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 9 ++++++---
 sources                 | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5eb0675..753c95d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,3 +131,5 @@
 /icecat-78.3.0-rh1.tar.bz2
 /icecat-78.3.1-langpacks.tar.gz
 /icecat-78.3.1-rh1.tar.bz2
+/icecat-78.4.0-langpacks.tar.gz
+/icecat-78.4.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index cb5f586..d487b5a 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.3.1
+VERSION=78.4.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 3c6451f..5d6f774 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -17,7 +17,7 @@
 %global extra_ver %{nil}
 %endif
 
-%global pre_tag .test
+%global pre_tag %{nil}
 
 ####################
 
@@ -125,8 +125,8 @@ ExcludeArch: ppc64le
 %global build_with_clang  0
 
 Name: icecat
-Version: 78.3.1
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.4.0
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -888,6 +888,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Mon Oct 19 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.4.0-1.rh1
+- Mozilla Release 78.4.0ESR
+
 * Wed Oct 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.1-2.rh1.test
 - PGO build test
 
diff --git a/sources b/sources
index 6adcfa1..f9bcd64 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = fdd85f10476c90ae73c6b8ca9aa162ae96f481697cb1f36687dbc6ff6202e9507dff96d0b6103c9be684bd6e9db3c767835f9478266ce48cc4cad03b23107ede
-SHA512 (icecat-78.3.1-langpacks.tar.gz) = 08ab241459f1142c3d334933689dfbc21c8a44de78d415745df9488f8e49bc33614d39ba288b398cfcac74c1e1fb73ec7016041a7652d3b047f13c9a570d828d
-SHA512 (icecat-78.3.1-rh1.tar.bz2) = 9b824888ae0a8c3a3e152739c579f11bab8ec2096f736e9763ce664beacc2cb47a0d2b2584d4ce4329a74237ccf2466d2f9217e48516712187801ee02ded3a8c
+SHA512 (icecat-78.4.0-langpacks.tar.gz) = cd887bd2c45c78aed13ff43b2577280094c7700687b423a19db110105e6f8165e7238b8b98226fba0ed73d0eb9631f11f625fd8cef1f5547009cd30d2fc7f701
+SHA512 (icecat-78.4.0-rh1.tar.bz2) = 7e0a4ac7175f0f19c981fec3932c2d042c17b6f55b785d942ea6e8f2639dd7530727bbbb48432fc85d3131d9c7852ddf9290e6fada67e32e791f9d70949f9e28
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From dd3dc84ce6ff551620e847b4fa37f1e256a5c531 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mon, 19 Oct 2020 14:33:55 +0200
Subject: [PATCH 167/473] Patched for mozilla#1669471

---
 icecat-mozilla-1669471.patch | 27 +++++++++++++++++++++++++++
 icecat.spec                  |  8 +++++---
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 icecat-mozilla-1669471.patch

diff --git a/icecat-mozilla-1669471.patch b/icecat-mozilla-1669471.patch
new file mode 100644
index 0000000..c3818e0
--- /dev/null
+++ b/icecat-mozilla-1669471.patch
@@ -0,0 +1,27 @@
+# Bug 1669471 - Get rid of `DeprecationWarning` in `file_generate.py` r=firefox-build-system-reviewers,mhentges
+# `imp` is deprecated since Python 3.4 and later Python versions are very noisy about printing `DeprecationWarning`s; instead, use its replacement, `importlib`.
+
+--- a/python/mozbuild/mozbuild/action/file_generate.py
++++ b/python/mozbuild/mozbuild/action/file_generate.py
+@@ -9,7 +9,7 @@
+ from __future__ import absolute_import, print_function
+ 
+ import argparse
+-import imp
++import importlib.util
+ import os
+ import six
+ import sys
+@@ -56,9 +56,9 @@
+     # Since we're invoking the script in a roundabout way, we provide this
+     # bit of convenience.
+     sys.path.append(os.path.dirname(script))
+-    with open(script, 'r') as fh:
+-        module = imp.load_module('script', fh, script,
+-                                 ('.py', 'r', imp.PY_SOURCE))
++    spec = importlib.util.spec_from_file_location('script', script)
++    module = importlib.util.module_from_spec(spec)
++    spec.loader.exec_module(module)
+     method = args.method_name
+     if not hasattr(module, method):
+         print('Error: script "{0}" is missing a {1} method'.format(script, method),
diff --git a/icecat.spec b/icecat.spec
index 5d6f774..70c1968 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -203,14 +203,15 @@ Patch403: mozilla-1640567.patch
 Patch412: mozilla-1337988.patch
 Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
+# Fix crash on ppc64le (mozilla#1512162)
+Patch423: mozilla-1512162.patch
+
+Patch424: icecat-mozilla-1669471.patch
 
 # PGO/LTO patches
 Patch600:        %{name}-pgo.patch
 Patch602:        mozilla-1516803.patch
 
-# Fix crash on ppc64le (mozilla#1512162)
-Patch423: mozilla-1512162.patch
-
 # Wayland specific upstream patches
 Patch565: firefox-pipewire.patch
 #
@@ -422,6 +423,7 @@ tar -xf %{SOURCE5}
 %patch402 -p1 -b .1196777
 %patch403 -p1 -b .1640567
 %patch423 -p1 -b .mozilla-1596503
+%patch424 -p1 -b .mozilla-1669471
 
 # Wayland specific upstream patches
 %patch565 -p1 -b .firefox-pipewire

From 81226a4ab39cdce0a0aa7249c8bd676a13423096 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 23 Oct 2020 15:08:14 +0200
Subject: [PATCH 168/473] Mozilla Release 78.4.0ESR| Regenerate
 cbindgen-0.14.3| Patched for using Rust-1.47 (mzbz#1663715)

---
 icecat-rust-1.47.patch | 35277 +++++++++++++++++++++++++++++++++++++++
 icecat.rpmlintrc       |    54 -
 icecat.spec            |     6 +-
 sources                |     2 +-
 4 files changed, 35283 insertions(+), 56 deletions(-)
 create mode 100644 icecat-rust-1.47.patch
 delete mode 100644 icecat.rpmlintrc

diff --git a/icecat-rust-1.47.patch b/icecat-rust-1.47.patch
new file mode 100644
index 0000000..8a131ff
--- /dev/null
+++ b/icecat-rust-1.47.patch
@@ -0,0 +1,35277 @@
+
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio@crisal.io>
+# Date 1599584448 0
+# Node ID 85c38ea4d34969797eb5d24265cd90cc6841e6ae
+# Parent  5aa243a2fe9d77578dd95ce3ab3a2aa6c1e92604
+Bug 1663715 - Update syn and proc-macro2 so that Firefox can build on Rust nightly again. r=froydnj, a=RyanVM
+
+Generated with:
+
+  cargo update -p syn --precise 1.0.40
+  ./mach vendor rust
+
+Rust issue: https://github.com/rust-lang/rust/issues/76482
+
+Differential Revision: https://phabricator.services.mozilla.com/D89473
+
+diff --git a/Cargo.lock b/Cargo.lock
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -3712,19 +3712,19 @@ checksum = "ecd45702f76d6d3c75a80564378a
+ dependencies = [
+  "proc-macro2",
+  "quote",
+  "syn",
+ ]
+ 
+ [[package]]
+ name = "proc-macro2"
+-version = "1.0.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "90cf5f418035b98e655e9cdb225047638296b862b42411c4e45bb88d700f7fc0"
++version = "1.0.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29"
+ dependencies = [
+  "unicode-xid",
+ ]
+ 
+ [[package]]
+ name = "procedural-masquerade"
+ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -4642,19 +4642,19 @@ dependencies = [
+  "cc",
+  "gleam",
+  "glsl-to-cxx",
+  "webrender_build",
+ ]
+ 
+ [[package]]
+ name = "syn"
+-version = "1.0.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
++version = "1.0.40"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+  "unicode-xid",
+ ]
+ 
+ [[package]]
+ name = "sync-guid"
+diff --git a/third_party/rust/proc-macro2/.cargo-checksum.json b/third_party/rust/proc-macro2/.cargo-checksum.json
+--- a/third_party/rust/proc-macro2/.cargo-checksum.json
++++ b/third_party/rust/proc-macro2/.cargo-checksum.json
+@@ -1,1 +1,1 @@
+-{"files":{"Cargo.toml":"e2c1fc6ed317eeef8462fcd192f6b6389e1d84f0d7afeac78f12c23903deddf8","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"362a2156f7645528061b6e8487a2eb0f32f1693012ed82ee57afa05c039bba0d","build.rs":"0cc6e2cb919ddbff59cf1d810283939f97a59f0037540c0f2ee3453237635ff8","src/fallback.rs":"5c6379a90735e27abcc40253b223158c6b1e5784f3850bc423335363e87ef038","src/lib.rs":"ae5251296ad3fcd8b600919a993fec0afd8b56da3e11fef6bc7265b273129936","src/strnom.rs":"37f7791f73f123817ad5403af1d4e2a0714be27401729a2d451bc80b1f26bac9","src/wrapper.rs":"81372e910604217a625aa71c47d43e65f4e008456eae93ac39325c9abf10701a","tests/features.rs":"a86deb8644992a4eb64d9fd493eff16f9cf9c5cb6ade3a634ce0c990cf87d559","tests/marker.rs":"c2652e3ae1dfcb94d2e6313b29712c5dcbd0fe62026913e67bb7cebd7560aade","tests/test.rs":"8c427be9cba1fa8d4a16647e53e3545e5863e29e2c0b311c93c9dd1399abf6a1"},"package":"90cf5f418035b98e655e9cdb225047638296b862b42411c4e45bb88d700f7fc0"}
+\ No newline at end of file
++{"files":{"Cargo.toml":"c20c4c52342e65ea11ad8382edc636e628e8f8c5ab7cffddc32426b2fe8fe4cd","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"e1f9d4fc22cff2c049f166a403b41458632a94357890d31cf0e3ad83807fb430","build.rs":"332185d7ad4c859210f5edd7a76bc95146c8277726a2f81417f34927c4424d68","src/detection.rs":"9d25d896889e65330858f2d6f6223c1b98cd1dad189813ad4161ff189fbda2b8","src/fallback.rs":"239f9a25c0f2ab57592288d944c7f1a0f887536b6d4dc2428a17640af8d10a41","src/lib.rs":"2b1d98424c9b23b547dabf85554120e5e65472026a0f3f711b3a097bca7c32fe","src/parse.rs":"500edee9773132e27e44d0fdaa042b1cb9451e29e65124493986f51710c0664c","src/wrapper.rs":"d36c0dced7ec0e7585c1f935cda836080bcae6de1de3d7851d962e9e11a3ac48","tests/comments.rs":"ea6cbe6f4c8852e6a0612893c7d4f2c144a2e6a134a6c3db641a320cbfc3c800","tests/features.rs":"a86deb8644992a4eb64d9fd493eff16f9cf9c5cb6ade3a634ce0c990cf87d559","tests/marker.rs":"c2652e3ae1dfcb94d2e6313b29712c5dcbd0fe62026913e67bb7cebd7560aade","tests/test.rs":"310c856e27ff61c9ec7f0a5cd96031aac02971557b1621f5e17b089d58e79bcd","tests/test_fmt.rs":"745dfdc41d09c5308c221395eb43f2041f0a1413d2927a813bc2ad4554438fe2"},"package":"175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29"}
+\ No newline at end of file
+diff --git a/third_party/rust/proc-macro2/Cargo.toml b/third_party/rust/proc-macro2/Cargo.toml
+--- a/third_party/rust/proc-macro2/Cargo.toml
++++ b/third_party/rust/proc-macro2/Cargo.toml
+@@ -8,36 +8,35 @@
+ # 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]
+ edition = "2018"
+ name = "proc-macro2"
+-version = "1.0.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"
++version = "1.0.20"
++authors = ["Alex Crichton <alex@alexcrichton.com>", "David Tolnay <dtolnay@gmail.com>"]
++description = "A substitute implementation of the compiler's `proc_macro` API to decouple\ntoken-based libraries from the procedural macro use case.\n"
+ documentation = "https://docs.rs/proc-macro2"
+ readme = "README.md"
+ keywords = ["macros"]
++categories = ["development-tools::procedural-macro-helpers"]
+ license = "MIT OR Apache-2.0"
+ repository = "https://github.com/alexcrichton/proc-macro2"
+ [package.metadata.docs.rs]
+ rustc-args = ["--cfg", "procmacro2_semver_exempt"]
+ rustdoc-args = ["--cfg", "procmacro2_semver_exempt"]
++targets = ["x86_64-unknown-linux-gnu"]
+ 
+-[lib]
+-name = "proc_macro2"
++[package.metadata.playground]
++features = ["span-locations"]
+ [dependencies.unicode-xid]
+ version = "0.2"
+ [dev-dependencies.quote]
+ version = "1.0"
+ default_features = false
+ 
+ [features]
+ default = ["proc-macro"]
+ nightly = []
+ proc-macro = []
+ span-locations = []
+-[badges.travis-ci]
+-repository = "alexcrichton/proc-macro2"
+diff --git a/third_party/rust/proc-macro2/README.md b/third_party/rust/proc-macro2/README.md
+--- a/third_party/rust/proc-macro2/README.md
++++ b/third_party/rust/proc-macro2/README.md
+@@ -1,11 +1,11 @@
+ # proc-macro2
+ 
+-[![Build Status](https://api.travis-ci.com/alexcrichton/proc-macro2.svg?branch=master)](https://travis-ci.com/alexcrichton/proc-macro2)
++[![Build Status](https://img.shields.io/github/workflow/status/alexcrichton/proc-macro2/build%20and%20test)](https://github.com/alexcrichton/proc-macro2/actions)
+ [![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 wrapper around the procedural macro API of the compiler's `proc_macro` crate.
+ This library serves two purposes:
+ 
+ - **Bring proc-macro-like functionality to other contexts like build.rs and
+   main.rs.** Types from `proc_macro` are entirely specific to procedural macros
+diff --git a/third_party/rust/proc-macro2/build.rs b/third_party/rust/proc-macro2/build.rs
+--- a/third_party/rust/proc-macro2/build.rs
++++ b/third_party/rust/proc-macro2/build.rs
+@@ -9,16 +9,20 @@
+ // "wrap_proc_macro"
+ //     Wrap types from libproc_macro rather than polyfilling the whole API.
+ //     Enabled on rustc 1.29+ as long as procmacro2_semver_exempt is not set,
+ //     because we can't emulate the unstable API without emulating everything
+ //     else. Also enabled unconditionally on nightly, in which case the
+ //     procmacro2_semver_exempt surface area is implemented by using the
+ //     nightly-only proc_macro API.
+ //
++//  "hygiene"
++//    Enable Span::mixed_site() and non-dummy behavior of Span::resolved_at
++//    and Span::located_at. Enabled on Rust 1.45+.
++//
+ // "proc_macro_span"
+ //     Enable non-dummy behavior of Span::start and Span::end methods which
+ //     requires an unstable compiler feature. Enabled when building with
+ //     nightly, unless `-Z allow-feature` in RUSTFLAGS disallows unstable
+ //     features.
+ //
+ // "super_unstable"
+ //     Implement the semver exempt API in terms of the nightly-only proc_macro
+@@ -52,16 +56,24 @@ fn main() {
+         // https://github.com/alexcrichton/proc-macro2/issues/147
+         println!("cargo:rustc-cfg=procmacro2_semver_exempt");
+     }
+ 
+     if semver_exempt || cfg!(feature = "span-locations") {
+         println!("cargo:rustc-cfg=span_locations");
+     }
+ 
++    if version.minor < 39 {
++        println!("cargo:rustc-cfg=no_bind_by_move_pattern_guard");
++    }
++
++    if version.minor >= 45 {
++        println!("cargo:rustc-cfg=hygiene");
++    }
++
+     let target = env::var("TARGET").unwrap();
+     if !enable_use_proc_macro(&target) {
+         return;
+     }
+ 
+     println!("cargo:rustc-cfg=use_proc_macro");
+ 
+     if version.nightly || !semver_exempt {
+diff --git a/third_party/rust/proc-macro2/src/detection.rs b/third_party/rust/proc-macro2/src/detection.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/proc-macro2/src/detection.rs
+@@ -0,0 +1,67 @@
++use std::panic::{self, PanicInfo};
++use std::sync::atomic::*;
++use std::sync::Once;
++
++static WORKS: AtomicUsize = AtomicUsize::new(0);
++static INIT: Once = Once::new();
++
++pub(crate) fn inside_proc_macro() -> bool {
++    match WORKS.load(Ordering::SeqCst) {
++        1 => return false,
++        2 => return true,
++        _ => {}
++    }
++
++    INIT.call_once(initialize);
++    inside_proc_macro()
++}
++
++pub(crate) fn force_fallback() {
++    WORKS.store(1, Ordering::SeqCst);
++}
++
++pub(crate) fn unforce_fallback() {
++    initialize();
++}
++
++// Swap in a null panic hook to avoid printing "thread panicked" to stderr,
++// then use catch_unwind to determine whether the compiler's proc_macro is
++// working. When proc-macro2 is used from outside of a procedural macro all
++// of the proc_macro crate's APIs currently panic.
++//
++// The Once is to prevent the possibility of this ordering:
++//
++//     thread 1 calls take_hook, gets the user's original hook
++//     thread 1 calls set_hook with the null hook
++//     thread 2 calls take_hook, thinks null hook is the original hook
++//     thread 2 calls set_hook with the null hook
++//     thread 1 calls set_hook with the actual original hook
++//     thread 2 calls set_hook with what it thinks is the original hook
++//
++// in which the user's hook has been lost.
++//
++// There is still a race condition where a panic in a different thread can
++// happen during the interval that the user's original panic hook is
++// unregistered such that their hook is incorrectly not called. This is
++// sufficiently unlikely and less bad than printing panic messages to stderr
++// on correct use of this crate. Maybe there is a libstd feature request
++// here. For now, if a user needs to guarantee that this failure mode does
++// not occur, they need to call e.g. `proc_macro2::Span::call_site()` from
++// the main thread before launching any other threads.
++fn initialize() {
++    type PanicHook = dyn Fn(&PanicInfo) + Sync + Send + 'static;
++
++    let null_hook: Box<PanicHook> = Box::new(|_panic_info| { /* ignore */ });
++    let sanity_check = &*null_hook as *const PanicHook;
++    let original_hook = panic::take_hook();
++    panic::set_hook(null_hook);
++
++    let works = panic::catch_unwind(proc_macro::Span::call_site).is_ok();
++    WORKS.store(works as usize + 1, Ordering::SeqCst);
++
++    let hopefully_null_hook = panic::take_hook();
++    panic::set_hook(original_hook);
++    if sanity_check != &*hopefully_null_hook {
++        panic!("observed race condition in proc_macro2::inside_proc_macro");
++    }
++}
+diff --git a/third_party/rust/proc-macro2/src/fallback.rs b/third_party/rust/proc-macro2/src/fallback.rs
+--- a/third_party/rust/proc-macro2/src/fallback.rs
++++ b/third_party/rust/proc-macro2/src/fallback.rs
+@@ -1,41 +1,121 @@
++use crate::parse::{token_stream, Cursor};
++use crate::{Delimiter, Spacing, TokenTree};
+ #[cfg(span_locations)]
+ use std::cell::RefCell;
+ #[cfg(span_locations)]
+ use std::cmp;
+-use std::fmt;
+-use std::iter;
++use std::fmt::{self, Debug, Display};
++use std::iter::FromIterator;
++use std::mem;
+ use std::ops::RangeBounds;
+ #[cfg(procmacro2_semver_exempt)]
+ use std::path::Path;
+ use std::path::PathBuf;
+ use std::str::FromStr;
+ use std::vec;
+-
+-use crate::strnom::{block_comment, skip_whitespace, whitespace, word_break, Cursor, PResult};
+-use crate::{Delimiter, Punct, Spacing, TokenTree};
+ use unicode_xid::UnicodeXID;
+ 
++/// Force use of proc-macro2's fallback implementation of the API for now, even
++/// if the compiler's implementation is available.
++pub fn force() {
++    #[cfg(wrap_proc_macro)]
++    crate::detection::force_fallback();
++}
++
++/// Resume using the compiler's implementation of the proc macro API if it is
++/// available.
++pub fn unforce() {
++    #[cfg(wrap_proc_macro)]
++    crate::detection::unforce_fallback();
++}
++
+ #[derive(Clone)]
+-pub struct TokenStream {
+-    inner: Vec<TokenTree>,
++pub(crate) struct TokenStream {
++    pub(crate) inner: Vec<TokenTree>,
+ }
+ 
+ #[derive(Debug)]
+-pub struct LexError;
++pub(crate) struct LexError;
+ 
+ impl TokenStream {
+     pub fn new() -> TokenStream {
+         TokenStream { inner: Vec::new() }
+     }
+ 
+     pub fn is_empty(&self) -> bool {
+         self.inner.len() == 0
+     }
++
++    fn take_inner(&mut self) -> Vec<TokenTree> {
++        mem::replace(&mut self.inner, Vec::new())
++    }
++
++    fn push_token(&mut self, token: TokenTree) {
++        // https://github.com/alexcrichton/proc-macro2/issues/235
++        match token {
++            #[cfg(not(no_bind_by_move_pattern_guard))]
++            TokenTree::Literal(crate::Literal {
++                #[cfg(wrap_proc_macro)]
++                    inner: crate::imp::Literal::Fallback(literal),
++                #[cfg(not(wrap_proc_macro))]
++                    inner: literal,
++                ..
++            }) if literal.text.starts_with('-') => {
++                push_negative_literal(self, literal);
++            }
++            #[cfg(no_bind_by_move_pattern_guard)]
++            TokenTree::Literal(crate::Literal {
++                #[cfg(wrap_proc_macro)]
++                    inner: crate::imp::Literal::Fallback(literal),
++                #[cfg(not(wrap_proc_macro))]
++                    inner: literal,
++                ..
++            }) => {
++                if literal.text.starts_with('-') {
++                    push_negative_literal(self, literal);
++                } else {
++                    self.inner
++                        .push(TokenTree::Literal(crate::Literal::_new_stable(literal)));
++                }
++            }
++            _ => self.inner.push(token),
++        }
++
++        #[cold]
++        fn push_negative_literal(stream: &mut TokenStream, mut literal: Literal) {
++            literal.text.remove(0);
++            let mut punct = crate::Punct::new('-', Spacing::Alone);
++            punct.set_span(crate::Span::_new_stable(literal.span));
++            stream.inner.push(TokenTree::Punct(punct));
++            stream
++                .inner
++                .push(TokenTree::Literal(crate::Literal::_new_stable(literal)));
++        }
++    }
++}
++
++// Nonrecursive to prevent stack overflow.
++impl Drop for TokenStream {
++    fn drop(&mut self) {
++        while let Some(token) = self.inner.pop() {
++            let group = match token {
++                TokenTree::Group(group) => group.inner,
++                _ => continue,
++            };
++            #[cfg(wrap_proc_macro)]
++            let group = match group {
++                crate::imp::Group::Fallback(group) => group,
++                _ => continue,
++            };
++            let mut group = group;
++            self.inner.extend(group.stream.take_inner());
++        }
++    }
+ }
+ 
+ #[cfg(span_locations)]
+ fn get_cursor(src: &str) -> Cursor {
+     // Create a dummy file & add it to the source map
+     SOURCE_MAP.with(|cm| {
+         let mut cm = cm.borrow_mut();
+         let name = format!("<parsed string {}>", cm.files.len());
+@@ -54,68 +134,49 @@ fn get_cursor(src: &str) -> Cursor {
+ 
+ impl FromStr for TokenStream {
+     type Err = LexError;
+ 
+     fn from_str(src: &str) -> Result<TokenStream, LexError> {
+         // Create a dummy file & add it to the source map
+         let cursor = get_cursor(src);
+ 
+-        match token_stream(cursor) {
+-            Ok((input, output)) => {
+-                if skip_whitespace(input).len() != 0 {
+-                    Err(LexError)
+-                } else {
+-                    Ok(output)
+-                }
+-            }
+-            Err(LexError) => Err(LexError),
++        let (rest, tokens) = token_stream(cursor)?;
++        if rest.is_empty() {
++            Ok(tokens)
++        } else {
++            Err(LexError)
+         }
+     }
+ }
+ 
+-impl fmt::Display for TokenStream {
++impl 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().into_iter().next().is_none() {
+-                        write!(f, "{} {}", start, end)?
+-                    } else {
+-                        write!(f, "{} {} {}", start, tt.stream(), end)?
+-                    }
++            match tt {
++                TokenTree::Group(tt) => Display::fmt(tt, f),
++                TokenTree::Ident(tt) => Display::fmt(tt, f),
++                TokenTree::Punct(tt) => {
++                    joint = tt.spacing() == Spacing::Joint;
++                    Display::fmt(tt, f)
+                 }
+-                TokenTree::Ident(ref tt) => write!(f, "{}", tt)?,
+-                TokenTree::Punct(ref tt) => {
+-                    write!(f, "{}", tt.as_char())?;
+-                    match tt.spacing() {
+-                        Spacing::Alone => {}
+-                        Spacing::Joint => joint = true,
+-                    }
+-                }
+-                TokenTree::Literal(ref tt) => write!(f, "{}", tt)?,
+-            }
++                TokenTree::Literal(tt) => Display::fmt(tt, f),
++            }?
+         }
+ 
+         Ok(())
+     }
+ }
+ 
+-impl fmt::Debug for TokenStream {
++impl Debug for TokenStream {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         f.write_str("TokenStream ")?;
+         f.debug_list().entries(self.clone()).finish()
+     }
+ }
+ 
+ #[cfg(use_proc_macro)]
+ impl From<proc_macro::TokenStream> for TokenStream {
+@@ -134,122 +195,107 @@ impl From<TokenStream> for proc_macro::T
+             .to_string()
+             .parse()
+             .expect("failed to parse to compiler tokens")
+     }
+ }
+ 
+ impl From<TokenTree> for TokenStream {
+     fn from(tree: TokenTree) -> TokenStream {
+-        TokenStream { inner: vec![tree] }
++        let mut stream = TokenStream::new();
++        stream.push_token(tree);
++        stream
+     }
+ }
+ 
+-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 }
++impl FromIterator<TokenTree> for TokenStream {
++    fn from_iter<I: IntoIterator<Item = TokenTree>>(tokens: I) -> Self {
++        let mut stream = TokenStream::new();
++        stream.extend(tokens);
++        stream
+     }
+ }
+ 
+-impl iter::FromIterator<TokenStream> for TokenStream {
++impl FromIterator<TokenStream> for TokenStream {
+     fn from_iter<I: IntoIterator<Item = TokenStream>>(streams: I) -> Self {
+         let mut v = Vec::new();
+ 
+-        for stream in streams.into_iter() {
+-            v.extend(stream.inner);
++        for mut stream in streams {
++            v.extend(stream.take_inner());
+         }
+ 
+         TokenStream { inner: v }
+     }
+ }
+ 
+ impl Extend<TokenTree> for TokenStream {
+-    fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, streams: I) {
+-        self.inner.extend(streams);
++    fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, tokens: I) {
++        tokens.into_iter().for_each(|token| self.push_token(token));
+     }
+ }
+ 
+ impl Extend<TokenStream> for TokenStream {
+     fn extend<I: IntoIterator<Item = TokenStream>>(&mut self, streams: I) {
+-        self.inner
+-            .extend(streams.into_iter().flat_map(|stream| stream));
++        self.inner.extend(streams.into_iter().flatten());
+     }
+ }
+ 
+-pub type TokenTreeIter = vec::IntoIter<TokenTree>;
++pub(crate) type TokenTreeIter = vec::IntoIter<TokenTree>;
+ 
+ impl IntoIterator for TokenStream {
+     type Item = TokenTree;
+     type IntoIter = TokenTreeIter;
+ 
+-    fn into_iter(self) -> TokenTreeIter {
+-        self.inner.into_iter()
++    fn into_iter(mut self) -> TokenTreeIter {
++        self.take_inner().into_iter()
+     }
+ }
+ 
+ #[derive(Clone, PartialEq, Eq)]
+-pub struct SourceFile {
++pub(crate) struct SourceFile {
+     path: PathBuf,
+ }
+ 
+ impl SourceFile {
+     /// Get the path to this source file as a string.
+     pub fn path(&self) -> PathBuf {
+         self.path.clone()
+     }
+ 
+     pub fn is_real(&self) -> bool {
+         // XXX(nika): Support real files in the future?
+         false
+     }
+ }
+ 
+-impl fmt::Debug for SourceFile {
++impl 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()
+     }
+ }
+ 
+ #[derive(Clone, Copy, Debug, PartialEq, Eq)]
+-pub struct LineColumn {
++pub(crate) struct LineColumn {
+     pub line: usize,
+     pub column: usize,
+ }
+ 
+ #[cfg(span_locations)]
+ thread_local! {
+     static SOURCE_MAP: RefCell<SourceMap> = RefCell::new(SourceMap {
+         // NOTE: We start with a single dummy file which all call_site() and
+         // def_site() spans reference.
+-        files: vec![{
++        files: vec![FileInfo {
+             #[cfg(procmacro2_semver_exempt)]
+-            {
+-                FileInfo {
+-                    name: "<unspecified>".to_owned(),
+-                    span: Span { lo: 0, hi: 0 },
+-                    lines: vec![0],
+-                }
+-            }
+-
+-            #[cfg(not(procmacro2_semver_exempt))]
+-            {
+-                FileInfo {
+-                    span: Span { lo: 0, hi: 0 },
+-                    lines: vec![0],
+-                }
+-            }
++            name: "<unspecified>".to_owned(),
++            span: Span { lo: 0, hi: 0 },
++            lines: vec![0],
+         }],
+     });
+ }
+ 
+ #[cfg(span_locations)]
+ struct FileInfo {
+     #[cfg(procmacro2_semver_exempt)]
+     name: String,
+@@ -277,26 +323,31 @@ impl FileInfo {
+         }
+     }
+ 
+     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.
++/// Computes the offsets of each line in the given source string
++/// and the total number of characters
+ #[cfg(span_locations)]
+-fn lines_offsets(s: &str) -> Vec<usize> {
++fn lines_offsets(s: &str) -> (usize, 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);
++    let mut total = 0;
++
++    for ch in s.chars() {
++        total += 1;
++        if ch == '\n' {
++            lines.push(total);
++        }
+     }
+-    lines
++
++    (total, lines)
+ }
+ 
+ #[cfg(span_locations)]
+ struct SourceMap {
+     files: Vec<FileInfo>,
+ }
+ 
+ #[cfg(span_locations)]
+@@ -305,81 +356,83 @@ impl SourceMap {
+         // 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 (len, 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,
+-            hi: lo + (src.len() as u32),
++            hi: lo + (len as u32),
+         };
+ 
+-        #[cfg(procmacro2_semver_exempt)]
+         self.files.push(FileInfo {
++            #[cfg(procmacro2_semver_exempt)]
+             name: name.to_owned(),
+             span,
+             lines,
+         });
+ 
+         #[cfg(not(procmacro2_semver_exempt))]
+-        self.files.push(FileInfo { span, lines });
+         let _ = name;
+ 
+         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, PartialEq, Eq)]
+-pub struct Span {
++pub(crate) struct Span {
+     #[cfg(span_locations)]
+-    lo: u32,
++    pub(crate) lo: u32,
+     #[cfg(span_locations)]
+-    hi: u32,
++    pub(crate) hi: u32,
+ }
+ 
+ impl Span {
+     #[cfg(not(span_locations))]
+     pub fn call_site() -> Span {
+         Span {}
+     }
+ 
+     #[cfg(span_locations)]
+     pub fn call_site() -> Span {
+         Span { lo: 0, hi: 0 }
+     }
+ 
++    #[cfg(hygiene)]
++    pub fn mixed_site() -> Span {
++        Span::call_site()
++    }
++
+     #[cfg(procmacro2_semver_exempt)]
+     pub fn def_site() -> Span {
+         Span::call_site()
+     }
+ 
+-    #[cfg(procmacro2_semver_exempt)]
+     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
+     }
+ 
+-    #[cfg(procmacro2_semver_exempt)]
+     pub fn located_at(&self, other: Span) -> Span {
+         other
+     }
+ 
+     #[cfg(procmacro2_semver_exempt)]
+     pub fn source_file(&self) -> SourceFile {
+         SOURCE_MAP.with(|cm| {
+             let cm = cm.borrow();
+@@ -422,36 +475,69 @@ impl Span {
+                 return None;
+             }
+             Some(Span {
+                 lo: cmp::min(self.lo, other.lo),
+                 hi: cmp::max(self.hi, other.hi),
+             })
+         })
+     }
++
++    #[cfg(not(span_locations))]
++    fn first_byte(self) -> Self {
++        self
++    }
++
++    #[cfg(span_locations)]
++    fn first_byte(self) -> Self {
++        Span {
++            lo: self.lo,
++            hi: cmp::min(self.lo.saturating_add(1), self.hi),
++        }
++    }
++
++    #[cfg(not(span_locations))]
++    fn last_byte(self) -> Self {
++        self
++    }
++
++    #[cfg(span_locations)]
++    fn last_byte(self) -> Self {
++        Span {
++            lo: cmp::max(self.hi.saturating_sub(1), self.lo),
++            hi: self.hi,
++        }
++    }
+ }
+ 
+-impl fmt::Debug for Span {
++impl Debug for Span {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-        #[cfg(procmacro2_semver_exempt)]
++        #[cfg(span_locations)]
+         return write!(f, "bytes({}..{})", self.lo, self.hi);
+ 
+-        #[cfg(not(procmacro2_semver_exempt))]
++        #[cfg(not(span_locations))]
+         write!(f, "Span")
+     }
+ }
+ 
+-pub fn debug_span_field_if_nontrivial(debug: &mut fmt::DebugStruct, span: Span) {
+-    if cfg!(procmacro2_semver_exempt) {
++pub(crate) fn debug_span_field_if_nontrivial(debug: &mut fmt::DebugStruct, span: Span) {
++    #[cfg(span_locations)]
++    {
++        if span.lo == 0 && span.hi == 0 {
++            return;
++        }
++    }
++
++    if cfg!(span_locations) {
+         debug.field("span", &span);
+     }
+ }
+ 
+ #[derive(Clone)]
+-pub struct Group {
++pub(crate) struct Group {
+     delimiter: Delimiter,
+     stream: TokenStream,
+     span: Span,
+ }
+ 
+ impl Group {
+     pub fn new(delimiter: Delimiter, stream: TokenStream) -> Group {
+         Group {
+@@ -469,58 +555,67 @@ impl Group {
+         self.stream.clone()
+     }
+ 
+     pub fn span(&self) -> Span {
+         self.span
+     }
+ 
+     pub fn span_open(&self) -> Span {
+-        self.span
++        self.span.first_byte()
+     }
+ 
+     pub fn span_close(&self) -> Span {
+-        self.span
++        self.span.last_byte()
+     }
+ 
+     pub fn set_span(&mut self, span: Span) {
+         self.span = span;
+     }
+ }
+ 
+-impl fmt::Display for Group {
++impl Display for Group {
++    // We attempt to match libproc_macro's formatting.
++    // Empty parens: ()
++    // Nonempty parens: (...)
++    // Empty brackets: []
++    // Nonempty brackets: [...]
++    // Empty braces: { }
++    // Nonempty braces: { ... }
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-        let (left, right) = match self.delimiter {
++        let (open, close) = match self.delimiter {
+             Delimiter::Parenthesis => ("(", ")"),
+-            Delimiter::Brace => ("{", "}"),
++            Delimiter::Brace => ("{ ", "}"),
+             Delimiter::Bracket => ("[", "]"),
+             Delimiter::None => ("", ""),
+         };
+ 
+-        f.write_str(left)?;
+-        self.stream.fmt(f)?;
+-        f.write_str(right)?;
++        f.write_str(open)?;
++        Display::fmt(&self.stream, f)?;
++        if self.delimiter == Delimiter::Brace && !self.stream.inner.is_empty() {
++            f.write_str(" ")?;
++        }
++        f.write_str(close)?;
+ 
+         Ok(())
+     }
+ }
+ 
+-impl fmt::Debug for Group {
++impl Debug for Group {
+     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+         let mut debug = fmt.debug_struct("Group");
+         debug.field("delimiter", &self.delimiter);
+         debug.field("stream", &self.stream);
+-        #[cfg(procmacro2_semver_exempt)]
+-        debug.field("span", &self.span);
++        debug_span_field_if_nontrivial(&mut debug, self.span);
+         debug.finish()
+     }
+ }
+ 
+ #[derive(Clone)]
+-pub struct Ident {
++pub(crate) struct Ident {
+     sym: String,
+     span: Span,
+     raw: bool,
+ }
+ 
+ impl Ident {
+     fn _new(string: &str, raw: bool, span: Span) -> Ident {
+         validate_ident(string);
+@@ -544,26 +639,24 @@ impl Ident {
+         self.span
+     }
+ 
+     pub fn set_span(&mut self, span: Span) {
+         self.span = span;
+     }
+ }
+ 
+-#[inline]
+-fn is_ident_start(c: char) -> bool {
++pub(crate) fn is_ident_start(c: char) -> bool {
+     ('a' <= c && c <= 'z')
+         || ('A' <= c && c <= 'Z')
+         || c == '_'
+         || (c > '\x7f' && UnicodeXID::is_xid_start(c))
+ }
+ 
+-#[inline]
+-fn is_ident_continue(c: char) -> bool {
++pub(crate) fn is_ident_continue(c: char) -> bool {
+     ('a' <= c && c <= 'z')
+         || ('A' <= c && c <= 'Z')
+         || c == '_'
+         || ('0' <= c && c <= '9')
+         || (c > '\x7f' && UnicodeXID::is_xid_continue(c))
+ }
+ 
+ fn validate_ident(string: &str) {
+@@ -610,49 +703,49 @@ where
+         if self.raw {
+             other.starts_with("r#") && self.sym == other[2..]
+         } else {
+             self.sym == other
+         }
+     }
+ }
+ 
+-impl fmt::Display for Ident {
++impl Display for Ident {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         if self.raw {
+-            "r#".fmt(f)?;
++            f.write_str("r#")?;
+         }
+-        self.sym.fmt(f)
++        Display::fmt(&self.sym, f)
+     }
+ }
+ 
+-impl fmt::Debug for Ident {
++impl Debug for Ident {
+     // Ident(proc_macro), Ident(r#union)
+-    #[cfg(not(procmacro2_semver_exempt))]
++    #[cfg(not(span_locations))]
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         let mut debug = f.debug_tuple("Ident");
+         debug.field(&format_args!("{}", self));
+         debug.finish()
+     }
+ 
+     // Ident {
+     //     sym: proc_macro,
+     //     span: bytes(128..138)
+     // }
+-    #[cfg(procmacro2_semver_exempt)]
++    #[cfg(span_locations)]
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         let mut debug = f.debug_struct("Ident");
+         debug.field("sym", &format_args!("{}", self));
+-        debug.field("span", &self.span);
++        debug_span_field_if_nontrivial(&mut debug, self.span);
+         debug.finish()
+     }
+ }
+ 
+ #[derive(Clone)]
+-pub struct Literal {
++pub(crate) 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))
+@@ -664,17 +757,17 @@ 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 {
++    pub(crate) fn _new(text: String) -> Literal {
+         Literal {
+             text,
+             span: Span::call_site(),
+         }
+     }
+ 
+     suffixed_numbers! {
+         u8_suffixed => u8,
+@@ -706,61 +799,62 @@ impl Literal {
+         i32_unsuffixed => i32,
+         i64_unsuffixed => i64,
+         i128_unsuffixed => i128,
+         isize_unsuffixed => isize,
+     }
+ 
+     pub fn f32_unsuffixed(f: f32) -> Literal {
+         let mut s = f.to_string();
+-        if !s.contains(".") {
++        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(".") {
++        if !s.contains('.') {
+             s.push_str(".0");
+         }
+         Literal::_new(s)
+     }
+ 
+     pub fn string(t: &str) -> Literal {
+         let mut text = String::with_capacity(t.len() + 2);
+         text.push('"');
+         for c in t.chars() {
+             if c == '\'' {
+-                // escape_default turns this into "\'" which is unnecessary.
++                // escape_debug turns this into "\'" which is unnecessary.
+                 text.push(c);
+             } else {
+-                text.extend(c.escape_default());
++                text.extend(c.escape_debug());
+             }
+         }
+         text.push('"');
+         Literal::_new(text)
+     }
+ 
+     pub fn character(t: char) -> Literal {
+         let mut text = String::new();
+         text.push('\'');
+         if t == '"' {
+-            // escape_default turns this into '\"' which is unnecessary.
++            // escape_debug turns this into '\"' which is unnecessary.
+             text.push(t);
+         } else {
+-            text.extend(t.escape_default());
++            text.extend(t.escape_debug());
+         }
+         text.push('\'');
+         Literal::_new(text)
+     }
+ 
+     pub fn byte_string(bytes: &[u8]) -> Literal {
+         let mut escaped = "b\"".to_string();
+         for b in bytes {
++            #[allow(clippy::match_overlapping_arm)]
+             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),
+@@ -779,656 +873,22 @@ impl Literal {
+         self.span = span;
+     }
+ 
+     pub fn subspan<R: RangeBounds<usize>>(&self, _range: R) -> Option<Span> {
+         None
+     }
+ }
+ 
+-impl fmt::Display for Literal {
++impl Display for Literal {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-        self.text.fmt(f)
+-    }
+-}
+-
+-impl fmt::Debug for Literal {
+-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+-        let mut debug = fmt.debug_struct("Literal");
+-        debug.field("lit", &format_args!("{}", self.text));
+-        #[cfg(procmacro2_semver_exempt)]
+-        debug.field("span", &self.span);
+-        debug.finish()
+-    }
+-}
+-
+-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 { inner: trees }))
+-}
+-
+-#[cfg(not(span_locations))]
+-fn spanned<'a, T>(
+-    input: Cursor<'a>,
+-    f: fn(Cursor<'a>) -> PResult<'a, T>,
+-) -> PResult<'a, (T, crate::Span)> {
+-    let (a, b) = f(skip_whitespace(input))?;
+-    Ok((a, ((b, crate::Span::_new_stable(Span::call_site())))))
+-}
+-
+-#[cfg(span_locations)]
+-fn spanned<'a, T>(
+-    input: Cursor<'a>,
+-    f: fn(Cursor<'a>) -> PResult<'a, T>,
+-) -> PResult<'a, (T, crate::Span)> {
+-    let input = skip_whitespace(input);
+-    let lo = input.off;
+-    let (a, b) = f(input)?;
+-    let hi = a.off;
+-    let span = crate::Span::_new_stable(Span { lo, 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, |g| TokenTree::Group(crate::Group::_new_stable(g)))
+-    |
+-    map!(literal, |l| TokenTree::Literal(crate::Literal::_new_stable(l))) // must be before symbol
+-    |
+-    map!(op, TokenTree::Punct)
+-    |
+-    symbol_leading_ws
+-));
+-
+-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_leading_ws(input: Cursor) -> PResult<TokenTree> {
+-    symbol(skip_whitespace(input))
+-}
+-
+-fn symbol(input: Cursor) -> PResult<TokenTree> {
+-    let raw = input.starts_with("r#");
+-    let rest = input.advance((raw as usize) << 1);
+-
+-    let (rest, sym) = symbol_not_raw(rest)?;
+-
+-    if !raw {
+-        let ident = crate::Ident::new(sym, crate::Span::call_site());
+-        return Ok((rest, ident.into()));
+-    }
+-
+-    if sym == "_" {
+-        return Err(LexError);
+-    }
+-
+-    let ident = crate::Ident::_new_raw(sym, crate::Span::call_site());
+-    Ok((rest, ident.into()))
+-}
+-
+-fn symbol_not_raw(input: Cursor) -> PResult<&str> {
+-    let mut chars = input.char_indices();
+-
+-    match chars.next() {
+-        Some((_, ch)) if is_ident_start(ch) => {}
+-        _ => return Err(LexError),
+-    }
+-
+-    let mut end = input.len();
+-    for (i, ch) in chars {
+-        if !is_ident_continue(ch) {
+-            end = i;
+-            break;
+-        }
+-    }
+-
+-    Ok((input.advance(end), &input.rest[..end]))
+-}
+-
+-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(input.rest[start..end].to_string())))
+-        }
+-        Err(LexError) => Err(LexError),
++        Display::fmt(&self.text, f)
+     }
+ }
+ 
+-named!(literal_nocapture -> (), alt!(
+-    string
+-    |
+-    byte_string
+-    |
+-    byte
+-    |
+-    character
+-    |
+-    float
+-    |
+-    int
+-));
+-
+-named!(string -> (), alt!(
+-    quoted_string
+-    |
+-    preceded!(
+-        punct!("r"),
+-        raw_string
+-    ) => { |_| () }
+-));
+-
+-named!(quoted_string -> (), do_parse!(
+-    punct!("\"") >>
+-    cooked_string >>
+-    tag!("\"") >>
+-    option!(symbol_not_raw) >>
+-    (())
+-));
+-
+-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)
++impl Debug for Literal {
++    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
++        let mut debug = fmt.debug_struct("Literal");
++        debug.field("lit", &format_args!("{}", self.text));
++        debug_span_field_if_nontrivial(&mut debug, self.span);
++        debug.finish()
+     }
+ }
+-
+-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 (mut rest, ()) = float_digits(input)?;
+-    if let Some(ch) = rest.chars().next() {
+-        if is_ident_start(ch) {
+-            rest = symbol_not_raw(rest)?.0;
+-        }
+-    }
+-    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 == '.' || is_ident_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 (mut rest, ()) = digits(input)?;
+-    if let Some(ch) = rest.chars().next() {
+-        if is_ident_start(ch) {
+-            rest = symbol_not_raw(rest)?.0;
+-        }
+-    }
+-    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<Punct> {
+-    let input = skip_whitespace(input);
+-    match op_char(input) {
+-        Ok((rest, '\'')) => {
+-            symbol(rest)?;
+-            Ok((rest, Punct::new('\'', Spacing::Joint)))
+-        }
+-        Ok((rest, ch)) => {
+-            let kind = match op_char(rest) {
+-                Ok(_) => Spacing::Joint,
+-                Err(LexError) => Spacing::Alone,
+-            };
+-            Ok((rest, Punct::new(ch, kind)))
+-        }
+-        Err(LexError) => Err(LexError),
+-    }
+-}
+-
+-fn op_char(input: Cursor) -> PResult<char> {
+-    if input.starts_with("//") || input.starts_with("/*") {
+-        // Do not accept `/` of a comment as an op.
+-        return Err(LexError);
+-    }
+-
+-    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::Punct(Punct::new('#', Spacing::Alone)));
+-    if inner {
+-        trees.push(Punct::new('!', Spacing::Alone).into());
+-    }
+-    let mut stream = vec![
+-        TokenTree::Ident(crate::Ident::new("doc", span)),
+-        TokenTree::Punct(Punct::new('=', Spacing::Alone)),
+-        TokenTree::Literal(crate::Literal::string(comment)),
+-    ];
+-    for tt in stream.iter_mut() {
+-        tt.set_span(span);
+-    }
+-    let group = Group::new(Delimiter::Bracket, stream.into_iter().collect());
+-    trees.push(crate::Group::_new_stable(group).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/src/lib.rs b/third_party/rust/proc-macro2/src/lib.rs
+--- a/third_party/rust/proc-macro2/src/lib.rs
++++ b/third_party/rust/proc-macro2/src/lib.rs
+@@ -73,37 +73,44 @@
+ //!
+ //! # Thread-Safety
+ //!
+ //! Most types in this crate are `!Sync` because the underlying compiler
+ //! types make use of thread-local memory, meaning they cannot be accessed from
+ //! a different thread.
+ 
+ // Proc-macro2 types in rustdoc of other crates get linked to here.
+-#![doc(html_root_url = "https://docs.rs/proc-macro2/1.0.5")]
++#![doc(html_root_url = "https://docs.rs/proc-macro2/1.0.20")]
+ #![cfg_attr(any(proc_macro_span, super_unstable), feature(proc_macro_span))]
+ #![cfg_attr(super_unstable, feature(proc_macro_raw_ident, proc_macro_def_site))]
++#![allow(clippy::needless_doctest_main)]
+ 
+ #[cfg(use_proc_macro)]
+ extern crate proc_macro;
+ 
+ use std::cmp::Ordering;
+-use std::fmt;
++use std::fmt::{self, Debug, Display};
+ use std::hash::{Hash, Hasher};
+ use std::iter::FromIterator;
+ use std::marker;
+ use std::ops::RangeBounds;
+ #[cfg(procmacro2_semver_exempt)]
+ use std::path::PathBuf;
+ use std::rc::Rc;
+ use std::str::FromStr;
+ 
+-#[macro_use]
+-mod strnom;
+-mod fallback;
++mod parse;
++
++#[cfg(wrap_proc_macro)]
++mod detection;
++
++// Public for proc_macro2::fallback::force() and unforce(), but those are quite
++// a niche use case so we omit it from rustdoc.
++#[doc(hidden)]
++pub mod fallback;
+ 
+ #[cfg(not(wrap_proc_macro))]
+ use crate::fallback as imp;
+ #[path = "wrapper.rs"]
+ #[cfg(wrap_proc_macro)]
+ mod imp;
+ 
+ /// An abstract stream of tokens, or more concretely a sequence of token trees.
+@@ -223,32 +230,32 @@ impl FromIterator<TokenStream> for Token
+         TokenStream::_new(streams.into_iter().map(|i| i.inner).collect())
+     }
+ }
+ 
+ /// Prints the token stream as a string that is supposed to be losslessly
+ /// convertible back into the same token stream (modulo spans), except for
+ /// possibly `TokenTree::Group`s with `Delimiter::None` delimiters and negative
+ /// numeric literals.
+-impl fmt::Display for TokenStream {
++impl Display for TokenStream {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-        self.inner.fmt(f)
++        Display::fmt(&self.inner, f)
+     }
+ }
+ 
+ /// Prints token in a form convenient for debugging.
+-impl fmt::Debug for TokenStream {
++impl Debug for TokenStream {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-        self.inner.fmt(f)
++        Debug::fmt(&self.inner, f)
+     }
+ }
+ 
+-impl fmt::Debug for LexError {
++impl Debug for LexError {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-        self.inner.fmt(f)
++        Debug::fmt(&self.inner, f)
+     }
+ }
+ 
+ /// The source file of a given `Span`.
+ ///
+ /// This type is semver exempt and not exposed by default.
+ #[cfg(procmacro2_semver_exempt)]
+ #[derive(Clone, PartialEq, Eq)]
+@@ -286,19 +293,19 @@ impl SourceFile {
+     /// Returns `true` if this source file is a real source file, and not
+     /// generated by an external macro's expansion.
+     pub fn is_real(&self) -> bool {
+         self.inner.is_real()
+     }
+ }
+ 
+ #[cfg(procmacro2_semver_exempt)]
+-impl fmt::Debug for SourceFile {
++impl Debug for SourceFile {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-        self.inner.fmt(f)
++        Debug::fmt(&self.inner, f)
+     }
+ }
+ 
+ /// A line-column pair representing the start or end of a `Span`.
+ ///
+ /// This type is semver exempt and not exposed by default.
+ #[cfg(span_locations)]
+ #[derive(Copy, Clone, Debug, PartialEq, Eq)]
+@@ -306,16 +313,32 @@ pub struct LineColumn {
+     /// The 1-indexed line in the source file on which the span starts or ends
+     /// (inclusive).
+     pub line: usize,
+     /// The 0-indexed column (in UTF-8 characters) in the source file on which
+     /// the span starts or ends (inclusive).
+     pub column: usize,
+ }
+ 
++#[cfg(span_locations)]
++impl Ord for LineColumn {
++    fn cmp(&self, other: &Self) -> Ordering {
++        self.line
++            .cmp(&other.line)
++            .then(self.column.cmp(&other.column))
++    }
++}
++
++#[cfg(span_locations)]
++impl PartialOrd for LineColumn {
++    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
++        Some(self.cmp(other))
++    }
++}
++
+ /// A region of source code, along with macro expansion information.
+ #[derive(Copy, Clone)]
+ pub struct Span {
+     inner: imp::Span,
+     _marker: marker::PhantomData<Rc<()>>,
+ }
+ 
+ impl Span {
+@@ -337,38 +360,42 @@ impl Span {
+     ///
+     /// Identifiers created with this span will be resolved as if they were
+     /// written directly at the macro call location (call-site hygiene) and
+     /// other code at the macro call site will be able to refer to them as well.
+     pub fn call_site() -> Span {
+         Span::_new(imp::Span::call_site())
+     }
+ 
++    /// The span located at the invocation of the procedural macro, but with
++    /// local variables, labels, and `$crate` resolved at the definition site
++    /// of the macro. This is the same hygiene behavior as `macro_rules`.
++    ///
++    /// This function requires Rust 1.45 or later.
++    #[cfg(hygiene)]
++    pub fn mixed_site() -> Span {
++        Span::_new(imp::Span::mixed_site())
++    }
++
+     /// A span that resolves at the macro definition site.
+     ///
+     /// This method is semver exempt and not exposed by default.
+     #[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`.
+-    ///
+-    /// This method is semver exempt and not exposed by default.
+-    #[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`.
+-    ///
+-    /// This method is semver exempt and not exposed by default.
+-    #[cfg(procmacro2_semver_exempt)]
+     pub fn located_at(&self, other: Span) -> Span {
+         Span::_new(self.inner.located_at(other.inner))
+     }
+ 
+     /// Convert `proc_macro2::Span` to `proc_macro::Span`.
+     ///
+     /// This method is available when building with a nightly compiler, or when
+     /// building with rustc 1.29+ *without* semver exempt features.
+@@ -434,19 +461,19 @@ impl Span {
+     /// This method is semver exempt and not exposed by default.
+     #[cfg(procmacro2_semver_exempt)]
+     pub fn eq(&self, other: &Span) -> bool {
+         self.inner.eq(&other.inner)
+     }
+ }
+ 
+ /// Prints a span in a form convenient for debugging.
+-impl fmt::Debug for Span {
++impl Debug for Span {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-        self.inner.fmt(f)
++        Debug::fmt(&self.inner, f)
+     }
+ }
+ 
+ /// A single token or a delimited sequence of token trees (e.g. `[1, (), ..]`).
+ #[derive(Clone)]
+ pub enum TokenTree {
+     /// A token stream surrounded by bracket delimiters.
+     Group(Group),
+@@ -457,35 +484,35 @@ pub enum TokenTree {
+     /// A literal character (`'a'`), string (`"hello"`), number (`2.3`), etc.
+     Literal(Literal),
+ }
+ 
+ impl TokenTree {
+     /// Returns the span of this tree, delegating to the `span` method of
+     /// the contained token or a delimited stream.
+     pub fn span(&self) -> Span {
+-        match *self {
+-            TokenTree::Group(ref t) => t.span(),
+-            TokenTree::Ident(ref t) => t.span(),
+-            TokenTree::Punct(ref t) => t.span(),
+-            TokenTree::Literal(ref t) => t.span(),
++        match self {
++            TokenTree::Group(t) => t.span(),
++            TokenTree::Ident(t) => t.span(),
++            TokenTree::Punct(t) => t.span(),
++            TokenTree::Literal(t) => t.span(),
+         }
+     }
+ 
+     /// Configures the span for *only this token*.
+     ///
+     /// Note that if this token is a `Group` then this method will not configure
+     /// the span of each of the internal tokens, this will simply delegate to
+     /// the `set_span` method of each variant.
+     pub fn set_span(&mut self, span: Span) {
+-        match *self {
+-            TokenTree::Group(ref mut t) => t.set_span(span),
+-            TokenTree::Ident(ref mut t) => t.set_span(span),
+-            TokenTree::Punct(ref mut t) => t.set_span(span),
+-            TokenTree::Literal(ref mut t) => t.set_span(span),
++        match self {
++            TokenTree::Group(t) => t.set_span(span),
++            TokenTree::Ident(t) => t.set_span(span),
++            TokenTree::Punct(t) => t.set_span(span),
++            TokenTree::Literal(t) => t.set_span(span),
+         }
+     }
+ }
+ 
+ impl From<Group> for TokenTree {
+     fn from(g: Group) -> TokenTree {
+         TokenTree::Group(g)
+     }
+@@ -508,42 +535,42 @@ impl From<Literal> for TokenTree {
+         TokenTree::Literal(g)
+     }
+ }
+ 
+ /// Prints the token tree as a string that is supposed to be losslessly
+ /// convertible back into the same token tree (modulo spans), except for
+ /// possibly `TokenTree::Group`s with `Delimiter::None` delimiters and negative
+ /// numeric literals.
+-impl fmt::Display for TokenTree {
++impl Display for TokenTree {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-        match *self {
+-            TokenTree::Group(ref t) => t.fmt(f),
+-            TokenTree::Ident(ref t) => t.fmt(f),
+-            TokenTree::Punct(ref t) => t.fmt(f),
+-            TokenTree::Literal(ref t) => t.fmt(f),
++        match self {
++            TokenTree::Group(t) => Display::fmt(t, f),
++            TokenTree::Ident(t) => Display::fmt(t, f),
++            TokenTree::Punct(t) => Display::fmt(t, f),
++            TokenTree::Literal(t) => Display::fmt(t, f),
+         }
+     }
+ }
+ 
+ /// Prints token tree in a form convenient for debugging.
+-impl fmt::Debug for TokenTree {
++impl Debug for TokenTree {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         // Each of these has the name in the struct type in the derived debug,
+         // so don't bother with an extra layer of indirection
+-        match *self {
+-            TokenTree::Group(ref t) => t.fmt(f),
+-            TokenTree::Ident(ref t) => {
++        match self {
++            TokenTree::Group(t) => Debug::fmt(t, f),
++            TokenTree::Ident(t) => {
+                 let mut debug = f.debug_struct("Ident");
+                 debug.field("sym", &format_args!("{}", t));
+                 imp::debug_span_field_if_nontrivial(&mut debug, t.span().inner);
+                 debug.finish()
+             }
+-            TokenTree::Punct(ref t) => t.fmt(f),
+-            TokenTree::Literal(ref t) => t.fmt(f),
++            TokenTree::Punct(t) => Debug::fmt(t, f),
++            TokenTree::Literal(t) => Debug::fmt(t, f),
+         }
+     }
+ }
+ 
+ /// A delimited token stream.
+ ///
+ /// A `Group` internally contains a `TokenStream` which is surrounded by
+ /// `Delimiter`s.
+@@ -646,25 +673,25 @@ impl Group {
+     pub fn set_span(&mut self, span: Span) {
+         self.inner.set_span(span.inner)
+     }
+ }
+ 
+ /// Prints the group as a string that should be losslessly convertible back
+ /// into the same group (modulo spans), except for possibly `TokenTree::Group`s
+ /// with `Delimiter::None` delimiters.
+-impl fmt::Display for Group {
++impl Display for Group {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+-        fmt::Display::fmt(&self.inner, formatter)
++        Display::fmt(&self.inner, formatter)
+     }
+ }
+ 
+-impl fmt::Debug for Group {
++impl Debug for Group {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+-        fmt::Debug::fmt(&self.inner, formatter)
++        Debug::fmt(&self.inner, formatter)
+     }
+ }
+ 
+ /// An `Punct` is an single punctuation character like `+`, `-` or `#`.
+ ///
+ /// Multicharacter operators like `+=` are represented as two instances of
+ /// `Punct` with different forms of `Spacing` returned.
+ #[derive(Clone)]
+@@ -725,23 +752,23 @@ impl Punct {
+     /// Configure the span for this punctuation character.
+     pub fn set_span(&mut self, span: Span) {
+         self.span = span;
+     }
+ }
+ 
+ /// Prints the punctuation character as a string that should be losslessly
+ /// convertible back into the same character.
+-impl fmt::Display for Punct {
++impl Display for Punct {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-        self.op.fmt(f)
++        Display::fmt(&self.op, f)
+     }
+ }
+ 
+-impl fmt::Debug for Punct {
++impl Debug for Punct {
+     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+         let mut debug = fmt.debug_struct("Punct");
+         debug.field("op", &self.op);
+         debug.field("spacing", &self.spacing);
+         imp::debug_span_field_if_nontrivial(&mut debug, self.span.inner);
+         debug.finish()
+     }
+ }
+@@ -915,25 +942,25 @@ impl Ord for Ident {
+ impl Hash for Ident {
+     fn hash<H: Hasher>(&self, hasher: &mut H) {
+         self.to_string().hash(hasher)
+     }
+ }
+ 
+ /// Prints the identifier as a string that should be losslessly convertible back
+ /// into the same identifier.
+-impl fmt::Display for Ident {
++impl Display for Ident {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-        self.inner.fmt(f)
++        Display::fmt(&self.inner, f)
+     }
+ }
+ 
+-impl fmt::Debug for Ident {
++impl Debug for Ident {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-        self.inner.fmt(f)
++        Debug::fmt(&self.inner, f)
+     }
+ }
+ 
+ /// A literal string (`"hello"`), byte string (`b"hello"`), character (`'a'`),
+ /// byte character (`b'a'`), an integer or floating point number with or without
+ /// a suffix (`1`, `1u8`, `2.3`, `2.3f32`).
+ ///
+ /// Boolean literals like `true` and `false` do not belong here, they are
+@@ -1135,36 +1162,36 @@ impl Literal {
+     /// nightly compiler, this method will always return `None`.
+     ///
+     /// [`proc_macro::Literal::subspan`]: https://doc.rust-lang.org/proc_macro/struct.Literal.html#method.subspan
+     pub fn subspan<R: RangeBounds<usize>>(&self, range: R) -> Option<Span> {
+         self.inner.subspan(range).map(Span::_new)
+     }
+ }
+ 
+-impl fmt::Debug for Literal {
++impl Debug for Literal {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-        self.inner.fmt(f)
++        Debug::fmt(&self.inner, f)
+     }
+ }
+ 
+-impl fmt::Display for Literal {
++impl Display for Literal {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-        self.inner.fmt(f)
++        Display::fmt(&self.inner, f)
+     }
+ }
+ 
+ /// Public implementation details for the `TokenStream` type, such as iterators.
+ pub mod token_stream {
+-    use std::fmt;
++    use crate::{imp, TokenTree};
++    use std::fmt::{self, Debug};
+     use std::marker;
+     use std::rc::Rc;
+ 
+     pub use crate::TokenStream;
+-    use crate::{imp, TokenTree};
+ 
+     /// An iterator over `TokenStream`'s `TokenTree`s.
+     ///
+     /// The iteration is "shallow", e.g. the iterator doesn't recurse into
+     /// delimited groups, and returns whole groups as token trees.
+     #[derive(Clone)]
+     pub struct IntoIter {
+         inner: imp::TokenTreeIter,
+@@ -1174,19 +1201,19 @@ pub mod token_stream {
+     impl Iterator for IntoIter {
+         type Item = TokenTree;
+ 
+         fn next(&mut self) -> Option<TokenTree> {
+             self.inner.next()
+         }
+     }
+ 
+-    impl fmt::Debug for IntoIter {
++    impl Debug for IntoIter {
+         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+-            self.inner.fmt(f)
++            Debug::fmt(&self.inner, f)
+         }
+     }
+ 
+     impl IntoIterator for TokenStream {
+         type Item = TokenTree;
+         type IntoIter = IntoIter;
+ 
+         fn into_iter(self) -> IntoIter {
+diff --git a/third_party/rust/proc-macro2/src/parse.rs b/third_party/rust/proc-macro2/src/parse.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/proc-macro2/src/parse.rs
+@@ -0,0 +1,791 @@
++use crate::fallback::{
++    is_ident_continue, is_ident_start, Group, LexError, Literal, Span, TokenStream,
++};
++use crate::{Delimiter, Punct, Spacing, TokenTree};
++use std::str::{Bytes, CharIndices, Chars};
++use unicode_xid::UnicodeXID;
++
++#[derive(Copy, Clone, Eq, PartialEq)]
++pub(crate) struct Cursor<'a> {
++    pub rest: &'a str,
++    #[cfg(span_locations)]
++    pub off: u32,
++}
++
++impl<'a> Cursor<'a> {
++    fn advance(&self, bytes: usize) -> Cursor<'a> {
++        let (_front, rest) = self.rest.split_at(bytes);
++        Cursor {
++            rest,
++            #[cfg(span_locations)]
++            off: self.off + _front.chars().count() as u32,
++        }
++    }
++
++    fn starts_with(&self, s: &str) -> bool {
++        self.rest.starts_with(s)
++    }
++
++    pub(crate) fn is_empty(&self) -> bool {
++        self.rest.is_empty()
++    }
++
++    fn len(&self) -> usize {
++        self.rest.len()
++    }
++
++    fn as_bytes(&self) -> &'a [u8] {
++        self.rest.as_bytes()
++    }
++
++    fn bytes(&self) -> Bytes<'a> {
++        self.rest.bytes()
++    }
++
++    fn chars(&self) -> Chars<'a> {
++        self.rest.chars()
++    }
++
++    fn char_indices(&self) -> CharIndices<'a> {
++        self.rest.char_indices()
++    }
++
++    fn parse(&self, tag: &str) -> Result<Cursor<'a>, LexError> {
++        if self.starts_with(tag) {
++            Ok(self.advance(tag.len()))
++        } else {
++            Err(LexError)
++        }
++    }
++}
++
++type PResult<'a, O> = Result<(Cursor<'a>, O), LexError>;
++
++fn skip_whitespace(input: Cursor) -> Cursor {
++    let mut s = input;
++
++    while !s.is_empty() {
++        let byte = s.as_bytes()[0];
++        if byte == b'/' {
++            if s.starts_with("//")
++                && (!s.starts_with("///") || s.starts_with("////"))
++                && !s.starts_with("//!")
++            {
++                let (cursor, _) = take_until_newline_or_eof(s);
++                s = cursor;
++                continue;
++            } else if s.starts_with("/**/") {
++                s = s.advance(4);
++                continue;
++            } else if s.starts_with("/*")
++                && (!s.starts_with("/**") || s.starts_with("/***"))
++                && !s.starts_with("/*!")
++            {
++                match block_comment(s) {
++                    Ok((rest, _)) => {
++                        s = rest;
++                        continue;
++                    }
++                    Err(LexError) => return s,
++                }
++            }
++        }
++        match byte {
++            b' ' | 0x09..=0x0d => {
++                s = s.advance(1);
++                continue;
++            }
++            b if b <= 0x7f => {}
++            _ => {
++                let ch = s.chars().next().unwrap();
++                if is_whitespace(ch) {
++                    s = s.advance(ch.len_utf8());
++                    continue;
++                }
++            }
++        }
++        return s;
++    }
++    s
++}
++
++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)
++}
++
++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}'
++}
++
++fn word_break(input: Cursor) -> Result<Cursor, LexError> {
++    match input.chars().next() {
++        Some(ch) if UnicodeXID::is_xid_continue(ch) => Err(LexError),
++        Some(_) | None => Ok(input),
++    }
++}
++
++pub(crate) fn token_stream(mut input: Cursor) -> PResult<TokenStream> {
++    let mut trees = Vec::new();
++    let mut stack = Vec::new();
++
++    loop {
++        input = skip_whitespace(input);
++
++        if let Ok((rest, tt)) = doc_comment(input) {
++            trees.extend(tt);
++            input = rest;
++            continue;
++        }
++
++        #[cfg(span_locations)]
++        let lo = input.off;
++
++        let first = match input.bytes().next() {
++            Some(first) => first,
++            None => break,
++        };
++
++        if let Some(open_delimiter) = match first {
++            b'(' => Some(Delimiter::Parenthesis),
++            b'[' => Some(Delimiter::Bracket),
++            b'{' => Some(Delimiter::Brace),
++            _ => None,
++        } {
++            input = input.advance(1);
++            let frame = (open_delimiter, trees);
++            #[cfg(span_locations)]
++            let frame = (lo, frame);
++            stack.push(frame);
++            trees = Vec::new();
++        } else if let Some(close_delimiter) = match first {
++            b')' => Some(Delimiter::Parenthesis),
++            b']' => Some(Delimiter::Bracket),
++            b'}' => Some(Delimiter::Brace),
++            _ => None,
++        } {
++            input = input.advance(1);
++            let frame = stack.pop().ok_or(LexError)?;
++            #[cfg(span_locations)]
++            let (lo, frame) = frame;
++            let (open_delimiter, outer) = frame;
++            if open_delimiter != close_delimiter {
++                return Err(LexError);
++            }
++            let mut g = Group::new(open_delimiter, TokenStream { inner: trees });
++            g.set_span(Span {
++                #[cfg(span_locations)]
++                lo,
++                #[cfg(span_locations)]
++                hi: input.off,
++            });
++            trees = outer;
++            trees.push(TokenTree::Group(crate::Group::_new_stable(g)));
++        } else {
++            let (rest, mut tt) = leaf_token(input)?;
++            tt.set_span(crate::Span::_new_stable(Span {
++                #[cfg(span_locations)]
++                lo,
++                #[cfg(span_locations)]
++                hi: rest.off,
++            }));
++            trees.push(tt);
++            input = rest;
++        }
++    }
++
++    if stack.is_empty() {
++        Ok((input, TokenStream { inner: trees }))
++    } else {
++        Err(LexError)
++    }
++}
++
++fn leaf_token(input: Cursor) -> PResult<TokenTree> {
++    if let Ok((input, l)) = literal(input) {
++        // must be parsed before ident
++        Ok((input, TokenTree::Literal(crate::Literal::_new_stable(l))))
++    } else if let Ok((input, p)) = op(input) {
++        Ok((input, TokenTree::Punct(p)))
++    } else if let Ok((input, i)) = ident(input) {
++        Ok((input, TokenTree::Ident(i)))
++    } else {
++        Err(LexError)
++    }
++}
++
++fn ident(input: Cursor) -> PResult<crate::Ident> {
++    let raw = input.starts_with("r#");
++    let rest = input.advance((raw as usize) << 1);
++
++    let (rest, sym) = ident_not_raw(rest)?;
++
++    if !raw {
++        let ident = crate::Ident::new(sym, crate::Span::call_site());
++        return Ok((rest, ident));
++    }
++
++    if sym == "_" {
++        return Err(LexError);
++    }
++
++    let ident = crate::Ident::_new_raw(sym, crate::Span::call_site());
++    Ok((rest, ident))
++}
++
++fn ident_not_raw(input: Cursor) -> PResult<&str> {
++    let mut chars = input.char_indices();
++
++    match chars.next() {
++        Some((_, ch)) if is_ident_start(ch) => {}
++        _ => return Err(LexError),
++    }
++
++    let mut end = input.len();
++    for (i, ch) in chars {
++        if !is_ident_continue(ch) {
++            end = i;
++            break;
++        }
++    }
++
++    Ok((input.advance(end), &input.rest[..end]))
++}
++
++fn literal(input: Cursor) -> PResult<Literal> {
++    match literal_nocapture(input) {
++        Ok(a) => {
++            let end = input.len() - a.len();
++            Ok((a, Literal::_new(input.rest[..end].to_string())))
++        }
++        Err(LexError) => Err(LexError),
++    }
++}
++
++fn literal_nocapture(input: Cursor) -> Result<Cursor, LexError> {
++    if let Ok(ok) = string(input) {
++        Ok(ok)
++    } else if let Ok(ok) = byte_string(input) {
++        Ok(ok)
++    } else if let Ok(ok) = byte(input) {
++        Ok(ok)
++    } else if let Ok(ok) = character(input) {
++        Ok(ok)
++    } else if let Ok(ok) = float(input) {
++        Ok(ok)
++    } else if let Ok(ok) = int(input) {
++        Ok(ok)
++    } else {
++        Err(LexError)
++    }
++}
++
++fn literal_suffix(input: Cursor) -> Cursor {
++    match ident_not_raw(input) {
++        Ok((input, _)) => input,
++        Err(LexError) => input,
++    }
++}
++
++fn string(input: Cursor) -> Result<Cursor, LexError> {
++    if let Ok(input) = input.parse("\"") {
++        cooked_string(input)
++    } else if let Ok(input) = input.parse("r") {
++        raw_string(input)
++    } else {
++        Err(LexError)
++    }
++}
++
++fn cooked_string(input: Cursor) -> Result<Cursor, LexError> {
++    let mut chars = input.char_indices().peekable();
++
++    while let Some((i, ch)) = chars.next() {
++        match ch {
++            '"' => {
++                let input = input.advance(i + 1);
++                return Ok(literal_suffix(input));
++            }
++            '\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)
++}
++
++fn byte_string(input: Cursor) -> Result<Cursor, LexError> {
++    if let Ok(input) = input.parse("b\"") {
++        cooked_byte_string(input)
++    } else if let Ok(input) = input.parse("br") {
++        raw_string(input)
++    } else {
++        Err(LexError)
++    }
++}
++
++fn cooked_byte_string(mut input: Cursor) -> Result<Cursor, LexError> {
++    let mut bytes = input.bytes().enumerate();
++    'outer: while let Some((offset, b)) = bytes.next() {
++        match b {
++            b'"' => {
++                let input = input.advance(offset + 1);
++                return Ok(literal_suffix(input));
++            }
++            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) -> Result<Cursor, LexError> {
++    let mut chars = input.char_indices();
++    let mut n = 0;
++    while let Some((i, ch)) = chars.next() {
++        match ch {
++            '"' => {
++                n = i;
++                break;
++            }
++            '#' => {}
++            _ => return Err(LexError),
++        }
++    }
++    for (i, ch) in chars {
++        match ch {
++            '"' if input.rest[i + 1..].starts_with(&input.rest[..n]) => {
++                let rest = input.advance(i + 1 + n);
++                return Ok(literal_suffix(rest));
++            }
++            '\r' => {}
++            _ => {}
++        }
++    }
++    Err(LexError)
++}
++
++fn byte(input: Cursor) -> Result<Cursor, LexError> {
++    let input = input.parse("b'")?;
++    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 {
++        return Err(LexError);
++    }
++    let (offset, _) = bytes.next().ok_or(LexError)?;
++    if !input.chars().as_str().is_char_boundary(offset) {
++        return Err(LexError);
++    }
++    let input = input.advance(offset).parse("'")?;
++    Ok(literal_suffix(input))
++}
++
++fn character(input: Cursor) -> Result<Cursor, LexError> {
++    let input = input.parse("'")?;
++    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 {
++        return Err(LexError);
++    }
++    let (idx, _) = chars.next().ok_or(LexError)?;
++    let input = input.advance(idx).parse("'")?;
++    Ok(literal_suffix(input))
++}
++
++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) -> Result<Cursor, LexError> {
++    let mut rest = float_digits(input)?;
++    if let Some(ch) = rest.chars().next() {
++        if is_ident_start(ch) {
++            rest = ident_not_raw(rest)?.0;
++        }
++    }
++    word_break(rest)
++}
++
++fn float_digits(input: Cursor) -> Result<Cursor, LexError> {
++    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 == '.' || is_ident_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) -> Result<Cursor, LexError> {
++    let mut rest = digits(input)?;
++    if let Some(ch) = rest.chars().next() {
++        if is_ident_start(ch) {
++            rest = ident_not_raw(rest)?.0;
++        }
++    }
++    word_break(rest)
++}
++
++fn digits(mut input: Cursor) -> Result<Cursor, LexError> {
++    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<Punct> {
++    match op_char(input) {
++        Ok((rest, '\'')) => {
++            ident(rest)?;
++            Ok((rest, Punct::new('\'', Spacing::Joint)))
++        }
++        Ok((rest, ch)) => {
++            let kind = match op_char(rest) {
++                Ok(_) => Spacing::Joint,
++                Err(LexError) => Spacing::Alone,
++            };
++            Ok((rest, Punct::new(ch, kind)))
++        }
++        Err(LexError) => Err(LexError),
++    }
++}
++
++fn op_char(input: Cursor) -> PResult<char> {
++    if input.starts_with("//") || input.starts_with("/*") {
++        // Do not accept `/` of a comment as an op.
++        return Err(LexError);
++    }
++
++    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>> {
++    #[cfg(span_locations)]
++    let lo = input.off;
++    let (rest, (comment, inner)) = doc_comment_contents(input)?;
++    let span = crate::Span::_new_stable(Span {
++        #[cfg(span_locations)]
++        lo,
++        #[cfg(span_locations)]
++        hi: rest.off,
++    });
++
++    let mut scan_for_bare_cr = comment;
++    while let Some(cr) = scan_for_bare_cr.find('\r') {
++        let rest = &scan_for_bare_cr[cr + 1..];
++        if !rest.starts_with('\n') {
++            return Err(LexError);
++        }
++        scan_for_bare_cr = rest;
++    }
++
++    let mut trees = Vec::new();
++    trees.push(TokenTree::Punct(Punct::new('#', Spacing::Alone)));
++    if inner {
++        trees.push(Punct::new('!', Spacing::Alone).into());
++    }
++    let mut stream = vec![
++        TokenTree::Ident(crate::Ident::new("doc", span)),
++        TokenTree::Punct(Punct::new('=', Spacing::Alone)),
++        TokenTree::Literal(crate::Literal::string(comment)),
++    ];
++    for tt in stream.iter_mut() {
++        tt.set_span(span);
++    }
++    let group = Group::new(Delimiter::Bracket, stream.into_iter().collect());
++    trees.push(crate::Group::_new_stable(group).into());
++    for tt in trees.iter_mut() {
++        tt.set_span(span);
++    }
++    Ok((rest, trees))
++}
++
++fn doc_comment_contents(input: Cursor) -> PResult<(&str, bool)> {
++    if input.starts_with("//!") {
++        let input = input.advance(3);
++        let (input, s) = take_until_newline_or_eof(input);
++        Ok((input, (s, true)))
++    } else if input.starts_with("/*!") {
++        let (input, s) = block_comment(input)?;
++        Ok((input, (&s[3..s.len() - 2], true)))
++    } else if input.starts_with("///") {
++        let input = input.advance(3);
++        if input.starts_with("/") {
++            return Err(LexError);
++        }
++        let (input, s) = take_until_newline_or_eof(input);
++        Ok((input, (s, false)))
++    } else if input.starts_with("/**") && !input.rest[3..].starts_with('*') {
++        let (input, s) = block_comment(input)?;
++        Ok((input, (&s[3..s.len() - 2], false)))
++    } else {
++        Err(LexError)
++    }
++}
++
++fn take_until_newline_or_eof(input: Cursor) -> (Cursor, &str) {
++    let chars = input.char_indices();
++
++    for (i, ch) in chars {
++        if ch == '\n' {
++            return (input.advance(i), &input.rest[..i]);
++        } else if ch == '\r' && input.rest[i + 1..].starts_with('\n') {
++            return (input.advance(i + 1), &input.rest[..i]);
++        }
++    }
++
++    (input.advance(input.len()), input.rest)
++}
+diff --git a/third_party/rust/proc-macro2/src/strnom.rs b/third_party/rust/proc-macro2/src/strnom.rs
+deleted file mode 100644
+--- a/third_party/rust/proc-macro2/src/strnom.rs
++++ /dev/null
+@@ -1,391 +0,0 @@
+-//! Adapted from [`nom`](https://github.com/Geal/nom).
+-
+-use crate::fallback::LexError;
+-use std::str::{Bytes, CharIndices, Chars};
+-use unicode_xid::UnicodeXID;
+-
+-#[derive(Copy, Clone, Eq, PartialEq)]
+-pub struct Cursor<'a> {
+-    pub rest: &'a str,
+-    #[cfg(span_locations)]
+-    pub off: u32,
+-}
+-
+-impl<'a> Cursor<'a> {
+-    #[cfg(not(span_locations))]
+-    pub fn advance(&self, amt: usize) -> Cursor<'a> {
+-        Cursor {
+-            rest: &self.rest[amt..],
+-        }
+-    }
+-    #[cfg(span_locations)]
+-    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/src/wrapper.rs b/third_party/rust/proc-macro2/src/wrapper.rs
+--- a/third_party/rust/proc-macro2/src/wrapper.rs
++++ b/third_party/rust/proc-macro2/src/wrapper.rs
+@@ -1,96 +1,39 @@
+-use std::fmt;
+-use std::iter;
++use crate::detection::inside_proc_macro;
++use crate::{fallback, Delimiter, Punct, Spacing, TokenTree};
++use std::fmt::{self, Debug, Display};
++use std::iter::FromIterator;
+ use std::ops::RangeBounds;
+-use std::panic::{self, PanicInfo};
++use std::panic;
+ #[cfg(super_unstable)]
+ use std::path::PathBuf;
+ use std::str::FromStr;
+ 
+-use crate::{fallback, Delimiter, Punct, Spacing, TokenTree};
+-
+ #[derive(Clone)]
+-pub enum TokenStream {
++pub(crate) enum TokenStream {
+     Compiler(DeferredTokenStream),
+     Fallback(fallback::TokenStream),
+ }
+ 
+ // Work around https://github.com/rust-lang/rust/issues/65080.
+ // In `impl Extend<TokenTree> for TokenStream` which is used heavily by quote,
+ // we hold on to the appended tokens and do proc_macro::TokenStream::extend as
+ // late as possible to batch together consecutive uses of the Extend impl.
+ #[derive(Clone)]
+-pub struct DeferredTokenStream {
++pub(crate) struct DeferredTokenStream {
+     stream: proc_macro::TokenStream,
+     extra: Vec<proc_macro::TokenTree>,
+ }
+ 
+-pub enum LexError {
++pub(crate) enum LexError {
+     Compiler(proc_macro::LexError),
+     Fallback(fallback::LexError),
+ }
+ 
+-fn nightly_works() -> bool {
+-    use std::sync::atomic::*;
+-    use std::sync::Once;
+-
+-    static WORKS: AtomicUsize = AtomicUsize::new(0);
+-    static INIT: Once = Once::new();
+-
+-    match WORKS.load(Ordering::SeqCst) {
+-        1 => return false,
+-        2 => return true,
+-        _ => {}
+-    }
+-
+-    // Swap in a null panic hook to avoid printing "thread panicked" to stderr,
+-    // then use catch_unwind to determine whether the compiler's proc_macro is
+-    // working. When proc-macro2 is used from outside of a procedural macro all
+-    // of the proc_macro crate's APIs currently panic.
+-    //
+-    // The Once is to prevent the possibility of this ordering:
+-    //
+-    //     thread 1 calls take_hook, gets the user's original hook
+-    //     thread 1 calls set_hook with the null hook
+-    //     thread 2 calls take_hook, thinks null hook is the original hook
+-    //     thread 2 calls set_hook with the null hook
+-    //     thread 1 calls set_hook with the actual original hook
+-    //     thread 2 calls set_hook with what it thinks is the original hook
+-    //
+-    // in which the user's hook has been lost.
+-    //
+-    // There is still a race condition where a panic in a different thread can
+-    // happen during the interval that the user's original panic hook is
+-    // unregistered such that their hook is incorrectly not called. This is
+-    // sufficiently unlikely and less bad than printing panic messages to stderr
+-    // on correct use of this crate. Maybe there is a libstd feature request
+-    // here. For now, if a user needs to guarantee that this failure mode does
+-    // not occur, they need to call e.g. `proc_macro2::Span::call_site()` from
+-    // the main thread before launching any other threads.
+-    INIT.call_once(|| {
+-        type PanicHook = dyn Fn(&PanicInfo) + Sync + Send + 'static;
+-
+-        let null_hook: Box<PanicHook> = Box::new(|_panic_info| { /* ignore */ });
+-        let sanity_check = &*null_hook as *const PanicHook;
+-        let original_hook = panic::take_hook();
+-        panic::set_hook(null_hook);
+-
+-        let works = panic::catch_unwind(|| proc_macro::Span::call_site()).is_ok();
+-        WORKS.store(works as usize + 1, Ordering::SeqCst);
+-
+-        let hopefully_null_hook = panic::take_hook();
+-        panic::set_hook(original_hook);
+-        if sanity_check != &*hopefully_null_hook {
+-            panic!("observed race condition in proc_macro2::nightly_works");
+-        }
+-    });
+-    nightly_works()
+-}
+-
+ fn mismatch() -> ! {
+     panic!("stable/nightly mismatch")
+ }
+ 
+ impl DeferredTokenStream {
+     fn new(stream: proc_macro::TokenStream) -> Self {
+         DeferredTokenStream {
+             stream,
+@@ -98,28 +41,33 @@ impl DeferredTokenStream {
+         }
+     }
+ 
+     fn is_empty(&self) -> bool {
+         self.stream.is_empty() && self.extra.is_empty()
+     }
+ 
+     fn evaluate_now(&mut self) {
+-        self.stream.extend(self.extra.drain(..));
++        // If-check provides a fast short circuit for the common case of `extra`
++        // being empty, which saves a round trip over the proc macro bridge.
++        // Improves macro expansion time in winrt by 6% in debug mode.
++        if !self.extra.is_empty() {
++            self.stream.extend(self.extra.drain(..));
++        }
+     }
+ 
+     fn into_token_stream(mut self) -> proc_macro::TokenStream {
+         self.evaluate_now();
+         self.stream
+     }
+ }
+ 
+ impl TokenStream {
+     pub fn new() -> TokenStream {
+-        if nightly_works() {
++        if inside_proc_macro() {
+             TokenStream::Compiler(DeferredTokenStream::new(proc_macro::TokenStream::new()))
+         } else {
+             TokenStream::Fallback(fallback::TokenStream::new())
+         }
+     }
+ 
+     pub fn is_empty(&self) -> bool {
+         match self {
+@@ -142,31 +90,37 @@ impl TokenStream {
+         }
+     }
+ }
+ 
+ impl FromStr for TokenStream {
+     type Err = LexError;
+ 
+     fn from_str(src: &str) -> Result<TokenStream, LexError> {
+-        if nightly_works() {
++        if inside_proc_macro() {
+             Ok(TokenStream::Compiler(DeferredTokenStream::new(
+-                src.parse()?,
++                proc_macro_parse(src)?,
+             )))
+         } else {
+             Ok(TokenStream::Fallback(src.parse()?))
+         }
+     }
+ }
+ 
+-impl fmt::Display for TokenStream {
++// Work around https://github.com/rust-lang/rust/issues/58736.
++fn proc_macro_parse(src: &str) -> Result<proc_macro::TokenStream, LexError> {
++    panic::catch_unwind(|| src.parse().map_err(LexError::Compiler))
++        .unwrap_or(Err(LexError::Fallback(fallback::LexError)))
++}
++
++impl Display for TokenStream {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         match self {
+-            TokenStream::Compiler(tts) => tts.clone().into_token_stream().fmt(f),
+-            TokenStream::Fallback(tts) => tts.fmt(f),
++            TokenStream::Compiler(tts) => Display::fmt(&tts.clone().into_token_stream(), f),
++            TokenStream::Fallback(tts) => Display::fmt(tts, f),
+         }
+     }
+ }
+ 
+ impl From<proc_macro::TokenStream> for TokenStream {
+     fn from(inner: proc_macro::TokenStream) -> TokenStream {
+         TokenStream::Compiler(DeferredTokenStream::new(inner))
+     }
+@@ -182,17 +136,17 @@ impl From<TokenStream> for proc_macro::T
+ }
+ 
+ impl From<fallback::TokenStream> for TokenStream {
+     fn from(inner: fallback::TokenStream) -> TokenStream {
+         TokenStream::Fallback(inner)
+     }
+ }
+ 
+-// Assumes nightly_works().
++// Assumes inside_proc_macro().
+ fn into_compiler_token(token: TokenTree) -> proc_macro::TokenTree {
+     match token {
+         TokenTree::Group(tt) => tt.inner.unwrap_nightly().into(),
+         TokenTree::Punct(tt) => {
+             let spacing = match tt.spacing() {
+                 Spacing::Joint => proc_macro::Spacing::Joint,
+                 Spacing::Alone => proc_macro::Spacing::Alone,
+             };
+@@ -202,37 +156,37 @@ fn into_compiler_token(token: TokenTree)
+         }
+         TokenTree::Ident(tt) => tt.inner.unwrap_nightly().into(),
+         TokenTree::Literal(tt) => tt.inner.unwrap_nightly().into(),
+     }
+ }
+ 
+ impl From<TokenTree> for TokenStream {
+     fn from(token: TokenTree) -> TokenStream {
+-        if nightly_works() {
++        if inside_proc_macro() {
+             TokenStream::Compiler(DeferredTokenStream::new(into_compiler_token(token).into()))
+         } else {
+             TokenStream::Fallback(token.into())
+         }
+     }
+ }
+ 
+-impl iter::FromIterator<TokenTree> for TokenStream {
++impl FromIterator<TokenTree> for TokenStream {
+     fn from_iter<I: IntoIterator<Item = TokenTree>>(trees: I) -> Self {
+-        if nightly_works() {
++        if inside_proc_macro() {
+             TokenStream::Compiler(DeferredTokenStream::new(
+                 trees.into_iter().map(into_compiler_token).collect(),
+             ))
+         } else {
+             TokenStream::Fallback(trees.into_iter().collect())
+         }
+     }
+ }
+ 
+-impl iter::FromIterator<TokenStream> for TokenStream {
++impl FromIterator<TokenStream> for TokenStream {
+     fn from_iter<I: IntoIterator<Item = TokenStream>>(streams: I) -> Self {
+         let mut streams = streams.into_iter();
+         match streams.next() {
+             Some(TokenStream::Compiler(mut first)) => {
+                 first.evaluate_now();
+                 first.stream.extend(streams.map(|s| match s {
+                     TokenStream::Compiler(s) => s.into_token_stream(),
+                     TokenStream::Fallback(_) => mismatch(),
+@@ -247,75 +201,76 @@ impl iter::FromIterator<TokenStream> for
+                 TokenStream::Fallback(first)
+             }
+             None => TokenStream::new(),
+         }
+     }
+ }
+ 
+ impl Extend<TokenTree> for TokenStream {
+-    fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, streams: I) {
++    fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, stream: I) {
+         match self {
+             TokenStream::Compiler(tts) => {
+                 // Here is the reason for DeferredTokenStream.
+-                tts.extra
+-                    .extend(streams.into_iter().map(into_compiler_token));
++                for token in stream {
++                    tts.extra.push(into_compiler_token(token));
++                }
+             }
+-            TokenStream::Fallback(tts) => tts.extend(streams),
++            TokenStream::Fallback(tts) => tts.extend(stream),
+         }
+     }
+ }
+ 
+ impl Extend<TokenStream> for TokenStream {
+     fn extend<I: IntoIterator<Item = TokenStream>>(&mut self, streams: I) {
+         match self {
+             TokenStream::Compiler(tts) => {
+                 tts.evaluate_now();
+                 tts.stream
+-                    .extend(streams.into_iter().map(|stream| stream.unwrap_nightly()));
++                    .extend(streams.into_iter().map(TokenStream::unwrap_nightly));
+             }
+             TokenStream::Fallback(tts) => {
+-                tts.extend(streams.into_iter().map(|stream| stream.unwrap_stable()));
++                tts.extend(streams.into_iter().map(TokenStream::unwrap_stable));
+             }
+         }
+     }
+ }
+ 
+-impl fmt::Debug for TokenStream {
++impl Debug for TokenStream {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         match self {
+-            TokenStream::Compiler(tts) => tts.clone().into_token_stream().fmt(f),
+-            TokenStream::Fallback(tts) => tts.fmt(f),
++            TokenStream::Compiler(tts) => Debug::fmt(&tts.clone().into_token_stream(), f),
++            TokenStream::Fallback(tts) => Debug::fmt(tts, f),
+         }
+     }
+ }
+ 
+ impl From<proc_macro::LexError> for LexError {
+     fn from(e: proc_macro::LexError) -> LexError {
+         LexError::Compiler(e)
+     }
+ }
+ 
+ impl From<fallback::LexError> for LexError {
+     fn from(e: fallback::LexError) -> LexError {
+         LexError::Fallback(e)
+     }
+ }
+ 
+-impl fmt::Debug for LexError {
++impl Debug for LexError {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         match self {
+-            LexError::Compiler(e) => e.fmt(f),
+-            LexError::Fallback(e) => e.fmt(f),
++            LexError::Compiler(e) => Debug::fmt(e, f),
++            LexError::Fallback(e) => Debug::fmt(e, f),
+         }
+     }
+ }
+ 
+ #[derive(Clone)]
+-pub enum TokenTreeIter {
++pub(crate) enum TokenTreeIter {
+     Compiler(proc_macro::token_stream::IntoIter),
+     Fallback(fallback::TokenTreeIter),
+ }
+ 
+ impl IntoIterator for TokenStream {
+     type Item = TokenTree;
+     type IntoIter = TokenTreeIter;
+ 
+@@ -356,25 +311,25 @@ impl Iterator for TokenTreeIter {
+     fn size_hint(&self) -> (usize, Option<usize>) {
+         match self {
+             TokenTreeIter::Compiler(tts) => tts.size_hint(),
+             TokenTreeIter::Fallback(tts) => tts.size_hint(),
+         }
+     }
+ }
+ 
+-impl fmt::Debug for TokenTreeIter {
++impl Debug for TokenTreeIter {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         f.debug_struct("TokenTreeIter").finish()
+     }
+ }
+ 
+ #[derive(Clone, PartialEq, Eq)]
+ #[cfg(super_unstable)]
+-pub enum SourceFile {
++pub(crate) enum SourceFile {
+     Compiler(proc_macro::SourceFile),
+     Fallback(fallback::SourceFile),
+ }
+ 
+ #[cfg(super_unstable)]
+ impl SourceFile {
+     fn nightly(sf: proc_macro::SourceFile) -> Self {
+         SourceFile::Compiler(sf)
+@@ -392,68 +347,87 @@ impl SourceFile {
+         match self {
+             SourceFile::Compiler(a) => a.is_real(),
+             SourceFile::Fallback(a) => a.is_real(),
+         }
+     }
+ }
+ 
+ #[cfg(super_unstable)]
+-impl fmt::Debug for SourceFile {
++impl Debug for SourceFile {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         match self {
+-            SourceFile::Compiler(a) => a.fmt(f),
+-            SourceFile::Fallback(a) => a.fmt(f),
++            SourceFile::Compiler(a) => Debug::fmt(a, f),
++            SourceFile::Fallback(a) => Debug::fmt(a, f),
+         }
+     }
+ }
+ 
+ #[cfg(any(super_unstable, feature = "span-locations"))]
+-pub struct LineColumn {
++pub(crate) struct LineColumn {
+     pub line: usize,
+     pub column: usize,
+ }
+ 
+ #[derive(Copy, Clone)]
+-pub enum Span {
++pub(crate) enum Span {
+     Compiler(proc_macro::Span),
+     Fallback(fallback::Span),
+ }
+ 
+ impl Span {
+     pub fn call_site() -> Span {
+-        if nightly_works() {
++        if inside_proc_macro() {
+             Span::Compiler(proc_macro::Span::call_site())
+         } else {
+             Span::Fallback(fallback::Span::call_site())
+         }
+     }
+ 
++    #[cfg(hygiene)]
++    pub fn mixed_site() -> Span {
++        if inside_proc_macro() {
++            Span::Compiler(proc_macro::Span::mixed_site())
++        } else {
++            Span::Fallback(fallback::Span::mixed_site())
++        }
++    }
++
+     #[cfg(super_unstable)]
+     pub fn def_site() -> Span {
+-        if nightly_works() {
++        if inside_proc_macro() {
+             Span::Compiler(proc_macro::Span::def_site())
+         } else {
+             Span::Fallback(fallback::Span::def_site())
+         }
+     }
+ 
+-    #[cfg(super_unstable)]
+     pub fn resolved_at(&self, other: Span) -> Span {
+         match (self, other) {
++            #[cfg(hygiene)]
+             (Span::Compiler(a), Span::Compiler(b)) => Span::Compiler(a.resolved_at(b)),
++
++            // Name resolution affects semantics, but location is only cosmetic
++            #[cfg(not(hygiene))]
++            (Span::Compiler(_), Span::Compiler(_)) => other,
++
+             (Span::Fallback(a), Span::Fallback(b)) => Span::Fallback(a.resolved_at(b)),
+             _ => mismatch(),
+         }
+     }
+ 
+-    #[cfg(super_unstable)]
+     pub fn located_at(&self, other: Span) -> Span {
+         match (self, other) {
++            #[cfg(hygiene)]
+             (Span::Compiler(a), Span::Compiler(b)) => Span::Compiler(a.located_at(b)),
++
++            // Name resolution affects semantics, but location is only cosmetic
++            #[cfg(not(hygiene))]
++            (Span::Compiler(_), Span::Compiler(_)) => *self,
++
+             (Span::Fallback(a), Span::Fallback(b)) => Span::Fallback(a.located_at(b)),
+             _ => mismatch(),
+         }
+     }
+ 
+     pub fn unwrap(self) -> proc_macro::Span {
+         match self {
+             Span::Compiler(s) => s,
+@@ -537,36 +511,36 @@ impl From<proc_macro::Span> for crate::S
+ }
+ 
+ impl From<fallback::Span> for Span {
+     fn from(inner: fallback::Span) -> Span {
+         Span::Fallback(inner)
+     }
+ }
+ 
+-impl fmt::Debug for Span {
++impl Debug for Span {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         match self {
+-            Span::Compiler(s) => s.fmt(f),
+-            Span::Fallback(s) => s.fmt(f),
++            Span::Compiler(s) => Debug::fmt(s, f),
++            Span::Fallback(s) => Debug::fmt(s, f),
+         }
+     }
+ }
+ 
+-pub fn debug_span_field_if_nontrivial(debug: &mut fmt::DebugStruct, span: Span) {
++pub(crate) fn debug_span_field_if_nontrivial(debug: &mut fmt::DebugStruct, span: Span) {
+     match span {
+         Span::Compiler(s) => {
+             debug.field("span", &s);
+         }
+         Span::Fallback(s) => fallback::debug_span_field_if_nontrivial(debug, s),
+     }
+ }
+ 
+ #[derive(Clone)]
+-pub enum Group {
++pub(crate) enum Group {
+     Compiler(proc_macro::Group),
+     Fallback(fallback::Group),
+ }
+ 
+ impl Group {
+     pub fn new(delimiter: Delimiter, stream: TokenStream) -> Group {
+         match stream {
+             TokenStream::Compiler(tts) => {
+@@ -647,36 +621,36 @@ impl Group {
+ }
+ 
+ impl From<fallback::Group> for Group {
+     fn from(g: fallback::Group) -> Self {
+         Group::Fallback(g)
+     }
+ }
+ 
+-impl fmt::Display for Group {
++impl Display for Group {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+         match self {
+-            Group::Compiler(group) => group.fmt(formatter),
+-            Group::Fallback(group) => group.fmt(formatter),
++            Group::Compiler(group) => Display::fmt(group, formatter),
++            Group::Fallback(group) => Display::fmt(group, formatter),
+         }
+     }
+ }
+ 
+-impl fmt::Debug for Group {
++impl Debug for Group {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+         match self {
+-            Group::Compiler(group) => group.fmt(formatter),
+-            Group::Fallback(group) => group.fmt(formatter),
++            Group::Compiler(group) => Debug::fmt(group, formatter),
++            Group::Fallback(group) => Debug::fmt(group, formatter),
+         }
+     }
+ }
+ 
+ #[derive(Clone)]
+-pub enum Ident {
++pub(crate) enum Ident {
+     Compiler(proc_macro::Ident),
+     Fallback(fallback::Ident),
+ }
+ 
+ impl Ident {
+     pub fn new(string: &str, span: Span) -> Ident {
+         match span {
+             Span::Compiler(s) => Ident::Compiler(proc_macro::Ident::new(string, s)),
+@@ -742,56 +716,56 @@ where
+         let other = other.as_ref();
+         match self {
+             Ident::Compiler(t) => t.to_string() == other,
+             Ident::Fallback(t) => t == other,
+         }
+     }
+ }
+ 
+-impl fmt::Display for Ident {
++impl Display for Ident {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         match self {
+-            Ident::Compiler(t) => t.fmt(f),
+-            Ident::Fallback(t) => t.fmt(f),
++            Ident::Compiler(t) => Display::fmt(t, f),
++            Ident::Fallback(t) => Display::fmt(t, f),
+         }
+     }
+ }
+ 
+-impl fmt::Debug for Ident {
++impl Debug for Ident {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         match self {
+-            Ident::Compiler(t) => t.fmt(f),
+-            Ident::Fallback(t) => t.fmt(f),
++            Ident::Compiler(t) => Debug::fmt(t, f),
++            Ident::Fallback(t) => Debug::fmt(t, f),
+         }
+     }
+ }
+ 
+ #[derive(Clone)]
+-pub enum Literal {
++pub(crate) enum Literal {
+     Compiler(proc_macro::Literal),
+     Fallback(fallback::Literal),
+ }
+ 
+ macro_rules! suffixed_numbers {
+     ($($name:ident => $kind:ident,)*) => ($(
+         pub fn $name(n: $kind) -> Literal {
+-            if nightly_works() {
++            if inside_proc_macro() {
+                 Literal::Compiler(proc_macro::Literal::$name(n))
+             } else {
+                 Literal::Fallback(fallback::Literal::$name(n))
+             }
+         }
+     )*)
+ }
+ 
+ macro_rules! unsuffixed_integers {
+     ($($name:ident => $kind:ident,)*) => ($(
+         pub fn $name(n: $kind) -> Literal {
+-            if nightly_works() {
++            if inside_proc_macro() {
+                 Literal::Compiler(proc_macro::Literal::$name(n))
+             } else {
+                 Literal::Fallback(fallback::Literal::$name(n))
+             }
+         }
+     )*)
+ }
+ 
+@@ -825,49 +799,49 @@ impl Literal {
+         i16_unsuffixed => i16,
+         i32_unsuffixed => i32,
+         i64_unsuffixed => i64,
+         i128_unsuffixed => i128,
+         isize_unsuffixed => isize,
+     }
+ 
+     pub fn f32_unsuffixed(f: f32) -> Literal {
+-        if nightly_works() {
++        if inside_proc_macro() {
+             Literal::Compiler(proc_macro::Literal::f32_unsuffixed(f))
+         } else {
+             Literal::Fallback(fallback::Literal::f32_unsuffixed(f))
+         }
+     }
+ 
+     pub fn f64_unsuffixed(f: f64) -> Literal {
+-        if nightly_works() {
++        if inside_proc_macro() {
+             Literal::Compiler(proc_macro::Literal::f64_unsuffixed(f))
+         } else {
+             Literal::Fallback(fallback::Literal::f64_unsuffixed(f))
+         }
+     }
+ 
+     pub fn string(t: &str) -> Literal {
+-        if nightly_works() {
++        if inside_proc_macro() {
+             Literal::Compiler(proc_macro::Literal::string(t))
+         } else {
+             Literal::Fallback(fallback::Literal::string(t))
+         }
+     }
+ 
+     pub fn character(t: char) -> Literal {
+-        if nightly_works() {
++        if inside_proc_macro() {
+             Literal::Compiler(proc_macro::Literal::character(t))
+         } else {
+             Literal::Fallback(fallback::Literal::character(t))
+         }
+     }
+ 
+     pub fn byte_string(bytes: &[u8]) -> Literal {
+-        if nightly_works() {
++        if inside_proc_macro() {
+             Literal::Compiler(proc_macro::Literal::byte_string(bytes))
+         } else {
+             Literal::Fallback(fallback::Literal::byte_string(bytes))
+         }
+     }
+ 
+     pub fn span(&self) -> Span {
+         match self {
+@@ -903,25 +877,25 @@ impl Literal {
+ }
+ 
+ impl From<fallback::Literal> for Literal {
+     fn from(s: fallback::Literal) -> Literal {
+         Literal::Fallback(s)
+     }
+ }
+ 
+-impl fmt::Display for Literal {
++impl Display for Literal {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         match self {
+-            Literal::Compiler(t) => t.fmt(f),
+-            Literal::Fallback(t) => t.fmt(f),
++            Literal::Compiler(t) => Display::fmt(t, f),
++            Literal::Fallback(t) => Display::fmt(t, f),
+         }
+     }
+ }
+ 
+-impl fmt::Debug for Literal {
++impl Debug for Literal {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         match self {
+-            Literal::Compiler(t) => t.fmt(f),
+-            Literal::Fallback(t) => t.fmt(f),
++            Literal::Compiler(t) => Debug::fmt(t, f),
++            Literal::Fallback(t) => Debug::fmt(t, f),
+         }
+     }
+ }
+diff --git a/third_party/rust/proc-macro2/tests/comments.rs b/third_party/rust/proc-macro2/tests/comments.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/proc-macro2/tests/comments.rs
+@@ -0,0 +1,103 @@
++use proc_macro2::{Delimiter, Literal, Spacing, TokenStream, TokenTree};
++
++// #[doc = "..."] -> "..."
++fn lit_of_outer_doc_comment(tokens: TokenStream) -> Literal {
++    lit_of_doc_comment(tokens, false)
++}
++
++// #![doc = "..."] -> "..."
++fn lit_of_inner_doc_comment(tokens: TokenStream) -> Literal {
++    lit_of_doc_comment(tokens, true)
++}
++
++fn lit_of_doc_comment(tokens: TokenStream, inner: bool) -> Literal {
++    let mut iter = tokens.clone().into_iter();
++    match iter.next().unwrap() {
++        TokenTree::Punct(punct) => {
++            assert_eq!(punct.as_char(), '#');
++            assert_eq!(punct.spacing(), Spacing::Alone);
++        }
++        _ => panic!("wrong token {:?}", tokens),
++    }
++    if inner {
++        match iter.next().unwrap() {
++            TokenTree::Punct(punct) => {
++                assert_eq!(punct.as_char(), '!');
++                assert_eq!(punct.spacing(), Spacing::Alone);
++            }
++            _ => panic!("wrong token {:?}", tokens),
++        }
++    }
++    iter = match iter.next().unwrap() {
++        TokenTree::Group(group) => {
++            assert_eq!(group.delimiter(), Delimiter::Bracket);
++            assert!(iter.next().is_none(), "unexpected token {:?}", tokens);
++            group.stream().into_iter()
++        }
++        _ => panic!("wrong token {:?}", tokens),
++    };
++    match iter.next().unwrap() {
++        TokenTree::Ident(ident) => assert_eq!(ident.to_string(), "doc"),
++        _ => panic!("wrong token {:?}", tokens),
++    }
++    match iter.next().unwrap() {
++        TokenTree::Punct(punct) => {
++            assert_eq!(punct.as_char(), '=');
++            assert_eq!(punct.spacing(), Spacing::Alone);
++        }
++        _ => panic!("wrong token {:?}", tokens),
++    }
++    match iter.next().unwrap() {
++        TokenTree::Literal(literal) => {
++            assert!(iter.next().is_none(), "unexpected token {:?}", tokens);
++            literal
++        }
++        _ => panic!("wrong token {:?}", tokens),
++    }
++}
++
++#[test]
++fn closed_immediately() {
++    let stream = "/**/".parse::<TokenStream>().unwrap();
++    let tokens = stream.into_iter().collect::<Vec<_>>();
++    assert!(tokens.is_empty(), "not empty -- {:?}", tokens);
++}
++
++#[test]
++fn incomplete() {
++    assert!("/*/".parse::<TokenStream>().is_err());
++}
++
++#[test]
++fn lit() {
++    let stream = "/// doc".parse::<TokenStream>().unwrap();
++    let lit = lit_of_outer_doc_comment(stream);
++    assert_eq!(lit.to_string(), "\" doc\"");
++
++    let stream = "//! doc".parse::<TokenStream>().unwrap();
++    let lit = lit_of_inner_doc_comment(stream);
++    assert_eq!(lit.to_string(), "\" doc\"");
++
++    let stream = "/** doc */".parse::<TokenStream>().unwrap();
++    let lit = lit_of_outer_doc_comment(stream);
++    assert_eq!(lit.to_string(), "\" doc \"");
++
++    let stream = "/*! doc */".parse::<TokenStream>().unwrap();
++    let lit = lit_of_inner_doc_comment(stream);
++    assert_eq!(lit.to_string(), "\" doc \"");
++}
++
++#[test]
++fn carriage_return() {
++    let stream = "///\r\n".parse::<TokenStream>().unwrap();
++    let lit = lit_of_outer_doc_comment(stream);
++    assert_eq!(lit.to_string(), "\"\"");
++
++    let stream = "/**\r\n*/".parse::<TokenStream>().unwrap();
++    let lit = lit_of_outer_doc_comment(stream);
++    assert_eq!(lit.to_string(), "\"\\r\\n\"");
++
++    "///\r".parse::<TokenStream>().unwrap_err();
++    "///\r \n".parse::<TokenStream>().unwrap_err();
++    "/**\r \n*/".parse::<TokenStream>().unwrap_err();
++}
+diff --git a/third_party/rust/proc-macro2/tests/test.rs b/third_party/rust/proc-macro2/tests/test.rs
+--- a/third_party/rust/proc-macro2/tests/test.rs
++++ b/third_party/rust/proc-macro2/tests/test.rs
+@@ -1,12 +1,11 @@
++use proc_macro2::{Ident, Literal, Spacing, Span, TokenStream, TokenTree};
+ use std::str::{self, FromStr};
+ 
+-use proc_macro2::{Ident, Literal, Spacing, Span, TokenStream, TokenTree};
+-
+ #[test]
+ fn idents() {
+     assert_eq!(
+         Ident::new("String", Span::call_site()).to_string(),
+         "String"
+     );
+     assert_eq!(Ident::new("fn", Span::call_site()).to_string(), "fn");
+     assert_eq!(Ident::new("_", Span::call_site()).to_string(), "_");
+@@ -105,16 +104,43 @@ fn literal_suffix() {
+     assert_eq!(token_count("999u256"), 1);
+     assert_eq!(token_count("999r#u256"), 3);
+     assert_eq!(token_count("1."), 1);
+     assert_eq!(token_count("1.f32"), 3);
+     assert_eq!(token_count("1.0_0"), 1);
+     assert_eq!(token_count("1._0"), 3);
+     assert_eq!(token_count("1._m"), 3);
+     assert_eq!(token_count("\"\"s"), 1);
++    assert_eq!(token_count("r\"\"r"), 1);
++    assert_eq!(token_count("b\"\"b"), 1);
++    assert_eq!(token_count("br\"\"br"), 1);
++    assert_eq!(token_count("r#\"\"#r"), 1);
++    assert_eq!(token_count("'c'c"), 1);
++    assert_eq!(token_count("b'b'b"), 1);
++}
++
++#[test]
++fn literal_iter_negative() {
++    let negative_literal = Literal::i32_suffixed(-3);
++    let tokens = TokenStream::from(TokenTree::Literal(negative_literal));
++    let mut iter = tokens.into_iter();
++    match iter.next().unwrap() {
++        TokenTree::Punct(punct) => {
++            assert_eq!(punct.as_char(), '-');
++            assert_eq!(punct.spacing(), Spacing::Alone);
++        }
++        unexpected => panic!("unexpected token {:?}", unexpected),
++    }
++    match iter.next().unwrap() {
++        TokenTree::Literal(literal) => {
++            assert_eq!(literal.to_string(), "3i32");
++        }
++        unexpected => panic!("unexpected token {:?}", unexpected),
++    }
++    assert!(iter.next().is_none());
+ }
+ 
+ #[test]
+ fn roundtrip() {
+     fn roundtrip(p: &str) {
+         println!("parse: {}", p);
+         let s = p.parse::<TokenStream>().unwrap().to_string();
+         println!("first: {}", s);
+@@ -161,46 +187,16 @@ fn fail() {
+     fail("' static");
+     fail("r#1");
+     fail("r#_");
+ }
+ 
+ #[cfg(span_locations)]
+ #[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
+ }",
+         &[
+@@ -269,59 +265,17 @@ fn span_join() {
+         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::Punct(ref tt) => assert_eq!(tt.as_char(), '#'),
+-        _ => 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::Ident(ref tt) => assert_eq!(tt.to_string(), "doc"),
+-        t => panic!("wrong token {:?}", t),
+-    }
+-    match tokens.next().unwrap() {
+-        proc_macro2::TokenTree::Punct(ref tt) => assert_eq!(tt.as_char(), '='),
+-        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);
++    assert!(s.parse::<TokenStream>().is_err());
+ }
+ 
+ #[test]
+ fn op_before_comment() {
+     let mut tts = TokenStream::from_str("~// comment").unwrap().into_iter();
+     match tts.next().unwrap() {
+         TokenTree::Punct(tt) => {
+             assert_eq!(tt.as_char(), '~');
+@@ -340,30 +294,30 @@ fn raw_identifier() {
+     }
+     assert!(tts.next().is_none());
+ }
+ 
+ #[test]
+ fn test_debug_ident() {
+     let ident = Ident::new("proc_macro", Span::call_site());
+ 
+-    #[cfg(not(procmacro2_semver_exempt))]
++    #[cfg(not(span_locations))]
+     let expected = "Ident(proc_macro)";
+ 
+-    #[cfg(procmacro2_semver_exempt)]
+-    let expected = "Ident { sym: proc_macro, span: bytes(0..0) }";
++    #[cfg(span_locations)]
++    let expected = "Ident { sym: proc_macro }";
+ 
+     assert_eq!(expected, format!("{:?}", ident));
+ }
+ 
+ #[test]
+ fn test_debug_tokenstream() {
+     let tts = TokenStream::from_str("[a + 1]").unwrap();
+ 
+-    #[cfg(not(procmacro2_semver_exempt))]
++    #[cfg(not(span_locations))]
+     let expected = "\
+ TokenStream [
+     Group {
+         delimiter: Bracket,
+         stream: TokenStream [
+             Ident {
+                 sym: a,
+             },
+@@ -374,17 +328,17 @@ TokenStream [
+             Literal {
+                 lit: 1,
+             },
+         ],
+     },
+ ]\
+     ";
+ 
+-    #[cfg(not(procmacro2_semver_exempt))]
++    #[cfg(not(span_locations))]
+     let expected_before_trailing_commas = "\
+ TokenStream [
+     Group {
+         delimiter: Bracket,
+         stream: TokenStream [
+             Ident {
+                 sym: a
+             },
+@@ -395,17 +349,17 @@ TokenStream [
+             Literal {
+                 lit: 1
+             }
+         ]
+     }
+ ]\
+     ";
+ 
+-    #[cfg(procmacro2_semver_exempt)]
++    #[cfg(span_locations)]
+     let expected = "\
+ TokenStream [
+     Group {
+         delimiter: Bracket,
+         stream: TokenStream [
+             Ident {
+                 sym: a,
+                 span: bytes(2..3),
+@@ -420,17 +374,17 @@ TokenStream [
+                 span: bytes(6..7),
+             },
+         ],
+         span: bytes(1..8),
+     },
+ ]\
+     ";
+ 
+-    #[cfg(procmacro2_semver_exempt)]
++    #[cfg(span_locations)]
+     let expected_before_trailing_commas = "\
+ TokenStream [
+     Group {
+         delimiter: Bracket,
+         stream: TokenStream [
+             Ident {
+                 sym: a,
+                 span: bytes(2..3)
+@@ -459,8 +413,85 @@ TokenStream [
+ }
+ 
+ #[test]
+ fn default_tokenstream_is_empty() {
+     let default_token_stream: TokenStream = Default::default();
+ 
+     assert!(default_token_stream.is_empty());
+ }
++
++#[test]
++fn tuple_indexing() {
++    // This behavior may change depending on https://github.com/rust-lang/rust/pull/71322
++    let mut tokens = "tuple.0.0".parse::<TokenStream>().unwrap().into_iter();
++    assert_eq!("tuple", tokens.next().unwrap().to_string());
++    assert_eq!(".", tokens.next().unwrap().to_string());
++    assert_eq!("0.0", tokens.next().unwrap().to_string());
++    assert!(tokens.next().is_none());
++}
++
++#[cfg(span_locations)]
++#[test]
++fn non_ascii_tokens() {
++    check_spans("// abc", &[]);
++    check_spans("// ábc", &[]);
++    check_spans("// abc x", &[]);
++    check_spans("// ábc x", &[]);
++    check_spans("/* abc */ x", &[(1, 10, 1, 11)]);
++    check_spans("/* ábc */ x", &[(1, 10, 1, 11)]);
++    check_spans("/* ab\nc */ x", &[(2, 5, 2, 6)]);
++    check_spans("/* áb\nc */ x", &[(2, 5, 2, 6)]);
++    check_spans("/*** abc */ x", &[(1, 12, 1, 13)]);
++    check_spans("/*** ábc */ x", &[(1, 12, 1, 13)]);
++    check_spans(r#""abc""#, &[(1, 0, 1, 5)]);
++    check_spans(r#""ábc""#, &[(1, 0, 1, 5)]);
++    check_spans(r###"r#"abc"#"###, &[(1, 0, 1, 8)]);
++    check_spans(r###"r#"ábc"#"###, &[(1, 0, 1, 8)]);
++    check_spans("r#\"a\nc\"#", &[(1, 0, 2, 3)]);
++    check_spans("r#\"á\nc\"#", &[(1, 0, 2, 3)]);
++    check_spans("'a'", &[(1, 0, 1, 3)]);
++    check_spans("'á'", &[(1, 0, 1, 3)]);
++    check_spans("//! abc", &[(1, 0, 1, 7), (1, 0, 1, 7), (1, 0, 1, 7)]);
++    check_spans("//! ábc", &[(1, 0, 1, 7), (1, 0, 1, 7), (1, 0, 1, 7)]);
++    check_spans("//! abc\n", &[(1, 0, 1, 7), (1, 0, 1, 7), (1, 0, 1, 7)]);
++    check_spans("//! ábc\n", &[(1, 0, 1, 7), (1, 0, 1, 7), (1, 0, 1, 7)]);
++    check_spans("/*! abc */", &[(1, 0, 1, 10), (1, 0, 1, 10), (1, 0, 1, 10)]);
++    check_spans("/*! ábc */", &[(1, 0, 1, 10), (1, 0, 1, 10), (1, 0, 1, 10)]);
++    check_spans("/*! a\nc */", &[(1, 0, 2, 4), (1, 0, 2, 4), (1, 0, 2, 4)]);
++    check_spans("/*! á\nc */", &[(1, 0, 2, 4), (1, 0, 2, 4), (1, 0, 2, 4)]);
++    check_spans("abc", &[(1, 0, 1, 3)]);
++    check_spans("ábc", &[(1, 0, 1, 3)]);
++    check_spans("ábć", &[(1, 0, 1, 3)]);
++    check_spans("abc// foo", &[(1, 0, 1, 3)]);
++    check_spans("ábc// foo", &[(1, 0, 1, 3)]);
++    check_spans("ábć// foo", &[(1, 0, 1, 3)]);
++    check_spans("b\"a\\\n c\"", &[(1, 0, 2, 3)]);
++    check_spans("b\"a\\\n\u{00a0}c\"", &[(1, 0, 2, 3)]);
++}
++
++#[cfg(span_locations)]
++fn check_spans(p: &str, mut lines: &[(usize, usize, usize, usize)]) {
++    let ts = p.parse::<TokenStream>().unwrap();
++    check_spans_internal(ts, &mut lines);
++    assert!(lines.is_empty(), "leftover ranges: {:?}", lines);
++}
++
++#[cfg(span_locations)]
++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);
++
++            if let TokenTree::Group(g) = i {
++                check_spans_internal(g.stream().clone(), lines);
++            }
++        }
++    }
++}
+diff --git a/third_party/rust/proc-macro2/tests/test_fmt.rs b/third_party/rust/proc-macro2/tests/test_fmt.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/proc-macro2/tests/test_fmt.rs
+@@ -0,0 +1,26 @@
++use proc_macro2::{Delimiter, Group, Ident, Span, TokenStream, TokenTree};
++use std::iter::{self, FromIterator};
++
++#[test]
++fn test_fmt_group() {
++    let ident = Ident::new("x", Span::call_site());
++    let inner = TokenStream::from_iter(iter::once(TokenTree::Ident(ident)));
++    let parens_empty = Group::new(Delimiter::Parenthesis, TokenStream::new());
++    let parens_nonempty = Group::new(Delimiter::Parenthesis, inner.clone());
++    let brackets_empty = Group::new(Delimiter::Bracket, TokenStream::new());
++    let brackets_nonempty = Group::new(Delimiter::Bracket, inner.clone());
++    let braces_empty = Group::new(Delimiter::Brace, TokenStream::new());
++    let braces_nonempty = Group::new(Delimiter::Brace, inner.clone());
++    let none_empty = Group::new(Delimiter::None, TokenStream::new());
++    let none_nonempty = Group::new(Delimiter::None, inner.clone());
++
++    // Matches libproc_macro.
++    assert_eq!("()", parens_empty.to_string());
++    assert_eq!("(x)", parens_nonempty.to_string());
++    assert_eq!("[]", brackets_empty.to_string());
++    assert_eq!("[x]", brackets_nonempty.to_string());
++    assert_eq!("{ }", braces_empty.to_string());
++    assert_eq!("{ x }", braces_nonempty.to_string());
++    assert_eq!("", none_empty.to_string());
++    assert_eq!("x", none_nonempty.to_string());
++}
+diff --git a/third_party/rust/syn/.cargo-checksum.json b/third_party/rust/syn/.cargo-checksum.json
+--- a/third_party/rust/syn/.cargo-checksum.json
++++ b/third_party/rust/syn/.cargo-checksum.json
+@@ -1,1 +1,1 @@
+-{"files":{"Cargo.toml":"484d29864d333a361652fa4e24e1dcfab9efa47705ffd8c106d802eb03b78da7","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"ca605417b6db8c995458f8407afaad6c177aedcc2274004283600f5638fa1b0c","benches/file.rs":"b45211cc4a0296a77aac2b4de16dbc6b5cb66adfb5afac00a77bccea87f43968","benches/rust.rs":"9cc0f62e944f1583d05c43a395a1556731501cf5976ef67a081f4f6387f883ba","build.rs":"7423ab199728d55c7d64c44b7c6729cfd93bd8273366a77707353003e27565d7","src/attr.rs":"cf81add298f0e75c35a9980a59bc3c2fd3fe933635830d1591374eeb2487c225","src/await.rs":"18f0b2ecb319991f891e300011424985e3cf33d166ea9f29f22d575fc8c83a76","src/bigint.rs":"efc7f64959980653d73fe4f8bc2a3a2904dc05f45b02c6dc15cd316fa3d7c338","src/buffer.rs":"2a432c11a3da67a21d46c2272bf9ce60a0bb20893b5750027bbd8ca3e843ab35","src/custom_keyword.rs":"589e46ec1be9a04d6de12c0b8cadf87cc1c05606ed46ddea62e9869cbca4a191","src/custom_punctuation.rs":"2ba2e294e15a0fce7ede3686c42b2891797079a724dd1193b66e7d305624c891","src/data.rs":"cc9b250d084e444782d3ff5e63c1ba387cbde8f7f2e977eab9846d920b4b8c3f","src/derive.rs":"c18878f14be5d5ab11fd7dda2d2ff1ff75c9662daf11eed033de62e4d0670a89","src/discouraged.rs":"50e10915695c4d14f64a78e20ecbef90a2cd53a7c26ee3426a2524a8ee5c9cbf","src/error.rs":"2c17a402f83ed5ae4ad96e753216771bef620235c2ff1ccc23f4bbafc7266fe1","src/export.rs":"dcae67456278c0339acfbcbb4737b8d37cfba5a150ae789f31f4be79abf7e726","src/expr.rs":"871d8eeb43cef02ef88de3bea7477b79b4eabc096a0899dde0e5750edf482f49","src/ext.rs":"b97ed549490b9248b5b5df31b3d5b08ba8791e23e6c5d3a1157a0363eb683ff3","src/file.rs":"3cc2bf5c709238d515a557f721f231c8c725b196400de051f945b549299d38a7","src/gen/fold.rs":"10b3ae33d0ce410d6bbe8b93be9d5f9e856c7dc8212133cc46b703f97d548190","src/gen/visit.rs":"e0f5798552d186024696b7bfc7219d4ff53b0e45f735a83e77cbb6b6578c5fa4","src/gen/visit_mut.rs":"9f7dda83907969971dba84d545aaa563b0728e54db97ffab5050fdf43a79c731","src/gen_helper.rs":"ea6c66388365971db6a2fc86cbb208f7eacde77e245bc8623f27a3642a3d7741","src/generics.rs":"d845d7a828863123a5187fd0fe59c9dae3636f63bad302bd035792eed3dcb1ba","src/group.rs":"119b62d8481b4b1c327639bed40e114bf1969765250b68186628247fd4144b3b","src/ident.rs":"503156ce51a7ef0420892e8dbf2ecf8fe51f42a84d52cc2c05654e1a83020cbf","src/item.rs":"213f2f58c65ee1aa222f111bc9b1be681f8fb069caed04ca56586839979318d0","src/keyword.rs":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/lib.rs":"24778e9f15e8025e75aca114c712716ada586b471adb3b3b69278f4d39b8a21b","src/lifetime.rs":"905359708f772ec858954badde69ee016d29e6eeba1dd205b268445b1aff6f3a","src/lit.rs":"5bb0bddb94cbd256e50e92dc091a0baa09f1be40a77058b897507f3b17191e5d","src/lookahead.rs":"5cce8b4cb345a85c24a452ea6d78eadb76f01ca0a789cbf5ce35108334904173","src/mac.rs":"6b468244cc07e3f2f10419f833d9e2ed23edbcd6dc34cf21c5947633699db964","src/macros.rs":"0d8c3bab47539aa2d00bec64e92c901ea2c9c0af74c868051c0905b82650f970","src/op.rs":"93cd44770bb110deadf807a01d9a666efe644b6e3010f4b51cae77ee7438cfbb","src/parse.rs":"5017123c249ebc65866af113a0ad671814b9873f47568180e6539a305eb0317d","src/parse_macro_input.rs":"f799aadb7216c2d333b579f48ed2fedfe07b5e96f004b25b569649ffbaa958d2","src/parse_quote.rs":"81575bf60b18b0d8624d7025a5bcc8dcd6633ad70c454dee2a06e4c391700b6c","src/pat.rs":"db0f2263b9813de1f4e3e3e0396fe0080b1e11c8090c6b4fb6fca3cfbe22bc96","src/path.rs":"32e685ac7fd2d4b9989802de8f326a8d47fa710f86ec3e45fd9d3ff8fdfe97ef","src/print.rs":"da6529c1d9d21aaf6c835f66b4e67eacb7cf91a10eb5e9a2143b49bf99b3b5e1","src/punctuated.rs":"384e7b317b26f24118eb4b0c39e949ee9f4f3e700a4c80e462342c83b2cc3282","src/sealed.rs":"896a495a5340eec898527f18bd4ddca408ea03ea0ee3af30074ff48deace778d","src/span.rs":"748c51c6feb223c26d3b1701f5bb98aee823666c775c98106cfa24fe29d8cec1","src/spanned.rs":"adddb6acae14a0fa340df302b932c31e34b259706ce56fd82ab597ec424500e1","src/stmt.rs":"fbccf2b4da7980fe6ea8d99457d291577c0f225b370c1dd97da41abf2a18fcf7","src/thread.rs":"815eca6bd64f4eef7c447f0809e84108f5428ff50225224b373efd8fbb696874","src/token.rs":"761d8d1793560eb2b631c36ddfdbb14ac65178405f095453aa0e75e8816bdbb9","src/tt.rs":"1e32ae216d14d895ff621bf32bc611f138aa00108b0090be2cbaa0affebe8e2a","src/ty.rs":"ce052e0079b65b66bea4e9502d2ff2c90ad4b867904bf7eb892eb60aa3ef219a","tests/clone.sh":"961243d42540d9992090efbbd5478b7aa395671db64a6c28cdadb6edc610ebdf","tests/common/eq.rs":"a42d339808fd32dd4bfd440c254add8c56d5e2cde3a6bf0c88621b618ce5eaa7","tests/common/mod.rs":"20a3300016351fa210a193fbb0db059ef5125fa7909585ded64790004d4977ed","tests/common/parse.rs":"17ba6d1e74aaa3f8096c6d379d803221f12d95cca69927be047d6ddf8367647f","tests/debug/gen.rs":"57bd5cf585e0b86ad00f29f09ff3db3390c4a756d503514a9b28407500dcea3c","tests/debug/mod.rs":"462d6fe34ee75c3ca1207d4db2ff3bdee5b430b9f9ca632e5671d1588d3f76b3","tests/features/error.rs":"e0581a2869cbd237c2bc18a0a85272296e1577bb5f7317a67fa85e28e04eea6f","tests/features/mod.rs":"66a2605ec54ede29208da350f2bed536dfa763b58408d64d3fca3b13de64b64f","tests/macros/mod.rs":"3f2d758c0ba76b93f54b0c1fc22ad50edff8ef42629ba4d47ac7d7f823da8359","tests/repo/mod.rs":"e851a68972c9194a9a8d7b68538b16ed79ae81cba55e1a2ce210d1b759fb1a21","tests/test_asyncness.rs":"b6c46118b036e6807d24eb0e1779244b4fca23dac0d8031e9843b3edec484ce8","tests/test_attribute.rs":"2d8f18a98c989d3f7adaaeb1aeebd4f8413365ace63feecb37cb3f9db9db4d8f","tests/test_derive_input.rs":"477d80f914c54b526f8ff229788dc0e7798d118f6dcfa348f4c99755edb347b9","tests/test_expr.rs":"f35ca80566849a36e6ba6403d9663519eff37e4224360c468fedff8b561a643e","tests/test_generics.rs":"83a5dc07f5c5701c12625399262f7120b66f01a742523f3eda28da2cf2c87eb3","tests/test_grouping.rs":"aadd75215addd9e5a8fa2f9472117d4cb80f1e8b84e07f4c0845675c9014164f","tests/test_ident.rs":"236c239dd66f543f084f44ff747d7bc3962cf11a019a279777fe972f6e17aa4c","tests/test_iterators.rs":"718938da14778dcba06324d36a99d9317c9d45d81a34c6a44c47e1fa38085e9f","tests/test_lit.rs":"7dff2661a5ac586d6ed2fe27501cb8ff62f4cf3f6c91f596bff6057c67ad7857","tests/test_meta.rs":"8444dee084882243b107dfc8a6aac27f9382f9774162d1ac8ed8ec30d60c048e","tests/test_parse_buffer.rs":"b244bb4bc41ff06d21f239e60a3d663fdec5aa4af33f2a354afef36d34f0aefc","tests/test_pat.rs":"41776b878efae9b8e340f21ffe6296e921cf309f618482efd98609c33e32c28b","tests/test_precedence.rs":"71f3ea52cda8b40166bb7416fb98774e6a653542497b521f8e183e283dcf579d","tests/test_round_trip.rs":"e0de37f45fa223b488d25a41beab185eb92abb7bf765a9f13fe5d870ff31f5f1","tests/test_should_parse.rs":"4da4e25ee2baa7e75135c375042a7f958de136c5698dab03f99ff7a774dcd463","tests/test_size.rs":"970150b9d49ef91ab4c8f8c6a59b83f9a68a02acb779f0280733a5efaec6487a","tests/test_token_trees.rs":"a07ea657bf03b9c667c821b2db2af49b176ca737e3e01217a73cca78b7f11380","tests/zzz_stable.rs":"961d4940a926db4ca523d834b060c62de988e6a8e01c9f5efaa7bb4c86745b47"},"package":"66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"}
+\ No newline at end of file
++{"files":{"Cargo.toml":"28ddb678a5ccac4423435384c8b7116f804e896eabc5aae9d5c2bc666aaebbb4","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"03f3b53cf858536a0883aa5b5882ee61dcd0f1e71c0930c9106fcfa1d6aad2df","benches/file.rs":"b4724fc7c0f48b8f488e2632a1064f6c0bf16ded3969680fc3f4a2369536269b","benches/rust.rs":"ea6291ef2d2a83d94a3312fe179d48259f8ec0b04c961993ddd181d0a4ab740e","build.rs":"aeca2312f05aec658eaa66980a0ef3d578837db107a55702b39419ea0422eb4a","src/attr.rs":"7d79482634d6544eb4a4825405407b53660d0f5f8b929f7e1671e005b9d92038","src/await.rs":"18f0b2ecb319991f891e300011424985e3cf33d166ea9f29f22d575fc8c83a76","src/bigint.rs":"efc7f64959980653d73fe4f8bc2a3a2904dc05f45b02c6dc15cd316fa3d7c338","src/buffer.rs":"cf2a4b3bdc247b80c85ff5625a1dfb7a5f517fd835f6e1518a7b924990e4c293","src/custom_keyword.rs":"9627467063e41776315a6a14b2aaea3875592d8e0ebd2dc6df1fc2f12c06f146","src/custom_punctuation.rs":"b00e7bee96eb473507527e39db65e74e71592dc06421d2cfe45ed899c17d4847","src/data.rs":"7aec9a745cd53ec95688afa353f6efb9576e7fc0143757b51d28bc3d900b1d2a","src/derive.rs":"fa71866df6e383673dd3329f455a9f953585b83f9739050be3bf1f8c6d526b96","src/discouraged.rs":"a1f3d85e20dedf50b1b7b4571d970a3a6e9b2de4afde7dd0c986fe240df2ba46","src/error.rs":"c3005b50e3132026250c5356d0d391bf96db8087f0f5f744de98e360d8a20a3e","src/export.rs":"dcae67456278c0339acfbcbb4737b8d37cfba5a150ae789f31f4be79abf7e726","src/expr.rs":"54455fd20041996653ca5379b03cdf3c2fc1b3dd2e1149b5bc6b1dd492545d55","src/ext.rs":"870086d9021e6a6fcefa2f00cd91b55c4b74dcee8f0f6a07e76d96fb44707d61","src/file.rs":"75167ebc77e7870122078eabde1b872c337142d4b0962c20cedffcaaa2a5b7c6","src/gen/clone.rs":"0845c1bf8624c3f235cd247b4eb748e7e16b4c240097cb0ff16751f688c079ae","src/gen/debug.rs":"d24fe37f4ce1dd74f2dc54136e893782d3c4d0908323c036c97599551a56960c","src/gen/eq.rs":"1e6ef09b17ca7f36861ef23ce2a6991b231ed5f087f046469b5f23da40f5b419","src/gen/fold.rs":"3f59e59ed8ad2ab5dd347bfbe41bbc785c2aabd8ae902087a584a6daed597182","src/gen/hash.rs":"e5b2a52587173076777233a9e57e2b3c8e0dd6d6f41d16fa7c9fde68b05c2bfc","src/gen/visit.rs":"23008c170d4dd3975232876a0a654921d9b6af57372cb9fcc133ca740588d666","src/gen/visit_mut.rs":"42886c3ee02ded72d9c3eec006e20431eaee0c6b90ddefc1a36ec7bf50c6a24a","src/gen_helper.rs":"ea6c66388365971db6a2fc86cbb208f7eacde77e245bc8623f27a3642a3d7741","src/generics.rs":"d1c175284ca21e777ef0414c28383929b170ccb00aaf7a929eb18d3b05e18da8","src/group.rs":"119b62d8481b4b1c327639bed40e114bf1969765250b68186628247fd4144b3b","src/ident.rs":"503156ce51a7ef0420892e8dbf2ecf8fe51f42a84d52cc2c05654e1a83020cbf","src/item.rs":"c9ad9881e8cda8ee3f157f0c7602fc53d08a7e3288b9afc388c393689eac5aea","src/lib.rs":"558ad13779233b27bebc4b2fc8025eb1c7e57b32130dc1dd911391e27b427500","src/lifetime.rs":"f390fe06692fc51fbf3eb490bb9f795da70e4452f51c5b0df3bbaa899084ddf1","src/lit.rs":"9fab84e38756b092fbb055dcdf01e31d42d916c49e3eaae8c9019043b0ee4301","src/lookahead.rs":"5cce8b4cb345a85c24a452ea6d78eadb76f01ca0a789cbf5ce35108334904173","src/mac.rs":"e5cecea397fd01a44958162781d8d94343fe2a1b9b9754a5666c3d2ab4d7ef64","src/macros.rs":"2ce05b553f14da4ee550bb681cb0733b7186ad94719cd36f96d53e15fd02cf2b","src/op.rs":"449514e146deab0ab020bc6f764544c294dbc780941c9802bf60cf1b2839d550","src/parse.rs":"bde888c98ee259f2a73489a693515ed4875432b0d79486ac83aea19f441992a3","src/parse_macro_input.rs":"653a020f023cac0eccbc1fcc34aa7bf80567b43e5475deab4ad3e487a5363201","src/parse_quote.rs":"642f21e5fa54df4b7c373fb158289ee1005d49e1a49b1d194df5438faee71c46","src/pat.rs":"1473b258162cc822f1ee0c0869f521053ed345a140c39ed83b9b4dfb6f9f2aca","src/path.rs":"f119f0c2af12fabd360eac9a2312e0f6e6c28c633c9671bde6ef0bece7c5ba3c","src/print.rs":"da6529c1d9d21aaf6c835f66b4e67eacb7cf91a10eb5e9a2143b49bf99b3b5e1","src/punctuated.rs":"212f5a601d6c2eb8b8fa679be1167b455b595bee964d2775b0101ebb16c3eaa5","src/reserved.rs":"3625eb2a64589a4992ab79a1674e9679f465bea613ab139a671df5337e88cee6","src/sealed.rs":"896a495a5340eec898527f18bd4ddca408ea03ea0ee3af30074ff48deace778d","src/span.rs":"748c51c6feb223c26d3b1701f5bb98aee823666c775c98106cfa24fe29d8cec1","src/spanned.rs":"7d77714d585e6f42397091ffb3a799fd7b20c05c5442c737683c429ea7d409a5","src/stmt.rs":"3917fbc897f80efe838267833c55650ff8d636cb49a6d1084e28eff65d0e3ccd","src/thread.rs":"815eca6bd64f4eef7c447f0809e84108f5428ff50225224b373efd8fbb696874","src/token.rs":"a1ca6298bf6592cb80cbab1db4eac2fa4e3fa56729bb807bfb0f08ab0f229ca5","src/tt.rs":"1cc9e200624288322f800f32e3d6e2e53da946467bb312dd40a52c02cdcc4730","src/ty.rs":"cb167cbb16240c59a31b44adec175172caaf75ffef9a0bb168584b51bf105795","src/verbatim.rs":"802a97df997432f18cac6e6200ff6ea29fb2474986005e0fcdbc2b65197f87f7","src/whitespace.rs":"e63dd0aa3d34029f17766a8b09c1a6e4479e36c552c8b7023d710a399333aace","tests/.gitignore":"22e782449a3c216db3f7215d5fb8882e316768e40beeec3833aae419ad8941db","tests/common/eq.rs":"4b190a3833bdfd20a4cb1e3dff25a698751dec71d6f30249cf09426e061a4fb1","tests/common/mod.rs":"25ef6d7daa09bad3198a0e9e91b2812425f92db7c585c1e34a03a84d7362ccd8","tests/common/parse.rs":"8b7ba32f4988c30758c108536c4877dc5a039a237bf9b0687220ef2295797bbd","tests/debug/gen.rs":"d6e2abf2a7bb58a7895a60c2f094a98a4f85c9189d02011d0dcef6ef053f26e3","tests/debug/mod.rs":"868763d0ef1609a3ad5e05e9f1bfa0f813e91e7e9a36653414a188bb2fdaa425","tests/macros/mod.rs":"c0eafa4e3845fc08f6efe6021bac37822c0ac325eb7b51194a5f35236f648d92","tests/repo/mod.rs":"9e316b88d57ae213e81950c35e45443078ec90e702798353bc3528cb8a2810b6","tests/repo/progress.rs":"c08d0314a7f3ecf760d471f27da3cd2a500aeb9f1c8331bffb2aa648f9fabf3f","tests/test_asyncness.rs":"cff01db49d28ab23b0b258bc6c0a5cc4071be4fe7248eef344a5d79d2fb649b7","tests/test_attribute.rs":"0ffd99384e1a52ae17d9fed5c4053e411e8f9018decef07ffa621d1faa7329d8","tests/test_derive_input.rs":"610444351e3bf99366976bbf1da109c334a70ac9500caef366bcf9b68819829f","tests/test_expr.rs":"0ee83f6f6de950018c043efcc3e85776b4227dae3068309998a8d9709f2fc66c","tests/test_generics.rs":"9d713f90a79d6145efc89fb6f946029ca03486c632219950889da39940152ba0","tests/test_grouping.rs":"46c27baec4daaaf1e891892f0b0515ea8a44619071c7d0cc9192580916f1569f","tests/test_ident.rs":"9eb53d1e21edf23e7c9e14dc74dcc2b2538e9221e19dbcc0a44e3acc2e90f3f6","tests/test_item.rs":"461ed0c8648afffcea3217f52c9a88298182b4d39d73a11803b1281d99c98c25","tests/test_iterators.rs":"53ed6078d37550bd6765d2411e3660be401aef8a31a407350cc064a7d08c7c33","tests/test_lit.rs":"2a46c5f2f2ad1dcbb7e9b0cd11b55861c5ff818c2c4c51351d07e2daa7c74674","tests/test_meta.rs":"1fc98af3279cadc3d8db3c7e8d4d7f9e9dbd4d17548cf6a2f6f4536ed65367f6","tests/test_parse_buffer.rs":"8bbe2d24ca8a3788f72c6908fc96c26d546f11c69687bf8d72727f851d5e2d27","tests/test_parse_stream.rs":"2f449a2c41a3dee6fd14bee24e1666a453cb808eda17332fd91afd127fcdd2a6","tests/test_pat.rs":"2cb331fe404496d51e7cc7e283ae13c519a2265ca82e1c88e113296f860c2cba","tests/test_path.rs":"fcd5591e639fc787acc9763d828a811c8114525c9341282eefda8f331e082a51","tests/test_precedence.rs":"8d03656741b01e577d7501ce24332d1a4febec3e31a043e47c61062b8c527ed2","tests/test_receiver.rs":"084eca59984b9a18651da52f2c4407355da3de1335916a12477652999e2d01cc","tests/test_round_trip.rs":"ba01bf4ec04cd2d6f9e4800c343563925ae960c5f16752dc0797fda4451b6cc2","tests/test_shebang.rs":"f5772cadad5b56e3112cb16308b779f92bce1c3a48091fc9933deb2276a69331","tests/test_should_parse.rs":"1d3535698a446e2755bfc360676bdb161841a1f454cdef6e7556c6d06a95c89d","tests/test_size.rs":"5fae772bab66809d6708232f35cfb4a287882486763b0f763feec2ad79fbb68b","tests/test_stmt.rs":"17e4355843ee2982b51faba2721a18966f8c2b9422e16b052a123b8ee8b80752","tests/test_token_trees.rs":"43e56a701817e3c3bfd0cae54a457dd7a38ccb3ca19da41e2b995fdf20e6ed18","tests/test_ty.rs":"5b7c0bfc4963d41920dd0b39fdea419e34f00409ba86ad4211d6c3c7e8bbe1c0","tests/test_visibility.rs":"3f958e2b3b5908005e756a80eea326a91eac97cc4ab60599bebde8d4b942d65c","tests/zzz_stable.rs":"2a862e59cb446235ed99aec0e6ada8e16d3ecc30229b29d825b7c0bbc2602989"},"package":"963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"}
+\ No newline at end of file
+diff --git a/third_party/rust/syn/Cargo.toml b/third_party/rust/syn/Cargo.toml
+--- a/third_party/rust/syn/Cargo.toml
++++ b/third_party/rust/syn/Cargo.toml
+@@ -8,79 +8,90 @@
+ # 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]
+ edition = "2018"
+ name = "syn"
+-version = "1.0.5"
++version = "1.0.40"
+ authors = ["David Tolnay <dtolnay@gmail.com>"]
+ include = ["/benches/**", "/build.rs", "/Cargo.toml", "/LICENSE-APACHE", "/LICENSE-MIT", "/README.md", "/src/**", "/tests/**"]
+ description = "Parser for Rust source code"
+ documentation = "https://docs.rs/syn"
+ readme = "README.md"
+ categories = ["development-tools::procedural-macro-helpers"]
+ license = "MIT OR Apache-2.0"
+ repository = "https://github.com/dtolnay/syn"
+ [package.metadata.docs.rs]
+ all-features = true
++targets = ["x86_64-unknown-linux-gnu"]
+ 
+ [package.metadata.playground]
+-all-features = true
+-
+-[lib]
+-name = "syn"
++features = ["full", "visit", "visit-mut", "fold", "extra-traits"]
+ 
+ [[bench]]
+ name = "rust"
+ harness = false
+ required-features = ["full", "parsing"]
+-edition = "2018"
+ 
+ [[bench]]
+ name = "file"
+ required-features = ["full", "parsing"]
+-edition = "2018"
+ [dependencies.proc-macro2]
+-version = "1.0"
++version = "1.0.13"
+ default-features = false
+ 
+ [dependencies.quote]
+ version = "1.0"
+ optional = true
+ default-features = false
+ 
+ [dependencies.unicode-xid]
+ version = "0.2"
++[dev-dependencies.anyhow]
++version = "1.0"
++
++[dev-dependencies.flate2]
++version = "1.0"
++
+ [dev-dependencies.insta]
+-version = "0.9"
++version = "0.16"
+ 
+ [dev-dependencies.rayon]
+ version = "1.0"
+ 
+ [dev-dependencies.ref-cast]
+-version = "0.2"
++version = "1.0"
+ 
+ [dev-dependencies.regex]
+ version = "1.0"
+ 
++[dev-dependencies.reqwest]
++version = "0.10"
++features = ["blocking"]
++
++[dev-dependencies.syn-test-suite]
++version = "0"
++
++[dev-dependencies.tar]
++version = "0.4"
++
+ [dev-dependencies.termcolor]
+ 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"]
++test = ["syn-test-suite/all-features"]
+ visit = []
+ visit-mut = []
+-[badges.travis-ci]
+-repository = "dtolnay/syn"
+diff --git a/third_party/rust/syn/README.md b/third_party/rust/syn/README.md
+--- a/third_party/rust/syn/README.md
++++ b/third_party/rust/syn/README.md
+@@ -1,15 +1,15 @@
+ 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/1.0/syn/)
+-[![Rustc Version 1.31+](https://img.shields.io/badge/rustc-1.31+-lightgray.svg)](https://blog.rust-lang.org/2018/12/06/Rust-1.31-and-rust-2018.html)
++[<img alt="github" src="https://img.shields.io/badge/github-dtolnay/syn-8da0cb?style=for-the-badge&labelColor=555555&logo=github" height="20">](https://github.com/dtolnay/syn)
++[<img alt="crates.io" src="https://img.shields.io/crates/v/syn.svg?style=for-the-badge&color=fc8d62&logo=rust" height="20">](https://crates.io/crates/syn)
++[<img alt="docs.rs" src="https://img.shields.io/badge/docs.rs-syn-66c2a5?style=for-the-badge&labelColor=555555&logoColor=white&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDUxMiA1MTIiPjxwYXRoIGZpbGw9IiNmNWY1ZjUiIGQ9Ik00ODguNiAyNTAuMkwzOTIgMjE0VjEwNS41YzAtMTUtOS4zLTI4LjQtMjMuNC0zMy43bC0xMDAtMzcuNWMtOC4xLTMuMS0xNy4xLTMuMS0yNS4zIDBsLTEwMCAzNy41Yy0xNC4xIDUuMy0yMy40IDE4LjctMjMuNCAzMy43VjIxNGwtOTYuNiAzNi4yQzkuMyAyNTUuNSAwIDI2OC45IDAgMjgzLjlWMzk0YzAgMTMuNiA3LjcgMjYuMSAxOS45IDMyLjJsMTAwIDUwYzEwLjEgNS4xIDIyLjEgNS4xIDMyLjIgMGwxMDMuOS01MiAxMDMuOSA1MmMxMC4xIDUuMSAyMi4xIDUuMSAzMi4yIDBsMTAwLTUwYzEyLjItNi4xIDE5LjktMTguNiAxOS45LTMyLjJWMjgzLjljMC0xNS05LjMtMjguNC0yMy40LTMzLjd6TTM1OCAyMTQuOGwtODUgMzEuOXYtNjguMmw4NS0zN3Y3My4zek0xNTQgMTA0LjFsMTAyLTM4LjIgMTAyIDM4LjJ2LjZsLTEwMiA0MS40LTEwMi00MS40di0uNnptODQgMjkxLjFsLTg1IDQyLjV2LTc5LjFsODUtMzguOHY3NS40em0wLTExMmwtMTAyIDQxLjQtMTAyLTQxLjR2LS42bDEwMi0zOC4yIDEwMiAzOC4ydi42em0yNDAgMTEybC04NSA0Mi41di03OS4xbDg1LTM4Ljh2NzUuNHptMC0xMTJsLTEwMiA0MS40LTEwMi00MS40di0uNmwxMDItMzguMiAxMDIgMzguMnYuNnoiPjwvcGF0aD48L3N2Zz4K" height="20">](https://docs.rs/syn)
++[<img alt="build status" src="https://img.shields.io/github/workflow/status/dtolnay/syn/CI/master?style=for-the-badge" height="20">](https://github.com/dtolnay/syn/actions?query=branch%3Amaster)
+ 
+ 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 use in Rust procedural macros, but
+ contains some APIs that may be useful more generally.
+ 
+ - **Data structures** — Syn provides a complete syntax tree that can represent
+@@ -41,20 +41,16 @@ contains some APIs that may be useful mo
+ 
+ [`syn::File`]: https://docs.rs/syn/1.0/syn/struct.File.html
+ [`syn::Item`]: https://docs.rs/syn/1.0/syn/enum.Item.html
+ [`syn::Expr`]: https://docs.rs/syn/1.0/syn/enum.Expr.html
+ [`syn::Type`]: https://docs.rs/syn/1.0/syn/enum.Type.html
+ [`syn::DeriveInput`]: https://docs.rs/syn/1.0/syn/struct.DeriveInput.html
+ [parser functions]: https://docs.rs/syn/1.0/syn/parse/index.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 rustc 1.31 and up.*
+ 
+ [*Release notes*](https://github.com/dtolnay/syn/releases)
+ 
+ <br>
+ 
+ ## Resources
+ 
+@@ -83,18 +79,16 @@ tokens back to the compiler to compile i
+ syn = "1.0"
+ quote = "1.0"
+ 
+ [lib]
+ proc-macro = true
+ ```
+ 
+ ```rust
+-extern crate proc_macro;
+-
+ use proc_macro::TokenStream;
+ use quote::quote;
+ use syn::{parse_macro_input, DeriveInput};
+ 
+ #[proc_macro_derive(MyMacro)]
+ pub fn my_macro(input: TokenStream) -> TokenStream {
+     // Parse the input tokens into a syntax tree
+     let input = parse_macro_input!(input as DeriveInput);
+@@ -266,17 +260,17 @@ incompatible ecosystems for proc macros 
+ 
+ In general all of your code should be written against proc-macro2 rather than
+ proc-macro. The one exception is in the signatures of procedural macro entry
+ points, which are required by the language to use `proc_macro::TokenStream`.
+ 
+ The proc-macro2 crate will automatically detect and use the compiler's data
+ structures when a procedural macro is active.
+ 
+-[proc-macro2]: https://docs.rs/proc-macro2/1.0.0/proc_macro2/
++[proc-macro2]: https://docs.rs/proc-macro2/1.0/proc_macro2/
+ 
+ <br>
+ 
+ #### License
+ 
+ <sup>
+ Licensed under either of <a href="LICENSE-APACHE">Apache License, Version
+ 2.0</a> or <a href="LICENSE-MIT">MIT license</a> at your option.
+diff --git a/third_party/rust/syn/benches/file.rs b/third_party/rust/syn/benches/file.rs
+--- a/third_party/rust/syn/benches/file.rs
++++ b/third_party/rust/syn/benches/file.rs
+@@ -1,14 +1,21 @@
+ // $ cargo bench --features full --bench file
+ 
+ #![feature(rustc_private, test)]
++#![recursion_limit = "1024"]
+ 
+ extern crate test;
+ 
++#[macro_use]
++#[path = "../tests/macros/mod.rs"]
++mod macros;
++
++#[path = "../tests/common/mod.rs"]
++mod common;
+ #[path = "../tests/repo/mod.rs"]
+ pub mod repo;
+ 
+ use proc_macro2::TokenStream;
+ use std::fs;
+ use std::str::FromStr;
+ use test::Bencher;
+ 
+diff --git a/third_party/rust/syn/benches/rust.rs b/third_party/rust/syn/benches/rust.rs
+--- a/third_party/rust/syn/benches/rust.rs
++++ b/third_party/rust/syn/benches/rust.rs
+@@ -1,15 +1,22 @@
+ // $ cargo bench --features full --bench rust
+ //
+ // Syn only, useful for profiling:
+ // $ RUSTFLAGS='--cfg syn_only' cargo build --release --features full --bench rust
+ 
+ #![cfg_attr(not(syn_only), feature(rustc_private))]
++#![recursion_limit = "1024"]
+ 
++#[macro_use]
++#[path = "../tests/macros/mod.rs"]
++mod macros;
++
++#[path = "../tests/common/mod.rs"]
++mod common;
+ #[path = "../tests/repo/mod.rs"]
+ mod repo;
+ 
+ use std::fs;
+ use std::time::{Duration, Instant};
+ 
+ #[cfg(not(syn_only))]
+ mod tokenstream_parse {
+@@ -23,41 +30,45 @@ mod tokenstream_parse {
+ 
+ mod syn_parse {
+     pub fn bench(content: &str) -> Result<(), ()> {
+         syn::parse_file(content).map(drop).map_err(drop)
+     }
+ }
+ 
+ #[cfg(not(syn_only))]
+-mod libsyntax_parse {
++mod librustc_parse {
+     extern crate rustc_data_structures;
+-    extern crate syntax;
+-    extern crate syntax_pos;
++    extern crate rustc_errors;
++    extern crate rustc_parse;
++    extern crate rustc_session;
++    extern crate rustc_span;
+ 
+     use rustc_data_structures::sync::Lrc;
+-    use syntax::edition::Edition;
+-    use syntax::errors::{emitter::Emitter, DiagnosticBuilder, Handler};
+-    use syntax::parse::ParseSess;
+-    use syntax::source_map::{FilePathMapping, SourceMap};
+-    use syntax_pos::FileName;
++    use rustc_errors::{emitter::Emitter, Diagnostic, Handler};
++    use rustc_session::parse::ParseSess;
++    use rustc_span::source_map::{FilePathMapping, SourceMap};
++    use rustc_span::{edition::Edition, FileName};
+ 
+     pub fn bench(content: &str) -> Result<(), ()> {
+         struct SilentEmitter;
+ 
+         impl Emitter for SilentEmitter {
+-            fn emit_diagnostic(&mut self, _db: &DiagnosticBuilder) {}
++            fn emit_diagnostic(&mut self, _diag: &Diagnostic) {}
++            fn source_map(&self) -> Option<&Lrc<SourceMap>> {
++                None
++            }
+         }
+ 
+-        syntax::with_globals(Edition::Edition2018, || {
++        rustc_span::with_session_globals(Edition::Edition2018, || {
+             let cm = Lrc::new(SourceMap::new(FilePathMapping::empty()));
+             let emitter = Box::new(SilentEmitter);
+             let handler = Handler::with_emitter(false, None, emitter);
+             let sess = ParseSess::with_span_handler(handler, cm);
+-            if let Err(mut diagnostic) = syntax::parse::parse_crate_from_source_str(
++            if let Err(mut diagnostic) = rustc_parse::parse_crate_from_source_str(
+                 FileName::Custom("bench".to_owned()),
+                 content.to_owned(),
+                 &sess,
+             ) {
+                 diagnostic.cancel();
+                 return Err(());
+             };
+             Ok(())
+@@ -99,21 +110,21 @@ fn exec(mut codepath: impl FnMut(&str) -
+     assert_eq!(success, total);
+     begin.elapsed()
+ }
+ 
+ fn main() {
+     repo::clone_rust();
+ 
+     macro_rules! testcases {
+-        ($($(#[$cfg:meta])* $name:path,)*) => {
++        ($($(#[$cfg:meta])* $name:ident,)*) => {
+             vec![
+                 $(
+                     $(#[$cfg])*
+-                    (stringify!($name), $name as fn(&str) -> Result<(), ()>),
++                    (stringify!($name), $name::bench as fn(&str) -> Result<(), ()>),
+                 )*
+             ]
+         };
+     }
+ 
+     #[cfg(not(syn_only))]
+     {
+         let mut lines = 0;
+@@ -123,22 +134,22 @@ fn main() {
+             files += 1;
+             Ok(())
+         });
+         eprintln!("\n{} lines in {} files", lines, files);
+     }
+ 
+     for (name, f) in testcases!(
+         #[cfg(not(syn_only))]
+-        read_from_disk::bench,
++        read_from_disk,
+         #[cfg(not(syn_only))]
+-        tokenstream_parse::bench,
+-        syn_parse::bench,
++        tokenstream_parse,
++        syn_parse,
+         #[cfg(not(syn_only))]
+-        libsyntax_parse::bench,
++        librustc_parse,
+     ) {
+         eprint!("{:20}", format!("{}:", name));
+         let elapsed = exec(f);
+         eprintln!(
+             "elapsed={}.{:03}s",
+             elapsed.as_secs(),
+             elapsed.subsec_millis(),
+         );
+diff --git a/third_party/rust/syn/build.rs b/third_party/rust/syn/build.rs
+--- a/third_party/rust/syn/build.rs
++++ b/third_party/rust/syn/build.rs
+@@ -1,11 +1,11 @@
+ use std::env;
+ use std::process::Command;
+-use std::str::{self, FromStr};
++use std::str;
+ 
+ // The rustc-cfg strings below are *not* public API. Please let us know by
+ // opening a GitHub issue if your build environment requires some way to enable
+ // these cfgs other than by executing our build script.
+ fn main() {
+     let compiler = match rustc_version() {
+         Some(compiler) => compiler,
+         None => return,
+@@ -21,43 +21,19 @@ fn main() {
+ }
+ 
+ struct Compiler {
+     minor: u32,
+     nightly: bool,
+ }
+ 
+ fn rustc_version() -> Option<Compiler> {
+-    let rustc = match env::var_os("RUSTC") {
+-        Some(rustc) => rustc,
+-        None => return None,
+-    };
+-
+-    let output = match Command::new(rustc).arg("--version").output() {
+-        Ok(output) => output,
+-        Err(_) => return None,
+-    };
+-
+-    let version = match str::from_utf8(&output.stdout) {
+-        Ok(version) => version,
+-        Err(_) => return None,
+-    };
+-
++    let rustc = env::var_os("RUSTC")?;
++    let output = Command::new(rustc).arg("--version").output().ok()?;
++    let version = str::from_utf8(&output.stdout).ok()?;
+     let mut pieces = version.split('.');
+     if pieces.next() != Some("rustc 1") {
+         return None;
+     }
+-
+-    let next = match pieces.next() {
+-        Some(next) => next,
+-        None => return None,
+-    };
+-
+-    let minor = match u32::from_str(next) {
+-        Ok(minor) => minor,
+-        Err(_) => return None,
+-    };
+-
+-    Some(Compiler {
+-        minor: minor,
+-        nightly: version.contains("nightly"),
+-    })
++    let minor = pieces.next()?.parse().ok()?;
++    let nightly = version.contains("nightly");
++    Some(Compiler { minor, nightly })
+ }
+diff --git a/third_party/rust/syn/src/attr.rs b/third_party/rust/syn/src/attr.rs
+--- a/third_party/rust/syn/src/attr.rs
++++ b/third_party/rust/syn/src/attr.rs
+@@ -4,25 +4,21 @@ use crate::punctuated::Punctuated;
+ use std::iter;
+ 
+ use proc_macro2::TokenStream;
+ 
+ #[cfg(feature = "parsing")]
+ use crate::parse::{Parse, ParseBuffer, ParseStream, Parser, Result};
+ #[cfg(feature = "parsing")]
+ use crate::punctuated::Pair;
+-#[cfg(feature = "extra-traits")]
+-use crate::tt::TokenStreamHelper;
+-#[cfg(feature = "extra-traits")]
+-use std::hash::{Hash, Hasher};
+ 
+ ast_struct! {
+     /// An attribute like `#[repr(transparent)]`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
++    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
+     /// feature.*
+     ///
+     /// <br>
+     ///
+     /// # Syntax
+     ///
+     /// Rust has six types of attributes.
+     ///
+@@ -106,58 +102,69 @@ ast_struct! {
+     /// If the attribute you are parsing is expected to conform to the
+     /// conventional structured form of attribute, use [`parse_meta()`] to
+     /// obtain that structured representation. If the attribute follows some
+     /// other grammar of its own, use [`parse_args()`] to parse that into the
+     /// expected data structure.
+     ///
+     /// [`parse_meta()`]: Attribute::parse_meta
+     /// [`parse_args()`]: Attribute::parse_args
+-    pub struct Attribute #manual_extra_traits {
++    ///
++    /// <p><br></p>
++    ///
++    /// # Doc comments
++    ///
++    /// The compiler transforms doc comments, such as `/// comment` and `/*!
++    /// comment */`, into attributes before macros are expanded. Each comment is
++    /// expanded into an attribute of the form `#[doc = r"comment"]`.
++    ///
++    /// As an example, the following `mod` items are expanded identically:
++    ///
++    /// ```
++    /// # use syn::{ItemMod, parse_quote};
++    /// let doc: ItemMod = parse_quote! {
++    ///     /// Single line doc comments
++    ///     /// We write so many!
++    ///     /**
++    ///      * Multi-line comments...
++    ///      * May span many lines
++    ///      */
++    ///     mod example {
++    ///         //! Of course, they can be inner too
++    ///         /*! And fit in a single line */
++    ///     }
++    /// };
++    /// let attr: ItemMod = parse_quote! {
++    ///     #[doc = r" Single line doc comments"]
++    ///     #[doc = r" We write so many!"]
++    ///     #[doc = r"
++    ///      * Multi-line comments...
++    ///      * May span many lines
++    ///      "]
++    ///     mod example {
++    ///         #![doc = r" Of course, they can be inner too"]
++    ///         #![doc = r" And fit in a single line "]
++    ///     }
++    /// };
++    /// assert_eq!(doc, attr);
++    /// ```
++    pub struct Attribute {
+         pub pound_token: Token![#],
+         pub style: AttrStyle,
+         pub bracket_token: token::Bracket,
+         pub path: Path,
+         pub tokens: TokenStream,
+     }
+ }
+ 
+-#[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.tokens) == TokenStreamHelper(&other.tokens)
+-    }
+-}
+-
+-#[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.tokens).hash(state);
+-    }
+-}
+-
+ impl Attribute {
+     /// Parses the content of the attribute, consisting of the path and tokens,
+     /// as a [`Meta`] if possible.
+     ///
+-    /// *This function is available if Syn is built with the `"parsing"`
++    /// *This function is available only if Syn is built with the `"parsing"`
+     /// feature.*
+     #[cfg(feature = "parsing")]
+     pub fn parse_meta(&self) -> Result<Meta> {
+         fn clone_ident_segment(segment: &PathSegment) -> PathSegment {
+             PathSegment {
+                 ident: segment.ident.clone(),
+                 arguments: PathArguments::None,
+             }
+@@ -194,91 +201,95 @@ impl Attribute {
+     ///   parser; and
+     /// - the error message has a more useful span when `tokens` is empty.
+     ///
+     /// ```text
+     /// #[my_attr(value < 5)]
+     ///           ^^^^^^^^^ what gets parsed
+     /// ```
+     ///
+-    /// *This function is available if Syn is built with the `"parsing"`
++    /// *This function is available only if Syn is built with the `"parsing"`
+     /// feature.*
+     #[cfg(feature = "parsing")]
+     pub fn parse_args<T: Parse>(&self) -> Result<T> {
+         self.parse_args_with(T::parse)
+     }
+ 
+     /// Parse the arguments to the attribute using the given parser.
+     ///
+-    /// *This function is available if Syn is built with the `"parsing"`
++    /// *This function is available only if Syn is built with the `"parsing"`
+     /// feature.*
+     #[cfg(feature = "parsing")]
+     pub fn parse_args_with<F: Parser>(&self, parser: F) -> Result<F::Output> {
+         let parser = |input: ParseStream| {
+             let args = enter_args(self, input)?;
+             parse::parse_stream(parser, &args)
+         };
+         parser.parse2(self.tokens.clone())
+     }
+ 
+     /// Parses zero or more outer attributes from the stream.
+     ///
+-    /// *This function is available if Syn is built with the `"parsing"`
++    /// *This function is available only if Syn is built with the `"parsing"`
+     /// feature.*
+     #[cfg(feature = "parsing")]
+     pub fn parse_outer(input: ParseStream) -> Result<Vec<Self>> {
+         let mut attrs = Vec::new();
+         while input.peek(Token![#]) {
+             attrs.push(input.call(parsing::single_parse_outer)?);
+         }
+         Ok(attrs)
+     }
+ 
+     /// Parses zero or more inner attributes from the stream.
+     ///
+-    /// *This function is available if Syn is built with the `"parsing"`
++    /// *This function is available only if Syn is built with the `"parsing"`
+     /// feature.*
+     #[cfg(feature = "parsing")]
+     pub fn parse_inner(input: ParseStream) -> Result<Vec<Self>> {
+         let mut attrs = Vec::new();
+         while input.peek(Token![#]) && input.peek2(Token![!]) {
+             attrs.push(input.call(parsing::single_parse_inner)?);
+         }
+         Ok(attrs)
+     }
+ }
+ 
+ #[cfg(feature = "parsing")]
+-fn error_expected_args(attr: &Attribute) -> Error {
++fn expected_parentheses(attr: &Attribute) -> String {
+     let style = match attr.style {
+         AttrStyle::Outer => "#",
+         AttrStyle::Inner(_) => "#!",
+     };
+ 
+     let mut path = String::new();
+     for segment in &attr.path.segments {
+         if !path.is_empty() || attr.path.leading_colon.is_some() {
+             path += "::";
+         }
+         path += &segment.ident.to_string();
+     }
+ 
+-    let msg = format!("expected attribute arguments: {}[{}(...)]", style, path);
+-
+-    #[cfg(feature = "printing")]
+-    return Error::new_spanned(attr, msg);
+-
+-    #[cfg(not(feature = "printing"))]
+-    return Error::new(attr.bracket_token.span, msg);
++    format!("{}[{}(...)]", style, path)
+ }
+ 
+ #[cfg(feature = "parsing")]
+ fn enter_args<'a>(attr: &Attribute, input: ParseStream<'a>) -> Result<ParseBuffer<'a>> {
+     if input.is_empty() {
+-        return Err(error_expected_args(attr));
++        let expected = expected_parentheses(attr);
++        let msg = format!("expected attribute arguments in parentheses: {}", expected);
++        return Err(crate::error::new2(
++            attr.pound_token.span,
++            attr.bracket_token.span,
++            msg,
++        ));
++    } else if input.peek(Token![=]) {
++        let expected = expected_parentheses(attr);
++        let msg = format!("expected parentheses: {}", expected);
++        return Err(input.error(msg));
+     };
+ 
+     let content;
+     if input.peek(token::Paren) {
+         parenthesized!(content in input);
+     } else if input.peek(token::Bracket) {
+         bracketed!(content in input);
+     } else if input.peek(token::Brace) {
+@@ -293,41 +304,40 @@ fn enter_args<'a>(attr: &Attribute, inpu
+         Err(input.error("unexpected token in attribute arguments"))
+     }
+ }
+ 
+ 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"`
++    /// *This type is available only 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"`
++    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
+     /// feature.*
+     ///
+     /// ## Path
+     ///
+     /// A meta path is like the `test` in `#[test]`.
+     ///
+     /// ## List
+     ///
+@@ -355,29 +365,29 @@ ast_enum_of_structs! {
+         /// A name-value pair within an attribute, like `feature = "nightly"`.
+         NameValue(MetaNameValue),
+     }
+ }
+ 
+ ast_struct! {
+     /// A structured list within an attribute, like `derive(Copy, Clone)`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct MetaList {
+         pub path: Path,
+         pub paren_token: token::Paren,
+         pub nested: Punctuated<NestedMeta, Token![,]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A name-value pair within an attribute, like `feature = "nightly"`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct MetaNameValue {
+         pub path: Path,
+         pub eq_token: Token![=],
+         pub lit: Lit,
+     }
+ }
+ 
+@@ -393,17 +403,17 @@ impl Meta {
+             Meta::NameValue(meta) => &meta.path,
+         }
+     }
+ }
+ 
+ ast_enum_of_structs! {
+     /// Element of a compile-time attribute list.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
++    /// *This type is available only 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::Path`.
+         Meta(Meta),
+ 
+         /// A Rust literal, like the `"new_name"` in `#[rename("new_name")]`.
+         Lit(Lit),
+@@ -424,18 +434,18 @@ ast_enum_of_structs! {
+ ///     /* ... */
+ /// }
+ /// ```
+ ///
+ /// The implementation of this macro would want to parse its attribute arguments
+ /// as type `AttributeArgs`.
+ ///
+ /// ```
+-/// extern crate proc_macro;
+-///
++/// # extern crate proc_macro;
++/// #
+ /// use proc_macro::TokenStream;
+ /// use syn::{parse_macro_input, AttributeArgs, ItemFn};
+ ///
+ /// # const IGNORE: &str = stringify! {
+ /// #[proc_macro_attribute]
+ /// # };
+ /// pub fn my_attribute(args: TokenStream, input: TokenStream) -> TokenStream {
+ ///     let args = parse_macro_input!(args as AttributeArgs);
+@@ -459,27 +469,27 @@ 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,
++                AttrStyle::Inner(_) => 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,
++                AttrStyle::Outer => false,
+             }
+         }
+         self.into_iter().filter(is_inner)
+     }
+ }
+ 
+ #[cfg(feature = "parsing")]
+ pub mod parsing {
+diff --git a/third_party/rust/syn/src/buffer.rs b/third_party/rust/syn/src/buffer.rs
+--- a/third_party/rust/syn/src/buffer.rs
++++ b/third_party/rust/syn/src/buffer.rs
+@@ -1,12 +1,12 @@
+ //! A stably addressed token buffer supporting efficient traversal based on a
+ //! cheaply copyable cursor.
+ //!
+-//! *This module is available if Syn is built with the `"parsing"` feature.*
++//! *This module is available only if Syn is built with the `"parsing"` feature.*
+ 
+ // This module is heavily commented as it contains most of the 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(all(
+     not(all(target_arch = "wasm32", any(target_os = "unknown", target_os = "wasi"))),
+     feature = "proc-macro"
+@@ -31,17 +31,17 @@ enum Entry {
+     // 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.
+ ///
+-/// *This type is available if Syn is built with the `"parsing"` feature.*
++/// *This type is available only 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 {
+@@ -93,17 +93,17 @@ impl TokenBuffer {
+         }
+ 
+         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
++    /// *This method is available only if Syn is built with both the `"parsing"` and
+     /// `"proc-macro"` features.*
+     #[cfg(all(
+         not(all(target_arch = "wasm32", any(target_os = "unknown", target_os = "wasi"))),
+         feature = "proc-macro"
+     ))]
+     pub fn new(stream: pm::TokenStream) -> TokenBuffer {
+         Self::new2(stream.into())
+     }
+@@ -128,18 +128,17 @@ impl TokenBuffer {
+ /// 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.
+ ///
+-/// *This type is available if Syn is built with the `"parsing"` feature.*
+-#[derive(Copy, Clone, Eq, PartialEq)]
++/// *This type is available only if Syn is built with the `"parsing"` feature.*
+ 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,
+     // Cursor is covariant in 'a. This field ensures that our pointers are still
+     // valid.
+@@ -196,37 +195,38 @@ impl<'a> Cursor<'a> {
+ 
+     /// 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
++    /// While 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(group, buf) = self.entry() {
++        while let Entry::Group(group, buf) = self.entry() {
+             if group.delimiter() == Delimiter::None {
+                 // 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);
+                 }
++            } else {
++                break;
+             }
+         }
+     }
+ 
+     /// 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>)> {
+@@ -337,16 +337,54 @@ impl<'a> Cursor<'a> {
+         match self.entry() {
+             Entry::Group(group, _) => group.span(),
+             Entry::Literal(l) => l.span(),
+             Entry::Ident(t) => t.span(),
+             Entry::Punct(o) => o.span(),
+             Entry::End(..) => Span::call_site(),
+         }
+     }
++
++    /// Skip over the next token without cloning it. Returns `None` if this
++    /// cursor points to eof.
++    ///
++    /// This method treats `'lifetimes` as a single token.
++    pub(crate) fn skip(self) -> Option<Cursor<'a>> {
++        match self.entry() {
++            Entry::End(..) => None,
++
++            // Treat lifetimes as a single tt for the purposes of 'skip'.
++            Entry::Punct(op) if op.as_char() == '\'' && op.spacing() == Spacing::Joint => {
++                let next = unsafe { self.bump() };
++                match next.entry() {
++                    Entry::Ident(_) => Some(unsafe { next.bump() }),
++                    _ => Some(next),
++                }
++            }
++            _ => Some(unsafe { self.bump() }),
++        }
++    }
++}
++
++impl<'a> Copy for Cursor<'a> {}
++
++impl<'a> Clone for Cursor<'a> {
++    fn clone(&self) -> Self {
++        *self
++    }
++}
++
++impl<'a> Eq for Cursor<'a> {}
++
++impl<'a> PartialEq for Cursor<'a> {
++    fn eq(&self, other: &Self) -> bool {
++        let Cursor { ptr, scope, marker } = self;
++        let _ = marker;
++        *ptr == other.ptr && *scope == other.scope
++    }
+ }
+ 
+ pub(crate) fn same_scope(a: Cursor, b: Cursor) -> bool {
+     a.scope == b.scope
+ }
+ 
+ pub(crate) fn open_span_of_group(cursor: Cursor) -> Span {
+     match cursor.entry() {
+diff --git a/third_party/rust/syn/src/custom_keyword.rs b/third_party/rust/syn/src/custom_keyword.rs
+--- a/third_party/rust/syn/src/custom_keyword.rs
++++ b/third_party/rust/syn/src/custom_keyword.rs
+@@ -81,46 +81,46 @@
+ ///                 value: input.parse()?,
+ ///             })
+ ///         } else {
+ ///             Err(lookahead.error())
+ ///         }
+ ///     }
+ /// }
+ /// ```
+-#[macro_export(local_inner_macros)]
++#[macro_export]
+ macro_rules! custom_keyword {
+     ($ident:ident) => {
+         #[allow(non_camel_case_types)]
+         pub struct $ident {
+             pub span: $crate::export::Span,
+         }
+ 
+         #[doc(hidden)]
+-        #[allow(non_snake_case)]
++        #[allow(dead_code, non_snake_case)]
+         pub fn $ident<__S: $crate::export::IntoSpans<[$crate::export::Span; 1]>>(
+             span: __S,
+         ) -> $ident {
+             $ident {
+                 span: $crate::export::IntoSpans::into_spans(span)[0],
+             }
+         }
+ 
+         impl $crate::export::Default for $ident {
+             fn default() -> Self {
+                 $ident {
+                     span: $crate::export::Span::call_site(),
+                 }
+             }
+         }
+ 
+-        impl_parse_for_custom_keyword!($ident);
+-        impl_to_tokens_for_custom_keyword!($ident);
+-        impl_clone_for_custom_keyword!($ident);
+-        impl_extra_traits_for_custom_keyword!($ident);
++        $crate::impl_parse_for_custom_keyword!($ident);
++        $crate::impl_to_tokens_for_custom_keyword!($ident);
++        $crate::impl_clone_for_custom_keyword!($ident);
++        $crate::impl_extra_traits_for_custom_keyword!($ident);
+     };
+ }
+ 
+ // Not public API.
+ #[cfg(feature = "parsing")]
+ #[doc(hidden)]
+ #[macro_export]
+ macro_rules! impl_parse_for_custom_keyword {
+diff --git a/third_party/rust/syn/src/custom_punctuation.rs b/third_party/rust/syn/src/custom_punctuation.rs
+--- a/third_party/rust/syn/src/custom_punctuation.rs
++++ b/third_party/rust/syn/src/custom_punctuation.rs
+@@ -69,67 +69,67 @@
+ ///     Ok(tokens)
+ /// }
+ ///
+ /// fn main() {
+ ///     let input = r#" a::b </> c::d::e "#;
+ ///     let _: PathSegments = syn::parse_str(input).unwrap();
+ /// }
+ /// ```
+-#[macro_export(local_inner_macros)]
++#[macro_export]
+ macro_rules! custom_punctuation {
+     ($ident:ident, $($tt:tt)+) => {
+         pub struct $ident {
+-            pub spans: custom_punctuation_repr!($($tt)+),
++            pub spans: $crate::custom_punctuation_repr!($($tt)+),
+         }
+ 
+         #[doc(hidden)]
+-        #[allow(non_snake_case)]
+-        pub fn $ident<__S: $crate::export::IntoSpans<custom_punctuation_repr!($($tt)+)>>(
++        #[allow(dead_code, non_snake_case)]
++        pub fn $ident<__S: $crate::export::IntoSpans<$crate::custom_punctuation_repr!($($tt)+)>>(
+             spans: __S,
+         ) -> $ident {
+-            let _validate_len = 0 $(+ custom_punctuation_len!(strict, $tt))*;
++            let _validate_len = 0 $(+ $crate::custom_punctuation_len!(strict, $tt))*;
+             $ident {
+                 spans: $crate::export::IntoSpans::into_spans(spans)
+             }
+         }
+ 
+         impl $crate::export::Default for $ident {
+             fn default() -> Self {
+                 $ident($crate::export::Span::call_site())
+             }
+         }
+ 
+-        impl_parse_for_custom_punctuation!($ident, $($tt)+);
+-        impl_to_tokens_for_custom_punctuation!($ident, $($tt)+);
+-        impl_clone_for_custom_punctuation!($ident, $($tt)+);
+-        impl_extra_traits_for_custom_punctuation!($ident, $($tt)+);
++        $crate::impl_parse_for_custom_punctuation!($ident, $($tt)+);
++        $crate::impl_to_tokens_for_custom_punctuation!($ident, $($tt)+);
++        $crate::impl_clone_for_custom_punctuation!($ident, $($tt)+);
++        $crate::impl_extra_traits_for_custom_punctuation!($ident, $($tt)+);
+     };
+ }
+ 
+ // Not public API.
+ #[cfg(feature = "parsing")]
+ #[doc(hidden)]
+-#[macro_export(local_inner_macros)]
++#[macro_export]
+ macro_rules! impl_parse_for_custom_punctuation {
+     ($ident:ident, $($tt:tt)+) => {
+         impl $crate::token::CustomToken for $ident {
+             fn peek(cursor: $crate::buffer::Cursor) -> bool {
+-                $crate::token::parsing::peek_punct(cursor, stringify_punct!($($tt)+))
++                $crate::token::parsing::peek_punct(cursor, $crate::stringify_punct!($($tt)+))
+             }
+ 
+             fn display() -> &'static $crate::export::str {
+-                custom_punctuation_concat!("`", stringify_punct!($($tt)+), "`")
++                concat!("`", $crate::stringify_punct!($($tt)+), "`")
+             }
+         }
+ 
+         impl $crate::parse::Parse for $ident {
+             fn parse(input: $crate::parse::ParseStream) -> $crate::parse::Result<$ident> {
+-                let spans: custom_punctuation_repr!($($tt)+) =
+-                    $crate::token::parsing::punct(input, stringify_punct!($($tt)+))?;
++                let spans: $crate::custom_punctuation_repr!($($tt)+) =
++                    $crate::token::parsing::punct(input, $crate::stringify_punct!($($tt)+))?;
+                 Ok($ident(spans))
+             }
+         }
+     };
+ }
+ 
+ // Not public API.
+ #[cfg(not(feature = "parsing"))]
+@@ -137,22 +137,22 @@ macro_rules! impl_parse_for_custom_punct
+ #[macro_export]
+ macro_rules! impl_parse_for_custom_punctuation {
+     ($ident:ident, $($tt:tt)+) => {};
+ }
+ 
+ // Not public API.
+ #[cfg(feature = "printing")]
+ #[doc(hidden)]
+-#[macro_export(local_inner_macros)]
++#[macro_export]
+ macro_rules! impl_to_tokens_for_custom_punctuation {
+     ($ident:ident, $($tt:tt)+) => {
+         impl $crate::export::ToTokens for $ident {
+             fn to_tokens(&self, tokens: &mut $crate::export::TokenStream2) {
+-                $crate::token::printing::punct(stringify_punct!($($tt)+), &self.spans, tokens)
++                $crate::token::printing::punct($crate::stringify_punct!($($tt)+), &self.spans, tokens)
+             }
+         }
+     };
+ }
+ 
+ // Not public API.
+ #[cfg(not(feature = "printing"))]
+ #[doc(hidden)]
+@@ -216,26 +216,26 @@ macro_rules! impl_extra_traits_for_custo
+ #[doc(hidden)]
+ #[macro_export]
+ macro_rules! impl_extra_traits_for_custom_punctuation {
+     ($ident:ident, $($tt:tt)+) => {};
+ }
+ 
+ // Not public API.
+ #[doc(hidden)]
+-#[macro_export(local_inner_macros)]
++#[macro_export]
+ macro_rules! custom_punctuation_repr {
+     ($($tt:tt)+) => {
+-        [$crate::export::Span; 0 $(+ custom_punctuation_len!(lenient, $tt))+]
++        [$crate::export::Span; 0 $(+ $crate::custom_punctuation_len!(lenient, $tt))+]
+     };
+ }
+ 
+ // Not public API.
+ #[doc(hidden)]
+-#[macro_export(local_inner_macros)]
++#[macro_export]
+ #[rustfmt::skip]
+ macro_rules! custom_punctuation_len {
+     ($mode:ident, +)     => { 1 };
+     ($mode:ident, +=)    => { 2 };
+     ($mode:ident, &)     => { 1 };
+     ($mode:ident, &&)    => { 2 };
+     ($mode:ident, &=)    => { 2 };
+     ($mode:ident, @)     => { 1 };
+@@ -274,17 +274,17 @@ macro_rules! custom_punctuation_len {
+     ($mode:ident, <<=)   => { 3 };
+     ($mode:ident, >>)    => { 2 };
+     ($mode:ident, >>=)   => { 3 };
+     ($mode:ident, *)     => { 1 };
+     ($mode:ident, -)     => { 1 };
+     ($mode:ident, -=)    => { 2 };
+     ($mode:ident, ~)     => { 1 };
+     (lenient, $tt:tt)    => { 0 };
+-    (strict, $tt:tt)     => {{ custom_punctuation_unexpected!($tt); 0 }};
++    (strict, $tt:tt)     => {{ $crate::custom_punctuation_unexpected!($tt); 0 }};
+ }
+ 
+ // Not public API.
+ #[doc(hidden)]
+ #[macro_export]
+ macro_rules! custom_punctuation_unexpected {
+     () => {};
+ }
+@@ -292,18 +292,8 @@ macro_rules! custom_punctuation_unexpect
+ // Not public API.
+ #[doc(hidden)]
+ #[macro_export]
+ macro_rules! stringify_punct {
+     ($($tt:tt)+) => {
+         concat!($(stringify!($tt)),+)
+     };
+ }
+-
+-// Not public API.
+-// Without this, local_inner_macros breaks when looking for concat!
+-#[doc(hidden)]
+-#[macro_export]
+-macro_rules! custom_punctuation_concat {
+-    ($($tt:tt)*) => {
+-        concat!($($tt)*)
+-    };
+-}
+diff --git a/third_party/rust/syn/src/data.rs b/third_party/rust/syn/src/data.rs
+--- a/third_party/rust/syn/src/data.rs
++++ b/third_party/rust/syn/src/data.rs
+@@ -1,15 +1,15 @@
+ use super::*;
+ use crate::punctuated::Punctuated;
+ 
+ ast_struct! {
+     /// An enum variant.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
++    /// *This type is available only 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,
+ 
+@@ -19,17 +19,17 @@ ast_struct! {
+         /// 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"`
++    /// *This type is available only 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
+     //
+@@ -47,28 +47,28 @@ ast_enum_of_structs! {
+         Unit,
+     }
+ }
+ 
+ ast_struct! {
+     /// 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
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct FieldsNamed {
+         pub brace_token: token::Brace,
+         pub named: Punctuated<Field, Token![,]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// 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
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct FieldsUnnamed {
+         pub paren_token: token::Paren,
+         pub unnamed: Punctuated<Field, Token![,]>,
+     }
+ }
+ 
+ impl Fields {
+@@ -88,16 +88,34 @@ impl Fields {
+     /// struct or variant's fields uniformly.
+     pub fn iter_mut(&mut self) -> punctuated::IterMut<Field> {
+         match self {
+             Fields::Unit => crate::punctuated::empty_punctuated_iter_mut(),
+             Fields::Named(f) => f.named.iter_mut(),
+             Fields::Unnamed(f) => f.unnamed.iter_mut(),
+         }
+     }
++
++    /// Returns the number of fields.
++    pub fn len(&self) -> usize {
++        match self {
++            Fields::Unit => 0,
++            Fields::Named(f) => f.named.len(),
++            Fields::Unnamed(f) => f.unnamed.len(),
++        }
++    }
++
++    /// Returns `true` if there are zero fields.
++    pub fn is_empty(&self) -> bool {
++        match self {
++            Fields::Unit => true,
++            Fields::Named(f) => f.named.is_empty(),
++            Fields::Unnamed(f) => f.unnamed.is_empty(),
++        }
++    }
+ }
+ 
+ impl IntoIterator for Fields {
+     type Item = Field;
+     type IntoIter = punctuated::IntoIter<Field>;
+ 
+     fn into_iter(self) -> Self::IntoIter {
+         match self {
+@@ -124,17 +142,17 @@ impl<'a> IntoIterator for &'a mut Fields
+     fn into_iter(self) -> Self::IntoIter {
+         self.iter_mut()
+     }
+ }
+ 
+ ast_struct! {
+     /// A field of a struct or enum variant.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
++    /// *This type is available only 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,
+ 
+@@ -149,17 +167,17 @@ ast_struct! {
+         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"`
++    /// *This type is available only 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
+     //
+@@ -179,58 +197,61 @@ ast_enum_of_structs! {
+         /// An inherited visibility, which usually means private.
+         Inherited,
+     }
+ }
+ 
+ ast_struct! {
+     /// A public visibility level: `pub`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct VisPublic {
+         pub pub_token: Token![pub],
+     }
+ }
+ 
+ ast_struct! {
+     /// A crate-level visibility: `crate`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct VisCrate {
+         pub crate_token: Token![crate],
+     }
+ }
+ 
+ ast_struct! {
+     /// 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
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct VisRestricted {
+         pub pub_token: Token![pub],
+         pub paren_token: token::Paren,
+         pub in_token: Option<Token![in]>,
+         pub path: Box<Path>,
+     }
+ }
+ 
+ #[cfg(feature = "parsing")]
+ pub mod parsing {
+     use super::*;
+ 
+     use crate::ext::IdentExt;
++    use crate::parse::discouraged::Speculative;
+     use crate::parse::{Parse, ParseStream, Result};
+ 
+     impl Parse for Variant {
+         fn parse(input: ParseStream) -> Result<Self> {
++            let attrs = input.call(Attribute::parse_outer)?;
++            let _visibility: Visibility = input.parse()?;
+             Ok(Variant {
+-                attrs: input.call(Attribute::parse_outer)?,
++                attrs,
+                 ident: input.parse()?,
+                 fields: {
+                     if input.peek(token::Brace) {
+                         Fields::Named(input.parse()?)
+                     } else if input.peek(token::Paren) {
+                         Fields::Unnamed(input.parse()?)
+                     } else {
+                         Fields::Unit
+@@ -290,68 +311,99 @@ pub mod parsing {
+                 colon_token: None,
+                 ty: input.parse()?,
+             })
+         }
+     }
+ 
+     impl Parse for Visibility {
+         fn parse(input: ParseStream) -> Result<Self> {
++            // Recognize an empty None-delimited group, as produced by a $:vis
++            // matcher that matched no tokens.
++            if input.peek(token::Group) {
++                let ahead = input.fork();
++                let group = crate::group::parse_group(&ahead)?;
++                if group.content.is_empty() {
++                    input.advance_to(&ahead);
++                    return Ok(Visibility::Inherited);
++                }
++            }
++
+             if input.peek(Token![pub]) {
+                 Self::parse_pub(input)
+             } else if input.peek(Token![crate]) {
+                 Self::parse_crate(input)
+             } else {
+                 Ok(Visibility::Inherited)
+             }
+         }
+     }
+ 
+     impl Visibility {
+         fn parse_pub(input: ParseStream) -> Result<Self> {
+             let pub_token = input.parse::<Token![pub]>()?;
+ 
+             if input.peek(token::Paren) {
+-                // TODO: optimize using advance_to
+                 let ahead = input.fork();
+-                let mut content;
+-                parenthesized!(content in ahead);
+ 
++                let content;
++                let paren_token = parenthesized!(content in ahead);
+                 if content.peek(Token![crate])
+                     || content.peek(Token![self])
+                     || content.peek(Token![super])
+                 {
++                    let path = content.call(Ident::parse_any)?;
++
++                    // Ensure there are no additional tokens within `content`.
++                    // Without explicitly checking, we may misinterpret a tuple
++                    // field as a restricted visibility, causing a parse error.
++                    // e.g. `pub (crate::A, crate::B)` (Issue #720).
++                    if content.is_empty() {
++                        input.advance_to(&ahead);
++                        return Ok(Visibility::Restricted(VisRestricted {
++                            pub_token,
++                            paren_token,
++                            in_token: None,
++                            path: Box::new(Path::from(path)),
++                        }));
++                    }
++                } else if content.peek(Token![in]) {
++                    let in_token: Token![in] = content.parse()?;
++                    let path = content.call(Path::parse_mod_style)?;
++
++                    input.advance_to(&ahead);
+                     return Ok(Visibility::Restricted(VisRestricted {
+                         pub_token,
+-                        paren_token: parenthesized!(content in input),
+-                        in_token: None,
+-                        path: Box::new(Path::from(content.call(Ident::parse_any)?)),
+-                    }));
+-                } else if content.peek(Token![in]) {
+-                    return Ok(Visibility::Restricted(VisRestricted {
+-                        pub_token,
+-                        paren_token: parenthesized!(content in input),
+-                        in_token: Some(content.parse()?),
+-                        path: Box::new(content.call(Path::parse_mod_style)?),
++                        paren_token,
++                        in_token: Some(in_token),
++                        path: Box::new(path),
+                     }));
+                 }
+             }
+ 
+             Ok(Visibility::Public(VisPublic { pub_token }))
+         }
+ 
+         fn parse_crate(input: ParseStream) -> Result<Self> {
+             if input.peek2(Token![::]) {
+                 Ok(Visibility::Inherited)
+             } else {
+                 Ok(Visibility::Crate(VisCrate {
+                     crate_token: input.parse()?,
+                 }))
+             }
+         }
++
++        #[cfg(feature = "full")]
++        pub(crate) fn is_some(&self) -> bool {
++            match self {
++                Visibility::Inherited => false,
++                _ => true,
++            }
++        }
+     }
+ }
+ 
+ #[cfg(feature = "printing")]
+ mod printing {
+     use super::*;
+ 
+     use proc_macro2::TokenStream;
+diff --git a/third_party/rust/syn/src/derive.rs b/third_party/rust/syn/src/derive.rs
+--- a/third_party/rust/syn/src/derive.rs
++++ b/third_party/rust/syn/src/derive.rs
+@@ -1,15 +1,15 @@
+ use super::*;
+ use crate::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.*
++    /// *This type is available only 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.
+@@ -21,17 +21,17 @@ ast_struct! {
+         /// 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.*
++    /// *This type is available only 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
+     //
+     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
+@@ -48,41 +48,41 @@ ast_enum_of_structs! {
+     }
+ 
+     do_not_generate_to_tokens
+ }
+ 
+ ast_struct! {
+     /// A struct input to a `proc_macro_derive` macro.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"`
++    /// *This type is available only if Syn is built with the `"derive"`
+     /// feature.*
+     pub struct DataStruct {
+         pub struct_token: Token![struct],
+         pub fields: Fields,
+         pub semi_token: Option<Token![;]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// An enum input to a `proc_macro_derive` macro.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"`
++    /// *This type is available only if Syn is built with the `"derive"`
+     /// feature.*
+     pub struct DataEnum {
+         pub enum_token: Token![enum],
+         pub brace_token: token::Brace,
+         pub variants: Punctuated<Variant, Token![,]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// An untagged union input to a `proc_macro_derive` macro.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"`
++    /// *This type is available only if Syn is built with the `"derive"`
+     /// feature.*
+     pub struct DataUnion {
+         pub union_token: Token![union],
+         pub fields: FieldsNamed,
+     }
+ }
+ 
+ #[cfg(feature = "parsing")]
+diff --git a/third_party/rust/syn/src/discouraged.rs b/third_party/rust/syn/src/discouraged.rs
+--- a/third_party/rust/syn/src/discouraged.rs
++++ b/third_party/rust/syn/src/discouraged.rs
+@@ -11,17 +11,17 @@ pub trait Speculative {
+     /// stream to the fork to "commit" the parsing from the fork to the main
+     /// stream.
+     ///
+     /// If you can avoid doing this, you should, as it limits the ability to
+     /// generate useful errors. That said, it is often the only way to parse
+     /// syntax of the form `A* B*` for arbitrary syntax `A` and `B`. The problem
+     /// is that when the fork fails to parse an `A`, it's impossible to tell
+     /// whether that was because of a syntax error and the user meant to provide
+-    /// an `A`, or that the `A`s are finished and its time to start parsing
++    /// an `A`, or that the `A`s are finished and it's time to start parsing
+     /// `B`s. Use with care.
+     ///
+     /// Also note that if `A` is a subset of `B`, `A* B*` can be parsed by
+     /// parsing `B*` and removing the leading members of `A` from the
+     /// repetition, bypassing the need to involve the downsides associated with
+     /// speculative parsing.
+     ///
+     /// [`ParseStream::fork`]: ParseBuffer::fork
+@@ -67,17 +67,16 @@ pub trait Speculative {
+     /// # }
+     ///
+     /// impl Parse for PathSegment {
+     ///     fn parse(input: ParseStream) -> Result<Self> {
+     ///         if input.peek(Token![super])
+     ///             || input.peek(Token![self])
+     ///             || input.peek(Token![Self])
+     ///             || input.peek(Token![crate])
+-    ///             || input.peek(Token![extern])
+     ///         {
+     ///             let ident = input.call(Ident::parse_any)?;
+     ///             return Ok(PathSegment::from(ident));
+     ///         }
+     ///
+     ///         let ident = input.parse()?;
+     ///         if input.peek(Token![::]) && input.peek3(Token![<]) {
+     ///             return Ok(PathSegment {
+@@ -159,13 +158,37 @@ pub trait Speculative {
+ }
+ 
+ impl<'a> Speculative for ParseBuffer<'a> {
+     fn advance_to(&self, fork: &Self) {
+         if !crate::buffer::same_scope(self.cursor(), fork.cursor()) {
+             panic!("Fork was not derived from the advancing parse stream");
+         }
+ 
++        let (self_unexp, self_sp) = inner_unexpected(self);
++        let (fork_unexp, fork_sp) = inner_unexpected(fork);
++        if !Rc::ptr_eq(&self_unexp, &fork_unexp) {
++            match (fork_sp, self_sp) {
++                // Unexpected set on the fork, but not on `self`, copy it over.
++                (Some(span), None) => {
++                    self_unexp.set(Unexpected::Some(span));
++                }
++                // Unexpected unset. Use chain to propagate errors from fork.
++                (None, None) => {
++                    fork_unexp.set(Unexpected::Chain(self_unexp));
++
++                    // Ensure toplevel 'unexpected' tokens from the fork don't
++                    // bubble up the chain by replacing the root `unexpected`
++                    // pointer, only 'unexpected' tokens from existing group
++                    // parsers should bubble.
++                    fork.unexpected
++                        .set(Some(Rc::new(Cell::new(Unexpected::None))));
++                }
++                // Unexpected has been set on `self`. No changes needed.
++                (_, Some(_)) => {}
++            }
++        }
++
+         // See comment on `cell` in the struct definition.
+         self.cell
+             .set(unsafe { mem::transmute::<Cursor, Cursor<'static>>(fork.cursor()) })
+     }
+ }
+diff --git a/third_party/rust/syn/src/error.rs b/third_party/rust/syn/src/error.rs
+--- a/third_party/rust/syn/src/error.rs
++++ b/third_party/rust/syn/src/error.rs
+@@ -1,9 +1,8 @@
+-use std;
+ use std::fmt::{self, Debug, Display};
+ use std::iter::FromIterator;
+ use std::slice;
+ use std::vec;
+ 
+ use proc_macro2::{
+     Delimiter, Group, Ident, LexError, Literal, Punct, Spacing, Span, TokenStream, TokenTree,
+ };
+@@ -27,18 +26,18 @@ pub type Result<T> = std::result::Result
+ /// message than simply panicking the macro.
+ ///
+ /// [`compile_error!`]: https://doc.rust-lang.org/std/macro.compile_error.html
+ ///
+ /// When parsing macro input, the [`parse_macro_input!`] macro handles the
+ /// conversion to `compile_error!` automatically.
+ ///
+ /// ```
+-/// extern crate proc_macro;
+-///
++/// # extern crate proc_macro;
++/// #
+ /// use proc_macro::TokenStream;
+ /// use syn::{parse_macro_input, AttributeArgs, ItemFn};
+ ///
+ /// # const IGNORE: &str = stringify! {
+ /// #[proc_macro_attribute]
+ /// # };
+ /// pub fn my_attr(args: TokenStream, input: TokenStream) -> TokenStream {
+ ///     let args = parse_macro_input!(args as AttributeArgs);
+@@ -77,17 +76,16 @@ pub type Result<T> = std::result::Result
+ /// #     use proc_macro2::TokenStream;
+ /// #     use syn::{DeriveInput, Result};
+ /// #
+ /// #     pub fn my_derive(input: DeriveInput) -> Result<TokenStream> {
+ /// #         unimplemented!()
+ /// #     }
+ /// # }
+ /// ```
+-#[derive(Clone)]
+ pub struct Error {
+     messages: Vec<ErrorMessage>,
+ }
+ 
+ struct ErrorMessage {
+     // Span is implemented as an index into a thread-local interner to keep the
+     // size small. It is not safe to access from a different thread. We want
+     // errors to be Send and Sync to play nicely with the Failure crate, so pin
+@@ -245,16 +243,27 @@ pub fn new_at<T: Display>(scope: Span, c
+     if cursor.eof() {
+         Error::new(scope, format!("unexpected end of input, {}", message))
+     } else {
+         let span = crate::buffer::open_span_of_group(cursor);
+         Error::new(span, message)
+     }
+ }
+ 
++#[cfg(all(feature = "parsing", any(feature = "full", feature = "derive")))]
++pub fn new2<T: Display>(start: Span, end: Span, message: T) -> Error {
++    Error {
++        messages: vec![ErrorMessage {
++            start_span: ThreadBound::new(start),
++            end_span: ThreadBound::new(end),
++            message: message.to_string(),
++        }],
++    }
++}
++
+ impl Debug for Error {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+         if self.messages.len() == 1 {
+             formatter
+                 .debug_tuple("Error")
+                 .field(&self.messages[0])
+                 .finish()
+         } else {
+@@ -273,16 +282,24 @@ impl Debug for ErrorMessage {
+ }
+ 
+ impl Display for Error {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+         formatter.write_str(&self.messages[0].message)
+     }
+ }
+ 
++impl Clone for Error {
++    fn clone(&self) -> Self {
++        Error {
++            messages: self.messages.clone(),
++        }
++    }
++}
++
+ impl Clone for ErrorMessage {
+     fn clone(&self) -> Self {
+         let start = self
+             .start_span
+             .get()
+             .cloned()
+             .unwrap_or_else(Span::call_site);
+         let end = self.end_span.get().cloned().unwrap_or_else(Span::call_site);
+@@ -350,8 +367,16 @@ impl<'a> Iterator for Iter<'a> {
+     type Item = Error;
+ 
+     fn next(&mut self) -> Option<Self::Item> {
+         Some(Error {
+             messages: vec![self.messages.next()?.clone()],
+         })
+     }
+ }
++
++impl Extend<Error> for Error {
++    fn extend<T: IntoIterator<Item = Error>>(&mut self, iter: T) {
++        for err in iter {
++            self.combine(err);
++        }
++    }
++}
+diff --git a/third_party/rust/syn/src/expr.rs b/third_party/rust/syn/src/expr.rs
+--- a/third_party/rust/syn/src/expr.rs
++++ b/third_party/rust/syn/src/expr.rs
+@@ -1,23 +1,26 @@
+ use super::*;
+ use crate::punctuated::Punctuated;
+-#[cfg(feature = "extra-traits")]
+-use crate::tt::TokenStreamHelper;
++#[cfg(feature = "full")]
++use crate::reserved::Reserved;
+ use proc_macro2::{Span, TokenStream};
+-#[cfg(feature = "extra-traits")]
++#[cfg(feature = "printing")]
++use quote::IdentFragment;
++#[cfg(feature = "printing")]
++use std::fmt::{self, Display};
+ use std::hash::{Hash, Hasher};
+-#[cfg(all(feature = "parsing", feature = "full"))]
++#[cfg(feature = "parsing")]
+ use std::mem;
+ 
+ ast_enum_of_structs! {
+     /// A Rust expression.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
+-    /// feature.*
++    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
++    /// feature, but most of the variants are not available unless "full" is enabled.*
+     ///
+     /// # 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;
+@@ -78,17 +81,17 @@ ast_enum_of_structs! {
+     /// if let Expr::Tuple(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 #manual_extra_traits {
++    pub enum Expr {
+         /// A slice literal expression: `[a, b, c, d]`.
+         Array(ExprArray),
+ 
+         /// An assignment expression: `a = compute()`.
+         Assign(ExprAssign),
+ 
+         /// A compound assignment expression: `counter += 1`.
+         AssignOp(ExprAssignOp),
+@@ -223,191 +226,191 @@ ast_enum_of_structs! {
+         #[doc(hidden)]
+         __Nonexhaustive,
+     }
+ }
+ 
+ ast_struct! {
+     /// A slice literal expression: `[a, b, c, d]`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprArray #full {
+         pub attrs: Vec<Attribute>,
+         pub bracket_token: token::Bracket,
+         pub elems: Punctuated<Expr, Token![,]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// An assignment expression: `a = compute()`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprAssign #full {
+         pub attrs: Vec<Attribute>,
+         pub left: Box<Expr>,
+         pub eq_token: Token![=],
+         pub right: Box<Expr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A compound assignment expression: `counter += 1`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprAssignOp #full {
+         pub attrs: Vec<Attribute>,
+         pub left: Box<Expr>,
+         pub op: BinOp,
+         pub right: Box<Expr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// An async block: `async { ... }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprAsync #full {
+         pub attrs: Vec<Attribute>,
+         pub async_token: Token![async],
+         pub capture: Option<Token![move]>,
+         pub block: Block,
+     }
+ }
+ 
+ ast_struct! {
+     /// An await expression: `fut.await`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprAwait #full {
+         pub attrs: Vec<Attribute>,
+         pub base: Box<Expr>,
+         pub dot_token: Token![.],
+         pub await_token: token::Await,
+     }
+ }
+ 
+ ast_struct! {
+     /// A binary operation: `a + b`, `a * b`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct ExprBinary {
+         pub attrs: Vec<Attribute>,
+         pub left: Box<Expr>,
+         pub op: BinOp,
+         pub right: Box<Expr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A blocked scope: `{ ... }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprBlock #full {
+         pub attrs: Vec<Attribute>,
+         pub label: Option<Label>,
+         pub block: Block,
+     }
+ }
+ 
+ ast_struct! {
+     /// A box expression: `box f`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprBox #full {
+         pub attrs: Vec<Attribute>,
+         pub box_token: Token![box],
+         pub expr: Box<Expr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A `break`, with an optional label to break and an optional
+     /// expression.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprBreak #full {
+         pub attrs: Vec<Attribute>,
+         pub break_token: Token![break],
+         pub label: Option<Lifetime>,
+         pub expr: Option<Box<Expr>>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A function call expression: `invoke(a, b)`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct ExprCall {
+         pub attrs: Vec<Attribute>,
+         pub func: Box<Expr>,
+         pub paren_token: token::Paren,
+         pub args: Punctuated<Expr, Token![,]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A cast expression: `foo as f64`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct ExprCast {
+         pub attrs: Vec<Attribute>,
+         pub expr: Box<Expr>,
+         pub as_token: Token![as],
+         pub ty: Box<Type>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A closure expression: `|a, b| a + b`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprClosure #full {
+         pub attrs: Vec<Attribute>,
+         pub asyncness: Option<Token![async]>,
+         pub movability: Option<Token![static]>,
+         pub capture: Option<Token![move]>,
+         pub or1_token: Token![|],
+         pub inputs: Punctuated<Pat, Token![,]>,
+         pub or2_token: Token![|],
+         pub output: ReturnType,
+         pub body: Box<Expr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A `continue`, with an optional label.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprContinue #full {
+         pub attrs: Vec<Attribute>,
+         pub continue_token: Token![continue],
+         pub label: Option<Lifetime>,
+     }
+ }
+ 
+ ast_struct! {
+     /// 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.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprField {
+         pub attrs: Vec<Attribute>,
+         pub base: Box<Expr>,
+         pub dot_token: Token![.],
+         pub member: Member,
+     }
+ }
+ 
+ ast_struct! {
+     /// A for loop: `for pat in expr { ... }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprForLoop #full {
+         pub attrs: Vec<Attribute>,
+         pub label: Option<Label>,
+         pub for_token: Token![for],
+         pub pat: Pat,
+         pub in_token: Token![in],
+         pub expr: Box<Expr>,
+         pub body: Block,
+@@ -416,538 +419,312 @@ ast_struct! {
+ 
+ ast_struct! {
+     /// 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.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprGroup #full {
+         pub attrs: Vec<Attribute>,
+         pub group_token: token::Group,
+         pub expr: Box<Expr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// An `if` expression with an optional `else` block: `if expr { ... }
+     /// else { ... }`.
+     ///
+     /// The `else` branch expression may only be an `If` or `Block`
+     /// expression, not any of the other types of expression.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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>)>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A square bracketed indexing expression: `vector[2]`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct ExprIndex {
+         pub attrs: Vec<Attribute>,
+         pub expr: Box<Expr>,
+         pub bracket_token: token::Bracket,
+         pub index: Box<Expr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A `let` guard: `let Some(x) = opt`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprLet #full {
+         pub attrs: Vec<Attribute>,
+         pub let_token: Token![let],
+         pub pat: Pat,
+         pub eq_token: Token![=],
+         pub expr: Box<Expr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A literal in place of an expression: `1`, `"foo"`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct ExprLit {
+         pub attrs: Vec<Attribute>,
+         pub lit: Lit,
+     }
+ }
+ 
+ ast_struct! {
+     /// Conditionless loop: `loop { ... }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprLoop #full {
+         pub attrs: Vec<Attribute>,
+         pub label: Option<Label>,
+         pub loop_token: Token![loop],
+         pub body: Block,
+     }
+ }
+ 
+ ast_struct! {
+     /// A macro invocation expression: `format!("{}", q)`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprMacro #full {
+         pub attrs: Vec<Attribute>,
+         pub mac: Macro,
+     }
+ }
+ 
+ ast_struct! {
+     /// A `match` expression: `match n { Some(n) => {}, None => {} }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprMatch #full {
+         pub attrs: Vec<Attribute>,
+         pub match_token: Token![match],
+         pub expr: Box<Expr>,
+         pub brace_token: token::Brace,
+         pub arms: Vec<Arm>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A method call expression: `x.foo::<T>(a, b)`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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![,]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A parenthesized expression: `(a + b)`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprParen {
+         pub attrs: Vec<Attribute>,
+         pub paren_token: token::Paren,
+         pub expr: Box<Expr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// 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
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct ExprPath {
+         pub attrs: Vec<Attribute>,
+         pub qself: Option<QSelf>,
+         pub path: Path,
+     }
+ }
+ 
+ ast_struct! {
+     /// A range expression: `1..2`, `1..`, `..2`, `1..=2`, `..=2`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprRange #full {
+         pub attrs: Vec<Attribute>,
+         pub from: Option<Box<Expr>>,
+         pub limits: RangeLimits,
+         pub to: Option<Box<Expr>>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A referencing operation: `&a` or `&mut a`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprReference #full {
+         pub attrs: Vec<Attribute>,
+         pub and_token: Token![&],
+         pub raw: Reserved,
+         pub mutability: Option<Token![mut]>,
+         pub expr: Box<Expr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// An array literal constructed from one repeated element: `[0u8; N]`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprRepeat #full {
+         pub attrs: Vec<Attribute>,
+         pub bracket_token: token::Bracket,
+         pub expr: Box<Expr>,
+         pub semi_token: Token![;],
+         pub len: Box<Expr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A `return`, with an optional value to be returned.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprReturn #full {
+         pub attrs: Vec<Attribute>,
+         pub return_token: Token![return],
+         pub expr: Option<Box<Expr>>,
+     }
+ }
+ 
+ ast_struct! {
+     /// 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.*
++    /// *This type is available only 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>>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A try-expression: `expr?`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprTry #full {
+         pub attrs: Vec<Attribute>,
+         pub expr: Box<Expr>,
+         pub question_token: Token![?],
+     }
+ }
+ 
+ ast_struct! {
+     /// A try block: `try { ... }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprTryBlock #full {
+         pub attrs: Vec<Attribute>,
+         pub try_token: Token![try],
+         pub block: Block,
+     }
+ }
+ 
+ ast_struct! {
+     /// A tuple expression: `(a, b, c, d)`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprTuple #full {
+         pub attrs: Vec<Attribute>,
+         pub paren_token: token::Paren,
+         pub elems: Punctuated<Expr, Token![,]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A type ascription expression: `foo: f64`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprType #full {
+         pub attrs: Vec<Attribute>,
+         pub expr: Box<Expr>,
+         pub colon_token: Token![:],
+         pub ty: Box<Type>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A unary operation: `!x`, `*x`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct ExprUnary {
+         pub attrs: Vec<Attribute>,
+         pub op: UnOp,
+         pub expr: Box<Expr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// An unsafe block: `unsafe { ... }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprUnsafe #full {
+         pub attrs: Vec<Attribute>,
+         pub unsafe_token: Token![unsafe],
+         pub block: Block,
+     }
+ }
+ 
+ ast_struct! {
+     /// A while loop: `while expr { ... }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprWhile #full {
+         pub attrs: Vec<Attribute>,
+         pub label: Option<Label>,
+         pub while_token: Token![while],
+         pub cond: Box<Expr>,
+         pub body: Block,
+     }
+ }
+ 
+ ast_struct! {
+     /// A yield expression: `yield expr`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ExprYield #full {
+         pub attrs: Vec<Attribute>,
+         pub yield_token: Token![yield],
+         pub expr: Option<Box<Expr>>,
+     }
+ }
+ 
+-#[cfg(feature = "extra-traits")]
+-impl Eq for Expr {}
+-
+-#[cfg(feature = "extra-traits")]
+-impl PartialEq for Expr {
+-    fn eq(&self, other: &Self) -> bool {
+-        match (self, other) {
+-            (Expr::Array(this), Expr::Array(other)) => this == other,
+-            (Expr::Assign(this), Expr::Assign(other)) => this == other,
+-            (Expr::AssignOp(this), Expr::AssignOp(other)) => this == other,
+-            (Expr::Async(this), Expr::Async(other)) => this == other,
+-            (Expr::Await(this), Expr::Await(other)) => this == other,
+-            (Expr::Binary(this), Expr::Binary(other)) => this == other,
+-            (Expr::Block(this), Expr::Block(other)) => this == other,
+-            (Expr::Box(this), Expr::Box(other)) => this == other,
+-            (Expr::Break(this), Expr::Break(other)) => this == other,
+-            (Expr::Call(this), Expr::Call(other)) => this == other,
+-            (Expr::Cast(this), Expr::Cast(other)) => this == other,
+-            (Expr::Closure(this), Expr::Closure(other)) => this == other,
+-            (Expr::Continue(this), Expr::Continue(other)) => this == other,
+-            (Expr::Field(this), Expr::Field(other)) => this == other,
+-            (Expr::ForLoop(this), Expr::ForLoop(other)) => this == other,
+-            (Expr::Group(this), Expr::Group(other)) => this == other,
+-            (Expr::If(this), Expr::If(other)) => this == other,
+-            (Expr::Index(this), Expr::Index(other)) => this == other,
+-            (Expr::Let(this), Expr::Let(other)) => this == other,
+-            (Expr::Lit(this), Expr::Lit(other)) => this == other,
+-            (Expr::Loop(this), Expr::Loop(other)) => this == other,
+-            (Expr::Macro(this), Expr::Macro(other)) => this == other,
+-            (Expr::Match(this), Expr::Match(other)) => this == other,
+-            (Expr::MethodCall(this), Expr::MethodCall(other)) => this == other,
+-            (Expr::Paren(this), Expr::Paren(other)) => this == other,
+-            (Expr::Path(this), Expr::Path(other)) => this == other,
+-            (Expr::Range(this), Expr::Range(other)) => this == other,
+-            (Expr::Reference(this), Expr::Reference(other)) => this == other,
+-            (Expr::Repeat(this), Expr::Repeat(other)) => this == other,
+-            (Expr::Return(this), Expr::Return(other)) => this == other,
+-            (Expr::Struct(this), Expr::Struct(other)) => this == other,
+-            (Expr::Try(this), Expr::Try(other)) => this == other,
+-            (Expr::TryBlock(this), Expr::TryBlock(other)) => this == other,
+-            (Expr::Tuple(this), Expr::Tuple(other)) => this == other,
+-            (Expr::Type(this), Expr::Type(other)) => this == other,
+-            (Expr::Unary(this), Expr::Unary(other)) => this == other,
+-            (Expr::Unsafe(this), Expr::Unsafe(other)) => this == other,
+-            (Expr::Verbatim(this), Expr::Verbatim(other)) => {
+-                TokenStreamHelper(this) == TokenStreamHelper(other)
+-            }
+-            (Expr::While(this), Expr::While(other)) => this == other,
+-            (Expr::Yield(this), Expr::Yield(other)) => this == other,
+-            _ => false,
+-        }
+-    }
+-}
+-
+-#[cfg(feature = "extra-traits")]
+-impl Hash for Expr {
+-    fn hash<H>(&self, hash: &mut H)
+-    where
+-        H: Hasher,
+-    {
+-        match self {
+-            Expr::Array(expr) => {
+-                hash.write_u8(0);
+-                expr.hash(hash);
+-            }
+-            Expr::Assign(expr) => {
+-                hash.write_u8(1);
+-                expr.hash(hash);
+-            }
+-            Expr::AssignOp(expr) => {
+-                hash.write_u8(2);
+-                expr.hash(hash);
+-            }
+-            Expr::Async(expr) => {
+-                hash.write_u8(3);
+-                expr.hash(hash);
+-            }
+-            Expr::Await(expr) => {
+-                hash.write_u8(4);
+-                expr.hash(hash);
+-            }
+-            Expr::Binary(expr) => {
+-                hash.write_u8(5);
+-                expr.hash(hash);
+-            }
+-            Expr::Block(expr) => {
+-                hash.write_u8(6);
+-                expr.hash(hash);
+-            }
+-            Expr::Box(expr) => {
+-                hash.write_u8(7);
+-                expr.hash(hash);
+-            }
+-            Expr::Break(expr) => {
+-                hash.write_u8(8);
+-                expr.hash(hash);
+-            }
+-            Expr::Call(expr) => {
+-                hash.write_u8(9);
+-                expr.hash(hash);
+-            }
+-            Expr::Cast(expr) => {
+-                hash.write_u8(10);
+-                expr.hash(hash);
+-            }
+-            Expr::Closure(expr) => {
+-                hash.write_u8(11);
+-                expr.hash(hash);
+-            }
+-            Expr::Continue(expr) => {
+-                hash.write_u8(12);
+-                expr.hash(hash);
+-            }
+-            Expr::Field(expr) => {
+-                hash.write_u8(13);
+-                expr.hash(hash);
+-            }
+-            Expr::ForLoop(expr) => {
+-                hash.write_u8(14);
+-                expr.hash(hash);
+-            }
+-            Expr::Group(expr) => {
+-                hash.write_u8(15);
+-                expr.hash(hash);
+-            }
+-            Expr::If(expr) => {
+-                hash.write_u8(16);
+-                expr.hash(hash);
+-            }
+-            Expr::Index(expr) => {
+-                hash.write_u8(17);
+-                expr.hash(hash);
+-            }
+-            Expr::Let(expr) => {
+-                hash.write_u8(18);
+-                expr.hash(hash);
+-            }
+-            Expr::Lit(expr) => {
+-                hash.write_u8(19);
+-                expr.hash(hash);
+-            }
+-            Expr::Loop(expr) => {
+-                hash.write_u8(20);
+-                expr.hash(hash);
+-            }
+-            Expr::Macro(expr) => {
+-                hash.write_u8(21);
+-                expr.hash(hash);
+-            }
+-            Expr::Match(expr) => {
+-                hash.write_u8(22);
+-                expr.hash(hash);
+-            }
+-            Expr::MethodCall(expr) => {
+-                hash.write_u8(23);
+-                expr.hash(hash);
+-            }
+-            Expr::Paren(expr) => {
+-                hash.write_u8(24);
+-                expr.hash(hash);
+-            }
+-            Expr::Path(expr) => {
+-                hash.write_u8(25);
+-                expr.hash(hash);
+-            }
+-            Expr::Range(expr) => {
+-                hash.write_u8(26);
+-                expr.hash(hash);
+-            }
+-            Expr::Reference(expr) => {
+-                hash.write_u8(27);
+-                expr.hash(hash);
+-            }
+-            Expr::Repeat(expr) => {
+-                hash.write_u8(28);
+-                expr.hash(hash);
+-            }
+-            Expr::Return(expr) => {
+-                hash.write_u8(29);
+-                expr.hash(hash);
+-            }
+-            Expr::Struct(expr) => {
+-                hash.write_u8(30);
+-                expr.hash(hash);
+-            }
+-            Expr::Try(expr) => {
+-                hash.write_u8(31);
+-                expr.hash(hash);
+-            }
+-            Expr::TryBlock(expr) => {
+-                hash.write_u8(32);
+-                expr.hash(hash);
+-            }
+-            Expr::Tuple(expr) => {
+-                hash.write_u8(33);
+-                expr.hash(hash);
+-            }
+-            Expr::Type(expr) => {
+-                hash.write_u8(34);
+-                expr.hash(hash);
+-            }
+-            Expr::Unary(expr) => {
+-                hash.write_u8(35);
+-                expr.hash(hash);
+-            }
+-            Expr::Unsafe(expr) => {
+-                hash.write_u8(36);
+-                expr.hash(hash);
+-            }
+-            Expr::Verbatim(expr) => {
+-                hash.write_u8(37);
+-                TokenStreamHelper(expr).hash(hash);
+-            }
+-            Expr::While(expr) => {
+-                hash.write_u8(38);
+-                expr.hash(hash);
+-            }
+-            Expr::Yield(expr) => {
+-                hash.write_u8(39);
+-                expr.hash(hash);
+-            }
+-            Expr::__Nonexhaustive => unreachable!(),
+-        }
+-    }
+-}
+-
+ impl Expr {
+     #[cfg(all(feature = "parsing", feature = "full"))]
+     pub(crate) fn replace_attrs(&mut self, new: Vec<Attribute>) -> Vec<Attribute> {
+         match self {
+             Expr::Box(ExprBox { attrs, .. })
+             | Expr::Array(ExprArray { attrs, .. })
+             | Expr::Call(ExprCall { attrs, .. })
+             | Expr::MethodCall(ExprMethodCall { attrs, .. })
+@@ -991,107 +768,145 @@ impl Expr {
+         }
+     }
+ }
+ 
+ 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"`
++    /// *This type is available only 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),
+     }
+ }
+ 
++impl Eq for Member {}
++
++impl PartialEq for Member {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (Member::Named(this), Member::Named(other)) => this == other,
++            (Member::Unnamed(this), Member::Unnamed(other)) => this == other,
++            _ => false,
++        }
++    }
++}
++
++impl Hash for Member {
++    fn hash<H: Hasher>(&self, state: &mut H) {
++        match self {
++            Member::Named(m) => m.hash(state),
++            Member::Unnamed(m) => m.hash(state),
++        }
++    }
++}
++
++#[cfg(feature = "printing")]
++impl IdentFragment for Member {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            Member::Named(m) => Display::fmt(m, formatter),
++            Member::Unnamed(m) => Display::fmt(&m.index, formatter),
++        }
++    }
++
++    fn span(&self) -> Option<Span> {
++        match self {
++            Member::Named(m) => Some(m.span()),
++            Member::Unnamed(m) => Some(m.span),
++        }
++    }
++}
++
+ ast_struct! {
+     /// The index of an unnamed tuple struct field.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
++    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
+     /// feature.*
+-    pub struct Index #manual_extra_traits {
++    pub struct Index {
+         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! {
+-    #[derive(Default)]
+-    pub struct Reserved {
+-        private: (),
++#[cfg(feature = "printing")]
++impl IdentFragment for Index {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        Display::fmt(&self.index, formatter)
++    }
++
++    fn span(&self) -> Option<Span> {
++        Some(self.span)
+     }
+ }
+ 
+ #[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.*
++    /// *This type is available only 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.*
++    /// *This type is available only 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.*
++    /// *This type is available only 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
+@@ -1102,17 +917,17 @@ ast_struct! {
+         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.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct Label {
+         pub name: Lifetime,
+         pub colon_token: Token![:],
+     }
+ }
+ 
+ #[cfg(feature = "full")]
+ ast_struct! {
+@@ -1129,45 +944,44 @@ ast_struct! {
+     ///     }
+     ///     // ...
+     ///     # _ => {}
+     /// }
+     /// #   false
+     /// # }
+     /// ```
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct Arm {
+         pub attrs: Vec<Attribute>,
+         pub pat: Pat,
+         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))]
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub enum RangeLimits {
+         /// Inclusive at the beginning, exclusive at the end.
+         HalfOpen(Token![..]),
+         /// Inclusive at the beginning and end.
+         Closed(Token![..=]),
+     }
+ }
+ 
+ #[cfg(any(feature = "parsing", feature = "printing"))]
+ #[cfg(feature = "full")]
+ pub(crate) fn requires_terminator(expr: &Expr) -> bool {
+-    // see https://github.com/rust-lang/rust/blob/eb8f2586e/src/libsyntax/parse/classify.rs#L17-L37
++    // see https://github.com/rust-lang/rust/blob/2679c38fc/src/librustc_ast/util/classify.rs#L7-L25
+     match *expr {
+         Expr::Unsafe(..)
+         | Expr::Block(..)
+         | Expr::If(..)
+         | Expr::Match(..)
+         | Expr::While(..)
+         | Expr::Loop(..)
+         | Expr::ForLoop(..)
+@@ -1178,26 +992,27 @@ pub(crate) fn requires_terminator(expr: 
+ }
+ 
+ #[cfg(feature = "parsing")]
+ pub(crate) mod parsing {
+     use super::*;
+ 
+     use crate::parse::{Parse, ParseStream, Result};
+     use crate::path;
++    use std::cmp::Ordering;
++
++    crate::custom_keyword!(raw);
+ 
+     // 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
+-    #[derive(Copy, Clone)]
+     pub struct AllowStruct(bool);
+ 
+-    #[derive(Copy, Clone, PartialEq, PartialOrd)]
+     enum Precedence {
+         Any,
+         Assign,
+         Range,
+         Or,
+         And,
+         Compare,
+         BitOr,
+@@ -1241,19 +1056,131 @@ pub(crate) mod parsing {
+     }
+ 
+     impl Parse for Expr {
+         fn parse(input: ParseStream) -> Result<Self> {
+             ambiguous_expr(input, AllowStruct(true))
+         }
+     }
+ 
+-    #[cfg(feature = "full")]
+-    fn expr_no_struct(input: ParseStream) -> Result<Expr> {
+-        ambiguous_expr(input, AllowStruct(false))
++    impl Expr {
++        /// An alternative to the primary `Expr::parse` parser (from the
++        /// [`Parse`] trait) for ambiguous syntactic positions in which a
++        /// trailing brace should not be taken as part of the expression.
++        ///
++        /// Rust grammar has an ambiguity where braces sometimes turn a path
++        /// expression into a struct initialization and sometimes do not. In the
++        /// following code, the expression `S {}` is one expression. Presumably
++        /// there is an empty struct `struct S {}` defined somewhere which it is
++        /// instantiating.
++        ///
++        /// ```
++        /// # struct S;
++        /// # impl std::ops::Deref for S {
++        /// #     type Target = bool;
++        /// #     fn deref(&self) -> &Self::Target {
++        /// #         &true
++        /// #     }
++        /// # }
++        /// let _ = *S {};
++        ///
++        /// // parsed by rustc as: `*(S {})`
++        /// ```
++        ///
++        /// We would want to parse the above using `Expr::parse` after the `=`
++        /// token.
++        ///
++        /// But in the following, `S {}` is *not* a struct init expression.
++        ///
++        /// ```
++        /// # const S: &bool = &true;
++        /// if *S {} {}
++        ///
++        /// // parsed by rustc as:
++        /// //
++        /// //    if (*S) {
++        /// //        /* empty block */
++        /// //    }
++        /// //    {
++        /// //        /* another empty block */
++        /// //    }
++        /// ```
++        ///
++        /// For that reason we would want to parse if-conditions using
++        /// `Expr::parse_without_eager_brace` after the `if` token. Same for
++        /// similar syntactic positions such as the condition expr after a
++        /// `while` token or the expr at the top of a `match`.
++        ///
++        /// The Rust grammar's choices around which way this ambiguity is
++        /// resolved at various syntactic positions is fairly arbitrary. Really
++        /// either parse behavior could work in most positions, and language
++        /// designers just decide each case based on which is more likely to be
++        /// what the programmer had in mind most of the time.
++        ///
++        /// ```
++        /// # struct S;
++        /// # fn doc() -> S {
++        /// if return S {} {}
++        /// # unreachable!()
++        /// # }
++        ///
++        /// // parsed by rustc as:
++        /// //
++        /// //    if (return (S {})) {
++        /// //    }
++        /// //
++        /// // but could equally well have been this other arbitrary choice:
++        /// //
++        /// //    if (return S) {
++        /// //    }
++        /// //    {}
++        /// ```
++        ///
++        /// Note the grammar ambiguity on trailing braces is distinct from
++        /// precedence and is not captured by assigning a precedence level to
++        /// the braced struct init expr in relation to other operators. This can
++        /// be illustrated by `return 0..S {}` vs `match 0..S {}`. The former
++        /// parses as `return (0..(S {}))` implying tighter precedence for
++        /// struct init than `..`, while the latter parses as `match (0..S) {}`
++        /// implying tighter precedence for `..` than struct init, a
++        /// contradiction.
++        #[cfg(feature = "full")]
++        pub fn parse_without_eager_brace(input: ParseStream) -> Result<Expr> {
++            ambiguous_expr(input, AllowStruct(false))
++        }
++    }
++
++    impl Copy for AllowStruct {}
++
++    impl Clone for AllowStruct {
++        fn clone(&self) -> Self {
++            *self
++        }
++    }
++
++    impl Copy for Precedence {}
++
++    impl Clone for Precedence {
++        fn clone(&self) -> Self {
++            *self
++        }
++    }
++
++    impl PartialEq for Precedence {
++        fn eq(&self, other: &Self) -> bool {
++            *self as u8 == *other as u8
++        }
++    }
++
++    impl PartialOrd for Precedence {
++        fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
++            let this = *self as u8;
++            let other = *other as u8;
++            Some(this.cmp(&other))
++        }
+     }
+ 
+     #[cfg(feature = "full")]
+     fn parse_expr(
+         input: ParseStream,
+         mut lhs: Expr,
+         allow_struct: AllowStruct,
+         base: Precedence,
+@@ -1425,88 +1352,114 @@ pub(crate) mod parsing {
+     }
+ 
+     // Parse an arbitrary expression.
+     fn ambiguous_expr(input: ParseStream, allow_struct: AllowStruct) -> Result<Expr> {
+         let lhs = unary_expr(input, allow_struct)?;
+         parse_expr(input, lhs, allow_struct, Precedence::Any)
+     }
+ 
++    #[cfg(feature = "full")]
++    fn expr_attrs(input: ParseStream) -> Result<Vec<Attribute>> {
++        let mut attrs = Vec::new();
++        loop {
++            if input.peek(token::Group) {
++                let ahead = input.fork();
++                let group = crate::group::parse_group(&ahead)?;
++                if !group.content.peek(Token![#]) || group.content.peek2(Token![!]) {
++                    break;
++                }
++                let attr = group.content.call(attr::parsing::single_parse_outer)?;
++                if !group.content.is_empty() {
++                    break;
++                }
++                attrs.push(attr);
++            } else if input.peek(Token![#]) {
++                attrs.push(input.call(attr::parsing::single_parse_outer)?);
++            } else {
++                break;
++            }
++        }
++        Ok(attrs)
++    }
++
+     // <UnOp> <trailer>
+     // & <trailer>
+     // &mut <trailer>
+     // box <trailer>
+     #[cfg(feature = "full")]
+     fn unary_expr(input: ParseStream, allow_struct: AllowStruct) -> Result<Expr> {
+-        // TODO: optimize using advance_to
+-        let ahead = input.fork();
+-        ahead.call(Attribute::parse_outer)?;
+-        if ahead.peek(Token![&])
+-            || ahead.peek(Token![box])
+-            || ahead.peek(Token![*])
+-            || ahead.peek(Token![!])
+-            || ahead.peek(Token![-])
+-        {
+-            let attrs = input.call(Attribute::parse_outer)?;
+-            if input.peek(Token![&]) {
++        let begin = input.fork();
++        let attrs = input.call(expr_attrs)?;
++        if input.peek(Token![&]) {
++            let and_token: Token![&] = input.parse()?;
++            let raw: Option<raw> =
++                if input.peek(raw) && (input.peek2(Token![mut]) || input.peek2(Token![const])) {
++                    Some(input.parse()?)
++                } else {
++                    None
++                };
++            let mutability: Option<Token![mut]> = input.parse()?;
++            if raw.is_some() && mutability.is_none() {
++                input.parse::<Token![const]>()?;
++            }
++            let expr = Box::new(unary_expr(input, allow_struct)?);
++            if raw.is_some() {
++                Ok(Expr::Verbatim(verbatim::between(begin, input)))
++            } else {
+                 Ok(Expr::Reference(ExprReference {
+                     attrs,
+-                    and_token: input.parse()?,
++                    and_token,
+                     raw: Reserved::default(),
+-                    mutability: input.parse()?,
+-                    expr: Box::new(unary_expr(input, allow_struct)?),
+-                }))
+-            } else if input.peek(Token![box]) {
+-                Ok(Expr::Box(ExprBox {
+-                    attrs,
+-                    box_token: input.parse()?,
+-                    expr: Box::new(unary_expr(input, allow_struct)?),
+-                }))
+-            } else {
+-                Ok(Expr::Unary(ExprUnary {
+-                    attrs,
+-                    op: input.parse()?,
+-                    expr: Box::new(unary_expr(input, allow_struct)?),
++                    mutability,
++                    expr,
+                 }))
+             }
++        } else if input.peek(Token![box]) {
++            Ok(Expr::Box(ExprBox {
++                attrs,
++                box_token: input.parse()?,
++                expr: Box::new(unary_expr(input, allow_struct)?),
++            }))
++        } else if input.peek(Token![*]) || input.peek(Token![!]) || input.peek(Token![-]) {
++            Ok(Expr::Unary(ExprUnary {
++                attrs,
++                op: input.parse()?,
++                expr: Box::new(unary_expr(input, allow_struct)?),
++            }))
+         } else {
+-            trailer_expr(input, allow_struct)
++            trailer_expr(attrs, input, allow_struct)
+         }
+     }
+ 
+     #[cfg(not(feature = "full"))]
+     fn unary_expr(input: ParseStream, allow_struct: AllowStruct) -> Result<Expr> {
+-        // TODO: optimize using advance_to
+-        let ahead = input.fork();
+-        ahead.call(Attribute::parse_outer)?;
+-        if ahead.peek(Token![*]) || ahead.peek(Token![!]) || ahead.peek(Token![-]) {
++        if input.peek(Token![*]) || input.peek(Token![!]) || input.peek(Token![-]) {
+             Ok(Expr::Unary(ExprUnary {
+-                attrs: input.call(Attribute::parse_outer)?,
++                attrs: Vec::new(),
+                 op: input.parse()?,
+                 expr: Box::new(unary_expr(input, allow_struct)?),
+             }))
+         } else {
+             trailer_expr(input, allow_struct)
+         }
+     }
+ 
+     // <atom> (..<args>) ...
+     // <atom> . <ident> (..<args>) ...
+     // <atom> . <ident> ...
+     // <atom> . <lit> ...
+     // <atom> [ <expr> ] ...
+     // <atom> ? ...
+     #[cfg(feature = "full")]
+-    fn trailer_expr(input: ParseStream, allow_struct: AllowStruct) -> Result<Expr> {
+-        if input.peek(token::Group) {
+-            return input.call(expr_group).map(Expr::Group);
+-        }
+-
+-        let outer_attrs = input.call(Attribute::parse_outer)?;
+-
++    fn trailer_expr(
++        outer_attrs: Vec<Attribute>,
++        input: ParseStream,
++        allow_struct: AllowStruct,
++    ) -> Result<Expr> {
+         let atom = atom_expr(input, allow_struct)?;
+         let mut e = trailer_helper(input, atom)?;
+ 
+         let inner_attrs = e.replace_attrs(Vec::new());
+         let attrs = private::attrs(outer_attrs, inner_attrs);
+         e.replace_attrs(attrs);
+         Ok(e)
+     }
+@@ -1518,28 +1471,36 @@ pub(crate) mod parsing {
+                 let content;
+                 e = Expr::Call(ExprCall {
+                     attrs: Vec::new(),
+                     func: Box::new(e),
+                     paren_token: parenthesized!(content in input),
+                     args: content.parse_terminated(Expr::parse)?,
+                 });
+             } else if input.peek(Token![.]) && !input.peek(Token![..]) {
+-                let dot_token: Token![.] = input.parse()?;
++                let mut dot_token: Token![.] = input.parse()?;
+ 
+-                if input.peek(token::Await) {
++                let await_token: Option<token::Await> = input.parse()?;
++                if let Some(await_token) = await_token {
+                     e = Expr::Await(ExprAwait {
+                         attrs: Vec::new(),
+                         base: Box::new(e),
+                         dot_token,
+-                        await_token: input.parse()?,
++                        await_token,
+                     });
+                     continue;
+                 }
+ 
++                let float_token: Option<LitFloat> = input.parse()?;
++                if let Some(float_token) = float_token {
++                    if multi_index(&mut e, &mut dot_token, float_token)? {
++                        continue;
++                    }
++                }
++
+                 let member: Member = input.parse()?;
+                 let turbofish = if member.is_named() && input.peek(Token![::]) {
+                     Some(MethodTurbofish {
+                         colon2_token: input.parse()?,
+                         lt_token: input.parse()?,
+                         args: {
+                             let mut args = Punctuated::new();
+                             loop {
+@@ -1615,20 +1576,27 @@ pub(crate) mod parsing {
+                 e = Expr::Call(ExprCall {
+                     attrs: Vec::new(),
+                     func: Box::new(e),
+                     paren_token: parenthesized!(content in input),
+                     args: content.parse_terminated(Expr::parse)?,
+                 });
+             } else if input.peek(Token![.]) && !input.peek(Token![..]) && !input.peek2(token::Await)
+             {
++                let mut dot_token: Token![.] = input.parse()?;
++                let float_token: Option<LitFloat> = input.parse()?;
++                if let Some(float_token) = float_token {
++                    if multi_index(&mut e, &mut dot_token, float_token)? {
++                        continue;
++                    }
++                }
+                 e = Expr::Field(ExprField {
+                     attrs: Vec::new(),
+                     base: Box::new(e),
+-                    dot_token: input.parse()?,
++                    dot_token,
+                     member: input.parse()?,
+                 });
+             } else if input.peek(token::Bracket) {
+                 let content;
+                 e = Expr::Index(ExprIndex {
+                     attrs: Vec::new(),
+                     expr: Box::new(e),
+                     bracket_token: bracketed!(content in input),
+@@ -1641,17 +1609,21 @@ pub(crate) mod parsing {
+ 
+         Ok(e)
+     }
+ 
+     // Parse all atomic expressions which don't have to worry about precedence
+     // interactions, as they are fully contained.
+     #[cfg(feature = "full")]
+     fn atom_expr(input: ParseStream, allow_struct: AllowStruct) -> Result<Expr> {
+-        if input.peek(token::Group) {
++        if input.peek(token::Group)
++            && !input.peek2(Token![::])
++            && !input.peek2(Token![!])
++            && !input.peek2(token::Brace)
++        {
+             input.call(expr_group).map(Expr::Group)
+         } else if input.peek(Lit) {
+             input.parse().map(Expr::Lit)
+         } else if input.peek(Token![async])
+             && (input.peek2(token::Brace) || input.peek2(Token![move]) && input.peek3(token::Brace))
+         {
+             input.call(expr_async).map(Expr::Async)
+         } else if input.peek(Token![try]) && input.peek2(token::Brace) {
+@@ -1663,17 +1635,16 @@ pub(crate) mod parsing {
+         {
+             expr_closure(input, allow_struct).map(Expr::Closure)
+         } else if input.peek(Ident)
+             || input.peek(Token![::])
+             || input.peek(Token![<])
+             || input.peek(Token![self])
+             || input.peek(Token![Self])
+             || input.peek(Token![super])
+-            || input.peek(Token![extern])
+             || input.peek(Token![crate])
+         {
+             path_or_macro_or_struct(input, allow_struct)
+         } else if input.peek(token::Paren) {
+             paren_or_tuple(input)
+         } else if input.peek(Token![break]) {
+             expr_break(input, allow_struct).map(Expr::Break)
+         } else if input.peek(Token![continue]) {
+@@ -1735,17 +1706,16 @@ pub(crate) mod parsing {
+         } else if input.peek(token::Paren) {
+             input.call(expr_paren).map(Expr::Paren)
+         } else if input.peek(Ident)
+             || input.peek(Token![::])
+             || input.peek(Token![<])
+             || input.peek(Token![self])
+             || input.peek(Token![Self])
+             || input.peek(Token![super])
+-            || input.peek(Token![extern])
+             || input.peek(Token![crate])
+         {
+             input.parse().map(Expr::Path)
+         } else {
+             Err(input.error("unsupported expression; enable syn's features=[\"full\"]"))
+         }
+     }
+ 
+@@ -1873,17 +1843,17 @@ pub(crate) mod parsing {
+             }))
+         } else {
+             Err(content.error("expected `,` or `;`"))
+         }
+     }
+ 
+     #[cfg(feature = "full")]
+     pub(crate) fn expr_early(input: ParseStream) -> Result<Expr> {
+-        let mut attrs = input.call(Attribute::parse_outer)?;
++        let mut attrs = input.call(expr_attrs)?;
+         let mut expr = if input.peek(Token![if]) {
+             Expr::If(input.parse()?)
+         } else if input.peek(Token![while]) {
+             Expr::While(input.parse()?)
+         } else if input.peek(Token![for]) {
+             Expr::ForLoop(input.parse()?)
+         } else if input.peek(Token![loop]) {
+             Expr::Loop(input.parse()?)
+@@ -1900,17 +1870,17 @@ pub(crate) mod parsing {
+             let mut expr = unary_expr(input, allow_struct)?;
+ 
+             attrs.extend(expr.replace_attrs(Vec::new()));
+             expr.replace_attrs(attrs);
+ 
+             return parse_expr(input, expr, allow_struct, Precedence::Any);
+         };
+ 
+-        if input.peek(Token![.]) || input.peek(Token![?]) {
++        if input.peek(Token![.]) && !input.peek(Token![..]) || input.peek(Token![?]) {
+             expr = trailer_helper(input, expr)?;
+ 
+             attrs.extend(expr.replace_attrs(Vec::new()));
+             expr.replace_attrs(attrs);
+ 
+             let allow_struct = AllowStruct(true);
+             return parse_expr(input, expr, allow_struct, Precedence::Any);
+         }
+@@ -1946,63 +1916,48 @@ pub(crate) mod parsing {
+             attrs: Vec::new(),
+             paren_token: parenthesized!(content in input),
+             expr: content.parse()?,
+         })
+     }
+ 
+     #[cfg(feature = "full")]
+     fn generic_method_argument(input: ParseStream) -> Result<GenericMethodArgument> {
+-        // TODO parse const generics as well
++        if input.peek(Lit) {
++            let lit = input.parse()?;
++            return Ok(GenericMethodArgument::Const(Expr::Lit(lit)));
++        }
++
++        if input.peek(token::Brace) {
++            let block = input.call(expr::parsing::expr_block)?;
++            return Ok(GenericMethodArgument::Const(Expr::Block(block)));
++        }
++
+         input.parse().map(GenericMethodArgument::Type)
+     }
+ 
+     #[cfg(feature = "full")]
+     fn expr_let(input: ParseStream) -> Result<ExprLet> {
+         Ok(ExprLet {
+             attrs: Vec::new(),
+             let_token: input.parse()?,
+-            pat: {
+-                let leading_vert: Option<Token![|]> = input.parse()?;
+-                let pat: Pat = input.parse()?;
+-                if leading_vert.is_some()
+-                    || input.peek(Token![|]) && !input.peek(Token![||]) && !input.peek(Token![|=])
+-                {
+-                    let mut cases = Punctuated::new();
+-                    cases.push_value(pat);
+-                    while input.peek(Token![|])
+-                        && !input.peek(Token![||])
+-                        && !input.peek(Token![|=])
+-                    {
+-                        let punct = input.parse()?;
+-                        cases.push_punct(punct);
+-                        let pat: Pat = input.parse()?;
+-                        cases.push_value(pat);
+-                    }
+-                    Pat::Or(PatOr {
+-                        attrs: Vec::new(),
+-                        leading_vert,
+-                        cases,
+-                    })
+-                } else {
+-                    pat
+-                }
+-            },
++            pat: pat::parsing::multi_pat_with_leading_vert(input)?,
+             eq_token: input.parse()?,
+-            expr: Box::new(input.call(expr_no_struct)?),
++            expr: Box::new(input.call(Expr::parse_without_eager_brace)?),
+         })
+     }
+ 
+     #[cfg(feature = "full")]
+     impl Parse for ExprIf {
+         fn parse(input: ParseStream) -> Result<Self> {
++            let attrs = input.call(Attribute::parse_outer)?;
+             Ok(ExprIf {
+-                attrs: Vec::new(),
++                attrs,
+                 if_token: input.parse()?,
+-                cond: Box::new(input.call(expr_no_struct)?),
++                cond: Box::new(input.call(Expr::parse_without_eager_brace)?),
+                 then_branch: input.parse()?,
+                 else_branch: {
+                     if input.peek(Token![else]) {
+                         Some(input.call(else_block)?)
+                     } else {
+                         None
+                     }
+                 },
+@@ -2028,94 +1983,81 @@ pub(crate) mod parsing {
+         };
+ 
+         Ok((else_token, Box::new(else_branch)))
+     }
+ 
+     #[cfg(feature = "full")]
+     impl Parse for ExprForLoop {
+         fn parse(input: ParseStream) -> Result<Self> {
++            let outer_attrs = input.call(Attribute::parse_outer)?;
+             let label: Option<Label> = input.parse()?;
+             let for_token: Token![for] = input.parse()?;
+ 
+-            let leading_vert: Option<Token![|]> = input.parse()?;
+-            let mut pat: Pat = input.parse()?;
+-            if leading_vert.is_some() || input.peek(Token![|]) {
+-                let mut cases = Punctuated::new();
+-                cases.push_value(pat);
+-                while input.peek(Token![|]) {
+-                    let punct = input.parse()?;
+-                    cases.push_punct(punct);
+-                    let pat: Pat = input.parse()?;
+-                    cases.push_value(pat);
+-                }
+-                pat = Pat::Or(PatOr {
+-                    attrs: Vec::new(),
+-                    leading_vert,
+-                    cases,
+-                });
+-            }
++            let pat = pat::parsing::multi_pat_with_leading_vert(input)?;
+ 
+             let in_token: Token![in] = input.parse()?;
+-            let expr: Expr = input.call(expr_no_struct)?;
++            let expr: Expr = input.call(Expr::parse_without_eager_brace)?;
+ 
+             let content;
+             let brace_token = braced!(content in input);
+             let inner_attrs = content.call(Attribute::parse_inner)?;
+             let stmts = content.call(Block::parse_within)?;
+ 
+             Ok(ExprForLoop {
+-                attrs: inner_attrs,
++                attrs: private::attrs(outer_attrs, inner_attrs),
+                 label,
+                 for_token,
+                 pat,
+                 in_token,
+                 expr: Box::new(expr),
+                 body: Block { brace_token, stmts },
+             })
+         }
+     }
+ 
+     #[cfg(feature = "full")]
+     impl Parse for ExprLoop {
+         fn parse(input: ParseStream) -> Result<Self> {
++            let outer_attrs = input.call(Attribute::parse_outer)?;
+             let label: Option<Label> = input.parse()?;
+             let loop_token: Token![loop] = input.parse()?;
+ 
+             let content;
+             let brace_token = braced!(content in input);
+             let inner_attrs = content.call(Attribute::parse_inner)?;
+             let stmts = content.call(Block::parse_within)?;
+ 
+             Ok(ExprLoop {
+-                attrs: inner_attrs,
++                attrs: private::attrs(outer_attrs, inner_attrs),
+                 label,
+                 loop_token,
+                 body: Block { brace_token, stmts },
+             })
+         }
+     }
+ 
+     #[cfg(feature = "full")]
+     impl Parse for ExprMatch {
+         fn parse(input: ParseStream) -> Result<Self> {
++            let outer_attrs = input.call(Attribute::parse_outer)?;
+             let match_token: Token![match] = input.parse()?;
+-            let expr = expr_no_struct(input)?;
++            let expr = Expr::parse_without_eager_brace(input)?;
+ 
+             let content;
+             let brace_token = braced!(content in input);
+             let inner_attrs = content.call(Attribute::parse_inner)?;
+ 
+             let mut arms = Vec::new();
+             while !content.is_empty() {
+                 arms.push(content.call(Arm::parse)?);
+             }
+ 
+             Ok(ExprMatch {
+-                attrs: inner_attrs,
++                attrs: private::attrs(outer_attrs, inner_attrs),
+                 match_token,
+                 expr: Box::new(expr),
+                 brace_token,
+                 arms,
+             })
+         }
+     }
+ 
+@@ -2300,27 +2242,28 @@ pub(crate) mod parsing {
+             }
+             Ok(pat)
+         }
+     }
+ 
+     #[cfg(feature = "full")]
+     impl Parse for ExprWhile {
+         fn parse(input: ParseStream) -> Result<Self> {
++            let outer_attrs = input.call(Attribute::parse_outer)?;
+             let label: Option<Label> = input.parse()?;
+             let while_token: Token![while] = input.parse()?;
+-            let cond = expr_no_struct(input)?;
++            let cond = Expr::parse_without_eager_brace(input)?;
+ 
+             let content;
+             let brace_token = braced!(content in input);
+             let inner_attrs = content.call(Attribute::parse_inner)?;
+             let stmts = content.call(Block::parse_within)?;
+ 
+             Ok(ExprWhile {
+-                attrs: inner_attrs,
++                attrs: private::attrs(outer_attrs, inner_attrs),
+                 label,
+                 while_token,
+                 cond: Box::new(cond),
+                 body: Block { brace_token, stmts },
+             })
+         }
+     }
+ 
+@@ -2394,16 +2337,17 @@ pub(crate) mod parsing {
+                 }
+             },
+         })
+     }
+ 
+     #[cfg(feature = "full")]
+     impl Parse for FieldValue {
+         fn parse(input: ParseStream) -> Result<Self> {
++            let attrs = input.call(Attribute::parse_outer)?;
+             let member: Member = input.parse()?;
+             let (colon_token, value) = if input.peek(Token![:]) || !member.is_named() {
+                 let colon_token: Token![:] = input.parse()?;
+                 let value: Expr = input.parse()?;
+                 (Some(colon_token), value)
+             } else if let Member::Named(ident) = &member {
+                 let value = Expr::Path(ExprPath {
+                     attrs: Vec::new(),
+@@ -2411,73 +2355,63 @@ pub(crate) mod parsing {
+                     path: Path::from(ident.clone()),
+                 });
+                 (None, value)
+             } else {
+                 unreachable!()
+             };
+ 
+             Ok(FieldValue {
+-                attrs: Vec::new(),
++                attrs,
+                 member,
+                 colon_token,
+                 expr: value,
+             })
+         }
+     }
+ 
+     #[cfg(feature = "full")]
+     fn expr_struct_helper(
+         input: ParseStream,
+         outer_attrs: Vec<Attribute>,
+         path: Path,
+     ) -> Result<ExprStruct> {
+         let content;
+         let brace_token = braced!(content in input);
+         let inner_attrs = content.call(Attribute::parse_inner)?;
++        let attrs = private::attrs(outer_attrs, inner_attrs);
+ 
+         let mut fields = Punctuated::new();
+-        loop {
+-            let attrs = content.call(Attribute::parse_outer)?;
+-            // TODO: optimize using advance_to
+-            if content.fork().parse::<Member>().is_err() {
+-                if attrs.is_empty() {
+-                    break;
+-                } else {
+-                    return Err(content.error("expected struct field"));
+-                }
++        while !content.is_empty() {
++            if content.peek(Token![..]) {
++                return Ok(ExprStruct {
++                    attrs,
++                    brace_token,
++                    path,
++                    fields,
++                    dot2_token: Some(content.parse()?),
++                    rest: Some(Box::new(content.parse()?)),
++                });
+             }
+ 
+-            fields.push(FieldValue {
+-                attrs,
+-                ..content.parse()?
+-            });
+-
+-            if !content.peek(Token![,]) {
++            fields.push(content.parse()?);
++            if content.is_empty() {
+                 break;
+             }
+             let punct: Token![,] = content.parse()?;
+             fields.push_punct(punct);
+         }
+ 
+-        let (dot2_token, rest) = if fields.empty_or_trailing() && content.peek(Token![..]) {
+-            let dot2_token: Token![..] = content.parse()?;
+-            let rest: Expr = content.parse()?;
+-            (Some(dot2_token), Some(Box::new(rest)))
+-        } else {
+-            (None, None)
+-        };
+-
+         Ok(ExprStruct {
+-            attrs: private::attrs(outer_attrs, inner_attrs),
++            attrs,
+             brace_token,
+             path,
+             fields,
+-            dot2_token,
+-            rest,
++            dot2_token: None,
++            rest: None,
+         })
+     }
+ 
+     #[cfg(feature = "full")]
+     fn expr_unsafe(input: ParseStream) -> Result<ExprUnsafe> {
+         let unsafe_token: Token![unsafe] = input.parse()?;
+ 
+         let content;
+@@ -2572,37 +2506,17 @@ pub(crate) mod parsing {
+     }
+ 
+     #[cfg(feature = "full")]
+     impl Parse for Arm {
+         fn parse(input: ParseStream) -> Result<Arm> {
+             let requires_comma;
+             Ok(Arm {
+                 attrs: input.call(Attribute::parse_outer)?,
+-                pat: {
+-                    let leading_vert: Option<Token![|]> = input.parse()?;
+-                    let pat: Pat = input.parse()?;
+-                    if leading_vert.is_some() || input.peek(Token![|]) {
+-                        let mut cases = Punctuated::new();
+-                        cases.push_value(pat);
+-                        while input.peek(Token![|]) {
+-                            let punct = input.parse()?;
+-                            cases.push_punct(punct);
+-                            let pat: Pat = input.parse()?;
+-                            cases.push_value(pat);
+-                        }
+-                        Pat::Or(PatOr {
+-                            attrs: Vec::new(),
+-                            leading_vert,
+-                            cases,
+-                        })
+-                    } else {
+-                        pat
+-                    }
+-                },
++                pat: pat::parsing::multi_pat_with_leading_vert(input)?,
+                 guard: {
+                     if input.peek(Token![if]) {
+                         let if_token: Token![if] = input.parse()?;
+                         let guard: Expr = input.parse()?;
+                         Some((if_token, Box::new(guard)))
+                     } else {
+                         None
+                     }
+@@ -2636,16 +2550,36 @@ pub(crate) mod parsing {
+                     span: lit.span(),
+                 })
+             } else {
+                 Err(Error::new(lit.span(), "expected unsuffixed integer"))
+             }
+         }
+     }
+ 
++    fn multi_index(e: &mut Expr, dot_token: &mut Token![.], float: LitFloat) -> Result<bool> {
++        let mut float_repr = float.to_string();
++        let trailing_dot = float_repr.ends_with('.');
++        if trailing_dot {
++            float_repr.truncate(float_repr.len() - 1);
++        }
++        for part in float_repr.split('.') {
++            let index = crate::parse_str(part).map_err(|err| Error::new(float.span(), err))?;
++            let base = mem::replace(e, Expr::__Nonexhaustive);
++            *e = Expr::Field(ExprField {
++                attrs: Vec::new(),
++                base: Box::new(base),
++                dot_token: Token![.](dot_token.span),
++                member: Member::Unnamed(index),
++            });
++            *dot_token = Token![.](float.span());
++        }
++        Ok(!trailing_dot)
++    }
++
+     #[cfg(feature = "full")]
+     impl Member {
+         fn is_named(&self) -> bool {
+             match *self {
+                 Member::Named(_) => true,
+                 Member::Unnamed(_) => false,
+             }
+         }
+diff --git a/third_party/rust/syn/src/ext.rs b/third_party/rust/syn/src/ext.rs
+--- a/third_party/rust/syn/src/ext.rs
++++ b/third_party/rust/syn/src/ext.rs
+@@ -1,27 +1,27 @@
+ //! Extension traits to provide parsing methods on foreign types.
+ //!
+-//! *This module is available if Syn is built with the `"parsing"` feature.*
++//! *This module is available only if Syn is built with the `"parsing"` feature.*
+ 
+ use proc_macro2::Ident;
+ 
+ use crate::parse::{ParseStream, Result};
+ 
+ use crate::buffer::Cursor;
+ use crate::parse::Peek;
+ use crate::sealed::lookahead;
+ use crate::token::CustomToken;
+ 
+ /// Additional methods for `Ident` not provided by proc-macro2 or libproc_macro.
+ ///
+ /// This trait is sealed and cannot be implemented for types outside of Syn. It
+ /// is implemented only for `proc_macro2::Ident`.
+ ///
+-/// *This trait is available if Syn is built with the `"parsing"` feature.*
++/// *This trait is available only if Syn is built with the `"parsing"` feature.*
+ pub trait IdentExt: Sized + private::Sealed {
+     /// Parses any identifier including keywords.
+     ///
+     /// This is useful when parsing macro input which allows Rust keywords as
+     /// identifiers.
+     ///
+     /// # Example
+     ///
+@@ -124,12 +124,18 @@ impl lookahead::Sealed for private::Peek
+ 
+ mod private {
+     use proc_macro2::Ident;
+ 
+     pub trait Sealed {}
+ 
+     impl Sealed for Ident {}
+ 
+-    #[derive(Copy, Clone)]
+     pub struct PeekFn;
+     pub struct IdentAny;
++
++    impl Copy for PeekFn {}
++    impl Clone for PeekFn {
++        fn clone(&self) -> Self {
++            *self
++        }
++    }
+ }
+diff --git a/third_party/rust/syn/src/file.rs b/third_party/rust/syn/src/file.rs
+--- a/third_party/rust/syn/src/file.rs
++++ b/third_party/rust/syn/src/file.rs
+@@ -1,14 +1,14 @@
+ use super::*;
+ 
+ ast_struct! {
+     /// A complete file of Rust source code.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only 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.
+     ///
+     /// ```
+     /// use std::env;
+@@ -32,16 +32,18 @@ ast_struct! {
+     ///     };
+     ///
+     ///     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");
++    ///
++    ///     // Debug impl is available if Syn is built with "extra-traits" feature.
+     ///     println!("{:#?}", syntax);
+     /// }
+     /// ```
+     ///
+     /// Running with its own source code as input, this program prints output
+     /// that begins with:
+     ///
+     /// ```text
+diff --git a/third_party/rust/syn/src/gen/clone.rs b/third_party/rust/syn/src/gen/clone.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/src/gen/clone.rs
+@@ -0,0 +1,2051 @@
++// This file is @generated by syn-internal-codegen.
++// It is not intended for manual editing.
++
++#![allow(clippy::clone_on_copy, clippy::expl_impl_clone_on_copy)]
++use crate::*;
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Abi {
++    fn clone(&self) -> Self {
++        Abi {
++            extern_token: self.extern_token.clone(),
++            name: self.name.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for AngleBracketedGenericArguments {
++    fn clone(&self) -> Self {
++        AngleBracketedGenericArguments {
++            colon2_token: self.colon2_token.clone(),
++            lt_token: self.lt_token.clone(),
++            args: self.args.clone(),
++            gt_token: self.gt_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for Arm {
++    fn clone(&self) -> Self {
++        Arm {
++            attrs: self.attrs.clone(),
++            pat: self.pat.clone(),
++            guard: self.guard.clone(),
++            fat_arrow_token: self.fat_arrow_token.clone(),
++            body: self.body.clone(),
++            comma: self.comma.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Copy for AttrStyle {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for AttrStyle {
++    fn clone(&self) -> Self {
++        *self
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Attribute {
++    fn clone(&self) -> Self {
++        Attribute {
++            pound_token: self.pound_token.clone(),
++            style: self.style.clone(),
++            bracket_token: self.bracket_token.clone(),
++            path: self.path.clone(),
++            tokens: self.tokens.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for BareFnArg {
++    fn clone(&self) -> Self {
++        BareFnArg {
++            attrs: self.attrs.clone(),
++            name: self.name.clone(),
++            ty: self.ty.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Copy for BinOp {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for BinOp {
++    fn clone(&self) -> Self {
++        *self
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Binding {
++    fn clone(&self) -> Self {
++        Binding {
++            ident: self.ident.clone(),
++            eq_token: self.eq_token.clone(),
++            ty: self.ty.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for Block {
++    fn clone(&self) -> Self {
++        Block {
++            brace_token: self.brace_token.clone(),
++            stmts: self.stmts.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for BoundLifetimes {
++    fn clone(&self) -> Self {
++        BoundLifetimes {
++            for_token: self.for_token.clone(),
++            lt_token: self.lt_token.clone(),
++            lifetimes: self.lifetimes.clone(),
++            gt_token: self.gt_token.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for ConstParam {
++    fn clone(&self) -> Self {
++        ConstParam {
++            attrs: self.attrs.clone(),
++            const_token: self.const_token.clone(),
++            ident: self.ident.clone(),
++            colon_token: self.colon_token.clone(),
++            ty: self.ty.clone(),
++            eq_token: self.eq_token.clone(),
++            default: self.default.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Constraint {
++    fn clone(&self) -> Self {
++        Constraint {
++            ident: self.ident.clone(),
++            colon_token: self.colon_token.clone(),
++            bounds: self.bounds.clone(),
++        }
++    }
++}
++#[cfg(feature = "derive")]
++impl Clone for Data {
++    fn clone(&self) -> Self {
++        match self {
++            Data::Struct(v0) => Data::Struct(v0.clone()),
++            Data::Enum(v0) => Data::Enum(v0.clone()),
++            Data::Union(v0) => Data::Union(v0.clone()),
++        }
++    }
++}
++#[cfg(feature = "derive")]
++impl Clone for DataEnum {
++    fn clone(&self) -> Self {
++        DataEnum {
++            enum_token: self.enum_token.clone(),
++            brace_token: self.brace_token.clone(),
++            variants: self.variants.clone(),
++        }
++    }
++}
++#[cfg(feature = "derive")]
++impl Clone for DataStruct {
++    fn clone(&self) -> Self {
++        DataStruct {
++            struct_token: self.struct_token.clone(),
++            fields: self.fields.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "derive")]
++impl Clone for DataUnion {
++    fn clone(&self) -> Self {
++        DataUnion {
++            union_token: self.union_token.clone(),
++            fields: self.fields.clone(),
++        }
++    }
++}
++#[cfg(feature = "derive")]
++impl Clone for DeriveInput {
++    fn clone(&self) -> Self {
++        DeriveInput {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            ident: self.ident.clone(),
++            generics: self.generics.clone(),
++            data: self.data.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Expr {
++    fn clone(&self) -> Self {
++        match self {
++            #[cfg(feature = "full")]
++            Expr::Array(v0) => Expr::Array(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Assign(v0) => Expr::Assign(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::AssignOp(v0) => Expr::AssignOp(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Async(v0) => Expr::Async(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Await(v0) => Expr::Await(v0.clone()),
++            Expr::Binary(v0) => Expr::Binary(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Block(v0) => Expr::Block(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Box(v0) => Expr::Box(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Break(v0) => Expr::Break(v0.clone()),
++            Expr::Call(v0) => Expr::Call(v0.clone()),
++            Expr::Cast(v0) => Expr::Cast(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Closure(v0) => Expr::Closure(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Continue(v0) => Expr::Continue(v0.clone()),
++            Expr::Field(v0) => Expr::Field(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::ForLoop(v0) => Expr::ForLoop(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Group(v0) => Expr::Group(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::If(v0) => Expr::If(v0.clone()),
++            Expr::Index(v0) => Expr::Index(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Let(v0) => Expr::Let(v0.clone()),
++            Expr::Lit(v0) => Expr::Lit(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Loop(v0) => Expr::Loop(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Macro(v0) => Expr::Macro(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Match(v0) => Expr::Match(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::MethodCall(v0) => Expr::MethodCall(v0.clone()),
++            Expr::Paren(v0) => Expr::Paren(v0.clone()),
++            Expr::Path(v0) => Expr::Path(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Range(v0) => Expr::Range(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Reference(v0) => Expr::Reference(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Repeat(v0) => Expr::Repeat(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Return(v0) => Expr::Return(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Struct(v0) => Expr::Struct(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Try(v0) => Expr::Try(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::TryBlock(v0) => Expr::TryBlock(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Tuple(v0) => Expr::Tuple(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Type(v0) => Expr::Type(v0.clone()),
++            Expr::Unary(v0) => Expr::Unary(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Unsafe(v0) => Expr::Unsafe(v0.clone()),
++            Expr::Verbatim(v0) => Expr::Verbatim(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::While(v0) => Expr::While(v0.clone()),
++            #[cfg(feature = "full")]
++            Expr::Yield(v0) => Expr::Yield(v0.clone()),
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprArray {
++    fn clone(&self) -> Self {
++        ExprArray {
++            attrs: self.attrs.clone(),
++            bracket_token: self.bracket_token.clone(),
++            elems: self.elems.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprAssign {
++    fn clone(&self) -> Self {
++        ExprAssign {
++            attrs: self.attrs.clone(),
++            left: self.left.clone(),
++            eq_token: self.eq_token.clone(),
++            right: self.right.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprAssignOp {
++    fn clone(&self) -> Self {
++        ExprAssignOp {
++            attrs: self.attrs.clone(),
++            left: self.left.clone(),
++            op: self.op.clone(),
++            right: self.right.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprAsync {
++    fn clone(&self) -> Self {
++        ExprAsync {
++            attrs: self.attrs.clone(),
++            async_token: self.async_token.clone(),
++            capture: self.capture.clone(),
++            block: self.block.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprAwait {
++    fn clone(&self) -> Self {
++        ExprAwait {
++            attrs: self.attrs.clone(),
++            base: self.base.clone(),
++            dot_token: self.dot_token.clone(),
++            await_token: self.await_token.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for ExprBinary {
++    fn clone(&self) -> Self {
++        ExprBinary {
++            attrs: self.attrs.clone(),
++            left: self.left.clone(),
++            op: self.op.clone(),
++            right: self.right.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprBlock {
++    fn clone(&self) -> Self {
++        ExprBlock {
++            attrs: self.attrs.clone(),
++            label: self.label.clone(),
++            block: self.block.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprBox {
++    fn clone(&self) -> Self {
++        ExprBox {
++            attrs: self.attrs.clone(),
++            box_token: self.box_token.clone(),
++            expr: self.expr.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprBreak {
++    fn clone(&self) -> Self {
++        ExprBreak {
++            attrs: self.attrs.clone(),
++            break_token: self.break_token.clone(),
++            label: self.label.clone(),
++            expr: self.expr.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for ExprCall {
++    fn clone(&self) -> Self {
++        ExprCall {
++            attrs: self.attrs.clone(),
++            func: self.func.clone(),
++            paren_token: self.paren_token.clone(),
++            args: self.args.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for ExprCast {
++    fn clone(&self) -> Self {
++        ExprCast {
++            attrs: self.attrs.clone(),
++            expr: self.expr.clone(),
++            as_token: self.as_token.clone(),
++            ty: self.ty.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprClosure {
++    fn clone(&self) -> Self {
++        ExprClosure {
++            attrs: self.attrs.clone(),
++            asyncness: self.asyncness.clone(),
++            movability: self.movability.clone(),
++            capture: self.capture.clone(),
++            or1_token: self.or1_token.clone(),
++            inputs: self.inputs.clone(),
++            or2_token: self.or2_token.clone(),
++            output: self.output.clone(),
++            body: self.body.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprContinue {
++    fn clone(&self) -> Self {
++        ExprContinue {
++            attrs: self.attrs.clone(),
++            continue_token: self.continue_token.clone(),
++            label: self.label.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for ExprField {
++    fn clone(&self) -> Self {
++        ExprField {
++            attrs: self.attrs.clone(),
++            base: self.base.clone(),
++            dot_token: self.dot_token.clone(),
++            member: self.member.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprForLoop {
++    fn clone(&self) -> Self {
++        ExprForLoop {
++            attrs: self.attrs.clone(),
++            label: self.label.clone(),
++            for_token: self.for_token.clone(),
++            pat: self.pat.clone(),
++            in_token: self.in_token.clone(),
++            expr: self.expr.clone(),
++            body: self.body.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprGroup {
++    fn clone(&self) -> Self {
++        ExprGroup {
++            attrs: self.attrs.clone(),
++            group_token: self.group_token.clone(),
++            expr: self.expr.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprIf {
++    fn clone(&self) -> Self {
++        ExprIf {
++            attrs: self.attrs.clone(),
++            if_token: self.if_token.clone(),
++            cond: self.cond.clone(),
++            then_branch: self.then_branch.clone(),
++            else_branch: self.else_branch.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for ExprIndex {
++    fn clone(&self) -> Self {
++        ExprIndex {
++            attrs: self.attrs.clone(),
++            expr: self.expr.clone(),
++            bracket_token: self.bracket_token.clone(),
++            index: self.index.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprLet {
++    fn clone(&self) -> Self {
++        ExprLet {
++            attrs: self.attrs.clone(),
++            let_token: self.let_token.clone(),
++            pat: self.pat.clone(),
++            eq_token: self.eq_token.clone(),
++            expr: self.expr.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for ExprLit {
++    fn clone(&self) -> Self {
++        ExprLit {
++            attrs: self.attrs.clone(),
++            lit: self.lit.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprLoop {
++    fn clone(&self) -> Self {
++        ExprLoop {
++            attrs: self.attrs.clone(),
++            label: self.label.clone(),
++            loop_token: self.loop_token.clone(),
++            body: self.body.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprMacro {
++    fn clone(&self) -> Self {
++        ExprMacro {
++            attrs: self.attrs.clone(),
++            mac: self.mac.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprMatch {
++    fn clone(&self) -> Self {
++        ExprMatch {
++            attrs: self.attrs.clone(),
++            match_token: self.match_token.clone(),
++            expr: self.expr.clone(),
++            brace_token: self.brace_token.clone(),
++            arms: self.arms.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprMethodCall {
++    fn clone(&self) -> Self {
++        ExprMethodCall {
++            attrs: self.attrs.clone(),
++            receiver: self.receiver.clone(),
++            dot_token: self.dot_token.clone(),
++            method: self.method.clone(),
++            turbofish: self.turbofish.clone(),
++            paren_token: self.paren_token.clone(),
++            args: self.args.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for ExprParen {
++    fn clone(&self) -> Self {
++        ExprParen {
++            attrs: self.attrs.clone(),
++            paren_token: self.paren_token.clone(),
++            expr: self.expr.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for ExprPath {
++    fn clone(&self) -> Self {
++        ExprPath {
++            attrs: self.attrs.clone(),
++            qself: self.qself.clone(),
++            path: self.path.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprRange {
++    fn clone(&self) -> Self {
++        ExprRange {
++            attrs: self.attrs.clone(),
++            from: self.from.clone(),
++            limits: self.limits.clone(),
++            to: self.to.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprReference {
++    fn clone(&self) -> Self {
++        ExprReference {
++            attrs: self.attrs.clone(),
++            and_token: self.and_token.clone(),
++            raw: self.raw.clone(),
++            mutability: self.mutability.clone(),
++            expr: self.expr.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprRepeat {
++    fn clone(&self) -> Self {
++        ExprRepeat {
++            attrs: self.attrs.clone(),
++            bracket_token: self.bracket_token.clone(),
++            expr: self.expr.clone(),
++            semi_token: self.semi_token.clone(),
++            len: self.len.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprReturn {
++    fn clone(&self) -> Self {
++        ExprReturn {
++            attrs: self.attrs.clone(),
++            return_token: self.return_token.clone(),
++            expr: self.expr.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprStruct {
++    fn clone(&self) -> Self {
++        ExprStruct {
++            attrs: self.attrs.clone(),
++            path: self.path.clone(),
++            brace_token: self.brace_token.clone(),
++            fields: self.fields.clone(),
++            dot2_token: self.dot2_token.clone(),
++            rest: self.rest.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprTry {
++    fn clone(&self) -> Self {
++        ExprTry {
++            attrs: self.attrs.clone(),
++            expr: self.expr.clone(),
++            question_token: self.question_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprTryBlock {
++    fn clone(&self) -> Self {
++        ExprTryBlock {
++            attrs: self.attrs.clone(),
++            try_token: self.try_token.clone(),
++            block: self.block.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprTuple {
++    fn clone(&self) -> Self {
++        ExprTuple {
++            attrs: self.attrs.clone(),
++            paren_token: self.paren_token.clone(),
++            elems: self.elems.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprType {
++    fn clone(&self) -> Self {
++        ExprType {
++            attrs: self.attrs.clone(),
++            expr: self.expr.clone(),
++            colon_token: self.colon_token.clone(),
++            ty: self.ty.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for ExprUnary {
++    fn clone(&self) -> Self {
++        ExprUnary {
++            attrs: self.attrs.clone(),
++            op: self.op.clone(),
++            expr: self.expr.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprUnsafe {
++    fn clone(&self) -> Self {
++        ExprUnsafe {
++            attrs: self.attrs.clone(),
++            unsafe_token: self.unsafe_token.clone(),
++            block: self.block.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprWhile {
++    fn clone(&self) -> Self {
++        ExprWhile {
++            attrs: self.attrs.clone(),
++            label: self.label.clone(),
++            while_token: self.while_token.clone(),
++            cond: self.cond.clone(),
++            body: self.body.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ExprYield {
++    fn clone(&self) -> Self {
++        ExprYield {
++            attrs: self.attrs.clone(),
++            yield_token: self.yield_token.clone(),
++            expr: self.expr.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Field {
++    fn clone(&self) -> Self {
++        Field {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            ident: self.ident.clone(),
++            colon_token: self.colon_token.clone(),
++            ty: self.ty.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for FieldPat {
++    fn clone(&self) -> Self {
++        FieldPat {
++            attrs: self.attrs.clone(),
++            member: self.member.clone(),
++            colon_token: self.colon_token.clone(),
++            pat: self.pat.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for FieldValue {
++    fn clone(&self) -> Self {
++        FieldValue {
++            attrs: self.attrs.clone(),
++            member: self.member.clone(),
++            colon_token: self.colon_token.clone(),
++            expr: self.expr.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Fields {
++    fn clone(&self) -> Self {
++        match self {
++            Fields::Named(v0) => Fields::Named(v0.clone()),
++            Fields::Unnamed(v0) => Fields::Unnamed(v0.clone()),
++            Fields::Unit => Fields::Unit,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for FieldsNamed {
++    fn clone(&self) -> Self {
++        FieldsNamed {
++            brace_token: self.brace_token.clone(),
++            named: self.named.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for FieldsUnnamed {
++    fn clone(&self) -> Self {
++        FieldsUnnamed {
++            paren_token: self.paren_token.clone(),
++            unnamed: self.unnamed.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for File {
++    fn clone(&self) -> Self {
++        File {
++            shebang: self.shebang.clone(),
++            attrs: self.attrs.clone(),
++            items: self.items.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for FnArg {
++    fn clone(&self) -> Self {
++        match self {
++            FnArg::Receiver(v0) => FnArg::Receiver(v0.clone()),
++            FnArg::Typed(v0) => FnArg::Typed(v0.clone()),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ForeignItem {
++    fn clone(&self) -> Self {
++        match self {
++            ForeignItem::Fn(v0) => ForeignItem::Fn(v0.clone()),
++            ForeignItem::Static(v0) => ForeignItem::Static(v0.clone()),
++            ForeignItem::Type(v0) => ForeignItem::Type(v0.clone()),
++            ForeignItem::Macro(v0) => ForeignItem::Macro(v0.clone()),
++            ForeignItem::Verbatim(v0) => ForeignItem::Verbatim(v0.clone()),
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ForeignItemFn {
++    fn clone(&self) -> Self {
++        ForeignItemFn {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            sig: self.sig.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ForeignItemMacro {
++    fn clone(&self) -> Self {
++        ForeignItemMacro {
++            attrs: self.attrs.clone(),
++            mac: self.mac.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ForeignItemStatic {
++    fn clone(&self) -> Self {
++        ForeignItemStatic {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            static_token: self.static_token.clone(),
++            mutability: self.mutability.clone(),
++            ident: self.ident.clone(),
++            colon_token: self.colon_token.clone(),
++            ty: self.ty.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ForeignItemType {
++    fn clone(&self) -> Self {
++        ForeignItemType {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            type_token: self.type_token.clone(),
++            ident: self.ident.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for GenericArgument {
++    fn clone(&self) -> Self {
++        match self {
++            GenericArgument::Lifetime(v0) => GenericArgument::Lifetime(v0.clone()),
++            GenericArgument::Type(v0) => GenericArgument::Type(v0.clone()),
++            GenericArgument::Binding(v0) => GenericArgument::Binding(v0.clone()),
++            GenericArgument::Constraint(v0) => GenericArgument::Constraint(v0.clone()),
++            GenericArgument::Const(v0) => GenericArgument::Const(v0.clone()),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for GenericMethodArgument {
++    fn clone(&self) -> Self {
++        match self {
++            GenericMethodArgument::Type(v0) => GenericMethodArgument::Type(v0.clone()),
++            GenericMethodArgument::Const(v0) => GenericMethodArgument::Const(v0.clone()),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for GenericParam {
++    fn clone(&self) -> Self {
++        match self {
++            GenericParam::Type(v0) => GenericParam::Type(v0.clone()),
++            GenericParam::Lifetime(v0) => GenericParam::Lifetime(v0.clone()),
++            GenericParam::Const(v0) => GenericParam::Const(v0.clone()),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Generics {
++    fn clone(&self) -> Self {
++        Generics {
++            lt_token: self.lt_token.clone(),
++            params: self.params.clone(),
++            gt_token: self.gt_token.clone(),
++            where_clause: self.where_clause.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ImplItem {
++    fn clone(&self) -> Self {
++        match self {
++            ImplItem::Const(v0) => ImplItem::Const(v0.clone()),
++            ImplItem::Method(v0) => ImplItem::Method(v0.clone()),
++            ImplItem::Type(v0) => ImplItem::Type(v0.clone()),
++            ImplItem::Macro(v0) => ImplItem::Macro(v0.clone()),
++            ImplItem::Verbatim(v0) => ImplItem::Verbatim(v0.clone()),
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ImplItemConst {
++    fn clone(&self) -> Self {
++        ImplItemConst {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            defaultness: self.defaultness.clone(),
++            const_token: self.const_token.clone(),
++            ident: self.ident.clone(),
++            colon_token: self.colon_token.clone(),
++            ty: self.ty.clone(),
++            eq_token: self.eq_token.clone(),
++            expr: self.expr.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ImplItemMacro {
++    fn clone(&self) -> Self {
++        ImplItemMacro {
++            attrs: self.attrs.clone(),
++            mac: self.mac.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ImplItemMethod {
++    fn clone(&self) -> Self {
++        ImplItemMethod {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            defaultness: self.defaultness.clone(),
++            sig: self.sig.clone(),
++            block: self.block.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ImplItemType {
++    fn clone(&self) -> Self {
++        ImplItemType {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            defaultness: self.defaultness.clone(),
++            type_token: self.type_token.clone(),
++            ident: self.ident.clone(),
++            generics: self.generics.clone(),
++            eq_token: self.eq_token.clone(),
++            ty: self.ty.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Index {
++    fn clone(&self) -> Self {
++        Index {
++            index: self.index.clone(),
++            span: self.span.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for Item {
++    fn clone(&self) -> Self {
++        match self {
++            Item::Const(v0) => Item::Const(v0.clone()),
++            Item::Enum(v0) => Item::Enum(v0.clone()),
++            Item::ExternCrate(v0) => Item::ExternCrate(v0.clone()),
++            Item::Fn(v0) => Item::Fn(v0.clone()),
++            Item::ForeignMod(v0) => Item::ForeignMod(v0.clone()),
++            Item::Impl(v0) => Item::Impl(v0.clone()),
++            Item::Macro(v0) => Item::Macro(v0.clone()),
++            Item::Macro2(v0) => Item::Macro2(v0.clone()),
++            Item::Mod(v0) => Item::Mod(v0.clone()),
++            Item::Static(v0) => Item::Static(v0.clone()),
++            Item::Struct(v0) => Item::Struct(v0.clone()),
++            Item::Trait(v0) => Item::Trait(v0.clone()),
++            Item::TraitAlias(v0) => Item::TraitAlias(v0.clone()),
++            Item::Type(v0) => Item::Type(v0.clone()),
++            Item::Union(v0) => Item::Union(v0.clone()),
++            Item::Use(v0) => Item::Use(v0.clone()),
++            Item::Verbatim(v0) => Item::Verbatim(v0.clone()),
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemConst {
++    fn clone(&self) -> Self {
++        ItemConst {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            const_token: self.const_token.clone(),
++            ident: self.ident.clone(),
++            colon_token: self.colon_token.clone(),
++            ty: self.ty.clone(),
++            eq_token: self.eq_token.clone(),
++            expr: self.expr.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemEnum {
++    fn clone(&self) -> Self {
++        ItemEnum {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            enum_token: self.enum_token.clone(),
++            ident: self.ident.clone(),
++            generics: self.generics.clone(),
++            brace_token: self.brace_token.clone(),
++            variants: self.variants.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemExternCrate {
++    fn clone(&self) -> Self {
++        ItemExternCrate {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            extern_token: self.extern_token.clone(),
++            crate_token: self.crate_token.clone(),
++            ident: self.ident.clone(),
++            rename: self.rename.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemFn {
++    fn clone(&self) -> Self {
++        ItemFn {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            sig: self.sig.clone(),
++            block: self.block.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemForeignMod {
++    fn clone(&self) -> Self {
++        ItemForeignMod {
++            attrs: self.attrs.clone(),
++            abi: self.abi.clone(),
++            brace_token: self.brace_token.clone(),
++            items: self.items.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemImpl {
++    fn clone(&self) -> Self {
++        ItemImpl {
++            attrs: self.attrs.clone(),
++            defaultness: self.defaultness.clone(),
++            unsafety: self.unsafety.clone(),
++            impl_token: self.impl_token.clone(),
++            generics: self.generics.clone(),
++            trait_: self.trait_.clone(),
++            self_ty: self.self_ty.clone(),
++            brace_token: self.brace_token.clone(),
++            items: self.items.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemMacro {
++    fn clone(&self) -> Self {
++        ItemMacro {
++            attrs: self.attrs.clone(),
++            ident: self.ident.clone(),
++            mac: self.mac.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemMacro2 {
++    fn clone(&self) -> Self {
++        ItemMacro2 {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            macro_token: self.macro_token.clone(),
++            ident: self.ident.clone(),
++            rules: self.rules.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemMod {
++    fn clone(&self) -> Self {
++        ItemMod {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            mod_token: self.mod_token.clone(),
++            ident: self.ident.clone(),
++            content: self.content.clone(),
++            semi: self.semi.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemStatic {
++    fn clone(&self) -> Self {
++        ItemStatic {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            static_token: self.static_token.clone(),
++            mutability: self.mutability.clone(),
++            ident: self.ident.clone(),
++            colon_token: self.colon_token.clone(),
++            ty: self.ty.clone(),
++            eq_token: self.eq_token.clone(),
++            expr: self.expr.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemStruct {
++    fn clone(&self) -> Self {
++        ItemStruct {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            struct_token: self.struct_token.clone(),
++            ident: self.ident.clone(),
++            generics: self.generics.clone(),
++            fields: self.fields.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemTrait {
++    fn clone(&self) -> Self {
++        ItemTrait {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            unsafety: self.unsafety.clone(),
++            auto_token: self.auto_token.clone(),
++            trait_token: self.trait_token.clone(),
++            ident: self.ident.clone(),
++            generics: self.generics.clone(),
++            colon_token: self.colon_token.clone(),
++            supertraits: self.supertraits.clone(),
++            brace_token: self.brace_token.clone(),
++            items: self.items.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemTraitAlias {
++    fn clone(&self) -> Self {
++        ItemTraitAlias {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            trait_token: self.trait_token.clone(),
++            ident: self.ident.clone(),
++            generics: self.generics.clone(),
++            eq_token: self.eq_token.clone(),
++            bounds: self.bounds.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemType {
++    fn clone(&self) -> Self {
++        ItemType {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            type_token: self.type_token.clone(),
++            ident: self.ident.clone(),
++            generics: self.generics.clone(),
++            eq_token: self.eq_token.clone(),
++            ty: self.ty.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemUnion {
++    fn clone(&self) -> Self {
++        ItemUnion {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            union_token: self.union_token.clone(),
++            ident: self.ident.clone(),
++            generics: self.generics.clone(),
++            fields: self.fields.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for ItemUse {
++    fn clone(&self) -> Self {
++        ItemUse {
++            attrs: self.attrs.clone(),
++            vis: self.vis.clone(),
++            use_token: self.use_token.clone(),
++            leading_colon: self.leading_colon.clone(),
++            tree: self.tree.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for Label {
++    fn clone(&self) -> Self {
++        Label {
++            name: self.name.clone(),
++            colon_token: self.colon_token.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for LifetimeDef {
++    fn clone(&self) -> Self {
++        LifetimeDef {
++            attrs: self.attrs.clone(),
++            lifetime: self.lifetime.clone(),
++            colon_token: self.colon_token.clone(),
++            bounds: self.bounds.clone(),
++        }
++    }
++}
++impl Clone for Lit {
++    fn clone(&self) -> Self {
++        match self {
++            Lit::Str(v0) => Lit::Str(v0.clone()),
++            Lit::ByteStr(v0) => Lit::ByteStr(v0.clone()),
++            Lit::Byte(v0) => Lit::Byte(v0.clone()),
++            Lit::Char(v0) => Lit::Char(v0.clone()),
++            Lit::Int(v0) => Lit::Int(v0.clone()),
++            Lit::Float(v0) => Lit::Float(v0.clone()),
++            Lit::Bool(v0) => Lit::Bool(v0.clone()),
++            Lit::Verbatim(v0) => Lit::Verbatim(v0.clone()),
++        }
++    }
++}
++impl Clone for LitBool {
++    fn clone(&self) -> Self {
++        LitBool {
++            value: self.value.clone(),
++            span: self.span.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for Local {
++    fn clone(&self) -> Self {
++        Local {
++            attrs: self.attrs.clone(),
++            let_token: self.let_token.clone(),
++            pat: self.pat.clone(),
++            init: self.init.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Macro {
++    fn clone(&self) -> Self {
++        Macro {
++            path: self.path.clone(),
++            bang_token: self.bang_token.clone(),
++            delimiter: self.delimiter.clone(),
++            tokens: self.tokens.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for MacroDelimiter {
++    fn clone(&self) -> Self {
++        match self {
++            MacroDelimiter::Paren(v0) => MacroDelimiter::Paren(v0.clone()),
++            MacroDelimiter::Brace(v0) => MacroDelimiter::Brace(v0.clone()),
++            MacroDelimiter::Bracket(v0) => MacroDelimiter::Bracket(v0.clone()),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Member {
++    fn clone(&self) -> Self {
++        match self {
++            Member::Named(v0) => Member::Named(v0.clone()),
++            Member::Unnamed(v0) => Member::Unnamed(v0.clone()),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Meta {
++    fn clone(&self) -> Self {
++        match self {
++            Meta::Path(v0) => Meta::Path(v0.clone()),
++            Meta::List(v0) => Meta::List(v0.clone()),
++            Meta::NameValue(v0) => Meta::NameValue(v0.clone()),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for MetaList {
++    fn clone(&self) -> Self {
++        MetaList {
++            path: self.path.clone(),
++            paren_token: self.paren_token.clone(),
++            nested: self.nested.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for MetaNameValue {
++    fn clone(&self) -> Self {
++        MetaNameValue {
++            path: self.path.clone(),
++            eq_token: self.eq_token.clone(),
++            lit: self.lit.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for MethodTurbofish {
++    fn clone(&self) -> Self {
++        MethodTurbofish {
++            colon2_token: self.colon2_token.clone(),
++            lt_token: self.lt_token.clone(),
++            args: self.args.clone(),
++            gt_token: self.gt_token.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for NestedMeta {
++    fn clone(&self) -> Self {
++        match self {
++            NestedMeta::Meta(v0) => NestedMeta::Meta(v0.clone()),
++            NestedMeta::Lit(v0) => NestedMeta::Lit(v0.clone()),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for ParenthesizedGenericArguments {
++    fn clone(&self) -> Self {
++        ParenthesizedGenericArguments {
++            paren_token: self.paren_token.clone(),
++            inputs: self.inputs.clone(),
++            output: self.output.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for Pat {
++    fn clone(&self) -> Self {
++        match self {
++            Pat::Box(v0) => Pat::Box(v0.clone()),
++            Pat::Ident(v0) => Pat::Ident(v0.clone()),
++            Pat::Lit(v0) => Pat::Lit(v0.clone()),
++            Pat::Macro(v0) => Pat::Macro(v0.clone()),
++            Pat::Or(v0) => Pat::Or(v0.clone()),
++            Pat::Path(v0) => Pat::Path(v0.clone()),
++            Pat::Range(v0) => Pat::Range(v0.clone()),
++            Pat::Reference(v0) => Pat::Reference(v0.clone()),
++            Pat::Rest(v0) => Pat::Rest(v0.clone()),
++            Pat::Slice(v0) => Pat::Slice(v0.clone()),
++            Pat::Struct(v0) => Pat::Struct(v0.clone()),
++            Pat::Tuple(v0) => Pat::Tuple(v0.clone()),
++            Pat::TupleStruct(v0) => Pat::TupleStruct(v0.clone()),
++            Pat::Type(v0) => Pat::Type(v0.clone()),
++            Pat::Verbatim(v0) => Pat::Verbatim(v0.clone()),
++            Pat::Wild(v0) => Pat::Wild(v0.clone()),
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatBox {
++    fn clone(&self) -> Self {
++        PatBox {
++            attrs: self.attrs.clone(),
++            box_token: self.box_token.clone(),
++            pat: self.pat.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatIdent {
++    fn clone(&self) -> Self {
++        PatIdent {
++            attrs: self.attrs.clone(),
++            by_ref: self.by_ref.clone(),
++            mutability: self.mutability.clone(),
++            ident: self.ident.clone(),
++            subpat: self.subpat.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatLit {
++    fn clone(&self) -> Self {
++        PatLit {
++            attrs: self.attrs.clone(),
++            expr: self.expr.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatMacro {
++    fn clone(&self) -> Self {
++        PatMacro {
++            attrs: self.attrs.clone(),
++            mac: self.mac.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatOr {
++    fn clone(&self) -> Self {
++        PatOr {
++            attrs: self.attrs.clone(),
++            leading_vert: self.leading_vert.clone(),
++            cases: self.cases.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatPath {
++    fn clone(&self) -> Self {
++        PatPath {
++            attrs: self.attrs.clone(),
++            qself: self.qself.clone(),
++            path: self.path.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatRange {
++    fn clone(&self) -> Self {
++        PatRange {
++            attrs: self.attrs.clone(),
++            lo: self.lo.clone(),
++            limits: self.limits.clone(),
++            hi: self.hi.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatReference {
++    fn clone(&self) -> Self {
++        PatReference {
++            attrs: self.attrs.clone(),
++            and_token: self.and_token.clone(),
++            mutability: self.mutability.clone(),
++            pat: self.pat.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatRest {
++    fn clone(&self) -> Self {
++        PatRest {
++            attrs: self.attrs.clone(),
++            dot2_token: self.dot2_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatSlice {
++    fn clone(&self) -> Self {
++        PatSlice {
++            attrs: self.attrs.clone(),
++            bracket_token: self.bracket_token.clone(),
++            elems: self.elems.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatStruct {
++    fn clone(&self) -> Self {
++        PatStruct {
++            attrs: self.attrs.clone(),
++            path: self.path.clone(),
++            brace_token: self.brace_token.clone(),
++            fields: self.fields.clone(),
++            dot2_token: self.dot2_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatTuple {
++    fn clone(&self) -> Self {
++        PatTuple {
++            attrs: self.attrs.clone(),
++            paren_token: self.paren_token.clone(),
++            elems: self.elems.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatTupleStruct {
++    fn clone(&self) -> Self {
++        PatTupleStruct {
++            attrs: self.attrs.clone(),
++            path: self.path.clone(),
++            pat: self.pat.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatType {
++    fn clone(&self) -> Self {
++        PatType {
++            attrs: self.attrs.clone(),
++            pat: self.pat.clone(),
++            colon_token: self.colon_token.clone(),
++            ty: self.ty.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for PatWild {
++    fn clone(&self) -> Self {
++        PatWild {
++            attrs: self.attrs.clone(),
++            underscore_token: self.underscore_token.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Path {
++    fn clone(&self) -> Self {
++        Path {
++            leading_colon: self.leading_colon.clone(),
++            segments: self.segments.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for PathArguments {
++    fn clone(&self) -> Self {
++        match self {
++            PathArguments::None => PathArguments::None,
++            PathArguments::AngleBracketed(v0) => PathArguments::AngleBracketed(v0.clone()),
++            PathArguments::Parenthesized(v0) => PathArguments::Parenthesized(v0.clone()),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for PathSegment {
++    fn clone(&self) -> Self {
++        PathSegment {
++            ident: self.ident.clone(),
++            arguments: self.arguments.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for PredicateEq {
++    fn clone(&self) -> Self {
++        PredicateEq {
++            lhs_ty: self.lhs_ty.clone(),
++            eq_token: self.eq_token.clone(),
++            rhs_ty: self.rhs_ty.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for PredicateLifetime {
++    fn clone(&self) -> Self {
++        PredicateLifetime {
++            lifetime: self.lifetime.clone(),
++            colon_token: self.colon_token.clone(),
++            bounds: self.bounds.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for PredicateType {
++    fn clone(&self) -> Self {
++        PredicateType {
++            lifetimes: self.lifetimes.clone(),
++            bounded_ty: self.bounded_ty.clone(),
++            colon_token: self.colon_token.clone(),
++            bounds: self.bounds.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for QSelf {
++    fn clone(&self) -> Self {
++        QSelf {
++            lt_token: self.lt_token.clone(),
++            ty: self.ty.clone(),
++            position: self.position.clone(),
++            as_token: self.as_token.clone(),
++            gt_token: self.gt_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Copy for RangeLimits {}
++#[cfg(feature = "full")]
++impl Clone for RangeLimits {
++    fn clone(&self) -> Self {
++        *self
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for Receiver {
++    fn clone(&self) -> Self {
++        Receiver {
++            attrs: self.attrs.clone(),
++            reference: self.reference.clone(),
++            mutability: self.mutability.clone(),
++            self_token: self.self_token.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for ReturnType {
++    fn clone(&self) -> Self {
++        match self {
++            ReturnType::Default => ReturnType::Default,
++            ReturnType::Type(v0, v1) => ReturnType::Type(v0.clone(), v1.clone()),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for Signature {
++    fn clone(&self) -> Self {
++        Signature {
++            constness: self.constness.clone(),
++            asyncness: self.asyncness.clone(),
++            unsafety: self.unsafety.clone(),
++            abi: self.abi.clone(),
++            fn_token: self.fn_token.clone(),
++            ident: self.ident.clone(),
++            generics: self.generics.clone(),
++            paren_token: self.paren_token.clone(),
++            inputs: self.inputs.clone(),
++            variadic: self.variadic.clone(),
++            output: self.output.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for Stmt {
++    fn clone(&self) -> Self {
++        match self {
++            Stmt::Local(v0) => Stmt::Local(v0.clone()),
++            Stmt::Item(v0) => Stmt::Item(v0.clone()),
++            Stmt::Expr(v0) => Stmt::Expr(v0.clone()),
++            Stmt::Semi(v0, v1) => Stmt::Semi(v0.clone(), v1.clone()),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TraitBound {
++    fn clone(&self) -> Self {
++        TraitBound {
++            paren_token: self.paren_token.clone(),
++            modifier: self.modifier.clone(),
++            lifetimes: self.lifetimes.clone(),
++            path: self.path.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Copy for TraitBoundModifier {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TraitBoundModifier {
++    fn clone(&self) -> Self {
++        *self
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for TraitItem {
++    fn clone(&self) -> Self {
++        match self {
++            TraitItem::Const(v0) => TraitItem::Const(v0.clone()),
++            TraitItem::Method(v0) => TraitItem::Method(v0.clone()),
++            TraitItem::Type(v0) => TraitItem::Type(v0.clone()),
++            TraitItem::Macro(v0) => TraitItem::Macro(v0.clone()),
++            TraitItem::Verbatim(v0) => TraitItem::Verbatim(v0.clone()),
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for TraitItemConst {
++    fn clone(&self) -> Self {
++        TraitItemConst {
++            attrs: self.attrs.clone(),
++            const_token: self.const_token.clone(),
++            ident: self.ident.clone(),
++            colon_token: self.colon_token.clone(),
++            ty: self.ty.clone(),
++            default: self.default.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for TraitItemMacro {
++    fn clone(&self) -> Self {
++        TraitItemMacro {
++            attrs: self.attrs.clone(),
++            mac: self.mac.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for TraitItemMethod {
++    fn clone(&self) -> Self {
++        TraitItemMethod {
++            attrs: self.attrs.clone(),
++            sig: self.sig.clone(),
++            default: self.default.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for TraitItemType {
++    fn clone(&self) -> Self {
++        TraitItemType {
++            attrs: self.attrs.clone(),
++            type_token: self.type_token.clone(),
++            ident: self.ident.clone(),
++            generics: self.generics.clone(),
++            colon_token: self.colon_token.clone(),
++            bounds: self.bounds.clone(),
++            default: self.default.clone(),
++            semi_token: self.semi_token.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Type {
++    fn clone(&self) -> Self {
++        match self {
++            Type::Array(v0) => Type::Array(v0.clone()),
++            Type::BareFn(v0) => Type::BareFn(v0.clone()),
++            Type::Group(v0) => Type::Group(v0.clone()),
++            Type::ImplTrait(v0) => Type::ImplTrait(v0.clone()),
++            Type::Infer(v0) => Type::Infer(v0.clone()),
++            Type::Macro(v0) => Type::Macro(v0.clone()),
++            Type::Never(v0) => Type::Never(v0.clone()),
++            Type::Paren(v0) => Type::Paren(v0.clone()),
++            Type::Path(v0) => Type::Path(v0.clone()),
++            Type::Ptr(v0) => Type::Ptr(v0.clone()),
++            Type::Reference(v0) => Type::Reference(v0.clone()),
++            Type::Slice(v0) => Type::Slice(v0.clone()),
++            Type::TraitObject(v0) => Type::TraitObject(v0.clone()),
++            Type::Tuple(v0) => Type::Tuple(v0.clone()),
++            Type::Verbatim(v0) => Type::Verbatim(v0.clone()),
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypeArray {
++    fn clone(&self) -> Self {
++        TypeArray {
++            bracket_token: self.bracket_token.clone(),
++            elem: self.elem.clone(),
++            semi_token: self.semi_token.clone(),
++            len: self.len.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypeBareFn {
++    fn clone(&self) -> Self {
++        TypeBareFn {
++            lifetimes: self.lifetimes.clone(),
++            unsafety: self.unsafety.clone(),
++            abi: self.abi.clone(),
++            fn_token: self.fn_token.clone(),
++            paren_token: self.paren_token.clone(),
++            inputs: self.inputs.clone(),
++            variadic: self.variadic.clone(),
++            output: self.output.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypeGroup {
++    fn clone(&self) -> Self {
++        TypeGroup {
++            group_token: self.group_token.clone(),
++            elem: self.elem.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypeImplTrait {
++    fn clone(&self) -> Self {
++        TypeImplTrait {
++            impl_token: self.impl_token.clone(),
++            bounds: self.bounds.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypeInfer {
++    fn clone(&self) -> Self {
++        TypeInfer {
++            underscore_token: self.underscore_token.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypeMacro {
++    fn clone(&self) -> Self {
++        TypeMacro {
++            mac: self.mac.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypeNever {
++    fn clone(&self) -> Self {
++        TypeNever {
++            bang_token: self.bang_token.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypeParam {
++    fn clone(&self) -> Self {
++        TypeParam {
++            attrs: self.attrs.clone(),
++            ident: self.ident.clone(),
++            colon_token: self.colon_token.clone(),
++            bounds: self.bounds.clone(),
++            eq_token: self.eq_token.clone(),
++            default: self.default.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypeParamBound {
++    fn clone(&self) -> Self {
++        match self {
++            TypeParamBound::Trait(v0) => TypeParamBound::Trait(v0.clone()),
++            TypeParamBound::Lifetime(v0) => TypeParamBound::Lifetime(v0.clone()),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypeParen {
++    fn clone(&self) -> Self {
++        TypeParen {
++            paren_token: self.paren_token.clone(),
++            elem: self.elem.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypePath {
++    fn clone(&self) -> Self {
++        TypePath {
++            qself: self.qself.clone(),
++            path: self.path.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypePtr {
++    fn clone(&self) -> Self {
++        TypePtr {
++            star_token: self.star_token.clone(),
++            const_token: self.const_token.clone(),
++            mutability: self.mutability.clone(),
++            elem: self.elem.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypeReference {
++    fn clone(&self) -> Self {
++        TypeReference {
++            and_token: self.and_token.clone(),
++            lifetime: self.lifetime.clone(),
++            mutability: self.mutability.clone(),
++            elem: self.elem.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypeSlice {
++    fn clone(&self) -> Self {
++        TypeSlice {
++            bracket_token: self.bracket_token.clone(),
++            elem: self.elem.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypeTraitObject {
++    fn clone(&self) -> Self {
++        TypeTraitObject {
++            dyn_token: self.dyn_token.clone(),
++            bounds: self.bounds.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for TypeTuple {
++    fn clone(&self) -> Self {
++        TypeTuple {
++            paren_token: self.paren_token.clone(),
++            elems: self.elems.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Copy for UnOp {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for UnOp {
++    fn clone(&self) -> Self {
++        *self
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for UseGlob {
++    fn clone(&self) -> Self {
++        UseGlob {
++            star_token: self.star_token.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for UseGroup {
++    fn clone(&self) -> Self {
++        UseGroup {
++            brace_token: self.brace_token.clone(),
++            items: self.items.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for UseName {
++    fn clone(&self) -> Self {
++        UseName {
++            ident: self.ident.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for UsePath {
++    fn clone(&self) -> Self {
++        UsePath {
++            ident: self.ident.clone(),
++            colon2_token: self.colon2_token.clone(),
++            tree: self.tree.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for UseRename {
++    fn clone(&self) -> Self {
++        UseRename {
++            ident: self.ident.clone(),
++            as_token: self.as_token.clone(),
++            rename: self.rename.clone(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Clone for UseTree {
++    fn clone(&self) -> Self {
++        match self {
++            UseTree::Path(v0) => UseTree::Path(v0.clone()),
++            UseTree::Name(v0) => UseTree::Name(v0.clone()),
++            UseTree::Rename(v0) => UseTree::Rename(v0.clone()),
++            UseTree::Glob(v0) => UseTree::Glob(v0.clone()),
++            UseTree::Group(v0) => UseTree::Group(v0.clone()),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Variadic {
++    fn clone(&self) -> Self {
++        Variadic {
++            attrs: self.attrs.clone(),
++            dots: self.dots.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Variant {
++    fn clone(&self) -> Self {
++        Variant {
++            attrs: self.attrs.clone(),
++            ident: self.ident.clone(),
++            fields: self.fields.clone(),
++            discriminant: self.discriminant.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for VisCrate {
++    fn clone(&self) -> Self {
++        VisCrate {
++            crate_token: self.crate_token.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for VisPublic {
++    fn clone(&self) -> Self {
++        VisPublic {
++            pub_token: self.pub_token.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for VisRestricted {
++    fn clone(&self) -> Self {
++        VisRestricted {
++            pub_token: self.pub_token.clone(),
++            paren_token: self.paren_token.clone(),
++            in_token: self.in_token.clone(),
++            path: self.path.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for Visibility {
++    fn clone(&self) -> Self {
++        match self {
++            Visibility::Public(v0) => Visibility::Public(v0.clone()),
++            Visibility::Crate(v0) => Visibility::Crate(v0.clone()),
++            Visibility::Restricted(v0) => Visibility::Restricted(v0.clone()),
++            Visibility::Inherited => Visibility::Inherited,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for WhereClause {
++    fn clone(&self) -> Self {
++        WhereClause {
++            where_token: self.where_token.clone(),
++            predicates: self.predicates.clone(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Clone for WherePredicate {
++    fn clone(&self) -> Self {
++        match self {
++            WherePredicate::Type(v0) => WherePredicate::Type(v0.clone()),
++            WherePredicate::Lifetime(v0) => WherePredicate::Lifetime(v0.clone()),
++            WherePredicate::Eq(v0) => WherePredicate::Eq(v0.clone()),
++        }
++    }
++}
+diff --git a/third_party/rust/syn/src/gen/debug.rs b/third_party/rust/syn/src/gen/debug.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/src/gen/debug.rs
+@@ -0,0 +1,2857 @@
++// This file is @generated by syn-internal-codegen.
++// It is not intended for manual editing.
++
++use crate::*;
++use std::fmt::{self, Debug};
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Abi {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Abi");
++        formatter.field("extern_token", &self.extern_token);
++        formatter.field("name", &self.name);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for AngleBracketedGenericArguments {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("AngleBracketedGenericArguments");
++        formatter.field("colon2_token", &self.colon2_token);
++        formatter.field("lt_token", &self.lt_token);
++        formatter.field("args", &self.args);
++        formatter.field("gt_token", &self.gt_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for Arm {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Arm");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("pat", &self.pat);
++        formatter.field("guard", &self.guard);
++        formatter.field("fat_arrow_token", &self.fat_arrow_token);
++        formatter.field("body", &self.body);
++        formatter.field("comma", &self.comma);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for AttrStyle {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            AttrStyle::Outer => formatter.write_str("Outer"),
++            AttrStyle::Inner(v0) => {
++                let mut formatter = formatter.debug_tuple("Inner");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Attribute {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Attribute");
++        formatter.field("pound_token", &self.pound_token);
++        formatter.field("style", &self.style);
++        formatter.field("bracket_token", &self.bracket_token);
++        formatter.field("path", &self.path);
++        formatter.field("tokens", &self.tokens);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for BareFnArg {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("BareFnArg");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("name", &self.name);
++        formatter.field("ty", &self.ty);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for BinOp {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            BinOp::Add(v0) => {
++                let mut formatter = formatter.debug_tuple("Add");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::Sub(v0) => {
++                let mut formatter = formatter.debug_tuple("Sub");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::Mul(v0) => {
++                let mut formatter = formatter.debug_tuple("Mul");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::Div(v0) => {
++                let mut formatter = formatter.debug_tuple("Div");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::Rem(v0) => {
++                let mut formatter = formatter.debug_tuple("Rem");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::And(v0) => {
++                let mut formatter = formatter.debug_tuple("And");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::Or(v0) => {
++                let mut formatter = formatter.debug_tuple("Or");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::BitXor(v0) => {
++                let mut formatter = formatter.debug_tuple("BitXor");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::BitAnd(v0) => {
++                let mut formatter = formatter.debug_tuple("BitAnd");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::BitOr(v0) => {
++                let mut formatter = formatter.debug_tuple("BitOr");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::Shl(v0) => {
++                let mut formatter = formatter.debug_tuple("Shl");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::Shr(v0) => {
++                let mut formatter = formatter.debug_tuple("Shr");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::Eq(v0) => {
++                let mut formatter = formatter.debug_tuple("Eq");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::Lt(v0) => {
++                let mut formatter = formatter.debug_tuple("Lt");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::Le(v0) => {
++                let mut formatter = formatter.debug_tuple("Le");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::Ne(v0) => {
++                let mut formatter = formatter.debug_tuple("Ne");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::Ge(v0) => {
++                let mut formatter = formatter.debug_tuple("Ge");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::Gt(v0) => {
++                let mut formatter = formatter.debug_tuple("Gt");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::AddEq(v0) => {
++                let mut formatter = formatter.debug_tuple("AddEq");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::SubEq(v0) => {
++                let mut formatter = formatter.debug_tuple("SubEq");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::MulEq(v0) => {
++                let mut formatter = formatter.debug_tuple("MulEq");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::DivEq(v0) => {
++                let mut formatter = formatter.debug_tuple("DivEq");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::RemEq(v0) => {
++                let mut formatter = formatter.debug_tuple("RemEq");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::BitXorEq(v0) => {
++                let mut formatter = formatter.debug_tuple("BitXorEq");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::BitAndEq(v0) => {
++                let mut formatter = formatter.debug_tuple("BitAndEq");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::BitOrEq(v0) => {
++                let mut formatter = formatter.debug_tuple("BitOrEq");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::ShlEq(v0) => {
++                let mut formatter = formatter.debug_tuple("ShlEq");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            BinOp::ShrEq(v0) => {
++                let mut formatter = formatter.debug_tuple("ShrEq");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Binding {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Binding");
++        formatter.field("ident", &self.ident);
++        formatter.field("eq_token", &self.eq_token);
++        formatter.field("ty", &self.ty);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for Block {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Block");
++        formatter.field("brace_token", &self.brace_token);
++        formatter.field("stmts", &self.stmts);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for BoundLifetimes {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("BoundLifetimes");
++        formatter.field("for_token", &self.for_token);
++        formatter.field("lt_token", &self.lt_token);
++        formatter.field("lifetimes", &self.lifetimes);
++        formatter.field("gt_token", &self.gt_token);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for ConstParam {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ConstParam");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("const_token", &self.const_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("ty", &self.ty);
++        formatter.field("eq_token", &self.eq_token);
++        formatter.field("default", &self.default);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Constraint {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Constraint");
++        formatter.field("ident", &self.ident);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("bounds", &self.bounds);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "derive")]
++impl Debug for Data {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            Data::Struct(v0) => {
++                let mut formatter = formatter.debug_tuple("Struct");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Data::Enum(v0) => {
++                let mut formatter = formatter.debug_tuple("Enum");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Data::Union(v0) => {
++                let mut formatter = formatter.debug_tuple("Union");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(feature = "derive")]
++impl Debug for DataEnum {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("DataEnum");
++        formatter.field("enum_token", &self.enum_token);
++        formatter.field("brace_token", &self.brace_token);
++        formatter.field("variants", &self.variants);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "derive")]
++impl Debug for DataStruct {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("DataStruct");
++        formatter.field("struct_token", &self.struct_token);
++        formatter.field("fields", &self.fields);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "derive")]
++impl Debug for DataUnion {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("DataUnion");
++        formatter.field("union_token", &self.union_token);
++        formatter.field("fields", &self.fields);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "derive")]
++impl Debug for DeriveInput {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("DeriveInput");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("ident", &self.ident);
++        formatter.field("generics", &self.generics);
++        formatter.field("data", &self.data);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Expr {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            #[cfg(feature = "full")]
++            Expr::Array(v0) => {
++                let mut formatter = formatter.debug_tuple("Array");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Assign(v0) => {
++                let mut formatter = formatter.debug_tuple("Assign");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::AssignOp(v0) => {
++                let mut formatter = formatter.debug_tuple("AssignOp");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Async(v0) => {
++                let mut formatter = formatter.debug_tuple("Async");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Await(v0) => {
++                let mut formatter = formatter.debug_tuple("Await");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Expr::Binary(v0) => {
++                let mut formatter = formatter.debug_tuple("Binary");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Block(v0) => {
++                let mut formatter = formatter.debug_tuple("Block");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Box(v0) => {
++                let mut formatter = formatter.debug_tuple("Box");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Break(v0) => {
++                let mut formatter = formatter.debug_tuple("Break");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Expr::Call(v0) => {
++                let mut formatter = formatter.debug_tuple("Call");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Expr::Cast(v0) => {
++                let mut formatter = formatter.debug_tuple("Cast");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Closure(v0) => {
++                let mut formatter = formatter.debug_tuple("Closure");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Continue(v0) => {
++                let mut formatter = formatter.debug_tuple("Continue");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Expr::Field(v0) => {
++                let mut formatter = formatter.debug_tuple("Field");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::ForLoop(v0) => {
++                let mut formatter = formatter.debug_tuple("ForLoop");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Group(v0) => {
++                let mut formatter = formatter.debug_tuple("Group");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::If(v0) => {
++                let mut formatter = formatter.debug_tuple("If");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Expr::Index(v0) => {
++                let mut formatter = formatter.debug_tuple("Index");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Let(v0) => {
++                let mut formatter = formatter.debug_tuple("Let");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Expr::Lit(v0) => {
++                let mut formatter = formatter.debug_tuple("Lit");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Loop(v0) => {
++                let mut formatter = formatter.debug_tuple("Loop");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Macro(v0) => {
++                let mut formatter = formatter.debug_tuple("Macro");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Match(v0) => {
++                let mut formatter = formatter.debug_tuple("Match");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::MethodCall(v0) => {
++                let mut formatter = formatter.debug_tuple("MethodCall");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Expr::Paren(v0) => {
++                let mut formatter = formatter.debug_tuple("Paren");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Expr::Path(v0) => {
++                let mut formatter = formatter.debug_tuple("Path");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Range(v0) => {
++                let mut formatter = formatter.debug_tuple("Range");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Reference(v0) => {
++                let mut formatter = formatter.debug_tuple("Reference");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Repeat(v0) => {
++                let mut formatter = formatter.debug_tuple("Repeat");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Return(v0) => {
++                let mut formatter = formatter.debug_tuple("Return");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Struct(v0) => {
++                let mut formatter = formatter.debug_tuple("Struct");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Try(v0) => {
++                let mut formatter = formatter.debug_tuple("Try");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::TryBlock(v0) => {
++                let mut formatter = formatter.debug_tuple("TryBlock");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Tuple(v0) => {
++                let mut formatter = formatter.debug_tuple("Tuple");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Type(v0) => {
++                let mut formatter = formatter.debug_tuple("Type");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Expr::Unary(v0) => {
++                let mut formatter = formatter.debug_tuple("Unary");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Unsafe(v0) => {
++                let mut formatter = formatter.debug_tuple("Unsafe");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Expr::Verbatim(v0) => {
++                let mut formatter = formatter.debug_tuple("Verbatim");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::While(v0) => {
++                let mut formatter = formatter.debug_tuple("While");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            #[cfg(feature = "full")]
++            Expr::Yield(v0) => {
++                let mut formatter = formatter.debug_tuple("Yield");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprArray {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprArray");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("bracket_token", &self.bracket_token);
++        formatter.field("elems", &self.elems);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprAssign {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprAssign");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("left", &self.left);
++        formatter.field("eq_token", &self.eq_token);
++        formatter.field("right", &self.right);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprAssignOp {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprAssignOp");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("left", &self.left);
++        formatter.field("op", &self.op);
++        formatter.field("right", &self.right);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprAsync {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprAsync");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("async_token", &self.async_token);
++        formatter.field("capture", &self.capture);
++        formatter.field("block", &self.block);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprAwait {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprAwait");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("base", &self.base);
++        formatter.field("dot_token", &self.dot_token);
++        formatter.field("await_token", &self.await_token);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for ExprBinary {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprBinary");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("left", &self.left);
++        formatter.field("op", &self.op);
++        formatter.field("right", &self.right);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprBlock {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprBlock");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("label", &self.label);
++        formatter.field("block", &self.block);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprBox {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprBox");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("box_token", &self.box_token);
++        formatter.field("expr", &self.expr);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprBreak {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprBreak");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("break_token", &self.break_token);
++        formatter.field("label", &self.label);
++        formatter.field("expr", &self.expr);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for ExprCall {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprCall");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("func", &self.func);
++        formatter.field("paren_token", &self.paren_token);
++        formatter.field("args", &self.args);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for ExprCast {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprCast");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("expr", &self.expr);
++        formatter.field("as_token", &self.as_token);
++        formatter.field("ty", &self.ty);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprClosure {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprClosure");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("asyncness", &self.asyncness);
++        formatter.field("movability", &self.movability);
++        formatter.field("capture", &self.capture);
++        formatter.field("or1_token", &self.or1_token);
++        formatter.field("inputs", &self.inputs);
++        formatter.field("or2_token", &self.or2_token);
++        formatter.field("output", &self.output);
++        formatter.field("body", &self.body);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprContinue {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprContinue");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("continue_token", &self.continue_token);
++        formatter.field("label", &self.label);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for ExprField {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprField");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("base", &self.base);
++        formatter.field("dot_token", &self.dot_token);
++        formatter.field("member", &self.member);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprForLoop {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprForLoop");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("label", &self.label);
++        formatter.field("for_token", &self.for_token);
++        formatter.field("pat", &self.pat);
++        formatter.field("in_token", &self.in_token);
++        formatter.field("expr", &self.expr);
++        formatter.field("body", &self.body);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprGroup {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprGroup");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("group_token", &self.group_token);
++        formatter.field("expr", &self.expr);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprIf {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprIf");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("if_token", &self.if_token);
++        formatter.field("cond", &self.cond);
++        formatter.field("then_branch", &self.then_branch);
++        formatter.field("else_branch", &self.else_branch);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for ExprIndex {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprIndex");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("expr", &self.expr);
++        formatter.field("bracket_token", &self.bracket_token);
++        formatter.field("index", &self.index);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprLet {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprLet");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("let_token", &self.let_token);
++        formatter.field("pat", &self.pat);
++        formatter.field("eq_token", &self.eq_token);
++        formatter.field("expr", &self.expr);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for ExprLit {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprLit");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("lit", &self.lit);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprLoop {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprLoop");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("label", &self.label);
++        formatter.field("loop_token", &self.loop_token);
++        formatter.field("body", &self.body);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprMacro {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprMacro");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("mac", &self.mac);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprMatch {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprMatch");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("match_token", &self.match_token);
++        formatter.field("expr", &self.expr);
++        formatter.field("brace_token", &self.brace_token);
++        formatter.field("arms", &self.arms);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprMethodCall {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprMethodCall");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("receiver", &self.receiver);
++        formatter.field("dot_token", &self.dot_token);
++        formatter.field("method", &self.method);
++        formatter.field("turbofish", &self.turbofish);
++        formatter.field("paren_token", &self.paren_token);
++        formatter.field("args", &self.args);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for ExprParen {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprParen");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("paren_token", &self.paren_token);
++        formatter.field("expr", &self.expr);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for ExprPath {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprPath");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("qself", &self.qself);
++        formatter.field("path", &self.path);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprRange {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprRange");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("from", &self.from);
++        formatter.field("limits", &self.limits);
++        formatter.field("to", &self.to);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprReference {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprReference");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("and_token", &self.and_token);
++        formatter.field("raw", &self.raw);
++        formatter.field("mutability", &self.mutability);
++        formatter.field("expr", &self.expr);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprRepeat {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprRepeat");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("bracket_token", &self.bracket_token);
++        formatter.field("expr", &self.expr);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.field("len", &self.len);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprReturn {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprReturn");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("return_token", &self.return_token);
++        formatter.field("expr", &self.expr);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprStruct {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprStruct");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("path", &self.path);
++        formatter.field("brace_token", &self.brace_token);
++        formatter.field("fields", &self.fields);
++        formatter.field("dot2_token", &self.dot2_token);
++        formatter.field("rest", &self.rest);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprTry {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprTry");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("expr", &self.expr);
++        formatter.field("question_token", &self.question_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprTryBlock {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprTryBlock");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("try_token", &self.try_token);
++        formatter.field("block", &self.block);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprTuple {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprTuple");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("paren_token", &self.paren_token);
++        formatter.field("elems", &self.elems);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprType {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprType");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("expr", &self.expr);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("ty", &self.ty);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for ExprUnary {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprUnary");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("op", &self.op);
++        formatter.field("expr", &self.expr);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprUnsafe {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprUnsafe");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("unsafe_token", &self.unsafe_token);
++        formatter.field("block", &self.block);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprWhile {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprWhile");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("label", &self.label);
++        formatter.field("while_token", &self.while_token);
++        formatter.field("cond", &self.cond);
++        formatter.field("body", &self.body);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ExprYield {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ExprYield");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("yield_token", &self.yield_token);
++        formatter.field("expr", &self.expr);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Field {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Field");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("ident", &self.ident);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("ty", &self.ty);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for FieldPat {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("FieldPat");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("member", &self.member);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("pat", &self.pat);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for FieldValue {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("FieldValue");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("member", &self.member);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("expr", &self.expr);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Fields {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            Fields::Named(v0) => {
++                let mut formatter = formatter.debug_tuple("Named");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Fields::Unnamed(v0) => {
++                let mut formatter = formatter.debug_tuple("Unnamed");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Fields::Unit => formatter.write_str("Unit"),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for FieldsNamed {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("FieldsNamed");
++        formatter.field("brace_token", &self.brace_token);
++        formatter.field("named", &self.named);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for FieldsUnnamed {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("FieldsUnnamed");
++        formatter.field("paren_token", &self.paren_token);
++        formatter.field("unnamed", &self.unnamed);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for File {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("File");
++        formatter.field("shebang", &self.shebang);
++        formatter.field("attrs", &self.attrs);
++        formatter.field("items", &self.items);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for FnArg {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            FnArg::Receiver(v0) => {
++                let mut formatter = formatter.debug_tuple("Receiver");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            FnArg::Typed(v0) => {
++                let mut formatter = formatter.debug_tuple("Typed");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ForeignItem {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            ForeignItem::Fn(v0) => {
++                let mut formatter = formatter.debug_tuple("Fn");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            ForeignItem::Static(v0) => {
++                let mut formatter = formatter.debug_tuple("Static");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            ForeignItem::Type(v0) => {
++                let mut formatter = formatter.debug_tuple("Type");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            ForeignItem::Macro(v0) => {
++                let mut formatter = formatter.debug_tuple("Macro");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            ForeignItem::Verbatim(v0) => {
++                let mut formatter = formatter.debug_tuple("Verbatim");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ForeignItemFn {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ForeignItemFn");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("sig", &self.sig);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ForeignItemMacro {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ForeignItemMacro");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("mac", &self.mac);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ForeignItemStatic {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ForeignItemStatic");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("static_token", &self.static_token);
++        formatter.field("mutability", &self.mutability);
++        formatter.field("ident", &self.ident);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("ty", &self.ty);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ForeignItemType {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ForeignItemType");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("type_token", &self.type_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for GenericArgument {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            GenericArgument::Lifetime(v0) => {
++                let mut formatter = formatter.debug_tuple("Lifetime");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            GenericArgument::Type(v0) => {
++                let mut formatter = formatter.debug_tuple("Type");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            GenericArgument::Binding(v0) => {
++                let mut formatter = formatter.debug_tuple("Binding");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            GenericArgument::Constraint(v0) => {
++                let mut formatter = formatter.debug_tuple("Constraint");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            GenericArgument::Const(v0) => {
++                let mut formatter = formatter.debug_tuple("Const");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for GenericMethodArgument {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            GenericMethodArgument::Type(v0) => {
++                let mut formatter = formatter.debug_tuple("Type");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            GenericMethodArgument::Const(v0) => {
++                let mut formatter = formatter.debug_tuple("Const");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for GenericParam {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            GenericParam::Type(v0) => {
++                let mut formatter = formatter.debug_tuple("Type");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            GenericParam::Lifetime(v0) => {
++                let mut formatter = formatter.debug_tuple("Lifetime");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            GenericParam::Const(v0) => {
++                let mut formatter = formatter.debug_tuple("Const");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Generics {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Generics");
++        formatter.field("lt_token", &self.lt_token);
++        formatter.field("params", &self.params);
++        formatter.field("gt_token", &self.gt_token);
++        formatter.field("where_clause", &self.where_clause);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ImplItem {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            ImplItem::Const(v0) => {
++                let mut formatter = formatter.debug_tuple("Const");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            ImplItem::Method(v0) => {
++                let mut formatter = formatter.debug_tuple("Method");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            ImplItem::Type(v0) => {
++                let mut formatter = formatter.debug_tuple("Type");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            ImplItem::Macro(v0) => {
++                let mut formatter = formatter.debug_tuple("Macro");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            ImplItem::Verbatim(v0) => {
++                let mut formatter = formatter.debug_tuple("Verbatim");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ImplItemConst {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ImplItemConst");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("defaultness", &self.defaultness);
++        formatter.field("const_token", &self.const_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("ty", &self.ty);
++        formatter.field("eq_token", &self.eq_token);
++        formatter.field("expr", &self.expr);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ImplItemMacro {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ImplItemMacro");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("mac", &self.mac);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ImplItemMethod {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ImplItemMethod");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("defaultness", &self.defaultness);
++        formatter.field("sig", &self.sig);
++        formatter.field("block", &self.block);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ImplItemType {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ImplItemType");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("defaultness", &self.defaultness);
++        formatter.field("type_token", &self.type_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("generics", &self.generics);
++        formatter.field("eq_token", &self.eq_token);
++        formatter.field("ty", &self.ty);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Index {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Index");
++        formatter.field("index", &self.index);
++        formatter.field("span", &self.span);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for Item {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            Item::Const(v0) => {
++                let mut formatter = formatter.debug_tuple("Const");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::Enum(v0) => {
++                let mut formatter = formatter.debug_tuple("Enum");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::ExternCrate(v0) => {
++                let mut formatter = formatter.debug_tuple("ExternCrate");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::Fn(v0) => {
++                let mut formatter = formatter.debug_tuple("Fn");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::ForeignMod(v0) => {
++                let mut formatter = formatter.debug_tuple("ForeignMod");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::Impl(v0) => {
++                let mut formatter = formatter.debug_tuple("Impl");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::Macro(v0) => {
++                let mut formatter = formatter.debug_tuple("Macro");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::Macro2(v0) => {
++                let mut formatter = formatter.debug_tuple("Macro2");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::Mod(v0) => {
++                let mut formatter = formatter.debug_tuple("Mod");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::Static(v0) => {
++                let mut formatter = formatter.debug_tuple("Static");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::Struct(v0) => {
++                let mut formatter = formatter.debug_tuple("Struct");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::Trait(v0) => {
++                let mut formatter = formatter.debug_tuple("Trait");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::TraitAlias(v0) => {
++                let mut formatter = formatter.debug_tuple("TraitAlias");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::Type(v0) => {
++                let mut formatter = formatter.debug_tuple("Type");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::Union(v0) => {
++                let mut formatter = formatter.debug_tuple("Union");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::Use(v0) => {
++                let mut formatter = formatter.debug_tuple("Use");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Item::Verbatim(v0) => {
++                let mut formatter = formatter.debug_tuple("Verbatim");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemConst {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemConst");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("const_token", &self.const_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("ty", &self.ty);
++        formatter.field("eq_token", &self.eq_token);
++        formatter.field("expr", &self.expr);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemEnum {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemEnum");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("enum_token", &self.enum_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("generics", &self.generics);
++        formatter.field("brace_token", &self.brace_token);
++        formatter.field("variants", &self.variants);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemExternCrate {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemExternCrate");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("extern_token", &self.extern_token);
++        formatter.field("crate_token", &self.crate_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("rename", &self.rename);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemFn {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemFn");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("sig", &self.sig);
++        formatter.field("block", &self.block);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemForeignMod {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemForeignMod");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("abi", &self.abi);
++        formatter.field("brace_token", &self.brace_token);
++        formatter.field("items", &self.items);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemImpl {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemImpl");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("defaultness", &self.defaultness);
++        formatter.field("unsafety", &self.unsafety);
++        formatter.field("impl_token", &self.impl_token);
++        formatter.field("generics", &self.generics);
++        formatter.field("trait_", &self.trait_);
++        formatter.field("self_ty", &self.self_ty);
++        formatter.field("brace_token", &self.brace_token);
++        formatter.field("items", &self.items);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemMacro {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemMacro");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("ident", &self.ident);
++        formatter.field("mac", &self.mac);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemMacro2 {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemMacro2");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("macro_token", &self.macro_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("rules", &self.rules);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemMod {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemMod");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("mod_token", &self.mod_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("content", &self.content);
++        formatter.field("semi", &self.semi);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemStatic {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemStatic");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("static_token", &self.static_token);
++        formatter.field("mutability", &self.mutability);
++        formatter.field("ident", &self.ident);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("ty", &self.ty);
++        formatter.field("eq_token", &self.eq_token);
++        formatter.field("expr", &self.expr);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemStruct {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemStruct");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("struct_token", &self.struct_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("generics", &self.generics);
++        formatter.field("fields", &self.fields);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemTrait {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemTrait");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("unsafety", &self.unsafety);
++        formatter.field("auto_token", &self.auto_token);
++        formatter.field("trait_token", &self.trait_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("generics", &self.generics);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("supertraits", &self.supertraits);
++        formatter.field("brace_token", &self.brace_token);
++        formatter.field("items", &self.items);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemTraitAlias {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemTraitAlias");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("trait_token", &self.trait_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("generics", &self.generics);
++        formatter.field("eq_token", &self.eq_token);
++        formatter.field("bounds", &self.bounds);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemType {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemType");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("type_token", &self.type_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("generics", &self.generics);
++        formatter.field("eq_token", &self.eq_token);
++        formatter.field("ty", &self.ty);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemUnion {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemUnion");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("union_token", &self.union_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("generics", &self.generics);
++        formatter.field("fields", &self.fields);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for ItemUse {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ItemUse");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("vis", &self.vis);
++        formatter.field("use_token", &self.use_token);
++        formatter.field("leading_colon", &self.leading_colon);
++        formatter.field("tree", &self.tree);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for Label {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Label");
++        formatter.field("name", &self.name);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.finish()
++    }
++}
++impl Debug for Lifetime {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Lifetime");
++        formatter.field("apostrophe", &self.apostrophe);
++        formatter.field("ident", &self.ident);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for LifetimeDef {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("LifetimeDef");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("lifetime", &self.lifetime);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("bounds", &self.bounds);
++        formatter.finish()
++    }
++}
++impl Debug for Lit {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            Lit::Str(v0) => {
++                let mut formatter = formatter.debug_tuple("Str");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Lit::ByteStr(v0) => {
++                let mut formatter = formatter.debug_tuple("ByteStr");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Lit::Byte(v0) => {
++                let mut formatter = formatter.debug_tuple("Byte");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Lit::Char(v0) => {
++                let mut formatter = formatter.debug_tuple("Char");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Lit::Int(v0) => {
++                let mut formatter = formatter.debug_tuple("Int");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Lit::Float(v0) => {
++                let mut formatter = formatter.debug_tuple("Float");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Lit::Bool(v0) => {
++                let mut formatter = formatter.debug_tuple("Bool");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Lit::Verbatim(v0) => {
++                let mut formatter = formatter.debug_tuple("Verbatim");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for Local {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Local");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("let_token", &self.let_token);
++        formatter.field("pat", &self.pat);
++        formatter.field("init", &self.init);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Macro {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Macro");
++        formatter.field("path", &self.path);
++        formatter.field("bang_token", &self.bang_token);
++        formatter.field("delimiter", &self.delimiter);
++        formatter.field("tokens", &self.tokens);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for MacroDelimiter {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            MacroDelimiter::Paren(v0) => {
++                let mut formatter = formatter.debug_tuple("Paren");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            MacroDelimiter::Brace(v0) => {
++                let mut formatter = formatter.debug_tuple("Brace");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            MacroDelimiter::Bracket(v0) => {
++                let mut formatter = formatter.debug_tuple("Bracket");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Member {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            Member::Named(v0) => {
++                let mut formatter = formatter.debug_tuple("Named");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Member::Unnamed(v0) => {
++                let mut formatter = formatter.debug_tuple("Unnamed");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Meta {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            Meta::Path(v0) => {
++                let mut formatter = formatter.debug_tuple("Path");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Meta::List(v0) => {
++                let mut formatter = formatter.debug_tuple("List");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Meta::NameValue(v0) => {
++                let mut formatter = formatter.debug_tuple("NameValue");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for MetaList {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("MetaList");
++        formatter.field("path", &self.path);
++        formatter.field("paren_token", &self.paren_token);
++        formatter.field("nested", &self.nested);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for MetaNameValue {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("MetaNameValue");
++        formatter.field("path", &self.path);
++        formatter.field("eq_token", &self.eq_token);
++        formatter.field("lit", &self.lit);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for MethodTurbofish {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("MethodTurbofish");
++        formatter.field("colon2_token", &self.colon2_token);
++        formatter.field("lt_token", &self.lt_token);
++        formatter.field("args", &self.args);
++        formatter.field("gt_token", &self.gt_token);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for NestedMeta {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            NestedMeta::Meta(v0) => {
++                let mut formatter = formatter.debug_tuple("Meta");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            NestedMeta::Lit(v0) => {
++                let mut formatter = formatter.debug_tuple("Lit");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for ParenthesizedGenericArguments {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("ParenthesizedGenericArguments");
++        formatter.field("paren_token", &self.paren_token);
++        formatter.field("inputs", &self.inputs);
++        formatter.field("output", &self.output);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for Pat {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            Pat::Box(v0) => {
++                let mut formatter = formatter.debug_tuple("Box");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::Ident(v0) => {
++                let mut formatter = formatter.debug_tuple("Ident");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::Lit(v0) => {
++                let mut formatter = formatter.debug_tuple("Lit");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::Macro(v0) => {
++                let mut formatter = formatter.debug_tuple("Macro");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::Or(v0) => {
++                let mut formatter = formatter.debug_tuple("Or");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::Path(v0) => {
++                let mut formatter = formatter.debug_tuple("Path");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::Range(v0) => {
++                let mut formatter = formatter.debug_tuple("Range");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::Reference(v0) => {
++                let mut formatter = formatter.debug_tuple("Reference");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::Rest(v0) => {
++                let mut formatter = formatter.debug_tuple("Rest");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::Slice(v0) => {
++                let mut formatter = formatter.debug_tuple("Slice");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::Struct(v0) => {
++                let mut formatter = formatter.debug_tuple("Struct");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::Tuple(v0) => {
++                let mut formatter = formatter.debug_tuple("Tuple");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::TupleStruct(v0) => {
++                let mut formatter = formatter.debug_tuple("TupleStruct");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::Type(v0) => {
++                let mut formatter = formatter.debug_tuple("Type");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::Verbatim(v0) => {
++                let mut formatter = formatter.debug_tuple("Verbatim");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Pat::Wild(v0) => {
++                let mut formatter = formatter.debug_tuple("Wild");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatBox {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatBox");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("box_token", &self.box_token);
++        formatter.field("pat", &self.pat);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatIdent {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatIdent");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("by_ref", &self.by_ref);
++        formatter.field("mutability", &self.mutability);
++        formatter.field("ident", &self.ident);
++        formatter.field("subpat", &self.subpat);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatLit {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatLit");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("expr", &self.expr);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatMacro {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatMacro");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("mac", &self.mac);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatOr {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatOr");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("leading_vert", &self.leading_vert);
++        formatter.field("cases", &self.cases);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatPath {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatPath");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("qself", &self.qself);
++        formatter.field("path", &self.path);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatRange {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatRange");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("lo", &self.lo);
++        formatter.field("limits", &self.limits);
++        formatter.field("hi", &self.hi);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatReference {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatReference");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("and_token", &self.and_token);
++        formatter.field("mutability", &self.mutability);
++        formatter.field("pat", &self.pat);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatRest {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatRest");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("dot2_token", &self.dot2_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatSlice {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatSlice");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("bracket_token", &self.bracket_token);
++        formatter.field("elems", &self.elems);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatStruct {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatStruct");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("path", &self.path);
++        formatter.field("brace_token", &self.brace_token);
++        formatter.field("fields", &self.fields);
++        formatter.field("dot2_token", &self.dot2_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatTuple {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatTuple");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("paren_token", &self.paren_token);
++        formatter.field("elems", &self.elems);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatTupleStruct {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatTupleStruct");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("path", &self.path);
++        formatter.field("pat", &self.pat);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatType {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatType");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("pat", &self.pat);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("ty", &self.ty);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for PatWild {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PatWild");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("underscore_token", &self.underscore_token);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Path {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Path");
++        formatter.field("leading_colon", &self.leading_colon);
++        formatter.field("segments", &self.segments);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for PathArguments {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            PathArguments::None => formatter.write_str("None"),
++            PathArguments::AngleBracketed(v0) => {
++                let mut formatter = formatter.debug_tuple("AngleBracketed");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            PathArguments::Parenthesized(v0) => {
++                let mut formatter = formatter.debug_tuple("Parenthesized");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for PathSegment {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PathSegment");
++        formatter.field("ident", &self.ident);
++        formatter.field("arguments", &self.arguments);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for PredicateEq {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PredicateEq");
++        formatter.field("lhs_ty", &self.lhs_ty);
++        formatter.field("eq_token", &self.eq_token);
++        formatter.field("rhs_ty", &self.rhs_ty);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for PredicateLifetime {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PredicateLifetime");
++        formatter.field("lifetime", &self.lifetime);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("bounds", &self.bounds);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for PredicateType {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("PredicateType");
++        formatter.field("lifetimes", &self.lifetimes);
++        formatter.field("bounded_ty", &self.bounded_ty);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("bounds", &self.bounds);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for QSelf {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("QSelf");
++        formatter.field("lt_token", &self.lt_token);
++        formatter.field("ty", &self.ty);
++        formatter.field("position", &self.position);
++        formatter.field("as_token", &self.as_token);
++        formatter.field("gt_token", &self.gt_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for RangeLimits {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            RangeLimits::HalfOpen(v0) => {
++                let mut formatter = formatter.debug_tuple("HalfOpen");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            RangeLimits::Closed(v0) => {
++                let mut formatter = formatter.debug_tuple("Closed");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for Receiver {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Receiver");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("reference", &self.reference);
++        formatter.field("mutability", &self.mutability);
++        formatter.field("self_token", &self.self_token);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for ReturnType {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            ReturnType::Default => formatter.write_str("Default"),
++            ReturnType::Type(v0, v1) => {
++                let mut formatter = formatter.debug_tuple("Type");
++                formatter.field(v0);
++                formatter.field(v1);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for Signature {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Signature");
++        formatter.field("constness", &self.constness);
++        formatter.field("asyncness", &self.asyncness);
++        formatter.field("unsafety", &self.unsafety);
++        formatter.field("abi", &self.abi);
++        formatter.field("fn_token", &self.fn_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("generics", &self.generics);
++        formatter.field("paren_token", &self.paren_token);
++        formatter.field("inputs", &self.inputs);
++        formatter.field("variadic", &self.variadic);
++        formatter.field("output", &self.output);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for Stmt {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            Stmt::Local(v0) => {
++                let mut formatter = formatter.debug_tuple("Local");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Stmt::Item(v0) => {
++                let mut formatter = formatter.debug_tuple("Item");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Stmt::Expr(v0) => {
++                let mut formatter = formatter.debug_tuple("Expr");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Stmt::Semi(v0, v1) => {
++                let mut formatter = formatter.debug_tuple("Semi");
++                formatter.field(v0);
++                formatter.field(v1);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TraitBound {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TraitBound");
++        formatter.field("paren_token", &self.paren_token);
++        formatter.field("modifier", &self.modifier);
++        formatter.field("lifetimes", &self.lifetimes);
++        formatter.field("path", &self.path);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TraitBoundModifier {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            TraitBoundModifier::None => formatter.write_str("None"),
++            TraitBoundModifier::Maybe(v0) => {
++                let mut formatter = formatter.debug_tuple("Maybe");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for TraitItem {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            TraitItem::Const(v0) => {
++                let mut formatter = formatter.debug_tuple("Const");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            TraitItem::Method(v0) => {
++                let mut formatter = formatter.debug_tuple("Method");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            TraitItem::Type(v0) => {
++                let mut formatter = formatter.debug_tuple("Type");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            TraitItem::Macro(v0) => {
++                let mut formatter = formatter.debug_tuple("Macro");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            TraitItem::Verbatim(v0) => {
++                let mut formatter = formatter.debug_tuple("Verbatim");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for TraitItemConst {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TraitItemConst");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("const_token", &self.const_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("ty", &self.ty);
++        formatter.field("default", &self.default);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for TraitItemMacro {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TraitItemMacro");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("mac", &self.mac);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for TraitItemMethod {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TraitItemMethod");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("sig", &self.sig);
++        formatter.field("default", &self.default);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for TraitItemType {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TraitItemType");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("type_token", &self.type_token);
++        formatter.field("ident", &self.ident);
++        formatter.field("generics", &self.generics);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("bounds", &self.bounds);
++        formatter.field("default", &self.default);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Type {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            Type::Array(v0) => {
++                let mut formatter = formatter.debug_tuple("Array");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Type::BareFn(v0) => {
++                let mut formatter = formatter.debug_tuple("BareFn");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Type::Group(v0) => {
++                let mut formatter = formatter.debug_tuple("Group");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Type::ImplTrait(v0) => {
++                let mut formatter = formatter.debug_tuple("ImplTrait");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Type::Infer(v0) => {
++                let mut formatter = formatter.debug_tuple("Infer");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Type::Macro(v0) => {
++                let mut formatter = formatter.debug_tuple("Macro");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Type::Never(v0) => {
++                let mut formatter = formatter.debug_tuple("Never");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Type::Paren(v0) => {
++                let mut formatter = formatter.debug_tuple("Paren");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Type::Path(v0) => {
++                let mut formatter = formatter.debug_tuple("Path");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Type::Ptr(v0) => {
++                let mut formatter = formatter.debug_tuple("Ptr");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Type::Reference(v0) => {
++                let mut formatter = formatter.debug_tuple("Reference");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Type::Slice(v0) => {
++                let mut formatter = formatter.debug_tuple("Slice");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Type::TraitObject(v0) => {
++                let mut formatter = formatter.debug_tuple("TraitObject");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Type::Tuple(v0) => {
++                let mut formatter = formatter.debug_tuple("Tuple");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Type::Verbatim(v0) => {
++                let mut formatter = formatter.debug_tuple("Verbatim");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypeArray {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypeArray");
++        formatter.field("bracket_token", &self.bracket_token);
++        formatter.field("elem", &self.elem);
++        formatter.field("semi_token", &self.semi_token);
++        formatter.field("len", &self.len);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypeBareFn {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypeBareFn");
++        formatter.field("lifetimes", &self.lifetimes);
++        formatter.field("unsafety", &self.unsafety);
++        formatter.field("abi", &self.abi);
++        formatter.field("fn_token", &self.fn_token);
++        formatter.field("paren_token", &self.paren_token);
++        formatter.field("inputs", &self.inputs);
++        formatter.field("variadic", &self.variadic);
++        formatter.field("output", &self.output);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypeGroup {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypeGroup");
++        formatter.field("group_token", &self.group_token);
++        formatter.field("elem", &self.elem);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypeImplTrait {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypeImplTrait");
++        formatter.field("impl_token", &self.impl_token);
++        formatter.field("bounds", &self.bounds);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypeInfer {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypeInfer");
++        formatter.field("underscore_token", &self.underscore_token);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypeMacro {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypeMacro");
++        formatter.field("mac", &self.mac);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypeNever {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypeNever");
++        formatter.field("bang_token", &self.bang_token);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypeParam {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypeParam");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("ident", &self.ident);
++        formatter.field("colon_token", &self.colon_token);
++        formatter.field("bounds", &self.bounds);
++        formatter.field("eq_token", &self.eq_token);
++        formatter.field("default", &self.default);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypeParamBound {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            TypeParamBound::Trait(v0) => {
++                let mut formatter = formatter.debug_tuple("Trait");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            TypeParamBound::Lifetime(v0) => {
++                let mut formatter = formatter.debug_tuple("Lifetime");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypeParen {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypeParen");
++        formatter.field("paren_token", &self.paren_token);
++        formatter.field("elem", &self.elem);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypePath {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypePath");
++        formatter.field("qself", &self.qself);
++        formatter.field("path", &self.path);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypePtr {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypePtr");
++        formatter.field("star_token", &self.star_token);
++        formatter.field("const_token", &self.const_token);
++        formatter.field("mutability", &self.mutability);
++        formatter.field("elem", &self.elem);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypeReference {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypeReference");
++        formatter.field("and_token", &self.and_token);
++        formatter.field("lifetime", &self.lifetime);
++        formatter.field("mutability", &self.mutability);
++        formatter.field("elem", &self.elem);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypeSlice {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypeSlice");
++        formatter.field("bracket_token", &self.bracket_token);
++        formatter.field("elem", &self.elem);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypeTraitObject {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypeTraitObject");
++        formatter.field("dyn_token", &self.dyn_token);
++        formatter.field("bounds", &self.bounds);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for TypeTuple {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("TypeTuple");
++        formatter.field("paren_token", &self.paren_token);
++        formatter.field("elems", &self.elems);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for UnOp {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            UnOp::Deref(v0) => {
++                let mut formatter = formatter.debug_tuple("Deref");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            UnOp::Not(v0) => {
++                let mut formatter = formatter.debug_tuple("Not");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            UnOp::Neg(v0) => {
++                let mut formatter = formatter.debug_tuple("Neg");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for UseGlob {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("UseGlob");
++        formatter.field("star_token", &self.star_token);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for UseGroup {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("UseGroup");
++        formatter.field("brace_token", &self.brace_token);
++        formatter.field("items", &self.items);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for UseName {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("UseName");
++        formatter.field("ident", &self.ident);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for UsePath {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("UsePath");
++        formatter.field("ident", &self.ident);
++        formatter.field("colon2_token", &self.colon2_token);
++        formatter.field("tree", &self.tree);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for UseRename {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("UseRename");
++        formatter.field("ident", &self.ident);
++        formatter.field("as_token", &self.as_token);
++        formatter.field("rename", &self.rename);
++        formatter.finish()
++    }
++}
++#[cfg(feature = "full")]
++impl Debug for UseTree {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            UseTree::Path(v0) => {
++                let mut formatter = formatter.debug_tuple("Path");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            UseTree::Name(v0) => {
++                let mut formatter = formatter.debug_tuple("Name");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            UseTree::Rename(v0) => {
++                let mut formatter = formatter.debug_tuple("Rename");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            UseTree::Glob(v0) => {
++                let mut formatter = formatter.debug_tuple("Glob");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            UseTree::Group(v0) => {
++                let mut formatter = formatter.debug_tuple("Group");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Variadic {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Variadic");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("dots", &self.dots);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Variant {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("Variant");
++        formatter.field("attrs", &self.attrs);
++        formatter.field("ident", &self.ident);
++        formatter.field("fields", &self.fields);
++        formatter.field("discriminant", &self.discriminant);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for VisCrate {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("VisCrate");
++        formatter.field("crate_token", &self.crate_token);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for VisPublic {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("VisPublic");
++        formatter.field("pub_token", &self.pub_token);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for VisRestricted {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("VisRestricted");
++        formatter.field("pub_token", &self.pub_token);
++        formatter.field("paren_token", &self.paren_token);
++        formatter.field("in_token", &self.in_token);
++        formatter.field("path", &self.path);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for Visibility {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            Visibility::Public(v0) => {
++                let mut formatter = formatter.debug_tuple("Public");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Visibility::Crate(v0) => {
++                let mut formatter = formatter.debug_tuple("Crate");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Visibility::Restricted(v0) => {
++                let mut formatter = formatter.debug_tuple("Restricted");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            Visibility::Inherited => formatter.write_str("Inherited"),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for WhereClause {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        let mut formatter = formatter.debug_struct("WhereClause");
++        formatter.field("where_token", &self.where_token);
++        formatter.field("predicates", &self.predicates);
++        formatter.finish()
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Debug for WherePredicate {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        match self {
++            WherePredicate::Type(v0) => {
++                let mut formatter = formatter.debug_tuple("Type");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            WherePredicate::Lifetime(v0) => {
++                let mut formatter = formatter.debug_tuple("Lifetime");
++                formatter.field(v0);
++                formatter.finish()
++            }
++            WherePredicate::Eq(v0) => {
++                let mut formatter = formatter.debug_tuple("Eq");
++                formatter.field(v0);
++                formatter.finish()
++            }
++        }
++    }
++}
+diff --git a/third_party/rust/syn/src/gen/eq.rs b/third_party/rust/syn/src/gen/eq.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/src/gen/eq.rs
+@@ -0,0 +1,1930 @@
++// This file is @generated by syn-internal-codegen.
++// It is not intended for manual editing.
++
++#[cfg(any(feature = "derive", feature = "full"))]
++use crate::tt::TokenStreamHelper;
++use crate::*;
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Abi {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Abi {
++    fn eq(&self, other: &Self) -> bool {
++        self.name == other.name
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for AngleBracketedGenericArguments {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for AngleBracketedGenericArguments {
++    fn eq(&self, other: &Self) -> bool {
++        self.colon2_token == other.colon2_token && self.args == other.args
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for Arm {}
++#[cfg(feature = "full")]
++impl PartialEq for Arm {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.pat == other.pat
++            && self.guard == other.guard
++            && self.body == other.body
++            && self.comma == other.comma
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for AttrStyle {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for AttrStyle {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (AttrStyle::Outer, AttrStyle::Outer) => true,
++            (AttrStyle::Inner(_), AttrStyle::Inner(_)) => true,
++            _ => false,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Attribute {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Attribute {
++    fn eq(&self, other: &Self) -> bool {
++        self.style == other.style
++            && self.path == other.path
++            && TokenStreamHelper(&self.tokens) == TokenStreamHelper(&other.tokens)
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for BareFnArg {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for BareFnArg {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.name == other.name && self.ty == other.ty
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for BinOp {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for BinOp {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (BinOp::Add(_), BinOp::Add(_)) => true,
++            (BinOp::Sub(_), BinOp::Sub(_)) => true,
++            (BinOp::Mul(_), BinOp::Mul(_)) => true,
++            (BinOp::Div(_), BinOp::Div(_)) => true,
++            (BinOp::Rem(_), BinOp::Rem(_)) => true,
++            (BinOp::And(_), BinOp::And(_)) => true,
++            (BinOp::Or(_), BinOp::Or(_)) => true,
++            (BinOp::BitXor(_), BinOp::BitXor(_)) => true,
++            (BinOp::BitAnd(_), BinOp::BitAnd(_)) => true,
++            (BinOp::BitOr(_), BinOp::BitOr(_)) => true,
++            (BinOp::Shl(_), BinOp::Shl(_)) => true,
++            (BinOp::Shr(_), BinOp::Shr(_)) => true,
++            (BinOp::Eq(_), BinOp::Eq(_)) => true,
++            (BinOp::Lt(_), BinOp::Lt(_)) => true,
++            (BinOp::Le(_), BinOp::Le(_)) => true,
++            (BinOp::Ne(_), BinOp::Ne(_)) => true,
++            (BinOp::Ge(_), BinOp::Ge(_)) => true,
++            (BinOp::Gt(_), BinOp::Gt(_)) => true,
++            (BinOp::AddEq(_), BinOp::AddEq(_)) => true,
++            (BinOp::SubEq(_), BinOp::SubEq(_)) => true,
++            (BinOp::MulEq(_), BinOp::MulEq(_)) => true,
++            (BinOp::DivEq(_), BinOp::DivEq(_)) => true,
++            (BinOp::RemEq(_), BinOp::RemEq(_)) => true,
++            (BinOp::BitXorEq(_), BinOp::BitXorEq(_)) => true,
++            (BinOp::BitAndEq(_), BinOp::BitAndEq(_)) => true,
++            (BinOp::BitOrEq(_), BinOp::BitOrEq(_)) => true,
++            (BinOp::ShlEq(_), BinOp::ShlEq(_)) => true,
++            (BinOp::ShrEq(_), BinOp::ShrEq(_)) => true,
++            _ => false,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Binding {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Binding {
++    fn eq(&self, other: &Self) -> bool {
++        self.ident == other.ident && self.ty == other.ty
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for Block {}
++#[cfg(feature = "full")]
++impl PartialEq for Block {
++    fn eq(&self, other: &Self) -> bool {
++        self.stmts == other.stmts
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for BoundLifetimes {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for BoundLifetimes {
++    fn eq(&self, other: &Self) -> bool {
++        self.lifetimes == other.lifetimes
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for ConstParam {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for ConstParam {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.ident == other.ident
++            && self.ty == other.ty
++            && self.eq_token == other.eq_token
++            && self.default == other.default
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Constraint {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Constraint {
++    fn eq(&self, other: &Self) -> bool {
++        self.ident == other.ident && self.bounds == other.bounds
++    }
++}
++#[cfg(feature = "derive")]
++impl Eq for Data {}
++#[cfg(feature = "derive")]
++impl PartialEq for Data {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (Data::Struct(self0), Data::Struct(other0)) => self0 == other0,
++            (Data::Enum(self0), Data::Enum(other0)) => self0 == other0,
++            (Data::Union(self0), Data::Union(other0)) => self0 == other0,
++            _ => false,
++        }
++    }
++}
++#[cfg(feature = "derive")]
++impl Eq for DataEnum {}
++#[cfg(feature = "derive")]
++impl PartialEq for DataEnum {
++    fn eq(&self, other: &Self) -> bool {
++        self.variants == other.variants
++    }
++}
++#[cfg(feature = "derive")]
++impl Eq for DataStruct {}
++#[cfg(feature = "derive")]
++impl PartialEq for DataStruct {
++    fn eq(&self, other: &Self) -> bool {
++        self.fields == other.fields && self.semi_token == other.semi_token
++    }
++}
++#[cfg(feature = "derive")]
++impl Eq for DataUnion {}
++#[cfg(feature = "derive")]
++impl PartialEq for DataUnion {
++    fn eq(&self, other: &Self) -> bool {
++        self.fields == other.fields
++    }
++}
++#[cfg(feature = "derive")]
++impl Eq for DeriveInput {}
++#[cfg(feature = "derive")]
++impl PartialEq for DeriveInput {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.ident == other.ident
++            && self.generics == other.generics
++            && self.data == other.data
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Expr {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Expr {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            #[cfg(feature = "full")]
++            (Expr::Array(self0), Expr::Array(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Assign(self0), Expr::Assign(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::AssignOp(self0), Expr::AssignOp(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Async(self0), Expr::Async(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Await(self0), Expr::Await(other0)) => self0 == other0,
++            (Expr::Binary(self0), Expr::Binary(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Block(self0), Expr::Block(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Box(self0), Expr::Box(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Break(self0), Expr::Break(other0)) => self0 == other0,
++            (Expr::Call(self0), Expr::Call(other0)) => self0 == other0,
++            (Expr::Cast(self0), Expr::Cast(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Closure(self0), Expr::Closure(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Continue(self0), Expr::Continue(other0)) => self0 == other0,
++            (Expr::Field(self0), Expr::Field(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::ForLoop(self0), Expr::ForLoop(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Group(self0), Expr::Group(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::If(self0), Expr::If(other0)) => self0 == other0,
++            (Expr::Index(self0), Expr::Index(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Let(self0), Expr::Let(other0)) => self0 == other0,
++            (Expr::Lit(self0), Expr::Lit(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Loop(self0), Expr::Loop(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Macro(self0), Expr::Macro(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Match(self0), Expr::Match(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::MethodCall(self0), Expr::MethodCall(other0)) => self0 == other0,
++            (Expr::Paren(self0), Expr::Paren(other0)) => self0 == other0,
++            (Expr::Path(self0), Expr::Path(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Range(self0), Expr::Range(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Reference(self0), Expr::Reference(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Repeat(self0), Expr::Repeat(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Return(self0), Expr::Return(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Struct(self0), Expr::Struct(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Try(self0), Expr::Try(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::TryBlock(self0), Expr::TryBlock(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Tuple(self0), Expr::Tuple(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Type(self0), Expr::Type(other0)) => self0 == other0,
++            (Expr::Unary(self0), Expr::Unary(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Unsafe(self0), Expr::Unsafe(other0)) => self0 == other0,
++            (Expr::Verbatim(self0), Expr::Verbatim(other0)) => {
++                TokenStreamHelper(self0) == TokenStreamHelper(other0)
++            }
++            #[cfg(feature = "full")]
++            (Expr::While(self0), Expr::While(other0)) => self0 == other0,
++            #[cfg(feature = "full")]
++            (Expr::Yield(self0), Expr::Yield(other0)) => self0 == other0,
++            _ => false,
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprArray {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprArray {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.elems == other.elems
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprAssign {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprAssign {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.left == other.left && self.right == other.right
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprAssignOp {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprAssignOp {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.left == other.left
++            && self.op == other.op
++            && self.right == other.right
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprAsync {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprAsync {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.capture == other.capture && self.block == other.block
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprAwait {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprAwait {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.base == other.base
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for ExprBinary {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for ExprBinary {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.left == other.left
++            && self.op == other.op
++            && self.right == other.right
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprBlock {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprBlock {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.label == other.label && self.block == other.block
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprBox {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprBox {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.expr == other.expr
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprBreak {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprBreak {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.label == other.label && self.expr == other.expr
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for ExprCall {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for ExprCall {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.func == other.func && self.args == other.args
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for ExprCast {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for ExprCast {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.expr == other.expr && self.ty == other.ty
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprClosure {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprClosure {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.asyncness == other.asyncness
++            && self.movability == other.movability
++            && self.capture == other.capture
++            && self.inputs == other.inputs
++            && self.output == other.output
++            && self.body == other.body
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprContinue {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprContinue {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.label == other.label
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for ExprField {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for ExprField {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.base == other.base && self.member == other.member
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprForLoop {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprForLoop {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.label == other.label
++            && self.pat == other.pat
++            && self.expr == other.expr
++            && self.body == other.body
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprGroup {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprGroup {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.expr == other.expr
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprIf {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprIf {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.cond == other.cond
++            && self.then_branch == other.then_branch
++            && self.else_branch == other.else_branch
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for ExprIndex {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for ExprIndex {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.expr == other.expr && self.index == other.index
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprLet {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprLet {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.pat == other.pat && self.expr == other.expr
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for ExprLit {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for ExprLit {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.lit == other.lit
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprLoop {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprLoop {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.label == other.label && self.body == other.body
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprMacro {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprMacro {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.mac == other.mac
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprMatch {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprMatch {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.expr == other.expr && self.arms == other.arms
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprMethodCall {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprMethodCall {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.receiver == other.receiver
++            && self.method == other.method
++            && self.turbofish == other.turbofish
++            && self.args == other.args
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for ExprParen {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for ExprParen {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.expr == other.expr
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for ExprPath {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for ExprPath {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.qself == other.qself && self.path == other.path
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprRange {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprRange {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.from == other.from
++            && self.limits == other.limits
++            && self.to == other.to
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprReference {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprReference {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.mutability == other.mutability && self.expr == other.expr
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprRepeat {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprRepeat {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.expr == other.expr && self.len == other.len
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprReturn {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprReturn {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.expr == other.expr
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprStruct {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprStruct {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.path == other.path
++            && self.fields == other.fields
++            && self.dot2_token == other.dot2_token
++            && self.rest == other.rest
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprTry {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprTry {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.expr == other.expr
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprTryBlock {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprTryBlock {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.block == other.block
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprTuple {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprTuple {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.elems == other.elems
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprType {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprType {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.expr == other.expr && self.ty == other.ty
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for ExprUnary {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for ExprUnary {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.op == other.op && self.expr == other.expr
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprUnsafe {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprUnsafe {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.block == other.block
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprWhile {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprWhile {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.label == other.label
++            && self.cond == other.cond
++            && self.body == other.body
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ExprYield {}
++#[cfg(feature = "full")]
++impl PartialEq for ExprYield {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.expr == other.expr
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Field {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Field {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.ident == other.ident
++            && self.colon_token == other.colon_token
++            && self.ty == other.ty
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for FieldPat {}
++#[cfg(feature = "full")]
++impl PartialEq for FieldPat {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.member == other.member
++            && self.colon_token == other.colon_token
++            && self.pat == other.pat
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for FieldValue {}
++#[cfg(feature = "full")]
++impl PartialEq for FieldValue {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.member == other.member
++            && self.colon_token == other.colon_token
++            && self.expr == other.expr
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Fields {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Fields {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (Fields::Named(self0), Fields::Named(other0)) => self0 == other0,
++            (Fields::Unnamed(self0), Fields::Unnamed(other0)) => self0 == other0,
++            (Fields::Unit, Fields::Unit) => true,
++            _ => false,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for FieldsNamed {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for FieldsNamed {
++    fn eq(&self, other: &Self) -> bool {
++        self.named == other.named
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for FieldsUnnamed {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for FieldsUnnamed {
++    fn eq(&self, other: &Self) -> bool {
++        self.unnamed == other.unnamed
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for File {}
++#[cfg(feature = "full")]
++impl PartialEq for File {
++    fn eq(&self, other: &Self) -> bool {
++        self.shebang == other.shebang && self.attrs == other.attrs && self.items == other.items
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for FnArg {}
++#[cfg(feature = "full")]
++impl PartialEq for FnArg {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (FnArg::Receiver(self0), FnArg::Receiver(other0)) => self0 == other0,
++            (FnArg::Typed(self0), FnArg::Typed(other0)) => self0 == other0,
++            _ => false,
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ForeignItem {}
++#[cfg(feature = "full")]
++impl PartialEq for ForeignItem {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (ForeignItem::Fn(self0), ForeignItem::Fn(other0)) => self0 == other0,
++            (ForeignItem::Static(self0), ForeignItem::Static(other0)) => self0 == other0,
++            (ForeignItem::Type(self0), ForeignItem::Type(other0)) => self0 == other0,
++            (ForeignItem::Macro(self0), ForeignItem::Macro(other0)) => self0 == other0,
++            (ForeignItem::Verbatim(self0), ForeignItem::Verbatim(other0)) => {
++                TokenStreamHelper(self0) == TokenStreamHelper(other0)
++            }
++            _ => false,
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ForeignItemFn {}
++#[cfg(feature = "full")]
++impl PartialEq for ForeignItemFn {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.vis == other.vis && self.sig == other.sig
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ForeignItemMacro {}
++#[cfg(feature = "full")]
++impl PartialEq for ForeignItemMacro {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.mac == other.mac && self.semi_token == other.semi_token
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ForeignItemStatic {}
++#[cfg(feature = "full")]
++impl PartialEq for ForeignItemStatic {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.mutability == other.mutability
++            && self.ident == other.ident
++            && self.ty == other.ty
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ForeignItemType {}
++#[cfg(feature = "full")]
++impl PartialEq for ForeignItemType {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.vis == other.vis && self.ident == other.ident
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for GenericArgument {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for GenericArgument {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (GenericArgument::Lifetime(self0), GenericArgument::Lifetime(other0)) => {
++                self0 == other0
++            }
++            (GenericArgument::Type(self0), GenericArgument::Type(other0)) => self0 == other0,
++            (GenericArgument::Binding(self0), GenericArgument::Binding(other0)) => self0 == other0,
++            (GenericArgument::Constraint(self0), GenericArgument::Constraint(other0)) => {
++                self0 == other0
++            }
++            (GenericArgument::Const(self0), GenericArgument::Const(other0)) => self0 == other0,
++            _ => false,
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for GenericMethodArgument {}
++#[cfg(feature = "full")]
++impl PartialEq for GenericMethodArgument {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (GenericMethodArgument::Type(self0), GenericMethodArgument::Type(other0)) => {
++                self0 == other0
++            }
++            (GenericMethodArgument::Const(self0), GenericMethodArgument::Const(other0)) => {
++                self0 == other0
++            }
++            _ => false,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for GenericParam {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for GenericParam {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (GenericParam::Type(self0), GenericParam::Type(other0)) => self0 == other0,
++            (GenericParam::Lifetime(self0), GenericParam::Lifetime(other0)) => self0 == other0,
++            (GenericParam::Const(self0), GenericParam::Const(other0)) => self0 == other0,
++            _ => false,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Generics {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Generics {
++    fn eq(&self, other: &Self) -> bool {
++        self.lt_token == other.lt_token
++            && self.params == other.params
++            && self.gt_token == other.gt_token
++            && self.where_clause == other.where_clause
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ImplItem {}
++#[cfg(feature = "full")]
++impl PartialEq for ImplItem {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (ImplItem::Const(self0), ImplItem::Const(other0)) => self0 == other0,
++            (ImplItem::Method(self0), ImplItem::Method(other0)) => self0 == other0,
++            (ImplItem::Type(self0), ImplItem::Type(other0)) => self0 == other0,
++            (ImplItem::Macro(self0), ImplItem::Macro(other0)) => self0 == other0,
++            (ImplItem::Verbatim(self0), ImplItem::Verbatim(other0)) => {
++                TokenStreamHelper(self0) == TokenStreamHelper(other0)
++            }
++            _ => false,
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ImplItemConst {}
++#[cfg(feature = "full")]
++impl PartialEq for ImplItemConst {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.defaultness == other.defaultness
++            && self.ident == other.ident
++            && self.ty == other.ty
++            && self.expr == other.expr
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ImplItemMacro {}
++#[cfg(feature = "full")]
++impl PartialEq for ImplItemMacro {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.mac == other.mac && self.semi_token == other.semi_token
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ImplItemMethod {}
++#[cfg(feature = "full")]
++impl PartialEq for ImplItemMethod {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.defaultness == other.defaultness
++            && self.sig == other.sig
++            && self.block == other.block
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ImplItemType {}
++#[cfg(feature = "full")]
++impl PartialEq for ImplItemType {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.defaultness == other.defaultness
++            && self.ident == other.ident
++            && self.generics == other.generics
++            && self.ty == other.ty
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for Item {}
++#[cfg(feature = "full")]
++impl PartialEq for Item {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (Item::Const(self0), Item::Const(other0)) => self0 == other0,
++            (Item::Enum(self0), Item::Enum(other0)) => self0 == other0,
++            (Item::ExternCrate(self0), Item::ExternCrate(other0)) => self0 == other0,
++            (Item::Fn(self0), Item::Fn(other0)) => self0 == other0,
++            (Item::ForeignMod(self0), Item::ForeignMod(other0)) => self0 == other0,
++            (Item::Impl(self0), Item::Impl(other0)) => self0 == other0,
++            (Item::Macro(self0), Item::Macro(other0)) => self0 == other0,
++            (Item::Macro2(self0), Item::Macro2(other0)) => self0 == other0,
++            (Item::Mod(self0), Item::Mod(other0)) => self0 == other0,
++            (Item::Static(self0), Item::Static(other0)) => self0 == other0,
++            (Item::Struct(self0), Item::Struct(other0)) => self0 == other0,
++            (Item::Trait(self0), Item::Trait(other0)) => self0 == other0,
++            (Item::TraitAlias(self0), Item::TraitAlias(other0)) => self0 == other0,
++            (Item::Type(self0), Item::Type(other0)) => self0 == other0,
++            (Item::Union(self0), Item::Union(other0)) => self0 == other0,
++            (Item::Use(self0), Item::Use(other0)) => self0 == other0,
++            (Item::Verbatim(self0), Item::Verbatim(other0)) => {
++                TokenStreamHelper(self0) == TokenStreamHelper(other0)
++            }
++            _ => false,
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemConst {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemConst {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.ident == other.ident
++            && self.ty == other.ty
++            && self.expr == other.expr
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemEnum {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemEnum {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.ident == other.ident
++            && self.generics == other.generics
++            && self.variants == other.variants
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemExternCrate {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemExternCrate {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.ident == other.ident
++            && self.rename == other.rename
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemFn {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemFn {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.sig == other.sig
++            && self.block == other.block
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemForeignMod {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemForeignMod {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.abi == other.abi && self.items == other.items
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemImpl {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemImpl {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.defaultness == other.defaultness
++            && self.unsafety == other.unsafety
++            && self.generics == other.generics
++            && self.trait_ == other.trait_
++            && self.self_ty == other.self_ty
++            && self.items == other.items
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemMacro {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemMacro {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.ident == other.ident
++            && self.mac == other.mac
++            && self.semi_token == other.semi_token
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemMacro2 {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemMacro2 {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.ident == other.ident
++            && TokenStreamHelper(&self.rules) == TokenStreamHelper(&other.rules)
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemMod {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemMod {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.ident == other.ident
++            && self.content == other.content
++            && self.semi == other.semi
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemStatic {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemStatic {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.mutability == other.mutability
++            && self.ident == other.ident
++            && self.ty == other.ty
++            && self.expr == other.expr
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemStruct {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemStruct {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.ident == other.ident
++            && self.generics == other.generics
++            && self.fields == other.fields
++            && self.semi_token == other.semi_token
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemTrait {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemTrait {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.unsafety == other.unsafety
++            && self.auto_token == other.auto_token
++            && self.ident == other.ident
++            && self.generics == other.generics
++            && self.colon_token == other.colon_token
++            && self.supertraits == other.supertraits
++            && self.items == other.items
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemTraitAlias {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemTraitAlias {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.ident == other.ident
++            && self.generics == other.generics
++            && self.bounds == other.bounds
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemType {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemType {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.ident == other.ident
++            && self.generics == other.generics
++            && self.ty == other.ty
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemUnion {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemUnion {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.ident == other.ident
++            && self.generics == other.generics
++            && self.fields == other.fields
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for ItemUse {}
++#[cfg(feature = "full")]
++impl PartialEq for ItemUse {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.vis == other.vis
++            && self.leading_colon == other.leading_colon
++            && self.tree == other.tree
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for Label {}
++#[cfg(feature = "full")]
++impl PartialEq for Label {
++    fn eq(&self, other: &Self) -> bool {
++        self.name == other.name
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for LifetimeDef {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for LifetimeDef {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.lifetime == other.lifetime
++            && self.colon_token == other.colon_token
++            && self.bounds == other.bounds
++    }
++}
++impl Eq for Lit {}
++impl PartialEq for Lit {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (Lit::Str(self0), Lit::Str(other0)) => self0 == other0,
++            (Lit::ByteStr(self0), Lit::ByteStr(other0)) => self0 == other0,
++            (Lit::Byte(self0), Lit::Byte(other0)) => self0 == other0,
++            (Lit::Char(self0), Lit::Char(other0)) => self0 == other0,
++            (Lit::Int(self0), Lit::Int(other0)) => self0 == other0,
++            (Lit::Float(self0), Lit::Float(other0)) => self0 == other0,
++            (Lit::Bool(self0), Lit::Bool(other0)) => self0 == other0,
++            (Lit::Verbatim(self0), Lit::Verbatim(other0)) => {
++                self0.to_string() == other0.to_string()
++            }
++            _ => false,
++        }
++    }
++}
++impl Eq for LitBool {}
++impl PartialEq for LitBool {
++    fn eq(&self, other: &Self) -> bool {
++        self.value == other.value
++    }
++}
++impl Eq for LitByte {}
++impl Eq for LitByteStr {}
++impl Eq for LitChar {}
++impl Eq for LitFloat {}
++impl Eq for LitInt {}
++impl Eq for LitStr {}
++#[cfg(feature = "full")]
++impl Eq for Local {}
++#[cfg(feature = "full")]
++impl PartialEq for Local {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.pat == other.pat && self.init == other.init
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Macro {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Macro {
++    fn eq(&self, other: &Self) -> bool {
++        self.path == other.path
++            && self.delimiter == other.delimiter
++            && TokenStreamHelper(&self.tokens) == TokenStreamHelper(&other.tokens)
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for MacroDelimiter {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for MacroDelimiter {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (MacroDelimiter::Paren(_), MacroDelimiter::Paren(_)) => true,
++            (MacroDelimiter::Brace(_), MacroDelimiter::Brace(_)) => true,
++            (MacroDelimiter::Bracket(_), MacroDelimiter::Bracket(_)) => true,
++            _ => false,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Meta {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Meta {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (Meta::Path(self0), Meta::Path(other0)) => self0 == other0,
++            (Meta::List(self0), Meta::List(other0)) => self0 == other0,
++            (Meta::NameValue(self0), Meta::NameValue(other0)) => self0 == other0,
++            _ => false,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for MetaList {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for MetaList {
++    fn eq(&self, other: &Self) -> bool {
++        self.path == other.path && self.nested == other.nested
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for MetaNameValue {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for MetaNameValue {
++    fn eq(&self, other: &Self) -> bool {
++        self.path == other.path && self.lit == other.lit
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for MethodTurbofish {}
++#[cfg(feature = "full")]
++impl PartialEq for MethodTurbofish {
++    fn eq(&self, other: &Self) -> bool {
++        self.args == other.args
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for NestedMeta {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for NestedMeta {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (NestedMeta::Meta(self0), NestedMeta::Meta(other0)) => self0 == other0,
++            (NestedMeta::Lit(self0), NestedMeta::Lit(other0)) => self0 == other0,
++            _ => false,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for ParenthesizedGenericArguments {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for ParenthesizedGenericArguments {
++    fn eq(&self, other: &Self) -> bool {
++        self.inputs == other.inputs && self.output == other.output
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for Pat {}
++#[cfg(feature = "full")]
++impl PartialEq for Pat {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (Pat::Box(self0), Pat::Box(other0)) => self0 == other0,
++            (Pat::Ident(self0), Pat::Ident(other0)) => self0 == other0,
++            (Pat::Lit(self0), Pat::Lit(other0)) => self0 == other0,
++            (Pat::Macro(self0), Pat::Macro(other0)) => self0 == other0,
++            (Pat::Or(self0), Pat::Or(other0)) => self0 == other0,
++            (Pat::Path(self0), Pat::Path(other0)) => self0 == other0,
++            (Pat::Range(self0), Pat::Range(other0)) => self0 == other0,
++            (Pat::Reference(self0), Pat::Reference(other0)) => self0 == other0,
++            (Pat::Rest(self0), Pat::Rest(other0)) => self0 == other0,
++            (Pat::Slice(self0), Pat::Slice(other0)) => self0 == other0,
++            (Pat::Struct(self0), Pat::Struct(other0)) => self0 == other0,
++            (Pat::Tuple(self0), Pat::Tuple(other0)) => self0 == other0,
++            (Pat::TupleStruct(self0), Pat::TupleStruct(other0)) => self0 == other0,
++            (Pat::Type(self0), Pat::Type(other0)) => self0 == other0,
++            (Pat::Verbatim(self0), Pat::Verbatim(other0)) => {
++                TokenStreamHelper(self0) == TokenStreamHelper(other0)
++            }
++            (Pat::Wild(self0), Pat::Wild(other0)) => self0 == other0,
++            _ => false,
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatBox {}
++#[cfg(feature = "full")]
++impl PartialEq for PatBox {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.pat == other.pat
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatIdent {}
++#[cfg(feature = "full")]
++impl PartialEq for PatIdent {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.by_ref == other.by_ref
++            && self.mutability == other.mutability
++            && self.ident == other.ident
++            && self.subpat == other.subpat
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatLit {}
++#[cfg(feature = "full")]
++impl PartialEq for PatLit {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.expr == other.expr
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatMacro {}
++#[cfg(feature = "full")]
++impl PartialEq for PatMacro {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.mac == other.mac
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatOr {}
++#[cfg(feature = "full")]
++impl PartialEq for PatOr {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.leading_vert == other.leading_vert
++            && self.cases == other.cases
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatPath {}
++#[cfg(feature = "full")]
++impl PartialEq for PatPath {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.qself == other.qself && self.path == other.path
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatRange {}
++#[cfg(feature = "full")]
++impl PartialEq for PatRange {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.lo == other.lo
++            && self.limits == other.limits
++            && self.hi == other.hi
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatReference {}
++#[cfg(feature = "full")]
++impl PartialEq for PatReference {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.mutability == other.mutability && self.pat == other.pat
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatRest {}
++#[cfg(feature = "full")]
++impl PartialEq for PatRest {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatSlice {}
++#[cfg(feature = "full")]
++impl PartialEq for PatSlice {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.elems == other.elems
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatStruct {}
++#[cfg(feature = "full")]
++impl PartialEq for PatStruct {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.path == other.path
++            && self.fields == other.fields
++            && self.dot2_token == other.dot2_token
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatTuple {}
++#[cfg(feature = "full")]
++impl PartialEq for PatTuple {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.elems == other.elems
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatTupleStruct {}
++#[cfg(feature = "full")]
++impl PartialEq for PatTupleStruct {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.path == other.path && self.pat == other.pat
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatType {}
++#[cfg(feature = "full")]
++impl PartialEq for PatType {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.pat == other.pat && self.ty == other.ty
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for PatWild {}
++#[cfg(feature = "full")]
++impl PartialEq for PatWild {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Path {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Path {
++    fn eq(&self, other: &Self) -> bool {
++        self.leading_colon == other.leading_colon && self.segments == other.segments
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for PathArguments {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for PathArguments {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (PathArguments::None, PathArguments::None) => true,
++            (PathArguments::AngleBracketed(self0), PathArguments::AngleBracketed(other0)) => {
++                self0 == other0
++            }
++            (PathArguments::Parenthesized(self0), PathArguments::Parenthesized(other0)) => {
++                self0 == other0
++            }
++            _ => false,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for PathSegment {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for PathSegment {
++    fn eq(&self, other: &Self) -> bool {
++        self.ident == other.ident && self.arguments == other.arguments
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for PredicateEq {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for PredicateEq {
++    fn eq(&self, other: &Self) -> bool {
++        self.lhs_ty == other.lhs_ty && self.rhs_ty == other.rhs_ty
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for PredicateLifetime {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for PredicateLifetime {
++    fn eq(&self, other: &Self) -> bool {
++        self.lifetime == other.lifetime && self.bounds == other.bounds
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for PredicateType {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for PredicateType {
++    fn eq(&self, other: &Self) -> bool {
++        self.lifetimes == other.lifetimes
++            && self.bounded_ty == other.bounded_ty
++            && self.bounds == other.bounds
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for QSelf {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for QSelf {
++    fn eq(&self, other: &Self) -> bool {
++        self.ty == other.ty && self.position == other.position && self.as_token == other.as_token
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for RangeLimits {}
++#[cfg(feature = "full")]
++impl PartialEq for RangeLimits {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (RangeLimits::HalfOpen(_), RangeLimits::HalfOpen(_)) => true,
++            (RangeLimits::Closed(_), RangeLimits::Closed(_)) => true,
++            _ => false,
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for Receiver {}
++#[cfg(feature = "full")]
++impl PartialEq for Receiver {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.reference == other.reference
++            && self.mutability == other.mutability
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for ReturnType {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for ReturnType {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (ReturnType::Default, ReturnType::Default) => true,
++            (ReturnType::Type(_, self1), ReturnType::Type(_, other1)) => self1 == other1,
++            _ => false,
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for Signature {}
++#[cfg(feature = "full")]
++impl PartialEq for Signature {
++    fn eq(&self, other: &Self) -> bool {
++        self.constness == other.constness
++            && self.asyncness == other.asyncness
++            && self.unsafety == other.unsafety
++            && self.abi == other.abi
++            && self.ident == other.ident
++            && self.generics == other.generics
++            && self.inputs == other.inputs
++            && self.variadic == other.variadic
++            && self.output == other.output
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for Stmt {}
++#[cfg(feature = "full")]
++impl PartialEq for Stmt {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (Stmt::Local(self0), Stmt::Local(other0)) => self0 == other0,
++            (Stmt::Item(self0), Stmt::Item(other0)) => self0 == other0,
++            (Stmt::Expr(self0), Stmt::Expr(other0)) => self0 == other0,
++            (Stmt::Semi(self0, _), Stmt::Semi(other0, _)) => self0 == other0,
++            _ => false,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TraitBound {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TraitBound {
++    fn eq(&self, other: &Self) -> bool {
++        self.paren_token == other.paren_token
++            && self.modifier == other.modifier
++            && self.lifetimes == other.lifetimes
++            && self.path == other.path
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TraitBoundModifier {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TraitBoundModifier {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (TraitBoundModifier::None, TraitBoundModifier::None) => true,
++            (TraitBoundModifier::Maybe(_), TraitBoundModifier::Maybe(_)) => true,
++            _ => false,
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for TraitItem {}
++#[cfg(feature = "full")]
++impl PartialEq for TraitItem {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (TraitItem::Const(self0), TraitItem::Const(other0)) => self0 == other0,
++            (TraitItem::Method(self0), TraitItem::Method(other0)) => self0 == other0,
++            (TraitItem::Type(self0), TraitItem::Type(other0)) => self0 == other0,
++            (TraitItem::Macro(self0), TraitItem::Macro(other0)) => self0 == other0,
++            (TraitItem::Verbatim(self0), TraitItem::Verbatim(other0)) => {
++                TokenStreamHelper(self0) == TokenStreamHelper(other0)
++            }
++            _ => false,
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for TraitItemConst {}
++#[cfg(feature = "full")]
++impl PartialEq for TraitItemConst {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.ident == other.ident
++            && self.ty == other.ty
++            && self.default == other.default
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for TraitItemMacro {}
++#[cfg(feature = "full")]
++impl PartialEq for TraitItemMacro {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs && self.mac == other.mac && self.semi_token == other.semi_token
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for TraitItemMethod {}
++#[cfg(feature = "full")]
++impl PartialEq for TraitItemMethod {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.sig == other.sig
++            && self.default == other.default
++            && self.semi_token == other.semi_token
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for TraitItemType {}
++#[cfg(feature = "full")]
++impl PartialEq for TraitItemType {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.ident == other.ident
++            && self.generics == other.generics
++            && self.colon_token == other.colon_token
++            && self.bounds == other.bounds
++            && self.default == other.default
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Type {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Type {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (Type::Array(self0), Type::Array(other0)) => self0 == other0,
++            (Type::BareFn(self0), Type::BareFn(other0)) => self0 == other0,
++            (Type::Group(self0), Type::Group(other0)) => self0 == other0,
++            (Type::ImplTrait(self0), Type::ImplTrait(other0)) => self0 == other0,
++            (Type::Infer(self0), Type::Infer(other0)) => self0 == other0,
++            (Type::Macro(self0), Type::Macro(other0)) => self0 == other0,
++            (Type::Never(self0), Type::Never(other0)) => self0 == other0,
++            (Type::Paren(self0), Type::Paren(other0)) => self0 == other0,
++            (Type::Path(self0), Type::Path(other0)) => self0 == other0,
++            (Type::Ptr(self0), Type::Ptr(other0)) => self0 == other0,
++            (Type::Reference(self0), Type::Reference(other0)) => self0 == other0,
++            (Type::Slice(self0), Type::Slice(other0)) => self0 == other0,
++            (Type::TraitObject(self0), Type::TraitObject(other0)) => self0 == other0,
++            (Type::Tuple(self0), Type::Tuple(other0)) => self0 == other0,
++            (Type::Verbatim(self0), Type::Verbatim(other0)) => {
++                TokenStreamHelper(self0) == TokenStreamHelper(other0)
++            }
++            _ => false,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypeArray {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypeArray {
++    fn eq(&self, other: &Self) -> bool {
++        self.elem == other.elem && self.len == other.len
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypeBareFn {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypeBareFn {
++    fn eq(&self, other: &Self) -> bool {
++        self.lifetimes == other.lifetimes
++            && self.unsafety == other.unsafety
++            && self.abi == other.abi
++            && self.inputs == other.inputs
++            && self.variadic == other.variadic
++            && self.output == other.output
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypeGroup {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypeGroup {
++    fn eq(&self, other: &Self) -> bool {
++        self.elem == other.elem
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypeImplTrait {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypeImplTrait {
++    fn eq(&self, other: &Self) -> bool {
++        self.bounds == other.bounds
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypeInfer {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypeInfer {
++    fn eq(&self, _other: &Self) -> bool {
++        true
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypeMacro {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypeMacro {
++    fn eq(&self, other: &Self) -> bool {
++        self.mac == other.mac
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypeNever {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypeNever {
++    fn eq(&self, _other: &Self) -> bool {
++        true
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypeParam {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypeParam {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.ident == other.ident
++            && self.colon_token == other.colon_token
++            && self.bounds == other.bounds
++            && self.eq_token == other.eq_token
++            && self.default == other.default
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypeParamBound {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypeParamBound {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (TypeParamBound::Trait(self0), TypeParamBound::Trait(other0)) => self0 == other0,
++            (TypeParamBound::Lifetime(self0), TypeParamBound::Lifetime(other0)) => self0 == other0,
++            _ => false,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypeParen {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypeParen {
++    fn eq(&self, other: &Self) -> bool {
++        self.elem == other.elem
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypePath {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypePath {
++    fn eq(&self, other: &Self) -> bool {
++        self.qself == other.qself && self.path == other.path
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypePtr {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypePtr {
++    fn eq(&self, other: &Self) -> bool {
++        self.const_token == other.const_token
++            && self.mutability == other.mutability
++            && self.elem == other.elem
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypeReference {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypeReference {
++    fn eq(&self, other: &Self) -> bool {
++        self.lifetime == other.lifetime
++            && self.mutability == other.mutability
++            && self.elem == other.elem
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypeSlice {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypeSlice {
++    fn eq(&self, other: &Self) -> bool {
++        self.elem == other.elem
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypeTraitObject {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypeTraitObject {
++    fn eq(&self, other: &Self) -> bool {
++        self.dyn_token == other.dyn_token && self.bounds == other.bounds
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for TypeTuple {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for TypeTuple {
++    fn eq(&self, other: &Self) -> bool {
++        self.elems == other.elems
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for UnOp {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for UnOp {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (UnOp::Deref(_), UnOp::Deref(_)) => true,
++            (UnOp::Not(_), UnOp::Not(_)) => true,
++            (UnOp::Neg(_), UnOp::Neg(_)) => true,
++            _ => false,
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for UseGlob {}
++#[cfg(feature = "full")]
++impl PartialEq for UseGlob {
++    fn eq(&self, _other: &Self) -> bool {
++        true
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for UseGroup {}
++#[cfg(feature = "full")]
++impl PartialEq for UseGroup {
++    fn eq(&self, other: &Self) -> bool {
++        self.items == other.items
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for UseName {}
++#[cfg(feature = "full")]
++impl PartialEq for UseName {
++    fn eq(&self, other: &Self) -> bool {
++        self.ident == other.ident
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for UsePath {}
++#[cfg(feature = "full")]
++impl PartialEq for UsePath {
++    fn eq(&self, other: &Self) -> bool {
++        self.ident == other.ident && self.tree == other.tree
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for UseRename {}
++#[cfg(feature = "full")]
++impl PartialEq for UseRename {
++    fn eq(&self, other: &Self) -> bool {
++        self.ident == other.ident && self.rename == other.rename
++    }
++}
++#[cfg(feature = "full")]
++impl Eq for UseTree {}
++#[cfg(feature = "full")]
++impl PartialEq for UseTree {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (UseTree::Path(self0), UseTree::Path(other0)) => self0 == other0,
++            (UseTree::Name(self0), UseTree::Name(other0)) => self0 == other0,
++            (UseTree::Rename(self0), UseTree::Rename(other0)) => self0 == other0,
++            (UseTree::Glob(self0), UseTree::Glob(other0)) => self0 == other0,
++            (UseTree::Group(self0), UseTree::Group(other0)) => self0 == other0,
++            _ => false,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Variadic {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Variadic {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Variant {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Variant {
++    fn eq(&self, other: &Self) -> bool {
++        self.attrs == other.attrs
++            && self.ident == other.ident
++            && self.fields == other.fields
++            && self.discriminant == other.discriminant
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for VisCrate {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for VisCrate {
++    fn eq(&self, _other: &Self) -> bool {
++        true
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for VisPublic {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for VisPublic {
++    fn eq(&self, _other: &Self) -> bool {
++        true
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for VisRestricted {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for VisRestricted {
++    fn eq(&self, other: &Self) -> bool {
++        self.in_token == other.in_token && self.path == other.path
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for Visibility {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for Visibility {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (Visibility::Public(self0), Visibility::Public(other0)) => self0 == other0,
++            (Visibility::Crate(self0), Visibility::Crate(other0)) => self0 == other0,
++            (Visibility::Restricted(self0), Visibility::Restricted(other0)) => self0 == other0,
++            (Visibility::Inherited, Visibility::Inherited) => true,
++            _ => false,
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for WhereClause {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for WhereClause {
++    fn eq(&self, other: &Self) -> bool {
++        self.predicates == other.predicates
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Eq for WherePredicate {}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl PartialEq for WherePredicate {
++    fn eq(&self, other: &Self) -> bool {
++        match (self, other) {
++            (WherePredicate::Type(self0), WherePredicate::Type(other0)) => self0 == other0,
++            (WherePredicate::Lifetime(self0), WherePredicate::Lifetime(other0)) => self0 == other0,
++            (WherePredicate::Eq(self0), WherePredicate::Eq(other0)) => self0 == other0,
++            _ => false,
++        }
++    }
++}
+diff --git a/third_party/rust/syn/src/gen/fold.rs b/third_party/rust/syn/src/gen/fold.rs
+--- a/third_party/rust/syn/src/gen/fold.rs
++++ b/third_party/rust/syn/src/gen/fold.rs
+@@ -1,12 +1,13 @@
+ // This file is @generated by syn-internal-codegen.
+ // It is not intended for manual editing.
+ 
+ #![allow(unreachable_code, unused_variables)]
++#![allow(clippy::match_wildcard_for_single_variants)]
+ #[cfg(any(feature = "full", feature = "derive"))]
+ use crate::gen::helper::fold::*;
+ #[cfg(any(feature = "full", feature = "derive"))]
+ use crate::token::{Brace, Bracket, Group, Paren};
+ use crate::*;
+ use proc_macro2::Span;
+ #[cfg(feature = "full")]
+ macro_rules! full {
+@@ -21,17 +22,17 @@ macro_rules! full {
+     };
+ }
+ /// Syntax tree traversal to transform the nodes of an owned syntax tree.
+ ///
+ /// See the [module documentation] for details.
+ ///
+ /// [module documentation]: self
+ ///
+-/// *This trait is available if Syn is built with the `"fold"` feature.*
++/// *This trait is available only if Syn is built with the `"fold"` feature.*
+ pub trait Fold {
+     #[cfg(any(feature = "derive", feature = "full"))]
+     fn fold_abi(&mut self, i: Abi) -> Abi {
+         fold_abi(self, i)
+     }
+     #[cfg(any(feature = "derive", feature = "full"))]
+     fn fold_angle_bracketed_generic_arguments(
+         &mut self,
+@@ -428,45 +429,37 @@ pub trait Fold {
+     }
+     fn fold_lifetime(&mut self, i: Lifetime) -> Lifetime {
+         fold_lifetime(self, i)
+     }
+     #[cfg(any(feature = "derive", feature = "full"))]
+     fn fold_lifetime_def(&mut self, i: LifetimeDef) -> LifetimeDef {
+         fold_lifetime_def(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn fold_lit(&mut self, i: Lit) -> Lit {
+         fold_lit(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn fold_lit_bool(&mut self, i: LitBool) -> LitBool {
+         fold_lit_bool(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn fold_lit_byte(&mut self, i: LitByte) -> LitByte {
+         fold_lit_byte(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn fold_lit_byte_str(&mut self, i: LitByteStr) -> LitByteStr {
+         fold_lit_byte_str(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn fold_lit_char(&mut self, i: LitChar) -> LitChar {
+         fold_lit_char(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn fold_lit_float(&mut self, i: LitFloat) -> LitFloat {
+         fold_lit_float(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn fold_lit_int(&mut self, i: LitInt) -> LitInt {
+         fold_lit_int(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn fold_lit_str(&mut self, i: LitStr) -> LitStr {
+         fold_lit_str(self, i)
+     }
+     #[cfg(feature = "full")]
+     fn fold_local(&mut self, i: Local) -> Local {
+         fold_local(self, i)
+     }
+     #[cfg(any(feature = "derive", feature = "full"))]
+@@ -794,39 +787,39 @@ where
+ pub fn fold_angle_bracketed_generic_arguments<F>(
+     f: &mut F,
+     node: AngleBracketedGenericArguments,
+ ) -> AngleBracketedGenericArguments
+ where
+     F: Fold + ?Sized,
+ {
+     AngleBracketedGenericArguments {
+-        colon2_token: (node.colon2_token).map(|it| Token ! [ :: ](tokens_helper(f, &it.spans))),
+-        lt_token: Token ! [ < ](tokens_helper(f, &node.lt_token.spans)),
++        colon2_token: (node.colon2_token).map(|it| Token ! [::](tokens_helper(f, &it.spans))),
++        lt_token: Token ! [<](tokens_helper(f, &node.lt_token.spans)),
+         args: FoldHelper::lift(node.args, |it| f.fold_generic_argument(it)),
+-        gt_token: Token ! [ > ](tokens_helper(f, &node.gt_token.spans)),
++        gt_token: Token ! [>](tokens_helper(f, &node.gt_token.spans)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_arm<F>(f: &mut F, node: Arm) -> Arm
+ where
+     F: Fold + ?Sized,
+ {
+     Arm {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         pat: f.fold_pat(node.pat),
+         guard: (node.guard).map(|it| {
+             (
+                 Token![if](tokens_helper(f, &(it).0.span)),
+                 Box::new(f.fold_expr(*(it).1)),
+             )
+         }),
+-        fat_arrow_token: Token ! [ => ](tokens_helper(f, &node.fat_arrow_token.spans)),
++        fat_arrow_token: Token ! [=>](tokens_helper(f, &node.fat_arrow_token.spans)),
+         body: Box::new(f.fold_expr(*node.body)),
+-        comma: (node.comma).map(|it| Token ! [ , ](tokens_helper(f, &it.spans))),
++        comma: (node.comma).map(|it| Token ! [,](tokens_helper(f, &it.spans))),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_attr_style<F>(f: &mut F, node: AttrStyle) -> AttrStyle
+ where
+     F: Fold + ?Sized,
+ {
+     match node {
+@@ -837,109 +830,97 @@ where
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_attribute<F>(f: &mut F, node: Attribute) -> Attribute
+ where
+     F: Fold + ?Sized,
+ {
+     Attribute {
+-        pound_token: Token ! [ # ](tokens_helper(f, &node.pound_token.spans)),
++        pound_token: Token ! [#](tokens_helper(f, &node.pound_token.spans)),
+         style: f.fold_attr_style(node.style),
+         bracket_token: Bracket(tokens_helper(f, &node.bracket_token.span)),
+         path: f.fold_path(node.path),
+         tokens: node.tokens,
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_bare_fn_arg<F>(f: &mut F, node: BareFnArg) -> BareFnArg
+ where
+     F: Fold + ?Sized,
+ {
+     BareFnArg {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         name: (node.name).map(|it| {
+             (
+                 f.fold_ident((it).0),
+-                Token ! [ : ](tokens_helper(f, &(it).1.spans)),
++                Token ! [:](tokens_helper(f, &(it).1.spans)),
+             )
+         }),
+         ty: f.fold_type(node.ty),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_bin_op<F>(f: &mut F, node: BinOp) -> BinOp
+ where
+     F: Fold + ?Sized,
+ {
+     match node {
+-        BinOp::Add(_binding_0) => BinOp::Add(Token ! [ + ](tokens_helper(f, &_binding_0.spans))),
+-        BinOp::Sub(_binding_0) => BinOp::Sub(Token ! [ - ](tokens_helper(f, &_binding_0.spans))),
+-        BinOp::Mul(_binding_0) => BinOp::Mul(Token ! [ * ](tokens_helper(f, &_binding_0.spans))),
+-        BinOp::Div(_binding_0) => BinOp::Div(Token ! [ / ](tokens_helper(f, &_binding_0.spans))),
+-        BinOp::Rem(_binding_0) => BinOp::Rem(Token ! [ % ](tokens_helper(f, &_binding_0.spans))),
+-        BinOp::And(_binding_0) => BinOp::And(Token ! [ && ](tokens_helper(f, &_binding_0.spans))),
+-        BinOp::Or(_binding_0) => BinOp::Or(Token ! [ || ](tokens_helper(f, &_binding_0.spans))),
++        BinOp::Add(_binding_0) => BinOp::Add(Token ! [+](tokens_helper(f, &_binding_0.spans))),
++        BinOp::Sub(_binding_0) => BinOp::Sub(Token ! [-](tokens_helper(f, &_binding_0.spans))),
++        BinOp::Mul(_binding_0) => BinOp::Mul(Token ! [*](tokens_helper(f, &_binding_0.spans))),
++        BinOp::Div(_binding_0) => BinOp::Div(Token ! [/](tokens_helper(f, &_binding_0.spans))),
++        BinOp::Rem(_binding_0) => BinOp::Rem(Token ! [%](tokens_helper(f, &_binding_0.spans))),
++        BinOp::And(_binding_0) => BinOp::And(Token ! [&&](tokens_helper(f, &_binding_0.spans))),
++        BinOp::Or(_binding_0) => BinOp::Or(Token ! [||](tokens_helper(f, &_binding_0.spans))),
+         BinOp::BitXor(_binding_0) => {
+-            BinOp::BitXor(Token ! [ ^ ](tokens_helper(f, &_binding_0.spans)))
++            BinOp::BitXor(Token ! [^](tokens_helper(f, &_binding_0.spans)))
+         }
+         BinOp::BitAnd(_binding_0) => {
+-            BinOp::BitAnd(Token ! [ & ](tokens_helper(f, &_binding_0.spans)))
+-        }
+-        BinOp::BitOr(_binding_0) => {
+-            BinOp::BitOr(Token ! [ | ](tokens_helper(f, &_binding_0.spans)))
++            BinOp::BitAnd(Token ! [&](tokens_helper(f, &_binding_0.spans)))
+         }
+-        BinOp::Shl(_binding_0) => BinOp::Shl(Token ! [ << ](tokens_helper(f, &_binding_0.spans))),
+-        BinOp::Shr(_binding_0) => BinOp::Shr(Token ! [ >> ](tokens_helper(f, &_binding_0.spans))),
+-        BinOp::Eq(_binding_0) => BinOp::Eq(Token ! [ == ](tokens_helper(f, &_binding_0.spans))),
+-        BinOp::Lt(_binding_0) => BinOp::Lt(Token ! [ < ](tokens_helper(f, &_binding_0.spans))),
+-        BinOp::Le(_binding_0) => BinOp::Le(Token ! [ <= ](tokens_helper(f, &_binding_0.spans))),
+-        BinOp::Ne(_binding_0) => BinOp::Ne(Token ! [ != ](tokens_helper(f, &_binding_0.spans))),
+-        BinOp::Ge(_binding_0) => BinOp::Ge(Token ! [ >= ](tokens_helper(f, &_binding_0.spans))),
+-        BinOp::Gt(_binding_0) => BinOp::Gt(Token ! [ > ](tokens_helper(f, &_binding_0.spans))),
+-        BinOp::AddEq(_binding_0) => {
+-            BinOp::AddEq(Token ! [ += ](tokens_helper(f, &_binding_0.spans)))
+-        }
+-        BinOp::SubEq(_binding_0) => {
+-            BinOp::SubEq(Token ! [ -= ](tokens_helper(f, &_binding_0.spans)))
+-        }
+-        BinOp::MulEq(_binding_0) => {
+-            BinOp::MulEq(Token ! [ *= ](tokens_helper(f, &_binding_0.spans)))
+-        }
+-        BinOp::DivEq(_binding_0) => {
+-            BinOp::DivEq(Token ! [ /= ](tokens_helper(f, &_binding_0.spans)))
+-        }
+-        BinOp::RemEq(_binding_0) => {
+-            BinOp::RemEq(Token ! [ %= ](tokens_helper(f, &_binding_0.spans)))
+-        }
++        BinOp::BitOr(_binding_0) => BinOp::BitOr(Token ! [|](tokens_helper(f, &_binding_0.spans))),
++        BinOp::Shl(_binding_0) => BinOp::Shl(Token ! [<<](tokens_helper(f, &_binding_0.spans))),
++        BinOp::Shr(_binding_0) => BinOp::Shr(Token ! [>>](tokens_helper(f, &_binding_0.spans))),
++        BinOp::Eq(_binding_0) => BinOp::Eq(Token ! [==](tokens_helper(f, &_binding_0.spans))),
++        BinOp::Lt(_binding_0) => BinOp::Lt(Token ! [<](tokens_helper(f, &_binding_0.spans))),
++        BinOp::Le(_binding_0) => BinOp::Le(Token ! [<=](tokens_helper(f, &_binding_0.spans))),
++        BinOp::Ne(_binding_0) => BinOp::Ne(Token ! [!=](tokens_helper(f, &_binding_0.spans))),
++        BinOp::Ge(_binding_0) => BinOp::Ge(Token ! [>=](tokens_helper(f, &_binding_0.spans))),
++        BinOp::Gt(_binding_0) => BinOp::Gt(Token ! [>](tokens_helper(f, &_binding_0.spans))),
++        BinOp::AddEq(_binding_0) => BinOp::AddEq(Token ! [+=](tokens_helper(f, &_binding_0.spans))),
++        BinOp::SubEq(_binding_0) => BinOp::SubEq(Token ! [-=](tokens_helper(f, &_binding_0.spans))),
++        BinOp::MulEq(_binding_0) => BinOp::MulEq(Token ! [*=](tokens_helper(f, &_binding_0.spans))),
++        BinOp::DivEq(_binding_0) => BinOp::DivEq(Token ! [/=](tokens_helper(f, &_binding_0.spans))),
++        BinOp::RemEq(_binding_0) => BinOp::RemEq(Token ! [%=](tokens_helper(f, &_binding_0.spans))),
+         BinOp::BitXorEq(_binding_0) => {
+-            BinOp::BitXorEq(Token ! [ ^= ](tokens_helper(f, &_binding_0.spans)))
++            BinOp::BitXorEq(Token ! [^=](tokens_helper(f, &_binding_0.spans)))
+         }
+         BinOp::BitAndEq(_binding_0) => {
+-            BinOp::BitAndEq(Token ! [ &= ](tokens_helper(f, &_binding_0.spans)))
++            BinOp::BitAndEq(Token ! [&=](tokens_helper(f, &_binding_0.spans)))
+         }
+         BinOp::BitOrEq(_binding_0) => {
+-            BinOp::BitOrEq(Token ! [ |= ](tokens_helper(f, &_binding_0.spans)))
++            BinOp::BitOrEq(Token ! [|=](tokens_helper(f, &_binding_0.spans)))
+         }
+         BinOp::ShlEq(_binding_0) => {
+-            BinOp::ShlEq(Token ! [ <<= ](tokens_helper(f, &_binding_0.spans)))
++            BinOp::ShlEq(Token ! [<<=](tokens_helper(f, &_binding_0.spans)))
+         }
+         BinOp::ShrEq(_binding_0) => {
+-            BinOp::ShrEq(Token ! [ >>= ](tokens_helper(f, &_binding_0.spans)))
++            BinOp::ShrEq(Token ! [>>=](tokens_helper(f, &_binding_0.spans)))
+         }
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_binding<F>(f: &mut F, node: Binding) -> Binding
+ where
+     F: Fold + ?Sized,
+ {
+     Binding {
+         ident: f.fold_ident(node.ident),
+-        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
++        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
+         ty: f.fold_type(node.ty),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_block<F>(f: &mut F, node: Block) -> Block
+ where
+     F: Fold + ?Sized,
+ {
+@@ -950,44 +931,44 @@ where
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_bound_lifetimes<F>(f: &mut F, node: BoundLifetimes) -> BoundLifetimes
+ where
+     F: Fold + ?Sized,
+ {
+     BoundLifetimes {
+         for_token: Token![for](tokens_helper(f, &node.for_token.span)),
+-        lt_token: Token ! [ < ](tokens_helper(f, &node.lt_token.spans)),
++        lt_token: Token ! [<](tokens_helper(f, &node.lt_token.spans)),
+         lifetimes: FoldHelper::lift(node.lifetimes, |it| f.fold_lifetime_def(it)),
+-        gt_token: Token ! [ > ](tokens_helper(f, &node.gt_token.spans)),
++        gt_token: Token ! [>](tokens_helper(f, &node.gt_token.spans)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_const_param<F>(f: &mut F, node: ConstParam) -> ConstParam
+ where
+     F: Fold + ?Sized,
+ {
+     ConstParam {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         const_token: Token![const](tokens_helper(f, &node.const_token.span)),
+         ident: f.fold_ident(node.ident),
+-        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
++        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
+         ty: f.fold_type(node.ty),
+-        eq_token: (node.eq_token).map(|it| Token ! [ = ](tokens_helper(f, &it.spans))),
++        eq_token: (node.eq_token).map(|it| Token ! [=](tokens_helper(f, &it.spans))),
+         default: (node.default).map(|it| f.fold_expr(it)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_constraint<F>(f: &mut F, node: Constraint) -> Constraint
+ where
+     F: Fold + ?Sized,
+ {
+     Constraint {
+         ident: f.fold_ident(node.ident),
+-        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
++        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
+         bounds: FoldHelper::lift(node.bounds, |it| f.fold_type_param_bound(it)),
+     }
+ }
+ #[cfg(feature = "derive")]
+ pub fn fold_data<F>(f: &mut F, node: Data) -> Data
+ where
+     F: Fold + ?Sized,
+ {
+@@ -1011,17 +992,17 @@ where
+ #[cfg(feature = "derive")]
+ pub fn fold_data_struct<F>(f: &mut F, node: DataStruct) -> DataStruct
+ where
+     F: Fold + ?Sized,
+ {
+     DataStruct {
+         struct_token: Token![struct](tokens_helper(f, &node.struct_token.span)),
+         fields: f.fold_fields(node.fields),
+-        semi_token: (node.semi_token).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
++        semi_token: (node.semi_token).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
+     }
+ }
+ #[cfg(feature = "derive")]
+ pub fn fold_data_union<F>(f: &mut F, node: DataUnion) -> DataUnion
+ where
+     F: Fold + ?Sized,
+ {
+     DataUnion {
+@@ -1107,17 +1088,17 @@ where
+ #[cfg(feature = "full")]
+ pub fn fold_expr_assign<F>(f: &mut F, node: ExprAssign) -> ExprAssign
+ where
+     F: Fold + ?Sized,
+ {
+     ExprAssign {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         left: Box::new(f.fold_expr(*node.left)),
+-        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
++        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
+         right: Box::new(f.fold_expr(*node.right)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_expr_assign_op<F>(f: &mut F, node: ExprAssignOp) -> ExprAssignOp
+ where
+     F: Fold + ?Sized,
+ {
+@@ -1143,17 +1124,17 @@ where
+ #[cfg(feature = "full")]
+ pub fn fold_expr_await<F>(f: &mut F, node: ExprAwait) -> ExprAwait
+ where
+     F: Fold + ?Sized,
+ {
+     ExprAwait {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         base: Box::new(f.fold_expr(*node.base)),
+-        dot_token: Token ! [ . ](tokens_helper(f, &node.dot_token.spans)),
++        dot_token: Token ! [.](tokens_helper(f, &node.dot_token.spans)),
+         await_token: crate::token::Await(tokens_helper(f, &node.await_token.span)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_expr_binary<F>(f: &mut F, node: ExprBinary) -> ExprBinary
+ where
+     F: Fold + ?Sized,
+ {
+@@ -1227,19 +1208,19 @@ pub fn fold_expr_closure<F>(f: &mut F, n
+ where
+     F: Fold + ?Sized,
+ {
+     ExprClosure {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         asyncness: (node.asyncness).map(|it| Token![async](tokens_helper(f, &it.span))),
+         movability: (node.movability).map(|it| Token![static](tokens_helper(f, &it.span))),
+         capture: (node.capture).map(|it| Token![move](tokens_helper(f, &it.span))),
+-        or1_token: Token ! [ | ](tokens_helper(f, &node.or1_token.spans)),
++        or1_token: Token ! [|](tokens_helper(f, &node.or1_token.spans)),
+         inputs: FoldHelper::lift(node.inputs, |it| f.fold_pat(it)),
+-        or2_token: Token ! [ | ](tokens_helper(f, &node.or2_token.spans)),
++        or2_token: Token ! [|](tokens_helper(f, &node.or2_token.spans)),
+         output: f.fold_return_type(node.output),
+         body: Box::new(f.fold_expr(*node.body)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_expr_continue<F>(f: &mut F, node: ExprContinue) -> ExprContinue
+ where
+     F: Fold + ?Sized,
+@@ -1253,17 +1234,17 @@ where
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_expr_field<F>(f: &mut F, node: ExprField) -> ExprField
+ where
+     F: Fold + ?Sized,
+ {
+     ExprField {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         base: Box::new(f.fold_expr(*node.base)),
+-        dot_token: Token ! [ . ](tokens_helper(f, &node.dot_token.spans)),
++        dot_token: Token ! [.](tokens_helper(f, &node.dot_token.spans)),
+         member: f.fold_member(node.member),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_expr_for_loop<F>(f: &mut F, node: ExprForLoop) -> ExprForLoop
+ where
+     F: Fold + ?Sized,
+ {
+@@ -1322,17 +1303,17 @@ where
+ pub fn fold_expr_let<F>(f: &mut F, node: ExprLet) -> ExprLet
+ where
+     F: Fold + ?Sized,
+ {
+     ExprLet {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         let_token: Token![let](tokens_helper(f, &node.let_token.span)),
+         pat: f.fold_pat(node.pat),
+-        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
++        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
+         expr: Box::new(f.fold_expr(*node.expr)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_expr_lit<F>(f: &mut F, node: ExprLit) -> ExprLit
+ where
+     F: Fold + ?Sized,
+ {
+@@ -1379,17 +1360,17 @@ where
+ #[cfg(feature = "full")]
+ pub fn fold_expr_method_call<F>(f: &mut F, node: ExprMethodCall) -> ExprMethodCall
+ where
+     F: Fold + ?Sized,
+ {
+     ExprMethodCall {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         receiver: Box::new(f.fold_expr(*node.receiver)),
+-        dot_token: Token ! [ . ](tokens_helper(f, &node.dot_token.spans)),
++        dot_token: Token ! [.](tokens_helper(f, &node.dot_token.spans)),
+         method: f.fold_ident(node.method),
+         turbofish: (node.turbofish).map(|it| f.fold_method_turbofish(it)),
+         paren_token: Paren(tokens_helper(f, &node.paren_token.span)),
+         args: FoldHelper::lift(node.args, |it| f.fold_expr(it)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_expr_paren<F>(f: &mut F, node: ExprParen) -> ExprParen
+@@ -1427,32 +1408,32 @@ where
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_expr_reference<F>(f: &mut F, node: ExprReference) -> ExprReference
+ where
+     F: Fold + ?Sized,
+ {
+     ExprReference {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+-        and_token: Token ! [ & ](tokens_helper(f, &node.and_token.spans)),
++        and_token: Token ! [&](tokens_helper(f, &node.and_token.spans)),
+         raw: node.raw,
+         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
+         expr: Box::new(f.fold_expr(*node.expr)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_expr_repeat<F>(f: &mut F, node: ExprRepeat) -> ExprRepeat
+ where
+     F: Fold + ?Sized,
+ {
+     ExprRepeat {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         bracket_token: Bracket(tokens_helper(f, &node.bracket_token.span)),
+         expr: Box::new(f.fold_expr(*node.expr)),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+         len: Box::new(f.fold_expr(*node.len)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_expr_return<F>(f: &mut F, node: ExprReturn) -> ExprReturn
+ where
+     F: Fold + ?Sized,
+ {
+@@ -1479,17 +1460,17 @@ where
+ #[cfg(feature = "full")]
+ pub fn fold_expr_try<F>(f: &mut F, node: ExprTry) -> ExprTry
+ where
+     F: Fold + ?Sized,
+ {
+     ExprTry {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         expr: Box::new(f.fold_expr(*node.expr)),
+-        question_token: Token ! [ ? ](tokens_helper(f, &node.question_token.spans)),
++        question_token: Token ! [?](tokens_helper(f, &node.question_token.spans)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_expr_try_block<F>(f: &mut F, node: ExprTryBlock) -> ExprTryBlock
+ where
+     F: Fold + ?Sized,
+ {
+     ExprTryBlock {
+@@ -1512,17 +1493,17 @@ where
+ #[cfg(feature = "full")]
+ pub fn fold_expr_type<F>(f: &mut F, node: ExprType) -> ExprType
+ where
+     F: Fold + ?Sized,
+ {
+     ExprType {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         expr: Box::new(f.fold_expr(*node.expr)),
+-        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
++        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
+         ty: Box::new(f.fold_type(*node.ty)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_expr_unary<F>(f: &mut F, node: ExprUnary) -> ExprUnary
+ where
+     F: Fold + ?Sized,
+ {
+@@ -1571,41 +1552,41 @@ where
+ pub fn fold_field<F>(f: &mut F, node: Field) -> Field
+ where
+     F: Fold + ?Sized,
+ {
+     Field {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         vis: f.fold_visibility(node.vis),
+         ident: (node.ident).map(|it| f.fold_ident(it)),
+-        colon_token: (node.colon_token).map(|it| Token ! [ : ](tokens_helper(f, &it.spans))),
++        colon_token: (node.colon_token).map(|it| Token ! [:](tokens_helper(f, &it.spans))),
+         ty: f.fold_type(node.ty),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_field_pat<F>(f: &mut F, node: FieldPat) -> FieldPat
+ where
+     F: Fold + ?Sized,
+ {
+     FieldPat {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         member: f.fold_member(node.member),
+-        colon_token: (node.colon_token).map(|it| Token ! [ : ](tokens_helper(f, &it.spans))),
++        colon_token: (node.colon_token).map(|it| Token ! [:](tokens_helper(f, &it.spans))),
+         pat: Box::new(f.fold_pat(*node.pat)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_field_value<F>(f: &mut F, node: FieldValue) -> FieldValue
+ where
+     F: Fold + ?Sized,
+ {
+     FieldValue {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         member: f.fold_member(node.member),
+-        colon_token: (node.colon_token).map(|it| Token ! [ : ](tokens_helper(f, &it.spans))),
++        colon_token: (node.colon_token).map(|it| Token ! [:](tokens_helper(f, &it.spans))),
+         expr: f.fold_expr(node.expr),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_fields<F>(f: &mut F, node: Fields) -> Fields
+ where
+     F: Fold + ?Sized,
+ {
+@@ -1676,57 +1657,57 @@ where
+ pub fn fold_foreign_item_fn<F>(f: &mut F, node: ForeignItemFn) -> ForeignItemFn
+ where
+     F: Fold + ?Sized,
+ {
+     ForeignItemFn {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         vis: f.fold_visibility(node.vis),
+         sig: f.fold_signature(node.sig),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_foreign_item_macro<F>(f: &mut F, node: ForeignItemMacro) -> ForeignItemMacro
+ where
+     F: Fold + ?Sized,
+ {
+     ForeignItemMacro {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         mac: f.fold_macro(node.mac),
+-        semi_token: (node.semi_token).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
++        semi_token: (node.semi_token).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_foreign_item_static<F>(f: &mut F, node: ForeignItemStatic) -> ForeignItemStatic
+ where
+     F: Fold + ?Sized,
+ {
+     ForeignItemStatic {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         vis: f.fold_visibility(node.vis),
+         static_token: Token![static](tokens_helper(f, &node.static_token.span)),
+         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
+         ident: f.fold_ident(node.ident),
+-        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
++        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
+         ty: Box::new(f.fold_type(*node.ty)),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_foreign_item_type<F>(f: &mut F, node: ForeignItemType) -> ForeignItemType
+ where
+     F: Fold + ?Sized,
+ {
+     ForeignItemType {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         vis: f.fold_visibility(node.vis),
+         type_token: Token![type](tokens_helper(f, &node.type_token.span)),
+         ident: f.fold_ident(node.ident),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_generic_argument<F>(f: &mut F, node: GenericArgument) -> GenericArgument
+ where
+     F: Fold + ?Sized,
+ {
+     match node {
+@@ -1774,19 +1755,19 @@ where
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_generics<F>(f: &mut F, node: Generics) -> Generics
+ where
+     F: Fold + ?Sized,
+ {
+     Generics {
+-        lt_token: (node.lt_token).map(|it| Token ! [ < ](tokens_helper(f, &it.spans))),
++        lt_token: (node.lt_token).map(|it| Token ! [<](tokens_helper(f, &it.spans))),
+         params: FoldHelper::lift(node.params, |it| f.fold_generic_param(it)),
+-        gt_token: (node.gt_token).map(|it| Token ! [ > ](tokens_helper(f, &it.spans))),
++        gt_token: (node.gt_token).map(|it| Token ! [>](tokens_helper(f, &it.spans))),
+         where_clause: (node.where_clause).map(|it| f.fold_where_clause(it)),
+     }
+ }
+ pub fn fold_ident<F>(f: &mut F, node: Ident) -> Ident
+ where
+     F: Fold + ?Sized,
+ {
+     let mut node = node;
+@@ -1814,32 +1795,32 @@ where
+     F: Fold + ?Sized,
+ {
+     ImplItemConst {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         vis: f.fold_visibility(node.vis),
+         defaultness: (node.defaultness).map(|it| Token![default](tokens_helper(f, &it.span))),
+         const_token: Token![const](tokens_helper(f, &node.const_token.span)),
+         ident: f.fold_ident(node.ident),
+-        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
++        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
+         ty: f.fold_type(node.ty),
+-        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
++        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
+         expr: f.fold_expr(node.expr),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_impl_item_macro<F>(f: &mut F, node: ImplItemMacro) -> ImplItemMacro
+ where
+     F: Fold + ?Sized,
+ {
+     ImplItemMacro {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         mac: f.fold_macro(node.mac),
+-        semi_token: (node.semi_token).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
++        semi_token: (node.semi_token).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_impl_item_method<F>(f: &mut F, node: ImplItemMethod) -> ImplItemMethod
+ where
+     F: Fold + ?Sized,
+ {
+     ImplItemMethod {
+@@ -1857,19 +1838,19 @@ where
+ {
+     ImplItemType {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         vis: f.fold_visibility(node.vis),
+         defaultness: (node.defaultness).map(|it| Token![default](tokens_helper(f, &it.span))),
+         type_token: Token![type](tokens_helper(f, &node.type_token.span)),
+         ident: f.fold_ident(node.ident),
+         generics: f.fold_generics(node.generics),
+-        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
++        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
+         ty: f.fold_type(node.ty),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_index<F>(f: &mut F, node: Index) -> Index
+ where
+     F: Fold + ?Sized,
+ {
+     Index {
+@@ -1908,21 +1889,21 @@ pub fn fold_item_const<F>(f: &mut F, nod
+ where
+     F: Fold + ?Sized,
+ {
+     ItemConst {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         vis: f.fold_visibility(node.vis),
+         const_token: Token![const](tokens_helper(f, &node.const_token.span)),
+         ident: f.fold_ident(node.ident),
+-        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
++        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
+         ty: Box::new(f.fold_type(*node.ty)),
+-        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
++        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
+         expr: Box::new(f.fold_expr(*node.expr)),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_item_enum<F>(f: &mut F, node: ItemEnum) -> ItemEnum
+ where
+     F: Fold + ?Sized,
+ {
+     ItemEnum {
+@@ -1947,17 +1928,17 @@ where
+         crate_token: Token![crate](tokens_helper(f, &node.crate_token.span)),
+         ident: f.fold_ident(node.ident),
+         rename: (node.rename).map(|it| {
+             (
+                 Token![as](tokens_helper(f, &(it).0.span)),
+                 f.fold_ident((it).1),
+             )
+         }),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_item_fn<F>(f: &mut F, node: ItemFn) -> ItemFn
+ where
+     F: Fold + ?Sized,
+ {
+     ItemFn {
+@@ -2006,17 +1987,17 @@ where
+ pub fn fold_item_macro<F>(f: &mut F, node: ItemMacro) -> ItemMacro
+ where
+     F: Fold + ?Sized,
+ {
+     ItemMacro {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         ident: (node.ident).map(|it| f.fold_ident(it)),
+         mac: f.fold_macro(node.mac),
+-        semi_token: (node.semi_token).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
++        semi_token: (node.semi_token).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_item_macro2<F>(f: &mut F, node: ItemMacro2) -> ItemMacro2
+ where
+     F: Fold + ?Sized,
+ {
+     ItemMacro2 {
+@@ -2038,101 +2019,101 @@ where
+         mod_token: Token![mod](tokens_helper(f, &node.mod_token.span)),
+         ident: f.fold_ident(node.ident),
+         content: (node.content).map(|it| {
+             (
+                 Brace(tokens_helper(f, &(it).0.span)),
+                 FoldHelper::lift((it).1, |it| f.fold_item(it)),
+             )
+         }),
+-        semi: (node.semi).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
++        semi: (node.semi).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_item_static<F>(f: &mut F, node: ItemStatic) -> ItemStatic
+ where
+     F: Fold + ?Sized,
+ {
+     ItemStatic {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         vis: f.fold_visibility(node.vis),
+         static_token: Token![static](tokens_helper(f, &node.static_token.span)),
+         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
+         ident: f.fold_ident(node.ident),
+-        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
++        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
+         ty: Box::new(f.fold_type(*node.ty)),
+-        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
++        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
+         expr: Box::new(f.fold_expr(*node.expr)),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_item_struct<F>(f: &mut F, node: ItemStruct) -> ItemStruct
+ where
+     F: Fold + ?Sized,
+ {
+     ItemStruct {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         vis: f.fold_visibility(node.vis),
+         struct_token: Token![struct](tokens_helper(f, &node.struct_token.span)),
+         ident: f.fold_ident(node.ident),
+         generics: f.fold_generics(node.generics),
+         fields: f.fold_fields(node.fields),
+-        semi_token: (node.semi_token).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
++        semi_token: (node.semi_token).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_item_trait<F>(f: &mut F, node: ItemTrait) -> ItemTrait
+ where
+     F: Fold + ?Sized,
+ {
+     ItemTrait {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         vis: f.fold_visibility(node.vis),
+         unsafety: (node.unsafety).map(|it| Token![unsafe](tokens_helper(f, &it.span))),
+         auto_token: (node.auto_token).map(|it| Token![auto](tokens_helper(f, &it.span))),
+         trait_token: Token![trait](tokens_helper(f, &node.trait_token.span)),
+         ident: f.fold_ident(node.ident),
+         generics: f.fold_generics(node.generics),
+-        colon_token: (node.colon_token).map(|it| Token ! [ : ](tokens_helper(f, &it.spans))),
++        colon_token: (node.colon_token).map(|it| Token ! [:](tokens_helper(f, &it.spans))),
+         supertraits: FoldHelper::lift(node.supertraits, |it| f.fold_type_param_bound(it)),
+         brace_token: Brace(tokens_helper(f, &node.brace_token.span)),
+         items: FoldHelper::lift(node.items, |it| f.fold_trait_item(it)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_item_trait_alias<F>(f: &mut F, node: ItemTraitAlias) -> ItemTraitAlias
+ where
+     F: Fold + ?Sized,
+ {
+     ItemTraitAlias {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         vis: f.fold_visibility(node.vis),
+         trait_token: Token![trait](tokens_helper(f, &node.trait_token.span)),
+         ident: f.fold_ident(node.ident),
+         generics: f.fold_generics(node.generics),
+-        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
++        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
+         bounds: FoldHelper::lift(node.bounds, |it| f.fold_type_param_bound(it)),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_item_type<F>(f: &mut F, node: ItemType) -> ItemType
+ where
+     F: Fold + ?Sized,
+ {
+     ItemType {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         vis: f.fold_visibility(node.vis),
+         type_token: Token![type](tokens_helper(f, &node.type_token.span)),
+         ident: f.fold_ident(node.ident),
+         generics: f.fold_generics(node.generics),
+-        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
++        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
+         ty: Box::new(f.fold_type(*node.ty)),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_item_union<F>(f: &mut F, node: ItemUnion) -> ItemUnion
+ where
+     F: Fold + ?Sized,
+ {
+     ItemUnion {
+@@ -2148,29 +2129,29 @@ where
+ pub fn fold_item_use<F>(f: &mut F, node: ItemUse) -> ItemUse
+ where
+     F: Fold + ?Sized,
+ {
+     ItemUse {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         vis: f.fold_visibility(node.vis),
+         use_token: Token![use](tokens_helper(f, &node.use_token.span)),
+-        leading_colon: (node.leading_colon).map(|it| Token ! [ :: ](tokens_helper(f, &it.spans))),
++        leading_colon: (node.leading_colon).map(|it| Token ! [::](tokens_helper(f, &it.spans))),
+         tree: f.fold_use_tree(node.tree),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_label<F>(f: &mut F, node: Label) -> Label
+ where
+     F: Fold + ?Sized,
+ {
+     Label {
+         name: f.fold_lifetime(node.name),
+-        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
++        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
+     }
+ }
+ pub fn fold_lifetime<F>(f: &mut F, node: Lifetime) -> Lifetime
+ where
+     F: Fold + ?Sized,
+ {
+     Lifetime {
+         apostrophe: f.fold_span(node.apostrophe),
+@@ -2180,97 +2161,89 @@ where
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_lifetime_def<F>(f: &mut F, node: LifetimeDef) -> LifetimeDef
+ where
+     F: Fold + ?Sized,
+ {
+     LifetimeDef {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         lifetime: f.fold_lifetime(node.lifetime),
+-        colon_token: (node.colon_token).map(|it| Token ! [ : ](tokens_helper(f, &it.spans))),
++        colon_token: (node.colon_token).map(|it| Token ! [:](tokens_helper(f, &it.spans))),
+         bounds: FoldHelper::lift(node.bounds, |it| f.fold_lifetime(it)),
+     }
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_lit<F>(f: &mut F, node: Lit) -> Lit
+ where
+     F: Fold + ?Sized,
+ {
+     match node {
+         Lit::Str(_binding_0) => Lit::Str(f.fold_lit_str(_binding_0)),
+         Lit::ByteStr(_binding_0) => Lit::ByteStr(f.fold_lit_byte_str(_binding_0)),
+         Lit::Byte(_binding_0) => Lit::Byte(f.fold_lit_byte(_binding_0)),
+         Lit::Char(_binding_0) => Lit::Char(f.fold_lit_char(_binding_0)),
+         Lit::Int(_binding_0) => Lit::Int(f.fold_lit_int(_binding_0)),
+         Lit::Float(_binding_0) => Lit::Float(f.fold_lit_float(_binding_0)),
+         Lit::Bool(_binding_0) => Lit::Bool(f.fold_lit_bool(_binding_0)),
+         Lit::Verbatim(_binding_0) => Lit::Verbatim(_binding_0),
+     }
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_lit_bool<F>(f: &mut F, node: LitBool) -> LitBool
+ where
+     F: Fold + ?Sized,
+ {
+     LitBool {
+         value: node.value,
+         span: f.fold_span(node.span),
+     }
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_lit_byte<F>(f: &mut F, node: LitByte) -> LitByte
+ where
+     F: Fold + ?Sized,
+ {
+     let span = f.fold_span(node.span());
+     let mut node = node;
+     node.set_span(span);
+     node
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_lit_byte_str<F>(f: &mut F, node: LitByteStr) -> LitByteStr
+ where
+     F: Fold + ?Sized,
+ {
+     let span = f.fold_span(node.span());
+     let mut node = node;
+     node.set_span(span);
+     node
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_lit_char<F>(f: &mut F, node: LitChar) -> LitChar
+ where
+     F: Fold + ?Sized,
+ {
+     let span = f.fold_span(node.span());
+     let mut node = node;
+     node.set_span(span);
+     node
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_lit_float<F>(f: &mut F, node: LitFloat) -> LitFloat
+ where
+     F: Fold + ?Sized,
+ {
+     let span = f.fold_span(node.span());
+     let mut node = node;
+     node.set_span(span);
+     node
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_lit_int<F>(f: &mut F, node: LitInt) -> LitInt
+ where
+     F: Fold + ?Sized,
+ {
+     let span = f.fold_span(node.span());
+     let mut node = node;
+     node.set_span(span);
+     node
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_lit_str<F>(f: &mut F, node: LitStr) -> LitStr
+ where
+     F: Fold + ?Sized,
+ {
+     let span = f.fold_span(node.span());
+     let mut node = node;
+     node.set_span(span);
+     node
+@@ -2281,21 +2254,21 @@ where
+     F: Fold + ?Sized,
+ {
+     Local {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         let_token: Token![let](tokens_helper(f, &node.let_token.span)),
+         pat: f.fold_pat(node.pat),
+         init: (node.init).map(|it| {
+             (
+-                Token ! [ = ](tokens_helper(f, &(it).0.spans)),
++                Token ! [=](tokens_helper(f, &(it).0.spans)),
+                 Box::new(f.fold_expr(*(it).1)),
+             )
+         }),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_macro<F>(f: &mut F, node: Macro) -> Macro
+ where
+     F: Fold + ?Sized,
+ {
+     Macro {
+@@ -2356,30 +2329,30 @@ where
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_meta_name_value<F>(f: &mut F, node: MetaNameValue) -> MetaNameValue
+ where
+     F: Fold + ?Sized,
+ {
+     MetaNameValue {
+         path: f.fold_path(node.path),
+-        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
++        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
+         lit: f.fold_lit(node.lit),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_method_turbofish<F>(f: &mut F, node: MethodTurbofish) -> MethodTurbofish
+ where
+     F: Fold + ?Sized,
+ {
+     MethodTurbofish {
+-        colon2_token: Token ! [ :: ](tokens_helper(f, &node.colon2_token.spans)),
+-        lt_token: Token ! [ < ](tokens_helper(f, &node.lt_token.spans)),
++        colon2_token: Token ! [::](tokens_helper(f, &node.colon2_token.spans)),
++        lt_token: Token ! [<](tokens_helper(f, &node.lt_token.spans)),
+         args: FoldHelper::lift(node.args, |it| f.fold_generic_method_argument(it)),
+-        gt_token: Token ! [ > ](tokens_helper(f, &node.gt_token.spans)),
++        gt_token: Token ! [>](tokens_helper(f, &node.gt_token.spans)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_nested_meta<F>(f: &mut F, node: NestedMeta) -> NestedMeta
+ where
+     F: Fold + ?Sized,
+ {
+     match node {
+@@ -2444,17 +2417,17 @@ where
+ {
+     PatIdent {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         by_ref: (node.by_ref).map(|it| Token![ref](tokens_helper(f, &it.span))),
+         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
+         ident: f.fold_ident(node.ident),
+         subpat: (node.subpat).map(|it| {
+             (
+-                Token ! [ @ ](tokens_helper(f, &(it).0.spans)),
++                Token ! [@](tokens_helper(f, &(it).0.spans)),
+                 Box::new(f.fold_pat(*(it).1)),
+             )
+         }),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_pat_lit<F>(f: &mut F, node: PatLit) -> PatLit
+ where
+@@ -2477,17 +2450,17 @@ where
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_pat_or<F>(f: &mut F, node: PatOr) -> PatOr
+ where
+     F: Fold + ?Sized,
+ {
+     PatOr {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+-        leading_vert: (node.leading_vert).map(|it| Token ! [ | ](tokens_helper(f, &it.spans))),
++        leading_vert: (node.leading_vert).map(|it| Token ! [|](tokens_helper(f, &it.spans))),
+         cases: FoldHelper::lift(node.cases, |it| f.fold_pat(it)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_pat_path<F>(f: &mut F, node: PatPath) -> PatPath
+ where
+     F: Fold + ?Sized,
+ {
+@@ -2511,17 +2484,17 @@ where
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_pat_reference<F>(f: &mut F, node: PatReference) -> PatReference
+ where
+     F: Fold + ?Sized,
+ {
+     PatReference {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+-        and_token: Token ! [ & ](tokens_helper(f, &node.and_token.spans)),
++        and_token: Token ! [&](tokens_helper(f, &node.and_token.spans)),
+         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
+         pat: Box::new(f.fold_pat(*node.pat)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_pat_rest<F>(f: &mut F, node: PatRest) -> PatRest
+ where
+     F: Fold + ?Sized,
+@@ -2580,17 +2553,17 @@ where
+ #[cfg(feature = "full")]
+ pub fn fold_pat_type<F>(f: &mut F, node: PatType) -> PatType
+ where
+     F: Fold + ?Sized,
+ {
+     PatType {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         pat: Box::new(f.fold_pat(*node.pat)),
+-        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
++        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
+         ty: Box::new(f.fold_type(*node.ty)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_pat_wild<F>(f: &mut F, node: PatWild) -> PatWild
+ where
+     F: Fold + ?Sized,
+ {
+@@ -2600,17 +2573,17 @@ where
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_path<F>(f: &mut F, node: Path) -> Path
+ where
+     F: Fold + ?Sized,
+ {
+     Path {
+-        leading_colon: (node.leading_colon).map(|it| Token ! [ :: ](tokens_helper(f, &it.spans))),
++        leading_colon: (node.leading_colon).map(|it| Token ! [::](tokens_helper(f, &it.spans))),
+         segments: FoldHelper::lift(node.segments, |it| f.fold_path_segment(it)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_path_arguments<F>(f: &mut F, node: PathArguments) -> PathArguments
+ where
+     F: Fold + ?Sized,
+ {
+@@ -2636,96 +2609,96 @@ where
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_predicate_eq<F>(f: &mut F, node: PredicateEq) -> PredicateEq
+ where
+     F: Fold + ?Sized,
+ {
+     PredicateEq {
+         lhs_ty: f.fold_type(node.lhs_ty),
+-        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
++        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
+         rhs_ty: f.fold_type(node.rhs_ty),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_predicate_lifetime<F>(f: &mut F, node: PredicateLifetime) -> PredicateLifetime
+ where
+     F: Fold + ?Sized,
+ {
+     PredicateLifetime {
+         lifetime: f.fold_lifetime(node.lifetime),
+-        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
++        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
+         bounds: FoldHelper::lift(node.bounds, |it| f.fold_lifetime(it)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_predicate_type<F>(f: &mut F, node: PredicateType) -> PredicateType
+ where
+     F: Fold + ?Sized,
+ {
+     PredicateType {
+         lifetimes: (node.lifetimes).map(|it| f.fold_bound_lifetimes(it)),
+         bounded_ty: f.fold_type(node.bounded_ty),
+-        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
++        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
+         bounds: FoldHelper::lift(node.bounds, |it| f.fold_type_param_bound(it)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_qself<F>(f: &mut F, node: QSelf) -> QSelf
+ where
+     F: Fold + ?Sized,
+ {
+     QSelf {
+-        lt_token: Token ! [ < ](tokens_helper(f, &node.lt_token.spans)),
++        lt_token: Token ! [<](tokens_helper(f, &node.lt_token.spans)),
+         ty: Box::new(f.fold_type(*node.ty)),
+         position: node.position,
+         as_token: (node.as_token).map(|it| Token![as](tokens_helper(f, &it.span))),
+-        gt_token: Token ! [ > ](tokens_helper(f, &node.gt_token.spans)),
++        gt_token: Token ! [>](tokens_helper(f, &node.gt_token.spans)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_range_limits<F>(f: &mut F, node: RangeLimits) -> RangeLimits
+ where
+     F: Fold + ?Sized,
+ {
+     match node {
+         RangeLimits::HalfOpen(_binding_0) => {
+             RangeLimits::HalfOpen(Token![..](tokens_helper(f, &_binding_0.spans)))
+         }
+         RangeLimits::Closed(_binding_0) => {
+-            RangeLimits::Closed(Token ! [ ..= ](tokens_helper(f, &_binding_0.spans)))
++            RangeLimits::Closed(Token ! [..=](tokens_helper(f, &_binding_0.spans)))
+         }
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_receiver<F>(f: &mut F, node: Receiver) -> Receiver
+ where
+     F: Fold + ?Sized,
+ {
+     Receiver {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         reference: (node.reference).map(|it| {
+             (
+-                Token ! [ & ](tokens_helper(f, &(it).0.spans)),
++                Token ! [&](tokens_helper(f, &(it).0.spans)),
+                 ((it).1).map(|it| f.fold_lifetime(it)),
+             )
+         }),
+         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
+         self_token: Token![self](tokens_helper(f, &node.self_token.span)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_return_type<F>(f: &mut F, node: ReturnType) -> ReturnType
+ where
+     F: Fold + ?Sized,
+ {
+     match node {
+         ReturnType::Default => ReturnType::Default,
+         ReturnType::Type(_binding_0, _binding_1) => ReturnType::Type(
+-            Token ! [ -> ](tokens_helper(f, &_binding_0.spans)),
++            Token ! [->](tokens_helper(f, &_binding_0.spans)),
+             Box::new(f.fold_type(*_binding_1)),
+         ),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_signature<F>(f: &mut F, node: Signature) -> Signature
+ where
+     F: Fold + ?Sized,
+@@ -2756,17 +2729,17 @@ where
+     F: Fold + ?Sized,
+ {
+     match node {
+         Stmt::Local(_binding_0) => Stmt::Local(f.fold_local(_binding_0)),
+         Stmt::Item(_binding_0) => Stmt::Item(f.fold_item(_binding_0)),
+         Stmt::Expr(_binding_0) => Stmt::Expr(f.fold_expr(_binding_0)),
+         Stmt::Semi(_binding_0, _binding_1) => Stmt::Semi(
+             f.fold_expr(_binding_0),
+-            Token ! [ ; ](tokens_helper(f, &_binding_1.spans)),
++            Token ! [;](tokens_helper(f, &_binding_1.spans)),
+         ),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_trait_bound<F>(f: &mut F, node: TraitBound) -> TraitBound
+ where
+     F: Fold + ?Sized,
+ {
+@@ -2780,17 +2753,17 @@ where
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_trait_bound_modifier<F>(f: &mut F, node: TraitBoundModifier) -> TraitBoundModifier
+ where
+     F: Fold + ?Sized,
+ {
+     match node {
+         TraitBoundModifier::None => TraitBoundModifier::None,
+         TraitBoundModifier::Maybe(_binding_0) => {
+-            TraitBoundModifier::Maybe(Token ! [ ? ](tokens_helper(f, &_binding_0.spans)))
++            TraitBoundModifier::Maybe(Token ! [?](tokens_helper(f, &_binding_0.spans)))
+         }
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_trait_item<F>(f: &mut F, node: TraitItem) -> TraitItem
+ where
+     F: Fold + ?Sized,
+ {
+@@ -2807,69 +2780,69 @@ where
+ pub fn fold_trait_item_const<F>(f: &mut F, node: TraitItemConst) -> TraitItemConst
+ where
+     F: Fold + ?Sized,
+ {
+     TraitItemConst {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         const_token: Token![const](tokens_helper(f, &node.const_token.span)),
+         ident: f.fold_ident(node.ident),
+-        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
++        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
+         ty: f.fold_type(node.ty),
+         default: (node.default).map(|it| {
+             (
+-                Token ! [ = ](tokens_helper(f, &(it).0.spans)),
++                Token ! [=](tokens_helper(f, &(it).0.spans)),
+                 f.fold_expr((it).1),
+             )
+         }),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_trait_item_macro<F>(f: &mut F, node: TraitItemMacro) -> TraitItemMacro
+ where
+     F: Fold + ?Sized,
+ {
+     TraitItemMacro {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         mac: f.fold_macro(node.mac),
+-        semi_token: (node.semi_token).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
++        semi_token: (node.semi_token).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_trait_item_method<F>(f: &mut F, node: TraitItemMethod) -> TraitItemMethod
+ where
+     F: Fold + ?Sized,
+ {
+     TraitItemMethod {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         sig: f.fold_signature(node.sig),
+         default: (node.default).map(|it| f.fold_block(it)),
+-        semi_token: (node.semi_token).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
++        semi_token: (node.semi_token).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_trait_item_type<F>(f: &mut F, node: TraitItemType) -> TraitItemType
+ where
+     F: Fold + ?Sized,
+ {
+     TraitItemType {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         type_token: Token![type](tokens_helper(f, &node.type_token.span)),
+         ident: f.fold_ident(node.ident),
+         generics: f.fold_generics(node.generics),
+-        colon_token: (node.colon_token).map(|it| Token ! [ : ](tokens_helper(f, &it.spans))),
++        colon_token: (node.colon_token).map(|it| Token ! [:](tokens_helper(f, &it.spans))),
+         bounds: FoldHelper::lift(node.bounds, |it| f.fold_type_param_bound(it)),
+         default: (node.default).map(|it| {
+             (
+-                Token ! [ = ](tokens_helper(f, &(it).0.spans)),
++                Token ! [=](tokens_helper(f, &(it).0.spans)),
+                 f.fold_type((it).1),
+             )
+         }),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_type<F>(f: &mut F, node: Type) -> Type
+ where
+     F: Fold + ?Sized,
+ {
+     match node {
+@@ -2894,17 +2867,17 @@ where
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_type_array<F>(f: &mut F, node: TypeArray) -> TypeArray
+ where
+     F: Fold + ?Sized,
+ {
+     TypeArray {
+         bracket_token: Bracket(tokens_helper(f, &node.bracket_token.span)),
+         elem: Box::new(f.fold_type(*node.elem)),
+-        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
++        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
+         len: f.fold_expr(node.len),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_type_bare_fn<F>(f: &mut F, node: TypeBareFn) -> TypeBareFn
+ where
+     F: Fold + ?Sized,
+ {
+@@ -2969,19 +2942,19 @@ where
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_type_param<F>(f: &mut F, node: TypeParam) -> TypeParam
+ where
+     F: Fold + ?Sized,
+ {
+     TypeParam {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         ident: f.fold_ident(node.ident),
+-        colon_token: (node.colon_token).map(|it| Token ! [ : ](tokens_helper(f, &it.spans))),
++        colon_token: (node.colon_token).map(|it| Token ! [:](tokens_helper(f, &it.spans))),
+         bounds: FoldHelper::lift(node.bounds, |it| f.fold_type_param_bound(it)),
+-        eq_token: (node.eq_token).map(|it| Token ! [ = ](tokens_helper(f, &it.spans))),
++        eq_token: (node.eq_token).map(|it| Token ! [=](tokens_helper(f, &it.spans))),
+         default: (node.default).map(|it| f.fold_type(it)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_type_param_bound<F>(f: &mut F, node: TypeParamBound) -> TypeParamBound
+ where
+     F: Fold + ?Sized,
+ {
+@@ -3013,29 +2986,29 @@ where
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_type_ptr<F>(f: &mut F, node: TypePtr) -> TypePtr
+ where
+     F: Fold + ?Sized,
+ {
+     TypePtr {
+-        star_token: Token ! [ * ](tokens_helper(f, &node.star_token.spans)),
++        star_token: Token ! [*](tokens_helper(f, &node.star_token.spans)),
+         const_token: (node.const_token).map(|it| Token![const](tokens_helper(f, &it.span))),
+         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
+         elem: Box::new(f.fold_type(*node.elem)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_type_reference<F>(f: &mut F, node: TypeReference) -> TypeReference
+ where
+     F: Fold + ?Sized,
+ {
+     TypeReference {
+-        and_token: Token ! [ & ](tokens_helper(f, &node.and_token.spans)),
++        and_token: Token ! [&](tokens_helper(f, &node.and_token.spans)),
+         lifetime: (node.lifetime).map(|it| f.fold_lifetime(it)),
+         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
+         elem: Box::new(f.fold_type(*node.elem)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_type_slice<F>(f: &mut F, node: TypeSlice) -> TypeSlice
+ where
+@@ -3067,28 +3040,28 @@ where
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_un_op<F>(f: &mut F, node: UnOp) -> UnOp
+ where
+     F: Fold + ?Sized,
+ {
+     match node {
+-        UnOp::Deref(_binding_0) => UnOp::Deref(Token ! [ * ](tokens_helper(f, &_binding_0.spans))),
++        UnOp::Deref(_binding_0) => UnOp::Deref(Token ! [*](tokens_helper(f, &_binding_0.spans))),
+         UnOp::Not(_binding_0) => UnOp::Not(Token![!](tokens_helper(f, &_binding_0.spans))),
+-        UnOp::Neg(_binding_0) => UnOp::Neg(Token ! [ - ](tokens_helper(f, &_binding_0.spans))),
++        UnOp::Neg(_binding_0) => UnOp::Neg(Token ! [-](tokens_helper(f, &_binding_0.spans))),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_use_glob<F>(f: &mut F, node: UseGlob) -> UseGlob
+ where
+     F: Fold + ?Sized,
+ {
+     UseGlob {
+-        star_token: Token ! [ * ](tokens_helper(f, &node.star_token.spans)),
++        star_token: Token ! [*](tokens_helper(f, &node.star_token.spans)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_use_group<F>(f: &mut F, node: UseGroup) -> UseGroup
+ where
+     F: Fold + ?Sized,
+ {
+     UseGroup {
+@@ -3107,17 +3080,17 @@ where
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_use_path<F>(f: &mut F, node: UsePath) -> UsePath
+ where
+     F: Fold + ?Sized,
+ {
+     UsePath {
+         ident: f.fold_ident(node.ident),
+-        colon2_token: Token ! [ :: ](tokens_helper(f, &node.colon2_token.spans)),
++        colon2_token: Token ! [::](tokens_helper(f, &node.colon2_token.spans)),
+         tree: Box::new(f.fold_use_tree(*node.tree)),
+     }
+ }
+ #[cfg(feature = "full")]
+ pub fn fold_use_rename<F>(f: &mut F, node: UseRename) -> UseRename
+ where
+     F: Fold + ?Sized,
+ {
+@@ -3142,31 +3115,31 @@ where
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_variadic<F>(f: &mut F, node: Variadic) -> Variadic
+ where
+     F: Fold + ?Sized,
+ {
+     Variadic {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+-        dots: Token ! [ ... ](tokens_helper(f, &node.dots.spans)),
++        dots: Token ! [...](tokens_helper(f, &node.dots.spans)),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_variant<F>(f: &mut F, node: Variant) -> Variant
+ where
+     F: Fold + ?Sized,
+ {
+     Variant {
+         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+         ident: f.fold_ident(node.ident),
+         fields: f.fold_fields(node.fields),
+         discriminant: (node.discriminant).map(|it| {
+             (
+-                Token ! [ = ](tokens_helper(f, &(it).0.spans)),
++                Token ! [=](tokens_helper(f, &(it).0.spans)),
+                 f.fold_expr((it).1),
+             )
+         }),
+     }
+ }
+ #[cfg(any(feature = "derive", feature = "full"))]
+ pub fn fold_vis_crate<F>(f: &mut F, node: VisCrate) -> VisCrate
+ where
+diff --git a/third_party/rust/syn/src/gen/hash.rs b/third_party/rust/syn/src/gen/hash.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/src/gen/hash.rs
+@@ -0,0 +1,2691 @@
++// This file is @generated by syn-internal-codegen.
++// It is not intended for manual editing.
++
++#[cfg(any(feature = "derive", feature = "full"))]
++use crate::tt::TokenStreamHelper;
++use crate::*;
++use std::hash::{Hash, Hasher};
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Abi {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.name.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for AngleBracketedGenericArguments {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.colon2_token.hash(state);
++        self.args.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for Arm {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.pat.hash(state);
++        self.guard.hash(state);
++        self.body.hash(state);
++        self.comma.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for AttrStyle {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            AttrStyle::Outer => {
++                state.write_u8(0u8);
++            }
++            AttrStyle::Inner(_) => {
++                state.write_u8(1u8);
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Attribute {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.style.hash(state);
++        self.path.hash(state);
++        TokenStreamHelper(&self.tokens).hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for BareFnArg {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.name.hash(state);
++        self.ty.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for BinOp {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            BinOp::Add(_) => {
++                state.write_u8(0u8);
++            }
++            BinOp::Sub(_) => {
++                state.write_u8(1u8);
++            }
++            BinOp::Mul(_) => {
++                state.write_u8(2u8);
++            }
++            BinOp::Div(_) => {
++                state.write_u8(3u8);
++            }
++            BinOp::Rem(_) => {
++                state.write_u8(4u8);
++            }
++            BinOp::And(_) => {
++                state.write_u8(5u8);
++            }
++            BinOp::Or(_) => {
++                state.write_u8(6u8);
++            }
++            BinOp::BitXor(_) => {
++                state.write_u8(7u8);
++            }
++            BinOp::BitAnd(_) => {
++                state.write_u8(8u8);
++            }
++            BinOp::BitOr(_) => {
++                state.write_u8(9u8);
++            }
++            BinOp::Shl(_) => {
++                state.write_u8(10u8);
++            }
++            BinOp::Shr(_) => {
++                state.write_u8(11u8);
++            }
++            BinOp::Eq(_) => {
++                state.write_u8(12u8);
++            }
++            BinOp::Lt(_) => {
++                state.write_u8(13u8);
++            }
++            BinOp::Le(_) => {
++                state.write_u8(14u8);
++            }
++            BinOp::Ne(_) => {
++                state.write_u8(15u8);
++            }
++            BinOp::Ge(_) => {
++                state.write_u8(16u8);
++            }
++            BinOp::Gt(_) => {
++                state.write_u8(17u8);
++            }
++            BinOp::AddEq(_) => {
++                state.write_u8(18u8);
++            }
++            BinOp::SubEq(_) => {
++                state.write_u8(19u8);
++            }
++            BinOp::MulEq(_) => {
++                state.write_u8(20u8);
++            }
++            BinOp::DivEq(_) => {
++                state.write_u8(21u8);
++            }
++            BinOp::RemEq(_) => {
++                state.write_u8(22u8);
++            }
++            BinOp::BitXorEq(_) => {
++                state.write_u8(23u8);
++            }
++            BinOp::BitAndEq(_) => {
++                state.write_u8(24u8);
++            }
++            BinOp::BitOrEq(_) => {
++                state.write_u8(25u8);
++            }
++            BinOp::ShlEq(_) => {
++                state.write_u8(26u8);
++            }
++            BinOp::ShrEq(_) => {
++                state.write_u8(27u8);
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Binding {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.ident.hash(state);
++        self.ty.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for Block {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.stmts.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for BoundLifetimes {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.lifetimes.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for ConstParam {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.ident.hash(state);
++        self.ty.hash(state);
++        self.eq_token.hash(state);
++        self.default.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Constraint {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.ident.hash(state);
++        self.bounds.hash(state);
++    }
++}
++#[cfg(feature = "derive")]
++impl Hash for Data {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            Data::Struct(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            Data::Enum(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            Data::Union(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++        }
++    }
++}
++#[cfg(feature = "derive")]
++impl Hash for DataEnum {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.variants.hash(state);
++    }
++}
++#[cfg(feature = "derive")]
++impl Hash for DataStruct {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.fields.hash(state);
++        self.semi_token.hash(state);
++    }
++}
++#[cfg(feature = "derive")]
++impl Hash for DataUnion {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.fields.hash(state);
++    }
++}
++#[cfg(feature = "derive")]
++impl Hash for DeriveInput {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.ident.hash(state);
++        self.generics.hash(state);
++        self.data.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Expr {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            #[cfg(feature = "full")]
++            Expr::Array(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Assign(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::AssignOp(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Async(v0) => {
++                state.write_u8(3u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Await(v0) => {
++                state.write_u8(4u8);
++                v0.hash(state);
++            }
++            Expr::Binary(v0) => {
++                state.write_u8(5u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Block(v0) => {
++                state.write_u8(6u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Box(v0) => {
++                state.write_u8(7u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Break(v0) => {
++                state.write_u8(8u8);
++                v0.hash(state);
++            }
++            Expr::Call(v0) => {
++                state.write_u8(9u8);
++                v0.hash(state);
++            }
++            Expr::Cast(v0) => {
++                state.write_u8(10u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Closure(v0) => {
++                state.write_u8(11u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Continue(v0) => {
++                state.write_u8(12u8);
++                v0.hash(state);
++            }
++            Expr::Field(v0) => {
++                state.write_u8(13u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::ForLoop(v0) => {
++                state.write_u8(14u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Group(v0) => {
++                state.write_u8(15u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::If(v0) => {
++                state.write_u8(16u8);
++                v0.hash(state);
++            }
++            Expr::Index(v0) => {
++                state.write_u8(17u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Let(v0) => {
++                state.write_u8(18u8);
++                v0.hash(state);
++            }
++            Expr::Lit(v0) => {
++                state.write_u8(19u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Loop(v0) => {
++                state.write_u8(20u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Macro(v0) => {
++                state.write_u8(21u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Match(v0) => {
++                state.write_u8(22u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::MethodCall(v0) => {
++                state.write_u8(23u8);
++                v0.hash(state);
++            }
++            Expr::Paren(v0) => {
++                state.write_u8(24u8);
++                v0.hash(state);
++            }
++            Expr::Path(v0) => {
++                state.write_u8(25u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Range(v0) => {
++                state.write_u8(26u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Reference(v0) => {
++                state.write_u8(27u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Repeat(v0) => {
++                state.write_u8(28u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Return(v0) => {
++                state.write_u8(29u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Struct(v0) => {
++                state.write_u8(30u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Try(v0) => {
++                state.write_u8(31u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::TryBlock(v0) => {
++                state.write_u8(32u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Tuple(v0) => {
++                state.write_u8(33u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Type(v0) => {
++                state.write_u8(34u8);
++                v0.hash(state);
++            }
++            Expr::Unary(v0) => {
++                state.write_u8(35u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Unsafe(v0) => {
++                state.write_u8(36u8);
++                v0.hash(state);
++            }
++            Expr::Verbatim(v0) => {
++                state.write_u8(37u8);
++                TokenStreamHelper(v0).hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::While(v0) => {
++                state.write_u8(38u8);
++                v0.hash(state);
++            }
++            #[cfg(feature = "full")]
++            Expr::Yield(v0) => {
++                state.write_u8(39u8);
++                v0.hash(state);
++            }
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprArray {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.elems.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprAssign {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.left.hash(state);
++        self.right.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprAssignOp {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.left.hash(state);
++        self.op.hash(state);
++        self.right.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprAsync {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.capture.hash(state);
++        self.block.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprAwait {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.base.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for ExprBinary {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.left.hash(state);
++        self.op.hash(state);
++        self.right.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprBlock {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.label.hash(state);
++        self.block.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprBox {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprBreak {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.label.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for ExprCall {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.func.hash(state);
++        self.args.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for ExprCast {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.expr.hash(state);
++        self.ty.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprClosure {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.asyncness.hash(state);
++        self.movability.hash(state);
++        self.capture.hash(state);
++        self.inputs.hash(state);
++        self.output.hash(state);
++        self.body.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprContinue {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.label.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for ExprField {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.base.hash(state);
++        self.member.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprForLoop {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.label.hash(state);
++        self.pat.hash(state);
++        self.expr.hash(state);
++        self.body.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprGroup {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprIf {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.cond.hash(state);
++        self.then_branch.hash(state);
++        self.else_branch.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for ExprIndex {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.expr.hash(state);
++        self.index.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprLet {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.pat.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for ExprLit {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.lit.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprLoop {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.label.hash(state);
++        self.body.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprMacro {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.mac.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprMatch {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.expr.hash(state);
++        self.arms.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprMethodCall {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.receiver.hash(state);
++        self.method.hash(state);
++        self.turbofish.hash(state);
++        self.args.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for ExprParen {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for ExprPath {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.qself.hash(state);
++        self.path.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprRange {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.from.hash(state);
++        self.limits.hash(state);
++        self.to.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprReference {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.mutability.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprRepeat {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.expr.hash(state);
++        self.len.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprReturn {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprStruct {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.path.hash(state);
++        self.fields.hash(state);
++        self.dot2_token.hash(state);
++        self.rest.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprTry {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprTryBlock {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.block.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprTuple {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.elems.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprType {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.expr.hash(state);
++        self.ty.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for ExprUnary {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.op.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprUnsafe {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.block.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprWhile {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.label.hash(state);
++        self.cond.hash(state);
++        self.body.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ExprYield {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Field {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.ident.hash(state);
++        self.colon_token.hash(state);
++        self.ty.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for FieldPat {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.member.hash(state);
++        self.colon_token.hash(state);
++        self.pat.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for FieldValue {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.member.hash(state);
++        self.colon_token.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Fields {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            Fields::Named(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            Fields::Unnamed(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            Fields::Unit => {
++                state.write_u8(2u8);
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for FieldsNamed {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.named.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for FieldsUnnamed {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.unnamed.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for File {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.shebang.hash(state);
++        self.attrs.hash(state);
++        self.items.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for FnArg {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            FnArg::Receiver(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            FnArg::Typed(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ForeignItem {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            ForeignItem::Fn(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            ForeignItem::Static(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            ForeignItem::Type(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++            ForeignItem::Macro(v0) => {
++                state.write_u8(3u8);
++                v0.hash(state);
++            }
++            ForeignItem::Verbatim(v0) => {
++                state.write_u8(4u8);
++                TokenStreamHelper(v0).hash(state);
++            }
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ForeignItemFn {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.sig.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ForeignItemMacro {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.mac.hash(state);
++        self.semi_token.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ForeignItemStatic {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.mutability.hash(state);
++        self.ident.hash(state);
++        self.ty.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ForeignItemType {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.ident.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for GenericArgument {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            GenericArgument::Lifetime(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            GenericArgument::Type(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            GenericArgument::Binding(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++            GenericArgument::Constraint(v0) => {
++                state.write_u8(3u8);
++                v0.hash(state);
++            }
++            GenericArgument::Const(v0) => {
++                state.write_u8(4u8);
++                v0.hash(state);
++            }
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for GenericMethodArgument {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            GenericMethodArgument::Type(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            GenericMethodArgument::Const(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for GenericParam {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            GenericParam::Type(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            GenericParam::Lifetime(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            GenericParam::Const(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Generics {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.lt_token.hash(state);
++        self.params.hash(state);
++        self.gt_token.hash(state);
++        self.where_clause.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ImplItem {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            ImplItem::Const(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            ImplItem::Method(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            ImplItem::Type(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++            ImplItem::Macro(v0) => {
++                state.write_u8(3u8);
++                v0.hash(state);
++            }
++            ImplItem::Verbatim(v0) => {
++                state.write_u8(4u8);
++                TokenStreamHelper(v0).hash(state);
++            }
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ImplItemConst {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.defaultness.hash(state);
++        self.ident.hash(state);
++        self.ty.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ImplItemMacro {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.mac.hash(state);
++        self.semi_token.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ImplItemMethod {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.defaultness.hash(state);
++        self.sig.hash(state);
++        self.block.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ImplItemType {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.defaultness.hash(state);
++        self.ident.hash(state);
++        self.generics.hash(state);
++        self.ty.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for Item {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            Item::Const(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            Item::Enum(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            Item::ExternCrate(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++            Item::Fn(v0) => {
++                state.write_u8(3u8);
++                v0.hash(state);
++            }
++            Item::ForeignMod(v0) => {
++                state.write_u8(4u8);
++                v0.hash(state);
++            }
++            Item::Impl(v0) => {
++                state.write_u8(5u8);
++                v0.hash(state);
++            }
++            Item::Macro(v0) => {
++                state.write_u8(6u8);
++                v0.hash(state);
++            }
++            Item::Macro2(v0) => {
++                state.write_u8(7u8);
++                v0.hash(state);
++            }
++            Item::Mod(v0) => {
++                state.write_u8(8u8);
++                v0.hash(state);
++            }
++            Item::Static(v0) => {
++                state.write_u8(9u8);
++                v0.hash(state);
++            }
++            Item::Struct(v0) => {
++                state.write_u8(10u8);
++                v0.hash(state);
++            }
++            Item::Trait(v0) => {
++                state.write_u8(11u8);
++                v0.hash(state);
++            }
++            Item::TraitAlias(v0) => {
++                state.write_u8(12u8);
++                v0.hash(state);
++            }
++            Item::Type(v0) => {
++                state.write_u8(13u8);
++                v0.hash(state);
++            }
++            Item::Union(v0) => {
++                state.write_u8(14u8);
++                v0.hash(state);
++            }
++            Item::Use(v0) => {
++                state.write_u8(15u8);
++                v0.hash(state);
++            }
++            Item::Verbatim(v0) => {
++                state.write_u8(16u8);
++                TokenStreamHelper(v0).hash(state);
++            }
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemConst {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.ident.hash(state);
++        self.ty.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemEnum {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.ident.hash(state);
++        self.generics.hash(state);
++        self.variants.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemExternCrate {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.ident.hash(state);
++        self.rename.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemFn {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.sig.hash(state);
++        self.block.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemForeignMod {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.abi.hash(state);
++        self.items.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemImpl {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.defaultness.hash(state);
++        self.unsafety.hash(state);
++        self.generics.hash(state);
++        self.trait_.hash(state);
++        self.self_ty.hash(state);
++        self.items.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemMacro {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.ident.hash(state);
++        self.mac.hash(state);
++        self.semi_token.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemMacro2 {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.ident.hash(state);
++        TokenStreamHelper(&self.rules).hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemMod {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.ident.hash(state);
++        self.content.hash(state);
++        self.semi.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemStatic {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.mutability.hash(state);
++        self.ident.hash(state);
++        self.ty.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemStruct {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.ident.hash(state);
++        self.generics.hash(state);
++        self.fields.hash(state);
++        self.semi_token.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemTrait {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.unsafety.hash(state);
++        self.auto_token.hash(state);
++        self.ident.hash(state);
++        self.generics.hash(state);
++        self.colon_token.hash(state);
++        self.supertraits.hash(state);
++        self.items.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemTraitAlias {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.ident.hash(state);
++        self.generics.hash(state);
++        self.bounds.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemType {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.ident.hash(state);
++        self.generics.hash(state);
++        self.ty.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemUnion {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.ident.hash(state);
++        self.generics.hash(state);
++        self.fields.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for ItemUse {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.vis.hash(state);
++        self.leading_colon.hash(state);
++        self.tree.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for Label {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.name.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for LifetimeDef {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.lifetime.hash(state);
++        self.colon_token.hash(state);
++        self.bounds.hash(state);
++    }
++}
++impl Hash for Lit {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            Lit::Str(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            Lit::ByteStr(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            Lit::Byte(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++            Lit::Char(v0) => {
++                state.write_u8(3u8);
++                v0.hash(state);
++            }
++            Lit::Int(v0) => {
++                state.write_u8(4u8);
++                v0.hash(state);
++            }
++            Lit::Float(v0) => {
++                state.write_u8(5u8);
++                v0.hash(state);
++            }
++            Lit::Bool(v0) => {
++                state.write_u8(6u8);
++                v0.hash(state);
++            }
++            Lit::Verbatim(v0) => {
++                state.write_u8(7u8);
++                v0.to_string().hash(state);
++            }
++        }
++    }
++}
++impl Hash for LitBool {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.value.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for Local {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.pat.hash(state);
++        self.init.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Macro {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.path.hash(state);
++        self.delimiter.hash(state);
++        TokenStreamHelper(&self.tokens).hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for MacroDelimiter {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            MacroDelimiter::Paren(_) => {
++                state.write_u8(0u8);
++            }
++            MacroDelimiter::Brace(_) => {
++                state.write_u8(1u8);
++            }
++            MacroDelimiter::Bracket(_) => {
++                state.write_u8(2u8);
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Meta {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            Meta::Path(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            Meta::List(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            Meta::NameValue(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for MetaList {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.path.hash(state);
++        self.nested.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for MetaNameValue {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.path.hash(state);
++        self.lit.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for MethodTurbofish {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.args.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for NestedMeta {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            NestedMeta::Meta(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            NestedMeta::Lit(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for ParenthesizedGenericArguments {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.inputs.hash(state);
++        self.output.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for Pat {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            Pat::Box(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            Pat::Ident(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            Pat::Lit(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++            Pat::Macro(v0) => {
++                state.write_u8(3u8);
++                v0.hash(state);
++            }
++            Pat::Or(v0) => {
++                state.write_u8(4u8);
++                v0.hash(state);
++            }
++            Pat::Path(v0) => {
++                state.write_u8(5u8);
++                v0.hash(state);
++            }
++            Pat::Range(v0) => {
++                state.write_u8(6u8);
++                v0.hash(state);
++            }
++            Pat::Reference(v0) => {
++                state.write_u8(7u8);
++                v0.hash(state);
++            }
++            Pat::Rest(v0) => {
++                state.write_u8(8u8);
++                v0.hash(state);
++            }
++            Pat::Slice(v0) => {
++                state.write_u8(9u8);
++                v0.hash(state);
++            }
++            Pat::Struct(v0) => {
++                state.write_u8(10u8);
++                v0.hash(state);
++            }
++            Pat::Tuple(v0) => {
++                state.write_u8(11u8);
++                v0.hash(state);
++            }
++            Pat::TupleStruct(v0) => {
++                state.write_u8(12u8);
++                v0.hash(state);
++            }
++            Pat::Type(v0) => {
++                state.write_u8(13u8);
++                v0.hash(state);
++            }
++            Pat::Verbatim(v0) => {
++                state.write_u8(14u8);
++                TokenStreamHelper(v0).hash(state);
++            }
++            Pat::Wild(v0) => {
++                state.write_u8(15u8);
++                v0.hash(state);
++            }
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatBox {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.pat.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatIdent {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.by_ref.hash(state);
++        self.mutability.hash(state);
++        self.ident.hash(state);
++        self.subpat.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatLit {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.expr.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatMacro {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.mac.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatOr {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.leading_vert.hash(state);
++        self.cases.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatPath {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.qself.hash(state);
++        self.path.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatRange {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.lo.hash(state);
++        self.limits.hash(state);
++        self.hi.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatReference {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.mutability.hash(state);
++        self.pat.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatRest {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatSlice {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.elems.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatStruct {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.path.hash(state);
++        self.fields.hash(state);
++        self.dot2_token.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatTuple {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.elems.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatTupleStruct {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.path.hash(state);
++        self.pat.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatType {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.pat.hash(state);
++        self.ty.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for PatWild {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Path {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.leading_colon.hash(state);
++        self.segments.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for PathArguments {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            PathArguments::None => {
++                state.write_u8(0u8);
++            }
++            PathArguments::AngleBracketed(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            PathArguments::Parenthesized(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for PathSegment {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.ident.hash(state);
++        self.arguments.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for PredicateEq {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.lhs_ty.hash(state);
++        self.rhs_ty.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for PredicateLifetime {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.lifetime.hash(state);
++        self.bounds.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for PredicateType {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.lifetimes.hash(state);
++        self.bounded_ty.hash(state);
++        self.bounds.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for QSelf {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.ty.hash(state);
++        self.position.hash(state);
++        self.as_token.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for RangeLimits {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            RangeLimits::HalfOpen(_) => {
++                state.write_u8(0u8);
++            }
++            RangeLimits::Closed(_) => {
++                state.write_u8(1u8);
++            }
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for Receiver {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.reference.hash(state);
++        self.mutability.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for ReturnType {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            ReturnType::Default => {
++                state.write_u8(0u8);
++            }
++            ReturnType::Type(_, v1) => {
++                state.write_u8(1u8);
++                v1.hash(state);
++            }
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for Signature {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.constness.hash(state);
++        self.asyncness.hash(state);
++        self.unsafety.hash(state);
++        self.abi.hash(state);
++        self.ident.hash(state);
++        self.generics.hash(state);
++        self.inputs.hash(state);
++        self.variadic.hash(state);
++        self.output.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for Stmt {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            Stmt::Local(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            Stmt::Item(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            Stmt::Expr(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++            Stmt::Semi(v0, _) => {
++                state.write_u8(3u8);
++                v0.hash(state);
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TraitBound {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.paren_token.hash(state);
++        self.modifier.hash(state);
++        self.lifetimes.hash(state);
++        self.path.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TraitBoundModifier {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            TraitBoundModifier::None => {
++                state.write_u8(0u8);
++            }
++            TraitBoundModifier::Maybe(_) => {
++                state.write_u8(1u8);
++            }
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for TraitItem {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            TraitItem::Const(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            TraitItem::Method(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            TraitItem::Type(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++            TraitItem::Macro(v0) => {
++                state.write_u8(3u8);
++                v0.hash(state);
++            }
++            TraitItem::Verbatim(v0) => {
++                state.write_u8(4u8);
++                TokenStreamHelper(v0).hash(state);
++            }
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for TraitItemConst {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.ident.hash(state);
++        self.ty.hash(state);
++        self.default.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for TraitItemMacro {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.mac.hash(state);
++        self.semi_token.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for TraitItemMethod {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.sig.hash(state);
++        self.default.hash(state);
++        self.semi_token.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for TraitItemType {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.ident.hash(state);
++        self.generics.hash(state);
++        self.colon_token.hash(state);
++        self.bounds.hash(state);
++        self.default.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Type {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            Type::Array(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            Type::BareFn(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            Type::Group(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++            Type::ImplTrait(v0) => {
++                state.write_u8(3u8);
++                v0.hash(state);
++            }
++            Type::Infer(v0) => {
++                state.write_u8(4u8);
++                v0.hash(state);
++            }
++            Type::Macro(v0) => {
++                state.write_u8(5u8);
++                v0.hash(state);
++            }
++            Type::Never(v0) => {
++                state.write_u8(6u8);
++                v0.hash(state);
++            }
++            Type::Paren(v0) => {
++                state.write_u8(7u8);
++                v0.hash(state);
++            }
++            Type::Path(v0) => {
++                state.write_u8(8u8);
++                v0.hash(state);
++            }
++            Type::Ptr(v0) => {
++                state.write_u8(9u8);
++                v0.hash(state);
++            }
++            Type::Reference(v0) => {
++                state.write_u8(10u8);
++                v0.hash(state);
++            }
++            Type::Slice(v0) => {
++                state.write_u8(11u8);
++                v0.hash(state);
++            }
++            Type::TraitObject(v0) => {
++                state.write_u8(12u8);
++                v0.hash(state);
++            }
++            Type::Tuple(v0) => {
++                state.write_u8(13u8);
++                v0.hash(state);
++            }
++            Type::Verbatim(v0) => {
++                state.write_u8(14u8);
++                TokenStreamHelper(v0).hash(state);
++            }
++            _ => unreachable!(),
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypeArray {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.elem.hash(state);
++        self.len.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypeBareFn {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.lifetimes.hash(state);
++        self.unsafety.hash(state);
++        self.abi.hash(state);
++        self.inputs.hash(state);
++        self.variadic.hash(state);
++        self.output.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypeGroup {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.elem.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypeImplTrait {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.bounds.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypeInfer {
++    fn hash<H>(&self, _state: &mut H)
++    where
++        H: Hasher,
++    {
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypeMacro {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.mac.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypeNever {
++    fn hash<H>(&self, _state: &mut H)
++    where
++        H: Hasher,
++    {
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypeParam {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.ident.hash(state);
++        self.colon_token.hash(state);
++        self.bounds.hash(state);
++        self.eq_token.hash(state);
++        self.default.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypeParamBound {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            TypeParamBound::Trait(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            TypeParamBound::Lifetime(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypeParen {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.elem.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypePath {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.qself.hash(state);
++        self.path.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypePtr {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.const_token.hash(state);
++        self.mutability.hash(state);
++        self.elem.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypeReference {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.lifetime.hash(state);
++        self.mutability.hash(state);
++        self.elem.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypeSlice {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.elem.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypeTraitObject {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.dyn_token.hash(state);
++        self.bounds.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for TypeTuple {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.elems.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for UnOp {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            UnOp::Deref(_) => {
++                state.write_u8(0u8);
++            }
++            UnOp::Not(_) => {
++                state.write_u8(1u8);
++            }
++            UnOp::Neg(_) => {
++                state.write_u8(2u8);
++            }
++        }
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for UseGlob {
++    fn hash<H>(&self, _state: &mut H)
++    where
++        H: Hasher,
++    {
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for UseGroup {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.items.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for UseName {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.ident.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for UsePath {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.ident.hash(state);
++        self.tree.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for UseRename {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.ident.hash(state);
++        self.rename.hash(state);
++    }
++}
++#[cfg(feature = "full")]
++impl Hash for UseTree {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            UseTree::Path(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            UseTree::Name(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            UseTree::Rename(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++            UseTree::Glob(v0) => {
++                state.write_u8(3u8);
++                v0.hash(state);
++            }
++            UseTree::Group(v0) => {
++                state.write_u8(4u8);
++                v0.hash(state);
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Variadic {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Variant {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.attrs.hash(state);
++        self.ident.hash(state);
++        self.fields.hash(state);
++        self.discriminant.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for VisCrate {
++    fn hash<H>(&self, _state: &mut H)
++    where
++        H: Hasher,
++    {
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for VisPublic {
++    fn hash<H>(&self, _state: &mut H)
++    where
++        H: Hasher,
++    {
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for VisRestricted {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.in_token.hash(state);
++        self.path.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for Visibility {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            Visibility::Public(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            Visibility::Crate(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            Visibility::Restricted(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++            Visibility::Inherited => {
++                state.write_u8(3u8);
++            }
++        }
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for WhereClause {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        self.predicates.hash(state);
++    }
++}
++#[cfg(any(feature = "derive", feature = "full"))]
++impl Hash for WherePredicate {
++    fn hash<H>(&self, state: &mut H)
++    where
++        H: Hasher,
++    {
++        match self {
++            WherePredicate::Type(v0) => {
++                state.write_u8(0u8);
++                v0.hash(state);
++            }
++            WherePredicate::Lifetime(v0) => {
++                state.write_u8(1u8);
++                v0.hash(state);
++            }
++            WherePredicate::Eq(v0) => {
++                state.write_u8(2u8);
++                v0.hash(state);
++            }
++        }
++    }
++}
+diff --git a/third_party/rust/syn/src/gen/visit.rs b/third_party/rust/syn/src/gen/visit.rs
+--- a/third_party/rust/syn/src/gen/visit.rs
++++ b/third_party/rust/syn/src/gen/visit.rs
+@@ -15,27 +15,26 @@ macro_rules! full {
+     };
+ }
+ #[cfg(all(feature = "derive", not(feature = "full")))]
+ macro_rules! full {
+     ($e:expr) => {
+         unreachable!()
+     };
+ }
+-#[cfg(any(feature = "full", feature = "derive"))]
+ macro_rules! skip {
+     ($($tt:tt)*) => {};
+ }
+ /// Syntax tree traversal to walk a shared borrow of a syntax tree.
+ ///
+ /// See the [module documentation] for details.
+ ///
+ /// [module documentation]: self
+ ///
+-/// *This trait is available if Syn is built with the `"visit"` feature.*
++/// *This trait is available only if Syn is built with the `"visit"` feature.*
+ pub trait Visit<'ast> {
+     #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_abi(&mut self, i: &'ast Abi) {
+         visit_abi(self, i)
+     }
+     #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_angle_bracketed_generic_arguments(&mut self, i: &'ast AngleBracketedGenericArguments) {
+         visit_angle_bracketed_generic_arguments(self, i)
+@@ -429,45 +428,37 @@ pub trait Visit<'ast> {
+     }
+     fn visit_lifetime(&mut self, i: &'ast Lifetime) {
+         visit_lifetime(self, i)
+     }
+     #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lifetime_def(&mut self, i: &'ast LifetimeDef) {
+         visit_lifetime_def(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit(&mut self, i: &'ast Lit) {
+         visit_lit(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_bool(&mut self, i: &'ast LitBool) {
+         visit_lit_bool(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_byte(&mut self, i: &'ast LitByte) {
+         visit_lit_byte(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_byte_str(&mut self, i: &'ast LitByteStr) {
+         visit_lit_byte_str(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_char(&mut self, i: &'ast LitChar) {
+         visit_lit_char(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_float(&mut self, i: &'ast LitFloat) {
+         visit_lit_float(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_int(&mut self, i: &'ast LitInt) {
+         visit_lit_int(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_str(&mut self, i: &'ast LitStr) {
+         visit_lit_str(self, i)
+     }
+     #[cfg(feature = "full")]
+     fn visit_local(&mut self, i: &'ast Local) {
+         visit_local(self, i)
+     }
+     #[cfg(any(feature = "derive", feature = "full"))]
+@@ -2532,17 +2523,16 @@ where
+     for el in Punctuated::pairs(&node.bounds) {
+         let (it, p) = el.into_tuple();
+         v.visit_lifetime(it);
+         if let Some(p) = p {
+             tokens_helper(v, &p.spans);
+         }
+     }
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit<'ast, V>(v: &mut V, node: &'ast Lit)
+ where
+     V: Visit<'ast> + ?Sized,
+ {
+     match node {
+         Lit::Str(_binding_0) => {
+             v.visit_lit_str(_binding_0);
+         }
+@@ -2564,55 +2554,48 @@ where
+         Lit::Bool(_binding_0) => {
+             v.visit_lit_bool(_binding_0);
+         }
+         Lit::Verbatim(_binding_0) => {
+             skip!(_binding_0);
+         }
+     }
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_bool<'ast, V>(v: &mut V, node: &'ast LitBool)
+ where
+     V: Visit<'ast> + ?Sized,
+ {
+     skip!(node.value);
+     v.visit_span(&node.span);
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_byte<'ast, V>(v: &mut V, node: &'ast LitByte)
+ where
+     V: Visit<'ast> + ?Sized,
+ {
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_byte_str<'ast, V>(v: &mut V, node: &'ast LitByteStr)
+ where
+     V: Visit<'ast> + ?Sized,
+ {
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_char<'ast, V>(v: &mut V, node: &'ast LitChar)
+ where
+     V: Visit<'ast> + ?Sized,
+ {
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_float<'ast, V>(v: &mut V, node: &'ast LitFloat)
+ where
+     V: Visit<'ast> + ?Sized,
+ {
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_int<'ast, V>(v: &mut V, node: &'ast LitInt)
+ where
+     V: Visit<'ast> + ?Sized,
+ {
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_str<'ast, V>(v: &mut V, node: &'ast LitStr)
+ where
+     V: Visit<'ast> + ?Sized,
+ {
+ }
+ #[cfg(feature = "full")]
+ pub fn visit_local<'ast, V>(v: &mut V, node: &'ast Local)
+ where
+diff --git a/third_party/rust/syn/src/gen/visit_mut.rs b/third_party/rust/syn/src/gen/visit_mut.rs
+--- a/third_party/rust/syn/src/gen/visit_mut.rs
++++ b/third_party/rust/syn/src/gen/visit_mut.rs
+@@ -15,28 +15,27 @@ macro_rules! full {
+     };
+ }
+ #[cfg(all(feature = "derive", not(feature = "full")))]
+ macro_rules! full {
+     ($e:expr) => {
+         unreachable!()
+     };
+ }
+-#[cfg(any(feature = "full", feature = "derive"))]
+ macro_rules! skip {
+     ($($tt:tt)*) => {};
+ }
+ /// Syntax tree traversal to mutate an exclusive borrow of a syntax tree in
+ /// place.
+ ///
+ /// See the [module documentation] for details.
+ ///
+ /// [module documentation]: self
+ ///
+-/// *This trait is available if Syn is built with the `"visit-mut"` feature.*
++/// *This trait is available only if Syn is built with the `"visit-mut"` feature.*
+ pub trait VisitMut {
+     #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_abi_mut(&mut self, i: &mut Abi) {
+         visit_abi_mut(self, i)
+     }
+     #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_angle_bracketed_generic_arguments_mut(
+         &mut self,
+@@ -433,45 +432,37 @@ pub trait VisitMut {
+     }
+     fn visit_lifetime_mut(&mut self, i: &mut Lifetime) {
+         visit_lifetime_mut(self, i)
+     }
+     #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lifetime_def_mut(&mut self, i: &mut LifetimeDef) {
+         visit_lifetime_def_mut(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_mut(&mut self, i: &mut Lit) {
+         visit_lit_mut(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_bool_mut(&mut self, i: &mut LitBool) {
+         visit_lit_bool_mut(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_byte_mut(&mut self, i: &mut LitByte) {
+         visit_lit_byte_mut(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_byte_str_mut(&mut self, i: &mut LitByteStr) {
+         visit_lit_byte_str_mut(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_char_mut(&mut self, i: &mut LitChar) {
+         visit_lit_char_mut(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_float_mut(&mut self, i: &mut LitFloat) {
+         visit_lit_float_mut(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_int_mut(&mut self, i: &mut LitInt) {
+         visit_lit_int_mut(self, i)
+     }
+-    #[cfg(any(feature = "derive", feature = "full"))]
+     fn visit_lit_str_mut(&mut self, i: &mut LitStr) {
+         visit_lit_str_mut(self, i)
+     }
+     #[cfg(feature = "full")]
+     fn visit_local_mut(&mut self, i: &mut Local) {
+         visit_local_mut(self, i)
+     }
+     #[cfg(any(feature = "derive", feature = "full"))]
+@@ -2538,17 +2529,16 @@ where
+     for el in Punctuated::pairs_mut(&mut node.bounds) {
+         let (it, p) = el.into_tuple();
+         v.visit_lifetime_mut(it);
+         if let Some(p) = p {
+             tokens_helper(v, &mut p.spans);
+         }
+     }
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_mut<V>(v: &mut V, node: &mut Lit)
+ where
+     V: VisitMut + ?Sized,
+ {
+     match node {
+         Lit::Str(_binding_0) => {
+             v.visit_lit_str_mut(_binding_0);
+         }
+@@ -2570,55 +2560,48 @@ where
+         Lit::Bool(_binding_0) => {
+             v.visit_lit_bool_mut(_binding_0);
+         }
+         Lit::Verbatim(_binding_0) => {
+             skip!(_binding_0);
+         }
+     }
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_bool_mut<V>(v: &mut V, node: &mut LitBool)
+ where
+     V: VisitMut + ?Sized,
+ {
+     skip!(node.value);
+     v.visit_span_mut(&mut node.span);
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_byte_mut<V>(v: &mut V, node: &mut LitByte)
+ where
+     V: VisitMut + ?Sized,
+ {
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_byte_str_mut<V>(v: &mut V, node: &mut LitByteStr)
+ where
+     V: VisitMut + ?Sized,
+ {
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_char_mut<V>(v: &mut V, node: &mut LitChar)
+ where
+     V: VisitMut + ?Sized,
+ {
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_float_mut<V>(v: &mut V, node: &mut LitFloat)
+ where
+     V: VisitMut + ?Sized,
+ {
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_int_mut<V>(v: &mut V, node: &mut LitInt)
+ where
+     V: VisitMut + ?Sized,
+ {
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_str_mut<V>(v: &mut V, node: &mut LitStr)
+ where
+     V: VisitMut + ?Sized,
+ {
+ }
+ #[cfg(feature = "full")]
+ pub fn visit_local_mut<V>(v: &mut V, node: &mut Local)
+ where
+diff --git a/third_party/rust/syn/src/generics.rs b/third_party/rust/syn/src/generics.rs
+--- a/third_party/rust/syn/src/generics.rs
++++ b/third_party/rust/syn/src/generics.rs
+@@ -1,97 +1,108 @@
+ use super::*;
+ use crate::punctuated::{Iter, IterMut, Punctuated};
++#[cfg(all(feature = "printing", feature = "extra-traits"))]
++use std::fmt::{self, Debug};
++#[cfg(all(feature = "printing", feature = "extra-traits"))]
++use std::hash::{Hash, Hasher};
+ 
+ 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"`
++    /// *This type is available only 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"`
++    /// *This type is available only 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
+-    //
+-    // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
+-    // blocked on https://github.com/rust-lang/rust/issues/62833
+     pub enum GenericParam {
+         /// A generic type parameter: `T: Into<String>`.
+         Type(TypeParam),
+ 
+         /// A lifetime definition: `'a: 'b + 'c + 'd`.
+         Lifetime(LifetimeDef),
+ 
+         /// A const generic parameter: `const LENGTH: usize`.
+         Const(ConstParam),
+     }
+ }
+ 
+ ast_struct! {
+     /// A generic type parameter: `T: Into<String>`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct 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>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A lifetime definition: `'a: 'b + 'c + 'd`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct LifetimeDef {
+         pub attrs: Vec<Attribute>,
+         pub lifetime: Lifetime,
+         pub colon_token: Option<Token![:]>,
+         pub bounds: Punctuated<Lifetime, Token![+]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A const generic parameter: `const LENGTH: usize`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct 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 Default for Generics {
++    fn default() -> Self {
++        Generics {
++            lt_token: None,
++            params: Punctuated::new(),
++            gt_token: None,
++            where_clause: None,
++        }
++    }
++}
++
+ 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`.
+@@ -275,100 +286,148 @@ impl<'a> Iterator for ConstParamsMut<'a>
+         } else {
+             self.next()
+         }
+     }
+ }
+ 
+ /// Returned by `Generics::split_for_impl`.
+ ///
+-/// *This type is available if Syn is built with the `"derive"` or `"full"`
++/// *This type is available only 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"`
++/// *This type is available only 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"`
++/// *This type is available only 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.
+     ///
+     /// ```
+     /// # use proc_macro2::{Span, Ident};
+     /// # use quote::quote;
+     /// #
+-    /// # fn main() {
+-    /// #     let generics: syn::Generics = Default::default();
+-    /// #     let name = Ident::new("MyType", Span::call_site());
++    /// # 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
++    /// *This method is available only 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")]
++macro_rules! generics_wrapper_impls {
++    ($ty:ident) => {
++        #[cfg(feature = "clone-impls")]
++        impl<'a> Clone for $ty<'a> {
++            fn clone(&self) -> Self {
++                $ty(self.0)
++            }
++        }
++
++        #[cfg(feature = "extra-traits")]
++        impl<'a> Debug for $ty<'a> {
++            fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++                formatter
++                    .debug_tuple(stringify!($ty))
++                    .field(self.0)
++                    .finish()
++            }
++        }
++
++        #[cfg(feature = "extra-traits")]
++        impl<'a> Eq for $ty<'a> {}
++
++        #[cfg(feature = "extra-traits")]
++        impl<'a> PartialEq for $ty<'a> {
++            fn eq(&self, other: &Self) -> bool {
++                self.0 == other.0
++            }
++        }
++
++        #[cfg(feature = "extra-traits")]
++        impl<'a> Hash for $ty<'a> {
++            fn hash<H: Hasher>(&self, state: &mut H) {
++                self.0.hash(state);
++            }
++        }
++    };
++}
++
++#[cfg(feature = "printing")]
++generics_wrapper_impls!(ImplGenerics);
++#[cfg(feature = "printing")]
++generics_wrapper_impls!(TypeGenerics);
++#[cfg(feature = "printing")]
++generics_wrapper_impls!(Turbofish);
++
++#[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
++    /// *This method is available only 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"`
++    /// *This type is available only 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 Default for BoundLifetimes {
++    fn default() -> Self {
++        BoundLifetimes {
++            for_token: Default::default(),
++            lt_token: Default::default(),
++            lifetimes: Punctuated::new(),
++            gt_token: Default::default(),
++        }
++    }
++}
++
+ impl LifetimeDef {
+     pub fn new(lifetime: Lifetime) -> Self {
+         LifetimeDef {
+             attrs: Vec::new(),
+             lifetime,
+             colon_token: None,
+             bounds: Punctuated::new(),
+         }
+@@ -386,122 +445,118 @@ impl From<Ident> for TypeParam {
+             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"`
++    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
+     /// feature.*
+     pub enum TypeParamBound {
+         Trait(TraitBound),
+         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"`
++    /// *This type is available only 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"`
++    /// *This type is available only 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"`
++    /// *This type is available only 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"`
++    /// *This type is available only 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
+-    //
+-    // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
+-    // blocked on https://github.com/rust-lang/rust/issues/62833
+     pub enum WherePredicate {
+         /// A type predicate in a `where` clause: `for<'c> Foo<'c>: Trait<'c>`.
+         Type(PredicateType),
+ 
+         /// A lifetime predicate in a `where` clause: `'a: 'b + 'c`.
+         Lifetime(PredicateLifetime),
+ 
+         /// An equality predicate in a `where` clause (unsupported).
+         Eq(PredicateEq),
+     }
+ }
+ 
+ ast_struct! {
+     /// 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
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct 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![+]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A lifetime predicate in a `where` clause: `'a: 'b + 'c`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct PredicateLifetime {
+         pub lifetime: Lifetime,
+         pub colon_token: Token![:],
+         pub bounds: Punctuated<Lifetime, Token![+]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// An equality predicate in a `where` clause (unsupported).
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct PredicateEq {
+         pub lhs_ty: Type,
+         pub eq_token: Token![=],
+         pub rhs_ty: Type,
+     }
+ }
+ 
+@@ -516,38 +571,36 @@ pub mod parsing {
+             if !input.peek(Token![<]) {
+                 return Ok(Generics::default());
+             }
+ 
+             let lt_token: Token![<] = input.parse()?;
+ 
+             let mut params = Punctuated::new();
+             let mut allow_lifetime_param = true;
+-            let mut allow_type_param = true;
+             loop {
+                 if input.peek(Token![>]) {
+                     break;
+                 }
+ 
+                 let attrs = input.call(Attribute::parse_outer)?;
+                 let lookahead = input.lookahead1();
+                 if allow_lifetime_param && lookahead.peek(Lifetime) {
+                     params.push_value(GenericParam::Lifetime(LifetimeDef {
+                         attrs,
+                         ..input.parse()?
+                     }));
+-                } else if allow_type_param && lookahead.peek(Ident) {
++                } else if lookahead.peek(Ident) {
+                     allow_lifetime_param = false;
+                     params.push_value(GenericParam::Type(TypeParam {
+                         attrs,
+                         ..input.parse()?
+                     }));
+                 } else if lookahead.peek(Token![const]) {
+                     allow_lifetime_param = false;
+-                    allow_type_param = false;
+                     params.push_value(GenericParam::Const(ConstParam {
+                         attrs,
+                         ..input.parse()?
+                     }));
+                 } else {
+                     return Err(lookahead.error());
+                 }
+ 
+@@ -660,67 +713,63 @@ pub mod parsing {
+             } else {
+                 Ok(None)
+             }
+         }
+     }
+ 
+     impl Parse for TypeParam {
+         fn parse(input: ParseStream) -> Result<Self> {
+-            let has_colon;
+-            let has_default;
+-            Ok(TypeParam {
+-                attrs: input.call(Attribute::parse_outer)?,
+-                ident: input.parse()?,
+-                colon_token: {
+-                    if input.peek(Token![:]) {
+-                        has_colon = true;
+-                        Some(input.parse()?)
+-                    } else {
+-                        has_colon = false;
+-                        None
++            let attrs = input.call(Attribute::parse_outer)?;
++            let ident: Ident = input.parse()?;
++            let colon_token: Option<Token![:]> = input.parse()?;
++
++            let begin_bound = input.fork();
++            let mut is_maybe_const = false;
++            let mut bounds = Punctuated::new();
++            if colon_token.is_some() {
++                loop {
++                    if input.peek(Token![,]) || input.peek(Token![>]) || input.peek(Token![=]) {
++                        break;
++                    }
++                    if input.peek(Token![?]) && input.peek2(Token![const]) {
++                        input.parse::<Token![?]>()?;
++                        input.parse::<Token![const]>()?;
++                        is_maybe_const = true;
++                    }
++                    let value: TypeParamBound = input.parse()?;
++                    bounds.push_value(value);
++                    if !input.peek(Token![+]) {
++                        break;
+                     }
+-                },
+-                bounds: {
+-                    let mut bounds = Punctuated::new();
+-                    if has_colon {
+-                        loop {
+-                            if input.peek(Token![,])
+-                                || input.peek(Token![>])
+-                                || input.peek(Token![=])
+-                            {
+-                                break;
+-                            }
+-                            let value = input.parse()?;
+-                            bounds.push_value(value);
+-                            if !input.peek(Token![+]) {
+-                                break;
+-                            }
+-                            let punct = input.parse()?;
+-                            bounds.push_punct(punct);
+-                        }
+-                    }
+-                    bounds
+-                },
+-                eq_token: {
+-                    if input.peek(Token![=]) {
+-                        has_default = true;
+-                        Some(input.parse()?)
+-                    } else {
+-                        has_default = false;
+-                        None
+-                    }
+-                },
+-                default: {
+-                    if has_default {
+-                        Some(input.parse()?)
+-                    } else {
+-                        None
+-                    }
+-                },
++                    let punct: Token![+] = input.parse()?;
++                    bounds.push_punct(punct);
++                }
++            }
++
++            let mut eq_token: Option<Token![=]> = input.parse()?;
++            let mut default = if eq_token.is_some() {
++                Some(input.parse::<Type>()?)
++            } else {
++                None
++            };
++
++            if is_maybe_const {
++                bounds.clear();
++                eq_token = None;
++                default = Some(Type::Verbatim(verbatim::between(begin_bound, input)));
++            }
++
++            Ok(TypeParam {
++                attrs,
++                ident,
++                colon_token,
++                bounds,
++                eq_token,
++                default,
+             })
+         }
+     }
+ 
+     impl Parse for TypeParamBound {
+         fn parse(input: ParseStream) -> Result<Self> {
+             if input.peek(Lifetime) {
+                 return input.parse().map(TypeParamBound::Lifetime);
+@@ -893,16 +942,18 @@ pub mod parsing {
+     }
+ }
+ 
+ #[cfg(feature = "printing")]
+ mod printing {
+     use super::*;
+ 
+     use proc_macro2::TokenStream;
++    #[cfg(feature = "full")]
++    use proc_macro2::TokenTree;
+     use quote::{ToTokens, TokenStreamExt};
+ 
+     use crate::attr::FilterAttrs;
+     use crate::print::TokensOrDefault;
+ 
+     impl ToTokens for Generics {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
+             if self.params.is_empty() {
+@@ -1075,19 +1126,35 @@ mod printing {
+     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() {
++            if let Some(default) = &self.default {
++                #[cfg(feature = "full")]
++                {
++                    if self.eq_token.is_none() {
++                        if let Type::Verbatim(default) = default {
++                            let mut iter = default.clone().into_iter();
++                            match (iter.next(), iter.next()) {
++                                (Some(TokenTree::Punct(ref q)), Some(TokenTree::Ident(ref c)))
++                                    if q.as_char() == '?' && c == "const" =>
++                                {
++                                    return default.to_tokens(tokens);
++                                }
++                                _ => {}
++                            }
++                        }
++                    }
++                }
+                 TokensOrDefault(&self.eq_token).to_tokens(tokens);
+-                self.default.to_tokens(tokens);
++                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);
+@@ -1112,19 +1179,19 @@ mod printing {
+ 
+     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() {
++            if let Some(default) = &self.default {
+                 TokensOrDefault(&self.eq_token).to_tokens(tokens);
+-                self.default.to_tokens(tokens);
++                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);
+diff --git a/third_party/rust/syn/src/item.rs b/third_party/rust/syn/src/item.rs
+--- a/third_party/rust/syn/src/item.rs
++++ b/third_party/rust/syn/src/item.rs
+@@ -1,32 +1,30 @@
+ use super::*;
+-use crate::derive::{Data, DeriveInput};
++use crate::derive::{Data, DataEnum, DataStruct, DataUnion, DeriveInput};
+ use crate::punctuated::Punctuated;
+ use proc_macro2::TokenStream;
+ 
+-#[cfg(feature = "extra-traits")]
+-use crate::tt::TokenStreamHelper;
+-#[cfg(feature = "extra-traits")]
+-use std::hash::{Hash, Hasher};
++#[cfg(feature = "parsing")]
++use std::mem;
+ 
+ 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.*
++    /// *This type is available only 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
+     //
+     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
+     // blocked on https://github.com/rust-lang/rust/issues/62833
+-    pub enum Item #manual_extra_traits {
++    pub enum Item {
+         /// A constant item: `const MAX: u16 = 65535`.
+         Const(ItemConst),
+ 
+         /// An enum definition: `enum Foo<A, B> { A(A), B(B) }`.
+         Enum(ItemEnum),
+ 
+         /// An `extern crate` item: `extern crate serde`.
+         ExternCrate(ItemExternCrate),
+@@ -78,90 +76,90 @@ ast_enum_of_structs! {
+         #[doc(hidden)]
+         __Nonexhaustive,
+     }
+ }
+ 
+ ast_struct! {
+     /// A constant item: `const MAX: u16 = 65535`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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![;],
+     }
+ }
+ 
+ ast_struct! {
+     /// An enum definition: `enum Foo<A, B> { A(A), B(B) }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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![,]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// An `extern crate` item: `extern crate serde`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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![;],
+     }
+ }
+ 
+ ast_struct! {
+     /// A free-standing function: `fn process(n: usize) -> Result<()> { ...
+     /// }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ItemFn {
+         pub attrs: Vec<Attribute>,
+         pub vis: Visibility,
+         pub sig: Signature,
+         pub block: Box<Block>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A block of foreign items: `extern "C" { ... }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ItemForeignMod {
+         pub attrs: Vec<Attribute>,
+         pub abi: Abi,
+         pub brace_token: token::Brace,
+         pub items: Vec<ForeignItem>,
+     }
+ }
+ 
+ ast_struct! {
+     /// 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.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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])>,
+@@ -170,57 +168,57 @@ ast_struct! {
+         pub brace_token: token::Brace,
+         pub items: Vec<ImplItem>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A macro invocation, which includes `macro_rules!` definitions.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ItemMacro {
+         pub attrs: Vec<Attribute>,
+         /// The `example` in `macro_rules! example { ... }`.
+         pub ident: Option<Ident>,
+         pub mac: Macro,
+         pub semi_token: Option<Token![;]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A 2.0-style declarative macro introduced by the `macro` keyword.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
+-    pub struct ItemMacro2 #manual_extra_traits {
++    /// *This type is available only if Syn is built with the `"full"` feature.*
++    pub struct ItemMacro2 {
+         pub attrs: Vec<Attribute>,
+         pub vis: Visibility,
+         pub macro_token: Token![macro],
+         pub ident: Ident,
+         pub rules: TokenStream,
+     }
+ }
+ 
+ ast_struct! {
+     /// A module or module declaration: `mod m` or `mod m { ... }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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![;]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A static item: `static BIKE: Shed = Shed(42)`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     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>,
+@@ -228,32 +226,32 @@ ast_struct! {
+         pub expr: Box<Expr>,
+         pub semi_token: Token![;],
+     }
+ }
+ 
+ ast_struct! {
+     /// A struct definition: `struct Foo<A> { x: A }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only 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![;]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A trait definition: `pub trait Iterator { ... }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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,
+@@ -262,212 +260,99 @@ ast_struct! {
+         pub brace_token: token::Brace,
+         pub items: Vec<TraitItem>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A trait alias: `pub trait SharableIterator = Iterator + Sync`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ItemTraitAlias {
+         pub attrs: Vec<Attribute>,
+         pub vis: Visibility,
+         pub trait_token: Token![trait],
+         pub ident: Ident,
+         pub generics: Generics,
+         pub eq_token: Token![=],
+         pub bounds: Punctuated<TypeParamBound, Token![+]>,
+         pub semi_token: Token![;],
+     }
+ }
+ 
+ ast_struct! {
+     /// A type alias: `type Result<T> = std::result::Result<T, MyError>`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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![;],
+     }
+ }
+ 
+ ast_struct! {
+     /// A union definition: `union Foo<A, B> { x: A, y: B }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ItemUnion {
+         pub attrs: Vec<Attribute>,
+         pub vis: Visibility,
+         pub union_token: Token![union],
+         pub ident: Ident,
+         pub generics: Generics,
+         pub fields: FieldsNamed,
+     }
+ }
+ 
+ ast_struct! {
+     /// A use declaration: `use std::collections::HashMap`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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![;],
+     }
+ }
+ 
+-#[cfg(feature = "extra-traits")]
+-impl Eq for Item {}
+-
+-#[cfg(feature = "extra-traits")]
+-impl PartialEq for Item {
+-    fn eq(&self, other: &Self) -> bool {
+-        match (self, other) {
+-            (Item::Const(this), Item::Const(other)) => this == other,
+-            (Item::Enum(this), Item::Enum(other)) => this == other,
+-            (Item::ExternCrate(this), Item::ExternCrate(other)) => this == other,
+-            (Item::Fn(this), Item::Fn(other)) => this == other,
+-            (Item::ForeignMod(this), Item::ForeignMod(other)) => this == other,
+-            (Item::Impl(this), Item::Impl(other)) => this == other,
+-            (Item::Macro(this), Item::Macro(other)) => this == other,
+-            (Item::Macro2(this), Item::Macro2(other)) => this == other,
+-            (Item::Mod(this), Item::Mod(other)) => this == other,
+-            (Item::Static(this), Item::Static(other)) => this == other,
+-            (Item::Struct(this), Item::Struct(other)) => this == other,
+-            (Item::Trait(this), Item::Trait(other)) => this == other,
+-            (Item::TraitAlias(this), Item::TraitAlias(other)) => this == other,
+-            (Item::Type(this), Item::Type(other)) => this == other,
+-            (Item::Union(this), Item::Union(other)) => this == other,
+-            (Item::Use(this), Item::Use(other)) => this == other,
+-            (Item::Verbatim(this), Item::Verbatim(other)) => {
+-                TokenStreamHelper(this) == TokenStreamHelper(other)
+-            }
+-            _ => false,
+-        }
+-    }
+-}
+-
+-#[cfg(feature = "extra-traits")]
+-impl Hash for Item {
+-    fn hash<H>(&self, state: &mut H)
+-    where
+-        H: Hasher,
+-    {
++impl Item {
++    #[cfg(feature = "parsing")]
++    pub(crate) fn replace_attrs(&mut self, new: Vec<Attribute>) -> Vec<Attribute> {
+         match self {
+-            Item::Const(item) => {
+-                state.write_u8(0);
+-                item.hash(state);
+-            }
+-            Item::Enum(item) => {
+-                state.write_u8(1);
+-                item.hash(state);
+-            }
+-            Item::ExternCrate(item) => {
+-                state.write_u8(2);
+-                item.hash(state);
+-            }
+-            Item::Fn(item) => {
+-                state.write_u8(3);
+-                item.hash(state);
+-            }
+-            Item::ForeignMod(item) => {
+-                state.write_u8(4);
+-                item.hash(state);
+-            }
+-            Item::Impl(item) => {
+-                state.write_u8(5);
+-                item.hash(state);
+-            }
+-            Item::Macro(item) => {
+-                state.write_u8(6);
+-                item.hash(state);
+-            }
+-            Item::Macro2(item) => {
+-                state.write_u8(7);
+-                item.hash(state);
+-            }
+-            Item::Mod(item) => {
+-                state.write_u8(8);
+-                item.hash(state);
+-            }
+-            Item::Static(item) => {
+-                state.write_u8(9);
+-                item.hash(state);
+-            }
+-            Item::Struct(item) => {
+-                state.write_u8(10);
+-                item.hash(state);
+-            }
+-            Item::Trait(item) => {
+-                state.write_u8(11);
+-                item.hash(state);
+-            }
+-            Item::TraitAlias(item) => {
+-                state.write_u8(12);
+-                item.hash(state);
+-            }
+-            Item::Type(item) => {
+-                state.write_u8(13);
+-                item.hash(state);
+-            }
+-            Item::Union(item) => {
+-                state.write_u8(14);
+-                item.hash(state);
+-            }
+-            Item::Use(item) => {
+-                state.write_u8(15);
+-                item.hash(state);
+-            }
+-            Item::Verbatim(item) => {
+-                state.write_u8(16);
+-                TokenStreamHelper(item).hash(state);
+-            }
++            Item::ExternCrate(ItemExternCrate { attrs, .. })
++            | Item::Use(ItemUse { attrs, .. })
++            | Item::Static(ItemStatic { attrs, .. })
++            | Item::Const(ItemConst { attrs, .. })
++            | Item::Fn(ItemFn { attrs, .. })
++            | Item::Mod(ItemMod { attrs, .. })
++            | Item::ForeignMod(ItemForeignMod { attrs, .. })
++            | Item::Type(ItemType { attrs, .. })
++            | Item::Struct(ItemStruct { attrs, .. })
++            | Item::Enum(ItemEnum { attrs, .. })
++            | Item::Union(ItemUnion { attrs, .. })
++            | Item::Trait(ItemTrait { attrs, .. })
++            | Item::TraitAlias(ItemTraitAlias { attrs, .. })
++            | Item::Impl(ItemImpl { attrs, .. })
++            | Item::Macro(ItemMacro { attrs, .. })
++            | Item::Macro2(ItemMacro2 { attrs, .. }) => mem::replace(attrs, new),
++            Item::Verbatim(_) => Vec::new(),
+             Item::__Nonexhaustive => unreachable!(),
+         }
+     }
+ }
+ 
+-#[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
+-            && TokenStreamHelper(&self.rules) == TokenStreamHelper(&other.rules)
+-    }
+-}
+-
+-#[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);
+-        TokenStreamHelper(&self.rules).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,
+@@ -491,20 +376,67 @@ impl From<DeriveInput> for Item {
+                 ident: input.ident,
+                 generics: input.generics,
+                 fields: data.fields,
+             }),
+         }
+     }
+ }
+ 
++impl From<ItemStruct> for DeriveInput {
++    fn from(input: ItemStruct) -> DeriveInput {
++        DeriveInput {
++            attrs: input.attrs,
++            vis: input.vis,
++            ident: input.ident,
++            generics: input.generics,
++            data: Data::Struct(DataStruct {
++                struct_token: input.struct_token,
++                fields: input.fields,
++                semi_token: input.semi_token,
++            }),
++        }
++    }
++}
++
++impl From<ItemEnum> for DeriveInput {
++    fn from(input: ItemEnum) -> DeriveInput {
++        DeriveInput {
++            attrs: input.attrs,
++            vis: input.vis,
++            ident: input.ident,
++            generics: input.generics,
++            data: Data::Enum(DataEnum {
++                enum_token: input.enum_token,
++                brace_token: input.brace_token,
++                variants: input.variants,
++            }),
++        }
++    }
++}
++
++impl From<ItemUnion> for DeriveInput {
++    fn from(input: ItemUnion) -> DeriveInput {
++        DeriveInput {
++            attrs: input.attrs,
++            vis: input.vis,
++            ident: input.ident,
++            generics: input.generics,
++            data: Data::Union(DataUnion {
++                union_token: input.union_token,
++                fields: input.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.*
++    /// *This type is available only 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
+     //
+     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
+@@ -525,77 +457,77 @@ ast_enum_of_structs! {
+         /// A braced group of imports in a `use` item: `{A, B, C}`.
+         Group(UseGroup),
+     }
+ }
+ 
+ ast_struct! {
+     /// A path prefix of imports in a `use` item: `std::...`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct UsePath {
+         pub ident: Ident,
+         pub colon2_token: Token![::],
+         pub tree: Box<UseTree>,
+     }
+ }
+ 
+ ast_struct! {
+     /// An identifier imported by a `use` item: `HashMap`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct UseName {
+         pub ident: Ident,
+     }
+ }
+ 
+ ast_struct! {
+     /// An renamed identifier imported by a `use` item: `HashMap as Map`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct UseRename {
+         pub ident: Ident,
+         pub as_token: Token![as],
+         pub rename: Ident,
+     }
+ }
+ 
+ ast_struct! {
+     /// A glob import in a `use` item: `*`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct UseGlob {
+         pub star_token: Token![*],
+     }
+ }
+ 
+ ast_struct! {
+     /// A braced group of imports in a `use` item: `{A, B, C}`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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.*
++    /// *This type is available only 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
+     //
+     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
+     // blocked on https://github.com/rust-lang/rust/issues/62833
+-    pub enum ForeignItem #manual_extra_traits {
++    pub enum ForeignItem {
+         /// A foreign function in an `extern` block.
+         Fn(ForeignItemFn),
+ 
+         /// A foreign static item in an `extern` block: `static ext: u8`.
+         Static(ForeignItemStatic),
+ 
+         /// A foreign type in an `extern` block: `type void`.
+         Type(ForeignItemType),
+@@ -609,130 +541,79 @@ ast_enum_of_structs! {
+         #[doc(hidden)]
+         __Nonexhaustive,
+     }
+ }
+ 
+ ast_struct! {
+     /// A foreign function in an `extern` block.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ForeignItemFn {
+         pub attrs: Vec<Attribute>,
+         pub vis: Visibility,
+         pub sig: Signature,
+         pub semi_token: Token![;],
+     }
+ }
+ 
+ ast_struct! {
+     /// A foreign static item in an `extern` block: `static ext: u8`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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![;],
+     }
+ }
+ 
+ ast_struct! {
+     /// A foreign type in an `extern` block: `type void`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ForeignItemType {
+         pub attrs: Vec<Attribute>,
+         pub vis: Visibility,
+         pub type_token: Token![type],
+         pub ident: Ident,
+         pub semi_token: Token![;],
+     }
+ }
+ 
+ ast_struct! {
+     /// A macro invocation within an extern block.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ForeignItemMacro {
+         pub attrs: Vec<Attribute>,
+         pub mac: Macro,
+         pub semi_token: Option<Token![;]>,
+     }
+ }
+ 
+-#[cfg(feature = "extra-traits")]
+-impl Eq for ForeignItem {}
+-
+-#[cfg(feature = "extra-traits")]
+-impl PartialEq for ForeignItem {
+-    fn eq(&self, other: &Self) -> bool {
+-        match (self, other) {
+-            (ForeignItem::Fn(this), ForeignItem::Fn(other)) => this == other,
+-            (ForeignItem::Static(this), ForeignItem::Static(other)) => this == other,
+-            (ForeignItem::Type(this), ForeignItem::Type(other)) => this == other,
+-            (ForeignItem::Macro(this), ForeignItem::Macro(other)) => this == other,
+-            (ForeignItem::Verbatim(this), ForeignItem::Verbatim(other)) => {
+-                TokenStreamHelper(this) == TokenStreamHelper(other)
+-            }
+-            _ => false,
+-        }
+-    }
+-}
+-
+-#[cfg(feature = "extra-traits")]
+-impl Hash for ForeignItem {
+-    fn hash<H>(&self, state: &mut H)
+-    where
+-        H: Hasher,
+-    {
+-        match self {
+-            ForeignItem::Fn(item) => {
+-                state.write_u8(0);
+-                item.hash(state);
+-            }
+-            ForeignItem::Static(item) => {
+-                state.write_u8(1);
+-                item.hash(state);
+-            }
+-            ForeignItem::Type(item) => {
+-                state.write_u8(2);
+-                item.hash(state);
+-            }
+-            ForeignItem::Macro(item) => {
+-                state.write_u8(3);
+-                item.hash(state);
+-            }
+-            ForeignItem::Verbatim(item) => {
+-                state.write_u8(4);
+-                TokenStreamHelper(item).hash(state);
+-            }
+-            ForeignItem::__Nonexhaustive => unreachable!(),
+-        }
+-    }
+-}
+-
+ 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.*
++    /// *This type is available only 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
+     //
+     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
+     // blocked on https://github.com/rust-lang/rust/issues/62833
+-    pub enum TraitItem #manual_extra_traits {
++    pub enum TraitItem {
+         /// An associated constant within the definition of a trait.
+         Const(TraitItemConst),
+ 
+         /// A trait method within the definition of a trait.
+         Method(TraitItemMethod),
+ 
+         /// An associated type within the definition of a trait.
+         Type(TraitItemType),
+@@ -746,132 +627,81 @@ ast_enum_of_structs! {
+         #[doc(hidden)]
+         __Nonexhaustive,
+     }
+ }
+ 
+ ast_struct! {
+     /// An associated constant within the definition of a trait.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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![;],
+     }
+ }
+ 
+ ast_struct! {
+     /// A trait method within the definition of a trait.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct TraitItemMethod {
+         pub attrs: Vec<Attribute>,
+         pub sig: Signature,
+         pub default: Option<Block>,
+         pub semi_token: Option<Token![;]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// An associated type within the definition of a trait.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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![;],
+     }
+ }
+ 
+ ast_struct! {
+     /// A macro invocation within the definition of a trait.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct TraitItemMacro {
+         pub attrs: Vec<Attribute>,
+         pub mac: Macro,
+         pub semi_token: Option<Token![;]>,
+     }
+ }
+ 
+-#[cfg(feature = "extra-traits")]
+-impl Eq for TraitItem {}
+-
+-#[cfg(feature = "extra-traits")]
+-impl PartialEq for TraitItem {
+-    fn eq(&self, other: &Self) -> bool {
+-        match (self, other) {
+-            (TraitItem::Const(this), TraitItem::Const(other)) => this == other,
+-            (TraitItem::Method(this), TraitItem::Method(other)) => this == other,
+-            (TraitItem::Type(this), TraitItem::Type(other)) => this == other,
+-            (TraitItem::Macro(this), TraitItem::Macro(other)) => this == other,
+-            (TraitItem::Verbatim(this), TraitItem::Verbatim(other)) => {
+-                TokenStreamHelper(this) == TokenStreamHelper(other)
+-            }
+-            _ => false,
+-        }
+-    }
+-}
+-
+-#[cfg(feature = "extra-traits")]
+-impl Hash for TraitItem {
+-    fn hash<H>(&self, state: &mut H)
+-    where
+-        H: Hasher,
+-    {
+-        match self {
+-            TraitItem::Const(item) => {
+-                state.write_u8(0);
+-                item.hash(state);
+-            }
+-            TraitItem::Method(item) => {
+-                state.write_u8(1);
+-                item.hash(state);
+-            }
+-            TraitItem::Type(item) => {
+-                state.write_u8(2);
+-                item.hash(state);
+-            }
+-            TraitItem::Macro(item) => {
+-                state.write_u8(3);
+-                item.hash(state);
+-            }
+-            TraitItem::Verbatim(item) => {
+-                state.write_u8(4);
+-                TokenStreamHelper(item).hash(state);
+-            }
+-            TraitItem::__Nonexhaustive => unreachable!(),
+-        }
+-    }
+-}
+-
+ ast_enum_of_structs! {
+     /// An item within an impl block.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only 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
+     //
+     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
+     // blocked on https://github.com/rust-lang/rust/issues/62833
+-    pub enum ImplItem #manual_extra_traits {
++    pub enum ImplItem {
+         /// An associated constant within an impl block.
+         Const(ImplItemConst),
+ 
+         /// A method within an impl block.
+         Method(ImplItemMethod),
+ 
+         /// An associated type within an impl block.
+         Type(ImplItemType),
+@@ -885,17 +715,17 @@ ast_enum_of_structs! {
+         #[doc(hidden)]
+         __Nonexhaustive,
+     }
+ }
+ 
+ ast_struct! {
+     /// An associated constant within an impl block.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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,
+@@ -903,144 +733,117 @@ ast_struct! {
+         pub expr: Expr,
+         pub semi_token: Token![;],
+     }
+ }
+ 
+ ast_struct! {
+     /// A method within an impl block.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ImplItemMethod {
+         pub attrs: Vec<Attribute>,
+         pub vis: Visibility,
+         pub defaultness: Option<Token![default]>,
+         pub sig: Signature,
+         pub block: Block,
+     }
+ }
+ 
+ ast_struct! {
+     /// An associated type within an impl block.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct 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![;],
+     }
+ }
+ 
+ ast_struct! {
+     /// A macro invocation within an impl block.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct ImplItemMacro {
+         pub attrs: Vec<Attribute>,
+         pub mac: Macro,
+         pub semi_token: Option<Token![;]>,
+     }
+ }
+ 
+-#[cfg(feature = "extra-traits")]
+-impl Eq for ImplItem {}
+-
+-#[cfg(feature = "extra-traits")]
+-impl PartialEq for ImplItem {
+-    fn eq(&self, other: &Self) -> bool {
+-        match (self, other) {
+-            (ImplItem::Const(this), ImplItem::Const(other)) => this == other,
+-            (ImplItem::Method(this), ImplItem::Method(other)) => this == other,
+-            (ImplItem::Type(this), ImplItem::Type(other)) => this == other,
+-            (ImplItem::Macro(this), ImplItem::Macro(other)) => this == other,
+-            (ImplItem::Verbatim(this), ImplItem::Verbatim(other)) => {
+-                TokenStreamHelper(this) == TokenStreamHelper(other)
+-            }
+-            _ => false,
+-        }
+-    }
+-}
+-
+-#[cfg(feature = "extra-traits")]
+-impl Hash for ImplItem {
+-    fn hash<H>(&self, state: &mut H)
+-    where
+-        H: Hasher,
+-    {
+-        match self {
+-            ImplItem::Const(item) => {
+-                state.write_u8(0);
+-                item.hash(state);
+-            }
+-            ImplItem::Method(item) => {
+-                state.write_u8(1);
+-                item.hash(state);
+-            }
+-            ImplItem::Type(item) => {
+-                state.write_u8(2);
+-                item.hash(state);
+-            }
+-            ImplItem::Macro(item) => {
+-                state.write_u8(3);
+-                item.hash(state);
+-            }
+-            ImplItem::Verbatim(item) => {
+-                state.write_u8(4);
+-                TokenStreamHelper(item).hash(state);
+-            }
+-            ImplItem::__Nonexhaustive => unreachable!(),
+-        }
+-    }
+-}
+-
+ ast_struct! {
+     /// A function signature in a trait or implementation: `unsafe fn
+     /// initialize(&self)`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct Signature {
+         pub constness: Option<Token![const]>,
+         pub asyncness: Option<Token![async]>,
+         pub unsafety: Option<Token![unsafe]>,
+         pub abi: Option<Abi>,
+         pub fn_token: Token![fn],
+         pub ident: Ident,
+         pub generics: Generics,
+         pub paren_token: token::Paren,
+         pub inputs: Punctuated<FnArg, Token![,]>,
+         pub variadic: Option<Variadic>,
+         pub output: ReturnType,
+     }
+ }
+ 
++impl Signature {
++    /// A method's `self` receiver, such as `&self` or `self: Box<Self>`.
++    pub fn receiver(&self) -> Option<&FnArg> {
++        let arg = self.inputs.first()?;
++        match arg {
++            FnArg::Receiver(_) => Some(arg),
++            FnArg::Typed(PatType { pat, .. }) => {
++                if let Pat::Ident(PatIdent { ident, .. }) = &**pat {
++                    if ident == "self" {
++                        return Some(arg);
++                    }
++                }
++                None
++            }
++        }
++    }
++}
++
+ 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.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub enum FnArg {
+         /// The `self` argument of an associated method, whether taken by value
+         /// or by reference.
++        ///
++        /// Note that `self` receivers with a specified type, such as `self:
++        /// Box<Self>`, are parsed as a `FnArg::Typed`.
+         Receiver(Receiver),
+ 
+         /// A function argument accepted by pattern and type.
+         Typed(PatType),
+     }
+ }
+ 
+ ast_struct! {
+     /// The `self` argument of an associated method, whether taken by value
+     /// or by reference.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// Note that `self` receivers with a specified type, such as `self:
++    /// Box<Self>`, are parsed as a `FnArg::Typed`.
++    ///
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct Receiver {
+         pub attrs: Vec<Attribute>,
+         pub reference: Option<(Token![&], Option<Lifetime>)>,
+         pub mutability: Option<Token![mut]>,
+         pub self_token: Token![self],
+     }
+ }
+ 
+@@ -1051,149 +854,233 @@ impl Receiver {
+ }
+ 
+ #[cfg(feature = "parsing")]
+ pub mod parsing {
+     use super::*;
+ 
+     use crate::ext::IdentExt;
+     use crate::parse::discouraged::Speculative;
+-    use crate::parse::{Parse, ParseStream, Result};
++    use crate::parse::{Parse, ParseBuffer, ParseStream, Result};
++    use crate::token::Brace;
+     use proc_macro2::{Delimiter, Group, Punct, Spacing, TokenTree};
+     use std::iter::{self, FromIterator};
+ 
+     crate::custom_keyword!(existential);
+ 
+     impl Parse for Item {
+         fn parse(input: ParseStream) -> Result<Self> {
++            let begin = input.fork();
+             let mut attrs = input.call(Attribute::parse_outer)?;
+             let ahead = input.fork();
+             let vis: Visibility = ahead.parse()?;
+ 
+             let lookahead = ahead.lookahead1();
+-            let mut item = if lookahead.peek(Token![extern]) {
++            let mut item = if lookahead.peek(Token![fn]) || peek_signature(&ahead) {
++                let vis: Visibility = input.parse()?;
++                let sig = parse_signature(input)?;
++                if input.peek(Token![;]) {
++                    input.parse::<Token![;]>()?;
++                    Ok(Item::Verbatim(verbatim::between(begin, input)))
++                } else {
++                    parse_rest_of_fn(input, Vec::new(), vis, sig).map(Item::Fn)
++                }
++            } else if lookahead.peek(Token![extern]) {
+                 ahead.parse::<Token![extern]>()?;
+                 let lookahead = ahead.lookahead1();
+                 if lookahead.peek(Token![crate]) {
+                     input.parse().map(Item::ExternCrate)
+-                } else if lookahead.peek(Token![fn]) {
+-                    input.parse().map(Item::Fn)
+                 } else if lookahead.peek(token::Brace) {
+                     input.parse().map(Item::ForeignMod)
+                 } else if lookahead.peek(LitStr) {
+                     ahead.parse::<LitStr>()?;
+                     let lookahead = ahead.lookahead1();
+                     if lookahead.peek(token::Brace) {
+                         input.parse().map(Item::ForeignMod)
+-                    } else if lookahead.peek(Token![fn]) {
+-                        input.parse().map(Item::Fn)
+                     } else {
+                         Err(lookahead.error())
+                     }
+                 } else {
+                     Err(lookahead.error())
+                 }
+             } else if lookahead.peek(Token![use]) {
+                 input.parse().map(Item::Use)
+             } else if lookahead.peek(Token![static]) {
+-                input.parse().map(Item::Static)
++                let vis = input.parse()?;
++                let static_token = input.parse()?;
++                let mutability = input.parse()?;
++                let ident = input.parse()?;
++                let colon_token = input.parse()?;
++                let ty = input.parse()?;
++                if input.peek(Token![;]) {
++                    input.parse::<Token![;]>()?;
++                    Ok(Item::Verbatim(verbatim::between(begin, input)))
++                } else {
++                    Ok(Item::Static(ItemStatic {
++                        attrs: Vec::new(),
++                        vis,
++                        static_token,
++                        mutability,
++                        ident,
++                        colon_token,
++                        ty,
++                        eq_token: input.parse()?,
++                        expr: input.parse()?,
++                        semi_token: input.parse()?,
++                    }))
++                }
+             } else if lookahead.peek(Token![const]) {
+                 ahead.parse::<Token![const]>()?;
+                 let lookahead = ahead.lookahead1();
+                 if lookahead.peek(Ident) || lookahead.peek(Token![_]) {
+-                    input.parse().map(Item::Const)
+-                } else if lookahead.peek(Token![unsafe])
+-                    || lookahead.peek(Token![async])
+-                    || lookahead.peek(Token![extern])
+-                    || lookahead.peek(Token![fn])
+-                {
+-                    input.parse().map(Item::Fn)
++                    let vis = input.parse()?;
++                    let const_token = input.parse()?;
++                    let ident = {
++                        let lookahead = input.lookahead1();
++                        if lookahead.peek(Ident) || lookahead.peek(Token![_]) {
++                            input.call(Ident::parse_any)?
++                        } else {
++                            return Err(lookahead.error());
++                        }
++                    };
++                    let colon_token = input.parse()?;
++                    let ty = input.parse()?;
++                    if input.peek(Token![;]) {
++                        input.parse::<Token![;]>()?;
++                        Ok(Item::Verbatim(verbatim::between(begin, input)))
++                    } else {
++                        Ok(Item::Const(ItemConst {
++                            attrs: Vec::new(),
++                            vis,
++                            const_token,
++                            ident,
++                            colon_token,
++                            ty,
++                            eq_token: input.parse()?,
++                            expr: input.parse()?,
++                            semi_token: input.parse()?,
++                        }))
++                    }
+                 } else {
+                     Err(lookahead.error())
+                 }
+             } else if lookahead.peek(Token![unsafe]) {
+                 ahead.parse::<Token![unsafe]>()?;
+                 let lookahead = ahead.lookahead1();
+                 if lookahead.peek(Token![trait])
+                     || lookahead.peek(Token![auto]) && ahead.peek2(Token![trait])
+                 {
+                     input.parse().map(Item::Trait)
+                 } else if lookahead.peek(Token![impl]) {
+-                    input.parse().map(Item::Impl)
+-                } else if lookahead.peek(Token![async])
+-                    || lookahead.peek(Token![extern])
+-                    || lookahead.peek(Token![fn])
+-                {
+-                    input.parse().map(Item::Fn)
++                    let allow_const_impl = true;
++                    if let Some(item) = parse_impl(input, allow_const_impl)? {
++                        Ok(Item::Impl(item))
++                    } else {
++                        Ok(Item::Verbatim(verbatim::between(begin, input)))
++                    }
+                 } else {
+                     Err(lookahead.error())
+                 }
+-            } else if lookahead.peek(Token![async]) || lookahead.peek(Token![fn]) {
+-                input.parse().map(Item::Fn)
+             } else if lookahead.peek(Token![mod]) {
+                 input.parse().map(Item::Mod)
+             } else if lookahead.peek(Token![type]) {
+-                input.parse().map(Item::Type)
++                parse_item_type(begin, input)
+             } else if lookahead.peek(existential) {
+                 input.call(item_existential).map(Item::Verbatim)
+             } else if lookahead.peek(Token![struct]) {
+                 input.parse().map(Item::Struct)
+             } else if lookahead.peek(Token![enum]) {
+                 input.parse().map(Item::Enum)
+             } else if lookahead.peek(Token![union]) && ahead.peek2(Ident) {
+                 input.parse().map(Item::Union)
+             } else if lookahead.peek(Token![trait]) {
+                 input.call(parse_trait_or_trait_alias)
+             } else if lookahead.peek(Token![auto]) && ahead.peek2(Token![trait]) {
+                 input.parse().map(Item::Trait)
+             } else if lookahead.peek(Token![impl])
+                 || lookahead.peek(Token![default]) && !ahead.peek2(Token![!])
+             {
+-                input.parse().map(Item::Impl)
++                let allow_const_impl = true;
++                if let Some(item) = parse_impl(input, allow_const_impl)? {
++                    Ok(Item::Impl(item))
++                } else {
++                    Ok(Item::Verbatim(verbatim::between(begin, input)))
++                }
+             } else if lookahead.peek(Token![macro]) {
+                 input.parse().map(Item::Macro2)
+             } else if vis.is_inherited()
+                 && (lookahead.peek(Ident)
+                     || lookahead.peek(Token![self])
+                     || lookahead.peek(Token![super])
+-                    || lookahead.peek(Token![extern])
+                     || lookahead.peek(Token![crate])
+                     || lookahead.peek(Token![::]))
+             {
+                 input.parse().map(Item::Macro)
+             } else {
+                 Err(lookahead.error())
+             }?;
+ 
+-            {
+-                let item_attrs = match &mut item {
+-                    Item::ExternCrate(item) => &mut item.attrs,
+-                    Item::Use(item) => &mut item.attrs,
+-                    Item::Static(item) => &mut item.attrs,
+-                    Item::Const(item) => &mut item.attrs,
+-                    Item::Fn(item) => &mut item.attrs,
+-                    Item::Mod(item) => &mut item.attrs,
+-                    Item::ForeignMod(item) => &mut item.attrs,
+-                    Item::Type(item) => &mut item.attrs,
+-                    Item::Struct(item) => &mut item.attrs,
+-                    Item::Enum(item) => &mut item.attrs,
+-                    Item::Union(item) => &mut item.attrs,
+-                    Item::Trait(item) => &mut item.attrs,
+-                    Item::TraitAlias(item) => &mut item.attrs,
+-                    Item::Impl(item) => &mut item.attrs,
+-                    Item::Macro(item) => &mut item.attrs,
+-                    Item::Macro2(item) => &mut item.attrs,
+-                    Item::Verbatim(_) => return Ok(item),
+-                    Item::__Nonexhaustive => unreachable!(),
+-                };
+-                attrs.extend(item_attrs.drain(..));
+-                *item_attrs = attrs;
++            attrs.extend(item.replace_attrs(Vec::new()));
++            item.replace_attrs(attrs);
++            Ok(item)
++        }
++    }
++
++    struct FlexibleItemType {
++        vis: Visibility,
++        defaultness: Option<Token![default]>,
++        type_token: Token![type],
++        ident: Ident,
++        generics: Generics,
++        colon_token: Option<Token![:]>,
++        bounds: Punctuated<TypeParamBound, Token![+]>,
++        ty: Option<(Token![=], Type)>,
++        semi_token: Token![;],
++    }
++
++    impl Parse for FlexibleItemType {
++        fn parse(input: ParseStream) -> Result<Self> {
++            let vis: Visibility = input.parse()?;
++            let defaultness: Option<Token![default]> = input.parse()?;
++            let type_token: Token![type] = input.parse()?;
++            let ident: Ident = input.parse()?;
++            let mut generics: Generics = input.parse()?;
++            let colon_token: Option<Token![:]> = input.parse()?;
++            let mut bounds = Punctuated::new();
++            if colon_token.is_some() {
++                loop {
++                    bounds.push_value(input.parse::<TypeParamBound>()?);
++                    if input.peek(Token![where]) || input.peek(Token![=]) || input.peek(Token![;]) {
++                        break;
++                    }
++                    bounds.push_punct(input.parse::<Token![+]>()?);
++                    if input.peek(Token![where]) || input.peek(Token![=]) || input.peek(Token![;]) {
++                        break;
++                    }
++                }
+             }
++            generics.where_clause = input.parse()?;
++            let ty = if let Some(eq_token) = input.parse()? {
++                Some((eq_token, input.parse::<Type>()?))
++            } else {
++                None
++            };
++            let semi_token: Token![;] = input.parse()?;
+ 
+-            Ok(item)
++            Ok(FlexibleItemType {
++                vis,
++                defaultness,
++                type_token,
++                ident,
++                generics,
++                colon_token,
++                bounds,
++                ty,
++                semi_token,
++            })
+         }
+     }
+ 
+     impl Parse for ItemMacro {
+         fn parse(input: ParseStream) -> Result<Self> {
+             let attrs = input.call(Attribute::parse_outer)?;
+             let path = input.call(Path::parse_mod_style)?;
+             let bang_token: Token![!] = input.parse()?;
+@@ -1305,17 +1192,16 @@ pub mod parsing {
+ 
+     impl Parse for UseTree {
+         fn parse(input: ParseStream) -> Result<UseTree> {
+             let lookahead = input.lookahead1();
+             if lookahead.peek(Ident)
+                 || lookahead.peek(Token![self])
+                 || lookahead.peek(Token![super])
+                 || lookahead.peek(Token![crate])
+-                || lookahead.peek(Token![extern])
+             {
+                 let ident = input.call(Ident::parse_any)?;
+                 if input.peek(Token![::]) {
+                     Ok(UseTree::Path(UsePath {
+                         ident,
+                         colon2_token: input.parse()?,
+                         tree: Box::new(input.parse()?),
+                     }))
+@@ -1387,77 +1273,134 @@ pub mod parsing {
+                 ty: input.parse()?,
+                 eq_token: input.parse()?,
+                 expr: input.parse()?,
+                 semi_token: input.parse()?,
+             })
+         }
+     }
+ 
++    fn pop_variadic(args: &mut Punctuated<FnArg, Token![,]>) -> Option<Variadic> {
++        let trailing_punct = args.trailing_punct();
++
++        let last = match args.last_mut()? {
++            FnArg::Typed(last) => last,
++            _ => return None,
++        };
++
++        let ty = match last.ty.as_ref() {
++            Type::Verbatim(ty) => ty,
++            _ => return None,
++        };
++
++        let mut variadic = Variadic {
++            attrs: Vec::new(),
++            dots: parse2(ty.clone()).ok()?,
++        };
++
++        if let Pat::Verbatim(pat) = last.pat.as_ref() {
++            if pat.to_string() == "..." && !trailing_punct {
++                variadic.attrs = mem::replace(&mut last.attrs, Vec::new());
++                args.pop();
++            }
++        }
++
++        Some(variadic)
++    }
++
++    fn variadic_to_tokens(dots: &Token![...]) -> TokenStream {
++        TokenStream::from_iter(vec![
++            TokenTree::Punct({
++                let mut dot = Punct::new('.', Spacing::Joint);
++                dot.set_span(dots.spans[0]);
++                dot
++            }),
++            TokenTree::Punct({
++                let mut dot = Punct::new('.', Spacing::Joint);
++                dot.set_span(dots.spans[1]);
++                dot
++            }),
++            TokenTree::Punct({
++                let mut dot = Punct::new('.', Spacing::Alone);
++                dot.set_span(dots.spans[2]);
++                dot
++            }),
++        ])
++    }
++
++    fn peek_signature(input: ParseStream) -> bool {
++        let fork = input.fork();
++        fork.parse::<Option<Token![const]>>().is_ok()
++            && fork.parse::<Option<Token![async]>>().is_ok()
++            && fork.parse::<Option<Token![unsafe]>>().is_ok()
++            && fork.parse::<Option<Abi>>().is_ok()
++            && fork.peek(Token![fn])
++    }
++
++    fn parse_signature(input: ParseStream) -> Result<Signature> {
++        let constness: Option<Token![const]> = input.parse()?;
++        let asyncness: Option<Token![async]> = input.parse()?;
++        let unsafety: Option<Token![unsafe]> = input.parse()?;
++        let abi: Option<Abi> = input.parse()?;
++        let fn_token: Token![fn] = input.parse()?;
++        let ident: Ident = input.parse()?;
++        let generics: Generics = input.parse()?;
++
++        let content;
++        let paren_token = parenthesized!(content in input);
++        let mut inputs = parse_fn_args(&content)?;
++        let variadic = pop_variadic(&mut inputs);
++
++        let output: ReturnType = input.parse()?;
++        let where_clause: Option<WhereClause> = input.parse()?;
++
++        Ok(Signature {
++            constness,
++            asyncness,
++            unsafety,
++            abi,
++            fn_token,
++            ident,
++            paren_token,
++            inputs,
++            output,
++            variadic,
++            generics: Generics {
++                where_clause,
++                ..generics
++            },
++        })
++    }
++
+     impl Parse for ItemFn {
+         fn parse(input: ParseStream) -> Result<Self> {
+             let outer_attrs = input.call(Attribute::parse_outer)?;
+             let vis: Visibility = input.parse()?;
+-            let constness: Option<Token![const]> = input.parse()?;
+-            let asyncness: Option<Token![async]> = input.parse()?;
+-            let unsafety: Option<Token![unsafe]> = input.parse()?;
+-            let abi: Option<Abi> = input.parse()?;
+-            let fn_token: Token![fn] = input.parse()?;
+-            let ident: Ident = input.parse()?;
+-            let generics: Generics = input.parse()?;
+-
+-            let content;
+-            let paren_token = parenthesized!(content in input);
+-            let inputs = content.parse_terminated(FnArg::parse)?;
+-            let variadic = inputs.last().as_ref().and_then(get_variadic);
+-
+-            fn get_variadic(input: &&FnArg) -> Option<Variadic> {
+-                if let FnArg::Typed(PatType { ty, .. }) = input {
+-                    if let Type::Verbatim(tokens) = &**ty {
+-                        if let Ok(dots) = parse2(tokens.clone()) {
+-                            return Some(Variadic {
+-                                attrs: Vec::new(),
+-                                dots,
+-                            });
+-                        }
+-                    }
+-                }
+-                None
+-            }
++            let sig = parse_signature(input)?;
++            parse_rest_of_fn(input, outer_attrs, vis, sig)
++        }
++    }
+ 
+-            let output: ReturnType = input.parse()?;
+-            let where_clause: Option<WhereClause> = input.parse()?;
+-
+-            let content;
+-            let brace_token = braced!(content in input);
+-            let inner_attrs = content.call(Attribute::parse_inner)?;
+-            let stmts = content.call(Block::parse_within)?;
++    fn parse_rest_of_fn(
++        input: ParseStream,
++        outer_attrs: Vec<Attribute>,
++        vis: Visibility,
++        sig: Signature,
++    ) -> Result<ItemFn> {
++        let content;
++        let brace_token = braced!(content in input);
++        let inner_attrs = content.call(Attribute::parse_inner)?;
++        let stmts = content.call(Block::parse_within)?;
+ 
+-            Ok(ItemFn {
+-                attrs: private::attrs(outer_attrs, inner_attrs),
+-                vis,
+-                sig: Signature {
+-                    constness,
+-                    asyncness,
+-                    unsafety,
+-                    abi,
+-                    fn_token,
+-                    ident,
+-                    paren_token,
+-                    inputs,
+-                    output,
+-                    variadic,
+-                    generics: Generics {
+-                        where_clause,
+-                        ..generics
+-                    },
+-                },
+-                block: Box::new(Block { brace_token, stmts }),
+-            })
+-        }
++        Ok(ItemFn {
++            attrs: private::attrs(outer_attrs, inner_attrs),
++            vis,
++            sig,
++            block: Box::new(Block { brace_token, stmts }),
++        })
+     }
+ 
+     impl Parse for FnArg {
+         fn parse(input: ParseStream) -> Result<Self> {
+             let attrs = input.call(Attribute::parse_outer)?;
+ 
+             let ahead = input.fork();
+             if let Ok(mut receiver) = ahead.parse::<Receiver>() {
+@@ -1486,36 +1429,89 @@ pub mod parsing {
+                     }
+                 },
+                 mutability: input.parse()?,
+                 self_token: input.parse()?,
+             })
+         }
+     }
+ 
++    fn parse_fn_args(input: ParseStream) -> Result<Punctuated<FnArg, Token![,]>> {
++        let mut args = Punctuated::new();
++        let mut has_receiver = false;
++
++        while !input.is_empty() {
++            let attrs = input.call(Attribute::parse_outer)?;
++
++            let arg = if let Some(dots) = input.parse::<Option<Token![...]>>()? {
++                FnArg::Typed(PatType {
++                    attrs,
++                    pat: Box::new(Pat::Verbatim(variadic_to_tokens(&dots))),
++                    colon_token: Token![:](dots.spans[0]),
++                    ty: Box::new(Type::Verbatim(variadic_to_tokens(&dots))),
++                })
++            } else {
++                let mut arg: FnArg = input.parse()?;
++                match &mut arg {
++                    FnArg::Receiver(receiver) if has_receiver => {
++                        return Err(Error::new(
++                            receiver.self_token.span,
++                            "unexpected second method receiver",
++                        ));
++                    }
++                    FnArg::Receiver(receiver) if !args.is_empty() => {
++                        return Err(Error::new(
++                            receiver.self_token.span,
++                            "unexpected method receiver",
++                        ));
++                    }
++                    FnArg::Receiver(receiver) => {
++                        has_receiver = true;
++                        receiver.attrs = attrs;
++                    }
++                    FnArg::Typed(arg) => arg.attrs = attrs,
++                }
++                arg
++            };
++            args.push_value(arg);
++
++            if input.is_empty() {
++                break;
++            }
++
++            let comma: Token![,] = input.parse()?;
++            args.push_punct(comma);
++        }
++
++        Ok(args)
++    }
++
+     fn fn_arg_typed(input: ParseStream) -> Result<PatType> {
++        // Hack to parse pre-2018 syntax in
++        // test/ui/rfc-2565-param-attrs/param-attrs-pretty.rs
++        // because the rest of the test case is valuable.
++        if input.peek(Ident) && input.peek2(Token![<]) {
++            let span = input.fork().parse::<Ident>()?.span();
++            return Ok(PatType {
++                attrs: Vec::new(),
++                pat: Box::new(Pat::Wild(PatWild {
++                    attrs: Vec::new(),
++                    underscore_token: Token![_](span),
++                })),
++                colon_token: Token![:](span),
++                ty: input.parse()?,
++            });
++        }
++
+         Ok(PatType {
+             attrs: Vec::new(),
+-            pat: input.parse()?,
++            pat: Box::new(pat::parsing::multi_pat(input)?),
+             colon_token: input.parse()?,
+             ty: Box::new(match input.parse::<Option<Token![...]>>()? {
+-                Some(dot3) => {
+-                    let args = vec![
+-                        TokenTree::Punct(Punct::new('.', Spacing::Joint)),
+-                        TokenTree::Punct(Punct::new('.', Spacing::Joint)),
+-                        TokenTree::Punct(Punct::new('.', Spacing::Alone)),
+-                    ];
+-                    let tokens = TokenStream::from_iter(args.into_iter().zip(&dot3.spans).map(
+-                        |(mut arg, span)| {
+-                            arg.set_span(*span);
+-                            arg
+-                        },
+-                    ));
+-                    Type::Verbatim(tokens)
+-                }
++                Some(dot3) => Type::Verbatim(variadic_to_tokens(&dot3)),
+                 None => input.parse()?,
+             }),
+         })
+     }
+ 
+     impl Parse for ItemMod {
+         fn parse(input: ParseStream) -> Result<Self> {
+             let outer_attrs = input.call(Attribute::parse_outer)?;
+@@ -1576,109 +1572,103 @@ pub mod parsing {
+                 brace_token,
+                 items,
+             })
+         }
+     }
+ 
+     impl Parse for ForeignItem {
+         fn parse(input: ParseStream) -> Result<Self> {
++            let begin = input.fork();
+             let mut attrs = input.call(Attribute::parse_outer)?;
+             let ahead = input.fork();
+             let vis: Visibility = ahead.parse()?;
+ 
+             let lookahead = ahead.lookahead1();
+-            let mut item = if lookahead.peek(Token![fn]) {
+-                input.parse().map(ForeignItem::Fn)
++            let mut item = if lookahead.peek(Token![fn]) || peek_signature(&ahead) {
++                let vis: Visibility = input.parse()?;
++                let sig = parse_signature(input)?;
++                if input.peek(token::Brace) {
++                    let content;
++                    braced!(content in input);
++                    content.call(Attribute::parse_inner)?;
++                    content.call(Block::parse_within)?;
++
++                    Ok(ForeignItem::Verbatim(verbatim::between(begin, input)))
++                } else {
++                    Ok(ForeignItem::Fn(ForeignItemFn {
++                        attrs: Vec::new(),
++                        vis,
++                        sig,
++                        semi_token: input.parse()?,
++                    }))
++                }
+             } else if lookahead.peek(Token![static]) {
+-                input.parse().map(ForeignItem::Static)
++                let vis = input.parse()?;
++                let static_token = input.parse()?;
++                let mutability = input.parse()?;
++                let ident = input.parse()?;
++                let colon_token = input.parse()?;
++                let ty = input.parse()?;
++                if input.peek(Token![=]) {
++                    input.parse::<Token![=]>()?;
++                    input.parse::<Expr>()?;
++                    input.parse::<Token![;]>()?;
++                    Ok(ForeignItem::Verbatim(verbatim::between(begin, input)))
++                } else {
++                    Ok(ForeignItem::Static(ForeignItemStatic {
++                        attrs: Vec::new(),
++                        vis,
++                        static_token,
++                        mutability,
++                        ident,
++                        colon_token,
++                        ty,
++                        semi_token: input.parse()?,
++                    }))
++                }
+             } else if lookahead.peek(Token![type]) {
+-                input.parse().map(ForeignItem::Type)
++                parse_foreign_item_type(begin, input)
+             } else if vis.is_inherited()
+                 && (lookahead.peek(Ident)
+                     || lookahead.peek(Token![self])
+                     || lookahead.peek(Token![super])
+-                    || lookahead.peek(Token![extern])
+                     || lookahead.peek(Token![crate])
+                     || lookahead.peek(Token![::]))
+             {
+                 input.parse().map(ForeignItem::Macro)
+             } else {
+                 Err(lookahead.error())
+             }?;
+ 
+-            {
+-                let item_attrs = match &mut item {
+-                    ForeignItem::Fn(item) => &mut item.attrs,
+-                    ForeignItem::Static(item) => &mut item.attrs,
+-                    ForeignItem::Type(item) => &mut item.attrs,
+-                    ForeignItem::Macro(item) => &mut item.attrs,
+-                    ForeignItem::Verbatim(_) | ForeignItem::__Nonexhaustive => unreachable!(),
+-                };
+-                attrs.extend(item_attrs.drain(..));
+-                *item_attrs = attrs;
+-            }
++            let item_attrs = match &mut item {
++                ForeignItem::Fn(item) => &mut item.attrs,
++                ForeignItem::Static(item) => &mut item.attrs,
++                ForeignItem::Type(item) => &mut item.attrs,
++                ForeignItem::Macro(item) => &mut item.attrs,
++                ForeignItem::Verbatim(_) => return Ok(item),
++                ForeignItem::__Nonexhaustive => unreachable!(),
++            };
++            attrs.extend(item_attrs.drain(..));
++            *item_attrs = attrs;
+ 
+             Ok(item)
+         }
+     }
+ 
+     impl Parse for ForeignItemFn {
+         fn parse(input: ParseStream) -> Result<Self> {
+             let attrs = input.call(Attribute::parse_outer)?;
+             let vis: Visibility = input.parse()?;
+-            let fn_token: Token![fn] = input.parse()?;
+-            let ident: Ident = input.parse()?;
+-            let generics: Generics = input.parse()?;
+-
+-            let content;
+-            let paren_token = parenthesized!(content in input);
+-            let mut inputs = Punctuated::new();
+-            let mut variadic = None;
+-            while !content.is_empty() {
+-                let attrs = content.call(Attribute::parse_outer)?;
+-
+-                if let Some(dots) = content.parse()? {
+-                    variadic = Some(Variadic { attrs, dots });
+-                    break;
+-                }
+-
+-                let mut arg = content.call(fn_arg_typed)?;
+-                arg.attrs = attrs;
+-                inputs.push_value(FnArg::Typed(arg));
+-                if content.is_empty() {
+-                    break;
+-                }
+-
+-                inputs.push_punct(content.parse()?);
+-            }
+-
+-            let output: ReturnType = input.parse()?;
+-            let where_clause: Option<WhereClause> = input.parse()?;
++            let sig = parse_signature(input)?;
+             let semi_token: Token![;] = input.parse()?;
+-
+             Ok(ForeignItemFn {
+                 attrs,
+                 vis,
+-                sig: Signature {
+-                    constness: None,
+-                    asyncness: None,
+-                    unsafety: None,
+-                    abi: None,
+-                    fn_token,
+-                    ident,
+-                    paren_token,
+-                    inputs,
+-                    output,
+-                    variadic,
+-                    generics: Generics {
+-                        where_clause,
+-                        ..generics
+-                    },
+-                },
++                sig,
+                 semi_token,
+             })
+         }
+     }
+ 
+     impl Parse for ForeignItemStatic {
+         fn parse(input: ParseStream) -> Result<Self> {
+             Ok(ForeignItemStatic {
+@@ -1701,16 +1691,47 @@ pub mod parsing {
+                 vis: input.parse()?,
+                 type_token: input.parse()?,
+                 ident: input.parse()?,
+                 semi_token: input.parse()?,
+             })
+         }
+     }
+ 
++    fn parse_foreign_item_type(begin: ParseBuffer, input: ParseStream) -> Result<ForeignItem> {
++        let FlexibleItemType {
++            vis,
++            defaultness,
++            type_token,
++            ident,
++            generics,
++            colon_token,
++            bounds: _,
++            ty,
++            semi_token,
++        } = input.parse()?;
++
++        if defaultness.is_some()
++            || generics.lt_token.is_some()
++            || generics.where_clause.is_some()
++            || colon_token.is_some()
++            || ty.is_some()
++        {
++            Ok(ForeignItem::Verbatim(verbatim::between(begin, input)))
++        } else {
++            Ok(ForeignItem::Type(ForeignItemType {
++                attrs: Vec::new(),
++                vis,
++                type_token,
++                ident,
++                semi_token,
++            }))
++        }
++    }
++
+     impl Parse for ForeignItemMacro {
+         fn parse(input: ParseStream) -> Result<Self> {
+             let attrs = input.call(Attribute::parse_outer)?;
+             let mac: Macro = input.parse()?;
+             let semi_token: Option<Token![;]> = if mac.delimiter.is_brace() {
+                 None
+             } else {
+                 Some(input.parse()?)
+@@ -1737,16 +1758,46 @@ pub mod parsing {
+                 },
+                 eq_token: input.parse()?,
+                 ty: input.parse()?,
+                 semi_token: input.parse()?,
+             })
+         }
+     }
+ 
++    fn parse_item_type(begin: ParseBuffer, input: ParseStream) -> Result<Item> {
++        let FlexibleItemType {
++            vis,
++            defaultness,
++            type_token,
++            ident,
++            generics,
++            colon_token,
++            bounds: _,
++            ty,
++            semi_token,
++        } = input.parse()?;
++
++        if defaultness.is_some() || colon_token.is_some() || ty.is_none() {
++            Ok(Item::Verbatim(verbatim::between(begin, input)))
++        } else {
++            let (eq_token, ty) = ty.unwrap();
++            Ok(Item::Type(ItemType {
++                attrs: Vec::new(),
++                vis,
++                type_token,
++                ident,
++                generics,
++                eq_token,
++                ty: Box::new(ty),
++                semi_token,
++            }))
++        }
++    }
++
+     #[cfg(not(feature = "printing"))]
+     fn item_existential(input: ParseStream) -> Result<TokenStream> {
+         Err(input.error("existential type is not supported"))
+     }
+ 
+     #[cfg(feature = "printing")]
+     fn item_existential(input: ParseStream) -> Result<TokenStream> {
+         use crate::attr::FilterAttrs;
+@@ -1882,39 +1933,39 @@ pub mod parsing {
+                 .map(Item::TraitAlias)
+         } else {
+             Err(lookahead.error())
+         }
+     }
+ 
+     impl Parse for ItemTrait {
+         fn parse(input: ParseStream) -> Result<Self> {
+-            let attrs = input.call(Attribute::parse_outer)?;
++            let outer_attrs = input.call(Attribute::parse_outer)?;
+             let vis: Visibility = input.parse()?;
+             let unsafety: Option<Token![unsafe]> = input.parse()?;
+             let auto_token: Option<Token![auto]> = input.parse()?;
+             let trait_token: Token![trait] = input.parse()?;
+             let ident: Ident = input.parse()?;
+             let generics: Generics = input.parse()?;
+             parse_rest_of_trait(
+                 input,
+-                attrs,
++                outer_attrs,
+                 vis,
+                 unsafety,
+                 auto_token,
+                 trait_token,
+                 ident,
+                 generics,
+             )
+         }
+     }
+ 
+     fn parse_rest_of_trait(
+         input: ParseStream,
+-        attrs: Vec<Attribute>,
++        outer_attrs: Vec<Attribute>,
+         vis: Visibility,
+         unsafety: Option<Token![unsafe]>,
+         auto_token: Option<Token![auto]>,
+         trait_token: Token![trait],
+         ident: Ident,
+         mut generics: Generics,
+     ) -> Result<ItemTrait> {
+         let colon_token: Option<Token![:]> = input.parse()?;
+@@ -1932,23 +1983,24 @@ pub mod parsing {
+                 }
+             }
+         }
+ 
+         generics.where_clause = input.parse()?;
+ 
+         let content;
+         let brace_token = braced!(content in input);
++        let inner_attrs = content.call(Attribute::parse_inner)?;
+         let mut items = Vec::new();
+         while !content.is_empty() {
+             items.push(content.parse()?);
+         }
+ 
+         Ok(ItemTrait {
+-            attrs,
++            attrs: private::attrs(outer_attrs, inner_attrs),
+             vis,
+             unsafety,
+             auto_token,
+             trait_token,
+             ident,
+             generics,
+             colon_token,
+             supertraits,
+@@ -2009,76 +2061,83 @@ pub mod parsing {
+             eq_token,
+             bounds,
+             semi_token,
+         })
+     }
+ 
+     impl Parse for TraitItem {
+         fn parse(input: ParseStream) -> Result<Self> {
++            let begin = input.fork();
+             let mut attrs = input.call(Attribute::parse_outer)?;
++            let vis: Visibility = input.parse()?;
++            let defaultness: Option<Token![default]> = input.parse()?;
+             let ahead = input.fork();
+ 
+             let lookahead = ahead.lookahead1();
+-            let mut item = if lookahead.peek(Token![const]) {
++            let mut item = if lookahead.peek(Token![fn]) || peek_signature(&ahead) {
++                input.parse().map(TraitItem::Method)
++            } else if lookahead.peek(Token![const]) {
+                 ahead.parse::<Token![const]>()?;
+                 let lookahead = ahead.lookahead1();
+-                if lookahead.peek(Ident) {
++                if lookahead.peek(Ident) || lookahead.peek(Token![_]) {
+                     input.parse().map(TraitItem::Const)
+                 } else if lookahead.peek(Token![async])
+                     || lookahead.peek(Token![unsafe])
+                     || lookahead.peek(Token![extern])
+                     || lookahead.peek(Token![fn])
+                 {
+                     input.parse().map(TraitItem::Method)
+                 } else {
+                     Err(lookahead.error())
+                 }
+-            } else if lookahead.peek(Token![async])
+-                || lookahead.peek(Token![unsafe])
+-                || lookahead.peek(Token![extern])
+-                || lookahead.peek(Token![fn])
+-            {
+-                input.parse().map(TraitItem::Method)
+             } else if lookahead.peek(Token![type]) {
+-                input.parse().map(TraitItem::Type)
++                parse_trait_item_type(begin.fork(), input)
+             } else if lookahead.peek(Ident)
+                 || lookahead.peek(Token![self])
+                 || lookahead.peek(Token![super])
+-                || lookahead.peek(Token![extern])
+                 || lookahead.peek(Token![crate])
+                 || lookahead.peek(Token![::])
+             {
+                 input.parse().map(TraitItem::Macro)
+             } else {
+                 Err(lookahead.error())
+             }?;
+ 
+-            {
+-                let item_attrs = match &mut item {
+-                    TraitItem::Const(item) => &mut item.attrs,
+-                    TraitItem::Method(item) => &mut item.attrs,
+-                    TraitItem::Type(item) => &mut item.attrs,
+-                    TraitItem::Macro(item) => &mut item.attrs,
+-                    TraitItem::Verbatim(_) | TraitItem::__Nonexhaustive => unreachable!(),
+-                };
+-                attrs.extend(item_attrs.drain(..));
+-                *item_attrs = attrs;
++            match (vis, defaultness) {
++                (Visibility::Inherited, None) => {}
++                _ => return Ok(TraitItem::Verbatim(verbatim::between(begin, input))),
+             }
+ 
++            let item_attrs = match &mut item {
++                TraitItem::Const(item) => &mut item.attrs,
++                TraitItem::Method(item) => &mut item.attrs,
++                TraitItem::Type(item) => &mut item.attrs,
++                TraitItem::Macro(item) => &mut item.attrs,
++                TraitItem::Verbatim(_) | TraitItem::__Nonexhaustive => unreachable!(),
++            };
++            attrs.extend(item_attrs.drain(..));
++            *item_attrs = attrs;
+             Ok(item)
+         }
+     }
+ 
+     impl Parse for TraitItemConst {
+         fn parse(input: ParseStream) -> Result<Self> {
+             Ok(TraitItemConst {
+                 attrs: input.call(Attribute::parse_outer)?,
+                 const_token: input.parse()?,
+-                ident: input.parse()?,
++                ident: {
++                    let lookahead = input.lookahead1();
++                    if lookahead.peek(Ident) || lookahead.peek(Token![_]) {
++                        input.call(Ident::parse_any)?
++                    } else {
++                        return Err(lookahead.error());
++                    }
++                },
+                 colon_token: input.parse()?,
+                 ty: input.parse()?,
+                 default: {
+                     if input.peek(Token![=]) {
+                         let eq_token: Token![=] = input.parse()?;
+                         let default: Expr = input.parse()?;
+                         Some((eq_token, default))
+                     } else {
+@@ -2088,30 +2147,17 @@ pub mod parsing {
+                 semi_token: input.parse()?,
+             })
+         }
+     }
+ 
+     impl Parse for TraitItemMethod {
+         fn parse(input: ParseStream) -> Result<Self> {
+             let outer_attrs = input.call(Attribute::parse_outer)?;
+-            let constness: Option<Token![const]> = input.parse()?;
+-            let asyncness: Option<Token![async]> = input.parse()?;
+-            let unsafety: Option<Token![unsafe]> = input.parse()?;
+-            let abi: Option<Abi> = input.parse()?;
+-            let fn_token: Token![fn] = input.parse()?;
+-            let ident: Ident = input.parse()?;
+-            let generics: Generics = input.parse()?;
+-
+-            let content;
+-            let paren_token = parenthesized!(content in input);
+-            let inputs = content.parse_terminated(FnArg::parse)?;
+-
+-            let output: ReturnType = input.parse()?;
+-            let where_clause: Option<WhereClause> = input.parse()?;
++            let sig = parse_signature(input)?;
+ 
+             let lookahead = input.lookahead1();
+             let (brace_token, inner_attrs, stmts, semi_token) = if lookahead.peek(token::Brace) {
+                 let content;
+                 let brace_token = braced!(content in input);
+                 let inner_attrs = content.call(Attribute::parse_inner)?;
+                 let stmts = content.call(Block::parse_within)?;
+                 (Some(brace_token), inner_attrs, stmts, None)
+@@ -2119,32 +2165,17 @@ pub mod parsing {
+                 let semi_token: Token![;] = input.parse()?;
+                 (None, Vec::new(), Vec::new(), Some(semi_token))
+             } else {
+                 return Err(lookahead.error());
+             };
+ 
+             Ok(TraitItemMethod {
+                 attrs: private::attrs(outer_attrs, inner_attrs),
+-                sig: Signature {
+-                    constness,
+-                    asyncness,
+-                    unsafety,
+-                    abi,
+-                    fn_token,
+-                    ident,
+-                    paren_token,
+-                    inputs,
+-                    output,
+-                    variadic: None,
+-                    generics: Generics {
+-                        where_clause,
+-                        ..generics
+-                    },
+-                },
++                sig,
+                 default: brace_token.map(|brace_token| Block { brace_token, stmts }),
+                 semi_token,
+             })
+         }
+     }
+ 
+     impl Parse for TraitItemType {
+         fn parse(input: ParseStream) -> Result<Self> {
+@@ -2183,16 +2214,45 @@ pub mod parsing {
+                 colon_token,
+                 bounds,
+                 default,
+                 semi_token,
+             })
+         }
+     }
+ 
++    fn parse_trait_item_type(begin: ParseBuffer, input: ParseStream) -> Result<TraitItem> {
++        let FlexibleItemType {
++            vis,
++            defaultness,
++            type_token,
++            ident,
++            generics,
++            colon_token,
++            bounds,
++            ty,
++            semi_token,
++        } = input.parse()?;
++
++        if defaultness.is_some() || vis.is_some() {
++            Ok(TraitItem::Verbatim(verbatim::between(begin, input)))
++        } else {
++            Ok(TraitItem::Type(TraitItemType {
++                attrs: Vec::new(),
++                type_token,
++                ident,
++                generics,
++                colon_token,
++                bounds,
++                default: ty,
++                semi_token,
++            }))
++        }
++    }
++
+     impl Parse for TraitItemMacro {
+         fn parse(input: ParseStream) -> Result<Self> {
+             let attrs = input.call(Attribute::parse_outer)?;
+             let mac: Macro = input.parse()?;
+             let semi_token: Option<Token![;]> = if mac.delimiter.is_brace() {
+                 None
+             } else {
+                 Some(input.parse()?)
+@@ -2202,123 +2262,148 @@ pub mod parsing {
+                 mac,
+                 semi_token,
+             })
+         }
+     }
+ 
+     impl Parse for ItemImpl {
+         fn parse(input: ParseStream) -> Result<Self> {
+-            let outer_attrs = input.call(Attribute::parse_outer)?;
+-            let defaultness: Option<Token![default]> = input.parse()?;
+-            let unsafety: Option<Token![unsafe]> = input.parse()?;
+-            let impl_token: Token![impl] = input.parse()?;
++            let allow_const_impl = false;
++            parse_impl(input, allow_const_impl).map(Option::unwrap)
++        }
++    }
++
++    fn parse_impl(input: ParseStream, allow_const_impl: bool) -> Result<Option<ItemImpl>> {
++        let outer_attrs = input.call(Attribute::parse_outer)?;
++        let defaultness: Option<Token![default]> = input.parse()?;
++        let unsafety: Option<Token![unsafe]> = input.parse()?;
++        let impl_token: Token![impl] = input.parse()?;
+ 
+-            let has_generics = input.peek(Token![<])
+-                && (input.peek2(Token![>])
+-                    || input.peek2(Token![#])
+-                    || (input.peek2(Ident) || input.peek2(Lifetime))
+-                        && (input.peek3(Token![:])
+-                            || input.peek3(Token![,])
+-                            || input.peek3(Token![>])));
+-            let generics: Generics = if has_generics {
+-                input.parse()?
+-            } else {
+-                Generics::default()
+-            };
++        let has_generics = input.peek(Token![<])
++            && (input.peek2(Token![>])
++                || input.peek2(Token![#])
++                || (input.peek2(Ident) || input.peek2(Lifetime))
++                    && (input.peek3(Token![:])
++                        || input.peek3(Token![,])
++                        || input.peek3(Token![>]))
++                || input.peek2(Token![const]));
++        let generics: Generics = if has_generics {
++            input.parse()?
++        } else {
++            Generics::default()
++        };
+ 
+-            let trait_ = {
+-                // TODO: optimize using advance_to
+-                let ahead = input.fork();
+-                if ahead.parse::<Option<Token![!]>>().is_ok()
+-                    && ahead.parse::<Path>().is_ok()
+-                    && ahead.parse::<Token![for]>().is_ok()
+-                {
+-                    let polarity: Option<Token![!]> = input.parse()?;
+-                    let path: Path = input.parse()?;
+-                    let for_token: Token![for] = input.parse()?;
+-                    Some((polarity, path, for_token))
+-                } else {
+-                    None
+-                }
+-            };
+-            let self_ty: Type = input.parse()?;
+-            let where_clause: Option<WhereClause> = input.parse()?;
++        let is_const_impl = allow_const_impl
++            && (input.peek(Token![const]) || input.peek(Token![?]) && input.peek2(Token![const]));
++        if is_const_impl {
++            input.parse::<Option<Token![?]>>()?;
++            input.parse::<Token![const]>()?;
++        }
+ 
+-            let content;
+-            let brace_token = braced!(content in input);
+-            let inner_attrs = content.call(Attribute::parse_inner)?;
++        let trait_ = (|| -> Option<_> {
++            let ahead = input.fork();
++            let polarity: Option<Token![!]> = ahead.parse().ok()?;
++            let mut path: Path = ahead.parse().ok()?;
++            if path.segments.last().unwrap().arguments.is_empty() && ahead.peek(token::Paren) {
++                let parenthesized = PathArguments::Parenthesized(ahead.parse().ok()?);
++                path.segments.last_mut().unwrap().arguments = parenthesized;
++            }
++            let for_token: Token![for] = ahead.parse().ok()?;
++            input.advance_to(&ahead);
++            Some((polarity, path, for_token))
++        })();
+ 
+-            let mut items = Vec::new();
+-            while !content.is_empty() {
+-                items.push(content.parse()?);
+-            }
++        let self_ty: Type = input.parse()?;
++        let where_clause: Option<WhereClause> = input.parse()?;
++
++        let content;
++        let brace_token = braced!(content in input);
++        let inner_attrs = content.call(Attribute::parse_inner)?;
+ 
+-            Ok(ItemImpl {
++        let mut items = Vec::new();
++        while !content.is_empty() {
++            items.push(content.parse()?);
++        }
++
++        if is_const_impl {
++            Ok(None)
++        } else {
++            Ok(Some(ItemImpl {
+                 attrs: private::attrs(outer_attrs, inner_attrs),
+                 defaultness,
+                 unsafety,
+                 impl_token,
+                 generics: Generics {
+                     where_clause,
+                     ..generics
+                 },
+                 trait_,
+                 self_ty: Box::new(self_ty),
+                 brace_token,
+                 items,
+-            })
++            }))
+         }
+     }
+ 
+     impl Parse for ImplItem {
+         fn parse(input: ParseStream) -> Result<Self> {
++            let begin = input.fork();
+             let mut attrs = input.call(Attribute::parse_outer)?;
+             let ahead = input.fork();
+             let vis: Visibility = ahead.parse()?;
+ 
+             let mut lookahead = ahead.lookahead1();
+             let defaultness = if lookahead.peek(Token![default]) && !ahead.peek2(Token![!]) {
+                 let defaultness: Token![default] = ahead.parse()?;
+                 lookahead = ahead.lookahead1();
+                 Some(defaultness)
+             } else {
+                 None
+             };
+ 
+-            let mut item = if lookahead.peek(Token![const]) {
+-                ahead.parse::<Token![const]>()?;
++            let mut item = if lookahead.peek(Token![fn]) || peek_signature(&ahead) {
++                input.parse().map(ImplItem::Method)
++            } else if lookahead.peek(Token![const]) {
++                let const_token: Token![const] = ahead.parse()?;
+                 let lookahead = ahead.lookahead1();
+-                if lookahead.peek(Ident) {
+-                    input.parse().map(ImplItem::Const)
+-                } else if lookahead.peek(Token![unsafe])
+-                    || lookahead.peek(Token![async])
+-                    || lookahead.peek(Token![extern])
+-                    || lookahead.peek(Token![fn])
+-                {
+-                    input.parse().map(ImplItem::Method)
++                if lookahead.peek(Ident) || lookahead.peek(Token![_]) {
++                    input.advance_to(&ahead);
++                    let ident: Ident = input.call(Ident::parse_any)?;
++                    let colon_token: Token![:] = input.parse()?;
++                    let ty: Type = input.parse()?;
++                    if let Some(eq_token) = input.parse()? {
++                        return Ok(ImplItem::Const(ImplItemConst {
++                            attrs,
++                            vis,
++                            defaultness,
++                            const_token,
++                            ident,
++                            colon_token,
++                            ty,
++                            eq_token,
++                            expr: input.parse()?,
++                            semi_token: input.parse()?,
++                        }));
++                    } else {
++                        input.parse::<Token![;]>()?;
++                        return Ok(ImplItem::Verbatim(verbatim::between(begin, input)));
++                    }
+                 } else {
+                     Err(lookahead.error())
+                 }
+-            } else if lookahead.peek(Token![unsafe])
+-                || lookahead.peek(Token![async])
+-                || lookahead.peek(Token![extern])
+-                || lookahead.peek(Token![fn])
+-            {
+-                input.parse().map(ImplItem::Method)
+             } else if lookahead.peek(Token![type]) {
+-                input.parse().map(ImplItem::Type)
++                parse_impl_item_type(begin, input)
+             } else if vis.is_inherited() && defaultness.is_none() && lookahead.peek(existential) {
+                 input.call(item_existential).map(ImplItem::Verbatim)
+             } else if vis.is_inherited()
+                 && defaultness.is_none()
+                 && (lookahead.peek(Ident)
+                     || lookahead.peek(Token![self])
+                     || lookahead.peek(Token![super])
+-                    || lookahead.peek(Token![extern])
+                     || lookahead.peek(Token![crate])
+                     || lookahead.peek(Token![::]))
+             {
+                 input.parse().map(ImplItem::Macro)
+             } else {
+                 Err(lookahead.error())
+             }?;
+ 
+@@ -2341,72 +2426,68 @@ pub mod parsing {
+ 
+     impl Parse for ImplItemConst {
+         fn parse(input: ParseStream) -> Result<Self> {
+             Ok(ImplItemConst {
+                 attrs: input.call(Attribute::parse_outer)?,
+                 vis: input.parse()?,
+                 defaultness: input.parse()?,
+                 const_token: input.parse()?,
+-                ident: input.parse()?,
++                ident: {
++                    let lookahead = input.lookahead1();
++                    if lookahead.peek(Ident) || lookahead.peek(Token![_]) {
++                        input.call(Ident::parse_any)?
++                    } else {
++                        return Err(lookahead.error());
++                    }
++                },
+                 colon_token: input.parse()?,
+                 ty: input.parse()?,
+                 eq_token: input.parse()?,
+                 expr: input.parse()?,
+                 semi_token: input.parse()?,
+             })
+         }
+     }
+ 
+     impl Parse for ImplItemMethod {
+         fn parse(input: ParseStream) -> Result<Self> {
+-            let outer_attrs = input.call(Attribute::parse_outer)?;
++            let mut attrs = input.call(Attribute::parse_outer)?;
+             let vis: Visibility = input.parse()?;
+             let defaultness: Option<Token![default]> = input.parse()?;
+-            let constness: Option<Token![const]> = input.parse()?;
+-            let asyncness: Option<Token![async]> = input.parse()?;
+-            let unsafety: Option<Token![unsafe]> = input.parse()?;
+-            let abi: Option<Abi> = input.parse()?;
+-            let fn_token: Token![fn] = input.parse()?;
+-            let ident: Ident = input.parse()?;
+-            let generics: Generics = input.parse()?;
++            let sig = parse_signature(input)?;
+ 
+-            let content;
+-            let paren_token = parenthesized!(content in input);
+-            let inputs = content.parse_terminated(FnArg::parse)?;
+-
+-            let output: ReturnType = input.parse()?;
+-            let where_clause: Option<WhereClause> = input.parse()?;
+-
+-            let content;
+-            let brace_token = braced!(content in input);
+-            let inner_attrs = content.call(Attribute::parse_inner)?;
+-            let stmts = content.call(Block::parse_within)?;
++            let block = if let Some(semi) = input.parse::<Option<Token![;]>>()? {
++                // Accept methods without a body in an impl block because
++                // rustc's *parser* does not reject them (the compilation error
++                // is emitted later than parsing) and it can be useful for macro
++                // DSLs.
++                let mut punct = Punct::new(';', Spacing::Alone);
++                punct.set_span(semi.span);
++                let tokens = TokenStream::from_iter(vec![TokenTree::Punct(punct)]);
++                Block {
++                    brace_token: Brace::default(),
++                    stmts: vec![Stmt::Item(Item::Verbatim(tokens))],
++                }
++            } else {
++                let content;
++                let brace_token = braced!(content in input);
++                attrs.extend(content.call(Attribute::parse_inner)?);
++                Block {
++                    brace_token,
++                    stmts: content.call(Block::parse_within)?,
++                }
++            };
+ 
+             Ok(ImplItemMethod {
+-                attrs: private::attrs(outer_attrs, inner_attrs),
++                attrs,
+                 vis,
+                 defaultness,
+-                sig: Signature {
+-                    constness,
+-                    asyncness,
+-                    unsafety,
+-                    abi,
+-                    fn_token,
+-                    ident,
+-                    paren_token,
+-                    inputs,
+-                    output,
+-                    variadic: None,
+-                    generics: Generics {
+-                        where_clause,
+-                        ..generics
+-                    },
+-                },
+-                block: Block { brace_token, stmts },
++                sig,
++                block,
+             })
+         }
+     }
+ 
+     impl Parse for ImplItemType {
+         fn parse(input: ParseStream) -> Result<Self> {
+             Ok(ImplItemType {
+                 attrs: input.call(Attribute::parse_outer)?,
+@@ -2421,16 +2502,47 @@ pub mod parsing {
+                 },
+                 eq_token: input.parse()?,
+                 ty: input.parse()?,
+                 semi_token: input.parse()?,
+             })
+         }
+     }
+ 
++    fn parse_impl_item_type(begin: ParseBuffer, input: ParseStream) -> Result<ImplItem> {
++        let FlexibleItemType {
++            vis,
++            defaultness,
++            type_token,
++            ident,
++            generics,
++            colon_token,
++            bounds: _,
++            ty,
++            semi_token,
++        } = input.parse()?;
++
++        if colon_token.is_some() || ty.is_none() {
++            Ok(ImplItem::Verbatim(verbatim::between(begin, input)))
++        } else {
++            let (eq_token, ty) = ty.unwrap();
++            Ok(ImplItem::Type(ImplItemType {
++                attrs: Vec::new(),
++                vis,
++                defaultness,
++                type_token,
++                ident,
++                generics,
++                eq_token,
++                ty,
++                semi_token,
++            }))
++        }
++    }
++
+     impl Parse for ImplItemMacro {
+         fn parse(input: ParseStream) -> Result<Self> {
+             let attrs = input.call(Attribute::parse_outer)?;
+             let mac: Macro = input.parse()?;
+             let semi_token: Option<Token![;]> = if mac.delimiter.is_brace() {
+                 None
+             } else {
+                 Some(input.parse()?)
+@@ -2466,16 +2578,17 @@ pub mod parsing {
+ mod printing {
+     use super::*;
+ 
+     use proc_macro2::TokenStream;
+     use quote::{ToTokens, TokenStreamExt};
+ 
+     use crate::attr::FilterAttrs;
+     use crate::print::TokensOrDefault;
++    use crate::punctuated::Pair;
+ 
+     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);
+@@ -2830,16 +2943,24 @@ mod printing {
+     }
+ 
+     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);
++            if self.block.stmts.len() == 1 {
++                if let Stmt::Item(Item::Verbatim(verbatim)) = &self.block.stmts[0] {
++                    if verbatim.to_string() == ";" {
++                        verbatim.to_tokens(tokens);
++                        return;
++                    }
++                }
++            }
+             self.block.brace_token.surround(tokens, |tokens| {
+                 tokens.append_all(self.attrs.inner());
+                 tokens.append_all(&self.block.stmts);
+             });
+         }
+     }
+ 
+     impl ToTokens for ImplItemType {
+@@ -2900,31 +3021,71 @@ mod printing {
+     impl ToTokens for ForeignItemMacro {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
+             tokens.append_all(self.attrs.outer());
+             self.mac.to_tokens(tokens);
+             self.semi_token.to_tokens(tokens);
+         }
+     }
+ 
++    fn maybe_variadic_to_tokens(arg: &FnArg, tokens: &mut TokenStream) -> bool {
++        let arg = match arg {
++            FnArg::Typed(arg) => arg,
++            FnArg::Receiver(receiver) => {
++                receiver.to_tokens(tokens);
++                return false;
++            }
++        };
++
++        match arg.ty.as_ref() {
++            Type::Verbatim(ty) if ty.to_string() == "..." => {
++                match arg.pat.as_ref() {
++                    Pat::Verbatim(pat) if pat.to_string() == "..." => {
++                        tokens.append_all(arg.attrs.outer());
++                        pat.to_tokens(tokens);
++                    }
++                    _ => arg.to_tokens(tokens),
++                }
++                true
++            }
++            _ => {
++                arg.to_tokens(tokens);
++                false
++            }
++        }
++    }
++
+     impl ToTokens for Signature {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
+             self.constness.to_tokens(tokens);
+             self.asyncness.to_tokens(tokens);
+             self.unsafety.to_tokens(tokens);
+             self.abi.to_tokens(tokens);
+             self.fn_token.to_tokens(tokens);
+             self.ident.to_tokens(tokens);
+             self.generics.to_tokens(tokens);
+             self.paren_token.surround(tokens, |tokens| {
+-                self.inputs.to_tokens(tokens);
+-                if self.variadic.is_some() && !self.inputs.empty_or_trailing() {
+-                    <Token![,]>::default().to_tokens(tokens);
++                let mut last_is_variadic = false;
++                for input in self.inputs.pairs() {
++                    match input {
++                        Pair::Punctuated(input, comma) => {
++                            maybe_variadic_to_tokens(input, tokens);
++                            comma.to_tokens(tokens);
++                        }
++                        Pair::End(input) => {
++                            last_is_variadic = maybe_variadic_to_tokens(input, tokens);
++                        }
++                    }
+                 }
+-                self.variadic.to_tokens(tokens);
++                if self.variadic.is_some() && !last_is_variadic {
++                    if !self.inputs.empty_or_trailing() {
++                        <Token![,]>::default().to_tokens(tokens);
++                    }
++                    self.variadic.to_tokens(tokens);
++                }
+             });
+             self.output.to_tokens(tokens);
+             self.generics.where_clause.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for Receiver {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
+diff --git a/third_party/rust/syn/src/lib.rs b/third_party/rust/syn/src/lib.rs
+--- a/third_party/rust/syn/src/lib.rs
++++ b/third_party/rust/syn/src/lib.rs
+@@ -1,8 +1,16 @@
++//! [![github]](https://github.com/dtolnay/syn)&ensp;[![crates-io]](https://crates.io/crates/syn)&ensp;[![docs-rs]](https://docs.rs/syn)
++//!
++//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
++//! [crates-io]: https://img.shields.io/badge/crates.io-fc8d62?style=for-the-badge&labelColor=555555&logo=rust
++//! [docs-rs]: https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logoColor=white&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDUxMiA1MTIiPjxwYXRoIGZpbGw9IiNmNWY1ZjUiIGQ9Ik00ODguNiAyNTAuMkwzOTIgMjE0VjEwNS41YzAtMTUtOS4zLTI4LjQtMjMuNC0zMy43bC0xMDAtMzcuNWMtOC4xLTMuMS0xNy4xLTMuMS0yNS4zIDBsLTEwMCAzNy41Yy0xNC4xIDUuMy0yMy40IDE4LjctMjMuNCAzMy43VjIxNGwtOTYuNiAzNi4yQzkuMyAyNTUuNSAwIDI2OC45IDAgMjgzLjlWMzk0YzAgMTMuNiA3LjcgMjYuMSAxOS45IDMyLjJsMTAwIDUwYzEwLjEgNS4xIDIyLjEgNS4xIDMyLjIgMGwxMDMuOS01MiAxMDMuOSA1MmMxMC4xIDUuMSAyMi4xIDUuMSAzMi4yIDBsMTAwLTUwYzEyLjItNi4xIDE5LjktMTguNiAxOS45LTMyLjJWMjgzLjljMC0xNS05LjMtMjguNC0yMy40LTMzLjd6TTM1OCAyMTQuOGwtODUgMzEuOXYtNjguMmw4NS0zN3Y3My4zek0xNTQgMTA0LjFsMTAyLTM4LjIgMTAyIDM4LjJ2LjZsLTEwMiA0MS40LTEwMi00MS40di0uNnptODQgMjkxLjFsLTg1IDQyLjV2LTc5LjFsODUtMzguOHY3NS40em0wLTExMmwtMTAyIDQxLjQtMTAyLTQxLjR2LS42bDEwMi0zOC4yIDEwMiAzOC4ydi42em0yNDAgMTEybC04NSA0Mi41di03OS4xbDg1LTM4Ljh2NzUuNHptMC0xMTJsLTEwMiA0MS40LTEwMi00MS40di0uNmwxMDItMzguMiAxMDIgMzguMnYuNnoiPjwvcGF0aD48L3N2Zz4K
++//!
++//! <br>
++//!
+ //! 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 use in Rust procedural macros, but
+ //! contains some APIs that may be useful more generally.
+ //!
+ //! - **Data structures** — Syn provides a complete syntax tree that can
+ //!   represent any valid Rust source code. The syntax tree is rooted at
+@@ -57,18 +65,18 @@
+ //! syn = "1.0"
+ //! quote = "1.0"
+ //!
+ //! [lib]
+ //! proc-macro = true
+ //! ```
+ //!
+ //! ```
+-//! extern crate proc_macro;
+-//!
++//! # extern crate proc_macro;
++//! #
+ //! use proc_macro::TokenStream;
+ //! use quote::quote;
+ //! use syn::{parse_macro_input, DeriveInput};
+ //!
+ //! # const IGNORE_TOKENS: &str = stringify! {
+ //! #[proc_macro_derive(MyMacro)]
+ //! # };
+ //! pub fn my_macro(input: TokenStream) -> TokenStream {
+@@ -237,59 +245,71 @@
+ //! - **`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/1.0.5")]
++#![doc(html_root_url = "https://docs.rs/syn/1.0.40")]
+ #![deny(clippy::all, clippy::pedantic)]
+ // Ignored clippy lints.
+ #![allow(
+-    clippy::block_in_if_condition_stmt,
++    clippy::blocks_in_if_conditions,
+     clippy::cognitive_complexity,
+     clippy::doc_markdown,
+     clippy::eval_order_dependence,
+     clippy::inherent_to_string,
+     clippy::large_enum_variant,
++    clippy::manual_non_exhaustive,
++    clippy::match_like_matches_macro,
++    clippy::match_on_vec_items,
++    clippy::needless_doctest_main,
+     clippy::needless_pass_by_value,
+     clippy::never_loop,
+     clippy::suspicious_op_assign_impl,
+     clippy::too_many_arguments,
+-    clippy::trivially_copy_pass_by_ref
++    clippy::trivially_copy_pass_by_ref,
++    clippy::unnecessary_unwrap
+ )]
+ // Ignored clippy_pedantic lints.
+ #![allow(
+     clippy::cast_possible_truncation,
++    clippy::default_trait_access,
+     clippy::empty_enum,
++    clippy::expl_impl_clone_on_copy,
+     clippy::if_not_else,
+     clippy::items_after_statements,
++    clippy::match_same_arms,
++    clippy::missing_errors_doc,
+     clippy::module_name_repetitions,
++    clippy::must_use_candidate,
++    clippy::option_if_let_else,
+     clippy::shadow_unrelated,
+     clippy::similar_names,
+     clippy::single_match_else,
++    clippy::too_many_lines,
+     clippy::unseparated_literal_suffix,
+     clippy::use_self,
+-    clippy::used_underscore_binding
++    clippy::used_underscore_binding,
++    clippy::wildcard_imports
+ )]
+ 
+ #[cfg(all(
+     not(all(target_arch = "wasm32", any(target_os = "unknown", target_os = "wasi"))),
+     feature = "proc-macro"
+ ))]
+ extern crate proc_macro;
+ extern crate proc_macro2;
+ extern crate unicode_xid;
+ 
+ #[cfg(feature = "printing")]
+ extern crate quote;
+ 
+-#[cfg(any(feature = "full", feature = "derive"))]
+ #[macro_use]
+ mod macros;
+ 
+ // Not public API.
+ #[cfg(feature = "parsing")]
+ #[doc(hidden)]
+ #[macro_use]
+ pub mod group;
+@@ -302,17 +322,16 @@ pub use crate::ident::Ident;
+ 
+ #[cfg(any(feature = "full", feature = "derive"))]
+ mod attr;
+ #[cfg(any(feature = "full", feature = "derive"))]
+ pub use crate::attr::{
+     AttrStyle, Attribute, AttributeArgs, Meta, MetaList, MetaNameValue, NestedMeta,
+ };
+ 
+-#[cfg(any(feature = "full", feature = "derive"))]
+ mod bigint;
+ 
+ #[cfg(any(feature = "full", feature = "derive"))]
+ mod data;
+ #[cfg(any(feature = "full", feature = "derive"))]
+ pub use crate::data::{
+     Field, Fields, FieldsNamed, FieldsUnnamed, Variant, VisCrate, VisPublic, VisRestricted,
+     Visibility,
+@@ -359,19 +378,17 @@ pub use crate::item::{
+ #[cfg(feature = "full")]
+ mod file;
+ #[cfg(feature = "full")]
+ pub use crate::file::File;
+ 
+ mod lifetime;
+ pub use crate::lifetime::Lifetime;
+ 
+-#[cfg(any(feature = "full", feature = "derive"))]
+ mod lit;
+-#[cfg(any(feature = "full", feature = "derive"))]
+ pub use crate::lit::{
+     Lit, LitBool, LitByte, LitByteStr, LitChar, LitFloat, LitInt, LitStr, StrStyle,
+ };
+ 
+ #[cfg(any(feature = "full", feature = "derive"))]
+ mod mac;
+ #[cfg(any(feature = "full", feature = "derive"))]
+ pub use crate::mac::{Macro, MacroDelimiter};
+@@ -436,16 +453,19 @@ pub mod parse_quote;
+     feature = "proc-macro"
+ ))]
+ #[doc(hidden)]
+ pub mod parse_macro_input;
+ 
+ #[cfg(all(feature = "parsing", feature = "printing"))]
+ pub mod spanned;
+ 
++#[cfg(all(feature = "parsing", feature = "full"))]
++mod whitespace;
++
+ 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.
+     ///
+@@ -477,17 +497,17 @@ mod gen {
+     ///     v.visit_expr(&*node.left);
+     ///     v.visit_bin_op(&node.op);
+     ///     v.visit_expr(&*node.right);
+     /// }
+     ///
+     /// /* ... */
+     /// ```
+     ///
+-    /// *This module is available if Syn is built with the `"visit"` feature.*
++    /// *This module is available only if Syn is built with the `"visit"` feature.*
+     ///
+     /// <br>
+     ///
+     /// # Example
+     ///
+     /// This visitor will print the name of every freestanding function in the
+     /// syntax tree, including nested functions.
+     ///
+@@ -598,17 +618,17 @@ mod gen {
+     ///     v.visit_expr_mut(&mut *node.left);
+     ///     v.visit_bin_op_mut(&mut node.op);
+     ///     v.visit_expr_mut(&mut *node.right);
+     /// }
+     ///
+     /// /* ... */
+     /// ```
+     ///
+-    /// *This module is available if Syn is built with the `"visit-mut"`
++    /// *This module is available only if Syn is built with the `"visit-mut"`
+     /// feature.*
+     ///
+     /// <br>
+     ///
+     /// # Example
+     ///
+     /// This mut visitor replace occurrences of u256 suffixed integer literals
+     /// like `999u256` with a macro invocation `bigint::u256!(999)`.
+@@ -697,17 +717,17 @@ mod gen {
+     ///         op: v.fold_bin_op(node.op),
+     ///         right: Box::new(v.fold_expr(*node.right)),
+     ///     }
+     /// }
+     ///
+     /// /* ... */
+     /// ```
+     ///
+-    /// *This module is available if Syn is built with the `"fold"` feature.*
++    /// *This module is available only if Syn is built with the `"fold"` feature.*
+     ///
+     /// <br>
+     ///
+     /// # Example
+     ///
+     /// This fold inserts parentheses to fully parenthesizes any expression.
+     ///
+     /// ```
+@@ -739,43 +759,63 @@ mod gen {
+     ///
+     ///     // Output: (((a)()) + (((b)((1))) * ((c).d)))
+     /// }
+     /// ```
+     #[cfg(feature = "fold")]
+     #[rustfmt::skip]
+     pub mod fold;
+ 
++    #[cfg(feature = "clone-impls")]
++    #[rustfmt::skip]
++    mod clone;
++
++    #[cfg(feature = "extra-traits")]
++    #[rustfmt::skip]
++    mod eq;
++
++    #[cfg(feature = "extra-traits")]
++    #[rustfmt::skip]
++    mod hash;
++
++    #[cfg(feature = "extra-traits")]
++    #[rustfmt::skip]
++    mod debug;
++
+     #[cfg(any(feature = "full", feature = "derive"))]
+     #[path = "../gen_helper.rs"]
+     mod helper;
+ }
+ pub use crate::gen::*;
+ 
+ // Not public API.
+ #[doc(hidden)]
+ pub mod export;
+ 
+ mod custom_keyword;
+ mod custom_punctuation;
+ mod sealed;
++mod span;
++mod thread;
+ 
+ #[cfg(feature = "parsing")]
+ mod lookahead;
+ 
+ #[cfg(feature = "parsing")]
+ pub mod parse;
+ 
+-mod span;
++#[cfg(feature = "full")]
++mod reserved;
++
++#[cfg(all(any(feature = "full", feature = "derive"), feature = "parsing"))]
++mod verbatim;
+ 
+ #[cfg(all(any(feature = "full", feature = "derive"), feature = "printing"))]
+ mod print;
+ 
+-mod thread;
+-
+ ////////////////////////////////////////////////////////////////////////////////
+ 
+ #[allow(dead_code, non_camel_case_types)]
+ struct private;
+ 
+ // https://github.com/rust-lang/rust/issues/62830
+ #[cfg(feature = "parsing")]
+ mod rustdoc_workaround {
+@@ -795,24 +835,24 @@ pub use crate::error::{Error, Result};
+ /// 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`]: parse2
+ ///
+-/// *This function is available if Syn is built with both the `"parsing"` and
++/// *This function is available only if Syn is built with both the `"parsing"` and
+ /// `"proc-macro"` features.*
+ ///
+ /// # Examples
+ ///
+ /// ```
+-/// extern crate proc_macro;
+-///
++/// # extern crate proc_macro;
++/// #
+ /// use proc_macro::TokenStream;
+ /// use quote::quote;
+ /// use syn::DeriveInput;
+ ///
+ /// # const IGNORE_TOKENS: &str = stringify! {
+ /// #[proc_macro_derive(MyMacro)]
+ /// # };
+ /// pub fn my_macro(input: TokenStream) -> TokenStream {
+@@ -842,25 +882,25 @@ pub fn parse<T: parse::Parse>(tokens: pr
+ /// 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
+ /// body tokens of a [`Macro`] node. When in a procedural macro parsing the
+ /// `proc_macro::TokenStream` provided by the compiler, use [`syn::parse`]
+ /// instead.
+ ///
+ /// [`syn::parse`]: parse()
+ ///
+-/// *This function is available if Syn is built with the `"parsing"` feature.*
++/// *This function is available only if Syn is built with the `"parsing"` feature.*
+ #[cfg(feature = "parsing")]
+ pub fn parse2<T: parse::Parse>(tokens: proc_macro2::TokenStream) -> Result<T> {
+     parse::Parser::parse2(T::parse, tokens)
+ }
+ 
+ /// Parse a string of Rust code into the chosen syntax tree node.
+ ///
+-/// *This function is available if Syn is built with the `"parsing"` feature.*
++/// *This function is available only 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
+ ///
+@@ -869,19 +909,17 @@ pub fn parse2<T: parse::Parse>(tokens: p
+ ///
+ /// 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();
+-/// # }
++/// # run().unwrap();
+ /// ```
+ #[cfg(feature = "parsing")]
+ pub fn parse_str<T: parse::Parse>(s: &str) -> Result<T> {
+     parse::Parser::parse_str(T::parse, s)
+ }
+ 
+ // FIXME the name parse_file makes it sound like you might pass in a path to a
+ // file, rather than the content.
+@@ -889,17 +927,17 @@ pub fn parse_str<T: parse::Parse>(s: &st
+ ///
+ /// 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
++/// *This function is available only if Syn is built with the `"parsing"` and
+ /// `"full"` features.*
+ ///
+ /// # Examples
+ ///
+ /// ```no_run
+ /// use std::error::Error;
+ /// use std::fs::File;
+ /// use std::io::Read;
+@@ -913,35 +951,36 @@ pub fn parse_str<T: parse::Parse>(s: &st
+ ///     if let Some(shebang) = ast.shebang {
+ ///         println!("{}", shebang);
+ ///     }
+ ///     println!("{} items", ast.items.len());
+ ///
+ ///     Ok(())
+ /// }
+ /// #
+-/// # fn main() {
+-/// #     run().unwrap();
+-/// # }
++/// # run().unwrap();
+ /// ```
+ #[cfg(all(feature = "parsing", feature = "full"))]
+ pub fn parse_file(mut content: &str) -> Result<File> {
+     // Strip the BOM if it is present
+     const BOM: &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 = "";
++    if content.starts_with("#!") {
++        let rest = whitespace::skip(&content[2..]);
++        if !rest.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)
+ }
+diff --git a/third_party/rust/syn/src/lifetime.rs b/third_party/rust/syn/src/lifetime.rs
+--- a/third_party/rust/syn/src/lifetime.rs
++++ b/third_party/rust/syn/src/lifetime.rs
+@@ -13,20 +13,18 @@ use crate::lookahead;
+ ///
+ /// - 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"`
++/// *This type is available only if Syn is built with the `"derive"` or `"full"`
+ /// feature.*
+-#[cfg_attr(feature = "extra-traits", derive(Debug))]
+-#[derive(Clone)]
+ pub struct Lifetime {
+     pub apostrophe: Span,
+     pub ident: Ident,
+ }
+ 
+ impl Lifetime {
+     /// # Panics
+     ///
+@@ -67,16 +65,25 @@ impl Lifetime {
+ 
+ impl Display for Lifetime {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+         "'".fmt(formatter)?;
+         self.ident.fmt(formatter)
+     }
+ }
+ 
++impl Clone for Lifetime {
++    fn clone(&self) -> Self {
++        Lifetime {
++            apostrophe: self.apostrophe,
++            ident: self.ident.clone(),
++        }
++    }
++}
++
+ impl PartialEq for Lifetime {
+     fn eq(&self, other: &Lifetime) -> bool {
+         self.ident.eq(&other.ident)
+     }
+ }
+ 
+ impl Eq for Lifetime {}
+ 
+diff --git a/third_party/rust/syn/src/lit.rs b/third_party/rust/syn/src/lit.rs
+--- a/third_party/rust/syn/src/lit.rs
++++ b/third_party/rust/syn/src/lit.rs
+@@ -17,28 +17,25 @@ use std::hash::{Hash, Hasher};
+ use crate::lookahead;
+ #[cfg(feature = "parsing")]
+ use crate::parse::{Parse, Parser};
+ use crate::{Error, Result};
+ 
+ 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
+     //
+     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
+     // blocked on https://github.com/rust-lang/rust/issues/62833
+-    pub enum Lit #manual_extra_traits {
++    pub enum Lit {
+         /// A UTF-8 string literal: `"foo"`.
+         Str(LitStr),
+ 
+         /// A byte string literal: `b"foo"`.
+         ByteStr(LitByteStr),
+ 
+         /// A byte literal: `b'f'`.
+         Byte(LitByte),
+@@ -59,184 +56,98 @@ ast_enum_of_structs! {
+ 
+         /// A raw token literal not interpreted by Syn.
+         Verbatim(Literal),
+     }
+ }
+ 
+ ast_struct! {
+     /// A UTF-8 string literal: `"foo"`.
+-    ///
+-    /// *This type is available if Syn is built with the `"derive"` or
+-    /// `"full"` feature.*
+-    pub struct LitStr #manual_extra_traits_debug {
+-        repr: Box<LitStrRepr>,
++    pub struct LitStr {
++        repr: Box<LitRepr>,
+     }
+ }
+ 
+-#[cfg_attr(feature = "clone-impls", derive(Clone))]
+-struct LitStrRepr {
+-    token: Literal,
+-    suffix: Box<str>,
+-}
+-
+ ast_struct! {
+     /// A byte string literal: `b"foo"`.
+-    ///
+-    /// *This type is available if Syn is built with the `"derive"` or
+-    /// `"full"` feature.*
+-    pub struct LitByteStr #manual_extra_traits_debug {
+-        token: Literal,
++    pub struct LitByteStr {
++        repr: Box<LitRepr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A byte literal: `b'f'`.
+-    ///
+-    /// *This type is available if Syn is built with the `"derive"` or
+-    /// `"full"` feature.*
+-    pub struct LitByte #manual_extra_traits_debug {
+-        token: Literal,
++    pub struct LitByte {
++        repr: Box<LitRepr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A character literal: `'a'`.
+-    ///
+-    /// *This type is available if Syn is built with the `"derive"` or
+-    /// `"full"` feature.*
+-    pub struct LitChar #manual_extra_traits_debug {
+-        token: Literal,
++    pub struct LitChar {
++        repr: Box<LitRepr>,
+     }
+ }
+ 
++struct LitRepr {
++    token: Literal,
++    suffix: Box<str>,
++}
++
+ ast_struct! {
+     /// An integer literal: `1` or `1u16`.
+-    ///
+-    /// *This type is available if Syn is built with the `"derive"` or
+-    /// `"full"` feature.*
+-    pub struct LitInt #manual_extra_traits_debug {
++    pub struct LitInt {
+         repr: Box<LitIntRepr>,
+     }
+ }
+ 
+-#[cfg_attr(feature = "clone-impls", derive(Clone))]
+ struct LitIntRepr {
+     token: Literal,
+     digits: Box<str>,
+     suffix: Box<str>,
+ }
+ 
+ ast_struct! {
+     /// 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 struct LitFloat #manual_extra_traits_debug {
++    pub struct LitFloat {
+         repr: Box<LitFloatRepr>,
+     }
+ }
+ 
+-#[cfg_attr(feature = "clone-impls", derive(Clone))]
+ struct LitFloatRepr {
+     token: Literal,
+     digits: Box<str>,
+     suffix: Box<str>,
+ }
+ 
+ ast_struct! {
+     /// A boolean literal: `true` or `false`.
+-    ///
+-    /// *This type is available if Syn is built with the `"derive"` or
+-    /// `"full"` feature.*
+-    pub struct LitBool #manual_extra_traits_debug {
++    pub struct LitBool {
+         pub value: bool,
+         pub span: Span,
+     }
+ }
+ 
+-#[cfg(feature = "extra-traits")]
+-impl Eq for Lit {}
+-
+-#[cfg(feature = "extra-traits")]
+-impl PartialEq for Lit {
+-    fn eq(&self, other: &Self) -> bool {
+-        match (self, other) {
+-            (Lit::Str(this), Lit::Str(other)) => this == other,
+-            (Lit::ByteStr(this), Lit::ByteStr(other)) => this == other,
+-            (Lit::Byte(this), Lit::Byte(other)) => this == other,
+-            (Lit::Char(this), Lit::Char(other)) => this == other,
+-            (Lit::Int(this), Lit::Int(other)) => this == other,
+-            (Lit::Float(this), Lit::Float(other)) => this == other,
+-            (Lit::Bool(this), Lit::Bool(other)) => this == other,
+-            (Lit::Verbatim(this), Lit::Verbatim(other)) => this.to_string() == other.to_string(),
+-            _ => false,
+-        }
+-    }
+-}
+-
+-#[cfg(feature = "extra-traits")]
+-impl Hash for Lit {
+-    fn hash<H>(&self, hash: &mut H)
+-    where
+-        H: Hasher,
+-    {
+-        match self {
+-            Lit::Str(lit) => {
+-                hash.write_u8(0);
+-                lit.hash(hash);
+-            }
+-            Lit::ByteStr(lit) => {
+-                hash.write_u8(1);
+-                lit.hash(hash);
+-            }
+-            Lit::Byte(lit) => {
+-                hash.write_u8(2);
+-                lit.hash(hash);
+-            }
+-            Lit::Char(lit) => {
+-                hash.write_u8(3);
+-                lit.hash(hash);
+-            }
+-            Lit::Int(lit) => {
+-                hash.write_u8(4);
+-                lit.hash(hash);
+-            }
+-            Lit::Float(lit) => {
+-                hash.write_u8(5);
+-                lit.hash(hash);
+-            }
+-            Lit::Bool(lit) => {
+-                hash.write_u8(6);
+-                lit.hash(hash);
+-            }
+-            Lit::Verbatim(lit) => {
+-                hash.write_u8(7);
+-                lit.to_string().hash(hash);
+-            }
+-        }
+-    }
+-}
+-
+ impl LitStr {
+     pub fn new(value: &str, span: Span) -> Self {
+-        let mut lit = Literal::string(value);
+-        lit.set_span(span);
++        let mut token = Literal::string(value);
++        token.set_span(span);
+         LitStr {
+-            repr: Box::new(LitStrRepr {
+-                token: lit,
++            repr: Box::new(LitRepr {
++                token,
+                 suffix: Box::<str>::default(),
+             }),
+         }
+     }
+ 
+     pub fn value(&self) -> String {
+-        let (value, _) = value::parse_lit_str(&self.repr.token.to_string());
++        let repr = self.repr.token.to_string();
++        let (value, _suffix) = value::parse_lit_str(&repr);
+         String::from(value)
+     }
+ 
+     /// 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`.
+     ///
+     /// # Example
+@@ -306,17 +217,17 @@ impl LitStr {
+                 .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 &mut token {
+                 TokenTree::Group(g) => {
+-                    let stream = respan_token_stream(g.stream().clone(), span);
++                    let stream = respan_token_stream(g.stream(), span);
+                     *g = Group::new(g.delimiter(), stream);
+                     g.set_span(span);
+                 }
+                 other => other.set_span(span),
+             }
+             token
+         }
+ 
+@@ -340,86 +251,124 @@ impl LitStr {
+         &self.repr.suffix
+     }
+ }
+ 
+ impl LitByteStr {
+     pub fn new(value: &[u8], span: Span) -> Self {
+         let mut token = Literal::byte_string(value);
+         token.set_span(span);
+-        LitByteStr { token }
++        LitByteStr {
++            repr: Box::new(LitRepr {
++                token,
++                suffix: Box::<str>::default(),
++            }),
++        }
+     }
+ 
+     pub fn value(&self) -> Vec<u8> {
+-        value::parse_lit_byte_str(&self.token.to_string())
++        let repr = self.repr.token.to_string();
++        let (value, _suffix) = value::parse_lit_byte_str(&repr);
++        value
+     }
+ 
+     pub fn span(&self) -> Span {
+-        self.token.span()
++        self.repr.token.span()
+     }
+ 
+     pub fn set_span(&mut self, span: Span) {
+-        self.token.set_span(span)
++        self.repr.token.set_span(span)
++    }
++
++    pub fn suffix(&self) -> &str {
++        &self.repr.suffix
+     }
+ }
+ 
+ impl LitByte {
+     pub fn new(value: u8, span: Span) -> Self {
+         let mut token = Literal::u8_suffixed(value);
+         token.set_span(span);
+-        LitByte { token }
++        LitByte {
++            repr: Box::new(LitRepr {
++                token,
++                suffix: Box::<str>::default(),
++            }),
++        }
+     }
+ 
+     pub fn value(&self) -> u8 {
+-        value::parse_lit_byte(&self.token.to_string())
++        let repr = self.repr.token.to_string();
++        let (value, _suffix) = value::parse_lit_byte(&repr);
++        value
+     }
+ 
+     pub fn span(&self) -> Span {
+-        self.token.span()
++        self.repr.token.span()
+     }
+ 
+     pub fn set_span(&mut self, span: Span) {
+-        self.token.set_span(span)
++        self.repr.token.set_span(span)
++    }
++
++    pub fn suffix(&self) -> &str {
++        &self.repr.suffix
+     }
+ }
+ 
+ impl LitChar {
+     pub fn new(value: char, span: Span) -> Self {
+         let mut token = Literal::character(value);
+         token.set_span(span);
+-        LitChar { token }
++        LitChar {
++            repr: Box::new(LitRepr {
++                token,
++                suffix: Box::<str>::default(),
++            }),
++        }
+     }
+ 
+     pub fn value(&self) -> char {
+-        value::parse_lit_char(&self.token.to_string())
++        let repr = self.repr.token.to_string();
++        let (value, _suffix) = value::parse_lit_char(&repr);
++        value
+     }
+ 
+     pub fn span(&self) -> Span {
+-        self.token.span()
++        self.repr.token.span()
+     }
+ 
+     pub fn set_span(&mut self, span: Span) {
+-        self.token.set_span(span)
++        self.repr.token.set_span(span)
++    }
++
++    pub fn suffix(&self) -> &str {
++        &self.repr.suffix
+     }
+ }
+ 
+ impl LitInt {
+     pub fn new(repr: &str, span: Span) -> Self {
+-        if let Some((digits, suffix)) = value::parse_lit_int(repr) {
+-            let mut token = value::to_literal(repr);
+-            token.set_span(span);
+-            LitInt {
+-                repr: Box::new(LitIntRepr {
+-                    token,
+-                    digits,
+-                    suffix,
+-                }),
+-            }
+-        } else {
+-            panic!("Not an integer literal: `{}`", repr);
++        let (digits, suffix) = match value::parse_lit_int(repr) {
++            Some(parse) => parse,
++            None => panic!("Not an integer literal: `{}`", repr),
++        };
++
++        let mut token = match value::to_literal(repr, &digits, &suffix) {
++            Some(token) => token,
++            None => panic!("Unsupported integer literal: `{}`", repr),
++        };
++
++        token.set_span(span);
++        LitInt {
++            repr: Box::new(LitIntRepr {
++                token,
++                digits,
++                suffix,
++            }),
+         }
+     }
+ 
+     pub fn base10_digits(&self) -> &str {
+         &self.repr.digits
+     }
+ 
+     /// Parses the literal into a selected number type.
+@@ -487,28 +436,33 @@ impl From<Literal> for LitInt {
+ impl Display for LitInt {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+         self.repr.token.fmt(formatter)
+     }
+ }
+ 
+ impl LitFloat {
+     pub fn new(repr: &str, span: Span) -> Self {
+-        if let Some((digits, suffix)) = value::parse_lit_float(repr) {
+-            let mut token = value::to_literal(repr);
+-            token.set_span(span);
+-            LitFloat {
+-                repr: Box::new(LitFloatRepr {
+-                    token,
+-                    digits,
+-                    suffix,
+-                }),
+-            }
+-        } else {
+-            panic!("Not a float literal: `{}`", repr);
++        let (digits, suffix) = match value::parse_lit_float(repr) {
++            Some(parse) => parse,
++            None => panic!("Not a float literal: `{}`", repr),
++        };
++
++        let mut token = match value::to_literal(repr, &digits, &suffix) {
++            Some(token) => token,
++            None => panic!("Unsupported float literal: `{}`", repr),
++        };
++
++        token.set_span(span);
++        LitFloat {
++            repr: Box::new(LitFloatRepr {
++                token,
++                digits,
++                suffix,
++            }),
+         }
+     }
+ 
+     pub fn base10_digits(&self) -> &str {
+         &self.repr.digits
+     }
+ 
+     pub fn base10_parse<N>(&self) -> Result<N>
+@@ -570,35 +524,35 @@ mod debug_impls {
+                 .finish()
+         }
+     }
+ 
+     impl Debug for LitByteStr {
+         fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+             formatter
+                 .debug_struct("LitByteStr")
+-                .field("token", &format_args!("{}", self.token))
++                .field("token", &format_args!("{}", self.repr.token))
+                 .finish()
+         }
+     }
+ 
+     impl Debug for LitByte {
+         fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+             formatter
+                 .debug_struct("LitByte")
+-                .field("token", &format_args!("{}", self.token))
++                .field("token", &format_args!("{}", self.repr.token))
+                 .finish()
+         }
+     }
+ 
+     impl Debug for LitChar {
+         fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+             formatter
+                 .debug_struct("LitChar")
+-                .field("token", &format_args!("{}", self.token))
++                .field("token", &format_args!("{}", self.repr.token))
+                 .finish()
+         }
+     }
+ 
+     impl Debug for LitInt {
+         fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+             formatter
+                 .debug_struct("LitInt")
+@@ -621,61 +575,102 @@ mod debug_impls {
+             formatter
+                 .debug_struct("LitBool")
+                 .field("value", &self.value)
+                 .finish()
+         }
+     }
+ }
+ 
++#[cfg(feature = "clone-impls")]
++impl Clone for LitRepr {
++    fn clone(&self) -> Self {
++        LitRepr {
++            token: self.token.clone(),
++            suffix: self.suffix.clone(),
++        }
++    }
++}
++
++#[cfg(feature = "clone-impls")]
++impl Clone for LitIntRepr {
++    fn clone(&self) -> Self {
++        LitIntRepr {
++            token: self.token.clone(),
++            digits: self.digits.clone(),
++            suffix: self.suffix.clone(),
++        }
++    }
++}
++
++#[cfg(feature = "clone-impls")]
++impl Clone for LitFloatRepr {
++    fn clone(&self) -> Self {
++        LitFloatRepr {
++            token: self.token.clone(),
++            digits: self.digits.clone(),
++            suffix: self.suffix.clone(),
++        }
++    }
++}
++
+ macro_rules! lit_extra_traits {
+-    ($ty:ident, $($field:ident).+) => {
+-        #[cfg(feature = "extra-traits")]
+-        impl Eq for $ty {}
++    ($ty:ident) => {
++        #[cfg(feature = "clone-impls")]
++        impl Clone for $ty {
++            fn clone(&self) -> Self {
++                $ty {
++                    repr: self.repr.clone(),
++                }
++            }
++        }
+ 
+         #[cfg(feature = "extra-traits")]
+         impl PartialEq for $ty {
+             fn eq(&self, other: &Self) -> bool {
+-                self.$($field).+.to_string() == other.$($field).+.to_string()
++                self.repr.token.to_string() == other.repr.token.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);
++                self.repr.token.to_string().hash(state);
+             }
+         }
+ 
+         #[cfg(feature = "parsing")]
+         #[doc(hidden)]
+         #[allow(non_snake_case)]
+         pub fn $ty(marker: lookahead::TokenMarker) -> $ty {
+             match marker {}
+         }
+     };
+ }
+ 
+-lit_extra_traits!(LitStr, repr.token);
+-lit_extra_traits!(LitByteStr, token);
+-lit_extra_traits!(LitByte, token);
+-lit_extra_traits!(LitChar, token);
+-lit_extra_traits!(LitInt, repr.token);
+-lit_extra_traits!(LitFloat, repr.token);
+-lit_extra_traits!(LitBool, value);
++lit_extra_traits!(LitStr);
++lit_extra_traits!(LitByteStr);
++lit_extra_traits!(LitByte);
++lit_extra_traits!(LitChar);
++lit_extra_traits!(LitInt);
++lit_extra_traits!(LitFloat);
++
++#[cfg(feature = "parsing")]
++#[doc(hidden)]
++#[allow(non_snake_case)]
++pub fn LitBool(marker: lookahead::TokenMarker) -> LitBool {
++    match marker {}
++}
+ 
+ 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),
+     }
+@@ -686,43 +681,93 @@ ast_enum! {
+ #[allow(non_snake_case)]
+ pub fn Lit(marker: lookahead::TokenMarker) -> Lit {
+     match marker {}
+ }
+ 
+ #[cfg(feature = "parsing")]
+ pub mod parsing {
+     use super::*;
++    use crate::buffer::Cursor;
+     use crate::parse::{Parse, ParseStream, Result};
++    use proc_macro2::Punct;
+ 
+     impl Parse for Lit {
+         fn parse(input: ParseStream) -> Result<Self> {
+             input.step(|cursor| {
+                 if let Some((lit, rest)) = cursor.literal() {
+                     return Ok((Lit::new(lit), rest));
+                 }
+-                while let Some((ident, rest)) = cursor.ident() {
+-                    let value = if ident == "true" {
+-                        true
+-                    } else if ident == "false" {
+-                        false
+-                    } else {
+-                        break;
+-                    };
+-                    let lit_bool = LitBool {
+-                        value,
+-                        span: ident.span(),
+-                    };
+-                    return Ok((Lit::Bool(lit_bool), rest));
++
++                if let Some((ident, rest)) = cursor.ident() {
++                    let value = ident == "true";
++                    if value || ident == "false" {
++                        let lit_bool = LitBool {
++                            value,
++                            span: ident.span(),
++                        };
++                        return Ok((Lit::Bool(lit_bool), rest));
++                    }
+                 }
++
++                if let Some((punct, rest)) = cursor.punct() {
++                    if punct.as_char() == '-' {
++                        if let Some((lit, rest)) = parse_negative_lit(punct, rest) {
++                            return Ok((lit, rest));
++                        }
++                    }
++                }
++
+                 Err(cursor.error("expected literal"))
+             })
+         }
+     }
+ 
++    fn parse_negative_lit(neg: Punct, cursor: Cursor) -> Option<(Lit, Cursor)> {
++        let (lit, rest) = cursor.literal()?;
++
++        let mut span = neg.span();
++        span = span.join(lit.span()).unwrap_or(span);
++
++        let mut repr = lit.to_string();
++        repr.insert(0, '-');
++
++        if !(repr.ends_with("f32") || repr.ends_with("f64")) {
++            if let Some((digits, suffix)) = value::parse_lit_int(&repr) {
++                if let Some(mut token) = value::to_literal(&repr, &digits, &suffix) {
++                    token.set_span(span);
++                    return Some((
++                        Lit::Int(LitInt {
++                            repr: Box::new(LitIntRepr {
++                                token,
++                                digits,
++                                suffix,
++                            }),
++                        }),
++                        rest,
++                    ));
++                }
++            }
++        }
++
++        let (digits, suffix) = value::parse_lit_float(&repr)?;
++        let mut token = value::to_literal(&repr, &digits, &suffix)?;
++        token.set_span(span);
++        Some((
++            Lit::Float(LitFloat {
++                repr: Box::new(LitFloatRepr {
++                    token,
++                    digits,
++                    suffix,
++                }),
++            }),
++            rest,
++        ))
++    }
++
+     impl Parse for LitStr {
+         fn parse(input: ParseStream) -> Result<Self> {
+             let head = input.fork();
+             match input.parse()? {
+                 Lit::Str(lit) => Ok(lit),
+                 _ => Err(head.error("expected string literal")),
+             }
+         }
+@@ -798,29 +843,29 @@ mod printing {
+     impl ToTokens for LitStr {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
+             self.repr.token.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for LitByteStr {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
+-            self.token.to_tokens(tokens);
++            self.repr.token.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for LitByte {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
+-            self.token.to_tokens(tokens);
++            self.repr.token.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for LitChar {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
+-            self.token.to_tokens(tokens);
++            self.repr.token.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for LitInt {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
+             self.repr.token.to_tokens(tokens);
+         }
+     }
+@@ -850,30 +895,39 @@ mod value {
+         /// Interpret a Syn literal from a proc-macro2 literal.
+         pub fn new(token: Literal) -> Self {
+             let repr = token.to_string();
+ 
+             match byte(&repr, 0) {
+                 b'"' | b'r' => {
+                     let (_, suffix) = parse_lit_str(&repr);
+                     return Lit::Str(LitStr {
+-                        repr: Box::new(LitStrRepr { token, suffix }),
++                        repr: Box::new(LitRepr { token, suffix }),
+                     });
+                 }
+                 b'b' => match byte(&repr, 1) {
+                     b'"' | b'r' => {
+-                        return Lit::ByteStr(LitByteStr { token });
++                        let (_, suffix) = parse_lit_byte_str(&repr);
++                        return Lit::ByteStr(LitByteStr {
++                            repr: Box::new(LitRepr { token, suffix }),
++                        });
+                     }
+                     b'\'' => {
+-                        return Lit::Byte(LitByte { token });
++                        let (_, suffix) = parse_lit_byte(&repr);
++                        return Lit::Byte(LitByte {
++                            repr: Box::new(LitRepr { token, suffix }),
++                        });
+                     }
+                     _ => {}
+                 },
+                 b'\'' => {
+-                    return Lit::Char(LitChar { token });
++                    let (_, suffix) = parse_lit_char(&repr);
++                    return Lit::Char(LitChar {
++                        repr: Box::new(LitRepr { token, suffix }),
++                    });
+                 }
+                 b'0'..=b'9' | b'-' => {
+                     if !(repr.ends_with("f32") || repr.ends_with("f64")) {
+                         if let Some((digits, suffix)) = parse_lit_int(&repr) {
+                             return Lit::Int(LitInt {
+                                 repr: Box::new(LitIntRepr {
+                                     token,
+                                     digits,
+@@ -900,16 +954,54 @@ mod value {
+                         });
+                     }
+                 }
+                 _ => {}
+             }
+ 
+             panic!("Unrecognized literal: `{}`", repr);
+         }
++
++        pub fn suffix(&self) -> &str {
++            match self {
++                Lit::Str(lit) => lit.suffix(),
++                Lit::ByteStr(lit) => lit.suffix(),
++                Lit::Byte(lit) => lit.suffix(),
++                Lit::Char(lit) => lit.suffix(),
++                Lit::Int(lit) => lit.suffix(),
++                Lit::Float(lit) => lit.suffix(),
++                Lit::Bool(_) | Lit::Verbatim(_) => "",
++            }
++        }
++
++        pub fn span(&self) -> Span {
++            match self {
++                Lit::Str(lit) => lit.span(),
++                Lit::ByteStr(lit) => lit.span(),
++                Lit::Byte(lit) => lit.span(),
++                Lit::Char(lit) => lit.span(),
++                Lit::Int(lit) => lit.span(),
++                Lit::Float(lit) => lit.span(),
++                Lit::Bool(lit) => lit.span,
++                Lit::Verbatim(lit) => lit.span(),
++            }
++        }
++
++        pub fn set_span(&mut self, span: Span) {
++            match self {
++                Lit::Str(lit) => lit.set_span(span),
++                Lit::ByteStr(lit) => lit.set_span(span),
++                Lit::Byte(lit) => lit.set_span(span),
++                Lit::Char(lit) => lit.set_span(span),
++                Lit::Int(lit) => lit.set_span(span),
++                Lit::Float(lit) => lit.set_span(span),
++                Lit::Bool(lit) => lit.span = span,
++                Lit::Verbatim(lit) => lit.set_span(span),
++            }
++        }
+     }
+ 
+     /// 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]
+@@ -999,140 +1091,144 @@ mod value {
+         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() {
++        let close = s.rfind('"').unwrap();
++        for end in s[close + 1..close + 1 + pounds].bytes() {
+             assert_eq!(end, b'#');
+         }
+ 
+-        let content = s[pounds + 1..s.len() - pounds - 1]
+-            .to_owned()
+-            .into_boxed_str();
+-        let suffix = Box::<str>::default(); // todo
++        let content = s[pounds + 1..close].to_owned().into_boxed_str();
++        let suffix = s[close + 1 + pounds..].to_owned().into_boxed_str();
+         (content, suffix)
+     }
+ 
+-    pub fn parse_lit_byte_str(s: &str) -> Vec<u8> {
++    // Returns (content, suffix).
++    pub fn parse_lit_byte_str(s: &str) -> (Vec<u8>, Box<str>) {
+         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
+     #[allow(clippy::needless_continue)]
+-    fn parse_lit_byte_str_cooked(mut s: &str) -> Vec<u8> {
++    fn parse_lit_byte_str_cooked(mut s: &str) -> (Vec<u8>, Box<str>) {
+         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 v = s.as_bytes();
+ 
+         let mut out = Vec::new();
+         'outer: loop {
+-            let byte = match byte(s, 0) {
++            let byte = match byte(v, 0) {
+                 b'"' => break,
+                 b'\\' => {
+-                    let b = byte(s, 1);
+-                    s = &s[2..];
++                    let b = byte(v, 1);
++                    v = &v[2..];
+                     match b {
+                         b'x' => {
+-                            let (b, rest) = backslash_x(s);
+-                            s = rest;
++                            let (b, rest) = backslash_x(v);
++                            v = 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 byte = byte(v, 0);
+                             let ch = char::from_u32(u32::from(byte)).unwrap();
+                             if ch.is_whitespace() {
+-                                s = &s[1..];
++                                v = &v[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..];
++                    assert_eq!(byte(v, 1), b'\n', "Bare CR not allowed in string");
++                    v = &v[2..];
+                     b'\n'
+                 }
+                 b => {
+-                    s = &s[1..];
++                    v = &v[1..];
+                     b
+                 }
+             };
+             out.push(byte);
+         }
+ 
+-        assert_eq!(s, b"\"");
+-        out
++        assert_eq!(byte(v, 0), b'"');
++        let suffix = s[s.len() - v.len() + 1..].to_owned().into_boxed_str();
++        (out, suffix)
+     }
+ 
+-    fn parse_lit_byte_str_raw(s: &str) -> Vec<u8> {
++    fn parse_lit_byte_str_raw(s: &str) -> (Vec<u8>, Box<str>) {
+         assert_eq!(byte(s, 0), b'b');
+-        String::from(parse_lit_str_raw(&s[1..]).0).into_bytes()
++        let (value, suffix) = parse_lit_str_raw(&s[1..]);
++        (String::from(value).into_bytes(), suffix)
+     }
+ 
+-    pub fn parse_lit_byte(s: &str) -> u8 {
++    // Returns (value, suffix).
++    pub fn parse_lit_byte(s: &str) -> (u8, Box<str>) {
+         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 mut v = s[2..].as_bytes();
+ 
+-        let b = match byte(s, 0) {
++        let b = match byte(v, 0) {
+             b'\\' => {
+-                let b = byte(s, 1);
+-                s = &s[2..];
++                let b = byte(v, 1);
++                v = &v[2..];
+                 match b {
+                     b'x' => {
+-                        let (b, rest) = backslash_x(s);
+-                        s = rest;
++                        let (b, rest) = backslash_x(v);
++                        v = 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..];
++                v = &v[1..];
+                 b
+             }
+         };
+ 
+-        assert_eq!(byte(s, 0), b'\'');
+-        b
++        assert_eq!(byte(v, 0), b'\'');
++        let suffix = s[s.len() - v.len() + 1..].to_owned().into_boxed_str();
++        (b, suffix)
+     }
+ 
+-    pub fn parse_lit_char(mut s: &str) -> char {
++    // Returns (value, suffix).
++    pub fn parse_lit_char(mut s: &str) -> (char, Box<str>) {
+         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 {
+@@ -1158,18 +1254,19 @@ mod value {
+                 }
+             }
+             _ => {
+                 let ch = next_chr(s);
+                 s = &s[ch.len_utf8()..];
+                 ch
+             }
+         };
+-        assert_eq!(s, "\'", "Expected end of char literal");
+-        ch
++        assert_eq!(byte(s, 0), b'\'');
++        let suffix = s[1..].to_owned().into_boxed_str();
++        (ch, suffix)
+     }
+ 
+     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);
+@@ -1329,17 +1426,21 @@ mod value {
+                     if has_e || has_dot {
+                         return None;
+                     }
+                     has_dot = true;
+                     bytes[write] = b'.';
+                 }
+                 b'e' | b'E' => {
+                     if has_e {
+-                        return None;
++                        if has_exponent {
++                            break;
++                        } else {
++                            return None;
++                        }
+                     }
+                     has_e = true;
+                     bytes[write] = b'e';
+                 }
+                 b'-' | b'+' => {
+                     if has_sign || has_exponent || !has_e {
+                         return None;
+                     }
+@@ -1367,16 +1468,38 @@ mod value {
+         digits.truncate(write);
+         if suffix.is_empty() || crate::ident::xid_ok(&suffix) {
+             Some((digits.into_boxed_str(), suffix.into_boxed_str()))
+         } else {
+             None
+         }
+     }
+ 
+-    pub fn to_literal(s: &str) -> Literal {
+-        let stream = s.parse::<TokenStream>().unwrap();
+-        match stream.into_iter().next().unwrap() {
+-            TokenTree::Literal(l) => l,
+-            _ => unreachable!(),
++    pub fn to_literal(repr: &str, digits: &str, suffix: &str) -> Option<Literal> {
++        if repr.starts_with('-') {
++            if suffix == "f64" {
++                digits.parse().ok().map(Literal::f64_suffixed)
++            } else if suffix == "f32" {
++                digits.parse().ok().map(Literal::f32_suffixed)
++            } else if suffix == "i64" {
++                digits.parse().ok().map(Literal::i64_suffixed)
++            } else if suffix == "i32" {
++                digits.parse().ok().map(Literal::i32_suffixed)
++            } else if suffix == "i16" {
++                digits.parse().ok().map(Literal::i16_suffixed)
++            } else if suffix == "i8" {
++                digits.parse().ok().map(Literal::i8_suffixed)
++            } else if !suffix.is_empty() {
++                None
++            } else if digits.contains('.') {
++                digits.parse().ok().map(Literal::f64_unsuffixed)
++            } else {
++                digits.parse().ok().map(Literal::i64_unsuffixed)
++            }
++        } else {
++            let stream = repr.parse::<TokenStream>().unwrap();
++            match stream.into_iter().next().unwrap() {
++                TokenTree::Literal(l) => Some(l),
++                _ => unreachable!(),
++            }
+         }
+     }
+ }
+diff --git a/third_party/rust/syn/src/mac.rs b/third_party/rust/syn/src/mac.rs
+--- a/third_party/rust/syn/src/mac.rs
++++ b/third_party/rust/syn/src/mac.rs
+@@ -1,79 +1,56 @@
+ use super::*;
+ use crate::token::{Brace, Bracket, Paren};
+ use proc_macro2::TokenStream;
+ #[cfg(feature = "parsing")]
+-use proc_macro2::{Delimiter, Span, TokenTree};
++use proc_macro2::{Delimiter, Group, Span, TokenTree};
+ 
+ #[cfg(feature = "parsing")]
+ use crate::parse::{Parse, ParseStream, Parser, Result};
+-#[cfg(feature = "extra-traits")]
+-use crate::tt::TokenStreamHelper;
+-#[cfg(feature = "extra-traits")]
+-use std::hash::{Hash, Hasher};
+ 
+ ast_struct! {
+     /// A macro invocation: `println!("{}", mac)`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
++    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
+     /// feature.*
+-    pub struct Macro #manual_extra_traits {
++    pub struct Macro {
+         pub path: Path,
+         pub bang_token: Token![!],
+         pub delimiter: MacroDelimiter,
+         pub tokens: 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"`
++    /// *This type is available only 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.tokens) == TokenStreamHelper(&other.tokens)
+-    }
+-}
+-
+-#[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.tokens).hash(state);
+-    }
+-}
+-
+ #[cfg(feature = "parsing")]
+-fn delimiter_span(delimiter: &MacroDelimiter) -> Span {
+-    match delimiter {
++fn delimiter_span_close(macro_delimiter: &MacroDelimiter) -> Span {
++    let delimiter = match macro_delimiter {
++        MacroDelimiter::Paren(_) => Delimiter::Parenthesis,
++        MacroDelimiter::Brace(_) => Delimiter::Brace,
++        MacroDelimiter::Bracket(_) => Delimiter::Bracket,
++    };
++    let mut group = Group::new(delimiter, TokenStream::new());
++    group.set_span(match macro_delimiter {
+         MacroDelimiter::Paren(token) => token.span,
+         MacroDelimiter::Brace(token) => token.span,
+         MacroDelimiter::Bracket(token) => token.span,
+-    }
++    });
++    group.span_close()
+ }
+ 
+ impl Macro {
+     /// Parse the tokens within the macro invocation's delimiters into a syntax
+     /// tree.
+     ///
+     /// This is equivalent to `syn::parse2::<T>(mac.tokens)` except that it
+     /// produces a more useful span when `tokens` is empty.
+@@ -158,19 +135,17 @@ impl Macro {
+     pub fn parse_body<T: Parse>(&self) -> Result<T> {
+         self.parse_body_with(T::parse)
+     }
+ 
+     /// Parse the tokens within the macro invocation's delimiters using the
+     /// given parser.
+     #[cfg(feature = "parsing")]
+     pub fn parse_body_with<F: Parser>(&self, parser: F) -> Result<F::Output> {
+-        // TODO: see if we can get a group.span_close() span in here as the
+-        // scope, rather than the span of the whole group.
+-        let scope = delimiter_span(&self.delimiter);
++        let scope = delimiter_span_close(&self.delimiter);
+         crate::parse::parse_scoped(parser, scope, self.tokens.clone())
+     }
+ }
+ 
+ #[cfg(feature = "parsing")]
+ pub fn parse_delimiter(input: ParseStream) -> Result<(MacroDelimiter, TokenStream)> {
+     input.step(|cursor| {
+         if let Some((TokenTree::Group(g), rest)) = cursor.token_tree() {
+diff --git a/third_party/rust/syn/src/macros.rs b/third_party/rust/syn/src/macros.rs
+--- a/third_party/rust/syn/src/macros.rs
++++ b/third_party/rust/syn/src/macros.rs
+@@ -1,56 +1,33 @@
+ macro_rules! ast_struct {
+     (
+         [$($attrs_pub:tt)*]
+         struct $name:ident #full $($rest:tt)*
+     ) => {
+         #[cfg(feature = "full")]
+-        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
+-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
+         $($attrs_pub)* struct $name $($rest)*
+ 
+         #[cfg(not(feature = "full"))]
+-        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
+-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
+         $($attrs_pub)* struct $name {
+-            _noconstruct: (),
++            _noconstruct: ::std::marker::PhantomData<::proc_macro2::Span>,
+         }
+ 
+         #[cfg(all(not(feature = "full"), feature = "printing"))]
+         impl ::quote::ToTokens for $name {
+             fn to_tokens(&self, _: &mut ::proc_macro2::TokenStream) {
+                 unreachable!()
+             }
+         }
+     };
+ 
+     (
+         [$($attrs_pub:tt)*]
+-        struct $name:ident #manual_extra_traits $($rest:tt)*
+-    ) => {
+-        #[cfg_attr(feature = "extra-traits", derive(Debug))]
+-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
+-        $($attrs_pub)* struct $name $($rest)*
+-    };
+-
+-    (
+-        [$($attrs_pub:tt)*]
+-        struct $name:ident #manual_extra_traits_debug $($rest:tt)*
+-    ) => {
+-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
+-        $($attrs_pub)* struct $name $($rest)*
+-    };
+-
+-    (
+-        [$($attrs_pub:tt)*]
+         struct $name:ident $($rest:tt)*
+     ) => {
+-        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
+-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
+         $($attrs_pub)* struct $name $($rest)*
+     };
+ 
+     ($($t:tt)*) => {
+         strip_attrs_pub!(ast_struct!($($t)*));
+     };
+ }
+ 
+@@ -60,29 +37,18 @@ macro_rules! ast_enum {
+         [$($attrs_pub:tt)*]
+         enum $name:ident #no_visit $($rest:tt)*
+     ) => (
+         ast_enum!([$($attrs_pub)*] enum $name $($rest)*);
+     );
+ 
+     (
+         [$($attrs_pub:tt)*]
+-        enum $name:ident #manual_extra_traits $($rest:tt)*
+-    ) => (
+-        #[cfg_attr(feature = "extra-traits", derive(Debug))]
+-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
+-        $($attrs_pub)* enum $name $($rest)*
+-    );
+-
+-    (
+-        [$($attrs_pub:tt)*]
+         enum $name:ident $($rest:tt)*
+     ) => (
+-        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
+-        #[cfg_attr(feature = "clone-impls", derive(Clone))]
+         $($attrs_pub)* enum $name $($rest)*
+     );
+ 
+     ($($t:tt)*) => {
+         strip_attrs_pub!(ast_enum!($($t)*));
+     };
+ }
+ 
+@@ -115,36 +81,43 @@ macro_rules! ast_enum_of_structs_impl {
+             )*
+         }
+ 
+         $($remaining:tt)*
+     ) => {
+         check_keyword_matches!(pub $pub);
+         check_keyword_matches!(enum $enum);
+ 
+-        $(
+-            $(
+-                impl From<$member> for $name {
+-                    fn from(e: $member) -> $name {
+-                        $name::$variant(e)
+-                    }
+-                }
+-            )*
+-        )*
++        $($(
++            ast_enum_from_struct!($name::$variant, $member);
++        )*)*
+ 
+         #[cfg(feature = "printing")]
+         generate_to_tokens! {
+             $($remaining)*
+             ()
+             tokens
+             $name { $($variant $($member)*,)* }
+         }
+     };
+ }
+ 
++macro_rules! ast_enum_from_struct {
++    // No From<TokenStream> for verbatim variants.
++    ($name:ident::Verbatim, $member:ident) => {};
++
++    ($name:ident::$variant:ident, $member:ident) => {
++        impl From<$member> for $name {
++            fn from(e: $member) -> $name {
++                $name::$variant(e)
++            }
++        }
++    };
++}
++
+ #[cfg(feature = "printing")]
+ 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)* }
+diff --git a/third_party/rust/syn/src/op.rs b/third_party/rust/syn/src/op.rs
+--- a/third_party/rust/syn/src/op.rs
++++ b/third_party/rust/syn/src/op.rs
+@@ -1,14 +1,13 @@
+ ast_enum! {
+     /// A binary operator: `+`, `+=`, `&`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
++    /// *This type is available only 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)
+@@ -62,19 +61,18 @@ ast_enum! {
+         /// The `>>=` operator
+         ShrEq(Token![>>=]),
+     }
+ }
+ 
+ ast_enum! {
+     /// A unary operator: `*`, `!`, `-`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
++    /// *This type is available only 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![-]),
+     }
+diff --git a/third_party/rust/syn/src/parse.rs b/third_party/rust/syn/src/parse.rs
+--- a/third_party/rust/syn/src/parse.rs
++++ b/third_party/rust/syn/src/parse.rs
+@@ -21,18 +21,18 @@
+ //! procedural macro through [`parse_macro_input!`] as shown at the bottom of
+ //! the snippet. If the caller provides syntactically invalid input to the
+ //! procedural macro, they will receive a helpful compiler error message
+ //! pointing out the exact token that triggered the failure to parse.
+ //!
+ //! [`parse_macro_input!`]: ../macro.parse_macro_input.html
+ //!
+ //! ```
+-//! extern crate proc_macro;
+-//!
++//! # extern crate proc_macro;
++//! #
+ //! use proc_macro::TokenStream;
+ //! use syn::{braced, parse_macro_input, token, Field, Ident, Result, Token};
+ //! use syn::parse::{Parse, ParseStream};
+ //! use syn::punctuated::Punctuated;
+ //!
+ //! enum Item {
+ //!     Struct(ItemStruct),
+ //!     Enum(ItemEnum),
+@@ -104,19 +104,17 @@
+ //! ```
+ //! use syn::Type;
+ //!
+ //! # fn run_parser() -> syn::Result<()> {
+ //! let t: Type = syn::parse_str("std::collections::HashMap<String, Value>")?;
+ //! #     Ok(())
+ //! # }
+ //! #
+-//! # fn main() {
+-//! #     run_parser().unwrap();
+-//! # }
++//! # run_parser().unwrap();
+ //! ```
+ //!
+ //! The [`parse_quote!`] macro also uses this approach.
+ //!
+ //! [`parse_quote!`]: ../macro.parse_quote.html
+ //!
+ //! # The `Parser` trait
+ //!
+@@ -150,18 +148,18 @@
+ //!
+ //! In these cases the types provide a choice of parser functions rather than a
+ //! single `Parse` implementation, and those parser functions can be invoked
+ //! through the [`Parser`] trait.
+ //!
+ //! [`Parser`]: trait.Parser.html
+ //!
+ //! ```
+-//! extern crate proc_macro;
+-//!
++//! # extern crate proc_macro;
++//! #
+ //! use proc_macro::TokenStream;
+ //! use syn::parse::Parser;
+ //! use syn::punctuated::Punctuated;
+ //! use syn::{Attribute, Expr, PathSegment, Result, Token};
+ //!
+ //! fn call_some_parser_methods(input: TokenStream) -> Result<()> {
+ //!     // Parse a nonempty sequence of path segments separated by `::` punctuation
+ //!     // with no trailing punctuation.
+@@ -181,17 +179,17 @@
+ //!     let _attrs = parser.parse(tokens)?;
+ //!
+ //!     Ok(())
+ //! }
+ //! ```
+ //!
+ //! ---
+ //!
+-//! *This module is available if Syn is built with the `"parsing"` feature.*
++//! *This module is available only if Syn is built with the `"parsing"` feature.*
+ 
+ #[path = "discouraged.rs"]
+ pub mod discouraged;
+ 
+ use std::cell::Cell;
+ use std::fmt::{self, Debug, Display};
+ use std::marker::PhantomData;
+ use std::mem;
+@@ -212,16 +210,21 @@ use crate::lookahead;
+ use crate::punctuated::Punctuated;
+ use crate::token::Token;
+ 
+ pub use crate::error::{Error, Result};
+ pub use crate::lookahead::{Lookahead1, Peek};
+ 
+ /// 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 implementing and using
++/// the `Parse` trait.
++///
++/// [module documentation]: self
+ pub trait Parse: Sized {
+     fn parse(input: ParseStream) -> Result<Self>;
+ }
+ 
+ /// Input to a Syn parser function.
+ ///
+ /// See the methods of this type under the documentation of [`ParseBuffer`]. For
+ /// an overview of parsing in Syn, refer to the [module documentation].
+@@ -258,23 +261,26 @@ pub struct ParseBuffer<'a> {
+     // ParseBuffer<'a>, upcast to ParseBuffer<'short> for some lifetime shorter
+     // than 'a, and then assign a Cursor<'short> into the Cell.
+     //
+     // By extension, it would not be safe to expose an API that accepts a
+     // Cursor<'a> and trusts that it lives as long as the cursor currently in
+     // the cell.
+     cell: Cell<Cursor<'static>>,
+     marker: PhantomData<Cursor<'a>>,
+-    unexpected: Rc<Cell<Option<Span>>>,
++    unexpected: Cell<Option<Rc<Cell<Unexpected>>>>,
+ }
+ 
+ impl<'a> Drop for ParseBuffer<'a> {
+     fn drop(&mut self) {
+-        if !self.is_empty() && self.unexpected.get().is_none() {
+-            self.unexpected.set(Some(self.cursor().span()));
++        if let Some(unexpected_span) = span_of_unexpected_ignoring_nones(self.cursor()) {
++            let (inner, old_span) = inner_unexpected(self);
++            if old_span.is_none() {
++                inner.set(Unexpected::Some(unexpected_span));
++            }
+         }
+     }
+ }
+ 
+ impl<'a> Display for ParseBuffer<'a> {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         Display::fmt(&self.cursor().token_stream(), f)
+     }
+@@ -319,25 +325,22 @@ impl<'a> Debug for ParseBuffer<'a> {
+ /// #
+ /// # fn remainder_after_skipping_past_next_at(
+ /// #     input: ParseStream,
+ /// # ) -> Result<proc_macro2::TokenStream> {
+ /// #     skip_past_next_at(input)?;
+ /// #     input.parse()
+ /// # }
+ /// #
+-/// # fn main() {
+-/// #     use syn::parse::Parser;
+-/// #     let remainder = remainder_after_skipping_past_next_at
+-/// #         .parse_str("a @ b c")
+-/// #         .unwrap();
+-/// #     assert_eq!(remainder.to_string(), "b c");
+-/// # }
++/// # use syn::parse::Parser;
++/// # let remainder = remainder_after_skipping_past_next_at
++/// #     .parse_str("a @ b c")
++/// #     .unwrap();
++/// # assert_eq!(remainder.to_string(), "b c");
+ /// ```
+-#[derive(Copy, Clone)]
+ pub struct StepCursor<'c, 'a> {
+     scope: Span,
+     // This field is covariant in 'c.
+     cursor: Cursor<'c>,
+     // This field is contravariant in 'c. Together these make StepCursor
+     // invariant in 'c. Also covariant in 'a. The user cannot cast 'c to a
+     // different lifetime but can upcast into a StepCursor with a shorter
+     // lifetime 'a.
+@@ -351,16 +354,24 @@ pub struct StepCursor<'c, 'a> {
+ impl<'c, 'a> Deref for StepCursor<'c, 'a> {
+     type Target = Cursor<'c>;
+ 
+     fn deref(&self) -> &Self::Target {
+         &self.cursor
+     }
+ }
+ 
++impl<'c, 'a> Copy for StepCursor<'c, 'a> {}
++
++impl<'c, 'a> Clone for StepCursor<'c, 'a> {
++    fn clone(&self) -> Self {
++        *self
++    }
++}
++
+ impl<'c, 'a> StepCursor<'c, 'a> {
+     /// Triggers an error at the current position of the parse stream.
+     ///
+     /// The `ParseStream::step` invocation will return this same error without
+     /// advancing the stream state.
+     pub fn error<T: Display>(self, message: T) -> Error {
+         error::new_at(self.scope, self.cursor, message)
+     }
+@@ -370,46 +381,91 @@ pub(crate) fn advance_step_cursor<'c, 'a
+     // Refer to the comments within the StepCursor definition. We use the
+     // fact that a StepCursor<'c, 'a> exists as proof that 'c outlives 'a.
+     // Cursor is covariant in its lifetime parameter so we can cast a
+     // Cursor<'c> to one with the shorter lifetime Cursor<'a>.
+     let _ = proof;
+     unsafe { mem::transmute::<Cursor<'c>, Cursor<'a>>(to) }
+ }
+ 
+-fn skip(input: ParseStream) -> bool {
+-    input
+-        .step(|cursor| {
+-            if let Some((_lifetime, rest)) = cursor.lifetime() {
+-                Ok((true, rest))
+-            } else if let Some((_token, rest)) = cursor.token_tree() {
+-                Ok((true, rest))
+-            } else {
+-                Ok((false, *cursor))
+-            }
+-        })
+-        .unwrap()
+-}
+-
+ pub(crate) fn new_parse_buffer(
+     scope: Span,
+     cursor: Cursor,
+-    unexpected: Rc<Cell<Option<Span>>>,
++    unexpected: Rc<Cell<Unexpected>>,
+ ) -> ParseBuffer {
+     ParseBuffer {
+         scope,
+         // See comment on `cell` in the struct definition.
+         cell: Cell::new(unsafe { mem::transmute::<Cursor, Cursor<'static>>(cursor) }),
+         marker: PhantomData,
+-        unexpected,
++        unexpected: Cell::new(Some(unexpected)),
++    }
++}
++
++pub(crate) enum Unexpected {
++    None,
++    Some(Span),
++    Chain(Rc<Cell<Unexpected>>),
++}
++
++impl Default for Unexpected {
++    fn default() -> Self {
++        Unexpected::None
++    }
++}
++
++impl Clone for Unexpected {
++    fn clone(&self) -> Self {
++        match self {
++            Unexpected::None => Unexpected::None,
++            Unexpected::Some(span) => Unexpected::Some(*span),
++            Unexpected::Chain(next) => Unexpected::Chain(next.clone()),
++        }
+     }
+ }
+ 
+-pub(crate) fn get_unexpected(buffer: &ParseBuffer) -> Rc<Cell<Option<Span>>> {
+-    buffer.unexpected.clone()
++// We call this on Cell<Unexpected> and Cell<Option<T>> where temporarily
++// swapping in a None is cheap.
++fn cell_clone<T: Default + Clone>(cell: &Cell<T>) -> T {
++    let prev = cell.take();
++    let ret = prev.clone();
++    cell.set(prev);
++    ret
++}
++
++fn inner_unexpected(buffer: &ParseBuffer) -> (Rc<Cell<Unexpected>>, Option<Span>) {
++    let mut unexpected = get_unexpected(buffer);
++    loop {
++        match cell_clone(&unexpected) {
++            Unexpected::None => return (unexpected, None),
++            Unexpected::Some(span) => return (unexpected, Some(span)),
++            Unexpected::Chain(next) => unexpected = next,
++        }
++    }
++}
++
++pub(crate) fn get_unexpected(buffer: &ParseBuffer) -> Rc<Cell<Unexpected>> {
++    cell_clone(&buffer.unexpected).unwrap()
++}
++
++fn span_of_unexpected_ignoring_nones(mut cursor: Cursor) -> Option<Span> {
++    if cursor.eof() {
++        return None;
++    }
++    while let Some((inner, _span, rest)) = cursor.group(Delimiter::None) {
++        if let Some(unexpected) = span_of_unexpected_ignoring_nones(inner) {
++            return Some(unexpected);
++        }
++        cursor = rest;
++    }
++    if cursor.eof() {
++        None
++    } else {
++        Some(cursor.span())
++    }
+ }
+ 
+ impl<'a> ParseBuffer<'a> {
+     /// Parses a syntax tree node of type `T`, advancing the position of our
+     /// parse stream past it.
+     pub fn parse<T: Parse>(&self) -> Result<T> {
+         T::parse(self)
+     }
+@@ -561,24 +617,27 @@ impl<'a> ParseBuffer<'a> {
+     ///             input.parse().map(UnionOrMacro::Union)
+     ///         } else {
+     ///             input.parse().map(UnionOrMacro::Macro)
+     ///         }
+     ///     }
+     /// }
+     /// ```
+     pub fn peek2<T: Peek>(&self, token: T) -> bool {
+-        let ahead = self.fork();
+-        skip(&ahead) && ahead.peek(token)
++        let _ = token;
++        self.cursor().skip().map_or(false, T::Token::peek)
+     }
+ 
+     /// Looks at the third-next token in the parse stream.
+     pub fn peek3<T: Peek>(&self, token: T) -> bool {
+-        let ahead = self.fork();
+-        skip(&ahead) && skip(&ahead) && ahead.peek(token)
++        let _ = token;
++        self.cursor()
++            .skip()
++            .and_then(Cursor::skip)
++            .map_or(false, T::Token::peek)
+     }
+ 
+     /// Parses zero or more occurrences of `T` separated by punctuation of type
+     /// `P`, with optional trailing punctuation.
+     ///
+     /// Parsing continues until the end of this parse stream. The entire content
+     /// of this parse stream must consist of `T` and `P`.
+     ///
+@@ -610,22 +669,20 @@ impl<'a> ParseBuffer<'a> {
+     ///             ident: input.parse()?,
+     ///             paren_token: parenthesized!(content in input),
+     ///             fields: content.parse_terminated(Type::parse)?,
+     ///             semi_token: input.parse()?,
+     ///         })
+     ///     }
+     /// }
+     /// #
+-    /// # fn main() {
+-    /// #     let input = quote! {
+-    /// #         struct S(A, B);
+-    /// #     };
+-    /// #     syn::parse2::<TupleStruct>(input).unwrap();
+-    /// # }
++    /// # let input = quote! {
++    /// #     struct S(A, B);
++    /// # };
++    /// # syn::parse2::<TupleStruct>(input).unwrap();
+     /// ```
+     pub fn parse_terminated<T, P: Parse>(
+         &self,
+         parser: fn(ParseStream) -> Result<T>,
+     ) -> Result<Punctuated<T, P>> {
+         Punctuated::parse_terminated_with(self, parser)
+     }
+ 
+@@ -842,18 +899,18 @@ impl<'a> ParseBuffer<'a> {
+     /// }
+     /// ```
+     pub fn fork(&self) -> Self {
+         ParseBuffer {
+             scope: self.scope,
+             cell: self.cell.clone(),
+             marker: PhantomData,
+             // Not the parent's unexpected. Nothing cares whether the clone
+-            // parses all the way.
+-            unexpected: Rc::new(Cell::new(None)),
++            // parses all the way unless we `advance_to`.
++            unexpected: Cell::new(Some(Rc::new(Cell::new(Unexpected::None)))),
+         }
+     }
+ 
+     /// Triggers an error at the current position of the parse stream.
+     ///
+     /// # Example
+     ///
+     /// ```
+@@ -918,23 +975,21 @@ impl<'a> ParseBuffer<'a> {
+     /// #
+     /// # fn remainder_after_skipping_past_next_at(
+     /// #     input: ParseStream,
+     /// # ) -> Result<proc_macro2::TokenStream> {
+     /// #     skip_past_next_at(input)?;
+     /// #     input.parse()
+     /// # }
+     /// #
+-    /// # fn main() {
+-    /// #     use syn::parse::Parser;
+-    /// #     let remainder = remainder_after_skipping_past_next_at
+-    /// #         .parse_str("a @ b c")
+-    /// #         .unwrap();
+-    /// #     assert_eq!(remainder.to_string(), "b c");
+-    /// # }
++    /// # use syn::parse::Parser;
++    /// # let remainder = remainder_after_skipping_past_next_at
++    /// #     .parse_str("a @ b c")
++    /// #     .unwrap();
++    /// # assert_eq!(remainder.to_string(), "b c");
+     /// ```
+     pub fn step<F, R>(&self, function: F) -> Result<R>
+     where
+         F: for<'c> FnOnce(StepCursor<'c, 'a>) -> Result<(R, Cursor<'c>)>,
+     {
+         // Since the user's function is required to work for any 'c, we know
+         // that the Cursor<'c> they return is either derived from the input
+         // StepCursor<'c, 'a> or from a Cursor<'static>.
+@@ -956,27 +1011,39 @@ impl<'a> ParseBuffer<'a> {
+             scope: self.scope,
+             cursor: self.cell.get(),
+             marker: PhantomData,
+         })?;
+         self.cell.set(rest);
+         Ok(node)
+     }
+ 
++    /// Returns the `Span` of the next token in the parse stream, or
++    /// `Span::call_site()` if this parse stream has completely exhausted its
++    /// input `TokenStream`.
++    pub fn span(&self) -> Span {
++        let cursor = self.cursor();
++        if cursor.eof() {
++            self.scope
++        } else {
++            crate::buffer::open_span_of_group(cursor)
++        }
++    }
++
+     /// Provides low-level access to the token representation underlying this
+     /// parse stream.
+     ///
+     /// Cursors are immutable so no operations you perform against the cursor
+     /// will affect the state of this parse stream.
+     pub fn cursor(&self) -> Cursor<'a> {
+         self.cell.get()
+     }
+ 
+     fn check_unexpected(&self) -> Result<()> {
+-        match self.unexpected.get() {
++        match inner_unexpected(self).1 {
+             Some(span) => Err(Error::new(span, "unexpected token")),
+             None => Ok(()),
+         }
+     }
+ }
+ 
+ impl<T: Parse> Parse for Box<T> {
+     fn parse(input: ParseStream) -> Result<Self> {
+@@ -1043,32 +1110,32 @@ impl Parse for Literal {
+ }
+ 
+ /// 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]: self
+ ///
+-/// *This trait is available if Syn is built with the `"parsing"` feature.*
++/// *This trait is available only 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.
+     ///
+     /// This function will check that the input is fully parsed. If there are
+     /// any unparsed tokens at the end of the stream, an error is returned.
+     fn parse2(self, tokens: TokenStream) -> Result<Self::Output>;
+ 
+     /// Parse tokens of source code into the chosen syntax tree node.
+     ///
+     /// This function will check that the input is fully parsed. If there are
+     /// any unparsed tokens at the end of the stream, an error is returned.
+     ///
+-    /// *This method is available if Syn is built with both the `"parsing"` and
++    /// *This method is available only if Syn is built with both the `"parsing"` and
+     /// `"proc-macro"` features.*
+     #[cfg(all(
+         not(all(target_arch = "wasm32", any(target_os = "unknown", target_os = "wasi"))),
+         feature = "proc-macro"
+     ))]
+     fn parse(self, tokens: proc_macro::TokenStream) -> Result<Self::Output> {
+         self.parse2(proc_macro2::TokenStream::from(tokens))
+     }
+@@ -1083,90 +1150,96 @@ pub trait Parser: Sized {
+     /// 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> {
+         self.parse2(proc_macro2::TokenStream::from_str(s)?)
+     }
+ 
+     // Not public API.
+     #[doc(hidden)]
++    #[cfg(any(feature = "full", feature = "derive"))]
+     fn __parse_scoped(self, scope: Span, tokens: TokenStream) -> Result<Self::Output> {
+         let _ = scope;
+         self.parse2(tokens)
+     }
+ 
+     // Not public API.
+     #[doc(hidden)]
++    #[cfg(any(feature = "full", feature = "derive"))]
+     fn __parse_stream(self, input: ParseStream) -> Result<Self::Output> {
+         input.parse().and_then(|tokens| self.parse2(tokens))
+     }
+ }
+ 
+ fn tokens_to_parse_buffer(tokens: &TokenBuffer) -> ParseBuffer {
+     let scope = Span::call_site();
+     let cursor = tokens.begin();
+-    let unexpected = Rc::new(Cell::new(None));
++    let unexpected = Rc::new(Cell::new(Unexpected::None));
+     new_parse_buffer(scope, cursor, unexpected)
+ }
+ 
+ impl<F, T> Parser for F
+ where
+     F: FnOnce(ParseStream) -> Result<T>,
+ {
+     type Output = T;
+ 
+     fn parse2(self, tokens: TokenStream) -> Result<T> {
+         let buf = TokenBuffer::new2(tokens);
+         let state = tokens_to_parse_buffer(&buf);
+         let node = self(&state)?;
+         state.check_unexpected()?;
+-        if state.is_empty() {
++        if let Some(unexpected_span) = span_of_unexpected_ignoring_nones(state.cursor()) {
++            Err(Error::new(unexpected_span, "unexpected token"))
++        } else {
+             Ok(node)
+-        } else {
+-            Err(state.error("unexpected token"))
+         }
+     }
+ 
+     #[doc(hidden)]
++    #[cfg(any(feature = "full", feature = "derive"))]
+     fn __parse_scoped(self, scope: Span, tokens: TokenStream) -> Result<Self::Output> {
+         let buf = TokenBuffer::new2(tokens);
+         let cursor = buf.begin();
+-        let unexpected = Rc::new(Cell::new(None));
++        let unexpected = Rc::new(Cell::new(Unexpected::None));
+         let state = new_parse_buffer(scope, cursor, unexpected);
+         let node = self(&state)?;
+         state.check_unexpected()?;
+-        if state.is_empty() {
++        if let Some(unexpected_span) = span_of_unexpected_ignoring_nones(state.cursor()) {
++            Err(Error::new(unexpected_span, "unexpected token"))
++        } else {
+             Ok(node)
+-        } else {
+-            Err(state.error("unexpected token"))
+         }
+     }
+ 
+     #[doc(hidden)]
++    #[cfg(any(feature = "full", feature = "derive"))]
+     fn __parse_stream(self, input: ParseStream) -> Result<Self::Output> {
+         self(input)
+     }
+ }
+ 
++#[cfg(any(feature = "full", feature = "derive"))]
+ pub(crate) fn parse_scoped<F: Parser>(f: F, scope: Span, tokens: TokenStream) -> Result<F::Output> {
+     f.__parse_scoped(scope, tokens)
+ }
+ 
++#[cfg(any(feature = "full", feature = "derive"))]
+ pub(crate) fn parse_stream<F: Parser>(f: F, input: ParseStream) -> Result<F::Output> {
+     f.__parse_stream(input)
+ }
+ 
+ /// An empty syntax tree node that consumes no tokens when parsed.
+ ///
+ /// This is useful for attribute macros that want to ensure they are not
+ /// provided any attribute args.
+ ///
+ /// ```
+-/// extern crate proc_macro;
+-///
++/// # extern crate proc_macro;
++/// #
+ /// use proc_macro::TokenStream;
+ /// use syn::parse_macro_input;
+ /// use syn::parse::Nothing;
+ ///
+ /// # const IGNORE: &str = stringify! {
+ /// #[proc_macro_attribute]
+ /// # };
+ /// pub fn my_attr(args: TokenStream, input: TokenStream) -> TokenStream {
+diff --git a/third_party/rust/syn/src/parse_macro_input.rs b/third_party/rust/syn/src/parse_macro_input.rs
+--- a/third_party/rust/syn/src/parse_macro_input.rs
++++ b/third_party/rust/syn/src/parse_macro_input.rs
+@@ -11,18 +11,18 @@
+ /// # Intended usage
+ ///
+ /// This macro must be called from a function that returns
+ /// `proc_macro::TokenStream`. Usually this will be your proc macro entry point,
+ /// the function that has the #\[proc_macro\] / #\[proc_macro_derive\] /
+ /// #\[proc_macro_attribute\] attribute.
+ ///
+ /// ```
+-/// extern crate proc_macro;
+-///
++/// # extern crate proc_macro;
++/// #
+ /// use proc_macro::TokenStream;
+ /// use syn::{parse_macro_input, Result};
+ /// use syn::parse::{Parse, ParseStream};
+ ///
+ /// struct MyMacroInput {
+ ///     /* ... */
+ /// }
+ ///
+@@ -38,28 +38,52 @@
+ /// # };
+ /// pub fn my_macro(tokens: TokenStream) -> TokenStream {
+ ///     let input = parse_macro_input!(tokens as MyMacroInput);
+ ///
+ ///     /* ... */
+ /// #   "".parse().unwrap()
+ /// }
+ /// ```
+-#[macro_export(local_inner_macros)]
++///
++/// <br>
++///
++/// # Expansion
++///
++/// `parse_macro_input!($variable as $Type)` expands to something like:
++///
++/// ```no_run
++/// # extern crate proc_macro;
++/// #
++/// # macro_rules! doc_test {
++/// #     ($variable:ident as $Type:ty) => {
++/// match syn::parse::<$Type>($variable) {
++///     Ok(syntax_tree) => syntax_tree,
++///     Err(err) => return proc_macro::TokenStream::from(err.to_compile_error()),
++/// }
++/// #     };
++/// # }
++/// #
++/// # fn test(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
++/// #     let _ = doc_test!(input as syn::Ident);
++/// #     proc_macro::TokenStream::new()
++/// # }
++/// ```
++#[macro_export]
+ macro_rules! parse_macro_input {
+     ($tokenstream:ident as $ty:ty) => {
+         match $crate::parse_macro_input::parse::<$ty>($tokenstream) {
+             $crate::export::Ok(data) => data,
+             $crate::export::Err(err) => {
+                 return $crate::export::TokenStream::from(err.to_compile_error());
+             }
+         }
+     };
+     ($tokenstream:ident) => {
+-        parse_macro_input!($tokenstream as _)
++        $crate::parse_macro_input!($tokenstream as _)
+     };
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ // Can parse any type that implements Parse.
+ 
+ use crate::parse::{Parse, ParseStream, Parser, Result};
+ use proc_macro::TokenStream;
+diff --git a/third_party/rust/syn/src/parse_quote.rs b/third_party/rust/syn/src/parse_quote.rs
+--- a/third_party/rust/syn/src/parse_quote.rs
++++ b/third_party/rust/syn/src/parse_quote.rs
+@@ -19,17 +19,17 @@
+ ///     let stmt: Stmt = parse_quote! {
+ ///         let #name: #ty = Default::default();
+ ///     };
+ ///
+ ///     println!("{:#?}", stmt);
+ /// }
+ /// ```
+ ///
+-/// *This macro is available if Syn is built with the `"parsing"` feature,
++/// *This macro is available only 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.
+ ///
+@@ -51,28 +51,30 @@
+ ///
+ /// This macro can parse the following additional types as a special case even
+ /// though they do not implement the `Parse` 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
++/// - [`Vec<Stmt>`] — parses the same as `Block::parse_within`
+ ///
+ /// [`Punctuated<T, P>`]: punctuated::Punctuated
++/// [`Vec<Stmt>`]: Block::parse_within
+ ///
+ /// # 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.
+ //
+ // TODO: allow Punctuated to be inferred as intra doc link, currently blocked on
+ // https://github.com/rust-lang/rust/issues/62834
+-#[macro_export(local_inner_macros)]
++#[macro_export]
+ macro_rules! parse_quote {
+     ($($tt:tt)*) => {
+         $crate::parse_quote::parse(
+             $crate::export::From::from(
+                 $crate::export::quote::quote!($($tt)*)
+             )
+         )
+     };
+@@ -107,16 +109,18 @@ impl<T: Parse> ParseQuote for T {
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ // Any other types that we want `parse_quote!` to be able to parse.
+ 
+ use crate::punctuated::Punctuated;
+ #[cfg(any(feature = "full", feature = "derive"))]
+ use crate::{attr, Attribute};
++#[cfg(feature = "full")]
++use crate::{Block, Stmt};
+ 
+ #[cfg(any(feature = "full", feature = "derive"))]
+ impl ParseQuote for Attribute {
+     fn parse(input: ParseStream) -> Result<Self> {
+         if input.peek(Token![#]) && input.peek2(Token![!]) {
+             attr::parsing::single_parse_inner(input)
+         } else {
+             attr::parsing::single_parse_outer(input)
+@@ -124,8 +128,15 @@ impl ParseQuote for Attribute {
+     }
+ }
+ 
+ impl<T: Parse, P: Parse> ParseQuote for Punctuated<T, P> {
+     fn parse(input: ParseStream) -> Result<Self> {
+         Self::parse_terminated(input)
+     }
+ }
++
++#[cfg(feature = "full")]
++impl ParseQuote for Vec<Stmt> {
++    fn parse(input: ParseStream) -> Result<Self> {
++        Block::parse_within(input)
++    }
++}
+diff --git a/third_party/rust/syn/src/pat.rs b/third_party/rust/syn/src/pat.rs
+--- a/third_party/rust/syn/src/pat.rs
++++ b/third_party/rust/syn/src/pat.rs
+@@ -1,31 +1,27 @@
+ use super::*;
+ use crate::punctuated::Punctuated;
+-#[cfg(feature = "extra-traits")]
+-use crate::tt::TokenStreamHelper;
+ use proc_macro2::TokenStream;
+-#[cfg(feature = "extra-traits")]
+-use std::hash::{Hash, Hasher};
+ 
+ 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.*
++    /// *This type is available only 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
+     //
+     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
+     // blocked on https://github.com/rust-lang/rust/issues/62833
+-    pub enum Pat #manual_extra_traits {
++    pub enum Pat {
+         /// A box pattern: `box v`.
+         Box(PatBox),
+ 
+         /// A pattern that binds a new variable: `ref mut binding @ SUBPATTERN`.
+         Ident(PatIdent),
+ 
+         /// A literal pattern: `0`.
+         ///
+@@ -81,321 +77,219 @@ ast_enum_of_structs! {
+         #[doc(hidden)]
+         __Nonexhaustive,
+     }
+ }
+ 
+ ast_struct! {
+     /// A box pattern: `box v`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatBox {
+         pub attrs: Vec<Attribute>,
+         pub box_token: Token![box],
+         pub pat: Box<Pat>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A pattern that binds a new variable: `ref mut binding @ SUBPATTERN`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// It may also be a unit struct or struct variant (e.g. `None`), or a
++    /// constant; these cannot be distinguished syntactically.
++    ///
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatIdent {
+         pub attrs: Vec<Attribute>,
+         pub by_ref: Option<Token![ref]>,
+         pub mutability: Option<Token![mut]>,
+         pub ident: Ident,
+         pub subpat: Option<(Token![@], Box<Pat>)>,
+     }
+ }
+ 
+ ast_struct! {
+     /// 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.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatLit {
+         pub attrs: Vec<Attribute>,
+         pub expr: Box<Expr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A macro in pattern position.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatMacro {
+         pub attrs: Vec<Attribute>,
+         pub mac: Macro,
+     }
+ }
+ 
+ ast_struct! {
+     /// A pattern that matches any one of a set of cases.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatOr {
+         pub attrs: Vec<Attribute>,
+         pub leading_vert: Option<Token![|]>,
+         pub cases: Punctuated<Pat, Token![|]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A path pattern like `Color::Red`, optionally qualified with a
+     /// self-type.
+     ///
+     /// Unqualified path patterns can legally refer to variants, structs,
+     /// constants or associated constants. Qualified 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.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatPath {
+         pub attrs: Vec<Attribute>,
+         pub qself: Option<QSelf>,
+         pub path: Path,
+     }
+ }
+ 
+ ast_struct! {
+     /// A range pattern: `1..=2`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatRange {
+         pub attrs: Vec<Attribute>,
+         pub lo: Box<Expr>,
+         pub limits: RangeLimits,
+         pub hi: Box<Expr>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A reference pattern: `&mut var`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatReference {
+         pub attrs: Vec<Attribute>,
+         pub and_token: Token![&],
+         pub mutability: Option<Token![mut]>,
+         pub pat: Box<Pat>,
+     }
+ }
+ 
+ ast_struct! {
+     /// The dots in a tuple or slice pattern: `[0, 1, ..]`
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatRest {
+         pub attrs: Vec<Attribute>,
+         pub dot2_token: Token![..],
+     }
+ }
+ 
+ ast_struct! {
+     /// A dynamically sized slice pattern: `[a, b, ref i @ .., y, z]`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatSlice {
+         pub attrs: Vec<Attribute>,
+         pub bracket_token: token::Bracket,
+         pub elems: Punctuated<Pat, Token![,]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A struct or struct variant pattern: `Variant { x, y, .. }`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatStruct {
+         pub attrs: Vec<Attribute>,
+         pub path: Path,
+         pub brace_token: token::Brace,
+         pub fields: Punctuated<FieldPat, Token![,]>,
+         pub dot2_token: Option<Token![..]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A tuple pattern: `(a, b)`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatTuple {
+         pub attrs: Vec<Attribute>,
+         pub paren_token: token::Paren,
+         pub elems: Punctuated<Pat, Token![,]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A tuple struct or tuple variant pattern: `Variant(x, y, .., z)`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatTupleStruct {
+         pub attrs: Vec<Attribute>,
+         pub path: Path,
+         pub pat: PatTuple,
+     }
+ }
+ 
+ ast_struct! {
+     /// A type ascription pattern: `foo: f64`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatType {
+         pub attrs: Vec<Attribute>,
+         pub pat: Box<Pat>,
+         pub colon_token: Token![:],
+         pub ty: Box<Type>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A pattern that matches any value: `_`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct PatWild {
+         pub attrs: Vec<Attribute>,
+         pub underscore_token: Token![_],
+     }
+ }
+ 
+ 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.*
++    /// *This type is available only 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(feature = "extra-traits")]
+-impl Eq for Pat {}
+-
+-#[cfg(feature = "extra-traits")]
+-impl PartialEq for Pat {
+-    fn eq(&self, other: &Self) -> bool {
+-        match (self, other) {
+-            (Pat::Box(this), Pat::Box(other)) => this == other,
+-            (Pat::Ident(this), Pat::Ident(other)) => this == other,
+-            (Pat::Lit(this), Pat::Lit(other)) => this == other,
+-            (Pat::Macro(this), Pat::Macro(other)) => this == other,
+-            (Pat::Or(this), Pat::Or(other)) => this == other,
+-            (Pat::Path(this), Pat::Path(other)) => this == other,
+-            (Pat::Range(this), Pat::Range(other)) => this == other,
+-            (Pat::Reference(this), Pat::Reference(other)) => this == other,
+-            (Pat::Rest(this), Pat::Rest(other)) => this == other,
+-            (Pat::Slice(this), Pat::Slice(other)) => this == other,
+-            (Pat::Struct(this), Pat::Struct(other)) => this == other,
+-            (Pat::Tuple(this), Pat::Tuple(other)) => this == other,
+-            (Pat::TupleStruct(this), Pat::TupleStruct(other)) => this == other,
+-            (Pat::Type(this), Pat::Type(other)) => this == other,
+-            (Pat::Verbatim(this), Pat::Verbatim(other)) => {
+-                TokenStreamHelper(this) == TokenStreamHelper(other)
+-            }
+-            (Pat::Wild(this), Pat::Wild(other)) => this == other,
+-            _ => false,
+-        }
+-    }
+-}
+-
+-#[cfg(feature = "extra-traits")]
+-impl Hash for Pat {
+-    fn hash<H>(&self, hash: &mut H)
+-    where
+-        H: Hasher,
+-    {
+-        match self {
+-            Pat::Box(pat) => {
+-                hash.write_u8(0);
+-                pat.hash(hash);
+-            }
+-            Pat::Ident(pat) => {
+-                hash.write_u8(1);
+-                pat.hash(hash);
+-            }
+-            Pat::Lit(pat) => {
+-                hash.write_u8(2);
+-                pat.hash(hash);
+-            }
+-            Pat::Macro(pat) => {
+-                hash.write_u8(3);
+-                pat.hash(hash);
+-            }
+-            Pat::Or(pat) => {
+-                hash.write_u8(4);
+-                pat.hash(hash);
+-            }
+-            Pat::Path(pat) => {
+-                hash.write_u8(5);
+-                pat.hash(hash);
+-            }
+-            Pat::Range(pat) => {
+-                hash.write_u8(6);
+-                pat.hash(hash);
+-            }
+-            Pat::Reference(pat) => {
+-                hash.write_u8(7);
+-                pat.hash(hash);
+-            }
+-            Pat::Rest(pat) => {
+-                hash.write_u8(8);
+-                pat.hash(hash);
+-            }
+-            Pat::Slice(pat) => {
+-                hash.write_u8(9);
+-                pat.hash(hash);
+-            }
+-            Pat::Struct(pat) => {
+-                hash.write_u8(10);
+-                pat.hash(hash);
+-            }
+-            Pat::Tuple(pat) => {
+-                hash.write_u8(11);
+-                pat.hash(hash);
+-            }
+-            Pat::TupleStruct(pat) => {
+-                hash.write_u8(12);
+-                pat.hash(hash);
+-            }
+-            Pat::Type(pat) => {
+-                hash.write_u8(13);
+-                pat.hash(hash);
+-            }
+-            Pat::Verbatim(pat) => {
+-                hash.write_u8(14);
+-                TokenStreamHelper(pat).hash(hash);
+-            }
+-            Pat::Wild(pat) => {
+-                hash.write_u8(15);
+-                pat.hash(hash);
+-            }
+-            Pat::__Nonexhaustive => unreachable!(),
+-        }
+-    }
+-}
+-
+ #[cfg(feature = "parsing")]
+-mod parsing {
++pub mod parsing {
+     use super::*;
+ 
+     use crate::ext::IdentExt;
+-    use crate::parse::{Parse, ParseStream, Result};
++    use crate::parse::{Parse, ParseBuffer, ParseStream, Result};
+     use crate::path;
+ 
+     impl Parse for Pat {
+         fn parse(input: ParseStream) -> Result<Self> {
++            let begin = input.fork();
+             let lookahead = input.lookahead1();
+             if lookahead.peek(Ident)
+                 && ({
+                     input.peek2(Token![::])
+                         || input.peek2(Token![!])
+                         || input.peek2(token::Brace)
+                         || input.peek2(token::Paren)
+                         || input.peek2(Token![..])
+@@ -406,17 +300,16 @@ mod parsing {
+                                 ahead.is_empty() || ahead.peek(Token![,])
+                             }
+                 })
+                 || input.peek(Token![self]) && input.peek2(Token![::])
+                 || lookahead.peek(Token![::])
+                 || lookahead.peek(Token![<])
+                 || input.peek(Token![Self])
+                 || input.peek(Token![super])
+-                || input.peek(Token![extern])
+                 || input.peek(Token![crate])
+             {
+                 pat_path_or_macro_or_struct_or_range(input)
+             } else if lookahead.peek(Token![_]) {
+                 input.call(pat_wild).map(Pat::Wild)
+             } else if input.peek(Token![box]) {
+                 input.call(pat_box).map(Pat::Box)
+             } else if input.peek(Token![-]) || lookahead.peek(Lit) {
+@@ -429,28 +322,29 @@ mod parsing {
+                 input.call(pat_ident).map(Pat::Ident)
+             } else if lookahead.peek(Token![&]) {
+                 input.call(pat_reference).map(Pat::Reference)
+             } else if lookahead.peek(token::Paren) {
+                 input.call(pat_tuple).map(Pat::Tuple)
+             } else if lookahead.peek(token::Bracket) {
+                 input.call(pat_slice).map(Pat::Slice)
+             } else if lookahead.peek(Token![..]) && !input.peek(Token![...]) {
+-                input.call(pat_rest).map(Pat::Rest)
++                pat_range_half_open(input, begin)
+             } else {
+                 Err(lookahead.error())
+             }
+         }
+     }
+ 
+     fn pat_path_or_macro_or_struct_or_range(input: ParseStream) -> Result<Pat> {
++        let begin = input.fork();
+         let (qself, path) = path::parsing::qpath(input, true)?;
+ 
+         if input.peek(Token![..]) {
+-            return pat_range(input, qself, path).map(Pat::Range);
++            return pat_range(input, begin, qself, path);
+         }
+ 
+         if qself.is_some() {
+             return Ok(Pat::Path(PatPath {
+                 attrs: Vec::new(),
+                 qself,
+                 path,
+             }));
+@@ -482,17 +376,17 @@ mod parsing {
+             }
+         }
+ 
+         if input.peek(token::Brace) {
+             pat_struct(input, path).map(Pat::Struct)
+         } else if input.peek(token::Paren) {
+             pat_tuple_struct(input, path).map(Pat::TupleStruct)
+         } else if input.peek(Token![..]) {
+-            pat_range(input, qself, path).map(Pat::Range)
++            pat_range(input, begin, qself, path)
+         } else {
+             Ok(Pat::Path(PatPath {
+                 attrs: Vec::new(),
+                 qself,
+                 path,
+             }))
+         }
+     }
+@@ -541,17 +435,17 @@ mod parsing {
+     fn pat_struct(input: ParseStream, path: Path) -> Result<PatStruct> {
+         let content;
+         let brace_token = braced!(content in input);
+ 
+         let mut fields = Punctuated::new();
+         while !content.is_empty() && !content.peek(Token![..]) {
+             let value = content.call(field_pat)?;
+             fields.push_value(value);
+-            if !content.peek(Token![,]) {
++            if content.is_empty() {
+                 break;
+             }
+             let punct: Token![,] = content.parse()?;
+             fields.push_punct(punct);
+         }
+ 
+         let dot2_token = if fields.empty_or_trailing() && content.peek(Token![..]) {
+             Some(content.parse()?)
+@@ -573,29 +467,30 @@ mod parsing {
+             match *self {
+                 Member::Named(_) => false,
+                 Member::Unnamed(_) => true,
+             }
+         }
+     }
+ 
+     fn field_pat(input: ParseStream) -> Result<FieldPat> {
++        let attrs = input.call(Attribute::parse_outer)?;
+         let boxed: Option<Token![box]> = input.parse()?;
+         let by_ref: Option<Token![ref]> = input.parse()?;
+         let mutability: Option<Token![mut]> = input.parse()?;
+         let member: Member = input.parse()?;
+ 
+         if boxed.is_none() && by_ref.is_none() && mutability.is_none() && input.peek(Token![:])
+             || member.is_unnamed()
+         {
+             return Ok(FieldPat {
+-                attrs: Vec::new(),
++                attrs,
+                 member,
+                 colon_token: input.parse()?,
+-                pat: input.parse()?,
++                pat: Box::new(multi_pat(input)?),
+             });
+         }
+ 
+         let ident = match member {
+             Member::Named(ident) => ident,
+             Member::Unnamed(_) => unreachable!(),
+         };
+ 
+@@ -605,49 +500,76 @@ mod parsing {
+             mutability,
+             ident: ident.clone(),
+             subpat: None,
+         });
+ 
+         if let Some(boxed) = boxed {
+             pat = Pat::Box(PatBox {
+                 attrs: Vec::new(),
++                box_token: boxed,
+                 pat: Box::new(pat),
+-                box_token: boxed,
+             });
+         }
+ 
+         Ok(FieldPat {
++            attrs,
+             member: Member::Named(ident),
++            colon_token: None,
+             pat: Box::new(pat),
+-            attrs: Vec::new(),
+-            colon_token: None,
+         })
+     }
+ 
+-    fn pat_range(input: ParseStream, qself: Option<QSelf>, path: Path) -> Result<PatRange> {
+-        Ok(PatRange {
+-            attrs: Vec::new(),
+-            lo: Box::new(Expr::Path(ExprPath {
++    fn pat_range(
++        input: ParseStream,
++        begin: ParseBuffer,
++        qself: Option<QSelf>,
++        path: Path,
++    ) -> Result<Pat> {
++        let limits: RangeLimits = input.parse()?;
++        let hi = input.call(pat_lit_expr)?;
++        if let Some(hi) = hi {
++            Ok(Pat::Range(PatRange {
+                 attrs: Vec::new(),
+-                qself,
+-                path,
+-            })),
+-            limits: input.parse()?,
+-            hi: input.call(pat_lit_expr)?,
+-        })
++                lo: Box::new(Expr::Path(ExprPath {
++                    attrs: Vec::new(),
++                    qself,
++                    path,
++                })),
++                limits,
++                hi,
++            }))
++        } else {
++            Ok(Pat::Verbatim(verbatim::between(begin, input)))
++        }
++    }
++
++    fn pat_range_half_open(input: ParseStream, begin: ParseBuffer) -> Result<Pat> {
++        let limits: RangeLimits = input.parse()?;
++        let hi = input.call(pat_lit_expr)?;
++        if hi.is_some() {
++            Ok(Pat::Verbatim(verbatim::between(begin, input)))
++        } else {
++            match limits {
++                RangeLimits::HalfOpen(dot2_token) => Ok(Pat::Rest(PatRest {
++                    attrs: Vec::new(),
++                    dot2_token,
++                })),
++                RangeLimits::Closed(_) => Err(input.error("expected range upper bound")),
++            }
++        }
+     }
+ 
+     fn pat_tuple(input: ParseStream) -> Result<PatTuple> {
+         let content;
+         let paren_token = parenthesized!(content in input);
+ 
+         let mut elems = Punctuated::new();
+         while !content.is_empty() {
+-            let value: Pat = content.parse()?;
++            let value = multi_pat(&content)?;
+             elems.push_value(value);
+             if content.is_empty() {
+                 break;
+             }
+             let punct = content.parse()?;
+             elems.push_punct(punct);
+         }
+ 
+@@ -663,225 +585,280 @@ mod parsing {
+             attrs: Vec::new(),
+             and_token: input.parse()?,
+             mutability: input.parse()?,
+             pat: input.parse()?,
+         })
+     }
+ 
+     fn pat_lit_or_range(input: ParseStream) -> Result<Pat> {
+-        let lo = input.call(pat_lit_expr)?;
++        let begin = input.fork();
++        let lo = input.call(pat_lit_expr)?.unwrap();
+         if input.peek(Token![..]) {
+-            Ok(Pat::Range(PatRange {
+-                attrs: Vec::new(),
+-                lo,
+-                limits: input.parse()?,
+-                hi: input.call(pat_lit_expr)?,
+-            }))
++            let limits: RangeLimits = input.parse()?;
++            let hi = input.call(pat_lit_expr)?;
++            if let Some(hi) = hi {
++                Ok(Pat::Range(PatRange {
++                    attrs: Vec::new(),
++                    lo,
++                    limits,
++                    hi,
++                }))
++            } else {
++                Ok(Pat::Verbatim(verbatim::between(begin, input)))
++            }
+         } else {
+             Ok(Pat::Lit(PatLit {
+                 attrs: Vec::new(),
+                 expr: lo,
+             }))
+         }
+     }
+ 
+-    fn pat_lit_expr(input: ParseStream) -> Result<Box<Expr>> {
++    fn pat_lit_expr(input: ParseStream) -> Result<Option<Box<Expr>>> {
++        if input.is_empty()
++            || input.peek(Token![|])
++            || input.peek(Token![=>])
++            || input.peek(Token![:]) && !input.peek(Token![::])
++            || input.peek(Token![,])
++            || input.peek(Token![;])
++        {
++            return Ok(None);
++        }
++
+         let neg: Option<Token![-]> = input.parse()?;
+ 
+         let lookahead = input.lookahead1();
+         let expr = if lookahead.peek(Lit) {
+             Expr::Lit(input.parse()?)
+         } else if lookahead.peek(Ident)
+             || lookahead.peek(Token![::])
+             || lookahead.peek(Token![<])
+             || lookahead.peek(Token![self])
+             || lookahead.peek(Token![Self])
+             || lookahead.peek(Token![super])
+-            || lookahead.peek(Token![extern])
+             || lookahead.peek(Token![crate])
+         {
+             Expr::Path(input.parse()?)
+         } else {
+             return Err(lookahead.error());
+         };
+ 
+-        Ok(Box::new(if let Some(neg) = neg {
++        Ok(Some(Box::new(if let Some(neg) = neg {
+             Expr::Unary(ExprUnary {
+                 attrs: Vec::new(),
+                 op: UnOp::Neg(neg),
+                 expr: Box::new(expr),
+             })
+         } else {
+             expr
+-        }))
++        })))
+     }
+ 
+     fn pat_slice(input: ParseStream) -> Result<PatSlice> {
+         let content;
+         let bracket_token = bracketed!(content in input);
+ 
+         let mut elems = Punctuated::new();
+         while !content.is_empty() {
+-            let value: Pat = content.parse()?;
++            let value = multi_pat(&content)?;
+             elems.push_value(value);
+             if content.is_empty() {
+                 break;
+             }
+             let punct = content.parse()?;
+             elems.push_punct(punct);
+         }
+ 
+         Ok(PatSlice {
+             attrs: Vec::new(),
+             bracket_token,
+             elems,
+         })
+     }
+ 
+-    fn pat_rest(input: ParseStream) -> Result<PatRest> {
+-        Ok(PatRest {
+-            attrs: Vec::new(),
+-            dot2_token: input.parse()?,
+-        })
++    pub fn multi_pat(input: ParseStream) -> Result<Pat> {
++        multi_pat_impl(input, None)
++    }
++
++    pub fn multi_pat_with_leading_vert(input: ParseStream) -> Result<Pat> {
++        let leading_vert: Option<Token![|]> = input.parse()?;
++        multi_pat_impl(input, leading_vert)
++    }
++
++    fn multi_pat_impl(input: ParseStream, leading_vert: Option<Token![|]>) -> Result<Pat> {
++        let mut pat: Pat = input.parse()?;
++        if leading_vert.is_some()
++            || input.peek(Token![|]) && !input.peek(Token![||]) && !input.peek(Token![|=])
++        {
++            let mut cases = Punctuated::new();
++            cases.push_value(pat);
++            while input.peek(Token![|]) && !input.peek(Token![||]) && !input.peek(Token![|=]) {
++                let punct = input.parse()?;
++                cases.push_punct(punct);
++                let pat: Pat = input.parse()?;
++                cases.push_value(pat);
++            }
++            pat = Pat::Or(PatOr {
++                attrs: Vec::new(),
++                leading_vert,
++                cases,
++            });
++        }
++        Ok(pat)
+     }
+ }
+ 
+ #[cfg(feature = "printing")]
+ mod printing {
+     use super::*;
+ 
+     use proc_macro2::TokenStream;
+     use quote::{ToTokens, TokenStreamExt};
+ 
+     use crate::attr::FilterAttrs;
+ 
+     impl ToTokens for PatWild {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             self.underscore_token.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for PatIdent {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             self.by_ref.to_tokens(tokens);
+             self.mutability.to_tokens(tokens);
+             self.ident.to_tokens(tokens);
+             if let Some((at_token, subpat)) = &self.subpat {
+                 at_token.to_tokens(tokens);
+                 subpat.to_tokens(tokens);
+             }
+         }
+     }
+ 
+     impl ToTokens for PatStruct {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             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);
+             });
+         }
+     }
+ 
+     impl ToTokens for PatTupleStruct {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             self.path.to_tokens(tokens);
+             self.pat.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for PatType {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
+             tokens.append_all(self.attrs.outer());
+             self.pat.to_tokens(tokens);
+             self.colon_token.to_tokens(tokens);
+             self.ty.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for PatPath {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             private::print_path(tokens, &self.qself, &self.path);
+         }
+     }
+ 
+     impl ToTokens for PatTuple {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             self.paren_token.surround(tokens, |tokens| {
+                 self.elems.to_tokens(tokens);
+             });
+         }
+     }
+ 
+     impl ToTokens for PatBox {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             self.box_token.to_tokens(tokens);
+             self.pat.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for PatReference {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             self.and_token.to_tokens(tokens);
+             self.mutability.to_tokens(tokens);
+             self.pat.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for PatRest {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             self.dot2_token.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for PatLit {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             self.expr.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for PatRange {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             self.lo.to_tokens(tokens);
+             match &self.limits {
+                 RangeLimits::HalfOpen(t) => t.to_tokens(tokens),
+                 RangeLimits::Closed(t) => t.to_tokens(tokens),
+             }
+             self.hi.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for PatSlice {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             self.bracket_token.surround(tokens, |tokens| {
+                 self.elems.to_tokens(tokens);
+             });
+         }
+     }
+ 
+     impl ToTokens for PatMacro {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             self.mac.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for PatOr {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             self.leading_vert.to_tokens(tokens);
+             self.cases.to_tokens(tokens);
+         }
+     }
+ 
+     impl ToTokens for FieldPat {
+         fn to_tokens(&self, tokens: &mut TokenStream) {
++            tokens.append_all(self.attrs.outer());
+             if let Some(colon_token) = &self.colon_token {
+                 self.member.to_tokens(tokens);
+                 colon_token.to_tokens(tokens);
+             }
+             self.pat.to_tokens(tokens);
+         }
+     }
+ }
+diff --git a/third_party/rust/syn/src/path.rs b/third_party/rust/syn/src/path.rs
+--- a/third_party/rust/syn/src/path.rs
++++ b/third_party/rust/syn/src/path.rs
+@@ -1,15 +1,15 @@
+ use super::*;
+ use crate::punctuated::Punctuated;
+ 
+ ast_struct! {
+-    /// A path at which a named item is exported: `std::collections::HashMap`.
++    /// A path at which a named item is exported (e.g. `std::collections::HashMap`).
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
++    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
+     /// feature.*
+     pub struct Path {
+         pub leading_colon: Option<Token![::]>,
+         pub segments: Punctuated<PathSegment, Token![::]>,
+     }
+ }
+ 
+ impl<T> From<T> for Path
+@@ -24,17 +24,17 @@ where
+         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"`
++    /// *This type is available only 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
+@@ -47,17 +47,17 @@ where
+             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"`
++    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
+     /// feature.*
+     ///
+     /// ## Angle bracketed
+     ///
+     /// The `<'a, T>` in `std::slice::iter<'a, T>`.
+     ///
+     /// ## Parenthesized
+     ///
+@@ -93,17 +93,17 @@ impl PathArguments {
+             PathArguments::AngleBracketed(_) | 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"`
++    /// *This type is available only 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>`.
+@@ -117,55 +117,55 @@ ast_enum! {
+         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"`
++    /// *This type is available only 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"`
++    /// *This type is available only 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! {
+     /// An associated type bound: `Iterator<Item: Display>`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
++    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
+     /// feature.*
+     pub struct Constraint {
+         pub ident: Ident,
+         pub colon_token: Token![:],
+         pub bounds: Punctuated<TypeParamBound, Token![+]>,
+     }
+ }
+ 
+ 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"`
++    /// *This type is available only 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,
+     }
+@@ -184,17 +184,17 @@ ast_struct! {
+     ///  ^~~~~~    ~~~~~~~~~~~~~~^
+     ///  ty        position = 3
+     ///
+     /// <Vec<T>>::AssociatedItem
+     ///  ^~~~~~   ^
+     ///  ty       position = 0
+     /// ```
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
++    /// *This type is available only 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![>],
+     }
+@@ -286,21 +286,17 @@ pub mod parsing {
+     impl Parse for PathSegment {
+         fn parse(input: ParseStream) -> Result<Self> {
+             Self::parse_helper(input, false)
+         }
+     }
+ 
+     impl PathSegment {
+         fn parse_helper(input: ParseStream, expr_style: bool) -> Result<Self> {
+-            if input.peek(Token![super])
+-                || input.peek(Token![self])
+-                || input.peek(Token![crate])
+-                || input.peek(Token![extern])
+-            {
++            if input.peek(Token![super]) || input.peek(Token![self]) || input.peek(Token![crate]) {
+                 let ident = input.call(Ident::parse_any)?;
+                 return Ok(PathSegment::from(ident));
+             }
+ 
+             let ident = if input.peek(Token![Self]) {
+                 input.call(Ident::parse_any)?
+             } else {
+                 input.parse()?
+@@ -353,17 +349,17 @@ pub mod parsing {
+                 },
+             })
+         }
+     }
+ 
+     impl Path {
+         /// Parse a `Path` containing no path arguments on any of its segments.
+         ///
+-        /// *This function is available if Syn is built with the `"parsing"`
++        /// *This function is available only if Syn is built with the `"parsing"`
+         /// feature.*
+         ///
+         /// # Example
+         ///
+         /// ```
+         /// use syn::{Path, Result, Token};
+         /// use syn::parse::{Parse, ParseStream};
+         ///
+@@ -395,17 +391,16 @@ pub mod parsing {
+                 segments: {
+                     let mut segments = Punctuated::new();
+                     loop {
+                         if !input.peek(Ident)
+                             && !input.peek(Token![super])
+                             && !input.peek(Token![self])
+                             && !input.peek(Token![Self])
+                             && !input.peek(Token![crate])
+-                            && !input.peek(Token![extern])
+                         {
+                             break;
+                         }
+                         let ident = Ident::parse_any(input)?;
+                         segments.push_value(PathSegment::from(ident));
+                         if !input.peek(Token![::]) {
+                             break;
+                         }
+@@ -428,17 +423,17 @@ pub mod parsing {
+         /// For them to compare equal, it must be the case that:
+         ///
+         /// - the path has no leading colon,
+         /// - the number of path segments is 1,
+         /// - the first path segment has no angle bracketed or parenthesized
+         ///   path arguments, and
+         /// - the ident of the first path segment is equal to the given one.
+         ///
+-        /// *This function is available if Syn is built with the `"parsing"`
++        /// *This function is available only if Syn is built with the `"parsing"`
+         /// feature.*
+         ///
+         /// # Example
+         ///
+         /// ```
+         /// use syn::{Attribute, Error, Meta, NestedMeta, Result};
+         /// # use std::iter::FromIterator;
+         ///
+@@ -467,17 +462,17 @@ pub mod parsing {
+         ///
+         /// A path is considered an ident if:
+         ///
+         /// - the path has no leading colon,
+         /// - the number of path segments is 1, and
+         /// - the first path segment has no angle bracketed or parenthesized
+         ///   path arguments.
+         ///
+-        /// *This function is available if Syn is built with the `"parsing"`
++        /// *This function is available only if Syn is built with the `"parsing"`
+         /// feature.*
+         pub fn get_ident(&self) -> Option<&Ident> {
+             if self.leading_colon.is_none()
+                 && self.segments.len() == 1
+                 && self.segments[0].arguments.is_none()
+             {
+                 Some(&self.segments[0].ident)
+             } else {
+diff --git a/third_party/rust/syn/src/punctuated.rs b/third_party/rust/syn/src/punctuated.rs
+--- a/third_party/rust/syn/src/punctuated.rs
++++ b/third_party/rust/syn/src/punctuated.rs
+@@ -17,16 +17,18 @@
+ //!
+ //! ```text
+ //! a_function_call(arg1, arg2, arg3);
+ //!                 ~~~~^ ~~~~^ ~~~~
+ //! ```
+ 
+ #[cfg(feature = "extra-traits")]
+ use std::fmt::{self, Debug};
++#[cfg(feature = "extra-traits")]
++use std::hash::{Hash, Hasher};
+ #[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;
+ 
+@@ -36,18 +38,16 @@ use crate::parse::{Parse, ParseStream, R
+ use crate::token::Token;
+ 
+ /// 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]: self
+-#[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> {
+@@ -71,32 +71,29 @@ impl<T, P> Punctuated<T, P> {
+         self.inner.len() + if self.last.is_some() { 1 } else { 0 }
+     }
+ 
+     /// Borrows the first element in this sequence.
+     pub fn first(&self) -> Option<&T> {
+         self.iter().next()
+     }
+ 
++    /// Mutably borrows the first element in this sequence.
++    pub fn first_mut(&mut self) -> Option<&mut T> {
++        self.iter_mut().next()
++    }
++
+     /// Borrows the last element in this sequence.
+     pub fn last(&self) -> Option<&T> {
+-        if self.last.is_some() {
+-            self.last.as_ref().map(Box::as_ref)
+-        } else {
+-            self.inner.last().map(|pair| &pair.0)
+-        }
++        self.iter().next_back()
+     }
+ 
+     /// Mutably borrows the last element in this sequence.
+     pub fn last_mut(&mut self) -> Option<&mut T> {
+-        if self.last.is_some() {
+-            self.last.as_mut().map(Box::as_mut)
+-        } else {
+-            self.inner.last_mut().map(|pair| &mut pair.0)
+-        }
++        self.iter_mut().next_back()
+     }
+ 
+     /// 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(Box::as_ref).into_iter(),
+@@ -225,23 +222,29 @@ impl<T, P> Punctuated<T, P> {
+ 
+         if index == self.len() {
+             self.push(value);
+         } else {
+             self.inner.insert(index, (value, Default::default()));
+         }
+     }
+ 
++    /// Clears the sequence of all values and punctuation, making it empty.
++    pub fn clear(&mut self) {
++        self.inner.clear();
++        self.last = None;
++    }
++
+     /// Parses zero or more occurrences of `T` separated by punctuation of type
+     /// `P`, with optional trailing punctuation.
+     ///
+     /// Parsing continues until the end of this parse stream. The entire content
+     /// of this parse stream must consist of `T` and `P`.
+     ///
+-    /// *This function is available if Syn is built with the `"parsing"`
++    /// *This function is available only if Syn is built with the `"parsing"`
+     /// feature.*
+     #[cfg(feature = "parsing")]
+     pub fn parse_terminated(input: ParseStream) -> Result<Self>
+     where
+         T: Parse,
+         P: Parse,
+     {
+         Self::parse_terminated_with(input, T::parse)
+@@ -251,17 +254,17 @@ impl<T, P> Punctuated<T, P> {
+     /// separated by punctuation of type `P`, with optional trailing
+     /// punctuation.
+     ///
+     /// Like [`parse_terminated`], the entire content of this stream is expected
+     /// to be parsed.
+     ///
+     /// [`parse_terminated`]: Punctuated::parse_terminated
+     ///
+-    /// *This function is available if Syn is built with the `"parsing"`
++    /// *This function is available only if Syn is built with the `"parsing"`
+     /// feature.*
+     #[cfg(feature = "parsing")]
+     pub fn parse_terminated_with(
+         input: ParseStream,
+         parser: fn(ParseStream) -> Result<T>,
+     ) -> Result<Self>
+     where
+         P: Parse,
+@@ -287,17 +290,17 @@ impl<T, P> Punctuated<T, P> {
+     /// Parses one or more occurrences of `T` separated by punctuation of type
+     /// `P`, not accepting trailing punctuation.
+     ///
+     /// Parsing continues as long as punctuation `P` is present at the head of
+     /// the stream. This method returns upon parsing a `T` and observing that it
+     /// is not followed by a `P`, even if there are remaining tokens in the
+     /// stream.
+     ///
+-    /// *This function is available if Syn is built with the `"parsing"`
++    /// *This function is available only if Syn is built with the `"parsing"`
+     /// feature.*
+     #[cfg(feature = "parsing")]
+     pub fn parse_separated_nonempty(input: ParseStream) -> Result<Self>
+     where
+         T: Parse,
+         P: Token + Parse,
+     {
+         Self::parse_separated_nonempty_with(input, T::parse)
+@@ -307,17 +310,17 @@ impl<T, P> Punctuated<T, P> {
+     /// separated by punctuation of type `P`, not accepting trailing
+     /// punctuation.
+     ///
+     /// Like [`parse_separated_nonempty`], may complete early without parsing
+     /// the entire content of this stream.
+     ///
+     /// [`parse_separated_nonempty`]: Punctuated::parse_separated_nonempty
+     ///
+-    /// *This function is available if Syn is built with the `"parsing"`
++    /// *This function is available only if Syn is built with the `"parsing"`
+     /// feature.*
+     #[cfg(feature = "parsing")]
+     pub fn parse_separated_nonempty_with(
+         input: ParseStream,
+         parser: fn(ParseStream) -> Result<T>,
+     ) -> Result<Self>
+     where
+         P: Token + Parse,
+@@ -333,16 +336,63 @@ impl<T, P> Punctuated<T, P> {
+             let punct = input.parse()?;
+             punctuated.push_punct(punct);
+         }
+ 
+         Ok(punctuated)
+     }
+ }
+ 
++#[cfg(feature = "clone-impls")]
++impl<T, P> Clone for Punctuated<T, P>
++where
++    T: Clone,
++    P: Clone,
++{
++    fn clone(&self) -> Self {
++        Punctuated {
++            inner: self.inner.clone(),
++            last: self.last.clone(),
++        }
++    }
++}
++
++#[cfg(feature = "extra-traits")]
++impl<T, P> Eq for Punctuated<T, P>
++where
++    T: Eq,
++    P: Eq,
++{
++}
++
++#[cfg(feature = "extra-traits")]
++impl<T, P> PartialEq for Punctuated<T, P>
++where
++    T: PartialEq,
++    P: PartialEq,
++{
++    fn eq(&self, other: &Self) -> bool {
++        let Punctuated { inner, last } = self;
++        *inner == other.inner && *last == other.last
++    }
++}
++
++#[cfg(feature = "extra-traits")]
++impl<T, P> Hash for Punctuated<T, P>
++where
++    T: Hash,
++    P: Hash,
++{
++    fn hash<H: Hasher>(&self, state: &mut H) {
++        let Punctuated { inner, last } = self;
++        inner.hash(state);
++        last.hash(state);
++    }
++}
++
+ #[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 (t, p) in &self.inner {
+             list.entry(t);
+             list.entry(p);
+         }
+@@ -531,17 +581,16 @@ impl<'a, T, P> ExactSizeIterator for Pai
+     }
+ }
+ 
+ /// An iterator over owned pairs of type `Pair<T, P>`.
+ ///
+ /// Refer to the [module documentation] for details about punctuated sequences.
+ ///
+ /// [module documentation]: self
+-#[derive(Clone)]
+ 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>;
+ 
+@@ -567,22 +616,34 @@ impl<T, P> DoubleEndedIterator for IntoP
+ }
+ 
+ impl<T, P> ExactSizeIterator for IntoPairs<T, P> {
+     fn len(&self) -> usize {
+         self.inner.len() + self.last.len()
+     }
+ }
+ 
++impl<T, P> Clone for IntoPairs<T, P>
++where
++    T: Clone,
++    P: Clone,
++{
++    fn clone(&self) -> Self {
++        IntoPairs {
++            inner: self.inner.clone(),
++            last: self.last.clone(),
++        }
++    }
++}
++
+ /// An iterator over owned values of type `T`.
+ ///
+ /// Refer to the [module documentation] for details about punctuated sequences.
+ ///
+ /// [module documentation]: self
+-#[derive(Clone)]
+ pub struct IntoIter<T> {
+     inner: vec::IntoIter<T>,
+ }
+ 
+ impl<T> Iterator for IntoIter<T> {
+     type Item = T;
+ 
+     fn next(&mut self) -> Option<Self::Item> {
+@@ -601,16 +662,27 @@ impl<T> DoubleEndedIterator for IntoIter
+ }
+ 
+ impl<T> ExactSizeIterator for IntoIter<T> {
+     fn len(&self) -> usize {
+         self.inner.len()
+     }
+ }
+ 
++impl<T> Clone for IntoIter<T>
++where
++    T: Clone,
++{
++    fn clone(&self) -> Self {
++        IntoIter {
++            inner: self.inner.clone(),
++        }
++    }
++}
++
+ /// An iterator over borrowed values of type `&T`.
+ ///
+ /// Refer to the [module documentation] for details about punctuated sequences.
+ ///
+ /// [module documentation]: self
+ pub struct Iter<'a, T: 'a> {
+     // The `Item = &'a T` needs to be specified to support rustc 1.31 and older.
+     // On modern compilers we would be able to write just IterTrait<'a, T> where
+@@ -794,17 +866,16 @@ impl<'a, T: 'a, I: 'a> IterMutTrait<'a, 
+ }
+ 
+ /// 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]: self
+-#[cfg_attr(feature = "clone-impls", derive(Clone))]
+ 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.
+@@ -851,16 +922,30 @@ impl<T, P> Pair<T, P> {
+     pub fn into_tuple(self) -> (T, Option<P>) {
+         match self {
+             Pair::Punctuated(t, d) => (t, Some(d)),
+             Pair::End(t) => (t, None),
+         }
+     }
+ }
+ 
++#[cfg(feature = "clone-impls")]
++impl<T, P> Clone for Pair<T, P>
++where
++    T: Clone,
++    P: Clone,
++{
++    fn clone(&self) -> Self {
++        match self {
++            Pair::Punctuated(t, p) => Pair::Punctuated(t.clone(), p.clone()),
++            Pair::End(t) => Pair::End(t.clone()),
++        }
++    }
++}
++
+ 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(t) => t,
+                 None => &self.inner[index].0,
+diff --git a/third_party/rust/syn/src/reserved.rs b/third_party/rust/syn/src/reserved.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/src/reserved.rs
+@@ -0,0 +1,42 @@
++// Type for a syntax tree node that is reserved for future use.
++//
++// For example ExprReference contains a field `raw` of type Reserved. If `&raw
++// place` syntax becomes a thing as per https://github.com/rust-lang/rfcs/pull/2582,
++// we can backward compatibly change `raw`'s type to Option<Token![raw]> without
++// the possibility of breaking any code.
++
++use proc_macro2::Span;
++use std::marker::PhantomData;
++
++#[cfg(feature = "extra-traits")]
++use std::fmt::{self, Debug};
++
++ast_struct! {
++    pub struct Reserved {
++        _private: PhantomData<Span>,
++    }
++}
++
++impl Default for Reserved {
++    fn default() -> Self {
++        Reserved {
++            _private: PhantomData,
++        }
++    }
++}
++
++#[cfg(feature = "clone-impls")]
++impl Clone for Reserved {
++    fn clone(&self) -> Self {
++        Reserved {
++            _private: self._private,
++        }
++    }
++}
++
++#[cfg(feature = "extra-traits")]
++impl Debug for Reserved {
++    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
++        formatter.debug_struct("Reserved").finish()
++    }
++}
+diff --git a/third_party/rust/syn/src/spanned.rs b/third_party/rust/syn/src/spanned.rs
+--- a/third_party/rust/syn/src/spanned.rs
++++ b/third_party/rust/syn/src/spanned.rs
+@@ -1,12 +1,12 @@
+ //! 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
++//! *This module is available only if Syn is built with both the `"parsing"` and
+ //! `"printing"` features.*
+ //!
+ //! <br>
+ //!
+ //! # 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
+@@ -92,17 +92,17 @@ use quote::spanned::Spanned as ToTokens;
+ /// [`ToTokens`] from the `quote` crate, as well as for `Span` itself.
+ ///
+ /// [`ToTokens`]: quote::ToTokens
+ ///
+ /// See the [module documentation] for an example.
+ ///
+ /// [module documentation]: self
+ ///
+-/// *This trait is available if Syn is built with both the `"parsing"` and
++/// *This trait is available only 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()`]: proc_macro2::Span::call_site
+     fn span(&self) -> Span;
+ }
+diff --git a/third_party/rust/syn/src/stmt.rs b/third_party/rust/syn/src/stmt.rs
+--- a/third_party/rust/syn/src/stmt.rs
++++ b/third_party/rust/syn/src/stmt.rs
+@@ -1,25 +1,25 @@
+ use super::*;
+ 
+ ast_struct! {
+     /// A braced block containing Rust statements.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct Block {
+         pub brace_token: token::Brace,
+         /// Statements in a block
+         pub stmts: Vec<Stmt>,
+     }
+ }
+ 
+ ast_enum! {
+     /// A statement, usually ending in a semicolon.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only 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.
+@@ -28,38 +28,39 @@ ast_enum! {
+         /// Expression with trailing semicolon.
+         Semi(Expr, Token![;]),
+     }
+ }
+ 
+ ast_struct! {
+     /// A local `let` binding: `let x: u64 = s.parse()?`.
+     ///
+-    /// *This type is available if Syn is built with the `"full"` feature.*
++    /// *This type is available only if Syn is built with the `"full"` feature.*
+     pub struct Local {
+         pub attrs: Vec<Attribute>,
+         pub let_token: Token![let],
+         pub pat: Pat,
+         pub init: Option<(Token![=], Box<Expr>)>,
+         pub semi_token: Token![;],
+     }
+ }
+ 
+ #[cfg(feature = "parsing")]
+ pub mod parsing {
+     use super::*;
+ 
++    use crate::parse::discouraged::Speculative;
+     use crate::parse::{Parse, ParseStream, Result};
+-    use crate::punctuated::Punctuated;
++    use proc_macro2::TokenStream;
+ 
+     impl Block {
+         /// Parse the body of a block as zero or more statements, possibly
+         /// including one trailing expression.
+         ///
+-        /// *This function is available if Syn is built with the `"parsing"`
++        /// *This function is available only if Syn is built with the `"parsing"`
+         /// feature.*
+         ///
+         /// # Example
+         ///
+         /// ```
+         /// use syn::{braced, token, Attribute, Block, Ident, Result, Stmt, Token};
+         /// use syn::parse::{Parse, ParseStream};
+         ///
+@@ -101,18 +102,18 @@ pub mod parsing {
+         ///             stmts,
+         ///         })
+         ///     }
+         /// }
+         /// ```
+         pub fn parse_within(input: ParseStream) -> Result<Vec<Stmt>> {
+             let mut stmts = Vec::new();
+             loop {
+-                while input.peek(Token![;]) {
+-                    input.parse::<Token![;]>()?;
++                while let Some(semi) = input.parse::<Option<Token![;]>>()? {
++                    stmts.push(Stmt::Semi(Expr::Verbatim(TokenStream::new()), semi));
+                 }
+                 if input.is_empty() {
+                     break;
+                 }
+                 let s = parse_stmt(input, true)?;
+                 let requires_semicolon = if let Stmt::Expr(s) = &s {
+                     expr::requires_terminator(s)
+                 } else {
+@@ -141,65 +142,65 @@ pub mod parsing {
+ 
+     impl Parse for Stmt {
+         fn parse(input: ParseStream) -> Result<Self> {
+             parse_stmt(input, false)
+         }
+     }
+ 
+     fn parse_stmt(input: ParseStream, allow_nosemi: bool) -> Result<Stmt> {
+-        // TODO: optimize using advance_to
++        let mut attrs = input.call(Attribute::parse_outer)?;
++
++        // brace-style macros; paren and bracket macros get parsed as
++        // expression statements.
+         let ahead = input.fork();
+-        ahead.call(Attribute::parse_outer)?;
++        if let Ok(path) = ahead.call(Path::parse_mod_style) {
++            if ahead.peek(Token![!]) && (ahead.peek2(token::Brace) || ahead.peek2(Ident)) {
++                input.advance_to(&ahead);
++                return stmt_mac(input, attrs, path);
++            }
++        }
+ 
+-        if {
+-            let ahead = ahead.fork();
+-            // Only parse braces here; paren and bracket will get parsed as
+-            // expression statements
+-            ahead.call(Path::parse_mod_style).is_ok()
+-                && ahead.parse::<Token![!]>().is_ok()
+-                && (ahead.peek(token::Brace) || ahead.peek(Ident))
+-        } {
+-            stmt_mac(input)
+-        } else if ahead.peek(Token![let]) {
+-            stmt_local(input).map(Stmt::Local)
+-        } else if ahead.peek(Token![pub])
+-            || ahead.peek(Token![crate]) && !ahead.peek2(Token![::])
+-            || ahead.peek(Token![extern]) && !ahead.peek2(Token![::])
+-            || ahead.peek(Token![use])
+-            || ahead.peek(Token![static]) && (ahead.peek2(Token![mut]) || ahead.peek2(Ident))
+-            || ahead.peek(Token![const])
+-            || ahead.peek(Token![unsafe]) && !ahead.peek2(token::Brace)
+-            || ahead.peek(Token![async])
+-                && (ahead.peek2(Token![unsafe])
+-                    || ahead.peek2(Token![extern])
+-                    || ahead.peek2(Token![fn]))
+-            || ahead.peek(Token![fn])
+-            || ahead.peek(Token![mod])
+-            || ahead.peek(Token![type])
+-            || ahead.peek(item::parsing::existential) && ahead.peek2(Token![type])
+-            || ahead.peek(Token![struct])
+-            || ahead.peek(Token![enum])
+-            || ahead.peek(Token![union]) && ahead.peek2(Ident)
+-            || ahead.peek(Token![auto]) && ahead.peek2(Token![trait])
+-            || ahead.peek(Token![trait])
+-            || ahead.peek(Token![default])
+-                && (ahead.peek2(Token![unsafe]) || ahead.peek2(Token![impl]))
+-            || ahead.peek(Token![impl])
+-            || ahead.peek(Token![macro])
++        if input.peek(Token![let]) {
++            stmt_local(input, attrs).map(Stmt::Local)
++        } else if input.peek(Token![pub])
++            || input.peek(Token![crate]) && !input.peek2(Token![::])
++            || input.peek(Token![extern])
++            || input.peek(Token![use])
++            || input.peek(Token![static]) && (input.peek2(Token![mut]) || input.peek2(Ident))
++            || input.peek(Token![const])
++            || input.peek(Token![unsafe]) && !input.peek2(token::Brace)
++            || input.peek(Token![async])
++                && (input.peek2(Token![unsafe])
++                    || input.peek2(Token![extern])
++                    || input.peek2(Token![fn]))
++            || input.peek(Token![fn])
++            || input.peek(Token![mod])
++            || input.peek(Token![type])
++            || input.peek(item::parsing::existential) && input.peek2(Token![type])
++            || input.peek(Token![struct])
++            || input.peek(Token![enum])
++            || input.peek(Token![union]) && input.peek2(Ident)
++            || input.peek(Token![auto]) && input.peek2(Token![trait])
++            || input.peek(Token![trait])
++            || input.peek(Token![default])
++                && (input.peek2(Token![unsafe]) || input.peek2(Token![impl]))
++            || input.peek(Token![impl])
++            || input.peek(Token![macro])
+         {
+-            input.parse().map(Stmt::Item)
++            let mut item: Item = input.parse()?;
++            attrs.extend(item.replace_attrs(Vec::new()));
++            item.replace_attrs(attrs);
++            Ok(Stmt::Item(item))
+         } else {
+-            stmt_expr(input, allow_nosemi)
++            stmt_expr(input, allow_nosemi, attrs)
+         }
+     }
+ 
+-    fn stmt_mac(input: ParseStream) -> Result<Stmt> {
+-        let attrs = input.call(Attribute::parse_outer)?;
+-        let path = input.call(Path::parse_mod_style)?;
++    fn stmt_mac(input: ParseStream, attrs: Vec<Attribute>, path: Path) -> Result<Stmt> {
+         let bang_token: Token![!] = input.parse()?;
+         let ident: Option<Ident> = input.parse()?;
+         let (delimiter, tokens) = mac::parse_delimiter(input)?;
+         let semi_token: Option<Token![;]> = input.parse()?;
+ 
+         Ok(Stmt::Item(Item::Macro(ItemMacro {
+             attrs,
+             ident,
+@@ -208,43 +209,22 @@ pub mod parsing {
+                 bang_token,
+                 delimiter,
+                 tokens,
+             },
+             semi_token,
+         })))
+     }
+ 
+-    fn stmt_local(input: ParseStream) -> Result<Local> {
++    fn stmt_local(input: ParseStream, attrs: Vec<Attribute>) -> Result<Local> {
+         Ok(Local {
+-            attrs: input.call(Attribute::parse_outer)?,
++            attrs,
+             let_token: input.parse()?,
+             pat: {
+-                let leading_vert: Option<Token![|]> = input.parse()?;
+-                let mut pat: Pat = input.parse()?;
+-                if leading_vert.is_some()
+-                    || input.peek(Token![|]) && !input.peek(Token![||]) && !input.peek(Token![|=])
+-                {
+-                    let mut cases = Punctuated::new();
+-                    cases.push_value(pat);
+-                    while input.peek(Token![|])
+-                        && !input.peek(Token![||])
+-                        && !input.peek(Token![|=])
+-                    {
+-                        let punct = input.parse()?;
+-                        cases.push_punct(punct);
+-                        let pat: Pat = input.parse()?;
+-                        cases.push_value(pat);
+-                    }
+-                    pat = Pat::Or(PatOr {
+-                        attrs: Vec::new(),
+-                        leading_vert,
+-                        cases,
+-                    });
+-                }
++                let mut pat: Pat = pat::parsing::multi_pat_with_leading_vert(input)?;
+                 if input.peek(Token![:]) {
+                     let colon_token: Token![:] = input.parse()?;
+                     let ty: Type = input.parse()?;
+                     pat = Pat::Type(PatType {
+                         attrs: Vec::new(),
+                         pat: Box::new(pat),
+                         colon_token,
+                         ty: Box::new(ty),
+@@ -260,22 +240,29 @@ pub mod parsing {
+                 } else {
+                     None
+                 }
+             },
+             semi_token: input.parse()?,
+         })
+     }
+ 
+-    fn stmt_expr(input: ParseStream, allow_nosemi: bool) -> Result<Stmt> {
+-        let mut attrs = input.call(Attribute::parse_outer)?;
++    fn stmt_expr(
++        input: ParseStream,
++        allow_nosemi: bool,
++        mut attrs: Vec<Attribute>,
++    ) -> Result<Stmt> {
+         let mut e = expr::parsing::expr_early(input)?;
+ 
+-        attrs.extend(e.replace_attrs(Vec::new()));
+-        e.replace_attrs(attrs);
++        let mut attr_target = &mut e;
++        while let Expr::Binary(e) = attr_target {
++            attr_target = &mut e.left;
++        }
++        attrs.extend(attr_target.replace_attrs(Vec::new()));
++        attr_target.replace_attrs(attrs);
+ 
+         if input.peek(Token![;]) {
+             return Ok(Stmt::Semi(e, input.parse()?));
+         }
+ 
+         if allow_nosemi || !expr::requires_terminator(&e) {
+             Ok(Stmt::Expr(e))
+         } else {
+diff --git a/third_party/rust/syn/src/token.rs b/third_party/rust/syn/src/token.rs
+--- a/third_party/rust/syn/src/token.rs
++++ b/third_party/rust/syn/src/token.rs
+@@ -83,44 +83,41 @@
+ //!
+ //! - Field access to its span — `let sp = the_token.span`
+ //!
+ //! [Peeking]: ../parse/struct.ParseBuffer.html#method.peek
+ //! [Parsing]: ../parse/struct.ParseBuffer.html#method.parse
+ //! [Printing]: https://docs.rs/quote/1.0/quote/trait.ToTokens.html
+ //! [`Span`]: https://docs.rs/proc-macro2/1.0/proc_macro2/struct.Span.html
+ 
+-use std;
+ #[cfg(feature = "extra-traits")]
+ use std::cmp;
+ #[cfg(feature = "extra-traits")]
+ use std::fmt::{self, Debug};
+ #[cfg(feature = "extra-traits")]
+ use std::hash::{Hash, Hasher};
+ use std::ops::{Deref, DerefMut};
+ 
+-#[cfg(feature = "parsing")]
+-use proc_macro2::Delimiter;
+ #[cfg(any(feature = "parsing", feature = "printing"))]
+ use proc_macro2::Ident;
+ use proc_macro2::Span;
+ #[cfg(feature = "printing")]
+ use proc_macro2::TokenStream;
++#[cfg(feature = "parsing")]
++use proc_macro2::{Delimiter, Literal, Punct, TokenTree};
+ #[cfg(feature = "printing")]
+ use quote::{ToTokens, TokenStreamExt};
+ 
+ use self::private::WithSpan;
+ #[cfg(feature = "parsing")]
+ use crate::buffer::Cursor;
+ #[cfg(feature = "parsing")]
+ use crate::error::Result;
+-#[cfg(any(feature = "full", feature = "derive"))]
+ #[cfg(feature = "parsing")]
+ use crate::lifetime::Lifetime;
+-#[cfg(any(feature = "full", feature = "derive"))]
+ #[cfg(feature = "parsing")]
+ use crate::lit::{Lit, LitBool, LitByte, LitByteStr, LitChar, LitFloat, LitInt, LitStr};
+ #[cfg(feature = "parsing")]
+ use crate::lookahead;
+ #[cfg(feature = "parsing")]
+ use crate::parse::{Parse, ParseStream};
+ use crate::span::IntoSpans;
+ 
+@@ -150,31 +147,30 @@ mod private {
+     pub struct WithSpan {
+         pub span: Span,
+     }
+ }
+ 
+ #[cfg(feature = "parsing")]
+ impl private::Sealed for Ident {}
+ 
+-#[cfg(any(feature = "full", feature = "derive"))]
+ #[cfg(feature = "parsing")]
+ fn peek_impl(cursor: Cursor, peek: fn(ParseStream) -> bool) -> bool {
++    use crate::parse::Unexpected;
+     use std::cell::Cell;
+     use std::rc::Rc;
+ 
+     let scope = Span::call_site();
+-    let unexpected = Rc::new(Cell::new(None));
++    let unexpected = Rc::new(Cell::new(Unexpected::None));
+     let buffer = crate::parse::new_parse_buffer(scope, cursor, unexpected);
+     peek(&buffer)
+ }
+ 
+-#[cfg(any(feature = "full", feature = "derive"))]
+ macro_rules! impl_token {
+-    ($name:ident $display:expr) => {
++    ($display:tt $name:ty) => {
+         #[cfg(feature = "parsing")]
+         impl Token for $name {
+             fn peek(cursor: Cursor) -> bool {
+                 fn peek(input: ParseStream) -> bool {
+                     <$name as Parse>::parse(input).is_ok()
+                 }
+                 peek_impl(cursor, peek)
+             }
+@@ -184,34 +180,48 @@ macro_rules! impl_token {
+             }
+         }
+ 
+         #[cfg(feature = "parsing")]
+         impl private::Sealed for $name {}
+     };
+ }
+ 
+-#[cfg(any(feature = "full", feature = "derive"))]
+-impl_token!(Lifetime "lifetime");
+-#[cfg(any(feature = "full", feature = "derive"))]
+-impl_token!(Lit "literal");
+-#[cfg(any(feature = "full", feature = "derive"))]
+-impl_token!(LitStr "string literal");
+-#[cfg(any(feature = "full", feature = "derive"))]
+-impl_token!(LitByteStr "byte string literal");
+-#[cfg(any(feature = "full", feature = "derive"))]
+-impl_token!(LitByte "byte literal");
+-#[cfg(any(feature = "full", feature = "derive"))]
+-impl_token!(LitChar "character literal");
+-#[cfg(any(feature = "full", feature = "derive"))]
+-impl_token!(LitInt "integer literal");
+-#[cfg(any(feature = "full", feature = "derive"))]
+-impl_token!(LitFloat "floating point literal");
+-#[cfg(any(feature = "full", feature = "derive"))]
+-impl_token!(LitBool "boolean literal");
++impl_token!("lifetime" Lifetime);
++impl_token!("literal" Lit);
++impl_token!("string literal" LitStr);
++impl_token!("byte string literal" LitByteStr);
++impl_token!("byte literal" LitByte);
++impl_token!("character literal" LitChar);
++impl_token!("integer literal" LitInt);
++impl_token!("floating point literal" LitFloat);
++impl_token!("boolean literal" LitBool);
++impl_token!("group token" proc_macro2::Group);
++
++macro_rules! impl_low_level_token {
++    ($display:tt $ty:ident $get:ident) => {
++        #[cfg(feature = "parsing")]
++        impl Token for $ty {
++            fn peek(cursor: Cursor) -> bool {
++                cursor.$get().is_some()
++            }
++
++            fn display() -> &'static str {
++                $display
++            }
++        }
++
++        #[cfg(feature = "parsing")]
++        impl private::Sealed for $ty {}
++    };
++}
++
++impl_low_level_token!("punctuation token" Punct punct);
++impl_low_level_token!("literal" Literal literal);
++impl_low_level_token!("token" TokenTree token_tree);
+ 
+ // Not public API.
+ #[doc(hidden)]
+ #[cfg(feature = "parsing")]
+ pub trait CustomToken {
+     fn peek(cursor: Cursor) -> bool;
+     fn display() -> &'static str;
+ }
+@@ -228,17 +238,16 @@ impl<T: CustomToken> Token for T {
+     fn display() -> &'static str {
+         <Self as CustomToken>::display()
+     }
+ }
+ 
+ macro_rules! define_keywords {
+     ($($token:tt pub struct $name:ident #[$doc:meta])*) => {
+         $(
+-            #[cfg_attr(feature = "clone-impls", derive(Copy, Clone))]
+             #[$doc]
+             ///
+             /// Don't try to remember the name of this type &mdash; use the
+             /// [`Token!`] macro instead.
+             ///
+             /// [`Token!`]: crate::token
+             pub struct $name {
+                 pub span: Span,
+@@ -255,16 +264,26 @@ macro_rules! define_keywords {
+             impl std::default::Default for $name {
+                 fn default() -> Self {
+                     $name {
+                         span: Span::call_site(),
+                     }
+                 }
+             }
+ 
++            #[cfg(feature = "clone-impls")]
++            impl Copy for $name {}
++
++            #[cfg(feature = "clone-impls")]
++            impl Clone for $name {
++                fn clone(&self) -> Self {
++                    *self
++                }
++            }
++
+             #[cfg(feature = "extra-traits")]
+             impl Debug for $name {
+                 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                     f.write_str(stringify!($name))
+                 }
+             }
+ 
+             #[cfg(feature = "extra-traits")]
+@@ -333,17 +352,16 @@ macro_rules! impl_deref_if_len_is_1 {
+     };
+ 
+     ($name:ident/$len:tt) => {};
+ }
+ 
+ macro_rules! define_punctuation_structs {
+     ($($token:tt pub struct $name:ident/$len:tt #[$doc:meta])*) => {
+         $(
+-            #[cfg_attr(feature = "clone-impls", derive(Copy, Clone))]
+             #[repr(C)]
+             #[$doc]
+             ///
+             /// Don't try to remember the name of this type &mdash; use the
+             /// [`Token!`] macro instead.
+             ///
+             /// [`Token!`]: crate::token
+             pub struct $name {
+@@ -361,16 +379,26 @@ macro_rules! define_punctuation_structs 
+             impl std::default::Default for $name {
+                 fn default() -> Self {
+                     $name {
+                         spans: [Span::call_site(); $len],
+                     }
+                 }
+             }
+ 
++            #[cfg(feature = "clone-impls")]
++            impl Copy for $name {}
++
++            #[cfg(feature = "clone-impls")]
++            impl Clone for $name {
++                fn clone(&self) -> Self {
++                    *self
++                }
++            }
++
+             #[cfg(feature = "extra-traits")]
+             impl Debug for $name {
+                 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                     f.write_str(stringify!($name))
+                 }
+             }
+ 
+             #[cfg(feature = "extra-traits")]
+@@ -431,17 +459,16 @@ macro_rules! define_punctuation {
+             impl private::Sealed for $name {}
+         )*
+     };
+ }
+ 
+ macro_rules! define_delimiters {
+     ($($token:tt pub struct $name:ident #[$doc:meta])*) => {
+         $(
+-            #[cfg_attr(feature = "clone-impls", derive(Copy, Clone))]
+             #[$doc]
+             pub struct $name {
+                 pub span: Span,
+             }
+ 
+             #[doc(hidden)]
+             #[allow(non_snake_case)]
+             pub fn $name<S: IntoSpans<[Span; 1]>>(span: S) -> $name {
+@@ -453,16 +480,26 @@ macro_rules! define_delimiters {
+             impl std::default::Default for $name {
+                 fn default() -> Self {
+                     $name {
+                         span: Span::call_site(),
+                     }
+                 }
+             }
+ 
++            #[cfg(feature = "clone-impls")]
++            impl Copy for $name {}
++
++            #[cfg(feature = "clone-impls")]
++            impl Clone for $name {
++                fn clone(&self) -> Self {
++                    *self
++                }
++            }
++
+             #[cfg(feature = "extra-traits")]
+             impl Debug for $name {
+                 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                     f.write_str(stringify!($name))
+                 }
+             }
+ 
+             #[cfg(feature = "extra-traits")]
+@@ -850,17 +887,17 @@ pub mod parsing {
+         if let Some((ident, _rest)) = cursor.ident() {
+             ident == token
+         } else {
+             false
+         }
+     }
+ 
+     pub fn punct<S: FromSpans>(input: ParseStream, token: &str) -> Result<S> {
+-        let mut spans = [input.cursor().span(); 3];
++        let mut spans = [input.span(); 3];
+         punct_helper(input, token, &mut spans)?;
+         Ok(S::from_spans(&spans))
+     }
+ 
+     fn punct_helper(input: ParseStream, token: &str, spans: &mut [Span; 3]) -> Result<()> {
+         input.step(|cursor| {
+             let mut cursor = *cursor;
+             assert!(token.len() <= spans.len());
+diff --git a/third_party/rust/syn/src/tt.rs b/third_party/rust/syn/src/tt.rs
+--- a/third_party/rust/syn/src/tt.rs
++++ b/third_party/rust/syn/src/tt.rs
+@@ -13,18 +13,18 @@ impl<'a> PartialEq for TokenTreeHelper<'
+                 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();
++                let s1 = g1.stream().into_iter();
++                let mut s2 = g2.stream().into_iter();
+ 
+                 for item1 in s1 {
+                     let item2 = match s2.next() {
+                         Some(item) => item,
+                         None => return false,
+                     };
+                     if TokenTreeHelper(&item1) != TokenTreeHelper(&item2) {
+                         return false;
+@@ -55,17 +55,17 @@ impl<'a> Hash for TokenTreeHelper<'a> {
+                 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() {
++                for item in g.stream() {
+                     TokenTreeHelper(&item).hash(h);
+                 }
+                 0xffu8.hash(h); // terminator w/ a variant we don't normally hash
+             }
+             TokenTree::Punct(op) => {
+                 1u8.hash(h);
+                 op.as_char().hash(h);
+                 match op.spacing() {
+diff --git a/third_party/rust/syn/src/ty.rs b/third_party/rust/syn/src/ty.rs
+--- a/third_party/rust/syn/src/ty.rs
++++ b/third_party/rust/syn/src/ty.rs
+@@ -1,31 +1,27 @@
+ use super::*;
+ use crate::punctuated::Punctuated;
+-#[cfg(feature = "extra-traits")]
+-use crate::tt::TokenStreamHelper;
+ use proc_macro2::TokenStream;
+-#[cfg(feature = "extra-traits")]
+-use std::hash::{Hash, Hasher};
+ 
+ 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"`
++    /// *This type is available only 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
+     //
+     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
+     // blocked on https://github.com/rust-lang/rust/issues/62833
+-    pub enum Type #manual_extra_traits {
++    pub enum Type {
+         /// A fixed size array type: `[T; n]`.
+         Array(TypeArray),
+ 
+         /// A bare function type: `fn(usize) -> bool`.
+         BareFn(TypeBareFn),
+ 
+         /// A type contained within invisible delimiters.
+         Group(TypeGroup),
+@@ -72,295 +68,194 @@ ast_enum_of_structs! {
+         #[doc(hidden)]
+         __Nonexhaustive,
+     }
+ }
+ 
+ ast_struct! {
+     /// A fixed size array type: `[T; n]`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct TypeArray {
+         pub bracket_token: token::Bracket,
+         pub elem: Box<Type>,
+         pub semi_token: Token![;],
+         pub len: Expr,
+     }
+ }
+ 
+ ast_struct! {
+     /// A bare function type: `fn(usize) -> bool`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct TypeBareFn {
+         pub lifetimes: Option<BoundLifetimes>,
+         pub unsafety: Option<Token![unsafe]>,
+         pub abi: Option<Abi>,
+         pub fn_token: Token![fn],
+         pub paren_token: token::Paren,
+         pub inputs: Punctuated<BareFnArg, Token![,]>,
+         pub variadic: Option<Variadic>,
+         pub output: ReturnType,
+     }
+ }
+ 
+ ast_struct! {
+     /// A type contained within invisible delimiters.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct TypeGroup {
+         pub group_token: token::Group,
+         pub elem: Box<Type>,
+     }
+ }
+ 
+ ast_struct! {
+     /// 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
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct TypeImplTrait {
+         pub impl_token: Token![impl],
+         pub bounds: Punctuated<TypeParamBound, Token![+]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// Indication that a type should be inferred by the compiler: `_`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct TypeInfer {
+         pub underscore_token: Token![_],
+     }
+ }
+ 
+ ast_struct! {
+     /// A macro in the type position.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct TypeMacro {
+         pub mac: Macro,
+     }
+ }
+ 
+ ast_struct! {
+     /// The never type: `!`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct TypeNever {
+         pub bang_token: Token![!],
+     }
+ }
+ 
+ ast_struct! {
+     /// A parenthesized type equivalent to the inner type.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct TypeParen {
+         pub paren_token: token::Paren,
+         pub elem: Box<Type>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A path like `std::slice::Iter`, optionally qualified with a
+     /// self-type as in `<Vec<T> as SomeTrait>::Associated`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct TypePath {
+         pub qself: Option<QSelf>,
+         pub path: Path,
+     }
+ }
+ 
+ ast_struct! {
+     /// A raw pointer type: `*const T` or `*mut T`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct TypePtr {
+         pub star_token: Token![*],
+         pub const_token: Option<Token![const]>,
+         pub mutability: Option<Token![mut]>,
+         pub elem: Box<Type>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A reference type: `&'a T` or `&'a mut T`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct TypeReference {
+         pub and_token: Token![&],
+         pub lifetime: Option<Lifetime>,
+         pub mutability: Option<Token![mut]>,
+         pub elem: Box<Type>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A dynamically sized slice type: `[T]`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct TypeSlice {
+         pub bracket_token: token::Bracket,
+         pub elem: Box<Type>,
+     }
+ }
+ 
+ ast_struct! {
+     /// 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
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct TypeTraitObject {
+         pub dyn_token: Option<Token![dyn]>,
+         pub bounds: Punctuated<TypeParamBound, Token![+]>,
+     }
+ }
+ 
+ ast_struct! {
+     /// A tuple type: `(A, B, C, String)`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or
++    /// *This type is available only if Syn is built with the `"derive"` or
+     /// `"full"` feature.*
+     pub struct TypeTuple {
+         pub paren_token: token::Paren,
+         pub elems: Punctuated<Type, Token![,]>,
+     }
+ }
+ 
+-#[cfg(feature = "extra-traits")]
+-impl Eq for Type {}
+-
+-#[cfg(feature = "extra-traits")]
+-impl PartialEq for Type {
+-    fn eq(&self, other: &Self) -> bool {
+-        match (self, other) {
+-            (Type::Array(this), Type::Array(other)) => this == other,
+-            (Type::BareFn(this), Type::BareFn(other)) => this == other,
+-            (Type::Group(this), Type::Group(other)) => this == other,
+-            (Type::ImplTrait(this), Type::ImplTrait(other)) => this == other,
+-            (Type::Infer(this), Type::Infer(other)) => this == other,
+-            (Type::Macro(this), Type::Macro(other)) => this == other,
+-            (Type::Never(this), Type::Never(other)) => this == other,
+-            (Type::Paren(this), Type::Paren(other)) => this == other,
+-            (Type::Path(this), Type::Path(other)) => this == other,
+-            (Type::Ptr(this), Type::Ptr(other)) => this == other,
+-            (Type::Reference(this), Type::Reference(other)) => this == other,
+-            (Type::Slice(this), Type::Slice(other)) => this == other,
+-            (Type::TraitObject(this), Type::TraitObject(other)) => this == other,
+-            (Type::Tuple(this), Type::Tuple(other)) => this == other,
+-            (Type::Verbatim(this), Type::Verbatim(other)) => {
+-                TokenStreamHelper(this) == TokenStreamHelper(other)
+-            }
+-            _ => false,
+-        }
+-    }
+-}
+-
+-#[cfg(feature = "extra-traits")]
+-impl Hash for Type {
+-    fn hash<H>(&self, hash: &mut H)
+-    where
+-        H: Hasher,
+-    {
+-        match self {
+-            Type::Array(ty) => {
+-                hash.write_u8(0);
+-                ty.hash(hash);
+-            }
+-            Type::BareFn(ty) => {
+-                hash.write_u8(1);
+-                ty.hash(hash);
+-            }
+-            Type::Group(ty) => {
+-                hash.write_u8(2);
+-                ty.hash(hash);
+-            }
+-            Type::ImplTrait(ty) => {
+-                hash.write_u8(3);
+-                ty.hash(hash);
+-            }
+-            Type::Infer(ty) => {
+-                hash.write_u8(4);
+-                ty.hash(hash);
+-            }
+-            Type::Macro(ty) => {
+-                hash.write_u8(5);
+-                ty.hash(hash);
+-            }
+-            Type::Never(ty) => {
+-                hash.write_u8(6);
+-                ty.hash(hash);
+-            }
+-            Type::Paren(ty) => {
+-                hash.write_u8(7);
+-                ty.hash(hash);
+-            }
+-            Type::Path(ty) => {
+-                hash.write_u8(8);
+-                ty.hash(hash);
+-            }
+-            Type::Ptr(ty) => {
+-                hash.write_u8(9);
+-                ty.hash(hash);
+-            }
+-            Type::Reference(ty) => {
+-                hash.write_u8(10);
+-                ty.hash(hash);
+-            }
+-            Type::Slice(ty) => {
+-                hash.write_u8(11);
+-                ty.hash(hash);
+-            }
+-            Type::TraitObject(ty) => {
+-                hash.write_u8(12);
+-                ty.hash(hash);
+-            }
+-            Type::Tuple(ty) => {
+-                hash.write_u8(13);
+-                ty.hash(hash);
+-            }
+-            Type::Verbatim(ty) => {
+-                hash.write_u8(14);
+-                TokenStreamHelper(ty).hash(hash);
+-            }
+-            Type::__Nonexhaustive => unreachable!(),
+-        }
+-    }
+-}
+-
+ ast_struct! {
+     /// The binary interface of a function: `extern "C"`.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
++    /// *This type is available only 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"`
++    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
+     /// feature.*
+     pub struct BareFnArg {
+         pub attrs: Vec<Attribute>,
+         pub name: Option<(Ident, Token![:])>,
+         pub ty: Type,
+     }
+ }
+ 
+@@ -372,28 +267,28 @@ ast_struct! {
+     /// # struct c_int;
+     /// #
+     /// extern "C" {
+     ///     fn printf(format: *const c_char, ...) -> c_int;
+     ///     //                               ^^^
+     /// }
+     /// ```
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
++    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
+     /// feature.*
+     pub struct Variadic {
+         pub attrs: Vec<Attribute>,
+         pub dots: Token![...],
+     }
+ }
+ 
+ ast_enum! {
+     /// Return type of a function signature.
+     ///
+-    /// *This type is available if Syn is built with the `"derive"` or `"full"`
++    /// *This type is available only 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>),
+@@ -402,39 +297,44 @@ ast_enum! {
+ 
+ #[cfg(feature = "parsing")]
+ pub mod parsing {
+     use super::*;
+ 
+     use crate::ext::IdentExt;
+     use crate::parse::{Parse, ParseStream, Result};
+     use crate::path;
++    use proc_macro2::{Punct, Spacing, TokenTree};
++    use std::iter::FromIterator;
+ 
+     impl Parse for Type {
+         fn parse(input: ParseStream) -> Result<Self> {
+-            ambig_ty(input, true)
++            let allow_plus = true;
++            ambig_ty(input, allow_plus)
+         }
+     }
+ 
+     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.
+         pub fn without_plus(input: ParseStream) -> Result<Self> {
+-            ambig_ty(input, false)
++            let allow_plus = false;
++            ambig_ty(input, allow_plus)
+         }
+     }
+ 
+     fn ambig_ty(input: ParseStream, allow_plus: bool) -> Result<Type> {
+-        if input.peek(token::Group) {
++        if input.peek(token::Group) && !input.peek2(Token![::]) && !input.peek2(Token![<]) {
+             return input.parse().map(Type::Group);
+         }
+ 
++        let begin = input.fork();
+         let mut lifetimes = None::<BoundLifetimes>;
+         let mut lookahead = input.lookahead1();
+         if lookahead.peek(Token![for]) {
+             lifetimes = input.parse()?;
+             lookahead = input.lookahead1();
+             if !lookahead.peek(Ident)
+                 && !lookahead.peek(Token![fn])
+                 && !lookahead.peek(Token![unsafe])
+@@ -519,17 +419,17 @@ pub mod parsing {
+                             }
+                             match bounds.into_iter().next().unwrap() {
+                                 TypeParamBound::Trait(trait_bound) => {
+                                     TypeParamBound::Trait(TraitBound {
+                                         paren_token: Some(paren_token),
+                                         ..trait_bound
+                                     })
+                                 }
+-                                other => other,
++                                other @ TypeParamBound::Lifetime(_) => other,
+                             }
+                         }
+                         _ => break,
+                     };
+                     return Ok(Type::TraitObject(TypeTraitObject {
+                         dyn_token: None,
+                         bounds: {
+                             let mut bounds = Punctuated::new();
+@@ -544,27 +444,30 @@ pub mod parsing {
+                 }
+             }
+             Ok(Type::Paren(TypeParen {
+                 paren_token,
+                 elem: Box::new(first),
+             }))
+         } else if lookahead.peek(Token![fn])
+             || lookahead.peek(Token![unsafe])
+-            || lookahead.peek(Token![extern]) && !input.peek2(Token![::])
++            || lookahead.peek(Token![extern])
+         {
+-            let mut bare_fn: TypeBareFn = input.parse()?;
+-            bare_fn.lifetimes = lifetimes;
+-            Ok(Type::BareFn(bare_fn))
++            let allow_mut_self = true;
++            if let Some(mut bare_fn) = parse_bare_fn(input, allow_mut_self)? {
++                bare_fn.lifetimes = lifetimes;
++                Ok(Type::BareFn(bare_fn))
++            } else {
++                Ok(Type::Verbatim(verbatim::between(begin, input)))
++            }
+         } else if lookahead.peek(Ident)
+             || input.peek(Token![super])
+             || input.peek(Token![self])
+             || input.peek(Token![Self])
+             || input.peek(Token![crate])
+-            || input.peek(Token![extern])
+             || lookahead.peek(Token![::])
+             || lookahead.peek(Token![<])
+         {
+             if input.peek(Token![dyn]) {
+                 let mut trait_object: TypeTraitObject = input.parse()?;
+                 if lifetimes.is_some() {
+                     match trait_object.bounds.iter_mut().next().unwrap() {
+                         TypeParamBound::Trait(trait_bound) => {
+@@ -717,48 +620,68 @@ pub mod parsing {
+                 // & binds tighter than +, so we don't allow + here.
+                 elem: Box::new(input.call(Type::without_plus)?),
+             })
+         }
+     }
+ 
+     impl Parse for TypeBareFn {
+         fn parse(input: ParseStream) -> Result<Self> {
+-            let args;
+-            let allow_variadic;
+-            Ok(TypeBareFn {
+-                lifetimes: input.parse()?,
+-                unsafety: input.parse()?,
+-                abi: input.parse()?,
+-                fn_token: input.parse()?,
+-                paren_token: parenthesized!(args in input),
+-                inputs: {
+-                    let mut inputs = Punctuated::new();
+-                    while !args.is_empty() && !args.peek(Token![...]) {
+-                        inputs.push_value(args.parse()?);
+-                        if args.is_empty() {
+-                            break;
+-                        }
+-                        inputs.push_punct(args.parse()?);
++            let allow_mut_self = false;
++            parse_bare_fn(input, allow_mut_self).map(Option::unwrap)
++        }
++    }
++
++    fn parse_bare_fn(input: ParseStream, allow_mut_self: bool) -> Result<Option<TypeBareFn>> {
++        let args;
++        let mut variadic = None;
++        let mut has_mut_self = false;
++
++        let bare_fn = TypeBareFn {
++            lifetimes: input.parse()?,
++            unsafety: input.parse()?,
++            abi: input.parse()?,
++            fn_token: input.parse()?,
++            paren_token: parenthesized!(args in input),
++            inputs: {
++                let mut inputs = Punctuated::new();
++
++                while !args.is_empty() {
++                    let attrs = args.call(Attribute::parse_outer)?;
++
++                    if inputs.empty_or_trailing() && args.peek(Token![...]) {
++                        variadic = Some(Variadic {
++                            attrs,
++                            dots: args.parse()?,
++                        });
++                        break;
+                     }
+-                    allow_variadic = inputs.empty_or_trailing();
+-                    inputs
+-                },
+-                variadic: {
+-                    if allow_variadic && args.peek(Token![...]) {
+-                        Some(Variadic {
+-                            attrs: Vec::new(),
+-                            dots: args.parse()?,
+-                        })
++
++                    if let Some(arg) = parse_bare_fn_arg(&args, allow_mut_self)? {
++                        inputs.push_value(BareFnArg { attrs, ..arg });
+                     } else {
+-                        None
++                        has_mut_self = true;
++                    }
++                    if args.is_empty() {
++                        break;
+                     }
+-                },
+-                output: input.call(ReturnType::without_plus)?,
+-            })
++
++                    inputs.push_punct(args.parse()?);
++                }
++
++                inputs
++            },
++            variadic,
++            output: input.call(ReturnType::without_plus)?,
++        };
++
++        if has_mut_self {
++            Ok(None)
++        } else {
++            Ok(Some(bare_fn))
+         }
+     }
+ 
+     impl Parse for TypeNever {
+         fn parse(input: ParseStream) -> Result<Self> {
+             Ok(TypeNever {
+                 bang_token: input.parse()?,
+             })
+@@ -771,19 +694,37 @@ pub mod parsing {
+                 underscore_token: input.parse()?,
+             })
+         }
+     }
+ 
+     impl Parse for TypeTuple {
+         fn parse(input: ParseStream) -> Result<Self> {
+             let content;
++            let paren_token = parenthesized!(content in input);
++
++            if content.is_empty() {
++                return Ok(TypeTuple {
++                    paren_token,
++                    elems: Punctuated::new(),
++                });
++            }
++
++            let first: Type = content.parse()?;
+             Ok(TypeTuple {
+-                paren_token: parenthesized!(content in input),
+-                elems: content.parse_terminated(Type::parse)?,
++                paren_token,
++                elems: {
++                    let mut elems = Punctuated::new();
++                    elems.push_value(first);
++                    elems.push_punct(content.parse()?);
++                    let rest: Punctuated<Type, Token![,]> =
++                        content.parse_terminated(Parse::parse)?;
++                    elems.extend(rest);
++                    elems
++                },
+             })
+         }
+     }
+ 
+     impl Parse for TypeMacro {
+         fn parse(input: ParseStream) -> Result<Self> {
+             Ok(TypeMacro {
+                 mac: input.parse()?,
+@@ -802,19 +743,21 @@ pub mod parsing {
+             }
+ 
+             Ok(TypePath { qself, path })
+         }
+     }
+ 
+     impl ReturnType {
+         pub fn without_plus(input: ParseStream) -> Result<Self> {
+-            Self::parse(input, false)
++            let allow_plus = false;
++            Self::parse(input, allow_plus)
+         }
+ 
++        #[doc(hidden)]
+         pub fn parse(input: ParseStream, allow_plus: bool) -> Result<Self> {
+             if input.peek(Token![->]) {
+                 let arrow = input.parse()?;
+                 let ty = ambig_ty(input, allow_plus)?;
+                 Ok(ReturnType::Type(arrow, Box::new(ty)))
+             } else {
+                 Ok(ReturnType::Default)
+             }
+@@ -839,20 +782,22 @@ pub mod parsing {
+                 return true;
+             }
+         }
+         false
+     }
+ 
+     impl TypeTraitObject {
+         pub fn without_plus(input: ParseStream) -> Result<Self> {
+-            Self::parse(input, false)
++            let allow_plus = false;
++            Self::parse(input, allow_plus)
+         }
+ 
+         // Only allow multiple trait references if allow_plus is true.
++        #[doc(hidden)]
+         pub fn parse(input: ParseStream, allow_plus: bool) -> Result<Self> {
+             Ok(TypeTraitObject {
+                 dyn_token: input.parse()?,
+                 bounds: {
+                     let mut bounds = Punctuated::new();
+                     if allow_plus {
+                         loop {
+                             bounds.push_value(input.parse()?);
+@@ -905,48 +850,99 @@ pub mod parsing {
+                 group_token: group.token,
+                 elem: group.content.parse()?,
+             })
+         }
+     }
+ 
+     impl Parse for TypeParen {
+         fn parse(input: ParseStream) -> Result<Self> {
+-            Self::parse(input, false)
++            let allow_plus = false;
++            Self::parse(input, allow_plus)
+         }
+     }
+ 
+     impl TypeParen {
+         fn parse(input: ParseStream, allow_plus: bool) -> Result<Self> {
+             let content;
+             Ok(TypeParen {
+                 paren_token: parenthesized!(content in input),
+                 elem: Box::new(ambig_ty(&content, allow_plus)?),
+             })
+         }
+     }
+ 
+     impl Parse for BareFnArg {
+         fn parse(input: ParseStream) -> Result<Self> {
+-            Ok(BareFnArg {
+-                attrs: input.call(Attribute::parse_outer)?,
+-                name: {
+-                    if (input.peek(Ident) || input.peek(Token![_]))
+-                        && input.peek2(Token![:])
+-                        && !input.peek2(Token![::])
+-                    {
+-                        let name = input.call(Ident::parse_any)?;
+-                        let colon: Token![:] = input.parse()?;
+-                        Some((name, colon))
+-                    } else {
+-                        None
+-                    }
+-                },
+-                ty: input.parse()?,
+-            })
++            let allow_mut_self = false;
++            parse_bare_fn_arg(input, allow_mut_self).map(Option::unwrap)
++        }
++    }
++
++    fn parse_bare_fn_arg(
++        input: ParseStream,
++        mut allow_mut_self: bool,
++    ) -> Result<Option<BareFnArg>> {
++        let mut has_mut_self = false;
++        let arg = BareFnArg {
++            attrs: input.call(Attribute::parse_outer)?,
++            name: {
++                if (input.peek(Ident) || input.peek(Token![_]) || input.peek(Token![self]))
++                    && input.peek2(Token![:])
++                    && !input.peek2(Token![::])
++                {
++                    let name = input.call(Ident::parse_any)?;
++                    let colon: Token![:] = input.parse()?;
++                    Some((name, colon))
++                } else if allow_mut_self
++                    && input.peek(Token![mut])
++                    && input.peek2(Token![self])
++                    && input.peek3(Token![:])
++                    && !input.peek3(Token![::])
++                {
++                    has_mut_self = true;
++                    allow_mut_self = false;
++                    input.parse::<Token![mut]>()?;
++                    input.parse::<Token![self]>()?;
++                    input.parse::<Token![:]>()?;
++                    None
++                } else {
++                    None
++                }
++            },
++            ty: if !has_mut_self && input.peek(Token![...]) {
++                let dot3 = input.parse::<Token![...]>()?;
++                let args = vec![
++                    TokenTree::Punct(Punct::new('.', Spacing::Joint)),
++                    TokenTree::Punct(Punct::new('.', Spacing::Joint)),
++                    TokenTree::Punct(Punct::new('.', Spacing::Alone)),
++                ];
++                let tokens = TokenStream::from_iter(args.into_iter().zip(&dot3.spans).map(
++                    |(mut arg, span)| {
++                        arg.set_span(*span);
++                        arg
++                    },
++                ));
++                Type::Verbatim(tokens)
++            } else if allow_mut_self && input.peek(Token![mut]) && input.peek2(Token![self]) {
++                has_mut_self = true;
++                input.parse::<Token![mut]>()?;
++                Type::Path(TypePath {
++                    qself: None,
++                    path: input.parse::<Token![self]>()?.into(),
++                })
++            } else {
++                input.parse()?
++            },
++        };
++
++        if has_mut_self {
++            Ok(None)
++        } else {
++            Ok(Some(arg))
+         }
+     }
+ 
+     impl Parse for Abi {
+         fn parse(input: ParseStream) -> Result<Self> {
+             Ok(Abi {
+                 extern_token: input.parse()?,
+                 name: input.parse()?,
+diff --git a/third_party/rust/syn/src/verbatim.rs b/third_party/rust/syn/src/verbatim.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/src/verbatim.rs
+@@ -0,0 +1,15 @@
++use crate::parse::{ParseBuffer, ParseStream};
++use proc_macro2::TokenStream;
++use std::iter;
++
++pub fn between<'a>(begin: ParseBuffer<'a>, end: ParseStream<'a>) -> TokenStream {
++    let end = end.cursor();
++    let mut cursor = begin.cursor();
++    let mut tokens = TokenStream::new();
++    while cursor != end {
++        let (tt, next) = cursor.token_tree().unwrap();
++        tokens.extend(iter::once(tt));
++        cursor = next;
++    }
++    tokens
++}
+diff --git a/third_party/rust/syn/src/whitespace.rs b/third_party/rust/syn/src/whitespace.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/src/whitespace.rs
+@@ -0,0 +1,65 @@
++pub fn skip(mut s: &str) -> &str {
++    'skip: while !s.is_empty() {
++        let byte = s.as_bytes()[0];
++        if byte == b'/' {
++            if s.starts_with("//")
++                && (!s.starts_with("///") || s.starts_with("////"))
++                && !s.starts_with("//!")
++            {
++                if let Some(i) = s.find('\n') {
++                    s = &s[i + 1..];
++                    continue;
++                } else {
++                    return "";
++                }
++            } else if s.starts_with("/**/") {
++                s = &s[4..];
++                continue;
++            } else if s.starts_with("/*")
++                && (!s.starts_with("/**") || s.starts_with("/***"))
++                && !s.starts_with("/*!")
++            {
++                let mut depth = 0;
++                let bytes = s.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 {
++                            s = &s[i + 2..];
++                            continue 'skip;
++                        }
++                        i += 1; // eat '/'
++                    }
++                    i += 1;
++                }
++                return s;
++            }
++        }
++        match byte {
++            b' ' | 0x09..=0x0d => {
++                s = &s[1..];
++                continue;
++            }
++            b if b <= 0x7f => {}
++            _ => {
++                let ch = s.chars().next().unwrap();
++                if is_whitespace(ch) {
++                    s = &s[ch.len_utf8()..];
++                    continue;
++                }
++            }
++        }
++        return s;
++    }
++    s
++}
++
++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}'
++}
+diff --git a/third_party/rust/syn/tests/.gitignore b/third_party/rust/syn/tests/.gitignore
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/tests/.gitignore
+@@ -0,0 +1,1 @@
++/*.pending-snap
+diff --git a/third_party/rust/syn/tests/clone.sh b/third_party/rust/syn/tests/clone.sh
+deleted file mode 100755
+--- a/third_party/rust/syn/tests/clone.sh
++++ /dev/null
+@@ -1,16 +0,0 @@
+-#!/bin/bash
+-
+-REV=4560cb830fce63fcffdc4558f4281aaac6a3a1ba
+-
+-set -euo pipefail
+-cd "$(dirname "${BASH_SOURCE[0]}")"
+-mkdir -p rust
+-touch rust/COMMIT
+-
+-if [ "$(cat rust/COMMIT)" != "$REV" ]; then
+-    rm -rf rust
+-    mkdir rust
+-    curl -L "https://github.com/rust-lang/rust/archive/${REV}.tar.gz" \
+-        | tar xz --directory rust --strip-components 1
+-    echo "$REV" > rust/COMMIT
+-fi
+diff --git a/third_party/rust/syn/tests/common/eq.rs b/third_party/rust/syn/tests/common/eq.rs
+--- a/third_party/rust/syn/tests/common/eq.rs
++++ b/third_party/rust/syn/tests/common/eq.rs
+@@ -1,41 +1,40 @@
++extern crate rustc_ast;
+ extern crate rustc_data_structures;
++extern crate rustc_span;
+ extern crate rustc_target;
+-extern crate syntax;
+-extern crate syntax_pos;
+ 
+ use std::mem;
+ 
+-use self::rustc_data_structures::sync::Lrc;
+-use self::rustc_data_structures::thin_vec::ThinVec;
+-use self::rustc_target::abi::FloatTy;
+-use self::rustc_target::spec::abi::Abi;
+-use self::syntax::ast::{
+-    AngleBracketedArgs, AnonConst, Arg, Arm, AsmDialect, AssocTyConstraint, AssocTyConstraintKind,
+-    AttrId, AttrStyle, Attribute, BareFnTy, BinOpKind, BindingMode, Block, BlockCheckMode,
+-    CaptureBy, Constness, Crate, CrateSugar, Defaultness, EnumDef, Expr, ExprKind, Field, FieldPat,
+-    FnDecl, FnHeader, ForeignItem, ForeignItemKind, ForeignMod, FunctionRetTy, GenericArg,
+-    GenericArgs, GenericBound, GenericParam, GenericParamKind, Generics, GlobalAsm, Ident,
+-    ImplItem, ImplItemKind, ImplPolarity, InlineAsm, InlineAsmOutput, IntTy, IsAsync, IsAuto, Item,
+-    ItemKind, Label, Lifetime, Lit, LitIntType, LitKind, Local, Mac, MacDelimiter, MacStmtStyle,
+-    MacroDef, MethodSig, Mod, Movability, MutTy, Mutability, NodeId, ParenthesizedArgs, Pat,
+-    PatKind, Path, PathSegment, PolyTraitRef, QSelf, RangeEnd, RangeLimits, RangeSyntax, Stmt,
+-    StmtKind, StrStyle, StructField, TraitBoundModifier, TraitItem, TraitItemKind,
+-    TraitObjectSyntax, TraitRef, Ty, TyKind, UintTy, UnOp, UnsafeSource, Unsafety, UseTree,
+-    UseTreeKind, Variant, VariantData, VisibilityKind, WhereBoundPredicate, WhereClause,
+-    WhereEqPredicate, WherePredicate, WhereRegionPredicate,
++use rustc_ast::ast::{
++    AngleBracketedArg, AngleBracketedArgs, AnonConst, Arm, AssocItemKind, AssocTyConstraint,
++    AssocTyConstraintKind, Async, AttrId, AttrItem, AttrKind, AttrStyle, Attribute, BareFnTy,
++    BinOpKind, BindingMode, Block, BlockCheckMode, BorrowKind, CaptureBy, Const, Crate, CrateSugar,
++    Defaultness, EnumDef, Expr, ExprKind, Extern, Field, FieldPat, FloatTy, FnDecl, FnHeader,
++    FnRetTy, FnSig, ForeignItemKind, ForeignMod, GenericArg, GenericArgs, GenericBound,
++    GenericParam, GenericParamKind, Generics, GlobalAsm, ImplPolarity, InlineAsm, InlineAsmOperand,
++    InlineAsmOptions, InlineAsmRegOrRegClass, InlineAsmTemplatePiece, IntTy, IsAuto, Item,
++    ItemKind, Label, Lifetime, Lit, LitFloatType, LitIntType, LitKind, LlvmAsmDialect,
++    LlvmInlineAsm, LlvmInlineAsmOutput, Local, MacArgs, MacCall, MacCallStmt, MacDelimiter,
++    MacStmtStyle, MacroDef, Mod, Movability, MutTy, Mutability, NodeId, Param, ParenthesizedArgs,
++    Pat, PatKind, Path, PathSegment, PolyTraitRef, QSelf, RangeEnd, RangeLimits, RangeSyntax, Stmt,
++    StmtKind, StrLit, StrStyle, StructField, TraitBoundModifier, TraitObjectSyntax, TraitRef, Ty,
++    TyKind, UintTy, UnOp, Unsafe, UnsafeSource, UseTree, UseTreeKind, Variant, VariantData,
++    VisibilityKind, WhereBoundPredicate, WhereClause, WhereEqPredicate, WherePredicate,
++    WhereRegionPredicate,
+ };
+-use self::syntax::parse::lexer::comments;
+-use self::syntax::parse::token::{self, DelimToken, Token, TokenKind};
+-use self::syntax::ptr::P;
+-use self::syntax::source_map::Spanned;
+-use self::syntax::symbol::{sym, Symbol};
+-use self::syntax::tokenstream::{DelimSpan, TokenStream, TokenTree};
+-use self::syntax_pos::{Span, SyntaxContext, DUMMY_SP};
++use rustc_ast::ptr::P;
++use rustc_ast::token::{self, CommentKind, DelimToken, Token, TokenKind};
++use rustc_ast::tokenstream::{DelimSpan, TokenStream, TokenTree};
++use rustc_data_structures::sync::Lrc;
++use rustc_data_structures::thin_vec::ThinVec;
++use rustc_span::source_map::Spanned;
++use rustc_span::symbol::Ident;
++use rustc_span::{Span, Symbol, SyntaxContext};
+ 
+ pub trait SpanlessEq {
+     fn eq(&self, other: &Self) -> bool;
+ }
+ 
+ impl<T: SpanlessEq> SpanlessEq for P<T> {
+     fn eq(&self, other: &Self) -> bool {
+         SpanlessEq::eq(&**self, &**other)
+@@ -81,24 +80,16 @@ impl<T: SpanlessEq> SpanlessEq for Spann
+ }
+ 
+ impl<A: SpanlessEq, B: SpanlessEq> SpanlessEq for (A, B) {
+     fn eq(&self, other: &Self) -> bool {
+         SpanlessEq::eq(&self.0, &other.0) && SpanlessEq::eq(&self.1, &other.1)
+     }
+ }
+ 
+-impl<A: SpanlessEq, B: SpanlessEq, C: SpanlessEq> SpanlessEq for (A, B, C) {
+-    fn eq(&self, other: &Self) -> bool {
+-        SpanlessEq::eq(&self.0, &other.0)
+-            && SpanlessEq::eq(&self.1, &other.1)
+-            && SpanlessEq::eq(&self.2, &other.2)
+-    }
+-}
+-
+ macro_rules! spanless_eq_true {
+     ($name:ident) => {
+         impl SpanlessEq for $name {
+             fn eq(&self, _other: &Self) -> bool {
+                 true
+             }
+         }
+     };
+@@ -121,60 +112,62 @@ macro_rules! spanless_eq_partial_eq {
+ }
+ 
+ spanless_eq_partial_eq!(bool);
+ spanless_eq_partial_eq!(u8);
+ spanless_eq_partial_eq!(u16);
+ spanless_eq_partial_eq!(u128);
+ spanless_eq_partial_eq!(usize);
+ spanless_eq_partial_eq!(char);
++spanless_eq_partial_eq!(String);
+ spanless_eq_partial_eq!(Symbol);
+-spanless_eq_partial_eq!(Abi);
++spanless_eq_partial_eq!(CommentKind);
+ spanless_eq_partial_eq!(DelimToken);
++spanless_eq_partial_eq!(InlineAsmOptions);
+ 
+ macro_rules! spanless_eq_struct {
+     {
+-        $name:ident;
++        $name:ident $(<$param:ident>)?;
+         $([$field:ident $other:ident])*
+         $(![$ignore:ident])*
+     } => {
+-        impl SpanlessEq for $name {
++        impl $(<$param: SpanlessEq>)* SpanlessEq for $name $(<$param>)* {
+             fn eq(&self, other: &Self) -> bool {
+                 let $name { $($field,)* $($ignore: _,)* } = self;
+                 let $name { $($field: $other,)* $($ignore: _,)* } = other;
+                 $(SpanlessEq::eq($field, $other))&&*
+             }
+         }
+     };
+ 
+     {
+-        $name:ident;
++        $name:ident $(<$param:ident>)?;
+         $([$field:ident $other:ident])*
+         $next:ident
+         $($rest:ident)*
+         $(!$ignore:ident)*
+     } => {
+         spanless_eq_struct! {
+-            $name;
++            $name $(<$param>)*;
+             $([$field $other])*
+             [$next other]
+             $($rest)*
+             $(!$ignore)*
+         }
+     };
+ 
+     {
+-        $name:ident;
++        $name:ident $(<$param:ident>)?;
+         $([$field:ident $other:ident])*
+         $(![$ignore:ident])*
+         !$next:ident
+         $(!$rest:ident)*
+     } => {
+         spanless_eq_struct! {
+-            $name;
++            $name $(<$param>)*;
+             $([$field $other])*
+             $(![$ignore])*
+             ![$next]
+             $(!$rest)*
+         }
+     };
+ }
+ 
+@@ -258,129 +251,141 @@ macro_rules! spanless_eq_enum {
+             $name;
+             $([$variant $($fields)*])*
+             [$next]
+             $($rest)*
+         }
+     };
+ }
+ 
+-spanless_eq_struct!(AngleBracketedArgs; span args constraints);
++spanless_eq_struct!(AngleBracketedArgs; span args);
+ spanless_eq_struct!(AnonConst; id value);
+-spanless_eq_struct!(Arg; attrs ty pat id span);
+-spanless_eq_struct!(Arm; attrs pats guard body span id);
++spanless_eq_struct!(Arm; attrs pat guard body span id is_placeholder);
+ spanless_eq_struct!(AssocTyConstraint; id ident kind span);
+-spanless_eq_struct!(Attribute; id style path tokens span !is_sugared_doc);
+-spanless_eq_struct!(BareFnTy; unsafety abi generic_params decl);
++spanless_eq_struct!(AttrItem; path args);
++spanless_eq_struct!(Attribute; kind id style span);
++spanless_eq_struct!(BareFnTy; unsafety ext generic_params decl);
+ spanless_eq_struct!(Block; stmts id rules span);
+-spanless_eq_struct!(Crate; module attrs span);
++spanless_eq_struct!(Crate; module attrs span proc_macros);
+ spanless_eq_struct!(EnumDef; variants);
+-spanless_eq_struct!(Expr; id node span attrs);
+-spanless_eq_struct!(Field; ident expr span is_shorthand attrs id);
+-spanless_eq_struct!(FieldPat; ident pat is_shorthand attrs id span);
+-spanless_eq_struct!(FnDecl; inputs output c_variadic);
+-spanless_eq_struct!(FnHeader; constness asyncness unsafety abi);
+-spanless_eq_struct!(ForeignItem; ident attrs node id span vis);
++spanless_eq_struct!(Expr; id kind span attrs !tokens);
++spanless_eq_struct!(Field; attrs id span ident expr is_shorthand is_placeholder);
++spanless_eq_struct!(FieldPat; ident pat is_shorthand attrs id span is_placeholder);
++spanless_eq_struct!(FnDecl; inputs output);
++spanless_eq_struct!(FnHeader; constness asyncness unsafety ext);
++spanless_eq_struct!(FnSig; header decl span);
+ spanless_eq_struct!(ForeignMod; abi items);
+-spanless_eq_struct!(GenericParam; id ident attrs bounds kind);
++spanless_eq_struct!(GenericParam; id ident attrs bounds is_placeholder kind);
+ spanless_eq_struct!(Generics; params where_clause span);
+ spanless_eq_struct!(GlobalAsm; asm);
+-spanless_eq_struct!(ImplItem; id ident vis defaultness attrs generics node span !tokens);
+-spanless_eq_struct!(InlineAsm; asm asm_str_style outputs inputs clobbers volatile alignstack dialect);
+-spanless_eq_struct!(InlineAsmOutput; constraint expr is_rw is_indirect);
+-spanless_eq_struct!(Item; ident attrs id node vis span !tokens);
++spanless_eq_struct!(InlineAsm; template operands options line_spans);
++spanless_eq_struct!(Item<K>; attrs id span vis ident kind !tokens);
+ spanless_eq_struct!(Label; ident);
+ spanless_eq_struct!(Lifetime; id ident);
+-spanless_eq_struct!(Lit; token node span);
++spanless_eq_struct!(Lit; token kind span);
++spanless_eq_struct!(LlvmInlineAsm; asm asm_str_style outputs inputs clobbers volatile alignstack dialect);
++spanless_eq_struct!(LlvmInlineAsmOutput; constraint expr is_rw is_indirect);
+ spanless_eq_struct!(Local; pat ty init id span attrs);
+-spanless_eq_struct!(Mac; path delim tts span prior_type_ascription);
+-spanless_eq_struct!(MacroDef; tokens legacy);
+-spanless_eq_struct!(MethodSig; header decl);
++spanless_eq_struct!(MacCall; path args prior_type_ascription);
++spanless_eq_struct!(MacCallStmt; mac style attrs);
++spanless_eq_struct!(MacroDef; body macro_rules);
+ spanless_eq_struct!(Mod; inner items inline);
+ spanless_eq_struct!(MutTy; ty mutbl);
++spanless_eq_struct!(Param; attrs ty pat id span is_placeholder);
+ spanless_eq_struct!(ParenthesizedArgs; span inputs output);
+-spanless_eq_struct!(Pat; id node span);
++spanless_eq_struct!(Pat; id kind span tokens);
+ spanless_eq_struct!(Path; span segments);
+ spanless_eq_struct!(PathSegment; ident id args);
+ spanless_eq_struct!(PolyTraitRef; bound_generic_params trait_ref span);
+ spanless_eq_struct!(QSelf; ty path_span position);
+-spanless_eq_struct!(Stmt; id node span);
+-spanless_eq_struct!(StructField; span ident vis id ty attrs);
++spanless_eq_struct!(Stmt; id kind span);
++spanless_eq_struct!(StrLit; style symbol suffix span symbol_unescaped);
++spanless_eq_struct!(StructField; attrs id span vis ident ty is_placeholder);
+ spanless_eq_struct!(Token; kind span);
+-spanless_eq_struct!(TraitItem; id ident attrs generics node span !tokens);
+ spanless_eq_struct!(TraitRef; path ref_id);
+-spanless_eq_struct!(Ty; id node span);
++spanless_eq_struct!(Ty; id kind span);
+ spanless_eq_struct!(UseTree; prefix kind span);
+-spanless_eq_struct!(Variant; ident attrs id data disr_expr span);
++spanless_eq_struct!(Variant; attrs id span vis ident data disr_expr is_placeholder);
+ spanless_eq_struct!(WhereBoundPredicate; span bound_generic_params bounded_ty bounds);
+-spanless_eq_struct!(WhereClause; predicates span);
++spanless_eq_struct!(WhereClause; has_where_token predicates span);
+ spanless_eq_struct!(WhereEqPredicate; id span lhs_ty rhs_ty);
+ spanless_eq_struct!(WhereRegionPredicate; span lifetime bounds);
+-spanless_eq_enum!(AsmDialect; Att Intel);
++spanless_eq_enum!(AngleBracketedArg; Arg(0) Constraint(0));
++spanless_eq_enum!(AssocItemKind; Const(0 1 2) Fn(0 1 2 3) TyAlias(0 1 2 3) MacCall(0));
+ spanless_eq_enum!(AssocTyConstraintKind; Equality(ty) Bound(bounds));
++spanless_eq_enum!(Async; Yes(span closure_id return_impl_trait_id) No);
++spanless_eq_enum!(AttrKind; Normal(0) DocComment(0 1));
+ spanless_eq_enum!(AttrStyle; Outer Inner);
+ spanless_eq_enum!(BinOpKind; Add Sub Mul Div Rem And Or BitXor BitAnd BitOr Shl Shr Eq Lt Le Ne Ge Gt);
+ spanless_eq_enum!(BindingMode; ByRef(0) ByValue(0));
+ spanless_eq_enum!(BlockCheckMode; Default Unsafe(0));
++spanless_eq_enum!(BorrowKind; Ref Raw);
+ spanless_eq_enum!(CaptureBy; Value Ref);
+-spanless_eq_enum!(Constness; Const NotConst);
++spanless_eq_enum!(Const; Yes(0) No);
+ spanless_eq_enum!(CrateSugar; PubCrate JustCrate);
+-spanless_eq_enum!(Defaultness; Default Final);
++spanless_eq_enum!(Defaultness; Default(0) Final);
++spanless_eq_enum!(Extern; None Implicit Explicit(0));
+ spanless_eq_enum!(FloatTy; F32 F64);
+-spanless_eq_enum!(ForeignItemKind; Fn(0 1) Static(0 1) Ty Macro(0));
+-spanless_eq_enum!(FunctionRetTy; Default(0) Ty(0));
++spanless_eq_enum!(FnRetTy; Default(0) Ty(0));
++spanless_eq_enum!(ForeignItemKind; Static(0 1 2) Fn(0 1 2 3) TyAlias(0 1 2 3) MacCall(0));
+ spanless_eq_enum!(GenericArg; Lifetime(0) Type(0) Const(0));
+ spanless_eq_enum!(GenericArgs; AngleBracketed(0) Parenthesized(0));
+ spanless_eq_enum!(GenericBound; Trait(0 1) Outlives(0));
+-spanless_eq_enum!(GenericParamKind; Lifetime Type(default) Const(ty));
+-spanless_eq_enum!(ImplItemKind; Const(0 1) Method(0 1) TyAlias(0) OpaqueTy(0) Macro(0));
+-spanless_eq_enum!(ImplPolarity; Positive Negative);
++spanless_eq_enum!(GenericParamKind; Lifetime Type(default) Const(ty kw_span));
++spanless_eq_enum!(ImplPolarity; Positive Negative(0));
++spanless_eq_enum!(InlineAsmRegOrRegClass; Reg(0) RegClass(0));
++spanless_eq_enum!(InlineAsmTemplatePiece; String(0) Placeholder(operand_idx modifier span));
+ spanless_eq_enum!(IntTy; Isize I8 I16 I32 I64 I128);
+-spanless_eq_enum!(IsAsync; Async(closure_id return_impl_trait_id) NotAsync);
+ spanless_eq_enum!(IsAuto; Yes No);
++spanless_eq_enum!(LitFloatType; Suffixed(0) Unsuffixed);
+ spanless_eq_enum!(LitIntType; Signed(0) Unsigned(0) Unsuffixed);
++spanless_eq_enum!(LlvmAsmDialect; Att Intel);
++spanless_eq_enum!(MacArgs; Empty Delimited(0 1 2) Eq(0 1));
+ spanless_eq_enum!(MacDelimiter; Parenthesis Bracket Brace);
+ spanless_eq_enum!(MacStmtStyle; Semicolon Braces NoBraces);
+ spanless_eq_enum!(Movability; Static Movable);
+-spanless_eq_enum!(Mutability; Mutable Immutable);
++spanless_eq_enum!(Mutability; Mut Not);
+ spanless_eq_enum!(RangeEnd; Included(0) Excluded);
+ spanless_eq_enum!(RangeLimits; HalfOpen Closed);
+-spanless_eq_enum!(StmtKind; Local(0) Item(0) Expr(0) Semi(0) Mac(0));
++spanless_eq_enum!(StmtKind; Local(0) Item(0) Expr(0) Semi(0) Empty MacCall(0));
+ spanless_eq_enum!(StrStyle; Cooked Raw(0));
+ spanless_eq_enum!(TokenTree; Token(0) Delimited(0 1 2));
+-spanless_eq_enum!(TraitBoundModifier; None Maybe);
+-spanless_eq_enum!(TraitItemKind; Const(0 1) Method(0 1) Type(0 1) Macro(0));
++spanless_eq_enum!(TraitBoundModifier; None Maybe MaybeConst MaybeConstMaybe);
+ spanless_eq_enum!(TraitObjectSyntax; Dyn None);
+ spanless_eq_enum!(UintTy; Usize U8 U16 U32 U64 U128);
+ spanless_eq_enum!(UnOp; Deref Not Neg);
++spanless_eq_enum!(Unsafe; Yes(0) No);
+ spanless_eq_enum!(UnsafeSource; CompilerGenerated UserProvided);
+-spanless_eq_enum!(Unsafety; Unsafe Normal);
+ spanless_eq_enum!(UseTreeKind; Simple(0 1 2) Nested(0) Glob);
+ spanless_eq_enum!(VariantData; Struct(0 1) Tuple(0 1) Unit(0));
+ spanless_eq_enum!(VisibilityKind; Public Crate(0) Restricted(path id) Inherited);
+ spanless_eq_enum!(WherePredicate; BoundPredicate(0) RegionPredicate(0) EqPredicate(0));
+-spanless_eq_enum!(ExprKind; Box(0) Array(0) Call(0 1) MethodCall(0 1) Tup(0)
++spanless_eq_enum!(ExprKind; Box(0) Array(0) Call(0 1) MethodCall(0 1 2) Tup(0)
+     Binary(0 1 2) Unary(0 1) Lit(0) Cast(0 1) Type(0 1) Let(0 1) If(0 1 2)
+     While(0 1 2) ForLoop(0 1 2 3) Loop(0 1) Match(0 1) Closure(0 1 2 3 4 5)
+-    Block(0 1) Async(0 1 2) Await(0) TryBlock(0) Assign(0 1) AssignOp(0 1 2)
+-    Field(0 1) Index(0 1) Range(0 1 2) Path(0 1) AddrOf(0 1) Break(0 1)
+-    Continue(0) Ret(0) InlineAsm(0) Mac(0) Struct(0 1 2) Repeat(0 1) Paren(0)
+-    Try(0) Yield(0) Err);
+-spanless_eq_enum!(ItemKind; ExternCrate(0) Use(0) Static(0 1 2) Const(0 1)
+-    Fn(0 1 2 3) Mod(0) ForeignMod(0) GlobalAsm(0) TyAlias(0 1) OpaqueTy(0 1)
+-    Enum(0 1) Struct(0 1) Union(0 1) Trait(0 1 2 3 4) TraitAlias(0 1)
+-    Impl(0 1 2 3 4 5 6) Mac(0) MacroDef(0));
++    Block(0 1) Async(0 1 2) Await(0) TryBlock(0) Assign(0 1 2) AssignOp(0 1 2)
++    Field(0 1) Index(0 1) Range(0 1 2) Path(0 1) AddrOf(0 1 2) Break(0 1)
++    Continue(0) Ret(0) InlineAsm(0) LlvmInlineAsm(0) MacCall(0) Struct(0 1 2)
++    Repeat(0 1) Paren(0) Try(0) Yield(0) Err);
++spanless_eq_enum!(InlineAsmOperand; In(reg expr) Out(reg late expr)
++    InOut(reg late expr) SplitInOut(reg late in_expr out_expr) Const(expr)
++    Sym(expr));
++spanless_eq_enum!(ItemKind; ExternCrate(0) Use(0) Static(0 1 2) Const(0 1 2)
++    Fn(0 1 2 3) Mod(0) ForeignMod(0) GlobalAsm(0) TyAlias(0 1 2 3) Enum(0 1)
++    Struct(0 1) Union(0 1) Trait(0 1 2 3 4) TraitAlias(0 1)
++    Impl(unsafety polarity defaultness constness generics of_trait self_ty items)
++    MacCall(0) MacroDef(0));
+ spanless_eq_enum!(LitKind; Str(0 1) ByteStr(0) Byte(0) Char(0) Int(0 1)
+-    Float(0 1) FloatUnsuffixed(0) Bool(0) Err(0));
++    Float(0 1) Bool(0) Err(0));
+ spanless_eq_enum!(PatKind; Wild Ident(0 1 2) Struct(0 1 2) TupleStruct(0 1)
+     Or(0) Path(0 1) Tuple(0) Box(0) Ref(0 1) Lit(0) Range(0 1 2) Slice(0) Rest
+-    Paren(0) Mac(0));
++    Paren(0) MacCall(0));
+ spanless_eq_enum!(TyKind; Slice(0) Array(0 1) Ptr(0) Rptr(0 1) BareFn(0) Never
+     Tup(0) Path(0 1) TraitObject(0 1) ImplTrait(0 1) Paren(0) Typeof(0) Infer
+-    ImplicitSelf Mac(0) Err CVarArgs);
++    ImplicitSelf MacCall(0) Err CVarArgs);
+ 
+ impl SpanlessEq for Ident {
+     fn eq(&self, other: &Self) -> bool {
+         self.as_str() == other.as_str()
+     }
+ }
+ 
+ // Give up on comparing literals inside of macros because there are so many
+@@ -409,49 +414,25 @@ impl SpanlessEq for TokenKind {
+             },
+             _ => self == other,
+         }
+     }
+ }
+ 
+ impl SpanlessEq for TokenStream {
+     fn eq(&self, other: &Self) -> bool {
+-        SpanlessEq::eq(&expand_tts(self), &expand_tts(other))
++        let mut this = self.clone().into_trees();
++        let mut other = other.clone().into_trees();
++        loop {
++            let this = match this.next() {
++                None => return other.next().is_none(),
++                Some(val) => val,
++            };
++            let other = match other.next() {
++                None => return false,
++                Some(val) => val,
++            };
++            if !SpanlessEq::eq(&this, &other) {
++                return false;
++            }
++        }
+     }
+ }
+-
+-fn expand_tts(tts: &TokenStream) -> Vec<TokenTree> {
+-    let mut tokens = Vec::new();
+-    for tt in tts.clone().into_trees() {
+-        let c = match tt {
+-            TokenTree::Token(Token {
+-                kind: TokenKind::DocComment(c),
+-                ..
+-            }) => c,
+-            _ => {
+-                tokens.push(tt);
+-                continue;
+-            }
+-        };
+-        let contents = comments::strip_doc_comment_decoration(&c.as_str());
+-        let style = comments::doc_comment_style(&c.as_str());
+-        tokens.push(TokenTree::token(TokenKind::Pound, DUMMY_SP));
+-        if style == AttrStyle::Inner {
+-            tokens.push(TokenTree::token(TokenKind::Not, DUMMY_SP));
+-        }
+-        let lit = token::Lit {
+-            kind: token::LitKind::Str,
+-            symbol: Symbol::intern(&contents),
+-            suffix: None,
+-        };
+-        let tts = vec![
+-            TokenTree::token(TokenKind::Ident(sym::doc, false), DUMMY_SP),
+-            TokenTree::token(TokenKind::Eq, DUMMY_SP),
+-            TokenTree::token(TokenKind::Literal(lit), DUMMY_SP),
+-        ];
+-        tokens.push(TokenTree::Delimited(
+-            DelimSpan::dummy(),
+-            DelimToken::Bracket,
+-            tts.into_iter().collect::<TokenStream>().into(),
+-        ));
+-    }
+-    tokens
+-}
+diff --git a/third_party/rust/syn/tests/common/mod.rs b/third_party/rust/syn/tests/common/mod.rs
+--- a/third_party/rust/syn/tests/common/mod.rs
++++ b/third_party/rust/syn/tests/common/mod.rs
+@@ -1,14 +1,27 @@
+ #![allow(dead_code)]
+ 
++use rayon::ThreadPoolBuilder;
+ use std::env;
+ 
+ pub mod eq;
+ pub mod parse;
+ 
+ /// Read the `ABORT_AFTER_FAILURE` environment variable, and parse it.
+ pub fn abort_after() -> usize {
+     match env::var("ABORT_AFTER_FAILURE") {
+         Ok(s) => s.parse().expect("failed to parse ABORT_AFTER_FAILURE"),
+         Err(_) => usize::max_value(),
+     }
+ }
++
++/// Configure Rayon threadpool.
++pub fn rayon_init() {
++    let stack_size = match env::var("RUST_MIN_STACK") {
++        Ok(s) => s.parse().expect("failed to parse RUST_MIN_STACK"),
++        Err(_) => 20 * 1024 * 1024,
++    };
++    ThreadPoolBuilder::new()
++        .stack_size(stack_size)
++        .build_global()
++        .unwrap();
++}
+diff --git a/third_party/rust/syn/tests/common/parse.rs b/third_party/rust/syn/tests/common/parse.rs
+--- a/third_party/rust/syn/tests/common/parse.rs
++++ b/third_party/rust/syn/tests/common/parse.rs
+@@ -1,25 +1,25 @@
+-extern crate proc_macro2;
+-extern crate syn;
+-extern crate syntax;
+-extern crate syntax_pos;
++extern crate rustc_ast;
++extern crate rustc_expand;
++extern crate rustc_parse as parse;
++extern crate rustc_session;
++extern crate rustc_span;
+ 
+-use self::syntax::ast;
+-use self::syntax::parse::{self, ParseSess};
+-use self::syntax::ptr::P;
+-use self::syntax::source_map::FilePathMapping;
+-use self::syntax_pos::FileName;
++use rustc_ast::ast;
++use rustc_ast::ptr::P;
++use rustc_session::parse::ParseSess;
++use rustc_span::source_map::FilePathMapping;
++use rustc_span::FileName;
+ 
+ use std::panic;
+ 
+-pub fn libsyntax_expr(input: &str) -> Option<P<ast::Expr>> {
++pub fn librustc_expr(input: &str) -> Option<P<ast::Expr>> {
+     match panic::catch_unwind(|| {
+         let sess = ParseSess::new(FilePathMapping::empty());
+-        sess.span_diagnostic.set_continue_after_error(false);
+         let e = parse::new_parser_from_source_str(
+             &sess,
+             FileName::Custom("test_precedence".to_string()),
+             input.to_string(),
+         )
+         .parse_expr();
+         match e {
+             Ok(expr) => Some(expr),
+@@ -27,17 +27,17 @@ pub fn libsyntax_expr(input: &str) -> Op
+                 diagnostic.emit();
+                 None
+             }
+         }
+     }) {
+         Ok(Some(e)) => Some(e),
+         Ok(None) => None,
+         Err(_) => {
+-            errorf!("libsyntax panicked\n");
++            errorf!("librustc panicked\n");
+             None
+         }
+     }
+ }
+ 
+ pub fn syn_expr(input: &str) -> Option<syn::Expr> {
+     match syn::parse_str(input) {
+         Ok(e) => Some(e),
+diff --git a/third_party/rust/syn/tests/debug/gen.rs b/third_party/rust/syn/tests/debug/gen.rs
+--- a/third_party/rust/syn/tests/debug/gen.rs
++++ b/third_party/rust/syn/tests/debug/gen.rs
+@@ -1,13 +1,13 @@
+ // This file is @generated by syn-internal-codegen.
+ // It is not intended for manual editing.
+ 
+ use super::{Lite, RefCast};
+-use std::fmt::{self, Debug};
++use std::fmt::{self, Debug, Display};
+ impl Debug for Lite<syn::Abi> {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+         let _val = &self.value;
+         let mut formatter = formatter.debug_struct("Abi");
+         if let Some(val) = &_val.name {
+             #[derive(RefCast)]
+             #[repr(transparent)]
+             struct Print(syn::LitStr);
+@@ -1034,19 +1034,19 @@ impl Debug for Lite<syn::Expr> {
+                 if !_val.attrs.is_empty() {
+                     formatter.field("attrs", Lite(&_val.attrs));
+                 }
+                 formatter.field("block", Lite(&_val.block));
+                 formatter.finish()
+             }
+             syn::Expr::Verbatim(_val) => {
+                 formatter.write_str("Verbatim")?;
+-                formatter.write_str("(")?;
+-                Debug::fmt(Lite(_val), formatter)?;
+-                formatter.write_str(")")?;
++                formatter.write_str("(`")?;
++                Display::fmt(_val, formatter)?;
++                formatter.write_str("`)")?;
+                 Ok(())
+             }
+             syn::Expr::While(_val) => {
+                 let mut formatter = formatter.debug_struct("Expr::While");
+                 if !_val.attrs.is_empty() {
+                     formatter.field("attrs", Lite(&_val.attrs));
+                 }
+                 if let Some(val) = &_val.label {
+@@ -2111,19 +2111,19 @@ impl Debug for Lite<syn::ForeignItem> {
+                         }
+                     }
+                     formatter.field("semi_token", Print::ref_cast(val));
+                 }
+                 formatter.finish()
+             }
+             syn::ForeignItem::Verbatim(_val) => {
+                 formatter.write_str("Verbatim")?;
+-                formatter.write_str("(")?;
+-                Debug::fmt(Lite(_val), formatter)?;
+-                formatter.write_str(")")?;
++                formatter.write_str("(`")?;
++                Display::fmt(_val, formatter)?;
++                formatter.write_str("`)")?;
+                 Ok(())
+             }
+             _ => unreachable!(),
+         }
+     }
+ }
+ impl Debug for Lite<syn::ForeignItemFn> {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+@@ -2427,19 +2427,19 @@ impl Debug for Lite<syn::ImplItem> {
+                         }
+                     }
+                     formatter.field("semi_token", Print::ref_cast(val));
+                 }
+                 formatter.finish()
+             }
+             syn::ImplItem::Verbatim(_val) => {
+                 formatter.write_str("Verbatim")?;
+-                formatter.write_str("(")?;
+-                Debug::fmt(Lite(_val), formatter)?;
+-                formatter.write_str(")")?;
++                formatter.write_str("(`")?;
++                Display::fmt(_val, formatter)?;
++                formatter.write_str("`)")?;
+                 Ok(())
+             }
+             _ => unreachable!(),
+         }
+     }
+ }
+ impl Debug for Lite<syn::ImplItemConst> {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+@@ -2935,19 +2935,19 @@ impl Debug for Lite<syn::Item> {
+                     }
+                     formatter.field("leading_colon", Print::ref_cast(val));
+                 }
+                 formatter.field("tree", Lite(&_val.tree));
+                 formatter.finish()
+             }
+             syn::Item::Verbatim(_val) => {
+                 formatter.write_str("Verbatim")?;
+-                formatter.write_str("(")?;
+-                Debug::fmt(Lite(_val), formatter)?;
+-                formatter.write_str(")")?;
++                formatter.write_str("(`")?;
++                Display::fmt(_val, formatter)?;
++                formatter.write_str("`)")?;
+                 Ok(())
+             }
+             _ => unreachable!(),
+         }
+     }
+ }
+ impl Debug for Lite<syn::ItemConst> {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+@@ -3432,19 +3432,19 @@ impl Debug for Lite<syn::Lit> {
+             syn::Lit::Float(_val) => write!(formatter, "{}", _val),
+             syn::Lit::Bool(_val) => {
+                 let mut formatter = formatter.debug_struct("Lit::Bool");
+                 formatter.field("value", Lite(&_val.value));
+                 formatter.finish()
+             }
+             syn::Lit::Verbatim(_val) => {
+                 formatter.write_str("Verbatim")?;
+-                formatter.write_str("(")?;
+-                Debug::fmt(Lite(_val), formatter)?;
+-                formatter.write_str(")")?;
++                formatter.write_str("(`")?;
++                Display::fmt(_val, formatter)?;
++                formatter.write_str("`)")?;
+                 Ok(())
+             }
+         }
+     }
+ }
+ impl Debug for Lite<syn::LitBool> {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+         let _val = &self.value;
+@@ -3873,19 +3873,19 @@ impl Debug for Lite<syn::Pat> {
+                     formatter.field("attrs", Lite(&_val.attrs));
+                 }
+                 formatter.field("pat", Lite(&_val.pat));
+                 formatter.field("ty", Lite(&_val.ty));
+                 formatter.finish()
+             }
+             syn::Pat::Verbatim(_val) => {
+                 formatter.write_str("Verbatim")?;
+-                formatter.write_str("(")?;
+-                Debug::fmt(Lite(_val), formatter)?;
+-                formatter.write_str(")")?;
++                formatter.write_str("(`")?;
++                Display::fmt(_val, formatter)?;
++                formatter.write_str("`)")?;
+                 Ok(())
+             }
+             syn::Pat::Wild(_val) => {
+                 let mut formatter = formatter.debug_struct("Pat::Wild");
+                 if !_val.attrs.is_empty() {
+                     formatter.field("attrs", Lite(&_val.attrs));
+                 }
+                 formatter.finish()
+@@ -4669,19 +4669,19 @@ impl Debug for Lite<syn::TraitItem> {
+                         }
+                     }
+                     formatter.field("semi_token", Print::ref_cast(val));
+                 }
+                 formatter.finish()
+             }
+             syn::TraitItem::Verbatim(_val) => {
+                 formatter.write_str("Verbatim")?;
+-                formatter.write_str("(")?;
+-                Debug::fmt(Lite(_val), formatter)?;
+-                formatter.write_str(")")?;
++                formatter.write_str("(`")?;
++                Display::fmt(_val, formatter)?;
++                formatter.write_str("`)")?;
+                 Ok(())
+             }
+             _ => unreachable!(),
+         }
+     }
+ }
+ impl Debug for Lite<syn::TraitItemConst> {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+@@ -5035,19 +5035,19 @@ impl Debug for Lite<syn::Type> {
+                 let mut formatter = formatter.debug_struct("Type::Tuple");
+                 if !_val.elems.is_empty() {
+                     formatter.field("elems", Lite(&_val.elems));
+                 }
+                 formatter.finish()
+             }
+             syn::Type::Verbatim(_val) => {
+                 formatter.write_str("Verbatim")?;
+-                formatter.write_str("(")?;
+-                Debug::fmt(Lite(_val), formatter)?;
+-                formatter.write_str(")")?;
++                formatter.write_str("(`")?;
++                Display::fmt(_val, formatter)?;
++                formatter.write_str("`)")?;
+                 Ok(())
+             }
+             _ => unreachable!(),
+         }
+     }
+ }
+ impl Debug for Lite<syn::TypeArray> {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+diff --git a/third_party/rust/syn/tests/debug/mod.rs b/third_party/rust/syn/tests/debug/mod.rs
+--- a/third_party/rust/syn/tests/debug/mod.rs
++++ b/third_party/rust/syn/tests/debug/mod.rs
+@@ -1,15 +1,12 @@
+-extern crate proc_macro2;
+-extern crate ref_cast;
+-
+ mod gen;
+ 
+-use self::proc_macro2::{Ident, Literal, TokenStream};
+-use self::ref_cast::RefCast;
++use proc_macro2::{Ident, Literal, TokenStream};
++use ref_cast::RefCast;
+ use std::fmt::{self, Debug};
+ use std::ops::Deref;
+ use syn::punctuated::Punctuated;
+ 
+ #[derive(RefCast)]
+ #[repr(transparent)]
+ pub struct Lite<T: ?Sized> {
+     value: T,
+@@ -61,17 +58,25 @@ impl Debug for Lite<Ident> {
+ impl Debug for Lite<Literal> {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+         write!(formatter, "{}", self.value)
+     }
+ }
+ 
+ impl Debug for Lite<TokenStream> {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+-        write!(formatter, "`{}`", self.value)
++        let string = self.value.to_string();
++        if string.len() <= 80 {
++            write!(formatter, "TokenStream(`{}`)", self.value)
++        } else {
++            formatter
++                .debug_tuple("TokenStream")
++                .field(&format_args!("`{}`", string))
++                .finish()
++        }
+     }
+ }
+ 
+ impl<'a, T> Debug for Lite<&'a T>
+ where
+     Lite<T>: Debug,
+ {
+     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+diff --git a/third_party/rust/syn/tests/features/error.rs b/third_party/rust/syn/tests/features/error.rs
+deleted file mode 100644
+--- a/third_party/rust/syn/tests/features/error.rs
++++ /dev/null
+@@ -1,1 +0,0 @@
+-"Hello! You want: cargo test --release --all-features"
+diff --git a/third_party/rust/syn/tests/features/mod.rs b/third_party/rust/syn/tests/features/mod.rs
+deleted file mode 100644
+--- a/third_party/rust/syn/tests/features/mod.rs
++++ /dev/null
+@@ -1,22 +0,0 @@
+-#[allow(unused_macros)]
+-macro_rules! hide_from_rustfmt {
+-    ($mod:item) => {
+-        $mod
+-    };
+-}
+-
+-#[cfg(not(all(
+-    feature = "derive",
+-    feature = "full",
+-    feature = "parsing",
+-    feature = "printing",
+-    feature = "visit",
+-    feature = "visit-mut",
+-    feature = "fold",
+-    feature = "clone-impls",
+-    feature = "extra-traits",
+-    feature = "proc-macro",
+-)))]
+-hide_from_rustfmt! {
+-    mod error;
+-}
+diff --git a/third_party/rust/syn/tests/macros/mod.rs b/third_party/rust/syn/tests/macros/mod.rs
+--- a/third_party/rust/syn/tests/macros/mod.rs
++++ b/third_party/rust/syn/tests/macros/mod.rs
+@@ -1,10 +1,8 @@
+-extern crate proc_macro2;
+-
+ #[path = "../debug/mod.rs"]
+ pub mod debug;
+ 
+ use syn;
+ use syn::parse::{Parse, Result};
+ 
+ #[macro_export]
+ macro_rules! errorf {
+@@ -37,28 +35,28 @@ macro_rules! snapshot {
+     };
+ }
+ 
+ #[macro_export]
+ macro_rules! snapshot_impl {
+     (($expr:ident) as $t:ty, @$snapshot:literal) => {
+         let $expr = crate::macros::Tokens::parse::<$t>($expr).unwrap();
+         let debug = crate::macros::debug::Lite(&$expr);
+-        insta::assert_debug_snapshot_matches!(debug, @$snapshot);
++        insta::assert_debug_snapshot!(debug, @$snapshot);
+     };
+     (($($expr:tt)*) as $t:ty, @$snapshot:literal) => {{
+         let syntax_tree = crate::macros::Tokens::parse::<$t>($($expr)*).unwrap();
+         let debug = crate::macros::debug::Lite(&syntax_tree);
+-        insta::assert_debug_snapshot_matches!(debug, @$snapshot);
++        insta::assert_debug_snapshot!(debug, @$snapshot);
+         syntax_tree
+     }};
+     (($($expr:tt)*) , @$snapshot:literal) => {{
+         let syntax_tree = $($expr)*;
+         let debug = crate::macros::debug::Lite(&syntax_tree);
+-        insta::assert_debug_snapshot_matches!(debug, @$snapshot);
++        insta::assert_debug_snapshot!(debug, @$snapshot);
+         syntax_tree
+     }};
+     (($($expr:tt)*) $next:tt $($rest:tt)*) => {
+         snapshot_impl!(($($expr)* $next) $($rest)*)
+     };
+ }
+ 
+ pub trait Tokens {
+diff --git a/third_party/rust/syn/tests/repo/mod.rs b/third_party/rust/syn/tests/repo/mod.rs
+--- a/third_party/rust/syn/tests/repo/mod.rs
++++ b/third_party/rust/syn/tests/repo/mod.rs
+@@ -1,60 +1,135 @@
+-extern crate walkdir;
++mod progress;
++
++use self::progress::Progress;
++use anyhow::Result;
++use flate2::read::GzDecoder;
++use std::fs;
++use std::path::Path;
++use tar::Archive;
++use walkdir::DirEntry;
++
++const REVISION: &str = "792c645ca7d11a8d254df307d019c5bf01445c37";
++
++#[rustfmt::skip]
++static EXCLUDE: &[&str] = &[
++    // Compile-fail expr parameter in const generic position: f::<1 + 2>()
++    "test/ui/const-generics/const-expression-parameter.rs",
+ 
+-use std::process::Command;
++    // Deprecated anonymous parameter syntax in traits
++    "test/ui/issues/issue-13105.rs",
++    "test/ui/issues/issue-13775.rs",
++    "test/ui/issues/issue-34074.rs",
++    "test/ui/proc-macro/trait-fn-args-2015.rs",
+ 
+-use self::walkdir::DirEntry;
++    // Not actually test cases
++    "test/rustdoc-ui/test-compile-fail2.rs",
++    "test/rustdoc-ui/test-compile-fail3.rs",
++    "test/ui/include-single-expr-helper.rs",
++    "test/ui/include-single-expr-helper-1.rs",
++    "test/ui/issues/auxiliary/issue-21146-inc.rs",
++    "test/ui/json-bom-plus-crlf-multifile-aux.rs",
++    "test/ui/lint/expansion-time-include.rs",
++    "test/ui/macros/auxiliary/macro-comma-support.rs",
++    "test/ui/macros/auxiliary/macro-include-items-expr.rs",
++];
+ 
+ pub fn base_dir_filter(entry: &DirEntry) -> bool {
+     let path = entry.path();
+     if path.is_dir() {
+         return true; // otherwise walkdir does not visit the files
+     }
+     if path.extension().map(|e| e != "rs").unwrap_or(true) {
+         return false;
+     }
+-    let path_string = path.to_string_lossy();
+-    let path_string = if cfg!(windows) {
+-        path_string.replace('\\', "/").into()
++
++    let mut path_string = path.to_string_lossy();
++    if cfg!(windows) {
++        path_string = path_string.replace('\\', "/").into();
++    }
++    let path = if let Some(path) = path_string.strip_prefix("tests/rust/src/") {
++        path
++    } else if let Some(path) = path_string.strip_prefix("tests/rust/library/") {
++        path
+     } else {
+-        path_string
++        panic!("unexpected path in Rust dist: {}", path_string);
+     };
++
+     // TODO assert that parsing fails on the parse-fail cases
+-    if path_string.starts_with("tests/rust/src/test/parse-fail")
+-        || path_string.starts_with("tests/rust/src/test/compile-fail")
+-        || path_string.starts_with("tests/rust/src/test/rustfix")
++    if path.starts_with("test/parse-fail")
++        || path.starts_with("test/compile-fail")
++        || path.starts_with("test/rustfix")
+     {
+         return false;
+     }
+ 
+-    if path_string.starts_with("tests/rust/src/test/ui") {
+-        let stderr_path = path.with_extension("stderr");
++    if path.starts_with("test/ui") {
++        let stderr_path = entry.path().with_extension("stderr");
+         if stderr_path.exists() {
+             // Expected to fail in some way
+             return false;
+         }
+     }
+ 
+-    match path_string.as_ref() {
+-        // Deprecated placement syntax
+-        "tests/rust/src/test/ui/obsolete-in-place/bad.rs" |
+-        // Deprecated anonymous parameter syntax in traits
+-        "tests/rust/src/test/ui/error-codes/e0119/auxiliary/issue-23563-a.rs" |
+-        "tests/rust/src/test/ui/issues/issue-13105.rs" |
+-        "tests/rust/src/test/ui/issues/issue-13775.rs" |
+-        "tests/rust/src/test/ui/issues/issue-34074.rs" |
+-        // Deprecated await macro syntax
+-        "tests/rust/src/test/ui/async-await/await-macro.rs" |
+-        // 2015-style dyn that libsyntax rejects
+-        "tests/rust/src/test/ui/dyn-keyword/dyn-2015-no-warnings-without-lints.rs" |
+-        // not actually test cases
+-        "tests/rust/src/test/ui/macros/auxiliary/macro-comma-support.rs" |
+-        "tests/rust/src/test/ui/macros/auxiliary/macro-include-items-expr.rs" |
+-        "tests/rust/src/test/ui/issues/auxiliary/issue-21146-inc.rs" => false,
+-        _ => true,
++    !EXCLUDE.contains(&path)
++}
++
++#[allow(dead_code)]
++pub fn edition(path: &Path) -> &'static str {
++    if path.ends_with("dyn-2015-no-warnings-without-lints.rs") {
++        "2015"
++    } else {
++        "2018"
+     }
+ }
+ 
+ pub fn clone_rust() {
+-    let result = Command::new("tests/clone.sh").status().unwrap();
+-    assert!(result.success());
++    let needs_clone = match fs::read_to_string("tests/rust/COMMIT") {
++        Err(_) => true,
++        Ok(contents) => contents.trim() != REVISION,
++    };
++    if needs_clone {
++        download_and_unpack().unwrap();
++    }
++    let mut missing = String::new();
++    let test_src = Path::new("tests/rust/src");
++    for exclude in EXCLUDE {
++        if !test_src.join(exclude).exists() {
++            missing += "\ntests/rust/src/";
++            missing += exclude;
++        }
++    }
++    if !missing.is_empty() {
++        panic!("excluded test file does not exist:{}\n", missing);
++    }
+ }
++
++fn download_and_unpack() -> Result<()> {
++    let url = format!(
++        "https://github.com/rust-lang/rust/archive/{}.tar.gz",
++        REVISION
++    );
++    let response = reqwest::blocking::get(&url)?.error_for_status()?;
++    let progress = Progress::new(response);
++    let decoder = GzDecoder::new(progress);
++    let mut archive = Archive::new(decoder);
++    let prefix = format!("rust-{}", REVISION);
++
++    let tests_rust = Path::new("tests/rust");
++    if tests_rust.exists() {
++        fs::remove_dir_all(tests_rust)?;
++    }
++
++    for entry in archive.entries()? {
++        let mut entry = entry?;
++        let path = entry.path()?;
++        if path == Path::new("pax_global_header") {
++            continue;
++        }
++        let relative = path.strip_prefix(&prefix)?;
++        let out = tests_rust.join(relative);
++        entry.unpack(&out)?;
++    }
++
++    fs::write("tests/rust/COMMIT", REVISION)?;
++    Ok(())
++}
+diff --git a/third_party/rust/syn/tests/repo/progress.rs b/third_party/rust/syn/tests/repo/progress.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/tests/repo/progress.rs
+@@ -0,0 +1,37 @@
++use std::io::{Read, Result};
++use std::time::{Duration, Instant};
++
++pub struct Progress<R> {
++    bytes: usize,
++    tick: Instant,
++    stream: R,
++}
++
++impl<R> Progress<R> {
++    pub fn new(stream: R) -> Self {
++        Progress {
++            bytes: 0,
++            tick: Instant::now() + Duration::from_millis(2000),
++            stream,
++        }
++    }
++}
++
++impl<R: Read> Read for Progress<R> {
++    fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
++        let num = self.stream.read(buf)?;
++        self.bytes += num;
++        let now = Instant::now();
++        if now > self.tick {
++            self.tick = now + Duration::from_millis(500);
++            errorf!("downloading... {} bytes\n", self.bytes);
++        }
++        Ok(num)
++    }
++}
++
++impl<R> Drop for Progress<R> {
++    fn drop(&mut self) {
++        errorf!("done ({} bytes)\n", self.bytes);
++    }
++}
+diff --git a/third_party/rust/syn/tests/test_asyncness.rs b/third_party/rust/syn/tests/test_asyncness.rs
+--- a/third_party/rust/syn/tests/test_asyncness.rs
++++ b/third_party/rust/syn/tests/test_asyncness.rs
+@@ -1,41 +1,37 @@
+-extern crate syn;
+-
+-mod features;
+-
+ #[macro_use]
+ mod macros;
+ 
+ use syn::{Expr, Item};
+ 
+ #[test]
+ fn test_async_fn() {
+     let input = "async fn process() {}";
+ 
+     snapshot!(input as Item, @r###"
+-   ⋮Item::Fn {
+-   ⋮    vis: Inherited,
+-   ⋮    sig: Signature {
+-   ⋮        asyncness: Some,
+-   ⋮        ident: "process",
+-   ⋮        generics: Generics,
+-   ⋮        output: Default,
+-   ⋮    },
+-   ⋮    block: Block,
+-   ⋮}
++    Item::Fn {
++        vis: Inherited,
++        sig: Signature {
++            asyncness: Some,
++            ident: "process",
++            generics: Generics,
++            output: Default,
++        },
++        block: Block,
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_async_closure() {
+     let input = "async || {}";
+ 
+     snapshot!(input as Expr, @r###"
+-   ⋮Expr::Closure {
+-   ⋮    asyncness: Some,
+-   ⋮    output: Default,
+-   ⋮    body: Expr::Block {
+-   ⋮        block: Block,
+-   ⋮    },
+-   ⋮}
++    Expr::Closure {
++        asyncness: Some,
++        output: Default,
++        body: Expr::Block {
++            block: Block,
++        },
++    }
+     "###);
+ }
+diff --git a/third_party/rust/syn/tests/test_attribute.rs b/third_party/rust/syn/tests/test_attribute.rs
+--- a/third_party/rust/syn/tests/test_attribute.rs
++++ b/third_party/rust/syn/tests/test_attribute.rs
+@@ -1,295 +1,333 @@
+-extern crate syn;
+-
+-mod features;
+-
+ #[macro_use]
+ mod macros;
+ 
+ use syn::parse::Parser;
+ use syn::{Attribute, Meta};
+ 
+ #[test]
+ fn test_meta_item_word() {
+     let meta = test("#[foo]");
+ 
+     snapshot!(meta, @r###"
+-   ⋮Path(Path {
+-   ⋮    segments: [
+-   ⋮        PathSegment {
+-   ⋮            ident: "foo",
+-   ⋮            arguments: None,
+-   ⋮        },
+-   ⋮    ],
+-   ⋮})
++    Path(Path {
++        segments: [
++            PathSegment {
++                ident: "foo",
++                arguments: None,
++            },
++        ],
++    })
+     "###);
+ }
+ 
+ #[test]
+ fn test_meta_item_name_value() {
+     let meta = test("#[foo = 5]");
+ 
+     snapshot!(meta, @r###"
+-   ⋮Meta::NameValue {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    lit: 5,
+-   ⋮}
++    Meta::NameValue {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        lit: 5,
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_meta_item_bool_value() {
+     let meta = test("#[foo = true]");
+ 
+     snapshot!(meta, @r###"
+-   ⋮Meta::NameValue {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    lit: Lit::Bool {
+-   ⋮        value: true,
+-   ⋮    },
+-   ⋮}
++    Meta::NameValue {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        lit: Lit::Bool {
++            value: true,
++        },
++    }
+     "###);
+ 
+     let meta = test("#[foo = false]");
+ 
+     snapshot!(meta, @r###"
+-   ⋮Meta::NameValue {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    lit: Lit::Bool {
+-   ⋮        value: false,
+-   ⋮    },
+-   ⋮}
++    Meta::NameValue {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        lit: Lit::Bool {
++            value: false,
++        },
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_meta_item_list_lit() {
+     let meta = test("#[foo(5)]");
+ 
+     snapshot!(meta, @r###"
+-   ⋮Meta::List {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    nested: [
+-   ⋮        Lit(5),
+-   ⋮    ],
+-   ⋮}
++    Meta::List {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        nested: [
++            Lit(5),
++        ],
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_meta_item_list_word() {
+     let meta = test("#[foo(bar)]");
+ 
+     snapshot!(meta, @r###"
+-   ⋮Meta::List {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    nested: [
+-   ⋮        Meta(Path(Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "bar",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        })),
+-   ⋮    ],
+-   ⋮}
++    Meta::List {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        nested: [
++            Meta(Path(Path {
++                segments: [
++                    PathSegment {
++                        ident: "bar",
++                        arguments: None,
++                    },
++                ],
++            })),
++        ],
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_meta_item_list_name_value() {
+     let meta = test("#[foo(bar = 5)]");
+ 
+     snapshot!(meta, @r###"
+-   ⋮Meta::List {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    nested: [
+-   ⋮        Meta(Meta::NameValue {
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "bar",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            lit: 5,
+-   ⋮        }),
+-   ⋮    ],
+-   ⋮}
++    Meta::List {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        nested: [
++            Meta(Meta::NameValue {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "bar",
++                            arguments: None,
++                        },
++                    ],
++                },
++                lit: 5,
++            }),
++        ],
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_meta_item_list_bool_value() {
+     let meta = test("#[foo(bar = true)]");
+ 
+     snapshot!(meta, @r###"
+-   ⋮Meta::List {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    nested: [
+-   ⋮        Meta(Meta::NameValue {
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "bar",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            lit: Lit::Bool {
+-   ⋮                value: true,
+-   ⋮            },
+-   ⋮        }),
+-   ⋮    ],
+-   ⋮}
++    Meta::List {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        nested: [
++            Meta(Meta::NameValue {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "bar",
++                            arguments: None,
++                        },
++                    ],
++                },
++                lit: Lit::Bool {
++                    value: true,
++                },
++            }),
++        ],
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_meta_item_multiple() {
+     let meta = test("#[foo(word, name = 5, list(name2 = 6), word2)]");
+ 
+     snapshot!(meta, @r###"
+-   ⋮Meta::List {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    nested: [
+-   ⋮        Meta(Path(Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "word",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        })),
+-   ⋮        Meta(Meta::NameValue {
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "name",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            lit: 5,
+-   ⋮        }),
+-   ⋮        Meta(Meta::List {
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "list",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            nested: [
+-   ⋮                Meta(Meta::NameValue {
+-   ⋮                    path: Path {
+-   ⋮                        segments: [
+-   ⋮                            PathSegment {
+-   ⋮                                ident: "name2",
+-   ⋮                                arguments: None,
+-   ⋮                            },
+-   ⋮                        ],
+-   ⋮                    },
+-   ⋮                    lit: 6,
+-   ⋮                }),
+-   ⋮            ],
+-   ⋮        }),
+-   ⋮        Meta(Path(Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "word2",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        })),
+-   ⋮    ],
+-   ⋮}
++    Meta::List {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        nested: [
++            Meta(Path(Path {
++                segments: [
++                    PathSegment {
++                        ident: "word",
++                        arguments: None,
++                    },
++                ],
++            })),
++            Meta(Meta::NameValue {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "name",
++                            arguments: None,
++                        },
++                    ],
++                },
++                lit: 5,
++            }),
++            Meta(Meta::List {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "list",
++                            arguments: None,
++                        },
++                    ],
++                },
++                nested: [
++                    Meta(Meta::NameValue {
++                        path: Path {
++                            segments: [
++                                PathSegment {
++                                    ident: "name2",
++                                    arguments: None,
++                                },
++                            ],
++                        },
++                        lit: 6,
++                    }),
++                ],
++            }),
++            Meta(Path(Path {
++                segments: [
++                    PathSegment {
++                        ident: "word2",
++                        arguments: None,
++                    },
++                ],
++            })),
++        ],
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_bool_lit() {
+     let meta = test("#[foo(true)]");
+ 
+     snapshot!(meta, @r###"
+-   ⋮Meta::List {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    nested: [
+-   ⋮        Lit(Lit::Bool {
+-   ⋮            value: true,
+-   ⋮        }),
+-   ⋮    ],
+-   ⋮}
++    Meta::List {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        nested: [
++            Lit(Lit::Bool {
++                value: true,
++            }),
++        ],
++    }
++    "###);
++}
++
++#[test]
++fn test_negative_lit() {
++    let meta = test("#[form(min = -1, max = 200)]");
++
++    snapshot!(meta, @r###"
++    Meta::List {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "form",
++                    arguments: None,
++                },
++            ],
++        },
++        nested: [
++            Meta(Meta::NameValue {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "min",
++                            arguments: None,
++                        },
++                    ],
++                },
++                lit: -1,
++            }),
++            Meta(Meta::NameValue {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "max",
++                            arguments: None,
++                        },
++                    ],
++                },
++                lit: 200,
++            }),
++        ],
++    }
+     "###);
+ }
+ 
+ fn test(input: &str) -> Meta {
+     let attrs = Attribute::parse_outer.parse_str(input).unwrap();
+ 
+     assert_eq!(attrs.len(), 1);
+     let attr = attrs.into_iter().next().unwrap();
+diff --git a/third_party/rust/syn/tests/test_derive_input.rs b/third_party/rust/syn/tests/test_derive_input.rs
+--- a/third_party/rust/syn/tests/test_derive_input.rs
++++ b/third_party/rust/syn/tests/test_derive_input.rs
+@@ -1,201 +1,196 @@
+-extern crate quote;
+-extern crate syn;
+-
+-mod features;
+-
+ #[macro_use]
+ mod macros;
+ 
+ use quote::quote;
+ use syn::{Data, DeriveInput};
+ 
+ #[test]
+ fn test_unit() {
+     let input = quote! {
+         struct Unit;
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    vis: Inherited,
+-   ⋮    ident: "Unit",
+-   ⋮    generics: Generics,
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Unit,
+-   ⋮        semi_token: Some,
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        vis: Inherited,
++        ident: "Unit",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Unit,
++            semi_token: Some,
++        },
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_struct() {
+     let input = quote! {
+         #[derive(Debug, Clone)]
+         pub struct Item {
+             pub ident: Ident,
+             pub attrs: Vec<Attribute>
+         }
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    attrs: [
+-   ⋮        Attribute {
+-   ⋮            style: Outer,
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "derive",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            tokens: `( Debug , Clone )`,
+-   ⋮        },
+-   ⋮    ],
+-   ⋮    vis: Visibility::Public,
+-   ⋮    ident: "Item",
+-   ⋮    generics: Generics,
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Fields::Named {
+-   ⋮            named: [
+-   ⋮                Field {
+-   ⋮                    vis: Visibility::Public,
+-   ⋮                    ident: Some("ident"),
+-   ⋮                    colon_token: Some,
+-   ⋮                    ty: Type::Path {
+-   ⋮                        path: Path {
+-   ⋮                            segments: [
+-   ⋮                                PathSegment {
+-   ⋮                                    ident: "Ident",
+-   ⋮                                    arguments: None,
+-   ⋮                                },
+-   ⋮                            ],
+-   ⋮                        },
+-   ⋮                    },
+-   ⋮                },
+-   ⋮                Field {
+-   ⋮                    vis: Visibility::Public,
+-   ⋮                    ident: Some("attrs"),
+-   ⋮                    colon_token: Some,
+-   ⋮                    ty: Type::Path {
+-   ⋮                        path: Path {
+-   ⋮                            segments: [
+-   ⋮                                PathSegment {
+-   ⋮                                    ident: "Vec",
+-   ⋮                                    arguments: PathArguments::AngleBracketed {
+-   ⋮                                        args: [
+-   ⋮                                            Type(Type::Path {
+-   ⋮                                                path: Path {
+-   ⋮                                                    segments: [
+-   ⋮                                                        PathSegment {
+-   ⋮                                                            ident: "Attribute",
+-   ⋮                                                            arguments: None,
+-   ⋮                                                        },
+-   ⋮                                                    ],
+-   ⋮                                                },
+-   ⋮                                            }),
+-   ⋮                                        ],
+-   ⋮                                    },
+-   ⋮                                },
+-   ⋮                            ],
+-   ⋮                        },
+-   ⋮                    },
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        },
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        attrs: [
++            Attribute {
++                style: Outer,
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "derive",
++                            arguments: None,
++                        },
++                    ],
++                },
++                tokens: TokenStream(`(Debug , Clone)`),
++            },
++        ],
++        vis: Visibility::Public,
++        ident: "Item",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Fields::Named {
++                named: [
++                    Field {
++                        vis: Visibility::Public,
++                        ident: Some("ident"),
++                        colon_token: Some,
++                        ty: Type::Path {
++                            path: Path {
++                                segments: [
++                                    PathSegment {
++                                        ident: "Ident",
++                                        arguments: None,
++                                    },
++                                ],
++                            },
++                        },
++                    },
++                    Field {
++                        vis: Visibility::Public,
++                        ident: Some("attrs"),
++                        colon_token: Some,
++                        ty: Type::Path {
++                            path: Path {
++                                segments: [
++                                    PathSegment {
++                                        ident: "Vec",
++                                        arguments: PathArguments::AngleBracketed {
++                                            args: [
++                                                Type(Type::Path {
++                                                    path: Path {
++                                                        segments: [
++                                                            PathSegment {
++                                                                ident: "Attribute",
++                                                                arguments: None,
++                                                            },
++                                                        ],
++                                                    },
++                                                }),
++                                            ],
++                                        },
++                                    },
++                                ],
++                            },
++                        },
++                    },
++                ],
++            },
++        },
++    }
+     "###);
+ 
+     snapshot!(input.attrs[0].parse_meta().unwrap(), @r###"
+-   ⋮Meta::List {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "derive",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    nested: [
+-   ⋮        Meta(Path(Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "Debug",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        })),
+-   ⋮        Meta(Path(Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "Clone",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        })),
+-   ⋮    ],
+-   ⋮}
++    Meta::List {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "derive",
++                    arguments: None,
++                },
++            ],
++        },
++        nested: [
++            Meta(Path(Path {
++                segments: [
++                    PathSegment {
++                        ident: "Debug",
++                        arguments: None,
++                    },
++                ],
++            })),
++            Meta(Path(Path {
++                segments: [
++                    PathSegment {
++                        ident: "Clone",
++                        arguments: None,
++                    },
++                ],
++            })),
++        ],
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_union() {
+     let input = quote! {
+         union MaybeUninit<T> {
+             uninit: (),
+             value: T
+         }
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    vis: Inherited,
+-   ⋮    ident: "MaybeUninit",
+-   ⋮    generics: Generics {
+-   ⋮        lt_token: Some,
+-   ⋮        params: [
+-   ⋮            Type(TypeParam {
+-   ⋮                ident: "T",
+-   ⋮            }),
+-   ⋮        ],
+-   ⋮        gt_token: Some,
+-   ⋮    },
+-   ⋮    data: Data::Union {
+-   ⋮        fields: FieldsNamed {
+-   ⋮            named: [
+-   ⋮                Field {
+-   ⋮                    vis: Inherited,
+-   ⋮                    ident: Some("uninit"),
+-   ⋮                    colon_token: Some,
+-   ⋮                    ty: Type::Tuple,
+-   ⋮                },
+-   ⋮                Field {
+-   ⋮                    vis: Inherited,
+-   ⋮                    ident: Some("value"),
+-   ⋮                    colon_token: Some,
+-   ⋮                    ty: Type::Path {
+-   ⋮                        path: Path {
+-   ⋮                            segments: [
+-   ⋮                                PathSegment {
+-   ⋮                                    ident: "T",
+-   ⋮                                    arguments: None,
+-   ⋮                                },
+-   ⋮                            ],
+-   ⋮                        },
+-   ⋮                    },
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        },
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        vis: Inherited,
++        ident: "MaybeUninit",
++        generics: Generics {
++            lt_token: Some,
++            params: [
++                Type(TypeParam {
++                    ident: "T",
++                }),
++            ],
++            gt_token: Some,
++        },
++        data: Data::Union {
++            fields: FieldsNamed {
++                named: [
++                    Field {
++                        vis: Inherited,
++                        ident: Some("uninit"),
++                        colon_token: Some,
++                        ty: Type::Tuple,
++                    },
++                    Field {
++                        vis: Inherited,
++                        ident: Some("value"),
++                        colon_token: Some,
++                        ty: Type::Path {
++                            path: Path {
++                                segments: [
++                                    PathSegment {
++                                        ident: "T",
++                                        arguments: None,
++                                    },
++                                ],
++                            },
++                        },
++                    },
++                ],
++            },
++        },
++    }
+     "###);
+ }
+ 
+ #[test]
+ #[cfg(feature = "full")]
+ fn test_enum() {
+     let input = quote! {
+         /// See the std::result module documentation for details.
+@@ -207,472 +202,472 @@ fn test_enum() {
+ 
+             // Smuggling data into a proc_macro_derive,
+             // in the style of https://github.com/dtolnay/proc-macro-hack
+             ProcMacroHack = (0, "data").0
+         }
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    attrs: [
+-   ⋮        Attribute {
+-   ⋮            style: Outer,
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "doc",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            tokens: `= r" See the std::result module documentation for details."`,
+-   ⋮        },
+-   ⋮        Attribute {
+-   ⋮            style: Outer,
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "must_use",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            tokens: ``,
+-   ⋮        },
+-   ⋮    ],
+-   ⋮    vis: Visibility::Public,
+-   ⋮    ident: "Result",
+-   ⋮    generics: Generics {
+-   ⋮        lt_token: Some,
+-   ⋮        params: [
+-   ⋮            Type(TypeParam {
+-   ⋮                ident: "T",
+-   ⋮            }),
+-   ⋮            Type(TypeParam {
+-   ⋮                ident: "E",
+-   ⋮            }),
+-   ⋮        ],
+-   ⋮        gt_token: Some,
+-   ⋮    },
+-   ⋮    data: Data::Enum {
+-   ⋮        variants: [
+-   ⋮            Variant {
+-   ⋮                ident: "Ok",
+-   ⋮                fields: Fields::Unnamed {
+-   ⋮                    unnamed: [
+-   ⋮                        Field {
+-   ⋮                            vis: Inherited,
+-   ⋮                            ty: Type::Path {
+-   ⋮                                path: Path {
+-   ⋮                                    segments: [
+-   ⋮                                        PathSegment {
+-   ⋮                                            ident: "T",
+-   ⋮                                            arguments: None,
+-   ⋮                                        },
+-   ⋮                                    ],
+-   ⋮                                },
+-   ⋮                            },
+-   ⋮                        },
+-   ⋮                    ],
+-   ⋮                },
+-   ⋮            },
+-   ⋮            Variant {
+-   ⋮                ident: "Err",
+-   ⋮                fields: Fields::Unnamed {
+-   ⋮                    unnamed: [
+-   ⋮                        Field {
+-   ⋮                            vis: Inherited,
+-   ⋮                            ty: Type::Path {
+-   ⋮                                path: Path {
+-   ⋮                                    segments: [
+-   ⋮                                        PathSegment {
+-   ⋮                                            ident: "E",
+-   ⋮                                            arguments: None,
+-   ⋮                                        },
+-   ⋮                                    ],
+-   ⋮                                },
+-   ⋮                            },
+-   ⋮                        },
+-   ⋮                    ],
+-   ⋮                },
+-   ⋮            },
+-   ⋮            Variant {
+-   ⋮                ident: "Surprise",
+-   ⋮                fields: Unit,
+-   ⋮                discriminant: Some(Expr::Lit {
+-   ⋮                    lit: 0isize,
+-   ⋮                }),
+-   ⋮            },
+-   ⋮            Variant {
+-   ⋮                ident: "ProcMacroHack",
+-   ⋮                fields: Unit,
+-   ⋮                discriminant: Some(Expr::Field {
+-   ⋮                    base: Expr::Tuple {
+-   ⋮                        elems: [
+-   ⋮                            Expr::Lit {
+-   ⋮                                lit: 0,
+-   ⋮                            },
+-   ⋮                            Expr::Lit {
+-   ⋮                                lit: "data",
+-   ⋮                            },
+-   ⋮                        ],
+-   ⋮                    },
+-   ⋮                    member: Unnamed(Index {
+-   ⋮                        index: 0,
+-   ⋮                    }),
+-   ⋮                }),
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        attrs: [
++            Attribute {
++                style: Outer,
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "doc",
++                            arguments: None,
++                        },
++                    ],
++                },
++                tokens: TokenStream(`= r" See the std::result module documentation for details."`),
++            },
++            Attribute {
++                style: Outer,
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "must_use",
++                            arguments: None,
++                        },
++                    ],
++                },
++                tokens: TokenStream(``),
++            },
++        ],
++        vis: Visibility::Public,
++        ident: "Result",
++        generics: Generics {
++            lt_token: Some,
++            params: [
++                Type(TypeParam {
++                    ident: "T",
++                }),
++                Type(TypeParam {
++                    ident: "E",
++                }),
++            ],
++            gt_token: Some,
++        },
++        data: Data::Enum {
++            variants: [
++                Variant {
++                    ident: "Ok",
++                    fields: Fields::Unnamed {
++                        unnamed: [
++                            Field {
++                                vis: Inherited,
++                                ty: Type::Path {
++                                    path: Path {
++                                        segments: [
++                                            PathSegment {
++                                                ident: "T",
++                                                arguments: None,
++                                            },
++                                        ],
++                                    },
++                                },
++                            },
++                        ],
++                    },
++                },
++                Variant {
++                    ident: "Err",
++                    fields: Fields::Unnamed {
++                        unnamed: [
++                            Field {
++                                vis: Inherited,
++                                ty: Type::Path {
++                                    path: Path {
++                                        segments: [
++                                            PathSegment {
++                                                ident: "E",
++                                                arguments: None,
++                                            },
++                                        ],
++                                    },
++                                },
++                            },
++                        ],
++                    },
++                },
++                Variant {
++                    ident: "Surprise",
++                    fields: Unit,
++                    discriminant: Some(Expr::Lit {
++                        lit: 0isize,
++                    }),
++                },
++                Variant {
++                    ident: "ProcMacroHack",
++                    fields: Unit,
++                    discriminant: Some(Expr::Field {
++                        base: Expr::Tuple {
++                            elems: [
++                                Expr::Lit {
++                                    lit: 0,
++                                },
++                                Expr::Lit {
++                                    lit: "data",
++                                },
++                            ],
++                        },
++                        member: Unnamed(Index {
++                            index: 0,
++                        }),
++                    }),
++                },
++            ],
++        },
++    }
+     "###);
+ 
+     let meta_items: Vec<_> = input
+         .attrs
+         .into_iter()
+         .map(|attr| attr.parse_meta().unwrap())
+         .collect();
+ 
+     snapshot!(meta_items, @r###"
+-   ⋮[
+-   ⋮    Meta::NameValue {
+-   ⋮        path: Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "doc",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        },
+-   ⋮        lit: " See the std::result module documentation for details.",
+-   ⋮    },
+-   ⋮    Path(Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "must_use",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    }),
+-   ⋮]
++    [
++        Meta::NameValue {
++            path: Path {
++                segments: [
++                    PathSegment {
++                        ident: "doc",
++                        arguments: None,
++                    },
++                ],
++            },
++            lit: " See the std::result module documentation for details.",
++        },
++        Path(Path {
++            segments: [
++                PathSegment {
++                    ident: "must_use",
++                    arguments: None,
++                },
++            ],
++        }),
++    ]
+     "###);
+ }
+ 
+ #[test]
+ fn test_attr_with_path() {
+     let input = quote! {
+         #[::attr_args::identity
+             fn main() { assert_eq!(foo(), "Hello, world!"); }]
+         struct Dummy;
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    attrs: [
+-   ⋮        Attribute {
+-   ⋮            style: Outer,
+-   ⋮            path: Path {
+-   ⋮                leading_colon: Some,
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "attr_args",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "identity",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            tokens: `fn main ( ) { assert_eq ! ( foo ( ) , "Hello, world!" ) ; }`,
+-   ⋮        },
+-   ⋮    ],
+-   ⋮    vis: Inherited,
+-   ⋮    ident: "Dummy",
+-   ⋮    generics: Generics,
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Unit,
+-   ⋮        semi_token: Some,
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        attrs: [
++            Attribute {
++                style: Outer,
++                path: Path {
++                    leading_colon: Some,
++                    segments: [
++                        PathSegment {
++                            ident: "attr_args",
++                            arguments: None,
++                        },
++                        PathSegment {
++                            ident: "identity",
++                            arguments: None,
++                        },
++                    ],
++                },
++                tokens: TokenStream(`fn main () { assert_eq ! (foo () , "Hello, world!") ; }`),
++            },
++        ],
++        vis: Inherited,
++        ident: "Dummy",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Unit,
++            semi_token: Some,
++        },
++    }
+     "###);
+ 
+     assert!(input.attrs[0].parse_meta().is_err());
+ }
+ 
+ #[test]
+ fn test_attr_with_non_mod_style_path() {
+     let input = quote! {
+         #[inert <T>]
+         struct S;
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    attrs: [
+-   ⋮        Attribute {
+-   ⋮            style: Outer,
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "inert",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            tokens: `< T >`,
+-   ⋮        },
+-   ⋮    ],
+-   ⋮    vis: Inherited,
+-   ⋮    ident: "S",
+-   ⋮    generics: Generics,
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Unit,
+-   ⋮        semi_token: Some,
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        attrs: [
++            Attribute {
++                style: Outer,
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "inert",
++                            arguments: None,
++                        },
++                    ],
++                },
++                tokens: TokenStream(`< T >`),
++            },
++        ],
++        vis: Inherited,
++        ident: "S",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Unit,
++            semi_token: Some,
++        },
++    }
+     "###);
+ 
+     assert!(input.attrs[0].parse_meta().is_err());
+ }
+ 
+ #[test]
+ fn test_attr_with_mod_style_path_with_self() {
+     let input = quote! {
+         #[foo::self]
+         struct S;
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    attrs: [
+-   ⋮        Attribute {
+-   ⋮            style: Outer,
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "foo",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "self",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            tokens: ``,
+-   ⋮        },
+-   ⋮    ],
+-   ⋮    vis: Inherited,
+-   ⋮    ident: "S",
+-   ⋮    generics: Generics,
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Unit,
+-   ⋮        semi_token: Some,
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        attrs: [
++            Attribute {
++                style: Outer,
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "foo",
++                            arguments: None,
++                        },
++                        PathSegment {
++                            ident: "self",
++                            arguments: None,
++                        },
++                    ],
++                },
++                tokens: TokenStream(``),
++            },
++        ],
++        vis: Inherited,
++        ident: "S",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Unit,
++            semi_token: Some,
++        },
++    }
+     "###);
+ 
+     snapshot!(input.attrs[0].parse_meta().unwrap(), @r###"
+-   ⋮Path(Path {
+-   ⋮    segments: [
+-   ⋮        PathSegment {
+-   ⋮            ident: "foo",
+-   ⋮            arguments: None,
+-   ⋮        },
+-   ⋮        PathSegment {
+-   ⋮            ident: "self",
+-   ⋮            arguments: None,
+-   ⋮        },
+-   ⋮    ],
+-   ⋮})
++    Path(Path {
++        segments: [
++            PathSegment {
++                ident: "foo",
++                arguments: None,
++            },
++            PathSegment {
++                ident: "self",
++                arguments: None,
++            },
++        ],
++    })
+     "###);
+ }
+ 
+ #[test]
+ fn test_pub_restricted() {
+     // Taken from tests/rust/src/test/ui/resolve/auxiliary/privacy-struct-ctor.rs
+     let input = quote! {
+         pub(in m) struct Z(pub(in m::n) u8);
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    vis: Visibility::Restricted {
+-   ⋮        in_token: Some,
+-   ⋮        path: Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "m",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        },
+-   ⋮    },
+-   ⋮    ident: "Z",
+-   ⋮    generics: Generics,
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Fields::Unnamed {
+-   ⋮            unnamed: [
+-   ⋮                Field {
+-   ⋮                    vis: Visibility::Restricted {
+-   ⋮                        in_token: Some,
+-   ⋮                        path: Path {
+-   ⋮                            segments: [
+-   ⋮                                PathSegment {
+-   ⋮                                    ident: "m",
+-   ⋮                                    arguments: None,
+-   ⋮                                },
+-   ⋮                                PathSegment {
+-   ⋮                                    ident: "n",
+-   ⋮                                    arguments: None,
+-   ⋮                                },
+-   ⋮                            ],
+-   ⋮                        },
+-   ⋮                    },
+-   ⋮                    ty: Type::Path {
+-   ⋮                        path: Path {
+-   ⋮                            segments: [
+-   ⋮                                PathSegment {
+-   ⋮                                    ident: "u8",
+-   ⋮                                    arguments: None,
+-   ⋮                                },
+-   ⋮                            ],
+-   ⋮                        },
+-   ⋮                    },
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        },
+-   ⋮        semi_token: Some,
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        vis: Visibility::Restricted {
++            in_token: Some,
++            path: Path {
++                segments: [
++                    PathSegment {
++                        ident: "m",
++                        arguments: None,
++                    },
++                ],
++            },
++        },
++        ident: "Z",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Fields::Unnamed {
++                unnamed: [
++                    Field {
++                        vis: Visibility::Restricted {
++                            in_token: Some,
++                            path: Path {
++                                segments: [
++                                    PathSegment {
++                                        ident: "m",
++                                        arguments: None,
++                                    },
++                                    PathSegment {
++                                        ident: "n",
++                                        arguments: None,
++                                    },
++                                ],
++                            },
++                        },
++                        ty: Type::Path {
++                            path: Path {
++                                segments: [
++                                    PathSegment {
++                                        ident: "u8",
++                                        arguments: None,
++                                    },
++                                ],
++                            },
++                        },
++                    },
++                ],
++            },
++            semi_token: Some,
++        },
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_vis_crate() {
+     let input = quote! {
+         crate struct S;
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    vis: Visibility::Crate,
+-   ⋮    ident: "S",
+-   ⋮    generics: Generics,
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Unit,
+-   ⋮        semi_token: Some,
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        vis: Visibility::Crate,
++        ident: "S",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Unit,
++            semi_token: Some,
++        },
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_pub_restricted_crate() {
+     let input = quote! {
+         pub(crate) struct S;
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    vis: Visibility::Restricted {
+-   ⋮        path: Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "crate",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        },
+-   ⋮    },
+-   ⋮    ident: "S",
+-   ⋮    generics: Generics,
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Unit,
+-   ⋮        semi_token: Some,
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        vis: Visibility::Restricted {
++            path: Path {
++                segments: [
++                    PathSegment {
++                        ident: "crate",
++                        arguments: None,
++                    },
++                ],
++            },
++        },
++        ident: "S",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Unit,
++            semi_token: Some,
++        },
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_pub_restricted_super() {
+     let input = quote! {
+         pub(super) struct S;
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    vis: Visibility::Restricted {
+-   ⋮        path: Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "super",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        },
+-   ⋮    },
+-   ⋮    ident: "S",
+-   ⋮    generics: Generics,
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Unit,
+-   ⋮        semi_token: Some,
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        vis: Visibility::Restricted {
++            path: Path {
++                segments: [
++                    PathSegment {
++                        ident: "super",
++                        arguments: None,
++                    },
++                ],
++            },
++        },
++        ident: "S",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Unit,
++            semi_token: Some,
++        },
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_pub_restricted_in_super() {
+     let input = quote! {
+         pub(in super) struct S;
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    vis: Visibility::Restricted {
+-   ⋮        in_token: Some,
+-   ⋮        path: Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "super",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        },
+-   ⋮    },
+-   ⋮    ident: "S",
+-   ⋮    generics: Generics,
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Unit,
+-   ⋮        semi_token: Some,
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        vis: Visibility::Restricted {
++            in_token: Some,
++            path: Path {
++                segments: [
++                    PathSegment {
++                        ident: "super",
++                        arguments: None,
++                    },
++                ],
++            },
++        },
++        ident: "S",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Unit,
++            semi_token: Some,
++        },
++    }
+     "###);
+ }
+ 
+ #[test]
+ fn test_fields_on_unit_struct() {
+     let input = quote! {
+         struct S;
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    vis: Inherited,
+-   ⋮    ident: "S",
+-   ⋮    generics: Generics,
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Unit,
+-   ⋮        semi_token: Some,
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        vis: Inherited,
++        ident: "S",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Unit,
++            semi_token: Some,
++        },
++    }
+     "###);
+ 
+     let data = match input.data {
+         Data::Struct(data) => data,
+         _ => panic!("expected a struct"),
+     };
+ 
+     assert_eq!(0, data.fields.iter().count());
+@@ -683,215 +678,215 @@ fn test_fields_on_named_struct() {
+     let input = quote! {
+         struct S {
+             foo: i32,
+             pub bar: String,
+         }
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    vis: Inherited,
+-   ⋮    ident: "S",
+-   ⋮    generics: Generics,
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Fields::Named {
+-   ⋮            named: [
+-   ⋮                Field {
+-   ⋮                    vis: Inherited,
+-   ⋮                    ident: Some("foo"),
+-   ⋮                    colon_token: Some,
+-   ⋮                    ty: Type::Path {
+-   ⋮                        path: Path {
+-   ⋮                            segments: [
+-   ⋮                                PathSegment {
+-   ⋮                                    ident: "i32",
+-   ⋮                                    arguments: None,
+-   ⋮                                },
+-   ⋮                            ],
+-   ⋮                        },
+-   ⋮                    },
+-   ⋮                },
+-   ⋮                Field {
+-   ⋮                    vis: Visibility::Public,
+-   ⋮                    ident: Some("bar"),
+-   ⋮                    colon_token: Some,
+-   ⋮                    ty: Type::Path {
+-   ⋮                        path: Path {
+-   ⋮                            segments: [
+-   ⋮                                PathSegment {
+-   ⋮                                    ident: "String",
+-   ⋮                                    arguments: None,
+-   ⋮                                },
+-   ⋮                            ],
+-   ⋮                        },
+-   ⋮                    },
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        },
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        vis: Inherited,
++        ident: "S",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Fields::Named {
++                named: [
++                    Field {
++                        vis: Inherited,
++                        ident: Some("foo"),
++                        colon_token: Some,
++                        ty: Type::Path {
++                            path: Path {
++                                segments: [
++                                    PathSegment {
++                                        ident: "i32",
++                                        arguments: None,
++                                    },
++                                ],
++                            },
++                        },
++                    },
++                    Field {
++                        vis: Visibility::Public,
++                        ident: Some("bar"),
++                        colon_token: Some,
++                        ty: Type::Path {
++                            path: Path {
++                                segments: [
++                                    PathSegment {
++                                        ident: "String",
++                                        arguments: None,
++                                    },
++                                ],
++                            },
++                        },
++                    },
++                ],
++            },
++        },
++    }
+     "###);
+ 
+     let data = match input.data {
+         Data::Struct(data) => data,
+         _ => panic!("expected a struct"),
+     };
+ 
+     snapshot!(data.fields.into_iter().collect::<Vec<_>>(), @r###"
+-   ⋮[
+-   ⋮    Field {
+-   ⋮        vis: Inherited,
+-   ⋮        ident: Some("foo"),
+-   ⋮        colon_token: Some,
+-   ⋮        ty: Type::Path {
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "i32",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮        },
+-   ⋮    },
+-   ⋮    Field {
+-   ⋮        vis: Visibility::Public,
+-   ⋮        ident: Some("bar"),
+-   ⋮        colon_token: Some,
+-   ⋮        ty: Type::Path {
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "String",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮        },
+-   ⋮    },
+-   ⋮]
++    [
++        Field {
++            vis: Inherited,
++            ident: Some("foo"),
++            colon_token: Some,
++            ty: Type::Path {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "i32",
++                            arguments: None,
++                        },
++                    ],
++                },
++            },
++        },
++        Field {
++            vis: Visibility::Public,
++            ident: Some("bar"),
++            colon_token: Some,
++            ty: Type::Path {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "String",
++                            arguments: None,
++                        },
++                    ],
++                },
++            },
++        },
++    ]
+     "###);
+ }
+ 
+ #[test]
+ fn test_fields_on_tuple_struct() {
+     let input = quote! {
+         struct S(i32, pub String);
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    vis: Inherited,
+-   ⋮    ident: "S",
+-   ⋮    generics: Generics,
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Fields::Unnamed {
+-   ⋮            unnamed: [
+-   ⋮                Field {
+-   ⋮                    vis: Inherited,
+-   ⋮                    ty: Type::Path {
+-   ⋮                        path: Path {
+-   ⋮                            segments: [
+-   ⋮                                PathSegment {
+-   ⋮                                    ident: "i32",
+-   ⋮                                    arguments: None,
+-   ⋮                                },
+-   ⋮                            ],
+-   ⋮                        },
+-   ⋮                    },
+-   ⋮                },
+-   ⋮                Field {
+-   ⋮                    vis: Visibility::Public,
+-   ⋮                    ty: Type::Path {
+-   ⋮                        path: Path {
+-   ⋮                            segments: [
+-   ⋮                                PathSegment {
+-   ⋮                                    ident: "String",
+-   ⋮                                    arguments: None,
+-   ⋮                                },
+-   ⋮                            ],
+-   ⋮                        },
+-   ⋮                    },
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        },
+-   ⋮        semi_token: Some,
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        vis: Inherited,
++        ident: "S",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Fields::Unnamed {
++                unnamed: [
++                    Field {
++                        vis: Inherited,
++                        ty: Type::Path {
++                            path: Path {
++                                segments: [
++                                    PathSegment {
++                                        ident: "i32",
++                                        arguments: None,
++                                    },
++                                ],
++                            },
++                        },
++                    },
++                    Field {
++                        vis: Visibility::Public,
++                        ty: Type::Path {
++                            path: Path {
++                                segments: [
++                                    PathSegment {
++                                        ident: "String",
++                                        arguments: None,
++                                    },
++                                ],
++                            },
++                        },
++                    },
++                ],
++            },
++            semi_token: Some,
++        },
++    }
+     "###);
+ 
+     let data = match input.data {
+         Data::Struct(data) => data,
+         _ => panic!("expected a struct"),
+     };
+ 
+     snapshot!(data.fields.iter().collect::<Vec<_>>(), @r###"
+-   ⋮[
+-   ⋮    Field {
+-   ⋮        vis: Inherited,
+-   ⋮        ty: Type::Path {
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "i32",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮        },
+-   ⋮    },
+-   ⋮    Field {
+-   ⋮        vis: Visibility::Public,
+-   ⋮        ty: Type::Path {
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "String",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮        },
+-   ⋮    },
+-   ⋮]
++    [
++        Field {
++            vis: Inherited,
++            ty: Type::Path {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "i32",
++                            arguments: None,
++                        },
++                    ],
++                },
++            },
++        },
++        Field {
++            vis: Visibility::Public,
++            ty: Type::Path {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "String",
++                            arguments: None,
++                        },
++                    ],
++                },
++            },
++        },
++    ]
+     "###);
+ }
+ 
+ #[test]
+ fn test_ambiguous_crate() {
+     let input = quote! {
+         // The field type is `(crate::X)` not `crate (::X)`.
+         struct S(crate::X);
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    vis: Inherited,
+-   ⋮    ident: "S",
+-   ⋮    generics: Generics,
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Fields::Unnamed {
+-   ⋮            unnamed: [
+-   ⋮                Field {
+-   ⋮                    vis: Inherited,
+-   ⋮                    ty: Type::Path {
+-   ⋮                        path: Path {
+-   ⋮                            segments: [
+-   ⋮                                PathSegment {
+-   ⋮                                    ident: "crate",
+-   ⋮                                    arguments: None,
+-   ⋮                                },
+-   ⋮                                PathSegment {
+-   ⋮                                    ident: "X",
+-   ⋮                                    arguments: None,
+-   ⋮                                },
+-   ⋮                            ],
+-   ⋮                        },
+-   ⋮                    },
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        },
+-   ⋮        semi_token: Some,
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        vis: Inherited,
++        ident: "S",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Fields::Unnamed {
++                unnamed: [
++                    Field {
++                        vis: Inherited,
++                        ty: Type::Path {
++                            path: Path {
++                                segments: [
++                                    PathSegment {
++                                        ident: "crate",
++                                        arguments: None,
++                                    },
++                                    PathSegment {
++                                        ident: "X",
++                                        arguments: None,
++                                    },
++                                ],
++                            },
++                        },
++                    },
++                ],
++            },
++            semi_token: Some,
++        },
++    }
+     "###);
+ }
+diff --git a/third_party/rust/syn/tests/test_expr.rs b/third_party/rust/syn/tests/test_expr.rs
+--- a/third_party/rust/syn/tests/test_expr.rs
++++ b/third_party/rust/syn/tests/test_expr.rs
+@@ -1,40 +1,302 @@
+-extern crate proc_macro2;
+-extern crate syn;
+-
+ #[macro_use]
+ mod macros;
+ 
+-use std::str::FromStr;
+-
+-use proc_macro2::TokenStream;
++use proc_macro2::{Delimiter, Group, Ident, Punct, Spacing, Span, TokenStream, TokenTree};
++use quote::quote;
++use std::iter::FromIterator;
+ use syn::{Expr, ExprRange};
+ 
+ #[test]
+ fn test_expr_parse() {
+-    let code = "..100u32";
+-    let tt = TokenStream::from_str(code).unwrap();
+-    let expr: Expr = syn::parse2(tt.clone()).unwrap();
+-    let expr_range: ExprRange = syn::parse2(tt).unwrap();
+-    assert_eq!(expr, Expr::Range(expr_range));
++    let tokens = quote!(..100u32);
++    snapshot!(tokens as Expr, @r###"
++    Expr::Range {
++        limits: HalfOpen,
++        to: Some(Expr::Lit {
++            lit: 100u32,
++        }),
++    }
++    "###);
++
++    let tokens = quote!(..100u32);
++    snapshot!(tokens as ExprRange, @r###"
++    ExprRange {
++        limits: HalfOpen,
++        to: Some(Expr::Lit {
++            lit: 100u32,
++        }),
++    }
++    "###);
+ }
+ 
+ #[test]
+ fn test_await() {
+     // Must not parse as Expr::Field.
+-    let expr = syn::parse_str::<Expr>("fut.await").unwrap();
++    let tokens = quote!(fut.await);
+ 
+-    snapshot!(expr, @r###"
+-   ⋮Expr::Await {
+-   ⋮    base: Expr::Path {
+-   ⋮        path: Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "fut",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        },
+-   ⋮    },
+-   ⋮}
++    snapshot!(tokens as Expr, @r###"
++    Expr::Await {
++        base: Expr::Path {
++            path: Path {
++                segments: [
++                    PathSegment {
++                        ident: "fut",
++                        arguments: None,
++                    },
++                ],
++            },
++        },
++    }
+     "###);
+ }
++
++#[rustfmt::skip]
++#[test]
++fn test_tuple_multi_index() {
++    for &input in &[
++        "tuple.0.0",
++        "tuple .0.0",
++        "tuple. 0.0",
++        "tuple.0 .0",
++        "tuple.0. 0",
++        "tuple . 0 . 0",
++    ] {
++        snapshot!(input as Expr, @r###"
++        Expr::Field {
++            base: Expr::Field {
++                base: Expr::Path {
++                    path: Path {
++                        segments: [
++                            PathSegment {
++                                ident: "tuple",
++                                arguments: None,
++                            },
++                        ],
++                    },
++                },
++                member: Unnamed(Index {
++                    index: 0,
++                }),
++            },
++            member: Unnamed(Index {
++                index: 0,
++            }),
++        }
++        "###);
++    }
++
++    for tokens in vec![
++        quote!(tuple.0.0),
++        quote!(tuple .0.0),
++        quote!(tuple. 0.0),
++        quote!(tuple.0 .0),
++        quote!(tuple.0. 0),
++        quote!(tuple . 0 . 0),
++    ] {
++        snapshot!(tokens as Expr, @r###"
++        Expr::Field {
++            base: Expr::Field {
++                base: Expr::Path {
++                    path: Path {
++                        segments: [
++                            PathSegment {
++                                ident: "tuple",
++                                arguments: None,
++                            },
++                        ],
++                    },
++                },
++                member: Unnamed(Index {
++                    index: 0,
++                }),
++            },
++            member: Unnamed(Index {
++                index: 0,
++            }),
++        }
++        "###);
++    }
++}
++
++#[test]
++fn test_macro_variable_func() {
++    // mimics the token stream corresponding to `$fn()`
++    let tokens = TokenStream::from_iter(vec![
++        TokenTree::Group(Group::new(Delimiter::None, quote! { f })),
++        TokenTree::Group(Group::new(Delimiter::Parenthesis, TokenStream::new())),
++    ]);
++
++    snapshot!(tokens as Expr, @r###"
++    Expr::Call {
++        func: Expr::Group {
++            expr: Expr::Path {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "f",
++                            arguments: None,
++                        },
++                    ],
++                },
++            },
++        },
++    }
++    "###);
++
++    let tokens = TokenStream::from_iter(vec![
++        TokenTree::Punct(Punct::new('#', Spacing::Alone)),
++        TokenTree::Group(Group::new(Delimiter::Bracket, quote! { outside })),
++        TokenTree::Group(Group::new(Delimiter::None, quote! { #[inside] f })),
++        TokenTree::Group(Group::new(Delimiter::Parenthesis, TokenStream::new())),
++    ]);
++
++    snapshot!(tokens as Expr, @r###"
++    Expr::Call {
++        attrs: [
++            Attribute {
++                style: Outer,
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "outside",
++                            arguments: None,
++                        },
++                    ],
++                },
++                tokens: TokenStream(``),
++            },
++        ],
++        func: Expr::Group {
++            expr: Expr::Path {
++                attrs: [
++                    Attribute {
++                        style: Outer,
++                        path: Path {
++                            segments: [
++                                PathSegment {
++                                    ident: "inside",
++                                    arguments: None,
++                                },
++                            ],
++                        },
++                        tokens: TokenStream(``),
++                    },
++                ],
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "f",
++                            arguments: None,
++                        },
++                    ],
++                },
++            },
++        },
++    }
++    "###);
++}
++
++#[test]
++fn test_macro_variable_macro() {
++    // mimics the token stream corresponding to `$macro!()`
++    let tokens = TokenStream::from_iter(vec![
++        TokenTree::Group(Group::new(Delimiter::None, quote! { m })),
++        TokenTree::Punct(Punct::new('!', Spacing::Alone)),
++        TokenTree::Group(Group::new(Delimiter::Parenthesis, TokenStream::new())),
++    ]);
++
++    snapshot!(tokens as Expr, @r###"
++    Expr::Macro {
++        mac: Macro {
++            path: Path {
++                segments: [
++                    PathSegment {
++                        ident: "m",
++                        arguments: None,
++                    },
++                ],
++            },
++            delimiter: Paren,
++            tokens: TokenStream(``),
++        },
++    }
++    "###);
++}
++
++#[test]
++fn test_macro_variable_struct() {
++    // mimics the token stream corresponding to `$struct {}`
++    let tokens = TokenStream::from_iter(vec![
++        TokenTree::Group(Group::new(Delimiter::None, quote! { S })),
++        TokenTree::Group(Group::new(Delimiter::Brace, TokenStream::new())),
++    ]);
++
++    snapshot!(tokens as Expr, @r###"
++    Expr::Struct {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "S",
++                    arguments: None,
++                },
++            ],
++        },
++    }
++    "###);
++}
++
++#[test]
++fn test_macro_variable_match_arm() {
++    // mimics the token stream corresponding to `match v { _ => $expr }`
++    let tokens = TokenStream::from_iter(vec![
++        TokenTree::Ident(Ident::new("match", Span::call_site())),
++        TokenTree::Ident(Ident::new("v", Span::call_site())),
++        TokenTree::Group(Group::new(
++            Delimiter::Brace,
++            TokenStream::from_iter(vec![
++                TokenTree::Punct(Punct::new('_', Spacing::Alone)),
++                TokenTree::Punct(Punct::new('=', Spacing::Joint)),
++                TokenTree::Punct(Punct::new('>', Spacing::Alone)),
++                TokenTree::Group(Group::new(Delimiter::None, quote! { #[a] () })),
++            ]),
++        )),
++    ]);
++
++    snapshot!(tokens as Expr, @r###"
++    Expr::Match {
++        expr: Expr::Path {
++            path: Path {
++                segments: [
++                    PathSegment {
++                        ident: "v",
++                        arguments: None,
++                    },
++                ],
++            },
++        },
++        arms: [
++            Arm {
++                pat: Pat::Wild,
++                body: Expr::Group {
++                    expr: Expr::Tuple {
++                        attrs: [
++                            Attribute {
++                                style: Outer,
++                                path: Path {
++                                    segments: [
++                                        PathSegment {
++                                            ident: "a",
++                                            arguments: None,
++                                        },
++                                    ],
++                                },
++                                tokens: TokenStream(``),
++                            },
++                        ],
++                    },
++                },
++            },
++        ],
++    }
++    "###);
++}
+diff --git a/third_party/rust/syn/tests/test_generics.rs b/third_party/rust/syn/tests/test_generics.rs
+--- a/third_party/rust/syn/tests/test_generics.rs
++++ b/third_party/rust/syn/tests/test_generics.rs
+@@ -1,110 +1,105 @@
+-extern crate quote;
+-extern crate syn;
+-
+-mod features;
+-
+ #[macro_use]
+ mod macros;
+ 
+ use quote::quote;
+ use syn::{DeriveInput, ItemFn, TypeParamBound, WhereClause, WherePredicate};
+ 
+ #[test]
+ fn test_split_for_impl() {
+     let input = quote! {
+         struct S<'a, 'b: 'a, #[may_dangle] T: 'a = ()> where T: Debug;
+     };
+ 
+     snapshot!(input as DeriveInput, @r###"
+-   ⋮DeriveInput {
+-   ⋮    vis: Inherited,
+-   ⋮    ident: "S",
+-   ⋮    generics: Generics {
+-   ⋮        lt_token: Some,
+-   ⋮        params: [
+-   ⋮            Lifetime(LifetimeDef {
+-   ⋮                lifetime: Lifetime {
+-   ⋮                    ident: "a",
+-   ⋮                },
+-   ⋮            }),
+-   ⋮            Lifetime(LifetimeDef {
+-   ⋮                lifetime: Lifetime {
+-   ⋮                    ident: "b",
+-   ⋮                },
+-   ⋮                colon_token: Some,
+-   ⋮                bounds: [
+-   ⋮                    Lifetime {
+-   ⋮                        ident: "a",
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            }),
+-   ⋮            Type(TypeParam {
+-   ⋮                attrs: [
+-   ⋮                    Attribute {
+-   ⋮                        style: Outer,
+-   ⋮                        path: Path {
+-   ⋮                            segments: [
+-   ⋮                                PathSegment {
+-   ⋮                                    ident: "may_dangle",
+-   ⋮                                    arguments: None,
+-   ⋮                                },
+-   ⋮                            ],
+-   ⋮                        },
+-   ⋮                        tokens: ``,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮                ident: "T",
+-   ⋮                colon_token: Some,
+-   ⋮                bounds: [
+-   ⋮                    Lifetime(Lifetime {
+-   ⋮                        ident: "a",
+-   ⋮                    }),
+-   ⋮                ],
+-   ⋮                eq_token: Some,
+-   ⋮                default: Some(Type::Tuple),
+-   ⋮            }),
+-   ⋮        ],
+-   ⋮        gt_token: Some,
+-   ⋮        where_clause: Some(WhereClause {
+-   ⋮            predicates: [
+-   ⋮                Type(PredicateType {
+-   ⋮                    bounded_ty: Type::Path {
+-   ⋮                        path: Path {
+-   ⋮                            segments: [
+-   ⋮                                PathSegment {
+-   ⋮                                    ident: "T",
+-   ⋮                                    arguments: None,
+-   ⋮                                },
+-   ⋮                            ],
+-   ⋮                        },
+-   ⋮                    },
+-   ⋮                    bounds: [
+-   ⋮                        Trait(TraitBound {
+-   ⋮                            modifier: None,
+-   ⋮                            path: Path {
+-   ⋮                                segments: [
+-   ⋮                                    PathSegment {
+-   ⋮                                        ident: "Debug",
+-   ⋮                                        arguments: None,
+-   ⋮                                    },
+-   ⋮                                ],
+-   ⋮                            },
+-   ⋮                        }),
+-   ⋮                    ],
+-   ⋮                }),
+-   ⋮            ],
+-   ⋮        }),
+-   ⋮    },
+-   ⋮    data: Data::Struct {
+-   ⋮        fields: Unit,
+-   ⋮        semi_token: Some,
+-   ⋮    },
+-   ⋮}
++    DeriveInput {
++        vis: Inherited,
++        ident: "S",
++        generics: Generics {
++            lt_token: Some,
++            params: [
++                Lifetime(LifetimeDef {
++                    lifetime: Lifetime {
++                        ident: "a",
++                    },
++                }),
++                Lifetime(LifetimeDef {
++                    lifetime: Lifetime {
++                        ident: "b",
++                    },
++                    colon_token: Some,
++                    bounds: [
++                        Lifetime {
++                            ident: "a",
++                        },
++                    ],
++                }),
++                Type(TypeParam {
++                    attrs: [
++                        Attribute {
++                            style: Outer,
++                            path: Path {
++                                segments: [
++                                    PathSegment {
++                                        ident: "may_dangle",
++                                        arguments: None,
++                                    },
++                                ],
++                            },
++                            tokens: TokenStream(``),
++                        },
++                    ],
++                    ident: "T",
++                    colon_token: Some,
++                    bounds: [
++                        Lifetime(Lifetime {
++                            ident: "a",
++                        }),
++                    ],
++                    eq_token: Some,
++                    default: Some(Type::Tuple),
++                }),
++            ],
++            gt_token: Some,
++            where_clause: Some(WhereClause {
++                predicates: [
++                    Type(PredicateType {
++                        bounded_ty: Type::Path {
++                            path: Path {
++                                segments: [
++                                    PathSegment {
++                                        ident: "T",
++                                        arguments: None,
++                                    },
++                                ],
++                            },
++                        },
++                        bounds: [
++                            Trait(TraitBound {
++                                modifier: None,
++                                path: Path {
++                                    segments: [
++                                        PathSegment {
++                                            ident: "Debug",
++                                            arguments: None,
++                                        },
++                                    ],
++                                },
++                            }),
++                        ],
++                    }),
++                ],
++            }),
++        },
++        data: Data::Struct {
++            fields: Unit,
++            semi_token: Some,
++        },
++    }
+     "###);
+ 
+     let generics = input.generics;
+     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
+ 
+     let generated = quote! {
+         impl #impl_generics MyTrait for Test #ty_generics #where_clause {}
+     };
+@@ -126,156 +121,156 @@ fn test_split_for_impl() {
+     };
+     assert_eq!(generated.to_string(), expected.to_string());
+ }
+ 
+ #[test]
+ fn test_ty_param_bound() {
+     let tokens = quote!('a);
+     snapshot!(tokens as TypeParamBound, @r###"
+-   ⋮Lifetime(Lifetime {
+-   ⋮    ident: "a",
+-   ⋮})
++    Lifetime(Lifetime {
++        ident: "a",
++    })
+     "###);
+ 
+     let tokens = quote!('_);
+     snapshot!(tokens as TypeParamBound, @r###"
+-   ⋮Lifetime(Lifetime {
+-   ⋮    ident: "_",
+-   ⋮})
++    Lifetime(Lifetime {
++        ident: "_",
++    })
+     "###);
+ 
+     let tokens = quote!(Debug);
+     snapshot!(tokens as TypeParamBound, @r###"
+-   ⋮Trait(TraitBound {
+-   ⋮    modifier: None,
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "Debug",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮})
++    Trait(TraitBound {
++        modifier: None,
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "Debug",
++                    arguments: None,
++                },
++            ],
++        },
++    })
+     "###);
+ 
+     let tokens = quote!(?Sized);
+     snapshot!(tokens as TypeParamBound, @r###"
+-   ⋮Trait(TraitBound {
+-   ⋮    modifier: Maybe,
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "Sized",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮})
++    Trait(TraitBound {
++        modifier: Maybe,
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "Sized",
++                    arguments: None,
++                },
++            ],
++        },
++    })
+     "###);
+ }
+ 
+ #[test]
+ fn test_fn_precedence_in_where_clause() {
+     // This should parse as two separate bounds, `FnOnce() -> i32` and `Send` - not
+     // `FnOnce() -> (i32 + Send)`.
+     let input = quote! {
+         fn f<G>()
+         where
+             G: FnOnce() -> i32 + Send,
+         {
+         }
+     };
+ 
+     snapshot!(input as ItemFn, @r###"
+-   ⋮ItemFn {
+-   ⋮    vis: Inherited,
+-   ⋮    sig: Signature {
+-   ⋮        ident: "f",
+-   ⋮        generics: Generics {
+-   ⋮            lt_token: Some,
+-   ⋮            params: [
+-   ⋮                Type(TypeParam {
+-   ⋮                    ident: "G",
+-   ⋮                }),
+-   ⋮            ],
+-   ⋮            gt_token: Some,
+-   ⋮            where_clause: Some(WhereClause {
+-   ⋮                predicates: [
+-   ⋮                    Type(PredicateType {
+-   ⋮                        bounded_ty: Type::Path {
+-   ⋮                            path: Path {
+-   ⋮                                segments: [
+-   ⋮                                    PathSegment {
+-   ⋮                                        ident: "G",
+-   ⋮                                        arguments: None,
+-   ⋮                                    },
+-   ⋮                                ],
+-   ⋮                            },
+-   ⋮                        },
+-   ⋮                        bounds: [
+-   ⋮                            Trait(TraitBound {
+-   ⋮                                modifier: None,
+-   ⋮                                path: Path {
+-   ⋮                                    segments: [
+-   ⋮                                        PathSegment {
+-   ⋮                                            ident: "FnOnce",
+-   ⋮                                            arguments: PathArguments::Parenthesized {
+-   ⋮                                                output: Type(
+-   ⋮                                                    Type::Path {
+-   ⋮                                                        path: Path {
+-   ⋮                                                            segments: [
+-   ⋮                                                                PathSegment {
+-   ⋮                                                                    ident: "i32",
+-   ⋮                                                                    arguments: None,
+-   ⋮                                                                },
+-   ⋮                                                            ],
+-   ⋮                                                        },
+-   ⋮                                                    },
+-   ⋮                                                ),
+-   ⋮                                            },
+-   ⋮                                        },
+-   ⋮                                    ],
+-   ⋮                                },
+-   ⋮                            }),
+-   ⋮                            Trait(TraitBound {
+-   ⋮                                modifier: None,
+-   ⋮                                path: Path {
+-   ⋮                                    segments: [
+-   ⋮                                        PathSegment {
+-   ⋮                                            ident: "Send",
+-   ⋮                                            arguments: None,
+-   ⋮                                        },
+-   ⋮                                    ],
+-   ⋮                                },
+-   ⋮                            }),
+-   ⋮                        ],
+-   ⋮                    }),
+-   ⋮                ],
+-   ⋮            }),
+-   ⋮        },
+-   ⋮        output: Default,
+-   ⋮    },
+-   ⋮    block: Block,
+-   ⋮}
++    ItemFn {
++        vis: Inherited,
++        sig: Signature {
++            ident: "f",
++            generics: Generics {
++                lt_token: Some,
++                params: [
++                    Type(TypeParam {
++                        ident: "G",
++                    }),
++                ],
++                gt_token: Some,
++                where_clause: Some(WhereClause {
++                    predicates: [
++                        Type(PredicateType {
++                            bounded_ty: Type::Path {
++                                path: Path {
++                                    segments: [
++                                        PathSegment {
++                                            ident: "G",
++                                            arguments: None,
++                                        },
++                                    ],
++                                },
++                            },
++                            bounds: [
++                                Trait(TraitBound {
++                                    modifier: None,
++                                    path: Path {
++                                        segments: [
++                                            PathSegment {
++                                                ident: "FnOnce",
++                                                arguments: PathArguments::Parenthesized {
++                                                    output: Type(
++                                                        Type::Path {
++                                                            path: Path {
++                                                                segments: [
++                                                                    PathSegment {
++                                                                        ident: "i32",
++                                                                        arguments: None,
++                                                                    },
++                                                                ],
++                                                            },
++                                                        },
++                                                    ),
++                                                },
++                                            },
++                                        ],
++                                    },
++                                }),
++                                Trait(TraitBound {
++                                    modifier: None,
++                                    path: Path {
++                                        segments: [
++                                            PathSegment {
++                                                ident: "Send",
++                                                arguments: None,
++                                            },
++                                        ],
++                                    },
++                                }),
++                            ],
++                        }),
++                    ],
++                }),
++            },
++            output: Default,
++        },
++        block: Block,
++    }
+     "###);
+ 
+     let where_clause = input.sig.generics.where_clause.as_ref().unwrap();
+     assert_eq!(where_clause.predicates.len(), 1);
+ 
+     let predicate = match &where_clause.predicates[0] {
+         WherePredicate::Type(pred) => pred,
+         _ => panic!("wrong predicate kind"),
+     };
+ 
+     assert_eq!(predicate.bounds.len(), 2, "{:#?}", predicate.bounds);
+ 
+     let first_bound = &predicate.bounds[0];
+-    assert_eq!(quote!(#first_bound).to_string(), "FnOnce ( ) -> i32");
++    assert_eq!(quote!(#first_bound).to_string(), "FnOnce () -> i32");
+ 
+     let second_bound = &predicate.bounds[1];
+     assert_eq!(quote!(#second_bound).to_string(), "Send");
+ }
+ 
+ #[test]
+ fn test_where_clause_at_end_of_input() {
+     let input = quote! {
+diff --git a/third_party/rust/syn/tests/test_grouping.rs b/third_party/rust/syn/tests/test_grouping.rs
+--- a/third_party/rust/syn/tests/test_grouping.rs
++++ b/third_party/rust/syn/tests/test_grouping.rs
+@@ -1,13 +1,8 @@
+-extern crate proc_macro2;
+-extern crate syn;
+-
+-mod features;
+-
+ #[macro_use]
+ mod macros;
+ 
+ use proc_macro2::{Delimiter, Group, Literal, Punct, Spacing, TokenStream, TokenTree};
+ use syn::Expr;
+ 
+ use std::iter::FromIterator;
+ 
+@@ -23,36 +18,36 @@ fn test_grouping() {
+                 TokenTree::Punct(Punct::new('+', Spacing::Alone)),
+                 TokenTree::Literal(Literal::i32_suffixed(3)),
+             ]),
+         )),
+         TokenTree::Punct(Punct::new('*', Spacing::Alone)),
+         TokenTree::Literal(Literal::i32_suffixed(4)),
+     ]);
+ 
+-    assert_eq!(tokens.to_string(), "1i32 +  2i32 + 3i32  * 4i32");
++    assert_eq!(tokens.to_string(), "1i32 + 2i32 + 3i32 * 4i32");
+ 
+     snapshot!(tokens as Expr, @r###"
+-   ⋮Expr::Binary {
+-   ⋮    left: Expr::Lit {
+-   ⋮        lit: 1i32,
+-   ⋮    },
+-   ⋮    op: Add,
+-   ⋮    right: Expr::Binary {
+-   ⋮        left: Expr::Group {
+-   ⋮            expr: Expr::Binary {
+-   ⋮                left: Expr::Lit {
+-   ⋮                    lit: 2i32,
+-   ⋮                },
+-   ⋮                op: Add,
+-   ⋮                right: Expr::Lit {
+-   ⋮                    lit: 3i32,
+-   ⋮                },
+-   ⋮            },
+-   ⋮        },
+-   ⋮        op: Mul,
+-   ⋮        right: Expr::Lit {
+-   ⋮            lit: 4i32,
+-   ⋮        },
+-   ⋮    },
+-   ⋮}
++    Expr::Binary {
++        left: Expr::Lit {
++            lit: 1i32,
++        },
++        op: Add,
++        right: Expr::Binary {
++            left: Expr::Group {
++                expr: Expr::Binary {
++                    left: Expr::Lit {
++                        lit: 2i32,
++                    },
++                    op: Add,
++                    right: Expr::Lit {
++                        lit: 3i32,
++                    },
++                },
++            },
++            op: Mul,
++            right: Expr::Lit {
++                lit: 4i32,
++            },
++        },
++    }
+     "###);
+ }
+diff --git a/third_party/rust/syn/tests/test_ident.rs b/third_party/rust/syn/tests/test_ident.rs
+--- a/third_party/rust/syn/tests/test_ident.rs
++++ b/third_party/rust/syn/tests/test_ident.rs
+@@ -1,13 +1,8 @@
+-extern crate proc_macro2;
+-extern crate syn;
+-
+-mod features;
+-
+ use proc_macro2::{Ident, Span, TokenStream};
+ use std::str::FromStr;
+ use syn::Result;
+ 
+ fn parse(s: &str) -> Result<Ident> {
+     syn::parse2(TokenStream::from_str(s).unwrap())
+ }
+ 
+diff --git a/third_party/rust/syn/tests/test_item.rs b/third_party/rust/syn/tests/test_item.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/tests/test_item.rs
+@@ -0,0 +1,45 @@
++#[macro_use]
++mod macros;
++
++use proc_macro2::{Delimiter, Group, Ident, Span, TokenStream, TokenTree};
++use quote::quote;
++use std::iter::FromIterator;
++use syn::Item;
++
++#[test]
++fn test_macro_variable_attr() {
++    // mimics the token stream corresponding to `$attr fn f() {}`
++    let tokens = TokenStream::from_iter(vec![
++        TokenTree::Group(Group::new(Delimiter::None, quote! { #[test] })),
++        TokenTree::Ident(Ident::new("fn", Span::call_site())),
++        TokenTree::Ident(Ident::new("f", Span::call_site())),
++        TokenTree::Group(Group::new(Delimiter::Parenthesis, TokenStream::new())),
++        TokenTree::Group(Group::new(Delimiter::Brace, TokenStream::new())),
++    ]);
++
++    snapshot!(tokens as Item, @r###"
++    Item::Fn {
++        attrs: [
++            Attribute {
++                style: Outer,
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "test",
++                            arguments: None,
++                        },
++                    ],
++                },
++                tokens: TokenStream(``),
++            },
++        ],
++        vis: Inherited,
++        sig: Signature {
++            ident: "f",
++            generics: Generics,
++            output: Default,
++        },
++        block: Block,
++    }
++    "###);
++}
+diff --git a/third_party/rust/syn/tests/test_iterators.rs b/third_party/rust/syn/tests/test_iterators.rs
+--- a/third_party/rust/syn/tests/test_iterators.rs
++++ b/third_party/rust/syn/tests/test_iterators.rs
+@@ -1,15 +1,10 @@
+ use syn::punctuated::{Pair, Punctuated};
+-
+-extern crate quote;
+-#[macro_use]
+-extern crate syn;
+-
+-mod features;
++use syn::Token;
+ 
+ #[macro_use]
+ mod macros;
+ 
+ macro_rules! check_exact_size_iterator {
+     ($iter:expr) => {{
+         let iter = $iter;
+         let size_hint = iter.size_hint();
+diff --git a/third_party/rust/syn/tests/test_lit.rs b/third_party/rust/syn/tests/test_lit.rs
+--- a/third_party/rust/syn/tests/test_lit.rs
++++ b/third_party/rust/syn/tests/test_lit.rs
+@@ -1,18 +1,16 @@
+-extern crate proc_macro2;
+-extern crate quote;
+-extern crate syn;
++#[macro_use]
++mod macros;
+ 
+-mod features;
+-
+-use proc_macro2::{TokenStream, TokenTree};
++use proc_macro2::{Delimiter, Group, Literal, Span, TokenStream, TokenTree};
+ use quote::ToTokens;
++use std::iter::FromIterator;
+ use std::str::FromStr;
+-use syn::Lit;
++use syn::{Lit, LitFloat, LitInt};
+ 
+ fn lit(s: &str) -> Lit {
+     match TokenStream::from_str(s)
+         .unwrap()
+         .into_iter()
+         .next()
+         .unwrap()
+     {
+@@ -45,16 +43,19 @@ fn strings() {
+     test_string("\"'\"", "'");
+     test_string("\"\"", "");
+     test_string("\"\\u{1F415}\"", "\u{1F415}");
+     test_string(
+         "\"contains\nnewlines\\\nescaped newlines\"",
+         "contains\nnewlinesescaped newlines",
+     );
+     test_string("r\"raw\nstring\\\nhere\"", "raw\nstring\\\nhere");
++    test_string("\"...\"q", "...");
++    test_string("r\"...\"q", "...");
++    test_string("r##\"...\"##q", "...");
+ }
+ 
+ #[test]
+ fn byte_strings() {
+     fn test_byte_string(s: &str, value: &[u8]) {
+         match lit(s) {
+             Lit::ByteStr(lit) => {
+                 assert_eq!(lit.value(), value);
+@@ -74,16 +75,19 @@ fn byte_strings() {
+     test_byte_string("b\"\\\"\"", b"\"");
+     test_byte_string("b\"'\"", b"'");
+     test_byte_string("b\"\"", b"");
+     test_byte_string(
+         "b\"contains\nnewlines\\\nescaped newlines\"",
+         b"contains\nnewlinesescaped newlines",
+     );
+     test_byte_string("br\"raw\nstring\\\nhere\"", b"raw\nstring\\\nhere");
++    test_byte_string("b\"...\"q", b"...");
++    test_byte_string("br\"...\"q", b"...");
++    test_byte_string("br##\"...\"##q", b"...");
+ }
+ 
+ #[test]
+ fn bytes() {
+     fn test_byte(s: &str, value: u8) {
+         match lit(s) {
+             Lit::Byte(lit) => {
+                 assert_eq!(lit.value(), value);
+@@ -95,16 +99,17 @@ fn bytes() {
+     }
+ 
+     test_byte("b'a'", b'a');
+     test_byte("b'\\n'", b'\n');
+     test_byte("b'\\r'", b'\r');
+     test_byte("b'\\t'", b'\t');
+     test_byte("b'\\''", b'\'');
+     test_byte("b'\"'", b'"');
++    test_byte("b'a'q", b'a');
+ }
+ 
+ #[test]
+ fn chars() {
+     fn test_char(s: &str, value: char) {
+         match lit(s) {
+             Lit::Char(lit) => {
+                 assert_eq!(lit.value(), value);
+@@ -120,16 +125,17 @@ fn chars() {
+     test_char("'a'", 'a');
+     test_char("'\\n'", '\n');
+     test_char("'\\r'", '\r');
+     test_char("'\\t'", '\t');
+     test_char("'🐕'", '🐕'); // NOTE: This is an emoji
+     test_char("'\\''", '\'');
+     test_char("'\"'", '"');
+     test_char("'\\u{1F415}'", '\u{1F415}');
++    test_char("'a'q", 'a');
+ }
+ 
+ #[test]
+ fn ints() {
+     fn test_int(s: &str, value: u64, suffix: &str) {
+         match lit(s) {
+             Lit::Int(lit) => {
+                 assert_eq!(lit.base10_digits().parse::<u64>().unwrap(), value);
+@@ -180,9 +186,64 @@ fn floats() {
+         }
+     }
+ 
+     test_float("5.5", 5.5, "");
+     test_float("5.5E12", 5.5e12, "");
+     test_float("5.5e12", 5.5e12, "");
+     test_float("1.0__3e-12", 1.03e-12, "");
+     test_float("1.03e+12", 1.03e12, "");
++    test_float("9e99e99", 9e99, "e99");
+ }
++
++#[test]
++fn negative() {
++    let span = Span::call_site();
++    assert_eq!("-1", LitInt::new("-1", span).to_string());
++    assert_eq!("-1i8", LitInt::new("-1i8", span).to_string());
++    assert_eq!("-1i16", LitInt::new("-1i16", span).to_string());
++    assert_eq!("-1i32", LitInt::new("-1i32", span).to_string());
++    assert_eq!("-1i64", LitInt::new("-1i64", span).to_string());
++    assert_eq!("-1.5", LitFloat::new("-1.5", span).to_string());
++    assert_eq!("-1.5f32", LitFloat::new("-1.5f32", span).to_string());
++    assert_eq!("-1.5f64", LitFloat::new("-1.5f64", span).to_string());
++}
++
++#[test]
++fn suffix() {
++    fn get_suffix(token: &str) -> String {
++        let lit = syn::parse_str::<Lit>(token).unwrap();
++        match lit {
++            Lit::Str(lit) => lit.suffix().to_owned(),
++            Lit::ByteStr(lit) => lit.suffix().to_owned(),
++            Lit::Byte(lit) => lit.suffix().to_owned(),
++            Lit::Char(lit) => lit.suffix().to_owned(),
++            Lit::Int(lit) => lit.suffix().to_owned(),
++            Lit::Float(lit) => lit.suffix().to_owned(),
++            _ => unimplemented!(),
++        }
++    }
++
++    assert_eq!(get_suffix("\"\"s"), "s");
++    assert_eq!(get_suffix("r\"\"r"), "r");
++    assert_eq!(get_suffix("b\"\"b"), "b");
++    assert_eq!(get_suffix("br\"\"br"), "br");
++    assert_eq!(get_suffix("r#\"\"#r"), "r");
++    assert_eq!(get_suffix("'c'c"), "c");
++    assert_eq!(get_suffix("b'b'b"), "b");
++    assert_eq!(get_suffix("1i32"), "i32");
++    assert_eq!(get_suffix("1_i32"), "i32");
++    assert_eq!(get_suffix("1.0f32"), "f32");
++    assert_eq!(get_suffix("1.0_f32"), "f32");
++}
++
++#[test]
++fn test_deep_group_empty() {
++    let tokens = TokenStream::from_iter(vec![TokenTree::Group(Group::new(
++        Delimiter::None,
++        TokenStream::from_iter(vec![TokenTree::Group(Group::new(
++            Delimiter::None,
++            TokenStream::from_iter(vec![TokenTree::Literal(Literal::string("hi"))]),
++        ))]),
++    ))]);
++
++    snapshot!(tokens as Lit, @r#""hi""# );
++}
+diff --git a/third_party/rust/syn/tests/test_meta.rs b/third_party/rust/syn/tests/test_meta.rs
+--- a/third_party/rust/syn/tests/test_meta.rs
++++ b/third_party/rust/syn/tests/test_meta.rs
+@@ -1,343 +1,339 @@
+-extern crate syn;
+-
+-mod features;
+-
+ #[macro_use]
+ mod macros;
+ 
+ use syn::{Meta, MetaList, MetaNameValue, NestedMeta};
+ 
+ #[test]
+ fn test_parse_meta_item_word() {
+     let input = "hello";
+ 
+     snapshot!(input as Meta, @r###"
+-   ⋮Path(Path {
+-   ⋮    segments: [
+-   ⋮        PathSegment {
+-   ⋮            ident: "hello",
+-   ⋮            arguments: None,
+-   ⋮        },
+-   ⋮    ],
+-   ⋮})
++    Path(Path {
++        segments: [
++            PathSegment {
++                ident: "hello",
++                arguments: None,
++            },
++        ],
++    })
+     "###);
+ }
+ 
+ #[test]
+ fn test_parse_meta_name_value() {
+     let input = "foo = 5";
+     let (inner, meta) = (input, input);
+ 
+     snapshot!(inner as MetaNameValue, @r###"
+-   ⋮MetaNameValue {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    lit: 5,
+-   ⋮}
++    MetaNameValue {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        lit: 5,
++    }
+     "###);
+ 
+     snapshot!(meta as Meta, @r###"
+-   ⋮Meta::NameValue {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    lit: 5,
+-   ⋮}
++    Meta::NameValue {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        lit: 5,
++    }
+     "###);
+ 
+     assert_eq!(meta, inner.into());
+ }
+ 
+ #[test]
+ fn test_parse_meta_name_value_with_keyword() {
+     let input = "static = 5";
+     let (inner, meta) = (input, input);
+ 
+     snapshot!(inner as MetaNameValue, @r###"
+-   ⋮MetaNameValue {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "static",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    lit: 5,
+-   ⋮}
++    MetaNameValue {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "static",
++                    arguments: None,
++                },
++            ],
++        },
++        lit: 5,
++    }
+     "###);
+ 
+     snapshot!(meta as Meta, @r###"
+-   ⋮Meta::NameValue {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "static",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    lit: 5,
+-   ⋮}
++    Meta::NameValue {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "static",
++                    arguments: None,
++                },
++            ],
++        },
++        lit: 5,
++    }
+     "###);
+ 
+     assert_eq!(meta, inner.into());
+ }
+ 
+ #[test]
+ fn test_parse_meta_name_value_with_bool() {
+     let input = "true = 5";
+     let (inner, meta) = (input, input);
+ 
+     snapshot!(inner as MetaNameValue, @r###"
+-   ⋮MetaNameValue {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "true",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    lit: 5,
+-   ⋮}
++    MetaNameValue {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "true",
++                    arguments: None,
++                },
++            ],
++        },
++        lit: 5,
++    }
+     "###);
+ 
+     snapshot!(meta as Meta, @r###"
+-   ⋮Meta::NameValue {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "true",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    lit: 5,
+-   ⋮}
++    Meta::NameValue {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "true",
++                    arguments: None,
++                },
++            ],
++        },
++        lit: 5,
++    }
+     "###);
+ 
+     assert_eq!(meta, inner.into());
+ }
+ 
+ #[test]
+ fn test_parse_meta_item_list_lit() {
+     let input = "foo(5)";
+     let (inner, meta) = (input, input);
+ 
+     snapshot!(inner as MetaList, @r###"
+-   ⋮MetaList {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    nested: [
+-   ⋮        Lit(5),
+-   ⋮    ],
+-   ⋮}
++    MetaList {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        nested: [
++            Lit(5),
++        ],
++    }
+     "###);
+ 
+     snapshot!(meta as Meta, @r###"
+-   ⋮Meta::List {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    nested: [
+-   ⋮        Lit(5),
+-   ⋮    ],
+-   ⋮}
++    Meta::List {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        nested: [
++            Lit(5),
++        ],
++    }
+     "###);
+ 
+     assert_eq!(meta, inner.into());
+ }
+ 
+ #[test]
+ fn test_parse_meta_item_multiple() {
+     let input = "foo(word, name = 5, list(name2 = 6), word2)";
+     let (inner, meta) = (input, input);
+ 
+     snapshot!(inner as MetaList, @r###"
+-   ⋮MetaList {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    nested: [
+-   ⋮        Meta(Path(Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "word",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        })),
+-   ⋮        Meta(Meta::NameValue {
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "name",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            lit: 5,
+-   ⋮        }),
+-   ⋮        Meta(Meta::List {
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "list",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            nested: [
+-   ⋮                Meta(Meta::NameValue {
+-   ⋮                    path: Path {
+-   ⋮                        segments: [
+-   ⋮                            PathSegment {
+-   ⋮                                ident: "name2",
+-   ⋮                                arguments: None,
+-   ⋮                            },
+-   ⋮                        ],
+-   ⋮                    },
+-   ⋮                    lit: 6,
+-   ⋮                }),
+-   ⋮            ],
+-   ⋮        }),
+-   ⋮        Meta(Path(Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "word2",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        })),
+-   ⋮    ],
+-   ⋮}
++    MetaList {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        nested: [
++            Meta(Path(Path {
++                segments: [
++                    PathSegment {
++                        ident: "word",
++                        arguments: None,
++                    },
++                ],
++            })),
++            Meta(Meta::NameValue {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "name",
++                            arguments: None,
++                        },
++                    ],
++                },
++                lit: 5,
++            }),
++            Meta(Meta::List {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "list",
++                            arguments: None,
++                        },
++                    ],
++                },
++                nested: [
++                    Meta(Meta::NameValue {
++                        path: Path {
++                            segments: [
++                                PathSegment {
++                                    ident: "name2",
++                                    arguments: None,
++                                },
++                            ],
++                        },
++                        lit: 6,
++                    }),
++                ],
++            }),
++            Meta(Path(Path {
++                segments: [
++                    PathSegment {
++                        ident: "word2",
++                        arguments: None,
++                    },
++                ],
++            })),
++        ],
++    }
+     "###);
+ 
+     snapshot!(meta as Meta, @r###"
+-   ⋮Meta::List {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "foo",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    nested: [
+-   ⋮        Meta(Path(Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "word",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        })),
+-   ⋮        Meta(Meta::NameValue {
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "name",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            lit: 5,
+-   ⋮        }),
+-   ⋮        Meta(Meta::List {
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "list",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            nested: [
+-   ⋮                Meta(Meta::NameValue {
+-   ⋮                    path: Path {
+-   ⋮                        segments: [
+-   ⋮                            PathSegment {
+-   ⋮                                ident: "name2",
+-   ⋮                                arguments: None,
+-   ⋮                            },
+-   ⋮                        ],
+-   ⋮                    },
+-   ⋮                    lit: 6,
+-   ⋮                }),
+-   ⋮            ],
+-   ⋮        }),
+-   ⋮        Meta(Path(Path {
+-   ⋮            segments: [
+-   ⋮                PathSegment {
+-   ⋮                    ident: "word2",
+-   ⋮                    arguments: None,
+-   ⋮                },
+-   ⋮            ],
+-   ⋮        })),
+-   ⋮    ],
+-   ⋮}
++    Meta::List {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "foo",
++                    arguments: None,
++                },
++            ],
++        },
++        nested: [
++            Meta(Path(Path {
++                segments: [
++                    PathSegment {
++                        ident: "word",
++                        arguments: None,
++                    },
++                ],
++            })),
++            Meta(Meta::NameValue {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "name",
++                            arguments: None,
++                        },
++                    ],
++                },
++                lit: 5,
++            }),
++            Meta(Meta::List {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "list",
++                            arguments: None,
++                        },
++                    ],
++                },
++                nested: [
++                    Meta(Meta::NameValue {
++                        path: Path {
++                            segments: [
++                                PathSegment {
++                                    ident: "name2",
++                                    arguments: None,
++                                },
++                            ],
++                        },
++                        lit: 6,
++                    }),
++                ],
++            }),
++            Meta(Path(Path {
++                segments: [
++                    PathSegment {
++                        ident: "word2",
++                        arguments: None,
++                    },
++                ],
++            })),
++        ],
++    }
+     "###);
+ 
+     assert_eq!(meta, inner.into());
+ }
+ 
+ #[test]
+ fn test_parse_nested_meta() {
+     let input = "5";
+     snapshot!(input as NestedMeta, @"Lit(5)");
+ 
+     let input = "list(name2 = 6)";
+     snapshot!(input as NestedMeta, @r###"
+-   ⋮Meta(Meta::List {
+-   ⋮    path: Path {
+-   ⋮        segments: [
+-   ⋮            PathSegment {
+-   ⋮                ident: "list",
+-   ⋮                arguments: None,
+-   ⋮            },
+-   ⋮        ],
+-   ⋮    },
+-   ⋮    nested: [
+-   ⋮        Meta(Meta::NameValue {
+-   ⋮            path: Path {
+-   ⋮                segments: [
+-   ⋮                    PathSegment {
+-   ⋮                        ident: "name2",
+-   ⋮                        arguments: None,
+-   ⋮                    },
+-   ⋮                ],
+-   ⋮            },
+-   ⋮            lit: 6,
+-   ⋮        }),
+-   ⋮    ],
+-   ⋮})
++    Meta(Meta::List {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "list",
++                    arguments: None,
++                },
++            ],
++        },
++        nested: [
++            Meta(Meta::NameValue {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "name2",
++                            arguments: None,
++                        },
++                    ],
++                },
++                lit: 6,
++            }),
++        ],
++    })
+     "###);
+ }
+diff --git a/third_party/rust/syn/tests/test_parse_buffer.rs b/third_party/rust/syn/tests/test_parse_buffer.rs
+--- a/third_party/rust/syn/tests/test_parse_buffer.rs
++++ b/third_party/rust/syn/tests/test_parse_buffer.rs
+@@ -1,12 +1,12 @@
+-#[macro_use]
+-extern crate syn;
+-
++use proc_macro2::{Delimiter, Group, Punct, Spacing, TokenStream, TokenTree};
++use std::iter::FromIterator;
+ use syn::parse::{discouraged::Speculative, Parse, ParseStream, Parser, Result};
++use syn::{parenthesized, Token};
+ 
+ #[test]
+ #[should_panic(expected = "Fork was not derived from the advancing parse stream")]
+ fn smuggled_speculative_cursor_between_sources() {
+     struct BreakRules;
+     impl Parse for BreakRules {
+         fn parse(input1: ParseStream) -> Result<Self> {
+             let nested = |input2: ParseStream| {
+@@ -48,8 +48,43 @@ fn smuggled_speculative_cursor_into_brac
+             parenthesized!(a in input);
+             input.advance_to(&a);
+             Ok(Self)
+         }
+     }
+ 
+     syn::parse_str::<BreakRules>("()").unwrap();
+ }
++
++#[test]
++fn trailing_empty_none_group() {
++    fn parse(input: ParseStream) -> Result<()> {
++        input.parse::<Token![+]>()?;
++
++        let content;
++        parenthesized!(content in input);
++        content.parse::<Token![+]>()?;
++
++        Ok(())
++    }
++
++    // `+ ( + <Ø Ø> ) <Ø <Ø Ø> Ø>`
++    let tokens = TokenStream::from_iter(vec![
++        TokenTree::Punct(Punct::new('+', Spacing::Alone)),
++        TokenTree::Group(Group::new(
++            Delimiter::Parenthesis,
++            TokenStream::from_iter(vec![
++                TokenTree::Punct(Punct::new('+', Spacing::Alone)),
++                TokenTree::Group(Group::new(Delimiter::None, TokenStream::new())),
++            ]),
++        )),
++        TokenTree::Group(Group::new(Delimiter::None, TokenStream::new())),
++        TokenTree::Group(Group::new(
++            Delimiter::None,
++            TokenStream::from_iter(vec![TokenTree::Group(Group::new(
++                Delimiter::None,
++                TokenStream::new(),
++            ))]),
++        )),
++    ]);
++
++    parse.parse2(tokens).unwrap();
++}
+diff --git a/third_party/rust/syn/tests/test_parse_stream.rs b/third_party/rust/syn/tests/test_parse_stream.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/tests/test_parse_stream.rs
+@@ -0,0 +1,12 @@
++use syn::ext::IdentExt;
++use syn::parse::ParseStream;
++use syn::{Ident, Token};
++
++#[test]
++fn test_peek() {
++    let _ = |input: ParseStream| {
++        let _ = input.peek(Ident);
++        let _ = input.peek(Ident::peek_any);
++        let _ = input.peek(Token![::]);
++    };
++}
+diff --git a/third_party/rust/syn/tests/test_pat.rs b/third_party/rust/syn/tests/test_pat.rs
+--- a/third_party/rust/syn/tests/test_pat.rs
++++ b/third_party/rust/syn/tests/test_pat.rs
+@@ -1,23 +1,38 @@
+-extern crate quote;
+-extern crate syn;
+-
+-mod features;
+-
+ use quote::quote;
+-use syn::Pat;
++use syn::{Item, Pat, Stmt};
+ 
+ #[test]
+ fn test_pat_ident() {
+     match syn::parse2(quote!(self)).unwrap() {
+         Pat::Ident(_) => (),
+         value => panic!("expected PatIdent, got {:?}", value),
+     }
+ }
+ 
+ #[test]
+ fn test_pat_path() {
+     match syn::parse2(quote!(self::CONST)).unwrap() {
+         Pat::Path(_) => (),
+         value => panic!("expected PatPath, got {:?}", value),
+     }
+ }
++
++#[test]
++fn test_leading_vert() {
++    // https://github.com/rust-lang/rust/blob/1.43.0/src/test/ui/or-patterns/remove-leading-vert.rs
++
++    syn::parse_str::<Item>("fn f() {}").unwrap();
++    syn::parse_str::<Item>("fn fun1(| A: E) {}").unwrap_err();
++    syn::parse_str::<Item>("fn fun2(|| A: E) {}").unwrap_err();
++
++    syn::parse_str::<Stmt>("let | () = ();").unwrap();
++    syn::parse_str::<Stmt>("let (| A): E;").unwrap_err();
++    syn::parse_str::<Stmt>("let (|| A): (E);").unwrap_err();
++    syn::parse_str::<Stmt>("let (| A,): (E,);").unwrap_err();
++    syn::parse_str::<Stmt>("let [| A]: [E; 1];").unwrap_err();
++    syn::parse_str::<Stmt>("let [|| A]: [E; 1];").unwrap_err();
++    syn::parse_str::<Stmt>("let TS(| A): TS;").unwrap_err();
++    syn::parse_str::<Stmt>("let TS(|| A): TS;").unwrap_err();
++    syn::parse_str::<Stmt>("let NS { f: | A }: NS;").unwrap_err();
++    syn::parse_str::<Stmt>("let NS { f: || A }: NS;").unwrap_err();
++}
+diff --git a/third_party/rust/syn/tests/test_path.rs b/third_party/rust/syn/tests/test_path.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/tests/test_path.rs
+@@ -0,0 +1,52 @@
++#[macro_use]
++mod macros;
++
++use proc_macro2::{Delimiter, Group, Ident, Punct, Spacing, Span, TokenStream, TokenTree};
++use quote::quote;
++use std::iter::FromIterator;
++use syn::{Expr, Type};
++
++#[test]
++fn parse_interpolated_leading_component() {
++    // mimics the token stream corresponding to `$mod::rest`
++    let tokens = TokenStream::from_iter(vec![
++        TokenTree::Group(Group::new(Delimiter::None, quote! { first })),
++        TokenTree::Punct(Punct::new(':', Spacing::Joint)),
++        TokenTree::Punct(Punct::new(':', Spacing::Alone)),
++        TokenTree::Ident(Ident::new("rest", Span::call_site())),
++    ]);
++
++    snapshot!(tokens.clone() as Expr, @r###"
++    Expr::Path {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "first",
++                    arguments: None,
++                },
++                PathSegment {
++                    ident: "rest",
++                    arguments: None,
++                },
++            ],
++        },
++    }
++    "###);
++
++    snapshot!(tokens as Type, @r###"
++    Type::Path {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "first",
++                    arguments: None,
++                },
++                PathSegment {
++                    ident: "rest",
++                    arguments: None,
++                },
++            ],
++        },
++    }
++    "###);
++}
+diff --git a/third_party/rust/syn/tests/test_precedence.rs b/third_party/rust/syn/tests/test_precedence.rs
+--- a/third_party/rust/syn/tests/test_precedence.rs
++++ b/third_party/rust/syn/tests/test_precedence.rs
+@@ -1,43 +1,34 @@
+ #![cfg(not(syn_disable_nightly_tests))]
+ #![recursion_limit = "1024"]
+ #![feature(rustc_private)]
+ 
+ //! The tests in this module do the following:
+ //!
+-//! 1. Parse a given expression in both `syn` and `libsyntax`.
++//! 1. Parse a given expression in both `syn` and `librustc`.
+ //! 2. Fold over the expression adding brackets around each subexpression (with
+-//!    some complications - see the `syn_brackets` and `libsyntax_brackets`
++//!    some complications - see the `syn_brackets` and `librustc_brackets`
+ //!    methods).
+ //! 3. Serialize the `syn` expression back into a string, and re-parse it with
+-//!    `libsyntax`.
++//!    `librustc`.
+ //! 4. Respan all of the expressions, replacing the spans with the default
+ //!    spans.
+ //! 5. Compare the expressions with one another, if they are not equal fail.
+ 
+-extern crate quote;
+-extern crate rayon;
+-extern crate regex;
++extern crate rustc_ast;
+ extern crate rustc_data_structures;
+-extern crate smallvec;
+-extern crate syn;
+-extern crate syntax;
+-extern crate syntax_pos;
+-extern crate walkdir;
+-
+-mod features;
++extern crate rustc_span;
+ 
+ use quote::quote;
+ use rayon::iter::{IntoParallelIterator, ParallelIterator};
+ use regex::Regex;
+-use smallvec::smallvec;
+-use syntax::ast;
+-use syntax::ptr::P;
+-use syntax_pos::edition::Edition;
++use rustc_ast::ast;
++use rustc_ast::ptr::P;
++use rustc_span::edition::Edition;
+ use walkdir::{DirEntry, WalkDir};
+ 
+ use std::fs::File;
+ use std::io::Read;
+ use std::process;
+ use std::sync::atomic::{AtomicUsize, Ordering};
+ 
+ use common::eq::SpanlessEq;
+@@ -68,17 +59,17 @@ fn test_simple_precedence() {
+     for input in EXPRS {
+         let expr = if let Some(expr) = parse::syn_expr(input) {
+             expr
+         } else {
+             failed += 1;
+             continue;
+         };
+ 
+-        let pf = match test_expressions(vec![expr]) {
++        let pf = match test_expressions(Edition::Edition2018, vec![expr]) {
+             (1, 0) => "passed",
+             (0, 1) => {
+                 failed += 1;
+                 "failed"
+             }
+             _ => unreachable!(),
+         };
+         errorf!("=== {}: {}\n", input, pf);
+@@ -86,18 +77,18 @@ fn test_simple_precedence() {
+ 
+     if failed > 0 {
+         panic!("Failed {} tests", failed);
+     }
+ }
+ 
+ /// Test expressions from rustc, like in `test_round_trip`.
+ #[test]
+-#[cfg_attr(target_os = "windows", ignore = "requires nix .sh")]
+ fn test_rustc_precedence() {
++    common::rayon_init();
+     repo::clone_rust();
+     let abort_after = common::abort_after();
+     if abort_after == 0 {
+         panic!("Skipping all precedence tests");
+     }
+ 
+     let passed = AtomicUsize::new(0);
+     let failed = AtomicUsize::new(0);
+@@ -113,34 +104,26 @@ fn test_rustc_precedence() {
+         .unwrap()
+         .into_par_iter()
+         .for_each(|entry| {
+             let path = entry.path();
+             if path.is_dir() {
+                 return;
+             }
+ 
+-            // Our version of `libsyntax` can't parse this tests
+-            if path
+-                .to_str()
+-                .unwrap()
+-                .ends_with("optional_comma_in_match_arm.rs")
+-            {
+-                return;
+-            }
+-
+             let mut file = File::open(path).unwrap();
+             let mut content = String::new();
+             file.read_to_string(&mut content).unwrap();
+             let content = edition_regex.replace_all(&content, "_$0");
+ 
+             let (l_passed, l_failed) = match syn::parse_file(&content) {
+                 Ok(file) => {
++                    let edition = repo::edition(path).parse().unwrap();
+                     let exprs = collect_exprs(file);
+-                    test_expressions(exprs)
++                    test_expressions(edition, exprs)
+                 }
+                 Err(msg) => {
+                     errorf!("syn failed to parse\n{:?}\n", msg);
+                     (0, 1)
+                 }
+             };
+ 
+             errorf!(
+@@ -164,147 +147,182 @@ fn test_rustc_precedence() {
+     errorf!("\n===== Precedence Test Results =====\n");
+     errorf!("{} passed | {} failed\n", passed, failed);
+ 
+     if failed > 0 {
+         panic!("{} failures", failed);
+     }
+ }
+ 
+-fn test_expressions(exprs: Vec<syn::Expr>) -> (usize, usize) {
++fn test_expressions(edition: Edition, exprs: Vec<syn::Expr>) -> (usize, usize) {
+     let mut passed = 0;
+     let mut failed = 0;
+ 
+-    syntax::with_globals(Edition::Edition2018, || {
++    rustc_span::with_session_globals(edition, || {
+         for expr in exprs {
+             let raw = quote!(#expr).to_string();
+ 
+-            let libsyntax_ast = if let Some(e) = libsyntax_parse_and_rewrite(&raw) {
++            let librustc_ast = if let Some(e) = librustc_parse_and_rewrite(&raw) {
+                 e
+             } else {
+                 failed += 1;
+-                errorf!("\nFAIL - libsyntax failed to parse raw\n");
++                errorf!("\nFAIL - librustc failed to parse raw\n");
+                 continue;
+             };
+ 
+             let syn_expr = syn_brackets(expr);
+-            let syn_ast = if let Some(e) = parse::libsyntax_expr(&quote!(#syn_expr).to_string()) {
++            let syn_ast = if let Some(e) = parse::librustc_expr(&quote!(#syn_expr).to_string()) {
+                 e
+             } else {
+                 failed += 1;
+-                errorf!("\nFAIL - libsyntax failed to parse bracketed\n");
++                errorf!("\nFAIL - librustc failed to parse bracketed\n");
+                 continue;
+             };
+ 
+-            if SpanlessEq::eq(&syn_ast, &libsyntax_ast) {
++            if SpanlessEq::eq(&syn_ast, &librustc_ast) {
+                 passed += 1;
+             } else {
+                 failed += 1;
+-                errorf!("\nFAIL\n{:?}\n!=\n{:?}\n", syn_ast, libsyntax_ast);
++                errorf!("\nFAIL\n{:?}\n!=\n{:?}\n", syn_ast, librustc_ast);
+             }
+         }
+     });
+ 
+     (passed, failed)
+ }
+ 
+-fn libsyntax_parse_and_rewrite(input: &str) -> Option<P<ast::Expr>> {
+-    parse::libsyntax_expr(input).and_then(libsyntax_brackets)
++fn librustc_parse_and_rewrite(input: &str) -> Option<P<ast::Expr>> {
++    parse::librustc_expr(input).and_then(librustc_brackets)
+ }
+ 
+ /// Wrap every expression which is not already wrapped in parens with parens, to
+ /// reveal the precidence of the parsed expressions, and produce a stringified
+ /// form of the resulting expression.
+ ///
+-/// This method operates on libsyntax objects.
+-fn libsyntax_brackets(mut libsyntax_expr: P<ast::Expr>) -> Option<P<ast::Expr>> {
++/// This method operates on librustc objects.
++fn librustc_brackets(mut librustc_expr: P<ast::Expr>) -> Option<P<ast::Expr>> {
++    use rustc_ast::ast::{
++        Block, BorrowKind, Expr, ExprKind, Field, GenericArg, MacCall, Pat, Stmt, StmtKind, Ty,
++    };
++    use rustc_ast::mut_visit::{noop_visit_generic_arg, MutVisitor};
++    use rustc_data_structures::map_in_place::MapInPlace;
+     use rustc_data_structures::thin_vec::ThinVec;
+-    use smallvec::SmallVec;
++    use rustc_span::DUMMY_SP;
+     use std::mem;
+-    use syntax::ast::{Expr, ExprKind, Field, Mac, Pat, Stmt, StmtKind, Ty};
+-    use syntax::mut_visit::{noop_visit_expr, MutVisitor};
+-    use syntax_pos::DUMMY_SP;
+ 
+     struct BracketsVisitor {
+         failed: bool,
+     };
+ 
++    fn flat_map_field<T: MutVisitor>(mut f: Field, vis: &mut T) -> Vec<Field> {
++        if f.is_shorthand {
++            noop_visit_expr(&mut f.expr, vis);
++        } else {
++            vis.visit_expr(&mut f.expr);
++        }
++        vec![f]
++    }
++
++    fn flat_map_stmt<T: MutVisitor>(stmt: Stmt, vis: &mut T) -> Vec<Stmt> {
++        let kind = match stmt.kind {
++            // Don't wrap toplevel expressions in statements.
++            StmtKind::Expr(mut e) => {
++                noop_visit_expr(&mut e, vis);
++                StmtKind::Expr(e)
++            }
++            StmtKind::Semi(mut e) => {
++                noop_visit_expr(&mut e, vis);
++                StmtKind::Semi(e)
++            }
++            s => s,
++        };
++
++        vec![Stmt { kind, ..stmt }]
++    }
++
++    fn noop_visit_expr<T: MutVisitor>(e: &mut Expr, vis: &mut T) {
++        use rustc_ast::mut_visit::{noop_visit_expr, visit_opt, visit_thin_attrs};
++        match &mut e.kind {
++            ExprKind::AddrOf(BorrowKind::Raw, ..) => {}
++            ExprKind::Struct(path, fields, expr) => {
++                vis.visit_path(path);
++                fields.flat_map_in_place(|field| flat_map_field(field, vis));
++                visit_opt(expr, |expr| vis.visit_expr(expr));
++                vis.visit_id(&mut e.id);
++                vis.visit_span(&mut e.span);
++                visit_thin_attrs(&mut e.attrs, vis);
++            }
++            _ => noop_visit_expr(e, vis),
++        }
++    }
++
+     impl MutVisitor for BracketsVisitor {
+         fn visit_expr(&mut self, e: &mut P<Expr>) {
+             noop_visit_expr(e, self);
+-            match e.node {
++            match e.kind {
+                 ExprKind::If(..) | ExprKind::Block(..) | ExprKind::Let(..) => {}
+                 _ => {
+                     let inner = mem::replace(
+                         e,
+                         P(Expr {
+                             id: ast::DUMMY_NODE_ID,
+-                            node: ExprKind::Err,
++                            kind: ExprKind::Err,
+                             span: DUMMY_SP,
+                             attrs: ThinVec::new(),
++                            tokens: None,
+                         }),
+                     );
+-                    e.node = ExprKind::Paren(inner);
++                    e.kind = ExprKind::Paren(inner);
+                 }
+             }
+         }
+ 
+-        fn flat_map_field(&mut self, mut f: Field) -> SmallVec<[Field; 1]> {
+-            if f.is_shorthand {
+-                noop_visit_expr(&mut f.expr, self);
+-            } else {
+-                self.visit_expr(&mut f.expr);
++        fn visit_generic_arg(&mut self, arg: &mut GenericArg) {
++            match arg {
++                // Don't wrap const generic arg as that's invalid syntax.
++                GenericArg::Const(arg) => noop_visit_expr(&mut arg.value, self),
++                _ => noop_visit_generic_arg(arg, self),
+             }
+-            SmallVec::from([f])
++        }
++
++        fn visit_block(&mut self, block: &mut P<Block>) {
++            self.visit_id(&mut block.id);
++            block
++                .stmts
++                .flat_map_in_place(|stmt| flat_map_stmt(stmt, self));
++            self.visit_span(&mut block.span);
+         }
+ 
+         // We don't want to look at expressions that might appear in patterns or
+         // types yet. We'll look into comparing those in the future. For now
+         // focus on expressions appearing in other places.
+         fn visit_pat(&mut self, pat: &mut P<Pat>) {
+             let _ = pat;
+         }
+ 
+         fn visit_ty(&mut self, ty: &mut P<Ty>) {
+             let _ = ty;
+         }
+ 
+-        fn flat_map_stmt(&mut self, stmt: Stmt) -> SmallVec<[Stmt; 1]> {
+-            let node = match stmt.node {
+-                // Don't wrap toplevel expressions in statements.
+-                StmtKind::Expr(mut e) => {
+-                    noop_visit_expr(&mut e, self);
+-                    StmtKind::Expr(e)
+-                }
+-                StmtKind::Semi(mut e) => {
+-                    noop_visit_expr(&mut e, self);
+-                    StmtKind::Semi(e)
+-                }
+-                s => s,
+-            };
+-
+-            smallvec![Stmt { node, ..stmt }]
+-        }
+-
+-        fn visit_mac(&mut self, mac: &mut Mac) {
+-            // By default when folding over macros, libsyntax panics. This is
++        fn visit_mac(&mut self, mac: &mut MacCall) {
++            // By default when folding over macros, librustc panics. This is
+             // because it's usually not what you want, you want to run after
+             // macro expansion. We do want to do that (syn doesn't do macro
+             // expansion), so we implement visit_mac to just return the macro
+             // unchanged.
+             let _ = mac;
+         }
+     }
+ 
+     let mut folder = BracketsVisitor { failed: false };
+-    folder.visit_expr(&mut libsyntax_expr);
++    folder.visit_expr(&mut librustc_expr);
+     if folder.failed {
+         None
+     } else {
+-        Some(libsyntax_expr)
++        Some(librustc_expr)
+     }
+ }
+ 
+ /// Wrap every expression which is not already wrapped in parens with parens, to
+ /// reveal the precedence of the parsed expressions, and produce a stringified
+ /// form of the resulting expression.
+ fn syn_brackets(syn_expr: syn::Expr) -> syn::Expr {
+     use syn::fold::*;
+@@ -313,24 +331,43 @@ fn syn_brackets(syn_expr: syn::Expr) -> 
+     struct ParenthesizeEveryExpr;
+     impl Fold for ParenthesizeEveryExpr {
+         fn fold_expr(&mut self, expr: Expr) -> Expr {
+             match expr {
+                 Expr::Group(_) => unreachable!(),
+                 Expr::If(..) | Expr::Unsafe(..) | Expr::Block(..) | Expr::Let(..) => {
+                     fold_expr(self, expr)
+                 }
+-                node => Expr::Paren(ExprParen {
++                _ => Expr::Paren(ExprParen {
+                     attrs: Vec::new(),
+-                    expr: Box::new(fold_expr(self, node)),
++                    expr: Box::new(fold_expr(self, expr)),
+                     paren_token: token::Paren::default(),
+                 }),
+             }
+         }
+ 
++        fn fold_generic_argument(&mut self, arg: GenericArgument) -> GenericArgument {
++            match arg {
++                // Don't wrap const generic arg as that's invalid syntax.
++                GenericArgument::Const(a) => GenericArgument::Const(fold_expr(self, a)),
++                _ => fold_generic_argument(self, arg),
++            }
++        }
++
++        fn fold_generic_method_argument(
++            &mut self,
++            arg: GenericMethodArgument,
++        ) -> GenericMethodArgument {
++            match arg {
++                // Don't wrap const generic arg as that's invalid syntax.
++                GenericMethodArgument::Const(a) => GenericMethodArgument::Const(fold_expr(self, a)),
++                _ => fold_generic_method_argument(self, arg),
++            }
++        }
++
+         fn fold_stmt(&mut self, stmt: Stmt) -> Stmt {
+             match stmt {
+                 // Don't wrap toplevel expressions in statements.
+                 Stmt::Expr(e) => Stmt::Expr(fold_expr(self, e)),
+                 Stmt::Semi(e, semi) => Stmt::Semi(fold_expr(self, e), semi),
+                 s => s,
+             }
+         }
+@@ -355,17 +392,20 @@ fn syn_brackets(syn_expr: syn::Expr) -> 
+ fn collect_exprs(file: syn::File) -> Vec<syn::Expr> {
+     use syn::fold::*;
+     use syn::punctuated::Punctuated;
+     use syn::*;
+ 
+     struct CollectExprs(Vec<Expr>);
+     impl Fold for CollectExprs {
+         fn fold_expr(&mut self, expr: Expr) -> Expr {
+-            self.0.push(expr);
++            match expr {
++                Expr::Verbatim(tokens) if tokens.is_empty() => {}
++                _ => self.0.push(expr),
++            }
+ 
+             Expr::Tuple(ExprTuple {
+                 attrs: vec![],
+                 elems: Punctuated::new(),
+                 paren_token: token::Paren::default(),
+             })
+         }
+     }
+diff --git a/third_party/rust/syn/tests/test_receiver.rs b/third_party/rust/syn/tests/test_receiver.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/tests/test_receiver.rs
+@@ -0,0 +1,127 @@
++use syn::{parse_quote, FnArg, Receiver, TraitItemMethod};
++
++#[test]
++fn test_by_value() {
++    let TraitItemMethod { sig, .. } = parse_quote! {
++        fn by_value(self: Self);
++    };
++    match sig.receiver() {
++        Some(FnArg::Typed(_)) => (),
++        value => panic!("expected FnArg::Typed, got {:?}", value),
++    }
++}
++
++#[test]
++fn test_by_mut_value() {
++    let TraitItemMethod { sig, .. } = parse_quote! {
++        fn by_mut(mut self: Self);
++    };
++    match sig.receiver() {
++        Some(FnArg::Typed(_)) => (),
++        value => panic!("expected FnArg::Typed, got {:?}", value),
++    }
++}
++
++#[test]
++fn test_by_ref() {
++    let TraitItemMethod { sig, .. } = parse_quote! {
++        fn by_ref(self: &Self);
++    };
++    match sig.receiver() {
++        Some(FnArg::Typed(_)) => (),
++        value => panic!("expected FnArg::Typed, got {:?}", value),
++    }
++}
++
++#[test]
++fn test_by_box() {
++    let TraitItemMethod { sig, .. } = parse_quote! {
++        fn by_box(self: Box<Self>);
++    };
++    match sig.receiver() {
++        Some(FnArg::Typed(_)) => (),
++        value => panic!("expected FnArg::Typed, got {:?}", value),
++    }
++}
++
++#[test]
++fn test_by_pin() {
++    let TraitItemMethod { sig, .. } = parse_quote! {
++        fn by_pin(self: Pin<Self>);
++    };
++    match sig.receiver() {
++        Some(FnArg::Typed(_)) => (),
++        value => panic!("expected FnArg::Typed, got {:?}", value),
++    }
++}
++
++#[test]
++fn test_explicit_type() {
++    let TraitItemMethod { sig, .. } = parse_quote! {
++        fn explicit_type(self: Pin<MyType>);
++    };
++    match sig.receiver() {
++        Some(FnArg::Typed(_)) => (),
++        value => panic!("expected FnArg::Typed, got {:?}", value),
++    }
++}
++
++#[test]
++fn test_value_shorthand() {
++    let TraitItemMethod { sig, .. } = parse_quote! {
++        fn value_shorthand(self);
++    };
++    match sig.receiver() {
++        Some(FnArg::Receiver(Receiver {
++            reference: None,
++            mutability: None,
++            ..
++        })) => (),
++        value => panic!("expected FnArg::Receiver without ref/mut, got {:?}", value),
++    }
++}
++
++#[test]
++fn test_mut_value_shorthand() {
++    let TraitItemMethod { sig, .. } = parse_quote! {
++        fn mut_value_shorthand(mut self);
++    };
++    match sig.receiver() {
++        Some(FnArg::Receiver(Receiver {
++            reference: None,
++            mutability: Some(_),
++            ..
++        })) => (),
++        value => panic!("expected FnArg::Receiver with mut, got {:?}", value),
++    }
++}
++
++#[test]
++fn test_ref_shorthand() {
++    let TraitItemMethod { sig, .. } = parse_quote! {
++        fn ref_shorthand(&self);
++    };
++    match sig.receiver() {
++        Some(FnArg::Receiver(Receiver {
++            reference: Some(_),
++            mutability: None,
++            ..
++        })) => (),
++        value => panic!("expected FnArg::Receiver with ref, got {:?}", value),
++    }
++}
++
++#[test]
++fn test_ref_mut_shorthand() {
++    let TraitItemMethod { sig, .. } = parse_quote! {
++        fn ref_mut_shorthand(&mut self);
++    };
++    match sig.receiver() {
++        Some(FnArg::Receiver(Receiver {
++            reference: Some(_),
++            mutability: Some(_),
++            ..
++        })) => (),
++        value => panic!("expected FnArg::Receiver with ref+mut, got {:?}", value),
++    }
++}
+diff --git a/third_party/rust/syn/tests/test_round_trip.rs b/third_party/rust/syn/tests/test_round_trip.rs
+--- a/third_party/rust/syn/tests/test_round_trip.rs
++++ b/third_party/rust/syn/tests/test_round_trip.rs
+@@ -1,28 +1,26 @@
+ #![cfg(not(syn_disable_nightly_tests))]
+ #![recursion_limit = "1024"]
+ #![feature(rustc_private)]
+ 
+-extern crate quote;
+-extern crate rayon;
+-extern crate syn;
+-extern crate syntax;
+-extern crate syntax_pos;
+-extern crate walkdir;
+-
+-mod features;
++extern crate rustc_ast;
++extern crate rustc_errors;
++extern crate rustc_expand;
++extern crate rustc_parse as parse;
++extern crate rustc_session;
++extern crate rustc_span;
+ 
+ use quote::quote;
+ use rayon::iter::{IntoParallelIterator, ParallelIterator};
+-use syntax::ast;
+-use syntax::parse::{self, PResult, ParseSess};
+-use syntax::source_map::FilePathMapping;
+-use syntax_pos::edition::Edition;
+-use syntax_pos::FileName;
++use rustc_ast::ast;
++use rustc_errors::PResult;
++use rustc_session::parse::ParseSess;
++use rustc_span::source_map::FilePathMapping;
++use rustc_span::FileName;
+ use walkdir::{DirEntry, WalkDir};
+ 
+ use std::fs::File;
+ use std::io::Read;
+ use std::panic;
+ use std::process;
+ use std::sync::atomic::{AtomicUsize, Ordering};
+ use std::time::Instant;
+@@ -33,18 +31,18 @@ mod macros;
+ #[allow(dead_code)]
+ mod common;
+ 
+ mod repo;
+ 
+ use common::eq::SpanlessEq;
+ 
+ #[test]
+-#[cfg_attr(target_os = "windows", ignore = "requires nix .sh")]
+ fn test_round_trip() {
++    common::rayon_init();
+     repo::clone_rust();
+     let abort_after = common::abort_after();
+     if abort_after == 0 {
+         panic!("Skipping all round_trip tests");
+     }
+ 
+     let failed = AtomicUsize::new(0);
+ 
+@@ -73,43 +71,44 @@ fn test_round_trip() {
+                     let prev_failed = failed.fetch_add(1, Ordering::SeqCst);
+                     if prev_failed + 1 >= abort_after {
+                         process::exit(1);
+                     }
+                     return;
+                 }
+             };
+             let back = quote!(#krate).to_string();
++            let edition = repo::edition(path).parse().unwrap();
+ 
+             let equal = panic::catch_unwind(|| {
+-                syntax::with_globals(Edition::Edition2018, || {
++                rustc_span::with_session_globals(edition, || {
+                     let sess = ParseSess::new(FilePathMapping::empty());
+-                    let before = match libsyntax_parse(content, &sess) {
++                    let before = match librustc_parse(content, &sess) {
+                         Ok(before) => before,
+                         Err(mut diagnostic) => {
+                             diagnostic.cancel();
+                             if diagnostic
+                                 .message()
+                                 .starts_with("file not found for module")
+                             {
+                                 errorf!("=== {}: ignore\n", path.display());
+                             } else {
+                                 errorf!(
+-                                "=== {}: ignore - libsyntax failed to parse original content: {}\n",
++                                "=== {}: ignore - librustc failed to parse original content: {}\n",
+                                 path.display(),
+                                 diagnostic.message()
+                             );
+                             }
+                             return true;
+                         }
+                     };
+-                    let after = match libsyntax_parse(back, &sess) {
++                    let after = match librustc_parse(back, &sess) {
+                         Ok(after) => after,
+                         Err(mut diagnostic) => {
+-                            errorf!("=== {}: libsyntax failed to parse", path.display());
++                            errorf!("=== {}: librustc failed to parse", path.display());
+                             diagnostic.emit();
+                             return false;
+                         }
+                     };
+ 
+                     if SpanlessEq::eq(&before, &after) {
+                         errorf!(
+                             "=== {}: pass in {}ms\n",
+@@ -125,29 +124,29 @@ fn test_round_trip() {
+                             before,
+                             after,
+                         );
+                         false
+                     }
+                 })
+             });
+             match equal {
+-                Err(_) => errorf!("=== {}: ignoring libsyntax panic\n", path.display()),
++                Err(_) => errorf!("=== {}: ignoring librustc panic\n", path.display()),
+                 Ok(true) => {}
+                 Ok(false) => {
+                     let prev_failed = failed.fetch_add(1, Ordering::SeqCst);
+                     if prev_failed + 1 >= abort_after {
+                         process::exit(1);
+                     }
+                 }
+             }
+         });
+ 
+     let failed = failed.load(Ordering::SeqCst);
+     if failed > 0 {
+         panic!("{} failures", failed);
+     }
+ }
+ 
+-fn libsyntax_parse(content: String, sess: &ParseSess) -> PResult<ast::Crate> {
++fn librustc_parse(content: String, sess: &ParseSess) -> PResult<ast::Crate> {
+     let name = FileName::Custom("test_round_trip".to_string());
+     parse::parse_crate_from_source_str(name, content, sess)
+ }
+diff --git a/third_party/rust/syn/tests/test_shebang.rs b/third_party/rust/syn/tests/test_shebang.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/tests/test_shebang.rs
+@@ -0,0 +1,59 @@
++#[macro_use]
++mod macros;
++
++#[test]
++fn test_basic() {
++    let content = "#!/usr/bin/env rustx\nfn main() {}";
++    let file = syn::parse_file(content).unwrap();
++    snapshot!(file, @r###"
++    File {
++        shebang: Some("#!/usr/bin/env rustx"),
++        items: [
++            Item::Fn {
++                vis: Inherited,
++                sig: Signature {
++                    ident: "main",
++                    generics: Generics,
++                    output: Default,
++                },
++                block: Block,
++            },
++        ],
++    }
++    "###);
++}
++
++#[test]
++fn test_comment() {
++    let content = "#!//am/i/a/comment\n[allow(dead_code)] fn main() {}";
++    let file = syn::parse_file(content).unwrap();
++    snapshot!(file, @r###"
++    File {
++        attrs: [
++            Attribute {
++                style: Inner,
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "allow",
++                            arguments: None,
++                        },
++                    ],
++                },
++                tokens: TokenStream(`(dead_code)`),
++            },
++        ],
++        items: [
++            Item::Fn {
++                vis: Inherited,
++                sig: Signature {
++                    ident: "main",
++                    generics: Generics,
++                    output: Default,
++                },
++                block: Block,
++            },
++        ],
++    }
++    "###);
++}
+diff --git a/third_party/rust/syn/tests/test_should_parse.rs b/third_party/rust/syn/tests/test_should_parse.rs
+--- a/third_party/rust/syn/tests/test_should_parse.rs
++++ b/third_party/rust/syn/tests/test_should_parse.rs
+@@ -1,12 +1,8 @@
+-extern crate syn;
+-
+-mod features;
+-
+ macro_rules! should_parse {
+     ($name:ident, { $($in:tt)* }) => {
+         #[test]
+         fn $name() {
+             // Make sure we can parse the file!
+             syn::parse_file(stringify!($($in)*)).unwrap();
+         }
+     }
+diff --git a/third_party/rust/syn/tests/test_size.rs b/third_party/rust/syn/tests/test_size.rs
+--- a/third_party/rust/syn/tests/test_size.rs
++++ b/third_party/rust/syn/tests/test_size.rs
+@@ -1,12 +1,10 @@
+ #![cfg(target_pointer_width = "64")]
+ 
+-mod features;
+-
+ use std::mem;
+ use syn::*;
+ 
+ #[test]
+ fn test_expr_size() {
+     assert_eq!(mem::size_of::<Expr>(), 280);
+ }
+ 
+diff --git a/third_party/rust/syn/tests/test_stmt.rs b/third_party/rust/syn/tests/test_stmt.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/tests/test_stmt.rs
+@@ -0,0 +1,44 @@
++#[macro_use]
++mod macros;
++
++use syn::Stmt;
++
++#[test]
++fn test_raw_operator() {
++    let stmt = syn::parse_str::<Stmt>("let _ = &raw const x;").unwrap();
++
++    snapshot!(stmt, @r###"
++    Local(Local {
++        pat: Pat::Wild,
++        init: Some(Verbatim(`& raw const x`)),
++    })
++    "###);
++}
++
++#[test]
++fn test_raw_variable() {
++    let stmt = syn::parse_str::<Stmt>("let _ = &raw;").unwrap();
++
++    snapshot!(stmt, @r###"
++    Local(Local {
++        pat: Pat::Wild,
++        init: Some(Expr::Reference {
++            expr: Expr::Path {
++                path: Path {
++                    segments: [
++                        PathSegment {
++                            ident: "raw",
++                            arguments: None,
++                        },
++                    ],
++                },
++            },
++        }),
++    })
++    "###);
++}
++
++#[test]
++fn test_raw_invalid() {
++    assert!(syn::parse_str::<Stmt>("let _ = &raw x;").is_err());
++}
+diff --git a/third_party/rust/syn/tests/test_token_trees.rs b/third_party/rust/syn/tests/test_token_trees.rs
+--- a/third_party/rust/syn/tests/test_token_trees.rs
++++ b/third_party/rust/syn/tests/test_token_trees.rs
+@@ -1,14 +1,8 @@
+-extern crate proc_macro2;
+-extern crate quote;
+-extern crate syn;
+-
+-mod features;
+-
+ #[macro_use]
+ mod macros;
+ 
+ use proc_macro2::TokenStream;
+ use quote::quote;
+ use syn::Lit;
+ 
+ #[test]
+@@ -16,17 +10,21 @@ fn test_struct() {
+     let input = "
+         #[derive(Debug, Clone)]
+         pub struct Item {
+             pub ident: Ident,
+             pub attrs: Vec<Attribute>,
+         }
+     ";
+ 
+-    snapshot!(input as TokenStream, @"`# [ derive ( Debug , Clone ) ] pub struct Item { pub ident : Ident , pub attrs : Vec < Attribute >, }`");
++    snapshot!(input as TokenStream, @r###"
++    TokenStream(
++        `# [derive (Debug , Clone)] pub struct Item { pub ident : Ident , pub attrs : Vec < Attribute >, }`,
++    )
++    "###);
+ }
+ 
+ #[test]
+ fn test_literal_mangling() {
+     let code = "0_4";
+     let parsed: Lit = syn::parse_str(code).unwrap();
+     assert_eq!(code, quote!(#parsed).to_string());
+ }
+diff --git a/third_party/rust/syn/tests/test_ty.rs b/third_party/rust/syn/tests/test_ty.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/tests/test_ty.rs
+@@ -0,0 +1,53 @@
++#[macro_use]
++mod macros;
++
++use proc_macro2::{Delimiter, Group, Ident, Punct, Spacing, Span, TokenStream, TokenTree};
++use quote::quote;
++use std::iter::FromIterator;
++use syn::Type;
++
++#[test]
++fn test_mut_self() {
++    syn::parse_str::<Type>("fn(mut self)").unwrap();
++    syn::parse_str::<Type>("fn(mut self: ())").unwrap();
++    syn::parse_str::<Type>("fn(mut self: ...)").unwrap_err();
++    syn::parse_str::<Type>("fn(mut self: mut self)").unwrap_err();
++    syn::parse_str::<Type>("fn(mut self::T)").unwrap_err();
++}
++
++#[test]
++fn test_macro_variable_type() {
++    // mimics the token stream corresponding to `$ty<T>`
++    let tokens = TokenStream::from_iter(vec![
++        TokenTree::Group(Group::new(Delimiter::None, quote! { ty })),
++        TokenTree::Punct(Punct::new('<', Spacing::Alone)),
++        TokenTree::Ident(Ident::new("T", Span::call_site())),
++        TokenTree::Punct(Punct::new('>', Spacing::Alone)),
++    ]);
++
++    snapshot!(tokens as Type, @r###"
++    Type::Path {
++        path: Path {
++            segments: [
++                PathSegment {
++                    ident: "ty",
++                    arguments: PathArguments::AngleBracketed {
++                        args: [
++                            Type(Type::Path {
++                                path: Path {
++                                    segments: [
++                                        PathSegment {
++                                            ident: "T",
++                                            arguments: None,
++                                        },
++                                    ],
++                                },
++                            }),
++                        ],
++                    },
++                },
++            ],
++        },
++    }
++    "###);
++}
+diff --git a/third_party/rust/syn/tests/test_visibility.rs b/third_party/rust/syn/tests/test_visibility.rs
+new file mode 100644
+--- /dev/null
++++ b/third_party/rust/syn/tests/test_visibility.rs
+@@ -0,0 +1,145 @@
++#[macro_use]
++mod macros;
++
++use proc_macro2::{Delimiter, Group, Ident, Punct, Spacing, Span, TokenStream, TokenTree};
++use std::iter::FromIterator;
++use syn::parse::{Parse, ParseStream};
++use syn::{DeriveInput, Result, Visibility};
++
++#[derive(Debug)]
++struct VisRest {
++    vis: Visibility,
++    rest: TokenStream,
++}
++
++impl Parse for VisRest {
++    fn parse(input: ParseStream) -> Result<Self> {
++        Ok(VisRest {
++            vis: input.parse()?,
++            rest: input.parse()?,
++        })
++    }
++}
++
++macro_rules! assert_vis_parse {
++    ($input:expr, Ok($p:pat)) => {
++        assert_vis_parse!($input, Ok($p) + "");
++    };
++
++    ($input:expr, Ok($p:pat) + $rest:expr) => {
++        let expected = $rest.parse::<TokenStream>().unwrap();
++        let parse: VisRest = syn::parse_str($input).unwrap();
++
++        match parse.vis {
++            $p => {}
++            _ => panic!("Expected {}, got {:?}", stringify!($p), parse.vis),
++        }
++
++        // NOTE: Round-trips through `to_string` to avoid potential whitespace
++        // diffs.
++        assert_eq!(parse.rest.to_string(), expected.to_string());
++    };
++
++    ($input:expr, Err) => {
++        syn::parse2::<VisRest>($input.parse().unwrap()).unwrap_err();
++    };
++}
++
++#[test]
++fn test_pub() {
++    assert_vis_parse!("pub", Ok(Visibility::Public(_)));
++}
++
++#[test]
++fn test_crate() {
++    assert_vis_parse!("crate", Ok(Visibility::Crate(_)));
++}
++
++#[test]
++fn test_inherited() {
++    assert_vis_parse!("", Ok(Visibility::Inherited));
++}
++
++#[test]
++fn test_in() {
++    assert_vis_parse!("pub(in foo::bar)", Ok(Visibility::Restricted(_)));
++}
++
++#[test]
++fn test_pub_crate() {
++    assert_vis_parse!("pub(crate)", Ok(Visibility::Restricted(_)));
++}
++
++#[test]
++fn test_pub_self() {
++    assert_vis_parse!("pub(self)", Ok(Visibility::Restricted(_)));
++}
++
++#[test]
++fn test_pub_super() {
++    assert_vis_parse!("pub(super)", Ok(Visibility::Restricted(_)));
++}
++
++#[test]
++fn test_missing_in() {
++    assert_vis_parse!("pub(foo::bar)", Ok(Visibility::Public(_)) + "(foo::bar)");
++}
++
++#[test]
++fn test_missing_in_path() {
++    assert_vis_parse!("pub(in)", Err);
++}
++
++#[test]
++fn test_crate_path() {
++    assert_vis_parse!("pub(crate::A, crate::B)", Ok(Visibility::Public(_)) + "(crate::A, crate::B)");
++}
++
++#[test]
++fn test_junk_after_in() {
++    assert_vis_parse!("pub(in some::path @@garbage)", Err);
++}
++
++#[test]
++fn test_empty_group_vis() {
++    // mimics `struct S { $vis $field: () }` where $vis is empty
++    let tokens = TokenStream::from_iter(vec![
++        TokenTree::Ident(Ident::new("struct", Span::call_site())),
++        TokenTree::Ident(Ident::new("S", Span::call_site())),
++        TokenTree::Group(Group::new(
++            Delimiter::Brace,
++            TokenStream::from_iter(vec![
++                TokenTree::Group(Group::new(Delimiter::None, TokenStream::new())),
++                TokenTree::Group(Group::new(
++                    Delimiter::None,
++                    TokenStream::from_iter(vec![TokenTree::Ident(Ident::new(
++                        "f",
++                        Span::call_site(),
++                    ))]),
++                )),
++                TokenTree::Punct(Punct::new(':', Spacing::Alone)),
++                TokenTree::Group(Group::new(Delimiter::Parenthesis, TokenStream::new())),
++            ]),
++        )),
++    ]);
++
++    snapshot!(tokens as DeriveInput, @r###"
++    DeriveInput {
++        vis: Inherited,
++        ident: "S",
++        generics: Generics,
++        data: Data::Struct {
++            fields: Fields::Named {
++                named: [
++                    Field {
++                        vis: Inherited,
++                        ident: Some("f"),
++                        colon_token: Some,
++                        ty: Type::Tuple,
++                    },
++                ],
++            },
++        },
++    }
++    "###);
++}
+diff --git a/third_party/rust/syn/tests/zzz_stable.rs b/third_party/rust/syn/tests/zzz_stable.rs
+--- a/third_party/rust/syn/tests/zzz_stable.rs
++++ b/third_party/rust/syn/tests/zzz_stable.rs
+@@ -1,21 +1,19 @@
+ #![cfg(syn_disable_nightly_tests)]
+ 
+-extern crate termcolor;
+-
+ use std::io::{self, Write};
+ use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
+ 
+ const MSG: &str = "\
+ ‖
+ ‖   WARNING:
+ ‖   This is not a nightly compiler so not all tests were able to
+ ‖   run. Syn includes tests that compare Syn's parser against the
+-‖   compiler's parser, which requires access to unstable libsyntax
++‖   compiler's parser, which requires access to unstable librustc
+ ‖   data structures and a nightly compiler.
+ ‖
+ ";
+ 
+ #[test]
+ fn notice() -> io::Result<()> {
+     let header = "WARNING";
+     let index_of_header = MSG.find(header).unwrap();
+
+
diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
deleted file mode 100644
index 562f383..0000000
--- a/icecat.rpmlintrc
+++ /dev/null
@@ -1,54 +0,0 @@
-# Whitelisting errors
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-# https://src.fedoraproject.org/rpms/python3/blob/master/f/python3.rpmlintrc
-# Edited by sagitter (sagitter@fedoraproject.org)
-
-# KNOWN BUGS:
-#
-
-# TESTS:
-##### SRPMs #####
-
-# ifarch applied patches are okay
-# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
-addFilter(r'(%ifarch-applied-patch) Patch*')
-# Different file size due to the signature of the source code tarbz archive
-addFilter(r'file-size-mismatch')
-
-addFilter(r'(invalid-url) Source0')
-addFilter(r'(invalid-url) Source4')
-addFilter(r'(invalid-url) Source5')
-addFilter(r'(invalid-url) Source17')
-
-addFilter(r'(strange-permission) icecat-lang_download.sh')
-addFilter(r'(strange-permission) node-stdout-nonblocking-wrapper')
-
-# ERRORS:
-##### RPMs  #####
-
-# chroot function (??)
-addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib64/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib64/icecat/libxul.so')
-addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib/icecat/libxul.so')
-
-# Expected on FF browser
-# https://support.mozilla.org/en-US/questions/1045418
-addFilter(r'(zero-length) /usr/lib(64)?/icecat/chrome.manifest')
-addFilter(r'(zero-length) /usr/lib(64)?/icecat/browser/chrome.manifest')
-
-addFilter(r'E:library-not-linked-against-libc /usr/lib64/icecat/gtk2/libmozgtk.so')
-addFilter(r'E:library-not-linked-against-libc /usr/lib64/icecat/libmozgtk.so')
-addFilter(r'E:library-not-linked-against-libc /usr/lib/icecat/gtk2/libmozgtk.so')
-addFilter(r'E:library-not-linked-against-libc /usr/lib/icecat/libmozgtk.so')
-
-# False positive
-addFilter(r'(dangling-symlink) /usr/lib(64)?/icecat/dictionaries /usr/share/myspell')
-addFilter(r'(unversioned-explicit-provides) webclient')
-
-# WARNINGS:
-##### RPMs  #####
-
-addFilter(r'(no-manual-page-for-binary) icecat-wayland')
-addFilter(r'(no-manual-page-for-binary) icecat-x11')
-
diff --git a/icecat.spec b/icecat.spec
index 70c1968..8914815 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -175,6 +175,7 @@ Patch1: %{name}-fix_addon_installation.patch
 Patch2: %{name}-libevent_linkflag.patch
 Patch3: mozilla-build-arm.patch
 Patch5: rhbz-1219542-s390-build.patch
+Patch6: %{name}-rust-1.47.patch
 
 # Unrecognized file?
 Patch7: %{name}-fix_jar.patch
@@ -397,6 +398,7 @@ tar -xf %{SOURCE5}
 %ifarch s390
 %patch5 -p1 -b .rhbz-1219542-s390
 %endif
+%patch6 -p1 -b .rust-1.47
 %patch7 -p0 -b .fix_jar
 %patch8 -p0 -b .fix_installer
 
@@ -890,8 +892,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
-* Mon Oct 19 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.4.0-1.rh1
+* Fri Oct 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.4.0-1.rh1
 - Mozilla Release 78.4.0ESR
+- Regenerate cbindgen-0.14.3
+- Patched for using Rust-1.47 (mzbz#1663715)
 
 * Wed Oct 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.1-2.rh1.test
 - PGO build test
diff --git a/sources b/sources
index f9bcd64..aa061d1 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = fdd85f10476c90ae73c6b8ca9aa162ae96f481697cb1f36687dbc6ff6202e9507dff96d0b6103c9be684bd6e9db3c767835f9478266ce48cc4cad03b23107ede
+SHA512 (cbindgen-vendor.tar.xz) = 97dce4affcd04d5adb14e5249dd752440ee7d090432503b557aa443439999ebaa3ad616e1ad2ae192233941b8d6349cfa06d219335f8df3cb840972e428ab199
 SHA512 (icecat-78.4.0-langpacks.tar.gz) = cd887bd2c45c78aed13ff43b2577280094c7700687b423a19db110105e6f8165e7238b8b98226fba0ed73d0eb9631f11f625fd8cef1f5547009cd30d2fc7f701
 SHA512 (icecat-78.4.0-rh1.tar.bz2) = 7e0a4ac7175f0f19c981fec3932c2d042c17b6f55b785d942ea6e8f2639dd7530727bbbb48432fc85d3131d9c7852ddf9290e6fada67e32e791f9d70949f9e28
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 894fee804f6a47f0fc81a3776a0d1d783795e0fa Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Fri, 23 Oct 2020 15:11:14 +0200
Subject: [PATCH 169/473] Mozilla Release 78.4.0ESR| Add icecat.rpmlintrc

---
 icecat.rpmlintrc | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 icecat.rpmlintrc

diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
new file mode 100644
index 0000000..562f383
--- /dev/null
+++ b/icecat.rpmlintrc
@@ -0,0 +1,54 @@
+# Whitelisting errors
+# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
+# https://src.fedoraproject.org/rpms/python3/blob/master/f/python3.rpmlintrc
+# Edited by sagitter (sagitter@fedoraproject.org)
+
+# KNOWN BUGS:
+#
+
+# TESTS:
+##### SRPMs #####
+
+# ifarch applied patches are okay
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
+addFilter(r'(%ifarch-applied-patch) Patch*')
+# Different file size due to the signature of the source code tarbz archive
+addFilter(r'file-size-mismatch')
+
+addFilter(r'(invalid-url) Source0')
+addFilter(r'(invalid-url) Source4')
+addFilter(r'(invalid-url) Source5')
+addFilter(r'(invalid-url) Source17')
+
+addFilter(r'(strange-permission) icecat-lang_download.sh')
+addFilter(r'(strange-permission) node-stdout-nonblocking-wrapper')
+
+# ERRORS:
+##### RPMs  #####
+
+# chroot function (??)
+addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib64/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib64/icecat/libxul.so')
+addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib/icecat/libxul.so')
+
+# Expected on FF browser
+# https://support.mozilla.org/en-US/questions/1045418
+addFilter(r'(zero-length) /usr/lib(64)?/icecat/chrome.manifest')
+addFilter(r'(zero-length) /usr/lib(64)?/icecat/browser/chrome.manifest')
+
+addFilter(r'E:library-not-linked-against-libc /usr/lib64/icecat/gtk2/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib64/icecat/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib/icecat/gtk2/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib/icecat/libmozgtk.so')
+
+# False positive
+addFilter(r'(dangling-symlink) /usr/lib(64)?/icecat/dictionaries /usr/share/myspell')
+addFilter(r'(unversioned-explicit-provides) webclient')
+
+# WARNINGS:
+##### RPMs  #####
+
+addFilter(r'(no-manual-page-for-binary) icecat-wayland')
+addFilter(r'(no-manual-page-for-binary) icecat-x11')
+

From 3dab25d3a4159c1ebac679c7cf15a8f41de4be14 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 27 Oct 2020 17:34:05 +0100
Subject: [PATCH 170/473] Patched for rhbz#1891234

---
 icecat-mozilla-1673202.patch | 34 ++++++++++++++++++++++++++++++++++
 icecat.spec                  | 15 +++++++++++----
 2 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 icecat-mozilla-1673202.patch

diff --git a/icecat-mozilla-1673202.patch b/icecat-mozilla-1673202.patch
new file mode 100644
index 0000000..5cf1013
--- /dev/null
+++ b/icecat-mozilla-1673202.patch
@@ -0,0 +1,34 @@
+# HG changeset patch
+# User Jed Davis <jld@mozilla.com>
+
+Bug 1673202 - Call fstat directly in Linux sandbox fstatat interception. r?gcp
+
+Sandbox policies handle the case of `fstatat(fd, "", AT_EMPTY_PATH|...)`
+by invoking the SIGSYS handler (because seccomp-bpf can't tell if the
+string will be empty when the syscall would use it), which makes the
+equivalent call to `fstat`.
+
+Unfortunately, recent development versions of glibc implement `fstat` by
+calling `fstatat`, which causes unbounded recursion and stack overflow.
+(This depends on the headers present at build time; see the bug for more
+details.)  This patch switches it to use the `fstat` (or `fstat64` on 32-bit) syscall directly.
+
+Differential Revision: https://phabricator.services.mozilla.com/D94798
+
+diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp
+index 9bdb10c49e085..a128cce7b266c 100644
+--- a/security/sandbox/linux/SandboxFilter.cpp
++++ b/security/sandbox/linux/SandboxFilter.cpp
+@@ -246,7 +246,11 @@
+ 
+     if (fd != AT_FDCWD && (flags & AT_EMPTY_PATH) != 0 &&
+         strcmp(path, "") == 0) {
+-      return ConvertError(fstatsyscall(fd, buf));
++#ifdef __NR_fstat64
++      return DoSyscall(__NR_fstat64, fd, buf);
++#else
++      return DoSyscall(__NR_fstat, fd, buf);
++#endif
+     }
+ 
+     if (fd != AT_FDCWD && path[0] != '/') {
diff --git a/icecat.spec b/icecat.spec
index 8914815..20abc60 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -126,7 +126,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.4.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -207,11 +207,14 @@ Patch422: mozilla-1580174-webrtc-popup.patch
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
 
-Patch424: icecat-mozilla-1669471.patch
+Patch424: %{name}-mozilla-1669471.patch
+
+# rhbz#1891234
+Patch425: %{name}-mozilla-1673202.patch
 
 # PGO/LTO patches
-Patch600:        %{name}-pgo.patch
-Patch602:        mozilla-1516803.patch
+Patch600: %{name}-pgo.patch
+Patch602: mozilla-1516803.patch
 
 # Wayland specific upstream patches
 Patch565: firefox-pipewire.patch
@@ -426,6 +429,7 @@ tar -xf %{SOURCE5}
 %patch403 -p1 -b .1640567
 %patch423 -p1 -b .mozilla-1596503
 %patch424 -p1 -b .mozilla-1669471
+%patch425 -p1 -b .mozilla-1673202
 
 # Wayland specific upstream patches
 %patch565 -p1 -b .firefox-pipewire
@@ -892,6 +896,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Tue Oct 27 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.4.0-2.rh1
+- Patched for rhbz#1891234
+
 * Fri Oct 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.4.0-1.rh1
 - Mozilla Release 78.4.0ESR
 - Regenerate cbindgen-0.14.3

From 474f89b317b877c4814462f473922ce993c7f53d Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Mon, 16 Nov 2020 13:53:35 +0100
Subject: [PATCH 171/473] Mozilla Release 78.5.0ESR

---
 .gitignore              |     2 +
 icecat-lang_download.sh |     2 +-
 icecat-rust-1.47.patch  | 35277 --------------------------------------
 icecat.rpmlintrc        |    54 -
 icecat.spec             |     9 +-
 sources                 |     6 +-
 6 files changed, 11 insertions(+), 35339 deletions(-)
 delete mode 100644 icecat-rust-1.47.patch
 delete mode 100644 icecat.rpmlintrc

diff --git a/.gitignore b/.gitignore
index 753c95d..faf041a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,3 +133,5 @@
 /icecat-78.3.1-rh1.tar.bz2
 /icecat-78.4.0-langpacks.tar.gz
 /icecat-78.4.0-rh1.tar.bz2
+/icecat-78.5.0-langpacks.tar.gz
+/icecat-78.5.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index d487b5a..f2a2e48 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.4.0
+VERSION=78.5.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat-rust-1.47.patch b/icecat-rust-1.47.patch
deleted file mode 100644
index 8a131ff..0000000
--- a/icecat-rust-1.47.patch
+++ /dev/null
@@ -1,35277 +0,0 @@
-
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1599584448 0
-# Node ID 85c38ea4d34969797eb5d24265cd90cc6841e6ae
-# Parent  5aa243a2fe9d77578dd95ce3ab3a2aa6c1e92604
-Bug 1663715 - Update syn and proc-macro2 so that Firefox can build on Rust nightly again. r=froydnj, a=RyanVM
-
-Generated with:
-
-  cargo update -p syn --precise 1.0.40
-  ./mach vendor rust
-
-Rust issue: https://github.com/rust-lang/rust/issues/76482
-
-Differential Revision: https://phabricator.services.mozilla.com/D89473
-
-diff --git a/Cargo.lock b/Cargo.lock
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -3712,19 +3712,19 @@ checksum = "ecd45702f76d6d3c75a80564378a
- dependencies = [
-  "proc-macro2",
-  "quote",
-  "syn",
- ]
- 
- [[package]]
- name = "proc-macro2"
--version = "1.0.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "90cf5f418035b98e655e9cdb225047638296b862b42411c4e45bb88d700f7fc0"
-+version = "1.0.20"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29"
- dependencies = [
-  "unicode-xid",
- ]
- 
- [[package]]
- name = "procedural-masquerade"
- version = "0.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -4642,19 +4642,19 @@ dependencies = [
-  "cc",
-  "gleam",
-  "glsl-to-cxx",
-  "webrender_build",
- ]
- 
- [[package]]
- name = "syn"
--version = "1.0.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
-+version = "1.0.40"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"
- dependencies = [
-  "proc-macro2",
-  "quote",
-  "unicode-xid",
- ]
- 
- [[package]]
- name = "sync-guid"
-diff --git a/third_party/rust/proc-macro2/.cargo-checksum.json b/third_party/rust/proc-macro2/.cargo-checksum.json
---- a/third_party/rust/proc-macro2/.cargo-checksum.json
-+++ b/third_party/rust/proc-macro2/.cargo-checksum.json
-@@ -1,1 +1,1 @@
--{"files":{"Cargo.toml":"e2c1fc6ed317eeef8462fcd192f6b6389e1d84f0d7afeac78f12c23903deddf8","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"362a2156f7645528061b6e8487a2eb0f32f1693012ed82ee57afa05c039bba0d","build.rs":"0cc6e2cb919ddbff59cf1d810283939f97a59f0037540c0f2ee3453237635ff8","src/fallback.rs":"5c6379a90735e27abcc40253b223158c6b1e5784f3850bc423335363e87ef038","src/lib.rs":"ae5251296ad3fcd8b600919a993fec0afd8b56da3e11fef6bc7265b273129936","src/strnom.rs":"37f7791f73f123817ad5403af1d4e2a0714be27401729a2d451bc80b1f26bac9","src/wrapper.rs":"81372e910604217a625aa71c47d43e65f4e008456eae93ac39325c9abf10701a","tests/features.rs":"a86deb8644992a4eb64d9fd493eff16f9cf9c5cb6ade3a634ce0c990cf87d559","tests/marker.rs":"c2652e3ae1dfcb94d2e6313b29712c5dcbd0fe62026913e67bb7cebd7560aade","tests/test.rs":"8c427be9cba1fa8d4a16647e53e3545e5863e29e2c0b311c93c9dd1399abf6a1"},"package":"90cf5f418035b98e655e9cdb225047638296b862b42411c4e45bb88d700f7fc0"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"c20c4c52342e65ea11ad8382edc636e628e8f8c5ab7cffddc32426b2fe8fe4cd","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"e1f9d4fc22cff2c049f166a403b41458632a94357890d31cf0e3ad83807fb430","build.rs":"332185d7ad4c859210f5edd7a76bc95146c8277726a2f81417f34927c4424d68","src/detection.rs":"9d25d896889e65330858f2d6f6223c1b98cd1dad189813ad4161ff189fbda2b8","src/fallback.rs":"239f9a25c0f2ab57592288d944c7f1a0f887536b6d4dc2428a17640af8d10a41","src/lib.rs":"2b1d98424c9b23b547dabf85554120e5e65472026a0f3f711b3a097bca7c32fe","src/parse.rs":"500edee9773132e27e44d0fdaa042b1cb9451e29e65124493986f51710c0664c","src/wrapper.rs":"d36c0dced7ec0e7585c1f935cda836080bcae6de1de3d7851d962e9e11a3ac48","tests/comments.rs":"ea6cbe6f4c8852e6a0612893c7d4f2c144a2e6a134a6c3db641a320cbfc3c800","tests/features.rs":"a86deb8644992a4eb64d9fd493eff16f9cf9c5cb6ade3a634ce0c990cf87d559","tests/marker.rs":"c2652e3ae1dfcb94d2e6313b29712c5dcbd0fe62026913e67bb7cebd7560aade","tests/test.rs":"310c856e27ff61c9ec7f0a5cd96031aac02971557b1621f5e17b089d58e79bcd","tests/test_fmt.rs":"745dfdc41d09c5308c221395eb43f2041f0a1413d2927a813bc2ad4554438fe2"},"package":"175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29"}
-\ No newline at end of file
-diff --git a/third_party/rust/proc-macro2/Cargo.toml b/third_party/rust/proc-macro2/Cargo.toml
---- a/third_party/rust/proc-macro2/Cargo.toml
-+++ b/third_party/rust/proc-macro2/Cargo.toml
-@@ -8,36 +8,35 @@
- # 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]
- edition = "2018"
- name = "proc-macro2"
--version = "1.0.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"
-+version = "1.0.20"
-+authors = ["Alex Crichton <alex@alexcrichton.com>", "David Tolnay <dtolnay@gmail.com>"]
-+description = "A substitute implementation of the compiler's `proc_macro` API to decouple\ntoken-based libraries from the procedural macro use case.\n"
- documentation = "https://docs.rs/proc-macro2"
- readme = "README.md"
- keywords = ["macros"]
-+categories = ["development-tools::procedural-macro-helpers"]
- license = "MIT OR Apache-2.0"
- repository = "https://github.com/alexcrichton/proc-macro2"
- [package.metadata.docs.rs]
- rustc-args = ["--cfg", "procmacro2_semver_exempt"]
- rustdoc-args = ["--cfg", "procmacro2_semver_exempt"]
-+targets = ["x86_64-unknown-linux-gnu"]
- 
--[lib]
--name = "proc_macro2"
-+[package.metadata.playground]
-+features = ["span-locations"]
- [dependencies.unicode-xid]
- version = "0.2"
- [dev-dependencies.quote]
- version = "1.0"
- default_features = false
- 
- [features]
- default = ["proc-macro"]
- nightly = []
- proc-macro = []
- span-locations = []
--[badges.travis-ci]
--repository = "alexcrichton/proc-macro2"
-diff --git a/third_party/rust/proc-macro2/README.md b/third_party/rust/proc-macro2/README.md
---- a/third_party/rust/proc-macro2/README.md
-+++ b/third_party/rust/proc-macro2/README.md
-@@ -1,11 +1,11 @@
- # proc-macro2
- 
--[![Build Status](https://api.travis-ci.com/alexcrichton/proc-macro2.svg?branch=master)](https://travis-ci.com/alexcrichton/proc-macro2)
-+[![Build Status](https://img.shields.io/github/workflow/status/alexcrichton/proc-macro2/build%20and%20test)](https://github.com/alexcrichton/proc-macro2/actions)
- [![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 wrapper around the procedural macro API of the compiler's `proc_macro` crate.
- This library serves two purposes:
- 
- - **Bring proc-macro-like functionality to other contexts like build.rs and
-   main.rs.** Types from `proc_macro` are entirely specific to procedural macros
-diff --git a/third_party/rust/proc-macro2/build.rs b/third_party/rust/proc-macro2/build.rs
---- a/third_party/rust/proc-macro2/build.rs
-+++ b/third_party/rust/proc-macro2/build.rs
-@@ -9,16 +9,20 @@
- // "wrap_proc_macro"
- //     Wrap types from libproc_macro rather than polyfilling the whole API.
- //     Enabled on rustc 1.29+ as long as procmacro2_semver_exempt is not set,
- //     because we can't emulate the unstable API without emulating everything
- //     else. Also enabled unconditionally on nightly, in which case the
- //     procmacro2_semver_exempt surface area is implemented by using the
- //     nightly-only proc_macro API.
- //
-+//  "hygiene"
-+//    Enable Span::mixed_site() and non-dummy behavior of Span::resolved_at
-+//    and Span::located_at. Enabled on Rust 1.45+.
-+//
- // "proc_macro_span"
- //     Enable non-dummy behavior of Span::start and Span::end methods which
- //     requires an unstable compiler feature. Enabled when building with
- //     nightly, unless `-Z allow-feature` in RUSTFLAGS disallows unstable
- //     features.
- //
- // "super_unstable"
- //     Implement the semver exempt API in terms of the nightly-only proc_macro
-@@ -52,16 +56,24 @@ fn main() {
-         // https://github.com/alexcrichton/proc-macro2/issues/147
-         println!("cargo:rustc-cfg=procmacro2_semver_exempt");
-     }
- 
-     if semver_exempt || cfg!(feature = "span-locations") {
-         println!("cargo:rustc-cfg=span_locations");
-     }
- 
-+    if version.minor < 39 {
-+        println!("cargo:rustc-cfg=no_bind_by_move_pattern_guard");
-+    }
-+
-+    if version.minor >= 45 {
-+        println!("cargo:rustc-cfg=hygiene");
-+    }
-+
-     let target = env::var("TARGET").unwrap();
-     if !enable_use_proc_macro(&target) {
-         return;
-     }
- 
-     println!("cargo:rustc-cfg=use_proc_macro");
- 
-     if version.nightly || !semver_exempt {
-diff --git a/third_party/rust/proc-macro2/src/detection.rs b/third_party/rust/proc-macro2/src/detection.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/proc-macro2/src/detection.rs
-@@ -0,0 +1,67 @@
-+use std::panic::{self, PanicInfo};
-+use std::sync::atomic::*;
-+use std::sync::Once;
-+
-+static WORKS: AtomicUsize = AtomicUsize::new(0);
-+static INIT: Once = Once::new();
-+
-+pub(crate) fn inside_proc_macro() -> bool {
-+    match WORKS.load(Ordering::SeqCst) {
-+        1 => return false,
-+        2 => return true,
-+        _ => {}
-+    }
-+
-+    INIT.call_once(initialize);
-+    inside_proc_macro()
-+}
-+
-+pub(crate) fn force_fallback() {
-+    WORKS.store(1, Ordering::SeqCst);
-+}
-+
-+pub(crate) fn unforce_fallback() {
-+    initialize();
-+}
-+
-+// Swap in a null panic hook to avoid printing "thread panicked" to stderr,
-+// then use catch_unwind to determine whether the compiler's proc_macro is
-+// working. When proc-macro2 is used from outside of a procedural macro all
-+// of the proc_macro crate's APIs currently panic.
-+//
-+// The Once is to prevent the possibility of this ordering:
-+//
-+//     thread 1 calls take_hook, gets the user's original hook
-+//     thread 1 calls set_hook with the null hook
-+//     thread 2 calls take_hook, thinks null hook is the original hook
-+//     thread 2 calls set_hook with the null hook
-+//     thread 1 calls set_hook with the actual original hook
-+//     thread 2 calls set_hook with what it thinks is the original hook
-+//
-+// in which the user's hook has been lost.
-+//
-+// There is still a race condition where a panic in a different thread can
-+// happen during the interval that the user's original panic hook is
-+// unregistered such that their hook is incorrectly not called. This is
-+// sufficiently unlikely and less bad than printing panic messages to stderr
-+// on correct use of this crate. Maybe there is a libstd feature request
-+// here. For now, if a user needs to guarantee that this failure mode does
-+// not occur, they need to call e.g. `proc_macro2::Span::call_site()` from
-+// the main thread before launching any other threads.
-+fn initialize() {
-+    type PanicHook = dyn Fn(&PanicInfo) + Sync + Send + 'static;
-+
-+    let null_hook: Box<PanicHook> = Box::new(|_panic_info| { /* ignore */ });
-+    let sanity_check = &*null_hook as *const PanicHook;
-+    let original_hook = panic::take_hook();
-+    panic::set_hook(null_hook);
-+
-+    let works = panic::catch_unwind(proc_macro::Span::call_site).is_ok();
-+    WORKS.store(works as usize + 1, Ordering::SeqCst);
-+
-+    let hopefully_null_hook = panic::take_hook();
-+    panic::set_hook(original_hook);
-+    if sanity_check != &*hopefully_null_hook {
-+        panic!("observed race condition in proc_macro2::inside_proc_macro");
-+    }
-+}
-diff --git a/third_party/rust/proc-macro2/src/fallback.rs b/third_party/rust/proc-macro2/src/fallback.rs
---- a/third_party/rust/proc-macro2/src/fallback.rs
-+++ b/third_party/rust/proc-macro2/src/fallback.rs
-@@ -1,41 +1,121 @@
-+use crate::parse::{token_stream, Cursor};
-+use crate::{Delimiter, Spacing, TokenTree};
- #[cfg(span_locations)]
- use std::cell::RefCell;
- #[cfg(span_locations)]
- use std::cmp;
--use std::fmt;
--use std::iter;
-+use std::fmt::{self, Debug, Display};
-+use std::iter::FromIterator;
-+use std::mem;
- use std::ops::RangeBounds;
- #[cfg(procmacro2_semver_exempt)]
- use std::path::Path;
- use std::path::PathBuf;
- use std::str::FromStr;
- use std::vec;
--
--use crate::strnom::{block_comment, skip_whitespace, whitespace, word_break, Cursor, PResult};
--use crate::{Delimiter, Punct, Spacing, TokenTree};
- use unicode_xid::UnicodeXID;
- 
-+/// Force use of proc-macro2's fallback implementation of the API for now, even
-+/// if the compiler's implementation is available.
-+pub fn force() {
-+    #[cfg(wrap_proc_macro)]
-+    crate::detection::force_fallback();
-+}
-+
-+/// Resume using the compiler's implementation of the proc macro API if it is
-+/// available.
-+pub fn unforce() {
-+    #[cfg(wrap_proc_macro)]
-+    crate::detection::unforce_fallback();
-+}
-+
- #[derive(Clone)]
--pub struct TokenStream {
--    inner: Vec<TokenTree>,
-+pub(crate) struct TokenStream {
-+    pub(crate) inner: Vec<TokenTree>,
- }
- 
- #[derive(Debug)]
--pub struct LexError;
-+pub(crate) struct LexError;
- 
- impl TokenStream {
-     pub fn new() -> TokenStream {
-         TokenStream { inner: Vec::new() }
-     }
- 
-     pub fn is_empty(&self) -> bool {
-         self.inner.len() == 0
-     }
-+
-+    fn take_inner(&mut self) -> Vec<TokenTree> {
-+        mem::replace(&mut self.inner, Vec::new())
-+    }
-+
-+    fn push_token(&mut self, token: TokenTree) {
-+        // https://github.com/alexcrichton/proc-macro2/issues/235
-+        match token {
-+            #[cfg(not(no_bind_by_move_pattern_guard))]
-+            TokenTree::Literal(crate::Literal {
-+                #[cfg(wrap_proc_macro)]
-+                    inner: crate::imp::Literal::Fallback(literal),
-+                #[cfg(not(wrap_proc_macro))]
-+                    inner: literal,
-+                ..
-+            }) if literal.text.starts_with('-') => {
-+                push_negative_literal(self, literal);
-+            }
-+            #[cfg(no_bind_by_move_pattern_guard)]
-+            TokenTree::Literal(crate::Literal {
-+                #[cfg(wrap_proc_macro)]
-+                    inner: crate::imp::Literal::Fallback(literal),
-+                #[cfg(not(wrap_proc_macro))]
-+                    inner: literal,
-+                ..
-+            }) => {
-+                if literal.text.starts_with('-') {
-+                    push_negative_literal(self, literal);
-+                } else {
-+                    self.inner
-+                        .push(TokenTree::Literal(crate::Literal::_new_stable(literal)));
-+                }
-+            }
-+            _ => self.inner.push(token),
-+        }
-+
-+        #[cold]
-+        fn push_negative_literal(stream: &mut TokenStream, mut literal: Literal) {
-+            literal.text.remove(0);
-+            let mut punct = crate::Punct::new('-', Spacing::Alone);
-+            punct.set_span(crate::Span::_new_stable(literal.span));
-+            stream.inner.push(TokenTree::Punct(punct));
-+            stream
-+                .inner
-+                .push(TokenTree::Literal(crate::Literal::_new_stable(literal)));
-+        }
-+    }
-+}
-+
-+// Nonrecursive to prevent stack overflow.
-+impl Drop for TokenStream {
-+    fn drop(&mut self) {
-+        while let Some(token) = self.inner.pop() {
-+            let group = match token {
-+                TokenTree::Group(group) => group.inner,
-+                _ => continue,
-+            };
-+            #[cfg(wrap_proc_macro)]
-+            let group = match group {
-+                crate::imp::Group::Fallback(group) => group,
-+                _ => continue,
-+            };
-+            let mut group = group;
-+            self.inner.extend(group.stream.take_inner());
-+        }
-+    }
- }
- 
- #[cfg(span_locations)]
- fn get_cursor(src: &str) -> Cursor {
-     // Create a dummy file & add it to the source map
-     SOURCE_MAP.with(|cm| {
-         let mut cm = cm.borrow_mut();
-         let name = format!("<parsed string {}>", cm.files.len());
-@@ -54,68 +134,49 @@ fn get_cursor(src: &str) -> Cursor {
- 
- impl FromStr for TokenStream {
-     type Err = LexError;
- 
-     fn from_str(src: &str) -> Result<TokenStream, LexError> {
-         // Create a dummy file & add it to the source map
-         let cursor = get_cursor(src);
- 
--        match token_stream(cursor) {
--            Ok((input, output)) => {
--                if skip_whitespace(input).len() != 0 {
--                    Err(LexError)
--                } else {
--                    Ok(output)
--                }
--            }
--            Err(LexError) => Err(LexError),
-+        let (rest, tokens) = token_stream(cursor)?;
-+        if rest.is_empty() {
-+            Ok(tokens)
-+        } else {
-+            Err(LexError)
-         }
-     }
- }
- 
--impl fmt::Display for TokenStream {
-+impl 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().into_iter().next().is_none() {
--                        write!(f, "{} {}", start, end)?
--                    } else {
--                        write!(f, "{} {} {}", start, tt.stream(), end)?
--                    }
-+            match tt {
-+                TokenTree::Group(tt) => Display::fmt(tt, f),
-+                TokenTree::Ident(tt) => Display::fmt(tt, f),
-+                TokenTree::Punct(tt) => {
-+                    joint = tt.spacing() == Spacing::Joint;
-+                    Display::fmt(tt, f)
-                 }
--                TokenTree::Ident(ref tt) => write!(f, "{}", tt)?,
--                TokenTree::Punct(ref tt) => {
--                    write!(f, "{}", tt.as_char())?;
--                    match tt.spacing() {
--                        Spacing::Alone => {}
--                        Spacing::Joint => joint = true,
--                    }
--                }
--                TokenTree::Literal(ref tt) => write!(f, "{}", tt)?,
--            }
-+                TokenTree::Literal(tt) => Display::fmt(tt, f),
-+            }?
-         }
- 
-         Ok(())
-     }
- }
- 
--impl fmt::Debug for TokenStream {
-+impl Debug for TokenStream {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         f.write_str("TokenStream ")?;
-         f.debug_list().entries(self.clone()).finish()
-     }
- }
- 
- #[cfg(use_proc_macro)]
- impl From<proc_macro::TokenStream> for TokenStream {
-@@ -134,122 +195,107 @@ impl From<TokenStream> for proc_macro::T
-             .to_string()
-             .parse()
-             .expect("failed to parse to compiler tokens")
-     }
- }
- 
- impl From<TokenTree> for TokenStream {
-     fn from(tree: TokenTree) -> TokenStream {
--        TokenStream { inner: vec![tree] }
-+        let mut stream = TokenStream::new();
-+        stream.push_token(tree);
-+        stream
-     }
- }
- 
--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 }
-+impl FromIterator<TokenTree> for TokenStream {
-+    fn from_iter<I: IntoIterator<Item = TokenTree>>(tokens: I) -> Self {
-+        let mut stream = TokenStream::new();
-+        stream.extend(tokens);
-+        stream
-     }
- }
- 
--impl iter::FromIterator<TokenStream> for TokenStream {
-+impl FromIterator<TokenStream> for TokenStream {
-     fn from_iter<I: IntoIterator<Item = TokenStream>>(streams: I) -> Self {
-         let mut v = Vec::new();
- 
--        for stream in streams.into_iter() {
--            v.extend(stream.inner);
-+        for mut stream in streams {
-+            v.extend(stream.take_inner());
-         }
- 
-         TokenStream { inner: v }
-     }
- }
- 
- impl Extend<TokenTree> for TokenStream {
--    fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, streams: I) {
--        self.inner.extend(streams);
-+    fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, tokens: I) {
-+        tokens.into_iter().for_each(|token| self.push_token(token));
-     }
- }
- 
- impl Extend<TokenStream> for TokenStream {
-     fn extend<I: IntoIterator<Item = TokenStream>>(&mut self, streams: I) {
--        self.inner
--            .extend(streams.into_iter().flat_map(|stream| stream));
-+        self.inner.extend(streams.into_iter().flatten());
-     }
- }
- 
--pub type TokenTreeIter = vec::IntoIter<TokenTree>;
-+pub(crate) type TokenTreeIter = vec::IntoIter<TokenTree>;
- 
- impl IntoIterator for TokenStream {
-     type Item = TokenTree;
-     type IntoIter = TokenTreeIter;
- 
--    fn into_iter(self) -> TokenTreeIter {
--        self.inner.into_iter()
-+    fn into_iter(mut self) -> TokenTreeIter {
-+        self.take_inner().into_iter()
-     }
- }
- 
- #[derive(Clone, PartialEq, Eq)]
--pub struct SourceFile {
-+pub(crate) struct SourceFile {
-     path: PathBuf,
- }
- 
- impl SourceFile {
-     /// Get the path to this source file as a string.
-     pub fn path(&self) -> PathBuf {
-         self.path.clone()
-     }
- 
-     pub fn is_real(&self) -> bool {
-         // XXX(nika): Support real files in the future?
-         false
-     }
- }
- 
--impl fmt::Debug for SourceFile {
-+impl 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()
-     }
- }
- 
- #[derive(Clone, Copy, Debug, PartialEq, Eq)]
--pub struct LineColumn {
-+pub(crate) struct LineColumn {
-     pub line: usize,
-     pub column: usize,
- }
- 
- #[cfg(span_locations)]
- thread_local! {
-     static SOURCE_MAP: RefCell<SourceMap> = RefCell::new(SourceMap {
-         // NOTE: We start with a single dummy file which all call_site() and
-         // def_site() spans reference.
--        files: vec![{
-+        files: vec![FileInfo {
-             #[cfg(procmacro2_semver_exempt)]
--            {
--                FileInfo {
--                    name: "<unspecified>".to_owned(),
--                    span: Span { lo: 0, hi: 0 },
--                    lines: vec![0],
--                }
--            }
--
--            #[cfg(not(procmacro2_semver_exempt))]
--            {
--                FileInfo {
--                    span: Span { lo: 0, hi: 0 },
--                    lines: vec![0],
--                }
--            }
-+            name: "<unspecified>".to_owned(),
-+            span: Span { lo: 0, hi: 0 },
-+            lines: vec![0],
-         }],
-     });
- }
- 
- #[cfg(span_locations)]
- struct FileInfo {
-     #[cfg(procmacro2_semver_exempt)]
-     name: String,
-@@ -277,26 +323,31 @@ impl FileInfo {
-         }
-     }
- 
-     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.
-+/// Computes the offsets of each line in the given source string
-+/// and the total number of characters
- #[cfg(span_locations)]
--fn lines_offsets(s: &str) -> Vec<usize> {
-+fn lines_offsets(s: &str) -> (usize, 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);
-+    let mut total = 0;
-+
-+    for ch in s.chars() {
-+        total += 1;
-+        if ch == '\n' {
-+            lines.push(total);
-+        }
-     }
--    lines
-+
-+    (total, lines)
- }
- 
- #[cfg(span_locations)]
- struct SourceMap {
-     files: Vec<FileInfo>,
- }
- 
- #[cfg(span_locations)]
-@@ -305,81 +356,83 @@ impl SourceMap {
-         // 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 (len, 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,
--            hi: lo + (src.len() as u32),
-+            hi: lo + (len as u32),
-         };
- 
--        #[cfg(procmacro2_semver_exempt)]
-         self.files.push(FileInfo {
-+            #[cfg(procmacro2_semver_exempt)]
-             name: name.to_owned(),
-             span,
-             lines,
-         });
- 
-         #[cfg(not(procmacro2_semver_exempt))]
--        self.files.push(FileInfo { span, lines });
-         let _ = name;
- 
-         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, PartialEq, Eq)]
--pub struct Span {
-+pub(crate) struct Span {
-     #[cfg(span_locations)]
--    lo: u32,
-+    pub(crate) lo: u32,
-     #[cfg(span_locations)]
--    hi: u32,
-+    pub(crate) hi: u32,
- }
- 
- impl Span {
-     #[cfg(not(span_locations))]
-     pub fn call_site() -> Span {
-         Span {}
-     }
- 
-     #[cfg(span_locations)]
-     pub fn call_site() -> Span {
-         Span { lo: 0, hi: 0 }
-     }
- 
-+    #[cfg(hygiene)]
-+    pub fn mixed_site() -> Span {
-+        Span::call_site()
-+    }
-+
-     #[cfg(procmacro2_semver_exempt)]
-     pub fn def_site() -> Span {
-         Span::call_site()
-     }
- 
--    #[cfg(procmacro2_semver_exempt)]
-     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
-     }
- 
--    #[cfg(procmacro2_semver_exempt)]
-     pub fn located_at(&self, other: Span) -> Span {
-         other
-     }
- 
-     #[cfg(procmacro2_semver_exempt)]
-     pub fn source_file(&self) -> SourceFile {
-         SOURCE_MAP.with(|cm| {
-             let cm = cm.borrow();
-@@ -422,36 +475,69 @@ impl Span {
-                 return None;
-             }
-             Some(Span {
-                 lo: cmp::min(self.lo, other.lo),
-                 hi: cmp::max(self.hi, other.hi),
-             })
-         })
-     }
-+
-+    #[cfg(not(span_locations))]
-+    fn first_byte(self) -> Self {
-+        self
-+    }
-+
-+    #[cfg(span_locations)]
-+    fn first_byte(self) -> Self {
-+        Span {
-+            lo: self.lo,
-+            hi: cmp::min(self.lo.saturating_add(1), self.hi),
-+        }
-+    }
-+
-+    #[cfg(not(span_locations))]
-+    fn last_byte(self) -> Self {
-+        self
-+    }
-+
-+    #[cfg(span_locations)]
-+    fn last_byte(self) -> Self {
-+        Span {
-+            lo: cmp::max(self.hi.saturating_sub(1), self.lo),
-+            hi: self.hi,
-+        }
-+    }
- }
- 
--impl fmt::Debug for Span {
-+impl Debug for Span {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--        #[cfg(procmacro2_semver_exempt)]
-+        #[cfg(span_locations)]
-         return write!(f, "bytes({}..{})", self.lo, self.hi);
- 
--        #[cfg(not(procmacro2_semver_exempt))]
-+        #[cfg(not(span_locations))]
-         write!(f, "Span")
-     }
- }
- 
--pub fn debug_span_field_if_nontrivial(debug: &mut fmt::DebugStruct, span: Span) {
--    if cfg!(procmacro2_semver_exempt) {
-+pub(crate) fn debug_span_field_if_nontrivial(debug: &mut fmt::DebugStruct, span: Span) {
-+    #[cfg(span_locations)]
-+    {
-+        if span.lo == 0 && span.hi == 0 {
-+            return;
-+        }
-+    }
-+
-+    if cfg!(span_locations) {
-         debug.field("span", &span);
-     }
- }
- 
- #[derive(Clone)]
--pub struct Group {
-+pub(crate) struct Group {
-     delimiter: Delimiter,
-     stream: TokenStream,
-     span: Span,
- }
- 
- impl Group {
-     pub fn new(delimiter: Delimiter, stream: TokenStream) -> Group {
-         Group {
-@@ -469,58 +555,67 @@ impl Group {
-         self.stream.clone()
-     }
- 
-     pub fn span(&self) -> Span {
-         self.span
-     }
- 
-     pub fn span_open(&self) -> Span {
--        self.span
-+        self.span.first_byte()
-     }
- 
-     pub fn span_close(&self) -> Span {
--        self.span
-+        self.span.last_byte()
-     }
- 
-     pub fn set_span(&mut self, span: Span) {
-         self.span = span;
-     }
- }
- 
--impl fmt::Display for Group {
-+impl Display for Group {
-+    // We attempt to match libproc_macro's formatting.
-+    // Empty parens: ()
-+    // Nonempty parens: (...)
-+    // Empty brackets: []
-+    // Nonempty brackets: [...]
-+    // Empty braces: { }
-+    // Nonempty braces: { ... }
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--        let (left, right) = match self.delimiter {
-+        let (open, close) = match self.delimiter {
-             Delimiter::Parenthesis => ("(", ")"),
--            Delimiter::Brace => ("{", "}"),
-+            Delimiter::Brace => ("{ ", "}"),
-             Delimiter::Bracket => ("[", "]"),
-             Delimiter::None => ("", ""),
-         };
- 
--        f.write_str(left)?;
--        self.stream.fmt(f)?;
--        f.write_str(right)?;
-+        f.write_str(open)?;
-+        Display::fmt(&self.stream, f)?;
-+        if self.delimiter == Delimiter::Brace && !self.stream.inner.is_empty() {
-+            f.write_str(" ")?;
-+        }
-+        f.write_str(close)?;
- 
-         Ok(())
-     }
- }
- 
--impl fmt::Debug for Group {
-+impl Debug for Group {
-     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-         let mut debug = fmt.debug_struct("Group");
-         debug.field("delimiter", &self.delimiter);
-         debug.field("stream", &self.stream);
--        #[cfg(procmacro2_semver_exempt)]
--        debug.field("span", &self.span);
-+        debug_span_field_if_nontrivial(&mut debug, self.span);
-         debug.finish()
-     }
- }
- 
- #[derive(Clone)]
--pub struct Ident {
-+pub(crate) struct Ident {
-     sym: String,
-     span: Span,
-     raw: bool,
- }
- 
- impl Ident {
-     fn _new(string: &str, raw: bool, span: Span) -> Ident {
-         validate_ident(string);
-@@ -544,26 +639,24 @@ impl Ident {
-         self.span
-     }
- 
-     pub fn set_span(&mut self, span: Span) {
-         self.span = span;
-     }
- }
- 
--#[inline]
--fn is_ident_start(c: char) -> bool {
-+pub(crate) fn is_ident_start(c: char) -> bool {
-     ('a' <= c && c <= 'z')
-         || ('A' <= c && c <= 'Z')
-         || c == '_'
-         || (c > '\x7f' && UnicodeXID::is_xid_start(c))
- }
- 
--#[inline]
--fn is_ident_continue(c: char) -> bool {
-+pub(crate) fn is_ident_continue(c: char) -> bool {
-     ('a' <= c && c <= 'z')
-         || ('A' <= c && c <= 'Z')
-         || c == '_'
-         || ('0' <= c && c <= '9')
-         || (c > '\x7f' && UnicodeXID::is_xid_continue(c))
- }
- 
- fn validate_ident(string: &str) {
-@@ -610,49 +703,49 @@ where
-         if self.raw {
-             other.starts_with("r#") && self.sym == other[2..]
-         } else {
-             self.sym == other
-         }
-     }
- }
- 
--impl fmt::Display for Ident {
-+impl Display for Ident {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         if self.raw {
--            "r#".fmt(f)?;
-+            f.write_str("r#")?;
-         }
--        self.sym.fmt(f)
-+        Display::fmt(&self.sym, f)
-     }
- }
- 
--impl fmt::Debug for Ident {
-+impl Debug for Ident {
-     // Ident(proc_macro), Ident(r#union)
--    #[cfg(not(procmacro2_semver_exempt))]
-+    #[cfg(not(span_locations))]
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         let mut debug = f.debug_tuple("Ident");
-         debug.field(&format_args!("{}", self));
-         debug.finish()
-     }
- 
-     // Ident {
-     //     sym: proc_macro,
-     //     span: bytes(128..138)
-     // }
--    #[cfg(procmacro2_semver_exempt)]
-+    #[cfg(span_locations)]
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         let mut debug = f.debug_struct("Ident");
-         debug.field("sym", &format_args!("{}", self));
--        debug.field("span", &self.span);
-+        debug_span_field_if_nontrivial(&mut debug, self.span);
-         debug.finish()
-     }
- }
- 
- #[derive(Clone)]
--pub struct Literal {
-+pub(crate) 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))
-@@ -664,17 +757,17 @@ 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 {
-+    pub(crate) fn _new(text: String) -> Literal {
-         Literal {
-             text,
-             span: Span::call_site(),
-         }
-     }
- 
-     suffixed_numbers! {
-         u8_suffixed => u8,
-@@ -706,61 +799,62 @@ impl Literal {
-         i32_unsuffixed => i32,
-         i64_unsuffixed => i64,
-         i128_unsuffixed => i128,
-         isize_unsuffixed => isize,
-     }
- 
-     pub fn f32_unsuffixed(f: f32) -> Literal {
-         let mut s = f.to_string();
--        if !s.contains(".") {
-+        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(".") {
-+        if !s.contains('.') {
-             s.push_str(".0");
-         }
-         Literal::_new(s)
-     }
- 
-     pub fn string(t: &str) -> Literal {
-         let mut text = String::with_capacity(t.len() + 2);
-         text.push('"');
-         for c in t.chars() {
-             if c == '\'' {
--                // escape_default turns this into "\'" which is unnecessary.
-+                // escape_debug turns this into "\'" which is unnecessary.
-                 text.push(c);
-             } else {
--                text.extend(c.escape_default());
-+                text.extend(c.escape_debug());
-             }
-         }
-         text.push('"');
-         Literal::_new(text)
-     }
- 
-     pub fn character(t: char) -> Literal {
-         let mut text = String::new();
-         text.push('\'');
-         if t == '"' {
--            // escape_default turns this into '\"' which is unnecessary.
-+            // escape_debug turns this into '\"' which is unnecessary.
-             text.push(t);
-         } else {
--            text.extend(t.escape_default());
-+            text.extend(t.escape_debug());
-         }
-         text.push('\'');
-         Literal::_new(text)
-     }
- 
-     pub fn byte_string(bytes: &[u8]) -> Literal {
-         let mut escaped = "b\"".to_string();
-         for b in bytes {
-+            #[allow(clippy::match_overlapping_arm)]
-             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),
-@@ -779,656 +873,22 @@ impl Literal {
-         self.span = span;
-     }
- 
-     pub fn subspan<R: RangeBounds<usize>>(&self, _range: R) -> Option<Span> {
-         None
-     }
- }
- 
--impl fmt::Display for Literal {
-+impl Display for Literal {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--        self.text.fmt(f)
--    }
--}
--
--impl fmt::Debug for Literal {
--    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
--        let mut debug = fmt.debug_struct("Literal");
--        debug.field("lit", &format_args!("{}", self.text));
--        #[cfg(procmacro2_semver_exempt)]
--        debug.field("span", &self.span);
--        debug.finish()
--    }
--}
--
--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 { inner: trees }))
--}
--
--#[cfg(not(span_locations))]
--fn spanned<'a, T>(
--    input: Cursor<'a>,
--    f: fn(Cursor<'a>) -> PResult<'a, T>,
--) -> PResult<'a, (T, crate::Span)> {
--    let (a, b) = f(skip_whitespace(input))?;
--    Ok((a, ((b, crate::Span::_new_stable(Span::call_site())))))
--}
--
--#[cfg(span_locations)]
--fn spanned<'a, T>(
--    input: Cursor<'a>,
--    f: fn(Cursor<'a>) -> PResult<'a, T>,
--) -> PResult<'a, (T, crate::Span)> {
--    let input = skip_whitespace(input);
--    let lo = input.off;
--    let (a, b) = f(input)?;
--    let hi = a.off;
--    let span = crate::Span::_new_stable(Span { lo, 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, |g| TokenTree::Group(crate::Group::_new_stable(g)))
--    |
--    map!(literal, |l| TokenTree::Literal(crate::Literal::_new_stable(l))) // must be before symbol
--    |
--    map!(op, TokenTree::Punct)
--    |
--    symbol_leading_ws
--));
--
--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_leading_ws(input: Cursor) -> PResult<TokenTree> {
--    symbol(skip_whitespace(input))
--}
--
--fn symbol(input: Cursor) -> PResult<TokenTree> {
--    let raw = input.starts_with("r#");
--    let rest = input.advance((raw as usize) << 1);
--
--    let (rest, sym) = symbol_not_raw(rest)?;
--
--    if !raw {
--        let ident = crate::Ident::new(sym, crate::Span::call_site());
--        return Ok((rest, ident.into()));
--    }
--
--    if sym == "_" {
--        return Err(LexError);
--    }
--
--    let ident = crate::Ident::_new_raw(sym, crate::Span::call_site());
--    Ok((rest, ident.into()))
--}
--
--fn symbol_not_raw(input: Cursor) -> PResult<&str> {
--    let mut chars = input.char_indices();
--
--    match chars.next() {
--        Some((_, ch)) if is_ident_start(ch) => {}
--        _ => return Err(LexError),
--    }
--
--    let mut end = input.len();
--    for (i, ch) in chars {
--        if !is_ident_continue(ch) {
--            end = i;
--            break;
--        }
--    }
--
--    Ok((input.advance(end), &input.rest[..end]))
--}
--
--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(input.rest[start..end].to_string())))
--        }
--        Err(LexError) => Err(LexError),
-+        Display::fmt(&self.text, f)
-     }
- }
- 
--named!(literal_nocapture -> (), alt!(
--    string
--    |
--    byte_string
--    |
--    byte
--    |
--    character
--    |
--    float
--    |
--    int
--));
--
--named!(string -> (), alt!(
--    quoted_string
--    |
--    preceded!(
--        punct!("r"),
--        raw_string
--    ) => { |_| () }
--));
--
--named!(quoted_string -> (), do_parse!(
--    punct!("\"") >>
--    cooked_string >>
--    tag!("\"") >>
--    option!(symbol_not_raw) >>
--    (())
--));
--
--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)
-+impl Debug for Literal {
-+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-+        let mut debug = fmt.debug_struct("Literal");
-+        debug.field("lit", &format_args!("{}", self.text));
-+        debug_span_field_if_nontrivial(&mut debug, self.span);
-+        debug.finish()
-     }
- }
--
--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 (mut rest, ()) = float_digits(input)?;
--    if let Some(ch) = rest.chars().next() {
--        if is_ident_start(ch) {
--            rest = symbol_not_raw(rest)?.0;
--        }
--    }
--    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 == '.' || is_ident_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 (mut rest, ()) = digits(input)?;
--    if let Some(ch) = rest.chars().next() {
--        if is_ident_start(ch) {
--            rest = symbol_not_raw(rest)?.0;
--        }
--    }
--    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<Punct> {
--    let input = skip_whitespace(input);
--    match op_char(input) {
--        Ok((rest, '\'')) => {
--            symbol(rest)?;
--            Ok((rest, Punct::new('\'', Spacing::Joint)))
--        }
--        Ok((rest, ch)) => {
--            let kind = match op_char(rest) {
--                Ok(_) => Spacing::Joint,
--                Err(LexError) => Spacing::Alone,
--            };
--            Ok((rest, Punct::new(ch, kind)))
--        }
--        Err(LexError) => Err(LexError),
--    }
--}
--
--fn op_char(input: Cursor) -> PResult<char> {
--    if input.starts_with("//") || input.starts_with("/*") {
--        // Do not accept `/` of a comment as an op.
--        return Err(LexError);
--    }
--
--    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::Punct(Punct::new('#', Spacing::Alone)));
--    if inner {
--        trees.push(Punct::new('!', Spacing::Alone).into());
--    }
--    let mut stream = vec![
--        TokenTree::Ident(crate::Ident::new("doc", span)),
--        TokenTree::Punct(Punct::new('=', Spacing::Alone)),
--        TokenTree::Literal(crate::Literal::string(comment)),
--    ];
--    for tt in stream.iter_mut() {
--        tt.set_span(span);
--    }
--    let group = Group::new(Delimiter::Bracket, stream.into_iter().collect());
--    trees.push(crate::Group::_new_stable(group).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/src/lib.rs b/third_party/rust/proc-macro2/src/lib.rs
---- a/third_party/rust/proc-macro2/src/lib.rs
-+++ b/third_party/rust/proc-macro2/src/lib.rs
-@@ -73,37 +73,44 @@
- //!
- //! # Thread-Safety
- //!
- //! Most types in this crate are `!Sync` because the underlying compiler
- //! types make use of thread-local memory, meaning they cannot be accessed from
- //! a different thread.
- 
- // Proc-macro2 types in rustdoc of other crates get linked to here.
--#![doc(html_root_url = "https://docs.rs/proc-macro2/1.0.5")]
-+#![doc(html_root_url = "https://docs.rs/proc-macro2/1.0.20")]
- #![cfg_attr(any(proc_macro_span, super_unstable), feature(proc_macro_span))]
- #![cfg_attr(super_unstable, feature(proc_macro_raw_ident, proc_macro_def_site))]
-+#![allow(clippy::needless_doctest_main)]
- 
- #[cfg(use_proc_macro)]
- extern crate proc_macro;
- 
- use std::cmp::Ordering;
--use std::fmt;
-+use std::fmt::{self, Debug, Display};
- use std::hash::{Hash, Hasher};
- use std::iter::FromIterator;
- use std::marker;
- use std::ops::RangeBounds;
- #[cfg(procmacro2_semver_exempt)]
- use std::path::PathBuf;
- use std::rc::Rc;
- use std::str::FromStr;
- 
--#[macro_use]
--mod strnom;
--mod fallback;
-+mod parse;
-+
-+#[cfg(wrap_proc_macro)]
-+mod detection;
-+
-+// Public for proc_macro2::fallback::force() and unforce(), but those are quite
-+// a niche use case so we omit it from rustdoc.
-+#[doc(hidden)]
-+pub mod fallback;
- 
- #[cfg(not(wrap_proc_macro))]
- use crate::fallback as imp;
- #[path = "wrapper.rs"]
- #[cfg(wrap_proc_macro)]
- mod imp;
- 
- /// An abstract stream of tokens, or more concretely a sequence of token trees.
-@@ -223,32 +230,32 @@ impl FromIterator<TokenStream> for Token
-         TokenStream::_new(streams.into_iter().map(|i| i.inner).collect())
-     }
- }
- 
- /// Prints the token stream as a string that is supposed to be losslessly
- /// convertible back into the same token stream (modulo spans), except for
- /// possibly `TokenTree::Group`s with `Delimiter::None` delimiters and negative
- /// numeric literals.
--impl fmt::Display for TokenStream {
-+impl Display for TokenStream {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--        self.inner.fmt(f)
-+        Display::fmt(&self.inner, f)
-     }
- }
- 
- /// Prints token in a form convenient for debugging.
--impl fmt::Debug for TokenStream {
-+impl Debug for TokenStream {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--        self.inner.fmt(f)
-+        Debug::fmt(&self.inner, f)
-     }
- }
- 
--impl fmt::Debug for LexError {
-+impl Debug for LexError {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--        self.inner.fmt(f)
-+        Debug::fmt(&self.inner, f)
-     }
- }
- 
- /// The source file of a given `Span`.
- ///
- /// This type is semver exempt and not exposed by default.
- #[cfg(procmacro2_semver_exempt)]
- #[derive(Clone, PartialEq, Eq)]
-@@ -286,19 +293,19 @@ impl SourceFile {
-     /// Returns `true` if this source file is a real source file, and not
-     /// generated by an external macro's expansion.
-     pub fn is_real(&self) -> bool {
-         self.inner.is_real()
-     }
- }
- 
- #[cfg(procmacro2_semver_exempt)]
--impl fmt::Debug for SourceFile {
-+impl Debug for SourceFile {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--        self.inner.fmt(f)
-+        Debug::fmt(&self.inner, f)
-     }
- }
- 
- /// A line-column pair representing the start or end of a `Span`.
- ///
- /// This type is semver exempt and not exposed by default.
- #[cfg(span_locations)]
- #[derive(Copy, Clone, Debug, PartialEq, Eq)]
-@@ -306,16 +313,32 @@ pub struct LineColumn {
-     /// The 1-indexed line in the source file on which the span starts or ends
-     /// (inclusive).
-     pub line: usize,
-     /// The 0-indexed column (in UTF-8 characters) in the source file on which
-     /// the span starts or ends (inclusive).
-     pub column: usize,
- }
- 
-+#[cfg(span_locations)]
-+impl Ord for LineColumn {
-+    fn cmp(&self, other: &Self) -> Ordering {
-+        self.line
-+            .cmp(&other.line)
-+            .then(self.column.cmp(&other.column))
-+    }
-+}
-+
-+#[cfg(span_locations)]
-+impl PartialOrd for LineColumn {
-+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-+        Some(self.cmp(other))
-+    }
-+}
-+
- /// A region of source code, along with macro expansion information.
- #[derive(Copy, Clone)]
- pub struct Span {
-     inner: imp::Span,
-     _marker: marker::PhantomData<Rc<()>>,
- }
- 
- impl Span {
-@@ -337,38 +360,42 @@ impl Span {
-     ///
-     /// Identifiers created with this span will be resolved as if they were
-     /// written directly at the macro call location (call-site hygiene) and
-     /// other code at the macro call site will be able to refer to them as well.
-     pub fn call_site() -> Span {
-         Span::_new(imp::Span::call_site())
-     }
- 
-+    /// The span located at the invocation of the procedural macro, but with
-+    /// local variables, labels, and `$crate` resolved at the definition site
-+    /// of the macro. This is the same hygiene behavior as `macro_rules`.
-+    ///
-+    /// This function requires Rust 1.45 or later.
-+    #[cfg(hygiene)]
-+    pub fn mixed_site() -> Span {
-+        Span::_new(imp::Span::mixed_site())
-+    }
-+
-     /// A span that resolves at the macro definition site.
-     ///
-     /// This method is semver exempt and not exposed by default.
-     #[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`.
--    ///
--    /// This method is semver exempt and not exposed by default.
--    #[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`.
--    ///
--    /// This method is semver exempt and not exposed by default.
--    #[cfg(procmacro2_semver_exempt)]
-     pub fn located_at(&self, other: Span) -> Span {
-         Span::_new(self.inner.located_at(other.inner))
-     }
- 
-     /// Convert `proc_macro2::Span` to `proc_macro::Span`.
-     ///
-     /// This method is available when building with a nightly compiler, or when
-     /// building with rustc 1.29+ *without* semver exempt features.
-@@ -434,19 +461,19 @@ impl Span {
-     /// This method is semver exempt and not exposed by default.
-     #[cfg(procmacro2_semver_exempt)]
-     pub fn eq(&self, other: &Span) -> bool {
-         self.inner.eq(&other.inner)
-     }
- }
- 
- /// Prints a span in a form convenient for debugging.
--impl fmt::Debug for Span {
-+impl Debug for Span {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--        self.inner.fmt(f)
-+        Debug::fmt(&self.inner, f)
-     }
- }
- 
- /// A single token or a delimited sequence of token trees (e.g. `[1, (), ..]`).
- #[derive(Clone)]
- pub enum TokenTree {
-     /// A token stream surrounded by bracket delimiters.
-     Group(Group),
-@@ -457,35 +484,35 @@ pub enum TokenTree {
-     /// A literal character (`'a'`), string (`"hello"`), number (`2.3`), etc.
-     Literal(Literal),
- }
- 
- impl TokenTree {
-     /// Returns the span of this tree, delegating to the `span` method of
-     /// the contained token or a delimited stream.
-     pub fn span(&self) -> Span {
--        match *self {
--            TokenTree::Group(ref t) => t.span(),
--            TokenTree::Ident(ref t) => t.span(),
--            TokenTree::Punct(ref t) => t.span(),
--            TokenTree::Literal(ref t) => t.span(),
-+        match self {
-+            TokenTree::Group(t) => t.span(),
-+            TokenTree::Ident(t) => t.span(),
-+            TokenTree::Punct(t) => t.span(),
-+            TokenTree::Literal(t) => t.span(),
-         }
-     }
- 
-     /// Configures the span for *only this token*.
-     ///
-     /// Note that if this token is a `Group` then this method will not configure
-     /// the span of each of the internal tokens, this will simply delegate to
-     /// the `set_span` method of each variant.
-     pub fn set_span(&mut self, span: Span) {
--        match *self {
--            TokenTree::Group(ref mut t) => t.set_span(span),
--            TokenTree::Ident(ref mut t) => t.set_span(span),
--            TokenTree::Punct(ref mut t) => t.set_span(span),
--            TokenTree::Literal(ref mut t) => t.set_span(span),
-+        match self {
-+            TokenTree::Group(t) => t.set_span(span),
-+            TokenTree::Ident(t) => t.set_span(span),
-+            TokenTree::Punct(t) => t.set_span(span),
-+            TokenTree::Literal(t) => t.set_span(span),
-         }
-     }
- }
- 
- impl From<Group> for TokenTree {
-     fn from(g: Group) -> TokenTree {
-         TokenTree::Group(g)
-     }
-@@ -508,42 +535,42 @@ impl From<Literal> for TokenTree {
-         TokenTree::Literal(g)
-     }
- }
- 
- /// Prints the token tree as a string that is supposed to be losslessly
- /// convertible back into the same token tree (modulo spans), except for
- /// possibly `TokenTree::Group`s with `Delimiter::None` delimiters and negative
- /// numeric literals.
--impl fmt::Display for TokenTree {
-+impl Display for TokenTree {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--        match *self {
--            TokenTree::Group(ref t) => t.fmt(f),
--            TokenTree::Ident(ref t) => t.fmt(f),
--            TokenTree::Punct(ref t) => t.fmt(f),
--            TokenTree::Literal(ref t) => t.fmt(f),
-+        match self {
-+            TokenTree::Group(t) => Display::fmt(t, f),
-+            TokenTree::Ident(t) => Display::fmt(t, f),
-+            TokenTree::Punct(t) => Display::fmt(t, f),
-+            TokenTree::Literal(t) => Display::fmt(t, f),
-         }
-     }
- }
- 
- /// Prints token tree in a form convenient for debugging.
--impl fmt::Debug for TokenTree {
-+impl Debug for TokenTree {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         // Each of these has the name in the struct type in the derived debug,
-         // so don't bother with an extra layer of indirection
--        match *self {
--            TokenTree::Group(ref t) => t.fmt(f),
--            TokenTree::Ident(ref t) => {
-+        match self {
-+            TokenTree::Group(t) => Debug::fmt(t, f),
-+            TokenTree::Ident(t) => {
-                 let mut debug = f.debug_struct("Ident");
-                 debug.field("sym", &format_args!("{}", t));
-                 imp::debug_span_field_if_nontrivial(&mut debug, t.span().inner);
-                 debug.finish()
-             }
--            TokenTree::Punct(ref t) => t.fmt(f),
--            TokenTree::Literal(ref t) => t.fmt(f),
-+            TokenTree::Punct(t) => Debug::fmt(t, f),
-+            TokenTree::Literal(t) => Debug::fmt(t, f),
-         }
-     }
- }
- 
- /// A delimited token stream.
- ///
- /// A `Group` internally contains a `TokenStream` which is surrounded by
- /// `Delimiter`s.
-@@ -646,25 +673,25 @@ impl Group {
-     pub fn set_span(&mut self, span: Span) {
-         self.inner.set_span(span.inner)
-     }
- }
- 
- /// Prints the group as a string that should be losslessly convertible back
- /// into the same group (modulo spans), except for possibly `TokenTree::Group`s
- /// with `Delimiter::None` delimiters.
--impl fmt::Display for Group {
-+impl Display for Group {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
--        fmt::Display::fmt(&self.inner, formatter)
-+        Display::fmt(&self.inner, formatter)
-     }
- }
- 
--impl fmt::Debug for Group {
-+impl Debug for Group {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
--        fmt::Debug::fmt(&self.inner, formatter)
-+        Debug::fmt(&self.inner, formatter)
-     }
- }
- 
- /// An `Punct` is an single punctuation character like `+`, `-` or `#`.
- ///
- /// Multicharacter operators like `+=` are represented as two instances of
- /// `Punct` with different forms of `Spacing` returned.
- #[derive(Clone)]
-@@ -725,23 +752,23 @@ impl Punct {
-     /// Configure the span for this punctuation character.
-     pub fn set_span(&mut self, span: Span) {
-         self.span = span;
-     }
- }
- 
- /// Prints the punctuation character as a string that should be losslessly
- /// convertible back into the same character.
--impl fmt::Display for Punct {
-+impl Display for Punct {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--        self.op.fmt(f)
-+        Display::fmt(&self.op, f)
-     }
- }
- 
--impl fmt::Debug for Punct {
-+impl Debug for Punct {
-     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-         let mut debug = fmt.debug_struct("Punct");
-         debug.field("op", &self.op);
-         debug.field("spacing", &self.spacing);
-         imp::debug_span_field_if_nontrivial(&mut debug, self.span.inner);
-         debug.finish()
-     }
- }
-@@ -915,25 +942,25 @@ impl Ord for Ident {
- impl Hash for Ident {
-     fn hash<H: Hasher>(&self, hasher: &mut H) {
-         self.to_string().hash(hasher)
-     }
- }
- 
- /// Prints the identifier as a string that should be losslessly convertible back
- /// into the same identifier.
--impl fmt::Display for Ident {
-+impl Display for Ident {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--        self.inner.fmt(f)
-+        Display::fmt(&self.inner, f)
-     }
- }
- 
--impl fmt::Debug for Ident {
-+impl Debug for Ident {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--        self.inner.fmt(f)
-+        Debug::fmt(&self.inner, f)
-     }
- }
- 
- /// A literal string (`"hello"`), byte string (`b"hello"`), character (`'a'`),
- /// byte character (`b'a'`), an integer or floating point number with or without
- /// a suffix (`1`, `1u8`, `2.3`, `2.3f32`).
- ///
- /// Boolean literals like `true` and `false` do not belong here, they are
-@@ -1135,36 +1162,36 @@ impl Literal {
-     /// nightly compiler, this method will always return `None`.
-     ///
-     /// [`proc_macro::Literal::subspan`]: https://doc.rust-lang.org/proc_macro/struct.Literal.html#method.subspan
-     pub fn subspan<R: RangeBounds<usize>>(&self, range: R) -> Option<Span> {
-         self.inner.subspan(range).map(Span::_new)
-     }
- }
- 
--impl fmt::Debug for Literal {
-+impl Debug for Literal {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--        self.inner.fmt(f)
-+        Debug::fmt(&self.inner, f)
-     }
- }
- 
--impl fmt::Display for Literal {
-+impl Display for Literal {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--        self.inner.fmt(f)
-+        Display::fmt(&self.inner, f)
-     }
- }
- 
- /// Public implementation details for the `TokenStream` type, such as iterators.
- pub mod token_stream {
--    use std::fmt;
-+    use crate::{imp, TokenTree};
-+    use std::fmt::{self, Debug};
-     use std::marker;
-     use std::rc::Rc;
- 
-     pub use crate::TokenStream;
--    use crate::{imp, TokenTree};
- 
-     /// An iterator over `TokenStream`'s `TokenTree`s.
-     ///
-     /// The iteration is "shallow", e.g. the iterator doesn't recurse into
-     /// delimited groups, and returns whole groups as token trees.
-     #[derive(Clone)]
-     pub struct IntoIter {
-         inner: imp::TokenTreeIter,
-@@ -1174,19 +1201,19 @@ pub mod token_stream {
-     impl Iterator for IntoIter {
-         type Item = TokenTree;
- 
-         fn next(&mut self) -> Option<TokenTree> {
-             self.inner.next()
-         }
-     }
- 
--    impl fmt::Debug for IntoIter {
-+    impl Debug for IntoIter {
-         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
--            self.inner.fmt(f)
-+            Debug::fmt(&self.inner, f)
-         }
-     }
- 
-     impl IntoIterator for TokenStream {
-         type Item = TokenTree;
-         type IntoIter = IntoIter;
- 
-         fn into_iter(self) -> IntoIter {
-diff --git a/third_party/rust/proc-macro2/src/parse.rs b/third_party/rust/proc-macro2/src/parse.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/proc-macro2/src/parse.rs
-@@ -0,0 +1,791 @@
-+use crate::fallback::{
-+    is_ident_continue, is_ident_start, Group, LexError, Literal, Span, TokenStream,
-+};
-+use crate::{Delimiter, Punct, Spacing, TokenTree};
-+use std::str::{Bytes, CharIndices, Chars};
-+use unicode_xid::UnicodeXID;
-+
-+#[derive(Copy, Clone, Eq, PartialEq)]
-+pub(crate) struct Cursor<'a> {
-+    pub rest: &'a str,
-+    #[cfg(span_locations)]
-+    pub off: u32,
-+}
-+
-+impl<'a> Cursor<'a> {
-+    fn advance(&self, bytes: usize) -> Cursor<'a> {
-+        let (_front, rest) = self.rest.split_at(bytes);
-+        Cursor {
-+            rest,
-+            #[cfg(span_locations)]
-+            off: self.off + _front.chars().count() as u32,
-+        }
-+    }
-+
-+    fn starts_with(&self, s: &str) -> bool {
-+        self.rest.starts_with(s)
-+    }
-+
-+    pub(crate) fn is_empty(&self) -> bool {
-+        self.rest.is_empty()
-+    }
-+
-+    fn len(&self) -> usize {
-+        self.rest.len()
-+    }
-+
-+    fn as_bytes(&self) -> &'a [u8] {
-+        self.rest.as_bytes()
-+    }
-+
-+    fn bytes(&self) -> Bytes<'a> {
-+        self.rest.bytes()
-+    }
-+
-+    fn chars(&self) -> Chars<'a> {
-+        self.rest.chars()
-+    }
-+
-+    fn char_indices(&self) -> CharIndices<'a> {
-+        self.rest.char_indices()
-+    }
-+
-+    fn parse(&self, tag: &str) -> Result<Cursor<'a>, LexError> {
-+        if self.starts_with(tag) {
-+            Ok(self.advance(tag.len()))
-+        } else {
-+            Err(LexError)
-+        }
-+    }
-+}
-+
-+type PResult<'a, O> = Result<(Cursor<'a>, O), LexError>;
-+
-+fn skip_whitespace(input: Cursor) -> Cursor {
-+    let mut s = input;
-+
-+    while !s.is_empty() {
-+        let byte = s.as_bytes()[0];
-+        if byte == b'/' {
-+            if s.starts_with("//")
-+                && (!s.starts_with("///") || s.starts_with("////"))
-+                && !s.starts_with("//!")
-+            {
-+                let (cursor, _) = take_until_newline_or_eof(s);
-+                s = cursor;
-+                continue;
-+            } else if s.starts_with("/**/") {
-+                s = s.advance(4);
-+                continue;
-+            } else if s.starts_with("/*")
-+                && (!s.starts_with("/**") || s.starts_with("/***"))
-+                && !s.starts_with("/*!")
-+            {
-+                match block_comment(s) {
-+                    Ok((rest, _)) => {
-+                        s = rest;
-+                        continue;
-+                    }
-+                    Err(LexError) => return s,
-+                }
-+            }
-+        }
-+        match byte {
-+            b' ' | 0x09..=0x0d => {
-+                s = s.advance(1);
-+                continue;
-+            }
-+            b if b <= 0x7f => {}
-+            _ => {
-+                let ch = s.chars().next().unwrap();
-+                if is_whitespace(ch) {
-+                    s = s.advance(ch.len_utf8());
-+                    continue;
-+                }
-+            }
-+        }
-+        return s;
-+    }
-+    s
-+}
-+
-+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)
-+}
-+
-+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}'
-+}
-+
-+fn word_break(input: Cursor) -> Result<Cursor, LexError> {
-+    match input.chars().next() {
-+        Some(ch) if UnicodeXID::is_xid_continue(ch) => Err(LexError),
-+        Some(_) | None => Ok(input),
-+    }
-+}
-+
-+pub(crate) fn token_stream(mut input: Cursor) -> PResult<TokenStream> {
-+    let mut trees = Vec::new();
-+    let mut stack = Vec::new();
-+
-+    loop {
-+        input = skip_whitespace(input);
-+
-+        if let Ok((rest, tt)) = doc_comment(input) {
-+            trees.extend(tt);
-+            input = rest;
-+            continue;
-+        }
-+
-+        #[cfg(span_locations)]
-+        let lo = input.off;
-+
-+        let first = match input.bytes().next() {
-+            Some(first) => first,
-+            None => break,
-+        };
-+
-+        if let Some(open_delimiter) = match first {
-+            b'(' => Some(Delimiter::Parenthesis),
-+            b'[' => Some(Delimiter::Bracket),
-+            b'{' => Some(Delimiter::Brace),
-+            _ => None,
-+        } {
-+            input = input.advance(1);
-+            let frame = (open_delimiter, trees);
-+            #[cfg(span_locations)]
-+            let frame = (lo, frame);
-+            stack.push(frame);
-+            trees = Vec::new();
-+        } else if let Some(close_delimiter) = match first {
-+            b')' => Some(Delimiter::Parenthesis),
-+            b']' => Some(Delimiter::Bracket),
-+            b'}' => Some(Delimiter::Brace),
-+            _ => None,
-+        } {
-+            input = input.advance(1);
-+            let frame = stack.pop().ok_or(LexError)?;
-+            #[cfg(span_locations)]
-+            let (lo, frame) = frame;
-+            let (open_delimiter, outer) = frame;
-+            if open_delimiter != close_delimiter {
-+                return Err(LexError);
-+            }
-+            let mut g = Group::new(open_delimiter, TokenStream { inner: trees });
-+            g.set_span(Span {
-+                #[cfg(span_locations)]
-+                lo,
-+                #[cfg(span_locations)]
-+                hi: input.off,
-+            });
-+            trees = outer;
-+            trees.push(TokenTree::Group(crate::Group::_new_stable(g)));
-+        } else {
-+            let (rest, mut tt) = leaf_token(input)?;
-+            tt.set_span(crate::Span::_new_stable(Span {
-+                #[cfg(span_locations)]
-+                lo,
-+                #[cfg(span_locations)]
-+                hi: rest.off,
-+            }));
-+            trees.push(tt);
-+            input = rest;
-+        }
-+    }
-+
-+    if stack.is_empty() {
-+        Ok((input, TokenStream { inner: trees }))
-+    } else {
-+        Err(LexError)
-+    }
-+}
-+
-+fn leaf_token(input: Cursor) -> PResult<TokenTree> {
-+    if let Ok((input, l)) = literal(input) {
-+        // must be parsed before ident
-+        Ok((input, TokenTree::Literal(crate::Literal::_new_stable(l))))
-+    } else if let Ok((input, p)) = op(input) {
-+        Ok((input, TokenTree::Punct(p)))
-+    } else if let Ok((input, i)) = ident(input) {
-+        Ok((input, TokenTree::Ident(i)))
-+    } else {
-+        Err(LexError)
-+    }
-+}
-+
-+fn ident(input: Cursor) -> PResult<crate::Ident> {
-+    let raw = input.starts_with("r#");
-+    let rest = input.advance((raw as usize) << 1);
-+
-+    let (rest, sym) = ident_not_raw(rest)?;
-+
-+    if !raw {
-+        let ident = crate::Ident::new(sym, crate::Span::call_site());
-+        return Ok((rest, ident));
-+    }
-+
-+    if sym == "_" {
-+        return Err(LexError);
-+    }
-+
-+    let ident = crate::Ident::_new_raw(sym, crate::Span::call_site());
-+    Ok((rest, ident))
-+}
-+
-+fn ident_not_raw(input: Cursor) -> PResult<&str> {
-+    let mut chars = input.char_indices();
-+
-+    match chars.next() {
-+        Some((_, ch)) if is_ident_start(ch) => {}
-+        _ => return Err(LexError),
-+    }
-+
-+    let mut end = input.len();
-+    for (i, ch) in chars {
-+        if !is_ident_continue(ch) {
-+            end = i;
-+            break;
-+        }
-+    }
-+
-+    Ok((input.advance(end), &input.rest[..end]))
-+}
-+
-+fn literal(input: Cursor) -> PResult<Literal> {
-+    match literal_nocapture(input) {
-+        Ok(a) => {
-+            let end = input.len() - a.len();
-+            Ok((a, Literal::_new(input.rest[..end].to_string())))
-+        }
-+        Err(LexError) => Err(LexError),
-+    }
-+}
-+
-+fn literal_nocapture(input: Cursor) -> Result<Cursor, LexError> {
-+    if let Ok(ok) = string(input) {
-+        Ok(ok)
-+    } else if let Ok(ok) = byte_string(input) {
-+        Ok(ok)
-+    } else if let Ok(ok) = byte(input) {
-+        Ok(ok)
-+    } else if let Ok(ok) = character(input) {
-+        Ok(ok)
-+    } else if let Ok(ok) = float(input) {
-+        Ok(ok)
-+    } else if let Ok(ok) = int(input) {
-+        Ok(ok)
-+    } else {
-+        Err(LexError)
-+    }
-+}
-+
-+fn literal_suffix(input: Cursor) -> Cursor {
-+    match ident_not_raw(input) {
-+        Ok((input, _)) => input,
-+        Err(LexError) => input,
-+    }
-+}
-+
-+fn string(input: Cursor) -> Result<Cursor, LexError> {
-+    if let Ok(input) = input.parse("\"") {
-+        cooked_string(input)
-+    } else if let Ok(input) = input.parse("r") {
-+        raw_string(input)
-+    } else {
-+        Err(LexError)
-+    }
-+}
-+
-+fn cooked_string(input: Cursor) -> Result<Cursor, LexError> {
-+    let mut chars = input.char_indices().peekable();
-+
-+    while let Some((i, ch)) = chars.next() {
-+        match ch {
-+            '"' => {
-+                let input = input.advance(i + 1);
-+                return Ok(literal_suffix(input));
-+            }
-+            '\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)
-+}
-+
-+fn byte_string(input: Cursor) -> Result<Cursor, LexError> {
-+    if let Ok(input) = input.parse("b\"") {
-+        cooked_byte_string(input)
-+    } else if let Ok(input) = input.parse("br") {
-+        raw_string(input)
-+    } else {
-+        Err(LexError)
-+    }
-+}
-+
-+fn cooked_byte_string(mut input: Cursor) -> Result<Cursor, LexError> {
-+    let mut bytes = input.bytes().enumerate();
-+    'outer: while let Some((offset, b)) = bytes.next() {
-+        match b {
-+            b'"' => {
-+                let input = input.advance(offset + 1);
-+                return Ok(literal_suffix(input));
-+            }
-+            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) -> Result<Cursor, LexError> {
-+    let mut chars = input.char_indices();
-+    let mut n = 0;
-+    while let Some((i, ch)) = chars.next() {
-+        match ch {
-+            '"' => {
-+                n = i;
-+                break;
-+            }
-+            '#' => {}
-+            _ => return Err(LexError),
-+        }
-+    }
-+    for (i, ch) in chars {
-+        match ch {
-+            '"' if input.rest[i + 1..].starts_with(&input.rest[..n]) => {
-+                let rest = input.advance(i + 1 + n);
-+                return Ok(literal_suffix(rest));
-+            }
-+            '\r' => {}
-+            _ => {}
-+        }
-+    }
-+    Err(LexError)
-+}
-+
-+fn byte(input: Cursor) -> Result<Cursor, LexError> {
-+    let input = input.parse("b'")?;
-+    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 {
-+        return Err(LexError);
-+    }
-+    let (offset, _) = bytes.next().ok_or(LexError)?;
-+    if !input.chars().as_str().is_char_boundary(offset) {
-+        return Err(LexError);
-+    }
-+    let input = input.advance(offset).parse("'")?;
-+    Ok(literal_suffix(input))
-+}
-+
-+fn character(input: Cursor) -> Result<Cursor, LexError> {
-+    let input = input.parse("'")?;
-+    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 {
-+        return Err(LexError);
-+    }
-+    let (idx, _) = chars.next().ok_or(LexError)?;
-+    let input = input.advance(idx).parse("'")?;
-+    Ok(literal_suffix(input))
-+}
-+
-+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) -> Result<Cursor, LexError> {
-+    let mut rest = float_digits(input)?;
-+    if let Some(ch) = rest.chars().next() {
-+        if is_ident_start(ch) {
-+            rest = ident_not_raw(rest)?.0;
-+        }
-+    }
-+    word_break(rest)
-+}
-+
-+fn float_digits(input: Cursor) -> Result<Cursor, LexError> {
-+    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 == '.' || is_ident_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) -> Result<Cursor, LexError> {
-+    let mut rest = digits(input)?;
-+    if let Some(ch) = rest.chars().next() {
-+        if is_ident_start(ch) {
-+            rest = ident_not_raw(rest)?.0;
-+        }
-+    }
-+    word_break(rest)
-+}
-+
-+fn digits(mut input: Cursor) -> Result<Cursor, LexError> {
-+    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<Punct> {
-+    match op_char(input) {
-+        Ok((rest, '\'')) => {
-+            ident(rest)?;
-+            Ok((rest, Punct::new('\'', Spacing::Joint)))
-+        }
-+        Ok((rest, ch)) => {
-+            let kind = match op_char(rest) {
-+                Ok(_) => Spacing::Joint,
-+                Err(LexError) => Spacing::Alone,
-+            };
-+            Ok((rest, Punct::new(ch, kind)))
-+        }
-+        Err(LexError) => Err(LexError),
-+    }
-+}
-+
-+fn op_char(input: Cursor) -> PResult<char> {
-+    if input.starts_with("//") || input.starts_with("/*") {
-+        // Do not accept `/` of a comment as an op.
-+        return Err(LexError);
-+    }
-+
-+    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>> {
-+    #[cfg(span_locations)]
-+    let lo = input.off;
-+    let (rest, (comment, inner)) = doc_comment_contents(input)?;
-+    let span = crate::Span::_new_stable(Span {
-+        #[cfg(span_locations)]
-+        lo,
-+        #[cfg(span_locations)]
-+        hi: rest.off,
-+    });
-+
-+    let mut scan_for_bare_cr = comment;
-+    while let Some(cr) = scan_for_bare_cr.find('\r') {
-+        let rest = &scan_for_bare_cr[cr + 1..];
-+        if !rest.starts_with('\n') {
-+            return Err(LexError);
-+        }
-+        scan_for_bare_cr = rest;
-+    }
-+
-+    let mut trees = Vec::new();
-+    trees.push(TokenTree::Punct(Punct::new('#', Spacing::Alone)));
-+    if inner {
-+        trees.push(Punct::new('!', Spacing::Alone).into());
-+    }
-+    let mut stream = vec![
-+        TokenTree::Ident(crate::Ident::new("doc", span)),
-+        TokenTree::Punct(Punct::new('=', Spacing::Alone)),
-+        TokenTree::Literal(crate::Literal::string(comment)),
-+    ];
-+    for tt in stream.iter_mut() {
-+        tt.set_span(span);
-+    }
-+    let group = Group::new(Delimiter::Bracket, stream.into_iter().collect());
-+    trees.push(crate::Group::_new_stable(group).into());
-+    for tt in trees.iter_mut() {
-+        tt.set_span(span);
-+    }
-+    Ok((rest, trees))
-+}
-+
-+fn doc_comment_contents(input: Cursor) -> PResult<(&str, bool)> {
-+    if input.starts_with("//!") {
-+        let input = input.advance(3);
-+        let (input, s) = take_until_newline_or_eof(input);
-+        Ok((input, (s, true)))
-+    } else if input.starts_with("/*!") {
-+        let (input, s) = block_comment(input)?;
-+        Ok((input, (&s[3..s.len() - 2], true)))
-+    } else if input.starts_with("///") {
-+        let input = input.advance(3);
-+        if input.starts_with("/") {
-+            return Err(LexError);
-+        }
-+        let (input, s) = take_until_newline_or_eof(input);
-+        Ok((input, (s, false)))
-+    } else if input.starts_with("/**") && !input.rest[3..].starts_with('*') {
-+        let (input, s) = block_comment(input)?;
-+        Ok((input, (&s[3..s.len() - 2], false)))
-+    } else {
-+        Err(LexError)
-+    }
-+}
-+
-+fn take_until_newline_or_eof(input: Cursor) -> (Cursor, &str) {
-+    let chars = input.char_indices();
-+
-+    for (i, ch) in chars {
-+        if ch == '\n' {
-+            return (input.advance(i), &input.rest[..i]);
-+        } else if ch == '\r' && input.rest[i + 1..].starts_with('\n') {
-+            return (input.advance(i + 1), &input.rest[..i]);
-+        }
-+    }
-+
-+    (input.advance(input.len()), input.rest)
-+}
-diff --git a/third_party/rust/proc-macro2/src/strnom.rs b/third_party/rust/proc-macro2/src/strnom.rs
-deleted file mode 100644
---- a/third_party/rust/proc-macro2/src/strnom.rs
-+++ /dev/null
-@@ -1,391 +0,0 @@
--//! Adapted from [`nom`](https://github.com/Geal/nom).
--
--use crate::fallback::LexError;
--use std::str::{Bytes, CharIndices, Chars};
--use unicode_xid::UnicodeXID;
--
--#[derive(Copy, Clone, Eq, PartialEq)]
--pub struct Cursor<'a> {
--    pub rest: &'a str,
--    #[cfg(span_locations)]
--    pub off: u32,
--}
--
--impl<'a> Cursor<'a> {
--    #[cfg(not(span_locations))]
--    pub fn advance(&self, amt: usize) -> Cursor<'a> {
--        Cursor {
--            rest: &self.rest[amt..],
--        }
--    }
--    #[cfg(span_locations)]
--    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/src/wrapper.rs b/third_party/rust/proc-macro2/src/wrapper.rs
---- a/third_party/rust/proc-macro2/src/wrapper.rs
-+++ b/third_party/rust/proc-macro2/src/wrapper.rs
-@@ -1,96 +1,39 @@
--use std::fmt;
--use std::iter;
-+use crate::detection::inside_proc_macro;
-+use crate::{fallback, Delimiter, Punct, Spacing, TokenTree};
-+use std::fmt::{self, Debug, Display};
-+use std::iter::FromIterator;
- use std::ops::RangeBounds;
--use std::panic::{self, PanicInfo};
-+use std::panic;
- #[cfg(super_unstable)]
- use std::path::PathBuf;
- use std::str::FromStr;
- 
--use crate::{fallback, Delimiter, Punct, Spacing, TokenTree};
--
- #[derive(Clone)]
--pub enum TokenStream {
-+pub(crate) enum TokenStream {
-     Compiler(DeferredTokenStream),
-     Fallback(fallback::TokenStream),
- }
- 
- // Work around https://github.com/rust-lang/rust/issues/65080.
- // In `impl Extend<TokenTree> for TokenStream` which is used heavily by quote,
- // we hold on to the appended tokens and do proc_macro::TokenStream::extend as
- // late as possible to batch together consecutive uses of the Extend impl.
- #[derive(Clone)]
--pub struct DeferredTokenStream {
-+pub(crate) struct DeferredTokenStream {
-     stream: proc_macro::TokenStream,
-     extra: Vec<proc_macro::TokenTree>,
- }
- 
--pub enum LexError {
-+pub(crate) enum LexError {
-     Compiler(proc_macro::LexError),
-     Fallback(fallback::LexError),
- }
- 
--fn nightly_works() -> bool {
--    use std::sync::atomic::*;
--    use std::sync::Once;
--
--    static WORKS: AtomicUsize = AtomicUsize::new(0);
--    static INIT: Once = Once::new();
--
--    match WORKS.load(Ordering::SeqCst) {
--        1 => return false,
--        2 => return true,
--        _ => {}
--    }
--
--    // Swap in a null panic hook to avoid printing "thread panicked" to stderr,
--    // then use catch_unwind to determine whether the compiler's proc_macro is
--    // working. When proc-macro2 is used from outside of a procedural macro all
--    // of the proc_macro crate's APIs currently panic.
--    //
--    // The Once is to prevent the possibility of this ordering:
--    //
--    //     thread 1 calls take_hook, gets the user's original hook
--    //     thread 1 calls set_hook with the null hook
--    //     thread 2 calls take_hook, thinks null hook is the original hook
--    //     thread 2 calls set_hook with the null hook
--    //     thread 1 calls set_hook with the actual original hook
--    //     thread 2 calls set_hook with what it thinks is the original hook
--    //
--    // in which the user's hook has been lost.
--    //
--    // There is still a race condition where a panic in a different thread can
--    // happen during the interval that the user's original panic hook is
--    // unregistered such that their hook is incorrectly not called. This is
--    // sufficiently unlikely and less bad than printing panic messages to stderr
--    // on correct use of this crate. Maybe there is a libstd feature request
--    // here. For now, if a user needs to guarantee that this failure mode does
--    // not occur, they need to call e.g. `proc_macro2::Span::call_site()` from
--    // the main thread before launching any other threads.
--    INIT.call_once(|| {
--        type PanicHook = dyn Fn(&PanicInfo) + Sync + Send + 'static;
--
--        let null_hook: Box<PanicHook> = Box::new(|_panic_info| { /* ignore */ });
--        let sanity_check = &*null_hook as *const PanicHook;
--        let original_hook = panic::take_hook();
--        panic::set_hook(null_hook);
--
--        let works = panic::catch_unwind(|| proc_macro::Span::call_site()).is_ok();
--        WORKS.store(works as usize + 1, Ordering::SeqCst);
--
--        let hopefully_null_hook = panic::take_hook();
--        panic::set_hook(original_hook);
--        if sanity_check != &*hopefully_null_hook {
--            panic!("observed race condition in proc_macro2::nightly_works");
--        }
--    });
--    nightly_works()
--}
--
- fn mismatch() -> ! {
-     panic!("stable/nightly mismatch")
- }
- 
- impl DeferredTokenStream {
-     fn new(stream: proc_macro::TokenStream) -> Self {
-         DeferredTokenStream {
-             stream,
-@@ -98,28 +41,33 @@ impl DeferredTokenStream {
-         }
-     }
- 
-     fn is_empty(&self) -> bool {
-         self.stream.is_empty() && self.extra.is_empty()
-     }
- 
-     fn evaluate_now(&mut self) {
--        self.stream.extend(self.extra.drain(..));
-+        // If-check provides a fast short circuit for the common case of `extra`
-+        // being empty, which saves a round trip over the proc macro bridge.
-+        // Improves macro expansion time in winrt by 6% in debug mode.
-+        if !self.extra.is_empty() {
-+            self.stream.extend(self.extra.drain(..));
-+        }
-     }
- 
-     fn into_token_stream(mut self) -> proc_macro::TokenStream {
-         self.evaluate_now();
-         self.stream
-     }
- }
- 
- impl TokenStream {
-     pub fn new() -> TokenStream {
--        if nightly_works() {
-+        if inside_proc_macro() {
-             TokenStream::Compiler(DeferredTokenStream::new(proc_macro::TokenStream::new()))
-         } else {
-             TokenStream::Fallback(fallback::TokenStream::new())
-         }
-     }
- 
-     pub fn is_empty(&self) -> bool {
-         match self {
-@@ -142,31 +90,37 @@ impl TokenStream {
-         }
-     }
- }
- 
- impl FromStr for TokenStream {
-     type Err = LexError;
- 
-     fn from_str(src: &str) -> Result<TokenStream, LexError> {
--        if nightly_works() {
-+        if inside_proc_macro() {
-             Ok(TokenStream::Compiler(DeferredTokenStream::new(
--                src.parse()?,
-+                proc_macro_parse(src)?,
-             )))
-         } else {
-             Ok(TokenStream::Fallback(src.parse()?))
-         }
-     }
- }
- 
--impl fmt::Display for TokenStream {
-+// Work around https://github.com/rust-lang/rust/issues/58736.
-+fn proc_macro_parse(src: &str) -> Result<proc_macro::TokenStream, LexError> {
-+    panic::catch_unwind(|| src.parse().map_err(LexError::Compiler))
-+        .unwrap_or(Err(LexError::Fallback(fallback::LexError)))
-+}
-+
-+impl Display for TokenStream {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         match self {
--            TokenStream::Compiler(tts) => tts.clone().into_token_stream().fmt(f),
--            TokenStream::Fallback(tts) => tts.fmt(f),
-+            TokenStream::Compiler(tts) => Display::fmt(&tts.clone().into_token_stream(), f),
-+            TokenStream::Fallback(tts) => Display::fmt(tts, f),
-         }
-     }
- }
- 
- impl From<proc_macro::TokenStream> for TokenStream {
-     fn from(inner: proc_macro::TokenStream) -> TokenStream {
-         TokenStream::Compiler(DeferredTokenStream::new(inner))
-     }
-@@ -182,17 +136,17 @@ impl From<TokenStream> for proc_macro::T
- }
- 
- impl From<fallback::TokenStream> for TokenStream {
-     fn from(inner: fallback::TokenStream) -> TokenStream {
-         TokenStream::Fallback(inner)
-     }
- }
- 
--// Assumes nightly_works().
-+// Assumes inside_proc_macro().
- fn into_compiler_token(token: TokenTree) -> proc_macro::TokenTree {
-     match token {
-         TokenTree::Group(tt) => tt.inner.unwrap_nightly().into(),
-         TokenTree::Punct(tt) => {
-             let spacing = match tt.spacing() {
-                 Spacing::Joint => proc_macro::Spacing::Joint,
-                 Spacing::Alone => proc_macro::Spacing::Alone,
-             };
-@@ -202,37 +156,37 @@ fn into_compiler_token(token: TokenTree)
-         }
-         TokenTree::Ident(tt) => tt.inner.unwrap_nightly().into(),
-         TokenTree::Literal(tt) => tt.inner.unwrap_nightly().into(),
-     }
- }
- 
- impl From<TokenTree> for TokenStream {
-     fn from(token: TokenTree) -> TokenStream {
--        if nightly_works() {
-+        if inside_proc_macro() {
-             TokenStream::Compiler(DeferredTokenStream::new(into_compiler_token(token).into()))
-         } else {
-             TokenStream::Fallback(token.into())
-         }
-     }
- }
- 
--impl iter::FromIterator<TokenTree> for TokenStream {
-+impl FromIterator<TokenTree> for TokenStream {
-     fn from_iter<I: IntoIterator<Item = TokenTree>>(trees: I) -> Self {
--        if nightly_works() {
-+        if inside_proc_macro() {
-             TokenStream::Compiler(DeferredTokenStream::new(
-                 trees.into_iter().map(into_compiler_token).collect(),
-             ))
-         } else {
-             TokenStream::Fallback(trees.into_iter().collect())
-         }
-     }
- }
- 
--impl iter::FromIterator<TokenStream> for TokenStream {
-+impl FromIterator<TokenStream> for TokenStream {
-     fn from_iter<I: IntoIterator<Item = TokenStream>>(streams: I) -> Self {
-         let mut streams = streams.into_iter();
-         match streams.next() {
-             Some(TokenStream::Compiler(mut first)) => {
-                 first.evaluate_now();
-                 first.stream.extend(streams.map(|s| match s {
-                     TokenStream::Compiler(s) => s.into_token_stream(),
-                     TokenStream::Fallback(_) => mismatch(),
-@@ -247,75 +201,76 @@ impl iter::FromIterator<TokenStream> for
-                 TokenStream::Fallback(first)
-             }
-             None => TokenStream::new(),
-         }
-     }
- }
- 
- impl Extend<TokenTree> for TokenStream {
--    fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, streams: I) {
-+    fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, stream: I) {
-         match self {
-             TokenStream::Compiler(tts) => {
-                 // Here is the reason for DeferredTokenStream.
--                tts.extra
--                    .extend(streams.into_iter().map(into_compiler_token));
-+                for token in stream {
-+                    tts.extra.push(into_compiler_token(token));
-+                }
-             }
--            TokenStream::Fallback(tts) => tts.extend(streams),
-+            TokenStream::Fallback(tts) => tts.extend(stream),
-         }
-     }
- }
- 
- impl Extend<TokenStream> for TokenStream {
-     fn extend<I: IntoIterator<Item = TokenStream>>(&mut self, streams: I) {
-         match self {
-             TokenStream::Compiler(tts) => {
-                 tts.evaluate_now();
-                 tts.stream
--                    .extend(streams.into_iter().map(|stream| stream.unwrap_nightly()));
-+                    .extend(streams.into_iter().map(TokenStream::unwrap_nightly));
-             }
-             TokenStream::Fallback(tts) => {
--                tts.extend(streams.into_iter().map(|stream| stream.unwrap_stable()));
-+                tts.extend(streams.into_iter().map(TokenStream::unwrap_stable));
-             }
-         }
-     }
- }
- 
--impl fmt::Debug for TokenStream {
-+impl Debug for TokenStream {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         match self {
--            TokenStream::Compiler(tts) => tts.clone().into_token_stream().fmt(f),
--            TokenStream::Fallback(tts) => tts.fmt(f),
-+            TokenStream::Compiler(tts) => Debug::fmt(&tts.clone().into_token_stream(), f),
-+            TokenStream::Fallback(tts) => Debug::fmt(tts, f),
-         }
-     }
- }
- 
- impl From<proc_macro::LexError> for LexError {
-     fn from(e: proc_macro::LexError) -> LexError {
-         LexError::Compiler(e)
-     }
- }
- 
- impl From<fallback::LexError> for LexError {
-     fn from(e: fallback::LexError) -> LexError {
-         LexError::Fallback(e)
-     }
- }
- 
--impl fmt::Debug for LexError {
-+impl Debug for LexError {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         match self {
--            LexError::Compiler(e) => e.fmt(f),
--            LexError::Fallback(e) => e.fmt(f),
-+            LexError::Compiler(e) => Debug::fmt(e, f),
-+            LexError::Fallback(e) => Debug::fmt(e, f),
-         }
-     }
- }
- 
- #[derive(Clone)]
--pub enum TokenTreeIter {
-+pub(crate) enum TokenTreeIter {
-     Compiler(proc_macro::token_stream::IntoIter),
-     Fallback(fallback::TokenTreeIter),
- }
- 
- impl IntoIterator for TokenStream {
-     type Item = TokenTree;
-     type IntoIter = TokenTreeIter;
- 
-@@ -356,25 +311,25 @@ impl Iterator for TokenTreeIter {
-     fn size_hint(&self) -> (usize, Option<usize>) {
-         match self {
-             TokenTreeIter::Compiler(tts) => tts.size_hint(),
-             TokenTreeIter::Fallback(tts) => tts.size_hint(),
-         }
-     }
- }
- 
--impl fmt::Debug for TokenTreeIter {
-+impl Debug for TokenTreeIter {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         f.debug_struct("TokenTreeIter").finish()
-     }
- }
- 
- #[derive(Clone, PartialEq, Eq)]
- #[cfg(super_unstable)]
--pub enum SourceFile {
-+pub(crate) enum SourceFile {
-     Compiler(proc_macro::SourceFile),
-     Fallback(fallback::SourceFile),
- }
- 
- #[cfg(super_unstable)]
- impl SourceFile {
-     fn nightly(sf: proc_macro::SourceFile) -> Self {
-         SourceFile::Compiler(sf)
-@@ -392,68 +347,87 @@ impl SourceFile {
-         match self {
-             SourceFile::Compiler(a) => a.is_real(),
-             SourceFile::Fallback(a) => a.is_real(),
-         }
-     }
- }
- 
- #[cfg(super_unstable)]
--impl fmt::Debug for SourceFile {
-+impl Debug for SourceFile {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         match self {
--            SourceFile::Compiler(a) => a.fmt(f),
--            SourceFile::Fallback(a) => a.fmt(f),
-+            SourceFile::Compiler(a) => Debug::fmt(a, f),
-+            SourceFile::Fallback(a) => Debug::fmt(a, f),
-         }
-     }
- }
- 
- #[cfg(any(super_unstable, feature = "span-locations"))]
--pub struct LineColumn {
-+pub(crate) struct LineColumn {
-     pub line: usize,
-     pub column: usize,
- }
- 
- #[derive(Copy, Clone)]
--pub enum Span {
-+pub(crate) enum Span {
-     Compiler(proc_macro::Span),
-     Fallback(fallback::Span),
- }
- 
- impl Span {
-     pub fn call_site() -> Span {
--        if nightly_works() {
-+        if inside_proc_macro() {
-             Span::Compiler(proc_macro::Span::call_site())
-         } else {
-             Span::Fallback(fallback::Span::call_site())
-         }
-     }
- 
-+    #[cfg(hygiene)]
-+    pub fn mixed_site() -> Span {
-+        if inside_proc_macro() {
-+            Span::Compiler(proc_macro::Span::mixed_site())
-+        } else {
-+            Span::Fallback(fallback::Span::mixed_site())
-+        }
-+    }
-+
-     #[cfg(super_unstable)]
-     pub fn def_site() -> Span {
--        if nightly_works() {
-+        if inside_proc_macro() {
-             Span::Compiler(proc_macro::Span::def_site())
-         } else {
-             Span::Fallback(fallback::Span::def_site())
-         }
-     }
- 
--    #[cfg(super_unstable)]
-     pub fn resolved_at(&self, other: Span) -> Span {
-         match (self, other) {
-+            #[cfg(hygiene)]
-             (Span::Compiler(a), Span::Compiler(b)) => Span::Compiler(a.resolved_at(b)),
-+
-+            // Name resolution affects semantics, but location is only cosmetic
-+            #[cfg(not(hygiene))]
-+            (Span::Compiler(_), Span::Compiler(_)) => other,
-+
-             (Span::Fallback(a), Span::Fallback(b)) => Span::Fallback(a.resolved_at(b)),
-             _ => mismatch(),
-         }
-     }
- 
--    #[cfg(super_unstable)]
-     pub fn located_at(&self, other: Span) -> Span {
-         match (self, other) {
-+            #[cfg(hygiene)]
-             (Span::Compiler(a), Span::Compiler(b)) => Span::Compiler(a.located_at(b)),
-+
-+            // Name resolution affects semantics, but location is only cosmetic
-+            #[cfg(not(hygiene))]
-+            (Span::Compiler(_), Span::Compiler(_)) => *self,
-+
-             (Span::Fallback(a), Span::Fallback(b)) => Span::Fallback(a.located_at(b)),
-             _ => mismatch(),
-         }
-     }
- 
-     pub fn unwrap(self) -> proc_macro::Span {
-         match self {
-             Span::Compiler(s) => s,
-@@ -537,36 +511,36 @@ impl From<proc_macro::Span> for crate::S
- }
- 
- impl From<fallback::Span> for Span {
-     fn from(inner: fallback::Span) -> Span {
-         Span::Fallback(inner)
-     }
- }
- 
--impl fmt::Debug for Span {
-+impl Debug for Span {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         match self {
--            Span::Compiler(s) => s.fmt(f),
--            Span::Fallback(s) => s.fmt(f),
-+            Span::Compiler(s) => Debug::fmt(s, f),
-+            Span::Fallback(s) => Debug::fmt(s, f),
-         }
-     }
- }
- 
--pub fn debug_span_field_if_nontrivial(debug: &mut fmt::DebugStruct, span: Span) {
-+pub(crate) fn debug_span_field_if_nontrivial(debug: &mut fmt::DebugStruct, span: Span) {
-     match span {
-         Span::Compiler(s) => {
-             debug.field("span", &s);
-         }
-         Span::Fallback(s) => fallback::debug_span_field_if_nontrivial(debug, s),
-     }
- }
- 
- #[derive(Clone)]
--pub enum Group {
-+pub(crate) enum Group {
-     Compiler(proc_macro::Group),
-     Fallback(fallback::Group),
- }
- 
- impl Group {
-     pub fn new(delimiter: Delimiter, stream: TokenStream) -> Group {
-         match stream {
-             TokenStream::Compiler(tts) => {
-@@ -647,36 +621,36 @@ impl Group {
- }
- 
- impl From<fallback::Group> for Group {
-     fn from(g: fallback::Group) -> Self {
-         Group::Fallback(g)
-     }
- }
- 
--impl fmt::Display for Group {
-+impl Display for Group {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-         match self {
--            Group::Compiler(group) => group.fmt(formatter),
--            Group::Fallback(group) => group.fmt(formatter),
-+            Group::Compiler(group) => Display::fmt(group, formatter),
-+            Group::Fallback(group) => Display::fmt(group, formatter),
-         }
-     }
- }
- 
--impl fmt::Debug for Group {
-+impl Debug for Group {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-         match self {
--            Group::Compiler(group) => group.fmt(formatter),
--            Group::Fallback(group) => group.fmt(formatter),
-+            Group::Compiler(group) => Debug::fmt(group, formatter),
-+            Group::Fallback(group) => Debug::fmt(group, formatter),
-         }
-     }
- }
- 
- #[derive(Clone)]
--pub enum Ident {
-+pub(crate) enum Ident {
-     Compiler(proc_macro::Ident),
-     Fallback(fallback::Ident),
- }
- 
- impl Ident {
-     pub fn new(string: &str, span: Span) -> Ident {
-         match span {
-             Span::Compiler(s) => Ident::Compiler(proc_macro::Ident::new(string, s)),
-@@ -742,56 +716,56 @@ where
-         let other = other.as_ref();
-         match self {
-             Ident::Compiler(t) => t.to_string() == other,
-             Ident::Fallback(t) => t == other,
-         }
-     }
- }
- 
--impl fmt::Display for Ident {
-+impl Display for Ident {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         match self {
--            Ident::Compiler(t) => t.fmt(f),
--            Ident::Fallback(t) => t.fmt(f),
-+            Ident::Compiler(t) => Display::fmt(t, f),
-+            Ident::Fallback(t) => Display::fmt(t, f),
-         }
-     }
- }
- 
--impl fmt::Debug for Ident {
-+impl Debug for Ident {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         match self {
--            Ident::Compiler(t) => t.fmt(f),
--            Ident::Fallback(t) => t.fmt(f),
-+            Ident::Compiler(t) => Debug::fmt(t, f),
-+            Ident::Fallback(t) => Debug::fmt(t, f),
-         }
-     }
- }
- 
- #[derive(Clone)]
--pub enum Literal {
-+pub(crate) enum Literal {
-     Compiler(proc_macro::Literal),
-     Fallback(fallback::Literal),
- }
- 
- macro_rules! suffixed_numbers {
-     ($($name:ident => $kind:ident,)*) => ($(
-         pub fn $name(n: $kind) -> Literal {
--            if nightly_works() {
-+            if inside_proc_macro() {
-                 Literal::Compiler(proc_macro::Literal::$name(n))
-             } else {
-                 Literal::Fallback(fallback::Literal::$name(n))
-             }
-         }
-     )*)
- }
- 
- macro_rules! unsuffixed_integers {
-     ($($name:ident => $kind:ident,)*) => ($(
-         pub fn $name(n: $kind) -> Literal {
--            if nightly_works() {
-+            if inside_proc_macro() {
-                 Literal::Compiler(proc_macro::Literal::$name(n))
-             } else {
-                 Literal::Fallback(fallback::Literal::$name(n))
-             }
-         }
-     )*)
- }
- 
-@@ -825,49 +799,49 @@ impl Literal {
-         i16_unsuffixed => i16,
-         i32_unsuffixed => i32,
-         i64_unsuffixed => i64,
-         i128_unsuffixed => i128,
-         isize_unsuffixed => isize,
-     }
- 
-     pub fn f32_unsuffixed(f: f32) -> Literal {
--        if nightly_works() {
-+        if inside_proc_macro() {
-             Literal::Compiler(proc_macro::Literal::f32_unsuffixed(f))
-         } else {
-             Literal::Fallback(fallback::Literal::f32_unsuffixed(f))
-         }
-     }
- 
-     pub fn f64_unsuffixed(f: f64) -> Literal {
--        if nightly_works() {
-+        if inside_proc_macro() {
-             Literal::Compiler(proc_macro::Literal::f64_unsuffixed(f))
-         } else {
-             Literal::Fallback(fallback::Literal::f64_unsuffixed(f))
-         }
-     }
- 
-     pub fn string(t: &str) -> Literal {
--        if nightly_works() {
-+        if inside_proc_macro() {
-             Literal::Compiler(proc_macro::Literal::string(t))
-         } else {
-             Literal::Fallback(fallback::Literal::string(t))
-         }
-     }
- 
-     pub fn character(t: char) -> Literal {
--        if nightly_works() {
-+        if inside_proc_macro() {
-             Literal::Compiler(proc_macro::Literal::character(t))
-         } else {
-             Literal::Fallback(fallback::Literal::character(t))
-         }
-     }
- 
-     pub fn byte_string(bytes: &[u8]) -> Literal {
--        if nightly_works() {
-+        if inside_proc_macro() {
-             Literal::Compiler(proc_macro::Literal::byte_string(bytes))
-         } else {
-             Literal::Fallback(fallback::Literal::byte_string(bytes))
-         }
-     }
- 
-     pub fn span(&self) -> Span {
-         match self {
-@@ -903,25 +877,25 @@ impl Literal {
- }
- 
- impl From<fallback::Literal> for Literal {
-     fn from(s: fallback::Literal) -> Literal {
-         Literal::Fallback(s)
-     }
- }
- 
--impl fmt::Display for Literal {
-+impl Display for Literal {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         match self {
--            Literal::Compiler(t) => t.fmt(f),
--            Literal::Fallback(t) => t.fmt(f),
-+            Literal::Compiler(t) => Display::fmt(t, f),
-+            Literal::Fallback(t) => Display::fmt(t, f),
-         }
-     }
- }
- 
--impl fmt::Debug for Literal {
-+impl Debug for Literal {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         match self {
--            Literal::Compiler(t) => t.fmt(f),
--            Literal::Fallback(t) => t.fmt(f),
-+            Literal::Compiler(t) => Debug::fmt(t, f),
-+            Literal::Fallback(t) => Debug::fmt(t, f),
-         }
-     }
- }
-diff --git a/third_party/rust/proc-macro2/tests/comments.rs b/third_party/rust/proc-macro2/tests/comments.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/proc-macro2/tests/comments.rs
-@@ -0,0 +1,103 @@
-+use proc_macro2::{Delimiter, Literal, Spacing, TokenStream, TokenTree};
-+
-+// #[doc = "..."] -> "..."
-+fn lit_of_outer_doc_comment(tokens: TokenStream) -> Literal {
-+    lit_of_doc_comment(tokens, false)
-+}
-+
-+// #![doc = "..."] -> "..."
-+fn lit_of_inner_doc_comment(tokens: TokenStream) -> Literal {
-+    lit_of_doc_comment(tokens, true)
-+}
-+
-+fn lit_of_doc_comment(tokens: TokenStream, inner: bool) -> Literal {
-+    let mut iter = tokens.clone().into_iter();
-+    match iter.next().unwrap() {
-+        TokenTree::Punct(punct) => {
-+            assert_eq!(punct.as_char(), '#');
-+            assert_eq!(punct.spacing(), Spacing::Alone);
-+        }
-+        _ => panic!("wrong token {:?}", tokens),
-+    }
-+    if inner {
-+        match iter.next().unwrap() {
-+            TokenTree::Punct(punct) => {
-+                assert_eq!(punct.as_char(), '!');
-+                assert_eq!(punct.spacing(), Spacing::Alone);
-+            }
-+            _ => panic!("wrong token {:?}", tokens),
-+        }
-+    }
-+    iter = match iter.next().unwrap() {
-+        TokenTree::Group(group) => {
-+            assert_eq!(group.delimiter(), Delimiter::Bracket);
-+            assert!(iter.next().is_none(), "unexpected token {:?}", tokens);
-+            group.stream().into_iter()
-+        }
-+        _ => panic!("wrong token {:?}", tokens),
-+    };
-+    match iter.next().unwrap() {
-+        TokenTree::Ident(ident) => assert_eq!(ident.to_string(), "doc"),
-+        _ => panic!("wrong token {:?}", tokens),
-+    }
-+    match iter.next().unwrap() {
-+        TokenTree::Punct(punct) => {
-+            assert_eq!(punct.as_char(), '=');
-+            assert_eq!(punct.spacing(), Spacing::Alone);
-+        }
-+        _ => panic!("wrong token {:?}", tokens),
-+    }
-+    match iter.next().unwrap() {
-+        TokenTree::Literal(literal) => {
-+            assert!(iter.next().is_none(), "unexpected token {:?}", tokens);
-+            literal
-+        }
-+        _ => panic!("wrong token {:?}", tokens),
-+    }
-+}
-+
-+#[test]
-+fn closed_immediately() {
-+    let stream = "/**/".parse::<TokenStream>().unwrap();
-+    let tokens = stream.into_iter().collect::<Vec<_>>();
-+    assert!(tokens.is_empty(), "not empty -- {:?}", tokens);
-+}
-+
-+#[test]
-+fn incomplete() {
-+    assert!("/*/".parse::<TokenStream>().is_err());
-+}
-+
-+#[test]
-+fn lit() {
-+    let stream = "/// doc".parse::<TokenStream>().unwrap();
-+    let lit = lit_of_outer_doc_comment(stream);
-+    assert_eq!(lit.to_string(), "\" doc\"");
-+
-+    let stream = "//! doc".parse::<TokenStream>().unwrap();
-+    let lit = lit_of_inner_doc_comment(stream);
-+    assert_eq!(lit.to_string(), "\" doc\"");
-+
-+    let stream = "/** doc */".parse::<TokenStream>().unwrap();
-+    let lit = lit_of_outer_doc_comment(stream);
-+    assert_eq!(lit.to_string(), "\" doc \"");
-+
-+    let stream = "/*! doc */".parse::<TokenStream>().unwrap();
-+    let lit = lit_of_inner_doc_comment(stream);
-+    assert_eq!(lit.to_string(), "\" doc \"");
-+}
-+
-+#[test]
-+fn carriage_return() {
-+    let stream = "///\r\n".parse::<TokenStream>().unwrap();
-+    let lit = lit_of_outer_doc_comment(stream);
-+    assert_eq!(lit.to_string(), "\"\"");
-+
-+    let stream = "/**\r\n*/".parse::<TokenStream>().unwrap();
-+    let lit = lit_of_outer_doc_comment(stream);
-+    assert_eq!(lit.to_string(), "\"\\r\\n\"");
-+
-+    "///\r".parse::<TokenStream>().unwrap_err();
-+    "///\r \n".parse::<TokenStream>().unwrap_err();
-+    "/**\r \n*/".parse::<TokenStream>().unwrap_err();
-+}
-diff --git a/third_party/rust/proc-macro2/tests/test.rs b/third_party/rust/proc-macro2/tests/test.rs
---- a/third_party/rust/proc-macro2/tests/test.rs
-+++ b/third_party/rust/proc-macro2/tests/test.rs
-@@ -1,12 +1,11 @@
-+use proc_macro2::{Ident, Literal, Spacing, Span, TokenStream, TokenTree};
- use std::str::{self, FromStr};
- 
--use proc_macro2::{Ident, Literal, Spacing, Span, TokenStream, TokenTree};
--
- #[test]
- fn idents() {
-     assert_eq!(
-         Ident::new("String", Span::call_site()).to_string(),
-         "String"
-     );
-     assert_eq!(Ident::new("fn", Span::call_site()).to_string(), "fn");
-     assert_eq!(Ident::new("_", Span::call_site()).to_string(), "_");
-@@ -105,16 +104,43 @@ fn literal_suffix() {
-     assert_eq!(token_count("999u256"), 1);
-     assert_eq!(token_count("999r#u256"), 3);
-     assert_eq!(token_count("1."), 1);
-     assert_eq!(token_count("1.f32"), 3);
-     assert_eq!(token_count("1.0_0"), 1);
-     assert_eq!(token_count("1._0"), 3);
-     assert_eq!(token_count("1._m"), 3);
-     assert_eq!(token_count("\"\"s"), 1);
-+    assert_eq!(token_count("r\"\"r"), 1);
-+    assert_eq!(token_count("b\"\"b"), 1);
-+    assert_eq!(token_count("br\"\"br"), 1);
-+    assert_eq!(token_count("r#\"\"#r"), 1);
-+    assert_eq!(token_count("'c'c"), 1);
-+    assert_eq!(token_count("b'b'b"), 1);
-+}
-+
-+#[test]
-+fn literal_iter_negative() {
-+    let negative_literal = Literal::i32_suffixed(-3);
-+    let tokens = TokenStream::from(TokenTree::Literal(negative_literal));
-+    let mut iter = tokens.into_iter();
-+    match iter.next().unwrap() {
-+        TokenTree::Punct(punct) => {
-+            assert_eq!(punct.as_char(), '-');
-+            assert_eq!(punct.spacing(), Spacing::Alone);
-+        }
-+        unexpected => panic!("unexpected token {:?}", unexpected),
-+    }
-+    match iter.next().unwrap() {
-+        TokenTree::Literal(literal) => {
-+            assert_eq!(literal.to_string(), "3i32");
-+        }
-+        unexpected => panic!("unexpected token {:?}", unexpected),
-+    }
-+    assert!(iter.next().is_none());
- }
- 
- #[test]
- fn roundtrip() {
-     fn roundtrip(p: &str) {
-         println!("parse: {}", p);
-         let s = p.parse::<TokenStream>().unwrap().to_string();
-         println!("first: {}", s);
-@@ -161,46 +187,16 @@ fn fail() {
-     fail("' static");
-     fail("r#1");
-     fail("r#_");
- }
- 
- #[cfg(span_locations)]
- #[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
- }",
-         &[
-@@ -269,59 +265,17 @@ fn span_join() {
-         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::Punct(ref tt) => assert_eq!(tt.as_char(), '#'),
--        _ => 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::Ident(ref tt) => assert_eq!(tt.to_string(), "doc"),
--        t => panic!("wrong token {:?}", t),
--    }
--    match tokens.next().unwrap() {
--        proc_macro2::TokenTree::Punct(ref tt) => assert_eq!(tt.as_char(), '='),
--        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);
-+    assert!(s.parse::<TokenStream>().is_err());
- }
- 
- #[test]
- fn op_before_comment() {
-     let mut tts = TokenStream::from_str("~// comment").unwrap().into_iter();
-     match tts.next().unwrap() {
-         TokenTree::Punct(tt) => {
-             assert_eq!(tt.as_char(), '~');
-@@ -340,30 +294,30 @@ fn raw_identifier() {
-     }
-     assert!(tts.next().is_none());
- }
- 
- #[test]
- fn test_debug_ident() {
-     let ident = Ident::new("proc_macro", Span::call_site());
- 
--    #[cfg(not(procmacro2_semver_exempt))]
-+    #[cfg(not(span_locations))]
-     let expected = "Ident(proc_macro)";
- 
--    #[cfg(procmacro2_semver_exempt)]
--    let expected = "Ident { sym: proc_macro, span: bytes(0..0) }";
-+    #[cfg(span_locations)]
-+    let expected = "Ident { sym: proc_macro }";
- 
-     assert_eq!(expected, format!("{:?}", ident));
- }
- 
- #[test]
- fn test_debug_tokenstream() {
-     let tts = TokenStream::from_str("[a + 1]").unwrap();
- 
--    #[cfg(not(procmacro2_semver_exempt))]
-+    #[cfg(not(span_locations))]
-     let expected = "\
- TokenStream [
-     Group {
-         delimiter: Bracket,
-         stream: TokenStream [
-             Ident {
-                 sym: a,
-             },
-@@ -374,17 +328,17 @@ TokenStream [
-             Literal {
-                 lit: 1,
-             },
-         ],
-     },
- ]\
-     ";
- 
--    #[cfg(not(procmacro2_semver_exempt))]
-+    #[cfg(not(span_locations))]
-     let expected_before_trailing_commas = "\
- TokenStream [
-     Group {
-         delimiter: Bracket,
-         stream: TokenStream [
-             Ident {
-                 sym: a
-             },
-@@ -395,17 +349,17 @@ TokenStream [
-             Literal {
-                 lit: 1
-             }
-         ]
-     }
- ]\
-     ";
- 
--    #[cfg(procmacro2_semver_exempt)]
-+    #[cfg(span_locations)]
-     let expected = "\
- TokenStream [
-     Group {
-         delimiter: Bracket,
-         stream: TokenStream [
-             Ident {
-                 sym: a,
-                 span: bytes(2..3),
-@@ -420,17 +374,17 @@ TokenStream [
-                 span: bytes(6..7),
-             },
-         ],
-         span: bytes(1..8),
-     },
- ]\
-     ";
- 
--    #[cfg(procmacro2_semver_exempt)]
-+    #[cfg(span_locations)]
-     let expected_before_trailing_commas = "\
- TokenStream [
-     Group {
-         delimiter: Bracket,
-         stream: TokenStream [
-             Ident {
-                 sym: a,
-                 span: bytes(2..3)
-@@ -459,8 +413,85 @@ TokenStream [
- }
- 
- #[test]
- fn default_tokenstream_is_empty() {
-     let default_token_stream: TokenStream = Default::default();
- 
-     assert!(default_token_stream.is_empty());
- }
-+
-+#[test]
-+fn tuple_indexing() {
-+    // This behavior may change depending on https://github.com/rust-lang/rust/pull/71322
-+    let mut tokens = "tuple.0.0".parse::<TokenStream>().unwrap().into_iter();
-+    assert_eq!("tuple", tokens.next().unwrap().to_string());
-+    assert_eq!(".", tokens.next().unwrap().to_string());
-+    assert_eq!("0.0", tokens.next().unwrap().to_string());
-+    assert!(tokens.next().is_none());
-+}
-+
-+#[cfg(span_locations)]
-+#[test]
-+fn non_ascii_tokens() {
-+    check_spans("// abc", &[]);
-+    check_spans("// ábc", &[]);
-+    check_spans("// abc x", &[]);
-+    check_spans("// ábc x", &[]);
-+    check_spans("/* abc */ x", &[(1, 10, 1, 11)]);
-+    check_spans("/* ábc */ x", &[(1, 10, 1, 11)]);
-+    check_spans("/* ab\nc */ x", &[(2, 5, 2, 6)]);
-+    check_spans("/* áb\nc */ x", &[(2, 5, 2, 6)]);
-+    check_spans("/*** abc */ x", &[(1, 12, 1, 13)]);
-+    check_spans("/*** ábc */ x", &[(1, 12, 1, 13)]);
-+    check_spans(r#""abc""#, &[(1, 0, 1, 5)]);
-+    check_spans(r#""ábc""#, &[(1, 0, 1, 5)]);
-+    check_spans(r###"r#"abc"#"###, &[(1, 0, 1, 8)]);
-+    check_spans(r###"r#"ábc"#"###, &[(1, 0, 1, 8)]);
-+    check_spans("r#\"a\nc\"#", &[(1, 0, 2, 3)]);
-+    check_spans("r#\"á\nc\"#", &[(1, 0, 2, 3)]);
-+    check_spans("'a'", &[(1, 0, 1, 3)]);
-+    check_spans("'á'", &[(1, 0, 1, 3)]);
-+    check_spans("//! abc", &[(1, 0, 1, 7), (1, 0, 1, 7), (1, 0, 1, 7)]);
-+    check_spans("//! ábc", &[(1, 0, 1, 7), (1, 0, 1, 7), (1, 0, 1, 7)]);
-+    check_spans("//! abc\n", &[(1, 0, 1, 7), (1, 0, 1, 7), (1, 0, 1, 7)]);
-+    check_spans("//! ábc\n", &[(1, 0, 1, 7), (1, 0, 1, 7), (1, 0, 1, 7)]);
-+    check_spans("/*! abc */", &[(1, 0, 1, 10), (1, 0, 1, 10), (1, 0, 1, 10)]);
-+    check_spans("/*! ábc */", &[(1, 0, 1, 10), (1, 0, 1, 10), (1, 0, 1, 10)]);
-+    check_spans("/*! a\nc */", &[(1, 0, 2, 4), (1, 0, 2, 4), (1, 0, 2, 4)]);
-+    check_spans("/*! á\nc */", &[(1, 0, 2, 4), (1, 0, 2, 4), (1, 0, 2, 4)]);
-+    check_spans("abc", &[(1, 0, 1, 3)]);
-+    check_spans("ábc", &[(1, 0, 1, 3)]);
-+    check_spans("ábć", &[(1, 0, 1, 3)]);
-+    check_spans("abc// foo", &[(1, 0, 1, 3)]);
-+    check_spans("ábc// foo", &[(1, 0, 1, 3)]);
-+    check_spans("ábć// foo", &[(1, 0, 1, 3)]);
-+    check_spans("b\"a\\\n c\"", &[(1, 0, 2, 3)]);
-+    check_spans("b\"a\\\n\u{00a0}c\"", &[(1, 0, 2, 3)]);
-+}
-+
-+#[cfg(span_locations)]
-+fn check_spans(p: &str, mut lines: &[(usize, usize, usize, usize)]) {
-+    let ts = p.parse::<TokenStream>().unwrap();
-+    check_spans_internal(ts, &mut lines);
-+    assert!(lines.is_empty(), "leftover ranges: {:?}", lines);
-+}
-+
-+#[cfg(span_locations)]
-+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);
-+
-+            if let TokenTree::Group(g) = i {
-+                check_spans_internal(g.stream().clone(), lines);
-+            }
-+        }
-+    }
-+}
-diff --git a/third_party/rust/proc-macro2/tests/test_fmt.rs b/third_party/rust/proc-macro2/tests/test_fmt.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/proc-macro2/tests/test_fmt.rs
-@@ -0,0 +1,26 @@
-+use proc_macro2::{Delimiter, Group, Ident, Span, TokenStream, TokenTree};
-+use std::iter::{self, FromIterator};
-+
-+#[test]
-+fn test_fmt_group() {
-+    let ident = Ident::new("x", Span::call_site());
-+    let inner = TokenStream::from_iter(iter::once(TokenTree::Ident(ident)));
-+    let parens_empty = Group::new(Delimiter::Parenthesis, TokenStream::new());
-+    let parens_nonempty = Group::new(Delimiter::Parenthesis, inner.clone());
-+    let brackets_empty = Group::new(Delimiter::Bracket, TokenStream::new());
-+    let brackets_nonempty = Group::new(Delimiter::Bracket, inner.clone());
-+    let braces_empty = Group::new(Delimiter::Brace, TokenStream::new());
-+    let braces_nonempty = Group::new(Delimiter::Brace, inner.clone());
-+    let none_empty = Group::new(Delimiter::None, TokenStream::new());
-+    let none_nonempty = Group::new(Delimiter::None, inner.clone());
-+
-+    // Matches libproc_macro.
-+    assert_eq!("()", parens_empty.to_string());
-+    assert_eq!("(x)", parens_nonempty.to_string());
-+    assert_eq!("[]", brackets_empty.to_string());
-+    assert_eq!("[x]", brackets_nonempty.to_string());
-+    assert_eq!("{ }", braces_empty.to_string());
-+    assert_eq!("{ x }", braces_nonempty.to_string());
-+    assert_eq!("", none_empty.to_string());
-+    assert_eq!("x", none_nonempty.to_string());
-+}
-diff --git a/third_party/rust/syn/.cargo-checksum.json b/third_party/rust/syn/.cargo-checksum.json
---- a/third_party/rust/syn/.cargo-checksum.json
-+++ b/third_party/rust/syn/.cargo-checksum.json
-@@ -1,1 +1,1 @@
--{"files":{"Cargo.toml":"484d29864d333a361652fa4e24e1dcfab9efa47705ffd8c106d802eb03b78da7","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"ca605417b6db8c995458f8407afaad6c177aedcc2274004283600f5638fa1b0c","benches/file.rs":"b45211cc4a0296a77aac2b4de16dbc6b5cb66adfb5afac00a77bccea87f43968","benches/rust.rs":"9cc0f62e944f1583d05c43a395a1556731501cf5976ef67a081f4f6387f883ba","build.rs":"7423ab199728d55c7d64c44b7c6729cfd93bd8273366a77707353003e27565d7","src/attr.rs":"cf81add298f0e75c35a9980a59bc3c2fd3fe933635830d1591374eeb2487c225","src/await.rs":"18f0b2ecb319991f891e300011424985e3cf33d166ea9f29f22d575fc8c83a76","src/bigint.rs":"efc7f64959980653d73fe4f8bc2a3a2904dc05f45b02c6dc15cd316fa3d7c338","src/buffer.rs":"2a432c11a3da67a21d46c2272bf9ce60a0bb20893b5750027bbd8ca3e843ab35","src/custom_keyword.rs":"589e46ec1be9a04d6de12c0b8cadf87cc1c05606ed46ddea62e9869cbca4a191","src/custom_punctuation.rs":"2ba2e294e15a0fce7ede3686c42b2891797079a724dd1193b66e7d305624c891","src/data.rs":"cc9b250d084e444782d3ff5e63c1ba387cbde8f7f2e977eab9846d920b4b8c3f","src/derive.rs":"c18878f14be5d5ab11fd7dda2d2ff1ff75c9662daf11eed033de62e4d0670a89","src/discouraged.rs":"50e10915695c4d14f64a78e20ecbef90a2cd53a7c26ee3426a2524a8ee5c9cbf","src/error.rs":"2c17a402f83ed5ae4ad96e753216771bef620235c2ff1ccc23f4bbafc7266fe1","src/export.rs":"dcae67456278c0339acfbcbb4737b8d37cfba5a150ae789f31f4be79abf7e726","src/expr.rs":"871d8eeb43cef02ef88de3bea7477b79b4eabc096a0899dde0e5750edf482f49","src/ext.rs":"b97ed549490b9248b5b5df31b3d5b08ba8791e23e6c5d3a1157a0363eb683ff3","src/file.rs":"3cc2bf5c709238d515a557f721f231c8c725b196400de051f945b549299d38a7","src/gen/fold.rs":"10b3ae33d0ce410d6bbe8b93be9d5f9e856c7dc8212133cc46b703f97d548190","src/gen/visit.rs":"e0f5798552d186024696b7bfc7219d4ff53b0e45f735a83e77cbb6b6578c5fa4","src/gen/visit_mut.rs":"9f7dda83907969971dba84d545aaa563b0728e54db97ffab5050fdf43a79c731","src/gen_helper.rs":"ea6c66388365971db6a2fc86cbb208f7eacde77e245bc8623f27a3642a3d7741","src/generics.rs":"d845d7a828863123a5187fd0fe59c9dae3636f63bad302bd035792eed3dcb1ba","src/group.rs":"119b62d8481b4b1c327639bed40e114bf1969765250b68186628247fd4144b3b","src/ident.rs":"503156ce51a7ef0420892e8dbf2ecf8fe51f42a84d52cc2c05654e1a83020cbf","src/item.rs":"213f2f58c65ee1aa222f111bc9b1be681f8fb069caed04ca56586839979318d0","src/keyword.rs":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/lib.rs":"24778e9f15e8025e75aca114c712716ada586b471adb3b3b69278f4d39b8a21b","src/lifetime.rs":"905359708f772ec858954badde69ee016d29e6eeba1dd205b268445b1aff6f3a","src/lit.rs":"5bb0bddb94cbd256e50e92dc091a0baa09f1be40a77058b897507f3b17191e5d","src/lookahead.rs":"5cce8b4cb345a85c24a452ea6d78eadb76f01ca0a789cbf5ce35108334904173","src/mac.rs":"6b468244cc07e3f2f10419f833d9e2ed23edbcd6dc34cf21c5947633699db964","src/macros.rs":"0d8c3bab47539aa2d00bec64e92c901ea2c9c0af74c868051c0905b82650f970","src/op.rs":"93cd44770bb110deadf807a01d9a666efe644b6e3010f4b51cae77ee7438cfbb","src/parse.rs":"5017123c249ebc65866af113a0ad671814b9873f47568180e6539a305eb0317d","src/parse_macro_input.rs":"f799aadb7216c2d333b579f48ed2fedfe07b5e96f004b25b569649ffbaa958d2","src/parse_quote.rs":"81575bf60b18b0d8624d7025a5bcc8dcd6633ad70c454dee2a06e4c391700b6c","src/pat.rs":"db0f2263b9813de1f4e3e3e0396fe0080b1e11c8090c6b4fb6fca3cfbe22bc96","src/path.rs":"32e685ac7fd2d4b9989802de8f326a8d47fa710f86ec3e45fd9d3ff8fdfe97ef","src/print.rs":"da6529c1d9d21aaf6c835f66b4e67eacb7cf91a10eb5e9a2143b49bf99b3b5e1","src/punctuated.rs":"384e7b317b26f24118eb4b0c39e949ee9f4f3e700a4c80e462342c83b2cc3282","src/sealed.rs":"896a495a5340eec898527f18bd4ddca408ea03ea0ee3af30074ff48deace778d","src/span.rs":"748c51c6feb223c26d3b1701f5bb98aee823666c775c98106cfa24fe29d8cec1","src/spanned.rs":"adddb6acae14a0fa340df302b932c31e34b259706ce56fd82ab597ec424500e1","src/stmt.rs":"fbccf2b4da7980fe6ea8d99457d291577c0f225b370c1dd97da41abf2a18fcf7","src/thread.rs":"815eca6bd64f4eef7c447f0809e84108f5428ff50225224b373efd8fbb696874","src/token.rs":"761d8d1793560eb2b631c36ddfdbb14ac65178405f095453aa0e75e8816bdbb9","src/tt.rs":"1e32ae216d14d895ff621bf32bc611f138aa00108b0090be2cbaa0affebe8e2a","src/ty.rs":"ce052e0079b65b66bea4e9502d2ff2c90ad4b867904bf7eb892eb60aa3ef219a","tests/clone.sh":"961243d42540d9992090efbbd5478b7aa395671db64a6c28cdadb6edc610ebdf","tests/common/eq.rs":"a42d339808fd32dd4bfd440c254add8c56d5e2cde3a6bf0c88621b618ce5eaa7","tests/common/mod.rs":"20a3300016351fa210a193fbb0db059ef5125fa7909585ded64790004d4977ed","tests/common/parse.rs":"17ba6d1e74aaa3f8096c6d379d803221f12d95cca69927be047d6ddf8367647f","tests/debug/gen.rs":"57bd5cf585e0b86ad00f29f09ff3db3390c4a756d503514a9b28407500dcea3c","tests/debug/mod.rs":"462d6fe34ee75c3ca1207d4db2ff3bdee5b430b9f9ca632e5671d1588d3f76b3","tests/features/error.rs":"e0581a2869cbd237c2bc18a0a85272296e1577bb5f7317a67fa85e28e04eea6f","tests/features/mod.rs":"66a2605ec54ede29208da350f2bed536dfa763b58408d64d3fca3b13de64b64f","tests/macros/mod.rs":"3f2d758c0ba76b93f54b0c1fc22ad50edff8ef42629ba4d47ac7d7f823da8359","tests/repo/mod.rs":"e851a68972c9194a9a8d7b68538b16ed79ae81cba55e1a2ce210d1b759fb1a21","tests/test_asyncness.rs":"b6c46118b036e6807d24eb0e1779244b4fca23dac0d8031e9843b3edec484ce8","tests/test_attribute.rs":"2d8f18a98c989d3f7adaaeb1aeebd4f8413365ace63feecb37cb3f9db9db4d8f","tests/test_derive_input.rs":"477d80f914c54b526f8ff229788dc0e7798d118f6dcfa348f4c99755edb347b9","tests/test_expr.rs":"f35ca80566849a36e6ba6403d9663519eff37e4224360c468fedff8b561a643e","tests/test_generics.rs":"83a5dc07f5c5701c12625399262f7120b66f01a742523f3eda28da2cf2c87eb3","tests/test_grouping.rs":"aadd75215addd9e5a8fa2f9472117d4cb80f1e8b84e07f4c0845675c9014164f","tests/test_ident.rs":"236c239dd66f543f084f44ff747d7bc3962cf11a019a279777fe972f6e17aa4c","tests/test_iterators.rs":"718938da14778dcba06324d36a99d9317c9d45d81a34c6a44c47e1fa38085e9f","tests/test_lit.rs":"7dff2661a5ac586d6ed2fe27501cb8ff62f4cf3f6c91f596bff6057c67ad7857","tests/test_meta.rs":"8444dee084882243b107dfc8a6aac27f9382f9774162d1ac8ed8ec30d60c048e","tests/test_parse_buffer.rs":"b244bb4bc41ff06d21f239e60a3d663fdec5aa4af33f2a354afef36d34f0aefc","tests/test_pat.rs":"41776b878efae9b8e340f21ffe6296e921cf309f618482efd98609c33e32c28b","tests/test_precedence.rs":"71f3ea52cda8b40166bb7416fb98774e6a653542497b521f8e183e283dcf579d","tests/test_round_trip.rs":"e0de37f45fa223b488d25a41beab185eb92abb7bf765a9f13fe5d870ff31f5f1","tests/test_should_parse.rs":"4da4e25ee2baa7e75135c375042a7f958de136c5698dab03f99ff7a774dcd463","tests/test_size.rs":"970150b9d49ef91ab4c8f8c6a59b83f9a68a02acb779f0280733a5efaec6487a","tests/test_token_trees.rs":"a07ea657bf03b9c667c821b2db2af49b176ca737e3e01217a73cca78b7f11380","tests/zzz_stable.rs":"961d4940a926db4ca523d834b060c62de988e6a8e01c9f5efaa7bb4c86745b47"},"package":"66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"28ddb678a5ccac4423435384c8b7116f804e896eabc5aae9d5c2bc666aaebbb4","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"03f3b53cf858536a0883aa5b5882ee61dcd0f1e71c0930c9106fcfa1d6aad2df","benches/file.rs":"b4724fc7c0f48b8f488e2632a1064f6c0bf16ded3969680fc3f4a2369536269b","benches/rust.rs":"ea6291ef2d2a83d94a3312fe179d48259f8ec0b04c961993ddd181d0a4ab740e","build.rs":"aeca2312f05aec658eaa66980a0ef3d578837db107a55702b39419ea0422eb4a","src/attr.rs":"7d79482634d6544eb4a4825405407b53660d0f5f8b929f7e1671e005b9d92038","src/await.rs":"18f0b2ecb319991f891e300011424985e3cf33d166ea9f29f22d575fc8c83a76","src/bigint.rs":"efc7f64959980653d73fe4f8bc2a3a2904dc05f45b02c6dc15cd316fa3d7c338","src/buffer.rs":"cf2a4b3bdc247b80c85ff5625a1dfb7a5f517fd835f6e1518a7b924990e4c293","src/custom_keyword.rs":"9627467063e41776315a6a14b2aaea3875592d8e0ebd2dc6df1fc2f12c06f146","src/custom_punctuation.rs":"b00e7bee96eb473507527e39db65e74e71592dc06421d2cfe45ed899c17d4847","src/data.rs":"7aec9a745cd53ec95688afa353f6efb9576e7fc0143757b51d28bc3d900b1d2a","src/derive.rs":"fa71866df6e383673dd3329f455a9f953585b83f9739050be3bf1f8c6d526b96","src/discouraged.rs":"a1f3d85e20dedf50b1b7b4571d970a3a6e9b2de4afde7dd0c986fe240df2ba46","src/error.rs":"c3005b50e3132026250c5356d0d391bf96db8087f0f5f744de98e360d8a20a3e","src/export.rs":"dcae67456278c0339acfbcbb4737b8d37cfba5a150ae789f31f4be79abf7e726","src/expr.rs":"54455fd20041996653ca5379b03cdf3c2fc1b3dd2e1149b5bc6b1dd492545d55","src/ext.rs":"870086d9021e6a6fcefa2f00cd91b55c4b74dcee8f0f6a07e76d96fb44707d61","src/file.rs":"75167ebc77e7870122078eabde1b872c337142d4b0962c20cedffcaaa2a5b7c6","src/gen/clone.rs":"0845c1bf8624c3f235cd247b4eb748e7e16b4c240097cb0ff16751f688c079ae","src/gen/debug.rs":"d24fe37f4ce1dd74f2dc54136e893782d3c4d0908323c036c97599551a56960c","src/gen/eq.rs":"1e6ef09b17ca7f36861ef23ce2a6991b231ed5f087f046469b5f23da40f5b419","src/gen/fold.rs":"3f59e59ed8ad2ab5dd347bfbe41bbc785c2aabd8ae902087a584a6daed597182","src/gen/hash.rs":"e5b2a52587173076777233a9e57e2b3c8e0dd6d6f41d16fa7c9fde68b05c2bfc","src/gen/visit.rs":"23008c170d4dd3975232876a0a654921d9b6af57372cb9fcc133ca740588d666","src/gen/visit_mut.rs":"42886c3ee02ded72d9c3eec006e20431eaee0c6b90ddefc1a36ec7bf50c6a24a","src/gen_helper.rs":"ea6c66388365971db6a2fc86cbb208f7eacde77e245bc8623f27a3642a3d7741","src/generics.rs":"d1c175284ca21e777ef0414c28383929b170ccb00aaf7a929eb18d3b05e18da8","src/group.rs":"119b62d8481b4b1c327639bed40e114bf1969765250b68186628247fd4144b3b","src/ident.rs":"503156ce51a7ef0420892e8dbf2ecf8fe51f42a84d52cc2c05654e1a83020cbf","src/item.rs":"c9ad9881e8cda8ee3f157f0c7602fc53d08a7e3288b9afc388c393689eac5aea","src/lib.rs":"558ad13779233b27bebc4b2fc8025eb1c7e57b32130dc1dd911391e27b427500","src/lifetime.rs":"f390fe06692fc51fbf3eb490bb9f795da70e4452f51c5b0df3bbaa899084ddf1","src/lit.rs":"9fab84e38756b092fbb055dcdf01e31d42d916c49e3eaae8c9019043b0ee4301","src/lookahead.rs":"5cce8b4cb345a85c24a452ea6d78eadb76f01ca0a789cbf5ce35108334904173","src/mac.rs":"e5cecea397fd01a44958162781d8d94343fe2a1b9b9754a5666c3d2ab4d7ef64","src/macros.rs":"2ce05b553f14da4ee550bb681cb0733b7186ad94719cd36f96d53e15fd02cf2b","src/op.rs":"449514e146deab0ab020bc6f764544c294dbc780941c9802bf60cf1b2839d550","src/parse.rs":"bde888c98ee259f2a73489a693515ed4875432b0d79486ac83aea19f441992a3","src/parse_macro_input.rs":"653a020f023cac0eccbc1fcc34aa7bf80567b43e5475deab4ad3e487a5363201","src/parse_quote.rs":"642f21e5fa54df4b7c373fb158289ee1005d49e1a49b1d194df5438faee71c46","src/pat.rs":"1473b258162cc822f1ee0c0869f521053ed345a140c39ed83b9b4dfb6f9f2aca","src/path.rs":"f119f0c2af12fabd360eac9a2312e0f6e6c28c633c9671bde6ef0bece7c5ba3c","src/print.rs":"da6529c1d9d21aaf6c835f66b4e67eacb7cf91a10eb5e9a2143b49bf99b3b5e1","src/punctuated.rs":"212f5a601d6c2eb8b8fa679be1167b455b595bee964d2775b0101ebb16c3eaa5","src/reserved.rs":"3625eb2a64589a4992ab79a1674e9679f465bea613ab139a671df5337e88cee6","src/sealed.rs":"896a495a5340eec898527f18bd4ddca408ea03ea0ee3af30074ff48deace778d","src/span.rs":"748c51c6feb223c26d3b1701f5bb98aee823666c775c98106cfa24fe29d8cec1","src/spanned.rs":"7d77714d585e6f42397091ffb3a799fd7b20c05c5442c737683c429ea7d409a5","src/stmt.rs":"3917fbc897f80efe838267833c55650ff8d636cb49a6d1084e28eff65d0e3ccd","src/thread.rs":"815eca6bd64f4eef7c447f0809e84108f5428ff50225224b373efd8fbb696874","src/token.rs":"a1ca6298bf6592cb80cbab1db4eac2fa4e3fa56729bb807bfb0f08ab0f229ca5","src/tt.rs":"1cc9e200624288322f800f32e3d6e2e53da946467bb312dd40a52c02cdcc4730","src/ty.rs":"cb167cbb16240c59a31b44adec175172caaf75ffef9a0bb168584b51bf105795","src/verbatim.rs":"802a97df997432f18cac6e6200ff6ea29fb2474986005e0fcdbc2b65197f87f7","src/whitespace.rs":"e63dd0aa3d34029f17766a8b09c1a6e4479e36c552c8b7023d710a399333aace","tests/.gitignore":"22e782449a3c216db3f7215d5fb8882e316768e40beeec3833aae419ad8941db","tests/common/eq.rs":"4b190a3833bdfd20a4cb1e3dff25a698751dec71d6f30249cf09426e061a4fb1","tests/common/mod.rs":"25ef6d7daa09bad3198a0e9e91b2812425f92db7c585c1e34a03a84d7362ccd8","tests/common/parse.rs":"8b7ba32f4988c30758c108536c4877dc5a039a237bf9b0687220ef2295797bbd","tests/debug/gen.rs":"d6e2abf2a7bb58a7895a60c2f094a98a4f85c9189d02011d0dcef6ef053f26e3","tests/debug/mod.rs":"868763d0ef1609a3ad5e05e9f1bfa0f813e91e7e9a36653414a188bb2fdaa425","tests/macros/mod.rs":"c0eafa4e3845fc08f6efe6021bac37822c0ac325eb7b51194a5f35236f648d92","tests/repo/mod.rs":"9e316b88d57ae213e81950c35e45443078ec90e702798353bc3528cb8a2810b6","tests/repo/progress.rs":"c08d0314a7f3ecf760d471f27da3cd2a500aeb9f1c8331bffb2aa648f9fabf3f","tests/test_asyncness.rs":"cff01db49d28ab23b0b258bc6c0a5cc4071be4fe7248eef344a5d79d2fb649b7","tests/test_attribute.rs":"0ffd99384e1a52ae17d9fed5c4053e411e8f9018decef07ffa621d1faa7329d8","tests/test_derive_input.rs":"610444351e3bf99366976bbf1da109c334a70ac9500caef366bcf9b68819829f","tests/test_expr.rs":"0ee83f6f6de950018c043efcc3e85776b4227dae3068309998a8d9709f2fc66c","tests/test_generics.rs":"9d713f90a79d6145efc89fb6f946029ca03486c632219950889da39940152ba0","tests/test_grouping.rs":"46c27baec4daaaf1e891892f0b0515ea8a44619071c7d0cc9192580916f1569f","tests/test_ident.rs":"9eb53d1e21edf23e7c9e14dc74dcc2b2538e9221e19dbcc0a44e3acc2e90f3f6","tests/test_item.rs":"461ed0c8648afffcea3217f52c9a88298182b4d39d73a11803b1281d99c98c25","tests/test_iterators.rs":"53ed6078d37550bd6765d2411e3660be401aef8a31a407350cc064a7d08c7c33","tests/test_lit.rs":"2a46c5f2f2ad1dcbb7e9b0cd11b55861c5ff818c2c4c51351d07e2daa7c74674","tests/test_meta.rs":"1fc98af3279cadc3d8db3c7e8d4d7f9e9dbd4d17548cf6a2f6f4536ed65367f6","tests/test_parse_buffer.rs":"8bbe2d24ca8a3788f72c6908fc96c26d546f11c69687bf8d72727f851d5e2d27","tests/test_parse_stream.rs":"2f449a2c41a3dee6fd14bee24e1666a453cb808eda17332fd91afd127fcdd2a6","tests/test_pat.rs":"2cb331fe404496d51e7cc7e283ae13c519a2265ca82e1c88e113296f860c2cba","tests/test_path.rs":"fcd5591e639fc787acc9763d828a811c8114525c9341282eefda8f331e082a51","tests/test_precedence.rs":"8d03656741b01e577d7501ce24332d1a4febec3e31a043e47c61062b8c527ed2","tests/test_receiver.rs":"084eca59984b9a18651da52f2c4407355da3de1335916a12477652999e2d01cc","tests/test_round_trip.rs":"ba01bf4ec04cd2d6f9e4800c343563925ae960c5f16752dc0797fda4451b6cc2","tests/test_shebang.rs":"f5772cadad5b56e3112cb16308b779f92bce1c3a48091fc9933deb2276a69331","tests/test_should_parse.rs":"1d3535698a446e2755bfc360676bdb161841a1f454cdef6e7556c6d06a95c89d","tests/test_size.rs":"5fae772bab66809d6708232f35cfb4a287882486763b0f763feec2ad79fbb68b","tests/test_stmt.rs":"17e4355843ee2982b51faba2721a18966f8c2b9422e16b052a123b8ee8b80752","tests/test_token_trees.rs":"43e56a701817e3c3bfd0cae54a457dd7a38ccb3ca19da41e2b995fdf20e6ed18","tests/test_ty.rs":"5b7c0bfc4963d41920dd0b39fdea419e34f00409ba86ad4211d6c3c7e8bbe1c0","tests/test_visibility.rs":"3f958e2b3b5908005e756a80eea326a91eac97cc4ab60599bebde8d4b942d65c","tests/zzz_stable.rs":"2a862e59cb446235ed99aec0e6ada8e16d3ecc30229b29d825b7c0bbc2602989"},"package":"963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"}
-\ No newline at end of file
-diff --git a/third_party/rust/syn/Cargo.toml b/third_party/rust/syn/Cargo.toml
---- a/third_party/rust/syn/Cargo.toml
-+++ b/third_party/rust/syn/Cargo.toml
-@@ -8,79 +8,90 @@
- # 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]
- edition = "2018"
- name = "syn"
--version = "1.0.5"
-+version = "1.0.40"
- authors = ["David Tolnay <dtolnay@gmail.com>"]
- include = ["/benches/**", "/build.rs", "/Cargo.toml", "/LICENSE-APACHE", "/LICENSE-MIT", "/README.md", "/src/**", "/tests/**"]
- description = "Parser for Rust source code"
- documentation = "https://docs.rs/syn"
- readme = "README.md"
- categories = ["development-tools::procedural-macro-helpers"]
- license = "MIT OR Apache-2.0"
- repository = "https://github.com/dtolnay/syn"
- [package.metadata.docs.rs]
- all-features = true
-+targets = ["x86_64-unknown-linux-gnu"]
- 
- [package.metadata.playground]
--all-features = true
--
--[lib]
--name = "syn"
-+features = ["full", "visit", "visit-mut", "fold", "extra-traits"]
- 
- [[bench]]
- name = "rust"
- harness = false
- required-features = ["full", "parsing"]
--edition = "2018"
- 
- [[bench]]
- name = "file"
- required-features = ["full", "parsing"]
--edition = "2018"
- [dependencies.proc-macro2]
--version = "1.0"
-+version = "1.0.13"
- default-features = false
- 
- [dependencies.quote]
- version = "1.0"
- optional = true
- default-features = false
- 
- [dependencies.unicode-xid]
- version = "0.2"
-+[dev-dependencies.anyhow]
-+version = "1.0"
-+
-+[dev-dependencies.flate2]
-+version = "1.0"
-+
- [dev-dependencies.insta]
--version = "0.9"
-+version = "0.16"
- 
- [dev-dependencies.rayon]
- version = "1.0"
- 
- [dev-dependencies.ref-cast]
--version = "0.2"
-+version = "1.0"
- 
- [dev-dependencies.regex]
- version = "1.0"
- 
-+[dev-dependencies.reqwest]
-+version = "0.10"
-+features = ["blocking"]
-+
-+[dev-dependencies.syn-test-suite]
-+version = "0"
-+
-+[dev-dependencies.tar]
-+version = "0.4"
-+
- [dev-dependencies.termcolor]
- 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"]
-+test = ["syn-test-suite/all-features"]
- visit = []
- visit-mut = []
--[badges.travis-ci]
--repository = "dtolnay/syn"
-diff --git a/third_party/rust/syn/README.md b/third_party/rust/syn/README.md
---- a/third_party/rust/syn/README.md
-+++ b/third_party/rust/syn/README.md
-@@ -1,15 +1,15 @@
- 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/1.0/syn/)
--[![Rustc Version 1.31+](https://img.shields.io/badge/rustc-1.31+-lightgray.svg)](https://blog.rust-lang.org/2018/12/06/Rust-1.31-and-rust-2018.html)
-+[<img alt="github" src="https://img.shields.io/badge/github-dtolnay/syn-8da0cb?style=for-the-badge&labelColor=555555&logo=github" height="20">](https://github.com/dtolnay/syn)
-+[<img alt="crates.io" src="https://img.shields.io/crates/v/syn.svg?style=for-the-badge&color=fc8d62&logo=rust" height="20">](https://crates.io/crates/syn)
-+[<img alt="docs.rs" src="https://img.shields.io/badge/docs.rs-syn-66c2a5?style=for-the-badge&labelColor=555555&logoColor=white&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDUxMiA1MTIiPjxwYXRoIGZpbGw9IiNmNWY1ZjUiIGQ9Ik00ODguNiAyNTAuMkwzOTIgMjE0VjEwNS41YzAtMTUtOS4zLTI4LjQtMjMuNC0zMy43bC0xMDAtMzcuNWMtOC4xLTMuMS0xNy4xLTMuMS0yNS4zIDBsLTEwMCAzNy41Yy0xNC4xIDUuMy0yMy40IDE4LjctMjMuNCAzMy43VjIxNGwtOTYuNiAzNi4yQzkuMyAyNTUuNSAwIDI2OC45IDAgMjgzLjlWMzk0YzAgMTMuNiA3LjcgMjYuMSAxOS45IDMyLjJsMTAwIDUwYzEwLjEgNS4xIDIyLjEgNS4xIDMyLjIgMGwxMDMuOS01MiAxMDMuOSA1MmMxMC4xIDUuMSAyMi4xIDUuMSAzMi4yIDBsMTAwLTUwYzEyLjItNi4xIDE5LjktMTguNiAxOS45LTMyLjJWMjgzLjljMC0xNS05LjMtMjguNC0yMy40LTMzLjd6TTM1OCAyMTQuOGwtODUgMzEuOXYtNjguMmw4NS0zN3Y3My4zek0xNTQgMTA0LjFsMTAyLTM4LjIgMTAyIDM4LjJ2LjZsLTEwMiA0MS40LTEwMi00MS40di0uNnptODQgMjkxLjFsLTg1IDQyLjV2LTc5LjFsODUtMzguOHY3NS40em0wLTExMmwtMTAyIDQxLjQtMTAyLTQxLjR2LS42bDEwMi0zOC4yIDEwMiAzOC4ydi42em0yNDAgMTEybC04NSA0Mi41di03OS4xbDg1LTM4Ljh2NzUuNHptMC0xMTJsLTEwMiA0MS40LTEwMi00MS40di0uNmwxMDItMzguMiAxMDIgMzguMnYuNnoiPjwvcGF0aD48L3N2Zz4K" height="20">](https://docs.rs/syn)
-+[<img alt="build status" src="https://img.shields.io/github/workflow/status/dtolnay/syn/CI/master?style=for-the-badge" height="20">](https://github.com/dtolnay/syn/actions?query=branch%3Amaster)
- 
- 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 use in Rust procedural macros, but
- contains some APIs that may be useful more generally.
- 
- - **Data structures** — Syn provides a complete syntax tree that can represent
-@@ -41,20 +41,16 @@ contains some APIs that may be useful mo
- 
- [`syn::File`]: https://docs.rs/syn/1.0/syn/struct.File.html
- [`syn::Item`]: https://docs.rs/syn/1.0/syn/enum.Item.html
- [`syn::Expr`]: https://docs.rs/syn/1.0/syn/enum.Expr.html
- [`syn::Type`]: https://docs.rs/syn/1.0/syn/enum.Type.html
- [`syn::DeriveInput`]: https://docs.rs/syn/1.0/syn/struct.DeriveInput.html
- [parser functions]: https://docs.rs/syn/1.0/syn/parse/index.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 rustc 1.31 and up.*
- 
- [*Release notes*](https://github.com/dtolnay/syn/releases)
- 
- <br>
- 
- ## Resources
- 
-@@ -83,18 +79,16 @@ tokens back to the compiler to compile i
- syn = "1.0"
- quote = "1.0"
- 
- [lib]
- proc-macro = true
- ```
- 
- ```rust
--extern crate proc_macro;
--
- use proc_macro::TokenStream;
- use quote::quote;
- use syn::{parse_macro_input, DeriveInput};
- 
- #[proc_macro_derive(MyMacro)]
- pub fn my_macro(input: TokenStream) -> TokenStream {
-     // Parse the input tokens into a syntax tree
-     let input = parse_macro_input!(input as DeriveInput);
-@@ -266,17 +260,17 @@ incompatible ecosystems for proc macros 
- 
- In general all of your code should be written against proc-macro2 rather than
- proc-macro. The one exception is in the signatures of procedural macro entry
- points, which are required by the language to use `proc_macro::TokenStream`.
- 
- The proc-macro2 crate will automatically detect and use the compiler's data
- structures when a procedural macro is active.
- 
--[proc-macro2]: https://docs.rs/proc-macro2/1.0.0/proc_macro2/
-+[proc-macro2]: https://docs.rs/proc-macro2/1.0/proc_macro2/
- 
- <br>
- 
- #### License
- 
- <sup>
- Licensed under either of <a href="LICENSE-APACHE">Apache License, Version
- 2.0</a> or <a href="LICENSE-MIT">MIT license</a> at your option.
-diff --git a/third_party/rust/syn/benches/file.rs b/third_party/rust/syn/benches/file.rs
---- a/third_party/rust/syn/benches/file.rs
-+++ b/third_party/rust/syn/benches/file.rs
-@@ -1,14 +1,21 @@
- // $ cargo bench --features full --bench file
- 
- #![feature(rustc_private, test)]
-+#![recursion_limit = "1024"]
- 
- extern crate test;
- 
-+#[macro_use]
-+#[path = "../tests/macros/mod.rs"]
-+mod macros;
-+
-+#[path = "../tests/common/mod.rs"]
-+mod common;
- #[path = "../tests/repo/mod.rs"]
- pub mod repo;
- 
- use proc_macro2::TokenStream;
- use std::fs;
- use std::str::FromStr;
- use test::Bencher;
- 
-diff --git a/third_party/rust/syn/benches/rust.rs b/third_party/rust/syn/benches/rust.rs
---- a/third_party/rust/syn/benches/rust.rs
-+++ b/third_party/rust/syn/benches/rust.rs
-@@ -1,15 +1,22 @@
- // $ cargo bench --features full --bench rust
- //
- // Syn only, useful for profiling:
- // $ RUSTFLAGS='--cfg syn_only' cargo build --release --features full --bench rust
- 
- #![cfg_attr(not(syn_only), feature(rustc_private))]
-+#![recursion_limit = "1024"]
- 
-+#[macro_use]
-+#[path = "../tests/macros/mod.rs"]
-+mod macros;
-+
-+#[path = "../tests/common/mod.rs"]
-+mod common;
- #[path = "../tests/repo/mod.rs"]
- mod repo;
- 
- use std::fs;
- use std::time::{Duration, Instant};
- 
- #[cfg(not(syn_only))]
- mod tokenstream_parse {
-@@ -23,41 +30,45 @@ mod tokenstream_parse {
- 
- mod syn_parse {
-     pub fn bench(content: &str) -> Result<(), ()> {
-         syn::parse_file(content).map(drop).map_err(drop)
-     }
- }
- 
- #[cfg(not(syn_only))]
--mod libsyntax_parse {
-+mod librustc_parse {
-     extern crate rustc_data_structures;
--    extern crate syntax;
--    extern crate syntax_pos;
-+    extern crate rustc_errors;
-+    extern crate rustc_parse;
-+    extern crate rustc_session;
-+    extern crate rustc_span;
- 
-     use rustc_data_structures::sync::Lrc;
--    use syntax::edition::Edition;
--    use syntax::errors::{emitter::Emitter, DiagnosticBuilder, Handler};
--    use syntax::parse::ParseSess;
--    use syntax::source_map::{FilePathMapping, SourceMap};
--    use syntax_pos::FileName;
-+    use rustc_errors::{emitter::Emitter, Diagnostic, Handler};
-+    use rustc_session::parse::ParseSess;
-+    use rustc_span::source_map::{FilePathMapping, SourceMap};
-+    use rustc_span::{edition::Edition, FileName};
- 
-     pub fn bench(content: &str) -> Result<(), ()> {
-         struct SilentEmitter;
- 
-         impl Emitter for SilentEmitter {
--            fn emit_diagnostic(&mut self, _db: &DiagnosticBuilder) {}
-+            fn emit_diagnostic(&mut self, _diag: &Diagnostic) {}
-+            fn source_map(&self) -> Option<&Lrc<SourceMap>> {
-+                None
-+            }
-         }
- 
--        syntax::with_globals(Edition::Edition2018, || {
-+        rustc_span::with_session_globals(Edition::Edition2018, || {
-             let cm = Lrc::new(SourceMap::new(FilePathMapping::empty()));
-             let emitter = Box::new(SilentEmitter);
-             let handler = Handler::with_emitter(false, None, emitter);
-             let sess = ParseSess::with_span_handler(handler, cm);
--            if let Err(mut diagnostic) = syntax::parse::parse_crate_from_source_str(
-+            if let Err(mut diagnostic) = rustc_parse::parse_crate_from_source_str(
-                 FileName::Custom("bench".to_owned()),
-                 content.to_owned(),
-                 &sess,
-             ) {
-                 diagnostic.cancel();
-                 return Err(());
-             };
-             Ok(())
-@@ -99,21 +110,21 @@ fn exec(mut codepath: impl FnMut(&str) -
-     assert_eq!(success, total);
-     begin.elapsed()
- }
- 
- fn main() {
-     repo::clone_rust();
- 
-     macro_rules! testcases {
--        ($($(#[$cfg:meta])* $name:path,)*) => {
-+        ($($(#[$cfg:meta])* $name:ident,)*) => {
-             vec![
-                 $(
-                     $(#[$cfg])*
--                    (stringify!($name), $name as fn(&str) -> Result<(), ()>),
-+                    (stringify!($name), $name::bench as fn(&str) -> Result<(), ()>),
-                 )*
-             ]
-         };
-     }
- 
-     #[cfg(not(syn_only))]
-     {
-         let mut lines = 0;
-@@ -123,22 +134,22 @@ fn main() {
-             files += 1;
-             Ok(())
-         });
-         eprintln!("\n{} lines in {} files", lines, files);
-     }
- 
-     for (name, f) in testcases!(
-         #[cfg(not(syn_only))]
--        read_from_disk::bench,
-+        read_from_disk,
-         #[cfg(not(syn_only))]
--        tokenstream_parse::bench,
--        syn_parse::bench,
-+        tokenstream_parse,
-+        syn_parse,
-         #[cfg(not(syn_only))]
--        libsyntax_parse::bench,
-+        librustc_parse,
-     ) {
-         eprint!("{:20}", format!("{}:", name));
-         let elapsed = exec(f);
-         eprintln!(
-             "elapsed={}.{:03}s",
-             elapsed.as_secs(),
-             elapsed.subsec_millis(),
-         );
-diff --git a/third_party/rust/syn/build.rs b/third_party/rust/syn/build.rs
---- a/third_party/rust/syn/build.rs
-+++ b/third_party/rust/syn/build.rs
-@@ -1,11 +1,11 @@
- use std::env;
- use std::process::Command;
--use std::str::{self, FromStr};
-+use std::str;
- 
- // The rustc-cfg strings below are *not* public API. Please let us know by
- // opening a GitHub issue if your build environment requires some way to enable
- // these cfgs other than by executing our build script.
- fn main() {
-     let compiler = match rustc_version() {
-         Some(compiler) => compiler,
-         None => return,
-@@ -21,43 +21,19 @@ fn main() {
- }
- 
- struct Compiler {
-     minor: u32,
-     nightly: bool,
- }
- 
- fn rustc_version() -> Option<Compiler> {
--    let rustc = match env::var_os("RUSTC") {
--        Some(rustc) => rustc,
--        None => return None,
--    };
--
--    let output = match Command::new(rustc).arg("--version").output() {
--        Ok(output) => output,
--        Err(_) => return None,
--    };
--
--    let version = match str::from_utf8(&output.stdout) {
--        Ok(version) => version,
--        Err(_) => return None,
--    };
--
-+    let rustc = env::var_os("RUSTC")?;
-+    let output = Command::new(rustc).arg("--version").output().ok()?;
-+    let version = str::from_utf8(&output.stdout).ok()?;
-     let mut pieces = version.split('.');
-     if pieces.next() != Some("rustc 1") {
-         return None;
-     }
--
--    let next = match pieces.next() {
--        Some(next) => next,
--        None => return None,
--    };
--
--    let minor = match u32::from_str(next) {
--        Ok(minor) => minor,
--        Err(_) => return None,
--    };
--
--    Some(Compiler {
--        minor: minor,
--        nightly: version.contains("nightly"),
--    })
-+    let minor = pieces.next()?.parse().ok()?;
-+    let nightly = version.contains("nightly");
-+    Some(Compiler { minor, nightly })
- }
-diff --git a/third_party/rust/syn/src/attr.rs b/third_party/rust/syn/src/attr.rs
---- a/third_party/rust/syn/src/attr.rs
-+++ b/third_party/rust/syn/src/attr.rs
-@@ -4,25 +4,21 @@ use crate::punctuated::Punctuated;
- use std::iter;
- 
- use proc_macro2::TokenStream;
- 
- #[cfg(feature = "parsing")]
- use crate::parse::{Parse, ParseBuffer, ParseStream, Parser, Result};
- #[cfg(feature = "parsing")]
- use crate::punctuated::Pair;
--#[cfg(feature = "extra-traits")]
--use crate::tt::TokenStreamHelper;
--#[cfg(feature = "extra-traits")]
--use std::hash::{Hash, Hasher};
- 
- ast_struct! {
-     /// An attribute like `#[repr(transparent)]`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-+    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
-     /// feature.*
-     ///
-     /// <br>
-     ///
-     /// # Syntax
-     ///
-     /// Rust has six types of attributes.
-     ///
-@@ -106,58 +102,69 @@ ast_struct! {
-     /// If the attribute you are parsing is expected to conform to the
-     /// conventional structured form of attribute, use [`parse_meta()`] to
-     /// obtain that structured representation. If the attribute follows some
-     /// other grammar of its own, use [`parse_args()`] to parse that into the
-     /// expected data structure.
-     ///
-     /// [`parse_meta()`]: Attribute::parse_meta
-     /// [`parse_args()`]: Attribute::parse_args
--    pub struct Attribute #manual_extra_traits {
-+    ///
-+    /// <p><br></p>
-+    ///
-+    /// # Doc comments
-+    ///
-+    /// The compiler transforms doc comments, such as `/// comment` and `/*!
-+    /// comment */`, into attributes before macros are expanded. Each comment is
-+    /// expanded into an attribute of the form `#[doc = r"comment"]`.
-+    ///
-+    /// As an example, the following `mod` items are expanded identically:
-+    ///
-+    /// ```
-+    /// # use syn::{ItemMod, parse_quote};
-+    /// let doc: ItemMod = parse_quote! {
-+    ///     /// Single line doc comments
-+    ///     /// We write so many!
-+    ///     /**
-+    ///      * Multi-line comments...
-+    ///      * May span many lines
-+    ///      */
-+    ///     mod example {
-+    ///         //! Of course, they can be inner too
-+    ///         /*! And fit in a single line */
-+    ///     }
-+    /// };
-+    /// let attr: ItemMod = parse_quote! {
-+    ///     #[doc = r" Single line doc comments"]
-+    ///     #[doc = r" We write so many!"]
-+    ///     #[doc = r"
-+    ///      * Multi-line comments...
-+    ///      * May span many lines
-+    ///      "]
-+    ///     mod example {
-+    ///         #![doc = r" Of course, they can be inner too"]
-+    ///         #![doc = r" And fit in a single line "]
-+    ///     }
-+    /// };
-+    /// assert_eq!(doc, attr);
-+    /// ```
-+    pub struct Attribute {
-         pub pound_token: Token![#],
-         pub style: AttrStyle,
-         pub bracket_token: token::Bracket,
-         pub path: Path,
-         pub tokens: TokenStream,
-     }
- }
- 
--#[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.tokens) == TokenStreamHelper(&other.tokens)
--    }
--}
--
--#[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.tokens).hash(state);
--    }
--}
--
- impl Attribute {
-     /// Parses the content of the attribute, consisting of the path and tokens,
-     /// as a [`Meta`] if possible.
-     ///
--    /// *This function is available if Syn is built with the `"parsing"`
-+    /// *This function is available only if Syn is built with the `"parsing"`
-     /// feature.*
-     #[cfg(feature = "parsing")]
-     pub fn parse_meta(&self) -> Result<Meta> {
-         fn clone_ident_segment(segment: &PathSegment) -> PathSegment {
-             PathSegment {
-                 ident: segment.ident.clone(),
-                 arguments: PathArguments::None,
-             }
-@@ -194,91 +201,95 @@ impl Attribute {
-     ///   parser; and
-     /// - the error message has a more useful span when `tokens` is empty.
-     ///
-     /// ```text
-     /// #[my_attr(value < 5)]
-     ///           ^^^^^^^^^ what gets parsed
-     /// ```
-     ///
--    /// *This function is available if Syn is built with the `"parsing"`
-+    /// *This function is available only if Syn is built with the `"parsing"`
-     /// feature.*
-     #[cfg(feature = "parsing")]
-     pub fn parse_args<T: Parse>(&self) -> Result<T> {
-         self.parse_args_with(T::parse)
-     }
- 
-     /// Parse the arguments to the attribute using the given parser.
-     ///
--    /// *This function is available if Syn is built with the `"parsing"`
-+    /// *This function is available only if Syn is built with the `"parsing"`
-     /// feature.*
-     #[cfg(feature = "parsing")]
-     pub fn parse_args_with<F: Parser>(&self, parser: F) -> Result<F::Output> {
-         let parser = |input: ParseStream| {
-             let args = enter_args(self, input)?;
-             parse::parse_stream(parser, &args)
-         };
-         parser.parse2(self.tokens.clone())
-     }
- 
-     /// Parses zero or more outer attributes from the stream.
-     ///
--    /// *This function is available if Syn is built with the `"parsing"`
-+    /// *This function is available only if Syn is built with the `"parsing"`
-     /// feature.*
-     #[cfg(feature = "parsing")]
-     pub fn parse_outer(input: ParseStream) -> Result<Vec<Self>> {
-         let mut attrs = Vec::new();
-         while input.peek(Token![#]) {
-             attrs.push(input.call(parsing::single_parse_outer)?);
-         }
-         Ok(attrs)
-     }
- 
-     /// Parses zero or more inner attributes from the stream.
-     ///
--    /// *This function is available if Syn is built with the `"parsing"`
-+    /// *This function is available only if Syn is built with the `"parsing"`
-     /// feature.*
-     #[cfg(feature = "parsing")]
-     pub fn parse_inner(input: ParseStream) -> Result<Vec<Self>> {
-         let mut attrs = Vec::new();
-         while input.peek(Token![#]) && input.peek2(Token![!]) {
-             attrs.push(input.call(parsing::single_parse_inner)?);
-         }
-         Ok(attrs)
-     }
- }
- 
- #[cfg(feature = "parsing")]
--fn error_expected_args(attr: &Attribute) -> Error {
-+fn expected_parentheses(attr: &Attribute) -> String {
-     let style = match attr.style {
-         AttrStyle::Outer => "#",
-         AttrStyle::Inner(_) => "#!",
-     };
- 
-     let mut path = String::new();
-     for segment in &attr.path.segments {
-         if !path.is_empty() || attr.path.leading_colon.is_some() {
-             path += "::";
-         }
-         path += &segment.ident.to_string();
-     }
- 
--    let msg = format!("expected attribute arguments: {}[{}(...)]", style, path);
--
--    #[cfg(feature = "printing")]
--    return Error::new_spanned(attr, msg);
--
--    #[cfg(not(feature = "printing"))]
--    return Error::new(attr.bracket_token.span, msg);
-+    format!("{}[{}(...)]", style, path)
- }
- 
- #[cfg(feature = "parsing")]
- fn enter_args<'a>(attr: &Attribute, input: ParseStream<'a>) -> Result<ParseBuffer<'a>> {
-     if input.is_empty() {
--        return Err(error_expected_args(attr));
-+        let expected = expected_parentheses(attr);
-+        let msg = format!("expected attribute arguments in parentheses: {}", expected);
-+        return Err(crate::error::new2(
-+            attr.pound_token.span,
-+            attr.bracket_token.span,
-+            msg,
-+        ));
-+    } else if input.peek(Token![=]) {
-+        let expected = expected_parentheses(attr);
-+        let msg = format!("expected parentheses: {}", expected);
-+        return Err(input.error(msg));
-     };
- 
-     let content;
-     if input.peek(token::Paren) {
-         parenthesized!(content in input);
-     } else if input.peek(token::Bracket) {
-         bracketed!(content in input);
-     } else if input.peek(token::Brace) {
-@@ -293,41 +304,40 @@ fn enter_args<'a>(attr: &Attribute, inpu
-         Err(input.error("unexpected token in attribute arguments"))
-     }
- }
- 
- 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"`
-+    /// *This type is available only 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"`
-+    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
-     /// feature.*
-     ///
-     /// ## Path
-     ///
-     /// A meta path is like the `test` in `#[test]`.
-     ///
-     /// ## List
-     ///
-@@ -355,29 +365,29 @@ ast_enum_of_structs! {
-         /// A name-value pair within an attribute, like `feature = "nightly"`.
-         NameValue(MetaNameValue),
-     }
- }
- 
- ast_struct! {
-     /// A structured list within an attribute, like `derive(Copy, Clone)`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct MetaList {
-         pub path: Path,
-         pub paren_token: token::Paren,
-         pub nested: Punctuated<NestedMeta, Token![,]>,
-     }
- }
- 
- ast_struct! {
-     /// A name-value pair within an attribute, like `feature = "nightly"`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct MetaNameValue {
-         pub path: Path,
-         pub eq_token: Token![=],
-         pub lit: Lit,
-     }
- }
- 
-@@ -393,17 +403,17 @@ impl Meta {
-             Meta::NameValue(meta) => &meta.path,
-         }
-     }
- }
- 
- ast_enum_of_structs! {
-     /// Element of a compile-time attribute list.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-+    /// *This type is available only 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::Path`.
-         Meta(Meta),
- 
-         /// A Rust literal, like the `"new_name"` in `#[rename("new_name")]`.
-         Lit(Lit),
-@@ -424,18 +434,18 @@ ast_enum_of_structs! {
- ///     /* ... */
- /// }
- /// ```
- ///
- /// The implementation of this macro would want to parse its attribute arguments
- /// as type `AttributeArgs`.
- ///
- /// ```
--/// extern crate proc_macro;
--///
-+/// # extern crate proc_macro;
-+/// #
- /// use proc_macro::TokenStream;
- /// use syn::{parse_macro_input, AttributeArgs, ItemFn};
- ///
- /// # const IGNORE: &str = stringify! {
- /// #[proc_macro_attribute]
- /// # };
- /// pub fn my_attribute(args: TokenStream, input: TokenStream) -> TokenStream {
- ///     let args = parse_macro_input!(args as AttributeArgs);
-@@ -459,27 +469,27 @@ 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,
-+                AttrStyle::Inner(_) => 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,
-+                AttrStyle::Outer => false,
-             }
-         }
-         self.into_iter().filter(is_inner)
-     }
- }
- 
- #[cfg(feature = "parsing")]
- pub mod parsing {
-diff --git a/third_party/rust/syn/src/buffer.rs b/third_party/rust/syn/src/buffer.rs
---- a/third_party/rust/syn/src/buffer.rs
-+++ b/third_party/rust/syn/src/buffer.rs
-@@ -1,12 +1,12 @@
- //! A stably addressed token buffer supporting efficient traversal based on a
- //! cheaply copyable cursor.
- //!
--//! *This module is available if Syn is built with the `"parsing"` feature.*
-+//! *This module is available only if Syn is built with the `"parsing"` feature.*
- 
- // This module is heavily commented as it contains most of the 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(all(
-     not(all(target_arch = "wasm32", any(target_os = "unknown", target_os = "wasi"))),
-     feature = "proc-macro"
-@@ -31,17 +31,17 @@ enum Entry {
-     // 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.
- ///
--/// *This type is available if Syn is built with the `"parsing"` feature.*
-+/// *This type is available only 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 {
-@@ -93,17 +93,17 @@ impl TokenBuffer {
-         }
- 
-         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
-+    /// *This method is available only if Syn is built with both the `"parsing"` and
-     /// `"proc-macro"` features.*
-     #[cfg(all(
-         not(all(target_arch = "wasm32", any(target_os = "unknown", target_os = "wasi"))),
-         feature = "proc-macro"
-     ))]
-     pub fn new(stream: pm::TokenStream) -> TokenBuffer {
-         Self::new2(stream.into())
-     }
-@@ -128,18 +128,17 @@ impl TokenBuffer {
- /// 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.
- ///
--/// *This type is available if Syn is built with the `"parsing"` feature.*
--#[derive(Copy, Clone, Eq, PartialEq)]
-+/// *This type is available only if Syn is built with the `"parsing"` feature.*
- 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,
-     // Cursor is covariant in 'a. This field ensures that our pointers are still
-     // valid.
-@@ -196,37 +195,38 @@ impl<'a> Cursor<'a> {
- 
-     /// 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
-+    /// While 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(group, buf) = self.entry() {
-+        while let Entry::Group(group, buf) = self.entry() {
-             if group.delimiter() == Delimiter::None {
-                 // 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);
-                 }
-+            } else {
-+                break;
-             }
-         }
-     }
- 
-     /// 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>)> {
-@@ -337,16 +337,54 @@ impl<'a> Cursor<'a> {
-         match self.entry() {
-             Entry::Group(group, _) => group.span(),
-             Entry::Literal(l) => l.span(),
-             Entry::Ident(t) => t.span(),
-             Entry::Punct(o) => o.span(),
-             Entry::End(..) => Span::call_site(),
-         }
-     }
-+
-+    /// Skip over the next token without cloning it. Returns `None` if this
-+    /// cursor points to eof.
-+    ///
-+    /// This method treats `'lifetimes` as a single token.
-+    pub(crate) fn skip(self) -> Option<Cursor<'a>> {
-+        match self.entry() {
-+            Entry::End(..) => None,
-+
-+            // Treat lifetimes as a single tt for the purposes of 'skip'.
-+            Entry::Punct(op) if op.as_char() == '\'' && op.spacing() == Spacing::Joint => {
-+                let next = unsafe { self.bump() };
-+                match next.entry() {
-+                    Entry::Ident(_) => Some(unsafe { next.bump() }),
-+                    _ => Some(next),
-+                }
-+            }
-+            _ => Some(unsafe { self.bump() }),
-+        }
-+    }
-+}
-+
-+impl<'a> Copy for Cursor<'a> {}
-+
-+impl<'a> Clone for Cursor<'a> {
-+    fn clone(&self) -> Self {
-+        *self
-+    }
-+}
-+
-+impl<'a> Eq for Cursor<'a> {}
-+
-+impl<'a> PartialEq for Cursor<'a> {
-+    fn eq(&self, other: &Self) -> bool {
-+        let Cursor { ptr, scope, marker } = self;
-+        let _ = marker;
-+        *ptr == other.ptr && *scope == other.scope
-+    }
- }
- 
- pub(crate) fn same_scope(a: Cursor, b: Cursor) -> bool {
-     a.scope == b.scope
- }
- 
- pub(crate) fn open_span_of_group(cursor: Cursor) -> Span {
-     match cursor.entry() {
-diff --git a/third_party/rust/syn/src/custom_keyword.rs b/third_party/rust/syn/src/custom_keyword.rs
---- a/third_party/rust/syn/src/custom_keyword.rs
-+++ b/third_party/rust/syn/src/custom_keyword.rs
-@@ -81,46 +81,46 @@
- ///                 value: input.parse()?,
- ///             })
- ///         } else {
- ///             Err(lookahead.error())
- ///         }
- ///     }
- /// }
- /// ```
--#[macro_export(local_inner_macros)]
-+#[macro_export]
- macro_rules! custom_keyword {
-     ($ident:ident) => {
-         #[allow(non_camel_case_types)]
-         pub struct $ident {
-             pub span: $crate::export::Span,
-         }
- 
-         #[doc(hidden)]
--        #[allow(non_snake_case)]
-+        #[allow(dead_code, non_snake_case)]
-         pub fn $ident<__S: $crate::export::IntoSpans<[$crate::export::Span; 1]>>(
-             span: __S,
-         ) -> $ident {
-             $ident {
-                 span: $crate::export::IntoSpans::into_spans(span)[0],
-             }
-         }
- 
-         impl $crate::export::Default for $ident {
-             fn default() -> Self {
-                 $ident {
-                     span: $crate::export::Span::call_site(),
-                 }
-             }
-         }
- 
--        impl_parse_for_custom_keyword!($ident);
--        impl_to_tokens_for_custom_keyword!($ident);
--        impl_clone_for_custom_keyword!($ident);
--        impl_extra_traits_for_custom_keyword!($ident);
-+        $crate::impl_parse_for_custom_keyword!($ident);
-+        $crate::impl_to_tokens_for_custom_keyword!($ident);
-+        $crate::impl_clone_for_custom_keyword!($ident);
-+        $crate::impl_extra_traits_for_custom_keyword!($ident);
-     };
- }
- 
- // Not public API.
- #[cfg(feature = "parsing")]
- #[doc(hidden)]
- #[macro_export]
- macro_rules! impl_parse_for_custom_keyword {
-diff --git a/third_party/rust/syn/src/custom_punctuation.rs b/third_party/rust/syn/src/custom_punctuation.rs
---- a/third_party/rust/syn/src/custom_punctuation.rs
-+++ b/third_party/rust/syn/src/custom_punctuation.rs
-@@ -69,67 +69,67 @@
- ///     Ok(tokens)
- /// }
- ///
- /// fn main() {
- ///     let input = r#" a::b </> c::d::e "#;
- ///     let _: PathSegments = syn::parse_str(input).unwrap();
- /// }
- /// ```
--#[macro_export(local_inner_macros)]
-+#[macro_export]
- macro_rules! custom_punctuation {
-     ($ident:ident, $($tt:tt)+) => {
-         pub struct $ident {
--            pub spans: custom_punctuation_repr!($($tt)+),
-+            pub spans: $crate::custom_punctuation_repr!($($tt)+),
-         }
- 
-         #[doc(hidden)]
--        #[allow(non_snake_case)]
--        pub fn $ident<__S: $crate::export::IntoSpans<custom_punctuation_repr!($($tt)+)>>(
-+        #[allow(dead_code, non_snake_case)]
-+        pub fn $ident<__S: $crate::export::IntoSpans<$crate::custom_punctuation_repr!($($tt)+)>>(
-             spans: __S,
-         ) -> $ident {
--            let _validate_len = 0 $(+ custom_punctuation_len!(strict, $tt))*;
-+            let _validate_len = 0 $(+ $crate::custom_punctuation_len!(strict, $tt))*;
-             $ident {
-                 spans: $crate::export::IntoSpans::into_spans(spans)
-             }
-         }
- 
-         impl $crate::export::Default for $ident {
-             fn default() -> Self {
-                 $ident($crate::export::Span::call_site())
-             }
-         }
- 
--        impl_parse_for_custom_punctuation!($ident, $($tt)+);
--        impl_to_tokens_for_custom_punctuation!($ident, $($tt)+);
--        impl_clone_for_custom_punctuation!($ident, $($tt)+);
--        impl_extra_traits_for_custom_punctuation!($ident, $($tt)+);
-+        $crate::impl_parse_for_custom_punctuation!($ident, $($tt)+);
-+        $crate::impl_to_tokens_for_custom_punctuation!($ident, $($tt)+);
-+        $crate::impl_clone_for_custom_punctuation!($ident, $($tt)+);
-+        $crate::impl_extra_traits_for_custom_punctuation!($ident, $($tt)+);
-     };
- }
- 
- // Not public API.
- #[cfg(feature = "parsing")]
- #[doc(hidden)]
--#[macro_export(local_inner_macros)]
-+#[macro_export]
- macro_rules! impl_parse_for_custom_punctuation {
-     ($ident:ident, $($tt:tt)+) => {
-         impl $crate::token::CustomToken for $ident {
-             fn peek(cursor: $crate::buffer::Cursor) -> bool {
--                $crate::token::parsing::peek_punct(cursor, stringify_punct!($($tt)+))
-+                $crate::token::parsing::peek_punct(cursor, $crate::stringify_punct!($($tt)+))
-             }
- 
-             fn display() -> &'static $crate::export::str {
--                custom_punctuation_concat!("`", stringify_punct!($($tt)+), "`")
-+                concat!("`", $crate::stringify_punct!($($tt)+), "`")
-             }
-         }
- 
-         impl $crate::parse::Parse for $ident {
-             fn parse(input: $crate::parse::ParseStream) -> $crate::parse::Result<$ident> {
--                let spans: custom_punctuation_repr!($($tt)+) =
--                    $crate::token::parsing::punct(input, stringify_punct!($($tt)+))?;
-+                let spans: $crate::custom_punctuation_repr!($($tt)+) =
-+                    $crate::token::parsing::punct(input, $crate::stringify_punct!($($tt)+))?;
-                 Ok($ident(spans))
-             }
-         }
-     };
- }
- 
- // Not public API.
- #[cfg(not(feature = "parsing"))]
-@@ -137,22 +137,22 @@ macro_rules! impl_parse_for_custom_punct
- #[macro_export]
- macro_rules! impl_parse_for_custom_punctuation {
-     ($ident:ident, $($tt:tt)+) => {};
- }
- 
- // Not public API.
- #[cfg(feature = "printing")]
- #[doc(hidden)]
--#[macro_export(local_inner_macros)]
-+#[macro_export]
- macro_rules! impl_to_tokens_for_custom_punctuation {
-     ($ident:ident, $($tt:tt)+) => {
-         impl $crate::export::ToTokens for $ident {
-             fn to_tokens(&self, tokens: &mut $crate::export::TokenStream2) {
--                $crate::token::printing::punct(stringify_punct!($($tt)+), &self.spans, tokens)
-+                $crate::token::printing::punct($crate::stringify_punct!($($tt)+), &self.spans, tokens)
-             }
-         }
-     };
- }
- 
- // Not public API.
- #[cfg(not(feature = "printing"))]
- #[doc(hidden)]
-@@ -216,26 +216,26 @@ macro_rules! impl_extra_traits_for_custo
- #[doc(hidden)]
- #[macro_export]
- macro_rules! impl_extra_traits_for_custom_punctuation {
-     ($ident:ident, $($tt:tt)+) => {};
- }
- 
- // Not public API.
- #[doc(hidden)]
--#[macro_export(local_inner_macros)]
-+#[macro_export]
- macro_rules! custom_punctuation_repr {
-     ($($tt:tt)+) => {
--        [$crate::export::Span; 0 $(+ custom_punctuation_len!(lenient, $tt))+]
-+        [$crate::export::Span; 0 $(+ $crate::custom_punctuation_len!(lenient, $tt))+]
-     };
- }
- 
- // Not public API.
- #[doc(hidden)]
--#[macro_export(local_inner_macros)]
-+#[macro_export]
- #[rustfmt::skip]
- macro_rules! custom_punctuation_len {
-     ($mode:ident, +)     => { 1 };
-     ($mode:ident, +=)    => { 2 };
-     ($mode:ident, &)     => { 1 };
-     ($mode:ident, &&)    => { 2 };
-     ($mode:ident, &=)    => { 2 };
-     ($mode:ident, @)     => { 1 };
-@@ -274,17 +274,17 @@ macro_rules! custom_punctuation_len {
-     ($mode:ident, <<=)   => { 3 };
-     ($mode:ident, >>)    => { 2 };
-     ($mode:ident, >>=)   => { 3 };
-     ($mode:ident, *)     => { 1 };
-     ($mode:ident, -)     => { 1 };
-     ($mode:ident, -=)    => { 2 };
-     ($mode:ident, ~)     => { 1 };
-     (lenient, $tt:tt)    => { 0 };
--    (strict, $tt:tt)     => {{ custom_punctuation_unexpected!($tt); 0 }};
-+    (strict, $tt:tt)     => {{ $crate::custom_punctuation_unexpected!($tt); 0 }};
- }
- 
- // Not public API.
- #[doc(hidden)]
- #[macro_export]
- macro_rules! custom_punctuation_unexpected {
-     () => {};
- }
-@@ -292,18 +292,8 @@ macro_rules! custom_punctuation_unexpect
- // Not public API.
- #[doc(hidden)]
- #[macro_export]
- macro_rules! stringify_punct {
-     ($($tt:tt)+) => {
-         concat!($(stringify!($tt)),+)
-     };
- }
--
--// Not public API.
--// Without this, local_inner_macros breaks when looking for concat!
--#[doc(hidden)]
--#[macro_export]
--macro_rules! custom_punctuation_concat {
--    ($($tt:tt)*) => {
--        concat!($($tt)*)
--    };
--}
-diff --git a/third_party/rust/syn/src/data.rs b/third_party/rust/syn/src/data.rs
---- a/third_party/rust/syn/src/data.rs
-+++ b/third_party/rust/syn/src/data.rs
-@@ -1,15 +1,15 @@
- use super::*;
- use crate::punctuated::Punctuated;
- 
- ast_struct! {
-     /// An enum variant.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-+    /// *This type is available only 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,
- 
-@@ -19,17 +19,17 @@ ast_struct! {
-         /// 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"`
-+    /// *This type is available only 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
-     //
-@@ -47,28 +47,28 @@ ast_enum_of_structs! {
-         Unit,
-     }
- }
- 
- ast_struct! {
-     /// 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
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct FieldsNamed {
-         pub brace_token: token::Brace,
-         pub named: Punctuated<Field, Token![,]>,
-     }
- }
- 
- ast_struct! {
-     /// 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
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct FieldsUnnamed {
-         pub paren_token: token::Paren,
-         pub unnamed: Punctuated<Field, Token![,]>,
-     }
- }
- 
- impl Fields {
-@@ -88,16 +88,34 @@ impl Fields {
-     /// struct or variant's fields uniformly.
-     pub fn iter_mut(&mut self) -> punctuated::IterMut<Field> {
-         match self {
-             Fields::Unit => crate::punctuated::empty_punctuated_iter_mut(),
-             Fields::Named(f) => f.named.iter_mut(),
-             Fields::Unnamed(f) => f.unnamed.iter_mut(),
-         }
-     }
-+
-+    /// Returns the number of fields.
-+    pub fn len(&self) -> usize {
-+        match self {
-+            Fields::Unit => 0,
-+            Fields::Named(f) => f.named.len(),
-+            Fields::Unnamed(f) => f.unnamed.len(),
-+        }
-+    }
-+
-+    /// Returns `true` if there are zero fields.
-+    pub fn is_empty(&self) -> bool {
-+        match self {
-+            Fields::Unit => true,
-+            Fields::Named(f) => f.named.is_empty(),
-+            Fields::Unnamed(f) => f.unnamed.is_empty(),
-+        }
-+    }
- }
- 
- impl IntoIterator for Fields {
-     type Item = Field;
-     type IntoIter = punctuated::IntoIter<Field>;
- 
-     fn into_iter(self) -> Self::IntoIter {
-         match self {
-@@ -124,17 +142,17 @@ impl<'a> IntoIterator for &'a mut Fields
-     fn into_iter(self) -> Self::IntoIter {
-         self.iter_mut()
-     }
- }
- 
- ast_struct! {
-     /// A field of a struct or enum variant.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-+    /// *This type is available only 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,
- 
-@@ -149,17 +167,17 @@ ast_struct! {
-         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"`
-+    /// *This type is available only 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
-     //
-@@ -179,58 +197,61 @@ ast_enum_of_structs! {
-         /// An inherited visibility, which usually means private.
-         Inherited,
-     }
- }
- 
- ast_struct! {
-     /// A public visibility level: `pub`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct VisPublic {
-         pub pub_token: Token![pub],
-     }
- }
- 
- ast_struct! {
-     /// A crate-level visibility: `crate`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct VisCrate {
-         pub crate_token: Token![crate],
-     }
- }
- 
- ast_struct! {
-     /// 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
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct VisRestricted {
-         pub pub_token: Token![pub],
-         pub paren_token: token::Paren,
-         pub in_token: Option<Token![in]>,
-         pub path: Box<Path>,
-     }
- }
- 
- #[cfg(feature = "parsing")]
- pub mod parsing {
-     use super::*;
- 
-     use crate::ext::IdentExt;
-+    use crate::parse::discouraged::Speculative;
-     use crate::parse::{Parse, ParseStream, Result};
- 
-     impl Parse for Variant {
-         fn parse(input: ParseStream) -> Result<Self> {
-+            let attrs = input.call(Attribute::parse_outer)?;
-+            let _visibility: Visibility = input.parse()?;
-             Ok(Variant {
--                attrs: input.call(Attribute::parse_outer)?,
-+                attrs,
-                 ident: input.parse()?,
-                 fields: {
-                     if input.peek(token::Brace) {
-                         Fields::Named(input.parse()?)
-                     } else if input.peek(token::Paren) {
-                         Fields::Unnamed(input.parse()?)
-                     } else {
-                         Fields::Unit
-@@ -290,68 +311,99 @@ pub mod parsing {
-                 colon_token: None,
-                 ty: input.parse()?,
-             })
-         }
-     }
- 
-     impl Parse for Visibility {
-         fn parse(input: ParseStream) -> Result<Self> {
-+            // Recognize an empty None-delimited group, as produced by a $:vis
-+            // matcher that matched no tokens.
-+            if input.peek(token::Group) {
-+                let ahead = input.fork();
-+                let group = crate::group::parse_group(&ahead)?;
-+                if group.content.is_empty() {
-+                    input.advance_to(&ahead);
-+                    return Ok(Visibility::Inherited);
-+                }
-+            }
-+
-             if input.peek(Token![pub]) {
-                 Self::parse_pub(input)
-             } else if input.peek(Token![crate]) {
-                 Self::parse_crate(input)
-             } else {
-                 Ok(Visibility::Inherited)
-             }
-         }
-     }
- 
-     impl Visibility {
-         fn parse_pub(input: ParseStream) -> Result<Self> {
-             let pub_token = input.parse::<Token![pub]>()?;
- 
-             if input.peek(token::Paren) {
--                // TODO: optimize using advance_to
-                 let ahead = input.fork();
--                let mut content;
--                parenthesized!(content in ahead);
- 
-+                let content;
-+                let paren_token = parenthesized!(content in ahead);
-                 if content.peek(Token![crate])
-                     || content.peek(Token![self])
-                     || content.peek(Token![super])
-                 {
-+                    let path = content.call(Ident::parse_any)?;
-+
-+                    // Ensure there are no additional tokens within `content`.
-+                    // Without explicitly checking, we may misinterpret a tuple
-+                    // field as a restricted visibility, causing a parse error.
-+                    // e.g. `pub (crate::A, crate::B)` (Issue #720).
-+                    if content.is_empty() {
-+                        input.advance_to(&ahead);
-+                        return Ok(Visibility::Restricted(VisRestricted {
-+                            pub_token,
-+                            paren_token,
-+                            in_token: None,
-+                            path: Box::new(Path::from(path)),
-+                        }));
-+                    }
-+                } else if content.peek(Token![in]) {
-+                    let in_token: Token![in] = content.parse()?;
-+                    let path = content.call(Path::parse_mod_style)?;
-+
-+                    input.advance_to(&ahead);
-                     return Ok(Visibility::Restricted(VisRestricted {
-                         pub_token,
--                        paren_token: parenthesized!(content in input),
--                        in_token: None,
--                        path: Box::new(Path::from(content.call(Ident::parse_any)?)),
--                    }));
--                } else if content.peek(Token![in]) {
--                    return Ok(Visibility::Restricted(VisRestricted {
--                        pub_token,
--                        paren_token: parenthesized!(content in input),
--                        in_token: Some(content.parse()?),
--                        path: Box::new(content.call(Path::parse_mod_style)?),
-+                        paren_token,
-+                        in_token: Some(in_token),
-+                        path: Box::new(path),
-                     }));
-                 }
-             }
- 
-             Ok(Visibility::Public(VisPublic { pub_token }))
-         }
- 
-         fn parse_crate(input: ParseStream) -> Result<Self> {
-             if input.peek2(Token![::]) {
-                 Ok(Visibility::Inherited)
-             } else {
-                 Ok(Visibility::Crate(VisCrate {
-                     crate_token: input.parse()?,
-                 }))
-             }
-         }
-+
-+        #[cfg(feature = "full")]
-+        pub(crate) fn is_some(&self) -> bool {
-+            match self {
-+                Visibility::Inherited => false,
-+                _ => true,
-+            }
-+        }
-     }
- }
- 
- #[cfg(feature = "printing")]
- mod printing {
-     use super::*;
- 
-     use proc_macro2::TokenStream;
-diff --git a/third_party/rust/syn/src/derive.rs b/third_party/rust/syn/src/derive.rs
---- a/third_party/rust/syn/src/derive.rs
-+++ b/third_party/rust/syn/src/derive.rs
-@@ -1,15 +1,15 @@
- use super::*;
- use crate::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.*
-+    /// *This type is available only 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.
-@@ -21,17 +21,17 @@ ast_struct! {
-         /// 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.*
-+    /// *This type is available only 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
-     //
-     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
-@@ -48,41 +48,41 @@ ast_enum_of_structs! {
-     }
- 
-     do_not_generate_to_tokens
- }
- 
- ast_struct! {
-     /// A struct input to a `proc_macro_derive` macro.
-     ///
--    /// *This type is available if Syn is built with the `"derive"`
-+    /// *This type is available only if Syn is built with the `"derive"`
-     /// feature.*
-     pub struct DataStruct {
-         pub struct_token: Token![struct],
-         pub fields: Fields,
-         pub semi_token: Option<Token![;]>,
-     }
- }
- 
- ast_struct! {
-     /// An enum input to a `proc_macro_derive` macro.
-     ///
--    /// *This type is available if Syn is built with the `"derive"`
-+    /// *This type is available only if Syn is built with the `"derive"`
-     /// feature.*
-     pub struct DataEnum {
-         pub enum_token: Token![enum],
-         pub brace_token: token::Brace,
-         pub variants: Punctuated<Variant, Token![,]>,
-     }
- }
- 
- ast_struct! {
-     /// An untagged union input to a `proc_macro_derive` macro.
-     ///
--    /// *This type is available if Syn is built with the `"derive"`
-+    /// *This type is available only if Syn is built with the `"derive"`
-     /// feature.*
-     pub struct DataUnion {
-         pub union_token: Token![union],
-         pub fields: FieldsNamed,
-     }
- }
- 
- #[cfg(feature = "parsing")]
-diff --git a/third_party/rust/syn/src/discouraged.rs b/third_party/rust/syn/src/discouraged.rs
---- a/third_party/rust/syn/src/discouraged.rs
-+++ b/third_party/rust/syn/src/discouraged.rs
-@@ -11,17 +11,17 @@ pub trait Speculative {
-     /// stream to the fork to "commit" the parsing from the fork to the main
-     /// stream.
-     ///
-     /// If you can avoid doing this, you should, as it limits the ability to
-     /// generate useful errors. That said, it is often the only way to parse
-     /// syntax of the form `A* B*` for arbitrary syntax `A` and `B`. The problem
-     /// is that when the fork fails to parse an `A`, it's impossible to tell
-     /// whether that was because of a syntax error and the user meant to provide
--    /// an `A`, or that the `A`s are finished and its time to start parsing
-+    /// an `A`, or that the `A`s are finished and it's time to start parsing
-     /// `B`s. Use with care.
-     ///
-     /// Also note that if `A` is a subset of `B`, `A* B*` can be parsed by
-     /// parsing `B*` and removing the leading members of `A` from the
-     /// repetition, bypassing the need to involve the downsides associated with
-     /// speculative parsing.
-     ///
-     /// [`ParseStream::fork`]: ParseBuffer::fork
-@@ -67,17 +67,16 @@ pub trait Speculative {
-     /// # }
-     ///
-     /// impl Parse for PathSegment {
-     ///     fn parse(input: ParseStream) -> Result<Self> {
-     ///         if input.peek(Token![super])
-     ///             || input.peek(Token![self])
-     ///             || input.peek(Token![Self])
-     ///             || input.peek(Token![crate])
--    ///             || input.peek(Token![extern])
-     ///         {
-     ///             let ident = input.call(Ident::parse_any)?;
-     ///             return Ok(PathSegment::from(ident));
-     ///         }
-     ///
-     ///         let ident = input.parse()?;
-     ///         if input.peek(Token![::]) && input.peek3(Token![<]) {
-     ///             return Ok(PathSegment {
-@@ -159,13 +158,37 @@ pub trait Speculative {
- }
- 
- impl<'a> Speculative for ParseBuffer<'a> {
-     fn advance_to(&self, fork: &Self) {
-         if !crate::buffer::same_scope(self.cursor(), fork.cursor()) {
-             panic!("Fork was not derived from the advancing parse stream");
-         }
- 
-+        let (self_unexp, self_sp) = inner_unexpected(self);
-+        let (fork_unexp, fork_sp) = inner_unexpected(fork);
-+        if !Rc::ptr_eq(&self_unexp, &fork_unexp) {
-+            match (fork_sp, self_sp) {
-+                // Unexpected set on the fork, but not on `self`, copy it over.
-+                (Some(span), None) => {
-+                    self_unexp.set(Unexpected::Some(span));
-+                }
-+                // Unexpected unset. Use chain to propagate errors from fork.
-+                (None, None) => {
-+                    fork_unexp.set(Unexpected::Chain(self_unexp));
-+
-+                    // Ensure toplevel 'unexpected' tokens from the fork don't
-+                    // bubble up the chain by replacing the root `unexpected`
-+                    // pointer, only 'unexpected' tokens from existing group
-+                    // parsers should bubble.
-+                    fork.unexpected
-+                        .set(Some(Rc::new(Cell::new(Unexpected::None))));
-+                }
-+                // Unexpected has been set on `self`. No changes needed.
-+                (_, Some(_)) => {}
-+            }
-+        }
-+
-         // See comment on `cell` in the struct definition.
-         self.cell
-             .set(unsafe { mem::transmute::<Cursor, Cursor<'static>>(fork.cursor()) })
-     }
- }
-diff --git a/third_party/rust/syn/src/error.rs b/third_party/rust/syn/src/error.rs
---- a/third_party/rust/syn/src/error.rs
-+++ b/third_party/rust/syn/src/error.rs
-@@ -1,9 +1,8 @@
--use std;
- use std::fmt::{self, Debug, Display};
- use std::iter::FromIterator;
- use std::slice;
- use std::vec;
- 
- use proc_macro2::{
-     Delimiter, Group, Ident, LexError, Literal, Punct, Spacing, Span, TokenStream, TokenTree,
- };
-@@ -27,18 +26,18 @@ pub type Result<T> = std::result::Result
- /// message than simply panicking the macro.
- ///
- /// [`compile_error!`]: https://doc.rust-lang.org/std/macro.compile_error.html
- ///
- /// When parsing macro input, the [`parse_macro_input!`] macro handles the
- /// conversion to `compile_error!` automatically.
- ///
- /// ```
--/// extern crate proc_macro;
--///
-+/// # extern crate proc_macro;
-+/// #
- /// use proc_macro::TokenStream;
- /// use syn::{parse_macro_input, AttributeArgs, ItemFn};
- ///
- /// # const IGNORE: &str = stringify! {
- /// #[proc_macro_attribute]
- /// # };
- /// pub fn my_attr(args: TokenStream, input: TokenStream) -> TokenStream {
- ///     let args = parse_macro_input!(args as AttributeArgs);
-@@ -77,17 +76,16 @@ pub type Result<T> = std::result::Result
- /// #     use proc_macro2::TokenStream;
- /// #     use syn::{DeriveInput, Result};
- /// #
- /// #     pub fn my_derive(input: DeriveInput) -> Result<TokenStream> {
- /// #         unimplemented!()
- /// #     }
- /// # }
- /// ```
--#[derive(Clone)]
- pub struct Error {
-     messages: Vec<ErrorMessage>,
- }
- 
- struct ErrorMessage {
-     // Span is implemented as an index into a thread-local interner to keep the
-     // size small. It is not safe to access from a different thread. We want
-     // errors to be Send and Sync to play nicely with the Failure crate, so pin
-@@ -245,16 +243,27 @@ pub fn new_at<T: Display>(scope: Span, c
-     if cursor.eof() {
-         Error::new(scope, format!("unexpected end of input, {}", message))
-     } else {
-         let span = crate::buffer::open_span_of_group(cursor);
-         Error::new(span, message)
-     }
- }
- 
-+#[cfg(all(feature = "parsing", any(feature = "full", feature = "derive")))]
-+pub fn new2<T: Display>(start: Span, end: Span, message: T) -> Error {
-+    Error {
-+        messages: vec![ErrorMessage {
-+            start_span: ThreadBound::new(start),
-+            end_span: ThreadBound::new(end),
-+            message: message.to_string(),
-+        }],
-+    }
-+}
-+
- impl Debug for Error {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-         if self.messages.len() == 1 {
-             formatter
-                 .debug_tuple("Error")
-                 .field(&self.messages[0])
-                 .finish()
-         } else {
-@@ -273,16 +282,24 @@ impl Debug for ErrorMessage {
- }
- 
- impl Display for Error {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-         formatter.write_str(&self.messages[0].message)
-     }
- }
- 
-+impl Clone for Error {
-+    fn clone(&self) -> Self {
-+        Error {
-+            messages: self.messages.clone(),
-+        }
-+    }
-+}
-+
- impl Clone for ErrorMessage {
-     fn clone(&self) -> Self {
-         let start = self
-             .start_span
-             .get()
-             .cloned()
-             .unwrap_or_else(Span::call_site);
-         let end = self.end_span.get().cloned().unwrap_or_else(Span::call_site);
-@@ -350,8 +367,16 @@ impl<'a> Iterator for Iter<'a> {
-     type Item = Error;
- 
-     fn next(&mut self) -> Option<Self::Item> {
-         Some(Error {
-             messages: vec![self.messages.next()?.clone()],
-         })
-     }
- }
-+
-+impl Extend<Error> for Error {
-+    fn extend<T: IntoIterator<Item = Error>>(&mut self, iter: T) {
-+        for err in iter {
-+            self.combine(err);
-+        }
-+    }
-+}
-diff --git a/third_party/rust/syn/src/expr.rs b/third_party/rust/syn/src/expr.rs
---- a/third_party/rust/syn/src/expr.rs
-+++ b/third_party/rust/syn/src/expr.rs
-@@ -1,23 +1,26 @@
- use super::*;
- use crate::punctuated::Punctuated;
--#[cfg(feature = "extra-traits")]
--use crate::tt::TokenStreamHelper;
-+#[cfg(feature = "full")]
-+use crate::reserved::Reserved;
- use proc_macro2::{Span, TokenStream};
--#[cfg(feature = "extra-traits")]
-+#[cfg(feature = "printing")]
-+use quote::IdentFragment;
-+#[cfg(feature = "printing")]
-+use std::fmt::{self, Display};
- use std::hash::{Hash, Hasher};
--#[cfg(all(feature = "parsing", feature = "full"))]
-+#[cfg(feature = "parsing")]
- use std::mem;
- 
- ast_enum_of_structs! {
-     /// A Rust expression.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
--    /// feature.*
-+    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
-+    /// feature, but most of the variants are not available unless "full" is enabled.*
-     ///
-     /// # 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;
-@@ -78,17 +81,17 @@ ast_enum_of_structs! {
-     /// if let Expr::Tuple(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 #manual_extra_traits {
-+    pub enum Expr {
-         /// A slice literal expression: `[a, b, c, d]`.
-         Array(ExprArray),
- 
-         /// An assignment expression: `a = compute()`.
-         Assign(ExprAssign),
- 
-         /// A compound assignment expression: `counter += 1`.
-         AssignOp(ExprAssignOp),
-@@ -223,191 +226,191 @@ ast_enum_of_structs! {
-         #[doc(hidden)]
-         __Nonexhaustive,
-     }
- }
- 
- ast_struct! {
-     /// A slice literal expression: `[a, b, c, d]`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprArray #full {
-         pub attrs: Vec<Attribute>,
-         pub bracket_token: token::Bracket,
-         pub elems: Punctuated<Expr, Token![,]>,
-     }
- }
- 
- ast_struct! {
-     /// An assignment expression: `a = compute()`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprAssign #full {
-         pub attrs: Vec<Attribute>,
-         pub left: Box<Expr>,
-         pub eq_token: Token![=],
-         pub right: Box<Expr>,
-     }
- }
- 
- ast_struct! {
-     /// A compound assignment expression: `counter += 1`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprAssignOp #full {
-         pub attrs: Vec<Attribute>,
-         pub left: Box<Expr>,
-         pub op: BinOp,
-         pub right: Box<Expr>,
-     }
- }
- 
- ast_struct! {
-     /// An async block: `async { ... }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprAsync #full {
-         pub attrs: Vec<Attribute>,
-         pub async_token: Token![async],
-         pub capture: Option<Token![move]>,
-         pub block: Block,
-     }
- }
- 
- ast_struct! {
-     /// An await expression: `fut.await`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprAwait #full {
-         pub attrs: Vec<Attribute>,
-         pub base: Box<Expr>,
-         pub dot_token: Token![.],
-         pub await_token: token::Await,
-     }
- }
- 
- ast_struct! {
-     /// A binary operation: `a + b`, `a * b`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct ExprBinary {
-         pub attrs: Vec<Attribute>,
-         pub left: Box<Expr>,
-         pub op: BinOp,
-         pub right: Box<Expr>,
-     }
- }
- 
- ast_struct! {
-     /// A blocked scope: `{ ... }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprBlock #full {
-         pub attrs: Vec<Attribute>,
-         pub label: Option<Label>,
-         pub block: Block,
-     }
- }
- 
- ast_struct! {
-     /// A box expression: `box f`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprBox #full {
-         pub attrs: Vec<Attribute>,
-         pub box_token: Token![box],
-         pub expr: Box<Expr>,
-     }
- }
- 
- ast_struct! {
-     /// A `break`, with an optional label to break and an optional
-     /// expression.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprBreak #full {
-         pub attrs: Vec<Attribute>,
-         pub break_token: Token![break],
-         pub label: Option<Lifetime>,
-         pub expr: Option<Box<Expr>>,
-     }
- }
- 
- ast_struct! {
-     /// A function call expression: `invoke(a, b)`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct ExprCall {
-         pub attrs: Vec<Attribute>,
-         pub func: Box<Expr>,
-         pub paren_token: token::Paren,
-         pub args: Punctuated<Expr, Token![,]>,
-     }
- }
- 
- ast_struct! {
-     /// A cast expression: `foo as f64`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct ExprCast {
-         pub attrs: Vec<Attribute>,
-         pub expr: Box<Expr>,
-         pub as_token: Token![as],
-         pub ty: Box<Type>,
-     }
- }
- 
- ast_struct! {
-     /// A closure expression: `|a, b| a + b`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprClosure #full {
-         pub attrs: Vec<Attribute>,
-         pub asyncness: Option<Token![async]>,
-         pub movability: Option<Token![static]>,
-         pub capture: Option<Token![move]>,
-         pub or1_token: Token![|],
-         pub inputs: Punctuated<Pat, Token![,]>,
-         pub or2_token: Token![|],
-         pub output: ReturnType,
-         pub body: Box<Expr>,
-     }
- }
- 
- ast_struct! {
-     /// A `continue`, with an optional label.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprContinue #full {
-         pub attrs: Vec<Attribute>,
-         pub continue_token: Token![continue],
-         pub label: Option<Lifetime>,
-     }
- }
- 
- ast_struct! {
-     /// 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.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprField {
-         pub attrs: Vec<Attribute>,
-         pub base: Box<Expr>,
-         pub dot_token: Token![.],
-         pub member: Member,
-     }
- }
- 
- ast_struct! {
-     /// A for loop: `for pat in expr { ... }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprForLoop #full {
-         pub attrs: Vec<Attribute>,
-         pub label: Option<Label>,
-         pub for_token: Token![for],
-         pub pat: Pat,
-         pub in_token: Token![in],
-         pub expr: Box<Expr>,
-         pub body: Block,
-@@ -416,538 +419,312 @@ ast_struct! {
- 
- ast_struct! {
-     /// 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.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprGroup #full {
-         pub attrs: Vec<Attribute>,
-         pub group_token: token::Group,
-         pub expr: Box<Expr>,
-     }
- }
- 
- ast_struct! {
-     /// An `if` expression with an optional `else` block: `if expr { ... }
-     /// else { ... }`.
-     ///
-     /// The `else` branch expression may only be an `If` or `Block`
-     /// expression, not any of the other types of expression.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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>)>,
-     }
- }
- 
- ast_struct! {
-     /// A square bracketed indexing expression: `vector[2]`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct ExprIndex {
-         pub attrs: Vec<Attribute>,
-         pub expr: Box<Expr>,
-         pub bracket_token: token::Bracket,
-         pub index: Box<Expr>,
-     }
- }
- 
- ast_struct! {
-     /// A `let` guard: `let Some(x) = opt`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprLet #full {
-         pub attrs: Vec<Attribute>,
-         pub let_token: Token![let],
-         pub pat: Pat,
-         pub eq_token: Token![=],
-         pub expr: Box<Expr>,
-     }
- }
- 
- ast_struct! {
-     /// A literal in place of an expression: `1`, `"foo"`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct ExprLit {
-         pub attrs: Vec<Attribute>,
-         pub lit: Lit,
-     }
- }
- 
- ast_struct! {
-     /// Conditionless loop: `loop { ... }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprLoop #full {
-         pub attrs: Vec<Attribute>,
-         pub label: Option<Label>,
-         pub loop_token: Token![loop],
-         pub body: Block,
-     }
- }
- 
- ast_struct! {
-     /// A macro invocation expression: `format!("{}", q)`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprMacro #full {
-         pub attrs: Vec<Attribute>,
-         pub mac: Macro,
-     }
- }
- 
- ast_struct! {
-     /// A `match` expression: `match n { Some(n) => {}, None => {} }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprMatch #full {
-         pub attrs: Vec<Attribute>,
-         pub match_token: Token![match],
-         pub expr: Box<Expr>,
-         pub brace_token: token::Brace,
-         pub arms: Vec<Arm>,
-     }
- }
- 
- ast_struct! {
-     /// A method call expression: `x.foo::<T>(a, b)`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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![,]>,
-     }
- }
- 
- ast_struct! {
-     /// A parenthesized expression: `(a + b)`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprParen {
-         pub attrs: Vec<Attribute>,
-         pub paren_token: token::Paren,
-         pub expr: Box<Expr>,
-     }
- }
- 
- ast_struct! {
-     /// 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
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct ExprPath {
-         pub attrs: Vec<Attribute>,
-         pub qself: Option<QSelf>,
-         pub path: Path,
-     }
- }
- 
- ast_struct! {
-     /// A range expression: `1..2`, `1..`, `..2`, `1..=2`, `..=2`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprRange #full {
-         pub attrs: Vec<Attribute>,
-         pub from: Option<Box<Expr>>,
-         pub limits: RangeLimits,
-         pub to: Option<Box<Expr>>,
-     }
- }
- 
- ast_struct! {
-     /// A referencing operation: `&a` or `&mut a`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprReference #full {
-         pub attrs: Vec<Attribute>,
-         pub and_token: Token![&],
-         pub raw: Reserved,
-         pub mutability: Option<Token![mut]>,
-         pub expr: Box<Expr>,
-     }
- }
- 
- ast_struct! {
-     /// An array literal constructed from one repeated element: `[0u8; N]`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprRepeat #full {
-         pub attrs: Vec<Attribute>,
-         pub bracket_token: token::Bracket,
-         pub expr: Box<Expr>,
-         pub semi_token: Token![;],
-         pub len: Box<Expr>,
-     }
- }
- 
- ast_struct! {
-     /// A `return`, with an optional value to be returned.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprReturn #full {
-         pub attrs: Vec<Attribute>,
-         pub return_token: Token![return],
-         pub expr: Option<Box<Expr>>,
-     }
- }
- 
- ast_struct! {
-     /// 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.*
-+    /// *This type is available only 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>>,
-     }
- }
- 
- ast_struct! {
-     /// A try-expression: `expr?`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprTry #full {
-         pub attrs: Vec<Attribute>,
-         pub expr: Box<Expr>,
-         pub question_token: Token![?],
-     }
- }
- 
- ast_struct! {
-     /// A try block: `try { ... }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprTryBlock #full {
-         pub attrs: Vec<Attribute>,
-         pub try_token: Token![try],
-         pub block: Block,
-     }
- }
- 
- ast_struct! {
-     /// A tuple expression: `(a, b, c, d)`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprTuple #full {
-         pub attrs: Vec<Attribute>,
-         pub paren_token: token::Paren,
-         pub elems: Punctuated<Expr, Token![,]>,
-     }
- }
- 
- ast_struct! {
-     /// A type ascription expression: `foo: f64`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprType #full {
-         pub attrs: Vec<Attribute>,
-         pub expr: Box<Expr>,
-         pub colon_token: Token![:],
-         pub ty: Box<Type>,
-     }
- }
- 
- ast_struct! {
-     /// A unary operation: `!x`, `*x`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct ExprUnary {
-         pub attrs: Vec<Attribute>,
-         pub op: UnOp,
-         pub expr: Box<Expr>,
-     }
- }
- 
- ast_struct! {
-     /// An unsafe block: `unsafe { ... }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprUnsafe #full {
-         pub attrs: Vec<Attribute>,
-         pub unsafe_token: Token![unsafe],
-         pub block: Block,
-     }
- }
- 
- ast_struct! {
-     /// A while loop: `while expr { ... }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprWhile #full {
-         pub attrs: Vec<Attribute>,
-         pub label: Option<Label>,
-         pub while_token: Token![while],
-         pub cond: Box<Expr>,
-         pub body: Block,
-     }
- }
- 
- ast_struct! {
-     /// A yield expression: `yield expr`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ExprYield #full {
-         pub attrs: Vec<Attribute>,
-         pub yield_token: Token![yield],
-         pub expr: Option<Box<Expr>>,
-     }
- }
- 
--#[cfg(feature = "extra-traits")]
--impl Eq for Expr {}
--
--#[cfg(feature = "extra-traits")]
--impl PartialEq for Expr {
--    fn eq(&self, other: &Self) -> bool {
--        match (self, other) {
--            (Expr::Array(this), Expr::Array(other)) => this == other,
--            (Expr::Assign(this), Expr::Assign(other)) => this == other,
--            (Expr::AssignOp(this), Expr::AssignOp(other)) => this == other,
--            (Expr::Async(this), Expr::Async(other)) => this == other,
--            (Expr::Await(this), Expr::Await(other)) => this == other,
--            (Expr::Binary(this), Expr::Binary(other)) => this == other,
--            (Expr::Block(this), Expr::Block(other)) => this == other,
--            (Expr::Box(this), Expr::Box(other)) => this == other,
--            (Expr::Break(this), Expr::Break(other)) => this == other,
--            (Expr::Call(this), Expr::Call(other)) => this == other,
--            (Expr::Cast(this), Expr::Cast(other)) => this == other,
--            (Expr::Closure(this), Expr::Closure(other)) => this == other,
--            (Expr::Continue(this), Expr::Continue(other)) => this == other,
--            (Expr::Field(this), Expr::Field(other)) => this == other,
--            (Expr::ForLoop(this), Expr::ForLoop(other)) => this == other,
--            (Expr::Group(this), Expr::Group(other)) => this == other,
--            (Expr::If(this), Expr::If(other)) => this == other,
--            (Expr::Index(this), Expr::Index(other)) => this == other,
--            (Expr::Let(this), Expr::Let(other)) => this == other,
--            (Expr::Lit(this), Expr::Lit(other)) => this == other,
--            (Expr::Loop(this), Expr::Loop(other)) => this == other,
--            (Expr::Macro(this), Expr::Macro(other)) => this == other,
--            (Expr::Match(this), Expr::Match(other)) => this == other,
--            (Expr::MethodCall(this), Expr::MethodCall(other)) => this == other,
--            (Expr::Paren(this), Expr::Paren(other)) => this == other,
--            (Expr::Path(this), Expr::Path(other)) => this == other,
--            (Expr::Range(this), Expr::Range(other)) => this == other,
--            (Expr::Reference(this), Expr::Reference(other)) => this == other,
--            (Expr::Repeat(this), Expr::Repeat(other)) => this == other,
--            (Expr::Return(this), Expr::Return(other)) => this == other,
--            (Expr::Struct(this), Expr::Struct(other)) => this == other,
--            (Expr::Try(this), Expr::Try(other)) => this == other,
--            (Expr::TryBlock(this), Expr::TryBlock(other)) => this == other,
--            (Expr::Tuple(this), Expr::Tuple(other)) => this == other,
--            (Expr::Type(this), Expr::Type(other)) => this == other,
--            (Expr::Unary(this), Expr::Unary(other)) => this == other,
--            (Expr::Unsafe(this), Expr::Unsafe(other)) => this == other,
--            (Expr::Verbatim(this), Expr::Verbatim(other)) => {
--                TokenStreamHelper(this) == TokenStreamHelper(other)
--            }
--            (Expr::While(this), Expr::While(other)) => this == other,
--            (Expr::Yield(this), Expr::Yield(other)) => this == other,
--            _ => false,
--        }
--    }
--}
--
--#[cfg(feature = "extra-traits")]
--impl Hash for Expr {
--    fn hash<H>(&self, hash: &mut H)
--    where
--        H: Hasher,
--    {
--        match self {
--            Expr::Array(expr) => {
--                hash.write_u8(0);
--                expr.hash(hash);
--            }
--            Expr::Assign(expr) => {
--                hash.write_u8(1);
--                expr.hash(hash);
--            }
--            Expr::AssignOp(expr) => {
--                hash.write_u8(2);
--                expr.hash(hash);
--            }
--            Expr::Async(expr) => {
--                hash.write_u8(3);
--                expr.hash(hash);
--            }
--            Expr::Await(expr) => {
--                hash.write_u8(4);
--                expr.hash(hash);
--            }
--            Expr::Binary(expr) => {
--                hash.write_u8(5);
--                expr.hash(hash);
--            }
--            Expr::Block(expr) => {
--                hash.write_u8(6);
--                expr.hash(hash);
--            }
--            Expr::Box(expr) => {
--                hash.write_u8(7);
--                expr.hash(hash);
--            }
--            Expr::Break(expr) => {
--                hash.write_u8(8);
--                expr.hash(hash);
--            }
--            Expr::Call(expr) => {
--                hash.write_u8(9);
--                expr.hash(hash);
--            }
--            Expr::Cast(expr) => {
--                hash.write_u8(10);
--                expr.hash(hash);
--            }
--            Expr::Closure(expr) => {
--                hash.write_u8(11);
--                expr.hash(hash);
--            }
--            Expr::Continue(expr) => {
--                hash.write_u8(12);
--                expr.hash(hash);
--            }
--            Expr::Field(expr) => {
--                hash.write_u8(13);
--                expr.hash(hash);
--            }
--            Expr::ForLoop(expr) => {
--                hash.write_u8(14);
--                expr.hash(hash);
--            }
--            Expr::Group(expr) => {
--                hash.write_u8(15);
--                expr.hash(hash);
--            }
--            Expr::If(expr) => {
--                hash.write_u8(16);
--                expr.hash(hash);
--            }
--            Expr::Index(expr) => {
--                hash.write_u8(17);
--                expr.hash(hash);
--            }
--            Expr::Let(expr) => {
--                hash.write_u8(18);
--                expr.hash(hash);
--            }
--            Expr::Lit(expr) => {
--                hash.write_u8(19);
--                expr.hash(hash);
--            }
--            Expr::Loop(expr) => {
--                hash.write_u8(20);
--                expr.hash(hash);
--            }
--            Expr::Macro(expr) => {
--                hash.write_u8(21);
--                expr.hash(hash);
--            }
--            Expr::Match(expr) => {
--                hash.write_u8(22);
--                expr.hash(hash);
--            }
--            Expr::MethodCall(expr) => {
--                hash.write_u8(23);
--                expr.hash(hash);
--            }
--            Expr::Paren(expr) => {
--                hash.write_u8(24);
--                expr.hash(hash);
--            }
--            Expr::Path(expr) => {
--                hash.write_u8(25);
--                expr.hash(hash);
--            }
--            Expr::Range(expr) => {
--                hash.write_u8(26);
--                expr.hash(hash);
--            }
--            Expr::Reference(expr) => {
--                hash.write_u8(27);
--                expr.hash(hash);
--            }
--            Expr::Repeat(expr) => {
--                hash.write_u8(28);
--                expr.hash(hash);
--            }
--            Expr::Return(expr) => {
--                hash.write_u8(29);
--                expr.hash(hash);
--            }
--            Expr::Struct(expr) => {
--                hash.write_u8(30);
--                expr.hash(hash);
--            }
--            Expr::Try(expr) => {
--                hash.write_u8(31);
--                expr.hash(hash);
--            }
--            Expr::TryBlock(expr) => {
--                hash.write_u8(32);
--                expr.hash(hash);
--            }
--            Expr::Tuple(expr) => {
--                hash.write_u8(33);
--                expr.hash(hash);
--            }
--            Expr::Type(expr) => {
--                hash.write_u8(34);
--                expr.hash(hash);
--            }
--            Expr::Unary(expr) => {
--                hash.write_u8(35);
--                expr.hash(hash);
--            }
--            Expr::Unsafe(expr) => {
--                hash.write_u8(36);
--                expr.hash(hash);
--            }
--            Expr::Verbatim(expr) => {
--                hash.write_u8(37);
--                TokenStreamHelper(expr).hash(hash);
--            }
--            Expr::While(expr) => {
--                hash.write_u8(38);
--                expr.hash(hash);
--            }
--            Expr::Yield(expr) => {
--                hash.write_u8(39);
--                expr.hash(hash);
--            }
--            Expr::__Nonexhaustive => unreachable!(),
--        }
--    }
--}
--
- impl Expr {
-     #[cfg(all(feature = "parsing", feature = "full"))]
-     pub(crate) fn replace_attrs(&mut self, new: Vec<Attribute>) -> Vec<Attribute> {
-         match self {
-             Expr::Box(ExprBox { attrs, .. })
-             | Expr::Array(ExprArray { attrs, .. })
-             | Expr::Call(ExprCall { attrs, .. })
-             | Expr::MethodCall(ExprMethodCall { attrs, .. })
-@@ -991,107 +768,145 @@ impl Expr {
-         }
-     }
- }
- 
- 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"`
-+    /// *This type is available only 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),
-     }
- }
- 
-+impl Eq for Member {}
-+
-+impl PartialEq for Member {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (Member::Named(this), Member::Named(other)) => this == other,
-+            (Member::Unnamed(this), Member::Unnamed(other)) => this == other,
-+            _ => false,
-+        }
-+    }
-+}
-+
-+impl Hash for Member {
-+    fn hash<H: Hasher>(&self, state: &mut H) {
-+        match self {
-+            Member::Named(m) => m.hash(state),
-+            Member::Unnamed(m) => m.hash(state),
-+        }
-+    }
-+}
-+
-+#[cfg(feature = "printing")]
-+impl IdentFragment for Member {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            Member::Named(m) => Display::fmt(m, formatter),
-+            Member::Unnamed(m) => Display::fmt(&m.index, formatter),
-+        }
-+    }
-+
-+    fn span(&self) -> Option<Span> {
-+        match self {
-+            Member::Named(m) => Some(m.span()),
-+            Member::Unnamed(m) => Some(m.span),
-+        }
-+    }
-+}
-+
- ast_struct! {
-     /// The index of an unnamed tuple struct field.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-+    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
-     /// feature.*
--    pub struct Index #manual_extra_traits {
-+    pub struct Index {
-         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! {
--    #[derive(Default)]
--    pub struct Reserved {
--        private: (),
-+#[cfg(feature = "printing")]
-+impl IdentFragment for Index {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        Display::fmt(&self.index, formatter)
-+    }
-+
-+    fn span(&self) -> Option<Span> {
-+        Some(self.span)
-     }
- }
- 
- #[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.*
-+    /// *This type is available only 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.*
-+    /// *This type is available only 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.*
-+    /// *This type is available only 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
-@@ -1102,17 +917,17 @@ ast_struct! {
-         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.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct Label {
-         pub name: Lifetime,
-         pub colon_token: Token![:],
-     }
- }
- 
- #[cfg(feature = "full")]
- ast_struct! {
-@@ -1129,45 +944,44 @@ ast_struct! {
-     ///     }
-     ///     // ...
-     ///     # _ => {}
-     /// }
-     /// #   false
-     /// # }
-     /// ```
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct Arm {
-         pub attrs: Vec<Attribute>,
-         pub pat: Pat,
-         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))]
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub enum RangeLimits {
-         /// Inclusive at the beginning, exclusive at the end.
-         HalfOpen(Token![..]),
-         /// Inclusive at the beginning and end.
-         Closed(Token![..=]),
-     }
- }
- 
- #[cfg(any(feature = "parsing", feature = "printing"))]
- #[cfg(feature = "full")]
- pub(crate) fn requires_terminator(expr: &Expr) -> bool {
--    // see https://github.com/rust-lang/rust/blob/eb8f2586e/src/libsyntax/parse/classify.rs#L17-L37
-+    // see https://github.com/rust-lang/rust/blob/2679c38fc/src/librustc_ast/util/classify.rs#L7-L25
-     match *expr {
-         Expr::Unsafe(..)
-         | Expr::Block(..)
-         | Expr::If(..)
-         | Expr::Match(..)
-         | Expr::While(..)
-         | Expr::Loop(..)
-         | Expr::ForLoop(..)
-@@ -1178,26 +992,27 @@ pub(crate) fn requires_terminator(expr: 
- }
- 
- #[cfg(feature = "parsing")]
- pub(crate) mod parsing {
-     use super::*;
- 
-     use crate::parse::{Parse, ParseStream, Result};
-     use crate::path;
-+    use std::cmp::Ordering;
-+
-+    crate::custom_keyword!(raw);
- 
-     // 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
--    #[derive(Copy, Clone)]
-     pub struct AllowStruct(bool);
- 
--    #[derive(Copy, Clone, PartialEq, PartialOrd)]
-     enum Precedence {
-         Any,
-         Assign,
-         Range,
-         Or,
-         And,
-         Compare,
-         BitOr,
-@@ -1241,19 +1056,131 @@ pub(crate) mod parsing {
-     }
- 
-     impl Parse for Expr {
-         fn parse(input: ParseStream) -> Result<Self> {
-             ambiguous_expr(input, AllowStruct(true))
-         }
-     }
- 
--    #[cfg(feature = "full")]
--    fn expr_no_struct(input: ParseStream) -> Result<Expr> {
--        ambiguous_expr(input, AllowStruct(false))
-+    impl Expr {
-+        /// An alternative to the primary `Expr::parse` parser (from the
-+        /// [`Parse`] trait) for ambiguous syntactic positions in which a
-+        /// trailing brace should not be taken as part of the expression.
-+        ///
-+        /// Rust grammar has an ambiguity where braces sometimes turn a path
-+        /// expression into a struct initialization and sometimes do not. In the
-+        /// following code, the expression `S {}` is one expression. Presumably
-+        /// there is an empty struct `struct S {}` defined somewhere which it is
-+        /// instantiating.
-+        ///
-+        /// ```
-+        /// # struct S;
-+        /// # impl std::ops::Deref for S {
-+        /// #     type Target = bool;
-+        /// #     fn deref(&self) -> &Self::Target {
-+        /// #         &true
-+        /// #     }
-+        /// # }
-+        /// let _ = *S {};
-+        ///
-+        /// // parsed by rustc as: `*(S {})`
-+        /// ```
-+        ///
-+        /// We would want to parse the above using `Expr::parse` after the `=`
-+        /// token.
-+        ///
-+        /// But in the following, `S {}` is *not* a struct init expression.
-+        ///
-+        /// ```
-+        /// # const S: &bool = &true;
-+        /// if *S {} {}
-+        ///
-+        /// // parsed by rustc as:
-+        /// //
-+        /// //    if (*S) {
-+        /// //        /* empty block */
-+        /// //    }
-+        /// //    {
-+        /// //        /* another empty block */
-+        /// //    }
-+        /// ```
-+        ///
-+        /// For that reason we would want to parse if-conditions using
-+        /// `Expr::parse_without_eager_brace` after the `if` token. Same for
-+        /// similar syntactic positions such as the condition expr after a
-+        /// `while` token or the expr at the top of a `match`.
-+        ///
-+        /// The Rust grammar's choices around which way this ambiguity is
-+        /// resolved at various syntactic positions is fairly arbitrary. Really
-+        /// either parse behavior could work in most positions, and language
-+        /// designers just decide each case based on which is more likely to be
-+        /// what the programmer had in mind most of the time.
-+        ///
-+        /// ```
-+        /// # struct S;
-+        /// # fn doc() -> S {
-+        /// if return S {} {}
-+        /// # unreachable!()
-+        /// # }
-+        ///
-+        /// // parsed by rustc as:
-+        /// //
-+        /// //    if (return (S {})) {
-+        /// //    }
-+        /// //
-+        /// // but could equally well have been this other arbitrary choice:
-+        /// //
-+        /// //    if (return S) {
-+        /// //    }
-+        /// //    {}
-+        /// ```
-+        ///
-+        /// Note the grammar ambiguity on trailing braces is distinct from
-+        /// precedence and is not captured by assigning a precedence level to
-+        /// the braced struct init expr in relation to other operators. This can
-+        /// be illustrated by `return 0..S {}` vs `match 0..S {}`. The former
-+        /// parses as `return (0..(S {}))` implying tighter precedence for
-+        /// struct init than `..`, while the latter parses as `match (0..S) {}`
-+        /// implying tighter precedence for `..` than struct init, a
-+        /// contradiction.
-+        #[cfg(feature = "full")]
-+        pub fn parse_without_eager_brace(input: ParseStream) -> Result<Expr> {
-+            ambiguous_expr(input, AllowStruct(false))
-+        }
-+    }
-+
-+    impl Copy for AllowStruct {}
-+
-+    impl Clone for AllowStruct {
-+        fn clone(&self) -> Self {
-+            *self
-+        }
-+    }
-+
-+    impl Copy for Precedence {}
-+
-+    impl Clone for Precedence {
-+        fn clone(&self) -> Self {
-+            *self
-+        }
-+    }
-+
-+    impl PartialEq for Precedence {
-+        fn eq(&self, other: &Self) -> bool {
-+            *self as u8 == *other as u8
-+        }
-+    }
-+
-+    impl PartialOrd for Precedence {
-+        fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-+            let this = *self as u8;
-+            let other = *other as u8;
-+            Some(this.cmp(&other))
-+        }
-     }
- 
-     #[cfg(feature = "full")]
-     fn parse_expr(
-         input: ParseStream,
-         mut lhs: Expr,
-         allow_struct: AllowStruct,
-         base: Precedence,
-@@ -1425,88 +1352,114 @@ pub(crate) mod parsing {
-     }
- 
-     // Parse an arbitrary expression.
-     fn ambiguous_expr(input: ParseStream, allow_struct: AllowStruct) -> Result<Expr> {
-         let lhs = unary_expr(input, allow_struct)?;
-         parse_expr(input, lhs, allow_struct, Precedence::Any)
-     }
- 
-+    #[cfg(feature = "full")]
-+    fn expr_attrs(input: ParseStream) -> Result<Vec<Attribute>> {
-+        let mut attrs = Vec::new();
-+        loop {
-+            if input.peek(token::Group) {
-+                let ahead = input.fork();
-+                let group = crate::group::parse_group(&ahead)?;
-+                if !group.content.peek(Token![#]) || group.content.peek2(Token![!]) {
-+                    break;
-+                }
-+                let attr = group.content.call(attr::parsing::single_parse_outer)?;
-+                if !group.content.is_empty() {
-+                    break;
-+                }
-+                attrs.push(attr);
-+            } else if input.peek(Token![#]) {
-+                attrs.push(input.call(attr::parsing::single_parse_outer)?);
-+            } else {
-+                break;
-+            }
-+        }
-+        Ok(attrs)
-+    }
-+
-     // <UnOp> <trailer>
-     // & <trailer>
-     // &mut <trailer>
-     // box <trailer>
-     #[cfg(feature = "full")]
-     fn unary_expr(input: ParseStream, allow_struct: AllowStruct) -> Result<Expr> {
--        // TODO: optimize using advance_to
--        let ahead = input.fork();
--        ahead.call(Attribute::parse_outer)?;
--        if ahead.peek(Token![&])
--            || ahead.peek(Token![box])
--            || ahead.peek(Token![*])
--            || ahead.peek(Token![!])
--            || ahead.peek(Token![-])
--        {
--            let attrs = input.call(Attribute::parse_outer)?;
--            if input.peek(Token![&]) {
-+        let begin = input.fork();
-+        let attrs = input.call(expr_attrs)?;
-+        if input.peek(Token![&]) {
-+            let and_token: Token![&] = input.parse()?;
-+            let raw: Option<raw> =
-+                if input.peek(raw) && (input.peek2(Token![mut]) || input.peek2(Token![const])) {
-+                    Some(input.parse()?)
-+                } else {
-+                    None
-+                };
-+            let mutability: Option<Token![mut]> = input.parse()?;
-+            if raw.is_some() && mutability.is_none() {
-+                input.parse::<Token![const]>()?;
-+            }
-+            let expr = Box::new(unary_expr(input, allow_struct)?);
-+            if raw.is_some() {
-+                Ok(Expr::Verbatim(verbatim::between(begin, input)))
-+            } else {
-                 Ok(Expr::Reference(ExprReference {
-                     attrs,
--                    and_token: input.parse()?,
-+                    and_token,
-                     raw: Reserved::default(),
--                    mutability: input.parse()?,
--                    expr: Box::new(unary_expr(input, allow_struct)?),
--                }))
--            } else if input.peek(Token![box]) {
--                Ok(Expr::Box(ExprBox {
--                    attrs,
--                    box_token: input.parse()?,
--                    expr: Box::new(unary_expr(input, allow_struct)?),
--                }))
--            } else {
--                Ok(Expr::Unary(ExprUnary {
--                    attrs,
--                    op: input.parse()?,
--                    expr: Box::new(unary_expr(input, allow_struct)?),
-+                    mutability,
-+                    expr,
-                 }))
-             }
-+        } else if input.peek(Token![box]) {
-+            Ok(Expr::Box(ExprBox {
-+                attrs,
-+                box_token: input.parse()?,
-+                expr: Box::new(unary_expr(input, allow_struct)?),
-+            }))
-+        } else if input.peek(Token![*]) || input.peek(Token![!]) || input.peek(Token![-]) {
-+            Ok(Expr::Unary(ExprUnary {
-+                attrs,
-+                op: input.parse()?,
-+                expr: Box::new(unary_expr(input, allow_struct)?),
-+            }))
-         } else {
--            trailer_expr(input, allow_struct)
-+            trailer_expr(attrs, input, allow_struct)
-         }
-     }
- 
-     #[cfg(not(feature = "full"))]
-     fn unary_expr(input: ParseStream, allow_struct: AllowStruct) -> Result<Expr> {
--        // TODO: optimize using advance_to
--        let ahead = input.fork();
--        ahead.call(Attribute::parse_outer)?;
--        if ahead.peek(Token![*]) || ahead.peek(Token![!]) || ahead.peek(Token![-]) {
-+        if input.peek(Token![*]) || input.peek(Token![!]) || input.peek(Token![-]) {
-             Ok(Expr::Unary(ExprUnary {
--                attrs: input.call(Attribute::parse_outer)?,
-+                attrs: Vec::new(),
-                 op: input.parse()?,
-                 expr: Box::new(unary_expr(input, allow_struct)?),
-             }))
-         } else {
-             trailer_expr(input, allow_struct)
-         }
-     }
- 
-     // <atom> (..<args>) ...
-     // <atom> . <ident> (..<args>) ...
-     // <atom> . <ident> ...
-     // <atom> . <lit> ...
-     // <atom> [ <expr> ] ...
-     // <atom> ? ...
-     #[cfg(feature = "full")]
--    fn trailer_expr(input: ParseStream, allow_struct: AllowStruct) -> Result<Expr> {
--        if input.peek(token::Group) {
--            return input.call(expr_group).map(Expr::Group);
--        }
--
--        let outer_attrs = input.call(Attribute::parse_outer)?;
--
-+    fn trailer_expr(
-+        outer_attrs: Vec<Attribute>,
-+        input: ParseStream,
-+        allow_struct: AllowStruct,
-+    ) -> Result<Expr> {
-         let atom = atom_expr(input, allow_struct)?;
-         let mut e = trailer_helper(input, atom)?;
- 
-         let inner_attrs = e.replace_attrs(Vec::new());
-         let attrs = private::attrs(outer_attrs, inner_attrs);
-         e.replace_attrs(attrs);
-         Ok(e)
-     }
-@@ -1518,28 +1471,36 @@ pub(crate) mod parsing {
-                 let content;
-                 e = Expr::Call(ExprCall {
-                     attrs: Vec::new(),
-                     func: Box::new(e),
-                     paren_token: parenthesized!(content in input),
-                     args: content.parse_terminated(Expr::parse)?,
-                 });
-             } else if input.peek(Token![.]) && !input.peek(Token![..]) {
--                let dot_token: Token![.] = input.parse()?;
-+                let mut dot_token: Token![.] = input.parse()?;
- 
--                if input.peek(token::Await) {
-+                let await_token: Option<token::Await> = input.parse()?;
-+                if let Some(await_token) = await_token {
-                     e = Expr::Await(ExprAwait {
-                         attrs: Vec::new(),
-                         base: Box::new(e),
-                         dot_token,
--                        await_token: input.parse()?,
-+                        await_token,
-                     });
-                     continue;
-                 }
- 
-+                let float_token: Option<LitFloat> = input.parse()?;
-+                if let Some(float_token) = float_token {
-+                    if multi_index(&mut e, &mut dot_token, float_token)? {
-+                        continue;
-+                    }
-+                }
-+
-                 let member: Member = input.parse()?;
-                 let turbofish = if member.is_named() && input.peek(Token![::]) {
-                     Some(MethodTurbofish {
-                         colon2_token: input.parse()?,
-                         lt_token: input.parse()?,
-                         args: {
-                             let mut args = Punctuated::new();
-                             loop {
-@@ -1615,20 +1576,27 @@ pub(crate) mod parsing {
-                 e = Expr::Call(ExprCall {
-                     attrs: Vec::new(),
-                     func: Box::new(e),
-                     paren_token: parenthesized!(content in input),
-                     args: content.parse_terminated(Expr::parse)?,
-                 });
-             } else if input.peek(Token![.]) && !input.peek(Token![..]) && !input.peek2(token::Await)
-             {
-+                let mut dot_token: Token![.] = input.parse()?;
-+                let float_token: Option<LitFloat> = input.parse()?;
-+                if let Some(float_token) = float_token {
-+                    if multi_index(&mut e, &mut dot_token, float_token)? {
-+                        continue;
-+                    }
-+                }
-                 e = Expr::Field(ExprField {
-                     attrs: Vec::new(),
-                     base: Box::new(e),
--                    dot_token: input.parse()?,
-+                    dot_token,
-                     member: input.parse()?,
-                 });
-             } else if input.peek(token::Bracket) {
-                 let content;
-                 e = Expr::Index(ExprIndex {
-                     attrs: Vec::new(),
-                     expr: Box::new(e),
-                     bracket_token: bracketed!(content in input),
-@@ -1641,17 +1609,21 @@ pub(crate) mod parsing {
- 
-         Ok(e)
-     }
- 
-     // Parse all atomic expressions which don't have to worry about precedence
-     // interactions, as they are fully contained.
-     #[cfg(feature = "full")]
-     fn atom_expr(input: ParseStream, allow_struct: AllowStruct) -> Result<Expr> {
--        if input.peek(token::Group) {
-+        if input.peek(token::Group)
-+            && !input.peek2(Token![::])
-+            && !input.peek2(Token![!])
-+            && !input.peek2(token::Brace)
-+        {
-             input.call(expr_group).map(Expr::Group)
-         } else if input.peek(Lit) {
-             input.parse().map(Expr::Lit)
-         } else if input.peek(Token![async])
-             && (input.peek2(token::Brace) || input.peek2(Token![move]) && input.peek3(token::Brace))
-         {
-             input.call(expr_async).map(Expr::Async)
-         } else if input.peek(Token![try]) && input.peek2(token::Brace) {
-@@ -1663,17 +1635,16 @@ pub(crate) mod parsing {
-         {
-             expr_closure(input, allow_struct).map(Expr::Closure)
-         } else if input.peek(Ident)
-             || input.peek(Token![::])
-             || input.peek(Token![<])
-             || input.peek(Token![self])
-             || input.peek(Token![Self])
-             || input.peek(Token![super])
--            || input.peek(Token![extern])
-             || input.peek(Token![crate])
-         {
-             path_or_macro_or_struct(input, allow_struct)
-         } else if input.peek(token::Paren) {
-             paren_or_tuple(input)
-         } else if input.peek(Token![break]) {
-             expr_break(input, allow_struct).map(Expr::Break)
-         } else if input.peek(Token![continue]) {
-@@ -1735,17 +1706,16 @@ pub(crate) mod parsing {
-         } else if input.peek(token::Paren) {
-             input.call(expr_paren).map(Expr::Paren)
-         } else if input.peek(Ident)
-             || input.peek(Token![::])
-             || input.peek(Token![<])
-             || input.peek(Token![self])
-             || input.peek(Token![Self])
-             || input.peek(Token![super])
--            || input.peek(Token![extern])
-             || input.peek(Token![crate])
-         {
-             input.parse().map(Expr::Path)
-         } else {
-             Err(input.error("unsupported expression; enable syn's features=[\"full\"]"))
-         }
-     }
- 
-@@ -1873,17 +1843,17 @@ pub(crate) mod parsing {
-             }))
-         } else {
-             Err(content.error("expected `,` or `;`"))
-         }
-     }
- 
-     #[cfg(feature = "full")]
-     pub(crate) fn expr_early(input: ParseStream) -> Result<Expr> {
--        let mut attrs = input.call(Attribute::parse_outer)?;
-+        let mut attrs = input.call(expr_attrs)?;
-         let mut expr = if input.peek(Token![if]) {
-             Expr::If(input.parse()?)
-         } else if input.peek(Token![while]) {
-             Expr::While(input.parse()?)
-         } else if input.peek(Token![for]) {
-             Expr::ForLoop(input.parse()?)
-         } else if input.peek(Token![loop]) {
-             Expr::Loop(input.parse()?)
-@@ -1900,17 +1870,17 @@ pub(crate) mod parsing {
-             let mut expr = unary_expr(input, allow_struct)?;
- 
-             attrs.extend(expr.replace_attrs(Vec::new()));
-             expr.replace_attrs(attrs);
- 
-             return parse_expr(input, expr, allow_struct, Precedence::Any);
-         };
- 
--        if input.peek(Token![.]) || input.peek(Token![?]) {
-+        if input.peek(Token![.]) && !input.peek(Token![..]) || input.peek(Token![?]) {
-             expr = trailer_helper(input, expr)?;
- 
-             attrs.extend(expr.replace_attrs(Vec::new()));
-             expr.replace_attrs(attrs);
- 
-             let allow_struct = AllowStruct(true);
-             return parse_expr(input, expr, allow_struct, Precedence::Any);
-         }
-@@ -1946,63 +1916,48 @@ pub(crate) mod parsing {
-             attrs: Vec::new(),
-             paren_token: parenthesized!(content in input),
-             expr: content.parse()?,
-         })
-     }
- 
-     #[cfg(feature = "full")]
-     fn generic_method_argument(input: ParseStream) -> Result<GenericMethodArgument> {
--        // TODO parse const generics as well
-+        if input.peek(Lit) {
-+            let lit = input.parse()?;
-+            return Ok(GenericMethodArgument::Const(Expr::Lit(lit)));
-+        }
-+
-+        if input.peek(token::Brace) {
-+            let block = input.call(expr::parsing::expr_block)?;
-+            return Ok(GenericMethodArgument::Const(Expr::Block(block)));
-+        }
-+
-         input.parse().map(GenericMethodArgument::Type)
-     }
- 
-     #[cfg(feature = "full")]
-     fn expr_let(input: ParseStream) -> Result<ExprLet> {
-         Ok(ExprLet {
-             attrs: Vec::new(),
-             let_token: input.parse()?,
--            pat: {
--                let leading_vert: Option<Token![|]> = input.parse()?;
--                let pat: Pat = input.parse()?;
--                if leading_vert.is_some()
--                    || input.peek(Token![|]) && !input.peek(Token![||]) && !input.peek(Token![|=])
--                {
--                    let mut cases = Punctuated::new();
--                    cases.push_value(pat);
--                    while input.peek(Token![|])
--                        && !input.peek(Token![||])
--                        && !input.peek(Token![|=])
--                    {
--                        let punct = input.parse()?;
--                        cases.push_punct(punct);
--                        let pat: Pat = input.parse()?;
--                        cases.push_value(pat);
--                    }
--                    Pat::Or(PatOr {
--                        attrs: Vec::new(),
--                        leading_vert,
--                        cases,
--                    })
--                } else {
--                    pat
--                }
--            },
-+            pat: pat::parsing::multi_pat_with_leading_vert(input)?,
-             eq_token: input.parse()?,
--            expr: Box::new(input.call(expr_no_struct)?),
-+            expr: Box::new(input.call(Expr::parse_without_eager_brace)?),
-         })
-     }
- 
-     #[cfg(feature = "full")]
-     impl Parse for ExprIf {
-         fn parse(input: ParseStream) -> Result<Self> {
-+            let attrs = input.call(Attribute::parse_outer)?;
-             Ok(ExprIf {
--                attrs: Vec::new(),
-+                attrs,
-                 if_token: input.parse()?,
--                cond: Box::new(input.call(expr_no_struct)?),
-+                cond: Box::new(input.call(Expr::parse_without_eager_brace)?),
-                 then_branch: input.parse()?,
-                 else_branch: {
-                     if input.peek(Token![else]) {
-                         Some(input.call(else_block)?)
-                     } else {
-                         None
-                     }
-                 },
-@@ -2028,94 +1983,81 @@ pub(crate) mod parsing {
-         };
- 
-         Ok((else_token, Box::new(else_branch)))
-     }
- 
-     #[cfg(feature = "full")]
-     impl Parse for ExprForLoop {
-         fn parse(input: ParseStream) -> Result<Self> {
-+            let outer_attrs = input.call(Attribute::parse_outer)?;
-             let label: Option<Label> = input.parse()?;
-             let for_token: Token![for] = input.parse()?;
- 
--            let leading_vert: Option<Token![|]> = input.parse()?;
--            let mut pat: Pat = input.parse()?;
--            if leading_vert.is_some() || input.peek(Token![|]) {
--                let mut cases = Punctuated::new();
--                cases.push_value(pat);
--                while input.peek(Token![|]) {
--                    let punct = input.parse()?;
--                    cases.push_punct(punct);
--                    let pat: Pat = input.parse()?;
--                    cases.push_value(pat);
--                }
--                pat = Pat::Or(PatOr {
--                    attrs: Vec::new(),
--                    leading_vert,
--                    cases,
--                });
--            }
-+            let pat = pat::parsing::multi_pat_with_leading_vert(input)?;
- 
-             let in_token: Token![in] = input.parse()?;
--            let expr: Expr = input.call(expr_no_struct)?;
-+            let expr: Expr = input.call(Expr::parse_without_eager_brace)?;
- 
-             let content;
-             let brace_token = braced!(content in input);
-             let inner_attrs = content.call(Attribute::parse_inner)?;
-             let stmts = content.call(Block::parse_within)?;
- 
-             Ok(ExprForLoop {
--                attrs: inner_attrs,
-+                attrs: private::attrs(outer_attrs, inner_attrs),
-                 label,
-                 for_token,
-                 pat,
-                 in_token,
-                 expr: Box::new(expr),
-                 body: Block { brace_token, stmts },
-             })
-         }
-     }
- 
-     #[cfg(feature = "full")]
-     impl Parse for ExprLoop {
-         fn parse(input: ParseStream) -> Result<Self> {
-+            let outer_attrs = input.call(Attribute::parse_outer)?;
-             let label: Option<Label> = input.parse()?;
-             let loop_token: Token![loop] = input.parse()?;
- 
-             let content;
-             let brace_token = braced!(content in input);
-             let inner_attrs = content.call(Attribute::parse_inner)?;
-             let stmts = content.call(Block::parse_within)?;
- 
-             Ok(ExprLoop {
--                attrs: inner_attrs,
-+                attrs: private::attrs(outer_attrs, inner_attrs),
-                 label,
-                 loop_token,
-                 body: Block { brace_token, stmts },
-             })
-         }
-     }
- 
-     #[cfg(feature = "full")]
-     impl Parse for ExprMatch {
-         fn parse(input: ParseStream) -> Result<Self> {
-+            let outer_attrs = input.call(Attribute::parse_outer)?;
-             let match_token: Token![match] = input.parse()?;
--            let expr = expr_no_struct(input)?;
-+            let expr = Expr::parse_without_eager_brace(input)?;
- 
-             let content;
-             let brace_token = braced!(content in input);
-             let inner_attrs = content.call(Attribute::parse_inner)?;
- 
-             let mut arms = Vec::new();
-             while !content.is_empty() {
-                 arms.push(content.call(Arm::parse)?);
-             }
- 
-             Ok(ExprMatch {
--                attrs: inner_attrs,
-+                attrs: private::attrs(outer_attrs, inner_attrs),
-                 match_token,
-                 expr: Box::new(expr),
-                 brace_token,
-                 arms,
-             })
-         }
-     }
- 
-@@ -2300,27 +2242,28 @@ pub(crate) mod parsing {
-             }
-             Ok(pat)
-         }
-     }
- 
-     #[cfg(feature = "full")]
-     impl Parse for ExprWhile {
-         fn parse(input: ParseStream) -> Result<Self> {
-+            let outer_attrs = input.call(Attribute::parse_outer)?;
-             let label: Option<Label> = input.parse()?;
-             let while_token: Token![while] = input.parse()?;
--            let cond = expr_no_struct(input)?;
-+            let cond = Expr::parse_without_eager_brace(input)?;
- 
-             let content;
-             let brace_token = braced!(content in input);
-             let inner_attrs = content.call(Attribute::parse_inner)?;
-             let stmts = content.call(Block::parse_within)?;
- 
-             Ok(ExprWhile {
--                attrs: inner_attrs,
-+                attrs: private::attrs(outer_attrs, inner_attrs),
-                 label,
-                 while_token,
-                 cond: Box::new(cond),
-                 body: Block { brace_token, stmts },
-             })
-         }
-     }
- 
-@@ -2394,16 +2337,17 @@ pub(crate) mod parsing {
-                 }
-             },
-         })
-     }
- 
-     #[cfg(feature = "full")]
-     impl Parse for FieldValue {
-         fn parse(input: ParseStream) -> Result<Self> {
-+            let attrs = input.call(Attribute::parse_outer)?;
-             let member: Member = input.parse()?;
-             let (colon_token, value) = if input.peek(Token![:]) || !member.is_named() {
-                 let colon_token: Token![:] = input.parse()?;
-                 let value: Expr = input.parse()?;
-                 (Some(colon_token), value)
-             } else if let Member::Named(ident) = &member {
-                 let value = Expr::Path(ExprPath {
-                     attrs: Vec::new(),
-@@ -2411,73 +2355,63 @@ pub(crate) mod parsing {
-                     path: Path::from(ident.clone()),
-                 });
-                 (None, value)
-             } else {
-                 unreachable!()
-             };
- 
-             Ok(FieldValue {
--                attrs: Vec::new(),
-+                attrs,
-                 member,
-                 colon_token,
-                 expr: value,
-             })
-         }
-     }
- 
-     #[cfg(feature = "full")]
-     fn expr_struct_helper(
-         input: ParseStream,
-         outer_attrs: Vec<Attribute>,
-         path: Path,
-     ) -> Result<ExprStruct> {
-         let content;
-         let brace_token = braced!(content in input);
-         let inner_attrs = content.call(Attribute::parse_inner)?;
-+        let attrs = private::attrs(outer_attrs, inner_attrs);
- 
-         let mut fields = Punctuated::new();
--        loop {
--            let attrs = content.call(Attribute::parse_outer)?;
--            // TODO: optimize using advance_to
--            if content.fork().parse::<Member>().is_err() {
--                if attrs.is_empty() {
--                    break;
--                } else {
--                    return Err(content.error("expected struct field"));
--                }
-+        while !content.is_empty() {
-+            if content.peek(Token![..]) {
-+                return Ok(ExprStruct {
-+                    attrs,
-+                    brace_token,
-+                    path,
-+                    fields,
-+                    dot2_token: Some(content.parse()?),
-+                    rest: Some(Box::new(content.parse()?)),
-+                });
-             }
- 
--            fields.push(FieldValue {
--                attrs,
--                ..content.parse()?
--            });
--
--            if !content.peek(Token![,]) {
-+            fields.push(content.parse()?);
-+            if content.is_empty() {
-                 break;
-             }
-             let punct: Token![,] = content.parse()?;
-             fields.push_punct(punct);
-         }
- 
--        let (dot2_token, rest) = if fields.empty_or_trailing() && content.peek(Token![..]) {
--            let dot2_token: Token![..] = content.parse()?;
--            let rest: Expr = content.parse()?;
--            (Some(dot2_token), Some(Box::new(rest)))
--        } else {
--            (None, None)
--        };
--
-         Ok(ExprStruct {
--            attrs: private::attrs(outer_attrs, inner_attrs),
-+            attrs,
-             brace_token,
-             path,
-             fields,
--            dot2_token,
--            rest,
-+            dot2_token: None,
-+            rest: None,
-         })
-     }
- 
-     #[cfg(feature = "full")]
-     fn expr_unsafe(input: ParseStream) -> Result<ExprUnsafe> {
-         let unsafe_token: Token![unsafe] = input.parse()?;
- 
-         let content;
-@@ -2572,37 +2506,17 @@ pub(crate) mod parsing {
-     }
- 
-     #[cfg(feature = "full")]
-     impl Parse for Arm {
-         fn parse(input: ParseStream) -> Result<Arm> {
-             let requires_comma;
-             Ok(Arm {
-                 attrs: input.call(Attribute::parse_outer)?,
--                pat: {
--                    let leading_vert: Option<Token![|]> = input.parse()?;
--                    let pat: Pat = input.parse()?;
--                    if leading_vert.is_some() || input.peek(Token![|]) {
--                        let mut cases = Punctuated::new();
--                        cases.push_value(pat);
--                        while input.peek(Token![|]) {
--                            let punct = input.parse()?;
--                            cases.push_punct(punct);
--                            let pat: Pat = input.parse()?;
--                            cases.push_value(pat);
--                        }
--                        Pat::Or(PatOr {
--                            attrs: Vec::new(),
--                            leading_vert,
--                            cases,
--                        })
--                    } else {
--                        pat
--                    }
--                },
-+                pat: pat::parsing::multi_pat_with_leading_vert(input)?,
-                 guard: {
-                     if input.peek(Token![if]) {
-                         let if_token: Token![if] = input.parse()?;
-                         let guard: Expr = input.parse()?;
-                         Some((if_token, Box::new(guard)))
-                     } else {
-                         None
-                     }
-@@ -2636,16 +2550,36 @@ pub(crate) mod parsing {
-                     span: lit.span(),
-                 })
-             } else {
-                 Err(Error::new(lit.span(), "expected unsuffixed integer"))
-             }
-         }
-     }
- 
-+    fn multi_index(e: &mut Expr, dot_token: &mut Token![.], float: LitFloat) -> Result<bool> {
-+        let mut float_repr = float.to_string();
-+        let trailing_dot = float_repr.ends_with('.');
-+        if trailing_dot {
-+            float_repr.truncate(float_repr.len() - 1);
-+        }
-+        for part in float_repr.split('.') {
-+            let index = crate::parse_str(part).map_err(|err| Error::new(float.span(), err))?;
-+            let base = mem::replace(e, Expr::__Nonexhaustive);
-+            *e = Expr::Field(ExprField {
-+                attrs: Vec::new(),
-+                base: Box::new(base),
-+                dot_token: Token![.](dot_token.span),
-+                member: Member::Unnamed(index),
-+            });
-+            *dot_token = Token![.](float.span());
-+        }
-+        Ok(!trailing_dot)
-+    }
-+
-     #[cfg(feature = "full")]
-     impl Member {
-         fn is_named(&self) -> bool {
-             match *self {
-                 Member::Named(_) => true,
-                 Member::Unnamed(_) => false,
-             }
-         }
-diff --git a/third_party/rust/syn/src/ext.rs b/third_party/rust/syn/src/ext.rs
---- a/third_party/rust/syn/src/ext.rs
-+++ b/third_party/rust/syn/src/ext.rs
-@@ -1,27 +1,27 @@
- //! Extension traits to provide parsing methods on foreign types.
- //!
--//! *This module is available if Syn is built with the `"parsing"` feature.*
-+//! *This module is available only if Syn is built with the `"parsing"` feature.*
- 
- use proc_macro2::Ident;
- 
- use crate::parse::{ParseStream, Result};
- 
- use crate::buffer::Cursor;
- use crate::parse::Peek;
- use crate::sealed::lookahead;
- use crate::token::CustomToken;
- 
- /// Additional methods for `Ident` not provided by proc-macro2 or libproc_macro.
- ///
- /// This trait is sealed and cannot be implemented for types outside of Syn. It
- /// is implemented only for `proc_macro2::Ident`.
- ///
--/// *This trait is available if Syn is built with the `"parsing"` feature.*
-+/// *This trait is available only if Syn is built with the `"parsing"` feature.*
- pub trait IdentExt: Sized + private::Sealed {
-     /// Parses any identifier including keywords.
-     ///
-     /// This is useful when parsing macro input which allows Rust keywords as
-     /// identifiers.
-     ///
-     /// # Example
-     ///
-@@ -124,12 +124,18 @@ impl lookahead::Sealed for private::Peek
- 
- mod private {
-     use proc_macro2::Ident;
- 
-     pub trait Sealed {}
- 
-     impl Sealed for Ident {}
- 
--    #[derive(Copy, Clone)]
-     pub struct PeekFn;
-     pub struct IdentAny;
-+
-+    impl Copy for PeekFn {}
-+    impl Clone for PeekFn {
-+        fn clone(&self) -> Self {
-+            *self
-+        }
-+    }
- }
-diff --git a/third_party/rust/syn/src/file.rs b/third_party/rust/syn/src/file.rs
---- a/third_party/rust/syn/src/file.rs
-+++ b/third_party/rust/syn/src/file.rs
-@@ -1,14 +1,14 @@
- use super::*;
- 
- ast_struct! {
-     /// A complete file of Rust source code.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only 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.
-     ///
-     /// ```
-     /// use std::env;
-@@ -32,16 +32,18 @@ ast_struct! {
-     ///     };
-     ///
-     ///     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");
-+    ///
-+    ///     // Debug impl is available if Syn is built with "extra-traits" feature.
-     ///     println!("{:#?}", syntax);
-     /// }
-     /// ```
-     ///
-     /// Running with its own source code as input, this program prints output
-     /// that begins with:
-     ///
-     /// ```text
-diff --git a/third_party/rust/syn/src/gen/clone.rs b/third_party/rust/syn/src/gen/clone.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/src/gen/clone.rs
-@@ -0,0 +1,2051 @@
-+// This file is @generated by syn-internal-codegen.
-+// It is not intended for manual editing.
-+
-+#![allow(clippy::clone_on_copy, clippy::expl_impl_clone_on_copy)]
-+use crate::*;
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Abi {
-+    fn clone(&self) -> Self {
-+        Abi {
-+            extern_token: self.extern_token.clone(),
-+            name: self.name.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for AngleBracketedGenericArguments {
-+    fn clone(&self) -> Self {
-+        AngleBracketedGenericArguments {
-+            colon2_token: self.colon2_token.clone(),
-+            lt_token: self.lt_token.clone(),
-+            args: self.args.clone(),
-+            gt_token: self.gt_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for Arm {
-+    fn clone(&self) -> Self {
-+        Arm {
-+            attrs: self.attrs.clone(),
-+            pat: self.pat.clone(),
-+            guard: self.guard.clone(),
-+            fat_arrow_token: self.fat_arrow_token.clone(),
-+            body: self.body.clone(),
-+            comma: self.comma.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Copy for AttrStyle {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for AttrStyle {
-+    fn clone(&self) -> Self {
-+        *self
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Attribute {
-+    fn clone(&self) -> Self {
-+        Attribute {
-+            pound_token: self.pound_token.clone(),
-+            style: self.style.clone(),
-+            bracket_token: self.bracket_token.clone(),
-+            path: self.path.clone(),
-+            tokens: self.tokens.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for BareFnArg {
-+    fn clone(&self) -> Self {
-+        BareFnArg {
-+            attrs: self.attrs.clone(),
-+            name: self.name.clone(),
-+            ty: self.ty.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Copy for BinOp {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for BinOp {
-+    fn clone(&self) -> Self {
-+        *self
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Binding {
-+    fn clone(&self) -> Self {
-+        Binding {
-+            ident: self.ident.clone(),
-+            eq_token: self.eq_token.clone(),
-+            ty: self.ty.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for Block {
-+    fn clone(&self) -> Self {
-+        Block {
-+            brace_token: self.brace_token.clone(),
-+            stmts: self.stmts.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for BoundLifetimes {
-+    fn clone(&self) -> Self {
-+        BoundLifetimes {
-+            for_token: self.for_token.clone(),
-+            lt_token: self.lt_token.clone(),
-+            lifetimes: self.lifetimes.clone(),
-+            gt_token: self.gt_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for ConstParam {
-+    fn clone(&self) -> Self {
-+        ConstParam {
-+            attrs: self.attrs.clone(),
-+            const_token: self.const_token.clone(),
-+            ident: self.ident.clone(),
-+            colon_token: self.colon_token.clone(),
-+            ty: self.ty.clone(),
-+            eq_token: self.eq_token.clone(),
-+            default: self.default.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Constraint {
-+    fn clone(&self) -> Self {
-+        Constraint {
-+            ident: self.ident.clone(),
-+            colon_token: self.colon_token.clone(),
-+            bounds: self.bounds.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Clone for Data {
-+    fn clone(&self) -> Self {
-+        match self {
-+            Data::Struct(v0) => Data::Struct(v0.clone()),
-+            Data::Enum(v0) => Data::Enum(v0.clone()),
-+            Data::Union(v0) => Data::Union(v0.clone()),
-+        }
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Clone for DataEnum {
-+    fn clone(&self) -> Self {
-+        DataEnum {
-+            enum_token: self.enum_token.clone(),
-+            brace_token: self.brace_token.clone(),
-+            variants: self.variants.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Clone for DataStruct {
-+    fn clone(&self) -> Self {
-+        DataStruct {
-+            struct_token: self.struct_token.clone(),
-+            fields: self.fields.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Clone for DataUnion {
-+    fn clone(&self) -> Self {
-+        DataUnion {
-+            union_token: self.union_token.clone(),
-+            fields: self.fields.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Clone for DeriveInput {
-+    fn clone(&self) -> Self {
-+        DeriveInput {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            ident: self.ident.clone(),
-+            generics: self.generics.clone(),
-+            data: self.data.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Expr {
-+    fn clone(&self) -> Self {
-+        match self {
-+            #[cfg(feature = "full")]
-+            Expr::Array(v0) => Expr::Array(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Assign(v0) => Expr::Assign(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::AssignOp(v0) => Expr::AssignOp(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Async(v0) => Expr::Async(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Await(v0) => Expr::Await(v0.clone()),
-+            Expr::Binary(v0) => Expr::Binary(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Block(v0) => Expr::Block(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Box(v0) => Expr::Box(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Break(v0) => Expr::Break(v0.clone()),
-+            Expr::Call(v0) => Expr::Call(v0.clone()),
-+            Expr::Cast(v0) => Expr::Cast(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Closure(v0) => Expr::Closure(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Continue(v0) => Expr::Continue(v0.clone()),
-+            Expr::Field(v0) => Expr::Field(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::ForLoop(v0) => Expr::ForLoop(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Group(v0) => Expr::Group(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::If(v0) => Expr::If(v0.clone()),
-+            Expr::Index(v0) => Expr::Index(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Let(v0) => Expr::Let(v0.clone()),
-+            Expr::Lit(v0) => Expr::Lit(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Loop(v0) => Expr::Loop(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Macro(v0) => Expr::Macro(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Match(v0) => Expr::Match(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::MethodCall(v0) => Expr::MethodCall(v0.clone()),
-+            Expr::Paren(v0) => Expr::Paren(v0.clone()),
-+            Expr::Path(v0) => Expr::Path(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Range(v0) => Expr::Range(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Reference(v0) => Expr::Reference(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Repeat(v0) => Expr::Repeat(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Return(v0) => Expr::Return(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Struct(v0) => Expr::Struct(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Try(v0) => Expr::Try(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::TryBlock(v0) => Expr::TryBlock(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Tuple(v0) => Expr::Tuple(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Type(v0) => Expr::Type(v0.clone()),
-+            Expr::Unary(v0) => Expr::Unary(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Unsafe(v0) => Expr::Unsafe(v0.clone()),
-+            Expr::Verbatim(v0) => Expr::Verbatim(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::While(v0) => Expr::While(v0.clone()),
-+            #[cfg(feature = "full")]
-+            Expr::Yield(v0) => Expr::Yield(v0.clone()),
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprArray {
-+    fn clone(&self) -> Self {
-+        ExprArray {
-+            attrs: self.attrs.clone(),
-+            bracket_token: self.bracket_token.clone(),
-+            elems: self.elems.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprAssign {
-+    fn clone(&self) -> Self {
-+        ExprAssign {
-+            attrs: self.attrs.clone(),
-+            left: self.left.clone(),
-+            eq_token: self.eq_token.clone(),
-+            right: self.right.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprAssignOp {
-+    fn clone(&self) -> Self {
-+        ExprAssignOp {
-+            attrs: self.attrs.clone(),
-+            left: self.left.clone(),
-+            op: self.op.clone(),
-+            right: self.right.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprAsync {
-+    fn clone(&self) -> Self {
-+        ExprAsync {
-+            attrs: self.attrs.clone(),
-+            async_token: self.async_token.clone(),
-+            capture: self.capture.clone(),
-+            block: self.block.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprAwait {
-+    fn clone(&self) -> Self {
-+        ExprAwait {
-+            attrs: self.attrs.clone(),
-+            base: self.base.clone(),
-+            dot_token: self.dot_token.clone(),
-+            await_token: self.await_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for ExprBinary {
-+    fn clone(&self) -> Self {
-+        ExprBinary {
-+            attrs: self.attrs.clone(),
-+            left: self.left.clone(),
-+            op: self.op.clone(),
-+            right: self.right.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprBlock {
-+    fn clone(&self) -> Self {
-+        ExprBlock {
-+            attrs: self.attrs.clone(),
-+            label: self.label.clone(),
-+            block: self.block.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprBox {
-+    fn clone(&self) -> Self {
-+        ExprBox {
-+            attrs: self.attrs.clone(),
-+            box_token: self.box_token.clone(),
-+            expr: self.expr.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprBreak {
-+    fn clone(&self) -> Self {
-+        ExprBreak {
-+            attrs: self.attrs.clone(),
-+            break_token: self.break_token.clone(),
-+            label: self.label.clone(),
-+            expr: self.expr.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for ExprCall {
-+    fn clone(&self) -> Self {
-+        ExprCall {
-+            attrs: self.attrs.clone(),
-+            func: self.func.clone(),
-+            paren_token: self.paren_token.clone(),
-+            args: self.args.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for ExprCast {
-+    fn clone(&self) -> Self {
-+        ExprCast {
-+            attrs: self.attrs.clone(),
-+            expr: self.expr.clone(),
-+            as_token: self.as_token.clone(),
-+            ty: self.ty.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprClosure {
-+    fn clone(&self) -> Self {
-+        ExprClosure {
-+            attrs: self.attrs.clone(),
-+            asyncness: self.asyncness.clone(),
-+            movability: self.movability.clone(),
-+            capture: self.capture.clone(),
-+            or1_token: self.or1_token.clone(),
-+            inputs: self.inputs.clone(),
-+            or2_token: self.or2_token.clone(),
-+            output: self.output.clone(),
-+            body: self.body.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprContinue {
-+    fn clone(&self) -> Self {
-+        ExprContinue {
-+            attrs: self.attrs.clone(),
-+            continue_token: self.continue_token.clone(),
-+            label: self.label.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for ExprField {
-+    fn clone(&self) -> Self {
-+        ExprField {
-+            attrs: self.attrs.clone(),
-+            base: self.base.clone(),
-+            dot_token: self.dot_token.clone(),
-+            member: self.member.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprForLoop {
-+    fn clone(&self) -> Self {
-+        ExprForLoop {
-+            attrs: self.attrs.clone(),
-+            label: self.label.clone(),
-+            for_token: self.for_token.clone(),
-+            pat: self.pat.clone(),
-+            in_token: self.in_token.clone(),
-+            expr: self.expr.clone(),
-+            body: self.body.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprGroup {
-+    fn clone(&self) -> Self {
-+        ExprGroup {
-+            attrs: self.attrs.clone(),
-+            group_token: self.group_token.clone(),
-+            expr: self.expr.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprIf {
-+    fn clone(&self) -> Self {
-+        ExprIf {
-+            attrs: self.attrs.clone(),
-+            if_token: self.if_token.clone(),
-+            cond: self.cond.clone(),
-+            then_branch: self.then_branch.clone(),
-+            else_branch: self.else_branch.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for ExprIndex {
-+    fn clone(&self) -> Self {
-+        ExprIndex {
-+            attrs: self.attrs.clone(),
-+            expr: self.expr.clone(),
-+            bracket_token: self.bracket_token.clone(),
-+            index: self.index.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprLet {
-+    fn clone(&self) -> Self {
-+        ExprLet {
-+            attrs: self.attrs.clone(),
-+            let_token: self.let_token.clone(),
-+            pat: self.pat.clone(),
-+            eq_token: self.eq_token.clone(),
-+            expr: self.expr.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for ExprLit {
-+    fn clone(&self) -> Self {
-+        ExprLit {
-+            attrs: self.attrs.clone(),
-+            lit: self.lit.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprLoop {
-+    fn clone(&self) -> Self {
-+        ExprLoop {
-+            attrs: self.attrs.clone(),
-+            label: self.label.clone(),
-+            loop_token: self.loop_token.clone(),
-+            body: self.body.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprMacro {
-+    fn clone(&self) -> Self {
-+        ExprMacro {
-+            attrs: self.attrs.clone(),
-+            mac: self.mac.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprMatch {
-+    fn clone(&self) -> Self {
-+        ExprMatch {
-+            attrs: self.attrs.clone(),
-+            match_token: self.match_token.clone(),
-+            expr: self.expr.clone(),
-+            brace_token: self.brace_token.clone(),
-+            arms: self.arms.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprMethodCall {
-+    fn clone(&self) -> Self {
-+        ExprMethodCall {
-+            attrs: self.attrs.clone(),
-+            receiver: self.receiver.clone(),
-+            dot_token: self.dot_token.clone(),
-+            method: self.method.clone(),
-+            turbofish: self.turbofish.clone(),
-+            paren_token: self.paren_token.clone(),
-+            args: self.args.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for ExprParen {
-+    fn clone(&self) -> Self {
-+        ExprParen {
-+            attrs: self.attrs.clone(),
-+            paren_token: self.paren_token.clone(),
-+            expr: self.expr.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for ExprPath {
-+    fn clone(&self) -> Self {
-+        ExprPath {
-+            attrs: self.attrs.clone(),
-+            qself: self.qself.clone(),
-+            path: self.path.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprRange {
-+    fn clone(&self) -> Self {
-+        ExprRange {
-+            attrs: self.attrs.clone(),
-+            from: self.from.clone(),
-+            limits: self.limits.clone(),
-+            to: self.to.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprReference {
-+    fn clone(&self) -> Self {
-+        ExprReference {
-+            attrs: self.attrs.clone(),
-+            and_token: self.and_token.clone(),
-+            raw: self.raw.clone(),
-+            mutability: self.mutability.clone(),
-+            expr: self.expr.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprRepeat {
-+    fn clone(&self) -> Self {
-+        ExprRepeat {
-+            attrs: self.attrs.clone(),
-+            bracket_token: self.bracket_token.clone(),
-+            expr: self.expr.clone(),
-+            semi_token: self.semi_token.clone(),
-+            len: self.len.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprReturn {
-+    fn clone(&self) -> Self {
-+        ExprReturn {
-+            attrs: self.attrs.clone(),
-+            return_token: self.return_token.clone(),
-+            expr: self.expr.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprStruct {
-+    fn clone(&self) -> Self {
-+        ExprStruct {
-+            attrs: self.attrs.clone(),
-+            path: self.path.clone(),
-+            brace_token: self.brace_token.clone(),
-+            fields: self.fields.clone(),
-+            dot2_token: self.dot2_token.clone(),
-+            rest: self.rest.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprTry {
-+    fn clone(&self) -> Self {
-+        ExprTry {
-+            attrs: self.attrs.clone(),
-+            expr: self.expr.clone(),
-+            question_token: self.question_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprTryBlock {
-+    fn clone(&self) -> Self {
-+        ExprTryBlock {
-+            attrs: self.attrs.clone(),
-+            try_token: self.try_token.clone(),
-+            block: self.block.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprTuple {
-+    fn clone(&self) -> Self {
-+        ExprTuple {
-+            attrs: self.attrs.clone(),
-+            paren_token: self.paren_token.clone(),
-+            elems: self.elems.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprType {
-+    fn clone(&self) -> Self {
-+        ExprType {
-+            attrs: self.attrs.clone(),
-+            expr: self.expr.clone(),
-+            colon_token: self.colon_token.clone(),
-+            ty: self.ty.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for ExprUnary {
-+    fn clone(&self) -> Self {
-+        ExprUnary {
-+            attrs: self.attrs.clone(),
-+            op: self.op.clone(),
-+            expr: self.expr.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprUnsafe {
-+    fn clone(&self) -> Self {
-+        ExprUnsafe {
-+            attrs: self.attrs.clone(),
-+            unsafe_token: self.unsafe_token.clone(),
-+            block: self.block.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprWhile {
-+    fn clone(&self) -> Self {
-+        ExprWhile {
-+            attrs: self.attrs.clone(),
-+            label: self.label.clone(),
-+            while_token: self.while_token.clone(),
-+            cond: self.cond.clone(),
-+            body: self.body.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ExprYield {
-+    fn clone(&self) -> Self {
-+        ExprYield {
-+            attrs: self.attrs.clone(),
-+            yield_token: self.yield_token.clone(),
-+            expr: self.expr.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Field {
-+    fn clone(&self) -> Self {
-+        Field {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            ident: self.ident.clone(),
-+            colon_token: self.colon_token.clone(),
-+            ty: self.ty.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for FieldPat {
-+    fn clone(&self) -> Self {
-+        FieldPat {
-+            attrs: self.attrs.clone(),
-+            member: self.member.clone(),
-+            colon_token: self.colon_token.clone(),
-+            pat: self.pat.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for FieldValue {
-+    fn clone(&self) -> Self {
-+        FieldValue {
-+            attrs: self.attrs.clone(),
-+            member: self.member.clone(),
-+            colon_token: self.colon_token.clone(),
-+            expr: self.expr.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Fields {
-+    fn clone(&self) -> Self {
-+        match self {
-+            Fields::Named(v0) => Fields::Named(v0.clone()),
-+            Fields::Unnamed(v0) => Fields::Unnamed(v0.clone()),
-+            Fields::Unit => Fields::Unit,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for FieldsNamed {
-+    fn clone(&self) -> Self {
-+        FieldsNamed {
-+            brace_token: self.brace_token.clone(),
-+            named: self.named.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for FieldsUnnamed {
-+    fn clone(&self) -> Self {
-+        FieldsUnnamed {
-+            paren_token: self.paren_token.clone(),
-+            unnamed: self.unnamed.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for File {
-+    fn clone(&self) -> Self {
-+        File {
-+            shebang: self.shebang.clone(),
-+            attrs: self.attrs.clone(),
-+            items: self.items.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for FnArg {
-+    fn clone(&self) -> Self {
-+        match self {
-+            FnArg::Receiver(v0) => FnArg::Receiver(v0.clone()),
-+            FnArg::Typed(v0) => FnArg::Typed(v0.clone()),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ForeignItem {
-+    fn clone(&self) -> Self {
-+        match self {
-+            ForeignItem::Fn(v0) => ForeignItem::Fn(v0.clone()),
-+            ForeignItem::Static(v0) => ForeignItem::Static(v0.clone()),
-+            ForeignItem::Type(v0) => ForeignItem::Type(v0.clone()),
-+            ForeignItem::Macro(v0) => ForeignItem::Macro(v0.clone()),
-+            ForeignItem::Verbatim(v0) => ForeignItem::Verbatim(v0.clone()),
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ForeignItemFn {
-+    fn clone(&self) -> Self {
-+        ForeignItemFn {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            sig: self.sig.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ForeignItemMacro {
-+    fn clone(&self) -> Self {
-+        ForeignItemMacro {
-+            attrs: self.attrs.clone(),
-+            mac: self.mac.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ForeignItemStatic {
-+    fn clone(&self) -> Self {
-+        ForeignItemStatic {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            static_token: self.static_token.clone(),
-+            mutability: self.mutability.clone(),
-+            ident: self.ident.clone(),
-+            colon_token: self.colon_token.clone(),
-+            ty: self.ty.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ForeignItemType {
-+    fn clone(&self) -> Self {
-+        ForeignItemType {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            type_token: self.type_token.clone(),
-+            ident: self.ident.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for GenericArgument {
-+    fn clone(&self) -> Self {
-+        match self {
-+            GenericArgument::Lifetime(v0) => GenericArgument::Lifetime(v0.clone()),
-+            GenericArgument::Type(v0) => GenericArgument::Type(v0.clone()),
-+            GenericArgument::Binding(v0) => GenericArgument::Binding(v0.clone()),
-+            GenericArgument::Constraint(v0) => GenericArgument::Constraint(v0.clone()),
-+            GenericArgument::Const(v0) => GenericArgument::Const(v0.clone()),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for GenericMethodArgument {
-+    fn clone(&self) -> Self {
-+        match self {
-+            GenericMethodArgument::Type(v0) => GenericMethodArgument::Type(v0.clone()),
-+            GenericMethodArgument::Const(v0) => GenericMethodArgument::Const(v0.clone()),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for GenericParam {
-+    fn clone(&self) -> Self {
-+        match self {
-+            GenericParam::Type(v0) => GenericParam::Type(v0.clone()),
-+            GenericParam::Lifetime(v0) => GenericParam::Lifetime(v0.clone()),
-+            GenericParam::Const(v0) => GenericParam::Const(v0.clone()),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Generics {
-+    fn clone(&self) -> Self {
-+        Generics {
-+            lt_token: self.lt_token.clone(),
-+            params: self.params.clone(),
-+            gt_token: self.gt_token.clone(),
-+            where_clause: self.where_clause.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ImplItem {
-+    fn clone(&self) -> Self {
-+        match self {
-+            ImplItem::Const(v0) => ImplItem::Const(v0.clone()),
-+            ImplItem::Method(v0) => ImplItem::Method(v0.clone()),
-+            ImplItem::Type(v0) => ImplItem::Type(v0.clone()),
-+            ImplItem::Macro(v0) => ImplItem::Macro(v0.clone()),
-+            ImplItem::Verbatim(v0) => ImplItem::Verbatim(v0.clone()),
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ImplItemConst {
-+    fn clone(&self) -> Self {
-+        ImplItemConst {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            defaultness: self.defaultness.clone(),
-+            const_token: self.const_token.clone(),
-+            ident: self.ident.clone(),
-+            colon_token: self.colon_token.clone(),
-+            ty: self.ty.clone(),
-+            eq_token: self.eq_token.clone(),
-+            expr: self.expr.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ImplItemMacro {
-+    fn clone(&self) -> Self {
-+        ImplItemMacro {
-+            attrs: self.attrs.clone(),
-+            mac: self.mac.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ImplItemMethod {
-+    fn clone(&self) -> Self {
-+        ImplItemMethod {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            defaultness: self.defaultness.clone(),
-+            sig: self.sig.clone(),
-+            block: self.block.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ImplItemType {
-+    fn clone(&self) -> Self {
-+        ImplItemType {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            defaultness: self.defaultness.clone(),
-+            type_token: self.type_token.clone(),
-+            ident: self.ident.clone(),
-+            generics: self.generics.clone(),
-+            eq_token: self.eq_token.clone(),
-+            ty: self.ty.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Index {
-+    fn clone(&self) -> Self {
-+        Index {
-+            index: self.index.clone(),
-+            span: self.span.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for Item {
-+    fn clone(&self) -> Self {
-+        match self {
-+            Item::Const(v0) => Item::Const(v0.clone()),
-+            Item::Enum(v0) => Item::Enum(v0.clone()),
-+            Item::ExternCrate(v0) => Item::ExternCrate(v0.clone()),
-+            Item::Fn(v0) => Item::Fn(v0.clone()),
-+            Item::ForeignMod(v0) => Item::ForeignMod(v0.clone()),
-+            Item::Impl(v0) => Item::Impl(v0.clone()),
-+            Item::Macro(v0) => Item::Macro(v0.clone()),
-+            Item::Macro2(v0) => Item::Macro2(v0.clone()),
-+            Item::Mod(v0) => Item::Mod(v0.clone()),
-+            Item::Static(v0) => Item::Static(v0.clone()),
-+            Item::Struct(v0) => Item::Struct(v0.clone()),
-+            Item::Trait(v0) => Item::Trait(v0.clone()),
-+            Item::TraitAlias(v0) => Item::TraitAlias(v0.clone()),
-+            Item::Type(v0) => Item::Type(v0.clone()),
-+            Item::Union(v0) => Item::Union(v0.clone()),
-+            Item::Use(v0) => Item::Use(v0.clone()),
-+            Item::Verbatim(v0) => Item::Verbatim(v0.clone()),
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemConst {
-+    fn clone(&self) -> Self {
-+        ItemConst {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            const_token: self.const_token.clone(),
-+            ident: self.ident.clone(),
-+            colon_token: self.colon_token.clone(),
-+            ty: self.ty.clone(),
-+            eq_token: self.eq_token.clone(),
-+            expr: self.expr.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemEnum {
-+    fn clone(&self) -> Self {
-+        ItemEnum {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            enum_token: self.enum_token.clone(),
-+            ident: self.ident.clone(),
-+            generics: self.generics.clone(),
-+            brace_token: self.brace_token.clone(),
-+            variants: self.variants.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemExternCrate {
-+    fn clone(&self) -> Self {
-+        ItemExternCrate {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            extern_token: self.extern_token.clone(),
-+            crate_token: self.crate_token.clone(),
-+            ident: self.ident.clone(),
-+            rename: self.rename.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemFn {
-+    fn clone(&self) -> Self {
-+        ItemFn {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            sig: self.sig.clone(),
-+            block: self.block.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemForeignMod {
-+    fn clone(&self) -> Self {
-+        ItemForeignMod {
-+            attrs: self.attrs.clone(),
-+            abi: self.abi.clone(),
-+            brace_token: self.brace_token.clone(),
-+            items: self.items.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemImpl {
-+    fn clone(&self) -> Self {
-+        ItemImpl {
-+            attrs: self.attrs.clone(),
-+            defaultness: self.defaultness.clone(),
-+            unsafety: self.unsafety.clone(),
-+            impl_token: self.impl_token.clone(),
-+            generics: self.generics.clone(),
-+            trait_: self.trait_.clone(),
-+            self_ty: self.self_ty.clone(),
-+            brace_token: self.brace_token.clone(),
-+            items: self.items.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemMacro {
-+    fn clone(&self) -> Self {
-+        ItemMacro {
-+            attrs: self.attrs.clone(),
-+            ident: self.ident.clone(),
-+            mac: self.mac.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemMacro2 {
-+    fn clone(&self) -> Self {
-+        ItemMacro2 {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            macro_token: self.macro_token.clone(),
-+            ident: self.ident.clone(),
-+            rules: self.rules.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemMod {
-+    fn clone(&self) -> Self {
-+        ItemMod {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            mod_token: self.mod_token.clone(),
-+            ident: self.ident.clone(),
-+            content: self.content.clone(),
-+            semi: self.semi.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemStatic {
-+    fn clone(&self) -> Self {
-+        ItemStatic {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            static_token: self.static_token.clone(),
-+            mutability: self.mutability.clone(),
-+            ident: self.ident.clone(),
-+            colon_token: self.colon_token.clone(),
-+            ty: self.ty.clone(),
-+            eq_token: self.eq_token.clone(),
-+            expr: self.expr.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemStruct {
-+    fn clone(&self) -> Self {
-+        ItemStruct {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            struct_token: self.struct_token.clone(),
-+            ident: self.ident.clone(),
-+            generics: self.generics.clone(),
-+            fields: self.fields.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemTrait {
-+    fn clone(&self) -> Self {
-+        ItemTrait {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            unsafety: self.unsafety.clone(),
-+            auto_token: self.auto_token.clone(),
-+            trait_token: self.trait_token.clone(),
-+            ident: self.ident.clone(),
-+            generics: self.generics.clone(),
-+            colon_token: self.colon_token.clone(),
-+            supertraits: self.supertraits.clone(),
-+            brace_token: self.brace_token.clone(),
-+            items: self.items.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemTraitAlias {
-+    fn clone(&self) -> Self {
-+        ItemTraitAlias {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            trait_token: self.trait_token.clone(),
-+            ident: self.ident.clone(),
-+            generics: self.generics.clone(),
-+            eq_token: self.eq_token.clone(),
-+            bounds: self.bounds.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemType {
-+    fn clone(&self) -> Self {
-+        ItemType {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            type_token: self.type_token.clone(),
-+            ident: self.ident.clone(),
-+            generics: self.generics.clone(),
-+            eq_token: self.eq_token.clone(),
-+            ty: self.ty.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemUnion {
-+    fn clone(&self) -> Self {
-+        ItemUnion {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            union_token: self.union_token.clone(),
-+            ident: self.ident.clone(),
-+            generics: self.generics.clone(),
-+            fields: self.fields.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for ItemUse {
-+    fn clone(&self) -> Self {
-+        ItemUse {
-+            attrs: self.attrs.clone(),
-+            vis: self.vis.clone(),
-+            use_token: self.use_token.clone(),
-+            leading_colon: self.leading_colon.clone(),
-+            tree: self.tree.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for Label {
-+    fn clone(&self) -> Self {
-+        Label {
-+            name: self.name.clone(),
-+            colon_token: self.colon_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for LifetimeDef {
-+    fn clone(&self) -> Self {
-+        LifetimeDef {
-+            attrs: self.attrs.clone(),
-+            lifetime: self.lifetime.clone(),
-+            colon_token: self.colon_token.clone(),
-+            bounds: self.bounds.clone(),
-+        }
-+    }
-+}
-+impl Clone for Lit {
-+    fn clone(&self) -> Self {
-+        match self {
-+            Lit::Str(v0) => Lit::Str(v0.clone()),
-+            Lit::ByteStr(v0) => Lit::ByteStr(v0.clone()),
-+            Lit::Byte(v0) => Lit::Byte(v0.clone()),
-+            Lit::Char(v0) => Lit::Char(v0.clone()),
-+            Lit::Int(v0) => Lit::Int(v0.clone()),
-+            Lit::Float(v0) => Lit::Float(v0.clone()),
-+            Lit::Bool(v0) => Lit::Bool(v0.clone()),
-+            Lit::Verbatim(v0) => Lit::Verbatim(v0.clone()),
-+        }
-+    }
-+}
-+impl Clone for LitBool {
-+    fn clone(&self) -> Self {
-+        LitBool {
-+            value: self.value.clone(),
-+            span: self.span.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for Local {
-+    fn clone(&self) -> Self {
-+        Local {
-+            attrs: self.attrs.clone(),
-+            let_token: self.let_token.clone(),
-+            pat: self.pat.clone(),
-+            init: self.init.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Macro {
-+    fn clone(&self) -> Self {
-+        Macro {
-+            path: self.path.clone(),
-+            bang_token: self.bang_token.clone(),
-+            delimiter: self.delimiter.clone(),
-+            tokens: self.tokens.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for MacroDelimiter {
-+    fn clone(&self) -> Self {
-+        match self {
-+            MacroDelimiter::Paren(v0) => MacroDelimiter::Paren(v0.clone()),
-+            MacroDelimiter::Brace(v0) => MacroDelimiter::Brace(v0.clone()),
-+            MacroDelimiter::Bracket(v0) => MacroDelimiter::Bracket(v0.clone()),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Member {
-+    fn clone(&self) -> Self {
-+        match self {
-+            Member::Named(v0) => Member::Named(v0.clone()),
-+            Member::Unnamed(v0) => Member::Unnamed(v0.clone()),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Meta {
-+    fn clone(&self) -> Self {
-+        match self {
-+            Meta::Path(v0) => Meta::Path(v0.clone()),
-+            Meta::List(v0) => Meta::List(v0.clone()),
-+            Meta::NameValue(v0) => Meta::NameValue(v0.clone()),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for MetaList {
-+    fn clone(&self) -> Self {
-+        MetaList {
-+            path: self.path.clone(),
-+            paren_token: self.paren_token.clone(),
-+            nested: self.nested.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for MetaNameValue {
-+    fn clone(&self) -> Self {
-+        MetaNameValue {
-+            path: self.path.clone(),
-+            eq_token: self.eq_token.clone(),
-+            lit: self.lit.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for MethodTurbofish {
-+    fn clone(&self) -> Self {
-+        MethodTurbofish {
-+            colon2_token: self.colon2_token.clone(),
-+            lt_token: self.lt_token.clone(),
-+            args: self.args.clone(),
-+            gt_token: self.gt_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for NestedMeta {
-+    fn clone(&self) -> Self {
-+        match self {
-+            NestedMeta::Meta(v0) => NestedMeta::Meta(v0.clone()),
-+            NestedMeta::Lit(v0) => NestedMeta::Lit(v0.clone()),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for ParenthesizedGenericArguments {
-+    fn clone(&self) -> Self {
-+        ParenthesizedGenericArguments {
-+            paren_token: self.paren_token.clone(),
-+            inputs: self.inputs.clone(),
-+            output: self.output.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for Pat {
-+    fn clone(&self) -> Self {
-+        match self {
-+            Pat::Box(v0) => Pat::Box(v0.clone()),
-+            Pat::Ident(v0) => Pat::Ident(v0.clone()),
-+            Pat::Lit(v0) => Pat::Lit(v0.clone()),
-+            Pat::Macro(v0) => Pat::Macro(v0.clone()),
-+            Pat::Or(v0) => Pat::Or(v0.clone()),
-+            Pat::Path(v0) => Pat::Path(v0.clone()),
-+            Pat::Range(v0) => Pat::Range(v0.clone()),
-+            Pat::Reference(v0) => Pat::Reference(v0.clone()),
-+            Pat::Rest(v0) => Pat::Rest(v0.clone()),
-+            Pat::Slice(v0) => Pat::Slice(v0.clone()),
-+            Pat::Struct(v0) => Pat::Struct(v0.clone()),
-+            Pat::Tuple(v0) => Pat::Tuple(v0.clone()),
-+            Pat::TupleStruct(v0) => Pat::TupleStruct(v0.clone()),
-+            Pat::Type(v0) => Pat::Type(v0.clone()),
-+            Pat::Verbatim(v0) => Pat::Verbatim(v0.clone()),
-+            Pat::Wild(v0) => Pat::Wild(v0.clone()),
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatBox {
-+    fn clone(&self) -> Self {
-+        PatBox {
-+            attrs: self.attrs.clone(),
-+            box_token: self.box_token.clone(),
-+            pat: self.pat.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatIdent {
-+    fn clone(&self) -> Self {
-+        PatIdent {
-+            attrs: self.attrs.clone(),
-+            by_ref: self.by_ref.clone(),
-+            mutability: self.mutability.clone(),
-+            ident: self.ident.clone(),
-+            subpat: self.subpat.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatLit {
-+    fn clone(&self) -> Self {
-+        PatLit {
-+            attrs: self.attrs.clone(),
-+            expr: self.expr.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatMacro {
-+    fn clone(&self) -> Self {
-+        PatMacro {
-+            attrs: self.attrs.clone(),
-+            mac: self.mac.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatOr {
-+    fn clone(&self) -> Self {
-+        PatOr {
-+            attrs: self.attrs.clone(),
-+            leading_vert: self.leading_vert.clone(),
-+            cases: self.cases.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatPath {
-+    fn clone(&self) -> Self {
-+        PatPath {
-+            attrs: self.attrs.clone(),
-+            qself: self.qself.clone(),
-+            path: self.path.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatRange {
-+    fn clone(&self) -> Self {
-+        PatRange {
-+            attrs: self.attrs.clone(),
-+            lo: self.lo.clone(),
-+            limits: self.limits.clone(),
-+            hi: self.hi.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatReference {
-+    fn clone(&self) -> Self {
-+        PatReference {
-+            attrs: self.attrs.clone(),
-+            and_token: self.and_token.clone(),
-+            mutability: self.mutability.clone(),
-+            pat: self.pat.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatRest {
-+    fn clone(&self) -> Self {
-+        PatRest {
-+            attrs: self.attrs.clone(),
-+            dot2_token: self.dot2_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatSlice {
-+    fn clone(&self) -> Self {
-+        PatSlice {
-+            attrs: self.attrs.clone(),
-+            bracket_token: self.bracket_token.clone(),
-+            elems: self.elems.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatStruct {
-+    fn clone(&self) -> Self {
-+        PatStruct {
-+            attrs: self.attrs.clone(),
-+            path: self.path.clone(),
-+            brace_token: self.brace_token.clone(),
-+            fields: self.fields.clone(),
-+            dot2_token: self.dot2_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatTuple {
-+    fn clone(&self) -> Self {
-+        PatTuple {
-+            attrs: self.attrs.clone(),
-+            paren_token: self.paren_token.clone(),
-+            elems: self.elems.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatTupleStruct {
-+    fn clone(&self) -> Self {
-+        PatTupleStruct {
-+            attrs: self.attrs.clone(),
-+            path: self.path.clone(),
-+            pat: self.pat.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatType {
-+    fn clone(&self) -> Self {
-+        PatType {
-+            attrs: self.attrs.clone(),
-+            pat: self.pat.clone(),
-+            colon_token: self.colon_token.clone(),
-+            ty: self.ty.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for PatWild {
-+    fn clone(&self) -> Self {
-+        PatWild {
-+            attrs: self.attrs.clone(),
-+            underscore_token: self.underscore_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Path {
-+    fn clone(&self) -> Self {
-+        Path {
-+            leading_colon: self.leading_colon.clone(),
-+            segments: self.segments.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for PathArguments {
-+    fn clone(&self) -> Self {
-+        match self {
-+            PathArguments::None => PathArguments::None,
-+            PathArguments::AngleBracketed(v0) => PathArguments::AngleBracketed(v0.clone()),
-+            PathArguments::Parenthesized(v0) => PathArguments::Parenthesized(v0.clone()),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for PathSegment {
-+    fn clone(&self) -> Self {
-+        PathSegment {
-+            ident: self.ident.clone(),
-+            arguments: self.arguments.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for PredicateEq {
-+    fn clone(&self) -> Self {
-+        PredicateEq {
-+            lhs_ty: self.lhs_ty.clone(),
-+            eq_token: self.eq_token.clone(),
-+            rhs_ty: self.rhs_ty.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for PredicateLifetime {
-+    fn clone(&self) -> Self {
-+        PredicateLifetime {
-+            lifetime: self.lifetime.clone(),
-+            colon_token: self.colon_token.clone(),
-+            bounds: self.bounds.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for PredicateType {
-+    fn clone(&self) -> Self {
-+        PredicateType {
-+            lifetimes: self.lifetimes.clone(),
-+            bounded_ty: self.bounded_ty.clone(),
-+            colon_token: self.colon_token.clone(),
-+            bounds: self.bounds.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for QSelf {
-+    fn clone(&self) -> Self {
-+        QSelf {
-+            lt_token: self.lt_token.clone(),
-+            ty: self.ty.clone(),
-+            position: self.position.clone(),
-+            as_token: self.as_token.clone(),
-+            gt_token: self.gt_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Copy for RangeLimits {}
-+#[cfg(feature = "full")]
-+impl Clone for RangeLimits {
-+    fn clone(&self) -> Self {
-+        *self
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for Receiver {
-+    fn clone(&self) -> Self {
-+        Receiver {
-+            attrs: self.attrs.clone(),
-+            reference: self.reference.clone(),
-+            mutability: self.mutability.clone(),
-+            self_token: self.self_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for ReturnType {
-+    fn clone(&self) -> Self {
-+        match self {
-+            ReturnType::Default => ReturnType::Default,
-+            ReturnType::Type(v0, v1) => ReturnType::Type(v0.clone(), v1.clone()),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for Signature {
-+    fn clone(&self) -> Self {
-+        Signature {
-+            constness: self.constness.clone(),
-+            asyncness: self.asyncness.clone(),
-+            unsafety: self.unsafety.clone(),
-+            abi: self.abi.clone(),
-+            fn_token: self.fn_token.clone(),
-+            ident: self.ident.clone(),
-+            generics: self.generics.clone(),
-+            paren_token: self.paren_token.clone(),
-+            inputs: self.inputs.clone(),
-+            variadic: self.variadic.clone(),
-+            output: self.output.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for Stmt {
-+    fn clone(&self) -> Self {
-+        match self {
-+            Stmt::Local(v0) => Stmt::Local(v0.clone()),
-+            Stmt::Item(v0) => Stmt::Item(v0.clone()),
-+            Stmt::Expr(v0) => Stmt::Expr(v0.clone()),
-+            Stmt::Semi(v0, v1) => Stmt::Semi(v0.clone(), v1.clone()),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TraitBound {
-+    fn clone(&self) -> Self {
-+        TraitBound {
-+            paren_token: self.paren_token.clone(),
-+            modifier: self.modifier.clone(),
-+            lifetimes: self.lifetimes.clone(),
-+            path: self.path.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Copy for TraitBoundModifier {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TraitBoundModifier {
-+    fn clone(&self) -> Self {
-+        *self
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for TraitItem {
-+    fn clone(&self) -> Self {
-+        match self {
-+            TraitItem::Const(v0) => TraitItem::Const(v0.clone()),
-+            TraitItem::Method(v0) => TraitItem::Method(v0.clone()),
-+            TraitItem::Type(v0) => TraitItem::Type(v0.clone()),
-+            TraitItem::Macro(v0) => TraitItem::Macro(v0.clone()),
-+            TraitItem::Verbatim(v0) => TraitItem::Verbatim(v0.clone()),
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for TraitItemConst {
-+    fn clone(&self) -> Self {
-+        TraitItemConst {
-+            attrs: self.attrs.clone(),
-+            const_token: self.const_token.clone(),
-+            ident: self.ident.clone(),
-+            colon_token: self.colon_token.clone(),
-+            ty: self.ty.clone(),
-+            default: self.default.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for TraitItemMacro {
-+    fn clone(&self) -> Self {
-+        TraitItemMacro {
-+            attrs: self.attrs.clone(),
-+            mac: self.mac.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for TraitItemMethod {
-+    fn clone(&self) -> Self {
-+        TraitItemMethod {
-+            attrs: self.attrs.clone(),
-+            sig: self.sig.clone(),
-+            default: self.default.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for TraitItemType {
-+    fn clone(&self) -> Self {
-+        TraitItemType {
-+            attrs: self.attrs.clone(),
-+            type_token: self.type_token.clone(),
-+            ident: self.ident.clone(),
-+            generics: self.generics.clone(),
-+            colon_token: self.colon_token.clone(),
-+            bounds: self.bounds.clone(),
-+            default: self.default.clone(),
-+            semi_token: self.semi_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Type {
-+    fn clone(&self) -> Self {
-+        match self {
-+            Type::Array(v0) => Type::Array(v0.clone()),
-+            Type::BareFn(v0) => Type::BareFn(v0.clone()),
-+            Type::Group(v0) => Type::Group(v0.clone()),
-+            Type::ImplTrait(v0) => Type::ImplTrait(v0.clone()),
-+            Type::Infer(v0) => Type::Infer(v0.clone()),
-+            Type::Macro(v0) => Type::Macro(v0.clone()),
-+            Type::Never(v0) => Type::Never(v0.clone()),
-+            Type::Paren(v0) => Type::Paren(v0.clone()),
-+            Type::Path(v0) => Type::Path(v0.clone()),
-+            Type::Ptr(v0) => Type::Ptr(v0.clone()),
-+            Type::Reference(v0) => Type::Reference(v0.clone()),
-+            Type::Slice(v0) => Type::Slice(v0.clone()),
-+            Type::TraitObject(v0) => Type::TraitObject(v0.clone()),
-+            Type::Tuple(v0) => Type::Tuple(v0.clone()),
-+            Type::Verbatim(v0) => Type::Verbatim(v0.clone()),
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypeArray {
-+    fn clone(&self) -> Self {
-+        TypeArray {
-+            bracket_token: self.bracket_token.clone(),
-+            elem: self.elem.clone(),
-+            semi_token: self.semi_token.clone(),
-+            len: self.len.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypeBareFn {
-+    fn clone(&self) -> Self {
-+        TypeBareFn {
-+            lifetimes: self.lifetimes.clone(),
-+            unsafety: self.unsafety.clone(),
-+            abi: self.abi.clone(),
-+            fn_token: self.fn_token.clone(),
-+            paren_token: self.paren_token.clone(),
-+            inputs: self.inputs.clone(),
-+            variadic: self.variadic.clone(),
-+            output: self.output.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypeGroup {
-+    fn clone(&self) -> Self {
-+        TypeGroup {
-+            group_token: self.group_token.clone(),
-+            elem: self.elem.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypeImplTrait {
-+    fn clone(&self) -> Self {
-+        TypeImplTrait {
-+            impl_token: self.impl_token.clone(),
-+            bounds: self.bounds.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypeInfer {
-+    fn clone(&self) -> Self {
-+        TypeInfer {
-+            underscore_token: self.underscore_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypeMacro {
-+    fn clone(&self) -> Self {
-+        TypeMacro {
-+            mac: self.mac.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypeNever {
-+    fn clone(&self) -> Self {
-+        TypeNever {
-+            bang_token: self.bang_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypeParam {
-+    fn clone(&self) -> Self {
-+        TypeParam {
-+            attrs: self.attrs.clone(),
-+            ident: self.ident.clone(),
-+            colon_token: self.colon_token.clone(),
-+            bounds: self.bounds.clone(),
-+            eq_token: self.eq_token.clone(),
-+            default: self.default.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypeParamBound {
-+    fn clone(&self) -> Self {
-+        match self {
-+            TypeParamBound::Trait(v0) => TypeParamBound::Trait(v0.clone()),
-+            TypeParamBound::Lifetime(v0) => TypeParamBound::Lifetime(v0.clone()),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypeParen {
-+    fn clone(&self) -> Self {
-+        TypeParen {
-+            paren_token: self.paren_token.clone(),
-+            elem: self.elem.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypePath {
-+    fn clone(&self) -> Self {
-+        TypePath {
-+            qself: self.qself.clone(),
-+            path: self.path.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypePtr {
-+    fn clone(&self) -> Self {
-+        TypePtr {
-+            star_token: self.star_token.clone(),
-+            const_token: self.const_token.clone(),
-+            mutability: self.mutability.clone(),
-+            elem: self.elem.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypeReference {
-+    fn clone(&self) -> Self {
-+        TypeReference {
-+            and_token: self.and_token.clone(),
-+            lifetime: self.lifetime.clone(),
-+            mutability: self.mutability.clone(),
-+            elem: self.elem.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypeSlice {
-+    fn clone(&self) -> Self {
-+        TypeSlice {
-+            bracket_token: self.bracket_token.clone(),
-+            elem: self.elem.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypeTraitObject {
-+    fn clone(&self) -> Self {
-+        TypeTraitObject {
-+            dyn_token: self.dyn_token.clone(),
-+            bounds: self.bounds.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for TypeTuple {
-+    fn clone(&self) -> Self {
-+        TypeTuple {
-+            paren_token: self.paren_token.clone(),
-+            elems: self.elems.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Copy for UnOp {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for UnOp {
-+    fn clone(&self) -> Self {
-+        *self
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for UseGlob {
-+    fn clone(&self) -> Self {
-+        UseGlob {
-+            star_token: self.star_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for UseGroup {
-+    fn clone(&self) -> Self {
-+        UseGroup {
-+            brace_token: self.brace_token.clone(),
-+            items: self.items.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for UseName {
-+    fn clone(&self) -> Self {
-+        UseName {
-+            ident: self.ident.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for UsePath {
-+    fn clone(&self) -> Self {
-+        UsePath {
-+            ident: self.ident.clone(),
-+            colon2_token: self.colon2_token.clone(),
-+            tree: self.tree.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for UseRename {
-+    fn clone(&self) -> Self {
-+        UseRename {
-+            ident: self.ident.clone(),
-+            as_token: self.as_token.clone(),
-+            rename: self.rename.clone(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Clone for UseTree {
-+    fn clone(&self) -> Self {
-+        match self {
-+            UseTree::Path(v0) => UseTree::Path(v0.clone()),
-+            UseTree::Name(v0) => UseTree::Name(v0.clone()),
-+            UseTree::Rename(v0) => UseTree::Rename(v0.clone()),
-+            UseTree::Glob(v0) => UseTree::Glob(v0.clone()),
-+            UseTree::Group(v0) => UseTree::Group(v0.clone()),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Variadic {
-+    fn clone(&self) -> Self {
-+        Variadic {
-+            attrs: self.attrs.clone(),
-+            dots: self.dots.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Variant {
-+    fn clone(&self) -> Self {
-+        Variant {
-+            attrs: self.attrs.clone(),
-+            ident: self.ident.clone(),
-+            fields: self.fields.clone(),
-+            discriminant: self.discriminant.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for VisCrate {
-+    fn clone(&self) -> Self {
-+        VisCrate {
-+            crate_token: self.crate_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for VisPublic {
-+    fn clone(&self) -> Self {
-+        VisPublic {
-+            pub_token: self.pub_token.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for VisRestricted {
-+    fn clone(&self) -> Self {
-+        VisRestricted {
-+            pub_token: self.pub_token.clone(),
-+            paren_token: self.paren_token.clone(),
-+            in_token: self.in_token.clone(),
-+            path: self.path.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for Visibility {
-+    fn clone(&self) -> Self {
-+        match self {
-+            Visibility::Public(v0) => Visibility::Public(v0.clone()),
-+            Visibility::Crate(v0) => Visibility::Crate(v0.clone()),
-+            Visibility::Restricted(v0) => Visibility::Restricted(v0.clone()),
-+            Visibility::Inherited => Visibility::Inherited,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for WhereClause {
-+    fn clone(&self) -> Self {
-+        WhereClause {
-+            where_token: self.where_token.clone(),
-+            predicates: self.predicates.clone(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Clone for WherePredicate {
-+    fn clone(&self) -> Self {
-+        match self {
-+            WherePredicate::Type(v0) => WherePredicate::Type(v0.clone()),
-+            WherePredicate::Lifetime(v0) => WherePredicate::Lifetime(v0.clone()),
-+            WherePredicate::Eq(v0) => WherePredicate::Eq(v0.clone()),
-+        }
-+    }
-+}
-diff --git a/third_party/rust/syn/src/gen/debug.rs b/third_party/rust/syn/src/gen/debug.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/src/gen/debug.rs
-@@ -0,0 +1,2857 @@
-+// This file is @generated by syn-internal-codegen.
-+// It is not intended for manual editing.
-+
-+use crate::*;
-+use std::fmt::{self, Debug};
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Abi {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Abi");
-+        formatter.field("extern_token", &self.extern_token);
-+        formatter.field("name", &self.name);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for AngleBracketedGenericArguments {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("AngleBracketedGenericArguments");
-+        formatter.field("colon2_token", &self.colon2_token);
-+        formatter.field("lt_token", &self.lt_token);
-+        formatter.field("args", &self.args);
-+        formatter.field("gt_token", &self.gt_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for Arm {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Arm");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("pat", &self.pat);
-+        formatter.field("guard", &self.guard);
-+        formatter.field("fat_arrow_token", &self.fat_arrow_token);
-+        formatter.field("body", &self.body);
-+        formatter.field("comma", &self.comma);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for AttrStyle {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            AttrStyle::Outer => formatter.write_str("Outer"),
-+            AttrStyle::Inner(v0) => {
-+                let mut formatter = formatter.debug_tuple("Inner");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Attribute {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Attribute");
-+        formatter.field("pound_token", &self.pound_token);
-+        formatter.field("style", &self.style);
-+        formatter.field("bracket_token", &self.bracket_token);
-+        formatter.field("path", &self.path);
-+        formatter.field("tokens", &self.tokens);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for BareFnArg {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("BareFnArg");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("name", &self.name);
-+        formatter.field("ty", &self.ty);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for BinOp {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            BinOp::Add(v0) => {
-+                let mut formatter = formatter.debug_tuple("Add");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::Sub(v0) => {
-+                let mut formatter = formatter.debug_tuple("Sub");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::Mul(v0) => {
-+                let mut formatter = formatter.debug_tuple("Mul");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::Div(v0) => {
-+                let mut formatter = formatter.debug_tuple("Div");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::Rem(v0) => {
-+                let mut formatter = formatter.debug_tuple("Rem");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::And(v0) => {
-+                let mut formatter = formatter.debug_tuple("And");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::Or(v0) => {
-+                let mut formatter = formatter.debug_tuple("Or");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::BitXor(v0) => {
-+                let mut formatter = formatter.debug_tuple("BitXor");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::BitAnd(v0) => {
-+                let mut formatter = formatter.debug_tuple("BitAnd");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::BitOr(v0) => {
-+                let mut formatter = formatter.debug_tuple("BitOr");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::Shl(v0) => {
-+                let mut formatter = formatter.debug_tuple("Shl");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::Shr(v0) => {
-+                let mut formatter = formatter.debug_tuple("Shr");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::Eq(v0) => {
-+                let mut formatter = formatter.debug_tuple("Eq");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::Lt(v0) => {
-+                let mut formatter = formatter.debug_tuple("Lt");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::Le(v0) => {
-+                let mut formatter = formatter.debug_tuple("Le");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::Ne(v0) => {
-+                let mut formatter = formatter.debug_tuple("Ne");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::Ge(v0) => {
-+                let mut formatter = formatter.debug_tuple("Ge");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::Gt(v0) => {
-+                let mut formatter = formatter.debug_tuple("Gt");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::AddEq(v0) => {
-+                let mut formatter = formatter.debug_tuple("AddEq");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::SubEq(v0) => {
-+                let mut formatter = formatter.debug_tuple("SubEq");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::MulEq(v0) => {
-+                let mut formatter = formatter.debug_tuple("MulEq");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::DivEq(v0) => {
-+                let mut formatter = formatter.debug_tuple("DivEq");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::RemEq(v0) => {
-+                let mut formatter = formatter.debug_tuple("RemEq");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::BitXorEq(v0) => {
-+                let mut formatter = formatter.debug_tuple("BitXorEq");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::BitAndEq(v0) => {
-+                let mut formatter = formatter.debug_tuple("BitAndEq");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::BitOrEq(v0) => {
-+                let mut formatter = formatter.debug_tuple("BitOrEq");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::ShlEq(v0) => {
-+                let mut formatter = formatter.debug_tuple("ShlEq");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            BinOp::ShrEq(v0) => {
-+                let mut formatter = formatter.debug_tuple("ShrEq");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Binding {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Binding");
-+        formatter.field("ident", &self.ident);
-+        formatter.field("eq_token", &self.eq_token);
-+        formatter.field("ty", &self.ty);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for Block {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Block");
-+        formatter.field("brace_token", &self.brace_token);
-+        formatter.field("stmts", &self.stmts);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for BoundLifetimes {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("BoundLifetimes");
-+        formatter.field("for_token", &self.for_token);
-+        formatter.field("lt_token", &self.lt_token);
-+        formatter.field("lifetimes", &self.lifetimes);
-+        formatter.field("gt_token", &self.gt_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for ConstParam {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ConstParam");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("const_token", &self.const_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("ty", &self.ty);
-+        formatter.field("eq_token", &self.eq_token);
-+        formatter.field("default", &self.default);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Constraint {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Constraint");
-+        formatter.field("ident", &self.ident);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("bounds", &self.bounds);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Debug for Data {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            Data::Struct(v0) => {
-+                let mut formatter = formatter.debug_tuple("Struct");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Data::Enum(v0) => {
-+                let mut formatter = formatter.debug_tuple("Enum");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Data::Union(v0) => {
-+                let mut formatter = formatter.debug_tuple("Union");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Debug for DataEnum {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("DataEnum");
-+        formatter.field("enum_token", &self.enum_token);
-+        formatter.field("brace_token", &self.brace_token);
-+        formatter.field("variants", &self.variants);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Debug for DataStruct {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("DataStruct");
-+        formatter.field("struct_token", &self.struct_token);
-+        formatter.field("fields", &self.fields);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Debug for DataUnion {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("DataUnion");
-+        formatter.field("union_token", &self.union_token);
-+        formatter.field("fields", &self.fields);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Debug for DeriveInput {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("DeriveInput");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("generics", &self.generics);
-+        formatter.field("data", &self.data);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Expr {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            #[cfg(feature = "full")]
-+            Expr::Array(v0) => {
-+                let mut formatter = formatter.debug_tuple("Array");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Assign(v0) => {
-+                let mut formatter = formatter.debug_tuple("Assign");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::AssignOp(v0) => {
-+                let mut formatter = formatter.debug_tuple("AssignOp");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Async(v0) => {
-+                let mut formatter = formatter.debug_tuple("Async");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Await(v0) => {
-+                let mut formatter = formatter.debug_tuple("Await");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Expr::Binary(v0) => {
-+                let mut formatter = formatter.debug_tuple("Binary");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Block(v0) => {
-+                let mut formatter = formatter.debug_tuple("Block");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Box(v0) => {
-+                let mut formatter = formatter.debug_tuple("Box");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Break(v0) => {
-+                let mut formatter = formatter.debug_tuple("Break");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Expr::Call(v0) => {
-+                let mut formatter = formatter.debug_tuple("Call");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Expr::Cast(v0) => {
-+                let mut formatter = formatter.debug_tuple("Cast");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Closure(v0) => {
-+                let mut formatter = formatter.debug_tuple("Closure");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Continue(v0) => {
-+                let mut formatter = formatter.debug_tuple("Continue");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Expr::Field(v0) => {
-+                let mut formatter = formatter.debug_tuple("Field");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::ForLoop(v0) => {
-+                let mut formatter = formatter.debug_tuple("ForLoop");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Group(v0) => {
-+                let mut formatter = formatter.debug_tuple("Group");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::If(v0) => {
-+                let mut formatter = formatter.debug_tuple("If");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Expr::Index(v0) => {
-+                let mut formatter = formatter.debug_tuple("Index");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Let(v0) => {
-+                let mut formatter = formatter.debug_tuple("Let");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Expr::Lit(v0) => {
-+                let mut formatter = formatter.debug_tuple("Lit");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Loop(v0) => {
-+                let mut formatter = formatter.debug_tuple("Loop");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Macro(v0) => {
-+                let mut formatter = formatter.debug_tuple("Macro");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Match(v0) => {
-+                let mut formatter = formatter.debug_tuple("Match");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::MethodCall(v0) => {
-+                let mut formatter = formatter.debug_tuple("MethodCall");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Expr::Paren(v0) => {
-+                let mut formatter = formatter.debug_tuple("Paren");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Expr::Path(v0) => {
-+                let mut formatter = formatter.debug_tuple("Path");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Range(v0) => {
-+                let mut formatter = formatter.debug_tuple("Range");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Reference(v0) => {
-+                let mut formatter = formatter.debug_tuple("Reference");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Repeat(v0) => {
-+                let mut formatter = formatter.debug_tuple("Repeat");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Return(v0) => {
-+                let mut formatter = formatter.debug_tuple("Return");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Struct(v0) => {
-+                let mut formatter = formatter.debug_tuple("Struct");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Try(v0) => {
-+                let mut formatter = formatter.debug_tuple("Try");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::TryBlock(v0) => {
-+                let mut formatter = formatter.debug_tuple("TryBlock");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Tuple(v0) => {
-+                let mut formatter = formatter.debug_tuple("Tuple");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Type(v0) => {
-+                let mut formatter = formatter.debug_tuple("Type");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Expr::Unary(v0) => {
-+                let mut formatter = formatter.debug_tuple("Unary");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Unsafe(v0) => {
-+                let mut formatter = formatter.debug_tuple("Unsafe");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Expr::Verbatim(v0) => {
-+                let mut formatter = formatter.debug_tuple("Verbatim");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::While(v0) => {
-+                let mut formatter = formatter.debug_tuple("While");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Yield(v0) => {
-+                let mut formatter = formatter.debug_tuple("Yield");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprArray {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprArray");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("bracket_token", &self.bracket_token);
-+        formatter.field("elems", &self.elems);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprAssign {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprAssign");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("left", &self.left);
-+        formatter.field("eq_token", &self.eq_token);
-+        formatter.field("right", &self.right);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprAssignOp {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprAssignOp");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("left", &self.left);
-+        formatter.field("op", &self.op);
-+        formatter.field("right", &self.right);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprAsync {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprAsync");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("async_token", &self.async_token);
-+        formatter.field("capture", &self.capture);
-+        formatter.field("block", &self.block);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprAwait {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprAwait");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("base", &self.base);
-+        formatter.field("dot_token", &self.dot_token);
-+        formatter.field("await_token", &self.await_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for ExprBinary {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprBinary");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("left", &self.left);
-+        formatter.field("op", &self.op);
-+        formatter.field("right", &self.right);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprBlock {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprBlock");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("label", &self.label);
-+        formatter.field("block", &self.block);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprBox {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprBox");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("box_token", &self.box_token);
-+        formatter.field("expr", &self.expr);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprBreak {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprBreak");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("break_token", &self.break_token);
-+        formatter.field("label", &self.label);
-+        formatter.field("expr", &self.expr);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for ExprCall {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprCall");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("func", &self.func);
-+        formatter.field("paren_token", &self.paren_token);
-+        formatter.field("args", &self.args);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for ExprCast {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprCast");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("expr", &self.expr);
-+        formatter.field("as_token", &self.as_token);
-+        formatter.field("ty", &self.ty);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprClosure {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprClosure");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("asyncness", &self.asyncness);
-+        formatter.field("movability", &self.movability);
-+        formatter.field("capture", &self.capture);
-+        formatter.field("or1_token", &self.or1_token);
-+        formatter.field("inputs", &self.inputs);
-+        formatter.field("or2_token", &self.or2_token);
-+        formatter.field("output", &self.output);
-+        formatter.field("body", &self.body);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprContinue {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprContinue");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("continue_token", &self.continue_token);
-+        formatter.field("label", &self.label);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for ExprField {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprField");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("base", &self.base);
-+        formatter.field("dot_token", &self.dot_token);
-+        formatter.field("member", &self.member);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprForLoop {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprForLoop");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("label", &self.label);
-+        formatter.field("for_token", &self.for_token);
-+        formatter.field("pat", &self.pat);
-+        formatter.field("in_token", &self.in_token);
-+        formatter.field("expr", &self.expr);
-+        formatter.field("body", &self.body);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprGroup {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprGroup");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("group_token", &self.group_token);
-+        formatter.field("expr", &self.expr);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprIf {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprIf");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("if_token", &self.if_token);
-+        formatter.field("cond", &self.cond);
-+        formatter.field("then_branch", &self.then_branch);
-+        formatter.field("else_branch", &self.else_branch);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for ExprIndex {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprIndex");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("expr", &self.expr);
-+        formatter.field("bracket_token", &self.bracket_token);
-+        formatter.field("index", &self.index);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprLet {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprLet");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("let_token", &self.let_token);
-+        formatter.field("pat", &self.pat);
-+        formatter.field("eq_token", &self.eq_token);
-+        formatter.field("expr", &self.expr);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for ExprLit {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprLit");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("lit", &self.lit);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprLoop {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprLoop");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("label", &self.label);
-+        formatter.field("loop_token", &self.loop_token);
-+        formatter.field("body", &self.body);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprMacro {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprMacro");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("mac", &self.mac);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprMatch {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprMatch");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("match_token", &self.match_token);
-+        formatter.field("expr", &self.expr);
-+        formatter.field("brace_token", &self.brace_token);
-+        formatter.field("arms", &self.arms);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprMethodCall {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprMethodCall");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("receiver", &self.receiver);
-+        formatter.field("dot_token", &self.dot_token);
-+        formatter.field("method", &self.method);
-+        formatter.field("turbofish", &self.turbofish);
-+        formatter.field("paren_token", &self.paren_token);
-+        formatter.field("args", &self.args);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for ExprParen {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprParen");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("paren_token", &self.paren_token);
-+        formatter.field("expr", &self.expr);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for ExprPath {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprPath");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("qself", &self.qself);
-+        formatter.field("path", &self.path);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprRange {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprRange");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("from", &self.from);
-+        formatter.field("limits", &self.limits);
-+        formatter.field("to", &self.to);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprReference {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprReference");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("and_token", &self.and_token);
-+        formatter.field("raw", &self.raw);
-+        formatter.field("mutability", &self.mutability);
-+        formatter.field("expr", &self.expr);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprRepeat {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprRepeat");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("bracket_token", &self.bracket_token);
-+        formatter.field("expr", &self.expr);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.field("len", &self.len);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprReturn {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprReturn");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("return_token", &self.return_token);
-+        formatter.field("expr", &self.expr);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprStruct {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprStruct");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("path", &self.path);
-+        formatter.field("brace_token", &self.brace_token);
-+        formatter.field("fields", &self.fields);
-+        formatter.field("dot2_token", &self.dot2_token);
-+        formatter.field("rest", &self.rest);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprTry {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprTry");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("expr", &self.expr);
-+        formatter.field("question_token", &self.question_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprTryBlock {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprTryBlock");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("try_token", &self.try_token);
-+        formatter.field("block", &self.block);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprTuple {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprTuple");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("paren_token", &self.paren_token);
-+        formatter.field("elems", &self.elems);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprType {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprType");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("expr", &self.expr);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("ty", &self.ty);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for ExprUnary {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprUnary");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("op", &self.op);
-+        formatter.field("expr", &self.expr);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprUnsafe {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprUnsafe");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("unsafe_token", &self.unsafe_token);
-+        formatter.field("block", &self.block);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprWhile {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprWhile");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("label", &self.label);
-+        formatter.field("while_token", &self.while_token);
-+        formatter.field("cond", &self.cond);
-+        formatter.field("body", &self.body);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ExprYield {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ExprYield");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("yield_token", &self.yield_token);
-+        formatter.field("expr", &self.expr);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Field {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Field");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("ty", &self.ty);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for FieldPat {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("FieldPat");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("member", &self.member);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("pat", &self.pat);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for FieldValue {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("FieldValue");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("member", &self.member);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("expr", &self.expr);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Fields {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            Fields::Named(v0) => {
-+                let mut formatter = formatter.debug_tuple("Named");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Fields::Unnamed(v0) => {
-+                let mut formatter = formatter.debug_tuple("Unnamed");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Fields::Unit => formatter.write_str("Unit"),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for FieldsNamed {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("FieldsNamed");
-+        formatter.field("brace_token", &self.brace_token);
-+        formatter.field("named", &self.named);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for FieldsUnnamed {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("FieldsUnnamed");
-+        formatter.field("paren_token", &self.paren_token);
-+        formatter.field("unnamed", &self.unnamed);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for File {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("File");
-+        formatter.field("shebang", &self.shebang);
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("items", &self.items);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for FnArg {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            FnArg::Receiver(v0) => {
-+                let mut formatter = formatter.debug_tuple("Receiver");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            FnArg::Typed(v0) => {
-+                let mut formatter = formatter.debug_tuple("Typed");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ForeignItem {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            ForeignItem::Fn(v0) => {
-+                let mut formatter = formatter.debug_tuple("Fn");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            ForeignItem::Static(v0) => {
-+                let mut formatter = formatter.debug_tuple("Static");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            ForeignItem::Type(v0) => {
-+                let mut formatter = formatter.debug_tuple("Type");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            ForeignItem::Macro(v0) => {
-+                let mut formatter = formatter.debug_tuple("Macro");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            ForeignItem::Verbatim(v0) => {
-+                let mut formatter = formatter.debug_tuple("Verbatim");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ForeignItemFn {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ForeignItemFn");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("sig", &self.sig);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ForeignItemMacro {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ForeignItemMacro");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("mac", &self.mac);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ForeignItemStatic {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ForeignItemStatic");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("static_token", &self.static_token);
-+        formatter.field("mutability", &self.mutability);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("ty", &self.ty);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ForeignItemType {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ForeignItemType");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("type_token", &self.type_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for GenericArgument {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            GenericArgument::Lifetime(v0) => {
-+                let mut formatter = formatter.debug_tuple("Lifetime");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            GenericArgument::Type(v0) => {
-+                let mut formatter = formatter.debug_tuple("Type");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            GenericArgument::Binding(v0) => {
-+                let mut formatter = formatter.debug_tuple("Binding");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            GenericArgument::Constraint(v0) => {
-+                let mut formatter = formatter.debug_tuple("Constraint");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            GenericArgument::Const(v0) => {
-+                let mut formatter = formatter.debug_tuple("Const");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for GenericMethodArgument {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            GenericMethodArgument::Type(v0) => {
-+                let mut formatter = formatter.debug_tuple("Type");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            GenericMethodArgument::Const(v0) => {
-+                let mut formatter = formatter.debug_tuple("Const");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for GenericParam {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            GenericParam::Type(v0) => {
-+                let mut formatter = formatter.debug_tuple("Type");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            GenericParam::Lifetime(v0) => {
-+                let mut formatter = formatter.debug_tuple("Lifetime");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            GenericParam::Const(v0) => {
-+                let mut formatter = formatter.debug_tuple("Const");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Generics {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Generics");
-+        formatter.field("lt_token", &self.lt_token);
-+        formatter.field("params", &self.params);
-+        formatter.field("gt_token", &self.gt_token);
-+        formatter.field("where_clause", &self.where_clause);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ImplItem {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            ImplItem::Const(v0) => {
-+                let mut formatter = formatter.debug_tuple("Const");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            ImplItem::Method(v0) => {
-+                let mut formatter = formatter.debug_tuple("Method");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            ImplItem::Type(v0) => {
-+                let mut formatter = formatter.debug_tuple("Type");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            ImplItem::Macro(v0) => {
-+                let mut formatter = formatter.debug_tuple("Macro");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            ImplItem::Verbatim(v0) => {
-+                let mut formatter = formatter.debug_tuple("Verbatim");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ImplItemConst {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ImplItemConst");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("defaultness", &self.defaultness);
-+        formatter.field("const_token", &self.const_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("ty", &self.ty);
-+        formatter.field("eq_token", &self.eq_token);
-+        formatter.field("expr", &self.expr);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ImplItemMacro {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ImplItemMacro");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("mac", &self.mac);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ImplItemMethod {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ImplItemMethod");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("defaultness", &self.defaultness);
-+        formatter.field("sig", &self.sig);
-+        formatter.field("block", &self.block);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ImplItemType {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ImplItemType");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("defaultness", &self.defaultness);
-+        formatter.field("type_token", &self.type_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("generics", &self.generics);
-+        formatter.field("eq_token", &self.eq_token);
-+        formatter.field("ty", &self.ty);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Index {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Index");
-+        formatter.field("index", &self.index);
-+        formatter.field("span", &self.span);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for Item {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            Item::Const(v0) => {
-+                let mut formatter = formatter.debug_tuple("Const");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::Enum(v0) => {
-+                let mut formatter = formatter.debug_tuple("Enum");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::ExternCrate(v0) => {
-+                let mut formatter = formatter.debug_tuple("ExternCrate");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::Fn(v0) => {
-+                let mut formatter = formatter.debug_tuple("Fn");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::ForeignMod(v0) => {
-+                let mut formatter = formatter.debug_tuple("ForeignMod");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::Impl(v0) => {
-+                let mut formatter = formatter.debug_tuple("Impl");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::Macro(v0) => {
-+                let mut formatter = formatter.debug_tuple("Macro");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::Macro2(v0) => {
-+                let mut formatter = formatter.debug_tuple("Macro2");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::Mod(v0) => {
-+                let mut formatter = formatter.debug_tuple("Mod");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::Static(v0) => {
-+                let mut formatter = formatter.debug_tuple("Static");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::Struct(v0) => {
-+                let mut formatter = formatter.debug_tuple("Struct");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::Trait(v0) => {
-+                let mut formatter = formatter.debug_tuple("Trait");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::TraitAlias(v0) => {
-+                let mut formatter = formatter.debug_tuple("TraitAlias");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::Type(v0) => {
-+                let mut formatter = formatter.debug_tuple("Type");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::Union(v0) => {
-+                let mut formatter = formatter.debug_tuple("Union");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::Use(v0) => {
-+                let mut formatter = formatter.debug_tuple("Use");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Item::Verbatim(v0) => {
-+                let mut formatter = formatter.debug_tuple("Verbatim");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemConst {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemConst");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("const_token", &self.const_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("ty", &self.ty);
-+        formatter.field("eq_token", &self.eq_token);
-+        formatter.field("expr", &self.expr);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemEnum {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemEnum");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("enum_token", &self.enum_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("generics", &self.generics);
-+        formatter.field("brace_token", &self.brace_token);
-+        formatter.field("variants", &self.variants);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemExternCrate {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemExternCrate");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("extern_token", &self.extern_token);
-+        formatter.field("crate_token", &self.crate_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("rename", &self.rename);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemFn {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemFn");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("sig", &self.sig);
-+        formatter.field("block", &self.block);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemForeignMod {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemForeignMod");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("abi", &self.abi);
-+        formatter.field("brace_token", &self.brace_token);
-+        formatter.field("items", &self.items);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemImpl {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemImpl");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("defaultness", &self.defaultness);
-+        formatter.field("unsafety", &self.unsafety);
-+        formatter.field("impl_token", &self.impl_token);
-+        formatter.field("generics", &self.generics);
-+        formatter.field("trait_", &self.trait_);
-+        formatter.field("self_ty", &self.self_ty);
-+        formatter.field("brace_token", &self.brace_token);
-+        formatter.field("items", &self.items);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemMacro {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemMacro");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("mac", &self.mac);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemMacro2 {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemMacro2");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("macro_token", &self.macro_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("rules", &self.rules);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemMod {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemMod");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("mod_token", &self.mod_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("content", &self.content);
-+        formatter.field("semi", &self.semi);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemStatic {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemStatic");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("static_token", &self.static_token);
-+        formatter.field("mutability", &self.mutability);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("ty", &self.ty);
-+        formatter.field("eq_token", &self.eq_token);
-+        formatter.field("expr", &self.expr);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemStruct {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemStruct");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("struct_token", &self.struct_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("generics", &self.generics);
-+        formatter.field("fields", &self.fields);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemTrait {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemTrait");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("unsafety", &self.unsafety);
-+        formatter.field("auto_token", &self.auto_token);
-+        formatter.field("trait_token", &self.trait_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("generics", &self.generics);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("supertraits", &self.supertraits);
-+        formatter.field("brace_token", &self.brace_token);
-+        formatter.field("items", &self.items);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemTraitAlias {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemTraitAlias");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("trait_token", &self.trait_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("generics", &self.generics);
-+        formatter.field("eq_token", &self.eq_token);
-+        formatter.field("bounds", &self.bounds);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemType {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemType");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("type_token", &self.type_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("generics", &self.generics);
-+        formatter.field("eq_token", &self.eq_token);
-+        formatter.field("ty", &self.ty);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemUnion {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemUnion");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("union_token", &self.union_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("generics", &self.generics);
-+        formatter.field("fields", &self.fields);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for ItemUse {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ItemUse");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("vis", &self.vis);
-+        formatter.field("use_token", &self.use_token);
-+        formatter.field("leading_colon", &self.leading_colon);
-+        formatter.field("tree", &self.tree);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for Label {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Label");
-+        formatter.field("name", &self.name);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.finish()
-+    }
-+}
-+impl Debug for Lifetime {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Lifetime");
-+        formatter.field("apostrophe", &self.apostrophe);
-+        formatter.field("ident", &self.ident);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for LifetimeDef {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("LifetimeDef");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("lifetime", &self.lifetime);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("bounds", &self.bounds);
-+        formatter.finish()
-+    }
-+}
-+impl Debug for Lit {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            Lit::Str(v0) => {
-+                let mut formatter = formatter.debug_tuple("Str");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Lit::ByteStr(v0) => {
-+                let mut formatter = formatter.debug_tuple("ByteStr");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Lit::Byte(v0) => {
-+                let mut formatter = formatter.debug_tuple("Byte");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Lit::Char(v0) => {
-+                let mut formatter = formatter.debug_tuple("Char");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Lit::Int(v0) => {
-+                let mut formatter = formatter.debug_tuple("Int");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Lit::Float(v0) => {
-+                let mut formatter = formatter.debug_tuple("Float");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Lit::Bool(v0) => {
-+                let mut formatter = formatter.debug_tuple("Bool");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Lit::Verbatim(v0) => {
-+                let mut formatter = formatter.debug_tuple("Verbatim");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for Local {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Local");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("let_token", &self.let_token);
-+        formatter.field("pat", &self.pat);
-+        formatter.field("init", &self.init);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Macro {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Macro");
-+        formatter.field("path", &self.path);
-+        formatter.field("bang_token", &self.bang_token);
-+        formatter.field("delimiter", &self.delimiter);
-+        formatter.field("tokens", &self.tokens);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for MacroDelimiter {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            MacroDelimiter::Paren(v0) => {
-+                let mut formatter = formatter.debug_tuple("Paren");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            MacroDelimiter::Brace(v0) => {
-+                let mut formatter = formatter.debug_tuple("Brace");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            MacroDelimiter::Bracket(v0) => {
-+                let mut formatter = formatter.debug_tuple("Bracket");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Member {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            Member::Named(v0) => {
-+                let mut formatter = formatter.debug_tuple("Named");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Member::Unnamed(v0) => {
-+                let mut formatter = formatter.debug_tuple("Unnamed");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Meta {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            Meta::Path(v0) => {
-+                let mut formatter = formatter.debug_tuple("Path");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Meta::List(v0) => {
-+                let mut formatter = formatter.debug_tuple("List");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Meta::NameValue(v0) => {
-+                let mut formatter = formatter.debug_tuple("NameValue");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for MetaList {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("MetaList");
-+        formatter.field("path", &self.path);
-+        formatter.field("paren_token", &self.paren_token);
-+        formatter.field("nested", &self.nested);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for MetaNameValue {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("MetaNameValue");
-+        formatter.field("path", &self.path);
-+        formatter.field("eq_token", &self.eq_token);
-+        formatter.field("lit", &self.lit);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for MethodTurbofish {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("MethodTurbofish");
-+        formatter.field("colon2_token", &self.colon2_token);
-+        formatter.field("lt_token", &self.lt_token);
-+        formatter.field("args", &self.args);
-+        formatter.field("gt_token", &self.gt_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for NestedMeta {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            NestedMeta::Meta(v0) => {
-+                let mut formatter = formatter.debug_tuple("Meta");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            NestedMeta::Lit(v0) => {
-+                let mut formatter = formatter.debug_tuple("Lit");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for ParenthesizedGenericArguments {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("ParenthesizedGenericArguments");
-+        formatter.field("paren_token", &self.paren_token);
-+        formatter.field("inputs", &self.inputs);
-+        formatter.field("output", &self.output);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for Pat {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            Pat::Box(v0) => {
-+                let mut formatter = formatter.debug_tuple("Box");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::Ident(v0) => {
-+                let mut formatter = formatter.debug_tuple("Ident");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::Lit(v0) => {
-+                let mut formatter = formatter.debug_tuple("Lit");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::Macro(v0) => {
-+                let mut formatter = formatter.debug_tuple("Macro");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::Or(v0) => {
-+                let mut formatter = formatter.debug_tuple("Or");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::Path(v0) => {
-+                let mut formatter = formatter.debug_tuple("Path");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::Range(v0) => {
-+                let mut formatter = formatter.debug_tuple("Range");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::Reference(v0) => {
-+                let mut formatter = formatter.debug_tuple("Reference");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::Rest(v0) => {
-+                let mut formatter = formatter.debug_tuple("Rest");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::Slice(v0) => {
-+                let mut formatter = formatter.debug_tuple("Slice");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::Struct(v0) => {
-+                let mut formatter = formatter.debug_tuple("Struct");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::Tuple(v0) => {
-+                let mut formatter = formatter.debug_tuple("Tuple");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::TupleStruct(v0) => {
-+                let mut formatter = formatter.debug_tuple("TupleStruct");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::Type(v0) => {
-+                let mut formatter = formatter.debug_tuple("Type");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::Verbatim(v0) => {
-+                let mut formatter = formatter.debug_tuple("Verbatim");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Pat::Wild(v0) => {
-+                let mut formatter = formatter.debug_tuple("Wild");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatBox {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatBox");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("box_token", &self.box_token);
-+        formatter.field("pat", &self.pat);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatIdent {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatIdent");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("by_ref", &self.by_ref);
-+        formatter.field("mutability", &self.mutability);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("subpat", &self.subpat);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatLit {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatLit");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("expr", &self.expr);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatMacro {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatMacro");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("mac", &self.mac);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatOr {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatOr");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("leading_vert", &self.leading_vert);
-+        formatter.field("cases", &self.cases);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatPath {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatPath");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("qself", &self.qself);
-+        formatter.field("path", &self.path);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatRange {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatRange");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("lo", &self.lo);
-+        formatter.field("limits", &self.limits);
-+        formatter.field("hi", &self.hi);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatReference {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatReference");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("and_token", &self.and_token);
-+        formatter.field("mutability", &self.mutability);
-+        formatter.field("pat", &self.pat);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatRest {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatRest");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("dot2_token", &self.dot2_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatSlice {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatSlice");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("bracket_token", &self.bracket_token);
-+        formatter.field("elems", &self.elems);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatStruct {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatStruct");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("path", &self.path);
-+        formatter.field("brace_token", &self.brace_token);
-+        formatter.field("fields", &self.fields);
-+        formatter.field("dot2_token", &self.dot2_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatTuple {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatTuple");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("paren_token", &self.paren_token);
-+        formatter.field("elems", &self.elems);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatTupleStruct {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatTupleStruct");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("path", &self.path);
-+        formatter.field("pat", &self.pat);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatType {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatType");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("pat", &self.pat);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("ty", &self.ty);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for PatWild {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PatWild");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("underscore_token", &self.underscore_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Path {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Path");
-+        formatter.field("leading_colon", &self.leading_colon);
-+        formatter.field("segments", &self.segments);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for PathArguments {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            PathArguments::None => formatter.write_str("None"),
-+            PathArguments::AngleBracketed(v0) => {
-+                let mut formatter = formatter.debug_tuple("AngleBracketed");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            PathArguments::Parenthesized(v0) => {
-+                let mut formatter = formatter.debug_tuple("Parenthesized");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for PathSegment {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PathSegment");
-+        formatter.field("ident", &self.ident);
-+        formatter.field("arguments", &self.arguments);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for PredicateEq {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PredicateEq");
-+        formatter.field("lhs_ty", &self.lhs_ty);
-+        formatter.field("eq_token", &self.eq_token);
-+        formatter.field("rhs_ty", &self.rhs_ty);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for PredicateLifetime {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PredicateLifetime");
-+        formatter.field("lifetime", &self.lifetime);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("bounds", &self.bounds);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for PredicateType {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("PredicateType");
-+        formatter.field("lifetimes", &self.lifetimes);
-+        formatter.field("bounded_ty", &self.bounded_ty);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("bounds", &self.bounds);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for QSelf {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("QSelf");
-+        formatter.field("lt_token", &self.lt_token);
-+        formatter.field("ty", &self.ty);
-+        formatter.field("position", &self.position);
-+        formatter.field("as_token", &self.as_token);
-+        formatter.field("gt_token", &self.gt_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for RangeLimits {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            RangeLimits::HalfOpen(v0) => {
-+                let mut formatter = formatter.debug_tuple("HalfOpen");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            RangeLimits::Closed(v0) => {
-+                let mut formatter = formatter.debug_tuple("Closed");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for Receiver {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Receiver");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("reference", &self.reference);
-+        formatter.field("mutability", &self.mutability);
-+        formatter.field("self_token", &self.self_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for ReturnType {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            ReturnType::Default => formatter.write_str("Default"),
-+            ReturnType::Type(v0, v1) => {
-+                let mut formatter = formatter.debug_tuple("Type");
-+                formatter.field(v0);
-+                formatter.field(v1);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for Signature {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Signature");
-+        formatter.field("constness", &self.constness);
-+        formatter.field("asyncness", &self.asyncness);
-+        formatter.field("unsafety", &self.unsafety);
-+        formatter.field("abi", &self.abi);
-+        formatter.field("fn_token", &self.fn_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("generics", &self.generics);
-+        formatter.field("paren_token", &self.paren_token);
-+        formatter.field("inputs", &self.inputs);
-+        formatter.field("variadic", &self.variadic);
-+        formatter.field("output", &self.output);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for Stmt {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            Stmt::Local(v0) => {
-+                let mut formatter = formatter.debug_tuple("Local");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Stmt::Item(v0) => {
-+                let mut formatter = formatter.debug_tuple("Item");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Stmt::Expr(v0) => {
-+                let mut formatter = formatter.debug_tuple("Expr");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Stmt::Semi(v0, v1) => {
-+                let mut formatter = formatter.debug_tuple("Semi");
-+                formatter.field(v0);
-+                formatter.field(v1);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TraitBound {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TraitBound");
-+        formatter.field("paren_token", &self.paren_token);
-+        formatter.field("modifier", &self.modifier);
-+        formatter.field("lifetimes", &self.lifetimes);
-+        formatter.field("path", &self.path);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TraitBoundModifier {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            TraitBoundModifier::None => formatter.write_str("None"),
-+            TraitBoundModifier::Maybe(v0) => {
-+                let mut formatter = formatter.debug_tuple("Maybe");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for TraitItem {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            TraitItem::Const(v0) => {
-+                let mut formatter = formatter.debug_tuple("Const");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            TraitItem::Method(v0) => {
-+                let mut formatter = formatter.debug_tuple("Method");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            TraitItem::Type(v0) => {
-+                let mut formatter = formatter.debug_tuple("Type");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            TraitItem::Macro(v0) => {
-+                let mut formatter = formatter.debug_tuple("Macro");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            TraitItem::Verbatim(v0) => {
-+                let mut formatter = formatter.debug_tuple("Verbatim");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for TraitItemConst {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TraitItemConst");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("const_token", &self.const_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("ty", &self.ty);
-+        formatter.field("default", &self.default);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for TraitItemMacro {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TraitItemMacro");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("mac", &self.mac);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for TraitItemMethod {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TraitItemMethod");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("sig", &self.sig);
-+        formatter.field("default", &self.default);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for TraitItemType {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TraitItemType");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("type_token", &self.type_token);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("generics", &self.generics);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("bounds", &self.bounds);
-+        formatter.field("default", &self.default);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Type {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            Type::Array(v0) => {
-+                let mut formatter = formatter.debug_tuple("Array");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Type::BareFn(v0) => {
-+                let mut formatter = formatter.debug_tuple("BareFn");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Type::Group(v0) => {
-+                let mut formatter = formatter.debug_tuple("Group");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Type::ImplTrait(v0) => {
-+                let mut formatter = formatter.debug_tuple("ImplTrait");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Type::Infer(v0) => {
-+                let mut formatter = formatter.debug_tuple("Infer");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Type::Macro(v0) => {
-+                let mut formatter = formatter.debug_tuple("Macro");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Type::Never(v0) => {
-+                let mut formatter = formatter.debug_tuple("Never");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Type::Paren(v0) => {
-+                let mut formatter = formatter.debug_tuple("Paren");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Type::Path(v0) => {
-+                let mut formatter = formatter.debug_tuple("Path");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Type::Ptr(v0) => {
-+                let mut formatter = formatter.debug_tuple("Ptr");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Type::Reference(v0) => {
-+                let mut formatter = formatter.debug_tuple("Reference");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Type::Slice(v0) => {
-+                let mut formatter = formatter.debug_tuple("Slice");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Type::TraitObject(v0) => {
-+                let mut formatter = formatter.debug_tuple("TraitObject");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Type::Tuple(v0) => {
-+                let mut formatter = formatter.debug_tuple("Tuple");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Type::Verbatim(v0) => {
-+                let mut formatter = formatter.debug_tuple("Verbatim");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypeArray {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypeArray");
-+        formatter.field("bracket_token", &self.bracket_token);
-+        formatter.field("elem", &self.elem);
-+        formatter.field("semi_token", &self.semi_token);
-+        formatter.field("len", &self.len);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypeBareFn {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypeBareFn");
-+        formatter.field("lifetimes", &self.lifetimes);
-+        formatter.field("unsafety", &self.unsafety);
-+        formatter.field("abi", &self.abi);
-+        formatter.field("fn_token", &self.fn_token);
-+        formatter.field("paren_token", &self.paren_token);
-+        formatter.field("inputs", &self.inputs);
-+        formatter.field("variadic", &self.variadic);
-+        formatter.field("output", &self.output);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypeGroup {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypeGroup");
-+        formatter.field("group_token", &self.group_token);
-+        formatter.field("elem", &self.elem);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypeImplTrait {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypeImplTrait");
-+        formatter.field("impl_token", &self.impl_token);
-+        formatter.field("bounds", &self.bounds);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypeInfer {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypeInfer");
-+        formatter.field("underscore_token", &self.underscore_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypeMacro {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypeMacro");
-+        formatter.field("mac", &self.mac);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypeNever {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypeNever");
-+        formatter.field("bang_token", &self.bang_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypeParam {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypeParam");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("colon_token", &self.colon_token);
-+        formatter.field("bounds", &self.bounds);
-+        formatter.field("eq_token", &self.eq_token);
-+        formatter.field("default", &self.default);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypeParamBound {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            TypeParamBound::Trait(v0) => {
-+                let mut formatter = formatter.debug_tuple("Trait");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            TypeParamBound::Lifetime(v0) => {
-+                let mut formatter = formatter.debug_tuple("Lifetime");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypeParen {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypeParen");
-+        formatter.field("paren_token", &self.paren_token);
-+        formatter.field("elem", &self.elem);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypePath {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypePath");
-+        formatter.field("qself", &self.qself);
-+        formatter.field("path", &self.path);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypePtr {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypePtr");
-+        formatter.field("star_token", &self.star_token);
-+        formatter.field("const_token", &self.const_token);
-+        formatter.field("mutability", &self.mutability);
-+        formatter.field("elem", &self.elem);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypeReference {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypeReference");
-+        formatter.field("and_token", &self.and_token);
-+        formatter.field("lifetime", &self.lifetime);
-+        formatter.field("mutability", &self.mutability);
-+        formatter.field("elem", &self.elem);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypeSlice {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypeSlice");
-+        formatter.field("bracket_token", &self.bracket_token);
-+        formatter.field("elem", &self.elem);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypeTraitObject {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypeTraitObject");
-+        formatter.field("dyn_token", &self.dyn_token);
-+        formatter.field("bounds", &self.bounds);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for TypeTuple {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("TypeTuple");
-+        formatter.field("paren_token", &self.paren_token);
-+        formatter.field("elems", &self.elems);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for UnOp {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            UnOp::Deref(v0) => {
-+                let mut formatter = formatter.debug_tuple("Deref");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            UnOp::Not(v0) => {
-+                let mut formatter = formatter.debug_tuple("Not");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            UnOp::Neg(v0) => {
-+                let mut formatter = formatter.debug_tuple("Neg");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for UseGlob {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("UseGlob");
-+        formatter.field("star_token", &self.star_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for UseGroup {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("UseGroup");
-+        formatter.field("brace_token", &self.brace_token);
-+        formatter.field("items", &self.items);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for UseName {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("UseName");
-+        formatter.field("ident", &self.ident);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for UsePath {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("UsePath");
-+        formatter.field("ident", &self.ident);
-+        formatter.field("colon2_token", &self.colon2_token);
-+        formatter.field("tree", &self.tree);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for UseRename {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("UseRename");
-+        formatter.field("ident", &self.ident);
-+        formatter.field("as_token", &self.as_token);
-+        formatter.field("rename", &self.rename);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Debug for UseTree {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            UseTree::Path(v0) => {
-+                let mut formatter = formatter.debug_tuple("Path");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            UseTree::Name(v0) => {
-+                let mut formatter = formatter.debug_tuple("Name");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            UseTree::Rename(v0) => {
-+                let mut formatter = formatter.debug_tuple("Rename");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            UseTree::Glob(v0) => {
-+                let mut formatter = formatter.debug_tuple("Glob");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            UseTree::Group(v0) => {
-+                let mut formatter = formatter.debug_tuple("Group");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Variadic {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Variadic");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("dots", &self.dots);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Variant {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("Variant");
-+        formatter.field("attrs", &self.attrs);
-+        formatter.field("ident", &self.ident);
-+        formatter.field("fields", &self.fields);
-+        formatter.field("discriminant", &self.discriminant);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for VisCrate {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("VisCrate");
-+        formatter.field("crate_token", &self.crate_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for VisPublic {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("VisPublic");
-+        formatter.field("pub_token", &self.pub_token);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for VisRestricted {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("VisRestricted");
-+        formatter.field("pub_token", &self.pub_token);
-+        formatter.field("paren_token", &self.paren_token);
-+        formatter.field("in_token", &self.in_token);
-+        formatter.field("path", &self.path);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for Visibility {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            Visibility::Public(v0) => {
-+                let mut formatter = formatter.debug_tuple("Public");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Visibility::Crate(v0) => {
-+                let mut formatter = formatter.debug_tuple("Crate");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Visibility::Restricted(v0) => {
-+                let mut formatter = formatter.debug_tuple("Restricted");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            Visibility::Inherited => formatter.write_str("Inherited"),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for WhereClause {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        let mut formatter = formatter.debug_struct("WhereClause");
-+        formatter.field("where_token", &self.where_token);
-+        formatter.field("predicates", &self.predicates);
-+        formatter.finish()
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Debug for WherePredicate {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        match self {
-+            WherePredicate::Type(v0) => {
-+                let mut formatter = formatter.debug_tuple("Type");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            WherePredicate::Lifetime(v0) => {
-+                let mut formatter = formatter.debug_tuple("Lifetime");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+            WherePredicate::Eq(v0) => {
-+                let mut formatter = formatter.debug_tuple("Eq");
-+                formatter.field(v0);
-+                formatter.finish()
-+            }
-+        }
-+    }
-+}
-diff --git a/third_party/rust/syn/src/gen/eq.rs b/third_party/rust/syn/src/gen/eq.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/src/gen/eq.rs
-@@ -0,0 +1,1930 @@
-+// This file is @generated by syn-internal-codegen.
-+// It is not intended for manual editing.
-+
-+#[cfg(any(feature = "derive", feature = "full"))]
-+use crate::tt::TokenStreamHelper;
-+use crate::*;
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Abi {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Abi {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.name == other.name
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for AngleBracketedGenericArguments {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for AngleBracketedGenericArguments {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.colon2_token == other.colon2_token && self.args == other.args
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for Arm {}
-+#[cfg(feature = "full")]
-+impl PartialEq for Arm {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.pat == other.pat
-+            && self.guard == other.guard
-+            && self.body == other.body
-+            && self.comma == other.comma
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for AttrStyle {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for AttrStyle {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (AttrStyle::Outer, AttrStyle::Outer) => true,
-+            (AttrStyle::Inner(_), AttrStyle::Inner(_)) => true,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Attribute {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Attribute {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.style == other.style
-+            && self.path == other.path
-+            && TokenStreamHelper(&self.tokens) == TokenStreamHelper(&other.tokens)
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for BareFnArg {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for BareFnArg {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.name == other.name && self.ty == other.ty
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for BinOp {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for BinOp {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (BinOp::Add(_), BinOp::Add(_)) => true,
-+            (BinOp::Sub(_), BinOp::Sub(_)) => true,
-+            (BinOp::Mul(_), BinOp::Mul(_)) => true,
-+            (BinOp::Div(_), BinOp::Div(_)) => true,
-+            (BinOp::Rem(_), BinOp::Rem(_)) => true,
-+            (BinOp::And(_), BinOp::And(_)) => true,
-+            (BinOp::Or(_), BinOp::Or(_)) => true,
-+            (BinOp::BitXor(_), BinOp::BitXor(_)) => true,
-+            (BinOp::BitAnd(_), BinOp::BitAnd(_)) => true,
-+            (BinOp::BitOr(_), BinOp::BitOr(_)) => true,
-+            (BinOp::Shl(_), BinOp::Shl(_)) => true,
-+            (BinOp::Shr(_), BinOp::Shr(_)) => true,
-+            (BinOp::Eq(_), BinOp::Eq(_)) => true,
-+            (BinOp::Lt(_), BinOp::Lt(_)) => true,
-+            (BinOp::Le(_), BinOp::Le(_)) => true,
-+            (BinOp::Ne(_), BinOp::Ne(_)) => true,
-+            (BinOp::Ge(_), BinOp::Ge(_)) => true,
-+            (BinOp::Gt(_), BinOp::Gt(_)) => true,
-+            (BinOp::AddEq(_), BinOp::AddEq(_)) => true,
-+            (BinOp::SubEq(_), BinOp::SubEq(_)) => true,
-+            (BinOp::MulEq(_), BinOp::MulEq(_)) => true,
-+            (BinOp::DivEq(_), BinOp::DivEq(_)) => true,
-+            (BinOp::RemEq(_), BinOp::RemEq(_)) => true,
-+            (BinOp::BitXorEq(_), BinOp::BitXorEq(_)) => true,
-+            (BinOp::BitAndEq(_), BinOp::BitAndEq(_)) => true,
-+            (BinOp::BitOrEq(_), BinOp::BitOrEq(_)) => true,
-+            (BinOp::ShlEq(_), BinOp::ShlEq(_)) => true,
-+            (BinOp::ShrEq(_), BinOp::ShrEq(_)) => true,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Binding {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Binding {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.ident == other.ident && self.ty == other.ty
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for Block {}
-+#[cfg(feature = "full")]
-+impl PartialEq for Block {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.stmts == other.stmts
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for BoundLifetimes {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for BoundLifetimes {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.lifetimes == other.lifetimes
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for ConstParam {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for ConstParam {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.ident == other.ident
-+            && self.ty == other.ty
-+            && self.eq_token == other.eq_token
-+            && self.default == other.default
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Constraint {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Constraint {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.ident == other.ident && self.bounds == other.bounds
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Eq for Data {}
-+#[cfg(feature = "derive")]
-+impl PartialEq for Data {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (Data::Struct(self0), Data::Struct(other0)) => self0 == other0,
-+            (Data::Enum(self0), Data::Enum(other0)) => self0 == other0,
-+            (Data::Union(self0), Data::Union(other0)) => self0 == other0,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Eq for DataEnum {}
-+#[cfg(feature = "derive")]
-+impl PartialEq for DataEnum {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.variants == other.variants
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Eq for DataStruct {}
-+#[cfg(feature = "derive")]
-+impl PartialEq for DataStruct {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.fields == other.fields && self.semi_token == other.semi_token
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Eq for DataUnion {}
-+#[cfg(feature = "derive")]
-+impl PartialEq for DataUnion {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.fields == other.fields
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Eq for DeriveInput {}
-+#[cfg(feature = "derive")]
-+impl PartialEq for DeriveInput {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.ident == other.ident
-+            && self.generics == other.generics
-+            && self.data == other.data
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Expr {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Expr {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            #[cfg(feature = "full")]
-+            (Expr::Array(self0), Expr::Array(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Assign(self0), Expr::Assign(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::AssignOp(self0), Expr::AssignOp(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Async(self0), Expr::Async(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Await(self0), Expr::Await(other0)) => self0 == other0,
-+            (Expr::Binary(self0), Expr::Binary(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Block(self0), Expr::Block(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Box(self0), Expr::Box(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Break(self0), Expr::Break(other0)) => self0 == other0,
-+            (Expr::Call(self0), Expr::Call(other0)) => self0 == other0,
-+            (Expr::Cast(self0), Expr::Cast(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Closure(self0), Expr::Closure(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Continue(self0), Expr::Continue(other0)) => self0 == other0,
-+            (Expr::Field(self0), Expr::Field(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::ForLoop(self0), Expr::ForLoop(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Group(self0), Expr::Group(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::If(self0), Expr::If(other0)) => self0 == other0,
-+            (Expr::Index(self0), Expr::Index(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Let(self0), Expr::Let(other0)) => self0 == other0,
-+            (Expr::Lit(self0), Expr::Lit(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Loop(self0), Expr::Loop(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Macro(self0), Expr::Macro(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Match(self0), Expr::Match(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::MethodCall(self0), Expr::MethodCall(other0)) => self0 == other0,
-+            (Expr::Paren(self0), Expr::Paren(other0)) => self0 == other0,
-+            (Expr::Path(self0), Expr::Path(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Range(self0), Expr::Range(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Reference(self0), Expr::Reference(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Repeat(self0), Expr::Repeat(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Return(self0), Expr::Return(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Struct(self0), Expr::Struct(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Try(self0), Expr::Try(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::TryBlock(self0), Expr::TryBlock(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Tuple(self0), Expr::Tuple(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Type(self0), Expr::Type(other0)) => self0 == other0,
-+            (Expr::Unary(self0), Expr::Unary(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Unsafe(self0), Expr::Unsafe(other0)) => self0 == other0,
-+            (Expr::Verbatim(self0), Expr::Verbatim(other0)) => {
-+                TokenStreamHelper(self0) == TokenStreamHelper(other0)
-+            }
-+            #[cfg(feature = "full")]
-+            (Expr::While(self0), Expr::While(other0)) => self0 == other0,
-+            #[cfg(feature = "full")]
-+            (Expr::Yield(self0), Expr::Yield(other0)) => self0 == other0,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprArray {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprArray {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.elems == other.elems
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprAssign {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprAssign {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.left == other.left && self.right == other.right
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprAssignOp {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprAssignOp {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.left == other.left
-+            && self.op == other.op
-+            && self.right == other.right
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprAsync {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprAsync {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.capture == other.capture && self.block == other.block
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprAwait {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprAwait {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.base == other.base
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for ExprBinary {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for ExprBinary {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.left == other.left
-+            && self.op == other.op
-+            && self.right == other.right
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprBlock {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprBlock {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.label == other.label && self.block == other.block
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprBox {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprBox {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.expr == other.expr
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprBreak {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprBreak {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.label == other.label && self.expr == other.expr
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for ExprCall {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for ExprCall {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.func == other.func && self.args == other.args
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for ExprCast {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for ExprCast {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.expr == other.expr && self.ty == other.ty
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprClosure {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprClosure {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.asyncness == other.asyncness
-+            && self.movability == other.movability
-+            && self.capture == other.capture
-+            && self.inputs == other.inputs
-+            && self.output == other.output
-+            && self.body == other.body
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprContinue {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprContinue {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.label == other.label
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for ExprField {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for ExprField {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.base == other.base && self.member == other.member
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprForLoop {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprForLoop {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.label == other.label
-+            && self.pat == other.pat
-+            && self.expr == other.expr
-+            && self.body == other.body
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprGroup {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprGroup {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.expr == other.expr
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprIf {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprIf {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.cond == other.cond
-+            && self.then_branch == other.then_branch
-+            && self.else_branch == other.else_branch
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for ExprIndex {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for ExprIndex {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.expr == other.expr && self.index == other.index
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprLet {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprLet {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.pat == other.pat && self.expr == other.expr
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for ExprLit {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for ExprLit {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.lit == other.lit
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprLoop {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprLoop {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.label == other.label && self.body == other.body
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprMacro {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprMacro {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.mac == other.mac
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprMatch {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprMatch {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.expr == other.expr && self.arms == other.arms
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprMethodCall {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprMethodCall {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.receiver == other.receiver
-+            && self.method == other.method
-+            && self.turbofish == other.turbofish
-+            && self.args == other.args
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for ExprParen {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for ExprParen {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.expr == other.expr
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for ExprPath {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for ExprPath {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.qself == other.qself && self.path == other.path
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprRange {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprRange {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.from == other.from
-+            && self.limits == other.limits
-+            && self.to == other.to
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprReference {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprReference {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.mutability == other.mutability && self.expr == other.expr
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprRepeat {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprRepeat {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.expr == other.expr && self.len == other.len
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprReturn {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprReturn {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.expr == other.expr
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprStruct {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprStruct {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.path == other.path
-+            && self.fields == other.fields
-+            && self.dot2_token == other.dot2_token
-+            && self.rest == other.rest
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprTry {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprTry {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.expr == other.expr
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprTryBlock {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprTryBlock {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.block == other.block
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprTuple {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprTuple {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.elems == other.elems
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprType {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprType {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.expr == other.expr && self.ty == other.ty
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for ExprUnary {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for ExprUnary {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.op == other.op && self.expr == other.expr
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprUnsafe {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprUnsafe {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.block == other.block
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprWhile {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprWhile {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.label == other.label
-+            && self.cond == other.cond
-+            && self.body == other.body
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ExprYield {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ExprYield {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.expr == other.expr
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Field {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Field {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.ident == other.ident
-+            && self.colon_token == other.colon_token
-+            && self.ty == other.ty
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for FieldPat {}
-+#[cfg(feature = "full")]
-+impl PartialEq for FieldPat {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.member == other.member
-+            && self.colon_token == other.colon_token
-+            && self.pat == other.pat
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for FieldValue {}
-+#[cfg(feature = "full")]
-+impl PartialEq for FieldValue {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.member == other.member
-+            && self.colon_token == other.colon_token
-+            && self.expr == other.expr
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Fields {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Fields {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (Fields::Named(self0), Fields::Named(other0)) => self0 == other0,
-+            (Fields::Unnamed(self0), Fields::Unnamed(other0)) => self0 == other0,
-+            (Fields::Unit, Fields::Unit) => true,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for FieldsNamed {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for FieldsNamed {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.named == other.named
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for FieldsUnnamed {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for FieldsUnnamed {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.unnamed == other.unnamed
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for File {}
-+#[cfg(feature = "full")]
-+impl PartialEq for File {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.shebang == other.shebang && self.attrs == other.attrs && self.items == other.items
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for FnArg {}
-+#[cfg(feature = "full")]
-+impl PartialEq for FnArg {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (FnArg::Receiver(self0), FnArg::Receiver(other0)) => self0 == other0,
-+            (FnArg::Typed(self0), FnArg::Typed(other0)) => self0 == other0,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ForeignItem {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ForeignItem {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (ForeignItem::Fn(self0), ForeignItem::Fn(other0)) => self0 == other0,
-+            (ForeignItem::Static(self0), ForeignItem::Static(other0)) => self0 == other0,
-+            (ForeignItem::Type(self0), ForeignItem::Type(other0)) => self0 == other0,
-+            (ForeignItem::Macro(self0), ForeignItem::Macro(other0)) => self0 == other0,
-+            (ForeignItem::Verbatim(self0), ForeignItem::Verbatim(other0)) => {
-+                TokenStreamHelper(self0) == TokenStreamHelper(other0)
-+            }
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ForeignItemFn {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ForeignItemFn {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.vis == other.vis && self.sig == other.sig
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ForeignItemMacro {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ForeignItemMacro {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.mac == other.mac && self.semi_token == other.semi_token
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ForeignItemStatic {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ForeignItemStatic {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.mutability == other.mutability
-+            && self.ident == other.ident
-+            && self.ty == other.ty
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ForeignItemType {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ForeignItemType {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.vis == other.vis && self.ident == other.ident
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for GenericArgument {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for GenericArgument {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (GenericArgument::Lifetime(self0), GenericArgument::Lifetime(other0)) => {
-+                self0 == other0
-+            }
-+            (GenericArgument::Type(self0), GenericArgument::Type(other0)) => self0 == other0,
-+            (GenericArgument::Binding(self0), GenericArgument::Binding(other0)) => self0 == other0,
-+            (GenericArgument::Constraint(self0), GenericArgument::Constraint(other0)) => {
-+                self0 == other0
-+            }
-+            (GenericArgument::Const(self0), GenericArgument::Const(other0)) => self0 == other0,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for GenericMethodArgument {}
-+#[cfg(feature = "full")]
-+impl PartialEq for GenericMethodArgument {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (GenericMethodArgument::Type(self0), GenericMethodArgument::Type(other0)) => {
-+                self0 == other0
-+            }
-+            (GenericMethodArgument::Const(self0), GenericMethodArgument::Const(other0)) => {
-+                self0 == other0
-+            }
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for GenericParam {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for GenericParam {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (GenericParam::Type(self0), GenericParam::Type(other0)) => self0 == other0,
-+            (GenericParam::Lifetime(self0), GenericParam::Lifetime(other0)) => self0 == other0,
-+            (GenericParam::Const(self0), GenericParam::Const(other0)) => self0 == other0,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Generics {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Generics {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.lt_token == other.lt_token
-+            && self.params == other.params
-+            && self.gt_token == other.gt_token
-+            && self.where_clause == other.where_clause
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ImplItem {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ImplItem {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (ImplItem::Const(self0), ImplItem::Const(other0)) => self0 == other0,
-+            (ImplItem::Method(self0), ImplItem::Method(other0)) => self0 == other0,
-+            (ImplItem::Type(self0), ImplItem::Type(other0)) => self0 == other0,
-+            (ImplItem::Macro(self0), ImplItem::Macro(other0)) => self0 == other0,
-+            (ImplItem::Verbatim(self0), ImplItem::Verbatim(other0)) => {
-+                TokenStreamHelper(self0) == TokenStreamHelper(other0)
-+            }
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ImplItemConst {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ImplItemConst {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.defaultness == other.defaultness
-+            && self.ident == other.ident
-+            && self.ty == other.ty
-+            && self.expr == other.expr
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ImplItemMacro {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ImplItemMacro {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.mac == other.mac && self.semi_token == other.semi_token
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ImplItemMethod {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ImplItemMethod {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.defaultness == other.defaultness
-+            && self.sig == other.sig
-+            && self.block == other.block
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ImplItemType {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ImplItemType {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.defaultness == other.defaultness
-+            && self.ident == other.ident
-+            && self.generics == other.generics
-+            && self.ty == other.ty
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for Item {}
-+#[cfg(feature = "full")]
-+impl PartialEq for Item {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (Item::Const(self0), Item::Const(other0)) => self0 == other0,
-+            (Item::Enum(self0), Item::Enum(other0)) => self0 == other0,
-+            (Item::ExternCrate(self0), Item::ExternCrate(other0)) => self0 == other0,
-+            (Item::Fn(self0), Item::Fn(other0)) => self0 == other0,
-+            (Item::ForeignMod(self0), Item::ForeignMod(other0)) => self0 == other0,
-+            (Item::Impl(self0), Item::Impl(other0)) => self0 == other0,
-+            (Item::Macro(self0), Item::Macro(other0)) => self0 == other0,
-+            (Item::Macro2(self0), Item::Macro2(other0)) => self0 == other0,
-+            (Item::Mod(self0), Item::Mod(other0)) => self0 == other0,
-+            (Item::Static(self0), Item::Static(other0)) => self0 == other0,
-+            (Item::Struct(self0), Item::Struct(other0)) => self0 == other0,
-+            (Item::Trait(self0), Item::Trait(other0)) => self0 == other0,
-+            (Item::TraitAlias(self0), Item::TraitAlias(other0)) => self0 == other0,
-+            (Item::Type(self0), Item::Type(other0)) => self0 == other0,
-+            (Item::Union(self0), Item::Union(other0)) => self0 == other0,
-+            (Item::Use(self0), Item::Use(other0)) => self0 == other0,
-+            (Item::Verbatim(self0), Item::Verbatim(other0)) => {
-+                TokenStreamHelper(self0) == TokenStreamHelper(other0)
-+            }
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemConst {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemConst {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.ident == other.ident
-+            && self.ty == other.ty
-+            && self.expr == other.expr
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemEnum {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemEnum {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.ident == other.ident
-+            && self.generics == other.generics
-+            && self.variants == other.variants
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemExternCrate {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemExternCrate {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.ident == other.ident
-+            && self.rename == other.rename
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemFn {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemFn {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.sig == other.sig
-+            && self.block == other.block
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemForeignMod {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemForeignMod {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.abi == other.abi && self.items == other.items
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemImpl {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemImpl {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.defaultness == other.defaultness
-+            && self.unsafety == other.unsafety
-+            && self.generics == other.generics
-+            && self.trait_ == other.trait_
-+            && self.self_ty == other.self_ty
-+            && self.items == other.items
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemMacro {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemMacro {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.ident == other.ident
-+            && self.mac == other.mac
-+            && self.semi_token == other.semi_token
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemMacro2 {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemMacro2 {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.ident == other.ident
-+            && TokenStreamHelper(&self.rules) == TokenStreamHelper(&other.rules)
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemMod {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemMod {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.ident == other.ident
-+            && self.content == other.content
-+            && self.semi == other.semi
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemStatic {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemStatic {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.mutability == other.mutability
-+            && self.ident == other.ident
-+            && self.ty == other.ty
-+            && self.expr == other.expr
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemStruct {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemStruct {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.ident == other.ident
-+            && self.generics == other.generics
-+            && self.fields == other.fields
-+            && self.semi_token == other.semi_token
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemTrait {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemTrait {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.unsafety == other.unsafety
-+            && self.auto_token == other.auto_token
-+            && self.ident == other.ident
-+            && self.generics == other.generics
-+            && self.colon_token == other.colon_token
-+            && self.supertraits == other.supertraits
-+            && self.items == other.items
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemTraitAlias {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemTraitAlias {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.ident == other.ident
-+            && self.generics == other.generics
-+            && self.bounds == other.bounds
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemType {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemType {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.ident == other.ident
-+            && self.generics == other.generics
-+            && self.ty == other.ty
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemUnion {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemUnion {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.ident == other.ident
-+            && self.generics == other.generics
-+            && self.fields == other.fields
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for ItemUse {}
-+#[cfg(feature = "full")]
-+impl PartialEq for ItemUse {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.vis == other.vis
-+            && self.leading_colon == other.leading_colon
-+            && self.tree == other.tree
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for Label {}
-+#[cfg(feature = "full")]
-+impl PartialEq for Label {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.name == other.name
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for LifetimeDef {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for LifetimeDef {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.lifetime == other.lifetime
-+            && self.colon_token == other.colon_token
-+            && self.bounds == other.bounds
-+    }
-+}
-+impl Eq for Lit {}
-+impl PartialEq for Lit {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (Lit::Str(self0), Lit::Str(other0)) => self0 == other0,
-+            (Lit::ByteStr(self0), Lit::ByteStr(other0)) => self0 == other0,
-+            (Lit::Byte(self0), Lit::Byte(other0)) => self0 == other0,
-+            (Lit::Char(self0), Lit::Char(other0)) => self0 == other0,
-+            (Lit::Int(self0), Lit::Int(other0)) => self0 == other0,
-+            (Lit::Float(self0), Lit::Float(other0)) => self0 == other0,
-+            (Lit::Bool(self0), Lit::Bool(other0)) => self0 == other0,
-+            (Lit::Verbatim(self0), Lit::Verbatim(other0)) => {
-+                self0.to_string() == other0.to_string()
-+            }
-+            _ => false,
-+        }
-+    }
-+}
-+impl Eq for LitBool {}
-+impl PartialEq for LitBool {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.value == other.value
-+    }
-+}
-+impl Eq for LitByte {}
-+impl Eq for LitByteStr {}
-+impl Eq for LitChar {}
-+impl Eq for LitFloat {}
-+impl Eq for LitInt {}
-+impl Eq for LitStr {}
-+#[cfg(feature = "full")]
-+impl Eq for Local {}
-+#[cfg(feature = "full")]
-+impl PartialEq for Local {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.pat == other.pat && self.init == other.init
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Macro {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Macro {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.path == other.path
-+            && self.delimiter == other.delimiter
-+            && TokenStreamHelper(&self.tokens) == TokenStreamHelper(&other.tokens)
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for MacroDelimiter {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for MacroDelimiter {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (MacroDelimiter::Paren(_), MacroDelimiter::Paren(_)) => true,
-+            (MacroDelimiter::Brace(_), MacroDelimiter::Brace(_)) => true,
-+            (MacroDelimiter::Bracket(_), MacroDelimiter::Bracket(_)) => true,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Meta {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Meta {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (Meta::Path(self0), Meta::Path(other0)) => self0 == other0,
-+            (Meta::List(self0), Meta::List(other0)) => self0 == other0,
-+            (Meta::NameValue(self0), Meta::NameValue(other0)) => self0 == other0,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for MetaList {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for MetaList {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.path == other.path && self.nested == other.nested
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for MetaNameValue {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for MetaNameValue {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.path == other.path && self.lit == other.lit
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for MethodTurbofish {}
-+#[cfg(feature = "full")]
-+impl PartialEq for MethodTurbofish {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.args == other.args
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for NestedMeta {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for NestedMeta {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (NestedMeta::Meta(self0), NestedMeta::Meta(other0)) => self0 == other0,
-+            (NestedMeta::Lit(self0), NestedMeta::Lit(other0)) => self0 == other0,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for ParenthesizedGenericArguments {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for ParenthesizedGenericArguments {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.inputs == other.inputs && self.output == other.output
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for Pat {}
-+#[cfg(feature = "full")]
-+impl PartialEq for Pat {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (Pat::Box(self0), Pat::Box(other0)) => self0 == other0,
-+            (Pat::Ident(self0), Pat::Ident(other0)) => self0 == other0,
-+            (Pat::Lit(self0), Pat::Lit(other0)) => self0 == other0,
-+            (Pat::Macro(self0), Pat::Macro(other0)) => self0 == other0,
-+            (Pat::Or(self0), Pat::Or(other0)) => self0 == other0,
-+            (Pat::Path(self0), Pat::Path(other0)) => self0 == other0,
-+            (Pat::Range(self0), Pat::Range(other0)) => self0 == other0,
-+            (Pat::Reference(self0), Pat::Reference(other0)) => self0 == other0,
-+            (Pat::Rest(self0), Pat::Rest(other0)) => self0 == other0,
-+            (Pat::Slice(self0), Pat::Slice(other0)) => self0 == other0,
-+            (Pat::Struct(self0), Pat::Struct(other0)) => self0 == other0,
-+            (Pat::Tuple(self0), Pat::Tuple(other0)) => self0 == other0,
-+            (Pat::TupleStruct(self0), Pat::TupleStruct(other0)) => self0 == other0,
-+            (Pat::Type(self0), Pat::Type(other0)) => self0 == other0,
-+            (Pat::Verbatim(self0), Pat::Verbatim(other0)) => {
-+                TokenStreamHelper(self0) == TokenStreamHelper(other0)
-+            }
-+            (Pat::Wild(self0), Pat::Wild(other0)) => self0 == other0,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatBox {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatBox {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.pat == other.pat
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatIdent {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatIdent {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.by_ref == other.by_ref
-+            && self.mutability == other.mutability
-+            && self.ident == other.ident
-+            && self.subpat == other.subpat
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatLit {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatLit {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.expr == other.expr
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatMacro {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatMacro {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.mac == other.mac
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatOr {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatOr {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.leading_vert == other.leading_vert
-+            && self.cases == other.cases
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatPath {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatPath {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.qself == other.qself && self.path == other.path
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatRange {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatRange {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.lo == other.lo
-+            && self.limits == other.limits
-+            && self.hi == other.hi
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatReference {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatReference {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.mutability == other.mutability && self.pat == other.pat
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatRest {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatRest {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatSlice {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatSlice {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.elems == other.elems
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatStruct {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatStruct {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.path == other.path
-+            && self.fields == other.fields
-+            && self.dot2_token == other.dot2_token
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatTuple {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatTuple {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.elems == other.elems
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatTupleStruct {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatTupleStruct {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.path == other.path && self.pat == other.pat
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatType {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatType {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.pat == other.pat && self.ty == other.ty
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for PatWild {}
-+#[cfg(feature = "full")]
-+impl PartialEq for PatWild {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Path {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Path {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.leading_colon == other.leading_colon && self.segments == other.segments
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for PathArguments {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for PathArguments {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (PathArguments::None, PathArguments::None) => true,
-+            (PathArguments::AngleBracketed(self0), PathArguments::AngleBracketed(other0)) => {
-+                self0 == other0
-+            }
-+            (PathArguments::Parenthesized(self0), PathArguments::Parenthesized(other0)) => {
-+                self0 == other0
-+            }
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for PathSegment {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for PathSegment {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.ident == other.ident && self.arguments == other.arguments
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for PredicateEq {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for PredicateEq {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.lhs_ty == other.lhs_ty && self.rhs_ty == other.rhs_ty
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for PredicateLifetime {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for PredicateLifetime {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.lifetime == other.lifetime && self.bounds == other.bounds
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for PredicateType {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for PredicateType {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.lifetimes == other.lifetimes
-+            && self.bounded_ty == other.bounded_ty
-+            && self.bounds == other.bounds
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for QSelf {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for QSelf {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.ty == other.ty && self.position == other.position && self.as_token == other.as_token
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for RangeLimits {}
-+#[cfg(feature = "full")]
-+impl PartialEq for RangeLimits {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (RangeLimits::HalfOpen(_), RangeLimits::HalfOpen(_)) => true,
-+            (RangeLimits::Closed(_), RangeLimits::Closed(_)) => true,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for Receiver {}
-+#[cfg(feature = "full")]
-+impl PartialEq for Receiver {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.reference == other.reference
-+            && self.mutability == other.mutability
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for ReturnType {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for ReturnType {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (ReturnType::Default, ReturnType::Default) => true,
-+            (ReturnType::Type(_, self1), ReturnType::Type(_, other1)) => self1 == other1,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for Signature {}
-+#[cfg(feature = "full")]
-+impl PartialEq for Signature {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.constness == other.constness
-+            && self.asyncness == other.asyncness
-+            && self.unsafety == other.unsafety
-+            && self.abi == other.abi
-+            && self.ident == other.ident
-+            && self.generics == other.generics
-+            && self.inputs == other.inputs
-+            && self.variadic == other.variadic
-+            && self.output == other.output
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for Stmt {}
-+#[cfg(feature = "full")]
-+impl PartialEq for Stmt {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (Stmt::Local(self0), Stmt::Local(other0)) => self0 == other0,
-+            (Stmt::Item(self0), Stmt::Item(other0)) => self0 == other0,
-+            (Stmt::Expr(self0), Stmt::Expr(other0)) => self0 == other0,
-+            (Stmt::Semi(self0, _), Stmt::Semi(other0, _)) => self0 == other0,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TraitBound {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TraitBound {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.paren_token == other.paren_token
-+            && self.modifier == other.modifier
-+            && self.lifetimes == other.lifetimes
-+            && self.path == other.path
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TraitBoundModifier {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TraitBoundModifier {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (TraitBoundModifier::None, TraitBoundModifier::None) => true,
-+            (TraitBoundModifier::Maybe(_), TraitBoundModifier::Maybe(_)) => true,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for TraitItem {}
-+#[cfg(feature = "full")]
-+impl PartialEq for TraitItem {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (TraitItem::Const(self0), TraitItem::Const(other0)) => self0 == other0,
-+            (TraitItem::Method(self0), TraitItem::Method(other0)) => self0 == other0,
-+            (TraitItem::Type(self0), TraitItem::Type(other0)) => self0 == other0,
-+            (TraitItem::Macro(self0), TraitItem::Macro(other0)) => self0 == other0,
-+            (TraitItem::Verbatim(self0), TraitItem::Verbatim(other0)) => {
-+                TokenStreamHelper(self0) == TokenStreamHelper(other0)
-+            }
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for TraitItemConst {}
-+#[cfg(feature = "full")]
-+impl PartialEq for TraitItemConst {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.ident == other.ident
-+            && self.ty == other.ty
-+            && self.default == other.default
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for TraitItemMacro {}
-+#[cfg(feature = "full")]
-+impl PartialEq for TraitItemMacro {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs && self.mac == other.mac && self.semi_token == other.semi_token
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for TraitItemMethod {}
-+#[cfg(feature = "full")]
-+impl PartialEq for TraitItemMethod {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.sig == other.sig
-+            && self.default == other.default
-+            && self.semi_token == other.semi_token
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for TraitItemType {}
-+#[cfg(feature = "full")]
-+impl PartialEq for TraitItemType {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.ident == other.ident
-+            && self.generics == other.generics
-+            && self.colon_token == other.colon_token
-+            && self.bounds == other.bounds
-+            && self.default == other.default
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Type {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Type {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (Type::Array(self0), Type::Array(other0)) => self0 == other0,
-+            (Type::BareFn(self0), Type::BareFn(other0)) => self0 == other0,
-+            (Type::Group(self0), Type::Group(other0)) => self0 == other0,
-+            (Type::ImplTrait(self0), Type::ImplTrait(other0)) => self0 == other0,
-+            (Type::Infer(self0), Type::Infer(other0)) => self0 == other0,
-+            (Type::Macro(self0), Type::Macro(other0)) => self0 == other0,
-+            (Type::Never(self0), Type::Never(other0)) => self0 == other0,
-+            (Type::Paren(self0), Type::Paren(other0)) => self0 == other0,
-+            (Type::Path(self0), Type::Path(other0)) => self0 == other0,
-+            (Type::Ptr(self0), Type::Ptr(other0)) => self0 == other0,
-+            (Type::Reference(self0), Type::Reference(other0)) => self0 == other0,
-+            (Type::Slice(self0), Type::Slice(other0)) => self0 == other0,
-+            (Type::TraitObject(self0), Type::TraitObject(other0)) => self0 == other0,
-+            (Type::Tuple(self0), Type::Tuple(other0)) => self0 == other0,
-+            (Type::Verbatim(self0), Type::Verbatim(other0)) => {
-+                TokenStreamHelper(self0) == TokenStreamHelper(other0)
-+            }
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypeArray {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypeArray {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.elem == other.elem && self.len == other.len
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypeBareFn {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypeBareFn {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.lifetimes == other.lifetimes
-+            && self.unsafety == other.unsafety
-+            && self.abi == other.abi
-+            && self.inputs == other.inputs
-+            && self.variadic == other.variadic
-+            && self.output == other.output
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypeGroup {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypeGroup {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.elem == other.elem
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypeImplTrait {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypeImplTrait {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.bounds == other.bounds
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypeInfer {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypeInfer {
-+    fn eq(&self, _other: &Self) -> bool {
-+        true
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypeMacro {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypeMacro {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.mac == other.mac
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypeNever {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypeNever {
-+    fn eq(&self, _other: &Self) -> bool {
-+        true
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypeParam {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypeParam {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.ident == other.ident
-+            && self.colon_token == other.colon_token
-+            && self.bounds == other.bounds
-+            && self.eq_token == other.eq_token
-+            && self.default == other.default
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypeParamBound {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypeParamBound {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (TypeParamBound::Trait(self0), TypeParamBound::Trait(other0)) => self0 == other0,
-+            (TypeParamBound::Lifetime(self0), TypeParamBound::Lifetime(other0)) => self0 == other0,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypeParen {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypeParen {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.elem == other.elem
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypePath {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypePath {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.qself == other.qself && self.path == other.path
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypePtr {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypePtr {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.const_token == other.const_token
-+            && self.mutability == other.mutability
-+            && self.elem == other.elem
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypeReference {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypeReference {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.lifetime == other.lifetime
-+            && self.mutability == other.mutability
-+            && self.elem == other.elem
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypeSlice {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypeSlice {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.elem == other.elem
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypeTraitObject {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypeTraitObject {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.dyn_token == other.dyn_token && self.bounds == other.bounds
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for TypeTuple {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for TypeTuple {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.elems == other.elems
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for UnOp {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for UnOp {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (UnOp::Deref(_), UnOp::Deref(_)) => true,
-+            (UnOp::Not(_), UnOp::Not(_)) => true,
-+            (UnOp::Neg(_), UnOp::Neg(_)) => true,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for UseGlob {}
-+#[cfg(feature = "full")]
-+impl PartialEq for UseGlob {
-+    fn eq(&self, _other: &Self) -> bool {
-+        true
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for UseGroup {}
-+#[cfg(feature = "full")]
-+impl PartialEq for UseGroup {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.items == other.items
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for UseName {}
-+#[cfg(feature = "full")]
-+impl PartialEq for UseName {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.ident == other.ident
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for UsePath {}
-+#[cfg(feature = "full")]
-+impl PartialEq for UsePath {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.ident == other.ident && self.tree == other.tree
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for UseRename {}
-+#[cfg(feature = "full")]
-+impl PartialEq for UseRename {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.ident == other.ident && self.rename == other.rename
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Eq for UseTree {}
-+#[cfg(feature = "full")]
-+impl PartialEq for UseTree {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (UseTree::Path(self0), UseTree::Path(other0)) => self0 == other0,
-+            (UseTree::Name(self0), UseTree::Name(other0)) => self0 == other0,
-+            (UseTree::Rename(self0), UseTree::Rename(other0)) => self0 == other0,
-+            (UseTree::Glob(self0), UseTree::Glob(other0)) => self0 == other0,
-+            (UseTree::Group(self0), UseTree::Group(other0)) => self0 == other0,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Variadic {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Variadic {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Variant {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Variant {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.attrs == other.attrs
-+            && self.ident == other.ident
-+            && self.fields == other.fields
-+            && self.discriminant == other.discriminant
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for VisCrate {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for VisCrate {
-+    fn eq(&self, _other: &Self) -> bool {
-+        true
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for VisPublic {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for VisPublic {
-+    fn eq(&self, _other: &Self) -> bool {
-+        true
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for VisRestricted {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for VisRestricted {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.in_token == other.in_token && self.path == other.path
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for Visibility {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for Visibility {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (Visibility::Public(self0), Visibility::Public(other0)) => self0 == other0,
-+            (Visibility::Crate(self0), Visibility::Crate(other0)) => self0 == other0,
-+            (Visibility::Restricted(self0), Visibility::Restricted(other0)) => self0 == other0,
-+            (Visibility::Inherited, Visibility::Inherited) => true,
-+            _ => false,
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for WhereClause {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for WhereClause {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.predicates == other.predicates
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Eq for WherePredicate {}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl PartialEq for WherePredicate {
-+    fn eq(&self, other: &Self) -> bool {
-+        match (self, other) {
-+            (WherePredicate::Type(self0), WherePredicate::Type(other0)) => self0 == other0,
-+            (WherePredicate::Lifetime(self0), WherePredicate::Lifetime(other0)) => self0 == other0,
-+            (WherePredicate::Eq(self0), WherePredicate::Eq(other0)) => self0 == other0,
-+            _ => false,
-+        }
-+    }
-+}
-diff --git a/third_party/rust/syn/src/gen/fold.rs b/third_party/rust/syn/src/gen/fold.rs
---- a/third_party/rust/syn/src/gen/fold.rs
-+++ b/third_party/rust/syn/src/gen/fold.rs
-@@ -1,12 +1,13 @@
- // This file is @generated by syn-internal-codegen.
- // It is not intended for manual editing.
- 
- #![allow(unreachable_code, unused_variables)]
-+#![allow(clippy::match_wildcard_for_single_variants)]
- #[cfg(any(feature = "full", feature = "derive"))]
- use crate::gen::helper::fold::*;
- #[cfg(any(feature = "full", feature = "derive"))]
- use crate::token::{Brace, Bracket, Group, Paren};
- use crate::*;
- use proc_macro2::Span;
- #[cfg(feature = "full")]
- macro_rules! full {
-@@ -21,17 +22,17 @@ macro_rules! full {
-     };
- }
- /// Syntax tree traversal to transform the nodes of an owned syntax tree.
- ///
- /// See the [module documentation] for details.
- ///
- /// [module documentation]: self
- ///
--/// *This trait is available if Syn is built with the `"fold"` feature.*
-+/// *This trait is available only if Syn is built with the `"fold"` feature.*
- pub trait Fold {
-     #[cfg(any(feature = "derive", feature = "full"))]
-     fn fold_abi(&mut self, i: Abi) -> Abi {
-         fold_abi(self, i)
-     }
-     #[cfg(any(feature = "derive", feature = "full"))]
-     fn fold_angle_bracketed_generic_arguments(
-         &mut self,
-@@ -428,45 +429,37 @@ pub trait Fold {
-     }
-     fn fold_lifetime(&mut self, i: Lifetime) -> Lifetime {
-         fold_lifetime(self, i)
-     }
-     #[cfg(any(feature = "derive", feature = "full"))]
-     fn fold_lifetime_def(&mut self, i: LifetimeDef) -> LifetimeDef {
-         fold_lifetime_def(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn fold_lit(&mut self, i: Lit) -> Lit {
-         fold_lit(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn fold_lit_bool(&mut self, i: LitBool) -> LitBool {
-         fold_lit_bool(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn fold_lit_byte(&mut self, i: LitByte) -> LitByte {
-         fold_lit_byte(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn fold_lit_byte_str(&mut self, i: LitByteStr) -> LitByteStr {
-         fold_lit_byte_str(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn fold_lit_char(&mut self, i: LitChar) -> LitChar {
-         fold_lit_char(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn fold_lit_float(&mut self, i: LitFloat) -> LitFloat {
-         fold_lit_float(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn fold_lit_int(&mut self, i: LitInt) -> LitInt {
-         fold_lit_int(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn fold_lit_str(&mut self, i: LitStr) -> LitStr {
-         fold_lit_str(self, i)
-     }
-     #[cfg(feature = "full")]
-     fn fold_local(&mut self, i: Local) -> Local {
-         fold_local(self, i)
-     }
-     #[cfg(any(feature = "derive", feature = "full"))]
-@@ -794,39 +787,39 @@ where
- pub fn fold_angle_bracketed_generic_arguments<F>(
-     f: &mut F,
-     node: AngleBracketedGenericArguments,
- ) -> AngleBracketedGenericArguments
- where
-     F: Fold + ?Sized,
- {
-     AngleBracketedGenericArguments {
--        colon2_token: (node.colon2_token).map(|it| Token ! [ :: ](tokens_helper(f, &it.spans))),
--        lt_token: Token ! [ < ](tokens_helper(f, &node.lt_token.spans)),
-+        colon2_token: (node.colon2_token).map(|it| Token ! [::](tokens_helper(f, &it.spans))),
-+        lt_token: Token ! [<](tokens_helper(f, &node.lt_token.spans)),
-         args: FoldHelper::lift(node.args, |it| f.fold_generic_argument(it)),
--        gt_token: Token ! [ > ](tokens_helper(f, &node.gt_token.spans)),
-+        gt_token: Token ! [>](tokens_helper(f, &node.gt_token.spans)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_arm<F>(f: &mut F, node: Arm) -> Arm
- where
-     F: Fold + ?Sized,
- {
-     Arm {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         pat: f.fold_pat(node.pat),
-         guard: (node.guard).map(|it| {
-             (
-                 Token![if](tokens_helper(f, &(it).0.span)),
-                 Box::new(f.fold_expr(*(it).1)),
-             )
-         }),
--        fat_arrow_token: Token ! [ => ](tokens_helper(f, &node.fat_arrow_token.spans)),
-+        fat_arrow_token: Token ! [=>](tokens_helper(f, &node.fat_arrow_token.spans)),
-         body: Box::new(f.fold_expr(*node.body)),
--        comma: (node.comma).map(|it| Token ! [ , ](tokens_helper(f, &it.spans))),
-+        comma: (node.comma).map(|it| Token ! [,](tokens_helper(f, &it.spans))),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_attr_style<F>(f: &mut F, node: AttrStyle) -> AttrStyle
- where
-     F: Fold + ?Sized,
- {
-     match node {
-@@ -837,109 +830,97 @@ where
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_attribute<F>(f: &mut F, node: Attribute) -> Attribute
- where
-     F: Fold + ?Sized,
- {
-     Attribute {
--        pound_token: Token ! [ # ](tokens_helper(f, &node.pound_token.spans)),
-+        pound_token: Token ! [#](tokens_helper(f, &node.pound_token.spans)),
-         style: f.fold_attr_style(node.style),
-         bracket_token: Bracket(tokens_helper(f, &node.bracket_token.span)),
-         path: f.fold_path(node.path),
-         tokens: node.tokens,
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_bare_fn_arg<F>(f: &mut F, node: BareFnArg) -> BareFnArg
- where
-     F: Fold + ?Sized,
- {
-     BareFnArg {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         name: (node.name).map(|it| {
-             (
-                 f.fold_ident((it).0),
--                Token ! [ : ](tokens_helper(f, &(it).1.spans)),
-+                Token ! [:](tokens_helper(f, &(it).1.spans)),
-             )
-         }),
-         ty: f.fold_type(node.ty),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_bin_op<F>(f: &mut F, node: BinOp) -> BinOp
- where
-     F: Fold + ?Sized,
- {
-     match node {
--        BinOp::Add(_binding_0) => BinOp::Add(Token ! [ + ](tokens_helper(f, &_binding_0.spans))),
--        BinOp::Sub(_binding_0) => BinOp::Sub(Token ! [ - ](tokens_helper(f, &_binding_0.spans))),
--        BinOp::Mul(_binding_0) => BinOp::Mul(Token ! [ * ](tokens_helper(f, &_binding_0.spans))),
--        BinOp::Div(_binding_0) => BinOp::Div(Token ! [ / ](tokens_helper(f, &_binding_0.spans))),
--        BinOp::Rem(_binding_0) => BinOp::Rem(Token ! [ % ](tokens_helper(f, &_binding_0.spans))),
--        BinOp::And(_binding_0) => BinOp::And(Token ! [ && ](tokens_helper(f, &_binding_0.spans))),
--        BinOp::Or(_binding_0) => BinOp::Or(Token ! [ || ](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::Add(_binding_0) => BinOp::Add(Token ! [+](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::Sub(_binding_0) => BinOp::Sub(Token ! [-](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::Mul(_binding_0) => BinOp::Mul(Token ! [*](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::Div(_binding_0) => BinOp::Div(Token ! [/](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::Rem(_binding_0) => BinOp::Rem(Token ! [%](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::And(_binding_0) => BinOp::And(Token ! [&&](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::Or(_binding_0) => BinOp::Or(Token ! [||](tokens_helper(f, &_binding_0.spans))),
-         BinOp::BitXor(_binding_0) => {
--            BinOp::BitXor(Token ! [ ^ ](tokens_helper(f, &_binding_0.spans)))
-+            BinOp::BitXor(Token ! [^](tokens_helper(f, &_binding_0.spans)))
-         }
-         BinOp::BitAnd(_binding_0) => {
--            BinOp::BitAnd(Token ! [ & ](tokens_helper(f, &_binding_0.spans)))
--        }
--        BinOp::BitOr(_binding_0) => {
--            BinOp::BitOr(Token ! [ | ](tokens_helper(f, &_binding_0.spans)))
-+            BinOp::BitAnd(Token ! [&](tokens_helper(f, &_binding_0.spans)))
-         }
--        BinOp::Shl(_binding_0) => BinOp::Shl(Token ! [ << ](tokens_helper(f, &_binding_0.spans))),
--        BinOp::Shr(_binding_0) => BinOp::Shr(Token ! [ >> ](tokens_helper(f, &_binding_0.spans))),
--        BinOp::Eq(_binding_0) => BinOp::Eq(Token ! [ == ](tokens_helper(f, &_binding_0.spans))),
--        BinOp::Lt(_binding_0) => BinOp::Lt(Token ! [ < ](tokens_helper(f, &_binding_0.spans))),
--        BinOp::Le(_binding_0) => BinOp::Le(Token ! [ <= ](tokens_helper(f, &_binding_0.spans))),
--        BinOp::Ne(_binding_0) => BinOp::Ne(Token ! [ != ](tokens_helper(f, &_binding_0.spans))),
--        BinOp::Ge(_binding_0) => BinOp::Ge(Token ! [ >= ](tokens_helper(f, &_binding_0.spans))),
--        BinOp::Gt(_binding_0) => BinOp::Gt(Token ! [ > ](tokens_helper(f, &_binding_0.spans))),
--        BinOp::AddEq(_binding_0) => {
--            BinOp::AddEq(Token ! [ += ](tokens_helper(f, &_binding_0.spans)))
--        }
--        BinOp::SubEq(_binding_0) => {
--            BinOp::SubEq(Token ! [ -= ](tokens_helper(f, &_binding_0.spans)))
--        }
--        BinOp::MulEq(_binding_0) => {
--            BinOp::MulEq(Token ! [ *= ](tokens_helper(f, &_binding_0.spans)))
--        }
--        BinOp::DivEq(_binding_0) => {
--            BinOp::DivEq(Token ! [ /= ](tokens_helper(f, &_binding_0.spans)))
--        }
--        BinOp::RemEq(_binding_0) => {
--            BinOp::RemEq(Token ! [ %= ](tokens_helper(f, &_binding_0.spans)))
--        }
-+        BinOp::BitOr(_binding_0) => BinOp::BitOr(Token ! [|](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::Shl(_binding_0) => BinOp::Shl(Token ! [<<](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::Shr(_binding_0) => BinOp::Shr(Token ! [>>](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::Eq(_binding_0) => BinOp::Eq(Token ! [==](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::Lt(_binding_0) => BinOp::Lt(Token ! [<](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::Le(_binding_0) => BinOp::Le(Token ! [<=](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::Ne(_binding_0) => BinOp::Ne(Token ! [!=](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::Ge(_binding_0) => BinOp::Ge(Token ! [>=](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::Gt(_binding_0) => BinOp::Gt(Token ! [>](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::AddEq(_binding_0) => BinOp::AddEq(Token ! [+=](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::SubEq(_binding_0) => BinOp::SubEq(Token ! [-=](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::MulEq(_binding_0) => BinOp::MulEq(Token ! [*=](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::DivEq(_binding_0) => BinOp::DivEq(Token ! [/=](tokens_helper(f, &_binding_0.spans))),
-+        BinOp::RemEq(_binding_0) => BinOp::RemEq(Token ! [%=](tokens_helper(f, &_binding_0.spans))),
-         BinOp::BitXorEq(_binding_0) => {
--            BinOp::BitXorEq(Token ! [ ^= ](tokens_helper(f, &_binding_0.spans)))
-+            BinOp::BitXorEq(Token ! [^=](tokens_helper(f, &_binding_0.spans)))
-         }
-         BinOp::BitAndEq(_binding_0) => {
--            BinOp::BitAndEq(Token ! [ &= ](tokens_helper(f, &_binding_0.spans)))
-+            BinOp::BitAndEq(Token ! [&=](tokens_helper(f, &_binding_0.spans)))
-         }
-         BinOp::BitOrEq(_binding_0) => {
--            BinOp::BitOrEq(Token ! [ |= ](tokens_helper(f, &_binding_0.spans)))
-+            BinOp::BitOrEq(Token ! [|=](tokens_helper(f, &_binding_0.spans)))
-         }
-         BinOp::ShlEq(_binding_0) => {
--            BinOp::ShlEq(Token ! [ <<= ](tokens_helper(f, &_binding_0.spans)))
-+            BinOp::ShlEq(Token ! [<<=](tokens_helper(f, &_binding_0.spans)))
-         }
-         BinOp::ShrEq(_binding_0) => {
--            BinOp::ShrEq(Token ! [ >>= ](tokens_helper(f, &_binding_0.spans)))
-+            BinOp::ShrEq(Token ! [>>=](tokens_helper(f, &_binding_0.spans)))
-         }
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_binding<F>(f: &mut F, node: Binding) -> Binding
- where
-     F: Fold + ?Sized,
- {
-     Binding {
-         ident: f.fold_ident(node.ident),
--        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
-+        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
-         ty: f.fold_type(node.ty),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_block<F>(f: &mut F, node: Block) -> Block
- where
-     F: Fold + ?Sized,
- {
-@@ -950,44 +931,44 @@ where
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_bound_lifetimes<F>(f: &mut F, node: BoundLifetimes) -> BoundLifetimes
- where
-     F: Fold + ?Sized,
- {
-     BoundLifetimes {
-         for_token: Token![for](tokens_helper(f, &node.for_token.span)),
--        lt_token: Token ! [ < ](tokens_helper(f, &node.lt_token.spans)),
-+        lt_token: Token ! [<](tokens_helper(f, &node.lt_token.spans)),
-         lifetimes: FoldHelper::lift(node.lifetimes, |it| f.fold_lifetime_def(it)),
--        gt_token: Token ! [ > ](tokens_helper(f, &node.gt_token.spans)),
-+        gt_token: Token ! [>](tokens_helper(f, &node.gt_token.spans)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_const_param<F>(f: &mut F, node: ConstParam) -> ConstParam
- where
-     F: Fold + ?Sized,
- {
-     ConstParam {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         const_token: Token![const](tokens_helper(f, &node.const_token.span)),
-         ident: f.fold_ident(node.ident),
--        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
-+        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
-         ty: f.fold_type(node.ty),
--        eq_token: (node.eq_token).map(|it| Token ! [ = ](tokens_helper(f, &it.spans))),
-+        eq_token: (node.eq_token).map(|it| Token ! [=](tokens_helper(f, &it.spans))),
-         default: (node.default).map(|it| f.fold_expr(it)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_constraint<F>(f: &mut F, node: Constraint) -> Constraint
- where
-     F: Fold + ?Sized,
- {
-     Constraint {
-         ident: f.fold_ident(node.ident),
--        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
-+        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
-         bounds: FoldHelper::lift(node.bounds, |it| f.fold_type_param_bound(it)),
-     }
- }
- #[cfg(feature = "derive")]
- pub fn fold_data<F>(f: &mut F, node: Data) -> Data
- where
-     F: Fold + ?Sized,
- {
-@@ -1011,17 +992,17 @@ where
- #[cfg(feature = "derive")]
- pub fn fold_data_struct<F>(f: &mut F, node: DataStruct) -> DataStruct
- where
-     F: Fold + ?Sized,
- {
-     DataStruct {
-         struct_token: Token![struct](tokens_helper(f, &node.struct_token.span)),
-         fields: f.fold_fields(node.fields),
--        semi_token: (node.semi_token).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
-+        semi_token: (node.semi_token).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
-     }
- }
- #[cfg(feature = "derive")]
- pub fn fold_data_union<F>(f: &mut F, node: DataUnion) -> DataUnion
- where
-     F: Fold + ?Sized,
- {
-     DataUnion {
-@@ -1107,17 +1088,17 @@ where
- #[cfg(feature = "full")]
- pub fn fold_expr_assign<F>(f: &mut F, node: ExprAssign) -> ExprAssign
- where
-     F: Fold + ?Sized,
- {
-     ExprAssign {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         left: Box::new(f.fold_expr(*node.left)),
--        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
-+        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
-         right: Box::new(f.fold_expr(*node.right)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_expr_assign_op<F>(f: &mut F, node: ExprAssignOp) -> ExprAssignOp
- where
-     F: Fold + ?Sized,
- {
-@@ -1143,17 +1124,17 @@ where
- #[cfg(feature = "full")]
- pub fn fold_expr_await<F>(f: &mut F, node: ExprAwait) -> ExprAwait
- where
-     F: Fold + ?Sized,
- {
-     ExprAwait {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         base: Box::new(f.fold_expr(*node.base)),
--        dot_token: Token ! [ . ](tokens_helper(f, &node.dot_token.spans)),
-+        dot_token: Token ! [.](tokens_helper(f, &node.dot_token.spans)),
-         await_token: crate::token::Await(tokens_helper(f, &node.await_token.span)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_expr_binary<F>(f: &mut F, node: ExprBinary) -> ExprBinary
- where
-     F: Fold + ?Sized,
- {
-@@ -1227,19 +1208,19 @@ pub fn fold_expr_closure<F>(f: &mut F, n
- where
-     F: Fold + ?Sized,
- {
-     ExprClosure {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         asyncness: (node.asyncness).map(|it| Token![async](tokens_helper(f, &it.span))),
-         movability: (node.movability).map(|it| Token![static](tokens_helper(f, &it.span))),
-         capture: (node.capture).map(|it| Token![move](tokens_helper(f, &it.span))),
--        or1_token: Token ! [ | ](tokens_helper(f, &node.or1_token.spans)),
-+        or1_token: Token ! [|](tokens_helper(f, &node.or1_token.spans)),
-         inputs: FoldHelper::lift(node.inputs, |it| f.fold_pat(it)),
--        or2_token: Token ! [ | ](tokens_helper(f, &node.or2_token.spans)),
-+        or2_token: Token ! [|](tokens_helper(f, &node.or2_token.spans)),
-         output: f.fold_return_type(node.output),
-         body: Box::new(f.fold_expr(*node.body)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_expr_continue<F>(f: &mut F, node: ExprContinue) -> ExprContinue
- where
-     F: Fold + ?Sized,
-@@ -1253,17 +1234,17 @@ where
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_expr_field<F>(f: &mut F, node: ExprField) -> ExprField
- where
-     F: Fold + ?Sized,
- {
-     ExprField {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         base: Box::new(f.fold_expr(*node.base)),
--        dot_token: Token ! [ . ](tokens_helper(f, &node.dot_token.spans)),
-+        dot_token: Token ! [.](tokens_helper(f, &node.dot_token.spans)),
-         member: f.fold_member(node.member),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_expr_for_loop<F>(f: &mut F, node: ExprForLoop) -> ExprForLoop
- where
-     F: Fold + ?Sized,
- {
-@@ -1322,17 +1303,17 @@ where
- pub fn fold_expr_let<F>(f: &mut F, node: ExprLet) -> ExprLet
- where
-     F: Fold + ?Sized,
- {
-     ExprLet {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         let_token: Token![let](tokens_helper(f, &node.let_token.span)),
-         pat: f.fold_pat(node.pat),
--        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
-+        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
-         expr: Box::new(f.fold_expr(*node.expr)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_expr_lit<F>(f: &mut F, node: ExprLit) -> ExprLit
- where
-     F: Fold + ?Sized,
- {
-@@ -1379,17 +1360,17 @@ where
- #[cfg(feature = "full")]
- pub fn fold_expr_method_call<F>(f: &mut F, node: ExprMethodCall) -> ExprMethodCall
- where
-     F: Fold + ?Sized,
- {
-     ExprMethodCall {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         receiver: Box::new(f.fold_expr(*node.receiver)),
--        dot_token: Token ! [ . ](tokens_helper(f, &node.dot_token.spans)),
-+        dot_token: Token ! [.](tokens_helper(f, &node.dot_token.spans)),
-         method: f.fold_ident(node.method),
-         turbofish: (node.turbofish).map(|it| f.fold_method_turbofish(it)),
-         paren_token: Paren(tokens_helper(f, &node.paren_token.span)),
-         args: FoldHelper::lift(node.args, |it| f.fold_expr(it)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_expr_paren<F>(f: &mut F, node: ExprParen) -> ExprParen
-@@ -1427,32 +1408,32 @@ where
- }
- #[cfg(feature = "full")]
- pub fn fold_expr_reference<F>(f: &mut F, node: ExprReference) -> ExprReference
- where
-     F: Fold + ?Sized,
- {
-     ExprReference {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
--        and_token: Token ! [ & ](tokens_helper(f, &node.and_token.spans)),
-+        and_token: Token ! [&](tokens_helper(f, &node.and_token.spans)),
-         raw: node.raw,
-         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
-         expr: Box::new(f.fold_expr(*node.expr)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_expr_repeat<F>(f: &mut F, node: ExprRepeat) -> ExprRepeat
- where
-     F: Fold + ?Sized,
- {
-     ExprRepeat {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         bracket_token: Bracket(tokens_helper(f, &node.bracket_token.span)),
-         expr: Box::new(f.fold_expr(*node.expr)),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-         len: Box::new(f.fold_expr(*node.len)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_expr_return<F>(f: &mut F, node: ExprReturn) -> ExprReturn
- where
-     F: Fold + ?Sized,
- {
-@@ -1479,17 +1460,17 @@ where
- #[cfg(feature = "full")]
- pub fn fold_expr_try<F>(f: &mut F, node: ExprTry) -> ExprTry
- where
-     F: Fold + ?Sized,
- {
-     ExprTry {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         expr: Box::new(f.fold_expr(*node.expr)),
--        question_token: Token ! [ ? ](tokens_helper(f, &node.question_token.spans)),
-+        question_token: Token ! [?](tokens_helper(f, &node.question_token.spans)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_expr_try_block<F>(f: &mut F, node: ExprTryBlock) -> ExprTryBlock
- where
-     F: Fold + ?Sized,
- {
-     ExprTryBlock {
-@@ -1512,17 +1493,17 @@ where
- #[cfg(feature = "full")]
- pub fn fold_expr_type<F>(f: &mut F, node: ExprType) -> ExprType
- where
-     F: Fold + ?Sized,
- {
-     ExprType {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         expr: Box::new(f.fold_expr(*node.expr)),
--        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
-+        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
-         ty: Box::new(f.fold_type(*node.ty)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_expr_unary<F>(f: &mut F, node: ExprUnary) -> ExprUnary
- where
-     F: Fold + ?Sized,
- {
-@@ -1571,41 +1552,41 @@ where
- pub fn fold_field<F>(f: &mut F, node: Field) -> Field
- where
-     F: Fold + ?Sized,
- {
-     Field {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         vis: f.fold_visibility(node.vis),
-         ident: (node.ident).map(|it| f.fold_ident(it)),
--        colon_token: (node.colon_token).map(|it| Token ! [ : ](tokens_helper(f, &it.spans))),
-+        colon_token: (node.colon_token).map(|it| Token ! [:](tokens_helper(f, &it.spans))),
-         ty: f.fold_type(node.ty),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_field_pat<F>(f: &mut F, node: FieldPat) -> FieldPat
- where
-     F: Fold + ?Sized,
- {
-     FieldPat {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         member: f.fold_member(node.member),
--        colon_token: (node.colon_token).map(|it| Token ! [ : ](tokens_helper(f, &it.spans))),
-+        colon_token: (node.colon_token).map(|it| Token ! [:](tokens_helper(f, &it.spans))),
-         pat: Box::new(f.fold_pat(*node.pat)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_field_value<F>(f: &mut F, node: FieldValue) -> FieldValue
- where
-     F: Fold + ?Sized,
- {
-     FieldValue {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         member: f.fold_member(node.member),
--        colon_token: (node.colon_token).map(|it| Token ! [ : ](tokens_helper(f, &it.spans))),
-+        colon_token: (node.colon_token).map(|it| Token ! [:](tokens_helper(f, &it.spans))),
-         expr: f.fold_expr(node.expr),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_fields<F>(f: &mut F, node: Fields) -> Fields
- where
-     F: Fold + ?Sized,
- {
-@@ -1676,57 +1657,57 @@ where
- pub fn fold_foreign_item_fn<F>(f: &mut F, node: ForeignItemFn) -> ForeignItemFn
- where
-     F: Fold + ?Sized,
- {
-     ForeignItemFn {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         vis: f.fold_visibility(node.vis),
-         sig: f.fold_signature(node.sig),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_foreign_item_macro<F>(f: &mut F, node: ForeignItemMacro) -> ForeignItemMacro
- where
-     F: Fold + ?Sized,
- {
-     ForeignItemMacro {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         mac: f.fold_macro(node.mac),
--        semi_token: (node.semi_token).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
-+        semi_token: (node.semi_token).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_foreign_item_static<F>(f: &mut F, node: ForeignItemStatic) -> ForeignItemStatic
- where
-     F: Fold + ?Sized,
- {
-     ForeignItemStatic {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         vis: f.fold_visibility(node.vis),
-         static_token: Token![static](tokens_helper(f, &node.static_token.span)),
-         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
-         ident: f.fold_ident(node.ident),
--        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
-+        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
-         ty: Box::new(f.fold_type(*node.ty)),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_foreign_item_type<F>(f: &mut F, node: ForeignItemType) -> ForeignItemType
- where
-     F: Fold + ?Sized,
- {
-     ForeignItemType {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         vis: f.fold_visibility(node.vis),
-         type_token: Token![type](tokens_helper(f, &node.type_token.span)),
-         ident: f.fold_ident(node.ident),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_generic_argument<F>(f: &mut F, node: GenericArgument) -> GenericArgument
- where
-     F: Fold + ?Sized,
- {
-     match node {
-@@ -1774,19 +1755,19 @@ where
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_generics<F>(f: &mut F, node: Generics) -> Generics
- where
-     F: Fold + ?Sized,
- {
-     Generics {
--        lt_token: (node.lt_token).map(|it| Token ! [ < ](tokens_helper(f, &it.spans))),
-+        lt_token: (node.lt_token).map(|it| Token ! [<](tokens_helper(f, &it.spans))),
-         params: FoldHelper::lift(node.params, |it| f.fold_generic_param(it)),
--        gt_token: (node.gt_token).map(|it| Token ! [ > ](tokens_helper(f, &it.spans))),
-+        gt_token: (node.gt_token).map(|it| Token ! [>](tokens_helper(f, &it.spans))),
-         where_clause: (node.where_clause).map(|it| f.fold_where_clause(it)),
-     }
- }
- pub fn fold_ident<F>(f: &mut F, node: Ident) -> Ident
- where
-     F: Fold + ?Sized,
- {
-     let mut node = node;
-@@ -1814,32 +1795,32 @@ where
-     F: Fold + ?Sized,
- {
-     ImplItemConst {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         vis: f.fold_visibility(node.vis),
-         defaultness: (node.defaultness).map(|it| Token![default](tokens_helper(f, &it.span))),
-         const_token: Token![const](tokens_helper(f, &node.const_token.span)),
-         ident: f.fold_ident(node.ident),
--        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
-+        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
-         ty: f.fold_type(node.ty),
--        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
-+        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
-         expr: f.fold_expr(node.expr),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_impl_item_macro<F>(f: &mut F, node: ImplItemMacro) -> ImplItemMacro
- where
-     F: Fold + ?Sized,
- {
-     ImplItemMacro {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         mac: f.fold_macro(node.mac),
--        semi_token: (node.semi_token).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
-+        semi_token: (node.semi_token).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_impl_item_method<F>(f: &mut F, node: ImplItemMethod) -> ImplItemMethod
- where
-     F: Fold + ?Sized,
- {
-     ImplItemMethod {
-@@ -1857,19 +1838,19 @@ where
- {
-     ImplItemType {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         vis: f.fold_visibility(node.vis),
-         defaultness: (node.defaultness).map(|it| Token![default](tokens_helper(f, &it.span))),
-         type_token: Token![type](tokens_helper(f, &node.type_token.span)),
-         ident: f.fold_ident(node.ident),
-         generics: f.fold_generics(node.generics),
--        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
-+        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
-         ty: f.fold_type(node.ty),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_index<F>(f: &mut F, node: Index) -> Index
- where
-     F: Fold + ?Sized,
- {
-     Index {
-@@ -1908,21 +1889,21 @@ pub fn fold_item_const<F>(f: &mut F, nod
- where
-     F: Fold + ?Sized,
- {
-     ItemConst {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         vis: f.fold_visibility(node.vis),
-         const_token: Token![const](tokens_helper(f, &node.const_token.span)),
-         ident: f.fold_ident(node.ident),
--        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
-+        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
-         ty: Box::new(f.fold_type(*node.ty)),
--        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
-+        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
-         expr: Box::new(f.fold_expr(*node.expr)),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_item_enum<F>(f: &mut F, node: ItemEnum) -> ItemEnum
- where
-     F: Fold + ?Sized,
- {
-     ItemEnum {
-@@ -1947,17 +1928,17 @@ where
-         crate_token: Token![crate](tokens_helper(f, &node.crate_token.span)),
-         ident: f.fold_ident(node.ident),
-         rename: (node.rename).map(|it| {
-             (
-                 Token![as](tokens_helper(f, &(it).0.span)),
-                 f.fold_ident((it).1),
-             )
-         }),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_item_fn<F>(f: &mut F, node: ItemFn) -> ItemFn
- where
-     F: Fold + ?Sized,
- {
-     ItemFn {
-@@ -2006,17 +1987,17 @@ where
- pub fn fold_item_macro<F>(f: &mut F, node: ItemMacro) -> ItemMacro
- where
-     F: Fold + ?Sized,
- {
-     ItemMacro {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         ident: (node.ident).map(|it| f.fold_ident(it)),
-         mac: f.fold_macro(node.mac),
--        semi_token: (node.semi_token).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
-+        semi_token: (node.semi_token).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_item_macro2<F>(f: &mut F, node: ItemMacro2) -> ItemMacro2
- where
-     F: Fold + ?Sized,
- {
-     ItemMacro2 {
-@@ -2038,101 +2019,101 @@ where
-         mod_token: Token![mod](tokens_helper(f, &node.mod_token.span)),
-         ident: f.fold_ident(node.ident),
-         content: (node.content).map(|it| {
-             (
-                 Brace(tokens_helper(f, &(it).0.span)),
-                 FoldHelper::lift((it).1, |it| f.fold_item(it)),
-             )
-         }),
--        semi: (node.semi).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
-+        semi: (node.semi).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_item_static<F>(f: &mut F, node: ItemStatic) -> ItemStatic
- where
-     F: Fold + ?Sized,
- {
-     ItemStatic {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         vis: f.fold_visibility(node.vis),
-         static_token: Token![static](tokens_helper(f, &node.static_token.span)),
-         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
-         ident: f.fold_ident(node.ident),
--        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
-+        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
-         ty: Box::new(f.fold_type(*node.ty)),
--        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
-+        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
-         expr: Box::new(f.fold_expr(*node.expr)),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_item_struct<F>(f: &mut F, node: ItemStruct) -> ItemStruct
- where
-     F: Fold + ?Sized,
- {
-     ItemStruct {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         vis: f.fold_visibility(node.vis),
-         struct_token: Token![struct](tokens_helper(f, &node.struct_token.span)),
-         ident: f.fold_ident(node.ident),
-         generics: f.fold_generics(node.generics),
-         fields: f.fold_fields(node.fields),
--        semi_token: (node.semi_token).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
-+        semi_token: (node.semi_token).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_item_trait<F>(f: &mut F, node: ItemTrait) -> ItemTrait
- where
-     F: Fold + ?Sized,
- {
-     ItemTrait {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         vis: f.fold_visibility(node.vis),
-         unsafety: (node.unsafety).map(|it| Token![unsafe](tokens_helper(f, &it.span))),
-         auto_token: (node.auto_token).map(|it| Token![auto](tokens_helper(f, &it.span))),
-         trait_token: Token![trait](tokens_helper(f, &node.trait_token.span)),
-         ident: f.fold_ident(node.ident),
-         generics: f.fold_generics(node.generics),
--        colon_token: (node.colon_token).map(|it| Token ! [ : ](tokens_helper(f, &it.spans))),
-+        colon_token: (node.colon_token).map(|it| Token ! [:](tokens_helper(f, &it.spans))),
-         supertraits: FoldHelper::lift(node.supertraits, |it| f.fold_type_param_bound(it)),
-         brace_token: Brace(tokens_helper(f, &node.brace_token.span)),
-         items: FoldHelper::lift(node.items, |it| f.fold_trait_item(it)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_item_trait_alias<F>(f: &mut F, node: ItemTraitAlias) -> ItemTraitAlias
- where
-     F: Fold + ?Sized,
- {
-     ItemTraitAlias {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         vis: f.fold_visibility(node.vis),
-         trait_token: Token![trait](tokens_helper(f, &node.trait_token.span)),
-         ident: f.fold_ident(node.ident),
-         generics: f.fold_generics(node.generics),
--        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
-+        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
-         bounds: FoldHelper::lift(node.bounds, |it| f.fold_type_param_bound(it)),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_item_type<F>(f: &mut F, node: ItemType) -> ItemType
- where
-     F: Fold + ?Sized,
- {
-     ItemType {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         vis: f.fold_visibility(node.vis),
-         type_token: Token![type](tokens_helper(f, &node.type_token.span)),
-         ident: f.fold_ident(node.ident),
-         generics: f.fold_generics(node.generics),
--        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
-+        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
-         ty: Box::new(f.fold_type(*node.ty)),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_item_union<F>(f: &mut F, node: ItemUnion) -> ItemUnion
- where
-     F: Fold + ?Sized,
- {
-     ItemUnion {
-@@ -2148,29 +2129,29 @@ where
- pub fn fold_item_use<F>(f: &mut F, node: ItemUse) -> ItemUse
- where
-     F: Fold + ?Sized,
- {
-     ItemUse {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         vis: f.fold_visibility(node.vis),
-         use_token: Token![use](tokens_helper(f, &node.use_token.span)),
--        leading_colon: (node.leading_colon).map(|it| Token ! [ :: ](tokens_helper(f, &it.spans))),
-+        leading_colon: (node.leading_colon).map(|it| Token ! [::](tokens_helper(f, &it.spans))),
-         tree: f.fold_use_tree(node.tree),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_label<F>(f: &mut F, node: Label) -> Label
- where
-     F: Fold + ?Sized,
- {
-     Label {
-         name: f.fold_lifetime(node.name),
--        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
-+        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
-     }
- }
- pub fn fold_lifetime<F>(f: &mut F, node: Lifetime) -> Lifetime
- where
-     F: Fold + ?Sized,
- {
-     Lifetime {
-         apostrophe: f.fold_span(node.apostrophe),
-@@ -2180,97 +2161,89 @@ where
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_lifetime_def<F>(f: &mut F, node: LifetimeDef) -> LifetimeDef
- where
-     F: Fold + ?Sized,
- {
-     LifetimeDef {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         lifetime: f.fold_lifetime(node.lifetime),
--        colon_token: (node.colon_token).map(|it| Token ! [ : ](tokens_helper(f, &it.spans))),
-+        colon_token: (node.colon_token).map(|it| Token ! [:](tokens_helper(f, &it.spans))),
-         bounds: FoldHelper::lift(node.bounds, |it| f.fold_lifetime(it)),
-     }
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_lit<F>(f: &mut F, node: Lit) -> Lit
- where
-     F: Fold + ?Sized,
- {
-     match node {
-         Lit::Str(_binding_0) => Lit::Str(f.fold_lit_str(_binding_0)),
-         Lit::ByteStr(_binding_0) => Lit::ByteStr(f.fold_lit_byte_str(_binding_0)),
-         Lit::Byte(_binding_0) => Lit::Byte(f.fold_lit_byte(_binding_0)),
-         Lit::Char(_binding_0) => Lit::Char(f.fold_lit_char(_binding_0)),
-         Lit::Int(_binding_0) => Lit::Int(f.fold_lit_int(_binding_0)),
-         Lit::Float(_binding_0) => Lit::Float(f.fold_lit_float(_binding_0)),
-         Lit::Bool(_binding_0) => Lit::Bool(f.fold_lit_bool(_binding_0)),
-         Lit::Verbatim(_binding_0) => Lit::Verbatim(_binding_0),
-     }
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_lit_bool<F>(f: &mut F, node: LitBool) -> LitBool
- where
-     F: Fold + ?Sized,
- {
-     LitBool {
-         value: node.value,
-         span: f.fold_span(node.span),
-     }
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_lit_byte<F>(f: &mut F, node: LitByte) -> LitByte
- where
-     F: Fold + ?Sized,
- {
-     let span = f.fold_span(node.span());
-     let mut node = node;
-     node.set_span(span);
-     node
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_lit_byte_str<F>(f: &mut F, node: LitByteStr) -> LitByteStr
- where
-     F: Fold + ?Sized,
- {
-     let span = f.fold_span(node.span());
-     let mut node = node;
-     node.set_span(span);
-     node
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_lit_char<F>(f: &mut F, node: LitChar) -> LitChar
- where
-     F: Fold + ?Sized,
- {
-     let span = f.fold_span(node.span());
-     let mut node = node;
-     node.set_span(span);
-     node
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_lit_float<F>(f: &mut F, node: LitFloat) -> LitFloat
- where
-     F: Fold + ?Sized,
- {
-     let span = f.fold_span(node.span());
-     let mut node = node;
-     node.set_span(span);
-     node
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_lit_int<F>(f: &mut F, node: LitInt) -> LitInt
- where
-     F: Fold + ?Sized,
- {
-     let span = f.fold_span(node.span());
-     let mut node = node;
-     node.set_span(span);
-     node
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_lit_str<F>(f: &mut F, node: LitStr) -> LitStr
- where
-     F: Fold + ?Sized,
- {
-     let span = f.fold_span(node.span());
-     let mut node = node;
-     node.set_span(span);
-     node
-@@ -2281,21 +2254,21 @@ where
-     F: Fold + ?Sized,
- {
-     Local {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         let_token: Token![let](tokens_helper(f, &node.let_token.span)),
-         pat: f.fold_pat(node.pat),
-         init: (node.init).map(|it| {
-             (
--                Token ! [ = ](tokens_helper(f, &(it).0.spans)),
-+                Token ! [=](tokens_helper(f, &(it).0.spans)),
-                 Box::new(f.fold_expr(*(it).1)),
-             )
-         }),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_macro<F>(f: &mut F, node: Macro) -> Macro
- where
-     F: Fold + ?Sized,
- {
-     Macro {
-@@ -2356,30 +2329,30 @@ where
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_meta_name_value<F>(f: &mut F, node: MetaNameValue) -> MetaNameValue
- where
-     F: Fold + ?Sized,
- {
-     MetaNameValue {
-         path: f.fold_path(node.path),
--        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
-+        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
-         lit: f.fold_lit(node.lit),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_method_turbofish<F>(f: &mut F, node: MethodTurbofish) -> MethodTurbofish
- where
-     F: Fold + ?Sized,
- {
-     MethodTurbofish {
--        colon2_token: Token ! [ :: ](tokens_helper(f, &node.colon2_token.spans)),
--        lt_token: Token ! [ < ](tokens_helper(f, &node.lt_token.spans)),
-+        colon2_token: Token ! [::](tokens_helper(f, &node.colon2_token.spans)),
-+        lt_token: Token ! [<](tokens_helper(f, &node.lt_token.spans)),
-         args: FoldHelper::lift(node.args, |it| f.fold_generic_method_argument(it)),
--        gt_token: Token ! [ > ](tokens_helper(f, &node.gt_token.spans)),
-+        gt_token: Token ! [>](tokens_helper(f, &node.gt_token.spans)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_nested_meta<F>(f: &mut F, node: NestedMeta) -> NestedMeta
- where
-     F: Fold + ?Sized,
- {
-     match node {
-@@ -2444,17 +2417,17 @@ where
- {
-     PatIdent {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         by_ref: (node.by_ref).map(|it| Token![ref](tokens_helper(f, &it.span))),
-         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
-         ident: f.fold_ident(node.ident),
-         subpat: (node.subpat).map(|it| {
-             (
--                Token ! [ @ ](tokens_helper(f, &(it).0.spans)),
-+                Token ! [@](tokens_helper(f, &(it).0.spans)),
-                 Box::new(f.fold_pat(*(it).1)),
-             )
-         }),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_pat_lit<F>(f: &mut F, node: PatLit) -> PatLit
- where
-@@ -2477,17 +2450,17 @@ where
- }
- #[cfg(feature = "full")]
- pub fn fold_pat_or<F>(f: &mut F, node: PatOr) -> PatOr
- where
-     F: Fold + ?Sized,
- {
-     PatOr {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
--        leading_vert: (node.leading_vert).map(|it| Token ! [ | ](tokens_helper(f, &it.spans))),
-+        leading_vert: (node.leading_vert).map(|it| Token ! [|](tokens_helper(f, &it.spans))),
-         cases: FoldHelper::lift(node.cases, |it| f.fold_pat(it)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_pat_path<F>(f: &mut F, node: PatPath) -> PatPath
- where
-     F: Fold + ?Sized,
- {
-@@ -2511,17 +2484,17 @@ where
- }
- #[cfg(feature = "full")]
- pub fn fold_pat_reference<F>(f: &mut F, node: PatReference) -> PatReference
- where
-     F: Fold + ?Sized,
- {
-     PatReference {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
--        and_token: Token ! [ & ](tokens_helper(f, &node.and_token.spans)),
-+        and_token: Token ! [&](tokens_helper(f, &node.and_token.spans)),
-         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
-         pat: Box::new(f.fold_pat(*node.pat)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_pat_rest<F>(f: &mut F, node: PatRest) -> PatRest
- where
-     F: Fold + ?Sized,
-@@ -2580,17 +2553,17 @@ where
- #[cfg(feature = "full")]
- pub fn fold_pat_type<F>(f: &mut F, node: PatType) -> PatType
- where
-     F: Fold + ?Sized,
- {
-     PatType {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         pat: Box::new(f.fold_pat(*node.pat)),
--        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
-+        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
-         ty: Box::new(f.fold_type(*node.ty)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_pat_wild<F>(f: &mut F, node: PatWild) -> PatWild
- where
-     F: Fold + ?Sized,
- {
-@@ -2600,17 +2573,17 @@ where
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_path<F>(f: &mut F, node: Path) -> Path
- where
-     F: Fold + ?Sized,
- {
-     Path {
--        leading_colon: (node.leading_colon).map(|it| Token ! [ :: ](tokens_helper(f, &it.spans))),
-+        leading_colon: (node.leading_colon).map(|it| Token ! [::](tokens_helper(f, &it.spans))),
-         segments: FoldHelper::lift(node.segments, |it| f.fold_path_segment(it)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_path_arguments<F>(f: &mut F, node: PathArguments) -> PathArguments
- where
-     F: Fold + ?Sized,
- {
-@@ -2636,96 +2609,96 @@ where
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_predicate_eq<F>(f: &mut F, node: PredicateEq) -> PredicateEq
- where
-     F: Fold + ?Sized,
- {
-     PredicateEq {
-         lhs_ty: f.fold_type(node.lhs_ty),
--        eq_token: Token ! [ = ](tokens_helper(f, &node.eq_token.spans)),
-+        eq_token: Token ! [=](tokens_helper(f, &node.eq_token.spans)),
-         rhs_ty: f.fold_type(node.rhs_ty),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_predicate_lifetime<F>(f: &mut F, node: PredicateLifetime) -> PredicateLifetime
- where
-     F: Fold + ?Sized,
- {
-     PredicateLifetime {
-         lifetime: f.fold_lifetime(node.lifetime),
--        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
-+        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
-         bounds: FoldHelper::lift(node.bounds, |it| f.fold_lifetime(it)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_predicate_type<F>(f: &mut F, node: PredicateType) -> PredicateType
- where
-     F: Fold + ?Sized,
- {
-     PredicateType {
-         lifetimes: (node.lifetimes).map(|it| f.fold_bound_lifetimes(it)),
-         bounded_ty: f.fold_type(node.bounded_ty),
--        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
-+        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
-         bounds: FoldHelper::lift(node.bounds, |it| f.fold_type_param_bound(it)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_qself<F>(f: &mut F, node: QSelf) -> QSelf
- where
-     F: Fold + ?Sized,
- {
-     QSelf {
--        lt_token: Token ! [ < ](tokens_helper(f, &node.lt_token.spans)),
-+        lt_token: Token ! [<](tokens_helper(f, &node.lt_token.spans)),
-         ty: Box::new(f.fold_type(*node.ty)),
-         position: node.position,
-         as_token: (node.as_token).map(|it| Token![as](tokens_helper(f, &it.span))),
--        gt_token: Token ! [ > ](tokens_helper(f, &node.gt_token.spans)),
-+        gt_token: Token ! [>](tokens_helper(f, &node.gt_token.spans)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_range_limits<F>(f: &mut F, node: RangeLimits) -> RangeLimits
- where
-     F: Fold + ?Sized,
- {
-     match node {
-         RangeLimits::HalfOpen(_binding_0) => {
-             RangeLimits::HalfOpen(Token![..](tokens_helper(f, &_binding_0.spans)))
-         }
-         RangeLimits::Closed(_binding_0) => {
--            RangeLimits::Closed(Token ! [ ..= ](tokens_helper(f, &_binding_0.spans)))
-+            RangeLimits::Closed(Token ! [..=](tokens_helper(f, &_binding_0.spans)))
-         }
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_receiver<F>(f: &mut F, node: Receiver) -> Receiver
- where
-     F: Fold + ?Sized,
- {
-     Receiver {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         reference: (node.reference).map(|it| {
-             (
--                Token ! [ & ](tokens_helper(f, &(it).0.spans)),
-+                Token ! [&](tokens_helper(f, &(it).0.spans)),
-                 ((it).1).map(|it| f.fold_lifetime(it)),
-             )
-         }),
-         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
-         self_token: Token![self](tokens_helper(f, &node.self_token.span)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_return_type<F>(f: &mut F, node: ReturnType) -> ReturnType
- where
-     F: Fold + ?Sized,
- {
-     match node {
-         ReturnType::Default => ReturnType::Default,
-         ReturnType::Type(_binding_0, _binding_1) => ReturnType::Type(
--            Token ! [ -> ](tokens_helper(f, &_binding_0.spans)),
-+            Token ! [->](tokens_helper(f, &_binding_0.spans)),
-             Box::new(f.fold_type(*_binding_1)),
-         ),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_signature<F>(f: &mut F, node: Signature) -> Signature
- where
-     F: Fold + ?Sized,
-@@ -2756,17 +2729,17 @@ where
-     F: Fold + ?Sized,
- {
-     match node {
-         Stmt::Local(_binding_0) => Stmt::Local(f.fold_local(_binding_0)),
-         Stmt::Item(_binding_0) => Stmt::Item(f.fold_item(_binding_0)),
-         Stmt::Expr(_binding_0) => Stmt::Expr(f.fold_expr(_binding_0)),
-         Stmt::Semi(_binding_0, _binding_1) => Stmt::Semi(
-             f.fold_expr(_binding_0),
--            Token ! [ ; ](tokens_helper(f, &_binding_1.spans)),
-+            Token ! [;](tokens_helper(f, &_binding_1.spans)),
-         ),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_trait_bound<F>(f: &mut F, node: TraitBound) -> TraitBound
- where
-     F: Fold + ?Sized,
- {
-@@ -2780,17 +2753,17 @@ where
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_trait_bound_modifier<F>(f: &mut F, node: TraitBoundModifier) -> TraitBoundModifier
- where
-     F: Fold + ?Sized,
- {
-     match node {
-         TraitBoundModifier::None => TraitBoundModifier::None,
-         TraitBoundModifier::Maybe(_binding_0) => {
--            TraitBoundModifier::Maybe(Token ! [ ? ](tokens_helper(f, &_binding_0.spans)))
-+            TraitBoundModifier::Maybe(Token ! [?](tokens_helper(f, &_binding_0.spans)))
-         }
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_trait_item<F>(f: &mut F, node: TraitItem) -> TraitItem
- where
-     F: Fold + ?Sized,
- {
-@@ -2807,69 +2780,69 @@ where
- pub fn fold_trait_item_const<F>(f: &mut F, node: TraitItemConst) -> TraitItemConst
- where
-     F: Fold + ?Sized,
- {
-     TraitItemConst {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         const_token: Token![const](tokens_helper(f, &node.const_token.span)),
-         ident: f.fold_ident(node.ident),
--        colon_token: Token ! [ : ](tokens_helper(f, &node.colon_token.spans)),
-+        colon_token: Token ! [:](tokens_helper(f, &node.colon_token.spans)),
-         ty: f.fold_type(node.ty),
-         default: (node.default).map(|it| {
-             (
--                Token ! [ = ](tokens_helper(f, &(it).0.spans)),
-+                Token ! [=](tokens_helper(f, &(it).0.spans)),
-                 f.fold_expr((it).1),
-             )
-         }),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_trait_item_macro<F>(f: &mut F, node: TraitItemMacro) -> TraitItemMacro
- where
-     F: Fold + ?Sized,
- {
-     TraitItemMacro {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         mac: f.fold_macro(node.mac),
--        semi_token: (node.semi_token).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
-+        semi_token: (node.semi_token).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_trait_item_method<F>(f: &mut F, node: TraitItemMethod) -> TraitItemMethod
- where
-     F: Fold + ?Sized,
- {
-     TraitItemMethod {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         sig: f.fold_signature(node.sig),
-         default: (node.default).map(|it| f.fold_block(it)),
--        semi_token: (node.semi_token).map(|it| Token ! [ ; ](tokens_helper(f, &it.spans))),
-+        semi_token: (node.semi_token).map(|it| Token ! [;](tokens_helper(f, &it.spans))),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_trait_item_type<F>(f: &mut F, node: TraitItemType) -> TraitItemType
- where
-     F: Fold + ?Sized,
- {
-     TraitItemType {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         type_token: Token![type](tokens_helper(f, &node.type_token.span)),
-         ident: f.fold_ident(node.ident),
-         generics: f.fold_generics(node.generics),
--        colon_token: (node.colon_token).map(|it| Token ! [ : ](tokens_helper(f, &it.spans))),
-+        colon_token: (node.colon_token).map(|it| Token ! [:](tokens_helper(f, &it.spans))),
-         bounds: FoldHelper::lift(node.bounds, |it| f.fold_type_param_bound(it)),
-         default: (node.default).map(|it| {
-             (
--                Token ! [ = ](tokens_helper(f, &(it).0.spans)),
-+                Token ! [=](tokens_helper(f, &(it).0.spans)),
-                 f.fold_type((it).1),
-             )
-         }),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_type<F>(f: &mut F, node: Type) -> Type
- where
-     F: Fold + ?Sized,
- {
-     match node {
-@@ -2894,17 +2867,17 @@ where
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_type_array<F>(f: &mut F, node: TypeArray) -> TypeArray
- where
-     F: Fold + ?Sized,
- {
-     TypeArray {
-         bracket_token: Bracket(tokens_helper(f, &node.bracket_token.span)),
-         elem: Box::new(f.fold_type(*node.elem)),
--        semi_token: Token ! [ ; ](tokens_helper(f, &node.semi_token.spans)),
-+        semi_token: Token ! [;](tokens_helper(f, &node.semi_token.spans)),
-         len: f.fold_expr(node.len),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_type_bare_fn<F>(f: &mut F, node: TypeBareFn) -> TypeBareFn
- where
-     F: Fold + ?Sized,
- {
-@@ -2969,19 +2942,19 @@ where
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_type_param<F>(f: &mut F, node: TypeParam) -> TypeParam
- where
-     F: Fold + ?Sized,
- {
-     TypeParam {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         ident: f.fold_ident(node.ident),
--        colon_token: (node.colon_token).map(|it| Token ! [ : ](tokens_helper(f, &it.spans))),
-+        colon_token: (node.colon_token).map(|it| Token ! [:](tokens_helper(f, &it.spans))),
-         bounds: FoldHelper::lift(node.bounds, |it| f.fold_type_param_bound(it)),
--        eq_token: (node.eq_token).map(|it| Token ! [ = ](tokens_helper(f, &it.spans))),
-+        eq_token: (node.eq_token).map(|it| Token ! [=](tokens_helper(f, &it.spans))),
-         default: (node.default).map(|it| f.fold_type(it)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_type_param_bound<F>(f: &mut F, node: TypeParamBound) -> TypeParamBound
- where
-     F: Fold + ?Sized,
- {
-@@ -3013,29 +2986,29 @@ where
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_type_ptr<F>(f: &mut F, node: TypePtr) -> TypePtr
- where
-     F: Fold + ?Sized,
- {
-     TypePtr {
--        star_token: Token ! [ * ](tokens_helper(f, &node.star_token.spans)),
-+        star_token: Token ! [*](tokens_helper(f, &node.star_token.spans)),
-         const_token: (node.const_token).map(|it| Token![const](tokens_helper(f, &it.span))),
-         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
-         elem: Box::new(f.fold_type(*node.elem)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_type_reference<F>(f: &mut F, node: TypeReference) -> TypeReference
- where
-     F: Fold + ?Sized,
- {
-     TypeReference {
--        and_token: Token ! [ & ](tokens_helper(f, &node.and_token.spans)),
-+        and_token: Token ! [&](tokens_helper(f, &node.and_token.spans)),
-         lifetime: (node.lifetime).map(|it| f.fold_lifetime(it)),
-         mutability: (node.mutability).map(|it| Token![mut](tokens_helper(f, &it.span))),
-         elem: Box::new(f.fold_type(*node.elem)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_type_slice<F>(f: &mut F, node: TypeSlice) -> TypeSlice
- where
-@@ -3067,28 +3040,28 @@ where
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_un_op<F>(f: &mut F, node: UnOp) -> UnOp
- where
-     F: Fold + ?Sized,
- {
-     match node {
--        UnOp::Deref(_binding_0) => UnOp::Deref(Token ! [ * ](tokens_helper(f, &_binding_0.spans))),
-+        UnOp::Deref(_binding_0) => UnOp::Deref(Token ! [*](tokens_helper(f, &_binding_0.spans))),
-         UnOp::Not(_binding_0) => UnOp::Not(Token![!](tokens_helper(f, &_binding_0.spans))),
--        UnOp::Neg(_binding_0) => UnOp::Neg(Token ! [ - ](tokens_helper(f, &_binding_0.spans))),
-+        UnOp::Neg(_binding_0) => UnOp::Neg(Token ! [-](tokens_helper(f, &_binding_0.spans))),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_use_glob<F>(f: &mut F, node: UseGlob) -> UseGlob
- where
-     F: Fold + ?Sized,
- {
-     UseGlob {
--        star_token: Token ! [ * ](tokens_helper(f, &node.star_token.spans)),
-+        star_token: Token ! [*](tokens_helper(f, &node.star_token.spans)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_use_group<F>(f: &mut F, node: UseGroup) -> UseGroup
- where
-     F: Fold + ?Sized,
- {
-     UseGroup {
-@@ -3107,17 +3080,17 @@ where
- }
- #[cfg(feature = "full")]
- pub fn fold_use_path<F>(f: &mut F, node: UsePath) -> UsePath
- where
-     F: Fold + ?Sized,
- {
-     UsePath {
-         ident: f.fold_ident(node.ident),
--        colon2_token: Token ! [ :: ](tokens_helper(f, &node.colon2_token.spans)),
-+        colon2_token: Token ! [::](tokens_helper(f, &node.colon2_token.spans)),
-         tree: Box::new(f.fold_use_tree(*node.tree)),
-     }
- }
- #[cfg(feature = "full")]
- pub fn fold_use_rename<F>(f: &mut F, node: UseRename) -> UseRename
- where
-     F: Fold + ?Sized,
- {
-@@ -3142,31 +3115,31 @@ where
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_variadic<F>(f: &mut F, node: Variadic) -> Variadic
- where
-     F: Fold + ?Sized,
- {
-     Variadic {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
--        dots: Token ! [ ... ](tokens_helper(f, &node.dots.spans)),
-+        dots: Token ! [...](tokens_helper(f, &node.dots.spans)),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_variant<F>(f: &mut F, node: Variant) -> Variant
- where
-     F: Fold + ?Sized,
- {
-     Variant {
-         attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
-         ident: f.fold_ident(node.ident),
-         fields: f.fold_fields(node.fields),
-         discriminant: (node.discriminant).map(|it| {
-             (
--                Token ! [ = ](tokens_helper(f, &(it).0.spans)),
-+                Token ! [=](tokens_helper(f, &(it).0.spans)),
-                 f.fold_expr((it).1),
-             )
-         }),
-     }
- }
- #[cfg(any(feature = "derive", feature = "full"))]
- pub fn fold_vis_crate<F>(f: &mut F, node: VisCrate) -> VisCrate
- where
-diff --git a/third_party/rust/syn/src/gen/hash.rs b/third_party/rust/syn/src/gen/hash.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/src/gen/hash.rs
-@@ -0,0 +1,2691 @@
-+// This file is @generated by syn-internal-codegen.
-+// It is not intended for manual editing.
-+
-+#[cfg(any(feature = "derive", feature = "full"))]
-+use crate::tt::TokenStreamHelper;
-+use crate::*;
-+use std::hash::{Hash, Hasher};
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Abi {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.name.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for AngleBracketedGenericArguments {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.colon2_token.hash(state);
-+        self.args.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for Arm {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.pat.hash(state);
-+        self.guard.hash(state);
-+        self.body.hash(state);
-+        self.comma.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for AttrStyle {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            AttrStyle::Outer => {
-+                state.write_u8(0u8);
-+            }
-+            AttrStyle::Inner(_) => {
-+                state.write_u8(1u8);
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Attribute {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.style.hash(state);
-+        self.path.hash(state);
-+        TokenStreamHelper(&self.tokens).hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for BareFnArg {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.name.hash(state);
-+        self.ty.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for BinOp {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            BinOp::Add(_) => {
-+                state.write_u8(0u8);
-+            }
-+            BinOp::Sub(_) => {
-+                state.write_u8(1u8);
-+            }
-+            BinOp::Mul(_) => {
-+                state.write_u8(2u8);
-+            }
-+            BinOp::Div(_) => {
-+                state.write_u8(3u8);
-+            }
-+            BinOp::Rem(_) => {
-+                state.write_u8(4u8);
-+            }
-+            BinOp::And(_) => {
-+                state.write_u8(5u8);
-+            }
-+            BinOp::Or(_) => {
-+                state.write_u8(6u8);
-+            }
-+            BinOp::BitXor(_) => {
-+                state.write_u8(7u8);
-+            }
-+            BinOp::BitAnd(_) => {
-+                state.write_u8(8u8);
-+            }
-+            BinOp::BitOr(_) => {
-+                state.write_u8(9u8);
-+            }
-+            BinOp::Shl(_) => {
-+                state.write_u8(10u8);
-+            }
-+            BinOp::Shr(_) => {
-+                state.write_u8(11u8);
-+            }
-+            BinOp::Eq(_) => {
-+                state.write_u8(12u8);
-+            }
-+            BinOp::Lt(_) => {
-+                state.write_u8(13u8);
-+            }
-+            BinOp::Le(_) => {
-+                state.write_u8(14u8);
-+            }
-+            BinOp::Ne(_) => {
-+                state.write_u8(15u8);
-+            }
-+            BinOp::Ge(_) => {
-+                state.write_u8(16u8);
-+            }
-+            BinOp::Gt(_) => {
-+                state.write_u8(17u8);
-+            }
-+            BinOp::AddEq(_) => {
-+                state.write_u8(18u8);
-+            }
-+            BinOp::SubEq(_) => {
-+                state.write_u8(19u8);
-+            }
-+            BinOp::MulEq(_) => {
-+                state.write_u8(20u8);
-+            }
-+            BinOp::DivEq(_) => {
-+                state.write_u8(21u8);
-+            }
-+            BinOp::RemEq(_) => {
-+                state.write_u8(22u8);
-+            }
-+            BinOp::BitXorEq(_) => {
-+                state.write_u8(23u8);
-+            }
-+            BinOp::BitAndEq(_) => {
-+                state.write_u8(24u8);
-+            }
-+            BinOp::BitOrEq(_) => {
-+                state.write_u8(25u8);
-+            }
-+            BinOp::ShlEq(_) => {
-+                state.write_u8(26u8);
-+            }
-+            BinOp::ShrEq(_) => {
-+                state.write_u8(27u8);
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Binding {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.ident.hash(state);
-+        self.ty.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for Block {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.stmts.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for BoundLifetimes {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.lifetimes.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for ConstParam {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.ident.hash(state);
-+        self.ty.hash(state);
-+        self.eq_token.hash(state);
-+        self.default.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Constraint {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.ident.hash(state);
-+        self.bounds.hash(state);
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Hash for Data {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            Data::Struct(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            Data::Enum(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            Data::Union(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Hash for DataEnum {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.variants.hash(state);
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Hash for DataStruct {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.fields.hash(state);
-+        self.semi_token.hash(state);
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Hash for DataUnion {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.fields.hash(state);
-+    }
-+}
-+#[cfg(feature = "derive")]
-+impl Hash for DeriveInput {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.ident.hash(state);
-+        self.generics.hash(state);
-+        self.data.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Expr {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            #[cfg(feature = "full")]
-+            Expr::Array(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Assign(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::AssignOp(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Async(v0) => {
-+                state.write_u8(3u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Await(v0) => {
-+                state.write_u8(4u8);
-+                v0.hash(state);
-+            }
-+            Expr::Binary(v0) => {
-+                state.write_u8(5u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Block(v0) => {
-+                state.write_u8(6u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Box(v0) => {
-+                state.write_u8(7u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Break(v0) => {
-+                state.write_u8(8u8);
-+                v0.hash(state);
-+            }
-+            Expr::Call(v0) => {
-+                state.write_u8(9u8);
-+                v0.hash(state);
-+            }
-+            Expr::Cast(v0) => {
-+                state.write_u8(10u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Closure(v0) => {
-+                state.write_u8(11u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Continue(v0) => {
-+                state.write_u8(12u8);
-+                v0.hash(state);
-+            }
-+            Expr::Field(v0) => {
-+                state.write_u8(13u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::ForLoop(v0) => {
-+                state.write_u8(14u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Group(v0) => {
-+                state.write_u8(15u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::If(v0) => {
-+                state.write_u8(16u8);
-+                v0.hash(state);
-+            }
-+            Expr::Index(v0) => {
-+                state.write_u8(17u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Let(v0) => {
-+                state.write_u8(18u8);
-+                v0.hash(state);
-+            }
-+            Expr::Lit(v0) => {
-+                state.write_u8(19u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Loop(v0) => {
-+                state.write_u8(20u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Macro(v0) => {
-+                state.write_u8(21u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Match(v0) => {
-+                state.write_u8(22u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::MethodCall(v0) => {
-+                state.write_u8(23u8);
-+                v0.hash(state);
-+            }
-+            Expr::Paren(v0) => {
-+                state.write_u8(24u8);
-+                v0.hash(state);
-+            }
-+            Expr::Path(v0) => {
-+                state.write_u8(25u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Range(v0) => {
-+                state.write_u8(26u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Reference(v0) => {
-+                state.write_u8(27u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Repeat(v0) => {
-+                state.write_u8(28u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Return(v0) => {
-+                state.write_u8(29u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Struct(v0) => {
-+                state.write_u8(30u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Try(v0) => {
-+                state.write_u8(31u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::TryBlock(v0) => {
-+                state.write_u8(32u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Tuple(v0) => {
-+                state.write_u8(33u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Type(v0) => {
-+                state.write_u8(34u8);
-+                v0.hash(state);
-+            }
-+            Expr::Unary(v0) => {
-+                state.write_u8(35u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Unsafe(v0) => {
-+                state.write_u8(36u8);
-+                v0.hash(state);
-+            }
-+            Expr::Verbatim(v0) => {
-+                state.write_u8(37u8);
-+                TokenStreamHelper(v0).hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::While(v0) => {
-+                state.write_u8(38u8);
-+                v0.hash(state);
-+            }
-+            #[cfg(feature = "full")]
-+            Expr::Yield(v0) => {
-+                state.write_u8(39u8);
-+                v0.hash(state);
-+            }
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprArray {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.elems.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprAssign {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.left.hash(state);
-+        self.right.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprAssignOp {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.left.hash(state);
-+        self.op.hash(state);
-+        self.right.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprAsync {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.capture.hash(state);
-+        self.block.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprAwait {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.base.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for ExprBinary {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.left.hash(state);
-+        self.op.hash(state);
-+        self.right.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprBlock {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.label.hash(state);
-+        self.block.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprBox {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprBreak {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.label.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for ExprCall {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.func.hash(state);
-+        self.args.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for ExprCast {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.expr.hash(state);
-+        self.ty.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprClosure {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.asyncness.hash(state);
-+        self.movability.hash(state);
-+        self.capture.hash(state);
-+        self.inputs.hash(state);
-+        self.output.hash(state);
-+        self.body.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprContinue {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.label.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for ExprField {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.base.hash(state);
-+        self.member.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprForLoop {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.label.hash(state);
-+        self.pat.hash(state);
-+        self.expr.hash(state);
-+        self.body.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprGroup {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprIf {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.cond.hash(state);
-+        self.then_branch.hash(state);
-+        self.else_branch.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for ExprIndex {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.expr.hash(state);
-+        self.index.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprLet {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.pat.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for ExprLit {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.lit.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprLoop {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.label.hash(state);
-+        self.body.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprMacro {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.mac.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprMatch {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.expr.hash(state);
-+        self.arms.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprMethodCall {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.receiver.hash(state);
-+        self.method.hash(state);
-+        self.turbofish.hash(state);
-+        self.args.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for ExprParen {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for ExprPath {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.qself.hash(state);
-+        self.path.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprRange {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.from.hash(state);
-+        self.limits.hash(state);
-+        self.to.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprReference {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.mutability.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprRepeat {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.expr.hash(state);
-+        self.len.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprReturn {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprStruct {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.path.hash(state);
-+        self.fields.hash(state);
-+        self.dot2_token.hash(state);
-+        self.rest.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprTry {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprTryBlock {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.block.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprTuple {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.elems.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprType {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.expr.hash(state);
-+        self.ty.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for ExprUnary {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.op.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprUnsafe {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.block.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprWhile {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.label.hash(state);
-+        self.cond.hash(state);
-+        self.body.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ExprYield {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Field {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.ident.hash(state);
-+        self.colon_token.hash(state);
-+        self.ty.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for FieldPat {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.member.hash(state);
-+        self.colon_token.hash(state);
-+        self.pat.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for FieldValue {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.member.hash(state);
-+        self.colon_token.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Fields {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            Fields::Named(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            Fields::Unnamed(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            Fields::Unit => {
-+                state.write_u8(2u8);
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for FieldsNamed {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.named.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for FieldsUnnamed {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.unnamed.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for File {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.shebang.hash(state);
-+        self.attrs.hash(state);
-+        self.items.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for FnArg {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            FnArg::Receiver(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            FnArg::Typed(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ForeignItem {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            ForeignItem::Fn(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            ForeignItem::Static(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            ForeignItem::Type(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+            ForeignItem::Macro(v0) => {
-+                state.write_u8(3u8);
-+                v0.hash(state);
-+            }
-+            ForeignItem::Verbatim(v0) => {
-+                state.write_u8(4u8);
-+                TokenStreamHelper(v0).hash(state);
-+            }
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ForeignItemFn {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.sig.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ForeignItemMacro {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.mac.hash(state);
-+        self.semi_token.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ForeignItemStatic {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.mutability.hash(state);
-+        self.ident.hash(state);
-+        self.ty.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ForeignItemType {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.ident.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for GenericArgument {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            GenericArgument::Lifetime(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            GenericArgument::Type(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            GenericArgument::Binding(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+            GenericArgument::Constraint(v0) => {
-+                state.write_u8(3u8);
-+                v0.hash(state);
-+            }
-+            GenericArgument::Const(v0) => {
-+                state.write_u8(4u8);
-+                v0.hash(state);
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for GenericMethodArgument {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            GenericMethodArgument::Type(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            GenericMethodArgument::Const(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for GenericParam {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            GenericParam::Type(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            GenericParam::Lifetime(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            GenericParam::Const(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Generics {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.lt_token.hash(state);
-+        self.params.hash(state);
-+        self.gt_token.hash(state);
-+        self.where_clause.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ImplItem {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            ImplItem::Const(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            ImplItem::Method(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            ImplItem::Type(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+            ImplItem::Macro(v0) => {
-+                state.write_u8(3u8);
-+                v0.hash(state);
-+            }
-+            ImplItem::Verbatim(v0) => {
-+                state.write_u8(4u8);
-+                TokenStreamHelper(v0).hash(state);
-+            }
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ImplItemConst {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.defaultness.hash(state);
-+        self.ident.hash(state);
-+        self.ty.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ImplItemMacro {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.mac.hash(state);
-+        self.semi_token.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ImplItemMethod {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.defaultness.hash(state);
-+        self.sig.hash(state);
-+        self.block.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ImplItemType {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.defaultness.hash(state);
-+        self.ident.hash(state);
-+        self.generics.hash(state);
-+        self.ty.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for Item {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            Item::Const(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            Item::Enum(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            Item::ExternCrate(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+            Item::Fn(v0) => {
-+                state.write_u8(3u8);
-+                v0.hash(state);
-+            }
-+            Item::ForeignMod(v0) => {
-+                state.write_u8(4u8);
-+                v0.hash(state);
-+            }
-+            Item::Impl(v0) => {
-+                state.write_u8(5u8);
-+                v0.hash(state);
-+            }
-+            Item::Macro(v0) => {
-+                state.write_u8(6u8);
-+                v0.hash(state);
-+            }
-+            Item::Macro2(v0) => {
-+                state.write_u8(7u8);
-+                v0.hash(state);
-+            }
-+            Item::Mod(v0) => {
-+                state.write_u8(8u8);
-+                v0.hash(state);
-+            }
-+            Item::Static(v0) => {
-+                state.write_u8(9u8);
-+                v0.hash(state);
-+            }
-+            Item::Struct(v0) => {
-+                state.write_u8(10u8);
-+                v0.hash(state);
-+            }
-+            Item::Trait(v0) => {
-+                state.write_u8(11u8);
-+                v0.hash(state);
-+            }
-+            Item::TraitAlias(v0) => {
-+                state.write_u8(12u8);
-+                v0.hash(state);
-+            }
-+            Item::Type(v0) => {
-+                state.write_u8(13u8);
-+                v0.hash(state);
-+            }
-+            Item::Union(v0) => {
-+                state.write_u8(14u8);
-+                v0.hash(state);
-+            }
-+            Item::Use(v0) => {
-+                state.write_u8(15u8);
-+                v0.hash(state);
-+            }
-+            Item::Verbatim(v0) => {
-+                state.write_u8(16u8);
-+                TokenStreamHelper(v0).hash(state);
-+            }
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemConst {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.ident.hash(state);
-+        self.ty.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemEnum {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.ident.hash(state);
-+        self.generics.hash(state);
-+        self.variants.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemExternCrate {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.ident.hash(state);
-+        self.rename.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemFn {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.sig.hash(state);
-+        self.block.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemForeignMod {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.abi.hash(state);
-+        self.items.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemImpl {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.defaultness.hash(state);
-+        self.unsafety.hash(state);
-+        self.generics.hash(state);
-+        self.trait_.hash(state);
-+        self.self_ty.hash(state);
-+        self.items.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemMacro {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.ident.hash(state);
-+        self.mac.hash(state);
-+        self.semi_token.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemMacro2 {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.ident.hash(state);
-+        TokenStreamHelper(&self.rules).hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemMod {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.ident.hash(state);
-+        self.content.hash(state);
-+        self.semi.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemStatic {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.mutability.hash(state);
-+        self.ident.hash(state);
-+        self.ty.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemStruct {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.ident.hash(state);
-+        self.generics.hash(state);
-+        self.fields.hash(state);
-+        self.semi_token.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemTrait {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.unsafety.hash(state);
-+        self.auto_token.hash(state);
-+        self.ident.hash(state);
-+        self.generics.hash(state);
-+        self.colon_token.hash(state);
-+        self.supertraits.hash(state);
-+        self.items.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemTraitAlias {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.ident.hash(state);
-+        self.generics.hash(state);
-+        self.bounds.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemType {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.ident.hash(state);
-+        self.generics.hash(state);
-+        self.ty.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemUnion {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.ident.hash(state);
-+        self.generics.hash(state);
-+        self.fields.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for ItemUse {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.vis.hash(state);
-+        self.leading_colon.hash(state);
-+        self.tree.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for Label {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.name.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for LifetimeDef {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.lifetime.hash(state);
-+        self.colon_token.hash(state);
-+        self.bounds.hash(state);
-+    }
-+}
-+impl Hash for Lit {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            Lit::Str(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            Lit::ByteStr(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            Lit::Byte(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+            Lit::Char(v0) => {
-+                state.write_u8(3u8);
-+                v0.hash(state);
-+            }
-+            Lit::Int(v0) => {
-+                state.write_u8(4u8);
-+                v0.hash(state);
-+            }
-+            Lit::Float(v0) => {
-+                state.write_u8(5u8);
-+                v0.hash(state);
-+            }
-+            Lit::Bool(v0) => {
-+                state.write_u8(6u8);
-+                v0.hash(state);
-+            }
-+            Lit::Verbatim(v0) => {
-+                state.write_u8(7u8);
-+                v0.to_string().hash(state);
-+            }
-+        }
-+    }
-+}
-+impl Hash for LitBool {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.value.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for Local {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.pat.hash(state);
-+        self.init.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Macro {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.path.hash(state);
-+        self.delimiter.hash(state);
-+        TokenStreamHelper(&self.tokens).hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for MacroDelimiter {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            MacroDelimiter::Paren(_) => {
-+                state.write_u8(0u8);
-+            }
-+            MacroDelimiter::Brace(_) => {
-+                state.write_u8(1u8);
-+            }
-+            MacroDelimiter::Bracket(_) => {
-+                state.write_u8(2u8);
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Meta {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            Meta::Path(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            Meta::List(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            Meta::NameValue(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for MetaList {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.path.hash(state);
-+        self.nested.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for MetaNameValue {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.path.hash(state);
-+        self.lit.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for MethodTurbofish {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.args.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for NestedMeta {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            NestedMeta::Meta(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            NestedMeta::Lit(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for ParenthesizedGenericArguments {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.inputs.hash(state);
-+        self.output.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for Pat {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            Pat::Box(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            Pat::Ident(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            Pat::Lit(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+            Pat::Macro(v0) => {
-+                state.write_u8(3u8);
-+                v0.hash(state);
-+            }
-+            Pat::Or(v0) => {
-+                state.write_u8(4u8);
-+                v0.hash(state);
-+            }
-+            Pat::Path(v0) => {
-+                state.write_u8(5u8);
-+                v0.hash(state);
-+            }
-+            Pat::Range(v0) => {
-+                state.write_u8(6u8);
-+                v0.hash(state);
-+            }
-+            Pat::Reference(v0) => {
-+                state.write_u8(7u8);
-+                v0.hash(state);
-+            }
-+            Pat::Rest(v0) => {
-+                state.write_u8(8u8);
-+                v0.hash(state);
-+            }
-+            Pat::Slice(v0) => {
-+                state.write_u8(9u8);
-+                v0.hash(state);
-+            }
-+            Pat::Struct(v0) => {
-+                state.write_u8(10u8);
-+                v0.hash(state);
-+            }
-+            Pat::Tuple(v0) => {
-+                state.write_u8(11u8);
-+                v0.hash(state);
-+            }
-+            Pat::TupleStruct(v0) => {
-+                state.write_u8(12u8);
-+                v0.hash(state);
-+            }
-+            Pat::Type(v0) => {
-+                state.write_u8(13u8);
-+                v0.hash(state);
-+            }
-+            Pat::Verbatim(v0) => {
-+                state.write_u8(14u8);
-+                TokenStreamHelper(v0).hash(state);
-+            }
-+            Pat::Wild(v0) => {
-+                state.write_u8(15u8);
-+                v0.hash(state);
-+            }
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatBox {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.pat.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatIdent {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.by_ref.hash(state);
-+        self.mutability.hash(state);
-+        self.ident.hash(state);
-+        self.subpat.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatLit {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.expr.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatMacro {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.mac.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatOr {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.leading_vert.hash(state);
-+        self.cases.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatPath {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.qself.hash(state);
-+        self.path.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatRange {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.lo.hash(state);
-+        self.limits.hash(state);
-+        self.hi.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatReference {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.mutability.hash(state);
-+        self.pat.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatRest {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatSlice {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.elems.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatStruct {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.path.hash(state);
-+        self.fields.hash(state);
-+        self.dot2_token.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatTuple {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.elems.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatTupleStruct {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.path.hash(state);
-+        self.pat.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatType {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.pat.hash(state);
-+        self.ty.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for PatWild {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Path {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.leading_colon.hash(state);
-+        self.segments.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for PathArguments {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            PathArguments::None => {
-+                state.write_u8(0u8);
-+            }
-+            PathArguments::AngleBracketed(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            PathArguments::Parenthesized(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for PathSegment {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.ident.hash(state);
-+        self.arguments.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for PredicateEq {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.lhs_ty.hash(state);
-+        self.rhs_ty.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for PredicateLifetime {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.lifetime.hash(state);
-+        self.bounds.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for PredicateType {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.lifetimes.hash(state);
-+        self.bounded_ty.hash(state);
-+        self.bounds.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for QSelf {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.ty.hash(state);
-+        self.position.hash(state);
-+        self.as_token.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for RangeLimits {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            RangeLimits::HalfOpen(_) => {
-+                state.write_u8(0u8);
-+            }
-+            RangeLimits::Closed(_) => {
-+                state.write_u8(1u8);
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for Receiver {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.reference.hash(state);
-+        self.mutability.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for ReturnType {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            ReturnType::Default => {
-+                state.write_u8(0u8);
-+            }
-+            ReturnType::Type(_, v1) => {
-+                state.write_u8(1u8);
-+                v1.hash(state);
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for Signature {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.constness.hash(state);
-+        self.asyncness.hash(state);
-+        self.unsafety.hash(state);
-+        self.abi.hash(state);
-+        self.ident.hash(state);
-+        self.generics.hash(state);
-+        self.inputs.hash(state);
-+        self.variadic.hash(state);
-+        self.output.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for Stmt {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            Stmt::Local(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            Stmt::Item(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            Stmt::Expr(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+            Stmt::Semi(v0, _) => {
-+                state.write_u8(3u8);
-+                v0.hash(state);
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TraitBound {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.paren_token.hash(state);
-+        self.modifier.hash(state);
-+        self.lifetimes.hash(state);
-+        self.path.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TraitBoundModifier {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            TraitBoundModifier::None => {
-+                state.write_u8(0u8);
-+            }
-+            TraitBoundModifier::Maybe(_) => {
-+                state.write_u8(1u8);
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for TraitItem {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            TraitItem::Const(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            TraitItem::Method(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            TraitItem::Type(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+            TraitItem::Macro(v0) => {
-+                state.write_u8(3u8);
-+                v0.hash(state);
-+            }
-+            TraitItem::Verbatim(v0) => {
-+                state.write_u8(4u8);
-+                TokenStreamHelper(v0).hash(state);
-+            }
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for TraitItemConst {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.ident.hash(state);
-+        self.ty.hash(state);
-+        self.default.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for TraitItemMacro {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.mac.hash(state);
-+        self.semi_token.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for TraitItemMethod {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.sig.hash(state);
-+        self.default.hash(state);
-+        self.semi_token.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for TraitItemType {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.ident.hash(state);
-+        self.generics.hash(state);
-+        self.colon_token.hash(state);
-+        self.bounds.hash(state);
-+        self.default.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Type {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            Type::Array(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            Type::BareFn(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            Type::Group(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+            Type::ImplTrait(v0) => {
-+                state.write_u8(3u8);
-+                v0.hash(state);
-+            }
-+            Type::Infer(v0) => {
-+                state.write_u8(4u8);
-+                v0.hash(state);
-+            }
-+            Type::Macro(v0) => {
-+                state.write_u8(5u8);
-+                v0.hash(state);
-+            }
-+            Type::Never(v0) => {
-+                state.write_u8(6u8);
-+                v0.hash(state);
-+            }
-+            Type::Paren(v0) => {
-+                state.write_u8(7u8);
-+                v0.hash(state);
-+            }
-+            Type::Path(v0) => {
-+                state.write_u8(8u8);
-+                v0.hash(state);
-+            }
-+            Type::Ptr(v0) => {
-+                state.write_u8(9u8);
-+                v0.hash(state);
-+            }
-+            Type::Reference(v0) => {
-+                state.write_u8(10u8);
-+                v0.hash(state);
-+            }
-+            Type::Slice(v0) => {
-+                state.write_u8(11u8);
-+                v0.hash(state);
-+            }
-+            Type::TraitObject(v0) => {
-+                state.write_u8(12u8);
-+                v0.hash(state);
-+            }
-+            Type::Tuple(v0) => {
-+                state.write_u8(13u8);
-+                v0.hash(state);
-+            }
-+            Type::Verbatim(v0) => {
-+                state.write_u8(14u8);
-+                TokenStreamHelper(v0).hash(state);
-+            }
-+            _ => unreachable!(),
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypeArray {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.elem.hash(state);
-+        self.len.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypeBareFn {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.lifetimes.hash(state);
-+        self.unsafety.hash(state);
-+        self.abi.hash(state);
-+        self.inputs.hash(state);
-+        self.variadic.hash(state);
-+        self.output.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypeGroup {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.elem.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypeImplTrait {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.bounds.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypeInfer {
-+    fn hash<H>(&self, _state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypeMacro {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.mac.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypeNever {
-+    fn hash<H>(&self, _state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypeParam {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.ident.hash(state);
-+        self.colon_token.hash(state);
-+        self.bounds.hash(state);
-+        self.eq_token.hash(state);
-+        self.default.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypeParamBound {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            TypeParamBound::Trait(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            TypeParamBound::Lifetime(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypeParen {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.elem.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypePath {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.qself.hash(state);
-+        self.path.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypePtr {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.const_token.hash(state);
-+        self.mutability.hash(state);
-+        self.elem.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypeReference {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.lifetime.hash(state);
-+        self.mutability.hash(state);
-+        self.elem.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypeSlice {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.elem.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypeTraitObject {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.dyn_token.hash(state);
-+        self.bounds.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for TypeTuple {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.elems.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for UnOp {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            UnOp::Deref(_) => {
-+                state.write_u8(0u8);
-+            }
-+            UnOp::Not(_) => {
-+                state.write_u8(1u8);
-+            }
-+            UnOp::Neg(_) => {
-+                state.write_u8(2u8);
-+            }
-+        }
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for UseGlob {
-+    fn hash<H>(&self, _state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for UseGroup {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.items.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for UseName {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.ident.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for UsePath {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.ident.hash(state);
-+        self.tree.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for UseRename {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.ident.hash(state);
-+        self.rename.hash(state);
-+    }
-+}
-+#[cfg(feature = "full")]
-+impl Hash for UseTree {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            UseTree::Path(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            UseTree::Name(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            UseTree::Rename(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+            UseTree::Glob(v0) => {
-+                state.write_u8(3u8);
-+                v0.hash(state);
-+            }
-+            UseTree::Group(v0) => {
-+                state.write_u8(4u8);
-+                v0.hash(state);
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Variadic {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Variant {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.attrs.hash(state);
-+        self.ident.hash(state);
-+        self.fields.hash(state);
-+        self.discriminant.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for VisCrate {
-+    fn hash<H>(&self, _state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for VisPublic {
-+    fn hash<H>(&self, _state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for VisRestricted {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.in_token.hash(state);
-+        self.path.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for Visibility {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            Visibility::Public(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            Visibility::Crate(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            Visibility::Restricted(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+            Visibility::Inherited => {
-+                state.write_u8(3u8);
-+            }
-+        }
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for WhereClause {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        self.predicates.hash(state);
-+    }
-+}
-+#[cfg(any(feature = "derive", feature = "full"))]
-+impl Hash for WherePredicate {
-+    fn hash<H>(&self, state: &mut H)
-+    where
-+        H: Hasher,
-+    {
-+        match self {
-+            WherePredicate::Type(v0) => {
-+                state.write_u8(0u8);
-+                v0.hash(state);
-+            }
-+            WherePredicate::Lifetime(v0) => {
-+                state.write_u8(1u8);
-+                v0.hash(state);
-+            }
-+            WherePredicate::Eq(v0) => {
-+                state.write_u8(2u8);
-+                v0.hash(state);
-+            }
-+        }
-+    }
-+}
-diff --git a/third_party/rust/syn/src/gen/visit.rs b/third_party/rust/syn/src/gen/visit.rs
---- a/third_party/rust/syn/src/gen/visit.rs
-+++ b/third_party/rust/syn/src/gen/visit.rs
-@@ -15,27 +15,26 @@ macro_rules! full {
-     };
- }
- #[cfg(all(feature = "derive", not(feature = "full")))]
- macro_rules! full {
-     ($e:expr) => {
-         unreachable!()
-     };
- }
--#[cfg(any(feature = "full", feature = "derive"))]
- macro_rules! skip {
-     ($($tt:tt)*) => {};
- }
- /// Syntax tree traversal to walk a shared borrow of a syntax tree.
- ///
- /// See the [module documentation] for details.
- ///
- /// [module documentation]: self
- ///
--/// *This trait is available if Syn is built with the `"visit"` feature.*
-+/// *This trait is available only if Syn is built with the `"visit"` feature.*
- pub trait Visit<'ast> {
-     #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_abi(&mut self, i: &'ast Abi) {
-         visit_abi(self, i)
-     }
-     #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_angle_bracketed_generic_arguments(&mut self, i: &'ast AngleBracketedGenericArguments) {
-         visit_angle_bracketed_generic_arguments(self, i)
-@@ -429,45 +428,37 @@ pub trait Visit<'ast> {
-     }
-     fn visit_lifetime(&mut self, i: &'ast Lifetime) {
-         visit_lifetime(self, i)
-     }
-     #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lifetime_def(&mut self, i: &'ast LifetimeDef) {
-         visit_lifetime_def(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit(&mut self, i: &'ast Lit) {
-         visit_lit(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_bool(&mut self, i: &'ast LitBool) {
-         visit_lit_bool(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_byte(&mut self, i: &'ast LitByte) {
-         visit_lit_byte(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_byte_str(&mut self, i: &'ast LitByteStr) {
-         visit_lit_byte_str(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_char(&mut self, i: &'ast LitChar) {
-         visit_lit_char(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_float(&mut self, i: &'ast LitFloat) {
-         visit_lit_float(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_int(&mut self, i: &'ast LitInt) {
-         visit_lit_int(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_str(&mut self, i: &'ast LitStr) {
-         visit_lit_str(self, i)
-     }
-     #[cfg(feature = "full")]
-     fn visit_local(&mut self, i: &'ast Local) {
-         visit_local(self, i)
-     }
-     #[cfg(any(feature = "derive", feature = "full"))]
-@@ -2532,17 +2523,16 @@ where
-     for el in Punctuated::pairs(&node.bounds) {
-         let (it, p) = el.into_tuple();
-         v.visit_lifetime(it);
-         if let Some(p) = p {
-             tokens_helper(v, &p.spans);
-         }
-     }
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit<'ast, V>(v: &mut V, node: &'ast Lit)
- where
-     V: Visit<'ast> + ?Sized,
- {
-     match node {
-         Lit::Str(_binding_0) => {
-             v.visit_lit_str(_binding_0);
-         }
-@@ -2564,55 +2554,48 @@ where
-         Lit::Bool(_binding_0) => {
-             v.visit_lit_bool(_binding_0);
-         }
-         Lit::Verbatim(_binding_0) => {
-             skip!(_binding_0);
-         }
-     }
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_bool<'ast, V>(v: &mut V, node: &'ast LitBool)
- where
-     V: Visit<'ast> + ?Sized,
- {
-     skip!(node.value);
-     v.visit_span(&node.span);
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_byte<'ast, V>(v: &mut V, node: &'ast LitByte)
- where
-     V: Visit<'ast> + ?Sized,
- {
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_byte_str<'ast, V>(v: &mut V, node: &'ast LitByteStr)
- where
-     V: Visit<'ast> + ?Sized,
- {
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_char<'ast, V>(v: &mut V, node: &'ast LitChar)
- where
-     V: Visit<'ast> + ?Sized,
- {
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_float<'ast, V>(v: &mut V, node: &'ast LitFloat)
- where
-     V: Visit<'ast> + ?Sized,
- {
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_int<'ast, V>(v: &mut V, node: &'ast LitInt)
- where
-     V: Visit<'ast> + ?Sized,
- {
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_str<'ast, V>(v: &mut V, node: &'ast LitStr)
- where
-     V: Visit<'ast> + ?Sized,
- {
- }
- #[cfg(feature = "full")]
- pub fn visit_local<'ast, V>(v: &mut V, node: &'ast Local)
- where
-diff --git a/third_party/rust/syn/src/gen/visit_mut.rs b/third_party/rust/syn/src/gen/visit_mut.rs
---- a/third_party/rust/syn/src/gen/visit_mut.rs
-+++ b/third_party/rust/syn/src/gen/visit_mut.rs
-@@ -15,28 +15,27 @@ macro_rules! full {
-     };
- }
- #[cfg(all(feature = "derive", not(feature = "full")))]
- macro_rules! full {
-     ($e:expr) => {
-         unreachable!()
-     };
- }
--#[cfg(any(feature = "full", feature = "derive"))]
- macro_rules! skip {
-     ($($tt:tt)*) => {};
- }
- /// Syntax tree traversal to mutate an exclusive borrow of a syntax tree in
- /// place.
- ///
- /// See the [module documentation] for details.
- ///
- /// [module documentation]: self
- ///
--/// *This trait is available if Syn is built with the `"visit-mut"` feature.*
-+/// *This trait is available only if Syn is built with the `"visit-mut"` feature.*
- pub trait VisitMut {
-     #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_abi_mut(&mut self, i: &mut Abi) {
-         visit_abi_mut(self, i)
-     }
-     #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_angle_bracketed_generic_arguments_mut(
-         &mut self,
-@@ -433,45 +432,37 @@ pub trait VisitMut {
-     }
-     fn visit_lifetime_mut(&mut self, i: &mut Lifetime) {
-         visit_lifetime_mut(self, i)
-     }
-     #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lifetime_def_mut(&mut self, i: &mut LifetimeDef) {
-         visit_lifetime_def_mut(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_mut(&mut self, i: &mut Lit) {
-         visit_lit_mut(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_bool_mut(&mut self, i: &mut LitBool) {
-         visit_lit_bool_mut(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_byte_mut(&mut self, i: &mut LitByte) {
-         visit_lit_byte_mut(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_byte_str_mut(&mut self, i: &mut LitByteStr) {
-         visit_lit_byte_str_mut(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_char_mut(&mut self, i: &mut LitChar) {
-         visit_lit_char_mut(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_float_mut(&mut self, i: &mut LitFloat) {
-         visit_lit_float_mut(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_int_mut(&mut self, i: &mut LitInt) {
-         visit_lit_int_mut(self, i)
-     }
--    #[cfg(any(feature = "derive", feature = "full"))]
-     fn visit_lit_str_mut(&mut self, i: &mut LitStr) {
-         visit_lit_str_mut(self, i)
-     }
-     #[cfg(feature = "full")]
-     fn visit_local_mut(&mut self, i: &mut Local) {
-         visit_local_mut(self, i)
-     }
-     #[cfg(any(feature = "derive", feature = "full"))]
-@@ -2538,17 +2529,16 @@ where
-     for el in Punctuated::pairs_mut(&mut node.bounds) {
-         let (it, p) = el.into_tuple();
-         v.visit_lifetime_mut(it);
-         if let Some(p) = p {
-             tokens_helper(v, &mut p.spans);
-         }
-     }
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_mut<V>(v: &mut V, node: &mut Lit)
- where
-     V: VisitMut + ?Sized,
- {
-     match node {
-         Lit::Str(_binding_0) => {
-             v.visit_lit_str_mut(_binding_0);
-         }
-@@ -2570,55 +2560,48 @@ where
-         Lit::Bool(_binding_0) => {
-             v.visit_lit_bool_mut(_binding_0);
-         }
-         Lit::Verbatim(_binding_0) => {
-             skip!(_binding_0);
-         }
-     }
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_bool_mut<V>(v: &mut V, node: &mut LitBool)
- where
-     V: VisitMut + ?Sized,
- {
-     skip!(node.value);
-     v.visit_span_mut(&mut node.span);
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_byte_mut<V>(v: &mut V, node: &mut LitByte)
- where
-     V: VisitMut + ?Sized,
- {
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_byte_str_mut<V>(v: &mut V, node: &mut LitByteStr)
- where
-     V: VisitMut + ?Sized,
- {
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_char_mut<V>(v: &mut V, node: &mut LitChar)
- where
-     V: VisitMut + ?Sized,
- {
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_float_mut<V>(v: &mut V, node: &mut LitFloat)
- where
-     V: VisitMut + ?Sized,
- {
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_int_mut<V>(v: &mut V, node: &mut LitInt)
- where
-     V: VisitMut + ?Sized,
- {
- }
--#[cfg(any(feature = "derive", feature = "full"))]
- pub fn visit_lit_str_mut<V>(v: &mut V, node: &mut LitStr)
- where
-     V: VisitMut + ?Sized,
- {
- }
- #[cfg(feature = "full")]
- pub fn visit_local_mut<V>(v: &mut V, node: &mut Local)
- where
-diff --git a/third_party/rust/syn/src/generics.rs b/third_party/rust/syn/src/generics.rs
---- a/third_party/rust/syn/src/generics.rs
-+++ b/third_party/rust/syn/src/generics.rs
-@@ -1,97 +1,108 @@
- use super::*;
- use crate::punctuated::{Iter, IterMut, Punctuated};
-+#[cfg(all(feature = "printing", feature = "extra-traits"))]
-+use std::fmt::{self, Debug};
-+#[cfg(all(feature = "printing", feature = "extra-traits"))]
-+use std::hash::{Hash, Hasher};
- 
- 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"`
-+    /// *This type is available only 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"`
-+    /// *This type is available only 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
--    //
--    // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
--    // blocked on https://github.com/rust-lang/rust/issues/62833
-     pub enum GenericParam {
-         /// A generic type parameter: `T: Into<String>`.
-         Type(TypeParam),
- 
-         /// A lifetime definition: `'a: 'b + 'c + 'd`.
-         Lifetime(LifetimeDef),
- 
-         /// A const generic parameter: `const LENGTH: usize`.
-         Const(ConstParam),
-     }
- }
- 
- ast_struct! {
-     /// A generic type parameter: `T: Into<String>`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct 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>,
-     }
- }
- 
- ast_struct! {
-     /// A lifetime definition: `'a: 'b + 'c + 'd`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct LifetimeDef {
-         pub attrs: Vec<Attribute>,
-         pub lifetime: Lifetime,
-         pub colon_token: Option<Token![:]>,
-         pub bounds: Punctuated<Lifetime, Token![+]>,
-     }
- }
- 
- ast_struct! {
-     /// A const generic parameter: `const LENGTH: usize`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct 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 Default for Generics {
-+    fn default() -> Self {
-+        Generics {
-+            lt_token: None,
-+            params: Punctuated::new(),
-+            gt_token: None,
-+            where_clause: None,
-+        }
-+    }
-+}
-+
- 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`.
-@@ -275,100 +286,148 @@ impl<'a> Iterator for ConstParamsMut<'a>
-         } else {
-             self.next()
-         }
-     }
- }
- 
- /// Returned by `Generics::split_for_impl`.
- ///
--/// *This type is available if Syn is built with the `"derive"` or `"full"`
-+/// *This type is available only 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"`
-+/// *This type is available only 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"`
-+/// *This type is available only 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.
-     ///
-     /// ```
-     /// # use proc_macro2::{Span, Ident};
-     /// # use quote::quote;
-     /// #
--    /// # fn main() {
--    /// #     let generics: syn::Generics = Default::default();
--    /// #     let name = Ident::new("MyType", Span::call_site());
-+    /// # 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
-+    /// *This method is available only 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")]
-+macro_rules! generics_wrapper_impls {
-+    ($ty:ident) => {
-+        #[cfg(feature = "clone-impls")]
-+        impl<'a> Clone for $ty<'a> {
-+            fn clone(&self) -> Self {
-+                $ty(self.0)
-+            }
-+        }
-+
-+        #[cfg(feature = "extra-traits")]
-+        impl<'a> Debug for $ty<'a> {
-+            fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+                formatter
-+                    .debug_tuple(stringify!($ty))
-+                    .field(self.0)
-+                    .finish()
-+            }
-+        }
-+
-+        #[cfg(feature = "extra-traits")]
-+        impl<'a> Eq for $ty<'a> {}
-+
-+        #[cfg(feature = "extra-traits")]
-+        impl<'a> PartialEq for $ty<'a> {
-+            fn eq(&self, other: &Self) -> bool {
-+                self.0 == other.0
-+            }
-+        }
-+
-+        #[cfg(feature = "extra-traits")]
-+        impl<'a> Hash for $ty<'a> {
-+            fn hash<H: Hasher>(&self, state: &mut H) {
-+                self.0.hash(state);
-+            }
-+        }
-+    };
-+}
-+
-+#[cfg(feature = "printing")]
-+generics_wrapper_impls!(ImplGenerics);
-+#[cfg(feature = "printing")]
-+generics_wrapper_impls!(TypeGenerics);
-+#[cfg(feature = "printing")]
-+generics_wrapper_impls!(Turbofish);
-+
-+#[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
-+    /// *This method is available only 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"`
-+    /// *This type is available only 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 Default for BoundLifetimes {
-+    fn default() -> Self {
-+        BoundLifetimes {
-+            for_token: Default::default(),
-+            lt_token: Default::default(),
-+            lifetimes: Punctuated::new(),
-+            gt_token: Default::default(),
-+        }
-+    }
-+}
-+
- impl LifetimeDef {
-     pub fn new(lifetime: Lifetime) -> Self {
-         LifetimeDef {
-             attrs: Vec::new(),
-             lifetime,
-             colon_token: None,
-             bounds: Punctuated::new(),
-         }
-@@ -386,122 +445,118 @@ impl From<Ident> for TypeParam {
-             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"`
-+    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
-     /// feature.*
-     pub enum TypeParamBound {
-         Trait(TraitBound),
-         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"`
-+    /// *This type is available only 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"`
-+    /// *This type is available only 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"`
-+    /// *This type is available only 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"`
-+    /// *This type is available only 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
--    //
--    // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
--    // blocked on https://github.com/rust-lang/rust/issues/62833
-     pub enum WherePredicate {
-         /// A type predicate in a `where` clause: `for<'c> Foo<'c>: Trait<'c>`.
-         Type(PredicateType),
- 
-         /// A lifetime predicate in a `where` clause: `'a: 'b + 'c`.
-         Lifetime(PredicateLifetime),
- 
-         /// An equality predicate in a `where` clause (unsupported).
-         Eq(PredicateEq),
-     }
- }
- 
- ast_struct! {
-     /// 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
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct 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![+]>,
-     }
- }
- 
- ast_struct! {
-     /// A lifetime predicate in a `where` clause: `'a: 'b + 'c`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct PredicateLifetime {
-         pub lifetime: Lifetime,
-         pub colon_token: Token![:],
-         pub bounds: Punctuated<Lifetime, Token![+]>,
-     }
- }
- 
- ast_struct! {
-     /// An equality predicate in a `where` clause (unsupported).
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct PredicateEq {
-         pub lhs_ty: Type,
-         pub eq_token: Token![=],
-         pub rhs_ty: Type,
-     }
- }
- 
-@@ -516,38 +571,36 @@ pub mod parsing {
-             if !input.peek(Token![<]) {
-                 return Ok(Generics::default());
-             }
- 
-             let lt_token: Token![<] = input.parse()?;
- 
-             let mut params = Punctuated::new();
-             let mut allow_lifetime_param = true;
--            let mut allow_type_param = true;
-             loop {
-                 if input.peek(Token![>]) {
-                     break;
-                 }
- 
-                 let attrs = input.call(Attribute::parse_outer)?;
-                 let lookahead = input.lookahead1();
-                 if allow_lifetime_param && lookahead.peek(Lifetime) {
-                     params.push_value(GenericParam::Lifetime(LifetimeDef {
-                         attrs,
-                         ..input.parse()?
-                     }));
--                } else if allow_type_param && lookahead.peek(Ident) {
-+                } else if lookahead.peek(Ident) {
-                     allow_lifetime_param = false;
-                     params.push_value(GenericParam::Type(TypeParam {
-                         attrs,
-                         ..input.parse()?
-                     }));
-                 } else if lookahead.peek(Token![const]) {
-                     allow_lifetime_param = false;
--                    allow_type_param = false;
-                     params.push_value(GenericParam::Const(ConstParam {
-                         attrs,
-                         ..input.parse()?
-                     }));
-                 } else {
-                     return Err(lookahead.error());
-                 }
- 
-@@ -660,67 +713,63 @@ pub mod parsing {
-             } else {
-                 Ok(None)
-             }
-         }
-     }
- 
-     impl Parse for TypeParam {
-         fn parse(input: ParseStream) -> Result<Self> {
--            let has_colon;
--            let has_default;
--            Ok(TypeParam {
--                attrs: input.call(Attribute::parse_outer)?,
--                ident: input.parse()?,
--                colon_token: {
--                    if input.peek(Token![:]) {
--                        has_colon = true;
--                        Some(input.parse()?)
--                    } else {
--                        has_colon = false;
--                        None
-+            let attrs = input.call(Attribute::parse_outer)?;
-+            let ident: Ident = input.parse()?;
-+            let colon_token: Option<Token![:]> = input.parse()?;
-+
-+            let begin_bound = input.fork();
-+            let mut is_maybe_const = false;
-+            let mut bounds = Punctuated::new();
-+            if colon_token.is_some() {
-+                loop {
-+                    if input.peek(Token![,]) || input.peek(Token![>]) || input.peek(Token![=]) {
-+                        break;
-+                    }
-+                    if input.peek(Token![?]) && input.peek2(Token![const]) {
-+                        input.parse::<Token![?]>()?;
-+                        input.parse::<Token![const]>()?;
-+                        is_maybe_const = true;
-+                    }
-+                    let value: TypeParamBound = input.parse()?;
-+                    bounds.push_value(value);
-+                    if !input.peek(Token![+]) {
-+                        break;
-                     }
--                },
--                bounds: {
--                    let mut bounds = Punctuated::new();
--                    if has_colon {
--                        loop {
--                            if input.peek(Token![,])
--                                || input.peek(Token![>])
--                                || input.peek(Token![=])
--                            {
--                                break;
--                            }
--                            let value = input.parse()?;
--                            bounds.push_value(value);
--                            if !input.peek(Token![+]) {
--                                break;
--                            }
--                            let punct = input.parse()?;
--                            bounds.push_punct(punct);
--                        }
--                    }
--                    bounds
--                },
--                eq_token: {
--                    if input.peek(Token![=]) {
--                        has_default = true;
--                        Some(input.parse()?)
--                    } else {
--                        has_default = false;
--                        None
--                    }
--                },
--                default: {
--                    if has_default {
--                        Some(input.parse()?)
--                    } else {
--                        None
--                    }
--                },
-+                    let punct: Token![+] = input.parse()?;
-+                    bounds.push_punct(punct);
-+                }
-+            }
-+
-+            let mut eq_token: Option<Token![=]> = input.parse()?;
-+            let mut default = if eq_token.is_some() {
-+                Some(input.parse::<Type>()?)
-+            } else {
-+                None
-+            };
-+
-+            if is_maybe_const {
-+                bounds.clear();
-+                eq_token = None;
-+                default = Some(Type::Verbatim(verbatim::between(begin_bound, input)));
-+            }
-+
-+            Ok(TypeParam {
-+                attrs,
-+                ident,
-+                colon_token,
-+                bounds,
-+                eq_token,
-+                default,
-             })
-         }
-     }
- 
-     impl Parse for TypeParamBound {
-         fn parse(input: ParseStream) -> Result<Self> {
-             if input.peek(Lifetime) {
-                 return input.parse().map(TypeParamBound::Lifetime);
-@@ -893,16 +942,18 @@ pub mod parsing {
-     }
- }
- 
- #[cfg(feature = "printing")]
- mod printing {
-     use super::*;
- 
-     use proc_macro2::TokenStream;
-+    #[cfg(feature = "full")]
-+    use proc_macro2::TokenTree;
-     use quote::{ToTokens, TokenStreamExt};
- 
-     use crate::attr::FilterAttrs;
-     use crate::print::TokensOrDefault;
- 
-     impl ToTokens for Generics {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-             if self.params.is_empty() {
-@@ -1075,19 +1126,35 @@ mod printing {
-     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() {
-+            if let Some(default) = &self.default {
-+                #[cfg(feature = "full")]
-+                {
-+                    if self.eq_token.is_none() {
-+                        if let Type::Verbatim(default) = default {
-+                            let mut iter = default.clone().into_iter();
-+                            match (iter.next(), iter.next()) {
-+                                (Some(TokenTree::Punct(ref q)), Some(TokenTree::Ident(ref c)))
-+                                    if q.as_char() == '?' && c == "const" =>
-+                                {
-+                                    return default.to_tokens(tokens);
-+                                }
-+                                _ => {}
-+                            }
-+                        }
-+                    }
-+                }
-                 TokensOrDefault(&self.eq_token).to_tokens(tokens);
--                self.default.to_tokens(tokens);
-+                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);
-@@ -1112,19 +1179,19 @@ mod printing {
- 
-     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() {
-+            if let Some(default) = &self.default {
-                 TokensOrDefault(&self.eq_token).to_tokens(tokens);
--                self.default.to_tokens(tokens);
-+                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);
-diff --git a/third_party/rust/syn/src/item.rs b/third_party/rust/syn/src/item.rs
---- a/third_party/rust/syn/src/item.rs
-+++ b/third_party/rust/syn/src/item.rs
-@@ -1,32 +1,30 @@
- use super::*;
--use crate::derive::{Data, DeriveInput};
-+use crate::derive::{Data, DataEnum, DataStruct, DataUnion, DeriveInput};
- use crate::punctuated::Punctuated;
- use proc_macro2::TokenStream;
- 
--#[cfg(feature = "extra-traits")]
--use crate::tt::TokenStreamHelper;
--#[cfg(feature = "extra-traits")]
--use std::hash::{Hash, Hasher};
-+#[cfg(feature = "parsing")]
-+use std::mem;
- 
- 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.*
-+    /// *This type is available only 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
-     //
-     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
-     // blocked on https://github.com/rust-lang/rust/issues/62833
--    pub enum Item #manual_extra_traits {
-+    pub enum Item {
-         /// A constant item: `const MAX: u16 = 65535`.
-         Const(ItemConst),
- 
-         /// An enum definition: `enum Foo<A, B> { A(A), B(B) }`.
-         Enum(ItemEnum),
- 
-         /// An `extern crate` item: `extern crate serde`.
-         ExternCrate(ItemExternCrate),
-@@ -78,90 +76,90 @@ ast_enum_of_structs! {
-         #[doc(hidden)]
-         __Nonexhaustive,
-     }
- }
- 
- ast_struct! {
-     /// A constant item: `const MAX: u16 = 65535`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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![;],
-     }
- }
- 
- ast_struct! {
-     /// An enum definition: `enum Foo<A, B> { A(A), B(B) }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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![,]>,
-     }
- }
- 
- ast_struct! {
-     /// An `extern crate` item: `extern crate serde`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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![;],
-     }
- }
- 
- ast_struct! {
-     /// A free-standing function: `fn process(n: usize) -> Result<()> { ...
-     /// }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ItemFn {
-         pub attrs: Vec<Attribute>,
-         pub vis: Visibility,
-         pub sig: Signature,
-         pub block: Box<Block>,
-     }
- }
- 
- ast_struct! {
-     /// A block of foreign items: `extern "C" { ... }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ItemForeignMod {
-         pub attrs: Vec<Attribute>,
-         pub abi: Abi,
-         pub brace_token: token::Brace,
-         pub items: Vec<ForeignItem>,
-     }
- }
- 
- ast_struct! {
-     /// 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.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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])>,
-@@ -170,57 +168,57 @@ ast_struct! {
-         pub brace_token: token::Brace,
-         pub items: Vec<ImplItem>,
-     }
- }
- 
- ast_struct! {
-     /// A macro invocation, which includes `macro_rules!` definitions.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ItemMacro {
-         pub attrs: Vec<Attribute>,
-         /// The `example` in `macro_rules! example { ... }`.
-         pub ident: Option<Ident>,
-         pub mac: Macro,
-         pub semi_token: Option<Token![;]>,
-     }
- }
- 
- ast_struct! {
-     /// A 2.0-style declarative macro introduced by the `macro` keyword.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
--    pub struct ItemMacro2 #manual_extra_traits {
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-+    pub struct ItemMacro2 {
-         pub attrs: Vec<Attribute>,
-         pub vis: Visibility,
-         pub macro_token: Token![macro],
-         pub ident: Ident,
-         pub rules: TokenStream,
-     }
- }
- 
- ast_struct! {
-     /// A module or module declaration: `mod m` or `mod m { ... }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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![;]>,
-     }
- }
- 
- ast_struct! {
-     /// A static item: `static BIKE: Shed = Shed(42)`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     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>,
-@@ -228,32 +226,32 @@ ast_struct! {
-         pub expr: Box<Expr>,
-         pub semi_token: Token![;],
-     }
- }
- 
- ast_struct! {
-     /// A struct definition: `struct Foo<A> { x: A }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only 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![;]>,
-     }
- }
- 
- ast_struct! {
-     /// A trait definition: `pub trait Iterator { ... }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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,
-@@ -262,212 +260,99 @@ ast_struct! {
-         pub brace_token: token::Brace,
-         pub items: Vec<TraitItem>,
-     }
- }
- 
- ast_struct! {
-     /// A trait alias: `pub trait SharableIterator = Iterator + Sync`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ItemTraitAlias {
-         pub attrs: Vec<Attribute>,
-         pub vis: Visibility,
-         pub trait_token: Token![trait],
-         pub ident: Ident,
-         pub generics: Generics,
-         pub eq_token: Token![=],
-         pub bounds: Punctuated<TypeParamBound, Token![+]>,
-         pub semi_token: Token![;],
-     }
- }
- 
- ast_struct! {
-     /// A type alias: `type Result<T> = std::result::Result<T, MyError>`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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![;],
-     }
- }
- 
- ast_struct! {
-     /// A union definition: `union Foo<A, B> { x: A, y: B }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ItemUnion {
-         pub attrs: Vec<Attribute>,
-         pub vis: Visibility,
-         pub union_token: Token![union],
-         pub ident: Ident,
-         pub generics: Generics,
-         pub fields: FieldsNamed,
-     }
- }
- 
- ast_struct! {
-     /// A use declaration: `use std::collections::HashMap`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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![;],
-     }
- }
- 
--#[cfg(feature = "extra-traits")]
--impl Eq for Item {}
--
--#[cfg(feature = "extra-traits")]
--impl PartialEq for Item {
--    fn eq(&self, other: &Self) -> bool {
--        match (self, other) {
--            (Item::Const(this), Item::Const(other)) => this == other,
--            (Item::Enum(this), Item::Enum(other)) => this == other,
--            (Item::ExternCrate(this), Item::ExternCrate(other)) => this == other,
--            (Item::Fn(this), Item::Fn(other)) => this == other,
--            (Item::ForeignMod(this), Item::ForeignMod(other)) => this == other,
--            (Item::Impl(this), Item::Impl(other)) => this == other,
--            (Item::Macro(this), Item::Macro(other)) => this == other,
--            (Item::Macro2(this), Item::Macro2(other)) => this == other,
--            (Item::Mod(this), Item::Mod(other)) => this == other,
--            (Item::Static(this), Item::Static(other)) => this == other,
--            (Item::Struct(this), Item::Struct(other)) => this == other,
--            (Item::Trait(this), Item::Trait(other)) => this == other,
--            (Item::TraitAlias(this), Item::TraitAlias(other)) => this == other,
--            (Item::Type(this), Item::Type(other)) => this == other,
--            (Item::Union(this), Item::Union(other)) => this == other,
--            (Item::Use(this), Item::Use(other)) => this == other,
--            (Item::Verbatim(this), Item::Verbatim(other)) => {
--                TokenStreamHelper(this) == TokenStreamHelper(other)
--            }
--            _ => false,
--        }
--    }
--}
--
--#[cfg(feature = "extra-traits")]
--impl Hash for Item {
--    fn hash<H>(&self, state: &mut H)
--    where
--        H: Hasher,
--    {
-+impl Item {
-+    #[cfg(feature = "parsing")]
-+    pub(crate) fn replace_attrs(&mut self, new: Vec<Attribute>) -> Vec<Attribute> {
-         match self {
--            Item::Const(item) => {
--                state.write_u8(0);
--                item.hash(state);
--            }
--            Item::Enum(item) => {
--                state.write_u8(1);
--                item.hash(state);
--            }
--            Item::ExternCrate(item) => {
--                state.write_u8(2);
--                item.hash(state);
--            }
--            Item::Fn(item) => {
--                state.write_u8(3);
--                item.hash(state);
--            }
--            Item::ForeignMod(item) => {
--                state.write_u8(4);
--                item.hash(state);
--            }
--            Item::Impl(item) => {
--                state.write_u8(5);
--                item.hash(state);
--            }
--            Item::Macro(item) => {
--                state.write_u8(6);
--                item.hash(state);
--            }
--            Item::Macro2(item) => {
--                state.write_u8(7);
--                item.hash(state);
--            }
--            Item::Mod(item) => {
--                state.write_u8(8);
--                item.hash(state);
--            }
--            Item::Static(item) => {
--                state.write_u8(9);
--                item.hash(state);
--            }
--            Item::Struct(item) => {
--                state.write_u8(10);
--                item.hash(state);
--            }
--            Item::Trait(item) => {
--                state.write_u8(11);
--                item.hash(state);
--            }
--            Item::TraitAlias(item) => {
--                state.write_u8(12);
--                item.hash(state);
--            }
--            Item::Type(item) => {
--                state.write_u8(13);
--                item.hash(state);
--            }
--            Item::Union(item) => {
--                state.write_u8(14);
--                item.hash(state);
--            }
--            Item::Use(item) => {
--                state.write_u8(15);
--                item.hash(state);
--            }
--            Item::Verbatim(item) => {
--                state.write_u8(16);
--                TokenStreamHelper(item).hash(state);
--            }
-+            Item::ExternCrate(ItemExternCrate { attrs, .. })
-+            | Item::Use(ItemUse { attrs, .. })
-+            | Item::Static(ItemStatic { attrs, .. })
-+            | Item::Const(ItemConst { attrs, .. })
-+            | Item::Fn(ItemFn { attrs, .. })
-+            | Item::Mod(ItemMod { attrs, .. })
-+            | Item::ForeignMod(ItemForeignMod { attrs, .. })
-+            | Item::Type(ItemType { attrs, .. })
-+            | Item::Struct(ItemStruct { attrs, .. })
-+            | Item::Enum(ItemEnum { attrs, .. })
-+            | Item::Union(ItemUnion { attrs, .. })
-+            | Item::Trait(ItemTrait { attrs, .. })
-+            | Item::TraitAlias(ItemTraitAlias { attrs, .. })
-+            | Item::Impl(ItemImpl { attrs, .. })
-+            | Item::Macro(ItemMacro { attrs, .. })
-+            | Item::Macro2(ItemMacro2 { attrs, .. }) => mem::replace(attrs, new),
-+            Item::Verbatim(_) => Vec::new(),
-             Item::__Nonexhaustive => unreachable!(),
-         }
-     }
- }
- 
--#[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
--            && TokenStreamHelper(&self.rules) == TokenStreamHelper(&other.rules)
--    }
--}
--
--#[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);
--        TokenStreamHelper(&self.rules).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,
-@@ -491,20 +376,67 @@ impl From<DeriveInput> for Item {
-                 ident: input.ident,
-                 generics: input.generics,
-                 fields: data.fields,
-             }),
-         }
-     }
- }
- 
-+impl From<ItemStruct> for DeriveInput {
-+    fn from(input: ItemStruct) -> DeriveInput {
-+        DeriveInput {
-+            attrs: input.attrs,
-+            vis: input.vis,
-+            ident: input.ident,
-+            generics: input.generics,
-+            data: Data::Struct(DataStruct {
-+                struct_token: input.struct_token,
-+                fields: input.fields,
-+                semi_token: input.semi_token,
-+            }),
-+        }
-+    }
-+}
-+
-+impl From<ItemEnum> for DeriveInput {
-+    fn from(input: ItemEnum) -> DeriveInput {
-+        DeriveInput {
-+            attrs: input.attrs,
-+            vis: input.vis,
-+            ident: input.ident,
-+            generics: input.generics,
-+            data: Data::Enum(DataEnum {
-+                enum_token: input.enum_token,
-+                brace_token: input.brace_token,
-+                variants: input.variants,
-+            }),
-+        }
-+    }
-+}
-+
-+impl From<ItemUnion> for DeriveInput {
-+    fn from(input: ItemUnion) -> DeriveInput {
-+        DeriveInput {
-+            attrs: input.attrs,
-+            vis: input.vis,
-+            ident: input.ident,
-+            generics: input.generics,
-+            data: Data::Union(DataUnion {
-+                union_token: input.union_token,
-+                fields: input.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.*
-+    /// *This type is available only 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
-     //
-     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
-@@ -525,77 +457,77 @@ ast_enum_of_structs! {
-         /// A braced group of imports in a `use` item: `{A, B, C}`.
-         Group(UseGroup),
-     }
- }
- 
- ast_struct! {
-     /// A path prefix of imports in a `use` item: `std::...`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct UsePath {
-         pub ident: Ident,
-         pub colon2_token: Token![::],
-         pub tree: Box<UseTree>,
-     }
- }
- 
- ast_struct! {
-     /// An identifier imported by a `use` item: `HashMap`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct UseName {
-         pub ident: Ident,
-     }
- }
- 
- ast_struct! {
-     /// An renamed identifier imported by a `use` item: `HashMap as Map`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct UseRename {
-         pub ident: Ident,
-         pub as_token: Token![as],
-         pub rename: Ident,
-     }
- }
- 
- ast_struct! {
-     /// A glob import in a `use` item: `*`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct UseGlob {
-         pub star_token: Token![*],
-     }
- }
- 
- ast_struct! {
-     /// A braced group of imports in a `use` item: `{A, B, C}`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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.*
-+    /// *This type is available only 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
-     //
-     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
-     // blocked on https://github.com/rust-lang/rust/issues/62833
--    pub enum ForeignItem #manual_extra_traits {
-+    pub enum ForeignItem {
-         /// A foreign function in an `extern` block.
-         Fn(ForeignItemFn),
- 
-         /// A foreign static item in an `extern` block: `static ext: u8`.
-         Static(ForeignItemStatic),
- 
-         /// A foreign type in an `extern` block: `type void`.
-         Type(ForeignItemType),
-@@ -609,130 +541,79 @@ ast_enum_of_structs! {
-         #[doc(hidden)]
-         __Nonexhaustive,
-     }
- }
- 
- ast_struct! {
-     /// A foreign function in an `extern` block.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ForeignItemFn {
-         pub attrs: Vec<Attribute>,
-         pub vis: Visibility,
-         pub sig: Signature,
-         pub semi_token: Token![;],
-     }
- }
- 
- ast_struct! {
-     /// A foreign static item in an `extern` block: `static ext: u8`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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![;],
-     }
- }
- 
- ast_struct! {
-     /// A foreign type in an `extern` block: `type void`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ForeignItemType {
-         pub attrs: Vec<Attribute>,
-         pub vis: Visibility,
-         pub type_token: Token![type],
-         pub ident: Ident,
-         pub semi_token: Token![;],
-     }
- }
- 
- ast_struct! {
-     /// A macro invocation within an extern block.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ForeignItemMacro {
-         pub attrs: Vec<Attribute>,
-         pub mac: Macro,
-         pub semi_token: Option<Token![;]>,
-     }
- }
- 
--#[cfg(feature = "extra-traits")]
--impl Eq for ForeignItem {}
--
--#[cfg(feature = "extra-traits")]
--impl PartialEq for ForeignItem {
--    fn eq(&self, other: &Self) -> bool {
--        match (self, other) {
--            (ForeignItem::Fn(this), ForeignItem::Fn(other)) => this == other,
--            (ForeignItem::Static(this), ForeignItem::Static(other)) => this == other,
--            (ForeignItem::Type(this), ForeignItem::Type(other)) => this == other,
--            (ForeignItem::Macro(this), ForeignItem::Macro(other)) => this == other,
--            (ForeignItem::Verbatim(this), ForeignItem::Verbatim(other)) => {
--                TokenStreamHelper(this) == TokenStreamHelper(other)
--            }
--            _ => false,
--        }
--    }
--}
--
--#[cfg(feature = "extra-traits")]
--impl Hash for ForeignItem {
--    fn hash<H>(&self, state: &mut H)
--    where
--        H: Hasher,
--    {
--        match self {
--            ForeignItem::Fn(item) => {
--                state.write_u8(0);
--                item.hash(state);
--            }
--            ForeignItem::Static(item) => {
--                state.write_u8(1);
--                item.hash(state);
--            }
--            ForeignItem::Type(item) => {
--                state.write_u8(2);
--                item.hash(state);
--            }
--            ForeignItem::Macro(item) => {
--                state.write_u8(3);
--                item.hash(state);
--            }
--            ForeignItem::Verbatim(item) => {
--                state.write_u8(4);
--                TokenStreamHelper(item).hash(state);
--            }
--            ForeignItem::__Nonexhaustive => unreachable!(),
--        }
--    }
--}
--
- 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.*
-+    /// *This type is available only 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
-     //
-     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
-     // blocked on https://github.com/rust-lang/rust/issues/62833
--    pub enum TraitItem #manual_extra_traits {
-+    pub enum TraitItem {
-         /// An associated constant within the definition of a trait.
-         Const(TraitItemConst),
- 
-         /// A trait method within the definition of a trait.
-         Method(TraitItemMethod),
- 
-         /// An associated type within the definition of a trait.
-         Type(TraitItemType),
-@@ -746,132 +627,81 @@ ast_enum_of_structs! {
-         #[doc(hidden)]
-         __Nonexhaustive,
-     }
- }
- 
- ast_struct! {
-     /// An associated constant within the definition of a trait.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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![;],
-     }
- }
- 
- ast_struct! {
-     /// A trait method within the definition of a trait.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct TraitItemMethod {
-         pub attrs: Vec<Attribute>,
-         pub sig: Signature,
-         pub default: Option<Block>,
-         pub semi_token: Option<Token![;]>,
-     }
- }
- 
- ast_struct! {
-     /// An associated type within the definition of a trait.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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![;],
-     }
- }
- 
- ast_struct! {
-     /// A macro invocation within the definition of a trait.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct TraitItemMacro {
-         pub attrs: Vec<Attribute>,
-         pub mac: Macro,
-         pub semi_token: Option<Token![;]>,
-     }
- }
- 
--#[cfg(feature = "extra-traits")]
--impl Eq for TraitItem {}
--
--#[cfg(feature = "extra-traits")]
--impl PartialEq for TraitItem {
--    fn eq(&self, other: &Self) -> bool {
--        match (self, other) {
--            (TraitItem::Const(this), TraitItem::Const(other)) => this == other,
--            (TraitItem::Method(this), TraitItem::Method(other)) => this == other,
--            (TraitItem::Type(this), TraitItem::Type(other)) => this == other,
--            (TraitItem::Macro(this), TraitItem::Macro(other)) => this == other,
--            (TraitItem::Verbatim(this), TraitItem::Verbatim(other)) => {
--                TokenStreamHelper(this) == TokenStreamHelper(other)
--            }
--            _ => false,
--        }
--    }
--}
--
--#[cfg(feature = "extra-traits")]
--impl Hash for TraitItem {
--    fn hash<H>(&self, state: &mut H)
--    where
--        H: Hasher,
--    {
--        match self {
--            TraitItem::Const(item) => {
--                state.write_u8(0);
--                item.hash(state);
--            }
--            TraitItem::Method(item) => {
--                state.write_u8(1);
--                item.hash(state);
--            }
--            TraitItem::Type(item) => {
--                state.write_u8(2);
--                item.hash(state);
--            }
--            TraitItem::Macro(item) => {
--                state.write_u8(3);
--                item.hash(state);
--            }
--            TraitItem::Verbatim(item) => {
--                state.write_u8(4);
--                TokenStreamHelper(item).hash(state);
--            }
--            TraitItem::__Nonexhaustive => unreachable!(),
--        }
--    }
--}
--
- ast_enum_of_structs! {
-     /// An item within an impl block.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only 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
-     //
-     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
-     // blocked on https://github.com/rust-lang/rust/issues/62833
--    pub enum ImplItem #manual_extra_traits {
-+    pub enum ImplItem {
-         /// An associated constant within an impl block.
-         Const(ImplItemConst),
- 
-         /// A method within an impl block.
-         Method(ImplItemMethod),
- 
-         /// An associated type within an impl block.
-         Type(ImplItemType),
-@@ -885,17 +715,17 @@ ast_enum_of_structs! {
-         #[doc(hidden)]
-         __Nonexhaustive,
-     }
- }
- 
- ast_struct! {
-     /// An associated constant within an impl block.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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,
-@@ -903,144 +733,117 @@ ast_struct! {
-         pub expr: Expr,
-         pub semi_token: Token![;],
-     }
- }
- 
- ast_struct! {
-     /// A method within an impl block.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ImplItemMethod {
-         pub attrs: Vec<Attribute>,
-         pub vis: Visibility,
-         pub defaultness: Option<Token![default]>,
-         pub sig: Signature,
-         pub block: Block,
-     }
- }
- 
- ast_struct! {
-     /// An associated type within an impl block.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct 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![;],
-     }
- }
- 
- ast_struct! {
-     /// A macro invocation within an impl block.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct ImplItemMacro {
-         pub attrs: Vec<Attribute>,
-         pub mac: Macro,
-         pub semi_token: Option<Token![;]>,
-     }
- }
- 
--#[cfg(feature = "extra-traits")]
--impl Eq for ImplItem {}
--
--#[cfg(feature = "extra-traits")]
--impl PartialEq for ImplItem {
--    fn eq(&self, other: &Self) -> bool {
--        match (self, other) {
--            (ImplItem::Const(this), ImplItem::Const(other)) => this == other,
--            (ImplItem::Method(this), ImplItem::Method(other)) => this == other,
--            (ImplItem::Type(this), ImplItem::Type(other)) => this == other,
--            (ImplItem::Macro(this), ImplItem::Macro(other)) => this == other,
--            (ImplItem::Verbatim(this), ImplItem::Verbatim(other)) => {
--                TokenStreamHelper(this) == TokenStreamHelper(other)
--            }
--            _ => false,
--        }
--    }
--}
--
--#[cfg(feature = "extra-traits")]
--impl Hash for ImplItem {
--    fn hash<H>(&self, state: &mut H)
--    where
--        H: Hasher,
--    {
--        match self {
--            ImplItem::Const(item) => {
--                state.write_u8(0);
--                item.hash(state);
--            }
--            ImplItem::Method(item) => {
--                state.write_u8(1);
--                item.hash(state);
--            }
--            ImplItem::Type(item) => {
--                state.write_u8(2);
--                item.hash(state);
--            }
--            ImplItem::Macro(item) => {
--                state.write_u8(3);
--                item.hash(state);
--            }
--            ImplItem::Verbatim(item) => {
--                state.write_u8(4);
--                TokenStreamHelper(item).hash(state);
--            }
--            ImplItem::__Nonexhaustive => unreachable!(),
--        }
--    }
--}
--
- ast_struct! {
-     /// A function signature in a trait or implementation: `unsafe fn
-     /// initialize(&self)`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct Signature {
-         pub constness: Option<Token![const]>,
-         pub asyncness: Option<Token![async]>,
-         pub unsafety: Option<Token![unsafe]>,
-         pub abi: Option<Abi>,
-         pub fn_token: Token![fn],
-         pub ident: Ident,
-         pub generics: Generics,
-         pub paren_token: token::Paren,
-         pub inputs: Punctuated<FnArg, Token![,]>,
-         pub variadic: Option<Variadic>,
-         pub output: ReturnType,
-     }
- }
- 
-+impl Signature {
-+    /// A method's `self` receiver, such as `&self` or `self: Box<Self>`.
-+    pub fn receiver(&self) -> Option<&FnArg> {
-+        let arg = self.inputs.first()?;
-+        match arg {
-+            FnArg::Receiver(_) => Some(arg),
-+            FnArg::Typed(PatType { pat, .. }) => {
-+                if let Pat::Ident(PatIdent { ident, .. }) = &**pat {
-+                    if ident == "self" {
-+                        return Some(arg);
-+                    }
-+                }
-+                None
-+            }
-+        }
-+    }
-+}
-+
- 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.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub enum FnArg {
-         /// The `self` argument of an associated method, whether taken by value
-         /// or by reference.
-+        ///
-+        /// Note that `self` receivers with a specified type, such as `self:
-+        /// Box<Self>`, are parsed as a `FnArg::Typed`.
-         Receiver(Receiver),
- 
-         /// A function argument accepted by pattern and type.
-         Typed(PatType),
-     }
- }
- 
- ast_struct! {
-     /// The `self` argument of an associated method, whether taken by value
-     /// or by reference.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// Note that `self` receivers with a specified type, such as `self:
-+    /// Box<Self>`, are parsed as a `FnArg::Typed`.
-+    ///
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct Receiver {
-         pub attrs: Vec<Attribute>,
-         pub reference: Option<(Token![&], Option<Lifetime>)>,
-         pub mutability: Option<Token![mut]>,
-         pub self_token: Token![self],
-     }
- }
- 
-@@ -1051,149 +854,233 @@ impl Receiver {
- }
- 
- #[cfg(feature = "parsing")]
- pub mod parsing {
-     use super::*;
- 
-     use crate::ext::IdentExt;
-     use crate::parse::discouraged::Speculative;
--    use crate::parse::{Parse, ParseStream, Result};
-+    use crate::parse::{Parse, ParseBuffer, ParseStream, Result};
-+    use crate::token::Brace;
-     use proc_macro2::{Delimiter, Group, Punct, Spacing, TokenTree};
-     use std::iter::{self, FromIterator};
- 
-     crate::custom_keyword!(existential);
- 
-     impl Parse for Item {
-         fn parse(input: ParseStream) -> Result<Self> {
-+            let begin = input.fork();
-             let mut attrs = input.call(Attribute::parse_outer)?;
-             let ahead = input.fork();
-             let vis: Visibility = ahead.parse()?;
- 
-             let lookahead = ahead.lookahead1();
--            let mut item = if lookahead.peek(Token![extern]) {
-+            let mut item = if lookahead.peek(Token![fn]) || peek_signature(&ahead) {
-+                let vis: Visibility = input.parse()?;
-+                let sig = parse_signature(input)?;
-+                if input.peek(Token![;]) {
-+                    input.parse::<Token![;]>()?;
-+                    Ok(Item::Verbatim(verbatim::between(begin, input)))
-+                } else {
-+                    parse_rest_of_fn(input, Vec::new(), vis, sig).map(Item::Fn)
-+                }
-+            } else if lookahead.peek(Token![extern]) {
-                 ahead.parse::<Token![extern]>()?;
-                 let lookahead = ahead.lookahead1();
-                 if lookahead.peek(Token![crate]) {
-                     input.parse().map(Item::ExternCrate)
--                } else if lookahead.peek(Token![fn]) {
--                    input.parse().map(Item::Fn)
-                 } else if lookahead.peek(token::Brace) {
-                     input.parse().map(Item::ForeignMod)
-                 } else if lookahead.peek(LitStr) {
-                     ahead.parse::<LitStr>()?;
-                     let lookahead = ahead.lookahead1();
-                     if lookahead.peek(token::Brace) {
-                         input.parse().map(Item::ForeignMod)
--                    } else if lookahead.peek(Token![fn]) {
--                        input.parse().map(Item::Fn)
-                     } else {
-                         Err(lookahead.error())
-                     }
-                 } else {
-                     Err(lookahead.error())
-                 }
-             } else if lookahead.peek(Token![use]) {
-                 input.parse().map(Item::Use)
-             } else if lookahead.peek(Token![static]) {
--                input.parse().map(Item::Static)
-+                let vis = input.parse()?;
-+                let static_token = input.parse()?;
-+                let mutability = input.parse()?;
-+                let ident = input.parse()?;
-+                let colon_token = input.parse()?;
-+                let ty = input.parse()?;
-+                if input.peek(Token![;]) {
-+                    input.parse::<Token![;]>()?;
-+                    Ok(Item::Verbatim(verbatim::between(begin, input)))
-+                } else {
-+                    Ok(Item::Static(ItemStatic {
-+                        attrs: Vec::new(),
-+                        vis,
-+                        static_token,
-+                        mutability,
-+                        ident,
-+                        colon_token,
-+                        ty,
-+                        eq_token: input.parse()?,
-+                        expr: input.parse()?,
-+                        semi_token: input.parse()?,
-+                    }))
-+                }
-             } else if lookahead.peek(Token![const]) {
-                 ahead.parse::<Token![const]>()?;
-                 let lookahead = ahead.lookahead1();
-                 if lookahead.peek(Ident) || lookahead.peek(Token![_]) {
--                    input.parse().map(Item::Const)
--                } else if lookahead.peek(Token![unsafe])
--                    || lookahead.peek(Token![async])
--                    || lookahead.peek(Token![extern])
--                    || lookahead.peek(Token![fn])
--                {
--                    input.parse().map(Item::Fn)
-+                    let vis = input.parse()?;
-+                    let const_token = input.parse()?;
-+                    let ident = {
-+                        let lookahead = input.lookahead1();
-+                        if lookahead.peek(Ident) || lookahead.peek(Token![_]) {
-+                            input.call(Ident::parse_any)?
-+                        } else {
-+                            return Err(lookahead.error());
-+                        }
-+                    };
-+                    let colon_token = input.parse()?;
-+                    let ty = input.parse()?;
-+                    if input.peek(Token![;]) {
-+                        input.parse::<Token![;]>()?;
-+                        Ok(Item::Verbatim(verbatim::between(begin, input)))
-+                    } else {
-+                        Ok(Item::Const(ItemConst {
-+                            attrs: Vec::new(),
-+                            vis,
-+                            const_token,
-+                            ident,
-+                            colon_token,
-+                            ty,
-+                            eq_token: input.parse()?,
-+                            expr: input.parse()?,
-+                            semi_token: input.parse()?,
-+                        }))
-+                    }
-                 } else {
-                     Err(lookahead.error())
-                 }
-             } else if lookahead.peek(Token![unsafe]) {
-                 ahead.parse::<Token![unsafe]>()?;
-                 let lookahead = ahead.lookahead1();
-                 if lookahead.peek(Token![trait])
-                     || lookahead.peek(Token![auto]) && ahead.peek2(Token![trait])
-                 {
-                     input.parse().map(Item::Trait)
-                 } else if lookahead.peek(Token![impl]) {
--                    input.parse().map(Item::Impl)
--                } else if lookahead.peek(Token![async])
--                    || lookahead.peek(Token![extern])
--                    || lookahead.peek(Token![fn])
--                {
--                    input.parse().map(Item::Fn)
-+                    let allow_const_impl = true;
-+                    if let Some(item) = parse_impl(input, allow_const_impl)? {
-+                        Ok(Item::Impl(item))
-+                    } else {
-+                        Ok(Item::Verbatim(verbatim::between(begin, input)))
-+                    }
-                 } else {
-                     Err(lookahead.error())
-                 }
--            } else if lookahead.peek(Token![async]) || lookahead.peek(Token![fn]) {
--                input.parse().map(Item::Fn)
-             } else if lookahead.peek(Token![mod]) {
-                 input.parse().map(Item::Mod)
-             } else if lookahead.peek(Token![type]) {
--                input.parse().map(Item::Type)
-+                parse_item_type(begin, input)
-             } else if lookahead.peek(existential) {
-                 input.call(item_existential).map(Item::Verbatim)
-             } else if lookahead.peek(Token![struct]) {
-                 input.parse().map(Item::Struct)
-             } else if lookahead.peek(Token![enum]) {
-                 input.parse().map(Item::Enum)
-             } else if lookahead.peek(Token![union]) && ahead.peek2(Ident) {
-                 input.parse().map(Item::Union)
-             } else if lookahead.peek(Token![trait]) {
-                 input.call(parse_trait_or_trait_alias)
-             } else if lookahead.peek(Token![auto]) && ahead.peek2(Token![trait]) {
-                 input.parse().map(Item::Trait)
-             } else if lookahead.peek(Token![impl])
-                 || lookahead.peek(Token![default]) && !ahead.peek2(Token![!])
-             {
--                input.parse().map(Item::Impl)
-+                let allow_const_impl = true;
-+                if let Some(item) = parse_impl(input, allow_const_impl)? {
-+                    Ok(Item::Impl(item))
-+                } else {
-+                    Ok(Item::Verbatim(verbatim::between(begin, input)))
-+                }
-             } else if lookahead.peek(Token![macro]) {
-                 input.parse().map(Item::Macro2)
-             } else if vis.is_inherited()
-                 && (lookahead.peek(Ident)
-                     || lookahead.peek(Token![self])
-                     || lookahead.peek(Token![super])
--                    || lookahead.peek(Token![extern])
-                     || lookahead.peek(Token![crate])
-                     || lookahead.peek(Token![::]))
-             {
-                 input.parse().map(Item::Macro)
-             } else {
-                 Err(lookahead.error())
-             }?;
- 
--            {
--                let item_attrs = match &mut item {
--                    Item::ExternCrate(item) => &mut item.attrs,
--                    Item::Use(item) => &mut item.attrs,
--                    Item::Static(item) => &mut item.attrs,
--                    Item::Const(item) => &mut item.attrs,
--                    Item::Fn(item) => &mut item.attrs,
--                    Item::Mod(item) => &mut item.attrs,
--                    Item::ForeignMod(item) => &mut item.attrs,
--                    Item::Type(item) => &mut item.attrs,
--                    Item::Struct(item) => &mut item.attrs,
--                    Item::Enum(item) => &mut item.attrs,
--                    Item::Union(item) => &mut item.attrs,
--                    Item::Trait(item) => &mut item.attrs,
--                    Item::TraitAlias(item) => &mut item.attrs,
--                    Item::Impl(item) => &mut item.attrs,
--                    Item::Macro(item) => &mut item.attrs,
--                    Item::Macro2(item) => &mut item.attrs,
--                    Item::Verbatim(_) => return Ok(item),
--                    Item::__Nonexhaustive => unreachable!(),
--                };
--                attrs.extend(item_attrs.drain(..));
--                *item_attrs = attrs;
-+            attrs.extend(item.replace_attrs(Vec::new()));
-+            item.replace_attrs(attrs);
-+            Ok(item)
-+        }
-+    }
-+
-+    struct FlexibleItemType {
-+        vis: Visibility,
-+        defaultness: Option<Token![default]>,
-+        type_token: Token![type],
-+        ident: Ident,
-+        generics: Generics,
-+        colon_token: Option<Token![:]>,
-+        bounds: Punctuated<TypeParamBound, Token![+]>,
-+        ty: Option<(Token![=], Type)>,
-+        semi_token: Token![;],
-+    }
-+
-+    impl Parse for FlexibleItemType {
-+        fn parse(input: ParseStream) -> Result<Self> {
-+            let vis: Visibility = input.parse()?;
-+            let defaultness: Option<Token![default]> = input.parse()?;
-+            let type_token: Token![type] = input.parse()?;
-+            let ident: Ident = input.parse()?;
-+            let mut generics: Generics = input.parse()?;
-+            let colon_token: Option<Token![:]> = input.parse()?;
-+            let mut bounds = Punctuated::new();
-+            if colon_token.is_some() {
-+                loop {
-+                    bounds.push_value(input.parse::<TypeParamBound>()?);
-+                    if input.peek(Token![where]) || input.peek(Token![=]) || input.peek(Token![;]) {
-+                        break;
-+                    }
-+                    bounds.push_punct(input.parse::<Token![+]>()?);
-+                    if input.peek(Token![where]) || input.peek(Token![=]) || input.peek(Token![;]) {
-+                        break;
-+                    }
-+                }
-             }
-+            generics.where_clause = input.parse()?;
-+            let ty = if let Some(eq_token) = input.parse()? {
-+                Some((eq_token, input.parse::<Type>()?))
-+            } else {
-+                None
-+            };
-+            let semi_token: Token![;] = input.parse()?;
- 
--            Ok(item)
-+            Ok(FlexibleItemType {
-+                vis,
-+                defaultness,
-+                type_token,
-+                ident,
-+                generics,
-+                colon_token,
-+                bounds,
-+                ty,
-+                semi_token,
-+            })
-         }
-     }
- 
-     impl Parse for ItemMacro {
-         fn parse(input: ParseStream) -> Result<Self> {
-             let attrs = input.call(Attribute::parse_outer)?;
-             let path = input.call(Path::parse_mod_style)?;
-             let bang_token: Token![!] = input.parse()?;
-@@ -1305,17 +1192,16 @@ pub mod parsing {
- 
-     impl Parse for UseTree {
-         fn parse(input: ParseStream) -> Result<UseTree> {
-             let lookahead = input.lookahead1();
-             if lookahead.peek(Ident)
-                 || lookahead.peek(Token![self])
-                 || lookahead.peek(Token![super])
-                 || lookahead.peek(Token![crate])
--                || lookahead.peek(Token![extern])
-             {
-                 let ident = input.call(Ident::parse_any)?;
-                 if input.peek(Token![::]) {
-                     Ok(UseTree::Path(UsePath {
-                         ident,
-                         colon2_token: input.parse()?,
-                         tree: Box::new(input.parse()?),
-                     }))
-@@ -1387,77 +1273,134 @@ pub mod parsing {
-                 ty: input.parse()?,
-                 eq_token: input.parse()?,
-                 expr: input.parse()?,
-                 semi_token: input.parse()?,
-             })
-         }
-     }
- 
-+    fn pop_variadic(args: &mut Punctuated<FnArg, Token![,]>) -> Option<Variadic> {
-+        let trailing_punct = args.trailing_punct();
-+
-+        let last = match args.last_mut()? {
-+            FnArg::Typed(last) => last,
-+            _ => return None,
-+        };
-+
-+        let ty = match last.ty.as_ref() {
-+            Type::Verbatim(ty) => ty,
-+            _ => return None,
-+        };
-+
-+        let mut variadic = Variadic {
-+            attrs: Vec::new(),
-+            dots: parse2(ty.clone()).ok()?,
-+        };
-+
-+        if let Pat::Verbatim(pat) = last.pat.as_ref() {
-+            if pat.to_string() == "..." && !trailing_punct {
-+                variadic.attrs = mem::replace(&mut last.attrs, Vec::new());
-+                args.pop();
-+            }
-+        }
-+
-+        Some(variadic)
-+    }
-+
-+    fn variadic_to_tokens(dots: &Token![...]) -> TokenStream {
-+        TokenStream::from_iter(vec![
-+            TokenTree::Punct({
-+                let mut dot = Punct::new('.', Spacing::Joint);
-+                dot.set_span(dots.spans[0]);
-+                dot
-+            }),
-+            TokenTree::Punct({
-+                let mut dot = Punct::new('.', Spacing::Joint);
-+                dot.set_span(dots.spans[1]);
-+                dot
-+            }),
-+            TokenTree::Punct({
-+                let mut dot = Punct::new('.', Spacing::Alone);
-+                dot.set_span(dots.spans[2]);
-+                dot
-+            }),
-+        ])
-+    }
-+
-+    fn peek_signature(input: ParseStream) -> bool {
-+        let fork = input.fork();
-+        fork.parse::<Option<Token![const]>>().is_ok()
-+            && fork.parse::<Option<Token![async]>>().is_ok()
-+            && fork.parse::<Option<Token![unsafe]>>().is_ok()
-+            && fork.parse::<Option<Abi>>().is_ok()
-+            && fork.peek(Token![fn])
-+    }
-+
-+    fn parse_signature(input: ParseStream) -> Result<Signature> {
-+        let constness: Option<Token![const]> = input.parse()?;
-+        let asyncness: Option<Token![async]> = input.parse()?;
-+        let unsafety: Option<Token![unsafe]> = input.parse()?;
-+        let abi: Option<Abi> = input.parse()?;
-+        let fn_token: Token![fn] = input.parse()?;
-+        let ident: Ident = input.parse()?;
-+        let generics: Generics = input.parse()?;
-+
-+        let content;
-+        let paren_token = parenthesized!(content in input);
-+        let mut inputs = parse_fn_args(&content)?;
-+        let variadic = pop_variadic(&mut inputs);
-+
-+        let output: ReturnType = input.parse()?;
-+        let where_clause: Option<WhereClause> = input.parse()?;
-+
-+        Ok(Signature {
-+            constness,
-+            asyncness,
-+            unsafety,
-+            abi,
-+            fn_token,
-+            ident,
-+            paren_token,
-+            inputs,
-+            output,
-+            variadic,
-+            generics: Generics {
-+                where_clause,
-+                ..generics
-+            },
-+        })
-+    }
-+
-     impl Parse for ItemFn {
-         fn parse(input: ParseStream) -> Result<Self> {
-             let outer_attrs = input.call(Attribute::parse_outer)?;
-             let vis: Visibility = input.parse()?;
--            let constness: Option<Token![const]> = input.parse()?;
--            let asyncness: Option<Token![async]> = input.parse()?;
--            let unsafety: Option<Token![unsafe]> = input.parse()?;
--            let abi: Option<Abi> = input.parse()?;
--            let fn_token: Token![fn] = input.parse()?;
--            let ident: Ident = input.parse()?;
--            let generics: Generics = input.parse()?;
--
--            let content;
--            let paren_token = parenthesized!(content in input);
--            let inputs = content.parse_terminated(FnArg::parse)?;
--            let variadic = inputs.last().as_ref().and_then(get_variadic);
--
--            fn get_variadic(input: &&FnArg) -> Option<Variadic> {
--                if let FnArg::Typed(PatType { ty, .. }) = input {
--                    if let Type::Verbatim(tokens) = &**ty {
--                        if let Ok(dots) = parse2(tokens.clone()) {
--                            return Some(Variadic {
--                                attrs: Vec::new(),
--                                dots,
--                            });
--                        }
--                    }
--                }
--                None
--            }
-+            let sig = parse_signature(input)?;
-+            parse_rest_of_fn(input, outer_attrs, vis, sig)
-+        }
-+    }
- 
--            let output: ReturnType = input.parse()?;
--            let where_clause: Option<WhereClause> = input.parse()?;
--
--            let content;
--            let brace_token = braced!(content in input);
--            let inner_attrs = content.call(Attribute::parse_inner)?;
--            let stmts = content.call(Block::parse_within)?;
-+    fn parse_rest_of_fn(
-+        input: ParseStream,
-+        outer_attrs: Vec<Attribute>,
-+        vis: Visibility,
-+        sig: Signature,
-+    ) -> Result<ItemFn> {
-+        let content;
-+        let brace_token = braced!(content in input);
-+        let inner_attrs = content.call(Attribute::parse_inner)?;
-+        let stmts = content.call(Block::parse_within)?;
- 
--            Ok(ItemFn {
--                attrs: private::attrs(outer_attrs, inner_attrs),
--                vis,
--                sig: Signature {
--                    constness,
--                    asyncness,
--                    unsafety,
--                    abi,
--                    fn_token,
--                    ident,
--                    paren_token,
--                    inputs,
--                    output,
--                    variadic,
--                    generics: Generics {
--                        where_clause,
--                        ..generics
--                    },
--                },
--                block: Box::new(Block { brace_token, stmts }),
--            })
--        }
-+        Ok(ItemFn {
-+            attrs: private::attrs(outer_attrs, inner_attrs),
-+            vis,
-+            sig,
-+            block: Box::new(Block { brace_token, stmts }),
-+        })
-     }
- 
-     impl Parse for FnArg {
-         fn parse(input: ParseStream) -> Result<Self> {
-             let attrs = input.call(Attribute::parse_outer)?;
- 
-             let ahead = input.fork();
-             if let Ok(mut receiver) = ahead.parse::<Receiver>() {
-@@ -1486,36 +1429,89 @@ pub mod parsing {
-                     }
-                 },
-                 mutability: input.parse()?,
-                 self_token: input.parse()?,
-             })
-         }
-     }
- 
-+    fn parse_fn_args(input: ParseStream) -> Result<Punctuated<FnArg, Token![,]>> {
-+        let mut args = Punctuated::new();
-+        let mut has_receiver = false;
-+
-+        while !input.is_empty() {
-+            let attrs = input.call(Attribute::parse_outer)?;
-+
-+            let arg = if let Some(dots) = input.parse::<Option<Token![...]>>()? {
-+                FnArg::Typed(PatType {
-+                    attrs,
-+                    pat: Box::new(Pat::Verbatim(variadic_to_tokens(&dots))),
-+                    colon_token: Token![:](dots.spans[0]),
-+                    ty: Box::new(Type::Verbatim(variadic_to_tokens(&dots))),
-+                })
-+            } else {
-+                let mut arg: FnArg = input.parse()?;
-+                match &mut arg {
-+                    FnArg::Receiver(receiver) if has_receiver => {
-+                        return Err(Error::new(
-+                            receiver.self_token.span,
-+                            "unexpected second method receiver",
-+                        ));
-+                    }
-+                    FnArg::Receiver(receiver) if !args.is_empty() => {
-+                        return Err(Error::new(
-+                            receiver.self_token.span,
-+                            "unexpected method receiver",
-+                        ));
-+                    }
-+                    FnArg::Receiver(receiver) => {
-+                        has_receiver = true;
-+                        receiver.attrs = attrs;
-+                    }
-+                    FnArg::Typed(arg) => arg.attrs = attrs,
-+                }
-+                arg
-+            };
-+            args.push_value(arg);
-+
-+            if input.is_empty() {
-+                break;
-+            }
-+
-+            let comma: Token![,] = input.parse()?;
-+            args.push_punct(comma);
-+        }
-+
-+        Ok(args)
-+    }
-+
-     fn fn_arg_typed(input: ParseStream) -> Result<PatType> {
-+        // Hack to parse pre-2018 syntax in
-+        // test/ui/rfc-2565-param-attrs/param-attrs-pretty.rs
-+        // because the rest of the test case is valuable.
-+        if input.peek(Ident) && input.peek2(Token![<]) {
-+            let span = input.fork().parse::<Ident>()?.span();
-+            return Ok(PatType {
-+                attrs: Vec::new(),
-+                pat: Box::new(Pat::Wild(PatWild {
-+                    attrs: Vec::new(),
-+                    underscore_token: Token![_](span),
-+                })),
-+                colon_token: Token![:](span),
-+                ty: input.parse()?,
-+            });
-+        }
-+
-         Ok(PatType {
-             attrs: Vec::new(),
--            pat: input.parse()?,
-+            pat: Box::new(pat::parsing::multi_pat(input)?),
-             colon_token: input.parse()?,
-             ty: Box::new(match input.parse::<Option<Token![...]>>()? {
--                Some(dot3) => {
--                    let args = vec![
--                        TokenTree::Punct(Punct::new('.', Spacing::Joint)),
--                        TokenTree::Punct(Punct::new('.', Spacing::Joint)),
--                        TokenTree::Punct(Punct::new('.', Spacing::Alone)),
--                    ];
--                    let tokens = TokenStream::from_iter(args.into_iter().zip(&dot3.spans).map(
--                        |(mut arg, span)| {
--                            arg.set_span(*span);
--                            arg
--                        },
--                    ));
--                    Type::Verbatim(tokens)
--                }
-+                Some(dot3) => Type::Verbatim(variadic_to_tokens(&dot3)),
-                 None => input.parse()?,
-             }),
-         })
-     }
- 
-     impl Parse for ItemMod {
-         fn parse(input: ParseStream) -> Result<Self> {
-             let outer_attrs = input.call(Attribute::parse_outer)?;
-@@ -1576,109 +1572,103 @@ pub mod parsing {
-                 brace_token,
-                 items,
-             })
-         }
-     }
- 
-     impl Parse for ForeignItem {
-         fn parse(input: ParseStream) -> Result<Self> {
-+            let begin = input.fork();
-             let mut attrs = input.call(Attribute::parse_outer)?;
-             let ahead = input.fork();
-             let vis: Visibility = ahead.parse()?;
- 
-             let lookahead = ahead.lookahead1();
--            let mut item = if lookahead.peek(Token![fn]) {
--                input.parse().map(ForeignItem::Fn)
-+            let mut item = if lookahead.peek(Token![fn]) || peek_signature(&ahead) {
-+                let vis: Visibility = input.parse()?;
-+                let sig = parse_signature(input)?;
-+                if input.peek(token::Brace) {
-+                    let content;
-+                    braced!(content in input);
-+                    content.call(Attribute::parse_inner)?;
-+                    content.call(Block::parse_within)?;
-+
-+                    Ok(ForeignItem::Verbatim(verbatim::between(begin, input)))
-+                } else {
-+                    Ok(ForeignItem::Fn(ForeignItemFn {
-+                        attrs: Vec::new(),
-+                        vis,
-+                        sig,
-+                        semi_token: input.parse()?,
-+                    }))
-+                }
-             } else if lookahead.peek(Token![static]) {
--                input.parse().map(ForeignItem::Static)
-+                let vis = input.parse()?;
-+                let static_token = input.parse()?;
-+                let mutability = input.parse()?;
-+                let ident = input.parse()?;
-+                let colon_token = input.parse()?;
-+                let ty = input.parse()?;
-+                if input.peek(Token![=]) {
-+                    input.parse::<Token![=]>()?;
-+                    input.parse::<Expr>()?;
-+                    input.parse::<Token![;]>()?;
-+                    Ok(ForeignItem::Verbatim(verbatim::between(begin, input)))
-+                } else {
-+                    Ok(ForeignItem::Static(ForeignItemStatic {
-+                        attrs: Vec::new(),
-+                        vis,
-+                        static_token,
-+                        mutability,
-+                        ident,
-+                        colon_token,
-+                        ty,
-+                        semi_token: input.parse()?,
-+                    }))
-+                }
-             } else if lookahead.peek(Token![type]) {
--                input.parse().map(ForeignItem::Type)
-+                parse_foreign_item_type(begin, input)
-             } else if vis.is_inherited()
-                 && (lookahead.peek(Ident)
-                     || lookahead.peek(Token![self])
-                     || lookahead.peek(Token![super])
--                    || lookahead.peek(Token![extern])
-                     || lookahead.peek(Token![crate])
-                     || lookahead.peek(Token![::]))
-             {
-                 input.parse().map(ForeignItem::Macro)
-             } else {
-                 Err(lookahead.error())
-             }?;
- 
--            {
--                let item_attrs = match &mut item {
--                    ForeignItem::Fn(item) => &mut item.attrs,
--                    ForeignItem::Static(item) => &mut item.attrs,
--                    ForeignItem::Type(item) => &mut item.attrs,
--                    ForeignItem::Macro(item) => &mut item.attrs,
--                    ForeignItem::Verbatim(_) | ForeignItem::__Nonexhaustive => unreachable!(),
--                };
--                attrs.extend(item_attrs.drain(..));
--                *item_attrs = attrs;
--            }
-+            let item_attrs = match &mut item {
-+                ForeignItem::Fn(item) => &mut item.attrs,
-+                ForeignItem::Static(item) => &mut item.attrs,
-+                ForeignItem::Type(item) => &mut item.attrs,
-+                ForeignItem::Macro(item) => &mut item.attrs,
-+                ForeignItem::Verbatim(_) => return Ok(item),
-+                ForeignItem::__Nonexhaustive => unreachable!(),
-+            };
-+            attrs.extend(item_attrs.drain(..));
-+            *item_attrs = attrs;
- 
-             Ok(item)
-         }
-     }
- 
-     impl Parse for ForeignItemFn {
-         fn parse(input: ParseStream) -> Result<Self> {
-             let attrs = input.call(Attribute::parse_outer)?;
-             let vis: Visibility = input.parse()?;
--            let fn_token: Token![fn] = input.parse()?;
--            let ident: Ident = input.parse()?;
--            let generics: Generics = input.parse()?;
--
--            let content;
--            let paren_token = parenthesized!(content in input);
--            let mut inputs = Punctuated::new();
--            let mut variadic = None;
--            while !content.is_empty() {
--                let attrs = content.call(Attribute::parse_outer)?;
--
--                if let Some(dots) = content.parse()? {
--                    variadic = Some(Variadic { attrs, dots });
--                    break;
--                }
--
--                let mut arg = content.call(fn_arg_typed)?;
--                arg.attrs = attrs;
--                inputs.push_value(FnArg::Typed(arg));
--                if content.is_empty() {
--                    break;
--                }
--
--                inputs.push_punct(content.parse()?);
--            }
--
--            let output: ReturnType = input.parse()?;
--            let where_clause: Option<WhereClause> = input.parse()?;
-+            let sig = parse_signature(input)?;
-             let semi_token: Token![;] = input.parse()?;
--
-             Ok(ForeignItemFn {
-                 attrs,
-                 vis,
--                sig: Signature {
--                    constness: None,
--                    asyncness: None,
--                    unsafety: None,
--                    abi: None,
--                    fn_token,
--                    ident,
--                    paren_token,
--                    inputs,
--                    output,
--                    variadic,
--                    generics: Generics {
--                        where_clause,
--                        ..generics
--                    },
--                },
-+                sig,
-                 semi_token,
-             })
-         }
-     }
- 
-     impl Parse for ForeignItemStatic {
-         fn parse(input: ParseStream) -> Result<Self> {
-             Ok(ForeignItemStatic {
-@@ -1701,16 +1691,47 @@ pub mod parsing {
-                 vis: input.parse()?,
-                 type_token: input.parse()?,
-                 ident: input.parse()?,
-                 semi_token: input.parse()?,
-             })
-         }
-     }
- 
-+    fn parse_foreign_item_type(begin: ParseBuffer, input: ParseStream) -> Result<ForeignItem> {
-+        let FlexibleItemType {
-+            vis,
-+            defaultness,
-+            type_token,
-+            ident,
-+            generics,
-+            colon_token,
-+            bounds: _,
-+            ty,
-+            semi_token,
-+        } = input.parse()?;
-+
-+        if defaultness.is_some()
-+            || generics.lt_token.is_some()
-+            || generics.where_clause.is_some()
-+            || colon_token.is_some()
-+            || ty.is_some()
-+        {
-+            Ok(ForeignItem::Verbatim(verbatim::between(begin, input)))
-+        } else {
-+            Ok(ForeignItem::Type(ForeignItemType {
-+                attrs: Vec::new(),
-+                vis,
-+                type_token,
-+                ident,
-+                semi_token,
-+            }))
-+        }
-+    }
-+
-     impl Parse for ForeignItemMacro {
-         fn parse(input: ParseStream) -> Result<Self> {
-             let attrs = input.call(Attribute::parse_outer)?;
-             let mac: Macro = input.parse()?;
-             let semi_token: Option<Token![;]> = if mac.delimiter.is_brace() {
-                 None
-             } else {
-                 Some(input.parse()?)
-@@ -1737,16 +1758,46 @@ pub mod parsing {
-                 },
-                 eq_token: input.parse()?,
-                 ty: input.parse()?,
-                 semi_token: input.parse()?,
-             })
-         }
-     }
- 
-+    fn parse_item_type(begin: ParseBuffer, input: ParseStream) -> Result<Item> {
-+        let FlexibleItemType {
-+            vis,
-+            defaultness,
-+            type_token,
-+            ident,
-+            generics,
-+            colon_token,
-+            bounds: _,
-+            ty,
-+            semi_token,
-+        } = input.parse()?;
-+
-+        if defaultness.is_some() || colon_token.is_some() || ty.is_none() {
-+            Ok(Item::Verbatim(verbatim::between(begin, input)))
-+        } else {
-+            let (eq_token, ty) = ty.unwrap();
-+            Ok(Item::Type(ItemType {
-+                attrs: Vec::new(),
-+                vis,
-+                type_token,
-+                ident,
-+                generics,
-+                eq_token,
-+                ty: Box::new(ty),
-+                semi_token,
-+            }))
-+        }
-+    }
-+
-     #[cfg(not(feature = "printing"))]
-     fn item_existential(input: ParseStream) -> Result<TokenStream> {
-         Err(input.error("existential type is not supported"))
-     }
- 
-     #[cfg(feature = "printing")]
-     fn item_existential(input: ParseStream) -> Result<TokenStream> {
-         use crate::attr::FilterAttrs;
-@@ -1882,39 +1933,39 @@ pub mod parsing {
-                 .map(Item::TraitAlias)
-         } else {
-             Err(lookahead.error())
-         }
-     }
- 
-     impl Parse for ItemTrait {
-         fn parse(input: ParseStream) -> Result<Self> {
--            let attrs = input.call(Attribute::parse_outer)?;
-+            let outer_attrs = input.call(Attribute::parse_outer)?;
-             let vis: Visibility = input.parse()?;
-             let unsafety: Option<Token![unsafe]> = input.parse()?;
-             let auto_token: Option<Token![auto]> = input.parse()?;
-             let trait_token: Token![trait] = input.parse()?;
-             let ident: Ident = input.parse()?;
-             let generics: Generics = input.parse()?;
-             parse_rest_of_trait(
-                 input,
--                attrs,
-+                outer_attrs,
-                 vis,
-                 unsafety,
-                 auto_token,
-                 trait_token,
-                 ident,
-                 generics,
-             )
-         }
-     }
- 
-     fn parse_rest_of_trait(
-         input: ParseStream,
--        attrs: Vec<Attribute>,
-+        outer_attrs: Vec<Attribute>,
-         vis: Visibility,
-         unsafety: Option<Token![unsafe]>,
-         auto_token: Option<Token![auto]>,
-         trait_token: Token![trait],
-         ident: Ident,
-         mut generics: Generics,
-     ) -> Result<ItemTrait> {
-         let colon_token: Option<Token![:]> = input.parse()?;
-@@ -1932,23 +1983,24 @@ pub mod parsing {
-                 }
-             }
-         }
- 
-         generics.where_clause = input.parse()?;
- 
-         let content;
-         let brace_token = braced!(content in input);
-+        let inner_attrs = content.call(Attribute::parse_inner)?;
-         let mut items = Vec::new();
-         while !content.is_empty() {
-             items.push(content.parse()?);
-         }
- 
-         Ok(ItemTrait {
--            attrs,
-+            attrs: private::attrs(outer_attrs, inner_attrs),
-             vis,
-             unsafety,
-             auto_token,
-             trait_token,
-             ident,
-             generics,
-             colon_token,
-             supertraits,
-@@ -2009,76 +2061,83 @@ pub mod parsing {
-             eq_token,
-             bounds,
-             semi_token,
-         })
-     }
- 
-     impl Parse for TraitItem {
-         fn parse(input: ParseStream) -> Result<Self> {
-+            let begin = input.fork();
-             let mut attrs = input.call(Attribute::parse_outer)?;
-+            let vis: Visibility = input.parse()?;
-+            let defaultness: Option<Token![default]> = input.parse()?;
-             let ahead = input.fork();
- 
-             let lookahead = ahead.lookahead1();
--            let mut item = if lookahead.peek(Token![const]) {
-+            let mut item = if lookahead.peek(Token![fn]) || peek_signature(&ahead) {
-+                input.parse().map(TraitItem::Method)
-+            } else if lookahead.peek(Token![const]) {
-                 ahead.parse::<Token![const]>()?;
-                 let lookahead = ahead.lookahead1();
--                if lookahead.peek(Ident) {
-+                if lookahead.peek(Ident) || lookahead.peek(Token![_]) {
-                     input.parse().map(TraitItem::Const)
-                 } else if lookahead.peek(Token![async])
-                     || lookahead.peek(Token![unsafe])
-                     || lookahead.peek(Token![extern])
-                     || lookahead.peek(Token![fn])
-                 {
-                     input.parse().map(TraitItem::Method)
-                 } else {
-                     Err(lookahead.error())
-                 }
--            } else if lookahead.peek(Token![async])
--                || lookahead.peek(Token![unsafe])
--                || lookahead.peek(Token![extern])
--                || lookahead.peek(Token![fn])
--            {
--                input.parse().map(TraitItem::Method)
-             } else if lookahead.peek(Token![type]) {
--                input.parse().map(TraitItem::Type)
-+                parse_trait_item_type(begin.fork(), input)
-             } else if lookahead.peek(Ident)
-                 || lookahead.peek(Token![self])
-                 || lookahead.peek(Token![super])
--                || lookahead.peek(Token![extern])
-                 || lookahead.peek(Token![crate])
-                 || lookahead.peek(Token![::])
-             {
-                 input.parse().map(TraitItem::Macro)
-             } else {
-                 Err(lookahead.error())
-             }?;
- 
--            {
--                let item_attrs = match &mut item {
--                    TraitItem::Const(item) => &mut item.attrs,
--                    TraitItem::Method(item) => &mut item.attrs,
--                    TraitItem::Type(item) => &mut item.attrs,
--                    TraitItem::Macro(item) => &mut item.attrs,
--                    TraitItem::Verbatim(_) | TraitItem::__Nonexhaustive => unreachable!(),
--                };
--                attrs.extend(item_attrs.drain(..));
--                *item_attrs = attrs;
-+            match (vis, defaultness) {
-+                (Visibility::Inherited, None) => {}
-+                _ => return Ok(TraitItem::Verbatim(verbatim::between(begin, input))),
-             }
- 
-+            let item_attrs = match &mut item {
-+                TraitItem::Const(item) => &mut item.attrs,
-+                TraitItem::Method(item) => &mut item.attrs,
-+                TraitItem::Type(item) => &mut item.attrs,
-+                TraitItem::Macro(item) => &mut item.attrs,
-+                TraitItem::Verbatim(_) | TraitItem::__Nonexhaustive => unreachable!(),
-+            };
-+            attrs.extend(item_attrs.drain(..));
-+            *item_attrs = attrs;
-             Ok(item)
-         }
-     }
- 
-     impl Parse for TraitItemConst {
-         fn parse(input: ParseStream) -> Result<Self> {
-             Ok(TraitItemConst {
-                 attrs: input.call(Attribute::parse_outer)?,
-                 const_token: input.parse()?,
--                ident: input.parse()?,
-+                ident: {
-+                    let lookahead = input.lookahead1();
-+                    if lookahead.peek(Ident) || lookahead.peek(Token![_]) {
-+                        input.call(Ident::parse_any)?
-+                    } else {
-+                        return Err(lookahead.error());
-+                    }
-+                },
-                 colon_token: input.parse()?,
-                 ty: input.parse()?,
-                 default: {
-                     if input.peek(Token![=]) {
-                         let eq_token: Token![=] = input.parse()?;
-                         let default: Expr = input.parse()?;
-                         Some((eq_token, default))
-                     } else {
-@@ -2088,30 +2147,17 @@ pub mod parsing {
-                 semi_token: input.parse()?,
-             })
-         }
-     }
- 
-     impl Parse for TraitItemMethod {
-         fn parse(input: ParseStream) -> Result<Self> {
-             let outer_attrs = input.call(Attribute::parse_outer)?;
--            let constness: Option<Token![const]> = input.parse()?;
--            let asyncness: Option<Token![async]> = input.parse()?;
--            let unsafety: Option<Token![unsafe]> = input.parse()?;
--            let abi: Option<Abi> = input.parse()?;
--            let fn_token: Token![fn] = input.parse()?;
--            let ident: Ident = input.parse()?;
--            let generics: Generics = input.parse()?;
--
--            let content;
--            let paren_token = parenthesized!(content in input);
--            let inputs = content.parse_terminated(FnArg::parse)?;
--
--            let output: ReturnType = input.parse()?;
--            let where_clause: Option<WhereClause> = input.parse()?;
-+            let sig = parse_signature(input)?;
- 
-             let lookahead = input.lookahead1();
-             let (brace_token, inner_attrs, stmts, semi_token) = if lookahead.peek(token::Brace) {
-                 let content;
-                 let brace_token = braced!(content in input);
-                 let inner_attrs = content.call(Attribute::parse_inner)?;
-                 let stmts = content.call(Block::parse_within)?;
-                 (Some(brace_token), inner_attrs, stmts, None)
-@@ -2119,32 +2165,17 @@ pub mod parsing {
-                 let semi_token: Token![;] = input.parse()?;
-                 (None, Vec::new(), Vec::new(), Some(semi_token))
-             } else {
-                 return Err(lookahead.error());
-             };
- 
-             Ok(TraitItemMethod {
-                 attrs: private::attrs(outer_attrs, inner_attrs),
--                sig: Signature {
--                    constness,
--                    asyncness,
--                    unsafety,
--                    abi,
--                    fn_token,
--                    ident,
--                    paren_token,
--                    inputs,
--                    output,
--                    variadic: None,
--                    generics: Generics {
--                        where_clause,
--                        ..generics
--                    },
--                },
-+                sig,
-                 default: brace_token.map(|brace_token| Block { brace_token, stmts }),
-                 semi_token,
-             })
-         }
-     }
- 
-     impl Parse for TraitItemType {
-         fn parse(input: ParseStream) -> Result<Self> {
-@@ -2183,16 +2214,45 @@ pub mod parsing {
-                 colon_token,
-                 bounds,
-                 default,
-                 semi_token,
-             })
-         }
-     }
- 
-+    fn parse_trait_item_type(begin: ParseBuffer, input: ParseStream) -> Result<TraitItem> {
-+        let FlexibleItemType {
-+            vis,
-+            defaultness,
-+            type_token,
-+            ident,
-+            generics,
-+            colon_token,
-+            bounds,
-+            ty,
-+            semi_token,
-+        } = input.parse()?;
-+
-+        if defaultness.is_some() || vis.is_some() {
-+            Ok(TraitItem::Verbatim(verbatim::between(begin, input)))
-+        } else {
-+            Ok(TraitItem::Type(TraitItemType {
-+                attrs: Vec::new(),
-+                type_token,
-+                ident,
-+                generics,
-+                colon_token,
-+                bounds,
-+                default: ty,
-+                semi_token,
-+            }))
-+        }
-+    }
-+
-     impl Parse for TraitItemMacro {
-         fn parse(input: ParseStream) -> Result<Self> {
-             let attrs = input.call(Attribute::parse_outer)?;
-             let mac: Macro = input.parse()?;
-             let semi_token: Option<Token![;]> = if mac.delimiter.is_brace() {
-                 None
-             } else {
-                 Some(input.parse()?)
-@@ -2202,123 +2262,148 @@ pub mod parsing {
-                 mac,
-                 semi_token,
-             })
-         }
-     }
- 
-     impl Parse for ItemImpl {
-         fn parse(input: ParseStream) -> Result<Self> {
--            let outer_attrs = input.call(Attribute::parse_outer)?;
--            let defaultness: Option<Token![default]> = input.parse()?;
--            let unsafety: Option<Token![unsafe]> = input.parse()?;
--            let impl_token: Token![impl] = input.parse()?;
-+            let allow_const_impl = false;
-+            parse_impl(input, allow_const_impl).map(Option::unwrap)
-+        }
-+    }
-+
-+    fn parse_impl(input: ParseStream, allow_const_impl: bool) -> Result<Option<ItemImpl>> {
-+        let outer_attrs = input.call(Attribute::parse_outer)?;
-+        let defaultness: Option<Token![default]> = input.parse()?;
-+        let unsafety: Option<Token![unsafe]> = input.parse()?;
-+        let impl_token: Token![impl] = input.parse()?;
- 
--            let has_generics = input.peek(Token![<])
--                && (input.peek2(Token![>])
--                    || input.peek2(Token![#])
--                    || (input.peek2(Ident) || input.peek2(Lifetime))
--                        && (input.peek3(Token![:])
--                            || input.peek3(Token![,])
--                            || input.peek3(Token![>])));
--            let generics: Generics = if has_generics {
--                input.parse()?
--            } else {
--                Generics::default()
--            };
-+        let has_generics = input.peek(Token![<])
-+            && (input.peek2(Token![>])
-+                || input.peek2(Token![#])
-+                || (input.peek2(Ident) || input.peek2(Lifetime))
-+                    && (input.peek3(Token![:])
-+                        || input.peek3(Token![,])
-+                        || input.peek3(Token![>]))
-+                || input.peek2(Token![const]));
-+        let generics: Generics = if has_generics {
-+            input.parse()?
-+        } else {
-+            Generics::default()
-+        };
- 
--            let trait_ = {
--                // TODO: optimize using advance_to
--                let ahead = input.fork();
--                if ahead.parse::<Option<Token![!]>>().is_ok()
--                    && ahead.parse::<Path>().is_ok()
--                    && ahead.parse::<Token![for]>().is_ok()
--                {
--                    let polarity: Option<Token![!]> = input.parse()?;
--                    let path: Path = input.parse()?;
--                    let for_token: Token![for] = input.parse()?;
--                    Some((polarity, path, for_token))
--                } else {
--                    None
--                }
--            };
--            let self_ty: Type = input.parse()?;
--            let where_clause: Option<WhereClause> = input.parse()?;
-+        let is_const_impl = allow_const_impl
-+            && (input.peek(Token![const]) || input.peek(Token![?]) && input.peek2(Token![const]));
-+        if is_const_impl {
-+            input.parse::<Option<Token![?]>>()?;
-+            input.parse::<Token![const]>()?;
-+        }
- 
--            let content;
--            let brace_token = braced!(content in input);
--            let inner_attrs = content.call(Attribute::parse_inner)?;
-+        let trait_ = (|| -> Option<_> {
-+            let ahead = input.fork();
-+            let polarity: Option<Token![!]> = ahead.parse().ok()?;
-+            let mut path: Path = ahead.parse().ok()?;
-+            if path.segments.last().unwrap().arguments.is_empty() && ahead.peek(token::Paren) {
-+                let parenthesized = PathArguments::Parenthesized(ahead.parse().ok()?);
-+                path.segments.last_mut().unwrap().arguments = parenthesized;
-+            }
-+            let for_token: Token![for] = ahead.parse().ok()?;
-+            input.advance_to(&ahead);
-+            Some((polarity, path, for_token))
-+        })();
- 
--            let mut items = Vec::new();
--            while !content.is_empty() {
--                items.push(content.parse()?);
--            }
-+        let self_ty: Type = input.parse()?;
-+        let where_clause: Option<WhereClause> = input.parse()?;
-+
-+        let content;
-+        let brace_token = braced!(content in input);
-+        let inner_attrs = content.call(Attribute::parse_inner)?;
- 
--            Ok(ItemImpl {
-+        let mut items = Vec::new();
-+        while !content.is_empty() {
-+            items.push(content.parse()?);
-+        }
-+
-+        if is_const_impl {
-+            Ok(None)
-+        } else {
-+            Ok(Some(ItemImpl {
-                 attrs: private::attrs(outer_attrs, inner_attrs),
-                 defaultness,
-                 unsafety,
-                 impl_token,
-                 generics: Generics {
-                     where_clause,
-                     ..generics
-                 },
-                 trait_,
-                 self_ty: Box::new(self_ty),
-                 brace_token,
-                 items,
--            })
-+            }))
-         }
-     }
- 
-     impl Parse for ImplItem {
-         fn parse(input: ParseStream) -> Result<Self> {
-+            let begin = input.fork();
-             let mut attrs = input.call(Attribute::parse_outer)?;
-             let ahead = input.fork();
-             let vis: Visibility = ahead.parse()?;
- 
-             let mut lookahead = ahead.lookahead1();
-             let defaultness = if lookahead.peek(Token![default]) && !ahead.peek2(Token![!]) {
-                 let defaultness: Token![default] = ahead.parse()?;
-                 lookahead = ahead.lookahead1();
-                 Some(defaultness)
-             } else {
-                 None
-             };
- 
--            let mut item = if lookahead.peek(Token![const]) {
--                ahead.parse::<Token![const]>()?;
-+            let mut item = if lookahead.peek(Token![fn]) || peek_signature(&ahead) {
-+                input.parse().map(ImplItem::Method)
-+            } else if lookahead.peek(Token![const]) {
-+                let const_token: Token![const] = ahead.parse()?;
-                 let lookahead = ahead.lookahead1();
--                if lookahead.peek(Ident) {
--                    input.parse().map(ImplItem::Const)
--                } else if lookahead.peek(Token![unsafe])
--                    || lookahead.peek(Token![async])
--                    || lookahead.peek(Token![extern])
--                    || lookahead.peek(Token![fn])
--                {
--                    input.parse().map(ImplItem::Method)
-+                if lookahead.peek(Ident) || lookahead.peek(Token![_]) {
-+                    input.advance_to(&ahead);
-+                    let ident: Ident = input.call(Ident::parse_any)?;
-+                    let colon_token: Token![:] = input.parse()?;
-+                    let ty: Type = input.parse()?;
-+                    if let Some(eq_token) = input.parse()? {
-+                        return Ok(ImplItem::Const(ImplItemConst {
-+                            attrs,
-+                            vis,
-+                            defaultness,
-+                            const_token,
-+                            ident,
-+                            colon_token,
-+                            ty,
-+                            eq_token,
-+                            expr: input.parse()?,
-+                            semi_token: input.parse()?,
-+                        }));
-+                    } else {
-+                        input.parse::<Token![;]>()?;
-+                        return Ok(ImplItem::Verbatim(verbatim::between(begin, input)));
-+                    }
-                 } else {
-                     Err(lookahead.error())
-                 }
--            } else if lookahead.peek(Token![unsafe])
--                || lookahead.peek(Token![async])
--                || lookahead.peek(Token![extern])
--                || lookahead.peek(Token![fn])
--            {
--                input.parse().map(ImplItem::Method)
-             } else if lookahead.peek(Token![type]) {
--                input.parse().map(ImplItem::Type)
-+                parse_impl_item_type(begin, input)
-             } else if vis.is_inherited() && defaultness.is_none() && lookahead.peek(existential) {
-                 input.call(item_existential).map(ImplItem::Verbatim)
-             } else if vis.is_inherited()
-                 && defaultness.is_none()
-                 && (lookahead.peek(Ident)
-                     || lookahead.peek(Token![self])
-                     || lookahead.peek(Token![super])
--                    || lookahead.peek(Token![extern])
-                     || lookahead.peek(Token![crate])
-                     || lookahead.peek(Token![::]))
-             {
-                 input.parse().map(ImplItem::Macro)
-             } else {
-                 Err(lookahead.error())
-             }?;
- 
-@@ -2341,72 +2426,68 @@ pub mod parsing {
- 
-     impl Parse for ImplItemConst {
-         fn parse(input: ParseStream) -> Result<Self> {
-             Ok(ImplItemConst {
-                 attrs: input.call(Attribute::parse_outer)?,
-                 vis: input.parse()?,
-                 defaultness: input.parse()?,
-                 const_token: input.parse()?,
--                ident: input.parse()?,
-+                ident: {
-+                    let lookahead = input.lookahead1();
-+                    if lookahead.peek(Ident) || lookahead.peek(Token![_]) {
-+                        input.call(Ident::parse_any)?
-+                    } else {
-+                        return Err(lookahead.error());
-+                    }
-+                },
-                 colon_token: input.parse()?,
-                 ty: input.parse()?,
-                 eq_token: input.parse()?,
-                 expr: input.parse()?,
-                 semi_token: input.parse()?,
-             })
-         }
-     }
- 
-     impl Parse for ImplItemMethod {
-         fn parse(input: ParseStream) -> Result<Self> {
--            let outer_attrs = input.call(Attribute::parse_outer)?;
-+            let mut attrs = input.call(Attribute::parse_outer)?;
-             let vis: Visibility = input.parse()?;
-             let defaultness: Option<Token![default]> = input.parse()?;
--            let constness: Option<Token![const]> = input.parse()?;
--            let asyncness: Option<Token![async]> = input.parse()?;
--            let unsafety: Option<Token![unsafe]> = input.parse()?;
--            let abi: Option<Abi> = input.parse()?;
--            let fn_token: Token![fn] = input.parse()?;
--            let ident: Ident = input.parse()?;
--            let generics: Generics = input.parse()?;
-+            let sig = parse_signature(input)?;
- 
--            let content;
--            let paren_token = parenthesized!(content in input);
--            let inputs = content.parse_terminated(FnArg::parse)?;
--
--            let output: ReturnType = input.parse()?;
--            let where_clause: Option<WhereClause> = input.parse()?;
--
--            let content;
--            let brace_token = braced!(content in input);
--            let inner_attrs = content.call(Attribute::parse_inner)?;
--            let stmts = content.call(Block::parse_within)?;
-+            let block = if let Some(semi) = input.parse::<Option<Token![;]>>()? {
-+                // Accept methods without a body in an impl block because
-+                // rustc's *parser* does not reject them (the compilation error
-+                // is emitted later than parsing) and it can be useful for macro
-+                // DSLs.
-+                let mut punct = Punct::new(';', Spacing::Alone);
-+                punct.set_span(semi.span);
-+                let tokens = TokenStream::from_iter(vec![TokenTree::Punct(punct)]);
-+                Block {
-+                    brace_token: Brace::default(),
-+                    stmts: vec![Stmt::Item(Item::Verbatim(tokens))],
-+                }
-+            } else {
-+                let content;
-+                let brace_token = braced!(content in input);
-+                attrs.extend(content.call(Attribute::parse_inner)?);
-+                Block {
-+                    brace_token,
-+                    stmts: content.call(Block::parse_within)?,
-+                }
-+            };
- 
-             Ok(ImplItemMethod {
--                attrs: private::attrs(outer_attrs, inner_attrs),
-+                attrs,
-                 vis,
-                 defaultness,
--                sig: Signature {
--                    constness,
--                    asyncness,
--                    unsafety,
--                    abi,
--                    fn_token,
--                    ident,
--                    paren_token,
--                    inputs,
--                    output,
--                    variadic: None,
--                    generics: Generics {
--                        where_clause,
--                        ..generics
--                    },
--                },
--                block: Block { brace_token, stmts },
-+                sig,
-+                block,
-             })
-         }
-     }
- 
-     impl Parse for ImplItemType {
-         fn parse(input: ParseStream) -> Result<Self> {
-             Ok(ImplItemType {
-                 attrs: input.call(Attribute::parse_outer)?,
-@@ -2421,16 +2502,47 @@ pub mod parsing {
-                 },
-                 eq_token: input.parse()?,
-                 ty: input.parse()?,
-                 semi_token: input.parse()?,
-             })
-         }
-     }
- 
-+    fn parse_impl_item_type(begin: ParseBuffer, input: ParseStream) -> Result<ImplItem> {
-+        let FlexibleItemType {
-+            vis,
-+            defaultness,
-+            type_token,
-+            ident,
-+            generics,
-+            colon_token,
-+            bounds: _,
-+            ty,
-+            semi_token,
-+        } = input.parse()?;
-+
-+        if colon_token.is_some() || ty.is_none() {
-+            Ok(ImplItem::Verbatim(verbatim::between(begin, input)))
-+        } else {
-+            let (eq_token, ty) = ty.unwrap();
-+            Ok(ImplItem::Type(ImplItemType {
-+                attrs: Vec::new(),
-+                vis,
-+                defaultness,
-+                type_token,
-+                ident,
-+                generics,
-+                eq_token,
-+                ty,
-+                semi_token,
-+            }))
-+        }
-+    }
-+
-     impl Parse for ImplItemMacro {
-         fn parse(input: ParseStream) -> Result<Self> {
-             let attrs = input.call(Attribute::parse_outer)?;
-             let mac: Macro = input.parse()?;
-             let semi_token: Option<Token![;]> = if mac.delimiter.is_brace() {
-                 None
-             } else {
-                 Some(input.parse()?)
-@@ -2466,16 +2578,17 @@ pub mod parsing {
- mod printing {
-     use super::*;
- 
-     use proc_macro2::TokenStream;
-     use quote::{ToTokens, TokenStreamExt};
- 
-     use crate::attr::FilterAttrs;
-     use crate::print::TokensOrDefault;
-+    use crate::punctuated::Pair;
- 
-     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);
-@@ -2830,16 +2943,24 @@ mod printing {
-     }
- 
-     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);
-+            if self.block.stmts.len() == 1 {
-+                if let Stmt::Item(Item::Verbatim(verbatim)) = &self.block.stmts[0] {
-+                    if verbatim.to_string() == ";" {
-+                        verbatim.to_tokens(tokens);
-+                        return;
-+                    }
-+                }
-+            }
-             self.block.brace_token.surround(tokens, |tokens| {
-                 tokens.append_all(self.attrs.inner());
-                 tokens.append_all(&self.block.stmts);
-             });
-         }
-     }
- 
-     impl ToTokens for ImplItemType {
-@@ -2900,31 +3021,71 @@ mod printing {
-     impl ToTokens for ForeignItemMacro {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-             tokens.append_all(self.attrs.outer());
-             self.mac.to_tokens(tokens);
-             self.semi_token.to_tokens(tokens);
-         }
-     }
- 
-+    fn maybe_variadic_to_tokens(arg: &FnArg, tokens: &mut TokenStream) -> bool {
-+        let arg = match arg {
-+            FnArg::Typed(arg) => arg,
-+            FnArg::Receiver(receiver) => {
-+                receiver.to_tokens(tokens);
-+                return false;
-+            }
-+        };
-+
-+        match arg.ty.as_ref() {
-+            Type::Verbatim(ty) if ty.to_string() == "..." => {
-+                match arg.pat.as_ref() {
-+                    Pat::Verbatim(pat) if pat.to_string() == "..." => {
-+                        tokens.append_all(arg.attrs.outer());
-+                        pat.to_tokens(tokens);
-+                    }
-+                    _ => arg.to_tokens(tokens),
-+                }
-+                true
-+            }
-+            _ => {
-+                arg.to_tokens(tokens);
-+                false
-+            }
-+        }
-+    }
-+
-     impl ToTokens for Signature {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-             self.constness.to_tokens(tokens);
-             self.asyncness.to_tokens(tokens);
-             self.unsafety.to_tokens(tokens);
-             self.abi.to_tokens(tokens);
-             self.fn_token.to_tokens(tokens);
-             self.ident.to_tokens(tokens);
-             self.generics.to_tokens(tokens);
-             self.paren_token.surround(tokens, |tokens| {
--                self.inputs.to_tokens(tokens);
--                if self.variadic.is_some() && !self.inputs.empty_or_trailing() {
--                    <Token![,]>::default().to_tokens(tokens);
-+                let mut last_is_variadic = false;
-+                for input in self.inputs.pairs() {
-+                    match input {
-+                        Pair::Punctuated(input, comma) => {
-+                            maybe_variadic_to_tokens(input, tokens);
-+                            comma.to_tokens(tokens);
-+                        }
-+                        Pair::End(input) => {
-+                            last_is_variadic = maybe_variadic_to_tokens(input, tokens);
-+                        }
-+                    }
-                 }
--                self.variadic.to_tokens(tokens);
-+                if self.variadic.is_some() && !last_is_variadic {
-+                    if !self.inputs.empty_or_trailing() {
-+                        <Token![,]>::default().to_tokens(tokens);
-+                    }
-+                    self.variadic.to_tokens(tokens);
-+                }
-             });
-             self.output.to_tokens(tokens);
-             self.generics.where_clause.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for Receiver {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-diff --git a/third_party/rust/syn/src/lib.rs b/third_party/rust/syn/src/lib.rs
---- a/third_party/rust/syn/src/lib.rs
-+++ b/third_party/rust/syn/src/lib.rs
-@@ -1,8 +1,16 @@
-+//! [![github]](https://github.com/dtolnay/syn)&ensp;[![crates-io]](https://crates.io/crates/syn)&ensp;[![docs-rs]](https://docs.rs/syn)
-+//!
-+//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
-+//! [crates-io]: https://img.shields.io/badge/crates.io-fc8d62?style=for-the-badge&labelColor=555555&logo=rust
-+//! [docs-rs]: https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logoColor=white&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDUxMiA1MTIiPjxwYXRoIGZpbGw9IiNmNWY1ZjUiIGQ9Ik00ODguNiAyNTAuMkwzOTIgMjE0VjEwNS41YzAtMTUtOS4zLTI4LjQtMjMuNC0zMy43bC0xMDAtMzcuNWMtOC4xLTMuMS0xNy4xLTMuMS0yNS4zIDBsLTEwMCAzNy41Yy0xNC4xIDUuMy0yMy40IDE4LjctMjMuNCAzMy43VjIxNGwtOTYuNiAzNi4yQzkuMyAyNTUuNSAwIDI2OC45IDAgMjgzLjlWMzk0YzAgMTMuNiA3LjcgMjYuMSAxOS45IDMyLjJsMTAwIDUwYzEwLjEgNS4xIDIyLjEgNS4xIDMyLjIgMGwxMDMuOS01MiAxMDMuOSA1MmMxMC4xIDUuMSAyMi4xIDUuMSAzMi4yIDBsMTAwLTUwYzEyLjItNi4xIDE5LjktMTguNiAxOS45LTMyLjJWMjgzLjljMC0xNS05LjMtMjguNC0yMy40LTMzLjd6TTM1OCAyMTQuOGwtODUgMzEuOXYtNjguMmw4NS0zN3Y3My4zek0xNTQgMTA0LjFsMTAyLTM4LjIgMTAyIDM4LjJ2LjZsLTEwMiA0MS40LTEwMi00MS40di0uNnptODQgMjkxLjFsLTg1IDQyLjV2LTc5LjFsODUtMzguOHY3NS40em0wLTExMmwtMTAyIDQxLjQtMTAyLTQxLjR2LS42bDEwMi0zOC4yIDEwMiAzOC4ydi42em0yNDAgMTEybC04NSA0Mi41di03OS4xbDg1LTM4Ljh2NzUuNHptMC0xMTJsLTEwMiA0MS40LTEwMi00MS40di0uNmwxMDItMzguMiAxMDIgMzguMnYuNnoiPjwvcGF0aD48L3N2Zz4K
-+//!
-+//! <br>
-+//!
- //! 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 use in Rust procedural macros, but
- //! contains some APIs that may be useful more generally.
- //!
- //! - **Data structures** — Syn provides a complete syntax tree that can
- //!   represent any valid Rust source code. The syntax tree is rooted at
-@@ -57,18 +65,18 @@
- //! syn = "1.0"
- //! quote = "1.0"
- //!
- //! [lib]
- //! proc-macro = true
- //! ```
- //!
- //! ```
--//! extern crate proc_macro;
--//!
-+//! # extern crate proc_macro;
-+//! #
- //! use proc_macro::TokenStream;
- //! use quote::quote;
- //! use syn::{parse_macro_input, DeriveInput};
- //!
- //! # const IGNORE_TOKENS: &str = stringify! {
- //! #[proc_macro_derive(MyMacro)]
- //! # };
- //! pub fn my_macro(input: TokenStream) -> TokenStream {
-@@ -237,59 +245,71 @@
- //! - **`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/1.0.5")]
-+#![doc(html_root_url = "https://docs.rs/syn/1.0.40")]
- #![deny(clippy::all, clippy::pedantic)]
- // Ignored clippy lints.
- #![allow(
--    clippy::block_in_if_condition_stmt,
-+    clippy::blocks_in_if_conditions,
-     clippy::cognitive_complexity,
-     clippy::doc_markdown,
-     clippy::eval_order_dependence,
-     clippy::inherent_to_string,
-     clippy::large_enum_variant,
-+    clippy::manual_non_exhaustive,
-+    clippy::match_like_matches_macro,
-+    clippy::match_on_vec_items,
-+    clippy::needless_doctest_main,
-     clippy::needless_pass_by_value,
-     clippy::never_loop,
-     clippy::suspicious_op_assign_impl,
-     clippy::too_many_arguments,
--    clippy::trivially_copy_pass_by_ref
-+    clippy::trivially_copy_pass_by_ref,
-+    clippy::unnecessary_unwrap
- )]
- // Ignored clippy_pedantic lints.
- #![allow(
-     clippy::cast_possible_truncation,
-+    clippy::default_trait_access,
-     clippy::empty_enum,
-+    clippy::expl_impl_clone_on_copy,
-     clippy::if_not_else,
-     clippy::items_after_statements,
-+    clippy::match_same_arms,
-+    clippy::missing_errors_doc,
-     clippy::module_name_repetitions,
-+    clippy::must_use_candidate,
-+    clippy::option_if_let_else,
-     clippy::shadow_unrelated,
-     clippy::similar_names,
-     clippy::single_match_else,
-+    clippy::too_many_lines,
-     clippy::unseparated_literal_suffix,
-     clippy::use_self,
--    clippy::used_underscore_binding
-+    clippy::used_underscore_binding,
-+    clippy::wildcard_imports
- )]
- 
- #[cfg(all(
-     not(all(target_arch = "wasm32", any(target_os = "unknown", target_os = "wasi"))),
-     feature = "proc-macro"
- ))]
- extern crate proc_macro;
- extern crate proc_macro2;
- extern crate unicode_xid;
- 
- #[cfg(feature = "printing")]
- extern crate quote;
- 
--#[cfg(any(feature = "full", feature = "derive"))]
- #[macro_use]
- mod macros;
- 
- // Not public API.
- #[cfg(feature = "parsing")]
- #[doc(hidden)]
- #[macro_use]
- pub mod group;
-@@ -302,17 +322,16 @@ pub use crate::ident::Ident;
- 
- #[cfg(any(feature = "full", feature = "derive"))]
- mod attr;
- #[cfg(any(feature = "full", feature = "derive"))]
- pub use crate::attr::{
-     AttrStyle, Attribute, AttributeArgs, Meta, MetaList, MetaNameValue, NestedMeta,
- };
- 
--#[cfg(any(feature = "full", feature = "derive"))]
- mod bigint;
- 
- #[cfg(any(feature = "full", feature = "derive"))]
- mod data;
- #[cfg(any(feature = "full", feature = "derive"))]
- pub use crate::data::{
-     Field, Fields, FieldsNamed, FieldsUnnamed, Variant, VisCrate, VisPublic, VisRestricted,
-     Visibility,
-@@ -359,19 +378,17 @@ pub use crate::item::{
- #[cfg(feature = "full")]
- mod file;
- #[cfg(feature = "full")]
- pub use crate::file::File;
- 
- mod lifetime;
- pub use crate::lifetime::Lifetime;
- 
--#[cfg(any(feature = "full", feature = "derive"))]
- mod lit;
--#[cfg(any(feature = "full", feature = "derive"))]
- pub use crate::lit::{
-     Lit, LitBool, LitByte, LitByteStr, LitChar, LitFloat, LitInt, LitStr, StrStyle,
- };
- 
- #[cfg(any(feature = "full", feature = "derive"))]
- mod mac;
- #[cfg(any(feature = "full", feature = "derive"))]
- pub use crate::mac::{Macro, MacroDelimiter};
-@@ -436,16 +453,19 @@ pub mod parse_quote;
-     feature = "proc-macro"
- ))]
- #[doc(hidden)]
- pub mod parse_macro_input;
- 
- #[cfg(all(feature = "parsing", feature = "printing"))]
- pub mod spanned;
- 
-+#[cfg(all(feature = "parsing", feature = "full"))]
-+mod whitespace;
-+
- 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.
-     ///
-@@ -477,17 +497,17 @@ mod gen {
-     ///     v.visit_expr(&*node.left);
-     ///     v.visit_bin_op(&node.op);
-     ///     v.visit_expr(&*node.right);
-     /// }
-     ///
-     /// /* ... */
-     /// ```
-     ///
--    /// *This module is available if Syn is built with the `"visit"` feature.*
-+    /// *This module is available only if Syn is built with the `"visit"` feature.*
-     ///
-     /// <br>
-     ///
-     /// # Example
-     ///
-     /// This visitor will print the name of every freestanding function in the
-     /// syntax tree, including nested functions.
-     ///
-@@ -598,17 +618,17 @@ mod gen {
-     ///     v.visit_expr_mut(&mut *node.left);
-     ///     v.visit_bin_op_mut(&mut node.op);
-     ///     v.visit_expr_mut(&mut *node.right);
-     /// }
-     ///
-     /// /* ... */
-     /// ```
-     ///
--    /// *This module is available if Syn is built with the `"visit-mut"`
-+    /// *This module is available only if Syn is built with the `"visit-mut"`
-     /// feature.*
-     ///
-     /// <br>
-     ///
-     /// # Example
-     ///
-     /// This mut visitor replace occurrences of u256 suffixed integer literals
-     /// like `999u256` with a macro invocation `bigint::u256!(999)`.
-@@ -697,17 +717,17 @@ mod gen {
-     ///         op: v.fold_bin_op(node.op),
-     ///         right: Box::new(v.fold_expr(*node.right)),
-     ///     }
-     /// }
-     ///
-     /// /* ... */
-     /// ```
-     ///
--    /// *This module is available if Syn is built with the `"fold"` feature.*
-+    /// *This module is available only if Syn is built with the `"fold"` feature.*
-     ///
-     /// <br>
-     ///
-     /// # Example
-     ///
-     /// This fold inserts parentheses to fully parenthesizes any expression.
-     ///
-     /// ```
-@@ -739,43 +759,63 @@ mod gen {
-     ///
-     ///     // Output: (((a)()) + (((b)((1))) * ((c).d)))
-     /// }
-     /// ```
-     #[cfg(feature = "fold")]
-     #[rustfmt::skip]
-     pub mod fold;
- 
-+    #[cfg(feature = "clone-impls")]
-+    #[rustfmt::skip]
-+    mod clone;
-+
-+    #[cfg(feature = "extra-traits")]
-+    #[rustfmt::skip]
-+    mod eq;
-+
-+    #[cfg(feature = "extra-traits")]
-+    #[rustfmt::skip]
-+    mod hash;
-+
-+    #[cfg(feature = "extra-traits")]
-+    #[rustfmt::skip]
-+    mod debug;
-+
-     #[cfg(any(feature = "full", feature = "derive"))]
-     #[path = "../gen_helper.rs"]
-     mod helper;
- }
- pub use crate::gen::*;
- 
- // Not public API.
- #[doc(hidden)]
- pub mod export;
- 
- mod custom_keyword;
- mod custom_punctuation;
- mod sealed;
-+mod span;
-+mod thread;
- 
- #[cfg(feature = "parsing")]
- mod lookahead;
- 
- #[cfg(feature = "parsing")]
- pub mod parse;
- 
--mod span;
-+#[cfg(feature = "full")]
-+mod reserved;
-+
-+#[cfg(all(any(feature = "full", feature = "derive"), feature = "parsing"))]
-+mod verbatim;
- 
- #[cfg(all(any(feature = "full", feature = "derive"), feature = "printing"))]
- mod print;
- 
--mod thread;
--
- ////////////////////////////////////////////////////////////////////////////////
- 
- #[allow(dead_code, non_camel_case_types)]
- struct private;
- 
- // https://github.com/rust-lang/rust/issues/62830
- #[cfg(feature = "parsing")]
- mod rustdoc_workaround {
-@@ -795,24 +835,24 @@ pub use crate::error::{Error, Result};
- /// 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`]: parse2
- ///
--/// *This function is available if Syn is built with both the `"parsing"` and
-+/// *This function is available only if Syn is built with both the `"parsing"` and
- /// `"proc-macro"` features.*
- ///
- /// # Examples
- ///
- /// ```
--/// extern crate proc_macro;
--///
-+/// # extern crate proc_macro;
-+/// #
- /// use proc_macro::TokenStream;
- /// use quote::quote;
- /// use syn::DeriveInput;
- ///
- /// # const IGNORE_TOKENS: &str = stringify! {
- /// #[proc_macro_derive(MyMacro)]
- /// # };
- /// pub fn my_macro(input: TokenStream) -> TokenStream {
-@@ -842,25 +882,25 @@ pub fn parse<T: parse::Parse>(tokens: pr
- /// 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
- /// body tokens of a [`Macro`] node. When in a procedural macro parsing the
- /// `proc_macro::TokenStream` provided by the compiler, use [`syn::parse`]
- /// instead.
- ///
- /// [`syn::parse`]: parse()
- ///
--/// *This function is available if Syn is built with the `"parsing"` feature.*
-+/// *This function is available only if Syn is built with the `"parsing"` feature.*
- #[cfg(feature = "parsing")]
- pub fn parse2<T: parse::Parse>(tokens: proc_macro2::TokenStream) -> Result<T> {
-     parse::Parser::parse2(T::parse, tokens)
- }
- 
- /// Parse a string of Rust code into the chosen syntax tree node.
- ///
--/// *This function is available if Syn is built with the `"parsing"` feature.*
-+/// *This function is available only 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
- ///
-@@ -869,19 +909,17 @@ pub fn parse2<T: parse::Parse>(tokens: p
- ///
- /// 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();
--/// # }
-+/// # run().unwrap();
- /// ```
- #[cfg(feature = "parsing")]
- pub fn parse_str<T: parse::Parse>(s: &str) -> Result<T> {
-     parse::Parser::parse_str(T::parse, s)
- }
- 
- // FIXME the name parse_file makes it sound like you might pass in a path to a
- // file, rather than the content.
-@@ -889,17 +927,17 @@ pub fn parse_str<T: parse::Parse>(s: &st
- ///
- /// 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
-+/// *This function is available only if Syn is built with the `"parsing"` and
- /// `"full"` features.*
- ///
- /// # Examples
- ///
- /// ```no_run
- /// use std::error::Error;
- /// use std::fs::File;
- /// use std::io::Read;
-@@ -913,35 +951,36 @@ pub fn parse_str<T: parse::Parse>(s: &st
- ///     if let Some(shebang) = ast.shebang {
- ///         println!("{}", shebang);
- ///     }
- ///     println!("{} items", ast.items.len());
- ///
- ///     Ok(())
- /// }
- /// #
--/// # fn main() {
--/// #     run().unwrap();
--/// # }
-+/// # run().unwrap();
- /// ```
- #[cfg(all(feature = "parsing", feature = "full"))]
- pub fn parse_file(mut content: &str) -> Result<File> {
-     // Strip the BOM if it is present
-     const BOM: &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 = "";
-+    if content.starts_with("#!") {
-+        let rest = whitespace::skip(&content[2..]);
-+        if !rest.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)
- }
-diff --git a/third_party/rust/syn/src/lifetime.rs b/third_party/rust/syn/src/lifetime.rs
---- a/third_party/rust/syn/src/lifetime.rs
-+++ b/third_party/rust/syn/src/lifetime.rs
-@@ -13,20 +13,18 @@ use crate::lookahead;
- ///
- /// - 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"`
-+/// *This type is available only if Syn is built with the `"derive"` or `"full"`
- /// feature.*
--#[cfg_attr(feature = "extra-traits", derive(Debug))]
--#[derive(Clone)]
- pub struct Lifetime {
-     pub apostrophe: Span,
-     pub ident: Ident,
- }
- 
- impl Lifetime {
-     /// # Panics
-     ///
-@@ -67,16 +65,25 @@ impl Lifetime {
- 
- impl Display for Lifetime {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-         "'".fmt(formatter)?;
-         self.ident.fmt(formatter)
-     }
- }
- 
-+impl Clone for Lifetime {
-+    fn clone(&self) -> Self {
-+        Lifetime {
-+            apostrophe: self.apostrophe,
-+            ident: self.ident.clone(),
-+        }
-+    }
-+}
-+
- impl PartialEq for Lifetime {
-     fn eq(&self, other: &Lifetime) -> bool {
-         self.ident.eq(&other.ident)
-     }
- }
- 
- impl Eq for Lifetime {}
- 
-diff --git a/third_party/rust/syn/src/lit.rs b/third_party/rust/syn/src/lit.rs
---- a/third_party/rust/syn/src/lit.rs
-+++ b/third_party/rust/syn/src/lit.rs
-@@ -17,28 +17,25 @@ use std::hash::{Hash, Hasher};
- use crate::lookahead;
- #[cfg(feature = "parsing")]
- use crate::parse::{Parse, Parser};
- use crate::{Error, Result};
- 
- 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
-     //
-     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
-     // blocked on https://github.com/rust-lang/rust/issues/62833
--    pub enum Lit #manual_extra_traits {
-+    pub enum Lit {
-         /// A UTF-8 string literal: `"foo"`.
-         Str(LitStr),
- 
-         /// A byte string literal: `b"foo"`.
-         ByteStr(LitByteStr),
- 
-         /// A byte literal: `b'f'`.
-         Byte(LitByte),
-@@ -59,184 +56,98 @@ ast_enum_of_structs! {
- 
-         /// A raw token literal not interpreted by Syn.
-         Verbatim(Literal),
-     }
- }
- 
- ast_struct! {
-     /// A UTF-8 string literal: `"foo"`.
--    ///
--    /// *This type is available if Syn is built with the `"derive"` or
--    /// `"full"` feature.*
--    pub struct LitStr #manual_extra_traits_debug {
--        repr: Box<LitStrRepr>,
-+    pub struct LitStr {
-+        repr: Box<LitRepr>,
-     }
- }
- 
--#[cfg_attr(feature = "clone-impls", derive(Clone))]
--struct LitStrRepr {
--    token: Literal,
--    suffix: Box<str>,
--}
--
- ast_struct! {
-     /// A byte string literal: `b"foo"`.
--    ///
--    /// *This type is available if Syn is built with the `"derive"` or
--    /// `"full"` feature.*
--    pub struct LitByteStr #manual_extra_traits_debug {
--        token: Literal,
-+    pub struct LitByteStr {
-+        repr: Box<LitRepr>,
-     }
- }
- 
- ast_struct! {
-     /// A byte literal: `b'f'`.
--    ///
--    /// *This type is available if Syn is built with the `"derive"` or
--    /// `"full"` feature.*
--    pub struct LitByte #manual_extra_traits_debug {
--        token: Literal,
-+    pub struct LitByte {
-+        repr: Box<LitRepr>,
-     }
- }
- 
- ast_struct! {
-     /// A character literal: `'a'`.
--    ///
--    /// *This type is available if Syn is built with the `"derive"` or
--    /// `"full"` feature.*
--    pub struct LitChar #manual_extra_traits_debug {
--        token: Literal,
-+    pub struct LitChar {
-+        repr: Box<LitRepr>,
-     }
- }
- 
-+struct LitRepr {
-+    token: Literal,
-+    suffix: Box<str>,
-+}
-+
- ast_struct! {
-     /// An integer literal: `1` or `1u16`.
--    ///
--    /// *This type is available if Syn is built with the `"derive"` or
--    /// `"full"` feature.*
--    pub struct LitInt #manual_extra_traits_debug {
-+    pub struct LitInt {
-         repr: Box<LitIntRepr>,
-     }
- }
- 
--#[cfg_attr(feature = "clone-impls", derive(Clone))]
- struct LitIntRepr {
-     token: Literal,
-     digits: Box<str>,
-     suffix: Box<str>,
- }
- 
- ast_struct! {
-     /// 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 struct LitFloat #manual_extra_traits_debug {
-+    pub struct LitFloat {
-         repr: Box<LitFloatRepr>,
-     }
- }
- 
--#[cfg_attr(feature = "clone-impls", derive(Clone))]
- struct LitFloatRepr {
-     token: Literal,
-     digits: Box<str>,
-     suffix: Box<str>,
- }
- 
- ast_struct! {
-     /// A boolean literal: `true` or `false`.
--    ///
--    /// *This type is available if Syn is built with the `"derive"` or
--    /// `"full"` feature.*
--    pub struct LitBool #manual_extra_traits_debug {
-+    pub struct LitBool {
-         pub value: bool,
-         pub span: Span,
-     }
- }
- 
--#[cfg(feature = "extra-traits")]
--impl Eq for Lit {}
--
--#[cfg(feature = "extra-traits")]
--impl PartialEq for Lit {
--    fn eq(&self, other: &Self) -> bool {
--        match (self, other) {
--            (Lit::Str(this), Lit::Str(other)) => this == other,
--            (Lit::ByteStr(this), Lit::ByteStr(other)) => this == other,
--            (Lit::Byte(this), Lit::Byte(other)) => this == other,
--            (Lit::Char(this), Lit::Char(other)) => this == other,
--            (Lit::Int(this), Lit::Int(other)) => this == other,
--            (Lit::Float(this), Lit::Float(other)) => this == other,
--            (Lit::Bool(this), Lit::Bool(other)) => this == other,
--            (Lit::Verbatim(this), Lit::Verbatim(other)) => this.to_string() == other.to_string(),
--            _ => false,
--        }
--    }
--}
--
--#[cfg(feature = "extra-traits")]
--impl Hash for Lit {
--    fn hash<H>(&self, hash: &mut H)
--    where
--        H: Hasher,
--    {
--        match self {
--            Lit::Str(lit) => {
--                hash.write_u8(0);
--                lit.hash(hash);
--            }
--            Lit::ByteStr(lit) => {
--                hash.write_u8(1);
--                lit.hash(hash);
--            }
--            Lit::Byte(lit) => {
--                hash.write_u8(2);
--                lit.hash(hash);
--            }
--            Lit::Char(lit) => {
--                hash.write_u8(3);
--                lit.hash(hash);
--            }
--            Lit::Int(lit) => {
--                hash.write_u8(4);
--                lit.hash(hash);
--            }
--            Lit::Float(lit) => {
--                hash.write_u8(5);
--                lit.hash(hash);
--            }
--            Lit::Bool(lit) => {
--                hash.write_u8(6);
--                lit.hash(hash);
--            }
--            Lit::Verbatim(lit) => {
--                hash.write_u8(7);
--                lit.to_string().hash(hash);
--            }
--        }
--    }
--}
--
- impl LitStr {
-     pub fn new(value: &str, span: Span) -> Self {
--        let mut lit = Literal::string(value);
--        lit.set_span(span);
-+        let mut token = Literal::string(value);
-+        token.set_span(span);
-         LitStr {
--            repr: Box::new(LitStrRepr {
--                token: lit,
-+            repr: Box::new(LitRepr {
-+                token,
-                 suffix: Box::<str>::default(),
-             }),
-         }
-     }
- 
-     pub fn value(&self) -> String {
--        let (value, _) = value::parse_lit_str(&self.repr.token.to_string());
-+        let repr = self.repr.token.to_string();
-+        let (value, _suffix) = value::parse_lit_str(&repr);
-         String::from(value)
-     }
- 
-     /// 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`.
-     ///
-     /// # Example
-@@ -306,17 +217,17 @@ impl LitStr {
-                 .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 &mut token {
-                 TokenTree::Group(g) => {
--                    let stream = respan_token_stream(g.stream().clone(), span);
-+                    let stream = respan_token_stream(g.stream(), span);
-                     *g = Group::new(g.delimiter(), stream);
-                     g.set_span(span);
-                 }
-                 other => other.set_span(span),
-             }
-             token
-         }
- 
-@@ -340,86 +251,124 @@ impl LitStr {
-         &self.repr.suffix
-     }
- }
- 
- impl LitByteStr {
-     pub fn new(value: &[u8], span: Span) -> Self {
-         let mut token = Literal::byte_string(value);
-         token.set_span(span);
--        LitByteStr { token }
-+        LitByteStr {
-+            repr: Box::new(LitRepr {
-+                token,
-+                suffix: Box::<str>::default(),
-+            }),
-+        }
-     }
- 
-     pub fn value(&self) -> Vec<u8> {
--        value::parse_lit_byte_str(&self.token.to_string())
-+        let repr = self.repr.token.to_string();
-+        let (value, _suffix) = value::parse_lit_byte_str(&repr);
-+        value
-     }
- 
-     pub fn span(&self) -> Span {
--        self.token.span()
-+        self.repr.token.span()
-     }
- 
-     pub fn set_span(&mut self, span: Span) {
--        self.token.set_span(span)
-+        self.repr.token.set_span(span)
-+    }
-+
-+    pub fn suffix(&self) -> &str {
-+        &self.repr.suffix
-     }
- }
- 
- impl LitByte {
-     pub fn new(value: u8, span: Span) -> Self {
-         let mut token = Literal::u8_suffixed(value);
-         token.set_span(span);
--        LitByte { token }
-+        LitByte {
-+            repr: Box::new(LitRepr {
-+                token,
-+                suffix: Box::<str>::default(),
-+            }),
-+        }
-     }
- 
-     pub fn value(&self) -> u8 {
--        value::parse_lit_byte(&self.token.to_string())
-+        let repr = self.repr.token.to_string();
-+        let (value, _suffix) = value::parse_lit_byte(&repr);
-+        value
-     }
- 
-     pub fn span(&self) -> Span {
--        self.token.span()
-+        self.repr.token.span()
-     }
- 
-     pub fn set_span(&mut self, span: Span) {
--        self.token.set_span(span)
-+        self.repr.token.set_span(span)
-+    }
-+
-+    pub fn suffix(&self) -> &str {
-+        &self.repr.suffix
-     }
- }
- 
- impl LitChar {
-     pub fn new(value: char, span: Span) -> Self {
-         let mut token = Literal::character(value);
-         token.set_span(span);
--        LitChar { token }
-+        LitChar {
-+            repr: Box::new(LitRepr {
-+                token,
-+                suffix: Box::<str>::default(),
-+            }),
-+        }
-     }
- 
-     pub fn value(&self) -> char {
--        value::parse_lit_char(&self.token.to_string())
-+        let repr = self.repr.token.to_string();
-+        let (value, _suffix) = value::parse_lit_char(&repr);
-+        value
-     }
- 
-     pub fn span(&self) -> Span {
--        self.token.span()
-+        self.repr.token.span()
-     }
- 
-     pub fn set_span(&mut self, span: Span) {
--        self.token.set_span(span)
-+        self.repr.token.set_span(span)
-+    }
-+
-+    pub fn suffix(&self) -> &str {
-+        &self.repr.suffix
-     }
- }
- 
- impl LitInt {
-     pub fn new(repr: &str, span: Span) -> Self {
--        if let Some((digits, suffix)) = value::parse_lit_int(repr) {
--            let mut token = value::to_literal(repr);
--            token.set_span(span);
--            LitInt {
--                repr: Box::new(LitIntRepr {
--                    token,
--                    digits,
--                    suffix,
--                }),
--            }
--        } else {
--            panic!("Not an integer literal: `{}`", repr);
-+        let (digits, suffix) = match value::parse_lit_int(repr) {
-+            Some(parse) => parse,
-+            None => panic!("Not an integer literal: `{}`", repr),
-+        };
-+
-+        let mut token = match value::to_literal(repr, &digits, &suffix) {
-+            Some(token) => token,
-+            None => panic!("Unsupported integer literal: `{}`", repr),
-+        };
-+
-+        token.set_span(span);
-+        LitInt {
-+            repr: Box::new(LitIntRepr {
-+                token,
-+                digits,
-+                suffix,
-+            }),
-         }
-     }
- 
-     pub fn base10_digits(&self) -> &str {
-         &self.repr.digits
-     }
- 
-     /// Parses the literal into a selected number type.
-@@ -487,28 +436,33 @@ impl From<Literal> for LitInt {
- impl Display for LitInt {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-         self.repr.token.fmt(formatter)
-     }
- }
- 
- impl LitFloat {
-     pub fn new(repr: &str, span: Span) -> Self {
--        if let Some((digits, suffix)) = value::parse_lit_float(repr) {
--            let mut token = value::to_literal(repr);
--            token.set_span(span);
--            LitFloat {
--                repr: Box::new(LitFloatRepr {
--                    token,
--                    digits,
--                    suffix,
--                }),
--            }
--        } else {
--            panic!("Not a float literal: `{}`", repr);
-+        let (digits, suffix) = match value::parse_lit_float(repr) {
-+            Some(parse) => parse,
-+            None => panic!("Not a float literal: `{}`", repr),
-+        };
-+
-+        let mut token = match value::to_literal(repr, &digits, &suffix) {
-+            Some(token) => token,
-+            None => panic!("Unsupported float literal: `{}`", repr),
-+        };
-+
-+        token.set_span(span);
-+        LitFloat {
-+            repr: Box::new(LitFloatRepr {
-+                token,
-+                digits,
-+                suffix,
-+            }),
-         }
-     }
- 
-     pub fn base10_digits(&self) -> &str {
-         &self.repr.digits
-     }
- 
-     pub fn base10_parse<N>(&self) -> Result<N>
-@@ -570,35 +524,35 @@ mod debug_impls {
-                 .finish()
-         }
-     }
- 
-     impl Debug for LitByteStr {
-         fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-             formatter
-                 .debug_struct("LitByteStr")
--                .field("token", &format_args!("{}", self.token))
-+                .field("token", &format_args!("{}", self.repr.token))
-                 .finish()
-         }
-     }
- 
-     impl Debug for LitByte {
-         fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-             formatter
-                 .debug_struct("LitByte")
--                .field("token", &format_args!("{}", self.token))
-+                .field("token", &format_args!("{}", self.repr.token))
-                 .finish()
-         }
-     }
- 
-     impl Debug for LitChar {
-         fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-             formatter
-                 .debug_struct("LitChar")
--                .field("token", &format_args!("{}", self.token))
-+                .field("token", &format_args!("{}", self.repr.token))
-                 .finish()
-         }
-     }
- 
-     impl Debug for LitInt {
-         fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-             formatter
-                 .debug_struct("LitInt")
-@@ -621,61 +575,102 @@ mod debug_impls {
-             formatter
-                 .debug_struct("LitBool")
-                 .field("value", &self.value)
-                 .finish()
-         }
-     }
- }
- 
-+#[cfg(feature = "clone-impls")]
-+impl Clone for LitRepr {
-+    fn clone(&self) -> Self {
-+        LitRepr {
-+            token: self.token.clone(),
-+            suffix: self.suffix.clone(),
-+        }
-+    }
-+}
-+
-+#[cfg(feature = "clone-impls")]
-+impl Clone for LitIntRepr {
-+    fn clone(&self) -> Self {
-+        LitIntRepr {
-+            token: self.token.clone(),
-+            digits: self.digits.clone(),
-+            suffix: self.suffix.clone(),
-+        }
-+    }
-+}
-+
-+#[cfg(feature = "clone-impls")]
-+impl Clone for LitFloatRepr {
-+    fn clone(&self) -> Self {
-+        LitFloatRepr {
-+            token: self.token.clone(),
-+            digits: self.digits.clone(),
-+            suffix: self.suffix.clone(),
-+        }
-+    }
-+}
-+
- macro_rules! lit_extra_traits {
--    ($ty:ident, $($field:ident).+) => {
--        #[cfg(feature = "extra-traits")]
--        impl Eq for $ty {}
-+    ($ty:ident) => {
-+        #[cfg(feature = "clone-impls")]
-+        impl Clone for $ty {
-+            fn clone(&self) -> Self {
-+                $ty {
-+                    repr: self.repr.clone(),
-+                }
-+            }
-+        }
- 
-         #[cfg(feature = "extra-traits")]
-         impl PartialEq for $ty {
-             fn eq(&self, other: &Self) -> bool {
--                self.$($field).+.to_string() == other.$($field).+.to_string()
-+                self.repr.token.to_string() == other.repr.token.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);
-+                self.repr.token.to_string().hash(state);
-             }
-         }
- 
-         #[cfg(feature = "parsing")]
-         #[doc(hidden)]
-         #[allow(non_snake_case)]
-         pub fn $ty(marker: lookahead::TokenMarker) -> $ty {
-             match marker {}
-         }
-     };
- }
- 
--lit_extra_traits!(LitStr, repr.token);
--lit_extra_traits!(LitByteStr, token);
--lit_extra_traits!(LitByte, token);
--lit_extra_traits!(LitChar, token);
--lit_extra_traits!(LitInt, repr.token);
--lit_extra_traits!(LitFloat, repr.token);
--lit_extra_traits!(LitBool, value);
-+lit_extra_traits!(LitStr);
-+lit_extra_traits!(LitByteStr);
-+lit_extra_traits!(LitByte);
-+lit_extra_traits!(LitChar);
-+lit_extra_traits!(LitInt);
-+lit_extra_traits!(LitFloat);
-+
-+#[cfg(feature = "parsing")]
-+#[doc(hidden)]
-+#[allow(non_snake_case)]
-+pub fn LitBool(marker: lookahead::TokenMarker) -> LitBool {
-+    match marker {}
-+}
- 
- 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),
-     }
-@@ -686,43 +681,93 @@ ast_enum! {
- #[allow(non_snake_case)]
- pub fn Lit(marker: lookahead::TokenMarker) -> Lit {
-     match marker {}
- }
- 
- #[cfg(feature = "parsing")]
- pub mod parsing {
-     use super::*;
-+    use crate::buffer::Cursor;
-     use crate::parse::{Parse, ParseStream, Result};
-+    use proc_macro2::Punct;
- 
-     impl Parse for Lit {
-         fn parse(input: ParseStream) -> Result<Self> {
-             input.step(|cursor| {
-                 if let Some((lit, rest)) = cursor.literal() {
-                     return Ok((Lit::new(lit), rest));
-                 }
--                while let Some((ident, rest)) = cursor.ident() {
--                    let value = if ident == "true" {
--                        true
--                    } else if ident == "false" {
--                        false
--                    } else {
--                        break;
--                    };
--                    let lit_bool = LitBool {
--                        value,
--                        span: ident.span(),
--                    };
--                    return Ok((Lit::Bool(lit_bool), rest));
-+
-+                if let Some((ident, rest)) = cursor.ident() {
-+                    let value = ident == "true";
-+                    if value || ident == "false" {
-+                        let lit_bool = LitBool {
-+                            value,
-+                            span: ident.span(),
-+                        };
-+                        return Ok((Lit::Bool(lit_bool), rest));
-+                    }
-                 }
-+
-+                if let Some((punct, rest)) = cursor.punct() {
-+                    if punct.as_char() == '-' {
-+                        if let Some((lit, rest)) = parse_negative_lit(punct, rest) {
-+                            return Ok((lit, rest));
-+                        }
-+                    }
-+                }
-+
-                 Err(cursor.error("expected literal"))
-             })
-         }
-     }
- 
-+    fn parse_negative_lit(neg: Punct, cursor: Cursor) -> Option<(Lit, Cursor)> {
-+        let (lit, rest) = cursor.literal()?;
-+
-+        let mut span = neg.span();
-+        span = span.join(lit.span()).unwrap_or(span);
-+
-+        let mut repr = lit.to_string();
-+        repr.insert(0, '-');
-+
-+        if !(repr.ends_with("f32") || repr.ends_with("f64")) {
-+            if let Some((digits, suffix)) = value::parse_lit_int(&repr) {
-+                if let Some(mut token) = value::to_literal(&repr, &digits, &suffix) {
-+                    token.set_span(span);
-+                    return Some((
-+                        Lit::Int(LitInt {
-+                            repr: Box::new(LitIntRepr {
-+                                token,
-+                                digits,
-+                                suffix,
-+                            }),
-+                        }),
-+                        rest,
-+                    ));
-+                }
-+            }
-+        }
-+
-+        let (digits, suffix) = value::parse_lit_float(&repr)?;
-+        let mut token = value::to_literal(&repr, &digits, &suffix)?;
-+        token.set_span(span);
-+        Some((
-+            Lit::Float(LitFloat {
-+                repr: Box::new(LitFloatRepr {
-+                    token,
-+                    digits,
-+                    suffix,
-+                }),
-+            }),
-+            rest,
-+        ))
-+    }
-+
-     impl Parse for LitStr {
-         fn parse(input: ParseStream) -> Result<Self> {
-             let head = input.fork();
-             match input.parse()? {
-                 Lit::Str(lit) => Ok(lit),
-                 _ => Err(head.error("expected string literal")),
-             }
-         }
-@@ -798,29 +843,29 @@ mod printing {
-     impl ToTokens for LitStr {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-             self.repr.token.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for LitByteStr {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
--            self.token.to_tokens(tokens);
-+            self.repr.token.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for LitByte {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
--            self.token.to_tokens(tokens);
-+            self.repr.token.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for LitChar {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
--            self.token.to_tokens(tokens);
-+            self.repr.token.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for LitInt {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-             self.repr.token.to_tokens(tokens);
-         }
-     }
-@@ -850,30 +895,39 @@ mod value {
-         /// Interpret a Syn literal from a proc-macro2 literal.
-         pub fn new(token: Literal) -> Self {
-             let repr = token.to_string();
- 
-             match byte(&repr, 0) {
-                 b'"' | b'r' => {
-                     let (_, suffix) = parse_lit_str(&repr);
-                     return Lit::Str(LitStr {
--                        repr: Box::new(LitStrRepr { token, suffix }),
-+                        repr: Box::new(LitRepr { token, suffix }),
-                     });
-                 }
-                 b'b' => match byte(&repr, 1) {
-                     b'"' | b'r' => {
--                        return Lit::ByteStr(LitByteStr { token });
-+                        let (_, suffix) = parse_lit_byte_str(&repr);
-+                        return Lit::ByteStr(LitByteStr {
-+                            repr: Box::new(LitRepr { token, suffix }),
-+                        });
-                     }
-                     b'\'' => {
--                        return Lit::Byte(LitByte { token });
-+                        let (_, suffix) = parse_lit_byte(&repr);
-+                        return Lit::Byte(LitByte {
-+                            repr: Box::new(LitRepr { token, suffix }),
-+                        });
-                     }
-                     _ => {}
-                 },
-                 b'\'' => {
--                    return Lit::Char(LitChar { token });
-+                    let (_, suffix) = parse_lit_char(&repr);
-+                    return Lit::Char(LitChar {
-+                        repr: Box::new(LitRepr { token, suffix }),
-+                    });
-                 }
-                 b'0'..=b'9' | b'-' => {
-                     if !(repr.ends_with("f32") || repr.ends_with("f64")) {
-                         if let Some((digits, suffix)) = parse_lit_int(&repr) {
-                             return Lit::Int(LitInt {
-                                 repr: Box::new(LitIntRepr {
-                                     token,
-                                     digits,
-@@ -900,16 +954,54 @@ mod value {
-                         });
-                     }
-                 }
-                 _ => {}
-             }
- 
-             panic!("Unrecognized literal: `{}`", repr);
-         }
-+
-+        pub fn suffix(&self) -> &str {
-+            match self {
-+                Lit::Str(lit) => lit.suffix(),
-+                Lit::ByteStr(lit) => lit.suffix(),
-+                Lit::Byte(lit) => lit.suffix(),
-+                Lit::Char(lit) => lit.suffix(),
-+                Lit::Int(lit) => lit.suffix(),
-+                Lit::Float(lit) => lit.suffix(),
-+                Lit::Bool(_) | Lit::Verbatim(_) => "",
-+            }
-+        }
-+
-+        pub fn span(&self) -> Span {
-+            match self {
-+                Lit::Str(lit) => lit.span(),
-+                Lit::ByteStr(lit) => lit.span(),
-+                Lit::Byte(lit) => lit.span(),
-+                Lit::Char(lit) => lit.span(),
-+                Lit::Int(lit) => lit.span(),
-+                Lit::Float(lit) => lit.span(),
-+                Lit::Bool(lit) => lit.span,
-+                Lit::Verbatim(lit) => lit.span(),
-+            }
-+        }
-+
-+        pub fn set_span(&mut self, span: Span) {
-+            match self {
-+                Lit::Str(lit) => lit.set_span(span),
-+                Lit::ByteStr(lit) => lit.set_span(span),
-+                Lit::Byte(lit) => lit.set_span(span),
-+                Lit::Char(lit) => lit.set_span(span),
-+                Lit::Int(lit) => lit.set_span(span),
-+                Lit::Float(lit) => lit.set_span(span),
-+                Lit::Bool(lit) => lit.span = span,
-+                Lit::Verbatim(lit) => lit.set_span(span),
-+            }
-+        }
-     }
- 
-     /// 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]
-@@ -999,140 +1091,144 @@ mod value {
-         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() {
-+        let close = s.rfind('"').unwrap();
-+        for end in s[close + 1..close + 1 + pounds].bytes() {
-             assert_eq!(end, b'#');
-         }
- 
--        let content = s[pounds + 1..s.len() - pounds - 1]
--            .to_owned()
--            .into_boxed_str();
--        let suffix = Box::<str>::default(); // todo
-+        let content = s[pounds + 1..close].to_owned().into_boxed_str();
-+        let suffix = s[close + 1 + pounds..].to_owned().into_boxed_str();
-         (content, suffix)
-     }
- 
--    pub fn parse_lit_byte_str(s: &str) -> Vec<u8> {
-+    // Returns (content, suffix).
-+    pub fn parse_lit_byte_str(s: &str) -> (Vec<u8>, Box<str>) {
-         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
-     #[allow(clippy::needless_continue)]
--    fn parse_lit_byte_str_cooked(mut s: &str) -> Vec<u8> {
-+    fn parse_lit_byte_str_cooked(mut s: &str) -> (Vec<u8>, Box<str>) {
-         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 v = s.as_bytes();
- 
-         let mut out = Vec::new();
-         'outer: loop {
--            let byte = match byte(s, 0) {
-+            let byte = match byte(v, 0) {
-                 b'"' => break,
-                 b'\\' => {
--                    let b = byte(s, 1);
--                    s = &s[2..];
-+                    let b = byte(v, 1);
-+                    v = &v[2..];
-                     match b {
-                         b'x' => {
--                            let (b, rest) = backslash_x(s);
--                            s = rest;
-+                            let (b, rest) = backslash_x(v);
-+                            v = 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 byte = byte(v, 0);
-                             let ch = char::from_u32(u32::from(byte)).unwrap();
-                             if ch.is_whitespace() {
--                                s = &s[1..];
-+                                v = &v[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..];
-+                    assert_eq!(byte(v, 1), b'\n', "Bare CR not allowed in string");
-+                    v = &v[2..];
-                     b'\n'
-                 }
-                 b => {
--                    s = &s[1..];
-+                    v = &v[1..];
-                     b
-                 }
-             };
-             out.push(byte);
-         }
- 
--        assert_eq!(s, b"\"");
--        out
-+        assert_eq!(byte(v, 0), b'"');
-+        let suffix = s[s.len() - v.len() + 1..].to_owned().into_boxed_str();
-+        (out, suffix)
-     }
- 
--    fn parse_lit_byte_str_raw(s: &str) -> Vec<u8> {
-+    fn parse_lit_byte_str_raw(s: &str) -> (Vec<u8>, Box<str>) {
-         assert_eq!(byte(s, 0), b'b');
--        String::from(parse_lit_str_raw(&s[1..]).0).into_bytes()
-+        let (value, suffix) = parse_lit_str_raw(&s[1..]);
-+        (String::from(value).into_bytes(), suffix)
-     }
- 
--    pub fn parse_lit_byte(s: &str) -> u8 {
-+    // Returns (value, suffix).
-+    pub fn parse_lit_byte(s: &str) -> (u8, Box<str>) {
-         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 mut v = s[2..].as_bytes();
- 
--        let b = match byte(s, 0) {
-+        let b = match byte(v, 0) {
-             b'\\' => {
--                let b = byte(s, 1);
--                s = &s[2..];
-+                let b = byte(v, 1);
-+                v = &v[2..];
-                 match b {
-                     b'x' => {
--                        let (b, rest) = backslash_x(s);
--                        s = rest;
-+                        let (b, rest) = backslash_x(v);
-+                        v = 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..];
-+                v = &v[1..];
-                 b
-             }
-         };
- 
--        assert_eq!(byte(s, 0), b'\'');
--        b
-+        assert_eq!(byte(v, 0), b'\'');
-+        let suffix = s[s.len() - v.len() + 1..].to_owned().into_boxed_str();
-+        (b, suffix)
-     }
- 
--    pub fn parse_lit_char(mut s: &str) -> char {
-+    // Returns (value, suffix).
-+    pub fn parse_lit_char(mut s: &str) -> (char, Box<str>) {
-         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 {
-@@ -1158,18 +1254,19 @@ mod value {
-                 }
-             }
-             _ => {
-                 let ch = next_chr(s);
-                 s = &s[ch.len_utf8()..];
-                 ch
-             }
-         };
--        assert_eq!(s, "\'", "Expected end of char literal");
--        ch
-+        assert_eq!(byte(s, 0), b'\'');
-+        let suffix = s[1..].to_owned().into_boxed_str();
-+        (ch, suffix)
-     }
- 
-     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);
-@@ -1329,17 +1426,21 @@ mod value {
-                     if has_e || has_dot {
-                         return None;
-                     }
-                     has_dot = true;
-                     bytes[write] = b'.';
-                 }
-                 b'e' | b'E' => {
-                     if has_e {
--                        return None;
-+                        if has_exponent {
-+                            break;
-+                        } else {
-+                            return None;
-+                        }
-                     }
-                     has_e = true;
-                     bytes[write] = b'e';
-                 }
-                 b'-' | b'+' => {
-                     if has_sign || has_exponent || !has_e {
-                         return None;
-                     }
-@@ -1367,16 +1468,38 @@ mod value {
-         digits.truncate(write);
-         if suffix.is_empty() || crate::ident::xid_ok(&suffix) {
-             Some((digits.into_boxed_str(), suffix.into_boxed_str()))
-         } else {
-             None
-         }
-     }
- 
--    pub fn to_literal(s: &str) -> Literal {
--        let stream = s.parse::<TokenStream>().unwrap();
--        match stream.into_iter().next().unwrap() {
--            TokenTree::Literal(l) => l,
--            _ => unreachable!(),
-+    pub fn to_literal(repr: &str, digits: &str, suffix: &str) -> Option<Literal> {
-+        if repr.starts_with('-') {
-+            if suffix == "f64" {
-+                digits.parse().ok().map(Literal::f64_suffixed)
-+            } else if suffix == "f32" {
-+                digits.parse().ok().map(Literal::f32_suffixed)
-+            } else if suffix == "i64" {
-+                digits.parse().ok().map(Literal::i64_suffixed)
-+            } else if suffix == "i32" {
-+                digits.parse().ok().map(Literal::i32_suffixed)
-+            } else if suffix == "i16" {
-+                digits.parse().ok().map(Literal::i16_suffixed)
-+            } else if suffix == "i8" {
-+                digits.parse().ok().map(Literal::i8_suffixed)
-+            } else if !suffix.is_empty() {
-+                None
-+            } else if digits.contains('.') {
-+                digits.parse().ok().map(Literal::f64_unsuffixed)
-+            } else {
-+                digits.parse().ok().map(Literal::i64_unsuffixed)
-+            }
-+        } else {
-+            let stream = repr.parse::<TokenStream>().unwrap();
-+            match stream.into_iter().next().unwrap() {
-+                TokenTree::Literal(l) => Some(l),
-+                _ => unreachable!(),
-+            }
-         }
-     }
- }
-diff --git a/third_party/rust/syn/src/mac.rs b/third_party/rust/syn/src/mac.rs
---- a/third_party/rust/syn/src/mac.rs
-+++ b/third_party/rust/syn/src/mac.rs
-@@ -1,79 +1,56 @@
- use super::*;
- use crate::token::{Brace, Bracket, Paren};
- use proc_macro2::TokenStream;
- #[cfg(feature = "parsing")]
--use proc_macro2::{Delimiter, Span, TokenTree};
-+use proc_macro2::{Delimiter, Group, Span, TokenTree};
- 
- #[cfg(feature = "parsing")]
- use crate::parse::{Parse, ParseStream, Parser, Result};
--#[cfg(feature = "extra-traits")]
--use crate::tt::TokenStreamHelper;
--#[cfg(feature = "extra-traits")]
--use std::hash::{Hash, Hasher};
- 
- ast_struct! {
-     /// A macro invocation: `println!("{}", mac)`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-+    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
-     /// feature.*
--    pub struct Macro #manual_extra_traits {
-+    pub struct Macro {
-         pub path: Path,
-         pub bang_token: Token![!],
-         pub delimiter: MacroDelimiter,
-         pub tokens: 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"`
-+    /// *This type is available only 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.tokens) == TokenStreamHelper(&other.tokens)
--    }
--}
--
--#[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.tokens).hash(state);
--    }
--}
--
- #[cfg(feature = "parsing")]
--fn delimiter_span(delimiter: &MacroDelimiter) -> Span {
--    match delimiter {
-+fn delimiter_span_close(macro_delimiter: &MacroDelimiter) -> Span {
-+    let delimiter = match macro_delimiter {
-+        MacroDelimiter::Paren(_) => Delimiter::Parenthesis,
-+        MacroDelimiter::Brace(_) => Delimiter::Brace,
-+        MacroDelimiter::Bracket(_) => Delimiter::Bracket,
-+    };
-+    let mut group = Group::new(delimiter, TokenStream::new());
-+    group.set_span(match macro_delimiter {
-         MacroDelimiter::Paren(token) => token.span,
-         MacroDelimiter::Brace(token) => token.span,
-         MacroDelimiter::Bracket(token) => token.span,
--    }
-+    });
-+    group.span_close()
- }
- 
- impl Macro {
-     /// Parse the tokens within the macro invocation's delimiters into a syntax
-     /// tree.
-     ///
-     /// This is equivalent to `syn::parse2::<T>(mac.tokens)` except that it
-     /// produces a more useful span when `tokens` is empty.
-@@ -158,19 +135,17 @@ impl Macro {
-     pub fn parse_body<T: Parse>(&self) -> Result<T> {
-         self.parse_body_with(T::parse)
-     }
- 
-     /// Parse the tokens within the macro invocation's delimiters using the
-     /// given parser.
-     #[cfg(feature = "parsing")]
-     pub fn parse_body_with<F: Parser>(&self, parser: F) -> Result<F::Output> {
--        // TODO: see if we can get a group.span_close() span in here as the
--        // scope, rather than the span of the whole group.
--        let scope = delimiter_span(&self.delimiter);
-+        let scope = delimiter_span_close(&self.delimiter);
-         crate::parse::parse_scoped(parser, scope, self.tokens.clone())
-     }
- }
- 
- #[cfg(feature = "parsing")]
- pub fn parse_delimiter(input: ParseStream) -> Result<(MacroDelimiter, TokenStream)> {
-     input.step(|cursor| {
-         if let Some((TokenTree::Group(g), rest)) = cursor.token_tree() {
-diff --git a/third_party/rust/syn/src/macros.rs b/third_party/rust/syn/src/macros.rs
---- a/third_party/rust/syn/src/macros.rs
-+++ b/third_party/rust/syn/src/macros.rs
-@@ -1,56 +1,33 @@
- macro_rules! ast_struct {
-     (
-         [$($attrs_pub:tt)*]
-         struct $name:ident #full $($rest:tt)*
-     ) => {
-         #[cfg(feature = "full")]
--        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
--        #[cfg_attr(feature = "clone-impls", derive(Clone))]
-         $($attrs_pub)* struct $name $($rest)*
- 
-         #[cfg(not(feature = "full"))]
--        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
--        #[cfg_attr(feature = "clone-impls", derive(Clone))]
-         $($attrs_pub)* struct $name {
--            _noconstruct: (),
-+            _noconstruct: ::std::marker::PhantomData<::proc_macro2::Span>,
-         }
- 
-         #[cfg(all(not(feature = "full"), feature = "printing"))]
-         impl ::quote::ToTokens for $name {
-             fn to_tokens(&self, _: &mut ::proc_macro2::TokenStream) {
-                 unreachable!()
-             }
-         }
-     };
- 
-     (
-         [$($attrs_pub:tt)*]
--        struct $name:ident #manual_extra_traits $($rest:tt)*
--    ) => {
--        #[cfg_attr(feature = "extra-traits", derive(Debug))]
--        #[cfg_attr(feature = "clone-impls", derive(Clone))]
--        $($attrs_pub)* struct $name $($rest)*
--    };
--
--    (
--        [$($attrs_pub:tt)*]
--        struct $name:ident #manual_extra_traits_debug $($rest:tt)*
--    ) => {
--        #[cfg_attr(feature = "clone-impls", derive(Clone))]
--        $($attrs_pub)* struct $name $($rest)*
--    };
--
--    (
--        [$($attrs_pub:tt)*]
-         struct $name:ident $($rest:tt)*
-     ) => {
--        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
--        #[cfg_attr(feature = "clone-impls", derive(Clone))]
-         $($attrs_pub)* struct $name $($rest)*
-     };
- 
-     ($($t:tt)*) => {
-         strip_attrs_pub!(ast_struct!($($t)*));
-     };
- }
- 
-@@ -60,29 +37,18 @@ macro_rules! ast_enum {
-         [$($attrs_pub:tt)*]
-         enum $name:ident #no_visit $($rest:tt)*
-     ) => (
-         ast_enum!([$($attrs_pub)*] enum $name $($rest)*);
-     );
- 
-     (
-         [$($attrs_pub:tt)*]
--        enum $name:ident #manual_extra_traits $($rest:tt)*
--    ) => (
--        #[cfg_attr(feature = "extra-traits", derive(Debug))]
--        #[cfg_attr(feature = "clone-impls", derive(Clone))]
--        $($attrs_pub)* enum $name $($rest)*
--    );
--
--    (
--        [$($attrs_pub:tt)*]
-         enum $name:ident $($rest:tt)*
-     ) => (
--        #[cfg_attr(feature = "extra-traits", derive(Debug, Eq, PartialEq, Hash))]
--        #[cfg_attr(feature = "clone-impls", derive(Clone))]
-         $($attrs_pub)* enum $name $($rest)*
-     );
- 
-     ($($t:tt)*) => {
-         strip_attrs_pub!(ast_enum!($($t)*));
-     };
- }
- 
-@@ -115,36 +81,43 @@ macro_rules! ast_enum_of_structs_impl {
-             )*
-         }
- 
-         $($remaining:tt)*
-     ) => {
-         check_keyword_matches!(pub $pub);
-         check_keyword_matches!(enum $enum);
- 
--        $(
--            $(
--                impl From<$member> for $name {
--                    fn from(e: $member) -> $name {
--                        $name::$variant(e)
--                    }
--                }
--            )*
--        )*
-+        $($(
-+            ast_enum_from_struct!($name::$variant, $member);
-+        )*)*
- 
-         #[cfg(feature = "printing")]
-         generate_to_tokens! {
-             $($remaining)*
-             ()
-             tokens
-             $name { $($variant $($member)*,)* }
-         }
-     };
- }
- 
-+macro_rules! ast_enum_from_struct {
-+    // No From<TokenStream> for verbatim variants.
-+    ($name:ident::Verbatim, $member:ident) => {};
-+
-+    ($name:ident::$variant:ident, $member:ident) => {
-+        impl From<$member> for $name {
-+            fn from(e: $member) -> $name {
-+                $name::$variant(e)
-+            }
-+        }
-+    };
-+}
-+
- #[cfg(feature = "printing")]
- 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)* }
-diff --git a/third_party/rust/syn/src/op.rs b/third_party/rust/syn/src/op.rs
---- a/third_party/rust/syn/src/op.rs
-+++ b/third_party/rust/syn/src/op.rs
-@@ -1,14 +1,13 @@
- ast_enum! {
-     /// A binary operator: `+`, `+=`, `&`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-+    /// *This type is available only 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)
-@@ -62,19 +61,18 @@ ast_enum! {
-         /// The `>>=` operator
-         ShrEq(Token![>>=]),
-     }
- }
- 
- ast_enum! {
-     /// A unary operator: `*`, `!`, `-`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-+    /// *This type is available only 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![-]),
-     }
-diff --git a/third_party/rust/syn/src/parse.rs b/third_party/rust/syn/src/parse.rs
---- a/third_party/rust/syn/src/parse.rs
-+++ b/third_party/rust/syn/src/parse.rs
-@@ -21,18 +21,18 @@
- //! procedural macro through [`parse_macro_input!`] as shown at the bottom of
- //! the snippet. If the caller provides syntactically invalid input to the
- //! procedural macro, they will receive a helpful compiler error message
- //! pointing out the exact token that triggered the failure to parse.
- //!
- //! [`parse_macro_input!`]: ../macro.parse_macro_input.html
- //!
- //! ```
--//! extern crate proc_macro;
--//!
-+//! # extern crate proc_macro;
-+//! #
- //! use proc_macro::TokenStream;
- //! use syn::{braced, parse_macro_input, token, Field, Ident, Result, Token};
- //! use syn::parse::{Parse, ParseStream};
- //! use syn::punctuated::Punctuated;
- //!
- //! enum Item {
- //!     Struct(ItemStruct),
- //!     Enum(ItemEnum),
-@@ -104,19 +104,17 @@
- //! ```
- //! use syn::Type;
- //!
- //! # fn run_parser() -> syn::Result<()> {
- //! let t: Type = syn::parse_str("std::collections::HashMap<String, Value>")?;
- //! #     Ok(())
- //! # }
- //! #
--//! # fn main() {
--//! #     run_parser().unwrap();
--//! # }
-+//! # run_parser().unwrap();
- //! ```
- //!
- //! The [`parse_quote!`] macro also uses this approach.
- //!
- //! [`parse_quote!`]: ../macro.parse_quote.html
- //!
- //! # The `Parser` trait
- //!
-@@ -150,18 +148,18 @@
- //!
- //! In these cases the types provide a choice of parser functions rather than a
- //! single `Parse` implementation, and those parser functions can be invoked
- //! through the [`Parser`] trait.
- //!
- //! [`Parser`]: trait.Parser.html
- //!
- //! ```
--//! extern crate proc_macro;
--//!
-+//! # extern crate proc_macro;
-+//! #
- //! use proc_macro::TokenStream;
- //! use syn::parse::Parser;
- //! use syn::punctuated::Punctuated;
- //! use syn::{Attribute, Expr, PathSegment, Result, Token};
- //!
- //! fn call_some_parser_methods(input: TokenStream) -> Result<()> {
- //!     // Parse a nonempty sequence of path segments separated by `::` punctuation
- //!     // with no trailing punctuation.
-@@ -181,17 +179,17 @@
- //!     let _attrs = parser.parse(tokens)?;
- //!
- //!     Ok(())
- //! }
- //! ```
- //!
- //! ---
- //!
--//! *This module is available if Syn is built with the `"parsing"` feature.*
-+//! *This module is available only if Syn is built with the `"parsing"` feature.*
- 
- #[path = "discouraged.rs"]
- pub mod discouraged;
- 
- use std::cell::Cell;
- use std::fmt::{self, Debug, Display};
- use std::marker::PhantomData;
- use std::mem;
-@@ -212,16 +210,21 @@ use crate::lookahead;
- use crate::punctuated::Punctuated;
- use crate::token::Token;
- 
- pub use crate::error::{Error, Result};
- pub use crate::lookahead::{Lookahead1, Peek};
- 
- /// 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 implementing and using
-+/// the `Parse` trait.
-+///
-+/// [module documentation]: self
- pub trait Parse: Sized {
-     fn parse(input: ParseStream) -> Result<Self>;
- }
- 
- /// Input to a Syn parser function.
- ///
- /// See the methods of this type under the documentation of [`ParseBuffer`]. For
- /// an overview of parsing in Syn, refer to the [module documentation].
-@@ -258,23 +261,26 @@ pub struct ParseBuffer<'a> {
-     // ParseBuffer<'a>, upcast to ParseBuffer<'short> for some lifetime shorter
-     // than 'a, and then assign a Cursor<'short> into the Cell.
-     //
-     // By extension, it would not be safe to expose an API that accepts a
-     // Cursor<'a> and trusts that it lives as long as the cursor currently in
-     // the cell.
-     cell: Cell<Cursor<'static>>,
-     marker: PhantomData<Cursor<'a>>,
--    unexpected: Rc<Cell<Option<Span>>>,
-+    unexpected: Cell<Option<Rc<Cell<Unexpected>>>>,
- }
- 
- impl<'a> Drop for ParseBuffer<'a> {
-     fn drop(&mut self) {
--        if !self.is_empty() && self.unexpected.get().is_none() {
--            self.unexpected.set(Some(self.cursor().span()));
-+        if let Some(unexpected_span) = span_of_unexpected_ignoring_nones(self.cursor()) {
-+            let (inner, old_span) = inner_unexpected(self);
-+            if old_span.is_none() {
-+                inner.set(Unexpected::Some(unexpected_span));
-+            }
-         }
-     }
- }
- 
- impl<'a> Display for ParseBuffer<'a> {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         Display::fmt(&self.cursor().token_stream(), f)
-     }
-@@ -319,25 +325,22 @@ impl<'a> Debug for ParseBuffer<'a> {
- /// #
- /// # fn remainder_after_skipping_past_next_at(
- /// #     input: ParseStream,
- /// # ) -> Result<proc_macro2::TokenStream> {
- /// #     skip_past_next_at(input)?;
- /// #     input.parse()
- /// # }
- /// #
--/// # fn main() {
--/// #     use syn::parse::Parser;
--/// #     let remainder = remainder_after_skipping_past_next_at
--/// #         .parse_str("a @ b c")
--/// #         .unwrap();
--/// #     assert_eq!(remainder.to_string(), "b c");
--/// # }
-+/// # use syn::parse::Parser;
-+/// # let remainder = remainder_after_skipping_past_next_at
-+/// #     .parse_str("a @ b c")
-+/// #     .unwrap();
-+/// # assert_eq!(remainder.to_string(), "b c");
- /// ```
--#[derive(Copy, Clone)]
- pub struct StepCursor<'c, 'a> {
-     scope: Span,
-     // This field is covariant in 'c.
-     cursor: Cursor<'c>,
-     // This field is contravariant in 'c. Together these make StepCursor
-     // invariant in 'c. Also covariant in 'a. The user cannot cast 'c to a
-     // different lifetime but can upcast into a StepCursor with a shorter
-     // lifetime 'a.
-@@ -351,16 +354,24 @@ pub struct StepCursor<'c, 'a> {
- impl<'c, 'a> Deref for StepCursor<'c, 'a> {
-     type Target = Cursor<'c>;
- 
-     fn deref(&self) -> &Self::Target {
-         &self.cursor
-     }
- }
- 
-+impl<'c, 'a> Copy for StepCursor<'c, 'a> {}
-+
-+impl<'c, 'a> Clone for StepCursor<'c, 'a> {
-+    fn clone(&self) -> Self {
-+        *self
-+    }
-+}
-+
- impl<'c, 'a> StepCursor<'c, 'a> {
-     /// Triggers an error at the current position of the parse stream.
-     ///
-     /// The `ParseStream::step` invocation will return this same error without
-     /// advancing the stream state.
-     pub fn error<T: Display>(self, message: T) -> Error {
-         error::new_at(self.scope, self.cursor, message)
-     }
-@@ -370,46 +381,91 @@ pub(crate) fn advance_step_cursor<'c, 'a
-     // Refer to the comments within the StepCursor definition. We use the
-     // fact that a StepCursor<'c, 'a> exists as proof that 'c outlives 'a.
-     // Cursor is covariant in its lifetime parameter so we can cast a
-     // Cursor<'c> to one with the shorter lifetime Cursor<'a>.
-     let _ = proof;
-     unsafe { mem::transmute::<Cursor<'c>, Cursor<'a>>(to) }
- }
- 
--fn skip(input: ParseStream) -> bool {
--    input
--        .step(|cursor| {
--            if let Some((_lifetime, rest)) = cursor.lifetime() {
--                Ok((true, rest))
--            } else if let Some((_token, rest)) = cursor.token_tree() {
--                Ok((true, rest))
--            } else {
--                Ok((false, *cursor))
--            }
--        })
--        .unwrap()
--}
--
- pub(crate) fn new_parse_buffer(
-     scope: Span,
-     cursor: Cursor,
--    unexpected: Rc<Cell<Option<Span>>>,
-+    unexpected: Rc<Cell<Unexpected>>,
- ) -> ParseBuffer {
-     ParseBuffer {
-         scope,
-         // See comment on `cell` in the struct definition.
-         cell: Cell::new(unsafe { mem::transmute::<Cursor, Cursor<'static>>(cursor) }),
-         marker: PhantomData,
--        unexpected,
-+        unexpected: Cell::new(Some(unexpected)),
-+    }
-+}
-+
-+pub(crate) enum Unexpected {
-+    None,
-+    Some(Span),
-+    Chain(Rc<Cell<Unexpected>>),
-+}
-+
-+impl Default for Unexpected {
-+    fn default() -> Self {
-+        Unexpected::None
-+    }
-+}
-+
-+impl Clone for Unexpected {
-+    fn clone(&self) -> Self {
-+        match self {
-+            Unexpected::None => Unexpected::None,
-+            Unexpected::Some(span) => Unexpected::Some(*span),
-+            Unexpected::Chain(next) => Unexpected::Chain(next.clone()),
-+        }
-     }
- }
- 
--pub(crate) fn get_unexpected(buffer: &ParseBuffer) -> Rc<Cell<Option<Span>>> {
--    buffer.unexpected.clone()
-+// We call this on Cell<Unexpected> and Cell<Option<T>> where temporarily
-+// swapping in a None is cheap.
-+fn cell_clone<T: Default + Clone>(cell: &Cell<T>) -> T {
-+    let prev = cell.take();
-+    let ret = prev.clone();
-+    cell.set(prev);
-+    ret
-+}
-+
-+fn inner_unexpected(buffer: &ParseBuffer) -> (Rc<Cell<Unexpected>>, Option<Span>) {
-+    let mut unexpected = get_unexpected(buffer);
-+    loop {
-+        match cell_clone(&unexpected) {
-+            Unexpected::None => return (unexpected, None),
-+            Unexpected::Some(span) => return (unexpected, Some(span)),
-+            Unexpected::Chain(next) => unexpected = next,
-+        }
-+    }
-+}
-+
-+pub(crate) fn get_unexpected(buffer: &ParseBuffer) -> Rc<Cell<Unexpected>> {
-+    cell_clone(&buffer.unexpected).unwrap()
-+}
-+
-+fn span_of_unexpected_ignoring_nones(mut cursor: Cursor) -> Option<Span> {
-+    if cursor.eof() {
-+        return None;
-+    }
-+    while let Some((inner, _span, rest)) = cursor.group(Delimiter::None) {
-+        if let Some(unexpected) = span_of_unexpected_ignoring_nones(inner) {
-+            return Some(unexpected);
-+        }
-+        cursor = rest;
-+    }
-+    if cursor.eof() {
-+        None
-+    } else {
-+        Some(cursor.span())
-+    }
- }
- 
- impl<'a> ParseBuffer<'a> {
-     /// Parses a syntax tree node of type `T`, advancing the position of our
-     /// parse stream past it.
-     pub fn parse<T: Parse>(&self) -> Result<T> {
-         T::parse(self)
-     }
-@@ -561,24 +617,27 @@ impl<'a> ParseBuffer<'a> {
-     ///             input.parse().map(UnionOrMacro::Union)
-     ///         } else {
-     ///             input.parse().map(UnionOrMacro::Macro)
-     ///         }
-     ///     }
-     /// }
-     /// ```
-     pub fn peek2<T: Peek>(&self, token: T) -> bool {
--        let ahead = self.fork();
--        skip(&ahead) && ahead.peek(token)
-+        let _ = token;
-+        self.cursor().skip().map_or(false, T::Token::peek)
-     }
- 
-     /// Looks at the third-next token in the parse stream.
-     pub fn peek3<T: Peek>(&self, token: T) -> bool {
--        let ahead = self.fork();
--        skip(&ahead) && skip(&ahead) && ahead.peek(token)
-+        let _ = token;
-+        self.cursor()
-+            .skip()
-+            .and_then(Cursor::skip)
-+            .map_or(false, T::Token::peek)
-     }
- 
-     /// Parses zero or more occurrences of `T` separated by punctuation of type
-     /// `P`, with optional trailing punctuation.
-     ///
-     /// Parsing continues until the end of this parse stream. The entire content
-     /// of this parse stream must consist of `T` and `P`.
-     ///
-@@ -610,22 +669,20 @@ impl<'a> ParseBuffer<'a> {
-     ///             ident: input.parse()?,
-     ///             paren_token: parenthesized!(content in input),
-     ///             fields: content.parse_terminated(Type::parse)?,
-     ///             semi_token: input.parse()?,
-     ///         })
-     ///     }
-     /// }
-     /// #
--    /// # fn main() {
--    /// #     let input = quote! {
--    /// #         struct S(A, B);
--    /// #     };
--    /// #     syn::parse2::<TupleStruct>(input).unwrap();
--    /// # }
-+    /// # let input = quote! {
-+    /// #     struct S(A, B);
-+    /// # };
-+    /// # syn::parse2::<TupleStruct>(input).unwrap();
-     /// ```
-     pub fn parse_terminated<T, P: Parse>(
-         &self,
-         parser: fn(ParseStream) -> Result<T>,
-     ) -> Result<Punctuated<T, P>> {
-         Punctuated::parse_terminated_with(self, parser)
-     }
- 
-@@ -842,18 +899,18 @@ impl<'a> ParseBuffer<'a> {
-     /// }
-     /// ```
-     pub fn fork(&self) -> Self {
-         ParseBuffer {
-             scope: self.scope,
-             cell: self.cell.clone(),
-             marker: PhantomData,
-             // Not the parent's unexpected. Nothing cares whether the clone
--            // parses all the way.
--            unexpected: Rc::new(Cell::new(None)),
-+            // parses all the way unless we `advance_to`.
-+            unexpected: Cell::new(Some(Rc::new(Cell::new(Unexpected::None)))),
-         }
-     }
- 
-     /// Triggers an error at the current position of the parse stream.
-     ///
-     /// # Example
-     ///
-     /// ```
-@@ -918,23 +975,21 @@ impl<'a> ParseBuffer<'a> {
-     /// #
-     /// # fn remainder_after_skipping_past_next_at(
-     /// #     input: ParseStream,
-     /// # ) -> Result<proc_macro2::TokenStream> {
-     /// #     skip_past_next_at(input)?;
-     /// #     input.parse()
-     /// # }
-     /// #
--    /// # fn main() {
--    /// #     use syn::parse::Parser;
--    /// #     let remainder = remainder_after_skipping_past_next_at
--    /// #         .parse_str("a @ b c")
--    /// #         .unwrap();
--    /// #     assert_eq!(remainder.to_string(), "b c");
--    /// # }
-+    /// # use syn::parse::Parser;
-+    /// # let remainder = remainder_after_skipping_past_next_at
-+    /// #     .parse_str("a @ b c")
-+    /// #     .unwrap();
-+    /// # assert_eq!(remainder.to_string(), "b c");
-     /// ```
-     pub fn step<F, R>(&self, function: F) -> Result<R>
-     where
-         F: for<'c> FnOnce(StepCursor<'c, 'a>) -> Result<(R, Cursor<'c>)>,
-     {
-         // Since the user's function is required to work for any 'c, we know
-         // that the Cursor<'c> they return is either derived from the input
-         // StepCursor<'c, 'a> or from a Cursor<'static>.
-@@ -956,27 +1011,39 @@ impl<'a> ParseBuffer<'a> {
-             scope: self.scope,
-             cursor: self.cell.get(),
-             marker: PhantomData,
-         })?;
-         self.cell.set(rest);
-         Ok(node)
-     }
- 
-+    /// Returns the `Span` of the next token in the parse stream, or
-+    /// `Span::call_site()` if this parse stream has completely exhausted its
-+    /// input `TokenStream`.
-+    pub fn span(&self) -> Span {
-+        let cursor = self.cursor();
-+        if cursor.eof() {
-+            self.scope
-+        } else {
-+            crate::buffer::open_span_of_group(cursor)
-+        }
-+    }
-+
-     /// Provides low-level access to the token representation underlying this
-     /// parse stream.
-     ///
-     /// Cursors are immutable so no operations you perform against the cursor
-     /// will affect the state of this parse stream.
-     pub fn cursor(&self) -> Cursor<'a> {
-         self.cell.get()
-     }
- 
-     fn check_unexpected(&self) -> Result<()> {
--        match self.unexpected.get() {
-+        match inner_unexpected(self).1 {
-             Some(span) => Err(Error::new(span, "unexpected token")),
-             None => Ok(()),
-         }
-     }
- }
- 
- impl<T: Parse> Parse for Box<T> {
-     fn parse(input: ParseStream) -> Result<Self> {
-@@ -1043,32 +1110,32 @@ impl Parse for Literal {
- }
- 
- /// 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]: self
- ///
--/// *This trait is available if Syn is built with the `"parsing"` feature.*
-+/// *This trait is available only 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.
-     ///
-     /// This function will check that the input is fully parsed. If there are
-     /// any unparsed tokens at the end of the stream, an error is returned.
-     fn parse2(self, tokens: TokenStream) -> Result<Self::Output>;
- 
-     /// Parse tokens of source code into the chosen syntax tree node.
-     ///
-     /// This function will check that the input is fully parsed. If there are
-     /// any unparsed tokens at the end of the stream, an error is returned.
-     ///
--    /// *This method is available if Syn is built with both the `"parsing"` and
-+    /// *This method is available only if Syn is built with both the `"parsing"` and
-     /// `"proc-macro"` features.*
-     #[cfg(all(
-         not(all(target_arch = "wasm32", any(target_os = "unknown", target_os = "wasi"))),
-         feature = "proc-macro"
-     ))]
-     fn parse(self, tokens: proc_macro::TokenStream) -> Result<Self::Output> {
-         self.parse2(proc_macro2::TokenStream::from(tokens))
-     }
-@@ -1083,90 +1150,96 @@ pub trait Parser: Sized {
-     /// 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> {
-         self.parse2(proc_macro2::TokenStream::from_str(s)?)
-     }
- 
-     // Not public API.
-     #[doc(hidden)]
-+    #[cfg(any(feature = "full", feature = "derive"))]
-     fn __parse_scoped(self, scope: Span, tokens: TokenStream) -> Result<Self::Output> {
-         let _ = scope;
-         self.parse2(tokens)
-     }
- 
-     // Not public API.
-     #[doc(hidden)]
-+    #[cfg(any(feature = "full", feature = "derive"))]
-     fn __parse_stream(self, input: ParseStream) -> Result<Self::Output> {
-         input.parse().and_then(|tokens| self.parse2(tokens))
-     }
- }
- 
- fn tokens_to_parse_buffer(tokens: &TokenBuffer) -> ParseBuffer {
-     let scope = Span::call_site();
-     let cursor = tokens.begin();
--    let unexpected = Rc::new(Cell::new(None));
-+    let unexpected = Rc::new(Cell::new(Unexpected::None));
-     new_parse_buffer(scope, cursor, unexpected)
- }
- 
- impl<F, T> Parser for F
- where
-     F: FnOnce(ParseStream) -> Result<T>,
- {
-     type Output = T;
- 
-     fn parse2(self, tokens: TokenStream) -> Result<T> {
-         let buf = TokenBuffer::new2(tokens);
-         let state = tokens_to_parse_buffer(&buf);
-         let node = self(&state)?;
-         state.check_unexpected()?;
--        if state.is_empty() {
-+        if let Some(unexpected_span) = span_of_unexpected_ignoring_nones(state.cursor()) {
-+            Err(Error::new(unexpected_span, "unexpected token"))
-+        } else {
-             Ok(node)
--        } else {
--            Err(state.error("unexpected token"))
-         }
-     }
- 
-     #[doc(hidden)]
-+    #[cfg(any(feature = "full", feature = "derive"))]
-     fn __parse_scoped(self, scope: Span, tokens: TokenStream) -> Result<Self::Output> {
-         let buf = TokenBuffer::new2(tokens);
-         let cursor = buf.begin();
--        let unexpected = Rc::new(Cell::new(None));
-+        let unexpected = Rc::new(Cell::new(Unexpected::None));
-         let state = new_parse_buffer(scope, cursor, unexpected);
-         let node = self(&state)?;
-         state.check_unexpected()?;
--        if state.is_empty() {
-+        if let Some(unexpected_span) = span_of_unexpected_ignoring_nones(state.cursor()) {
-+            Err(Error::new(unexpected_span, "unexpected token"))
-+        } else {
-             Ok(node)
--        } else {
--            Err(state.error("unexpected token"))
-         }
-     }
- 
-     #[doc(hidden)]
-+    #[cfg(any(feature = "full", feature = "derive"))]
-     fn __parse_stream(self, input: ParseStream) -> Result<Self::Output> {
-         self(input)
-     }
- }
- 
-+#[cfg(any(feature = "full", feature = "derive"))]
- pub(crate) fn parse_scoped<F: Parser>(f: F, scope: Span, tokens: TokenStream) -> Result<F::Output> {
-     f.__parse_scoped(scope, tokens)
- }
- 
-+#[cfg(any(feature = "full", feature = "derive"))]
- pub(crate) fn parse_stream<F: Parser>(f: F, input: ParseStream) -> Result<F::Output> {
-     f.__parse_stream(input)
- }
- 
- /// An empty syntax tree node that consumes no tokens when parsed.
- ///
- /// This is useful for attribute macros that want to ensure they are not
- /// provided any attribute args.
- ///
- /// ```
--/// extern crate proc_macro;
--///
-+/// # extern crate proc_macro;
-+/// #
- /// use proc_macro::TokenStream;
- /// use syn::parse_macro_input;
- /// use syn::parse::Nothing;
- ///
- /// # const IGNORE: &str = stringify! {
- /// #[proc_macro_attribute]
- /// # };
- /// pub fn my_attr(args: TokenStream, input: TokenStream) -> TokenStream {
-diff --git a/third_party/rust/syn/src/parse_macro_input.rs b/third_party/rust/syn/src/parse_macro_input.rs
---- a/third_party/rust/syn/src/parse_macro_input.rs
-+++ b/third_party/rust/syn/src/parse_macro_input.rs
-@@ -11,18 +11,18 @@
- /// # Intended usage
- ///
- /// This macro must be called from a function that returns
- /// `proc_macro::TokenStream`. Usually this will be your proc macro entry point,
- /// the function that has the #\[proc_macro\] / #\[proc_macro_derive\] /
- /// #\[proc_macro_attribute\] attribute.
- ///
- /// ```
--/// extern crate proc_macro;
--///
-+/// # extern crate proc_macro;
-+/// #
- /// use proc_macro::TokenStream;
- /// use syn::{parse_macro_input, Result};
- /// use syn::parse::{Parse, ParseStream};
- ///
- /// struct MyMacroInput {
- ///     /* ... */
- /// }
- ///
-@@ -38,28 +38,52 @@
- /// # };
- /// pub fn my_macro(tokens: TokenStream) -> TokenStream {
- ///     let input = parse_macro_input!(tokens as MyMacroInput);
- ///
- ///     /* ... */
- /// #   "".parse().unwrap()
- /// }
- /// ```
--#[macro_export(local_inner_macros)]
-+///
-+/// <br>
-+///
-+/// # Expansion
-+///
-+/// `parse_macro_input!($variable as $Type)` expands to something like:
-+///
-+/// ```no_run
-+/// # extern crate proc_macro;
-+/// #
-+/// # macro_rules! doc_test {
-+/// #     ($variable:ident as $Type:ty) => {
-+/// match syn::parse::<$Type>($variable) {
-+///     Ok(syntax_tree) => syntax_tree,
-+///     Err(err) => return proc_macro::TokenStream::from(err.to_compile_error()),
-+/// }
-+/// #     };
-+/// # }
-+/// #
-+/// # fn test(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-+/// #     let _ = doc_test!(input as syn::Ident);
-+/// #     proc_macro::TokenStream::new()
-+/// # }
-+/// ```
-+#[macro_export]
- macro_rules! parse_macro_input {
-     ($tokenstream:ident as $ty:ty) => {
-         match $crate::parse_macro_input::parse::<$ty>($tokenstream) {
-             $crate::export::Ok(data) => data,
-             $crate::export::Err(err) => {
-                 return $crate::export::TokenStream::from(err.to_compile_error());
-             }
-         }
-     };
-     ($tokenstream:ident) => {
--        parse_macro_input!($tokenstream as _)
-+        $crate::parse_macro_input!($tokenstream as _)
-     };
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
- // Can parse any type that implements Parse.
- 
- use crate::parse::{Parse, ParseStream, Parser, Result};
- use proc_macro::TokenStream;
-diff --git a/third_party/rust/syn/src/parse_quote.rs b/third_party/rust/syn/src/parse_quote.rs
---- a/third_party/rust/syn/src/parse_quote.rs
-+++ b/third_party/rust/syn/src/parse_quote.rs
-@@ -19,17 +19,17 @@
- ///     let stmt: Stmt = parse_quote! {
- ///         let #name: #ty = Default::default();
- ///     };
- ///
- ///     println!("{:#?}", stmt);
- /// }
- /// ```
- ///
--/// *This macro is available if Syn is built with the `"parsing"` feature,
-+/// *This macro is available only 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.
- ///
-@@ -51,28 +51,30 @@
- ///
- /// This macro can parse the following additional types as a special case even
- /// though they do not implement the `Parse` 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
-+/// - [`Vec<Stmt>`] — parses the same as `Block::parse_within`
- ///
- /// [`Punctuated<T, P>`]: punctuated::Punctuated
-+/// [`Vec<Stmt>`]: Block::parse_within
- ///
- /// # 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.
- //
- // TODO: allow Punctuated to be inferred as intra doc link, currently blocked on
- // https://github.com/rust-lang/rust/issues/62834
--#[macro_export(local_inner_macros)]
-+#[macro_export]
- macro_rules! parse_quote {
-     ($($tt:tt)*) => {
-         $crate::parse_quote::parse(
-             $crate::export::From::from(
-                 $crate::export::quote::quote!($($tt)*)
-             )
-         )
-     };
-@@ -107,16 +109,18 @@ impl<T: Parse> ParseQuote for T {
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
- // Any other types that we want `parse_quote!` to be able to parse.
- 
- use crate::punctuated::Punctuated;
- #[cfg(any(feature = "full", feature = "derive"))]
- use crate::{attr, Attribute};
-+#[cfg(feature = "full")]
-+use crate::{Block, Stmt};
- 
- #[cfg(any(feature = "full", feature = "derive"))]
- impl ParseQuote for Attribute {
-     fn parse(input: ParseStream) -> Result<Self> {
-         if input.peek(Token![#]) && input.peek2(Token![!]) {
-             attr::parsing::single_parse_inner(input)
-         } else {
-             attr::parsing::single_parse_outer(input)
-@@ -124,8 +128,15 @@ impl ParseQuote for Attribute {
-     }
- }
- 
- impl<T: Parse, P: Parse> ParseQuote for Punctuated<T, P> {
-     fn parse(input: ParseStream) -> Result<Self> {
-         Self::parse_terminated(input)
-     }
- }
-+
-+#[cfg(feature = "full")]
-+impl ParseQuote for Vec<Stmt> {
-+    fn parse(input: ParseStream) -> Result<Self> {
-+        Block::parse_within(input)
-+    }
-+}
-diff --git a/third_party/rust/syn/src/pat.rs b/third_party/rust/syn/src/pat.rs
---- a/third_party/rust/syn/src/pat.rs
-+++ b/third_party/rust/syn/src/pat.rs
-@@ -1,31 +1,27 @@
- use super::*;
- use crate::punctuated::Punctuated;
--#[cfg(feature = "extra-traits")]
--use crate::tt::TokenStreamHelper;
- use proc_macro2::TokenStream;
--#[cfg(feature = "extra-traits")]
--use std::hash::{Hash, Hasher};
- 
- 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.*
-+    /// *This type is available only 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
-     //
-     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
-     // blocked on https://github.com/rust-lang/rust/issues/62833
--    pub enum Pat #manual_extra_traits {
-+    pub enum Pat {
-         /// A box pattern: `box v`.
-         Box(PatBox),
- 
-         /// A pattern that binds a new variable: `ref mut binding @ SUBPATTERN`.
-         Ident(PatIdent),
- 
-         /// A literal pattern: `0`.
-         ///
-@@ -81,321 +77,219 @@ ast_enum_of_structs! {
-         #[doc(hidden)]
-         __Nonexhaustive,
-     }
- }
- 
- ast_struct! {
-     /// A box pattern: `box v`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatBox {
-         pub attrs: Vec<Attribute>,
-         pub box_token: Token![box],
-         pub pat: Box<Pat>,
-     }
- }
- 
- ast_struct! {
-     /// A pattern that binds a new variable: `ref mut binding @ SUBPATTERN`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// It may also be a unit struct or struct variant (e.g. `None`), or a
-+    /// constant; these cannot be distinguished syntactically.
-+    ///
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatIdent {
-         pub attrs: Vec<Attribute>,
-         pub by_ref: Option<Token![ref]>,
-         pub mutability: Option<Token![mut]>,
-         pub ident: Ident,
-         pub subpat: Option<(Token![@], Box<Pat>)>,
-     }
- }
- 
- ast_struct! {
-     /// 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.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatLit {
-         pub attrs: Vec<Attribute>,
-         pub expr: Box<Expr>,
-     }
- }
- 
- ast_struct! {
-     /// A macro in pattern position.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatMacro {
-         pub attrs: Vec<Attribute>,
-         pub mac: Macro,
-     }
- }
- 
- ast_struct! {
-     /// A pattern that matches any one of a set of cases.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatOr {
-         pub attrs: Vec<Attribute>,
-         pub leading_vert: Option<Token![|]>,
-         pub cases: Punctuated<Pat, Token![|]>,
-     }
- }
- 
- ast_struct! {
-     /// A path pattern like `Color::Red`, optionally qualified with a
-     /// self-type.
-     ///
-     /// Unqualified path patterns can legally refer to variants, structs,
-     /// constants or associated constants. Qualified 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.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatPath {
-         pub attrs: Vec<Attribute>,
-         pub qself: Option<QSelf>,
-         pub path: Path,
-     }
- }
- 
- ast_struct! {
-     /// A range pattern: `1..=2`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatRange {
-         pub attrs: Vec<Attribute>,
-         pub lo: Box<Expr>,
-         pub limits: RangeLimits,
-         pub hi: Box<Expr>,
-     }
- }
- 
- ast_struct! {
-     /// A reference pattern: `&mut var`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatReference {
-         pub attrs: Vec<Attribute>,
-         pub and_token: Token![&],
-         pub mutability: Option<Token![mut]>,
-         pub pat: Box<Pat>,
-     }
- }
- 
- ast_struct! {
-     /// The dots in a tuple or slice pattern: `[0, 1, ..]`
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatRest {
-         pub attrs: Vec<Attribute>,
-         pub dot2_token: Token![..],
-     }
- }
- 
- ast_struct! {
-     /// A dynamically sized slice pattern: `[a, b, ref i @ .., y, z]`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatSlice {
-         pub attrs: Vec<Attribute>,
-         pub bracket_token: token::Bracket,
-         pub elems: Punctuated<Pat, Token![,]>,
-     }
- }
- 
- ast_struct! {
-     /// A struct or struct variant pattern: `Variant { x, y, .. }`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatStruct {
-         pub attrs: Vec<Attribute>,
-         pub path: Path,
-         pub brace_token: token::Brace,
-         pub fields: Punctuated<FieldPat, Token![,]>,
-         pub dot2_token: Option<Token![..]>,
-     }
- }
- 
- ast_struct! {
-     /// A tuple pattern: `(a, b)`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatTuple {
-         pub attrs: Vec<Attribute>,
-         pub paren_token: token::Paren,
-         pub elems: Punctuated<Pat, Token![,]>,
-     }
- }
- 
- ast_struct! {
-     /// A tuple struct or tuple variant pattern: `Variant(x, y, .., z)`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatTupleStruct {
-         pub attrs: Vec<Attribute>,
-         pub path: Path,
-         pub pat: PatTuple,
-     }
- }
- 
- ast_struct! {
-     /// A type ascription pattern: `foo: f64`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatType {
-         pub attrs: Vec<Attribute>,
-         pub pat: Box<Pat>,
-         pub colon_token: Token![:],
-         pub ty: Box<Type>,
-     }
- }
- 
- ast_struct! {
-     /// A pattern that matches any value: `_`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct PatWild {
-         pub attrs: Vec<Attribute>,
-         pub underscore_token: Token![_],
-     }
- }
- 
- 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.*
-+    /// *This type is available only 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(feature = "extra-traits")]
--impl Eq for Pat {}
--
--#[cfg(feature = "extra-traits")]
--impl PartialEq for Pat {
--    fn eq(&self, other: &Self) -> bool {
--        match (self, other) {
--            (Pat::Box(this), Pat::Box(other)) => this == other,
--            (Pat::Ident(this), Pat::Ident(other)) => this == other,
--            (Pat::Lit(this), Pat::Lit(other)) => this == other,
--            (Pat::Macro(this), Pat::Macro(other)) => this == other,
--            (Pat::Or(this), Pat::Or(other)) => this == other,
--            (Pat::Path(this), Pat::Path(other)) => this == other,
--            (Pat::Range(this), Pat::Range(other)) => this == other,
--            (Pat::Reference(this), Pat::Reference(other)) => this == other,
--            (Pat::Rest(this), Pat::Rest(other)) => this == other,
--            (Pat::Slice(this), Pat::Slice(other)) => this == other,
--            (Pat::Struct(this), Pat::Struct(other)) => this == other,
--            (Pat::Tuple(this), Pat::Tuple(other)) => this == other,
--            (Pat::TupleStruct(this), Pat::TupleStruct(other)) => this == other,
--            (Pat::Type(this), Pat::Type(other)) => this == other,
--            (Pat::Verbatim(this), Pat::Verbatim(other)) => {
--                TokenStreamHelper(this) == TokenStreamHelper(other)
--            }
--            (Pat::Wild(this), Pat::Wild(other)) => this == other,
--            _ => false,
--        }
--    }
--}
--
--#[cfg(feature = "extra-traits")]
--impl Hash for Pat {
--    fn hash<H>(&self, hash: &mut H)
--    where
--        H: Hasher,
--    {
--        match self {
--            Pat::Box(pat) => {
--                hash.write_u8(0);
--                pat.hash(hash);
--            }
--            Pat::Ident(pat) => {
--                hash.write_u8(1);
--                pat.hash(hash);
--            }
--            Pat::Lit(pat) => {
--                hash.write_u8(2);
--                pat.hash(hash);
--            }
--            Pat::Macro(pat) => {
--                hash.write_u8(3);
--                pat.hash(hash);
--            }
--            Pat::Or(pat) => {
--                hash.write_u8(4);
--                pat.hash(hash);
--            }
--            Pat::Path(pat) => {
--                hash.write_u8(5);
--                pat.hash(hash);
--            }
--            Pat::Range(pat) => {
--                hash.write_u8(6);
--                pat.hash(hash);
--            }
--            Pat::Reference(pat) => {
--                hash.write_u8(7);
--                pat.hash(hash);
--            }
--            Pat::Rest(pat) => {
--                hash.write_u8(8);
--                pat.hash(hash);
--            }
--            Pat::Slice(pat) => {
--                hash.write_u8(9);
--                pat.hash(hash);
--            }
--            Pat::Struct(pat) => {
--                hash.write_u8(10);
--                pat.hash(hash);
--            }
--            Pat::Tuple(pat) => {
--                hash.write_u8(11);
--                pat.hash(hash);
--            }
--            Pat::TupleStruct(pat) => {
--                hash.write_u8(12);
--                pat.hash(hash);
--            }
--            Pat::Type(pat) => {
--                hash.write_u8(13);
--                pat.hash(hash);
--            }
--            Pat::Verbatim(pat) => {
--                hash.write_u8(14);
--                TokenStreamHelper(pat).hash(hash);
--            }
--            Pat::Wild(pat) => {
--                hash.write_u8(15);
--                pat.hash(hash);
--            }
--            Pat::__Nonexhaustive => unreachable!(),
--        }
--    }
--}
--
- #[cfg(feature = "parsing")]
--mod parsing {
-+pub mod parsing {
-     use super::*;
- 
-     use crate::ext::IdentExt;
--    use crate::parse::{Parse, ParseStream, Result};
-+    use crate::parse::{Parse, ParseBuffer, ParseStream, Result};
-     use crate::path;
- 
-     impl Parse for Pat {
-         fn parse(input: ParseStream) -> Result<Self> {
-+            let begin = input.fork();
-             let lookahead = input.lookahead1();
-             if lookahead.peek(Ident)
-                 && ({
-                     input.peek2(Token![::])
-                         || input.peek2(Token![!])
-                         || input.peek2(token::Brace)
-                         || input.peek2(token::Paren)
-                         || input.peek2(Token![..])
-@@ -406,17 +300,16 @@ mod parsing {
-                                 ahead.is_empty() || ahead.peek(Token![,])
-                             }
-                 })
-                 || input.peek(Token![self]) && input.peek2(Token![::])
-                 || lookahead.peek(Token![::])
-                 || lookahead.peek(Token![<])
-                 || input.peek(Token![Self])
-                 || input.peek(Token![super])
--                || input.peek(Token![extern])
-                 || input.peek(Token![crate])
-             {
-                 pat_path_or_macro_or_struct_or_range(input)
-             } else if lookahead.peek(Token![_]) {
-                 input.call(pat_wild).map(Pat::Wild)
-             } else if input.peek(Token![box]) {
-                 input.call(pat_box).map(Pat::Box)
-             } else if input.peek(Token![-]) || lookahead.peek(Lit) {
-@@ -429,28 +322,29 @@ mod parsing {
-                 input.call(pat_ident).map(Pat::Ident)
-             } else if lookahead.peek(Token![&]) {
-                 input.call(pat_reference).map(Pat::Reference)
-             } else if lookahead.peek(token::Paren) {
-                 input.call(pat_tuple).map(Pat::Tuple)
-             } else if lookahead.peek(token::Bracket) {
-                 input.call(pat_slice).map(Pat::Slice)
-             } else if lookahead.peek(Token![..]) && !input.peek(Token![...]) {
--                input.call(pat_rest).map(Pat::Rest)
-+                pat_range_half_open(input, begin)
-             } else {
-                 Err(lookahead.error())
-             }
-         }
-     }
- 
-     fn pat_path_or_macro_or_struct_or_range(input: ParseStream) -> Result<Pat> {
-+        let begin = input.fork();
-         let (qself, path) = path::parsing::qpath(input, true)?;
- 
-         if input.peek(Token![..]) {
--            return pat_range(input, qself, path).map(Pat::Range);
-+            return pat_range(input, begin, qself, path);
-         }
- 
-         if qself.is_some() {
-             return Ok(Pat::Path(PatPath {
-                 attrs: Vec::new(),
-                 qself,
-                 path,
-             }));
-@@ -482,17 +376,17 @@ mod parsing {
-             }
-         }
- 
-         if input.peek(token::Brace) {
-             pat_struct(input, path).map(Pat::Struct)
-         } else if input.peek(token::Paren) {
-             pat_tuple_struct(input, path).map(Pat::TupleStruct)
-         } else if input.peek(Token![..]) {
--            pat_range(input, qself, path).map(Pat::Range)
-+            pat_range(input, begin, qself, path)
-         } else {
-             Ok(Pat::Path(PatPath {
-                 attrs: Vec::new(),
-                 qself,
-                 path,
-             }))
-         }
-     }
-@@ -541,17 +435,17 @@ mod parsing {
-     fn pat_struct(input: ParseStream, path: Path) -> Result<PatStruct> {
-         let content;
-         let brace_token = braced!(content in input);
- 
-         let mut fields = Punctuated::new();
-         while !content.is_empty() && !content.peek(Token![..]) {
-             let value = content.call(field_pat)?;
-             fields.push_value(value);
--            if !content.peek(Token![,]) {
-+            if content.is_empty() {
-                 break;
-             }
-             let punct: Token![,] = content.parse()?;
-             fields.push_punct(punct);
-         }
- 
-         let dot2_token = if fields.empty_or_trailing() && content.peek(Token![..]) {
-             Some(content.parse()?)
-@@ -573,29 +467,30 @@ mod parsing {
-             match *self {
-                 Member::Named(_) => false,
-                 Member::Unnamed(_) => true,
-             }
-         }
-     }
- 
-     fn field_pat(input: ParseStream) -> Result<FieldPat> {
-+        let attrs = input.call(Attribute::parse_outer)?;
-         let boxed: Option<Token![box]> = input.parse()?;
-         let by_ref: Option<Token![ref]> = input.parse()?;
-         let mutability: Option<Token![mut]> = input.parse()?;
-         let member: Member = input.parse()?;
- 
-         if boxed.is_none() && by_ref.is_none() && mutability.is_none() && input.peek(Token![:])
-             || member.is_unnamed()
-         {
-             return Ok(FieldPat {
--                attrs: Vec::new(),
-+                attrs,
-                 member,
-                 colon_token: input.parse()?,
--                pat: input.parse()?,
-+                pat: Box::new(multi_pat(input)?),
-             });
-         }
- 
-         let ident = match member {
-             Member::Named(ident) => ident,
-             Member::Unnamed(_) => unreachable!(),
-         };
- 
-@@ -605,49 +500,76 @@ mod parsing {
-             mutability,
-             ident: ident.clone(),
-             subpat: None,
-         });
- 
-         if let Some(boxed) = boxed {
-             pat = Pat::Box(PatBox {
-                 attrs: Vec::new(),
-+                box_token: boxed,
-                 pat: Box::new(pat),
--                box_token: boxed,
-             });
-         }
- 
-         Ok(FieldPat {
-+            attrs,
-             member: Member::Named(ident),
-+            colon_token: None,
-             pat: Box::new(pat),
--            attrs: Vec::new(),
--            colon_token: None,
-         })
-     }
- 
--    fn pat_range(input: ParseStream, qself: Option<QSelf>, path: Path) -> Result<PatRange> {
--        Ok(PatRange {
--            attrs: Vec::new(),
--            lo: Box::new(Expr::Path(ExprPath {
-+    fn pat_range(
-+        input: ParseStream,
-+        begin: ParseBuffer,
-+        qself: Option<QSelf>,
-+        path: Path,
-+    ) -> Result<Pat> {
-+        let limits: RangeLimits = input.parse()?;
-+        let hi = input.call(pat_lit_expr)?;
-+        if let Some(hi) = hi {
-+            Ok(Pat::Range(PatRange {
-                 attrs: Vec::new(),
--                qself,
--                path,
--            })),
--            limits: input.parse()?,
--            hi: input.call(pat_lit_expr)?,
--        })
-+                lo: Box::new(Expr::Path(ExprPath {
-+                    attrs: Vec::new(),
-+                    qself,
-+                    path,
-+                })),
-+                limits,
-+                hi,
-+            }))
-+        } else {
-+            Ok(Pat::Verbatim(verbatim::between(begin, input)))
-+        }
-+    }
-+
-+    fn pat_range_half_open(input: ParseStream, begin: ParseBuffer) -> Result<Pat> {
-+        let limits: RangeLimits = input.parse()?;
-+        let hi = input.call(pat_lit_expr)?;
-+        if hi.is_some() {
-+            Ok(Pat::Verbatim(verbatim::between(begin, input)))
-+        } else {
-+            match limits {
-+                RangeLimits::HalfOpen(dot2_token) => Ok(Pat::Rest(PatRest {
-+                    attrs: Vec::new(),
-+                    dot2_token,
-+                })),
-+                RangeLimits::Closed(_) => Err(input.error("expected range upper bound")),
-+            }
-+        }
-     }
- 
-     fn pat_tuple(input: ParseStream) -> Result<PatTuple> {
-         let content;
-         let paren_token = parenthesized!(content in input);
- 
-         let mut elems = Punctuated::new();
-         while !content.is_empty() {
--            let value: Pat = content.parse()?;
-+            let value = multi_pat(&content)?;
-             elems.push_value(value);
-             if content.is_empty() {
-                 break;
-             }
-             let punct = content.parse()?;
-             elems.push_punct(punct);
-         }
- 
-@@ -663,225 +585,280 @@ mod parsing {
-             attrs: Vec::new(),
-             and_token: input.parse()?,
-             mutability: input.parse()?,
-             pat: input.parse()?,
-         })
-     }
- 
-     fn pat_lit_or_range(input: ParseStream) -> Result<Pat> {
--        let lo = input.call(pat_lit_expr)?;
-+        let begin = input.fork();
-+        let lo = input.call(pat_lit_expr)?.unwrap();
-         if input.peek(Token![..]) {
--            Ok(Pat::Range(PatRange {
--                attrs: Vec::new(),
--                lo,
--                limits: input.parse()?,
--                hi: input.call(pat_lit_expr)?,
--            }))
-+            let limits: RangeLimits = input.parse()?;
-+            let hi = input.call(pat_lit_expr)?;
-+            if let Some(hi) = hi {
-+                Ok(Pat::Range(PatRange {
-+                    attrs: Vec::new(),
-+                    lo,
-+                    limits,
-+                    hi,
-+                }))
-+            } else {
-+                Ok(Pat::Verbatim(verbatim::between(begin, input)))
-+            }
-         } else {
-             Ok(Pat::Lit(PatLit {
-                 attrs: Vec::new(),
-                 expr: lo,
-             }))
-         }
-     }
- 
--    fn pat_lit_expr(input: ParseStream) -> Result<Box<Expr>> {
-+    fn pat_lit_expr(input: ParseStream) -> Result<Option<Box<Expr>>> {
-+        if input.is_empty()
-+            || input.peek(Token![|])
-+            || input.peek(Token![=>])
-+            || input.peek(Token![:]) && !input.peek(Token![::])
-+            || input.peek(Token![,])
-+            || input.peek(Token![;])
-+        {
-+            return Ok(None);
-+        }
-+
-         let neg: Option<Token![-]> = input.parse()?;
- 
-         let lookahead = input.lookahead1();
-         let expr = if lookahead.peek(Lit) {
-             Expr::Lit(input.parse()?)
-         } else if lookahead.peek(Ident)
-             || lookahead.peek(Token![::])
-             || lookahead.peek(Token![<])
-             || lookahead.peek(Token![self])
-             || lookahead.peek(Token![Self])
-             || lookahead.peek(Token![super])
--            || lookahead.peek(Token![extern])
-             || lookahead.peek(Token![crate])
-         {
-             Expr::Path(input.parse()?)
-         } else {
-             return Err(lookahead.error());
-         };
- 
--        Ok(Box::new(if let Some(neg) = neg {
-+        Ok(Some(Box::new(if let Some(neg) = neg {
-             Expr::Unary(ExprUnary {
-                 attrs: Vec::new(),
-                 op: UnOp::Neg(neg),
-                 expr: Box::new(expr),
-             })
-         } else {
-             expr
--        }))
-+        })))
-     }
- 
-     fn pat_slice(input: ParseStream) -> Result<PatSlice> {
-         let content;
-         let bracket_token = bracketed!(content in input);
- 
-         let mut elems = Punctuated::new();
-         while !content.is_empty() {
--            let value: Pat = content.parse()?;
-+            let value = multi_pat(&content)?;
-             elems.push_value(value);
-             if content.is_empty() {
-                 break;
-             }
-             let punct = content.parse()?;
-             elems.push_punct(punct);
-         }
- 
-         Ok(PatSlice {
-             attrs: Vec::new(),
-             bracket_token,
-             elems,
-         })
-     }
- 
--    fn pat_rest(input: ParseStream) -> Result<PatRest> {
--        Ok(PatRest {
--            attrs: Vec::new(),
--            dot2_token: input.parse()?,
--        })
-+    pub fn multi_pat(input: ParseStream) -> Result<Pat> {
-+        multi_pat_impl(input, None)
-+    }
-+
-+    pub fn multi_pat_with_leading_vert(input: ParseStream) -> Result<Pat> {
-+        let leading_vert: Option<Token![|]> = input.parse()?;
-+        multi_pat_impl(input, leading_vert)
-+    }
-+
-+    fn multi_pat_impl(input: ParseStream, leading_vert: Option<Token![|]>) -> Result<Pat> {
-+        let mut pat: Pat = input.parse()?;
-+        if leading_vert.is_some()
-+            || input.peek(Token![|]) && !input.peek(Token![||]) && !input.peek(Token![|=])
-+        {
-+            let mut cases = Punctuated::new();
-+            cases.push_value(pat);
-+            while input.peek(Token![|]) && !input.peek(Token![||]) && !input.peek(Token![|=]) {
-+                let punct = input.parse()?;
-+                cases.push_punct(punct);
-+                let pat: Pat = input.parse()?;
-+                cases.push_value(pat);
-+            }
-+            pat = Pat::Or(PatOr {
-+                attrs: Vec::new(),
-+                leading_vert,
-+                cases,
-+            });
-+        }
-+        Ok(pat)
-     }
- }
- 
- #[cfg(feature = "printing")]
- mod printing {
-     use super::*;
- 
-     use proc_macro2::TokenStream;
-     use quote::{ToTokens, TokenStreamExt};
- 
-     use crate::attr::FilterAttrs;
- 
-     impl ToTokens for PatWild {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             self.underscore_token.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for PatIdent {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             self.by_ref.to_tokens(tokens);
-             self.mutability.to_tokens(tokens);
-             self.ident.to_tokens(tokens);
-             if let Some((at_token, subpat)) = &self.subpat {
-                 at_token.to_tokens(tokens);
-                 subpat.to_tokens(tokens);
-             }
-         }
-     }
- 
-     impl ToTokens for PatStruct {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             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);
-             });
-         }
-     }
- 
-     impl ToTokens for PatTupleStruct {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             self.path.to_tokens(tokens);
-             self.pat.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for PatType {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-             tokens.append_all(self.attrs.outer());
-             self.pat.to_tokens(tokens);
-             self.colon_token.to_tokens(tokens);
-             self.ty.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for PatPath {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             private::print_path(tokens, &self.qself, &self.path);
-         }
-     }
- 
-     impl ToTokens for PatTuple {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             self.paren_token.surround(tokens, |tokens| {
-                 self.elems.to_tokens(tokens);
-             });
-         }
-     }
- 
-     impl ToTokens for PatBox {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             self.box_token.to_tokens(tokens);
-             self.pat.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for PatReference {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             self.and_token.to_tokens(tokens);
-             self.mutability.to_tokens(tokens);
-             self.pat.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for PatRest {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             self.dot2_token.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for PatLit {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             self.expr.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for PatRange {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             self.lo.to_tokens(tokens);
-             match &self.limits {
-                 RangeLimits::HalfOpen(t) => t.to_tokens(tokens),
-                 RangeLimits::Closed(t) => t.to_tokens(tokens),
-             }
-             self.hi.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for PatSlice {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             self.bracket_token.surround(tokens, |tokens| {
-                 self.elems.to_tokens(tokens);
-             });
-         }
-     }
- 
-     impl ToTokens for PatMacro {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             self.mac.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for PatOr {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             self.leading_vert.to_tokens(tokens);
-             self.cases.to_tokens(tokens);
-         }
-     }
- 
-     impl ToTokens for FieldPat {
-         fn to_tokens(&self, tokens: &mut TokenStream) {
-+            tokens.append_all(self.attrs.outer());
-             if let Some(colon_token) = &self.colon_token {
-                 self.member.to_tokens(tokens);
-                 colon_token.to_tokens(tokens);
-             }
-             self.pat.to_tokens(tokens);
-         }
-     }
- }
-diff --git a/third_party/rust/syn/src/path.rs b/third_party/rust/syn/src/path.rs
---- a/third_party/rust/syn/src/path.rs
-+++ b/third_party/rust/syn/src/path.rs
-@@ -1,15 +1,15 @@
- use super::*;
- use crate::punctuated::Punctuated;
- 
- ast_struct! {
--    /// A path at which a named item is exported: `std::collections::HashMap`.
-+    /// A path at which a named item is exported (e.g. `std::collections::HashMap`).
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-+    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
-     /// feature.*
-     pub struct Path {
-         pub leading_colon: Option<Token![::]>,
-         pub segments: Punctuated<PathSegment, Token![::]>,
-     }
- }
- 
- impl<T> From<T> for Path
-@@ -24,17 +24,17 @@ where
-         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"`
-+    /// *This type is available only 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
-@@ -47,17 +47,17 @@ where
-             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"`
-+    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
-     /// feature.*
-     ///
-     /// ## Angle bracketed
-     ///
-     /// The `<'a, T>` in `std::slice::iter<'a, T>`.
-     ///
-     /// ## Parenthesized
-     ///
-@@ -93,17 +93,17 @@ impl PathArguments {
-             PathArguments::AngleBracketed(_) | 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"`
-+    /// *This type is available only 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>`.
-@@ -117,55 +117,55 @@ ast_enum! {
-         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"`
-+    /// *This type is available only 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"`
-+    /// *This type is available only 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! {
-     /// An associated type bound: `Iterator<Item: Display>`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-+    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
-     /// feature.*
-     pub struct Constraint {
-         pub ident: Ident,
-         pub colon_token: Token![:],
-         pub bounds: Punctuated<TypeParamBound, Token![+]>,
-     }
- }
- 
- 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"`
-+    /// *This type is available only 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,
-     }
-@@ -184,17 +184,17 @@ ast_struct! {
-     ///  ^~~~~~    ~~~~~~~~~~~~~~^
-     ///  ty        position = 3
-     ///
-     /// <Vec<T>>::AssociatedItem
-     ///  ^~~~~~   ^
-     ///  ty       position = 0
-     /// ```
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-+    /// *This type is available only 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![>],
-     }
-@@ -286,21 +286,17 @@ pub mod parsing {
-     impl Parse for PathSegment {
-         fn parse(input: ParseStream) -> Result<Self> {
-             Self::parse_helper(input, false)
-         }
-     }
- 
-     impl PathSegment {
-         fn parse_helper(input: ParseStream, expr_style: bool) -> Result<Self> {
--            if input.peek(Token![super])
--                || input.peek(Token![self])
--                || input.peek(Token![crate])
--                || input.peek(Token![extern])
--            {
-+            if input.peek(Token![super]) || input.peek(Token![self]) || input.peek(Token![crate]) {
-                 let ident = input.call(Ident::parse_any)?;
-                 return Ok(PathSegment::from(ident));
-             }
- 
-             let ident = if input.peek(Token![Self]) {
-                 input.call(Ident::parse_any)?
-             } else {
-                 input.parse()?
-@@ -353,17 +349,17 @@ pub mod parsing {
-                 },
-             })
-         }
-     }
- 
-     impl Path {
-         /// Parse a `Path` containing no path arguments on any of its segments.
-         ///
--        /// *This function is available if Syn is built with the `"parsing"`
-+        /// *This function is available only if Syn is built with the `"parsing"`
-         /// feature.*
-         ///
-         /// # Example
-         ///
-         /// ```
-         /// use syn::{Path, Result, Token};
-         /// use syn::parse::{Parse, ParseStream};
-         ///
-@@ -395,17 +391,16 @@ pub mod parsing {
-                 segments: {
-                     let mut segments = Punctuated::new();
-                     loop {
-                         if !input.peek(Ident)
-                             && !input.peek(Token![super])
-                             && !input.peek(Token![self])
-                             && !input.peek(Token![Self])
-                             && !input.peek(Token![crate])
--                            && !input.peek(Token![extern])
-                         {
-                             break;
-                         }
-                         let ident = Ident::parse_any(input)?;
-                         segments.push_value(PathSegment::from(ident));
-                         if !input.peek(Token![::]) {
-                             break;
-                         }
-@@ -428,17 +423,17 @@ pub mod parsing {
-         /// For them to compare equal, it must be the case that:
-         ///
-         /// - the path has no leading colon,
-         /// - the number of path segments is 1,
-         /// - the first path segment has no angle bracketed or parenthesized
-         ///   path arguments, and
-         /// - the ident of the first path segment is equal to the given one.
-         ///
--        /// *This function is available if Syn is built with the `"parsing"`
-+        /// *This function is available only if Syn is built with the `"parsing"`
-         /// feature.*
-         ///
-         /// # Example
-         ///
-         /// ```
-         /// use syn::{Attribute, Error, Meta, NestedMeta, Result};
-         /// # use std::iter::FromIterator;
-         ///
-@@ -467,17 +462,17 @@ pub mod parsing {
-         ///
-         /// A path is considered an ident if:
-         ///
-         /// - the path has no leading colon,
-         /// - the number of path segments is 1, and
-         /// - the first path segment has no angle bracketed or parenthesized
-         ///   path arguments.
-         ///
--        /// *This function is available if Syn is built with the `"parsing"`
-+        /// *This function is available only if Syn is built with the `"parsing"`
-         /// feature.*
-         pub fn get_ident(&self) -> Option<&Ident> {
-             if self.leading_colon.is_none()
-                 && self.segments.len() == 1
-                 && self.segments[0].arguments.is_none()
-             {
-                 Some(&self.segments[0].ident)
-             } else {
-diff --git a/third_party/rust/syn/src/punctuated.rs b/third_party/rust/syn/src/punctuated.rs
---- a/third_party/rust/syn/src/punctuated.rs
-+++ b/third_party/rust/syn/src/punctuated.rs
-@@ -17,16 +17,18 @@
- //!
- //! ```text
- //! a_function_call(arg1, arg2, arg3);
- //!                 ~~~~^ ~~~~^ ~~~~
- //! ```
- 
- #[cfg(feature = "extra-traits")]
- use std::fmt::{self, Debug};
-+#[cfg(feature = "extra-traits")]
-+use std::hash::{Hash, Hasher};
- #[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;
- 
-@@ -36,18 +38,16 @@ use crate::parse::{Parse, ParseStream, R
- use crate::token::Token;
- 
- /// 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]: self
--#[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> {
-@@ -71,32 +71,29 @@ impl<T, P> Punctuated<T, P> {
-         self.inner.len() + if self.last.is_some() { 1 } else { 0 }
-     }
- 
-     /// Borrows the first element in this sequence.
-     pub fn first(&self) -> Option<&T> {
-         self.iter().next()
-     }
- 
-+    /// Mutably borrows the first element in this sequence.
-+    pub fn first_mut(&mut self) -> Option<&mut T> {
-+        self.iter_mut().next()
-+    }
-+
-     /// Borrows the last element in this sequence.
-     pub fn last(&self) -> Option<&T> {
--        if self.last.is_some() {
--            self.last.as_ref().map(Box::as_ref)
--        } else {
--            self.inner.last().map(|pair| &pair.0)
--        }
-+        self.iter().next_back()
-     }
- 
-     /// Mutably borrows the last element in this sequence.
-     pub fn last_mut(&mut self) -> Option<&mut T> {
--        if self.last.is_some() {
--            self.last.as_mut().map(Box::as_mut)
--        } else {
--            self.inner.last_mut().map(|pair| &mut pair.0)
--        }
-+        self.iter_mut().next_back()
-     }
- 
-     /// 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(Box::as_ref).into_iter(),
-@@ -225,23 +222,29 @@ impl<T, P> Punctuated<T, P> {
- 
-         if index == self.len() {
-             self.push(value);
-         } else {
-             self.inner.insert(index, (value, Default::default()));
-         }
-     }
- 
-+    /// Clears the sequence of all values and punctuation, making it empty.
-+    pub fn clear(&mut self) {
-+        self.inner.clear();
-+        self.last = None;
-+    }
-+
-     /// Parses zero or more occurrences of `T` separated by punctuation of type
-     /// `P`, with optional trailing punctuation.
-     ///
-     /// Parsing continues until the end of this parse stream. The entire content
-     /// of this parse stream must consist of `T` and `P`.
-     ///
--    /// *This function is available if Syn is built with the `"parsing"`
-+    /// *This function is available only if Syn is built with the `"parsing"`
-     /// feature.*
-     #[cfg(feature = "parsing")]
-     pub fn parse_terminated(input: ParseStream) -> Result<Self>
-     where
-         T: Parse,
-         P: Parse,
-     {
-         Self::parse_terminated_with(input, T::parse)
-@@ -251,17 +254,17 @@ impl<T, P> Punctuated<T, P> {
-     /// separated by punctuation of type `P`, with optional trailing
-     /// punctuation.
-     ///
-     /// Like [`parse_terminated`], the entire content of this stream is expected
-     /// to be parsed.
-     ///
-     /// [`parse_terminated`]: Punctuated::parse_terminated
-     ///
--    /// *This function is available if Syn is built with the `"parsing"`
-+    /// *This function is available only if Syn is built with the `"parsing"`
-     /// feature.*
-     #[cfg(feature = "parsing")]
-     pub fn parse_terminated_with(
-         input: ParseStream,
-         parser: fn(ParseStream) -> Result<T>,
-     ) -> Result<Self>
-     where
-         P: Parse,
-@@ -287,17 +290,17 @@ impl<T, P> Punctuated<T, P> {
-     /// Parses one or more occurrences of `T` separated by punctuation of type
-     /// `P`, not accepting trailing punctuation.
-     ///
-     /// Parsing continues as long as punctuation `P` is present at the head of
-     /// the stream. This method returns upon parsing a `T` and observing that it
-     /// is not followed by a `P`, even if there are remaining tokens in the
-     /// stream.
-     ///
--    /// *This function is available if Syn is built with the `"parsing"`
-+    /// *This function is available only if Syn is built with the `"parsing"`
-     /// feature.*
-     #[cfg(feature = "parsing")]
-     pub fn parse_separated_nonempty(input: ParseStream) -> Result<Self>
-     where
-         T: Parse,
-         P: Token + Parse,
-     {
-         Self::parse_separated_nonempty_with(input, T::parse)
-@@ -307,17 +310,17 @@ impl<T, P> Punctuated<T, P> {
-     /// separated by punctuation of type `P`, not accepting trailing
-     /// punctuation.
-     ///
-     /// Like [`parse_separated_nonempty`], may complete early without parsing
-     /// the entire content of this stream.
-     ///
-     /// [`parse_separated_nonempty`]: Punctuated::parse_separated_nonempty
-     ///
--    /// *This function is available if Syn is built with the `"parsing"`
-+    /// *This function is available only if Syn is built with the `"parsing"`
-     /// feature.*
-     #[cfg(feature = "parsing")]
-     pub fn parse_separated_nonempty_with(
-         input: ParseStream,
-         parser: fn(ParseStream) -> Result<T>,
-     ) -> Result<Self>
-     where
-         P: Token + Parse,
-@@ -333,16 +336,63 @@ impl<T, P> Punctuated<T, P> {
-             let punct = input.parse()?;
-             punctuated.push_punct(punct);
-         }
- 
-         Ok(punctuated)
-     }
- }
- 
-+#[cfg(feature = "clone-impls")]
-+impl<T, P> Clone for Punctuated<T, P>
-+where
-+    T: Clone,
-+    P: Clone,
-+{
-+    fn clone(&self) -> Self {
-+        Punctuated {
-+            inner: self.inner.clone(),
-+            last: self.last.clone(),
-+        }
-+    }
-+}
-+
-+#[cfg(feature = "extra-traits")]
-+impl<T, P> Eq for Punctuated<T, P>
-+where
-+    T: Eq,
-+    P: Eq,
-+{
-+}
-+
-+#[cfg(feature = "extra-traits")]
-+impl<T, P> PartialEq for Punctuated<T, P>
-+where
-+    T: PartialEq,
-+    P: PartialEq,
-+{
-+    fn eq(&self, other: &Self) -> bool {
-+        let Punctuated { inner, last } = self;
-+        *inner == other.inner && *last == other.last
-+    }
-+}
-+
-+#[cfg(feature = "extra-traits")]
-+impl<T, P> Hash for Punctuated<T, P>
-+where
-+    T: Hash,
-+    P: Hash,
-+{
-+    fn hash<H: Hasher>(&self, state: &mut H) {
-+        let Punctuated { inner, last } = self;
-+        inner.hash(state);
-+        last.hash(state);
-+    }
-+}
-+
- #[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 (t, p) in &self.inner {
-             list.entry(t);
-             list.entry(p);
-         }
-@@ -531,17 +581,16 @@ impl<'a, T, P> ExactSizeIterator for Pai
-     }
- }
- 
- /// An iterator over owned pairs of type `Pair<T, P>`.
- ///
- /// Refer to the [module documentation] for details about punctuated sequences.
- ///
- /// [module documentation]: self
--#[derive(Clone)]
- 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>;
- 
-@@ -567,22 +616,34 @@ impl<T, P> DoubleEndedIterator for IntoP
- }
- 
- impl<T, P> ExactSizeIterator for IntoPairs<T, P> {
-     fn len(&self) -> usize {
-         self.inner.len() + self.last.len()
-     }
- }
- 
-+impl<T, P> Clone for IntoPairs<T, P>
-+where
-+    T: Clone,
-+    P: Clone,
-+{
-+    fn clone(&self) -> Self {
-+        IntoPairs {
-+            inner: self.inner.clone(),
-+            last: self.last.clone(),
-+        }
-+    }
-+}
-+
- /// An iterator over owned values of type `T`.
- ///
- /// Refer to the [module documentation] for details about punctuated sequences.
- ///
- /// [module documentation]: self
--#[derive(Clone)]
- pub struct IntoIter<T> {
-     inner: vec::IntoIter<T>,
- }
- 
- impl<T> Iterator for IntoIter<T> {
-     type Item = T;
- 
-     fn next(&mut self) -> Option<Self::Item> {
-@@ -601,16 +662,27 @@ impl<T> DoubleEndedIterator for IntoIter
- }
- 
- impl<T> ExactSizeIterator for IntoIter<T> {
-     fn len(&self) -> usize {
-         self.inner.len()
-     }
- }
- 
-+impl<T> Clone for IntoIter<T>
-+where
-+    T: Clone,
-+{
-+    fn clone(&self) -> Self {
-+        IntoIter {
-+            inner: self.inner.clone(),
-+        }
-+    }
-+}
-+
- /// An iterator over borrowed values of type `&T`.
- ///
- /// Refer to the [module documentation] for details about punctuated sequences.
- ///
- /// [module documentation]: self
- pub struct Iter<'a, T: 'a> {
-     // The `Item = &'a T` needs to be specified to support rustc 1.31 and older.
-     // On modern compilers we would be able to write just IterTrait<'a, T> where
-@@ -794,17 +866,16 @@ impl<'a, T: 'a, I: 'a> IterMutTrait<'a, 
- }
- 
- /// 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]: self
--#[cfg_attr(feature = "clone-impls", derive(Clone))]
- 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.
-@@ -851,16 +922,30 @@ impl<T, P> Pair<T, P> {
-     pub fn into_tuple(self) -> (T, Option<P>) {
-         match self {
-             Pair::Punctuated(t, d) => (t, Some(d)),
-             Pair::End(t) => (t, None),
-         }
-     }
- }
- 
-+#[cfg(feature = "clone-impls")]
-+impl<T, P> Clone for Pair<T, P>
-+where
-+    T: Clone,
-+    P: Clone,
-+{
-+    fn clone(&self) -> Self {
-+        match self {
-+            Pair::Punctuated(t, p) => Pair::Punctuated(t.clone(), p.clone()),
-+            Pair::End(t) => Pair::End(t.clone()),
-+        }
-+    }
-+}
-+
- 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(t) => t,
-                 None => &self.inner[index].0,
-diff --git a/third_party/rust/syn/src/reserved.rs b/third_party/rust/syn/src/reserved.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/src/reserved.rs
-@@ -0,0 +1,42 @@
-+// Type for a syntax tree node that is reserved for future use.
-+//
-+// For example ExprReference contains a field `raw` of type Reserved. If `&raw
-+// place` syntax becomes a thing as per https://github.com/rust-lang/rfcs/pull/2582,
-+// we can backward compatibly change `raw`'s type to Option<Token![raw]> without
-+// the possibility of breaking any code.
-+
-+use proc_macro2::Span;
-+use std::marker::PhantomData;
-+
-+#[cfg(feature = "extra-traits")]
-+use std::fmt::{self, Debug};
-+
-+ast_struct! {
-+    pub struct Reserved {
-+        _private: PhantomData<Span>,
-+    }
-+}
-+
-+impl Default for Reserved {
-+    fn default() -> Self {
-+        Reserved {
-+            _private: PhantomData,
-+        }
-+    }
-+}
-+
-+#[cfg(feature = "clone-impls")]
-+impl Clone for Reserved {
-+    fn clone(&self) -> Self {
-+        Reserved {
-+            _private: self._private,
-+        }
-+    }
-+}
-+
-+#[cfg(feature = "extra-traits")]
-+impl Debug for Reserved {
-+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-+        formatter.debug_struct("Reserved").finish()
-+    }
-+}
-diff --git a/third_party/rust/syn/src/spanned.rs b/third_party/rust/syn/src/spanned.rs
---- a/third_party/rust/syn/src/spanned.rs
-+++ b/third_party/rust/syn/src/spanned.rs
-@@ -1,12 +1,12 @@
- //! 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
-+//! *This module is available only if Syn is built with both the `"parsing"` and
- //! `"printing"` features.*
- //!
- //! <br>
- //!
- //! # 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
-@@ -92,17 +92,17 @@ use quote::spanned::Spanned as ToTokens;
- /// [`ToTokens`] from the `quote` crate, as well as for `Span` itself.
- ///
- /// [`ToTokens`]: quote::ToTokens
- ///
- /// See the [module documentation] for an example.
- ///
- /// [module documentation]: self
- ///
--/// *This trait is available if Syn is built with both the `"parsing"` and
-+/// *This trait is available only 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()`]: proc_macro2::Span::call_site
-     fn span(&self) -> Span;
- }
-diff --git a/third_party/rust/syn/src/stmt.rs b/third_party/rust/syn/src/stmt.rs
---- a/third_party/rust/syn/src/stmt.rs
-+++ b/third_party/rust/syn/src/stmt.rs
-@@ -1,25 +1,25 @@
- use super::*;
- 
- ast_struct! {
-     /// A braced block containing Rust statements.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct Block {
-         pub brace_token: token::Brace,
-         /// Statements in a block
-         pub stmts: Vec<Stmt>,
-     }
- }
- 
- ast_enum! {
-     /// A statement, usually ending in a semicolon.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only 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.
-@@ -28,38 +28,39 @@ ast_enum! {
-         /// Expression with trailing semicolon.
-         Semi(Expr, Token![;]),
-     }
- }
- 
- ast_struct! {
-     /// A local `let` binding: `let x: u64 = s.parse()?`.
-     ///
--    /// *This type is available if Syn is built with the `"full"` feature.*
-+    /// *This type is available only if Syn is built with the `"full"` feature.*
-     pub struct Local {
-         pub attrs: Vec<Attribute>,
-         pub let_token: Token![let],
-         pub pat: Pat,
-         pub init: Option<(Token![=], Box<Expr>)>,
-         pub semi_token: Token![;],
-     }
- }
- 
- #[cfg(feature = "parsing")]
- pub mod parsing {
-     use super::*;
- 
-+    use crate::parse::discouraged::Speculative;
-     use crate::parse::{Parse, ParseStream, Result};
--    use crate::punctuated::Punctuated;
-+    use proc_macro2::TokenStream;
- 
-     impl Block {
-         /// Parse the body of a block as zero or more statements, possibly
-         /// including one trailing expression.
-         ///
--        /// *This function is available if Syn is built with the `"parsing"`
-+        /// *This function is available only if Syn is built with the `"parsing"`
-         /// feature.*
-         ///
-         /// # Example
-         ///
-         /// ```
-         /// use syn::{braced, token, Attribute, Block, Ident, Result, Stmt, Token};
-         /// use syn::parse::{Parse, ParseStream};
-         ///
-@@ -101,18 +102,18 @@ pub mod parsing {
-         ///             stmts,
-         ///         })
-         ///     }
-         /// }
-         /// ```
-         pub fn parse_within(input: ParseStream) -> Result<Vec<Stmt>> {
-             let mut stmts = Vec::new();
-             loop {
--                while input.peek(Token![;]) {
--                    input.parse::<Token![;]>()?;
-+                while let Some(semi) = input.parse::<Option<Token![;]>>()? {
-+                    stmts.push(Stmt::Semi(Expr::Verbatim(TokenStream::new()), semi));
-                 }
-                 if input.is_empty() {
-                     break;
-                 }
-                 let s = parse_stmt(input, true)?;
-                 let requires_semicolon = if let Stmt::Expr(s) = &s {
-                     expr::requires_terminator(s)
-                 } else {
-@@ -141,65 +142,65 @@ pub mod parsing {
- 
-     impl Parse for Stmt {
-         fn parse(input: ParseStream) -> Result<Self> {
-             parse_stmt(input, false)
-         }
-     }
- 
-     fn parse_stmt(input: ParseStream, allow_nosemi: bool) -> Result<Stmt> {
--        // TODO: optimize using advance_to
-+        let mut attrs = input.call(Attribute::parse_outer)?;
-+
-+        // brace-style macros; paren and bracket macros get parsed as
-+        // expression statements.
-         let ahead = input.fork();
--        ahead.call(Attribute::parse_outer)?;
-+        if let Ok(path) = ahead.call(Path::parse_mod_style) {
-+            if ahead.peek(Token![!]) && (ahead.peek2(token::Brace) || ahead.peek2(Ident)) {
-+                input.advance_to(&ahead);
-+                return stmt_mac(input, attrs, path);
-+            }
-+        }
- 
--        if {
--            let ahead = ahead.fork();
--            // Only parse braces here; paren and bracket will get parsed as
--            // expression statements
--            ahead.call(Path::parse_mod_style).is_ok()
--                && ahead.parse::<Token![!]>().is_ok()
--                && (ahead.peek(token::Brace) || ahead.peek(Ident))
--        } {
--            stmt_mac(input)
--        } else if ahead.peek(Token![let]) {
--            stmt_local(input).map(Stmt::Local)
--        } else if ahead.peek(Token![pub])
--            || ahead.peek(Token![crate]) && !ahead.peek2(Token![::])
--            || ahead.peek(Token![extern]) && !ahead.peek2(Token![::])
--            || ahead.peek(Token![use])
--            || ahead.peek(Token![static]) && (ahead.peek2(Token![mut]) || ahead.peek2(Ident))
--            || ahead.peek(Token![const])
--            || ahead.peek(Token![unsafe]) && !ahead.peek2(token::Brace)
--            || ahead.peek(Token![async])
--                && (ahead.peek2(Token![unsafe])
--                    || ahead.peek2(Token![extern])
--                    || ahead.peek2(Token![fn]))
--            || ahead.peek(Token![fn])
--            || ahead.peek(Token![mod])
--            || ahead.peek(Token![type])
--            || ahead.peek(item::parsing::existential) && ahead.peek2(Token![type])
--            || ahead.peek(Token![struct])
--            || ahead.peek(Token![enum])
--            || ahead.peek(Token![union]) && ahead.peek2(Ident)
--            || ahead.peek(Token![auto]) && ahead.peek2(Token![trait])
--            || ahead.peek(Token![trait])
--            || ahead.peek(Token![default])
--                && (ahead.peek2(Token![unsafe]) || ahead.peek2(Token![impl]))
--            || ahead.peek(Token![impl])
--            || ahead.peek(Token![macro])
-+        if input.peek(Token![let]) {
-+            stmt_local(input, attrs).map(Stmt::Local)
-+        } else if input.peek(Token![pub])
-+            || input.peek(Token![crate]) && !input.peek2(Token![::])
-+            || input.peek(Token![extern])
-+            || input.peek(Token![use])
-+            || input.peek(Token![static]) && (input.peek2(Token![mut]) || input.peek2(Ident))
-+            || input.peek(Token![const])
-+            || input.peek(Token![unsafe]) && !input.peek2(token::Brace)
-+            || input.peek(Token![async])
-+                && (input.peek2(Token![unsafe])
-+                    || input.peek2(Token![extern])
-+                    || input.peek2(Token![fn]))
-+            || input.peek(Token![fn])
-+            || input.peek(Token![mod])
-+            || input.peek(Token![type])
-+            || input.peek(item::parsing::existential) && input.peek2(Token![type])
-+            || input.peek(Token![struct])
-+            || input.peek(Token![enum])
-+            || input.peek(Token![union]) && input.peek2(Ident)
-+            || input.peek(Token![auto]) && input.peek2(Token![trait])
-+            || input.peek(Token![trait])
-+            || input.peek(Token![default])
-+                && (input.peek2(Token![unsafe]) || input.peek2(Token![impl]))
-+            || input.peek(Token![impl])
-+            || input.peek(Token![macro])
-         {
--            input.parse().map(Stmt::Item)
-+            let mut item: Item = input.parse()?;
-+            attrs.extend(item.replace_attrs(Vec::new()));
-+            item.replace_attrs(attrs);
-+            Ok(Stmt::Item(item))
-         } else {
--            stmt_expr(input, allow_nosemi)
-+            stmt_expr(input, allow_nosemi, attrs)
-         }
-     }
- 
--    fn stmt_mac(input: ParseStream) -> Result<Stmt> {
--        let attrs = input.call(Attribute::parse_outer)?;
--        let path = input.call(Path::parse_mod_style)?;
-+    fn stmt_mac(input: ParseStream, attrs: Vec<Attribute>, path: Path) -> Result<Stmt> {
-         let bang_token: Token![!] = input.parse()?;
-         let ident: Option<Ident> = input.parse()?;
-         let (delimiter, tokens) = mac::parse_delimiter(input)?;
-         let semi_token: Option<Token![;]> = input.parse()?;
- 
-         Ok(Stmt::Item(Item::Macro(ItemMacro {
-             attrs,
-             ident,
-@@ -208,43 +209,22 @@ pub mod parsing {
-                 bang_token,
-                 delimiter,
-                 tokens,
-             },
-             semi_token,
-         })))
-     }
- 
--    fn stmt_local(input: ParseStream) -> Result<Local> {
-+    fn stmt_local(input: ParseStream, attrs: Vec<Attribute>) -> Result<Local> {
-         Ok(Local {
--            attrs: input.call(Attribute::parse_outer)?,
-+            attrs,
-             let_token: input.parse()?,
-             pat: {
--                let leading_vert: Option<Token![|]> = input.parse()?;
--                let mut pat: Pat = input.parse()?;
--                if leading_vert.is_some()
--                    || input.peek(Token![|]) && !input.peek(Token![||]) && !input.peek(Token![|=])
--                {
--                    let mut cases = Punctuated::new();
--                    cases.push_value(pat);
--                    while input.peek(Token![|])
--                        && !input.peek(Token![||])
--                        && !input.peek(Token![|=])
--                    {
--                        let punct = input.parse()?;
--                        cases.push_punct(punct);
--                        let pat: Pat = input.parse()?;
--                        cases.push_value(pat);
--                    }
--                    pat = Pat::Or(PatOr {
--                        attrs: Vec::new(),
--                        leading_vert,
--                        cases,
--                    });
--                }
-+                let mut pat: Pat = pat::parsing::multi_pat_with_leading_vert(input)?;
-                 if input.peek(Token![:]) {
-                     let colon_token: Token![:] = input.parse()?;
-                     let ty: Type = input.parse()?;
-                     pat = Pat::Type(PatType {
-                         attrs: Vec::new(),
-                         pat: Box::new(pat),
-                         colon_token,
-                         ty: Box::new(ty),
-@@ -260,22 +240,29 @@ pub mod parsing {
-                 } else {
-                     None
-                 }
-             },
-             semi_token: input.parse()?,
-         })
-     }
- 
--    fn stmt_expr(input: ParseStream, allow_nosemi: bool) -> Result<Stmt> {
--        let mut attrs = input.call(Attribute::parse_outer)?;
-+    fn stmt_expr(
-+        input: ParseStream,
-+        allow_nosemi: bool,
-+        mut attrs: Vec<Attribute>,
-+    ) -> Result<Stmt> {
-         let mut e = expr::parsing::expr_early(input)?;
- 
--        attrs.extend(e.replace_attrs(Vec::new()));
--        e.replace_attrs(attrs);
-+        let mut attr_target = &mut e;
-+        while let Expr::Binary(e) = attr_target {
-+            attr_target = &mut e.left;
-+        }
-+        attrs.extend(attr_target.replace_attrs(Vec::new()));
-+        attr_target.replace_attrs(attrs);
- 
-         if input.peek(Token![;]) {
-             return Ok(Stmt::Semi(e, input.parse()?));
-         }
- 
-         if allow_nosemi || !expr::requires_terminator(&e) {
-             Ok(Stmt::Expr(e))
-         } else {
-diff --git a/third_party/rust/syn/src/token.rs b/third_party/rust/syn/src/token.rs
---- a/third_party/rust/syn/src/token.rs
-+++ b/third_party/rust/syn/src/token.rs
-@@ -83,44 +83,41 @@
- //!
- //! - Field access to its span — `let sp = the_token.span`
- //!
- //! [Peeking]: ../parse/struct.ParseBuffer.html#method.peek
- //! [Parsing]: ../parse/struct.ParseBuffer.html#method.parse
- //! [Printing]: https://docs.rs/quote/1.0/quote/trait.ToTokens.html
- //! [`Span`]: https://docs.rs/proc-macro2/1.0/proc_macro2/struct.Span.html
- 
--use std;
- #[cfg(feature = "extra-traits")]
- use std::cmp;
- #[cfg(feature = "extra-traits")]
- use std::fmt::{self, Debug};
- #[cfg(feature = "extra-traits")]
- use std::hash::{Hash, Hasher};
- use std::ops::{Deref, DerefMut};
- 
--#[cfg(feature = "parsing")]
--use proc_macro2::Delimiter;
- #[cfg(any(feature = "parsing", feature = "printing"))]
- use proc_macro2::Ident;
- use proc_macro2::Span;
- #[cfg(feature = "printing")]
- use proc_macro2::TokenStream;
-+#[cfg(feature = "parsing")]
-+use proc_macro2::{Delimiter, Literal, Punct, TokenTree};
- #[cfg(feature = "printing")]
- use quote::{ToTokens, TokenStreamExt};
- 
- use self::private::WithSpan;
- #[cfg(feature = "parsing")]
- use crate::buffer::Cursor;
- #[cfg(feature = "parsing")]
- use crate::error::Result;
--#[cfg(any(feature = "full", feature = "derive"))]
- #[cfg(feature = "parsing")]
- use crate::lifetime::Lifetime;
--#[cfg(any(feature = "full", feature = "derive"))]
- #[cfg(feature = "parsing")]
- use crate::lit::{Lit, LitBool, LitByte, LitByteStr, LitChar, LitFloat, LitInt, LitStr};
- #[cfg(feature = "parsing")]
- use crate::lookahead;
- #[cfg(feature = "parsing")]
- use crate::parse::{Parse, ParseStream};
- use crate::span::IntoSpans;
- 
-@@ -150,31 +147,30 @@ mod private {
-     pub struct WithSpan {
-         pub span: Span,
-     }
- }
- 
- #[cfg(feature = "parsing")]
- impl private::Sealed for Ident {}
- 
--#[cfg(any(feature = "full", feature = "derive"))]
- #[cfg(feature = "parsing")]
- fn peek_impl(cursor: Cursor, peek: fn(ParseStream) -> bool) -> bool {
-+    use crate::parse::Unexpected;
-     use std::cell::Cell;
-     use std::rc::Rc;
- 
-     let scope = Span::call_site();
--    let unexpected = Rc::new(Cell::new(None));
-+    let unexpected = Rc::new(Cell::new(Unexpected::None));
-     let buffer = crate::parse::new_parse_buffer(scope, cursor, unexpected);
-     peek(&buffer)
- }
- 
--#[cfg(any(feature = "full", feature = "derive"))]
- macro_rules! impl_token {
--    ($name:ident $display:expr) => {
-+    ($display:tt $name:ty) => {
-         #[cfg(feature = "parsing")]
-         impl Token for $name {
-             fn peek(cursor: Cursor) -> bool {
-                 fn peek(input: ParseStream) -> bool {
-                     <$name as Parse>::parse(input).is_ok()
-                 }
-                 peek_impl(cursor, peek)
-             }
-@@ -184,34 +180,48 @@ macro_rules! impl_token {
-             }
-         }
- 
-         #[cfg(feature = "parsing")]
-         impl private::Sealed for $name {}
-     };
- }
- 
--#[cfg(any(feature = "full", feature = "derive"))]
--impl_token!(Lifetime "lifetime");
--#[cfg(any(feature = "full", feature = "derive"))]
--impl_token!(Lit "literal");
--#[cfg(any(feature = "full", feature = "derive"))]
--impl_token!(LitStr "string literal");
--#[cfg(any(feature = "full", feature = "derive"))]
--impl_token!(LitByteStr "byte string literal");
--#[cfg(any(feature = "full", feature = "derive"))]
--impl_token!(LitByte "byte literal");
--#[cfg(any(feature = "full", feature = "derive"))]
--impl_token!(LitChar "character literal");
--#[cfg(any(feature = "full", feature = "derive"))]
--impl_token!(LitInt "integer literal");
--#[cfg(any(feature = "full", feature = "derive"))]
--impl_token!(LitFloat "floating point literal");
--#[cfg(any(feature = "full", feature = "derive"))]
--impl_token!(LitBool "boolean literal");
-+impl_token!("lifetime" Lifetime);
-+impl_token!("literal" Lit);
-+impl_token!("string literal" LitStr);
-+impl_token!("byte string literal" LitByteStr);
-+impl_token!("byte literal" LitByte);
-+impl_token!("character literal" LitChar);
-+impl_token!("integer literal" LitInt);
-+impl_token!("floating point literal" LitFloat);
-+impl_token!("boolean literal" LitBool);
-+impl_token!("group token" proc_macro2::Group);
-+
-+macro_rules! impl_low_level_token {
-+    ($display:tt $ty:ident $get:ident) => {
-+        #[cfg(feature = "parsing")]
-+        impl Token for $ty {
-+            fn peek(cursor: Cursor) -> bool {
-+                cursor.$get().is_some()
-+            }
-+
-+            fn display() -> &'static str {
-+                $display
-+            }
-+        }
-+
-+        #[cfg(feature = "parsing")]
-+        impl private::Sealed for $ty {}
-+    };
-+}
-+
-+impl_low_level_token!("punctuation token" Punct punct);
-+impl_low_level_token!("literal" Literal literal);
-+impl_low_level_token!("token" TokenTree token_tree);
- 
- // Not public API.
- #[doc(hidden)]
- #[cfg(feature = "parsing")]
- pub trait CustomToken {
-     fn peek(cursor: Cursor) -> bool;
-     fn display() -> &'static str;
- }
-@@ -228,17 +238,16 @@ impl<T: CustomToken> Token for T {
-     fn display() -> &'static str {
-         <Self as CustomToken>::display()
-     }
- }
- 
- macro_rules! define_keywords {
-     ($($token:tt pub struct $name:ident #[$doc:meta])*) => {
-         $(
--            #[cfg_attr(feature = "clone-impls", derive(Copy, Clone))]
-             #[$doc]
-             ///
-             /// Don't try to remember the name of this type &mdash; use the
-             /// [`Token!`] macro instead.
-             ///
-             /// [`Token!`]: crate::token
-             pub struct $name {
-                 pub span: Span,
-@@ -255,16 +264,26 @@ macro_rules! define_keywords {
-             impl std::default::Default for $name {
-                 fn default() -> Self {
-                     $name {
-                         span: Span::call_site(),
-                     }
-                 }
-             }
- 
-+            #[cfg(feature = "clone-impls")]
-+            impl Copy for $name {}
-+
-+            #[cfg(feature = "clone-impls")]
-+            impl Clone for $name {
-+                fn clone(&self) -> Self {
-+                    *self
-+                }
-+            }
-+
-             #[cfg(feature = "extra-traits")]
-             impl Debug for $name {
-                 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                     f.write_str(stringify!($name))
-                 }
-             }
- 
-             #[cfg(feature = "extra-traits")]
-@@ -333,17 +352,16 @@ macro_rules! impl_deref_if_len_is_1 {
-     };
- 
-     ($name:ident/$len:tt) => {};
- }
- 
- macro_rules! define_punctuation_structs {
-     ($($token:tt pub struct $name:ident/$len:tt #[$doc:meta])*) => {
-         $(
--            #[cfg_attr(feature = "clone-impls", derive(Copy, Clone))]
-             #[repr(C)]
-             #[$doc]
-             ///
-             /// Don't try to remember the name of this type &mdash; use the
-             /// [`Token!`] macro instead.
-             ///
-             /// [`Token!`]: crate::token
-             pub struct $name {
-@@ -361,16 +379,26 @@ macro_rules! define_punctuation_structs 
-             impl std::default::Default for $name {
-                 fn default() -> Self {
-                     $name {
-                         spans: [Span::call_site(); $len],
-                     }
-                 }
-             }
- 
-+            #[cfg(feature = "clone-impls")]
-+            impl Copy for $name {}
-+
-+            #[cfg(feature = "clone-impls")]
-+            impl Clone for $name {
-+                fn clone(&self) -> Self {
-+                    *self
-+                }
-+            }
-+
-             #[cfg(feature = "extra-traits")]
-             impl Debug for $name {
-                 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                     f.write_str(stringify!($name))
-                 }
-             }
- 
-             #[cfg(feature = "extra-traits")]
-@@ -431,17 +459,16 @@ macro_rules! define_punctuation {
-             impl private::Sealed for $name {}
-         )*
-     };
- }
- 
- macro_rules! define_delimiters {
-     ($($token:tt pub struct $name:ident #[$doc:meta])*) => {
-         $(
--            #[cfg_attr(feature = "clone-impls", derive(Copy, Clone))]
-             #[$doc]
-             pub struct $name {
-                 pub span: Span,
-             }
- 
-             #[doc(hidden)]
-             #[allow(non_snake_case)]
-             pub fn $name<S: IntoSpans<[Span; 1]>>(span: S) -> $name {
-@@ -453,16 +480,26 @@ macro_rules! define_delimiters {
-             impl std::default::Default for $name {
-                 fn default() -> Self {
-                     $name {
-                         span: Span::call_site(),
-                     }
-                 }
-             }
- 
-+            #[cfg(feature = "clone-impls")]
-+            impl Copy for $name {}
-+
-+            #[cfg(feature = "clone-impls")]
-+            impl Clone for $name {
-+                fn clone(&self) -> Self {
-+                    *self
-+                }
-+            }
-+
-             #[cfg(feature = "extra-traits")]
-             impl Debug for $name {
-                 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                     f.write_str(stringify!($name))
-                 }
-             }
- 
-             #[cfg(feature = "extra-traits")]
-@@ -850,17 +887,17 @@ pub mod parsing {
-         if let Some((ident, _rest)) = cursor.ident() {
-             ident == token
-         } else {
-             false
-         }
-     }
- 
-     pub fn punct<S: FromSpans>(input: ParseStream, token: &str) -> Result<S> {
--        let mut spans = [input.cursor().span(); 3];
-+        let mut spans = [input.span(); 3];
-         punct_helper(input, token, &mut spans)?;
-         Ok(S::from_spans(&spans))
-     }
- 
-     fn punct_helper(input: ParseStream, token: &str, spans: &mut [Span; 3]) -> Result<()> {
-         input.step(|cursor| {
-             let mut cursor = *cursor;
-             assert!(token.len() <= spans.len());
-diff --git a/third_party/rust/syn/src/tt.rs b/third_party/rust/syn/src/tt.rs
---- a/third_party/rust/syn/src/tt.rs
-+++ b/third_party/rust/syn/src/tt.rs
-@@ -13,18 +13,18 @@ impl<'a> PartialEq for TokenTreeHelper<'
-                 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();
-+                let s1 = g1.stream().into_iter();
-+                let mut s2 = g2.stream().into_iter();
- 
-                 for item1 in s1 {
-                     let item2 = match s2.next() {
-                         Some(item) => item,
-                         None => return false,
-                     };
-                     if TokenTreeHelper(&item1) != TokenTreeHelper(&item2) {
-                         return false;
-@@ -55,17 +55,17 @@ impl<'a> Hash for TokenTreeHelper<'a> {
-                 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() {
-+                for item in g.stream() {
-                     TokenTreeHelper(&item).hash(h);
-                 }
-                 0xffu8.hash(h); // terminator w/ a variant we don't normally hash
-             }
-             TokenTree::Punct(op) => {
-                 1u8.hash(h);
-                 op.as_char().hash(h);
-                 match op.spacing() {
-diff --git a/third_party/rust/syn/src/ty.rs b/third_party/rust/syn/src/ty.rs
---- a/third_party/rust/syn/src/ty.rs
-+++ b/third_party/rust/syn/src/ty.rs
-@@ -1,31 +1,27 @@
- use super::*;
- use crate::punctuated::Punctuated;
--#[cfg(feature = "extra-traits")]
--use crate::tt::TokenStreamHelper;
- use proc_macro2::TokenStream;
--#[cfg(feature = "extra-traits")]
--use std::hash::{Hash, Hasher};
- 
- 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"`
-+    /// *This type is available only 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
-     //
-     // TODO: change syntax-tree-enum link to an intra rustdoc link, currently
-     // blocked on https://github.com/rust-lang/rust/issues/62833
--    pub enum Type #manual_extra_traits {
-+    pub enum Type {
-         /// A fixed size array type: `[T; n]`.
-         Array(TypeArray),
- 
-         /// A bare function type: `fn(usize) -> bool`.
-         BareFn(TypeBareFn),
- 
-         /// A type contained within invisible delimiters.
-         Group(TypeGroup),
-@@ -72,295 +68,194 @@ ast_enum_of_structs! {
-         #[doc(hidden)]
-         __Nonexhaustive,
-     }
- }
- 
- ast_struct! {
-     /// A fixed size array type: `[T; n]`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct TypeArray {
-         pub bracket_token: token::Bracket,
-         pub elem: Box<Type>,
-         pub semi_token: Token![;],
-         pub len: Expr,
-     }
- }
- 
- ast_struct! {
-     /// A bare function type: `fn(usize) -> bool`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct TypeBareFn {
-         pub lifetimes: Option<BoundLifetimes>,
-         pub unsafety: Option<Token![unsafe]>,
-         pub abi: Option<Abi>,
-         pub fn_token: Token![fn],
-         pub paren_token: token::Paren,
-         pub inputs: Punctuated<BareFnArg, Token![,]>,
-         pub variadic: Option<Variadic>,
-         pub output: ReturnType,
-     }
- }
- 
- ast_struct! {
-     /// A type contained within invisible delimiters.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct TypeGroup {
-         pub group_token: token::Group,
-         pub elem: Box<Type>,
-     }
- }
- 
- ast_struct! {
-     /// 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
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct TypeImplTrait {
-         pub impl_token: Token![impl],
-         pub bounds: Punctuated<TypeParamBound, Token![+]>,
-     }
- }
- 
- ast_struct! {
-     /// Indication that a type should be inferred by the compiler: `_`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct TypeInfer {
-         pub underscore_token: Token![_],
-     }
- }
- 
- ast_struct! {
-     /// A macro in the type position.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct TypeMacro {
-         pub mac: Macro,
-     }
- }
- 
- ast_struct! {
-     /// The never type: `!`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct TypeNever {
-         pub bang_token: Token![!],
-     }
- }
- 
- ast_struct! {
-     /// A parenthesized type equivalent to the inner type.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct TypeParen {
-         pub paren_token: token::Paren,
-         pub elem: Box<Type>,
-     }
- }
- 
- ast_struct! {
-     /// A path like `std::slice::Iter`, optionally qualified with a
-     /// self-type as in `<Vec<T> as SomeTrait>::Associated`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct TypePath {
-         pub qself: Option<QSelf>,
-         pub path: Path,
-     }
- }
- 
- ast_struct! {
-     /// A raw pointer type: `*const T` or `*mut T`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct TypePtr {
-         pub star_token: Token![*],
-         pub const_token: Option<Token![const]>,
-         pub mutability: Option<Token![mut]>,
-         pub elem: Box<Type>,
-     }
- }
- 
- ast_struct! {
-     /// A reference type: `&'a T` or `&'a mut T`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct TypeReference {
-         pub and_token: Token![&],
-         pub lifetime: Option<Lifetime>,
-         pub mutability: Option<Token![mut]>,
-         pub elem: Box<Type>,
-     }
- }
- 
- ast_struct! {
-     /// A dynamically sized slice type: `[T]`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct TypeSlice {
-         pub bracket_token: token::Bracket,
-         pub elem: Box<Type>,
-     }
- }
- 
- ast_struct! {
-     /// 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
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct TypeTraitObject {
-         pub dyn_token: Option<Token![dyn]>,
-         pub bounds: Punctuated<TypeParamBound, Token![+]>,
-     }
- }
- 
- ast_struct! {
-     /// A tuple type: `(A, B, C, String)`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or
-+    /// *This type is available only if Syn is built with the `"derive"` or
-     /// `"full"` feature.*
-     pub struct TypeTuple {
-         pub paren_token: token::Paren,
-         pub elems: Punctuated<Type, Token![,]>,
-     }
- }
- 
--#[cfg(feature = "extra-traits")]
--impl Eq for Type {}
--
--#[cfg(feature = "extra-traits")]
--impl PartialEq for Type {
--    fn eq(&self, other: &Self) -> bool {
--        match (self, other) {
--            (Type::Array(this), Type::Array(other)) => this == other,
--            (Type::BareFn(this), Type::BareFn(other)) => this == other,
--            (Type::Group(this), Type::Group(other)) => this == other,
--            (Type::ImplTrait(this), Type::ImplTrait(other)) => this == other,
--            (Type::Infer(this), Type::Infer(other)) => this == other,
--            (Type::Macro(this), Type::Macro(other)) => this == other,
--            (Type::Never(this), Type::Never(other)) => this == other,
--            (Type::Paren(this), Type::Paren(other)) => this == other,
--            (Type::Path(this), Type::Path(other)) => this == other,
--            (Type::Ptr(this), Type::Ptr(other)) => this == other,
--            (Type::Reference(this), Type::Reference(other)) => this == other,
--            (Type::Slice(this), Type::Slice(other)) => this == other,
--            (Type::TraitObject(this), Type::TraitObject(other)) => this == other,
--            (Type::Tuple(this), Type::Tuple(other)) => this == other,
--            (Type::Verbatim(this), Type::Verbatim(other)) => {
--                TokenStreamHelper(this) == TokenStreamHelper(other)
--            }
--            _ => false,
--        }
--    }
--}
--
--#[cfg(feature = "extra-traits")]
--impl Hash for Type {
--    fn hash<H>(&self, hash: &mut H)
--    where
--        H: Hasher,
--    {
--        match self {
--            Type::Array(ty) => {
--                hash.write_u8(0);
--                ty.hash(hash);
--            }
--            Type::BareFn(ty) => {
--                hash.write_u8(1);
--                ty.hash(hash);
--            }
--            Type::Group(ty) => {
--                hash.write_u8(2);
--                ty.hash(hash);
--            }
--            Type::ImplTrait(ty) => {
--                hash.write_u8(3);
--                ty.hash(hash);
--            }
--            Type::Infer(ty) => {
--                hash.write_u8(4);
--                ty.hash(hash);
--            }
--            Type::Macro(ty) => {
--                hash.write_u8(5);
--                ty.hash(hash);
--            }
--            Type::Never(ty) => {
--                hash.write_u8(6);
--                ty.hash(hash);
--            }
--            Type::Paren(ty) => {
--                hash.write_u8(7);
--                ty.hash(hash);
--            }
--            Type::Path(ty) => {
--                hash.write_u8(8);
--                ty.hash(hash);
--            }
--            Type::Ptr(ty) => {
--                hash.write_u8(9);
--                ty.hash(hash);
--            }
--            Type::Reference(ty) => {
--                hash.write_u8(10);
--                ty.hash(hash);
--            }
--            Type::Slice(ty) => {
--                hash.write_u8(11);
--                ty.hash(hash);
--            }
--            Type::TraitObject(ty) => {
--                hash.write_u8(12);
--                ty.hash(hash);
--            }
--            Type::Tuple(ty) => {
--                hash.write_u8(13);
--                ty.hash(hash);
--            }
--            Type::Verbatim(ty) => {
--                hash.write_u8(14);
--                TokenStreamHelper(ty).hash(hash);
--            }
--            Type::__Nonexhaustive => unreachable!(),
--        }
--    }
--}
--
- ast_struct! {
-     /// The binary interface of a function: `extern "C"`.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-+    /// *This type is available only 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"`
-+    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
-     /// feature.*
-     pub struct BareFnArg {
-         pub attrs: Vec<Attribute>,
-         pub name: Option<(Ident, Token![:])>,
-         pub ty: Type,
-     }
- }
- 
-@@ -372,28 +267,28 @@ ast_struct! {
-     /// # struct c_int;
-     /// #
-     /// extern "C" {
-     ///     fn printf(format: *const c_char, ...) -> c_int;
-     ///     //                               ^^^
-     /// }
-     /// ```
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-+    /// *This type is available only if Syn is built with the `"derive"` or `"full"`
-     /// feature.*
-     pub struct Variadic {
-         pub attrs: Vec<Attribute>,
-         pub dots: Token![...],
-     }
- }
- 
- ast_enum! {
-     /// Return type of a function signature.
-     ///
--    /// *This type is available if Syn is built with the `"derive"` or `"full"`
-+    /// *This type is available only 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>),
-@@ -402,39 +297,44 @@ ast_enum! {
- 
- #[cfg(feature = "parsing")]
- pub mod parsing {
-     use super::*;
- 
-     use crate::ext::IdentExt;
-     use crate::parse::{Parse, ParseStream, Result};
-     use crate::path;
-+    use proc_macro2::{Punct, Spacing, TokenTree};
-+    use std::iter::FromIterator;
- 
-     impl Parse for Type {
-         fn parse(input: ParseStream) -> Result<Self> {
--            ambig_ty(input, true)
-+            let allow_plus = true;
-+            ambig_ty(input, allow_plus)
-         }
-     }
- 
-     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.
-         pub fn without_plus(input: ParseStream) -> Result<Self> {
--            ambig_ty(input, false)
-+            let allow_plus = false;
-+            ambig_ty(input, allow_plus)
-         }
-     }
- 
-     fn ambig_ty(input: ParseStream, allow_plus: bool) -> Result<Type> {
--        if input.peek(token::Group) {
-+        if input.peek(token::Group) && !input.peek2(Token![::]) && !input.peek2(Token![<]) {
-             return input.parse().map(Type::Group);
-         }
- 
-+        let begin = input.fork();
-         let mut lifetimes = None::<BoundLifetimes>;
-         let mut lookahead = input.lookahead1();
-         if lookahead.peek(Token![for]) {
-             lifetimes = input.parse()?;
-             lookahead = input.lookahead1();
-             if !lookahead.peek(Ident)
-                 && !lookahead.peek(Token![fn])
-                 && !lookahead.peek(Token![unsafe])
-@@ -519,17 +419,17 @@ pub mod parsing {
-                             }
-                             match bounds.into_iter().next().unwrap() {
-                                 TypeParamBound::Trait(trait_bound) => {
-                                     TypeParamBound::Trait(TraitBound {
-                                         paren_token: Some(paren_token),
-                                         ..trait_bound
-                                     })
-                                 }
--                                other => other,
-+                                other @ TypeParamBound::Lifetime(_) => other,
-                             }
-                         }
-                         _ => break,
-                     };
-                     return Ok(Type::TraitObject(TypeTraitObject {
-                         dyn_token: None,
-                         bounds: {
-                             let mut bounds = Punctuated::new();
-@@ -544,27 +444,30 @@ pub mod parsing {
-                 }
-             }
-             Ok(Type::Paren(TypeParen {
-                 paren_token,
-                 elem: Box::new(first),
-             }))
-         } else if lookahead.peek(Token![fn])
-             || lookahead.peek(Token![unsafe])
--            || lookahead.peek(Token![extern]) && !input.peek2(Token![::])
-+            || lookahead.peek(Token![extern])
-         {
--            let mut bare_fn: TypeBareFn = input.parse()?;
--            bare_fn.lifetimes = lifetimes;
--            Ok(Type::BareFn(bare_fn))
-+            let allow_mut_self = true;
-+            if let Some(mut bare_fn) = parse_bare_fn(input, allow_mut_self)? {
-+                bare_fn.lifetimes = lifetimes;
-+                Ok(Type::BareFn(bare_fn))
-+            } else {
-+                Ok(Type::Verbatim(verbatim::between(begin, input)))
-+            }
-         } else if lookahead.peek(Ident)
-             || input.peek(Token![super])
-             || input.peek(Token![self])
-             || input.peek(Token![Self])
-             || input.peek(Token![crate])
--            || input.peek(Token![extern])
-             || lookahead.peek(Token![::])
-             || lookahead.peek(Token![<])
-         {
-             if input.peek(Token![dyn]) {
-                 let mut trait_object: TypeTraitObject = input.parse()?;
-                 if lifetimes.is_some() {
-                     match trait_object.bounds.iter_mut().next().unwrap() {
-                         TypeParamBound::Trait(trait_bound) => {
-@@ -717,48 +620,68 @@ pub mod parsing {
-                 // & binds tighter than +, so we don't allow + here.
-                 elem: Box::new(input.call(Type::without_plus)?),
-             })
-         }
-     }
- 
-     impl Parse for TypeBareFn {
-         fn parse(input: ParseStream) -> Result<Self> {
--            let args;
--            let allow_variadic;
--            Ok(TypeBareFn {
--                lifetimes: input.parse()?,
--                unsafety: input.parse()?,
--                abi: input.parse()?,
--                fn_token: input.parse()?,
--                paren_token: parenthesized!(args in input),
--                inputs: {
--                    let mut inputs = Punctuated::new();
--                    while !args.is_empty() && !args.peek(Token![...]) {
--                        inputs.push_value(args.parse()?);
--                        if args.is_empty() {
--                            break;
--                        }
--                        inputs.push_punct(args.parse()?);
-+            let allow_mut_self = false;
-+            parse_bare_fn(input, allow_mut_self).map(Option::unwrap)
-+        }
-+    }
-+
-+    fn parse_bare_fn(input: ParseStream, allow_mut_self: bool) -> Result<Option<TypeBareFn>> {
-+        let args;
-+        let mut variadic = None;
-+        let mut has_mut_self = false;
-+
-+        let bare_fn = TypeBareFn {
-+            lifetimes: input.parse()?,
-+            unsafety: input.parse()?,
-+            abi: input.parse()?,
-+            fn_token: input.parse()?,
-+            paren_token: parenthesized!(args in input),
-+            inputs: {
-+                let mut inputs = Punctuated::new();
-+
-+                while !args.is_empty() {
-+                    let attrs = args.call(Attribute::parse_outer)?;
-+
-+                    if inputs.empty_or_trailing() && args.peek(Token![...]) {
-+                        variadic = Some(Variadic {
-+                            attrs,
-+                            dots: args.parse()?,
-+                        });
-+                        break;
-                     }
--                    allow_variadic = inputs.empty_or_trailing();
--                    inputs
--                },
--                variadic: {
--                    if allow_variadic && args.peek(Token![...]) {
--                        Some(Variadic {
--                            attrs: Vec::new(),
--                            dots: args.parse()?,
--                        })
-+
-+                    if let Some(arg) = parse_bare_fn_arg(&args, allow_mut_self)? {
-+                        inputs.push_value(BareFnArg { attrs, ..arg });
-                     } else {
--                        None
-+                        has_mut_self = true;
-+                    }
-+                    if args.is_empty() {
-+                        break;
-                     }
--                },
--                output: input.call(ReturnType::without_plus)?,
--            })
-+
-+                    inputs.push_punct(args.parse()?);
-+                }
-+
-+                inputs
-+            },
-+            variadic,
-+            output: input.call(ReturnType::without_plus)?,
-+        };
-+
-+        if has_mut_self {
-+            Ok(None)
-+        } else {
-+            Ok(Some(bare_fn))
-         }
-     }
- 
-     impl Parse for TypeNever {
-         fn parse(input: ParseStream) -> Result<Self> {
-             Ok(TypeNever {
-                 bang_token: input.parse()?,
-             })
-@@ -771,19 +694,37 @@ pub mod parsing {
-                 underscore_token: input.parse()?,
-             })
-         }
-     }
- 
-     impl Parse for TypeTuple {
-         fn parse(input: ParseStream) -> Result<Self> {
-             let content;
-+            let paren_token = parenthesized!(content in input);
-+
-+            if content.is_empty() {
-+                return Ok(TypeTuple {
-+                    paren_token,
-+                    elems: Punctuated::new(),
-+                });
-+            }
-+
-+            let first: Type = content.parse()?;
-             Ok(TypeTuple {
--                paren_token: parenthesized!(content in input),
--                elems: content.parse_terminated(Type::parse)?,
-+                paren_token,
-+                elems: {
-+                    let mut elems = Punctuated::new();
-+                    elems.push_value(first);
-+                    elems.push_punct(content.parse()?);
-+                    let rest: Punctuated<Type, Token![,]> =
-+                        content.parse_terminated(Parse::parse)?;
-+                    elems.extend(rest);
-+                    elems
-+                },
-             })
-         }
-     }
- 
-     impl Parse for TypeMacro {
-         fn parse(input: ParseStream) -> Result<Self> {
-             Ok(TypeMacro {
-                 mac: input.parse()?,
-@@ -802,19 +743,21 @@ pub mod parsing {
-             }
- 
-             Ok(TypePath { qself, path })
-         }
-     }
- 
-     impl ReturnType {
-         pub fn without_plus(input: ParseStream) -> Result<Self> {
--            Self::parse(input, false)
-+            let allow_plus = false;
-+            Self::parse(input, allow_plus)
-         }
- 
-+        #[doc(hidden)]
-         pub fn parse(input: ParseStream, allow_plus: bool) -> Result<Self> {
-             if input.peek(Token![->]) {
-                 let arrow = input.parse()?;
-                 let ty = ambig_ty(input, allow_plus)?;
-                 Ok(ReturnType::Type(arrow, Box::new(ty)))
-             } else {
-                 Ok(ReturnType::Default)
-             }
-@@ -839,20 +782,22 @@ pub mod parsing {
-                 return true;
-             }
-         }
-         false
-     }
- 
-     impl TypeTraitObject {
-         pub fn without_plus(input: ParseStream) -> Result<Self> {
--            Self::parse(input, false)
-+            let allow_plus = false;
-+            Self::parse(input, allow_plus)
-         }
- 
-         // Only allow multiple trait references if allow_plus is true.
-+        #[doc(hidden)]
-         pub fn parse(input: ParseStream, allow_plus: bool) -> Result<Self> {
-             Ok(TypeTraitObject {
-                 dyn_token: input.parse()?,
-                 bounds: {
-                     let mut bounds = Punctuated::new();
-                     if allow_plus {
-                         loop {
-                             bounds.push_value(input.parse()?);
-@@ -905,48 +850,99 @@ pub mod parsing {
-                 group_token: group.token,
-                 elem: group.content.parse()?,
-             })
-         }
-     }
- 
-     impl Parse for TypeParen {
-         fn parse(input: ParseStream) -> Result<Self> {
--            Self::parse(input, false)
-+            let allow_plus = false;
-+            Self::parse(input, allow_plus)
-         }
-     }
- 
-     impl TypeParen {
-         fn parse(input: ParseStream, allow_plus: bool) -> Result<Self> {
-             let content;
-             Ok(TypeParen {
-                 paren_token: parenthesized!(content in input),
-                 elem: Box::new(ambig_ty(&content, allow_plus)?),
-             })
-         }
-     }
- 
-     impl Parse for BareFnArg {
-         fn parse(input: ParseStream) -> Result<Self> {
--            Ok(BareFnArg {
--                attrs: input.call(Attribute::parse_outer)?,
--                name: {
--                    if (input.peek(Ident) || input.peek(Token![_]))
--                        && input.peek2(Token![:])
--                        && !input.peek2(Token![::])
--                    {
--                        let name = input.call(Ident::parse_any)?;
--                        let colon: Token![:] = input.parse()?;
--                        Some((name, colon))
--                    } else {
--                        None
--                    }
--                },
--                ty: input.parse()?,
--            })
-+            let allow_mut_self = false;
-+            parse_bare_fn_arg(input, allow_mut_self).map(Option::unwrap)
-+        }
-+    }
-+
-+    fn parse_bare_fn_arg(
-+        input: ParseStream,
-+        mut allow_mut_self: bool,
-+    ) -> Result<Option<BareFnArg>> {
-+        let mut has_mut_self = false;
-+        let arg = BareFnArg {
-+            attrs: input.call(Attribute::parse_outer)?,
-+            name: {
-+                if (input.peek(Ident) || input.peek(Token![_]) || input.peek(Token![self]))
-+                    && input.peek2(Token![:])
-+                    && !input.peek2(Token![::])
-+                {
-+                    let name = input.call(Ident::parse_any)?;
-+                    let colon: Token![:] = input.parse()?;
-+                    Some((name, colon))
-+                } else if allow_mut_self
-+                    && input.peek(Token![mut])
-+                    && input.peek2(Token![self])
-+                    && input.peek3(Token![:])
-+                    && !input.peek3(Token![::])
-+                {
-+                    has_mut_self = true;
-+                    allow_mut_self = false;
-+                    input.parse::<Token![mut]>()?;
-+                    input.parse::<Token![self]>()?;
-+                    input.parse::<Token![:]>()?;
-+                    None
-+                } else {
-+                    None
-+                }
-+            },
-+            ty: if !has_mut_self && input.peek(Token![...]) {
-+                let dot3 = input.parse::<Token![...]>()?;
-+                let args = vec![
-+                    TokenTree::Punct(Punct::new('.', Spacing::Joint)),
-+                    TokenTree::Punct(Punct::new('.', Spacing::Joint)),
-+                    TokenTree::Punct(Punct::new('.', Spacing::Alone)),
-+                ];
-+                let tokens = TokenStream::from_iter(args.into_iter().zip(&dot3.spans).map(
-+                    |(mut arg, span)| {
-+                        arg.set_span(*span);
-+                        arg
-+                    },
-+                ));
-+                Type::Verbatim(tokens)
-+            } else if allow_mut_self && input.peek(Token![mut]) && input.peek2(Token![self]) {
-+                has_mut_self = true;
-+                input.parse::<Token![mut]>()?;
-+                Type::Path(TypePath {
-+                    qself: None,
-+                    path: input.parse::<Token![self]>()?.into(),
-+                })
-+            } else {
-+                input.parse()?
-+            },
-+        };
-+
-+        if has_mut_self {
-+            Ok(None)
-+        } else {
-+            Ok(Some(arg))
-         }
-     }
- 
-     impl Parse for Abi {
-         fn parse(input: ParseStream) -> Result<Self> {
-             Ok(Abi {
-                 extern_token: input.parse()?,
-                 name: input.parse()?,
-diff --git a/third_party/rust/syn/src/verbatim.rs b/third_party/rust/syn/src/verbatim.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/src/verbatim.rs
-@@ -0,0 +1,15 @@
-+use crate::parse::{ParseBuffer, ParseStream};
-+use proc_macro2::TokenStream;
-+use std::iter;
-+
-+pub fn between<'a>(begin: ParseBuffer<'a>, end: ParseStream<'a>) -> TokenStream {
-+    let end = end.cursor();
-+    let mut cursor = begin.cursor();
-+    let mut tokens = TokenStream::new();
-+    while cursor != end {
-+        let (tt, next) = cursor.token_tree().unwrap();
-+        tokens.extend(iter::once(tt));
-+        cursor = next;
-+    }
-+    tokens
-+}
-diff --git a/third_party/rust/syn/src/whitespace.rs b/third_party/rust/syn/src/whitespace.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/src/whitespace.rs
-@@ -0,0 +1,65 @@
-+pub fn skip(mut s: &str) -> &str {
-+    'skip: while !s.is_empty() {
-+        let byte = s.as_bytes()[0];
-+        if byte == b'/' {
-+            if s.starts_with("//")
-+                && (!s.starts_with("///") || s.starts_with("////"))
-+                && !s.starts_with("//!")
-+            {
-+                if let Some(i) = s.find('\n') {
-+                    s = &s[i + 1..];
-+                    continue;
-+                } else {
-+                    return "";
-+                }
-+            } else if s.starts_with("/**/") {
-+                s = &s[4..];
-+                continue;
-+            } else if s.starts_with("/*")
-+                && (!s.starts_with("/**") || s.starts_with("/***"))
-+                && !s.starts_with("/*!")
-+            {
-+                let mut depth = 0;
-+                let bytes = s.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 {
-+                            s = &s[i + 2..];
-+                            continue 'skip;
-+                        }
-+                        i += 1; // eat '/'
-+                    }
-+                    i += 1;
-+                }
-+                return s;
-+            }
-+        }
-+        match byte {
-+            b' ' | 0x09..=0x0d => {
-+                s = &s[1..];
-+                continue;
-+            }
-+            b if b <= 0x7f => {}
-+            _ => {
-+                let ch = s.chars().next().unwrap();
-+                if is_whitespace(ch) {
-+                    s = &s[ch.len_utf8()..];
-+                    continue;
-+                }
-+            }
-+        }
-+        return s;
-+    }
-+    s
-+}
-+
-+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}'
-+}
-diff --git a/third_party/rust/syn/tests/.gitignore b/third_party/rust/syn/tests/.gitignore
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/tests/.gitignore
-@@ -0,0 +1,1 @@
-+/*.pending-snap
-diff --git a/third_party/rust/syn/tests/clone.sh b/third_party/rust/syn/tests/clone.sh
-deleted file mode 100755
---- a/third_party/rust/syn/tests/clone.sh
-+++ /dev/null
-@@ -1,16 +0,0 @@
--#!/bin/bash
--
--REV=4560cb830fce63fcffdc4558f4281aaac6a3a1ba
--
--set -euo pipefail
--cd "$(dirname "${BASH_SOURCE[0]}")"
--mkdir -p rust
--touch rust/COMMIT
--
--if [ "$(cat rust/COMMIT)" != "$REV" ]; then
--    rm -rf rust
--    mkdir rust
--    curl -L "https://github.com/rust-lang/rust/archive/${REV}.tar.gz" \
--        | tar xz --directory rust --strip-components 1
--    echo "$REV" > rust/COMMIT
--fi
-diff --git a/third_party/rust/syn/tests/common/eq.rs b/third_party/rust/syn/tests/common/eq.rs
---- a/third_party/rust/syn/tests/common/eq.rs
-+++ b/third_party/rust/syn/tests/common/eq.rs
-@@ -1,41 +1,40 @@
-+extern crate rustc_ast;
- extern crate rustc_data_structures;
-+extern crate rustc_span;
- extern crate rustc_target;
--extern crate syntax;
--extern crate syntax_pos;
- 
- use std::mem;
- 
--use self::rustc_data_structures::sync::Lrc;
--use self::rustc_data_structures::thin_vec::ThinVec;
--use self::rustc_target::abi::FloatTy;
--use self::rustc_target::spec::abi::Abi;
--use self::syntax::ast::{
--    AngleBracketedArgs, AnonConst, Arg, Arm, AsmDialect, AssocTyConstraint, AssocTyConstraintKind,
--    AttrId, AttrStyle, Attribute, BareFnTy, BinOpKind, BindingMode, Block, BlockCheckMode,
--    CaptureBy, Constness, Crate, CrateSugar, Defaultness, EnumDef, Expr, ExprKind, Field, FieldPat,
--    FnDecl, FnHeader, ForeignItem, ForeignItemKind, ForeignMod, FunctionRetTy, GenericArg,
--    GenericArgs, GenericBound, GenericParam, GenericParamKind, Generics, GlobalAsm, Ident,
--    ImplItem, ImplItemKind, ImplPolarity, InlineAsm, InlineAsmOutput, IntTy, IsAsync, IsAuto, Item,
--    ItemKind, Label, Lifetime, Lit, LitIntType, LitKind, Local, Mac, MacDelimiter, MacStmtStyle,
--    MacroDef, MethodSig, Mod, Movability, MutTy, Mutability, NodeId, ParenthesizedArgs, Pat,
--    PatKind, Path, PathSegment, PolyTraitRef, QSelf, RangeEnd, RangeLimits, RangeSyntax, Stmt,
--    StmtKind, StrStyle, StructField, TraitBoundModifier, TraitItem, TraitItemKind,
--    TraitObjectSyntax, TraitRef, Ty, TyKind, UintTy, UnOp, UnsafeSource, Unsafety, UseTree,
--    UseTreeKind, Variant, VariantData, VisibilityKind, WhereBoundPredicate, WhereClause,
--    WhereEqPredicate, WherePredicate, WhereRegionPredicate,
-+use rustc_ast::ast::{
-+    AngleBracketedArg, AngleBracketedArgs, AnonConst, Arm, AssocItemKind, AssocTyConstraint,
-+    AssocTyConstraintKind, Async, AttrId, AttrItem, AttrKind, AttrStyle, Attribute, BareFnTy,
-+    BinOpKind, BindingMode, Block, BlockCheckMode, BorrowKind, CaptureBy, Const, Crate, CrateSugar,
-+    Defaultness, EnumDef, Expr, ExprKind, Extern, Field, FieldPat, FloatTy, FnDecl, FnHeader,
-+    FnRetTy, FnSig, ForeignItemKind, ForeignMod, GenericArg, GenericArgs, GenericBound,
-+    GenericParam, GenericParamKind, Generics, GlobalAsm, ImplPolarity, InlineAsm, InlineAsmOperand,
-+    InlineAsmOptions, InlineAsmRegOrRegClass, InlineAsmTemplatePiece, IntTy, IsAuto, Item,
-+    ItemKind, Label, Lifetime, Lit, LitFloatType, LitIntType, LitKind, LlvmAsmDialect,
-+    LlvmInlineAsm, LlvmInlineAsmOutput, Local, MacArgs, MacCall, MacCallStmt, MacDelimiter,
-+    MacStmtStyle, MacroDef, Mod, Movability, MutTy, Mutability, NodeId, Param, ParenthesizedArgs,
-+    Pat, PatKind, Path, PathSegment, PolyTraitRef, QSelf, RangeEnd, RangeLimits, RangeSyntax, Stmt,
-+    StmtKind, StrLit, StrStyle, StructField, TraitBoundModifier, TraitObjectSyntax, TraitRef, Ty,
-+    TyKind, UintTy, UnOp, Unsafe, UnsafeSource, UseTree, UseTreeKind, Variant, VariantData,
-+    VisibilityKind, WhereBoundPredicate, WhereClause, WhereEqPredicate, WherePredicate,
-+    WhereRegionPredicate,
- };
--use self::syntax::parse::lexer::comments;
--use self::syntax::parse::token::{self, DelimToken, Token, TokenKind};
--use self::syntax::ptr::P;
--use self::syntax::source_map::Spanned;
--use self::syntax::symbol::{sym, Symbol};
--use self::syntax::tokenstream::{DelimSpan, TokenStream, TokenTree};
--use self::syntax_pos::{Span, SyntaxContext, DUMMY_SP};
-+use rustc_ast::ptr::P;
-+use rustc_ast::token::{self, CommentKind, DelimToken, Token, TokenKind};
-+use rustc_ast::tokenstream::{DelimSpan, TokenStream, TokenTree};
-+use rustc_data_structures::sync::Lrc;
-+use rustc_data_structures::thin_vec::ThinVec;
-+use rustc_span::source_map::Spanned;
-+use rustc_span::symbol::Ident;
-+use rustc_span::{Span, Symbol, SyntaxContext};
- 
- pub trait SpanlessEq {
-     fn eq(&self, other: &Self) -> bool;
- }
- 
- impl<T: SpanlessEq> SpanlessEq for P<T> {
-     fn eq(&self, other: &Self) -> bool {
-         SpanlessEq::eq(&**self, &**other)
-@@ -81,24 +80,16 @@ impl<T: SpanlessEq> SpanlessEq for Spann
- }
- 
- impl<A: SpanlessEq, B: SpanlessEq> SpanlessEq for (A, B) {
-     fn eq(&self, other: &Self) -> bool {
-         SpanlessEq::eq(&self.0, &other.0) && SpanlessEq::eq(&self.1, &other.1)
-     }
- }
- 
--impl<A: SpanlessEq, B: SpanlessEq, C: SpanlessEq> SpanlessEq for (A, B, C) {
--    fn eq(&self, other: &Self) -> bool {
--        SpanlessEq::eq(&self.0, &other.0)
--            && SpanlessEq::eq(&self.1, &other.1)
--            && SpanlessEq::eq(&self.2, &other.2)
--    }
--}
--
- macro_rules! spanless_eq_true {
-     ($name:ident) => {
-         impl SpanlessEq for $name {
-             fn eq(&self, _other: &Self) -> bool {
-                 true
-             }
-         }
-     };
-@@ -121,60 +112,62 @@ macro_rules! spanless_eq_partial_eq {
- }
- 
- spanless_eq_partial_eq!(bool);
- spanless_eq_partial_eq!(u8);
- spanless_eq_partial_eq!(u16);
- spanless_eq_partial_eq!(u128);
- spanless_eq_partial_eq!(usize);
- spanless_eq_partial_eq!(char);
-+spanless_eq_partial_eq!(String);
- spanless_eq_partial_eq!(Symbol);
--spanless_eq_partial_eq!(Abi);
-+spanless_eq_partial_eq!(CommentKind);
- spanless_eq_partial_eq!(DelimToken);
-+spanless_eq_partial_eq!(InlineAsmOptions);
- 
- macro_rules! spanless_eq_struct {
-     {
--        $name:ident;
-+        $name:ident $(<$param:ident>)?;
-         $([$field:ident $other:ident])*
-         $(![$ignore:ident])*
-     } => {
--        impl SpanlessEq for $name {
-+        impl $(<$param: SpanlessEq>)* SpanlessEq for $name $(<$param>)* {
-             fn eq(&self, other: &Self) -> bool {
-                 let $name { $($field,)* $($ignore: _,)* } = self;
-                 let $name { $($field: $other,)* $($ignore: _,)* } = other;
-                 $(SpanlessEq::eq($field, $other))&&*
-             }
-         }
-     };
- 
-     {
--        $name:ident;
-+        $name:ident $(<$param:ident>)?;
-         $([$field:ident $other:ident])*
-         $next:ident
-         $($rest:ident)*
-         $(!$ignore:ident)*
-     } => {
-         spanless_eq_struct! {
--            $name;
-+            $name $(<$param>)*;
-             $([$field $other])*
-             [$next other]
-             $($rest)*
-             $(!$ignore)*
-         }
-     };
- 
-     {
--        $name:ident;
-+        $name:ident $(<$param:ident>)?;
-         $([$field:ident $other:ident])*
-         $(![$ignore:ident])*
-         !$next:ident
-         $(!$rest:ident)*
-     } => {
-         spanless_eq_struct! {
--            $name;
-+            $name $(<$param>)*;
-             $([$field $other])*
-             $(![$ignore])*
-             ![$next]
-             $(!$rest)*
-         }
-     };
- }
- 
-@@ -258,129 +251,141 @@ macro_rules! spanless_eq_enum {
-             $name;
-             $([$variant $($fields)*])*
-             [$next]
-             $($rest)*
-         }
-     };
- }
- 
--spanless_eq_struct!(AngleBracketedArgs; span args constraints);
-+spanless_eq_struct!(AngleBracketedArgs; span args);
- spanless_eq_struct!(AnonConst; id value);
--spanless_eq_struct!(Arg; attrs ty pat id span);
--spanless_eq_struct!(Arm; attrs pats guard body span id);
-+spanless_eq_struct!(Arm; attrs pat guard body span id is_placeholder);
- spanless_eq_struct!(AssocTyConstraint; id ident kind span);
--spanless_eq_struct!(Attribute; id style path tokens span !is_sugared_doc);
--spanless_eq_struct!(BareFnTy; unsafety abi generic_params decl);
-+spanless_eq_struct!(AttrItem; path args);
-+spanless_eq_struct!(Attribute; kind id style span);
-+spanless_eq_struct!(BareFnTy; unsafety ext generic_params decl);
- spanless_eq_struct!(Block; stmts id rules span);
--spanless_eq_struct!(Crate; module attrs span);
-+spanless_eq_struct!(Crate; module attrs span proc_macros);
- spanless_eq_struct!(EnumDef; variants);
--spanless_eq_struct!(Expr; id node span attrs);
--spanless_eq_struct!(Field; ident expr span is_shorthand attrs id);
--spanless_eq_struct!(FieldPat; ident pat is_shorthand attrs id span);
--spanless_eq_struct!(FnDecl; inputs output c_variadic);
--spanless_eq_struct!(FnHeader; constness asyncness unsafety abi);
--spanless_eq_struct!(ForeignItem; ident attrs node id span vis);
-+spanless_eq_struct!(Expr; id kind span attrs !tokens);
-+spanless_eq_struct!(Field; attrs id span ident expr is_shorthand is_placeholder);
-+spanless_eq_struct!(FieldPat; ident pat is_shorthand attrs id span is_placeholder);
-+spanless_eq_struct!(FnDecl; inputs output);
-+spanless_eq_struct!(FnHeader; constness asyncness unsafety ext);
-+spanless_eq_struct!(FnSig; header decl span);
- spanless_eq_struct!(ForeignMod; abi items);
--spanless_eq_struct!(GenericParam; id ident attrs bounds kind);
-+spanless_eq_struct!(GenericParam; id ident attrs bounds is_placeholder kind);
- spanless_eq_struct!(Generics; params where_clause span);
- spanless_eq_struct!(GlobalAsm; asm);
--spanless_eq_struct!(ImplItem; id ident vis defaultness attrs generics node span !tokens);
--spanless_eq_struct!(InlineAsm; asm asm_str_style outputs inputs clobbers volatile alignstack dialect);
--spanless_eq_struct!(InlineAsmOutput; constraint expr is_rw is_indirect);
--spanless_eq_struct!(Item; ident attrs id node vis span !tokens);
-+spanless_eq_struct!(InlineAsm; template operands options line_spans);
-+spanless_eq_struct!(Item<K>; attrs id span vis ident kind !tokens);
- spanless_eq_struct!(Label; ident);
- spanless_eq_struct!(Lifetime; id ident);
--spanless_eq_struct!(Lit; token node span);
-+spanless_eq_struct!(Lit; token kind span);
-+spanless_eq_struct!(LlvmInlineAsm; asm asm_str_style outputs inputs clobbers volatile alignstack dialect);
-+spanless_eq_struct!(LlvmInlineAsmOutput; constraint expr is_rw is_indirect);
- spanless_eq_struct!(Local; pat ty init id span attrs);
--spanless_eq_struct!(Mac; path delim tts span prior_type_ascription);
--spanless_eq_struct!(MacroDef; tokens legacy);
--spanless_eq_struct!(MethodSig; header decl);
-+spanless_eq_struct!(MacCall; path args prior_type_ascription);
-+spanless_eq_struct!(MacCallStmt; mac style attrs);
-+spanless_eq_struct!(MacroDef; body macro_rules);
- spanless_eq_struct!(Mod; inner items inline);
- spanless_eq_struct!(MutTy; ty mutbl);
-+spanless_eq_struct!(Param; attrs ty pat id span is_placeholder);
- spanless_eq_struct!(ParenthesizedArgs; span inputs output);
--spanless_eq_struct!(Pat; id node span);
-+spanless_eq_struct!(Pat; id kind span tokens);
- spanless_eq_struct!(Path; span segments);
- spanless_eq_struct!(PathSegment; ident id args);
- spanless_eq_struct!(PolyTraitRef; bound_generic_params trait_ref span);
- spanless_eq_struct!(QSelf; ty path_span position);
--spanless_eq_struct!(Stmt; id node span);
--spanless_eq_struct!(StructField; span ident vis id ty attrs);
-+spanless_eq_struct!(Stmt; id kind span);
-+spanless_eq_struct!(StrLit; style symbol suffix span symbol_unescaped);
-+spanless_eq_struct!(StructField; attrs id span vis ident ty is_placeholder);
- spanless_eq_struct!(Token; kind span);
--spanless_eq_struct!(TraitItem; id ident attrs generics node span !tokens);
- spanless_eq_struct!(TraitRef; path ref_id);
--spanless_eq_struct!(Ty; id node span);
-+spanless_eq_struct!(Ty; id kind span);
- spanless_eq_struct!(UseTree; prefix kind span);
--spanless_eq_struct!(Variant; ident attrs id data disr_expr span);
-+spanless_eq_struct!(Variant; attrs id span vis ident data disr_expr is_placeholder);
- spanless_eq_struct!(WhereBoundPredicate; span bound_generic_params bounded_ty bounds);
--spanless_eq_struct!(WhereClause; predicates span);
-+spanless_eq_struct!(WhereClause; has_where_token predicates span);
- spanless_eq_struct!(WhereEqPredicate; id span lhs_ty rhs_ty);
- spanless_eq_struct!(WhereRegionPredicate; span lifetime bounds);
--spanless_eq_enum!(AsmDialect; Att Intel);
-+spanless_eq_enum!(AngleBracketedArg; Arg(0) Constraint(0));
-+spanless_eq_enum!(AssocItemKind; Const(0 1 2) Fn(0 1 2 3) TyAlias(0 1 2 3) MacCall(0));
- spanless_eq_enum!(AssocTyConstraintKind; Equality(ty) Bound(bounds));
-+spanless_eq_enum!(Async; Yes(span closure_id return_impl_trait_id) No);
-+spanless_eq_enum!(AttrKind; Normal(0) DocComment(0 1));
- spanless_eq_enum!(AttrStyle; Outer Inner);
- spanless_eq_enum!(BinOpKind; Add Sub Mul Div Rem And Or BitXor BitAnd BitOr Shl Shr Eq Lt Le Ne Ge Gt);
- spanless_eq_enum!(BindingMode; ByRef(0) ByValue(0));
- spanless_eq_enum!(BlockCheckMode; Default Unsafe(0));
-+spanless_eq_enum!(BorrowKind; Ref Raw);
- spanless_eq_enum!(CaptureBy; Value Ref);
--spanless_eq_enum!(Constness; Const NotConst);
-+spanless_eq_enum!(Const; Yes(0) No);
- spanless_eq_enum!(CrateSugar; PubCrate JustCrate);
--spanless_eq_enum!(Defaultness; Default Final);
-+spanless_eq_enum!(Defaultness; Default(0) Final);
-+spanless_eq_enum!(Extern; None Implicit Explicit(0));
- spanless_eq_enum!(FloatTy; F32 F64);
--spanless_eq_enum!(ForeignItemKind; Fn(0 1) Static(0 1) Ty Macro(0));
--spanless_eq_enum!(FunctionRetTy; Default(0) Ty(0));
-+spanless_eq_enum!(FnRetTy; Default(0) Ty(0));
-+spanless_eq_enum!(ForeignItemKind; Static(0 1 2) Fn(0 1 2 3) TyAlias(0 1 2 3) MacCall(0));
- spanless_eq_enum!(GenericArg; Lifetime(0) Type(0) Const(0));
- spanless_eq_enum!(GenericArgs; AngleBracketed(0) Parenthesized(0));
- spanless_eq_enum!(GenericBound; Trait(0 1) Outlives(0));
--spanless_eq_enum!(GenericParamKind; Lifetime Type(default) Const(ty));
--spanless_eq_enum!(ImplItemKind; Const(0 1) Method(0 1) TyAlias(0) OpaqueTy(0) Macro(0));
--spanless_eq_enum!(ImplPolarity; Positive Negative);
-+spanless_eq_enum!(GenericParamKind; Lifetime Type(default) Const(ty kw_span));
-+spanless_eq_enum!(ImplPolarity; Positive Negative(0));
-+spanless_eq_enum!(InlineAsmRegOrRegClass; Reg(0) RegClass(0));
-+spanless_eq_enum!(InlineAsmTemplatePiece; String(0) Placeholder(operand_idx modifier span));
- spanless_eq_enum!(IntTy; Isize I8 I16 I32 I64 I128);
--spanless_eq_enum!(IsAsync; Async(closure_id return_impl_trait_id) NotAsync);
- spanless_eq_enum!(IsAuto; Yes No);
-+spanless_eq_enum!(LitFloatType; Suffixed(0) Unsuffixed);
- spanless_eq_enum!(LitIntType; Signed(0) Unsigned(0) Unsuffixed);
-+spanless_eq_enum!(LlvmAsmDialect; Att Intel);
-+spanless_eq_enum!(MacArgs; Empty Delimited(0 1 2) Eq(0 1));
- spanless_eq_enum!(MacDelimiter; Parenthesis Bracket Brace);
- spanless_eq_enum!(MacStmtStyle; Semicolon Braces NoBraces);
- spanless_eq_enum!(Movability; Static Movable);
--spanless_eq_enum!(Mutability; Mutable Immutable);
-+spanless_eq_enum!(Mutability; Mut Not);
- spanless_eq_enum!(RangeEnd; Included(0) Excluded);
- spanless_eq_enum!(RangeLimits; HalfOpen Closed);
--spanless_eq_enum!(StmtKind; Local(0) Item(0) Expr(0) Semi(0) Mac(0));
-+spanless_eq_enum!(StmtKind; Local(0) Item(0) Expr(0) Semi(0) Empty MacCall(0));
- spanless_eq_enum!(StrStyle; Cooked Raw(0));
- spanless_eq_enum!(TokenTree; Token(0) Delimited(0 1 2));
--spanless_eq_enum!(TraitBoundModifier; None Maybe);
--spanless_eq_enum!(TraitItemKind; Const(0 1) Method(0 1) Type(0 1) Macro(0));
-+spanless_eq_enum!(TraitBoundModifier; None Maybe MaybeConst MaybeConstMaybe);
- spanless_eq_enum!(TraitObjectSyntax; Dyn None);
- spanless_eq_enum!(UintTy; Usize U8 U16 U32 U64 U128);
- spanless_eq_enum!(UnOp; Deref Not Neg);
-+spanless_eq_enum!(Unsafe; Yes(0) No);
- spanless_eq_enum!(UnsafeSource; CompilerGenerated UserProvided);
--spanless_eq_enum!(Unsafety; Unsafe Normal);
- spanless_eq_enum!(UseTreeKind; Simple(0 1 2) Nested(0) Glob);
- spanless_eq_enum!(VariantData; Struct(0 1) Tuple(0 1) Unit(0));
- spanless_eq_enum!(VisibilityKind; Public Crate(0) Restricted(path id) Inherited);
- spanless_eq_enum!(WherePredicate; BoundPredicate(0) RegionPredicate(0) EqPredicate(0));
--spanless_eq_enum!(ExprKind; Box(0) Array(0) Call(0 1) MethodCall(0 1) Tup(0)
-+spanless_eq_enum!(ExprKind; Box(0) Array(0) Call(0 1) MethodCall(0 1 2) Tup(0)
-     Binary(0 1 2) Unary(0 1) Lit(0) Cast(0 1) Type(0 1) Let(0 1) If(0 1 2)
-     While(0 1 2) ForLoop(0 1 2 3) Loop(0 1) Match(0 1) Closure(0 1 2 3 4 5)
--    Block(0 1) Async(0 1 2) Await(0) TryBlock(0) Assign(0 1) AssignOp(0 1 2)
--    Field(0 1) Index(0 1) Range(0 1 2) Path(0 1) AddrOf(0 1) Break(0 1)
--    Continue(0) Ret(0) InlineAsm(0) Mac(0) Struct(0 1 2) Repeat(0 1) Paren(0)
--    Try(0) Yield(0) Err);
--spanless_eq_enum!(ItemKind; ExternCrate(0) Use(0) Static(0 1 2) Const(0 1)
--    Fn(0 1 2 3) Mod(0) ForeignMod(0) GlobalAsm(0) TyAlias(0 1) OpaqueTy(0 1)
--    Enum(0 1) Struct(0 1) Union(0 1) Trait(0 1 2 3 4) TraitAlias(0 1)
--    Impl(0 1 2 3 4 5 6) Mac(0) MacroDef(0));
-+    Block(0 1) Async(0 1 2) Await(0) TryBlock(0) Assign(0 1 2) AssignOp(0 1 2)
-+    Field(0 1) Index(0 1) Range(0 1 2) Path(0 1) AddrOf(0 1 2) Break(0 1)
-+    Continue(0) Ret(0) InlineAsm(0) LlvmInlineAsm(0) MacCall(0) Struct(0 1 2)
-+    Repeat(0 1) Paren(0) Try(0) Yield(0) Err);
-+spanless_eq_enum!(InlineAsmOperand; In(reg expr) Out(reg late expr)
-+    InOut(reg late expr) SplitInOut(reg late in_expr out_expr) Const(expr)
-+    Sym(expr));
-+spanless_eq_enum!(ItemKind; ExternCrate(0) Use(0) Static(0 1 2) Const(0 1 2)
-+    Fn(0 1 2 3) Mod(0) ForeignMod(0) GlobalAsm(0) TyAlias(0 1 2 3) Enum(0 1)
-+    Struct(0 1) Union(0 1) Trait(0 1 2 3 4) TraitAlias(0 1)
-+    Impl(unsafety polarity defaultness constness generics of_trait self_ty items)
-+    MacCall(0) MacroDef(0));
- spanless_eq_enum!(LitKind; Str(0 1) ByteStr(0) Byte(0) Char(0) Int(0 1)
--    Float(0 1) FloatUnsuffixed(0) Bool(0) Err(0));
-+    Float(0 1) Bool(0) Err(0));
- spanless_eq_enum!(PatKind; Wild Ident(0 1 2) Struct(0 1 2) TupleStruct(0 1)
-     Or(0) Path(0 1) Tuple(0) Box(0) Ref(0 1) Lit(0) Range(0 1 2) Slice(0) Rest
--    Paren(0) Mac(0));
-+    Paren(0) MacCall(0));
- spanless_eq_enum!(TyKind; Slice(0) Array(0 1) Ptr(0) Rptr(0 1) BareFn(0) Never
-     Tup(0) Path(0 1) TraitObject(0 1) ImplTrait(0 1) Paren(0) Typeof(0) Infer
--    ImplicitSelf Mac(0) Err CVarArgs);
-+    ImplicitSelf MacCall(0) Err CVarArgs);
- 
- impl SpanlessEq for Ident {
-     fn eq(&self, other: &Self) -> bool {
-         self.as_str() == other.as_str()
-     }
- }
- 
- // Give up on comparing literals inside of macros because there are so many
-@@ -409,49 +414,25 @@ impl SpanlessEq for TokenKind {
-             },
-             _ => self == other,
-         }
-     }
- }
- 
- impl SpanlessEq for TokenStream {
-     fn eq(&self, other: &Self) -> bool {
--        SpanlessEq::eq(&expand_tts(self), &expand_tts(other))
-+        let mut this = self.clone().into_trees();
-+        let mut other = other.clone().into_trees();
-+        loop {
-+            let this = match this.next() {
-+                None => return other.next().is_none(),
-+                Some(val) => val,
-+            };
-+            let other = match other.next() {
-+                None => return false,
-+                Some(val) => val,
-+            };
-+            if !SpanlessEq::eq(&this, &other) {
-+                return false;
-+            }
-+        }
-     }
- }
--
--fn expand_tts(tts: &TokenStream) -> Vec<TokenTree> {
--    let mut tokens = Vec::new();
--    for tt in tts.clone().into_trees() {
--        let c = match tt {
--            TokenTree::Token(Token {
--                kind: TokenKind::DocComment(c),
--                ..
--            }) => c,
--            _ => {
--                tokens.push(tt);
--                continue;
--            }
--        };
--        let contents = comments::strip_doc_comment_decoration(&c.as_str());
--        let style = comments::doc_comment_style(&c.as_str());
--        tokens.push(TokenTree::token(TokenKind::Pound, DUMMY_SP));
--        if style == AttrStyle::Inner {
--            tokens.push(TokenTree::token(TokenKind::Not, DUMMY_SP));
--        }
--        let lit = token::Lit {
--            kind: token::LitKind::Str,
--            symbol: Symbol::intern(&contents),
--            suffix: None,
--        };
--        let tts = vec![
--            TokenTree::token(TokenKind::Ident(sym::doc, false), DUMMY_SP),
--            TokenTree::token(TokenKind::Eq, DUMMY_SP),
--            TokenTree::token(TokenKind::Literal(lit), DUMMY_SP),
--        ];
--        tokens.push(TokenTree::Delimited(
--            DelimSpan::dummy(),
--            DelimToken::Bracket,
--            tts.into_iter().collect::<TokenStream>().into(),
--        ));
--    }
--    tokens
--}
-diff --git a/third_party/rust/syn/tests/common/mod.rs b/third_party/rust/syn/tests/common/mod.rs
---- a/third_party/rust/syn/tests/common/mod.rs
-+++ b/third_party/rust/syn/tests/common/mod.rs
-@@ -1,14 +1,27 @@
- #![allow(dead_code)]
- 
-+use rayon::ThreadPoolBuilder;
- use std::env;
- 
- pub mod eq;
- pub mod parse;
- 
- /// Read the `ABORT_AFTER_FAILURE` environment variable, and parse it.
- pub fn abort_after() -> usize {
-     match env::var("ABORT_AFTER_FAILURE") {
-         Ok(s) => s.parse().expect("failed to parse ABORT_AFTER_FAILURE"),
-         Err(_) => usize::max_value(),
-     }
- }
-+
-+/// Configure Rayon threadpool.
-+pub fn rayon_init() {
-+    let stack_size = match env::var("RUST_MIN_STACK") {
-+        Ok(s) => s.parse().expect("failed to parse RUST_MIN_STACK"),
-+        Err(_) => 20 * 1024 * 1024,
-+    };
-+    ThreadPoolBuilder::new()
-+        .stack_size(stack_size)
-+        .build_global()
-+        .unwrap();
-+}
-diff --git a/third_party/rust/syn/tests/common/parse.rs b/third_party/rust/syn/tests/common/parse.rs
---- a/third_party/rust/syn/tests/common/parse.rs
-+++ b/third_party/rust/syn/tests/common/parse.rs
-@@ -1,25 +1,25 @@
--extern crate proc_macro2;
--extern crate syn;
--extern crate syntax;
--extern crate syntax_pos;
-+extern crate rustc_ast;
-+extern crate rustc_expand;
-+extern crate rustc_parse as parse;
-+extern crate rustc_session;
-+extern crate rustc_span;
- 
--use self::syntax::ast;
--use self::syntax::parse::{self, ParseSess};
--use self::syntax::ptr::P;
--use self::syntax::source_map::FilePathMapping;
--use self::syntax_pos::FileName;
-+use rustc_ast::ast;
-+use rustc_ast::ptr::P;
-+use rustc_session::parse::ParseSess;
-+use rustc_span::source_map::FilePathMapping;
-+use rustc_span::FileName;
- 
- use std::panic;
- 
--pub fn libsyntax_expr(input: &str) -> Option<P<ast::Expr>> {
-+pub fn librustc_expr(input: &str) -> Option<P<ast::Expr>> {
-     match panic::catch_unwind(|| {
-         let sess = ParseSess::new(FilePathMapping::empty());
--        sess.span_diagnostic.set_continue_after_error(false);
-         let e = parse::new_parser_from_source_str(
-             &sess,
-             FileName::Custom("test_precedence".to_string()),
-             input.to_string(),
-         )
-         .parse_expr();
-         match e {
-             Ok(expr) => Some(expr),
-@@ -27,17 +27,17 @@ pub fn libsyntax_expr(input: &str) -> Op
-                 diagnostic.emit();
-                 None
-             }
-         }
-     }) {
-         Ok(Some(e)) => Some(e),
-         Ok(None) => None,
-         Err(_) => {
--            errorf!("libsyntax panicked\n");
-+            errorf!("librustc panicked\n");
-             None
-         }
-     }
- }
- 
- pub fn syn_expr(input: &str) -> Option<syn::Expr> {
-     match syn::parse_str(input) {
-         Ok(e) => Some(e),
-diff --git a/third_party/rust/syn/tests/debug/gen.rs b/third_party/rust/syn/tests/debug/gen.rs
---- a/third_party/rust/syn/tests/debug/gen.rs
-+++ b/third_party/rust/syn/tests/debug/gen.rs
-@@ -1,13 +1,13 @@
- // This file is @generated by syn-internal-codegen.
- // It is not intended for manual editing.
- 
- use super::{Lite, RefCast};
--use std::fmt::{self, Debug};
-+use std::fmt::{self, Debug, Display};
- impl Debug for Lite<syn::Abi> {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-         let _val = &self.value;
-         let mut formatter = formatter.debug_struct("Abi");
-         if let Some(val) = &_val.name {
-             #[derive(RefCast)]
-             #[repr(transparent)]
-             struct Print(syn::LitStr);
-@@ -1034,19 +1034,19 @@ impl Debug for Lite<syn::Expr> {
-                 if !_val.attrs.is_empty() {
-                     formatter.field("attrs", Lite(&_val.attrs));
-                 }
-                 formatter.field("block", Lite(&_val.block));
-                 formatter.finish()
-             }
-             syn::Expr::Verbatim(_val) => {
-                 formatter.write_str("Verbatim")?;
--                formatter.write_str("(")?;
--                Debug::fmt(Lite(_val), formatter)?;
--                formatter.write_str(")")?;
-+                formatter.write_str("(`")?;
-+                Display::fmt(_val, formatter)?;
-+                formatter.write_str("`)")?;
-                 Ok(())
-             }
-             syn::Expr::While(_val) => {
-                 let mut formatter = formatter.debug_struct("Expr::While");
-                 if !_val.attrs.is_empty() {
-                     formatter.field("attrs", Lite(&_val.attrs));
-                 }
-                 if let Some(val) = &_val.label {
-@@ -2111,19 +2111,19 @@ impl Debug for Lite<syn::ForeignItem> {
-                         }
-                     }
-                     formatter.field("semi_token", Print::ref_cast(val));
-                 }
-                 formatter.finish()
-             }
-             syn::ForeignItem::Verbatim(_val) => {
-                 formatter.write_str("Verbatim")?;
--                formatter.write_str("(")?;
--                Debug::fmt(Lite(_val), formatter)?;
--                formatter.write_str(")")?;
-+                formatter.write_str("(`")?;
-+                Display::fmt(_val, formatter)?;
-+                formatter.write_str("`)")?;
-                 Ok(())
-             }
-             _ => unreachable!(),
-         }
-     }
- }
- impl Debug for Lite<syn::ForeignItemFn> {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-@@ -2427,19 +2427,19 @@ impl Debug for Lite<syn::ImplItem> {
-                         }
-                     }
-                     formatter.field("semi_token", Print::ref_cast(val));
-                 }
-                 formatter.finish()
-             }
-             syn::ImplItem::Verbatim(_val) => {
-                 formatter.write_str("Verbatim")?;
--                formatter.write_str("(")?;
--                Debug::fmt(Lite(_val), formatter)?;
--                formatter.write_str(")")?;
-+                formatter.write_str("(`")?;
-+                Display::fmt(_val, formatter)?;
-+                formatter.write_str("`)")?;
-                 Ok(())
-             }
-             _ => unreachable!(),
-         }
-     }
- }
- impl Debug for Lite<syn::ImplItemConst> {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-@@ -2935,19 +2935,19 @@ impl Debug for Lite<syn::Item> {
-                     }
-                     formatter.field("leading_colon", Print::ref_cast(val));
-                 }
-                 formatter.field("tree", Lite(&_val.tree));
-                 formatter.finish()
-             }
-             syn::Item::Verbatim(_val) => {
-                 formatter.write_str("Verbatim")?;
--                formatter.write_str("(")?;
--                Debug::fmt(Lite(_val), formatter)?;
--                formatter.write_str(")")?;
-+                formatter.write_str("(`")?;
-+                Display::fmt(_val, formatter)?;
-+                formatter.write_str("`)")?;
-                 Ok(())
-             }
-             _ => unreachable!(),
-         }
-     }
- }
- impl Debug for Lite<syn::ItemConst> {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-@@ -3432,19 +3432,19 @@ impl Debug for Lite<syn::Lit> {
-             syn::Lit::Float(_val) => write!(formatter, "{}", _val),
-             syn::Lit::Bool(_val) => {
-                 let mut formatter = formatter.debug_struct("Lit::Bool");
-                 formatter.field("value", Lite(&_val.value));
-                 formatter.finish()
-             }
-             syn::Lit::Verbatim(_val) => {
-                 formatter.write_str("Verbatim")?;
--                formatter.write_str("(")?;
--                Debug::fmt(Lite(_val), formatter)?;
--                formatter.write_str(")")?;
-+                formatter.write_str("(`")?;
-+                Display::fmt(_val, formatter)?;
-+                formatter.write_str("`)")?;
-                 Ok(())
-             }
-         }
-     }
- }
- impl Debug for Lite<syn::LitBool> {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-         let _val = &self.value;
-@@ -3873,19 +3873,19 @@ impl Debug for Lite<syn::Pat> {
-                     formatter.field("attrs", Lite(&_val.attrs));
-                 }
-                 formatter.field("pat", Lite(&_val.pat));
-                 formatter.field("ty", Lite(&_val.ty));
-                 formatter.finish()
-             }
-             syn::Pat::Verbatim(_val) => {
-                 formatter.write_str("Verbatim")?;
--                formatter.write_str("(")?;
--                Debug::fmt(Lite(_val), formatter)?;
--                formatter.write_str(")")?;
-+                formatter.write_str("(`")?;
-+                Display::fmt(_val, formatter)?;
-+                formatter.write_str("`)")?;
-                 Ok(())
-             }
-             syn::Pat::Wild(_val) => {
-                 let mut formatter = formatter.debug_struct("Pat::Wild");
-                 if !_val.attrs.is_empty() {
-                     formatter.field("attrs", Lite(&_val.attrs));
-                 }
-                 formatter.finish()
-@@ -4669,19 +4669,19 @@ impl Debug for Lite<syn::TraitItem> {
-                         }
-                     }
-                     formatter.field("semi_token", Print::ref_cast(val));
-                 }
-                 formatter.finish()
-             }
-             syn::TraitItem::Verbatim(_val) => {
-                 formatter.write_str("Verbatim")?;
--                formatter.write_str("(")?;
--                Debug::fmt(Lite(_val), formatter)?;
--                formatter.write_str(")")?;
-+                formatter.write_str("(`")?;
-+                Display::fmt(_val, formatter)?;
-+                formatter.write_str("`)")?;
-                 Ok(())
-             }
-             _ => unreachable!(),
-         }
-     }
- }
- impl Debug for Lite<syn::TraitItemConst> {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-@@ -5035,19 +5035,19 @@ impl Debug for Lite<syn::Type> {
-                 let mut formatter = formatter.debug_struct("Type::Tuple");
-                 if !_val.elems.is_empty() {
-                     formatter.field("elems", Lite(&_val.elems));
-                 }
-                 formatter.finish()
-             }
-             syn::Type::Verbatim(_val) => {
-                 formatter.write_str("Verbatim")?;
--                formatter.write_str("(")?;
--                Debug::fmt(Lite(_val), formatter)?;
--                formatter.write_str(")")?;
-+                formatter.write_str("(`")?;
-+                Display::fmt(_val, formatter)?;
-+                formatter.write_str("`)")?;
-                 Ok(())
-             }
-             _ => unreachable!(),
-         }
-     }
- }
- impl Debug for Lite<syn::TypeArray> {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-diff --git a/third_party/rust/syn/tests/debug/mod.rs b/third_party/rust/syn/tests/debug/mod.rs
---- a/third_party/rust/syn/tests/debug/mod.rs
-+++ b/third_party/rust/syn/tests/debug/mod.rs
-@@ -1,15 +1,12 @@
--extern crate proc_macro2;
--extern crate ref_cast;
--
- mod gen;
- 
--use self::proc_macro2::{Ident, Literal, TokenStream};
--use self::ref_cast::RefCast;
-+use proc_macro2::{Ident, Literal, TokenStream};
-+use ref_cast::RefCast;
- use std::fmt::{self, Debug};
- use std::ops::Deref;
- use syn::punctuated::Punctuated;
- 
- #[derive(RefCast)]
- #[repr(transparent)]
- pub struct Lite<T: ?Sized> {
-     value: T,
-@@ -61,17 +58,25 @@ impl Debug for Lite<Ident> {
- impl Debug for Lite<Literal> {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-         write!(formatter, "{}", self.value)
-     }
- }
- 
- impl Debug for Lite<TokenStream> {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
--        write!(formatter, "`{}`", self.value)
-+        let string = self.value.to_string();
-+        if string.len() <= 80 {
-+            write!(formatter, "TokenStream(`{}`)", self.value)
-+        } else {
-+            formatter
-+                .debug_tuple("TokenStream")
-+                .field(&format_args!("`{}`", string))
-+                .finish()
-+        }
-     }
- }
- 
- impl<'a, T> Debug for Lite<&'a T>
- where
-     Lite<T>: Debug,
- {
-     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-diff --git a/third_party/rust/syn/tests/features/error.rs b/third_party/rust/syn/tests/features/error.rs
-deleted file mode 100644
---- a/third_party/rust/syn/tests/features/error.rs
-+++ /dev/null
-@@ -1,1 +0,0 @@
--"Hello! You want: cargo test --release --all-features"
-diff --git a/third_party/rust/syn/tests/features/mod.rs b/third_party/rust/syn/tests/features/mod.rs
-deleted file mode 100644
---- a/third_party/rust/syn/tests/features/mod.rs
-+++ /dev/null
-@@ -1,22 +0,0 @@
--#[allow(unused_macros)]
--macro_rules! hide_from_rustfmt {
--    ($mod:item) => {
--        $mod
--    };
--}
--
--#[cfg(not(all(
--    feature = "derive",
--    feature = "full",
--    feature = "parsing",
--    feature = "printing",
--    feature = "visit",
--    feature = "visit-mut",
--    feature = "fold",
--    feature = "clone-impls",
--    feature = "extra-traits",
--    feature = "proc-macro",
--)))]
--hide_from_rustfmt! {
--    mod error;
--}
-diff --git a/third_party/rust/syn/tests/macros/mod.rs b/third_party/rust/syn/tests/macros/mod.rs
---- a/third_party/rust/syn/tests/macros/mod.rs
-+++ b/third_party/rust/syn/tests/macros/mod.rs
-@@ -1,10 +1,8 @@
--extern crate proc_macro2;
--
- #[path = "../debug/mod.rs"]
- pub mod debug;
- 
- use syn;
- use syn::parse::{Parse, Result};
- 
- #[macro_export]
- macro_rules! errorf {
-@@ -37,28 +35,28 @@ macro_rules! snapshot {
-     };
- }
- 
- #[macro_export]
- macro_rules! snapshot_impl {
-     (($expr:ident) as $t:ty, @$snapshot:literal) => {
-         let $expr = crate::macros::Tokens::parse::<$t>($expr).unwrap();
-         let debug = crate::macros::debug::Lite(&$expr);
--        insta::assert_debug_snapshot_matches!(debug, @$snapshot);
-+        insta::assert_debug_snapshot!(debug, @$snapshot);
-     };
-     (($($expr:tt)*) as $t:ty, @$snapshot:literal) => {{
-         let syntax_tree = crate::macros::Tokens::parse::<$t>($($expr)*).unwrap();
-         let debug = crate::macros::debug::Lite(&syntax_tree);
--        insta::assert_debug_snapshot_matches!(debug, @$snapshot);
-+        insta::assert_debug_snapshot!(debug, @$snapshot);
-         syntax_tree
-     }};
-     (($($expr:tt)*) , @$snapshot:literal) => {{
-         let syntax_tree = $($expr)*;
-         let debug = crate::macros::debug::Lite(&syntax_tree);
--        insta::assert_debug_snapshot_matches!(debug, @$snapshot);
-+        insta::assert_debug_snapshot!(debug, @$snapshot);
-         syntax_tree
-     }};
-     (($($expr:tt)*) $next:tt $($rest:tt)*) => {
-         snapshot_impl!(($($expr)* $next) $($rest)*)
-     };
- }
- 
- pub trait Tokens {
-diff --git a/third_party/rust/syn/tests/repo/mod.rs b/third_party/rust/syn/tests/repo/mod.rs
---- a/third_party/rust/syn/tests/repo/mod.rs
-+++ b/third_party/rust/syn/tests/repo/mod.rs
-@@ -1,60 +1,135 @@
--extern crate walkdir;
-+mod progress;
-+
-+use self::progress::Progress;
-+use anyhow::Result;
-+use flate2::read::GzDecoder;
-+use std::fs;
-+use std::path::Path;
-+use tar::Archive;
-+use walkdir::DirEntry;
-+
-+const REVISION: &str = "792c645ca7d11a8d254df307d019c5bf01445c37";
-+
-+#[rustfmt::skip]
-+static EXCLUDE: &[&str] = &[
-+    // Compile-fail expr parameter in const generic position: f::<1 + 2>()
-+    "test/ui/const-generics/const-expression-parameter.rs",
- 
--use std::process::Command;
-+    // Deprecated anonymous parameter syntax in traits
-+    "test/ui/issues/issue-13105.rs",
-+    "test/ui/issues/issue-13775.rs",
-+    "test/ui/issues/issue-34074.rs",
-+    "test/ui/proc-macro/trait-fn-args-2015.rs",
- 
--use self::walkdir::DirEntry;
-+    // Not actually test cases
-+    "test/rustdoc-ui/test-compile-fail2.rs",
-+    "test/rustdoc-ui/test-compile-fail3.rs",
-+    "test/ui/include-single-expr-helper.rs",
-+    "test/ui/include-single-expr-helper-1.rs",
-+    "test/ui/issues/auxiliary/issue-21146-inc.rs",
-+    "test/ui/json-bom-plus-crlf-multifile-aux.rs",
-+    "test/ui/lint/expansion-time-include.rs",
-+    "test/ui/macros/auxiliary/macro-comma-support.rs",
-+    "test/ui/macros/auxiliary/macro-include-items-expr.rs",
-+];
- 
- pub fn base_dir_filter(entry: &DirEntry) -> bool {
-     let path = entry.path();
-     if path.is_dir() {
-         return true; // otherwise walkdir does not visit the files
-     }
-     if path.extension().map(|e| e != "rs").unwrap_or(true) {
-         return false;
-     }
--    let path_string = path.to_string_lossy();
--    let path_string = if cfg!(windows) {
--        path_string.replace('\\', "/").into()
-+
-+    let mut path_string = path.to_string_lossy();
-+    if cfg!(windows) {
-+        path_string = path_string.replace('\\', "/").into();
-+    }
-+    let path = if let Some(path) = path_string.strip_prefix("tests/rust/src/") {
-+        path
-+    } else if let Some(path) = path_string.strip_prefix("tests/rust/library/") {
-+        path
-     } else {
--        path_string
-+        panic!("unexpected path in Rust dist: {}", path_string);
-     };
-+
-     // TODO assert that parsing fails on the parse-fail cases
--    if path_string.starts_with("tests/rust/src/test/parse-fail")
--        || path_string.starts_with("tests/rust/src/test/compile-fail")
--        || path_string.starts_with("tests/rust/src/test/rustfix")
-+    if path.starts_with("test/parse-fail")
-+        || path.starts_with("test/compile-fail")
-+        || path.starts_with("test/rustfix")
-     {
-         return false;
-     }
- 
--    if path_string.starts_with("tests/rust/src/test/ui") {
--        let stderr_path = path.with_extension("stderr");
-+    if path.starts_with("test/ui") {
-+        let stderr_path = entry.path().with_extension("stderr");
-         if stderr_path.exists() {
-             // Expected to fail in some way
-             return false;
-         }
-     }
- 
--    match path_string.as_ref() {
--        // Deprecated placement syntax
--        "tests/rust/src/test/ui/obsolete-in-place/bad.rs" |
--        // Deprecated anonymous parameter syntax in traits
--        "tests/rust/src/test/ui/error-codes/e0119/auxiliary/issue-23563-a.rs" |
--        "tests/rust/src/test/ui/issues/issue-13105.rs" |
--        "tests/rust/src/test/ui/issues/issue-13775.rs" |
--        "tests/rust/src/test/ui/issues/issue-34074.rs" |
--        // Deprecated await macro syntax
--        "tests/rust/src/test/ui/async-await/await-macro.rs" |
--        // 2015-style dyn that libsyntax rejects
--        "tests/rust/src/test/ui/dyn-keyword/dyn-2015-no-warnings-without-lints.rs" |
--        // not actually test cases
--        "tests/rust/src/test/ui/macros/auxiliary/macro-comma-support.rs" |
--        "tests/rust/src/test/ui/macros/auxiliary/macro-include-items-expr.rs" |
--        "tests/rust/src/test/ui/issues/auxiliary/issue-21146-inc.rs" => false,
--        _ => true,
-+    !EXCLUDE.contains(&path)
-+}
-+
-+#[allow(dead_code)]
-+pub fn edition(path: &Path) -> &'static str {
-+    if path.ends_with("dyn-2015-no-warnings-without-lints.rs") {
-+        "2015"
-+    } else {
-+        "2018"
-     }
- }
- 
- pub fn clone_rust() {
--    let result = Command::new("tests/clone.sh").status().unwrap();
--    assert!(result.success());
-+    let needs_clone = match fs::read_to_string("tests/rust/COMMIT") {
-+        Err(_) => true,
-+        Ok(contents) => contents.trim() != REVISION,
-+    };
-+    if needs_clone {
-+        download_and_unpack().unwrap();
-+    }
-+    let mut missing = String::new();
-+    let test_src = Path::new("tests/rust/src");
-+    for exclude in EXCLUDE {
-+        if !test_src.join(exclude).exists() {
-+            missing += "\ntests/rust/src/";
-+            missing += exclude;
-+        }
-+    }
-+    if !missing.is_empty() {
-+        panic!("excluded test file does not exist:{}\n", missing);
-+    }
- }
-+
-+fn download_and_unpack() -> Result<()> {
-+    let url = format!(
-+        "https://github.com/rust-lang/rust/archive/{}.tar.gz",
-+        REVISION
-+    );
-+    let response = reqwest::blocking::get(&url)?.error_for_status()?;
-+    let progress = Progress::new(response);
-+    let decoder = GzDecoder::new(progress);
-+    let mut archive = Archive::new(decoder);
-+    let prefix = format!("rust-{}", REVISION);
-+
-+    let tests_rust = Path::new("tests/rust");
-+    if tests_rust.exists() {
-+        fs::remove_dir_all(tests_rust)?;
-+    }
-+
-+    for entry in archive.entries()? {
-+        let mut entry = entry?;
-+        let path = entry.path()?;
-+        if path == Path::new("pax_global_header") {
-+            continue;
-+        }
-+        let relative = path.strip_prefix(&prefix)?;
-+        let out = tests_rust.join(relative);
-+        entry.unpack(&out)?;
-+    }
-+
-+    fs::write("tests/rust/COMMIT", REVISION)?;
-+    Ok(())
-+}
-diff --git a/third_party/rust/syn/tests/repo/progress.rs b/third_party/rust/syn/tests/repo/progress.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/tests/repo/progress.rs
-@@ -0,0 +1,37 @@
-+use std::io::{Read, Result};
-+use std::time::{Duration, Instant};
-+
-+pub struct Progress<R> {
-+    bytes: usize,
-+    tick: Instant,
-+    stream: R,
-+}
-+
-+impl<R> Progress<R> {
-+    pub fn new(stream: R) -> Self {
-+        Progress {
-+            bytes: 0,
-+            tick: Instant::now() + Duration::from_millis(2000),
-+            stream,
-+        }
-+    }
-+}
-+
-+impl<R: Read> Read for Progress<R> {
-+    fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
-+        let num = self.stream.read(buf)?;
-+        self.bytes += num;
-+        let now = Instant::now();
-+        if now > self.tick {
-+            self.tick = now + Duration::from_millis(500);
-+            errorf!("downloading... {} bytes\n", self.bytes);
-+        }
-+        Ok(num)
-+    }
-+}
-+
-+impl<R> Drop for Progress<R> {
-+    fn drop(&mut self) {
-+        errorf!("done ({} bytes)\n", self.bytes);
-+    }
-+}
-diff --git a/third_party/rust/syn/tests/test_asyncness.rs b/third_party/rust/syn/tests/test_asyncness.rs
---- a/third_party/rust/syn/tests/test_asyncness.rs
-+++ b/third_party/rust/syn/tests/test_asyncness.rs
-@@ -1,41 +1,37 @@
--extern crate syn;
--
--mod features;
--
- #[macro_use]
- mod macros;
- 
- use syn::{Expr, Item};
- 
- #[test]
- fn test_async_fn() {
-     let input = "async fn process() {}";
- 
-     snapshot!(input as Item, @r###"
--   ⋮Item::Fn {
--   ⋮    vis: Inherited,
--   ⋮    sig: Signature {
--   ⋮        asyncness: Some,
--   ⋮        ident: "process",
--   ⋮        generics: Generics,
--   ⋮        output: Default,
--   ⋮    },
--   ⋮    block: Block,
--   ⋮}
-+    Item::Fn {
-+        vis: Inherited,
-+        sig: Signature {
-+            asyncness: Some,
-+            ident: "process",
-+            generics: Generics,
-+            output: Default,
-+        },
-+        block: Block,
-+    }
-     "###);
- }
- 
- #[test]
- fn test_async_closure() {
-     let input = "async || {}";
- 
-     snapshot!(input as Expr, @r###"
--   ⋮Expr::Closure {
--   ⋮    asyncness: Some,
--   ⋮    output: Default,
--   ⋮    body: Expr::Block {
--   ⋮        block: Block,
--   ⋮    },
--   ⋮}
-+    Expr::Closure {
-+        asyncness: Some,
-+        output: Default,
-+        body: Expr::Block {
-+            block: Block,
-+        },
-+    }
-     "###);
- }
-diff --git a/third_party/rust/syn/tests/test_attribute.rs b/third_party/rust/syn/tests/test_attribute.rs
---- a/third_party/rust/syn/tests/test_attribute.rs
-+++ b/third_party/rust/syn/tests/test_attribute.rs
-@@ -1,295 +1,333 @@
--extern crate syn;
--
--mod features;
--
- #[macro_use]
- mod macros;
- 
- use syn::parse::Parser;
- use syn::{Attribute, Meta};
- 
- #[test]
- fn test_meta_item_word() {
-     let meta = test("#[foo]");
- 
-     snapshot!(meta, @r###"
--   ⋮Path(Path {
--   ⋮    segments: [
--   ⋮        PathSegment {
--   ⋮            ident: "foo",
--   ⋮            arguments: None,
--   ⋮        },
--   ⋮    ],
--   ⋮})
-+    Path(Path {
-+        segments: [
-+            PathSegment {
-+                ident: "foo",
-+                arguments: None,
-+            },
-+        ],
-+    })
-     "###);
- }
- 
- #[test]
- fn test_meta_item_name_value() {
-     let meta = test("#[foo = 5]");
- 
-     snapshot!(meta, @r###"
--   ⋮Meta::NameValue {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    lit: 5,
--   ⋮}
-+    Meta::NameValue {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        lit: 5,
-+    }
-     "###);
- }
- 
- #[test]
- fn test_meta_item_bool_value() {
-     let meta = test("#[foo = true]");
- 
-     snapshot!(meta, @r###"
--   ⋮Meta::NameValue {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    lit: Lit::Bool {
--   ⋮        value: true,
--   ⋮    },
--   ⋮}
-+    Meta::NameValue {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        lit: Lit::Bool {
-+            value: true,
-+        },
-+    }
-     "###);
- 
-     let meta = test("#[foo = false]");
- 
-     snapshot!(meta, @r###"
--   ⋮Meta::NameValue {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    lit: Lit::Bool {
--   ⋮        value: false,
--   ⋮    },
--   ⋮}
-+    Meta::NameValue {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        lit: Lit::Bool {
-+            value: false,
-+        },
-+    }
-     "###);
- }
- 
- #[test]
- fn test_meta_item_list_lit() {
-     let meta = test("#[foo(5)]");
- 
-     snapshot!(meta, @r###"
--   ⋮Meta::List {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    nested: [
--   ⋮        Lit(5),
--   ⋮    ],
--   ⋮}
-+    Meta::List {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        nested: [
-+            Lit(5),
-+        ],
-+    }
-     "###);
- }
- 
- #[test]
- fn test_meta_item_list_word() {
-     let meta = test("#[foo(bar)]");
- 
-     snapshot!(meta, @r###"
--   ⋮Meta::List {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    nested: [
--   ⋮        Meta(Path(Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "bar",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        })),
--   ⋮    ],
--   ⋮}
-+    Meta::List {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        nested: [
-+            Meta(Path(Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "bar",
-+                        arguments: None,
-+                    },
-+                ],
-+            })),
-+        ],
-+    }
-     "###);
- }
- 
- #[test]
- fn test_meta_item_list_name_value() {
-     let meta = test("#[foo(bar = 5)]");
- 
-     snapshot!(meta, @r###"
--   ⋮Meta::List {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    nested: [
--   ⋮        Meta(Meta::NameValue {
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "bar",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            lit: 5,
--   ⋮        }),
--   ⋮    ],
--   ⋮}
-+    Meta::List {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        nested: [
-+            Meta(Meta::NameValue {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "bar",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                lit: 5,
-+            }),
-+        ],
-+    }
-     "###);
- }
- 
- #[test]
- fn test_meta_item_list_bool_value() {
-     let meta = test("#[foo(bar = true)]");
- 
-     snapshot!(meta, @r###"
--   ⋮Meta::List {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    nested: [
--   ⋮        Meta(Meta::NameValue {
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "bar",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            lit: Lit::Bool {
--   ⋮                value: true,
--   ⋮            },
--   ⋮        }),
--   ⋮    ],
--   ⋮}
-+    Meta::List {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        nested: [
-+            Meta(Meta::NameValue {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "bar",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                lit: Lit::Bool {
-+                    value: true,
-+                },
-+            }),
-+        ],
-+    }
-     "###);
- }
- 
- #[test]
- fn test_meta_item_multiple() {
-     let meta = test("#[foo(word, name = 5, list(name2 = 6), word2)]");
- 
-     snapshot!(meta, @r###"
--   ⋮Meta::List {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    nested: [
--   ⋮        Meta(Path(Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "word",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        })),
--   ⋮        Meta(Meta::NameValue {
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "name",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            lit: 5,
--   ⋮        }),
--   ⋮        Meta(Meta::List {
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "list",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            nested: [
--   ⋮                Meta(Meta::NameValue {
--   ⋮                    path: Path {
--   ⋮                        segments: [
--   ⋮                            PathSegment {
--   ⋮                                ident: "name2",
--   ⋮                                arguments: None,
--   ⋮                            },
--   ⋮                        ],
--   ⋮                    },
--   ⋮                    lit: 6,
--   ⋮                }),
--   ⋮            ],
--   ⋮        }),
--   ⋮        Meta(Path(Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "word2",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        })),
--   ⋮    ],
--   ⋮}
-+    Meta::List {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        nested: [
-+            Meta(Path(Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "word",
-+                        arguments: None,
-+                    },
-+                ],
-+            })),
-+            Meta(Meta::NameValue {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "name",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                lit: 5,
-+            }),
-+            Meta(Meta::List {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "list",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                nested: [
-+                    Meta(Meta::NameValue {
-+                        path: Path {
-+                            segments: [
-+                                PathSegment {
-+                                    ident: "name2",
-+                                    arguments: None,
-+                                },
-+                            ],
-+                        },
-+                        lit: 6,
-+                    }),
-+                ],
-+            }),
-+            Meta(Path(Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "word2",
-+                        arguments: None,
-+                    },
-+                ],
-+            })),
-+        ],
-+    }
-     "###);
- }
- 
- #[test]
- fn test_bool_lit() {
-     let meta = test("#[foo(true)]");
- 
-     snapshot!(meta, @r###"
--   ⋮Meta::List {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    nested: [
--   ⋮        Lit(Lit::Bool {
--   ⋮            value: true,
--   ⋮        }),
--   ⋮    ],
--   ⋮}
-+    Meta::List {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        nested: [
-+            Lit(Lit::Bool {
-+                value: true,
-+            }),
-+        ],
-+    }
-+    "###);
-+}
-+
-+#[test]
-+fn test_negative_lit() {
-+    let meta = test("#[form(min = -1, max = 200)]");
-+
-+    snapshot!(meta, @r###"
-+    Meta::List {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "form",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        nested: [
-+            Meta(Meta::NameValue {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "min",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                lit: -1,
-+            }),
-+            Meta(Meta::NameValue {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "max",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                lit: 200,
-+            }),
-+        ],
-+    }
-     "###);
- }
- 
- fn test(input: &str) -> Meta {
-     let attrs = Attribute::parse_outer.parse_str(input).unwrap();
- 
-     assert_eq!(attrs.len(), 1);
-     let attr = attrs.into_iter().next().unwrap();
-diff --git a/third_party/rust/syn/tests/test_derive_input.rs b/third_party/rust/syn/tests/test_derive_input.rs
---- a/third_party/rust/syn/tests/test_derive_input.rs
-+++ b/third_party/rust/syn/tests/test_derive_input.rs
-@@ -1,201 +1,196 @@
--extern crate quote;
--extern crate syn;
--
--mod features;
--
- #[macro_use]
- mod macros;
- 
- use quote::quote;
- use syn::{Data, DeriveInput};
- 
- #[test]
- fn test_unit() {
-     let input = quote! {
-         struct Unit;
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    vis: Inherited,
--   ⋮    ident: "Unit",
--   ⋮    generics: Generics,
--   ⋮    data: Data::Struct {
--   ⋮        fields: Unit,
--   ⋮        semi_token: Some,
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        vis: Inherited,
-+        ident: "Unit",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Unit,
-+            semi_token: Some,
-+        },
-+    }
-     "###);
- }
- 
- #[test]
- fn test_struct() {
-     let input = quote! {
-         #[derive(Debug, Clone)]
-         pub struct Item {
-             pub ident: Ident,
-             pub attrs: Vec<Attribute>
-         }
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    attrs: [
--   ⋮        Attribute {
--   ⋮            style: Outer,
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "derive",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            tokens: `( Debug , Clone )`,
--   ⋮        },
--   ⋮    ],
--   ⋮    vis: Visibility::Public,
--   ⋮    ident: "Item",
--   ⋮    generics: Generics,
--   ⋮    data: Data::Struct {
--   ⋮        fields: Fields::Named {
--   ⋮            named: [
--   ⋮                Field {
--   ⋮                    vis: Visibility::Public,
--   ⋮                    ident: Some("ident"),
--   ⋮                    colon_token: Some,
--   ⋮                    ty: Type::Path {
--   ⋮                        path: Path {
--   ⋮                            segments: [
--   ⋮                                PathSegment {
--   ⋮                                    ident: "Ident",
--   ⋮                                    arguments: None,
--   ⋮                                },
--   ⋮                            ],
--   ⋮                        },
--   ⋮                    },
--   ⋮                },
--   ⋮                Field {
--   ⋮                    vis: Visibility::Public,
--   ⋮                    ident: Some("attrs"),
--   ⋮                    colon_token: Some,
--   ⋮                    ty: Type::Path {
--   ⋮                        path: Path {
--   ⋮                            segments: [
--   ⋮                                PathSegment {
--   ⋮                                    ident: "Vec",
--   ⋮                                    arguments: PathArguments::AngleBracketed {
--   ⋮                                        args: [
--   ⋮                                            Type(Type::Path {
--   ⋮                                                path: Path {
--   ⋮                                                    segments: [
--   ⋮                                                        PathSegment {
--   ⋮                                                            ident: "Attribute",
--   ⋮                                                            arguments: None,
--   ⋮                                                        },
--   ⋮                                                    ],
--   ⋮                                                },
--   ⋮                                            }),
--   ⋮                                        ],
--   ⋮                                    },
--   ⋮                                },
--   ⋮                            ],
--   ⋮                        },
--   ⋮                    },
--   ⋮                },
--   ⋮            ],
--   ⋮        },
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        attrs: [
-+            Attribute {
-+                style: Outer,
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "derive",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                tokens: TokenStream(`(Debug , Clone)`),
-+            },
-+        ],
-+        vis: Visibility::Public,
-+        ident: "Item",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Fields::Named {
-+                named: [
-+                    Field {
-+                        vis: Visibility::Public,
-+                        ident: Some("ident"),
-+                        colon_token: Some,
-+                        ty: Type::Path {
-+                            path: Path {
-+                                segments: [
-+                                    PathSegment {
-+                                        ident: "Ident",
-+                                        arguments: None,
-+                                    },
-+                                ],
-+                            },
-+                        },
-+                    },
-+                    Field {
-+                        vis: Visibility::Public,
-+                        ident: Some("attrs"),
-+                        colon_token: Some,
-+                        ty: Type::Path {
-+                            path: Path {
-+                                segments: [
-+                                    PathSegment {
-+                                        ident: "Vec",
-+                                        arguments: PathArguments::AngleBracketed {
-+                                            args: [
-+                                                Type(Type::Path {
-+                                                    path: Path {
-+                                                        segments: [
-+                                                            PathSegment {
-+                                                                ident: "Attribute",
-+                                                                arguments: None,
-+                                                            },
-+                                                        ],
-+                                                    },
-+                                                }),
-+                                            ],
-+                                        },
-+                                    },
-+                                ],
-+                            },
-+                        },
-+                    },
-+                ],
-+            },
-+        },
-+    }
-     "###);
- 
-     snapshot!(input.attrs[0].parse_meta().unwrap(), @r###"
--   ⋮Meta::List {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "derive",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    nested: [
--   ⋮        Meta(Path(Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "Debug",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        })),
--   ⋮        Meta(Path(Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "Clone",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        })),
--   ⋮    ],
--   ⋮}
-+    Meta::List {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "derive",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        nested: [
-+            Meta(Path(Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "Debug",
-+                        arguments: None,
-+                    },
-+                ],
-+            })),
-+            Meta(Path(Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "Clone",
-+                        arguments: None,
-+                    },
-+                ],
-+            })),
-+        ],
-+    }
-     "###);
- }
- 
- #[test]
- fn test_union() {
-     let input = quote! {
-         union MaybeUninit<T> {
-             uninit: (),
-             value: T
-         }
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    vis: Inherited,
--   ⋮    ident: "MaybeUninit",
--   ⋮    generics: Generics {
--   ⋮        lt_token: Some,
--   ⋮        params: [
--   ⋮            Type(TypeParam {
--   ⋮                ident: "T",
--   ⋮            }),
--   ⋮        ],
--   ⋮        gt_token: Some,
--   ⋮    },
--   ⋮    data: Data::Union {
--   ⋮        fields: FieldsNamed {
--   ⋮            named: [
--   ⋮                Field {
--   ⋮                    vis: Inherited,
--   ⋮                    ident: Some("uninit"),
--   ⋮                    colon_token: Some,
--   ⋮                    ty: Type::Tuple,
--   ⋮                },
--   ⋮                Field {
--   ⋮                    vis: Inherited,
--   ⋮                    ident: Some("value"),
--   ⋮                    colon_token: Some,
--   ⋮                    ty: Type::Path {
--   ⋮                        path: Path {
--   ⋮                            segments: [
--   ⋮                                PathSegment {
--   ⋮                                    ident: "T",
--   ⋮                                    arguments: None,
--   ⋮                                },
--   ⋮                            ],
--   ⋮                        },
--   ⋮                    },
--   ⋮                },
--   ⋮            ],
--   ⋮        },
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        vis: Inherited,
-+        ident: "MaybeUninit",
-+        generics: Generics {
-+            lt_token: Some,
-+            params: [
-+                Type(TypeParam {
-+                    ident: "T",
-+                }),
-+            ],
-+            gt_token: Some,
-+        },
-+        data: Data::Union {
-+            fields: FieldsNamed {
-+                named: [
-+                    Field {
-+                        vis: Inherited,
-+                        ident: Some("uninit"),
-+                        colon_token: Some,
-+                        ty: Type::Tuple,
-+                    },
-+                    Field {
-+                        vis: Inherited,
-+                        ident: Some("value"),
-+                        colon_token: Some,
-+                        ty: Type::Path {
-+                            path: Path {
-+                                segments: [
-+                                    PathSegment {
-+                                        ident: "T",
-+                                        arguments: None,
-+                                    },
-+                                ],
-+                            },
-+                        },
-+                    },
-+                ],
-+            },
-+        },
-+    }
-     "###);
- }
- 
- #[test]
- #[cfg(feature = "full")]
- fn test_enum() {
-     let input = quote! {
-         /// See the std::result module documentation for details.
-@@ -207,472 +202,472 @@ fn test_enum() {
- 
-             // Smuggling data into a proc_macro_derive,
-             // in the style of https://github.com/dtolnay/proc-macro-hack
-             ProcMacroHack = (0, "data").0
-         }
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    attrs: [
--   ⋮        Attribute {
--   ⋮            style: Outer,
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "doc",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            tokens: `= r" See the std::result module documentation for details."`,
--   ⋮        },
--   ⋮        Attribute {
--   ⋮            style: Outer,
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "must_use",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            tokens: ``,
--   ⋮        },
--   ⋮    ],
--   ⋮    vis: Visibility::Public,
--   ⋮    ident: "Result",
--   ⋮    generics: Generics {
--   ⋮        lt_token: Some,
--   ⋮        params: [
--   ⋮            Type(TypeParam {
--   ⋮                ident: "T",
--   ⋮            }),
--   ⋮            Type(TypeParam {
--   ⋮                ident: "E",
--   ⋮            }),
--   ⋮        ],
--   ⋮        gt_token: Some,
--   ⋮    },
--   ⋮    data: Data::Enum {
--   ⋮        variants: [
--   ⋮            Variant {
--   ⋮                ident: "Ok",
--   ⋮                fields: Fields::Unnamed {
--   ⋮                    unnamed: [
--   ⋮                        Field {
--   ⋮                            vis: Inherited,
--   ⋮                            ty: Type::Path {
--   ⋮                                path: Path {
--   ⋮                                    segments: [
--   ⋮                                        PathSegment {
--   ⋮                                            ident: "T",
--   ⋮                                            arguments: None,
--   ⋮                                        },
--   ⋮                                    ],
--   ⋮                                },
--   ⋮                            },
--   ⋮                        },
--   ⋮                    ],
--   ⋮                },
--   ⋮            },
--   ⋮            Variant {
--   ⋮                ident: "Err",
--   ⋮                fields: Fields::Unnamed {
--   ⋮                    unnamed: [
--   ⋮                        Field {
--   ⋮                            vis: Inherited,
--   ⋮                            ty: Type::Path {
--   ⋮                                path: Path {
--   ⋮                                    segments: [
--   ⋮                                        PathSegment {
--   ⋮                                            ident: "E",
--   ⋮                                            arguments: None,
--   ⋮                                        },
--   ⋮                                    ],
--   ⋮                                },
--   ⋮                            },
--   ⋮                        },
--   ⋮                    ],
--   ⋮                },
--   ⋮            },
--   ⋮            Variant {
--   ⋮                ident: "Surprise",
--   ⋮                fields: Unit,
--   ⋮                discriminant: Some(Expr::Lit {
--   ⋮                    lit: 0isize,
--   ⋮                }),
--   ⋮            },
--   ⋮            Variant {
--   ⋮                ident: "ProcMacroHack",
--   ⋮                fields: Unit,
--   ⋮                discriminant: Some(Expr::Field {
--   ⋮                    base: Expr::Tuple {
--   ⋮                        elems: [
--   ⋮                            Expr::Lit {
--   ⋮                                lit: 0,
--   ⋮                            },
--   ⋮                            Expr::Lit {
--   ⋮                                lit: "data",
--   ⋮                            },
--   ⋮                        ],
--   ⋮                    },
--   ⋮                    member: Unnamed(Index {
--   ⋮                        index: 0,
--   ⋮                    }),
--   ⋮                }),
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        attrs: [
-+            Attribute {
-+                style: Outer,
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "doc",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                tokens: TokenStream(`= r" See the std::result module documentation for details."`),
-+            },
-+            Attribute {
-+                style: Outer,
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "must_use",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                tokens: TokenStream(``),
-+            },
-+        ],
-+        vis: Visibility::Public,
-+        ident: "Result",
-+        generics: Generics {
-+            lt_token: Some,
-+            params: [
-+                Type(TypeParam {
-+                    ident: "T",
-+                }),
-+                Type(TypeParam {
-+                    ident: "E",
-+                }),
-+            ],
-+            gt_token: Some,
-+        },
-+        data: Data::Enum {
-+            variants: [
-+                Variant {
-+                    ident: "Ok",
-+                    fields: Fields::Unnamed {
-+                        unnamed: [
-+                            Field {
-+                                vis: Inherited,
-+                                ty: Type::Path {
-+                                    path: Path {
-+                                        segments: [
-+                                            PathSegment {
-+                                                ident: "T",
-+                                                arguments: None,
-+                                            },
-+                                        ],
-+                                    },
-+                                },
-+                            },
-+                        ],
-+                    },
-+                },
-+                Variant {
-+                    ident: "Err",
-+                    fields: Fields::Unnamed {
-+                        unnamed: [
-+                            Field {
-+                                vis: Inherited,
-+                                ty: Type::Path {
-+                                    path: Path {
-+                                        segments: [
-+                                            PathSegment {
-+                                                ident: "E",
-+                                                arguments: None,
-+                                            },
-+                                        ],
-+                                    },
-+                                },
-+                            },
-+                        ],
-+                    },
-+                },
-+                Variant {
-+                    ident: "Surprise",
-+                    fields: Unit,
-+                    discriminant: Some(Expr::Lit {
-+                        lit: 0isize,
-+                    }),
-+                },
-+                Variant {
-+                    ident: "ProcMacroHack",
-+                    fields: Unit,
-+                    discriminant: Some(Expr::Field {
-+                        base: Expr::Tuple {
-+                            elems: [
-+                                Expr::Lit {
-+                                    lit: 0,
-+                                },
-+                                Expr::Lit {
-+                                    lit: "data",
-+                                },
-+                            ],
-+                        },
-+                        member: Unnamed(Index {
-+                            index: 0,
-+                        }),
-+                    }),
-+                },
-+            ],
-+        },
-+    }
-     "###);
- 
-     let meta_items: Vec<_> = input
-         .attrs
-         .into_iter()
-         .map(|attr| attr.parse_meta().unwrap())
-         .collect();
- 
-     snapshot!(meta_items, @r###"
--   ⋮[
--   ⋮    Meta::NameValue {
--   ⋮        path: Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "doc",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        },
--   ⋮        lit: " See the std::result module documentation for details.",
--   ⋮    },
--   ⋮    Path(Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "must_use",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    }),
--   ⋮]
-+    [
-+        Meta::NameValue {
-+            path: Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "doc",
-+                        arguments: None,
-+                    },
-+                ],
-+            },
-+            lit: " See the std::result module documentation for details.",
-+        },
-+        Path(Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "must_use",
-+                    arguments: None,
-+                },
-+            ],
-+        }),
-+    ]
-     "###);
- }
- 
- #[test]
- fn test_attr_with_path() {
-     let input = quote! {
-         #[::attr_args::identity
-             fn main() { assert_eq!(foo(), "Hello, world!"); }]
-         struct Dummy;
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    attrs: [
--   ⋮        Attribute {
--   ⋮            style: Outer,
--   ⋮            path: Path {
--   ⋮                leading_colon: Some,
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "attr_args",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                    PathSegment {
--   ⋮                        ident: "identity",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            tokens: `fn main ( ) { assert_eq ! ( foo ( ) , "Hello, world!" ) ; }`,
--   ⋮        },
--   ⋮    ],
--   ⋮    vis: Inherited,
--   ⋮    ident: "Dummy",
--   ⋮    generics: Generics,
--   ⋮    data: Data::Struct {
--   ⋮        fields: Unit,
--   ⋮        semi_token: Some,
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        attrs: [
-+            Attribute {
-+                style: Outer,
-+                path: Path {
-+                    leading_colon: Some,
-+                    segments: [
-+                        PathSegment {
-+                            ident: "attr_args",
-+                            arguments: None,
-+                        },
-+                        PathSegment {
-+                            ident: "identity",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                tokens: TokenStream(`fn main () { assert_eq ! (foo () , "Hello, world!") ; }`),
-+            },
-+        ],
-+        vis: Inherited,
-+        ident: "Dummy",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Unit,
-+            semi_token: Some,
-+        },
-+    }
-     "###);
- 
-     assert!(input.attrs[0].parse_meta().is_err());
- }
- 
- #[test]
- fn test_attr_with_non_mod_style_path() {
-     let input = quote! {
-         #[inert <T>]
-         struct S;
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    attrs: [
--   ⋮        Attribute {
--   ⋮            style: Outer,
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "inert",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            tokens: `< T >`,
--   ⋮        },
--   ⋮    ],
--   ⋮    vis: Inherited,
--   ⋮    ident: "S",
--   ⋮    generics: Generics,
--   ⋮    data: Data::Struct {
--   ⋮        fields: Unit,
--   ⋮        semi_token: Some,
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        attrs: [
-+            Attribute {
-+                style: Outer,
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "inert",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                tokens: TokenStream(`< T >`),
-+            },
-+        ],
-+        vis: Inherited,
-+        ident: "S",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Unit,
-+            semi_token: Some,
-+        },
-+    }
-     "###);
- 
-     assert!(input.attrs[0].parse_meta().is_err());
- }
- 
- #[test]
- fn test_attr_with_mod_style_path_with_self() {
-     let input = quote! {
-         #[foo::self]
-         struct S;
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    attrs: [
--   ⋮        Attribute {
--   ⋮            style: Outer,
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "foo",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                    PathSegment {
--   ⋮                        ident: "self",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            tokens: ``,
--   ⋮        },
--   ⋮    ],
--   ⋮    vis: Inherited,
--   ⋮    ident: "S",
--   ⋮    generics: Generics,
--   ⋮    data: Data::Struct {
--   ⋮        fields: Unit,
--   ⋮        semi_token: Some,
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        attrs: [
-+            Attribute {
-+                style: Outer,
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "foo",
-+                            arguments: None,
-+                        },
-+                        PathSegment {
-+                            ident: "self",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                tokens: TokenStream(``),
-+            },
-+        ],
-+        vis: Inherited,
-+        ident: "S",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Unit,
-+            semi_token: Some,
-+        },
-+    }
-     "###);
- 
-     snapshot!(input.attrs[0].parse_meta().unwrap(), @r###"
--   ⋮Path(Path {
--   ⋮    segments: [
--   ⋮        PathSegment {
--   ⋮            ident: "foo",
--   ⋮            arguments: None,
--   ⋮        },
--   ⋮        PathSegment {
--   ⋮            ident: "self",
--   ⋮            arguments: None,
--   ⋮        },
--   ⋮    ],
--   ⋮})
-+    Path(Path {
-+        segments: [
-+            PathSegment {
-+                ident: "foo",
-+                arguments: None,
-+            },
-+            PathSegment {
-+                ident: "self",
-+                arguments: None,
-+            },
-+        ],
-+    })
-     "###);
- }
- 
- #[test]
- fn test_pub_restricted() {
-     // Taken from tests/rust/src/test/ui/resolve/auxiliary/privacy-struct-ctor.rs
-     let input = quote! {
-         pub(in m) struct Z(pub(in m::n) u8);
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    vis: Visibility::Restricted {
--   ⋮        in_token: Some,
--   ⋮        path: Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "m",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        },
--   ⋮    },
--   ⋮    ident: "Z",
--   ⋮    generics: Generics,
--   ⋮    data: Data::Struct {
--   ⋮        fields: Fields::Unnamed {
--   ⋮            unnamed: [
--   ⋮                Field {
--   ⋮                    vis: Visibility::Restricted {
--   ⋮                        in_token: Some,
--   ⋮                        path: Path {
--   ⋮                            segments: [
--   ⋮                                PathSegment {
--   ⋮                                    ident: "m",
--   ⋮                                    arguments: None,
--   ⋮                                },
--   ⋮                                PathSegment {
--   ⋮                                    ident: "n",
--   ⋮                                    arguments: None,
--   ⋮                                },
--   ⋮                            ],
--   ⋮                        },
--   ⋮                    },
--   ⋮                    ty: Type::Path {
--   ⋮                        path: Path {
--   ⋮                            segments: [
--   ⋮                                PathSegment {
--   ⋮                                    ident: "u8",
--   ⋮                                    arguments: None,
--   ⋮                                },
--   ⋮                            ],
--   ⋮                        },
--   ⋮                    },
--   ⋮                },
--   ⋮            ],
--   ⋮        },
--   ⋮        semi_token: Some,
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        vis: Visibility::Restricted {
-+            in_token: Some,
-+            path: Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "m",
-+                        arguments: None,
-+                    },
-+                ],
-+            },
-+        },
-+        ident: "Z",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Fields::Unnamed {
-+                unnamed: [
-+                    Field {
-+                        vis: Visibility::Restricted {
-+                            in_token: Some,
-+                            path: Path {
-+                                segments: [
-+                                    PathSegment {
-+                                        ident: "m",
-+                                        arguments: None,
-+                                    },
-+                                    PathSegment {
-+                                        ident: "n",
-+                                        arguments: None,
-+                                    },
-+                                ],
-+                            },
-+                        },
-+                        ty: Type::Path {
-+                            path: Path {
-+                                segments: [
-+                                    PathSegment {
-+                                        ident: "u8",
-+                                        arguments: None,
-+                                    },
-+                                ],
-+                            },
-+                        },
-+                    },
-+                ],
-+            },
-+            semi_token: Some,
-+        },
-+    }
-     "###);
- }
- 
- #[test]
- fn test_vis_crate() {
-     let input = quote! {
-         crate struct S;
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    vis: Visibility::Crate,
--   ⋮    ident: "S",
--   ⋮    generics: Generics,
--   ⋮    data: Data::Struct {
--   ⋮        fields: Unit,
--   ⋮        semi_token: Some,
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        vis: Visibility::Crate,
-+        ident: "S",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Unit,
-+            semi_token: Some,
-+        },
-+    }
-     "###);
- }
- 
- #[test]
- fn test_pub_restricted_crate() {
-     let input = quote! {
-         pub(crate) struct S;
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    vis: Visibility::Restricted {
--   ⋮        path: Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "crate",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        },
--   ⋮    },
--   ⋮    ident: "S",
--   ⋮    generics: Generics,
--   ⋮    data: Data::Struct {
--   ⋮        fields: Unit,
--   ⋮        semi_token: Some,
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        vis: Visibility::Restricted {
-+            path: Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "crate",
-+                        arguments: None,
-+                    },
-+                ],
-+            },
-+        },
-+        ident: "S",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Unit,
-+            semi_token: Some,
-+        },
-+    }
-     "###);
- }
- 
- #[test]
- fn test_pub_restricted_super() {
-     let input = quote! {
-         pub(super) struct S;
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    vis: Visibility::Restricted {
--   ⋮        path: Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "super",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        },
--   ⋮    },
--   ⋮    ident: "S",
--   ⋮    generics: Generics,
--   ⋮    data: Data::Struct {
--   ⋮        fields: Unit,
--   ⋮        semi_token: Some,
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        vis: Visibility::Restricted {
-+            path: Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "super",
-+                        arguments: None,
-+                    },
-+                ],
-+            },
-+        },
-+        ident: "S",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Unit,
-+            semi_token: Some,
-+        },
-+    }
-     "###);
- }
- 
- #[test]
- fn test_pub_restricted_in_super() {
-     let input = quote! {
-         pub(in super) struct S;
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    vis: Visibility::Restricted {
--   ⋮        in_token: Some,
--   ⋮        path: Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "super",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        },
--   ⋮    },
--   ⋮    ident: "S",
--   ⋮    generics: Generics,
--   ⋮    data: Data::Struct {
--   ⋮        fields: Unit,
--   ⋮        semi_token: Some,
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        vis: Visibility::Restricted {
-+            in_token: Some,
-+            path: Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "super",
-+                        arguments: None,
-+                    },
-+                ],
-+            },
-+        },
-+        ident: "S",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Unit,
-+            semi_token: Some,
-+        },
-+    }
-     "###);
- }
- 
- #[test]
- fn test_fields_on_unit_struct() {
-     let input = quote! {
-         struct S;
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    vis: Inherited,
--   ⋮    ident: "S",
--   ⋮    generics: Generics,
--   ⋮    data: Data::Struct {
--   ⋮        fields: Unit,
--   ⋮        semi_token: Some,
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        vis: Inherited,
-+        ident: "S",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Unit,
-+            semi_token: Some,
-+        },
-+    }
-     "###);
- 
-     let data = match input.data {
-         Data::Struct(data) => data,
-         _ => panic!("expected a struct"),
-     };
- 
-     assert_eq!(0, data.fields.iter().count());
-@@ -683,215 +678,215 @@ fn test_fields_on_named_struct() {
-     let input = quote! {
-         struct S {
-             foo: i32,
-             pub bar: String,
-         }
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    vis: Inherited,
--   ⋮    ident: "S",
--   ⋮    generics: Generics,
--   ⋮    data: Data::Struct {
--   ⋮        fields: Fields::Named {
--   ⋮            named: [
--   ⋮                Field {
--   ⋮                    vis: Inherited,
--   ⋮                    ident: Some("foo"),
--   ⋮                    colon_token: Some,
--   ⋮                    ty: Type::Path {
--   ⋮                        path: Path {
--   ⋮                            segments: [
--   ⋮                                PathSegment {
--   ⋮                                    ident: "i32",
--   ⋮                                    arguments: None,
--   ⋮                                },
--   ⋮                            ],
--   ⋮                        },
--   ⋮                    },
--   ⋮                },
--   ⋮                Field {
--   ⋮                    vis: Visibility::Public,
--   ⋮                    ident: Some("bar"),
--   ⋮                    colon_token: Some,
--   ⋮                    ty: Type::Path {
--   ⋮                        path: Path {
--   ⋮                            segments: [
--   ⋮                                PathSegment {
--   ⋮                                    ident: "String",
--   ⋮                                    arguments: None,
--   ⋮                                },
--   ⋮                            ],
--   ⋮                        },
--   ⋮                    },
--   ⋮                },
--   ⋮            ],
--   ⋮        },
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        vis: Inherited,
-+        ident: "S",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Fields::Named {
-+                named: [
-+                    Field {
-+                        vis: Inherited,
-+                        ident: Some("foo"),
-+                        colon_token: Some,
-+                        ty: Type::Path {
-+                            path: Path {
-+                                segments: [
-+                                    PathSegment {
-+                                        ident: "i32",
-+                                        arguments: None,
-+                                    },
-+                                ],
-+                            },
-+                        },
-+                    },
-+                    Field {
-+                        vis: Visibility::Public,
-+                        ident: Some("bar"),
-+                        colon_token: Some,
-+                        ty: Type::Path {
-+                            path: Path {
-+                                segments: [
-+                                    PathSegment {
-+                                        ident: "String",
-+                                        arguments: None,
-+                                    },
-+                                ],
-+                            },
-+                        },
-+                    },
-+                ],
-+            },
-+        },
-+    }
-     "###);
- 
-     let data = match input.data {
-         Data::Struct(data) => data,
-         _ => panic!("expected a struct"),
-     };
- 
-     snapshot!(data.fields.into_iter().collect::<Vec<_>>(), @r###"
--   ⋮[
--   ⋮    Field {
--   ⋮        vis: Inherited,
--   ⋮        ident: Some("foo"),
--   ⋮        colon_token: Some,
--   ⋮        ty: Type::Path {
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "i32",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮        },
--   ⋮    },
--   ⋮    Field {
--   ⋮        vis: Visibility::Public,
--   ⋮        ident: Some("bar"),
--   ⋮        colon_token: Some,
--   ⋮        ty: Type::Path {
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "String",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮        },
--   ⋮    },
--   ⋮]
-+    [
-+        Field {
-+            vis: Inherited,
-+            ident: Some("foo"),
-+            colon_token: Some,
-+            ty: Type::Path {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "i32",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+            },
-+        },
-+        Field {
-+            vis: Visibility::Public,
-+            ident: Some("bar"),
-+            colon_token: Some,
-+            ty: Type::Path {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "String",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+            },
-+        },
-+    ]
-     "###);
- }
- 
- #[test]
- fn test_fields_on_tuple_struct() {
-     let input = quote! {
-         struct S(i32, pub String);
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    vis: Inherited,
--   ⋮    ident: "S",
--   ⋮    generics: Generics,
--   ⋮    data: Data::Struct {
--   ⋮        fields: Fields::Unnamed {
--   ⋮            unnamed: [
--   ⋮                Field {
--   ⋮                    vis: Inherited,
--   ⋮                    ty: Type::Path {
--   ⋮                        path: Path {
--   ⋮                            segments: [
--   ⋮                                PathSegment {
--   ⋮                                    ident: "i32",
--   ⋮                                    arguments: None,
--   ⋮                                },
--   ⋮                            ],
--   ⋮                        },
--   ⋮                    },
--   ⋮                },
--   ⋮                Field {
--   ⋮                    vis: Visibility::Public,
--   ⋮                    ty: Type::Path {
--   ⋮                        path: Path {
--   ⋮                            segments: [
--   ⋮                                PathSegment {
--   ⋮                                    ident: "String",
--   ⋮                                    arguments: None,
--   ⋮                                },
--   ⋮                            ],
--   ⋮                        },
--   ⋮                    },
--   ⋮                },
--   ⋮            ],
--   ⋮        },
--   ⋮        semi_token: Some,
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        vis: Inherited,
-+        ident: "S",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Fields::Unnamed {
-+                unnamed: [
-+                    Field {
-+                        vis: Inherited,
-+                        ty: Type::Path {
-+                            path: Path {
-+                                segments: [
-+                                    PathSegment {
-+                                        ident: "i32",
-+                                        arguments: None,
-+                                    },
-+                                ],
-+                            },
-+                        },
-+                    },
-+                    Field {
-+                        vis: Visibility::Public,
-+                        ty: Type::Path {
-+                            path: Path {
-+                                segments: [
-+                                    PathSegment {
-+                                        ident: "String",
-+                                        arguments: None,
-+                                    },
-+                                ],
-+                            },
-+                        },
-+                    },
-+                ],
-+            },
-+            semi_token: Some,
-+        },
-+    }
-     "###);
- 
-     let data = match input.data {
-         Data::Struct(data) => data,
-         _ => panic!("expected a struct"),
-     };
- 
-     snapshot!(data.fields.iter().collect::<Vec<_>>(), @r###"
--   ⋮[
--   ⋮    Field {
--   ⋮        vis: Inherited,
--   ⋮        ty: Type::Path {
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "i32",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮        },
--   ⋮    },
--   ⋮    Field {
--   ⋮        vis: Visibility::Public,
--   ⋮        ty: Type::Path {
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "String",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮        },
--   ⋮    },
--   ⋮]
-+    [
-+        Field {
-+            vis: Inherited,
-+            ty: Type::Path {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "i32",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+            },
-+        },
-+        Field {
-+            vis: Visibility::Public,
-+            ty: Type::Path {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "String",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+            },
-+        },
-+    ]
-     "###);
- }
- 
- #[test]
- fn test_ambiguous_crate() {
-     let input = quote! {
-         // The field type is `(crate::X)` not `crate (::X)`.
-         struct S(crate::X);
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    vis: Inherited,
--   ⋮    ident: "S",
--   ⋮    generics: Generics,
--   ⋮    data: Data::Struct {
--   ⋮        fields: Fields::Unnamed {
--   ⋮            unnamed: [
--   ⋮                Field {
--   ⋮                    vis: Inherited,
--   ⋮                    ty: Type::Path {
--   ⋮                        path: Path {
--   ⋮                            segments: [
--   ⋮                                PathSegment {
--   ⋮                                    ident: "crate",
--   ⋮                                    arguments: None,
--   ⋮                                },
--   ⋮                                PathSegment {
--   ⋮                                    ident: "X",
--   ⋮                                    arguments: None,
--   ⋮                                },
--   ⋮                            ],
--   ⋮                        },
--   ⋮                    },
--   ⋮                },
--   ⋮            ],
--   ⋮        },
--   ⋮        semi_token: Some,
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        vis: Inherited,
-+        ident: "S",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Fields::Unnamed {
-+                unnamed: [
-+                    Field {
-+                        vis: Inherited,
-+                        ty: Type::Path {
-+                            path: Path {
-+                                segments: [
-+                                    PathSegment {
-+                                        ident: "crate",
-+                                        arguments: None,
-+                                    },
-+                                    PathSegment {
-+                                        ident: "X",
-+                                        arguments: None,
-+                                    },
-+                                ],
-+                            },
-+                        },
-+                    },
-+                ],
-+            },
-+            semi_token: Some,
-+        },
-+    }
-     "###);
- }
-diff --git a/third_party/rust/syn/tests/test_expr.rs b/third_party/rust/syn/tests/test_expr.rs
---- a/third_party/rust/syn/tests/test_expr.rs
-+++ b/third_party/rust/syn/tests/test_expr.rs
-@@ -1,40 +1,302 @@
--extern crate proc_macro2;
--extern crate syn;
--
- #[macro_use]
- mod macros;
- 
--use std::str::FromStr;
--
--use proc_macro2::TokenStream;
-+use proc_macro2::{Delimiter, Group, Ident, Punct, Spacing, Span, TokenStream, TokenTree};
-+use quote::quote;
-+use std::iter::FromIterator;
- use syn::{Expr, ExprRange};
- 
- #[test]
- fn test_expr_parse() {
--    let code = "..100u32";
--    let tt = TokenStream::from_str(code).unwrap();
--    let expr: Expr = syn::parse2(tt.clone()).unwrap();
--    let expr_range: ExprRange = syn::parse2(tt).unwrap();
--    assert_eq!(expr, Expr::Range(expr_range));
-+    let tokens = quote!(..100u32);
-+    snapshot!(tokens as Expr, @r###"
-+    Expr::Range {
-+        limits: HalfOpen,
-+        to: Some(Expr::Lit {
-+            lit: 100u32,
-+        }),
-+    }
-+    "###);
-+
-+    let tokens = quote!(..100u32);
-+    snapshot!(tokens as ExprRange, @r###"
-+    ExprRange {
-+        limits: HalfOpen,
-+        to: Some(Expr::Lit {
-+            lit: 100u32,
-+        }),
-+    }
-+    "###);
- }
- 
- #[test]
- fn test_await() {
-     // Must not parse as Expr::Field.
--    let expr = syn::parse_str::<Expr>("fut.await").unwrap();
-+    let tokens = quote!(fut.await);
- 
--    snapshot!(expr, @r###"
--   ⋮Expr::Await {
--   ⋮    base: Expr::Path {
--   ⋮        path: Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "fut",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        },
--   ⋮    },
--   ⋮}
-+    snapshot!(tokens as Expr, @r###"
-+    Expr::Await {
-+        base: Expr::Path {
-+            path: Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "fut",
-+                        arguments: None,
-+                    },
-+                ],
-+            },
-+        },
-+    }
-     "###);
- }
-+
-+#[rustfmt::skip]
-+#[test]
-+fn test_tuple_multi_index() {
-+    for &input in &[
-+        "tuple.0.0",
-+        "tuple .0.0",
-+        "tuple. 0.0",
-+        "tuple.0 .0",
-+        "tuple.0. 0",
-+        "tuple . 0 . 0",
-+    ] {
-+        snapshot!(input as Expr, @r###"
-+        Expr::Field {
-+            base: Expr::Field {
-+                base: Expr::Path {
-+                    path: Path {
-+                        segments: [
-+                            PathSegment {
-+                                ident: "tuple",
-+                                arguments: None,
-+                            },
-+                        ],
-+                    },
-+                },
-+                member: Unnamed(Index {
-+                    index: 0,
-+                }),
-+            },
-+            member: Unnamed(Index {
-+                index: 0,
-+            }),
-+        }
-+        "###);
-+    }
-+
-+    for tokens in vec![
-+        quote!(tuple.0.0),
-+        quote!(tuple .0.0),
-+        quote!(tuple. 0.0),
-+        quote!(tuple.0 .0),
-+        quote!(tuple.0. 0),
-+        quote!(tuple . 0 . 0),
-+    ] {
-+        snapshot!(tokens as Expr, @r###"
-+        Expr::Field {
-+            base: Expr::Field {
-+                base: Expr::Path {
-+                    path: Path {
-+                        segments: [
-+                            PathSegment {
-+                                ident: "tuple",
-+                                arguments: None,
-+                            },
-+                        ],
-+                    },
-+                },
-+                member: Unnamed(Index {
-+                    index: 0,
-+                }),
-+            },
-+            member: Unnamed(Index {
-+                index: 0,
-+            }),
-+        }
-+        "###);
-+    }
-+}
-+
-+#[test]
-+fn test_macro_variable_func() {
-+    // mimics the token stream corresponding to `$fn()`
-+    let tokens = TokenStream::from_iter(vec![
-+        TokenTree::Group(Group::new(Delimiter::None, quote! { f })),
-+        TokenTree::Group(Group::new(Delimiter::Parenthesis, TokenStream::new())),
-+    ]);
-+
-+    snapshot!(tokens as Expr, @r###"
-+    Expr::Call {
-+        func: Expr::Group {
-+            expr: Expr::Path {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "f",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+            },
-+        },
-+    }
-+    "###);
-+
-+    let tokens = TokenStream::from_iter(vec![
-+        TokenTree::Punct(Punct::new('#', Spacing::Alone)),
-+        TokenTree::Group(Group::new(Delimiter::Bracket, quote! { outside })),
-+        TokenTree::Group(Group::new(Delimiter::None, quote! { #[inside] f })),
-+        TokenTree::Group(Group::new(Delimiter::Parenthesis, TokenStream::new())),
-+    ]);
-+
-+    snapshot!(tokens as Expr, @r###"
-+    Expr::Call {
-+        attrs: [
-+            Attribute {
-+                style: Outer,
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "outside",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                tokens: TokenStream(``),
-+            },
-+        ],
-+        func: Expr::Group {
-+            expr: Expr::Path {
-+                attrs: [
-+                    Attribute {
-+                        style: Outer,
-+                        path: Path {
-+                            segments: [
-+                                PathSegment {
-+                                    ident: "inside",
-+                                    arguments: None,
-+                                },
-+                            ],
-+                        },
-+                        tokens: TokenStream(``),
-+                    },
-+                ],
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "f",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+            },
-+        },
-+    }
-+    "###);
-+}
-+
-+#[test]
-+fn test_macro_variable_macro() {
-+    // mimics the token stream corresponding to `$macro!()`
-+    let tokens = TokenStream::from_iter(vec![
-+        TokenTree::Group(Group::new(Delimiter::None, quote! { m })),
-+        TokenTree::Punct(Punct::new('!', Spacing::Alone)),
-+        TokenTree::Group(Group::new(Delimiter::Parenthesis, TokenStream::new())),
-+    ]);
-+
-+    snapshot!(tokens as Expr, @r###"
-+    Expr::Macro {
-+        mac: Macro {
-+            path: Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "m",
-+                        arguments: None,
-+                    },
-+                ],
-+            },
-+            delimiter: Paren,
-+            tokens: TokenStream(``),
-+        },
-+    }
-+    "###);
-+}
-+
-+#[test]
-+fn test_macro_variable_struct() {
-+    // mimics the token stream corresponding to `$struct {}`
-+    let tokens = TokenStream::from_iter(vec![
-+        TokenTree::Group(Group::new(Delimiter::None, quote! { S })),
-+        TokenTree::Group(Group::new(Delimiter::Brace, TokenStream::new())),
-+    ]);
-+
-+    snapshot!(tokens as Expr, @r###"
-+    Expr::Struct {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "S",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+    }
-+    "###);
-+}
-+
-+#[test]
-+fn test_macro_variable_match_arm() {
-+    // mimics the token stream corresponding to `match v { _ => $expr }`
-+    let tokens = TokenStream::from_iter(vec![
-+        TokenTree::Ident(Ident::new("match", Span::call_site())),
-+        TokenTree::Ident(Ident::new("v", Span::call_site())),
-+        TokenTree::Group(Group::new(
-+            Delimiter::Brace,
-+            TokenStream::from_iter(vec![
-+                TokenTree::Punct(Punct::new('_', Spacing::Alone)),
-+                TokenTree::Punct(Punct::new('=', Spacing::Joint)),
-+                TokenTree::Punct(Punct::new('>', Spacing::Alone)),
-+                TokenTree::Group(Group::new(Delimiter::None, quote! { #[a] () })),
-+            ]),
-+        )),
-+    ]);
-+
-+    snapshot!(tokens as Expr, @r###"
-+    Expr::Match {
-+        expr: Expr::Path {
-+            path: Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "v",
-+                        arguments: None,
-+                    },
-+                ],
-+            },
-+        },
-+        arms: [
-+            Arm {
-+                pat: Pat::Wild,
-+                body: Expr::Group {
-+                    expr: Expr::Tuple {
-+                        attrs: [
-+                            Attribute {
-+                                style: Outer,
-+                                path: Path {
-+                                    segments: [
-+                                        PathSegment {
-+                                            ident: "a",
-+                                            arguments: None,
-+                                        },
-+                                    ],
-+                                },
-+                                tokens: TokenStream(``),
-+                            },
-+                        ],
-+                    },
-+                },
-+            },
-+        ],
-+    }
-+    "###);
-+}
-diff --git a/third_party/rust/syn/tests/test_generics.rs b/third_party/rust/syn/tests/test_generics.rs
---- a/third_party/rust/syn/tests/test_generics.rs
-+++ b/third_party/rust/syn/tests/test_generics.rs
-@@ -1,110 +1,105 @@
--extern crate quote;
--extern crate syn;
--
--mod features;
--
- #[macro_use]
- mod macros;
- 
- use quote::quote;
- use syn::{DeriveInput, ItemFn, TypeParamBound, WhereClause, WherePredicate};
- 
- #[test]
- fn test_split_for_impl() {
-     let input = quote! {
-         struct S<'a, 'b: 'a, #[may_dangle] T: 'a = ()> where T: Debug;
-     };
- 
-     snapshot!(input as DeriveInput, @r###"
--   ⋮DeriveInput {
--   ⋮    vis: Inherited,
--   ⋮    ident: "S",
--   ⋮    generics: Generics {
--   ⋮        lt_token: Some,
--   ⋮        params: [
--   ⋮            Lifetime(LifetimeDef {
--   ⋮                lifetime: Lifetime {
--   ⋮                    ident: "a",
--   ⋮                },
--   ⋮            }),
--   ⋮            Lifetime(LifetimeDef {
--   ⋮                lifetime: Lifetime {
--   ⋮                    ident: "b",
--   ⋮                },
--   ⋮                colon_token: Some,
--   ⋮                bounds: [
--   ⋮                    Lifetime {
--   ⋮                        ident: "a",
--   ⋮                    },
--   ⋮                ],
--   ⋮            }),
--   ⋮            Type(TypeParam {
--   ⋮                attrs: [
--   ⋮                    Attribute {
--   ⋮                        style: Outer,
--   ⋮                        path: Path {
--   ⋮                            segments: [
--   ⋮                                PathSegment {
--   ⋮                                    ident: "may_dangle",
--   ⋮                                    arguments: None,
--   ⋮                                },
--   ⋮                            ],
--   ⋮                        },
--   ⋮                        tokens: ``,
--   ⋮                    },
--   ⋮                ],
--   ⋮                ident: "T",
--   ⋮                colon_token: Some,
--   ⋮                bounds: [
--   ⋮                    Lifetime(Lifetime {
--   ⋮                        ident: "a",
--   ⋮                    }),
--   ⋮                ],
--   ⋮                eq_token: Some,
--   ⋮                default: Some(Type::Tuple),
--   ⋮            }),
--   ⋮        ],
--   ⋮        gt_token: Some,
--   ⋮        where_clause: Some(WhereClause {
--   ⋮            predicates: [
--   ⋮                Type(PredicateType {
--   ⋮                    bounded_ty: Type::Path {
--   ⋮                        path: Path {
--   ⋮                            segments: [
--   ⋮                                PathSegment {
--   ⋮                                    ident: "T",
--   ⋮                                    arguments: None,
--   ⋮                                },
--   ⋮                            ],
--   ⋮                        },
--   ⋮                    },
--   ⋮                    bounds: [
--   ⋮                        Trait(TraitBound {
--   ⋮                            modifier: None,
--   ⋮                            path: Path {
--   ⋮                                segments: [
--   ⋮                                    PathSegment {
--   ⋮                                        ident: "Debug",
--   ⋮                                        arguments: None,
--   ⋮                                    },
--   ⋮                                ],
--   ⋮                            },
--   ⋮                        }),
--   ⋮                    ],
--   ⋮                }),
--   ⋮            ],
--   ⋮        }),
--   ⋮    },
--   ⋮    data: Data::Struct {
--   ⋮        fields: Unit,
--   ⋮        semi_token: Some,
--   ⋮    },
--   ⋮}
-+    DeriveInput {
-+        vis: Inherited,
-+        ident: "S",
-+        generics: Generics {
-+            lt_token: Some,
-+            params: [
-+                Lifetime(LifetimeDef {
-+                    lifetime: Lifetime {
-+                        ident: "a",
-+                    },
-+                }),
-+                Lifetime(LifetimeDef {
-+                    lifetime: Lifetime {
-+                        ident: "b",
-+                    },
-+                    colon_token: Some,
-+                    bounds: [
-+                        Lifetime {
-+                            ident: "a",
-+                        },
-+                    ],
-+                }),
-+                Type(TypeParam {
-+                    attrs: [
-+                        Attribute {
-+                            style: Outer,
-+                            path: Path {
-+                                segments: [
-+                                    PathSegment {
-+                                        ident: "may_dangle",
-+                                        arguments: None,
-+                                    },
-+                                ],
-+                            },
-+                            tokens: TokenStream(``),
-+                        },
-+                    ],
-+                    ident: "T",
-+                    colon_token: Some,
-+                    bounds: [
-+                        Lifetime(Lifetime {
-+                            ident: "a",
-+                        }),
-+                    ],
-+                    eq_token: Some,
-+                    default: Some(Type::Tuple),
-+                }),
-+            ],
-+            gt_token: Some,
-+            where_clause: Some(WhereClause {
-+                predicates: [
-+                    Type(PredicateType {
-+                        bounded_ty: Type::Path {
-+                            path: Path {
-+                                segments: [
-+                                    PathSegment {
-+                                        ident: "T",
-+                                        arguments: None,
-+                                    },
-+                                ],
-+                            },
-+                        },
-+                        bounds: [
-+                            Trait(TraitBound {
-+                                modifier: None,
-+                                path: Path {
-+                                    segments: [
-+                                        PathSegment {
-+                                            ident: "Debug",
-+                                            arguments: None,
-+                                        },
-+                                    ],
-+                                },
-+                            }),
-+                        ],
-+                    }),
-+                ],
-+            }),
-+        },
-+        data: Data::Struct {
-+            fields: Unit,
-+            semi_token: Some,
-+        },
-+    }
-     "###);
- 
-     let generics = input.generics;
-     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
- 
-     let generated = quote! {
-         impl #impl_generics MyTrait for Test #ty_generics #where_clause {}
-     };
-@@ -126,156 +121,156 @@ fn test_split_for_impl() {
-     };
-     assert_eq!(generated.to_string(), expected.to_string());
- }
- 
- #[test]
- fn test_ty_param_bound() {
-     let tokens = quote!('a);
-     snapshot!(tokens as TypeParamBound, @r###"
--   ⋮Lifetime(Lifetime {
--   ⋮    ident: "a",
--   ⋮})
-+    Lifetime(Lifetime {
-+        ident: "a",
-+    })
-     "###);
- 
-     let tokens = quote!('_);
-     snapshot!(tokens as TypeParamBound, @r###"
--   ⋮Lifetime(Lifetime {
--   ⋮    ident: "_",
--   ⋮})
-+    Lifetime(Lifetime {
-+        ident: "_",
-+    })
-     "###);
- 
-     let tokens = quote!(Debug);
-     snapshot!(tokens as TypeParamBound, @r###"
--   ⋮Trait(TraitBound {
--   ⋮    modifier: None,
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "Debug",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮})
-+    Trait(TraitBound {
-+        modifier: None,
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "Debug",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+    })
-     "###);
- 
-     let tokens = quote!(?Sized);
-     snapshot!(tokens as TypeParamBound, @r###"
--   ⋮Trait(TraitBound {
--   ⋮    modifier: Maybe,
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "Sized",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮})
-+    Trait(TraitBound {
-+        modifier: Maybe,
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "Sized",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+    })
-     "###);
- }
- 
- #[test]
- fn test_fn_precedence_in_where_clause() {
-     // This should parse as two separate bounds, `FnOnce() -> i32` and `Send` - not
-     // `FnOnce() -> (i32 + Send)`.
-     let input = quote! {
-         fn f<G>()
-         where
-             G: FnOnce() -> i32 + Send,
-         {
-         }
-     };
- 
-     snapshot!(input as ItemFn, @r###"
--   ⋮ItemFn {
--   ⋮    vis: Inherited,
--   ⋮    sig: Signature {
--   ⋮        ident: "f",
--   ⋮        generics: Generics {
--   ⋮            lt_token: Some,
--   ⋮            params: [
--   ⋮                Type(TypeParam {
--   ⋮                    ident: "G",
--   ⋮                }),
--   ⋮            ],
--   ⋮            gt_token: Some,
--   ⋮            where_clause: Some(WhereClause {
--   ⋮                predicates: [
--   ⋮                    Type(PredicateType {
--   ⋮                        bounded_ty: Type::Path {
--   ⋮                            path: Path {
--   ⋮                                segments: [
--   ⋮                                    PathSegment {
--   ⋮                                        ident: "G",
--   ⋮                                        arguments: None,
--   ⋮                                    },
--   ⋮                                ],
--   ⋮                            },
--   ⋮                        },
--   ⋮                        bounds: [
--   ⋮                            Trait(TraitBound {
--   ⋮                                modifier: None,
--   ⋮                                path: Path {
--   ⋮                                    segments: [
--   ⋮                                        PathSegment {
--   ⋮                                            ident: "FnOnce",
--   ⋮                                            arguments: PathArguments::Parenthesized {
--   ⋮                                                output: Type(
--   ⋮                                                    Type::Path {
--   ⋮                                                        path: Path {
--   ⋮                                                            segments: [
--   ⋮                                                                PathSegment {
--   ⋮                                                                    ident: "i32",
--   ⋮                                                                    arguments: None,
--   ⋮                                                                },
--   ⋮                                                            ],
--   ⋮                                                        },
--   ⋮                                                    },
--   ⋮                                                ),
--   ⋮                                            },
--   ⋮                                        },
--   ⋮                                    ],
--   ⋮                                },
--   ⋮                            }),
--   ⋮                            Trait(TraitBound {
--   ⋮                                modifier: None,
--   ⋮                                path: Path {
--   ⋮                                    segments: [
--   ⋮                                        PathSegment {
--   ⋮                                            ident: "Send",
--   ⋮                                            arguments: None,
--   ⋮                                        },
--   ⋮                                    ],
--   ⋮                                },
--   ⋮                            }),
--   ⋮                        ],
--   ⋮                    }),
--   ⋮                ],
--   ⋮            }),
--   ⋮        },
--   ⋮        output: Default,
--   ⋮    },
--   ⋮    block: Block,
--   ⋮}
-+    ItemFn {
-+        vis: Inherited,
-+        sig: Signature {
-+            ident: "f",
-+            generics: Generics {
-+                lt_token: Some,
-+                params: [
-+                    Type(TypeParam {
-+                        ident: "G",
-+                    }),
-+                ],
-+                gt_token: Some,
-+                where_clause: Some(WhereClause {
-+                    predicates: [
-+                        Type(PredicateType {
-+                            bounded_ty: Type::Path {
-+                                path: Path {
-+                                    segments: [
-+                                        PathSegment {
-+                                            ident: "G",
-+                                            arguments: None,
-+                                        },
-+                                    ],
-+                                },
-+                            },
-+                            bounds: [
-+                                Trait(TraitBound {
-+                                    modifier: None,
-+                                    path: Path {
-+                                        segments: [
-+                                            PathSegment {
-+                                                ident: "FnOnce",
-+                                                arguments: PathArguments::Parenthesized {
-+                                                    output: Type(
-+                                                        Type::Path {
-+                                                            path: Path {
-+                                                                segments: [
-+                                                                    PathSegment {
-+                                                                        ident: "i32",
-+                                                                        arguments: None,
-+                                                                    },
-+                                                                ],
-+                                                            },
-+                                                        },
-+                                                    ),
-+                                                },
-+                                            },
-+                                        ],
-+                                    },
-+                                }),
-+                                Trait(TraitBound {
-+                                    modifier: None,
-+                                    path: Path {
-+                                        segments: [
-+                                            PathSegment {
-+                                                ident: "Send",
-+                                                arguments: None,
-+                                            },
-+                                        ],
-+                                    },
-+                                }),
-+                            ],
-+                        }),
-+                    ],
-+                }),
-+            },
-+            output: Default,
-+        },
-+        block: Block,
-+    }
-     "###);
- 
-     let where_clause = input.sig.generics.where_clause.as_ref().unwrap();
-     assert_eq!(where_clause.predicates.len(), 1);
- 
-     let predicate = match &where_clause.predicates[0] {
-         WherePredicate::Type(pred) => pred,
-         _ => panic!("wrong predicate kind"),
-     };
- 
-     assert_eq!(predicate.bounds.len(), 2, "{:#?}", predicate.bounds);
- 
-     let first_bound = &predicate.bounds[0];
--    assert_eq!(quote!(#first_bound).to_string(), "FnOnce ( ) -> i32");
-+    assert_eq!(quote!(#first_bound).to_string(), "FnOnce () -> i32");
- 
-     let second_bound = &predicate.bounds[1];
-     assert_eq!(quote!(#second_bound).to_string(), "Send");
- }
- 
- #[test]
- fn test_where_clause_at_end_of_input() {
-     let input = quote! {
-diff --git a/third_party/rust/syn/tests/test_grouping.rs b/third_party/rust/syn/tests/test_grouping.rs
---- a/third_party/rust/syn/tests/test_grouping.rs
-+++ b/third_party/rust/syn/tests/test_grouping.rs
-@@ -1,13 +1,8 @@
--extern crate proc_macro2;
--extern crate syn;
--
--mod features;
--
- #[macro_use]
- mod macros;
- 
- use proc_macro2::{Delimiter, Group, Literal, Punct, Spacing, TokenStream, TokenTree};
- use syn::Expr;
- 
- use std::iter::FromIterator;
- 
-@@ -23,36 +18,36 @@ fn test_grouping() {
-                 TokenTree::Punct(Punct::new('+', Spacing::Alone)),
-                 TokenTree::Literal(Literal::i32_suffixed(3)),
-             ]),
-         )),
-         TokenTree::Punct(Punct::new('*', Spacing::Alone)),
-         TokenTree::Literal(Literal::i32_suffixed(4)),
-     ]);
- 
--    assert_eq!(tokens.to_string(), "1i32 +  2i32 + 3i32  * 4i32");
-+    assert_eq!(tokens.to_string(), "1i32 + 2i32 + 3i32 * 4i32");
- 
-     snapshot!(tokens as Expr, @r###"
--   ⋮Expr::Binary {
--   ⋮    left: Expr::Lit {
--   ⋮        lit: 1i32,
--   ⋮    },
--   ⋮    op: Add,
--   ⋮    right: Expr::Binary {
--   ⋮        left: Expr::Group {
--   ⋮            expr: Expr::Binary {
--   ⋮                left: Expr::Lit {
--   ⋮                    lit: 2i32,
--   ⋮                },
--   ⋮                op: Add,
--   ⋮                right: Expr::Lit {
--   ⋮                    lit: 3i32,
--   ⋮                },
--   ⋮            },
--   ⋮        },
--   ⋮        op: Mul,
--   ⋮        right: Expr::Lit {
--   ⋮            lit: 4i32,
--   ⋮        },
--   ⋮    },
--   ⋮}
-+    Expr::Binary {
-+        left: Expr::Lit {
-+            lit: 1i32,
-+        },
-+        op: Add,
-+        right: Expr::Binary {
-+            left: Expr::Group {
-+                expr: Expr::Binary {
-+                    left: Expr::Lit {
-+                        lit: 2i32,
-+                    },
-+                    op: Add,
-+                    right: Expr::Lit {
-+                        lit: 3i32,
-+                    },
-+                },
-+            },
-+            op: Mul,
-+            right: Expr::Lit {
-+                lit: 4i32,
-+            },
-+        },
-+    }
-     "###);
- }
-diff --git a/third_party/rust/syn/tests/test_ident.rs b/third_party/rust/syn/tests/test_ident.rs
---- a/third_party/rust/syn/tests/test_ident.rs
-+++ b/third_party/rust/syn/tests/test_ident.rs
-@@ -1,13 +1,8 @@
--extern crate proc_macro2;
--extern crate syn;
--
--mod features;
--
- use proc_macro2::{Ident, Span, TokenStream};
- use std::str::FromStr;
- use syn::Result;
- 
- fn parse(s: &str) -> Result<Ident> {
-     syn::parse2(TokenStream::from_str(s).unwrap())
- }
- 
-diff --git a/third_party/rust/syn/tests/test_item.rs b/third_party/rust/syn/tests/test_item.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/tests/test_item.rs
-@@ -0,0 +1,45 @@
-+#[macro_use]
-+mod macros;
-+
-+use proc_macro2::{Delimiter, Group, Ident, Span, TokenStream, TokenTree};
-+use quote::quote;
-+use std::iter::FromIterator;
-+use syn::Item;
-+
-+#[test]
-+fn test_macro_variable_attr() {
-+    // mimics the token stream corresponding to `$attr fn f() {}`
-+    let tokens = TokenStream::from_iter(vec![
-+        TokenTree::Group(Group::new(Delimiter::None, quote! { #[test] })),
-+        TokenTree::Ident(Ident::new("fn", Span::call_site())),
-+        TokenTree::Ident(Ident::new("f", Span::call_site())),
-+        TokenTree::Group(Group::new(Delimiter::Parenthesis, TokenStream::new())),
-+        TokenTree::Group(Group::new(Delimiter::Brace, TokenStream::new())),
-+    ]);
-+
-+    snapshot!(tokens as Item, @r###"
-+    Item::Fn {
-+        attrs: [
-+            Attribute {
-+                style: Outer,
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "test",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                tokens: TokenStream(``),
-+            },
-+        ],
-+        vis: Inherited,
-+        sig: Signature {
-+            ident: "f",
-+            generics: Generics,
-+            output: Default,
-+        },
-+        block: Block,
-+    }
-+    "###);
-+}
-diff --git a/third_party/rust/syn/tests/test_iterators.rs b/third_party/rust/syn/tests/test_iterators.rs
---- a/third_party/rust/syn/tests/test_iterators.rs
-+++ b/third_party/rust/syn/tests/test_iterators.rs
-@@ -1,15 +1,10 @@
- use syn::punctuated::{Pair, Punctuated};
--
--extern crate quote;
--#[macro_use]
--extern crate syn;
--
--mod features;
-+use syn::Token;
- 
- #[macro_use]
- mod macros;
- 
- macro_rules! check_exact_size_iterator {
-     ($iter:expr) => {{
-         let iter = $iter;
-         let size_hint = iter.size_hint();
-diff --git a/third_party/rust/syn/tests/test_lit.rs b/third_party/rust/syn/tests/test_lit.rs
---- a/third_party/rust/syn/tests/test_lit.rs
-+++ b/third_party/rust/syn/tests/test_lit.rs
-@@ -1,18 +1,16 @@
--extern crate proc_macro2;
--extern crate quote;
--extern crate syn;
-+#[macro_use]
-+mod macros;
- 
--mod features;
--
--use proc_macro2::{TokenStream, TokenTree};
-+use proc_macro2::{Delimiter, Group, Literal, Span, TokenStream, TokenTree};
- use quote::ToTokens;
-+use std::iter::FromIterator;
- use std::str::FromStr;
--use syn::Lit;
-+use syn::{Lit, LitFloat, LitInt};
- 
- fn lit(s: &str) -> Lit {
-     match TokenStream::from_str(s)
-         .unwrap()
-         .into_iter()
-         .next()
-         .unwrap()
-     {
-@@ -45,16 +43,19 @@ fn strings() {
-     test_string("\"'\"", "'");
-     test_string("\"\"", "");
-     test_string("\"\\u{1F415}\"", "\u{1F415}");
-     test_string(
-         "\"contains\nnewlines\\\nescaped newlines\"",
-         "contains\nnewlinesescaped newlines",
-     );
-     test_string("r\"raw\nstring\\\nhere\"", "raw\nstring\\\nhere");
-+    test_string("\"...\"q", "...");
-+    test_string("r\"...\"q", "...");
-+    test_string("r##\"...\"##q", "...");
- }
- 
- #[test]
- fn byte_strings() {
-     fn test_byte_string(s: &str, value: &[u8]) {
-         match lit(s) {
-             Lit::ByteStr(lit) => {
-                 assert_eq!(lit.value(), value);
-@@ -74,16 +75,19 @@ fn byte_strings() {
-     test_byte_string("b\"\\\"\"", b"\"");
-     test_byte_string("b\"'\"", b"'");
-     test_byte_string("b\"\"", b"");
-     test_byte_string(
-         "b\"contains\nnewlines\\\nescaped newlines\"",
-         b"contains\nnewlinesescaped newlines",
-     );
-     test_byte_string("br\"raw\nstring\\\nhere\"", b"raw\nstring\\\nhere");
-+    test_byte_string("b\"...\"q", b"...");
-+    test_byte_string("br\"...\"q", b"...");
-+    test_byte_string("br##\"...\"##q", b"...");
- }
- 
- #[test]
- fn bytes() {
-     fn test_byte(s: &str, value: u8) {
-         match lit(s) {
-             Lit::Byte(lit) => {
-                 assert_eq!(lit.value(), value);
-@@ -95,16 +99,17 @@ fn bytes() {
-     }
- 
-     test_byte("b'a'", b'a');
-     test_byte("b'\\n'", b'\n');
-     test_byte("b'\\r'", b'\r');
-     test_byte("b'\\t'", b'\t');
-     test_byte("b'\\''", b'\'');
-     test_byte("b'\"'", b'"');
-+    test_byte("b'a'q", b'a');
- }
- 
- #[test]
- fn chars() {
-     fn test_char(s: &str, value: char) {
-         match lit(s) {
-             Lit::Char(lit) => {
-                 assert_eq!(lit.value(), value);
-@@ -120,16 +125,17 @@ fn chars() {
-     test_char("'a'", 'a');
-     test_char("'\\n'", '\n');
-     test_char("'\\r'", '\r');
-     test_char("'\\t'", '\t');
-     test_char("'🐕'", '🐕'); // NOTE: This is an emoji
-     test_char("'\\''", '\'');
-     test_char("'\"'", '"');
-     test_char("'\\u{1F415}'", '\u{1F415}');
-+    test_char("'a'q", 'a');
- }
- 
- #[test]
- fn ints() {
-     fn test_int(s: &str, value: u64, suffix: &str) {
-         match lit(s) {
-             Lit::Int(lit) => {
-                 assert_eq!(lit.base10_digits().parse::<u64>().unwrap(), value);
-@@ -180,9 +186,64 @@ fn floats() {
-         }
-     }
- 
-     test_float("5.5", 5.5, "");
-     test_float("5.5E12", 5.5e12, "");
-     test_float("5.5e12", 5.5e12, "");
-     test_float("1.0__3e-12", 1.03e-12, "");
-     test_float("1.03e+12", 1.03e12, "");
-+    test_float("9e99e99", 9e99, "e99");
- }
-+
-+#[test]
-+fn negative() {
-+    let span = Span::call_site();
-+    assert_eq!("-1", LitInt::new("-1", span).to_string());
-+    assert_eq!("-1i8", LitInt::new("-1i8", span).to_string());
-+    assert_eq!("-1i16", LitInt::new("-1i16", span).to_string());
-+    assert_eq!("-1i32", LitInt::new("-1i32", span).to_string());
-+    assert_eq!("-1i64", LitInt::new("-1i64", span).to_string());
-+    assert_eq!("-1.5", LitFloat::new("-1.5", span).to_string());
-+    assert_eq!("-1.5f32", LitFloat::new("-1.5f32", span).to_string());
-+    assert_eq!("-1.5f64", LitFloat::new("-1.5f64", span).to_string());
-+}
-+
-+#[test]
-+fn suffix() {
-+    fn get_suffix(token: &str) -> String {
-+        let lit = syn::parse_str::<Lit>(token).unwrap();
-+        match lit {
-+            Lit::Str(lit) => lit.suffix().to_owned(),
-+            Lit::ByteStr(lit) => lit.suffix().to_owned(),
-+            Lit::Byte(lit) => lit.suffix().to_owned(),
-+            Lit::Char(lit) => lit.suffix().to_owned(),
-+            Lit::Int(lit) => lit.suffix().to_owned(),
-+            Lit::Float(lit) => lit.suffix().to_owned(),
-+            _ => unimplemented!(),
-+        }
-+    }
-+
-+    assert_eq!(get_suffix("\"\"s"), "s");
-+    assert_eq!(get_suffix("r\"\"r"), "r");
-+    assert_eq!(get_suffix("b\"\"b"), "b");
-+    assert_eq!(get_suffix("br\"\"br"), "br");
-+    assert_eq!(get_suffix("r#\"\"#r"), "r");
-+    assert_eq!(get_suffix("'c'c"), "c");
-+    assert_eq!(get_suffix("b'b'b"), "b");
-+    assert_eq!(get_suffix("1i32"), "i32");
-+    assert_eq!(get_suffix("1_i32"), "i32");
-+    assert_eq!(get_suffix("1.0f32"), "f32");
-+    assert_eq!(get_suffix("1.0_f32"), "f32");
-+}
-+
-+#[test]
-+fn test_deep_group_empty() {
-+    let tokens = TokenStream::from_iter(vec![TokenTree::Group(Group::new(
-+        Delimiter::None,
-+        TokenStream::from_iter(vec![TokenTree::Group(Group::new(
-+            Delimiter::None,
-+            TokenStream::from_iter(vec![TokenTree::Literal(Literal::string("hi"))]),
-+        ))]),
-+    ))]);
-+
-+    snapshot!(tokens as Lit, @r#""hi""# );
-+}
-diff --git a/third_party/rust/syn/tests/test_meta.rs b/third_party/rust/syn/tests/test_meta.rs
---- a/third_party/rust/syn/tests/test_meta.rs
-+++ b/third_party/rust/syn/tests/test_meta.rs
-@@ -1,343 +1,339 @@
--extern crate syn;
--
--mod features;
--
- #[macro_use]
- mod macros;
- 
- use syn::{Meta, MetaList, MetaNameValue, NestedMeta};
- 
- #[test]
- fn test_parse_meta_item_word() {
-     let input = "hello";
- 
-     snapshot!(input as Meta, @r###"
--   ⋮Path(Path {
--   ⋮    segments: [
--   ⋮        PathSegment {
--   ⋮            ident: "hello",
--   ⋮            arguments: None,
--   ⋮        },
--   ⋮    ],
--   ⋮})
-+    Path(Path {
-+        segments: [
-+            PathSegment {
-+                ident: "hello",
-+                arguments: None,
-+            },
-+        ],
-+    })
-     "###);
- }
- 
- #[test]
- fn test_parse_meta_name_value() {
-     let input = "foo = 5";
-     let (inner, meta) = (input, input);
- 
-     snapshot!(inner as MetaNameValue, @r###"
--   ⋮MetaNameValue {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    lit: 5,
--   ⋮}
-+    MetaNameValue {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        lit: 5,
-+    }
-     "###);
- 
-     snapshot!(meta as Meta, @r###"
--   ⋮Meta::NameValue {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    lit: 5,
--   ⋮}
-+    Meta::NameValue {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        lit: 5,
-+    }
-     "###);
- 
-     assert_eq!(meta, inner.into());
- }
- 
- #[test]
- fn test_parse_meta_name_value_with_keyword() {
-     let input = "static = 5";
-     let (inner, meta) = (input, input);
- 
-     snapshot!(inner as MetaNameValue, @r###"
--   ⋮MetaNameValue {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "static",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    lit: 5,
--   ⋮}
-+    MetaNameValue {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "static",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        lit: 5,
-+    }
-     "###);
- 
-     snapshot!(meta as Meta, @r###"
--   ⋮Meta::NameValue {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "static",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    lit: 5,
--   ⋮}
-+    Meta::NameValue {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "static",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        lit: 5,
-+    }
-     "###);
- 
-     assert_eq!(meta, inner.into());
- }
- 
- #[test]
- fn test_parse_meta_name_value_with_bool() {
-     let input = "true = 5";
-     let (inner, meta) = (input, input);
- 
-     snapshot!(inner as MetaNameValue, @r###"
--   ⋮MetaNameValue {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "true",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    lit: 5,
--   ⋮}
-+    MetaNameValue {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "true",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        lit: 5,
-+    }
-     "###);
- 
-     snapshot!(meta as Meta, @r###"
--   ⋮Meta::NameValue {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "true",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    lit: 5,
--   ⋮}
-+    Meta::NameValue {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "true",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        lit: 5,
-+    }
-     "###);
- 
-     assert_eq!(meta, inner.into());
- }
- 
- #[test]
- fn test_parse_meta_item_list_lit() {
-     let input = "foo(5)";
-     let (inner, meta) = (input, input);
- 
-     snapshot!(inner as MetaList, @r###"
--   ⋮MetaList {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    nested: [
--   ⋮        Lit(5),
--   ⋮    ],
--   ⋮}
-+    MetaList {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        nested: [
-+            Lit(5),
-+        ],
-+    }
-     "###);
- 
-     snapshot!(meta as Meta, @r###"
--   ⋮Meta::List {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    nested: [
--   ⋮        Lit(5),
--   ⋮    ],
--   ⋮}
-+    Meta::List {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        nested: [
-+            Lit(5),
-+        ],
-+    }
-     "###);
- 
-     assert_eq!(meta, inner.into());
- }
- 
- #[test]
- fn test_parse_meta_item_multiple() {
-     let input = "foo(word, name = 5, list(name2 = 6), word2)";
-     let (inner, meta) = (input, input);
- 
-     snapshot!(inner as MetaList, @r###"
--   ⋮MetaList {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    nested: [
--   ⋮        Meta(Path(Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "word",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        })),
--   ⋮        Meta(Meta::NameValue {
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "name",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            lit: 5,
--   ⋮        }),
--   ⋮        Meta(Meta::List {
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "list",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            nested: [
--   ⋮                Meta(Meta::NameValue {
--   ⋮                    path: Path {
--   ⋮                        segments: [
--   ⋮                            PathSegment {
--   ⋮                                ident: "name2",
--   ⋮                                arguments: None,
--   ⋮                            },
--   ⋮                        ],
--   ⋮                    },
--   ⋮                    lit: 6,
--   ⋮                }),
--   ⋮            ],
--   ⋮        }),
--   ⋮        Meta(Path(Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "word2",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        })),
--   ⋮    ],
--   ⋮}
-+    MetaList {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        nested: [
-+            Meta(Path(Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "word",
-+                        arguments: None,
-+                    },
-+                ],
-+            })),
-+            Meta(Meta::NameValue {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "name",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                lit: 5,
-+            }),
-+            Meta(Meta::List {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "list",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                nested: [
-+                    Meta(Meta::NameValue {
-+                        path: Path {
-+                            segments: [
-+                                PathSegment {
-+                                    ident: "name2",
-+                                    arguments: None,
-+                                },
-+                            ],
-+                        },
-+                        lit: 6,
-+                    }),
-+                ],
-+            }),
-+            Meta(Path(Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "word2",
-+                        arguments: None,
-+                    },
-+                ],
-+            })),
-+        ],
-+    }
-     "###);
- 
-     snapshot!(meta as Meta, @r###"
--   ⋮Meta::List {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "foo",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    nested: [
--   ⋮        Meta(Path(Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "word",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        })),
--   ⋮        Meta(Meta::NameValue {
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "name",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            lit: 5,
--   ⋮        }),
--   ⋮        Meta(Meta::List {
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "list",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            nested: [
--   ⋮                Meta(Meta::NameValue {
--   ⋮                    path: Path {
--   ⋮                        segments: [
--   ⋮                            PathSegment {
--   ⋮                                ident: "name2",
--   ⋮                                arguments: None,
--   ⋮                            },
--   ⋮                        ],
--   ⋮                    },
--   ⋮                    lit: 6,
--   ⋮                }),
--   ⋮            ],
--   ⋮        }),
--   ⋮        Meta(Path(Path {
--   ⋮            segments: [
--   ⋮                PathSegment {
--   ⋮                    ident: "word2",
--   ⋮                    arguments: None,
--   ⋮                },
--   ⋮            ],
--   ⋮        })),
--   ⋮    ],
--   ⋮}
-+    Meta::List {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "foo",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        nested: [
-+            Meta(Path(Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "word",
-+                        arguments: None,
-+                    },
-+                ],
-+            })),
-+            Meta(Meta::NameValue {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "name",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                lit: 5,
-+            }),
-+            Meta(Meta::List {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "list",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                nested: [
-+                    Meta(Meta::NameValue {
-+                        path: Path {
-+                            segments: [
-+                                PathSegment {
-+                                    ident: "name2",
-+                                    arguments: None,
-+                                },
-+                            ],
-+                        },
-+                        lit: 6,
-+                    }),
-+                ],
-+            }),
-+            Meta(Path(Path {
-+                segments: [
-+                    PathSegment {
-+                        ident: "word2",
-+                        arguments: None,
-+                    },
-+                ],
-+            })),
-+        ],
-+    }
-     "###);
- 
-     assert_eq!(meta, inner.into());
- }
- 
- #[test]
- fn test_parse_nested_meta() {
-     let input = "5";
-     snapshot!(input as NestedMeta, @"Lit(5)");
- 
-     let input = "list(name2 = 6)";
-     snapshot!(input as NestedMeta, @r###"
--   ⋮Meta(Meta::List {
--   ⋮    path: Path {
--   ⋮        segments: [
--   ⋮            PathSegment {
--   ⋮                ident: "list",
--   ⋮                arguments: None,
--   ⋮            },
--   ⋮        ],
--   ⋮    },
--   ⋮    nested: [
--   ⋮        Meta(Meta::NameValue {
--   ⋮            path: Path {
--   ⋮                segments: [
--   ⋮                    PathSegment {
--   ⋮                        ident: "name2",
--   ⋮                        arguments: None,
--   ⋮                    },
--   ⋮                ],
--   ⋮            },
--   ⋮            lit: 6,
--   ⋮        }),
--   ⋮    ],
--   ⋮})
-+    Meta(Meta::List {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "list",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+        nested: [
-+            Meta(Meta::NameValue {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "name2",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                lit: 6,
-+            }),
-+        ],
-+    })
-     "###);
- }
-diff --git a/third_party/rust/syn/tests/test_parse_buffer.rs b/third_party/rust/syn/tests/test_parse_buffer.rs
---- a/third_party/rust/syn/tests/test_parse_buffer.rs
-+++ b/third_party/rust/syn/tests/test_parse_buffer.rs
-@@ -1,12 +1,12 @@
--#[macro_use]
--extern crate syn;
--
-+use proc_macro2::{Delimiter, Group, Punct, Spacing, TokenStream, TokenTree};
-+use std::iter::FromIterator;
- use syn::parse::{discouraged::Speculative, Parse, ParseStream, Parser, Result};
-+use syn::{parenthesized, Token};
- 
- #[test]
- #[should_panic(expected = "Fork was not derived from the advancing parse stream")]
- fn smuggled_speculative_cursor_between_sources() {
-     struct BreakRules;
-     impl Parse for BreakRules {
-         fn parse(input1: ParseStream) -> Result<Self> {
-             let nested = |input2: ParseStream| {
-@@ -48,8 +48,43 @@ fn smuggled_speculative_cursor_into_brac
-             parenthesized!(a in input);
-             input.advance_to(&a);
-             Ok(Self)
-         }
-     }
- 
-     syn::parse_str::<BreakRules>("()").unwrap();
- }
-+
-+#[test]
-+fn trailing_empty_none_group() {
-+    fn parse(input: ParseStream) -> Result<()> {
-+        input.parse::<Token![+]>()?;
-+
-+        let content;
-+        parenthesized!(content in input);
-+        content.parse::<Token![+]>()?;
-+
-+        Ok(())
-+    }
-+
-+    // `+ ( + <Ø Ø> ) <Ø <Ø Ø> Ø>`
-+    let tokens = TokenStream::from_iter(vec![
-+        TokenTree::Punct(Punct::new('+', Spacing::Alone)),
-+        TokenTree::Group(Group::new(
-+            Delimiter::Parenthesis,
-+            TokenStream::from_iter(vec![
-+                TokenTree::Punct(Punct::new('+', Spacing::Alone)),
-+                TokenTree::Group(Group::new(Delimiter::None, TokenStream::new())),
-+            ]),
-+        )),
-+        TokenTree::Group(Group::new(Delimiter::None, TokenStream::new())),
-+        TokenTree::Group(Group::new(
-+            Delimiter::None,
-+            TokenStream::from_iter(vec![TokenTree::Group(Group::new(
-+                Delimiter::None,
-+                TokenStream::new(),
-+            ))]),
-+        )),
-+    ]);
-+
-+    parse.parse2(tokens).unwrap();
-+}
-diff --git a/third_party/rust/syn/tests/test_parse_stream.rs b/third_party/rust/syn/tests/test_parse_stream.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/tests/test_parse_stream.rs
-@@ -0,0 +1,12 @@
-+use syn::ext::IdentExt;
-+use syn::parse::ParseStream;
-+use syn::{Ident, Token};
-+
-+#[test]
-+fn test_peek() {
-+    let _ = |input: ParseStream| {
-+        let _ = input.peek(Ident);
-+        let _ = input.peek(Ident::peek_any);
-+        let _ = input.peek(Token![::]);
-+    };
-+}
-diff --git a/third_party/rust/syn/tests/test_pat.rs b/third_party/rust/syn/tests/test_pat.rs
---- a/third_party/rust/syn/tests/test_pat.rs
-+++ b/third_party/rust/syn/tests/test_pat.rs
-@@ -1,23 +1,38 @@
--extern crate quote;
--extern crate syn;
--
--mod features;
--
- use quote::quote;
--use syn::Pat;
-+use syn::{Item, Pat, Stmt};
- 
- #[test]
- fn test_pat_ident() {
-     match syn::parse2(quote!(self)).unwrap() {
-         Pat::Ident(_) => (),
-         value => panic!("expected PatIdent, got {:?}", value),
-     }
- }
- 
- #[test]
- fn test_pat_path() {
-     match syn::parse2(quote!(self::CONST)).unwrap() {
-         Pat::Path(_) => (),
-         value => panic!("expected PatPath, got {:?}", value),
-     }
- }
-+
-+#[test]
-+fn test_leading_vert() {
-+    // https://github.com/rust-lang/rust/blob/1.43.0/src/test/ui/or-patterns/remove-leading-vert.rs
-+
-+    syn::parse_str::<Item>("fn f() {}").unwrap();
-+    syn::parse_str::<Item>("fn fun1(| A: E) {}").unwrap_err();
-+    syn::parse_str::<Item>("fn fun2(|| A: E) {}").unwrap_err();
-+
-+    syn::parse_str::<Stmt>("let | () = ();").unwrap();
-+    syn::parse_str::<Stmt>("let (| A): E;").unwrap_err();
-+    syn::parse_str::<Stmt>("let (|| A): (E);").unwrap_err();
-+    syn::parse_str::<Stmt>("let (| A,): (E,);").unwrap_err();
-+    syn::parse_str::<Stmt>("let [| A]: [E; 1];").unwrap_err();
-+    syn::parse_str::<Stmt>("let [|| A]: [E; 1];").unwrap_err();
-+    syn::parse_str::<Stmt>("let TS(| A): TS;").unwrap_err();
-+    syn::parse_str::<Stmt>("let TS(|| A): TS;").unwrap_err();
-+    syn::parse_str::<Stmt>("let NS { f: | A }: NS;").unwrap_err();
-+    syn::parse_str::<Stmt>("let NS { f: || A }: NS;").unwrap_err();
-+}
-diff --git a/third_party/rust/syn/tests/test_path.rs b/third_party/rust/syn/tests/test_path.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/tests/test_path.rs
-@@ -0,0 +1,52 @@
-+#[macro_use]
-+mod macros;
-+
-+use proc_macro2::{Delimiter, Group, Ident, Punct, Spacing, Span, TokenStream, TokenTree};
-+use quote::quote;
-+use std::iter::FromIterator;
-+use syn::{Expr, Type};
-+
-+#[test]
-+fn parse_interpolated_leading_component() {
-+    // mimics the token stream corresponding to `$mod::rest`
-+    let tokens = TokenStream::from_iter(vec![
-+        TokenTree::Group(Group::new(Delimiter::None, quote! { first })),
-+        TokenTree::Punct(Punct::new(':', Spacing::Joint)),
-+        TokenTree::Punct(Punct::new(':', Spacing::Alone)),
-+        TokenTree::Ident(Ident::new("rest", Span::call_site())),
-+    ]);
-+
-+    snapshot!(tokens.clone() as Expr, @r###"
-+    Expr::Path {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "first",
-+                    arguments: None,
-+                },
-+                PathSegment {
-+                    ident: "rest",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+    }
-+    "###);
-+
-+    snapshot!(tokens as Type, @r###"
-+    Type::Path {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "first",
-+                    arguments: None,
-+                },
-+                PathSegment {
-+                    ident: "rest",
-+                    arguments: None,
-+                },
-+            ],
-+        },
-+    }
-+    "###);
-+}
-diff --git a/third_party/rust/syn/tests/test_precedence.rs b/third_party/rust/syn/tests/test_precedence.rs
---- a/third_party/rust/syn/tests/test_precedence.rs
-+++ b/third_party/rust/syn/tests/test_precedence.rs
-@@ -1,43 +1,34 @@
- #![cfg(not(syn_disable_nightly_tests))]
- #![recursion_limit = "1024"]
- #![feature(rustc_private)]
- 
- //! The tests in this module do the following:
- //!
--//! 1. Parse a given expression in both `syn` and `libsyntax`.
-+//! 1. Parse a given expression in both `syn` and `librustc`.
- //! 2. Fold over the expression adding brackets around each subexpression (with
--//!    some complications - see the `syn_brackets` and `libsyntax_brackets`
-+//!    some complications - see the `syn_brackets` and `librustc_brackets`
- //!    methods).
- //! 3. Serialize the `syn` expression back into a string, and re-parse it with
--//!    `libsyntax`.
-+//!    `librustc`.
- //! 4. Respan all of the expressions, replacing the spans with the default
- //!    spans.
- //! 5. Compare the expressions with one another, if they are not equal fail.
- 
--extern crate quote;
--extern crate rayon;
--extern crate regex;
-+extern crate rustc_ast;
- extern crate rustc_data_structures;
--extern crate smallvec;
--extern crate syn;
--extern crate syntax;
--extern crate syntax_pos;
--extern crate walkdir;
--
--mod features;
-+extern crate rustc_span;
- 
- use quote::quote;
- use rayon::iter::{IntoParallelIterator, ParallelIterator};
- use regex::Regex;
--use smallvec::smallvec;
--use syntax::ast;
--use syntax::ptr::P;
--use syntax_pos::edition::Edition;
-+use rustc_ast::ast;
-+use rustc_ast::ptr::P;
-+use rustc_span::edition::Edition;
- use walkdir::{DirEntry, WalkDir};
- 
- use std::fs::File;
- use std::io::Read;
- use std::process;
- use std::sync::atomic::{AtomicUsize, Ordering};
- 
- use common::eq::SpanlessEq;
-@@ -68,17 +59,17 @@ fn test_simple_precedence() {
-     for input in EXPRS {
-         let expr = if let Some(expr) = parse::syn_expr(input) {
-             expr
-         } else {
-             failed += 1;
-             continue;
-         };
- 
--        let pf = match test_expressions(vec![expr]) {
-+        let pf = match test_expressions(Edition::Edition2018, vec![expr]) {
-             (1, 0) => "passed",
-             (0, 1) => {
-                 failed += 1;
-                 "failed"
-             }
-             _ => unreachable!(),
-         };
-         errorf!("=== {}: {}\n", input, pf);
-@@ -86,18 +77,18 @@ fn test_simple_precedence() {
- 
-     if failed > 0 {
-         panic!("Failed {} tests", failed);
-     }
- }
- 
- /// Test expressions from rustc, like in `test_round_trip`.
- #[test]
--#[cfg_attr(target_os = "windows", ignore = "requires nix .sh")]
- fn test_rustc_precedence() {
-+    common::rayon_init();
-     repo::clone_rust();
-     let abort_after = common::abort_after();
-     if abort_after == 0 {
-         panic!("Skipping all precedence tests");
-     }
- 
-     let passed = AtomicUsize::new(0);
-     let failed = AtomicUsize::new(0);
-@@ -113,34 +104,26 @@ fn test_rustc_precedence() {
-         .unwrap()
-         .into_par_iter()
-         .for_each(|entry| {
-             let path = entry.path();
-             if path.is_dir() {
-                 return;
-             }
- 
--            // Our version of `libsyntax` can't parse this tests
--            if path
--                .to_str()
--                .unwrap()
--                .ends_with("optional_comma_in_match_arm.rs")
--            {
--                return;
--            }
--
-             let mut file = File::open(path).unwrap();
-             let mut content = String::new();
-             file.read_to_string(&mut content).unwrap();
-             let content = edition_regex.replace_all(&content, "_$0");
- 
-             let (l_passed, l_failed) = match syn::parse_file(&content) {
-                 Ok(file) => {
-+                    let edition = repo::edition(path).parse().unwrap();
-                     let exprs = collect_exprs(file);
--                    test_expressions(exprs)
-+                    test_expressions(edition, exprs)
-                 }
-                 Err(msg) => {
-                     errorf!("syn failed to parse\n{:?}\n", msg);
-                     (0, 1)
-                 }
-             };
- 
-             errorf!(
-@@ -164,147 +147,182 @@ fn test_rustc_precedence() {
-     errorf!("\n===== Precedence Test Results =====\n");
-     errorf!("{} passed | {} failed\n", passed, failed);
- 
-     if failed > 0 {
-         panic!("{} failures", failed);
-     }
- }
- 
--fn test_expressions(exprs: Vec<syn::Expr>) -> (usize, usize) {
-+fn test_expressions(edition: Edition, exprs: Vec<syn::Expr>) -> (usize, usize) {
-     let mut passed = 0;
-     let mut failed = 0;
- 
--    syntax::with_globals(Edition::Edition2018, || {
-+    rustc_span::with_session_globals(edition, || {
-         for expr in exprs {
-             let raw = quote!(#expr).to_string();
- 
--            let libsyntax_ast = if let Some(e) = libsyntax_parse_and_rewrite(&raw) {
-+            let librustc_ast = if let Some(e) = librustc_parse_and_rewrite(&raw) {
-                 e
-             } else {
-                 failed += 1;
--                errorf!("\nFAIL - libsyntax failed to parse raw\n");
-+                errorf!("\nFAIL - librustc failed to parse raw\n");
-                 continue;
-             };
- 
-             let syn_expr = syn_brackets(expr);
--            let syn_ast = if let Some(e) = parse::libsyntax_expr(&quote!(#syn_expr).to_string()) {
-+            let syn_ast = if let Some(e) = parse::librustc_expr(&quote!(#syn_expr).to_string()) {
-                 e
-             } else {
-                 failed += 1;
--                errorf!("\nFAIL - libsyntax failed to parse bracketed\n");
-+                errorf!("\nFAIL - librustc failed to parse bracketed\n");
-                 continue;
-             };
- 
--            if SpanlessEq::eq(&syn_ast, &libsyntax_ast) {
-+            if SpanlessEq::eq(&syn_ast, &librustc_ast) {
-                 passed += 1;
-             } else {
-                 failed += 1;
--                errorf!("\nFAIL\n{:?}\n!=\n{:?}\n", syn_ast, libsyntax_ast);
-+                errorf!("\nFAIL\n{:?}\n!=\n{:?}\n", syn_ast, librustc_ast);
-             }
-         }
-     });
- 
-     (passed, failed)
- }
- 
--fn libsyntax_parse_and_rewrite(input: &str) -> Option<P<ast::Expr>> {
--    parse::libsyntax_expr(input).and_then(libsyntax_brackets)
-+fn librustc_parse_and_rewrite(input: &str) -> Option<P<ast::Expr>> {
-+    parse::librustc_expr(input).and_then(librustc_brackets)
- }
- 
- /// Wrap every expression which is not already wrapped in parens with parens, to
- /// reveal the precidence of the parsed expressions, and produce a stringified
- /// form of the resulting expression.
- ///
--/// This method operates on libsyntax objects.
--fn libsyntax_brackets(mut libsyntax_expr: P<ast::Expr>) -> Option<P<ast::Expr>> {
-+/// This method operates on librustc objects.
-+fn librustc_brackets(mut librustc_expr: P<ast::Expr>) -> Option<P<ast::Expr>> {
-+    use rustc_ast::ast::{
-+        Block, BorrowKind, Expr, ExprKind, Field, GenericArg, MacCall, Pat, Stmt, StmtKind, Ty,
-+    };
-+    use rustc_ast::mut_visit::{noop_visit_generic_arg, MutVisitor};
-+    use rustc_data_structures::map_in_place::MapInPlace;
-     use rustc_data_structures::thin_vec::ThinVec;
--    use smallvec::SmallVec;
-+    use rustc_span::DUMMY_SP;
-     use std::mem;
--    use syntax::ast::{Expr, ExprKind, Field, Mac, Pat, Stmt, StmtKind, Ty};
--    use syntax::mut_visit::{noop_visit_expr, MutVisitor};
--    use syntax_pos::DUMMY_SP;
- 
-     struct BracketsVisitor {
-         failed: bool,
-     };
- 
-+    fn flat_map_field<T: MutVisitor>(mut f: Field, vis: &mut T) -> Vec<Field> {
-+        if f.is_shorthand {
-+            noop_visit_expr(&mut f.expr, vis);
-+        } else {
-+            vis.visit_expr(&mut f.expr);
-+        }
-+        vec![f]
-+    }
-+
-+    fn flat_map_stmt<T: MutVisitor>(stmt: Stmt, vis: &mut T) -> Vec<Stmt> {
-+        let kind = match stmt.kind {
-+            // Don't wrap toplevel expressions in statements.
-+            StmtKind::Expr(mut e) => {
-+                noop_visit_expr(&mut e, vis);
-+                StmtKind::Expr(e)
-+            }
-+            StmtKind::Semi(mut e) => {
-+                noop_visit_expr(&mut e, vis);
-+                StmtKind::Semi(e)
-+            }
-+            s => s,
-+        };
-+
-+        vec![Stmt { kind, ..stmt }]
-+    }
-+
-+    fn noop_visit_expr<T: MutVisitor>(e: &mut Expr, vis: &mut T) {
-+        use rustc_ast::mut_visit::{noop_visit_expr, visit_opt, visit_thin_attrs};
-+        match &mut e.kind {
-+            ExprKind::AddrOf(BorrowKind::Raw, ..) => {}
-+            ExprKind::Struct(path, fields, expr) => {
-+                vis.visit_path(path);
-+                fields.flat_map_in_place(|field| flat_map_field(field, vis));
-+                visit_opt(expr, |expr| vis.visit_expr(expr));
-+                vis.visit_id(&mut e.id);
-+                vis.visit_span(&mut e.span);
-+                visit_thin_attrs(&mut e.attrs, vis);
-+            }
-+            _ => noop_visit_expr(e, vis),
-+        }
-+    }
-+
-     impl MutVisitor for BracketsVisitor {
-         fn visit_expr(&mut self, e: &mut P<Expr>) {
-             noop_visit_expr(e, self);
--            match e.node {
-+            match e.kind {
-                 ExprKind::If(..) | ExprKind::Block(..) | ExprKind::Let(..) => {}
-                 _ => {
-                     let inner = mem::replace(
-                         e,
-                         P(Expr {
-                             id: ast::DUMMY_NODE_ID,
--                            node: ExprKind::Err,
-+                            kind: ExprKind::Err,
-                             span: DUMMY_SP,
-                             attrs: ThinVec::new(),
-+                            tokens: None,
-                         }),
-                     );
--                    e.node = ExprKind::Paren(inner);
-+                    e.kind = ExprKind::Paren(inner);
-                 }
-             }
-         }
- 
--        fn flat_map_field(&mut self, mut f: Field) -> SmallVec<[Field; 1]> {
--            if f.is_shorthand {
--                noop_visit_expr(&mut f.expr, self);
--            } else {
--                self.visit_expr(&mut f.expr);
-+        fn visit_generic_arg(&mut self, arg: &mut GenericArg) {
-+            match arg {
-+                // Don't wrap const generic arg as that's invalid syntax.
-+                GenericArg::Const(arg) => noop_visit_expr(&mut arg.value, self),
-+                _ => noop_visit_generic_arg(arg, self),
-             }
--            SmallVec::from([f])
-+        }
-+
-+        fn visit_block(&mut self, block: &mut P<Block>) {
-+            self.visit_id(&mut block.id);
-+            block
-+                .stmts
-+                .flat_map_in_place(|stmt| flat_map_stmt(stmt, self));
-+            self.visit_span(&mut block.span);
-         }
- 
-         // We don't want to look at expressions that might appear in patterns or
-         // types yet. We'll look into comparing those in the future. For now
-         // focus on expressions appearing in other places.
-         fn visit_pat(&mut self, pat: &mut P<Pat>) {
-             let _ = pat;
-         }
- 
-         fn visit_ty(&mut self, ty: &mut P<Ty>) {
-             let _ = ty;
-         }
- 
--        fn flat_map_stmt(&mut self, stmt: Stmt) -> SmallVec<[Stmt; 1]> {
--            let node = match stmt.node {
--                // Don't wrap toplevel expressions in statements.
--                StmtKind::Expr(mut e) => {
--                    noop_visit_expr(&mut e, self);
--                    StmtKind::Expr(e)
--                }
--                StmtKind::Semi(mut e) => {
--                    noop_visit_expr(&mut e, self);
--                    StmtKind::Semi(e)
--                }
--                s => s,
--            };
--
--            smallvec![Stmt { node, ..stmt }]
--        }
--
--        fn visit_mac(&mut self, mac: &mut Mac) {
--            // By default when folding over macros, libsyntax panics. This is
-+        fn visit_mac(&mut self, mac: &mut MacCall) {
-+            // By default when folding over macros, librustc panics. This is
-             // because it's usually not what you want, you want to run after
-             // macro expansion. We do want to do that (syn doesn't do macro
-             // expansion), so we implement visit_mac to just return the macro
-             // unchanged.
-             let _ = mac;
-         }
-     }
- 
-     let mut folder = BracketsVisitor { failed: false };
--    folder.visit_expr(&mut libsyntax_expr);
-+    folder.visit_expr(&mut librustc_expr);
-     if folder.failed {
-         None
-     } else {
--        Some(libsyntax_expr)
-+        Some(librustc_expr)
-     }
- }
- 
- /// Wrap every expression which is not already wrapped in parens with parens, to
- /// reveal the precedence of the parsed expressions, and produce a stringified
- /// form of the resulting expression.
- fn syn_brackets(syn_expr: syn::Expr) -> syn::Expr {
-     use syn::fold::*;
-@@ -313,24 +331,43 @@ fn syn_brackets(syn_expr: syn::Expr) -> 
-     struct ParenthesizeEveryExpr;
-     impl Fold for ParenthesizeEveryExpr {
-         fn fold_expr(&mut self, expr: Expr) -> Expr {
-             match expr {
-                 Expr::Group(_) => unreachable!(),
-                 Expr::If(..) | Expr::Unsafe(..) | Expr::Block(..) | Expr::Let(..) => {
-                     fold_expr(self, expr)
-                 }
--                node => Expr::Paren(ExprParen {
-+                _ => Expr::Paren(ExprParen {
-                     attrs: Vec::new(),
--                    expr: Box::new(fold_expr(self, node)),
-+                    expr: Box::new(fold_expr(self, expr)),
-                     paren_token: token::Paren::default(),
-                 }),
-             }
-         }
- 
-+        fn fold_generic_argument(&mut self, arg: GenericArgument) -> GenericArgument {
-+            match arg {
-+                // Don't wrap const generic arg as that's invalid syntax.
-+                GenericArgument::Const(a) => GenericArgument::Const(fold_expr(self, a)),
-+                _ => fold_generic_argument(self, arg),
-+            }
-+        }
-+
-+        fn fold_generic_method_argument(
-+            &mut self,
-+            arg: GenericMethodArgument,
-+        ) -> GenericMethodArgument {
-+            match arg {
-+                // Don't wrap const generic arg as that's invalid syntax.
-+                GenericMethodArgument::Const(a) => GenericMethodArgument::Const(fold_expr(self, a)),
-+                _ => fold_generic_method_argument(self, arg),
-+            }
-+        }
-+
-         fn fold_stmt(&mut self, stmt: Stmt) -> Stmt {
-             match stmt {
-                 // Don't wrap toplevel expressions in statements.
-                 Stmt::Expr(e) => Stmt::Expr(fold_expr(self, e)),
-                 Stmt::Semi(e, semi) => Stmt::Semi(fold_expr(self, e), semi),
-                 s => s,
-             }
-         }
-@@ -355,17 +392,20 @@ fn syn_brackets(syn_expr: syn::Expr) -> 
- fn collect_exprs(file: syn::File) -> Vec<syn::Expr> {
-     use syn::fold::*;
-     use syn::punctuated::Punctuated;
-     use syn::*;
- 
-     struct CollectExprs(Vec<Expr>);
-     impl Fold for CollectExprs {
-         fn fold_expr(&mut self, expr: Expr) -> Expr {
--            self.0.push(expr);
-+            match expr {
-+                Expr::Verbatim(tokens) if tokens.is_empty() => {}
-+                _ => self.0.push(expr),
-+            }
- 
-             Expr::Tuple(ExprTuple {
-                 attrs: vec![],
-                 elems: Punctuated::new(),
-                 paren_token: token::Paren::default(),
-             })
-         }
-     }
-diff --git a/third_party/rust/syn/tests/test_receiver.rs b/third_party/rust/syn/tests/test_receiver.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/tests/test_receiver.rs
-@@ -0,0 +1,127 @@
-+use syn::{parse_quote, FnArg, Receiver, TraitItemMethod};
-+
-+#[test]
-+fn test_by_value() {
-+    let TraitItemMethod { sig, .. } = parse_quote! {
-+        fn by_value(self: Self);
-+    };
-+    match sig.receiver() {
-+        Some(FnArg::Typed(_)) => (),
-+        value => panic!("expected FnArg::Typed, got {:?}", value),
-+    }
-+}
-+
-+#[test]
-+fn test_by_mut_value() {
-+    let TraitItemMethod { sig, .. } = parse_quote! {
-+        fn by_mut(mut self: Self);
-+    };
-+    match sig.receiver() {
-+        Some(FnArg::Typed(_)) => (),
-+        value => panic!("expected FnArg::Typed, got {:?}", value),
-+    }
-+}
-+
-+#[test]
-+fn test_by_ref() {
-+    let TraitItemMethod { sig, .. } = parse_quote! {
-+        fn by_ref(self: &Self);
-+    };
-+    match sig.receiver() {
-+        Some(FnArg::Typed(_)) => (),
-+        value => panic!("expected FnArg::Typed, got {:?}", value),
-+    }
-+}
-+
-+#[test]
-+fn test_by_box() {
-+    let TraitItemMethod { sig, .. } = parse_quote! {
-+        fn by_box(self: Box<Self>);
-+    };
-+    match sig.receiver() {
-+        Some(FnArg::Typed(_)) => (),
-+        value => panic!("expected FnArg::Typed, got {:?}", value),
-+    }
-+}
-+
-+#[test]
-+fn test_by_pin() {
-+    let TraitItemMethod { sig, .. } = parse_quote! {
-+        fn by_pin(self: Pin<Self>);
-+    };
-+    match sig.receiver() {
-+        Some(FnArg::Typed(_)) => (),
-+        value => panic!("expected FnArg::Typed, got {:?}", value),
-+    }
-+}
-+
-+#[test]
-+fn test_explicit_type() {
-+    let TraitItemMethod { sig, .. } = parse_quote! {
-+        fn explicit_type(self: Pin<MyType>);
-+    };
-+    match sig.receiver() {
-+        Some(FnArg::Typed(_)) => (),
-+        value => panic!("expected FnArg::Typed, got {:?}", value),
-+    }
-+}
-+
-+#[test]
-+fn test_value_shorthand() {
-+    let TraitItemMethod { sig, .. } = parse_quote! {
-+        fn value_shorthand(self);
-+    };
-+    match sig.receiver() {
-+        Some(FnArg::Receiver(Receiver {
-+            reference: None,
-+            mutability: None,
-+            ..
-+        })) => (),
-+        value => panic!("expected FnArg::Receiver without ref/mut, got {:?}", value),
-+    }
-+}
-+
-+#[test]
-+fn test_mut_value_shorthand() {
-+    let TraitItemMethod { sig, .. } = parse_quote! {
-+        fn mut_value_shorthand(mut self);
-+    };
-+    match sig.receiver() {
-+        Some(FnArg::Receiver(Receiver {
-+            reference: None,
-+            mutability: Some(_),
-+            ..
-+        })) => (),
-+        value => panic!("expected FnArg::Receiver with mut, got {:?}", value),
-+    }
-+}
-+
-+#[test]
-+fn test_ref_shorthand() {
-+    let TraitItemMethod { sig, .. } = parse_quote! {
-+        fn ref_shorthand(&self);
-+    };
-+    match sig.receiver() {
-+        Some(FnArg::Receiver(Receiver {
-+            reference: Some(_),
-+            mutability: None,
-+            ..
-+        })) => (),
-+        value => panic!("expected FnArg::Receiver with ref, got {:?}", value),
-+    }
-+}
-+
-+#[test]
-+fn test_ref_mut_shorthand() {
-+    let TraitItemMethod { sig, .. } = parse_quote! {
-+        fn ref_mut_shorthand(&mut self);
-+    };
-+    match sig.receiver() {
-+        Some(FnArg::Receiver(Receiver {
-+            reference: Some(_),
-+            mutability: Some(_),
-+            ..
-+        })) => (),
-+        value => panic!("expected FnArg::Receiver with ref+mut, got {:?}", value),
-+    }
-+}
-diff --git a/third_party/rust/syn/tests/test_round_trip.rs b/third_party/rust/syn/tests/test_round_trip.rs
---- a/third_party/rust/syn/tests/test_round_trip.rs
-+++ b/third_party/rust/syn/tests/test_round_trip.rs
-@@ -1,28 +1,26 @@
- #![cfg(not(syn_disable_nightly_tests))]
- #![recursion_limit = "1024"]
- #![feature(rustc_private)]
- 
--extern crate quote;
--extern crate rayon;
--extern crate syn;
--extern crate syntax;
--extern crate syntax_pos;
--extern crate walkdir;
--
--mod features;
-+extern crate rustc_ast;
-+extern crate rustc_errors;
-+extern crate rustc_expand;
-+extern crate rustc_parse as parse;
-+extern crate rustc_session;
-+extern crate rustc_span;
- 
- use quote::quote;
- use rayon::iter::{IntoParallelIterator, ParallelIterator};
--use syntax::ast;
--use syntax::parse::{self, PResult, ParseSess};
--use syntax::source_map::FilePathMapping;
--use syntax_pos::edition::Edition;
--use syntax_pos::FileName;
-+use rustc_ast::ast;
-+use rustc_errors::PResult;
-+use rustc_session::parse::ParseSess;
-+use rustc_span::source_map::FilePathMapping;
-+use rustc_span::FileName;
- use walkdir::{DirEntry, WalkDir};
- 
- use std::fs::File;
- use std::io::Read;
- use std::panic;
- use std::process;
- use std::sync::atomic::{AtomicUsize, Ordering};
- use std::time::Instant;
-@@ -33,18 +31,18 @@ mod macros;
- #[allow(dead_code)]
- mod common;
- 
- mod repo;
- 
- use common::eq::SpanlessEq;
- 
- #[test]
--#[cfg_attr(target_os = "windows", ignore = "requires nix .sh")]
- fn test_round_trip() {
-+    common::rayon_init();
-     repo::clone_rust();
-     let abort_after = common::abort_after();
-     if abort_after == 0 {
-         panic!("Skipping all round_trip tests");
-     }
- 
-     let failed = AtomicUsize::new(0);
- 
-@@ -73,43 +71,44 @@ fn test_round_trip() {
-                     let prev_failed = failed.fetch_add(1, Ordering::SeqCst);
-                     if prev_failed + 1 >= abort_after {
-                         process::exit(1);
-                     }
-                     return;
-                 }
-             };
-             let back = quote!(#krate).to_string();
-+            let edition = repo::edition(path).parse().unwrap();
- 
-             let equal = panic::catch_unwind(|| {
--                syntax::with_globals(Edition::Edition2018, || {
-+                rustc_span::with_session_globals(edition, || {
-                     let sess = ParseSess::new(FilePathMapping::empty());
--                    let before = match libsyntax_parse(content, &sess) {
-+                    let before = match librustc_parse(content, &sess) {
-                         Ok(before) => before,
-                         Err(mut diagnostic) => {
-                             diagnostic.cancel();
-                             if diagnostic
-                                 .message()
-                                 .starts_with("file not found for module")
-                             {
-                                 errorf!("=== {}: ignore\n", path.display());
-                             } else {
-                                 errorf!(
--                                "=== {}: ignore - libsyntax failed to parse original content: {}\n",
-+                                "=== {}: ignore - librustc failed to parse original content: {}\n",
-                                 path.display(),
-                                 diagnostic.message()
-                             );
-                             }
-                             return true;
-                         }
-                     };
--                    let after = match libsyntax_parse(back, &sess) {
-+                    let after = match librustc_parse(back, &sess) {
-                         Ok(after) => after,
-                         Err(mut diagnostic) => {
--                            errorf!("=== {}: libsyntax failed to parse", path.display());
-+                            errorf!("=== {}: librustc failed to parse", path.display());
-                             diagnostic.emit();
-                             return false;
-                         }
-                     };
- 
-                     if SpanlessEq::eq(&before, &after) {
-                         errorf!(
-                             "=== {}: pass in {}ms\n",
-@@ -125,29 +124,29 @@ fn test_round_trip() {
-                             before,
-                             after,
-                         );
-                         false
-                     }
-                 })
-             });
-             match equal {
--                Err(_) => errorf!("=== {}: ignoring libsyntax panic\n", path.display()),
-+                Err(_) => errorf!("=== {}: ignoring librustc panic\n", path.display()),
-                 Ok(true) => {}
-                 Ok(false) => {
-                     let prev_failed = failed.fetch_add(1, Ordering::SeqCst);
-                     if prev_failed + 1 >= abort_after {
-                         process::exit(1);
-                     }
-                 }
-             }
-         });
- 
-     let failed = failed.load(Ordering::SeqCst);
-     if failed > 0 {
-         panic!("{} failures", failed);
-     }
- }
- 
--fn libsyntax_parse(content: String, sess: &ParseSess) -> PResult<ast::Crate> {
-+fn librustc_parse(content: String, sess: &ParseSess) -> PResult<ast::Crate> {
-     let name = FileName::Custom("test_round_trip".to_string());
-     parse::parse_crate_from_source_str(name, content, sess)
- }
-diff --git a/third_party/rust/syn/tests/test_shebang.rs b/third_party/rust/syn/tests/test_shebang.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/tests/test_shebang.rs
-@@ -0,0 +1,59 @@
-+#[macro_use]
-+mod macros;
-+
-+#[test]
-+fn test_basic() {
-+    let content = "#!/usr/bin/env rustx\nfn main() {}";
-+    let file = syn::parse_file(content).unwrap();
-+    snapshot!(file, @r###"
-+    File {
-+        shebang: Some("#!/usr/bin/env rustx"),
-+        items: [
-+            Item::Fn {
-+                vis: Inherited,
-+                sig: Signature {
-+                    ident: "main",
-+                    generics: Generics,
-+                    output: Default,
-+                },
-+                block: Block,
-+            },
-+        ],
-+    }
-+    "###);
-+}
-+
-+#[test]
-+fn test_comment() {
-+    let content = "#!//am/i/a/comment\n[allow(dead_code)] fn main() {}";
-+    let file = syn::parse_file(content).unwrap();
-+    snapshot!(file, @r###"
-+    File {
-+        attrs: [
-+            Attribute {
-+                style: Inner,
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "allow",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+                tokens: TokenStream(`(dead_code)`),
-+            },
-+        ],
-+        items: [
-+            Item::Fn {
-+                vis: Inherited,
-+                sig: Signature {
-+                    ident: "main",
-+                    generics: Generics,
-+                    output: Default,
-+                },
-+                block: Block,
-+            },
-+        ],
-+    }
-+    "###);
-+}
-diff --git a/third_party/rust/syn/tests/test_should_parse.rs b/third_party/rust/syn/tests/test_should_parse.rs
---- a/third_party/rust/syn/tests/test_should_parse.rs
-+++ b/third_party/rust/syn/tests/test_should_parse.rs
-@@ -1,12 +1,8 @@
--extern crate syn;
--
--mod features;
--
- macro_rules! should_parse {
-     ($name:ident, { $($in:tt)* }) => {
-         #[test]
-         fn $name() {
-             // Make sure we can parse the file!
-             syn::parse_file(stringify!($($in)*)).unwrap();
-         }
-     }
-diff --git a/third_party/rust/syn/tests/test_size.rs b/third_party/rust/syn/tests/test_size.rs
---- a/third_party/rust/syn/tests/test_size.rs
-+++ b/third_party/rust/syn/tests/test_size.rs
-@@ -1,12 +1,10 @@
- #![cfg(target_pointer_width = "64")]
- 
--mod features;
--
- use std::mem;
- use syn::*;
- 
- #[test]
- fn test_expr_size() {
-     assert_eq!(mem::size_of::<Expr>(), 280);
- }
- 
-diff --git a/third_party/rust/syn/tests/test_stmt.rs b/third_party/rust/syn/tests/test_stmt.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/tests/test_stmt.rs
-@@ -0,0 +1,44 @@
-+#[macro_use]
-+mod macros;
-+
-+use syn::Stmt;
-+
-+#[test]
-+fn test_raw_operator() {
-+    let stmt = syn::parse_str::<Stmt>("let _ = &raw const x;").unwrap();
-+
-+    snapshot!(stmt, @r###"
-+    Local(Local {
-+        pat: Pat::Wild,
-+        init: Some(Verbatim(`& raw const x`)),
-+    })
-+    "###);
-+}
-+
-+#[test]
-+fn test_raw_variable() {
-+    let stmt = syn::parse_str::<Stmt>("let _ = &raw;").unwrap();
-+
-+    snapshot!(stmt, @r###"
-+    Local(Local {
-+        pat: Pat::Wild,
-+        init: Some(Expr::Reference {
-+            expr: Expr::Path {
-+                path: Path {
-+                    segments: [
-+                        PathSegment {
-+                            ident: "raw",
-+                            arguments: None,
-+                        },
-+                    ],
-+                },
-+            },
-+        }),
-+    })
-+    "###);
-+}
-+
-+#[test]
-+fn test_raw_invalid() {
-+    assert!(syn::parse_str::<Stmt>("let _ = &raw x;").is_err());
-+}
-diff --git a/third_party/rust/syn/tests/test_token_trees.rs b/third_party/rust/syn/tests/test_token_trees.rs
---- a/third_party/rust/syn/tests/test_token_trees.rs
-+++ b/third_party/rust/syn/tests/test_token_trees.rs
-@@ -1,14 +1,8 @@
--extern crate proc_macro2;
--extern crate quote;
--extern crate syn;
--
--mod features;
--
- #[macro_use]
- mod macros;
- 
- use proc_macro2::TokenStream;
- use quote::quote;
- use syn::Lit;
- 
- #[test]
-@@ -16,17 +10,21 @@ fn test_struct() {
-     let input = "
-         #[derive(Debug, Clone)]
-         pub struct Item {
-             pub ident: Ident,
-             pub attrs: Vec<Attribute>,
-         }
-     ";
- 
--    snapshot!(input as TokenStream, @"`# [ derive ( Debug , Clone ) ] pub struct Item { pub ident : Ident , pub attrs : Vec < Attribute >, }`");
-+    snapshot!(input as TokenStream, @r###"
-+    TokenStream(
-+        `# [derive (Debug , Clone)] pub struct Item { pub ident : Ident , pub attrs : Vec < Attribute >, }`,
-+    )
-+    "###);
- }
- 
- #[test]
- fn test_literal_mangling() {
-     let code = "0_4";
-     let parsed: Lit = syn::parse_str(code).unwrap();
-     assert_eq!(code, quote!(#parsed).to_string());
- }
-diff --git a/third_party/rust/syn/tests/test_ty.rs b/third_party/rust/syn/tests/test_ty.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/tests/test_ty.rs
-@@ -0,0 +1,53 @@
-+#[macro_use]
-+mod macros;
-+
-+use proc_macro2::{Delimiter, Group, Ident, Punct, Spacing, Span, TokenStream, TokenTree};
-+use quote::quote;
-+use std::iter::FromIterator;
-+use syn::Type;
-+
-+#[test]
-+fn test_mut_self() {
-+    syn::parse_str::<Type>("fn(mut self)").unwrap();
-+    syn::parse_str::<Type>("fn(mut self: ())").unwrap();
-+    syn::parse_str::<Type>("fn(mut self: ...)").unwrap_err();
-+    syn::parse_str::<Type>("fn(mut self: mut self)").unwrap_err();
-+    syn::parse_str::<Type>("fn(mut self::T)").unwrap_err();
-+}
-+
-+#[test]
-+fn test_macro_variable_type() {
-+    // mimics the token stream corresponding to `$ty<T>`
-+    let tokens = TokenStream::from_iter(vec![
-+        TokenTree::Group(Group::new(Delimiter::None, quote! { ty })),
-+        TokenTree::Punct(Punct::new('<', Spacing::Alone)),
-+        TokenTree::Ident(Ident::new("T", Span::call_site())),
-+        TokenTree::Punct(Punct::new('>', Spacing::Alone)),
-+    ]);
-+
-+    snapshot!(tokens as Type, @r###"
-+    Type::Path {
-+        path: Path {
-+            segments: [
-+                PathSegment {
-+                    ident: "ty",
-+                    arguments: PathArguments::AngleBracketed {
-+                        args: [
-+                            Type(Type::Path {
-+                                path: Path {
-+                                    segments: [
-+                                        PathSegment {
-+                                            ident: "T",
-+                                            arguments: None,
-+                                        },
-+                                    ],
-+                                },
-+                            }),
-+                        ],
-+                    },
-+                },
-+            ],
-+        },
-+    }
-+    "###);
-+}
-diff --git a/third_party/rust/syn/tests/test_visibility.rs b/third_party/rust/syn/tests/test_visibility.rs
-new file mode 100644
---- /dev/null
-+++ b/third_party/rust/syn/tests/test_visibility.rs
-@@ -0,0 +1,145 @@
-+#[macro_use]
-+mod macros;
-+
-+use proc_macro2::{Delimiter, Group, Ident, Punct, Spacing, Span, TokenStream, TokenTree};
-+use std::iter::FromIterator;
-+use syn::parse::{Parse, ParseStream};
-+use syn::{DeriveInput, Result, Visibility};
-+
-+#[derive(Debug)]
-+struct VisRest {
-+    vis: Visibility,
-+    rest: TokenStream,
-+}
-+
-+impl Parse for VisRest {
-+    fn parse(input: ParseStream) -> Result<Self> {
-+        Ok(VisRest {
-+            vis: input.parse()?,
-+            rest: input.parse()?,
-+        })
-+    }
-+}
-+
-+macro_rules! assert_vis_parse {
-+    ($input:expr, Ok($p:pat)) => {
-+        assert_vis_parse!($input, Ok($p) + "");
-+    };
-+
-+    ($input:expr, Ok($p:pat) + $rest:expr) => {
-+        let expected = $rest.parse::<TokenStream>().unwrap();
-+        let parse: VisRest = syn::parse_str($input).unwrap();
-+
-+        match parse.vis {
-+            $p => {}
-+            _ => panic!("Expected {}, got {:?}", stringify!($p), parse.vis),
-+        }
-+
-+        // NOTE: Round-trips through `to_string` to avoid potential whitespace
-+        // diffs.
-+        assert_eq!(parse.rest.to_string(), expected.to_string());
-+    };
-+
-+    ($input:expr, Err) => {
-+        syn::parse2::<VisRest>($input.parse().unwrap()).unwrap_err();
-+    };
-+}
-+
-+#[test]
-+fn test_pub() {
-+    assert_vis_parse!("pub", Ok(Visibility::Public(_)));
-+}
-+
-+#[test]
-+fn test_crate() {
-+    assert_vis_parse!("crate", Ok(Visibility::Crate(_)));
-+}
-+
-+#[test]
-+fn test_inherited() {
-+    assert_vis_parse!("", Ok(Visibility::Inherited));
-+}
-+
-+#[test]
-+fn test_in() {
-+    assert_vis_parse!("pub(in foo::bar)", Ok(Visibility::Restricted(_)));
-+}
-+
-+#[test]
-+fn test_pub_crate() {
-+    assert_vis_parse!("pub(crate)", Ok(Visibility::Restricted(_)));
-+}
-+
-+#[test]
-+fn test_pub_self() {
-+    assert_vis_parse!("pub(self)", Ok(Visibility::Restricted(_)));
-+}
-+
-+#[test]
-+fn test_pub_super() {
-+    assert_vis_parse!("pub(super)", Ok(Visibility::Restricted(_)));
-+}
-+
-+#[test]
-+fn test_missing_in() {
-+    assert_vis_parse!("pub(foo::bar)", Ok(Visibility::Public(_)) + "(foo::bar)");
-+}
-+
-+#[test]
-+fn test_missing_in_path() {
-+    assert_vis_parse!("pub(in)", Err);
-+}
-+
-+#[test]
-+fn test_crate_path() {
-+    assert_vis_parse!("pub(crate::A, crate::B)", Ok(Visibility::Public(_)) + "(crate::A, crate::B)");
-+}
-+
-+#[test]
-+fn test_junk_after_in() {
-+    assert_vis_parse!("pub(in some::path @@garbage)", Err);
-+}
-+
-+#[test]
-+fn test_empty_group_vis() {
-+    // mimics `struct S { $vis $field: () }` where $vis is empty
-+    let tokens = TokenStream::from_iter(vec![
-+        TokenTree::Ident(Ident::new("struct", Span::call_site())),
-+        TokenTree::Ident(Ident::new("S", Span::call_site())),
-+        TokenTree::Group(Group::new(
-+            Delimiter::Brace,
-+            TokenStream::from_iter(vec![
-+                TokenTree::Group(Group::new(Delimiter::None, TokenStream::new())),
-+                TokenTree::Group(Group::new(
-+                    Delimiter::None,
-+                    TokenStream::from_iter(vec![TokenTree::Ident(Ident::new(
-+                        "f",
-+                        Span::call_site(),
-+                    ))]),
-+                )),
-+                TokenTree::Punct(Punct::new(':', Spacing::Alone)),
-+                TokenTree::Group(Group::new(Delimiter::Parenthesis, TokenStream::new())),
-+            ]),
-+        )),
-+    ]);
-+
-+    snapshot!(tokens as DeriveInput, @r###"
-+    DeriveInput {
-+        vis: Inherited,
-+        ident: "S",
-+        generics: Generics,
-+        data: Data::Struct {
-+            fields: Fields::Named {
-+                named: [
-+                    Field {
-+                        vis: Inherited,
-+                        ident: Some("f"),
-+                        colon_token: Some,
-+                        ty: Type::Tuple,
-+                    },
-+                ],
-+            },
-+        },
-+    }
-+    "###);
-+}
-diff --git a/third_party/rust/syn/tests/zzz_stable.rs b/third_party/rust/syn/tests/zzz_stable.rs
---- a/third_party/rust/syn/tests/zzz_stable.rs
-+++ b/third_party/rust/syn/tests/zzz_stable.rs
-@@ -1,21 +1,19 @@
- #![cfg(syn_disable_nightly_tests)]
- 
--extern crate termcolor;
--
- use std::io::{self, Write};
- use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
- 
- const MSG: &str = "\
- ‖
- ‖   WARNING:
- ‖   This is not a nightly compiler so not all tests were able to
- ‖   run. Syn includes tests that compare Syn's parser against the
--‖   compiler's parser, which requires access to unstable libsyntax
-+‖   compiler's parser, which requires access to unstable librustc
- ‖   data structures and a nightly compiler.
- ‖
- ";
- 
- #[test]
- fn notice() -> io::Result<()> {
-     let header = "WARNING";
-     let index_of_header = MSG.find(header).unwrap();
-
-
diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
deleted file mode 100644
index 562f383..0000000
--- a/icecat.rpmlintrc
+++ /dev/null
@@ -1,54 +0,0 @@
-# Whitelisting errors
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-# https://src.fedoraproject.org/rpms/python3/blob/master/f/python3.rpmlintrc
-# Edited by sagitter (sagitter@fedoraproject.org)
-
-# KNOWN BUGS:
-#
-
-# TESTS:
-##### SRPMs #####
-
-# ifarch applied patches are okay
-# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
-addFilter(r'(%ifarch-applied-patch) Patch*')
-# Different file size due to the signature of the source code tarbz archive
-addFilter(r'file-size-mismatch')
-
-addFilter(r'(invalid-url) Source0')
-addFilter(r'(invalid-url) Source4')
-addFilter(r'(invalid-url) Source5')
-addFilter(r'(invalid-url) Source17')
-
-addFilter(r'(strange-permission) icecat-lang_download.sh')
-addFilter(r'(strange-permission) node-stdout-nonblocking-wrapper')
-
-# ERRORS:
-##### RPMs  #####
-
-# chroot function (??)
-addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib64/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib64/icecat/libxul.so')
-addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib/icecat/libxul.so')
-
-# Expected on FF browser
-# https://support.mozilla.org/en-US/questions/1045418
-addFilter(r'(zero-length) /usr/lib(64)?/icecat/chrome.manifest')
-addFilter(r'(zero-length) /usr/lib(64)?/icecat/browser/chrome.manifest')
-
-addFilter(r'E:library-not-linked-against-libc /usr/lib64/icecat/gtk2/libmozgtk.so')
-addFilter(r'E:library-not-linked-against-libc /usr/lib64/icecat/libmozgtk.so')
-addFilter(r'E:library-not-linked-against-libc /usr/lib/icecat/gtk2/libmozgtk.so')
-addFilter(r'E:library-not-linked-against-libc /usr/lib/icecat/libmozgtk.so')
-
-# False positive
-addFilter(r'(dangling-symlink) /usr/lib(64)?/icecat/dictionaries /usr/share/myspell')
-addFilter(r'(unversioned-explicit-provides) webclient')
-
-# WARNINGS:
-##### RPMs  #####
-
-addFilter(r'(no-manual-page-for-binary) icecat-wayland')
-addFilter(r'(no-manual-page-for-binary) icecat-x11')
-
diff --git a/icecat.spec b/icecat.spec
index 20abc60..83a4539 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -125,8 +125,8 @@ ExcludeArch: ppc64le
 %global build_with_clang  0
 
 Name: icecat
-Version: 78.4.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.5.0
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -175,7 +175,6 @@ Patch1: %{name}-fix_addon_installation.patch
 Patch2: %{name}-libevent_linkflag.patch
 Patch3: mozilla-build-arm.patch
 Patch5: rhbz-1219542-s390-build.patch
-Patch6: %{name}-rust-1.47.patch
 
 # Unrecognized file?
 Patch7: %{name}-fix_jar.patch
@@ -401,7 +400,6 @@ tar -xf %{SOURCE5}
 %ifarch s390
 %patch5 -p1 -b .rhbz-1219542-s390
 %endif
-%patch6 -p1 -b .rust-1.47
 %patch7 -p0 -b .fix_jar
 %patch8 -p0 -b .fix_installer
 
@@ -896,6 +894,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Mon Nov 16 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.5.0-1.rh1
+- Mozilla Release 78.5.0ESR
+
 * Tue Oct 27 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.4.0-2.rh1
 - Patched for rhbz#1891234
 
diff --git a/sources b/sources
index aa061d1..c6fd185 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (cbindgen-vendor.tar.xz) = 97dce4affcd04d5adb14e5249dd752440ee7d090432503b557aa443439999ebaa3ad616e1ad2ae192233941b8d6349cfa06d219335f8df3cb840972e428ab199
-SHA512 (icecat-78.4.0-langpacks.tar.gz) = cd887bd2c45c78aed13ff43b2577280094c7700687b423a19db110105e6f8165e7238b8b98226fba0ed73d0eb9631f11f625fd8cef1f5547009cd30d2fc7f701
-SHA512 (icecat-78.4.0-rh1.tar.bz2) = 7e0a4ac7175f0f19c981fec3932c2d042c17b6f55b785d942ea6e8f2639dd7530727bbbb48432fc85d3131d9c7852ddf9290e6fada67e32e791f9d70949f9e28
+SHA512 (cbindgen-vendor.tar.xz) = 9503bb9c12610918481dd963a68e184053bf5fcf8def42594350686f46e4518727657b466bd88322d18c2b0fb33b92f7f4cf763928b571f4cdcddba83663dc7d
+SHA512 (icecat-78.5.0-langpacks.tar.gz) = 3d6a8d655150b23d4e357af59aa33f871b4a809f48309fdba433ff7822ea6f40091659766bdf1bff1fa5d7da6e1fad81ee612a76e593387a2820ad542dd5d73e
+SHA512 (icecat-78.5.0-rh1.tar.bz2) = 61edcbbc73267504f9a2c46303d0b84a1463ad6a5215b1170d27b4825edd6d42cb3147243bb6de56b8484f26b57ab7a1cb430fd4b83ca60a0a11cdbc961007f0
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From fddb9dd4fedc53978c131e6205d115079f5d0098 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Tue, 17 Nov 2020 15:54:29 +0100
Subject: [PATCH 172/473] Disable GTO/LTO flags

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 83a4539..2655704 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -540,7 +540,7 @@ echo "ac_add_options --disable-ion" >> .mozconfig
 
 %if 0%{?build_with_pgo}
 echo "ac_add_options MOZ_PGO=1" >> .mozconfig
-echo "ac_add_options --enable-lto" >> .mozconfig
+echo "ac_add_options --disable-lto" >> .mozconfig
 %else
 echo "ac_add_options --disable-lto" >> .mozconfig
 %endif

From 1cfb4b8ab65eaa7daa5e12b006606ec5d70eac7a Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Thu, 19 Nov 2020 18:36:14 +0100
Subject: [PATCH 173/473] Build Release 78.5.0-rh2| HTTPS Everywhere 2020.11.17

---
 .gitignore       |  1 +
 icecat.rpmlintrc | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
 icecat.spec      | 10 ++++++---
 sources          |  2 +-
 4 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 icecat.rpmlintrc

diff --git a/.gitignore b/.gitignore
index faf041a..9b6f284 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,3 +135,4 @@
 /icecat-78.4.0-rh1.tar.bz2
 /icecat-78.5.0-langpacks.tar.gz
 /icecat-78.5.0-rh1.tar.bz2
+/icecat-78.5.0-rh2.tar.bz2
diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
new file mode 100644
index 0000000..562f383
--- /dev/null
+++ b/icecat.rpmlintrc
@@ -0,0 +1,54 @@
+# Whitelisting errors
+# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
+# https://src.fedoraproject.org/rpms/python3/blob/master/f/python3.rpmlintrc
+# Edited by sagitter (sagitter@fedoraproject.org)
+
+# KNOWN BUGS:
+#
+
+# TESTS:
+##### SRPMs #####
+
+# ifarch applied patches are okay
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
+addFilter(r'(%ifarch-applied-patch) Patch*')
+# Different file size due to the signature of the source code tarbz archive
+addFilter(r'file-size-mismatch')
+
+addFilter(r'(invalid-url) Source0')
+addFilter(r'(invalid-url) Source4')
+addFilter(r'(invalid-url) Source5')
+addFilter(r'(invalid-url) Source17')
+
+addFilter(r'(strange-permission) icecat-lang_download.sh')
+addFilter(r'(strange-permission) node-stdout-nonblocking-wrapper')
+
+# ERRORS:
+##### RPMs  #####
+
+# chroot function (??)
+addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib64/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib64/icecat/libxul.so')
+addFilter(r'(missing-call-to-chdir-with-chroot) /usr/lib/icecat/libmozsandbox.so')
+addFilter(r'(missing-call-to-setgroups-before-setuid) /usr/lib/icecat/libxul.so')
+
+# Expected on FF browser
+# https://support.mozilla.org/en-US/questions/1045418
+addFilter(r'(zero-length) /usr/lib(64)?/icecat/chrome.manifest')
+addFilter(r'(zero-length) /usr/lib(64)?/icecat/browser/chrome.manifest')
+
+addFilter(r'E:library-not-linked-against-libc /usr/lib64/icecat/gtk2/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib64/icecat/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib/icecat/gtk2/libmozgtk.so')
+addFilter(r'E:library-not-linked-against-libc /usr/lib/icecat/libmozgtk.so')
+
+# False positive
+addFilter(r'(dangling-symlink) /usr/lib(64)?/icecat/dictionaries /usr/share/myspell')
+addFilter(r'(unversioned-explicit-provides) webclient')
+
+# WARNINGS:
+##### RPMs  #####
+
+addFilter(r'(no-manual-page-for-binary) icecat-wayland')
+addFilter(r'(no-manual-page-for-binary) icecat-x11')
+
diff --git a/icecat.spec b/icecat.spec
index 2655704..4c1b753 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -7,7 +7,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh1
+%global redhat_ver rh2
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -126,7 +126,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.5.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -540,7 +540,7 @@ echo "ac_add_options --disable-ion" >> .mozconfig
 
 %if 0%{?build_with_pgo}
 echo "ac_add_options MOZ_PGO=1" >> .mozconfig
-echo "ac_add_options --disable-lto" >> .mozconfig
+echo "ac_add_options --enable-lto" >> .mozconfig
 %else
 echo "ac_add_options --disable-lto" >> .mozconfig
 %endif
@@ -894,6 +894,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Thu Nov 19 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.5.0-2.rh2
+- Build Release 78.5.0-rh2
+- HTTPS Everywhere 2020.11.17
+
 * Mon Nov 16 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.5.0-1.rh1
 - Mozilla Release 78.5.0ESR
 
diff --git a/sources b/sources
index c6fd185..4a9f7b9 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9503bb9c12610918481dd963a68e184053bf5fcf8def42594350686f46e4518727657b466bd88322d18c2b0fb33b92f7f4cf763928b571f4cdcddba83663dc7d
 SHA512 (icecat-78.5.0-langpacks.tar.gz) = 3d6a8d655150b23d4e357af59aa33f871b4a809f48309fdba433ff7822ea6f40091659766bdf1bff1fa5d7da6e1fad81ee612a76e593387a2820ad542dd5d73e
-SHA512 (icecat-78.5.0-rh1.tar.bz2) = 61edcbbc73267504f9a2c46303d0b84a1463ad6a5215b1170d27b4825edd6d42cb3147243bb6de56b8484f26b57ab7a1cb430fd4b83ca60a0a11cdbc961007f0
+SHA512 (icecat-78.5.0-rh2.tar.bz2) = 6d2b6a2ebef67865d2c5de075bf2313e411b5ff397ff3dabfc3c37f194a1bf1b83b809382776b6f61f432a4bdf048c44174eaff4d443782844bd49e67a4d412e
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From efa8e5619445dbc0941876c175de496a68a4772b Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Sat, 21 Nov 2020 17:41:18 +0100
Subject: [PATCH 174/473] Modify description

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 4c1b753..71d7db6 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -358,7 +358,7 @@ Extensions included to this version of IceCat:
 
  * A set of companion extensions for LibreJS by Nathan Nichols
    are pre-installed, and provide workarounds to use some services at USPS,
-   RSF.org, SumOfUs.org, pay.gov, McDonald's, goteo.org and Google Docs
+   RSF.org, SumOfUs.org, pay.gov, McDonalds, goteo.org and Google Docs
    without using nonfree JavaScript.
 
  * A series of configuration changes and tweaks were applied to ensure that

From bb9fb2faf1507cc87b62e49fbabf4823baa3bf28 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Tue, 15 Dec 2020 22:34:01 +0100
Subject: [PATCH 175/473] Mozilla Release 78.6.0ESR

---
 .gitignore                   |  2 ++
 icecat-lang_download.sh      |  2 +-
 icecat-mozilla-1673202.patch | 34 ----------------------------------
 icecat.spec                  | 22 +++++++++++++---------
 sources                      |  4 ++--
 5 files changed, 18 insertions(+), 46 deletions(-)
 delete mode 100644 icecat-mozilla-1673202.patch

diff --git a/.gitignore b/.gitignore
index 9b6f284..4e15b9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,3 +136,5 @@
 /icecat-78.5.0-langpacks.tar.gz
 /icecat-78.5.0-rh1.tar.bz2
 /icecat-78.5.0-rh2.tar.bz2
+/icecat-78.6.0-langpacks.tar.gz
+/icecat-78.6.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index f2a2e48..5382f5e 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.5.0
+VERSION=78.6.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat-mozilla-1673202.patch b/icecat-mozilla-1673202.patch
deleted file mode 100644
index 5cf1013..0000000
--- a/icecat-mozilla-1673202.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# HG changeset patch
-# User Jed Davis <jld@mozilla.com>
-
-Bug 1673202 - Call fstat directly in Linux sandbox fstatat interception. r?gcp
-
-Sandbox policies handle the case of `fstatat(fd, "", AT_EMPTY_PATH|...)`
-by invoking the SIGSYS handler (because seccomp-bpf can't tell if the
-string will be empty when the syscall would use it), which makes the
-equivalent call to `fstat`.
-
-Unfortunately, recent development versions of glibc implement `fstat` by
-calling `fstatat`, which causes unbounded recursion and stack overflow.
-(This depends on the headers present at build time; see the bug for more
-details.)  This patch switches it to use the `fstat` (or `fstat64` on 32-bit) syscall directly.
-
-Differential Revision: https://phabricator.services.mozilla.com/D94798
-
-diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp
-index 9bdb10c49e085..a128cce7b266c 100644
---- a/security/sandbox/linux/SandboxFilter.cpp
-+++ b/security/sandbox/linux/SandboxFilter.cpp
-@@ -246,7 +246,11 @@
- 
-     if (fd != AT_FDCWD && (flags & AT_EMPTY_PATH) != 0 &&
-         strcmp(path, "") == 0) {
--      return ConvertError(fstatsyscall(fd, buf));
-+#ifdef __NR_fstat64
-+      return DoSyscall(__NR_fstat64, fd, buf);
-+#else
-+      return DoSyscall(__NR_fstat, fd, buf);
-+#endif
-     }
- 
-     if (fd != AT_FDCWD && path[0] != '/') {
diff --git a/icecat.spec b/icecat.spec
index 71d7db6..9f51325 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -7,7 +7,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh2
+%global redhat_ver rh1
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -102,7 +102,7 @@ ExcludeArch: ppc64le
 %if %{?system_nss}
 %global nspr_version 4.25.0
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.53.0
+%global nss_version 3.59.0
 %global nss_build_version %{nss_version}
 %endif
 
@@ -125,8 +125,8 @@ ExcludeArch: ppc64le
 %global build_with_clang  0
 
 Name: icecat
-Version: 78.5.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.6.0
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -208,9 +208,6 @@ Patch423: mozilla-1512162.patch
 
 Patch424: %{name}-mozilla-1669471.patch
 
-# rhbz#1891234
-Patch425: %{name}-mozilla-1673202.patch
-
 # PGO/LTO patches
 Patch600: %{name}-pgo.patch
 Patch602: mozilla-1516803.patch
@@ -239,6 +236,7 @@ BuildRequires: dconf
 BuildRequires: desktop-file-utils
 BuildRequires: dos2unix
 BuildRequires: gcc, gcc-c++
+BuildRequires: make
 BuildRequires: fedora-bookmarks
 BuildRequires: freetype-devel
 BuildRequires: gdk-pixbuf2
@@ -339,7 +337,7 @@ Requires: fedora-bookmarks
 Suggests: mozilla-ublock-origin
 
 Provides: webclient
-Provides: mozilla-https-everywhere = 20191107
+Provides: mozilla-https-everywhere = 20201117
 
 %description
 GNU IceCat is the GNU version of the Firefox ESR browser.
@@ -427,7 +425,6 @@ tar -xf %{SOURCE5}
 %patch403 -p1 -b .1640567
 %patch423 -p1 -b .mozilla-1596503
 %patch424 -p1 -b .mozilla-1669471
-%patch425 -p1 -b .mozilla-1673202
 
 # Wayland specific upstream patches
 %patch565 -p1 -b .firefox-pipewire
@@ -553,6 +550,7 @@ chmod a-x third_party/rust/gfx-backend-vulkan/src/*.rs
 chmod a-x third_party/rust/gfx-hal/src/*.rs
 chmod a-x third_party/rust/ash/src/extensions/ext/*.rs
 chmod a-x third_party/rust/ash/src/extensions/khr/*.rs
+chmod a-x third_party/rust/ash/src/extensions/nv/*.rs
 
 # Remove unrecognized files
 find extensions/gnu -name cose.manifest -delete
@@ -682,6 +680,9 @@ MOZ_SMP_FLAGS=-j1
 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
 [ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
 [ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
+[ "$RPM_BUILD_NCPUS" -ge 16 ] && MOZ_SMP_FLAGS=-j16
+[ "$RPM_BUILD_NCPUS" -ge 24 ] && MOZ_SMP_FLAGS=-j24
+[ "$RPM_BUILD_NCPUS" -ge 32 ] && MOZ_SMP_FLAGS=-j32
 %endif
 %endif
 
@@ -894,6 +895,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Tue Dec 15 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-1.rh1
+- Mozilla Release 78.6.0ESR
+
 * Thu Nov 19 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.5.0-2.rh2
 - Build Release 78.5.0-rh2
 - HTTPS Everywhere 2020.11.17
diff --git a/sources b/sources
index 4a9f7b9..53ed1da 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9503bb9c12610918481dd963a68e184053bf5fcf8def42594350686f46e4518727657b466bd88322d18c2b0fb33b92f7f4cf763928b571f4cdcddba83663dc7d
-SHA512 (icecat-78.5.0-langpacks.tar.gz) = 3d6a8d655150b23d4e357af59aa33f871b4a809f48309fdba433ff7822ea6f40091659766bdf1bff1fa5d7da6e1fad81ee612a76e593387a2820ad542dd5d73e
-SHA512 (icecat-78.5.0-rh2.tar.bz2) = 6d2b6a2ebef67865d2c5de075bf2313e411b5ff397ff3dabfc3c37f194a1bf1b83b809382776b6f61f432a4bdf048c44174eaff4d443782844bd49e67a4d412e
+SHA512 (icecat-78.6.0-langpacks.tar.gz) = c70a53c20ce738be638b62420883d2026ff8cf5ac4c8329d42ce3cca9330fc179a68d22e4db6ab0f71201228701cc3755ffcc8daf1e20f3035f53b038ef64361
+SHA512 (icecat-78.6.0-rh1.tar.bz2) = ca0264321f936a1a828400a7de1554da4889a70dac7aea85d54796584a7f452198981dda489af864beefab73ce579f0222480fdb34494e22bb2f1f70872fa635
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From d87544d5134b6ee810e55e67502413b7725a967c Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Wed, 16 Dec 2020 11:54:35 +0100
Subject: [PATCH 176/473] Mozilla Release 78.6.0ESR| Disable system nss
 (rhbz#1908018

---
 icecat.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 9f51325..6708b57 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -97,7 +97,8 @@ ExcludeArch: ppc64le
 %endif
 
 # Use system nspr/nss?
-%global system_nss    1
+# rhbz#1908018
+%global system_nss    0
 
 %if %{?system_nss}
 %global nspr_version 4.25.0
@@ -897,6 +898,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %changelog
 * Tue Dec 15 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-1.rh1
 - Mozilla Release 78.6.0ESR
+- Disable system nss (rhbz#1908018)
 
 * Thu Nov 19 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.5.0-2.rh2
 - Build Release 78.5.0-rh2

From dc4620fcee072d39d608d36ee8c722cea6bab460 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Wed, 16 Dec 2020 12:42:32 +0100
Subject: [PATCH 177/473] Mozilla Release 78.6.0ESR| Disable system nss
 (rhbz#1908018) /2

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 6708b57..110f39a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -408,7 +408,7 @@ tar -xf %{SOURCE5}
 
 # Fedora patches
 %patch219 -p1 -b .rhbz-1173156
-%patch220 -p1 -b .nss-version
+#%%patch220 -p1 -b .nss-version
 
 # ARM run-time patch
 %ifarch aarch64

From eb28d6f69b8659ad2bd49a0da4f5cebbf9c3dcb0 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Wed, 16 Dec 2020 15:16:40 +0100
Subject: [PATCH 178/473] Mozilla Release 78.6.0ESR| Fix NSPR flags

---
 icecat-mozconfig-common | 3 ---
 icecat.spec             | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/icecat-mozconfig-common b/icecat-mozconfig-common
index 9a8f1ff..bc960b7 100644
--- a/icecat-mozconfig-common
+++ b/icecat-mozconfig-common
@@ -13,6 +13,3 @@ ac_add_options --enable-necko-wifi
 ac_add_options --disable-updater
 ac_add_options --enable-chrome-format=omni
 ac_add_options --enable-release
-# Workaround for mozbz#1341234
-ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
-ac_add_options --allow-addon-sideload
diff --git a/icecat.spec b/icecat.spec
index 110f39a..93476d0 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -477,10 +477,13 @@ echo "ac_add_options --disable-jemalloc" >> .mozconfig
 %if %{?system_nss}
 echo "ac_add_options --with-system-nspr" >> .mozconfig
 echo "ac_add_options --with-system-nss" >> .mozconfig
+echo "ac_add_options BINDGEN_CFLAGS="%(pkg-config nspr pixman-1 --cflags)"" >> .mozconfig
 %else
-echo "ac_add_options --without-system-nspr" >> .mozconfig
+echo "ac_add_options --enable-nspr-build" >> .mozconfig
 echo "ac_add_options --without-system-nss" >> .mozconfig
 %endif
+# Workaround for mozbz#1341234
+echo "ac_add_options --allow-addon-sideload" >> .mozconfig
 
 %if 0%{?system_libicu}
 echo "ac_add_options --with-system-icu" >> .mozconfig

From ab19fa9c771acaa0afd30128cc9a953c717f7d57 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Wed, 16 Dec 2020 15:29:47 +0100
Subject: [PATCH 179/473] Mozilla Release 78.6.0ESR| Restore --with-system-nspr
 option

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 93476d0..d56224f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -479,7 +479,7 @@ echo "ac_add_options --with-system-nspr" >> .mozconfig
 echo "ac_add_options --with-system-nss" >> .mozconfig
 echo "ac_add_options BINDGEN_CFLAGS="%(pkg-config nspr pixman-1 --cflags)"" >> .mozconfig
 %else
-echo "ac_add_options --enable-nspr-build" >> .mozconfig
+echo "ac_add_options --without-system-nspr" >> .mozconfig
 echo "ac_add_options --without-system-nss" >> .mozconfig
 %endif
 # Workaround for mozbz#1341234

From 46f9470fbb75e7376d41d2ee7ecf7008cbb29931 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Wed, 16 Dec 2020 17:30:46 +0100
Subject: [PATCH 180/473] Mozilla Release 78.6.0ESR| Downgrade build jobs

---
 icecat.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index d56224f..1067e9e 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -684,9 +684,6 @@ MOZ_SMP_FLAGS=-j1
 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
 [ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
 [ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
-[ "$RPM_BUILD_NCPUS" -ge 16 ] && MOZ_SMP_FLAGS=-j16
-[ "$RPM_BUILD_NCPUS" -ge 24 ] && MOZ_SMP_FLAGS=-j24
-[ "$RPM_BUILD_NCPUS" -ge 32 ] && MOZ_SMP_FLAGS=-j32
 %endif
 %endif
 

From eb0982b7f35cf671288a8c027ee72f29f818d31e Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Wed, 16 Dec 2020 18:59:32 +0100
Subject: [PATCH 181/473] Mozilla Release 78.6.0ESR| Disable PGO build when use
 bundled NSPR

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 1067e9e..3181c40 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -36,7 +36,7 @@
 # on other arches.
 %ifarch x86_64
 %if 0%{?release_build}
-%global build_with_pgo 1
+%global build_with_pgo 0
 %global pgo_wayland    0
 %else
 %global build_with_pgo 0

From 17a41178bbdb9436e98e1faf4fd47fe2e7f34d4d Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Fri, 18 Dec 2020 14:04:47 +0100
Subject: [PATCH 182/473] Filter bundled NSS libraries (rhbz#1908792)

---
 icecat.spec | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 3181c40..b1f9036 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -105,6 +105,14 @@ ExcludeArch: ppc64le
 %global nspr_build_version %{nspr_version}
 %global nss_version 3.59.0
 %global nss_build_version %{nss_version}
+%else
+%global _privatelibs libnss*[.]so.*
+%global _privatelibs %{_privatelibs}|libssl*[.]so.*
+%global _privatelibs %{_privatelibs}|libsoftokn*[.]so.*
+%global _privatelibs %{_privatelibs}|libsmime*[.]so.*
+%global _privatelibs %{_privatelibs}|libfreeblpriv*[.]so.*
+%global __provides_exclude ^(%{_privatelibs})$
+%global __requires_exclude ^(%{_privatelibs})$
 %endif
 
 # Audio backends
@@ -127,7 +135,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.6.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -896,6 +904,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Fri Dec 18 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-2.rh1
+- Filter bundled NSS libraries (rhbz#1908792)
+
 * Tue Dec 15 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-1.rh1
 - Mozilla Release 78.6.0ESR
 - Disable system nss (rhbz#1908018)

From f276fe6691df802318de0606f3e622eb0469b73e Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Fri, 18 Dec 2020 15:39:53 +0100
Subject: [PATCH 183/473] Filter bundled NSS libraries (rhbz#1908792) |Change
 filtering method

---
 icecat.spec | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index b1f9036..658db64 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -106,13 +106,11 @@ ExcludeArch: ppc64le
 %global nss_version 3.59.0
 %global nss_build_version %{nss_version}
 %else
-%global _privatelibs libnss*[.]so.*
-%global _privatelibs %{_privatelibs}|libssl*[.]so.*
-%global _privatelibs %{_privatelibs}|libsoftokn*[.]so.*
-%global _privatelibs %{_privatelibs}|libsmime*[.]so.*
-%global _privatelibs %{_privatelibs}|libfreeblpriv*[.]so.*
-%global __provides_exclude ^(%{_privatelibs})$
-%global __requires_exclude ^(%{_privatelibs})$
+%global __provides_exclude_from ^%{_libdir}/icecat/libnss*\\.so$
+%global __provides_exclude_from ^%{_libdir}/icecat/libssl*\\.so$
+%global __provides_exclude_from ^%{_libdir}/icecat/libsoftokn*\\.so$
+%global __provides_exclude_from ^%{_libdir}/icecat/libsmime*\\.so$
+%global __provides_exclude_from ^%{_libdir}/icecat/libfreeblpriv*\\.so$
 %endif
 
 # Audio backends

From 6d55c417b9d0f0801843bd905fdf33320ea5d3df Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Fri, 18 Dec 2020 15:42:10 +0100
Subject: [PATCH 184/473] Filter bundled NSS libraries (rhbz#1908792) |Use even
 requires filtering

---
 icecat.spec | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 658db64..8d4902a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -111,6 +111,11 @@ ExcludeArch: ppc64le
 %global __provides_exclude_from ^%{_libdir}/icecat/libsoftokn*\\.so$
 %global __provides_exclude_from ^%{_libdir}/icecat/libsmime*\\.so$
 %global __provides_exclude_from ^%{_libdir}/icecat/libfreeblpriv*\\.so$
+%global __requires_exclude_from ^%{_libdir}/icecat/libnss*\\.so$
+%global __requires_exclude_from ^%{_libdir}/icecat/libssl*\\.so$
+%global __requires_exclude_from ^%{_libdir}/icecat/libsoftokn*\\.so$
+%global __requires_exclude_from ^%{_libdir}/icecat/libsmime*\\.so$
+%global __requires_exclude_from ^%{_libdir}/icecat/libfreeblpriv*\\.so$
 %endif
 
 # Audio backends

From 251b3660bb01f5ee5b6a3218f72c53da28630ed4 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Fri, 18 Dec 2020 17:39:47 +0100
Subject: [PATCH 185/473] Filter bundled NSS libraries (rhbz#1908792) /2

---
 icecat.spec | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 8d4902a..ae80d01 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -106,16 +106,16 @@ ExcludeArch: ppc64le
 %global nss_version 3.59.0
 %global nss_build_version %{nss_version}
 %else
-%global __provides_exclude_from ^%{_libdir}/icecat/libnss*\\.so$
-%global __provides_exclude_from ^%{_libdir}/icecat/libssl*\\.so$
-%global __provides_exclude_from ^%{_libdir}/icecat/libsoftokn*\\.so$
-%global __provides_exclude_from ^%{_libdir}/icecat/libsmime*\\.so$
-%global __provides_exclude_from ^%{_libdir}/icecat/libfreeblpriv*\\.so$
-%global __requires_exclude_from ^%{_libdir}/icecat/libnss*\\.so$
-%global __requires_exclude_from ^%{_libdir}/icecat/libssl*\\.so$
-%global __requires_exclude_from ^%{_libdir}/icecat/libsoftokn*\\.so$
-%global __requires_exclude_from ^%{_libdir}/icecat/libsmime*\\.so$
-%global __requires_exclude_from ^%{_libdir}/icecat/libfreeblpriv*\\.so$
+%global _privatelibs libfreeblpriv3
+%global _privatelibs %{privatelibs}|libnss3
+%global _privatelibs %{privatelibs}|libnssckbi
+%global _privatelibs %{privatelibs}|libnssutil3
+%global _privatelibs %{privatelibs}|libsmime3
+%global _privatelibs %{privatelibs}|libsoftokn3
+%global _privatelibs %{privatelibs}|libssl3
+%global _privatelibs %{privatelibs}|libav_stream
+%global __provides_exclude ^(%{_privatelibs})\\.so
+%global __requires_exclude ^(%{_privatelibs})\\.so
 %endif
 
 # Audio backends

From a6aae13bc5af882087bd583fa70e6ed6e2e9be45 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Fri, 18 Dec 2020 19:08:43 +0100
Subject: [PATCH 186/473] Filter bundled NSS libraries (rhbz#1908792) /3

---
 icecat.spec | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index ae80d01..07c5270 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -100,22 +100,21 @@ ExcludeArch: ppc64le
 # rhbz#1908018
 %global system_nss    0
 
+%global _privatelibs libfreeblpriv3
+%global _privatelibs %{_privatelibs}|libnss3
+%global _privatelibs %{_privatelibs}|libnssckbi
+%global _privatelibs %{_privatelibs}|libnssutil3
+%global _privatelibs %{_privatelibs}|libsmime3
+%global _privatelibs %{_privatelibs}|libsoftokn3
+%global _privatelibs %{_privatelibs}|libssl3
+%global __provides_exclude ^(%{_privatelibs})\\.so
+%global __requires_exclude ^(%{_privatelibs})\\.so
+
 %if %{?system_nss}
 %global nspr_version 4.25.0
 %global nspr_build_version %{nspr_version}
 %global nss_version 3.59.0
 %global nss_build_version %{nss_version}
-%else
-%global _privatelibs libfreeblpriv3
-%global _privatelibs %{privatelibs}|libnss3
-%global _privatelibs %{privatelibs}|libnssckbi
-%global _privatelibs %{privatelibs}|libnssutil3
-%global _privatelibs %{privatelibs}|libsmime3
-%global _privatelibs %{privatelibs}|libsoftokn3
-%global _privatelibs %{privatelibs}|libssl3
-%global _privatelibs %{privatelibs}|libav_stream
-%global __provides_exclude ^(%{_privatelibs})\\.so
-%global __requires_exclude ^(%{_privatelibs})\\.so
 %endif
 
 # Audio backends

From 4cbb214d6e94ea5fe6e5fc0c862d6ec196c965cf Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Sat, 19 Dec 2020 12:41:42 +0100
Subject: [PATCH 187/473] Re-enable system NSS

---
 icecat.spec | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 07c5270..1e1907e 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -36,7 +36,7 @@
 # on other arches.
 %ifarch x86_64
 %if 0%{?release_build}
-%global build_with_pgo 0
+%global build_with_pgo 1
 %global pgo_wayland    0
 %else
 %global build_with_pgo 0
@@ -98,17 +98,7 @@ ExcludeArch: ppc64le
 
 # Use system nspr/nss?
 # rhbz#1908018
-%global system_nss    0
-
-%global _privatelibs libfreeblpriv3
-%global _privatelibs %{_privatelibs}|libnss3
-%global _privatelibs %{_privatelibs}|libnssckbi
-%global _privatelibs %{_privatelibs}|libnssutil3
-%global _privatelibs %{_privatelibs}|libsmime3
-%global _privatelibs %{_privatelibs}|libsoftokn3
-%global _privatelibs %{_privatelibs}|libssl3
-%global __provides_exclude ^(%{_privatelibs})\\.so
-%global __requires_exclude ^(%{_privatelibs})\\.so
+%global system_nss  1
 
 %if %{?system_nss}
 %global nspr_version 4.25.0

From 58e4ba059671c409e000a0e5aa60f82a3233df96 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Sat, 19 Dec 2020 15:48:53 +0100
Subject: [PATCH 188/473] Re-enable system NSS| Fix NSPR bindgen flags

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 1e1907e..f875569 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -477,7 +477,7 @@ echo "ac_add_options --disable-jemalloc" >> .mozconfig
 %if %{?system_nss}
 echo "ac_add_options --with-system-nspr" >> .mozconfig
 echo "ac_add_options --with-system-nss" >> .mozconfig
-echo "ac_add_options BINDGEN_CFLAGS="%(pkg-config nspr pixman-1 --cflags)"" >> .mozconfig
+echo 'ac_add_options BINDGEN_CFLAGS="%(pkg-config nspr pixman-1 --cflags)"' >> .mozconfig
 %else
 echo "ac_add_options --without-system-nspr" >> .mozconfig
 echo "ac_add_options --without-system-nss" >> .mozconfig

From 913f7f42da977427713434421ce8e2304f19ea2d Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Sat, 19 Dec 2020 16:32:17 +0100
Subject: [PATCH 189/473] Fix Changelog

---
 icecat.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index f875569..ab625b9 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -896,8 +896,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
-* Fri Dec 18 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-2.rh1
-- Filter bundled NSS libraries (rhbz#1908792)
+* Sat Dec 19 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-2.rh1
+- Re-enable system NSS (rhbz#1908792)
 
 * Tue Dec 15 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-1.rh1
 - Mozilla Release 78.6.0ESR

From 7dee618fbf8f1a4e70e6bbe9665bb7eeac4a4c04 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Sat, 19 Dec 2020 17:49:12 +0100
Subject: [PATCH 190/473] Disable PGO builds (x86_64)

---
 icecat.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index ab625b9..3921450 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -36,7 +36,7 @@
 # on other arches.
 %ifarch x86_64
 %if 0%{?release_build}
-%global build_with_pgo 1
+%global build_with_pgo 0
 %global pgo_wayland    0
 %else
 %global build_with_pgo 0
@@ -898,6 +898,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %changelog
 * Sat Dec 19 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-2.rh1
 - Re-enable system NSS (rhbz#1908792)
+- Disable PGO builds (x86_64)
 
 * Tue Dec 15 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-1.rh1
 - Mozilla Release 78.6.0ESR

From 69d8fd7c19e01c5818a54e440056c311ee6533c6 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Sun, 20 Dec 2020 17:27:01 +0100
Subject: [PATCH 191/473] Try to disable ARM_NEON

---
 icecat.spec | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 3921450..5c52b82 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -127,7 +127,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.6.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -175,6 +175,7 @@ Source18: node-stdout-nonblocking-wrapper
 Patch1: %{name}-fix_addon_installation.patch
 Patch2: %{name}-libevent_linkflag.patch
 Patch3: mozilla-build-arm.patch
+Patch4: %{name}-build-arm-libaom.patch
 Patch5: rhbz-1219542-s390-build.patch
 
 # Unrecognized file?
@@ -395,7 +396,8 @@ tar -xf %{SOURCE5}
 
 %patch1 -p1 -b .fix_addon_installation
 %patch2 -p0 -b .libevent_linkflag
-%patch3 -p1 -b .arm
+%patch3 -p1 -b .build-arm-libaom
+%patch4 -p1 -b .arm
 %ifarch s390
 %patch5 -p1 -b .rhbz-1219542-s390
 %endif
@@ -547,6 +549,8 @@ echo "ac_add_options --disable-lto" >> .mozconfig
 %endif
 
 echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig
+echo "export BUILD_ARM_NEON=0" >> .mozconfig
+echo 'export NEON_FLAGS="%optflags"' >> .mozconfig
 
 # Remove executable bit to make brp-mangle-shebangs happy.
 chmod -x third_party/rust/itertools/src/lib.rs
@@ -593,7 +597,7 @@ mkdir %{_buildrootdir}/bin || :
 cp %{SOURCE18} %{_buildrootdir}/bin || :
 
 # Update the various config.guess to upstream release for aarch64 support
-find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
+find ./ -path ./third_party/rust -prune -o -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
 
 MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
 %if %{?less_optbuild}
@@ -896,6 +900,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Sun Dec 20 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-3.rh1
+- Add build-arm-libaom patch
+
 * Sat Dec 19 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-2.rh1
 - Re-enable system NSS (rhbz#1908792)
 - Disable PGO builds (x86_64)

From 31d5d24ff53c0f8d750d886fca2c86598c41bf8a Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Sun, 20 Dec 2020 17:33:57 +0100
Subject: [PATCH 192/473] Add new patch

---
 icecat-build-arm-libaom.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 icecat-build-arm-libaom.patch

diff --git a/icecat-build-arm-libaom.patch b/icecat-build-arm-libaom.patch
new file mode 100644
index 0000000..985f01d
--- /dev/null
+++ b/icecat-build-arm-libaom.patch
@@ -0,0 +1,12 @@
+diff -up firefox-73.0/media/libaom/moz.build.old firefox-73.0/media/libaom/moz.build
+--- firefox-73.0/media/libaom/moz.build.old	2020-02-07 23:13:28.000000000 +0200
++++ firefox-73.0/media/libaom/moz.build	2020-02-17 10:30:08.509805092 +0200
+@@ -55,7 +55,7 @@ elif CONFIG['CPU_ARCH'] == 'arm':
+ 
+     for f in SOURCES:
+         if f.endswith('neon.c'):
+-            SOURCES[f].flags += CONFIG['VPX_ASFLAGS']
++            SOURCES[f].flags += CONFIG['NEON_FLAGS']
+ 
+     if CONFIG['OS_TARGET'] == 'Android':
+         # For cpu-features.h

From b82e457b57a6fa18b9643eaa32f36c994856ec97 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Sun, 20 Dec 2020 19:12:43 +0100
Subject: [PATCH 193/473] Set NEON_FLAGS

---
 icecat.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 5c52b82..c45a211 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -506,6 +506,7 @@ echo "ac_add_options --with-system-jpeg" >> .mozconfig
 %ifarch %{arm}
 echo "ac_add_options --disable-elf-hack" >> .mozconfig
 echo "ac_add_options --disable-av1" >> .mozconfig
+echo 'export NEON_FLAGS=-mfpu=vfpv3-d16' >> .mozconfig
 %endif
 %ifnarch %{arm}
 echo "ac_add_options --enable-av1" >> .mozconfig
@@ -549,8 +550,6 @@ echo "ac_add_options --disable-lto" >> .mozconfig
 %endif
 
 echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig
-echo "export BUILD_ARM_NEON=0" >> .mozconfig
-echo 'export NEON_FLAGS="%optflags"' >> .mozconfig
 
 # Remove executable bit to make brp-mangle-shebangs happy.
 chmod -x third_party/rust/itertools/src/lib.rs

From ceeaa5f464521eb101b0a0be3e61cedb78f94e2e Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Sun, 20 Dec 2020 22:26:17 +0100
Subject: [PATCH 194/473] Exclude ARM architectures

---
 icecat.spec | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index c45a211..63ce592 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -58,6 +58,11 @@ ExcludeArch: s390x
 ExcludeArch: ppc64le
 %endif
 
+# See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/CWF4DOHDHS2WNRB6T4TM37HEDAKZL2J3/
+%if 0%{?fedora} > 33
+ExcludeArch: %{arm}
+%endif
+
 # Active/Deactive language files handling
 %global build_langpacks 1
 
@@ -901,6 +906,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %changelog
 * Sun Dec 20 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-3.rh1
 - Add build-arm-libaom patch
+- Exclude ARM architectures
 
 * Sat Dec 19 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-2.rh1
 - Re-enable system NSS (rhbz#1908792)

From c3c341e2fbf853b9e1e88f446e6d5e5bf6fc3c16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Sun, 20 Dec 2020 17:12:55 +0100
Subject: [PATCH 195/473] Filter out private libraries provides

---
 icecat.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 63ce592..823afdb 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -130,9 +130,12 @@ ExcludeArch: %{arm}
 # Use clang?
 %global build_with_clang  0
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1908792
+%global __provides_exclude_from ^%{icecatappdir}
+
 Name: icecat
 Version: 78.6.0
-Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 4%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -904,6 +907,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Sun Dec 20 2020 Miro Hrončok <mhroncok@redhat.com> - 78.6.0-4.rh1
+- Filter out private libraries provides
+- Fixes: rhbz#1908792
+
 * Sun Dec 20 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-3.rh1
 - Add build-arm-libaom patch
 - Exclude ARM architectures

From 72d10fce0559e3c5fa8789d394d4b50e36cfad2d Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Tue, 22 Dec 2020 15:55:02 +0100
Subject: [PATCH 196/473] Add __requires_exclude_from

---
 icecat.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 823afdb..d1a3a62 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -132,10 +132,11 @@ ExcludeArch: %{arm}
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1908792
 %global __provides_exclude_from ^%{icecatappdir}
+%global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
 Version: 78.6.0
-Release: 4%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 5%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -907,6 +908,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Tue Dec 22 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-5.rh1
+- Add __requires_exclude_from
+
 * Sun Dec 20 2020 Miro Hrončok <mhroncok@redhat.com> - 78.6.0-4.rh1
 - Filter out private libraries provides
 - Fixes: rhbz#1908792

From 0252c7f475ef169555a98ba56defde5e457d0af9 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Sat, 26 Dec 2020 17:12:01 +0100
Subject: [PATCH 197/473] Use wayland/x11 launchers| Test ARM build with
 gcc-11.0.0-0.11

---
 icecat.sh.in | 17 ++++++++++++++++-
 icecat.spec  | 31 +++++++++++--------------------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/icecat.sh.in b/icecat.sh.in
index e4c1a24..d21c731 100644
--- a/icecat.sh.in
+++ b/icecat.sh.in
@@ -67,7 +67,7 @@ MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE"
 MOZ_LAUNCHER="$MOZ_DIST_BIN/run-icecat.sh"
 
 ##
-## Enable X11 backend by default?	
+## Enable Wayland backend by default?	
 ##
 if __DEFAULT_WAYLAND__ && ! [ $MOZ_DISABLE_WAYLAND ]; then
   if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ]; then
@@ -75,6 +75,13 @@ if __DEFAULT_WAYLAND__ && ! [ $MOZ_DISABLE_WAYLAND ]; then
   fi
 fi
 
+##
+## Use D-Bus remote exclusively when there's Wayland display.
+##
+if [ "$WAYLAND_DISPLAY" ]; then
+  export MOZ_DBUS_REMOTE=1
+fi
+
 ##
 ## Set MOZ_GRE_CONF
 ##
@@ -173,6 +180,14 @@ if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then
     fi
 fi
 
+# When IceCat is not running, restore SELinux labels for profile files
+# (rhbz#1731371)
+if [ $MOZILLA_DOWN -ne 0 ]; then
+  if [ -x $GETENFORCE_FILE ] && [ `getenforce` != "Disabled" ]; then
+    (restorecon -vr ~/.mozilla/icecat/* &)
+  fi
+fi
+
 # Modify language pack configuration only when icecat is not running 
 # and language packs are not disabled
 if [ $MOZILLA_DOWN -ne 0 ]; then
diff --git a/icecat.spec b/icecat.spec
index d1a3a62..5ad9622 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -17,7 +17,7 @@
 %global extra_ver %{nil}
 %endif
 
-%global pre_tag %{nil}
+%global pre_tag test
 
 ####################
 
@@ -42,7 +42,6 @@
 %global build_with_pgo 0
 %endif
 %endif
-%global wayland_backend_default 1
 
 # Disable LTO to work around rhbz#1883904
 %define _lto_cflags %{nil}
@@ -60,7 +59,7 @@ ExcludeArch: ppc64le
 
 # See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/CWF4DOHDHS2WNRB6T4TM37HEDAKZL2J3/
 %if 0%{?fedora} > 33
-ExcludeArch: %{arm}
+#ExcludeArch: %%{arm}
 %endif
 
 # Active/Deactive language files handling
@@ -136,7 +135,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 78.6.0
-Release: 5%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 6%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -375,21 +374,19 @@ Extensions included to this version of IceCat:
    requested. This implies not downloading feeds, updates, blacklists or any
    other similar data needed during startup.
 
-%if 0%{?wayland_backend_default}
 %package x11
 Summary: GNU IceCat X11 launcher
 Requires: %{name}
 %description x11
 The %{name}-x11 package contains launcher and desktop file
 to run GNU IceCat native on X11.
-%else
+
 %package wayland
 Summary: GNU IceCat Wayland launcher
 Requires: %{name}
 %description wayland
 The icecat-wayland package contains launcher and desktop file
 to run GNU IceCat native on Wayland.
-%endif
 
 %prep
 %autosetup -N -n %{name}-%{version}
@@ -739,27 +736,19 @@ done
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE14}
 
-# set up the IceCat start script
-%if 0%{?wayland_backend_default}
-%global wayland_default true
-%else
-%global wayland_default false
-%endif
-
 rm -rf $RPM_BUILD_ROOT%{_bindir}/%{name}
 %{__sed} -e 's/__DEFAULT_WAYLAND__/%{wayland_default}/' \
  -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE13} > %{buildroot}%{_bindir}/%{name}
 chmod 755 %{buildroot}%{_bindir}/%{name}
 
-%if 0%{?wayland_backend_default}
 %{__sed} -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE15} > %{buildroot}%{_bindir}/%{name}-x11
 chmod 755 %{buildroot}%{_bindir}/%{name}-x11
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE16}
-%else
+
 %{__sed} -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE12} > %{buildroot}%{_bindir}/%{name}-wayland
 chmod 755 %{buildroot}%{_bindir}/%{name}-wayland
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE9}
-%endif
+
 #
 
 ##Install man page
@@ -897,17 +886,19 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %dir %{langpackdir}
 %endif
 
-%if 0%{?wayland_backend_default}
 %files x11
 %{_bindir}/%{name}-x11
 %{_datadir}/applications/%{name}-x11.desktop
-%else
+
 %files wayland
 %{_bindir}/%{name}-wayland
 %{_datadir}/applications/%{name}-wayland.desktop
-%endif
 
 %changelog
+* Sat Dec 26 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-6.rh1
+- Use wayland/x11 launchers
+- Test ARM build with gcc-11.0.0-0.11
+
 * Tue Dec 22 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-5.rh1
 - Add __requires_exclude_from
 

From e9052e292e45e62a3d8f00298469147aa0f1b660 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Sat, 26 Dec 2020 17:14:58 +0100
Subject: [PATCH 198/473] Use wayland/x11 launchers| Test ARM build with
 gcc-11.0.0-0.11 /2

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 5ad9622..972e329 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -17,7 +17,7 @@
 %global extra_ver %{nil}
 %endif
 
-%global pre_tag test
+%global pre_tag .test
 
 ####################
 

From 23b052ecd6a62c5310a6132e8d902b452ba73dba Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Wed, 6 Jan 2021 11:48:36 +0100
Subject: [PATCH 199/473] Mozilla Release 78.6.1ESR

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 16 ++++++++--------
 sources                 |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e15b9a..f06ea64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,3 +138,5 @@
 /icecat-78.5.0-rh2.tar.bz2
 /icecat-78.6.0-langpacks.tar.gz
 /icecat-78.6.0-rh1.tar.bz2
+/icecat-78.6.1-langpacks.tar.gz
+/icecat-78.6.1-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 5382f5e..9d87d23 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.6.0
+VERSION=78.6.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 972e329..881d0ce 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -17,7 +17,9 @@
 %global extra_ver %{nil}
 %endif
 
-%global pre_tag .test
+#%%global pre_tag .test
+%global pre_tag %{nil}
+
 
 ####################
 
@@ -57,11 +59,6 @@ ExcludeArch: s390x
 ExcludeArch: ppc64le
 %endif
 
-# See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/CWF4DOHDHS2WNRB6T4TM37HEDAKZL2J3/
-%if 0%{?fedora} > 33
-#ExcludeArch: %%{arm}
-%endif
-
 # Active/Deactive language files handling
 %global build_langpacks 1
 
@@ -134,8 +131,8 @@ ExcludeArch: ppc64le
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 78.6.0
-Release: 6%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.6.1
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -895,6 +892,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Wed Jan 06 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.6.1-1.rh1
+- Mozilla Release 78.6.1ESR
+
 * Sat Dec 26 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-6.rh1
 - Use wayland/x11 launchers
 - Test ARM build with gcc-11.0.0-0.11
diff --git a/sources b/sources
index 53ed1da..8bee150 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9503bb9c12610918481dd963a68e184053bf5fcf8def42594350686f46e4518727657b466bd88322d18c2b0fb33b92f7f4cf763928b571f4cdcddba83663dc7d
-SHA512 (icecat-78.6.0-langpacks.tar.gz) = c70a53c20ce738be638b62420883d2026ff8cf5ac4c8329d42ce3cca9330fc179a68d22e4db6ab0f71201228701cc3755ffcc8daf1e20f3035f53b038ef64361
-SHA512 (icecat-78.6.0-rh1.tar.bz2) = ca0264321f936a1a828400a7de1554da4889a70dac7aea85d54796584a7f452198981dda489af864beefab73ce579f0222480fdb34494e22bb2f1f70872fa635
+SHA512 (icecat-78.6.1-langpacks.tar.gz) = 044db01b85885ed5f266ea6efdcc406ec837d5cdcdd50f2552195eed4980a8231e9d0d3ec63071078fd6df704cbff1f78c24ef25340d3dfd04be42fec0e1ca5d
+SHA512 (icecat-78.6.1-rh1.tar.bz2) = 182a78d95c55345f43d60871b0c56a49ed4d7fb20841322460e37b7f210b8a61b0719af44806ee254962202b8fd4499694aeaaf80323c9f4e6d8446dc8cc9e43
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 19166c649554f7b2a922c70ce43bd39d35e5125e Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Wed, 6 Jan 2021 15:51:30 +0100
Subject: [PATCH 200/473] Fix desktop files

---
 icecat-x11.desktop |  4 ++--
 icecat.spec        | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/icecat-x11.desktop b/icecat-x11.desktop
index 4887034..6e7eea8 100644
--- a/icecat-x11.desktop
+++ b/icecat-x11.desktop
@@ -227,7 +227,7 @@ Name[wo]=Palanteer bu bees
 Name[xh]=Ifestile entsha
 Name[zh-CN]=新建窗口
 Name[zh-TW]=開新視窗
-Exec=icecat --new-window %u
+Exec=icecat-x11 --name icecat-x11 --new-window %u
 
 [Desktop Action new-private-window]
 Name=Open a New Private Window
@@ -335,4 +335,4 @@ Name[wo]=Panlanteeru biir bu bees
 Name[xh]=Ifestile yangasese entsha
 Name[zh-CN]=新建隐私浏览窗口
 Name[zh-TW]=新增隱私視窗
-Exec=icecat --private-window %u
+Exec=icecat-x11 --name icecat-x11 --private-window %u
diff --git a/icecat.spec b/icecat.spec
index 881d0ce..c8e9707 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -132,7 +132,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.6.1
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -373,14 +373,15 @@ Extensions included to this version of IceCat:
 
 %package x11
 Summary: GNU IceCat X11 launcher
-Requires: %{name}
+Requires: %{name}%{?_isa}
 %description x11
 The %{name}-x11 package contains launcher and desktop file
 to run GNU IceCat native on X11.
 
 %package wayland
 Summary: GNU IceCat Wayland launcher
-Requires: %{name}
+Requires: %{name}%{?_isa}
+Obsoletes: %{name} < 0:78.6.1-1
 %description wayland
 The icecat-wayland package contains launcher and desktop file
 to run GNU IceCat native on Wayland.
@@ -892,6 +893,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Wed Jan 06 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.6.1-2.rh1
+- Fix desktop files
+
 * Wed Jan 06 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.6.1-1.rh1
 - Mozilla Release 78.6.1ESR
 

From eb79d9fd6b7d2e453c0e3f4bc7c15d31cc045bcf Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Mon, 11 Jan 2021 14:34:28 +0100
Subject: [PATCH 201/473] Added a workaround for rhbz#1908018

---
 firefox-nss-addon-hack.patch | 19 +++++++++++++++++++
 icecat.spec                  |  8 ++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 firefox-nss-addon-hack.patch

diff --git a/firefox-nss-addon-hack.patch b/firefox-nss-addon-hack.patch
new file mode 100644
index 0000000..0322707
--- /dev/null
+++ b/firefox-nss-addon-hack.patch
@@ -0,0 +1,19 @@
+diff -up firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp.nss-hack firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp
+--- firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp.nss-hack      2021-01-11 12:12:02.585514543 +0100
++++ firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp       2021-01-11 12:47:50.345984582 +0100
+@@ -1619,6 +1619,15 @@ SECStatus InitializeNSS(const nsACString
+     return srv;
+   }
+
++  /* Sets the NSS_USE_ALG_IN_ANY_SIGNATURE bit.
++   * does not change NSS_USE_ALG_IN_CERT_SIGNATURE,
++   * so policy will still disable use of sha1 in
++   * certificate related signature processing. */
++  srv = NSS_SetAlgorithmPolicy(SEC_OID_SHA1, NSS_USE_ALG_IN_ANY_SIGNATURE, 0);
++  if (srv != SECSuccess) {
++    NS_WARNING("Unable to use SHA1 for Add-ons, expect broken/disabled Add-ons. See https://bugzilla.redhat.com/show_bug.cgi?id=1908018 for details.");
++  }
++
+   if (nssDbConfig == NSSDBConfig::ReadWrite) {
+     UniquePK11SlotInfo slot(PK11_GetInternalKeySlot());
+     if (!slot) {
diff --git a/icecat.spec b/icecat.spec
index c8e9707..6181358 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -132,7 +132,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.6.1
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -199,6 +199,7 @@ Patch55: mozilla-1669442.patch
 # Fedora specific patches
 Patch219: rhbz-1173156.patch
 Patch220: firefox-nss-version.patch
+Patch221: firefox-nss-addon-hack.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
@@ -381,7 +382,6 @@ to run GNU IceCat native on X11.
 %package wayland
 Summary: GNU IceCat Wayland launcher
 Requires: %{name}%{?_isa}
-Obsoletes: %{name} < 0:78.6.1-1
 %description wayland
 The icecat-wayland package contains launcher and desktop file
 to run GNU IceCat native on Wayland.
@@ -415,6 +415,7 @@ tar -xf %{SOURCE5}
 # Fedora patches
 %patch219 -p1 -b .rhbz-1173156
 #%%patch220 -p1 -b .nss-version
+%patch221 -p1 -b .firefox-nss-addon-hack
 
 # ARM run-time patch
 %ifarch aarch64
@@ -893,6 +894,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Mon Jan 11 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.6.1-3.rh1
+- Added a workaround for rhbz#1908018
+
 * Wed Jan 06 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.6.1-2.rh1
 - Fix desktop files
 

From 4a9cd7fde6829bcbcd7f0ad02c552aadd0960c49 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Mon, 11 Jan 2021 14:35:50 +0100
Subject: [PATCH 202/473] Added a workaround for rhbz#1908018| Add Obsoletes
 tag

---
 icecat.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/icecat.spec b/icecat.spec
index 6181358..ac213d7 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -382,6 +382,7 @@ to run GNU IceCat native on X11.
 %package wayland
 Summary: GNU IceCat Wayland launcher
 Requires: %{name}%{?_isa}
+Obsoletes: %{name} < 0:78.6.1-1
 %description wayland
 The icecat-wayland package contains launcher and desktop file
 to run GNU IceCat native on Wayland.

From 843db03713172242894497d9d2f2fc1b343c1faa Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Tue, 26 Jan 2021 11:36:35 +0100
Subject: [PATCH 203/473] Mozilla Release 78.7.0ESR

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 10 ++++++----
 sources                 |  4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index f06ea64..3f36648 100644
--- a/.gitignore
+++ b/.gitignore
@@ -140,3 +140,5 @@
 /icecat-78.6.0-rh1.tar.bz2
 /icecat-78.6.1-langpacks.tar.gz
 /icecat-78.6.1-rh1.tar.bz2
+/icecat-78.7.0-langpacks.tar.gz
+/icecat-78.7.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 9d87d23..b04e79c 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.6.1
+VERSION=78.7.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index ac213d7..acf0a99 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -104,7 +104,7 @@ ExcludeArch: ppc64le
 %if %{?system_nss}
 %global nspr_version 4.25.0
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.59.0
+%global nss_version 3.60.0
 %global nss_build_version %{nss_version}
 %endif
 
@@ -131,8 +131,8 @@ ExcludeArch: ppc64le
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 78.6.1
-Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.7.0
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -382,7 +382,6 @@ to run GNU IceCat native on X11.
 %package wayland
 Summary: GNU IceCat Wayland launcher
 Requires: %{name}%{?_isa}
-Obsoletes: %{name} < 0:78.6.1-1
 %description wayland
 The icecat-wayland package contains launcher and desktop file
 to run GNU IceCat native on Wayland.
@@ -895,6 +894,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Jan 26 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.0-1.rh1
+- Mozilla Release 78.7.0ESR
+
 * Mon Jan 11 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.6.1-3.rh1
 - Added a workaround for rhbz#1908018
 
diff --git a/sources b/sources
index 8bee150..cab4aec 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9503bb9c12610918481dd963a68e184053bf5fcf8def42594350686f46e4518727657b466bd88322d18c2b0fb33b92f7f4cf763928b571f4cdcddba83663dc7d
-SHA512 (icecat-78.6.1-langpacks.tar.gz) = 044db01b85885ed5f266ea6efdcc406ec837d5cdcdd50f2552195eed4980a8231e9d0d3ec63071078fd6df704cbff1f78c24ef25340d3dfd04be42fec0e1ca5d
-SHA512 (icecat-78.6.1-rh1.tar.bz2) = 182a78d95c55345f43d60871b0c56a49ed4d7fb20841322460e37b7f210b8a61b0719af44806ee254962202b8fd4499694aeaaf80323c9f4e6d8446dc8cc9e43
+SHA512 (icecat-78.7.0-langpacks.tar.gz) = 8db98a8b6c77782eeded7df9d1b5c15ee68ad580e3c8b9a6c047527ab81ebf1a5f3c27aefbec14700dcd4c65bc17010c7d2488ccb7accdbfb87fb99e86c0742d
+SHA512 (icecat-78.7.0-rh1.tar.bz2) = a640eb5da09081b9c461a3e9886d8fe3ee513d5a50b6615ef677f14819bfa73077c250950e8908d657f26f2e0f6cf8d11d07299ff8c1662f8fabed64492c1852
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From f72e804ab6491d6c504717459b8c55312f3d8c2a Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Tue, 26 Jan 2021 18:12:28 +0100
Subject: [PATCH 204/473] icecat-wayland obsoletes old icecat

---
 icecat.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/icecat.spec b/icecat.spec
index acf0a99..159d3dc 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -382,6 +382,7 @@ to run GNU IceCat native on X11.
 %package wayland
 Summary: GNU IceCat Wayland launcher
 Requires: %{name}%{?_isa}
+Obsoletes: %{name} < 0:78.6.1-1
 %description wayland
 The icecat-wayland package contains launcher and desktop file
 to run GNU IceCat native on Wayland.

From 38cdaf8b585e473908f65ad29c0c663fd3ae4776 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Thu, 28 Jan 2021 19:12:18 +0100
Subject: [PATCH 205/473] Build Release 78.7.0-rh2| HTTPS Everywhere 2021.1.27

---
 .gitignore  |  1 +
 icecat.spec | 26 +++++++-------------------
 sources     |  2 +-
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f36648..7e8bcc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -142,3 +142,4 @@
 /icecat-78.6.1-rh1.tar.bz2
 /icecat-78.7.0-langpacks.tar.gz
 /icecat-78.7.0-rh1.tar.bz2
+/icecat-78.7.0-rh2.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index 159d3dc..56fa0b8 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -7,7 +7,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh1
+%global redhat_ver rh2
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -81,15 +81,6 @@ ExcludeArch: ppc64le
 %global big_endian    1
 %endif
 
-# Use system sqlite?
-%global system_sqlite 1
-
-%if 0%{?system_sqlite}
-%global sqlite_version 3.28.0
-# The actual sqlite version (see #480989):
-%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
-%endif
-
 # Use system libicu?
 %if 0%{?fedora} > 32
 %global system_libicu 1
@@ -97,8 +88,6 @@ ExcludeArch: ppc64le
 %global system_libicu 0
 %endif
 
-# Use system nspr/nss?
-# rhbz#1908018
 %global system_nss  1
 
 %if %{?system_nss}
@@ -132,7 +121,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.7.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -323,11 +312,6 @@ BuildRequires:  mesa-dri-drivers
 BuildRequires:  xorg-x11-server-Xvfb
 %endif
 
-%if 0%{?system_sqlite}
-BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version}
-Requires: sqlite >= %{sqlite_build_version}
-%endif
-
 %if 0%{?big_endian}
 BuildRequires: icu
 %endif
@@ -345,7 +329,7 @@ Requires: fedora-bookmarks
 Suggests: mozilla-ublock-origin
 
 Provides: webclient
-Provides: mozilla-https-everywhere = 20201117
+Provides: bundled(mozilla-https-everywhere) = 2021.1.27
 
 %description
 GNU IceCat is the GNU version of the Firefox ESR browser.
@@ -895,6 +879,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Wed Jan 27 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.0-2.rh2
+- Build Release 78.7.0-rh2
+- HTTPS Everywhere 2021.1.27
+
 * Tue Jan 26 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.0-1.rh1
 - Mozilla Release 78.7.0ESR
 
diff --git a/sources b/sources
index cab4aec..5b212e0 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9503bb9c12610918481dd963a68e184053bf5fcf8def42594350686f46e4518727657b466bd88322d18c2b0fb33b92f7f4cf763928b571f4cdcddba83663dc7d
 SHA512 (icecat-78.7.0-langpacks.tar.gz) = 8db98a8b6c77782eeded7df9d1b5c15ee68ad580e3c8b9a6c047527ab81ebf1a5f3c27aefbec14700dcd4c65bc17010c7d2488ccb7accdbfb87fb99e86c0742d
-SHA512 (icecat-78.7.0-rh1.tar.bz2) = a640eb5da09081b9c461a3e9886d8fe3ee513d5a50b6615ef677f14819bfa73077c250950e8908d657f26f2e0f6cf8d11d07299ff8c1662f8fabed64492c1852
+SHA512 (icecat-78.7.0-rh2.tar.bz2) = 16bda1f397fc5e883c0840e9a836d6dad481b60a0a0db86408224155b10b56dc8df63bbbb813799ce622b07b2704f8aee937b6eba13f1454eff737d21b00a1fa
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 7b3f829556003a826c7542d9235e6ff3409e1af8 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Fri, 5 Feb 2021 11:36:39 +0100
Subject: [PATCH 206/473] Fix parameter passing on ppc64le (mozb#1690152)|
 Remove gtk2 support as flash plugin is no longer supported

---
 icecat.spec           | 12 +++++-
 mozilla-1690152.patch | 97 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 mozilla-1690152.patch

diff --git a/icecat.spec b/icecat.spec
index 56fa0b8..53b2195 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -121,7 +121,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.7.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -202,8 +202,8 @@ Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
-
 Patch424: %{name}-mozilla-1669471.patch
+Patch425: mozilla-1690152.patch
 
 # PGO/LTO patches
 Patch600: %{name}-pgo.patch
@@ -418,6 +418,7 @@ tar -xf %{SOURCE5}
 %patch403 -p1 -b .1640567
 %patch423 -p1 -b .mozilla-1596503
 %patch424 -p1 -b .mozilla-1669471
+%patch425 -p1 -b .mozilla-1690152
 
 # Wayland specific upstream patches
 %patch565 -p1 -b .firefox-pipewire
@@ -811,6 +812,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/idl/%{icecat_ver}
 rm -rf $RPM_BUILD_ROOT%{_includedir}/%{icecat_ver}
 rm -rf $RPM_BUILD_ROOT%{icecatappdir}/removed-files
 
+# Remove gtk2 support as flash plugin is no longer supported
+rm -rf %{buildroot}%{icecatappdir}/gtk2
+
 mkdir -p $RPM_BUILD_ROOT%{_metainfodir}
 install -pm 644 %{SOURCE10} $RPM_BUILD_ROOT%{_metainfodir}/
 install -pm 644 %{SOURCE11} $RPM_BUILD_ROOT%{_metainfodir}/
@@ -879,6 +883,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Fri Feb 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.0-3.rh2
+- Fix parameter passing on ppc64le (mozb#1690152)
+- Remove gtk2 support as flash plugin is no longer supported
+
 * Wed Jan 27 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.0-2.rh2
 - Build Release 78.7.0-rh2
 - HTTPS Everywhere 2021.1.27
diff --git a/mozilla-1690152.patch b/mozilla-1690152.patch
new file mode 100644
index 0000000..fb672d3
--- /dev/null
+++ b/mozilla-1690152.patch
@@ -0,0 +1,97 @@
+
+# HG changeset patch
+# User Cameron Kaiser <spectre@floodgap.com>
+# Date 1612231460 0
+# Node ID 579a66fd796690fb752485215b2edaa6167ebf16
+# Parent  a00504e040bfd34d01c74d478beb9d308ec085be
+Bug 1690152 - on ppc64 properly skip parameter slots if we overflow GPRs while still having FPRs to burn. r=tcampbell
+
+Differential Revision: https://phabricator.services.mozilla.com/D103724
+
+diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
+--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
++++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
+@@ -86,27 +86,37 @@ extern "C" void invoke_copy_to_stack(uin
+             case nsXPTType::T_WCHAR:  value = s->val.wc;            break;
+             default:                  value = (uint64_t) s->val.p;  break;
+             }
+         }
+ 
+         if (!s->IsIndirect() && s->type == nsXPTType::T_DOUBLE) {
+             if (nr_fpr < FPR_COUNT) {
+                 fpregs[nr_fpr++] = s->val.d;
+-                nr_gpr++;
++                // Even if we have enough FPRs, still skip space in
++                // the parameter area if we ran out of placeholder GPRs.
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    d++;
++                }
+             } else {
+                 *((double *)d) = s->val.d;
+                 d++;
+             }
+         }
+         else if (!s->IsIndirect() && s->type == nsXPTType::T_FLOAT) {
+             if (nr_fpr < FPR_COUNT) {
+                 // Single-precision floats are passed in FPRs too.
+                 fpregs[nr_fpr++] = s->val.f;
+-                nr_gpr++;
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    d++;
++                }
+             } else {
+ #ifdef __LITTLE_ENDIAN__
+                 *((float *)d) = s->val.f;
+ #else
+                 // Big endian needs adjustment to point to the least
+                 // significant word.
+                 float* p = (float*)d;
+                 p++;
+diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
+--- a/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
++++ b/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
+@@ -98,27 +98,37 @@ PrepareAndDispatch(nsXPTCStubBase * self
+                 nr_gpr++;
+             else
+                 ap++;
+         }
+ 
+         if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
+             if (nr_fpr < FPR_COUNT) {
+                 dp->val.d = fpregs[nr_fpr++];
+-                nr_gpr++;
++                // Even if we have enough FPRs, still skip space in
++                // the parameter area if we ran out of placeholder GPRs.
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    ap++;
++                }
+             } else {
+                 dp->val.d = *(double*)ap++;
+             }
+             continue;
+         }
+         if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
+             if (nr_fpr < FPR_COUNT) {
+                 // Single-precision floats are passed in FPRs too.
+                 dp->val.f = (float)fpregs[nr_fpr++];
+-                nr_gpr++;
++                if (nr_gpr < GPR_COUNT) {
++                    nr_gpr++;
++                } else {
++                    ap++;
++                }
+             } else {
+ #ifdef __LITTLE_ENDIAN__
+                 dp->val.f = *(float*)ap++;
+ #else
+                 // Big endian needs adjustment to point to the least
+                 // significant word.
+                 float* p = (float*)ap;
+                 p++;
+

From b39dd03bd28cd851963742bdd1d47d6a1061de84 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Fri, 5 Feb 2021 21:59:34 +0100
Subject: [PATCH 207/473] Mozilla Release 78.7.1ESR

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 9 ++++++---
 sources                 | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7e8bcc9..0a84949 100644
--- a/.gitignore
+++ b/.gitignore
@@ -143,3 +143,5 @@
 /icecat-78.7.0-langpacks.tar.gz
 /icecat-78.7.0-rh1.tar.bz2
 /icecat-78.7.0-rh2.tar.bz2
+/icecat-78.7.1-langpacks.tar.gz
+/icecat-78.7.1-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index b04e79c..192fb59 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.7.0
+VERSION=78.7.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 53b2195..7297d5e 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -7,7 +7,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh2
+%global redhat_ver rh1
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -120,8 +120,8 @@ ExcludeArch: ppc64le
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 78.7.0
-Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.7.1
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -883,6 +883,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Fri Feb 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.1-1.rh1
+- Mozilla Release 78.7.1ESR
+
 * Fri Feb 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.0-3.rh2
 - Fix parameter passing on ppc64le (mozb#1690152)
 - Remove gtk2 support as flash plugin is no longer supported
diff --git a/sources b/sources
index 5b212e0..9d39fe2 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9503bb9c12610918481dd963a68e184053bf5fcf8def42594350686f46e4518727657b466bd88322d18c2b0fb33b92f7f4cf763928b571f4cdcddba83663dc7d
-SHA512 (icecat-78.7.0-langpacks.tar.gz) = 8db98a8b6c77782eeded7df9d1b5c15ee68ad580e3c8b9a6c047527ab81ebf1a5f3c27aefbec14700dcd4c65bc17010c7d2488ccb7accdbfb87fb99e86c0742d
-SHA512 (icecat-78.7.0-rh2.tar.bz2) = 16bda1f397fc5e883c0840e9a836d6dad481b60a0a0db86408224155b10b56dc8df63bbbb813799ce622b07b2704f8aee937b6eba13f1454eff737d21b00a1fa
+SHA512 (icecat-78.7.1-langpacks.tar.gz) = 1b85e5890f24593b8eee8387c6f2ca3c71212485cf4ba11711ac27fe73232d875eeab0186dca3fc5dab3612ea1ae0b3b0639206fbccbc31da4636e317b207661
+SHA512 (icecat-78.7.1-rh1.tar.bz2) = 8392f27779ad0002ca5a54794e1905bdba46d1f776b99a31720e471da7f961ca2163a4f05d9b8bd94bb10c5d833c53e44f9fdd51a85fb0875b541a695fbf2ccd
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 69de53ca1f708436d6ace89f2da84d1a05e4fd3f Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Sat, 6 Feb 2021 14:55:04 +0100
Subject: [PATCH 208/473] Exclude patch mozilla-1690152

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 7297d5e..efc9157 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -418,7 +418,7 @@ tar -xf %{SOURCE5}
 %patch403 -p1 -b .1640567
 %patch423 -p1 -b .mozilla-1596503
 %patch424 -p1 -b .mozilla-1669471
-%patch425 -p1 -b .mozilla-1690152
+#%%patch425 -p1 -b .mozilla-1690152
 
 # Wayland specific upstream patches
 %patch565 -p1 -b .firefox-pipewire

From 902a94597e0d48bbe3e1ebc3184787f7b6fe9242 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Sat, 6 Feb 2021 19:43:04 +0100
Subject: [PATCH 209/473] Restore Patch425| Try to fix Template_with_C_linkage
 errors

---
 ...8.7.1-fix_error_template_with_C_linkage.patch | 16 ++++++++++++++++
 icecat.spec                                      |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 icecat-78.7.1-fix_error_template_with_C_linkage.patch

diff --git a/icecat-78.7.1-fix_error_template_with_C_linkage.patch b/icecat-78.7.1-fix_error_template_with_C_linkage.patch
new file mode 100644
index 0000000..43ee5e2
--- /dev/null
+++ b/icecat-78.7.1-fix_error_template_with_C_linkage.patch
@@ -0,0 +1,16 @@
+--- a/other-licenses/atk-1.0/atk/atkobject.orig.h	2021-02-05 19:53:35.000000000 +0100
++++ b/other-licenses/atk-1.0/atk/atkobject.h	2021-02-06 19:29:57.596256493 +0100
+@@ -20,11 +20,12 @@
+ #ifndef __ATK_OBJECT_H__
+ #define __ATK_OBJECT_H__
+ 
++#include <glib-object.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+ 
+-#include <glib-object.h>
+ #include <atk/atkstate.h>
+ #include <atk/atkrelationtype.h>
+ 
diff --git a/icecat.spec b/icecat.spec
index efc9157..6bcb634 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -189,6 +189,7 @@ Patch55: mozilla-1669442.patch
 Patch219: rhbz-1173156.patch
 Patch220: firefox-nss-version.patch
 Patch221: firefox-nss-addon-hack.patch
+Patch222: %{name}-%{version}-fix_error_template_with_C_linkage.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
@@ -401,6 +402,7 @@ tar -xf %{SOURCE5}
 %patch219 -p1 -b .rhbz-1173156
 #%%patch220 -p1 -b .nss-version
 %patch221 -p1 -b .firefox-nss-addon-hack
+%patch222 -p1 -b .fix_error_template_with_C_linkage
 
 # ARM run-time patch
 %ifarch aarch64
@@ -418,7 +420,7 @@ tar -xf %{SOURCE5}
 %patch403 -p1 -b .1640567
 %patch423 -p1 -b .mozilla-1596503
 %patch424 -p1 -b .mozilla-1669471
-#%%patch425 -p1 -b .mozilla-1690152
+%patch425 -p1 -b .mozilla-1690152
 
 # Wayland specific upstream patches
 %patch565 -p1 -b .firefox-pipewire

From 87e2702902dae21e57756f566e9674fa4057a23e Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Sun, 7 Feb 2021 12:46:47 +0100
Subject: [PATCH 210/473] Remove useless directory

---
 icecat.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 6bcb634..0571be5 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -871,7 +871,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{icecatappdir}/plugin-container
 %{icecatappdir}/pingsender
 %{icecatappdir}/gmp-clearkey/
-%{icecatappdir}/gtk2/*.so
 %if 0%{?build_langpacks}
 %dir %{langpackdir}
 %endif

From de561ad09b97d78a78e7b618852ddd6308a3f7e3 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Tue, 23 Feb 2021 14:44:31 +0100
Subject: [PATCH 211/473] Mozilla Release 78.8.0ESR

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 7 +++++--
 sources                 | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0a84949..a8a02f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,3 +145,5 @@
 /icecat-78.7.0-rh2.tar.bz2
 /icecat-78.7.1-langpacks.tar.gz
 /icecat-78.7.1-rh1.tar.bz2
+/icecat-78.8.0-langpacks.tar.gz
+/icecat-78.8.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 192fb59..1aeeea0 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.7.1
+VERSION=78.8.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 0571be5..64f95b9 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -120,7 +120,7 @@ ExcludeArch: ppc64le
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 78.7.1
+Version: 78.8.0
 Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -189,7 +189,7 @@ Patch55: mozilla-1669442.patch
 Patch219: rhbz-1173156.patch
 Patch220: firefox-nss-version.patch
 Patch221: firefox-nss-addon-hack.patch
-Patch222: %{name}-%{version}-fix_error_template_with_C_linkage.patch
+Patch222: %{name}-78.7.1-fix_error_template_with_C_linkage.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
@@ -884,6 +884,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Feb 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-1.rh1
+- Mozilla Release 78.8.0ESR
+
 * Fri Feb 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.1-1.rh1
 - Mozilla Release 78.7.1ESR
 
diff --git a/sources b/sources
index 9d39fe2..c07326f 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9503bb9c12610918481dd963a68e184053bf5fcf8def42594350686f46e4518727657b466bd88322d18c2b0fb33b92f7f4cf763928b571f4cdcddba83663dc7d
-SHA512 (icecat-78.7.1-langpacks.tar.gz) = 1b85e5890f24593b8eee8387c6f2ca3c71212485cf4ba11711ac27fe73232d875eeab0186dca3fc5dab3612ea1ae0b3b0639206fbccbc31da4636e317b207661
-SHA512 (icecat-78.7.1-rh1.tar.bz2) = 8392f27779ad0002ca5a54794e1905bdba46d1f776b99a31720e471da7f961ca2163a4f05d9b8bd94bb10c5d833c53e44f9fdd51a85fb0875b541a695fbf2ccd
+SHA512 (icecat-78.8.0-langpacks.tar.gz) = 2496c0da1bc9de5effd95fc6be75478bd9627a69fcd18e1098b5c5bc41e7ed1b6eb573f9dc355a3cfc4919164ba81ba8c1c7724daff043ff2b1ea13849547aa4
+SHA512 (icecat-78.8.0-rh1.tar.bz2) = 7248b9d161628e738a8ea17b5de832adba03c59c54181d708fa53e49b4e1ca13eaa029980cf365c3fba947ca331852ca4bbdc430a2e725b7da177859f401308b
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 8b16b2c3ab3a37759d37b2f872e05c31bbe463db Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Tue, 23 Feb 2021 14:58:21 +0100
Subject: [PATCH 212/473] Remove obsolete patch #1690152

---
 icecat.spec           |  2 -
 mozilla-1690152.patch | 97 -------------------------------------------
 2 files changed, 99 deletions(-)
 delete mode 100644 mozilla-1690152.patch

diff --git a/icecat.spec b/icecat.spec
index 64f95b9..6bd9465 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -204,7 +204,6 @@ Patch422: mozilla-1580174-webrtc-popup.patch
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
 Patch424: %{name}-mozilla-1669471.patch
-Patch425: mozilla-1690152.patch
 
 # PGO/LTO patches
 Patch600: %{name}-pgo.patch
@@ -420,7 +419,6 @@ tar -xf %{SOURCE5}
 %patch403 -p1 -b .1640567
 %patch423 -p1 -b .mozilla-1596503
 %patch424 -p1 -b .mozilla-1669471
-%patch425 -p1 -b .mozilla-1690152
 
 # Wayland specific upstream patches
 %patch565 -p1 -b .firefox-pipewire
diff --git a/mozilla-1690152.patch b/mozilla-1690152.patch
deleted file mode 100644
index fb672d3..0000000
--- a/mozilla-1690152.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-
-# HG changeset patch
-# User Cameron Kaiser <spectre@floodgap.com>
-# Date 1612231460 0
-# Node ID 579a66fd796690fb752485215b2edaa6167ebf16
-# Parent  a00504e040bfd34d01c74d478beb9d308ec085be
-Bug 1690152 - on ppc64 properly skip parameter slots if we overflow GPRs while still having FPRs to burn. r=tcampbell
-
-Differential Revision: https://phabricator.services.mozilla.com/D103724
-
-diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
---- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
-+++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
-@@ -86,27 +86,37 @@ extern "C" void invoke_copy_to_stack(uin
-             case nsXPTType::T_WCHAR:  value = s->val.wc;            break;
-             default:                  value = (uint64_t) s->val.p;  break;
-             }
-         }
- 
-         if (!s->IsIndirect() && s->type == nsXPTType::T_DOUBLE) {
-             if (nr_fpr < FPR_COUNT) {
-                 fpregs[nr_fpr++] = s->val.d;
--                nr_gpr++;
-+                // Even if we have enough FPRs, still skip space in
-+                // the parameter area if we ran out of placeholder GPRs.
-+                if (nr_gpr < GPR_COUNT) {
-+                    nr_gpr++;
-+                } else {
-+                    d++;
-+                }
-             } else {
-                 *((double *)d) = s->val.d;
-                 d++;
-             }
-         }
-         else if (!s->IsIndirect() && s->type == nsXPTType::T_FLOAT) {
-             if (nr_fpr < FPR_COUNT) {
-                 // Single-precision floats are passed in FPRs too.
-                 fpregs[nr_fpr++] = s->val.f;
--                nr_gpr++;
-+                if (nr_gpr < GPR_COUNT) {
-+                    nr_gpr++;
-+                } else {
-+                    d++;
-+                }
-             } else {
- #ifdef __LITTLE_ENDIAN__
-                 *((float *)d) = s->val.f;
- #else
-                 // Big endian needs adjustment to point to the least
-                 // significant word.
-                 float* p = (float*)d;
-                 p++;
-diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
---- a/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
-+++ b/xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
-@@ -98,27 +98,37 @@ PrepareAndDispatch(nsXPTCStubBase * self
-                 nr_gpr++;
-             else
-                 ap++;
-         }
- 
-         if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
-             if (nr_fpr < FPR_COUNT) {
-                 dp->val.d = fpregs[nr_fpr++];
--                nr_gpr++;
-+                // Even if we have enough FPRs, still skip space in
-+                // the parameter area if we ran out of placeholder GPRs.
-+                if (nr_gpr < GPR_COUNT) {
-+                    nr_gpr++;
-+                } else {
-+                    ap++;
-+                }
-             } else {
-                 dp->val.d = *(double*)ap++;
-             }
-             continue;
-         }
-         if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
-             if (nr_fpr < FPR_COUNT) {
-                 // Single-precision floats are passed in FPRs too.
-                 dp->val.f = (float)fpregs[nr_fpr++];
--                nr_gpr++;
-+                if (nr_gpr < GPR_COUNT) {
-+                    nr_gpr++;
-+                } else {
-+                    ap++;
-+                }
-             } else {
- #ifdef __LITTLE_ENDIAN__
-                 dp->val.f = *(float*)ap++;
- #else
-                 // Big endian needs adjustment to point to the least
-                 // significant word.
-                 float* p = (float*)ap;
-                 p++;
-

From d0552012e6ebd3003ef5e1c0c7024eb76f9efd8e Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Tue, 23 Feb 2021 19:51:44 +0100
Subject: [PATCH 213/473] Downgrade optimization on Power64 arch| Try to build
 on s390x

---
 icecat.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 6bd9465..65b1bbd 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -20,7 +20,6 @@
 #%%global pre_tag .test
 %global pre_tag %{nil}
 
-
 ####################
 
 ### Optimization ###
@@ -28,7 +27,11 @@
 %global debug_build   0
 
 # Downgrade optimization
+%ifarch %{power64}
+%global less_optbuild 1
+%else
 %global less_optbuild 0
+%endif
 
 # Use mozilla hardening option?
 %global hardened_build 1
@@ -51,7 +54,7 @@
 
 # Exclude ARM builds for rhbz #1658940
 # Exclude s390x for https://pagure.io/koji/issue/1974
-ExcludeArch: s390x
+#ExcludeArch: s390x
 
 # PPC64le does not compile on Fedora 33 yet.
 # Temporarily disabled, filed as rhbz#1862012

From 0a3cfe9877a278ba5e88e16af04aa125dbaaf488 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Tue, 23 Feb 2021 21:07:58 +0100
Subject: [PATCH 214/473] Exclude Power64| Fix build option for s390x

---
 icecat.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 65b1bbd..89a1d2d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -58,9 +58,7 @@
 
 # PPC64le does not compile on Fedora 33 yet.
 # Temporarily disabled, filed as rhbz#1862012
-%if 0%{?fedora} == 33
 ExcludeArch: ppc64le
-%endif
 
 # Active/Deactive language files handling
 %global build_langpacks 1
@@ -533,7 +531,7 @@ echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 %endif
 
 %ifarch s390x
-echo "ac_add_options --disable-ion" >> .mozconfig
+echo "ac_add_options --disable-jit" >> .mozconfig
 %endif
 
 %if 0%{?build_with_pgo}

From 058bc8f6fbb4a8ec286f52ed784ba0a836562a2f Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Tue, 23 Feb 2021 21:11:24 +0100
Subject: [PATCH 215/473] Change build release number

---
 icecat.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 89a1d2d..ea1706c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -27,11 +27,7 @@
 %global debug_build   0
 
 # Downgrade optimization
-%ifarch %{power64}
-%global less_optbuild 1
-%else
 %global less_optbuild 0
-%endif
 
 # Use mozilla hardening option?
 %global hardened_build 1
@@ -122,7 +118,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.8.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -883,6 +879,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Feb 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-2.rh1
+- Exclude Power64
+- Fix build option for s390x
+
 * Tue Feb 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-1.rh1
 - Mozilla Release 78.8.0ESR
 

From ebc93c5543d22fe08ab561744f84b44da5f38cf0 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Wed, 24 Feb 2021 12:19:14 +0100
Subject: [PATCH 216/473] Change some informations

---
 icecat.spec | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index ea1706c..8199de1 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -48,12 +48,7 @@
 %define _lto_cflags %{nil}
 ####################
 
-# Exclude ARM builds for rhbz #1658940
-# Exclude s390x for https://pagure.io/koji/issue/1974
-#ExcludeArch: s390x
-
-# PPC64le does not compile on Fedora 33 yet.
-# Temporarily disabled, filed as rhbz#1862012
+# Temporarily disabled, filed as rhbz#1932204
 ExcludeArch: ppc64le
 
 # Active/Deactive language files handling
@@ -880,7 +875,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
 %changelog
 * Tue Feb 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-2.rh1
-- Exclude Power64
+- Exclude Power64 (rhbz#1932204)
 - Fix build option for s390x
 
 * Tue Feb 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-1.rh1

From 223056b0bfef0f51aece2dc93af494686c9fc768 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Thu, 25 Feb 2021 11:41:17 +0100
Subject: [PATCH 217/473] Add Mozilla patch #1692706

---
 icecat.spec           | 16 +++++++++++-----
 mozilla-1692706.patch | 31 +++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 mozilla-1692706.patch

diff --git a/icecat.spec b/icecat.spec
index 8199de1..ae7063a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -49,7 +49,7 @@
 ####################
 
 # Temporarily disabled, filed as rhbz#1932204
-ExcludeArch: ppc64le
+#ExcludeArch: ppc64le
 
 # Active/Deactive language files handling
 %global build_langpacks 1
@@ -113,7 +113,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.8.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -197,6 +197,8 @@ Patch422: mozilla-1580174-webrtc-popup.patch
 Patch423: mozilla-1512162.patch
 Patch424: %{name}-mozilla-1669471.patch
 
+Patch425: mozilla-1692706.patch
+
 # PGO/LTO patches
 Patch600: %{name}-pgo.patch
 Patch602: mozilla-1516803.patch
@@ -409,15 +411,16 @@ tar -xf %{SOURCE5}
 
 %patch402 -p1 -b .1196777
 %patch403 -p1 -b .1640567
-%patch423 -p1 -b .mozilla-1596503
-%patch424 -p1 -b .mozilla-1669471
+%patch423 -p1 -b .1596503
+%patch424 -p1 -b .1669471
+%patch425 -p1 -b .1692706
 
 # Wayland specific upstream patches
 %patch565 -p1 -b .firefox-pipewire
 
 %patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
 %patch585 -p1 -b .firefox-vaapi-extra-frames
-%patch589 -p1 -b .mozilla-1634213
+%patch589 -p1 -b .1634213
 
 %patch54 -p1 -b .1669639
 %patch55 -p1 -b .1669442
@@ -874,6 +877,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Thu Feb 25 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-3.rh1
+- Add Mozilla patch #1692706
+
 * Tue Feb 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-2.rh1
 - Exclude Power64 (rhbz#1932204)
 - Fix build option for s390x
diff --git a/mozilla-1692706.patch b/mozilla-1692706.patch
new file mode 100644
index 0000000..6defdea
--- /dev/null
+++ b/mozilla-1692706.patch
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User Ian Neal <iann_cvs@blueyonder.co.uk>
+# Date 1614236439 0
+# Node ID cc45c336687916a6d1bfed79a80dc8a292b139a5
+# Parent  8024f219bda91c98fcbba16f2bfc6b4833014bfc
+Bug 1692706 - Update ccache stats parser for ccache 4.x. r=glandium
+
+Differential Revision: https://phabricator.services.mozilla.com/D105863
+
+diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
+--- a/python/mozbuild/mozbuild/controller/building.py
++++ b/python/mozbuild/mozbuild/controller/building.py
+@@ -842,7 +842,7 @@
+ 
+     DIRECTORY_DESCRIPTION = "cache directory"
+     PRIMARY_CONFIG_DESCRIPTION = "primary config"
+-    SECONDARY_CONFIG_DESCRIPTION = "secondary config      (readonly)"
++    SECONDARY_CONFIG_DESCRIPTION = "secondary config"
+     ABSOLUTE_KEYS = {'cache_files', 'cache_size', 'cache_max_size'}
+     FORMAT_KEYS = {'cache_size', 'cache_max_size'}
+ 
+@@ -874,7 +874,8 @@
+                 line, self.PRIMARY_CONFIG_DESCRIPTION)
+         elif line.startswith(self.SECONDARY_CONFIG_DESCRIPTION):
+             self.secondary_config = self._strip_prefix(
+-                line, self.SECONDARY_CONFIG_DESCRIPTION)
++                self._strip_prefix(line, self.SECONDARY_CONFIG_DESCRIPTION),
++                "(readonly)",
+         else:
+             for stat_key, stat_description in self.STATS_KEYS:
+                 if line.startswith(stat_description):

From 44716e4c48d6d3dac45b942b086e3a1345b84ee4 Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Thu, 25 Feb 2021 12:03:34 +0100
Subject: [PATCH 218/473] Fix patch #1692706

---
 mozilla-1692706.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mozilla-1692706.patch b/mozilla-1692706.patch
index 6defdea..b25d5dd 100644
--- a/mozilla-1692706.patch
+++ b/mozilla-1692706.patch
@@ -19,13 +19,14 @@ diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/m
      ABSOLUTE_KEYS = {'cache_files', 'cache_size', 'cache_max_size'}
      FORMAT_KEYS = {'cache_size', 'cache_max_size'}
  
-@@ -874,7 +874,8 @@
+@@ -874,7 +874,9 @@
                  line, self.PRIMARY_CONFIG_DESCRIPTION)
          elif line.startswith(self.SECONDARY_CONFIG_DESCRIPTION):
              self.secondary_config = self._strip_prefix(
 -                line, self.SECONDARY_CONFIG_DESCRIPTION)
 +                self._strip_prefix(line, self.SECONDARY_CONFIG_DESCRIPTION),
 +                "(readonly)",
++            )
          else:
              for stat_key, stat_description in self.STATS_KEYS:
                  if line.startswith(stat_description):

From 7ca16dae639d14b4a2d63d668ddcf1d3e0ba3efa Mon Sep 17 00:00:00 2001
From: Antonio T <sagitter@fedoraproject.org>
Date: Thu, 25 Feb 2021 14:27:59 +0100
Subject: [PATCH 219/473] Update cbindgen (0.16.0)

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index c07326f..e4b2413 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = 9503bb9c12610918481dd963a68e184053bf5fcf8def42594350686f46e4518727657b466bd88322d18c2b0fb33b92f7f4cf763928b571f4cdcddba83663dc7d
+SHA512 (cbindgen-vendor.tar.xz) = 6c016bcf40166f6b31531cb1da700706ff982884d65eeafa613031888c42ed6c8fff484403e7c0aa076f36dc722e98c8a9bfff413b933fecd225713b3dee8932
 SHA512 (icecat-78.8.0-langpacks.tar.gz) = 2496c0da1bc9de5effd95fc6be75478bd9627a69fcd18e1098b5c5bc41e7ed1b6eb573f9dc355a3cfc4919164ba81ba8c1c7724daff043ff2b1ea13849547aa4
 SHA512 (icecat-78.8.0-rh1.tar.bz2) = 7248b9d161628e738a8ea17b5de832adba03c59c54181d708fa53e49b4e1ca13eaa029980cf365c3fba947ca331852ca4bbdc430a2e725b7da177859f401308b
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 7a130b53cd40f809a553dae64a8faa5e34df793f Mon Sep 17 00:00:00 2001
From: Antonio Trande <3974791-anto.trande@users.noreply.gitlab.com>
Date: Tue, 23 Mar 2021 17:19:18 +0100
Subject: [PATCH 220/473] Mozilla Release 78.9.0ESR

---
 .gitignore                                       |  2 ++
 ...8.7.1-fix_error_template_with_C_linkage.patch | 16 ----------------
 icecat-lang_download.sh                          |  2 +-
 icecat.spec                                      | 12 +++++-------
 sources                                          |  4 ++--
 5 files changed, 10 insertions(+), 26 deletions(-)
 delete mode 100644 icecat-78.7.1-fix_error_template_with_C_linkage.patch

diff --git a/.gitignore b/.gitignore
index a8a02f1..00b8800 100644
--- a/.gitignore
+++ b/.gitignore
@@ -147,3 +147,5 @@
 /icecat-78.7.1-rh1.tar.bz2
 /icecat-78.8.0-langpacks.tar.gz
 /icecat-78.8.0-rh1.tar.bz2
+/icecat-78.9.0-langpacks.tar.gz
+/icecat-78.9.0-rh1.tar.bz2
diff --git a/icecat-78.7.1-fix_error_template_with_C_linkage.patch b/icecat-78.7.1-fix_error_template_with_C_linkage.patch
deleted file mode 100644
index 43ee5e2..0000000
--- a/icecat-78.7.1-fix_error_template_with_C_linkage.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/other-licenses/atk-1.0/atk/atkobject.orig.h	2021-02-05 19:53:35.000000000 +0100
-+++ b/other-licenses/atk-1.0/atk/atkobject.h	2021-02-06 19:29:57.596256493 +0100
-@@ -20,11 +20,12 @@
- #ifndef __ATK_OBJECT_H__
- #define __ATK_OBJECT_H__
- 
-+#include <glib-object.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif /* __cplusplus */
- 
--#include <glib-object.h>
- #include <atk/atkstate.h>
- #include <atk/atkrelationtype.h>
- 
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 1aeeea0..0352d7a 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.8.0
+VERSION=78.9.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index ae7063a..415d6fb 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -48,9 +48,6 @@
 %define _lto_cflags %{nil}
 ####################
 
-# Temporarily disabled, filed as rhbz#1932204
-#ExcludeArch: ppc64le
-
 # Active/Deactive language files handling
 %global build_langpacks 1
 
@@ -112,8 +109,8 @@
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 78.8.0
-Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.9.0
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -181,7 +178,6 @@ Patch55: mozilla-1669442.patch
 Patch219: rhbz-1173156.patch
 Patch220: firefox-nss-version.patch
 Patch221: firefox-nss-addon-hack.patch
-Patch222: %{name}-78.7.1-fix_error_template_with_C_linkage.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
@@ -395,7 +391,6 @@ tar -xf %{SOURCE5}
 %patch219 -p1 -b .rhbz-1173156
 #%%patch220 -p1 -b .nss-version
 %patch221 -p1 -b .firefox-nss-addon-hack
-%patch222 -p1 -b .fix_error_template_with_C_linkage
 
 # ARM run-time patch
 %ifarch aarch64
@@ -877,6 +872,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Mar 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.9.0-1.rh1
+- Mozilla Release 78.9.0ESR
+
 * Thu Feb 25 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-3.rh1
 - Add Mozilla patch #1692706
 
diff --git a/sources b/sources
index e4b2413..c1ae927 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 6c016bcf40166f6b31531cb1da700706ff982884d65eeafa613031888c42ed6c8fff484403e7c0aa076f36dc722e98c8a9bfff413b933fecd225713b3dee8932
-SHA512 (icecat-78.8.0-langpacks.tar.gz) = 2496c0da1bc9de5effd95fc6be75478bd9627a69fcd18e1098b5c5bc41e7ed1b6eb573f9dc355a3cfc4919164ba81ba8c1c7724daff043ff2b1ea13849547aa4
-SHA512 (icecat-78.8.0-rh1.tar.bz2) = 7248b9d161628e738a8ea17b5de832adba03c59c54181d708fa53e49b4e1ca13eaa029980cf365c3fba947ca331852ca4bbdc430a2e725b7da177859f401308b
+SHA512 (icecat-78.9.0-langpacks.tar.gz) = d8eab56257141bdcb9a653ff2058c69b1b84ae7b2a2ecdb3f7b53ac3cd4d15be77d8e2abb375a07fc166d71c850e9d0524eb07892d121c352f9c726997956ea0
+SHA512 (icecat-78.9.0-rh1.tar.bz2) = 278f6200a4fd73a45701e7ac0d5a159150858a9f1f6a165c8d5f789ea0825be9729f09e943fc5ce4b18a6f39ddf2c902e0d24606894ae9efab860e1853d66b73
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 6509dc78d0ab2bf0bad756f56513184a467c6503 Mon Sep 17 00:00:00 2001
From: Antonio Trande <3974791-anto.trande@users.noreply.gitlab.com>
Date: Tue, 23 Mar 2021 18:35:52 +0100
Subject: [PATCH 221/473] Mozilla Release 78.9.0ESR |Exclude PowerPC64le

---
 icecat.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 415d6fb..f610dc5 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,3 +1,6 @@
+# Temporarily disabled, filed as rhbz#1932204
+ExcludeArch: ppc64le 
+
 ### Naming ###
 # Set to true if it's going to be submitted as update
 %global release_build 1

From 081e3616e7c18ceb8ab1855f13fbf367abdcfed3 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 30 Mar 2021 19:38:56 +0100
Subject: [PATCH 222/473] Rebuilt for removed libstdc++ symbol (#1937698)

---
 icecat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index f610dc5..23ae751 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -113,7 +113,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.9.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -875,6 +875,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 78.9.0-2.rh1
+- Rebuilt for removed libstdc++ symbol (#1937698)
+
 * Tue Mar 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.9.0-1.rh1
 - Mozilla Release 78.9.0ESR
 

From cb5f569e13bbd453ba448f8dc2d092926efa32ce Mon Sep 17 00:00:00 2001
From: Antonio Trande <3974791-anto.trande@users.noreply.gitlab.com>
Date: Thu, 1 Apr 2021 14:27:07 +0200
Subject: [PATCH 223/473] Patched for Mozilla bug #1613672

---
 icecat-mozilla-1613672.patch | 84 ++++++++++++++++++++++++++++++++++++
 icecat.spec                  |  8 +++-
 2 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 icecat-mozilla-1613672.patch

diff --git a/icecat-mozilla-1613672.patch b/icecat-mozilla-1613672.patch
new file mode 100644
index 0000000..b9f11cb
--- /dev/null
+++ b/icecat-mozilla-1613672.patch
@@ -0,0 +1,84 @@
+
+# HG changeset patch
+# User alwu <alwu@mozilla.com>
+# Date 1608617164 0
+# Node ID 1c00de8c800ee726863fab0a9245e2c9a8e58136
+# Parent  ab7649dc7fddc8fd9a81a54d61b1e7221fc298ca
+Bug 1613672 - return `NS_ERROR_DOM_MEDIA_CANCELED` to indicate that track buffer manager has been detached from the demuxer. r=jya
+
+When we shutdown `MediaSourceDecoder`, it would trigger a shutdown for `MDSM` and a detaching for media source.
+
+In the previous one, that would eventually shutdown `MediaFormatReader` via tasks going through different threads (main->MDSM->MFR's supervisor).
+
+In the latter one, it would eventually detach the `TrackBufferManager` from the `MediaSourceTrackDemuxer`. (main->Demuxer's supervisor)
+
+As these two tasks running in different threads, and the latter usually get finished before the former one, which would result in `MediaSourceTrackDemuxer` no longer being able to get a sample.
+
+When that happens, the reader hasn't been shutdown yet, so it's still holding track demuxers and keeps requesting data from them. Then demuxers would return error because their corresponding track managers have been detached.
+
+The reader would report the demuxing error to the console, but that's acutally not a fatal error, because in this situation the reader is going to be shutdown soon. Therefore, return `NS_ERROR_DOM_MEDIA_CANCELED` to allow MFR to treat this error differently.
+
+Differential Revision: https://phabricator.services.mozilla.com/D100153
+
+diff --git a/dom/media/mediasource/MediaSourceDemuxer.cpp b/dom/media/mediasource/MediaSourceDemuxer.cpp
+--- a/dom/media/mediasource/MediaSourceDemuxer.cpp
++++ b/dom/media/mediasource/MediaSourceDemuxer.cpp
+@@ -338,17 +338,17 @@ void MediaSourceTrackDemuxer::BreakCycle
+   MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
+   Unused << rv;
+ }
+ 
+ RefPtr<MediaSourceTrackDemuxer::SeekPromise> MediaSourceTrackDemuxer::DoSeek(
+     const TimeUnit& aTime) {
+   if (!mManager) {
+     return SeekPromise::CreateAndReject(
+-        MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,
++        MediaResult(NS_ERROR_DOM_MEDIA_CANCELED,
+                     RESULT_DETAIL("manager is detached.")),
+         __func__);
+   }
+ 
+   MOZ_ASSERT(OnTaskQueue());
+   TimeIntervals buffered = mManager->Buffered(mType);
+   // Fuzz factor represents a +/- threshold. So when seeking it allows the gap
+   // to be twice as big as the fuzz value. We only want to allow EOS_FUZZ gap.
+@@ -390,17 +390,17 @@ RefPtr<MediaSourceTrackDemuxer::SeekProm
+   }
+   return SeekPromise::CreateAndResolve(seekTime, __func__);
+ }
+ 
+ RefPtr<MediaSourceTrackDemuxer::SamplesPromise>
+ MediaSourceTrackDemuxer::DoGetSamples(int32_t aNumSamples) {
+   if (!mManager) {
+     return SamplesPromise::CreateAndReject(
+-        MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,
++        MediaResult(NS_ERROR_DOM_MEDIA_CANCELED,
+                     RESULT_DETAIL("manager is detached.")),
+         __func__);
+   }
+ 
+   MOZ_ASSERT(OnTaskQueue());
+   if (mReset) {
+     // If a seek (or reset) was recently performed, we ensure that the data
+     // we are about to retrieve is still available.
+@@ -446,17 +446,17 @@ MediaSourceTrackDemuxer::DoGetSamples(in
+   return SamplesPromise::CreateAndResolve(samples, __func__);
+ }
+ 
+ RefPtr<MediaSourceTrackDemuxer::SkipAccessPointPromise>
+ MediaSourceTrackDemuxer::DoSkipToNextRandomAccessPoint(
+     const TimeUnit& aTimeThreadshold) {
+   if (!mManager) {
+     return SkipAccessPointPromise::CreateAndReject(
+-        SkipFailureHolder(MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,
++        SkipFailureHolder(MediaResult(NS_ERROR_DOM_MEDIA_CANCELED,
+                                       RESULT_DETAIL("manager is detached.")),
+                           0),
+         __func__);
+   }
+ 
+   MOZ_ASSERT(OnTaskQueue());
+   uint32_t parsed = 0;
+   // Ensure that the data we are about to skip to is still available.
+
+
diff --git a/icecat.spec b/icecat.spec
index 23ae751..7e12ce7 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -113,7 +113,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.9.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -195,8 +195,8 @@ Patch422: mozilla-1580174-webrtc-popup.patch
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
 Patch424: %{name}-mozilla-1669471.patch
-
 Patch425: mozilla-1692706.patch
+Patch426: %{name}-mozilla-1613672.patch
 
 # PGO/LTO patches
 Patch600: %{name}-pgo.patch
@@ -412,6 +412,7 @@ tar -xf %{SOURCE5}
 %patch423 -p1 -b .1596503
 %patch424 -p1 -b .1669471
 %patch425 -p1 -b .1692706
+%patch426 -p1 -b .1613672
 
 # Wayland specific upstream patches
 %patch565 -p1 -b .firefox-pipewire
@@ -875,6 +876,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Thu Apr 01 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.9.0-3.rh1
+- Patched for Mozilla bug #1613672
+
 * Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 78.9.0-2.rh1
 - Rebuilt for removed libstdc++ symbol (#1937698)
 

From 91270370e0cbcfe3ca7152867b21cafeeae43b61 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 9 Apr 2021 12:44:54 +0200
Subject: [PATCH 224/473] Debug build on| Use cbindgen 0.18.0

---
 icecat.spec | 11 +++++++----
 sources     |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 7e12ce7..188c3de 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -20,14 +20,14 @@ ExcludeArch: ppc64le
 %global extra_ver %{nil}
 %endif
 
-#%%global pre_tag .test
-%global pre_tag %{nil}
+%global pre_tag .test
+#%%global pre_tag %%{nil}
 
 ####################
 
 ### Optimization ###
 # Builds for debugging
-%global debug_build   0
+%global debug_build   1
 
 # Downgrade optimization
 %global less_optbuild 0
@@ -500,6 +500,7 @@ echo "ac_add_options --enable-av1" >> .mozconfig
 %if 0%{?debug_build}
 echo "ac_add_options --enable-debug" >> .mozconfig
 echo "ac_add_options --disable-optimize" >> .mozconfig
+echo "ac_add_options --enable-rust-debug" >> .mozconfig
 %else
 %global optimize_flags "none"
 %ifarch %{arm} s390x
@@ -876,8 +877,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
-* Thu Apr 01 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.9.0-3.rh1
+* Fri Apr 09 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.9.0-3.rh1
 - Patched for Mozilla bug #1613672
+- Use cbindgen 0.18.0
+- Debug build on
 
 * Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 78.9.0-2.rh1
 - Rebuilt for removed libstdc++ symbol (#1937698)
diff --git a/sources b/sources
index c1ae927..61bed4d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = 6c016bcf40166f6b31531cb1da700706ff982884d65eeafa613031888c42ed6c8fff484403e7c0aa076f36dc722e98c8a9bfff413b933fecd225713b3dee8932
+SHA512 (cbindgen-vendor.tar.xz) = 657a601d6b2a19488b5ea00f97ab04d461048f9954892bfdaf725943a3f26d492c77ddae3ce256b1c2cfd3bd3543c7b6f9ea8a4a89311fb5158afe4af6422369
 SHA512 (icecat-78.9.0-langpacks.tar.gz) = d8eab56257141bdcb9a653ff2058c69b1b84ae7b2a2ecdb3f7b53ac3cd4d15be77d8e2abb375a07fc166d71c850e9d0524eb07892d121c352f9c726997956ea0
 SHA512 (icecat-78.9.0-rh1.tar.bz2) = 278f6200a4fd73a45701e7ac0d5a159150858a9f1f6a165c8d5f789ea0825be9729f09e943fc5ce4b18a6f39ddf2c902e0d24606894ae9efab860e1853d66b73
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 6d50ea16f303111bca3a85efffb58d0cc01074b2 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Mon, 19 Apr 2021 20:14:10 +0200
Subject: [PATCH 225/473] Mozilla Release 78.10.0ESR

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 19 +++++++++----------
 sources                 |  4 ++--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 00b8800..e9b2627 100644
--- a/.gitignore
+++ b/.gitignore
@@ -149,3 +149,5 @@
 /icecat-78.8.0-rh1.tar.bz2
 /icecat-78.9.0-langpacks.tar.gz
 /icecat-78.9.0-rh1.tar.bz2
+/icecat-78.10.0-langpacks.tar.gz
+/icecat-78.10.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 0352d7a..ac12c31 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.9.0
+VERSION=78.10.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 188c3de..64c93c5 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -20,14 +20,14 @@ ExcludeArch: ppc64le
 %global extra_ver %{nil}
 %endif
 
-%global pre_tag .test
-#%%global pre_tag %%{nil}
+#%%global pre_tag .test
+%global pre_tag %{nil}
 
 ####################
 
 ### Optimization ###
 # Builds for debugging
-%global debug_build   1
+%global debug_build   0
 
 # Downgrade optimization
 %global less_optbuild 0
@@ -74,14 +74,9 @@ ExcludeArch: ppc64le
 %endif
 
 # Use system libicu?
-%if 0%{?fedora} > 32
 %global system_libicu 1
-%else
-%global system_libicu 0
-%endif
 
 %global system_nss  1
-
 %if %{?system_nss}
 %global nspr_version 4.25.0
 %global nspr_build_version %{nspr_version}
@@ -112,8 +107,8 @@ ExcludeArch: ppc64le
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 78.9.0
-Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.10.0
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -192,6 +187,7 @@ Patch403: mozilla-1640567.patch
 Patch412: mozilla-1337988.patch
 Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
+
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
 Patch424: %{name}-mozilla-1669471.patch
@@ -877,6 +873,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Mon Apr 19 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.10.0-1.rh1
+- Mozilla Release 78.10.0ESR
+
 * Fri Apr 09 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.9.0-3.rh1
 - Patched for Mozilla bug #1613672
 - Use cbindgen 0.18.0
diff --git a/sources b/sources
index 61bed4d..6fc3cd7 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 657a601d6b2a19488b5ea00f97ab04d461048f9954892bfdaf725943a3f26d492c77ddae3ce256b1c2cfd3bd3543c7b6f9ea8a4a89311fb5158afe4af6422369
-SHA512 (icecat-78.9.0-langpacks.tar.gz) = d8eab56257141bdcb9a653ff2058c69b1b84ae7b2a2ecdb3f7b53ac3cd4d15be77d8e2abb375a07fc166d71c850e9d0524eb07892d121c352f9c726997956ea0
-SHA512 (icecat-78.9.0-rh1.tar.bz2) = 278f6200a4fd73a45701e7ac0d5a159150858a9f1f6a165c8d5f789ea0825be9729f09e943fc5ce4b18a6f39ddf2c902e0d24606894ae9efab860e1853d66b73
+SHA512 (icecat-78.10.0-langpacks.tar.gz) = 7aaf75e84daaa27bafaebeb5e83c91a9fad4fa02268a1fd89eb08340e96a0866405f6ca2ca71952cebb944727fba830b2729f7918d2338dbbdc678232f2a1f70
+SHA512 (icecat-78.10.0-rh1.tar.bz2) = b2469af6a918e9867bf1e3a105542f71505b26244741ee998e647967a28f91932577277a9960ba22906acdffd27fec48f57fcc26a4b8fe5fb55b305445545f50
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 0369e52267d9589974de9a84d7999fc66f599f10 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 24 Apr 2021 14:57:37 +0200
Subject: [PATCH 226/473] Patched for rhbz#1945720 (Mozilla bug #1680166)

---
 icecat.spec           |   7 +-
 mozilla-1680166.patch | 154 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 160 insertions(+), 1 deletion(-)
 create mode 100644 mozilla-1680166.patch

diff --git a/icecat.spec b/icecat.spec
index 64c93c5..c092210 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -108,7 +108,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.10.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -184,6 +184,7 @@ Patch226: rhbz-1354671.patch
 Patch401: mozilla-1526653.patch
 Patch402: mozilla-1196777.patch
 Patch403: mozilla-1640567.patch
+Patch404: mozilla-1680166.patch
 Patch412: mozilla-1337988.patch
 Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
@@ -405,6 +406,7 @@ tar -xf %{SOURCE5}
 
 %patch402 -p1 -b .1196777
 %patch403 -p1 -b .1640567
+%patch404 -p1 -b .1680166
 %patch423 -p1 -b .1596503
 %patch424 -p1 -b .1669471
 %patch425 -p1 -b .1692706
@@ -873,6 +875,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Sat Apr 24 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.10.0-2.rh1
+- Patched for rhbz#1945720 (Mozilla bug #1680166)
+
 * Mon Apr 19 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.10.0-1.rh1
 - Mozilla Release 78.10.0ESR
 
diff --git a/mozilla-1680166.patch b/mozilla-1680166.patch
new file mode 100644
index 0000000..896f56a
--- /dev/null
+++ b/mozilla-1680166.patch
@@ -0,0 +1,154 @@
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio@crisal.io>
+# Date 1606907116 0
+# Node ID 60066199c32b9ea7a6ade0fcb562ef0cecb6146c
+# Parent  127c98c188479c4149e02f7cb106a57c438f192f
+Bug 1680166 - Return EFAULT when given a null path to stat* calls in the sandbox filter. r=gcp
+
+It's a common way to check the existence of system calls. Glibc may fall
+back to fstatat when statx is called, passing down the null path.
+
+Since we handle fstatat, let's return -EFAULT the same way the real
+fstatat syscall would do.
+
+This is needed for the sandbox not to constantly crash due to this statx
+call in rustc:
+
+https://github.com/rust-lang/rust/blob/09c9c9f7da72b774cc445c0f56fc0b9792a49647/library/std/src/sys/unix/fs.rs#L119-L123
+
+Differential Revision: https://phabricator.services.mozilla.com/D98414
+
+diff --git a/security/sandbox/linux/SandboxBrokerClient.cpp b/security/sandbox/linux/SandboxBrokerClient.cpp
+--- a/security/sandbox/linux/SandboxBrokerClient.cpp
++++ b/security/sandbox/linux/SandboxBrokerClient.cpp
+@@ -154,21 +154,29 @@ int SandboxBrokerClient::Open(const char
+ }
+ 
+ int SandboxBrokerClient::Access(const char* aPath, int aMode) {
+   Request req = {SANDBOX_FILE_ACCESS, aMode, 0};
+   return DoCall(&req, aPath, nullptr, nullptr, false);
+ }
+ 
+ int SandboxBrokerClient::Stat(const char* aPath, statstruct* aStat) {
++  if (!aPath || !aStat) {
++    return -EFAULT;
++  }
++
+   Request req = {SANDBOX_FILE_STAT, 0, sizeof(statstruct)};
+   return DoCall(&req, aPath, nullptr, (void*)aStat, false);
+ }
+ 
+ int SandboxBrokerClient::LStat(const char* aPath, statstruct* aStat) {
++  if (!aPath || !aStat) {
++    return -EFAULT;
++  }
++
+   Request req = {SANDBOX_FILE_STAT, O_NOFOLLOW, sizeof(statstruct)};
+   return DoCall(&req, aPath, nullptr, (void*)aStat, false);
+ }
+ 
+ int SandboxBrokerClient::Chmod(const char* aPath, int aMode) {
+   Request req = {SANDBOX_FILE_CHMOD, aMode, 0};
+   return DoCall(&req, aPath, nullptr, nullptr, false);
+ }
+diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp
+--- a/security/sandbox/linux/SandboxFilter.cpp
++++ b/security/sandbox/linux/SandboxFilter.cpp
+@@ -244,8 +244,8 @@
+     auto buf = reinterpret_cast<statstruct*>(aArgs.args[2]);
+     auto flags = static_cast<int>(aArgs.args[3]);
+ 
+-    if (fd != AT_FDCWD && (flags & AT_EMPTY_PATH) != 0 &&
+-        strcmp(path, "") == 0) {
++    if (fd != AT_FDCWD && (flags & AT_EMPTY_PATH) && path &&
++        !strcmp(path, "")) {
+ #ifdef __NR_fstat64
+       return DoSyscall(__NR_fstat64, fd, buf);
+ #else
+@@ -257,7 +257,7 @@
+       return BlockedSyscallTrap(aArgs, nullptr);
+     }
+ 
+-    if (fd != AT_FDCWD && path[0] != '/') {
++    if (fd != AT_FDCWD && path && path[0] != '/') {
+       SANDBOX_LOG_ERROR("unsupported fd-relative fstatat(%d, \"%s\", %p, %d)",
+                         fd, path, buf, flags);
+       return BlockedSyscallTrap(aArgs, nullptr);
+diff --git a/security/sandbox/linux/gtest/TestBroker.cpp b/security/sandbox/linux/gtest/TestBroker.cpp
+--- a/security/sandbox/linux/gtest/TestBroker.cpp
++++ b/security/sandbox/linux/gtest/TestBroker.cpp
+@@ -212,16 +212,24 @@ TEST_F(SandboxBrokerTest, Access) {
+ 
+ TEST_F(SandboxBrokerTest, Stat) {
+   statstruct realStat, brokeredStat;
+   ASSERT_EQ(0, statsyscall("/dev/null", &realStat)) << "Shouldn't ever fail!";
+   EXPECT_EQ(0, Stat("/dev/null", &brokeredStat));
+   EXPECT_EQ(realStat.st_ino, brokeredStat.st_ino);
+   EXPECT_EQ(realStat.st_rdev, brokeredStat.st_rdev);
+ 
++  // Add some indirection to avoid -Wnonnull warnings.
++  [&](const char* aPath) {
++    EXPECT_EQ(-1, statsyscall(aPath, &realStat));
++    EXPECT_EQ(errno, EFAULT);
++
++    EXPECT_EQ(-EFAULT, Stat(aPath, &brokeredStat));
++  }(nullptr);
++
+   EXPECT_EQ(-ENOENT, Stat("/var/empty/qwertyuiop", &brokeredStat));
+   EXPECT_EQ(-EACCES, Stat("/dev", &brokeredStat));
+ 
+   EXPECT_EQ(0, Stat("/proc/self", &brokeredStat));
+   EXPECT_TRUE(S_ISDIR(brokeredStat.st_mode));
+ }
+ 
+ TEST_F(SandboxBrokerTest, LStat) {
+
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio@crisal.io>
+# Date 1606915787 -3600
+# Node ID d69e924f3538ff0e7f536435ada4743d50681636
+# Parent  1e73f114efc56ea47b4887f42082ff0ffd14e73d
+Bug 1680166 - GCC is smarter than clang, so ignore the warning properly.
+
+CLOSED TREE
+
+MANUAL PUSH: Base toolchain build bustage.
+
+
+diff --git a/security/sandbox/linux/gtest/TestBroker.cpp b/security/sandbox/linux/gtest/TestBroker.cpp
+--- a/security/sandbox/linux/gtest/TestBroker.cpp
++++ b/security/sandbox/linux/gtest/TestBroker.cpp
+@@ -212,23 +212,27 @@ TEST_F(SandboxBrokerTest, Access) {
+ 
+ TEST_F(SandboxBrokerTest, Stat) {
+   statstruct realStat, brokeredStat;
+   ASSERT_EQ(0, statsyscall("/dev/null", &realStat)) << "Shouldn't ever fail!";
+   EXPECT_EQ(0, Stat("/dev/null", &brokeredStat));
+   EXPECT_EQ(realStat.st_ino, brokeredStat.st_ino);
+   EXPECT_EQ(realStat.st_rdev, brokeredStat.st_rdev);
+ 
+-  // Add some indirection to avoid -Wnonnull warnings.
+-  [&](const char* aPath) {
+-    EXPECT_EQ(-1, statsyscall(aPath, &realStat));
+-    EXPECT_EQ(errno, EFAULT);
++#if defined(__clang__) || defined(__GNUC__)
++#  pragma GCC diagnostic push
++#  pragma GCC diagnostic ignored "-Wnonnull"
++#endif
++  EXPECT_EQ(-1, statsyscall(nullptr, &realStat));
++  EXPECT_EQ(errno, EFAULT);
+ 
+-    EXPECT_EQ(-EFAULT, Stat(aPath, &brokeredStat));
+-  }(nullptr);
++  EXPECT_EQ(-EFAULT, Stat(nullptr, &brokeredStat));
++#if defined(__clang__) || defined(__GNUC__)
++#  pragma GCC diagnostic pop
++#endif
+ 
+   EXPECT_EQ(-ENOENT, Stat("/var/empty/qwertyuiop", &brokeredStat));
+   EXPECT_EQ(-EACCES, Stat("/dev", &brokeredStat));
+ 
+   EXPECT_EQ(0, Stat("/proc/self", &brokeredStat));
+   EXPECT_TRUE(S_ISDIR(brokeredStat.st_mode));
+ }
+ 

From 619a0f6a90a38fcbe7f752b7cd82b46c722d61c6 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 24 Apr 2021 20:39:53 +0200
Subject: [PATCH 227/473] Remove Mozilla references from IceCat releases

---
 icecat.spec | 108 ++++++++++++++++++++++++++--------------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index c092210..903249b 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -322,7 +322,7 @@ Provides: webclient
 Provides: bundled(mozilla-https-everywhere) = 2021.1.27
 
 %description
-GNU IceCat is the GNU version of the Firefox ESR browser.
+GNU IceCat is the GNU version of the Firefox  browser.
 Extensions included to this version of IceCat:
 
  * LibreJS
@@ -879,10 +879,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Patched for rhbz#1945720 (Mozilla bug #1680166)
 
 * Mon Apr 19 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.10.0-1.rh1
-- Mozilla Release 78.10.0ESR
+- Release 78.10.0
 
 * Fri Apr 09 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.9.0-3.rh1
-- Patched for Mozilla bug #1613672
+- Patched for bug #1613672
 - Use cbindgen 0.18.0
 - Debug build on
 
@@ -890,20 +890,20 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Rebuilt for removed libstdc++ symbol (#1937698)
 
 * Tue Mar 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.9.0-1.rh1
-- Mozilla Release 78.9.0ESR
+- Release 78.9.0
 
 * Thu Feb 25 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-3.rh1
-- Add Mozilla patch #1692706
+- Add patch #1692706
 
 * Tue Feb 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-2.rh1
 - Exclude Power64 (rhbz#1932204)
 - Fix build option for s390x
 
 * Tue Feb 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-1.rh1
-- Mozilla Release 78.8.0ESR
+- Release 78.8.0
 
 * Fri Feb 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.1-1.rh1
-- Mozilla Release 78.7.1ESR
+- Release 78.7.1
 
 * Fri Feb 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.0-3.rh2
 - Fix parameter passing on ppc64le (mozb#1690152)
@@ -914,7 +914,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - HTTPS Everywhere 2021.1.27
 
 * Tue Jan 26 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.0-1.rh1
-- Mozilla Release 78.7.0ESR
+- Release 78.7.0
 
 * Mon Jan 11 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.6.1-3.rh1
 - Added a workaround for rhbz#1908018
@@ -923,7 +923,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Fix desktop files
 
 * Wed Jan 06 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.6.1-1.rh1
-- Mozilla Release 78.6.1ESR
+- Release 78.6.1
 
 * Sat Dec 26 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-6.rh1
 - Use wayland/x11 launchers
@@ -945,7 +945,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Disable PGO builds (x86_64)
 
 * Tue Dec 15 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-1.rh1
-- Mozilla Release 78.6.0ESR
+- Release 78.6.0
 - Disable system nss (rhbz#1908018)
 
 * Thu Nov 19 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.5.0-2.rh2
@@ -953,13 +953,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - HTTPS Everywhere 2020.11.17
 
 * Mon Nov 16 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.5.0-1.rh1
-- Mozilla Release 78.5.0ESR
+- Release 78.5.0
 
 * Tue Oct 27 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.4.0-2.rh1
 - Patched for rhbz#1891234
 
 * Fri Oct 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.4.0-1.rh1
-- Mozilla Release 78.4.0ESR
+- Release 78.4.0
 - Regenerate cbindgen-0.14.3
 - Patched for using Rust-1.47 (mzbz#1663715)
 
@@ -967,56 +967,56 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - PGO build test
 
 * Thu Oct 01 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.1-1.rh1
-- Mozilla Release 78.3.1ESR (rh1)
+- Release 78.3.1 (rh1)
 - Patched for mzbz#1640567
 
 * Wed Sep 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.0-2.rh1
 - Rebuild for libevent-2.1.12
 
 * Mon Sep 21 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.0-1.rh1
-- Mozilla Release 78.3.0ESR (rh1)
+- Release 78.3.0 (rh1)
 
 * Fri Sep 18 2020 Miro Hrončok <mhroncok@redhat.com> - 78.2.0-7.rh6
 - Use python3 instead of python2 for build
 
 * Wed Sep 09 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-6.rh6
-- Build Release 78.2.0ESR-rh6
+- Build Release 78.2.0-rh6
 
 * Tue Sep 08 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-5.rh5
 - Add configure options to allow loading unsigned bundled addons
 
 * Sun Sep 06 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-4.rh5
-- Build Release 78.2.0ESR-rh5
+- Build Release 78.2.0-rh5
 
 * Sun Sep 06 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-3.rh4
-- Build Release 78.2.0ESR-rh4
+- Build Release 78.2.0-rh4
 - PPC64le build disabled on Fedora 33
 
 * Thu Sep 03 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-2.rh3
-- Build Release 78.2.0ESR-rh3
+- Build Release 78.2.0-rh3
 - Reintroduce PPC64LE builds
 
 * Tue Aug 25 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-1.rh2
-- Mozilla Release 78.2.0ESR
+- Release 78.2.0
 
 * Sun Aug 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-0.1.rc1.rh1.test
-- Mozilla Release Candidate 78.2.0ESR
+- Release Candidate 78.2.0
 
 * Wed Jul 29 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0.1-2.rh1.test
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
 * Thu Jul 02 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0.1-1.rh1.test
-- Mozilla Release 78.0.1ESR
+- Release 78.0.1
 - Disable crash reporter
 
 * Wed Jul 01 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0-1.rh1.test
-- Mozilla Release 78.0ESR
+- Release 78.0
 
 * Tue Jun 02 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.9.0-1.rh2
-- Mozilla release 68.9.0ESR
+- Release 68.9.0
 
 * Thu May 28 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.9.0-0.1.rc1.rh1
-- Mozilla release candidate 68.9.0ESR build1
+- Release candidate 68.9.0 build1
 
 * Wed May 20 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-5.rh1
 - Explicit perl-interpreter BR dependency
@@ -1032,11 +1032,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Don't exclude aarch64 architecture
 
 * Tue May 05 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-1.rh1
-- Mozilla release 68.8.0ESR
+- Release 68.8.0
 - Exclude s390x architecture
 
 * Tue Apr 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.7.0-1.rh1
-- Mozilla release 68.7.0ESR
+- Release 68.7.0
 
 * Sun Mar 29 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-4.rh4
 - Remove libgen addon
@@ -1049,26 +1049,26 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Remove useless build dependency
 
 * Tue Mar 10 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-1.rh2
-- Mozilla release 68.6.0ESR
+- Release 68.6.0
 
 * Sat Mar 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-0.1.rc1.rh1
-- Mozilla release candidate 68.6.0ESR
+- Release candidate 68.6.0
 
 * Mon Feb 10 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.5.0-1.rh1
-- Mozilla release 68.5.0ESR (Mozilla release)
+- Release 68.5.0
 
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 68.4.1-2.rh1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 - Undefine strict symbol checks on s390x
 
 * Sat Jan 11 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.1-1.rh1
-- Mozilla release 68.4.1ESR (release build)
+- Release 68.4.1 (release build)
 
 * Wed Jan 08 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-2.rh2
-- Mozilla release 68.4.0ESR (release build)
+- Release 68.4.0 (release build)
 
 * Tue Jan 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-1.rh2.test
-- Mozilla release 68.4.0ESR
+- Release 68.4.0
 - Test build for ARM and s390x
 - Patched for mzbz#1526653 to disable wasm on ARM
 - Add --disable-av1 build option for ARM
@@ -1078,7 +1078,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Use rh prefix instead of gnu
 
 * Wed Jan 01 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-0.1.rc1.gnu1
-- Mozilla release candidate 68.4.0ESR
+- Release candidate 68.4.0
 - Fix rhbz#1785956
 
 * Thu Dec 05 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.3.0-2.gnu1
@@ -1086,11 +1086,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Description updated
 
 * Wed Dec 04 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.3.0-1.gnu1
-- Mozilla release 68.3.0ESR
+- Release 68.3.0
 - Patch for cbindgen/rust-1.39
 
 * Wed Nov 27 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.3.0-0.1.rc2.gnu1
-- Mozilla release candidate 68.3.0ESR
+- Release candidate 68.3.0
 
 * Fri Nov 22 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.2.0-4.gnu3.test
 - Build release 68.2.0-gnu3
@@ -1107,10 +1107,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Patched for Mozilla bug #1556602
 
 * Tue Oct 22 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.2.0-1.gnu1
-- Mozilla release 68.2.0ESR
+- Release 68.2.0
 
 * Tue Sep 03 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.1.0-1.gnu1
-- Mozilla release 68.1.0ESR
+- Release 68.1.0
 - Incorporate Wayland patches from Firefox 68
 
 * Sun Sep 01 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.0.2-5.gnu3
@@ -1129,7 +1129,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Disable MOZ_SERVICES_SYNC
 
 * Thu Aug 15 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.0.2-1.gnu1
-- Mozilla release 68.0.2ESR
+- Release 68.0.2
 - Import cbindgen stuff from Firefox package
 - Do not use sqlite from system
 
@@ -1153,29 +1153,29 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Use mozilla-1512162.patch on Fedora 30+ only (GCC-9)
 
 * Tue Jul 09 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.8.0-1.gnu1
-- Mozilla release 60.8.0ESR
+- Release 60.8.0
 
 * Sat Jun 22 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.7.2-1.gnu1
-- Mozilla release 60.7.2ESR
+- Release 60.7.2
 
 * Wed Jun 19 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.7.1-1.gnu1
-- Mozilla release 60.7.1ESR
+- Release 60.7.1
 - Do not list Git-tracked icecat.rpmlintrc as source
 
 * Tue May 28 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.7.0-2.gnu2
 - Build release 60.7.0-gnu2
 
 * Mon May 20 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.7.0-1.gnu1
-- Mozilla release 60.7.0ESR
+- Release 60.7.0
 
 * Sun May 12 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.3-2.gnu2
 - Build release 60.6.3-gnu2
 
 * Thu May 09 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.3-1.gnu1
-- Mozilla release 60.6.3ESR (bugfix mozb #1549249)
+- Release 60.6.3 (bugfix mozb #1549249)
 
 * Mon May 06 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.2-1.gnu1
-- Mozilla release 60.6.2ESR (bugfix mozb #1549061)
+- Release 60.6.2 (bugfix mozb #1549061)
 
 * Sat Apr 06 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.1-2.gnu2
 - Source archive rebuilt (gnu2)
@@ -1183,7 +1183,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Use bundled https-everywhere extension
 
 * Fri Mar 22 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.1-1
-- Mozilla release 60.6.1ESR
+- Release 60.6.1
 - Wayland backend made default starting from Fedora 31 (rhbz#1691852)
 
 * Thu Mar 21 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.0-2
@@ -1192,24 +1192,24 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Language files re-based
 
 * Tue Mar 19 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.0-1
-- Mozilla release 60.6.0ESR
+- Release 60.6.0
 - Enable languages
 
 * Sun Mar 03 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.5.2-1
-- Mozilla release 60.5.2ESR
+- Release 60.5.2
 - Disable Werror-format-security flags
 - Enable linker=gold on ARM
 - Try to fix libevent LD path
 
 * Thu Feb 14 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.5.1-1
-- Mozilla release 60.5.1ESR
+- Release 60.5.1
 - Conditional macro for libvpx support
 
 * Tue Feb 05 2019 Björn Esser <besser82@fedoraproject.org> - 60.5.0-2
 - rebuilt (libvpx)
 
 * Tue Jan 29 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.5.0-1
-- Mozilla release 60.5.0ESR
+- Release 60.5.0
 
 * Sun Jan 13 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.4.0-2
 - Make Wayland support default on fedora 30+
@@ -1219,7 +1219,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Added fix for mozbz#1507475 - crash when display changes 
 
 * Wed Dec 12 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.4.0-1
-- Upstream release 60.4.0ESR
+- Upstream release 60.4.0
 
 * Tue Nov 13 2018 Caolán McNamara <caolanm@redhat.com> - 60.3.0-4
 - rebuild for hunspell-1.7.0
@@ -1231,21 +1231,21 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 - Drop UserAgent patch (rhbz#1644898)
 
 * Wed Oct 24 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.3.0-1
-- Upstream release 60.3.0ESR
+- Upstream release 60.3.0
 
 * Wed Oct 03 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.2.2-2
 - Drop UserAgent patch (rhbz#1644898)
 
 * Wed Oct 03 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.2.2-1
-- Upstream release 60.2.2ESR
+- Upstream release 60.2.2
 
 * Fri Sep 28 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.2.1-1
 - Upstream release 60.2.1
 
 * Fri Sep 14 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.2.0-0.1
-- Pre-release 60.2.0ESR
+- Pre-release 60.2.0
 - Integrate firefox patches for wayland (disabled)
-- Setting of upstream patches for ESR60
+- Setting of upstream patches for 60 releases
 - Manpage updated
 - Include languages
 - Use options to reduce memory requirements at ld runtime on ix86

From b6c017a43979eae716668b740979c43332d09e2e Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 24 Apr 2021 20:44:01 +0200
Subject: [PATCH 228/473] Fix HTTPS-Everywhere version

---
 icecat.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 903249b..591139c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -319,10 +319,10 @@ Requires: fedora-bookmarks
 Suggests: mozilla-ublock-origin
 
 Provides: webclient
-Provides: bundled(mozilla-https-everywhere) = 2021.1.27
+Provides: bundled(mozilla-https-everywhere) = 2021.4.15
 
 %description
-GNU IceCat is the GNU version of the Firefox  browser.
+GNU IceCat is the GNU version of the Firefox ESR browser.
 Extensions included to this version of IceCat:
 
  * LibreJS

From e09feac67aa1143496684486b55a5a377369e6f3 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 5 May 2021 14:12:52 +0200
Subject: [PATCH 229/473] Release 78.10.1

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 7 +++++--
 sources                 | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e9b2627..3bd017b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -151,3 +151,5 @@
 /icecat-78.9.0-rh1.tar.bz2
 /icecat-78.10.0-langpacks.tar.gz
 /icecat-78.10.0-rh1.tar.bz2
+/icecat-78.10.1-langpacks.tar.gz
+/icecat-78.10.1-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index ac12c31..25bf7e6 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.10.0
+VERSION=78.10.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 591139c..b39a167 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -107,8 +107,8 @@ ExcludeArch: ppc64le
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 78.10.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.10.1
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -875,6 +875,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Wed May 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.10.1-1.rh1
+- Release 78.10.1
+
 * Sat Apr 24 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.10.0-2.rh1
 - Patched for rhbz#1945720 (Mozilla bug #1680166)
 
diff --git a/sources b/sources
index 6fc3cd7..31d827f 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 657a601d6b2a19488b5ea00f97ab04d461048f9954892bfdaf725943a3f26d492c77ddae3ce256b1c2cfd3bd3543c7b6f9ea8a4a89311fb5158afe4af6422369
-SHA512 (icecat-78.10.0-langpacks.tar.gz) = 7aaf75e84daaa27bafaebeb5e83c91a9fad4fa02268a1fd89eb08340e96a0866405f6ca2ca71952cebb944727fba830b2729f7918d2338dbbdc678232f2a1f70
-SHA512 (icecat-78.10.0-rh1.tar.bz2) = b2469af6a918e9867bf1e3a105542f71505b26244741ee998e647967a28f91932577277a9960ba22906acdffd27fec48f57fcc26a4b8fe5fb55b305445545f50
+SHA512 (icecat-78.10.1-langpacks.tar.gz) = 8dc6cbc3bc803621ab7557ffb5d6233d2e523f023b38bd11b34d1648ca46f2f4a5beec3286ed33194942f323eb5c5aa9677998258141c9909a896d6003a24d71
+SHA512 (icecat-78.10.1-rh1.tar.bz2) = 70afbc63c32a9feba77e026a9fc4ab2ff643954a4017c24a9eb903e27e0d4ecf0914a45e13380abe9b26790afcfc89b7db6580d1d5bcacb0c8d324105bfbd809
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 8e06f28b96969b1308337d53d34e32c57fc2e3e0 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 7 May 2021 14:17:39 +0200
Subject: [PATCH 230/473] Hide DRM Content option in Preference

---
 icecat.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index b39a167..bc40fc1 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -108,7 +108,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.10.1
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -443,6 +443,9 @@ echo "ac_add_options --enable-default-toolkit=cairo-gtk3-wayland" >> .mozconfig
 echo "ac_add_options --enable-official-branding" >> .mozconfig
 echo "ac_add_options --disable-webrtc" >> .mozconfig
 
+# Hide DRM Content option
+echo "ac_add_options --disable-eme" >> .mozconfig
+
 %if %{with pulseaudio}
 echo "ac_add_options --enable-pulseaudio" >> .mozconfig
 %endif
@@ -875,6 +878,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Fri May 07 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.10.1-2.rh1
+- Hide DRM Content option in Preference
+
 * Wed May 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.10.1-1.rh1
 - Release 78.10.1
 

From 0af939cb41adbe68061c655e4066486c358394ba Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 7 May 2021 17:36:26 +0200
Subject: [PATCH 231/473] Change Preference's options links

---
 icecat-set_about_preference_links.patch | 42 +++++++++++++++++++++++++
 icecat.spec                             |  5 +++
 2 files changed, 47 insertions(+)
 create mode 100644 icecat-set_about_preference_links.patch

diff --git a/icecat-set_about_preference_links.patch b/icecat-set_about_preference_links.patch
new file mode 100644
index 0000000..48f57db
--- /dev/null
+++ b/icecat-set_about_preference_links.patch
@@ -0,0 +1,42 @@
+--- a/browser/components/preferences/main.origin.js	2021-05-05 13:29:46.000000000 +0200
++++ b/browser/components/preferences/main.js	2021-05-07 16:34:53.559049056 +0200
+@@ -347,8 +347,7 @@
+       "performanceSettingsLearnMore"
+     );
+     let performanceSettingsUrl =
+-      Services.urlFormatter.formatURLPref("app.support.baseURL") +
+-      "performance";
++      Services.urlFormatter.formatURLPref("https://support.mozilla.org/en-US/kb/performance-settings");
+     performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
+ 
+     this.updateDefaultPerformanceSettingsPref();
+@@ -365,8 +364,7 @@
+       "connectionSettingsLearnMore"
+     );
+     let connectionSettingsUrl =
+-      Services.urlFormatter.formatURLPref("app.support.baseURL") +
+-      "prefs-connection-settings";
++      Services.urlFormatter.formatURLPref("https://support.mozilla.org/en-US/kb/connection-settings-firefox");
+     connectionSettingsLink.setAttribute("href", connectionSettingsUrl);
+     this.updateProxySettingsUI();
+     initializeProxyUI(gMainPane);
+@@ -396,8 +394,7 @@
+       document.getElementById("pictureInPictureBox").hidden = false;
+ 
+       let pipLearnMoreUrl =
+-        Services.urlFormatter.formatURLPref("app.support.baseURL") +
+-        "picture-in-picture";
++        Services.urlFormatter.formatURLPref("https://support.mozilla.org/en-US/kb/about-picture-picture-firefox");
+       let link = document.getElementById("pictureInPictureLearnMore");
+       link.setAttribute("href", pipLearnMoreUrl);
+     }
+@@ -548,8 +545,7 @@
+     }
+ 
+     let drmInfoURL =
+-      Services.urlFormatter.formatURLPref("app.support.baseURL") +
+-      "drm-content";
++      Services.urlFormatter.formatURLPref("https://www.gnu.org/proprietary/proprietary-drm.html.en");
+     document
+       .getElementById("playDRMContentLink")
+       .setAttribute("href", drmInfoURL);
diff --git a/icecat.spec b/icecat.spec
index bc40fc1..fca55ce 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -158,6 +158,7 @@ Patch2: %{name}-libevent_linkflag.patch
 Patch3: mozilla-build-arm.patch
 Patch4: %{name}-build-arm-libaom.patch
 Patch5: rhbz-1219542-s390-build.patch
+Patch6: icecat-set_about_preference_links.patch
 
 # Unrecognized file?
 Patch7: %{name}-fix_jar.patch
@@ -380,6 +381,7 @@ tar -xf %{SOURCE5}
 %ifarch s390
 %patch5 -p1 -b .rhbz-1219542-s390
 %endif
+%patch6 -p1 -b .set_about_preference_links
 %patch7 -p0 -b .fix_jar
 %patch8 -p0 -b .fix_installer
 
@@ -444,7 +446,10 @@ echo "ac_add_options --enable-official-branding" >> .mozconfig
 echo "ac_add_options --disable-webrtc" >> .mozconfig
 
 # Hide DRM Content option
+# This option does not work on other architectures
+%ifarch x86_64 %{ix86}
 echo "ac_add_options --disable-eme" >> .mozconfig
+%endif
 
 %if %{with pulseaudio}
 echo "ac_add_options --enable-pulseaudio" >> .mozconfig

From 9759e8da0550f3076e5800c0414d0e0a4b4463aa Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 7 May 2021 21:47:04 +0200
Subject: [PATCH 232/473] Undo latest patch

---
 icecat-set_about_preference_links.patch | 42 -------------------------
 icecat.spec                             |  2 --
 2 files changed, 44 deletions(-)
 delete mode 100644 icecat-set_about_preference_links.patch

diff --git a/icecat-set_about_preference_links.patch b/icecat-set_about_preference_links.patch
deleted file mode 100644
index 48f57db..0000000
--- a/icecat-set_about_preference_links.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/browser/components/preferences/main.origin.js	2021-05-05 13:29:46.000000000 +0200
-+++ b/browser/components/preferences/main.js	2021-05-07 16:34:53.559049056 +0200
-@@ -347,8 +347,7 @@
-       "performanceSettingsLearnMore"
-     );
-     let performanceSettingsUrl =
--      Services.urlFormatter.formatURLPref("app.support.baseURL") +
--      "performance";
-+      Services.urlFormatter.formatURLPref("https://support.mozilla.org/en-US/kb/performance-settings");
-     performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
- 
-     this.updateDefaultPerformanceSettingsPref();
-@@ -365,8 +364,7 @@
-       "connectionSettingsLearnMore"
-     );
-     let connectionSettingsUrl =
--      Services.urlFormatter.formatURLPref("app.support.baseURL") +
--      "prefs-connection-settings";
-+      Services.urlFormatter.formatURLPref("https://support.mozilla.org/en-US/kb/connection-settings-firefox");
-     connectionSettingsLink.setAttribute("href", connectionSettingsUrl);
-     this.updateProxySettingsUI();
-     initializeProxyUI(gMainPane);
-@@ -396,8 +394,7 @@
-       document.getElementById("pictureInPictureBox").hidden = false;
- 
-       let pipLearnMoreUrl =
--        Services.urlFormatter.formatURLPref("app.support.baseURL") +
--        "picture-in-picture";
-+        Services.urlFormatter.formatURLPref("https://support.mozilla.org/en-US/kb/about-picture-picture-firefox");
-       let link = document.getElementById("pictureInPictureLearnMore");
-       link.setAttribute("href", pipLearnMoreUrl);
-     }
-@@ -548,8 +545,7 @@
-     }
- 
-     let drmInfoURL =
--      Services.urlFormatter.formatURLPref("app.support.baseURL") +
--      "drm-content";
-+      Services.urlFormatter.formatURLPref("https://www.gnu.org/proprietary/proprietary-drm.html.en");
-     document
-       .getElementById("playDRMContentLink")
-       .setAttribute("href", drmInfoURL);
diff --git a/icecat.spec b/icecat.spec
index fca55ce..633ca20 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -158,7 +158,6 @@ Patch2: %{name}-libevent_linkflag.patch
 Patch3: mozilla-build-arm.patch
 Patch4: %{name}-build-arm-libaom.patch
 Patch5: rhbz-1219542-s390-build.patch
-Patch6: icecat-set_about_preference_links.patch
 
 # Unrecognized file?
 Patch7: %{name}-fix_jar.patch
@@ -381,7 +380,6 @@ tar -xf %{SOURCE5}
 %ifarch s390
 %patch5 -p1 -b .rhbz-1219542-s390
 %endif
-%patch6 -p1 -b .set_about_preference_links
 %patch7 -p0 -b .fix_jar
 %patch8 -p0 -b .fix_installer
 

From 04e3898d89ef5435baa7443cb9c3881d51f15fdc Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 21 May 2021 12:41:25 +0200
Subject: [PATCH 233/473] Add README.md

---
 README.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..926586d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,34 @@
+GNU IceCat is the GNU version of the Firefox ESR browser.
+Extensions included to this version of IceCat:
+
+ * LibreJS
+   GNU LibreJS aims to address the JavaScript problem described in the article
+   "The JavaScript Trap" of Richard Stallman.
+
+ * HTTPS Everywhere
+   HTTPS Everywhere is an extension that encrypts your communications with
+   many major websites, making your browsing more secure.
+
+ * ViewTube
+   Watch videos from video sharing websites with extra options.
+
+ * A set of companion extensions for LibreJS by Nathan Nichols
+   are pre-installed, and provide workarounds to use some services at USPS,
+   RSF.org, SumOfUs.org, pay.gov, McDonalds, goteo.org and Google Docs
+   without using nonfree JavaScript.
+
+ * A series of configuration changes and tweaks were applied to ensure that
+   IceCat does not initiate network connections that the user has not explicitly
+   requested. This implies not downloading feeds, updates, blacklists or any
+   other similar data needed during startup.
+
+Origin of the name
+
+The name “IceCat” was coined to show our relationship to the Mozilla Firefox browser. Ice isn't Fire and a Cat isn't a Fox, so it is clearly a different package (we don't want Mozilla blamed for our mistakes, nor cause confusion with their trademarks), but is equally clearly intimately related (of course nearly all of the work comes from the Mozilla foundation effort, so we want to give credit).
+
+The gNewSense BurningDog browser and the Debian IceWeasel browser are similarly derived from Firefox, also with the intent of being free software. Technically, however, these projects are maintained entirely independently of IceCat. (Previously, this GNU browser project was also named IceWeasel, but that proved confusing.)
+About GNU and the GNU Philosophy
+
+The [GNU Project](https://www.gnu.org/) was launched in 1984 to develop a complete Unix-like operating system which is [free software—free as in freedom, not price](https://www.gnu.org/philosophy/free-sw.html). Its principal sponsor is the [Free Software Foundation](https://www.fsf.org/).
+
+The [free software philosophy](https://www.gnu.org/philosophy/philosophy.html) is the root and motivation of the guidelines and goals of the whole free software movement, a worldwide community.

From 0a6e454fe582858ccd03a177c85daf70ea9b2cbf Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 21 May 2021 12:48:12 +0200
Subject: [PATCH 234/473] Modify README.md

---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 926586d..4b63398 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,18 @@
-GNU IceCat is the GNU version of the Firefox ESR browser.
+[GNU IceCat](https://www.gnu.org/software/gnuzilla/) is the GNU version of the Firefox ESR browser.
 Extensions included to this version of IceCat:
 
  * LibreJS
+
    GNU LibreJS aims to address the JavaScript problem described in the article
-   "The JavaScript Trap" of Richard Stallman.
+   "[The JavaScript Trap](https://www.gnu.org/philosophy/javascript-trap.html)" of Richard Stallman.
 
  * HTTPS Everywhere
+
    HTTPS Everywhere is an extension that encrypts your communications with
    many major websites, making your browsing more secure.
 
  * ViewTube
+
    Watch videos from video sharing websites with extra options.
 
  * A set of companion extensions for LibreJS by Nathan Nichols

From 49440028dedc46e7a789bc576caca1c9258ea895 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 1 Jun 2021 14:11:54 +0200
Subject: [PATCH 235/473] Release 78.11.0

---
 .gitignore              |   2 +
 icecat-lang_download.sh |   2 +-
 icecat.spec             |  11 +--
 mozilla-1680166.patch   | 154 ----------------------------------------
 sources                 |   4 +-
 5 files changed, 12 insertions(+), 161 deletions(-)
 delete mode 100644 mozilla-1680166.patch

diff --git a/.gitignore b/.gitignore
index 3bd017b..043a7c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -153,3 +153,5 @@
 /icecat-78.10.0-rh1.tar.bz2
 /icecat-78.10.1-langpacks.tar.gz
 /icecat-78.10.1-rh1.tar.bz2
+/icecat-78.11.0-langpacks.tar.gz
+/icecat-78.11.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 25bf7e6..9099b8f 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.10.1
+VERSION=78.11.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 633ca20..7778d41 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -107,8 +107,8 @@ ExcludeArch: ppc64le
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 78.10.1
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.11.0
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -184,7 +184,6 @@ Patch226: rhbz-1354671.patch
 Patch401: mozilla-1526653.patch
 Patch402: mozilla-1196777.patch
 Patch403: mozilla-1640567.patch
-Patch404: mozilla-1680166.patch
 Patch412: mozilla-1337988.patch
 Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
@@ -240,7 +239,9 @@ BuildRequires: java-1.8.0-openjdk-headless
 BuildRequires: intltool
 BuildRequires: libappstream-glib
 BuildRequires: libevent-devel
+%if 0%{?system_libicu}
 BuildRequires: libicu-devel
+%endif
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libX11-devel
@@ -406,7 +407,6 @@ tar -xf %{SOURCE5}
 
 %patch402 -p1 -b .1196777
 %patch403 -p1 -b .1640567
-%patch404 -p1 -b .1680166
 %patch423 -p1 -b .1596503
 %patch424 -p1 -b .1669471
 %patch425 -p1 -b .1692706
@@ -881,6 +881,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Jun 01 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.11.0-1.rh1
+- Release 78.11.0
+
 * Fri May 07 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.10.1-2.rh1
 - Hide DRM Content option in Preference
 
diff --git a/mozilla-1680166.patch b/mozilla-1680166.patch
deleted file mode 100644
index 896f56a..0000000
--- a/mozilla-1680166.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1606907116 0
-# Node ID 60066199c32b9ea7a6ade0fcb562ef0cecb6146c
-# Parent  127c98c188479c4149e02f7cb106a57c438f192f
-Bug 1680166 - Return EFAULT when given a null path to stat* calls in the sandbox filter. r=gcp
-
-It's a common way to check the existence of system calls. Glibc may fall
-back to fstatat when statx is called, passing down the null path.
-
-Since we handle fstatat, let's return -EFAULT the same way the real
-fstatat syscall would do.
-
-This is needed for the sandbox not to constantly crash due to this statx
-call in rustc:
-
-https://github.com/rust-lang/rust/blob/09c9c9f7da72b774cc445c0f56fc0b9792a49647/library/std/src/sys/unix/fs.rs#L119-L123
-
-Differential Revision: https://phabricator.services.mozilla.com/D98414
-
-diff --git a/security/sandbox/linux/SandboxBrokerClient.cpp b/security/sandbox/linux/SandboxBrokerClient.cpp
---- a/security/sandbox/linux/SandboxBrokerClient.cpp
-+++ b/security/sandbox/linux/SandboxBrokerClient.cpp
-@@ -154,21 +154,29 @@ int SandboxBrokerClient::Open(const char
- }
- 
- int SandboxBrokerClient::Access(const char* aPath, int aMode) {
-   Request req = {SANDBOX_FILE_ACCESS, aMode, 0};
-   return DoCall(&req, aPath, nullptr, nullptr, false);
- }
- 
- int SandboxBrokerClient::Stat(const char* aPath, statstruct* aStat) {
-+  if (!aPath || !aStat) {
-+    return -EFAULT;
-+  }
-+
-   Request req = {SANDBOX_FILE_STAT, 0, sizeof(statstruct)};
-   return DoCall(&req, aPath, nullptr, (void*)aStat, false);
- }
- 
- int SandboxBrokerClient::LStat(const char* aPath, statstruct* aStat) {
-+  if (!aPath || !aStat) {
-+    return -EFAULT;
-+  }
-+
-   Request req = {SANDBOX_FILE_STAT, O_NOFOLLOW, sizeof(statstruct)};
-   return DoCall(&req, aPath, nullptr, (void*)aStat, false);
- }
- 
- int SandboxBrokerClient::Chmod(const char* aPath, int aMode) {
-   Request req = {SANDBOX_FILE_CHMOD, aMode, 0};
-   return DoCall(&req, aPath, nullptr, nullptr, false);
- }
-diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp
---- a/security/sandbox/linux/SandboxFilter.cpp
-+++ b/security/sandbox/linux/SandboxFilter.cpp
-@@ -244,8 +244,8 @@
-     auto buf = reinterpret_cast<statstruct*>(aArgs.args[2]);
-     auto flags = static_cast<int>(aArgs.args[3]);
- 
--    if (fd != AT_FDCWD && (flags & AT_EMPTY_PATH) != 0 &&
--        strcmp(path, "") == 0) {
-+    if (fd != AT_FDCWD && (flags & AT_EMPTY_PATH) && path &&
-+        !strcmp(path, "")) {
- #ifdef __NR_fstat64
-       return DoSyscall(__NR_fstat64, fd, buf);
- #else
-@@ -257,7 +257,7 @@
-       return BlockedSyscallTrap(aArgs, nullptr);
-     }
- 
--    if (fd != AT_FDCWD && path[0] != '/') {
-+    if (fd != AT_FDCWD && path && path[0] != '/') {
-       SANDBOX_LOG_ERROR("unsupported fd-relative fstatat(%d, \"%s\", %p, %d)",
-                         fd, path, buf, flags);
-       return BlockedSyscallTrap(aArgs, nullptr);
-diff --git a/security/sandbox/linux/gtest/TestBroker.cpp b/security/sandbox/linux/gtest/TestBroker.cpp
---- a/security/sandbox/linux/gtest/TestBroker.cpp
-+++ b/security/sandbox/linux/gtest/TestBroker.cpp
-@@ -212,16 +212,24 @@ TEST_F(SandboxBrokerTest, Access) {
- 
- TEST_F(SandboxBrokerTest, Stat) {
-   statstruct realStat, brokeredStat;
-   ASSERT_EQ(0, statsyscall("/dev/null", &realStat)) << "Shouldn't ever fail!";
-   EXPECT_EQ(0, Stat("/dev/null", &brokeredStat));
-   EXPECT_EQ(realStat.st_ino, brokeredStat.st_ino);
-   EXPECT_EQ(realStat.st_rdev, brokeredStat.st_rdev);
- 
-+  // Add some indirection to avoid -Wnonnull warnings.
-+  [&](const char* aPath) {
-+    EXPECT_EQ(-1, statsyscall(aPath, &realStat));
-+    EXPECT_EQ(errno, EFAULT);
-+
-+    EXPECT_EQ(-EFAULT, Stat(aPath, &brokeredStat));
-+  }(nullptr);
-+
-   EXPECT_EQ(-ENOENT, Stat("/var/empty/qwertyuiop", &brokeredStat));
-   EXPECT_EQ(-EACCES, Stat("/dev", &brokeredStat));
- 
-   EXPECT_EQ(0, Stat("/proc/self", &brokeredStat));
-   EXPECT_TRUE(S_ISDIR(brokeredStat.st_mode));
- }
- 
- TEST_F(SandboxBrokerTest, LStat) {
-
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1606915787 -3600
-# Node ID d69e924f3538ff0e7f536435ada4743d50681636
-# Parent  1e73f114efc56ea47b4887f42082ff0ffd14e73d
-Bug 1680166 - GCC is smarter than clang, so ignore the warning properly.
-
-CLOSED TREE
-
-MANUAL PUSH: Base toolchain build bustage.
-
-
-diff --git a/security/sandbox/linux/gtest/TestBroker.cpp b/security/sandbox/linux/gtest/TestBroker.cpp
---- a/security/sandbox/linux/gtest/TestBroker.cpp
-+++ b/security/sandbox/linux/gtest/TestBroker.cpp
-@@ -212,23 +212,27 @@ TEST_F(SandboxBrokerTest, Access) {
- 
- TEST_F(SandboxBrokerTest, Stat) {
-   statstruct realStat, brokeredStat;
-   ASSERT_EQ(0, statsyscall("/dev/null", &realStat)) << "Shouldn't ever fail!";
-   EXPECT_EQ(0, Stat("/dev/null", &brokeredStat));
-   EXPECT_EQ(realStat.st_ino, brokeredStat.st_ino);
-   EXPECT_EQ(realStat.st_rdev, brokeredStat.st_rdev);
- 
--  // Add some indirection to avoid -Wnonnull warnings.
--  [&](const char* aPath) {
--    EXPECT_EQ(-1, statsyscall(aPath, &realStat));
--    EXPECT_EQ(errno, EFAULT);
-+#if defined(__clang__) || defined(__GNUC__)
-+#  pragma GCC diagnostic push
-+#  pragma GCC diagnostic ignored "-Wnonnull"
-+#endif
-+  EXPECT_EQ(-1, statsyscall(nullptr, &realStat));
-+  EXPECT_EQ(errno, EFAULT);
- 
--    EXPECT_EQ(-EFAULT, Stat(aPath, &brokeredStat));
--  }(nullptr);
-+  EXPECT_EQ(-EFAULT, Stat(nullptr, &brokeredStat));
-+#if defined(__clang__) || defined(__GNUC__)
-+#  pragma GCC diagnostic pop
-+#endif
- 
-   EXPECT_EQ(-ENOENT, Stat("/var/empty/qwertyuiop", &brokeredStat));
-   EXPECT_EQ(-EACCES, Stat("/dev", &brokeredStat));
- 
-   EXPECT_EQ(0, Stat("/proc/self", &brokeredStat));
-   EXPECT_TRUE(S_ISDIR(brokeredStat.st_mode));
- }
- 
diff --git a/sources b/sources
index 31d827f..e6b986d 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 657a601d6b2a19488b5ea00f97ab04d461048f9954892bfdaf725943a3f26d492c77ddae3ce256b1c2cfd3bd3543c7b6f9ea8a4a89311fb5158afe4af6422369
-SHA512 (icecat-78.10.1-langpacks.tar.gz) = 8dc6cbc3bc803621ab7557ffb5d6233d2e523f023b38bd11b34d1648ca46f2f4a5beec3286ed33194942f323eb5c5aa9677998258141c9909a896d6003a24d71
-SHA512 (icecat-78.10.1-rh1.tar.bz2) = 70afbc63c32a9feba77e026a9fc4ab2ff643954a4017c24a9eb903e27e0d4ecf0914a45e13380abe9b26790afcfc89b7db6580d1d5bcacb0c8d324105bfbd809
+SHA512 (icecat-78.11.0-langpacks.tar.gz) = 46a4d54362f8841a25ead9baea13e98deace6dea904561757da63cab0645529648d5f6edaaee2fcc7c18a842dd597a49b9681309af5d8fec44737740dd9bbd2b
+SHA512 (icecat-78.11.0-rh1.tar.bz2) = d7f493ce01eaa710ba8c48b306cbea3afa678f20f7f5f91f1871e1002b4091229ec22577f444453c2ff2af8ae55e8424ce3f1f43a18948e286fd35d5e4fe90ca
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 84ea78579f7868f3a441215c8d3a471eca086bc5 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 13 Jul 2021 13:41:11 +0200
Subject: [PATCH 236/473] Release 78.12.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 9 ++++++---
 sources                 | 6 +++---
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 043a7c6..3926efa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -155,3 +155,5 @@
 /icecat-78.10.1-rh1.tar.bz2
 /icecat-78.11.0-langpacks.tar.gz
 /icecat-78.11.0-rh1.tar.bz2
+/icecat-78.12.0-langpacks.tar.gz
+/icecat-78.12.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 9099b8f..eecd885 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.11.0
+VERSION=78.12.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 7778d41..0289d10 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -78,9 +78,9 @@ ExcludeArch: ppc64le
 
 %global system_nss  1
 %if %{?system_nss}
-%global nspr_version 4.25.0
+%global nspr_version 4.31.0
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.60.0
+%global nss_version 3.67.0
 %global nss_build_version %{nss_version}
 %endif
 
@@ -107,7 +107,7 @@ ExcludeArch: ppc64le
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 78.11.0
+Version: 78.12.0
 Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -881,6 +881,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Jul 13 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.12.0-1.rh1
+- Release 78.12.0
+
 * Tue Jun 01 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.11.0-1.rh1
 - Release 78.11.0
 
diff --git a/sources b/sources
index e6b986d..02ee231 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (cbindgen-vendor.tar.xz) = 657a601d6b2a19488b5ea00f97ab04d461048f9954892bfdaf725943a3f26d492c77ddae3ce256b1c2cfd3bd3543c7b6f9ea8a4a89311fb5158afe4af6422369
-SHA512 (icecat-78.11.0-langpacks.tar.gz) = 46a4d54362f8841a25ead9baea13e98deace6dea904561757da63cab0645529648d5f6edaaee2fcc7c18a842dd597a49b9681309af5d8fec44737740dd9bbd2b
-SHA512 (icecat-78.11.0-rh1.tar.bz2) = d7f493ce01eaa710ba8c48b306cbea3afa678f20f7f5f91f1871e1002b4091229ec22577f444453c2ff2af8ae55e8424ce3f1f43a18948e286fd35d5e4fe90ca
+SHA512 (cbindgen-vendor.tar.xz) = 8654d175beda0f9db24470641473bf6236539e7dc68daa8f20b5c0343a89434aeba8e254a07a0668e4516c78a5a1383946a225da6fdb63584cf8ccda2a7927b2
+SHA512 (icecat-78.12.0-langpacks.tar.gz) = c877089e583d8fff4542c9e0b5f21a9c2bb76f0ea00906190f5bb8c4991d65322d699cb13b2eb73f19e88d92f7e00ed67b61a19c0006ed7827697bea9352ad15
+SHA512 (icecat-78.12.0-rh1.tar.bz2) = 075be66a0cf823057f77db088cccfd4e46b7e136a205f74ac39a5dfec9391785a83262fb9b3e2dc9cabb3f024982ee3e0e2677de39b36ce6d7163e5515be9fa3
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 9350b80cd5665510183c3a477174c4744d437fe2 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 13 Jul 2021 21:22:13 +0200
Subject: [PATCH 237/473] Try to fix importing error with Python-3.10

---
 icecat-porting_to_python310.patch | 11 +++++++++++
 icecat.spec                       |  5 +++++
 2 files changed, 16 insertions(+)
 create mode 100644 icecat-porting_to_python310.patch

diff --git a/icecat-porting_to_python310.patch b/icecat-porting_to_python310.patch
new file mode 100644
index 0000000..370fa20
--- /dev/null
+++ b/icecat-porting_to_python310.patch
@@ -0,0 +1,11 @@
+--- a/python/mach/mach/main.orig.py	2021-07-13 12:17:15.000000000 +0200
++++ b/python/mach/mach/main.py	2021-07-13 20:34:52.467189729 +0200
+@@ -16,7 +16,7 @@
+ import sys
+ import traceback
+ import uuid
+-from collections import Iterable
++from collections.abc import Iterable
+ 
+ from six import string_types
+ 
diff --git a/icecat.spec b/icecat.spec
index 0289d10..d780f14 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -176,6 +176,7 @@ Patch55: mozilla-1669442.patch
 Patch219: rhbz-1173156.patch
 Patch220: firefox-nss-version.patch
 Patch221: firefox-nss-addon-hack.patch
+Patch222: %{name}-porting_to_python310.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
@@ -393,6 +394,10 @@ tar -xf %{SOURCE5}
 #%%patch220 -p1 -b .nss-version
 %patch221 -p1 -b .firefox-nss-addon-hack
 
+%if 0%{?python3_version_nodots} > 39
+%patch222 -p1 -b .porting_to_python310
+%endif
+
 # ARM run-time patch
 %ifarch aarch64
 %patch40 -p1 -b .aarch64-skia

From 59bca841130a2c6b757f3549985ce1c8048edbbb Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 14 Jul 2021 13:25:04 +0200
Subject: [PATCH 238/473] Try to fix importing error with Python-3.10 /2

---
 icecat-porting_to_python310.patch | 274 +++++++++++++++++++++++++++++-
 1 file changed, 271 insertions(+), 3 deletions(-)

diff --git a/icecat-porting_to_python310.patch b/icecat-porting_to_python310.patch
index 370fa20..ae6bfab 100644
--- a/icecat-porting_to_python310.patch
+++ b/icecat-porting_to_python310.patch
@@ -1,6 +1,108 @@
---- a/python/mach/mach/main.orig.py	2021-07-13 12:17:15.000000000 +0200
-+++ b/python/mach/mach/main.py	2021-07-13 20:34:52.467189729 +0200
-@@ -16,7 +16,7 @@
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio@crisal.io>
+# Date 1625585189 0
+# Node ID 2418633d529c6df00a83e973295eed0e891990a6
+# Parent  0b5bfe85b344b34894f72176099da78c3849b5cc
+Bug 1719144 - Fix various imports for Python 3.10. r=firefox-build-system-reviewers,mhentges
+
+These are enough for me to run bootstrap+configure+build.
+
+Some touch third-party code (gyp), but per discussion in the earlier
+versions of this revision that seems fine.
+
+Differential Revision: https://phabricator.services.mozilla.com/D119080
+
+diff --git a/python/mach/mach/config.py b/python/mach/mach/config.py
+--- a/python/mach/mach/config.py
++++ b/python/mach/mach/config.py
+@@ -17,6 +17,7 @@
+ from __future__ import absolute_import, unicode_literals
+ 
+ import collections
++import collections.abc
+ import os
+ import sys
+ import six
+@@ -144,7 +145,7 @@
+     return _
+ 
+ 
+-class ConfigSettings(collections.Mapping):
++class ConfigSettings(collections.abc.Mapping):
+     """Interface for configuration settings.
+ 
+     This is the main interface to the configuration.
+@@ -190,7 +191,7 @@
+     will result in exceptions being raised.
+     """
+ 
+-    class ConfigSection(collections.MutableMapping, object):
++    class ConfigSection(collections.abc.MutableMapping, object):
+         """Represents an individual config section."""
+         def __init__(self, config, name, settings):
+             object.__setattr__(self, '_config', config)
+@@ -312,8 +313,8 @@
+         self._config.write(fh)
+ 
+     @classmethod
+-    def _format_metadata(cls, provider, section, option, type_cls, description,
+-                         default=DefaultValue, extra=None):
++    def _format_metadata(cls, provider, section, option, type_cls, description,
++                         default=DefaultValue, extra=None):
+         """Formats and returns the metadata for a setting.
+ 
+         Each setting must have:
+@@ -340,10 +340,7 @@
+         if isinstance(type_cls, string_types):
+             type_cls = TYPE_CLASSES[type_cls]
+ 
+-        meta = {
+-            'description': description,
+-            'type_cls': type_cls,
+-        }
++        meta = {'description': description, 'type_cls': type_cls}
+ 
+         if default != DefaultValue:
+             meta['default'] = default
+diff --git a/python/mach/mach/decorators.py b/python/mach/mach/decorators.py
+--- a/python/mach/mach/decorators.py
++++ b/python/mach/mach/decorators.py
+@@ -1,16 +1,17 @@
+ # 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/.
+ 
+ from __future__ import absolute_import, unicode_literals
+ 
+ import argparse
+ import collections
++import collections.abc
+ 
+ from .base import MachError
+ from .registrar import Registrar
+ from mozbuild.base import MachCommandBase
+ 
+ 
+ class _MachCommand(object):
+     """Container for mach command metadata."""
+@@ -140,7 +141,7 @@
+               'Conditions argument must take a list ' + \
+               'of functions. Found %s instead.'
+ 
+-        if not isinstance(command.conditions, collections.Iterable):
++        if not isinstance(command.conditions, collections.abc.Iterable):
+             msg = msg % (command.name, type(command.conditions))
+             raise MachError(msg)
+ 
+diff --git a/python/mach/mach/main.py b/python/mach/mach/main.py
+--- a/python/mach/mach/main.py
++++ b/python/mach/mach/main.py
+@@ -11,17 +11,17 @@ import argparse
+ import codecs
+ import errno
+ import imp
+ import logging
+ import os
  import sys
  import traceback
  import uuid
@@ -9,3 +111,169 @@
  
  from six import string_types
  
+ from .base import (
+     CommandContext,
+     MachError,
+     MissingFileError,
+     NoCommandError,
+diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py
+--- a/python/mozbuild/mozbuild/backend/configenvironment.py
++++ b/python/mozbuild/mozbuild/backend/configenvironment.py
+@@ -4,17 +4,18 @@
+ 
+ from __future__ import absolute_import, print_function
+ 
+ import os
+ import six
+ import sys
+ import json
+ 
+-from collections import Iterable, OrderedDict
++from collections.abc import Iterable
++from collections import OrderedDict
+ from types import ModuleType
+ 
+ import mozpack.path as mozpath
+ 
+ from mozbuild.util import (
+     FileAvoidWrite,
+     memoized_property,
+     ReadOnlyDict,
+@@ -63,10 +64,7 @@
+                     compile(source, path, 'exec', dont_inherit=1)
+                 )
+ 
+-        g = {
+-            '__builtins__': __builtins__,
+-            '__file__': path,
+-        }
++        g = {"__builtins__": __builtins__, "__file__": path}
+         l = {}
+         try:
+             exec(code_cache[path][1], g, l)
+diff --git a/python/mozbuild/mozbuild/makeutil.py b/python/mozbuild/mozbuild/makeutil.py
+--- a/python/mozbuild/mozbuild/makeutil.py
++++ b/python/mozbuild/mozbuild/makeutil.py
+@@ -7,7 +7,7 @@
+ import os
+ import re
+ import six
+-from collections import Iterable
++from collections.abc import Iterable
+ 
+ 
+ class Makefile(object):
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -4,16 +4,17 @@
+ 
+ # This file contains miscellaneous utility functions that don't belong anywhere
+ # in particular.
+ 
+ from __future__ import absolute_import, print_function, unicode_literals
+ 
+ import argparse
+ import collections
++import collections.abc
+ import ctypes
+ import difflib
+ import errno
+ import functools
+ import hashlib
+ import io
+ import itertools
+ import os
+@@ -782,7 +783,7 @@
+         self._strings = StrictOrderingOnAppendList()
+         self._children = {}
+ 
+-    class StringListAdaptor(collections.Sequence):
++    class StringListAdaptor(collections.abc.Sequence):
+         def __init__(self, hsl):
+             self._hsl = hsl
+ 
+diff --git a/taskcluster/taskgraph/util/schema.py b/taskcluster/taskgraph/util/schema.py
+--- a/taskcluster/taskgraph/util/schema.py
++++ b/taskcluster/taskgraph/util/schema.py
+@@ -6,7 +6,7 @@
+ 
+ import re
+ import pprint
+-import collections
++import collections.abc
+ import voluptuous
+ 
+ from six import text_type, iteritems
+@@ -160,7 +160,7 @@
+                     'Unexpected type in YAML schema: {} @ {}'.format(
+                         type(k).__name__, path))
+ 
+-        if isinstance(sch, collections.Mapping):
++        if isinstance(sch, collections.abc.Mapping):
+             for k, v in iteritems(sch):
+                 child = "{}[{!r}]".format(path, k)
+                 check_identifier(child, k)
+diff --git a/third_party/python/gyp/pylib/gyp/common.py b/third_party/python/gyp/pylib/gyp/common.py
+--- a/third_party/python/gyp/pylib/gyp/common.py
++++ b/third_party/python/gyp/pylib/gyp/common.py
+@@ -1,15 +1,16 @@
+ # Copyright (c) 2012 Google Inc. All rights reserved.
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
+ from __future__ import with_statement
+ 
+ import collections
++import collections.abc
+ import errno
+ import filecmp
+ import os.path
+ import re
+ import tempfile
+ import sys
+ 
+ 
+@@ -489,17 +490,17 @@ def uniquer(seq, idfun=None):
+         marker = idfun(item)
+         if marker in seen: continue
+         seen[marker] = 1
+         result.append(item)
+     return result
+ 
+ 
+ # Based on http://code.activestate.com/recipes/576694/.
+-class OrderedSet(collections.MutableSet):
++class OrderedSet(collections.abc.MutableSet):
+   def __init__(self, iterable=None):
+     self.end = end = []
+     end += [None, end, end]         # sentinel node for doubly linked list
+     self.map = {}                   # key --> [key, prev, next]
+     if iterable is not None:
+       self |= iterable
+ 
+   def __len__(self):
+
+
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio@crisal.io>
+# Date 1625657350 -7200
+# Node ID 6b2a1a09cd4735386414483dd4050c25f9e58e86
+# Parent  d2ab10b1b1619f8e2473837ed9043ad28c842aa5
+Bug 1719144 - Keep some code python2 compatible since we still run it in some windows talos jobs.
+
+MANUAL PUSH: Orange fix CLOSED TREE
+
+
+diff --git a/testing/mozbase/manifestparser/manifestparser/filters.py b/testing/mozbase/manifestparser/manifestparser/filters.py
+--- a/testing/mozbase/manifestparser/manifestparser/filters.py
++++ b/testing/mozbase/manifestparser/manifestparser/filters.py
+@@ -12,7 +12,7 @@
+ 
+ import itertools
+ import os
+-from collections import defaultdict, MutableSequence
++from collections.abc import MutableSequence
+ 
+ import six
+ from six import string_types

From e2f677ed86ece504de83a5d002f90dc1385fa6bf Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 14 Jul 2021 14:39:20 +0200
Subject: [PATCH 239/473] Try to fix importing error with Python-3.10 /3

---
 icecat-porting_to_python310.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/icecat-porting_to_python310.patch b/icecat-porting_to_python310.patch
index ae6bfab..62b30e7 100644
--- a/icecat-porting_to_python310.patch
+++ b/icecat-porting_to_python310.patch
@@ -277,3 +277,23 @@ diff --git a/testing/mozbase/manifestparser/manifestparser/filters.py b/testing/
  
  import six
  from six import string_types
+--- a/third_party/python/pyyaml/lib3/yaml/constructor.orig.py	2021-07-13 12:14:20.000000000 +0200
++++ b/third_party/python/pyyaml/lib3/yaml/constructor.py	2021-07-14 14:36:31.579176122 +0200
+@@ -5,7 +5,7 @@
+ from .error import *
+ from .nodes import *
+ 
+-import collections, datetime, base64, binascii, re, sys, types
++import collections.abc, datetime, base64, binascii, re, sys, types
+ 
+ class ConstructorError(MarkedYAMLError):
+     pass
+@@ -123,7 +123,7 @@
+         mapping = {}
+         for key_node, value_node in node.value:
+             key = self.construct_object(key_node, deep=deep)
+-            if not isinstance(key, collections.Hashable):
++            if not isinstance(key, collections.abc.Hashable):
+                 raise ConstructorError("while constructing a mapping", node.start_mark,
+                         "found unhashable key", key_node.start_mark)
+             value = self.construct_object(value_node, deep=deep)

From 63bcaa0bbb5bc7bdcd25567d6a81c7c9e9d74147 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 14 Jul 2021 20:40:25 +0200
Subject: [PATCH 240/473] Release 78.12.0 rebuild2 | HTTPS-everywhere-2021.7.13

---
 .gitignore  | 1 +
 icecat.spec | 7 ++++---
 sources     | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3926efa..a031239 100644
--- a/.gitignore
+++ b/.gitignore
@@ -157,3 +157,4 @@
 /icecat-78.11.0-rh1.tar.bz2
 /icecat-78.12.0-langpacks.tar.gz
 /icecat-78.12.0-rh1.tar.bz2
+/icecat-78.12.0-rh2.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index d780f14..f80b0f6 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -10,7 +10,7 @@ ExcludeArch: ppc64le
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh1
+%global redhat_ver rh2
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -321,7 +321,7 @@ Requires: fedora-bookmarks
 Suggests: mozilla-ublock-origin
 
 Provides: webclient
-Provides: bundled(mozilla-https-everywhere) = 2021.4.15
+Provides: bundled(mozilla-https-everywhere) = 2021.7.13
 
 %description
 GNU IceCat is the GNU version of the Firefox ESR browser.
@@ -886,8 +886,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
-* Tue Jul 13 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.12.0-1.rh1
+* Wed Jul 14 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.12.0-1.rh2
 - Release 78.12.0
+- HTTPS Everywhere 2021.7.13
 
 * Tue Jun 01 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.11.0-1.rh1
 - Release 78.11.0
diff --git a/sources b/sources
index 02ee231..befd8d1 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (cbindgen-vendor.tar.xz) = 8654d175beda0f9db24470641473bf6236539e7dc68daa8f20b5c0343a89434aeba8e254a07a0668e4516c78a5a1383946a225da6fdb63584cf8ccda2a7927b2
+SHA512 (cbindgen-vendor.tar.xz) = 7703fc71380cf872b75be8eecee7638e21a9a8b9480460ce90b63eaf2a841bb05ef45e80159803f6cf41c4c4fa93ff7ec217d8fdec60cbb9d7bd24a83fde4855
 SHA512 (icecat-78.12.0-langpacks.tar.gz) = c877089e583d8fff4542c9e0b5f21a9c2bb76f0ea00906190f5bb8c4991d65322d699cb13b2eb73f19e88d92f7e00ed67b61a19c0006ed7827697bea9352ad15
-SHA512 (icecat-78.12.0-rh1.tar.bz2) = 075be66a0cf823057f77db088cccfd4e46b7e136a205f74ac39a5dfec9391785a83262fb9b3e2dc9cabb3f024982ee3e0e2677de39b36ce6d7163e5515be9fa3
+SHA512 (icecat-78.12.0-rh2.tar.bz2) = 72aa068a7c611acf6d9e5f72cfb6ee5ba70225d8cca50df8653e7313c403e6e820452fc6c40789a158b89c0727feee9a73d3719b3de4001a701b03068330566c
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 2cb50428a87d998723ed0115280ceb4724054b86 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 15 Jul 2021 20:20:08 +0200
Subject: [PATCH 241/473] Enable debug build mode

---
 icecat.spec | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index f80b0f6..b8cbdb8 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -3,7 +3,7 @@ ExcludeArch: ppc64le
 
 ### Naming ###
 # Set to true if it's going to be submitted as update
-%global release_build 1
+%global release_build 0
 
 # Set to true if it's going to be submitted as release candidate
 %global release_candidate 0
@@ -21,13 +21,13 @@ ExcludeArch: ppc64le
 %endif
 
 #%%global pre_tag .test
-%global pre_tag %{nil}
+%global pre_tag .test
 
 ####################
 
 ### Optimization ###
 # Builds for debugging
-%global debug_build   0
+%global debug_build   1
 
 # Downgrade optimization
 %global less_optbuild 0
@@ -108,7 +108,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.12.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -717,15 +717,15 @@ cp -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/brow
 
 ##Resize IceCat icon
 for i in 16 22 24 32 36 48 64 72 96 128 256 ; do
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps
-  convert -geometry ${i} %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+  mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+  convert -geometry ${i} %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
 done
 
 ##desktop file installation
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE14}
+mkdir -p %{buildroot}%{_datadir}/applications
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE14}
 
-rm -rf $RPM_BUILD_ROOT%{_bindir}/%{name}
+rm -rf %{buildroot}%{_bindir}/%{name}
 %{__sed} -e 's/__DEFAULT_WAYLAND__/%{wayland_default}/' \
  -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE13} > %{buildroot}%{_bindir}/%{name}
 chmod 755 %{buildroot}%{_bindir}/%{name}
@@ -741,13 +741,13 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE9}
 #
 
 ##Install man page
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+mkdir -p %{buildroot}%{_mandir}/man1
+install -p -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/
 
 ##Extract langpacks, make any mods needed, repack the langpack, and install it.
 %if 0%{?build_langpacks}
 echo > %{name}.lang
-mkdir -p $RPM_BUILD_ROOT%{langpackdir}
+mkdir -p %{buildroot}%{langpackdir}
 tar xf %{SOURCE4}
  for langpack in `ls langpacks/*.xpi`; do
   language=`basename $langpack .xpi`
@@ -760,7 +760,7 @@ tar xf %{SOURCE4}
   zip -qq -r9mX ../${extensionID}.xpi *
   cd -
 
-  install -p -m 644 ${extensionID}.xpi $RPM_BUILD_ROOT%{langpackdir}
+  install -p -m 644 ${extensionID}.xpi %{buildroot}%{langpackdir}
   language=`echo $language | sed -e 's/-/_/g'`
   echo "%%lang($language) %{langpackdir}/${extensionID}.xpi" >> %{name}.lang
  done
@@ -770,7 +770,7 @@ rm -rf %{name}-langpacks
 function create_default_langpack() {
 language_long=$1
 language_short=$2
-cd $RPM_BUILD_ROOT%{langpackdir}
+cd %{buildroot}%{langpackdir}
 ln -s langpack-$language_long@icecat.mozilla.org.xpi langpack-$language_short@icecat.mozilla.org.xpi
 cd -
 echo "%%lang($language_short) %{langpackdir}/langpack-$language_short@icecat.mozilla.org.xpi" >> %{name}.lang
@@ -811,17 +811,17 @@ ln -s %{_datadir}/myspell ${RPM_BUILD_ROOT}%{icecatappdir}/dictionaries
 cp -p build/unix/run-%{name}.sh %{buildroot}%{icecatappdir}/
 
 # Remove unused directories
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{icecat_devel}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/idl/%{icecat_ver}
-rm -rf $RPM_BUILD_ROOT%{_includedir}/%{icecat_ver}
-rm -rf $RPM_BUILD_ROOT%{icecatappdir}/removed-files
+rm -rf %{buildroot}%{_libdir}/%{icecat_devel}
+rm -rf %{buildroot}%{_datadir}/idl/%{icecat_ver}
+rm -rf %{buildroot}%{_includedir}/%{icecat_ver}
+rm -rf %{buildroot}%{icecatappdir}/removed-files
 
 # Remove gtk2 support as flash plugin is no longer supported
 rm -rf %{buildroot}%{icecatappdir}/gtk2
 
-mkdir -p $RPM_BUILD_ROOT%{_metainfodir}
-install -pm 644 %{SOURCE10} $RPM_BUILD_ROOT%{_metainfodir}/
-install -pm 644 %{SOURCE11} $RPM_BUILD_ROOT%{_metainfodir}/
+mkdir -p %{buildroot}%{_metainfodir}
+install -pm 644 %{SOURCE10} %{buildroot}%{_metainfodir}/
+install -pm 644 %{SOURCE11} %{buildroot}%{_metainfodir}/
 
 # Moves defaults/preferences to browser/defaults/preferences
 %pretrans -p <lua>
@@ -843,7 +843,7 @@ if (posix.stat("%{icecatappdir}/browser/defaults/preferences", "type") == "link"
 end
 
 %check
-appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
 %if 0%{?build_langpacks}
@@ -886,6 +886,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Thu Jul 15 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.12.0-2.rh2.test
+- Enable debug build mode
+
 * Wed Jul 14 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.12.0-1.rh2
 - Release 78.12.0
 - HTTPS Everywhere 2021.7.13

From ac38dfa7bbd836705de4fca932dd393cf2efeeb5 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 20 Jul 2021 11:12:51 +0200
Subject: [PATCH 242/473] Patched for Mozilla bug #1721326

---
 ...PTHREAD_STACK_MIN-porting-1983645-19.patch | 68 +++++++++++++++++++
 icecat.spec                                   | 10 ++-
 2 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 icecat-PTHREAD_STACK_MIN-porting-1983645-19.patch

diff --git a/icecat-PTHREAD_STACK_MIN-porting-1983645-19.patch b/icecat-PTHREAD_STACK_MIN-porting-1983645-19.patch
new file mode 100644
index 0000000..026d13f
--- /dev/null
+++ b/icecat-PTHREAD_STACK_MIN-porting-1983645-19.patch
@@ -0,0 +1,68 @@
+From bfd45aefe777e9b07df52fc52a5621e9a9ad67c2 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Mon, 19 Jul 2021 12:54:46 +0200
+Subject: [PATCH] Python 3.10 and PTHREAD_STACK_MIN porting (#1983645,
+ #1983696)
+
+@@ -0,0 +1,64 @@
+diff -ur a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp
+--- a/js/xpconnect/src/XPCJSContext.cpp	2021-07-05 21:16:02.000000000 +0200
++++ b/js/xpconnect/src/XPCJSContext.cpp	2021-07-19 15:01:24.083460460 +0200
+@@ -81,14 +81,6 @@
+ using namespace JS;
+ using mozilla::dom::AutoEntryScript;
+ 
+-// The watchdog thread loop is pretty trivial, and should not require much stack
+-// space to do its job. So only give it 32KiB or the platform minimum.
+-#if !defined(PTHREAD_STACK_MIN)
+-#  define PTHREAD_STACK_MIN 0
+-#endif
+-static constexpr size_t kWatchdogStackSize =
+-    PTHREAD_STACK_MIN < 32 * 1024 ? 32 * 1024 : PTHREAD_STACK_MIN;
+-
+ static void WatchdogMain(void* arg);
+ class Watchdog;
+ class WatchdogManager;
+@@ -161,7 +153,7 @@
+       // watchdog, we need to join it on shutdown.
+       mThread = PR_CreateThread(PR_USER_THREAD, WatchdogMain, this,
+                                 PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+-                                PR_JOINABLE_THREAD, kWatchdogStackSize);
++                                PR_JOINABLE_THREAD, 0);
+       if (!mThread) {
+         MOZ_CRASH("PR_CreateThread failed!");
+       }
+diff -ur a/security/sandbox/linux/launch/SandboxLaunch.cpp b/security/sandbox/linux/launch/SandboxLaunch.cpp
+--- a/security/sandbox/linux/launch/SandboxLaunch.cpp	2021-07-05 18:20:36.000000000 +0200
++++ b/security/sandbox/linux/launch/SandboxLaunch.cpp	2021-07-20 08:39:17.272136982 +0200
+@@ -489,7 +489,7 @@
+ // we don't currently support sandboxing under valgrind.
+ MOZ_NEVER_INLINE MOZ_ASAN_BLACKLIST static pid_t DoClone(int aFlags,
+                                                          jmp_buf* aCtx) {
+-  uint8_t miniStack[PTHREAD_STACK_MIN];
++  uint8_t miniStack[4096] __attribute__((aligned(kStackAlignment)));
+ #ifdef __hppa__
+   void* stackPtr = miniStack;
+ #else
+@@ -523,13 +522,19 @@
+                                CLONE_CHILD_CLEARTID;
+   MOZ_RELEASE_ASSERT((aFlags & kBadFlags) == 0);
+ 
++  // Block signals due to small stack in DoClone.
++  sigset_t oldSigs;
++  BlockAllSignals(&oldSigs);
++
++  int ret = 0;
+   jmp_buf ctx;
+   if (setjmp(ctx) == 0) {
+     // In the parent and just called setjmp:
+-    return DoClone(aFlags | SIGCHLD, &ctx);
++    ret = DoClone(aFlags | SIGCHLD, &ctx);
+   }
++  RestoreSignals(&oldSigs);
+   // In the child and have longjmp'ed:
+-  return 0;
++  return ret;
+ }
+ 
+ static bool WriteStringToFile(const char* aPath, const char* aStr,
diff --git a/icecat.spec b/icecat.spec
index b8cbdb8..3add227 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -27,7 +27,7 @@ ExcludeArch: ppc64le
 
 ### Optimization ###
 # Builds for debugging
-%global debug_build   1
+%global debug_build   0
 
 # Downgrade optimization
 %global less_optbuild 0
@@ -108,7 +108,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.12.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -177,6 +177,7 @@ Patch219: rhbz-1173156.patch
 Patch220: firefox-nss-version.patch
 Patch221: firefox-nss-addon-hack.patch
 Patch222: %{name}-porting_to_python310.patch
+Patch223: %{name}-PTHREAD_STACK_MIN-porting-1983645-19.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
@@ -397,6 +398,7 @@ tar -xf %{SOURCE5}
 %if 0%{?python3_version_nodots} > 39
 %patch222 -p1 -b .porting_to_python310
 %endif
+%patch223 -p1 -b .PTHREAD_STACK_MIN
 
 # ARM run-time patch
 %ifarch aarch64
@@ -886,6 +888,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Jul 20 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.12.0-3.rh2.test
+- Disable debug build mode
+- Patched for Mozilla bug #1721326
+
 * Thu Jul 15 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.12.0-2.rh2.test
 - Enable debug build mode
 

From 3c73b1952b3841d6d210090706577b2eeab5fb2c Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 20 Jul 2021 12:16:58 +0200
Subject: [PATCH 243/473] Patched for Mozilla bug #1721326 /2

---
 icecat-PTHREAD_STACK_MIN-porting-1983645-19.patch | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/icecat-PTHREAD_STACK_MIN-porting-1983645-19.patch b/icecat-PTHREAD_STACK_MIN-porting-1983645-19.patch
index 026d13f..5206251 100644
--- a/icecat-PTHREAD_STACK_MIN-porting-1983645-19.patch
+++ b/icecat-PTHREAD_STACK_MIN-porting-1983645-19.patch
@@ -35,15 +35,6 @@ diff -ur a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp
 diff -ur a/security/sandbox/linux/launch/SandboxLaunch.cpp b/security/sandbox/linux/launch/SandboxLaunch.cpp
 --- a/security/sandbox/linux/launch/SandboxLaunch.cpp	2021-07-05 18:20:36.000000000 +0200
 +++ b/security/sandbox/linux/launch/SandboxLaunch.cpp	2021-07-20 08:39:17.272136982 +0200
-@@ -489,7 +489,7 @@
- // we don't currently support sandboxing under valgrind.
- MOZ_NEVER_INLINE MOZ_ASAN_BLACKLIST static pid_t DoClone(int aFlags,
-                                                          jmp_buf* aCtx) {
--  uint8_t miniStack[PTHREAD_STACK_MIN];
-+  uint8_t miniStack[4096] __attribute__((aligned(kStackAlignment)));
- #ifdef __hppa__
-   void* stackPtr = miniStack;
- #else
 @@ -523,13 +522,19 @@
                                 CLONE_CHILD_CLEARTID;
    MOZ_RELEASE_ASSERT((aFlags & kBadFlags) == 0);

From b3adfcd9101c7cb1884f17c64e1f26cfc09005e3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 22 Jul 2021 08:24:02 +0000
Subject: [PATCH 244/473] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 icecat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 3add227..231243f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -108,7 +108,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.12.0
-Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 4%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -888,6 +888,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 78.12.0-4.rh2.test
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Tue Jul 20 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.12.0-3.rh2.test
 - Disable debug build mode
 - Patched for Mozilla bug #1721326

From 27d280f02ecb69fed14584e7a54f713822d00072 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 23 Jul 2021 12:20:59 +0200
Subject: [PATCH 245/473] Update patch #222 (python-3.10)

---
 icecat-porting_to_python310.patch | 586 ++++++++++++++++++++++++++++++
 icecat.spec                       |   2 +-
 2 files changed, 587 insertions(+), 1 deletion(-)

diff --git a/icecat-porting_to_python310.patch b/icecat-porting_to_python310.patch
index 62b30e7..c0dca60 100644
--- a/icecat-porting_to_python310.patch
+++ b/icecat-porting_to_python310.patch
@@ -297,3 +297,589 @@ diff --git a/testing/mozbase/manifestparser/manifestparser/filters.py b/testing/
                  raise ConstructorError("while constructing a mapping", node.start_mark,
                          "found unhashable key", key_node.start_mark)
              value = self.construct_object(value_node, deep=deep)
+diff -up a/third_party/python/voluptuous/voluptuous-0.11.5.dist-info/RECORD.build-python-2 b/third_party/python/voluptuous/voluptuous-0.11.5.dist-info/RECORD
+diff -up a/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/COPYING.build-python-2 b/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/COPYING
+--- a/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/COPYING.build-python-2	2021-07-21 09:42:47.774128166 +0200
++++ b/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/COPYING	2021-07-21 09:42:47.774128166 +0200
+@@ -0,0 +1,25 @@
++Copyright (c) 2010, Alec Thomas
++All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are met:
++
++ - Redistributions of source code must retain the above copyright notice, this
++   list of conditions and the following disclaimer.
++ - Redistributions in binary form must reproduce the above copyright notice,
++   this list of conditions and the following disclaimer in the documentation
++   and/or other materials provided with the distribution.
++ - Neither the name of SwapOff.org nor the names of its contributors may
++   be used to endorse or promote products derived from this software without
++   specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
++FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
++SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
++CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
++OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff -up a/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/RECORD.build-python-2 b/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/RECORD
+--- a/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/RECORD.build-python-2	2021-07-21 09:42:47.774128166 +0200
++++ b/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/RECORD	2021-07-21 09:42:47.774128166 +0200
+@@ -0,0 +1,11 @@
++voluptuous/__init__.py,sha256=tSYWPAIWee6YwcMK8hxmaiagG_swokUMeH8MluJLWZM,203
++voluptuous/error.py,sha256=fLRmJwKp0bqRGgBM34ztg9MTxhEOf465sbQcvJlEtAk,4026
++voluptuous/humanize.py,sha256=hZlhdN4aVeGDIXdtSTeyEbmku65SDPRuut3mOfuRQP0,1606
++voluptuous/schema_builder.py,sha256=xVJpf3uJMyS1CKwzDw3rEK39ebqDiF_A2Kbq4VnZ3Aw,43677
++voluptuous/util.py,sha256=RXLZ2b5y-A4az3teG6UpCx2UZcXpS11sIVCdORyKar8,3150
++voluptuous/validators.py,sha256=xZgyKH-EVqUHCHral5gzViXq4HfEjJEsGdQy7z6llc0,32798
++voluptuous-0.12.1.dist-info/COPYING,sha256=JHtJdren-k2J2Vh8qlCVVh60bcVFfyJ59ipitUUq3qk,1486
++voluptuous-0.12.1.dist-info/METADATA,sha256=OdEydy5NydPFFzAhP8qj_YqJsQPQvoIt5ZT1t8B14Ok,20120
++voluptuous-0.12.1.dist-info/WHEEL,sha256=S6zePDbUAjzMmpYOg2cHDxuYFWw7WiOXt6ogM6hIB5Q,92
++voluptuous-0.12.1.dist-info/top_level.txt,sha256=TTdVb7M-vndb67UqTmAxuVjpAUakrlAWJYqvo3w4Iqc,11
++voluptuous-0.12.1.dist-info/RECORD,,
+diff -up a/third_party/python/voluptuous/voluptuous/error.py.build-python-2 b/third_party/python/voluptuous/voluptuous/error.py
+--- a/third_party/python/voluptuous/voluptuous/error.py.build-python-2	2021-07-05 21:16:03.000000000 +0200
++++ b/third_party/python/voluptuous/voluptuous/error.py	2021-07-21 09:42:47.775128197 +0200
+@@ -142,11 +142,11 @@ class BooleanInvalid(Invalid):
+ 
+ 
+ class UrlInvalid(Invalid):
+-    """The value is not a url."""
++    """The value is not a URL."""
+ 
+ 
+ class EmailInvalid(Invalid):
+-    """The value is not a email."""
++    """The value is not an email address."""
+ 
+ 
+ class FileInvalid(Invalid):
+diff -up a/third_party/python/voluptuous/voluptuous/__init__.py.build-python-2 b/third_party/python/voluptuous/voluptuous/__init__.py
+--- a/third_party/python/voluptuous/voluptuous/__init__.py.build-python-2	2021-07-05 21:16:03.000000000 +0200
++++ b/third_party/python/voluptuous/voluptuous/__init__.py	2021-07-21 09:42:47.775128197 +0200
+@@ -5,5 +5,5 @@ from voluptuous.validators import *
+ from voluptuous.util import *
+ from voluptuous.error import *
+ 
+-__version__ = '0.11.5'
++__version__ = '0.12.1'
+ __author__ = 'alecthomas'
+diff -up a/third_party/python/voluptuous/voluptuous/schema_builder.py.build-python-2 b/third_party/python/voluptuous/voluptuous/schema_builder.py
+--- a/third_party/python/voluptuous/voluptuous/schema_builder.py.build-python-2	2021-07-05 21:16:03.000000000 +0200
++++ b/third_party/python/voluptuous/voluptuous/schema_builder.py	2021-07-21 09:42:47.775128197 +0200
+@@ -22,6 +22,11 @@ else:
+     def iteritems(d):
+         return d.iteritems()
+ 
++if sys.version_info >= (3, 3):
++    _Mapping = collections.abc.Mapping
++else:
++    _Mapping = collections.Mapping
++
+ """Schema validation for Python data structures.
+ 
+ Given eg. a nested data structure like this:
+@@ -280,7 +285,7 @@ class Schema(object):
+             return schema.__voluptuous_compile__(self)
+         if isinstance(schema, Object):
+             return self._compile_object(schema)
+-        if isinstance(schema, collections.Mapping):
++        if isinstance(schema, _Mapping):
+             return self._compile_dict(schema)
+         elif isinstance(schema, list):
+             return self._compile_list(schema)
+@@ -610,11 +615,11 @@ class Schema(object):
+             if not isinstance(data, seq_type):
+                 raise er.SequenceTypeInvalid('expected a %s' % seq_type_name, path)
+ 
+-            # Empty seq schema, allow any data.
++            # Empty seq schema, reject any data.
+             if not schema:
+                 if data:
+                     raise er.MultipleInvalid([
+-                        er.ValueInvalid('not a valid value', [value]) for value in data
++                        er.ValueInvalid('not a valid value', path if path else data)
+                     ])
+                 return data
+ 
+@@ -735,7 +740,7 @@ class Schema(object):
+ 
+         result = self.schema.copy()
+ 
+-        # returns the key that may have been passed as arugment to Marker constructor
++        # returns the key that may have been passed as an argument to Marker constructor
+         def key_literal(key):
+             return (key.schema if isinstance(key, Marker) else key)
+ 
+@@ -771,9 +776,10 @@ class Schema(object):
+                 result[key] = value
+ 
+         # recompile and send old object
++        result_cls = type(self)
+         result_required = (required if required is not None else self.required)
+         result_extra = (extra if extra is not None else self.extra)
+-        return Schema(result, required=result_required, extra=result_extra)
++        return result_cls(result, required=result_required, extra=result_extra)
+ 
+ 
+ def _compile_scalar(schema):
+@@ -809,7 +815,7 @@ def _compile_scalar(schema):
+         def validate_callable(path, data):
+             try:
+                 return schema(data)
+-            except ValueError as e:
++            except ValueError:
+                 raise er.ValueInvalid('not a valid value', path)
+             except er.Invalid as e:
+                 e.prepend(path)
+@@ -1121,8 +1127,11 @@ class Inclusive(Optional):
+     True
+     """
+ 
+-    def __init__(self, schema, group_of_inclusion, msg=None):
+-        super(Inclusive, self).__init__(schema, msg=msg)
++    def __init__(self, schema, group_of_inclusion,
++                 msg=None, description=None, default=UNDEFINED):
++        super(Inclusive, self).__init__(schema, msg=msg,
++                                        default=default,
++                                        description=description)
+         self.group_of_inclusion = group_of_inclusion
+ 
+ 
+diff -up a/third_party/python/voluptuous/voluptuous/util.py.build-python-2 b/third_party/python/voluptuous/voluptuous/util.py
+--- a/third_party/python/voluptuous/voluptuous/util.py.build-python-2	2021-07-05 21:16:03.000000000 +0200
++++ b/third_party/python/voluptuous/voluptuous/util.py	2021-07-21 09:42:47.776128229 +0200
+@@ -7,6 +7,14 @@ from voluptuous import validators
+ __author__ = 'tusharmakkar08'
+ 
+ 
++def _fix_str(v):
++    if sys.version_info[0] == 2 and isinstance(v, unicode):
++        s = v
++    else:
++        s = str(v)
++    return s
++
++
+ def Lower(v):
+     """Transform a string to lower case.
+ 
+@@ -14,7 +22,7 @@ def Lower(v):
+     >>> s('HI')
+     'hi'
+     """
+-    return str(v).lower()
++    return _fix_str(v).lower()
+ 
+ 
+ def Upper(v):
+@@ -24,7 +32,7 @@ def Upper(v):
+     >>> s('hi')
+     'HI'
+     """
+-    return str(v).upper()
++    return _fix_str(v).upper()
+ 
+ 
+ def Capitalize(v):
+@@ -34,7 +42,7 @@ def Capitalize(v):
+     >>> s('hello world')
+     'Hello world'
+     """
+-    return str(v).capitalize()
++    return _fix_str(v).capitalize()
+ 
+ 
+ def Title(v):
+@@ -44,7 +52,7 @@ def Title(v):
+     >>> s('hello world')
+     'Hello World'
+     """
+-    return str(v).title()
++    return _fix_str(v).title()
+ 
+ 
+ def Strip(v):
+@@ -54,7 +62,7 @@ def Strip(v):
+     >>> s('  hello world  ')
+     'hello world'
+     """
+-    return str(v).strip()
++    return _fix_str(v).strip()
+ 
+ 
+ class DefaultTo(object):
+diff -up a/third_party/python/voluptuous/voluptuous/validators.py.build-python-2 b/third_party/python/voluptuous/voluptuous/validators.py
+--- a/third_party/python/voluptuous/voluptuous/validators.py.build-python-2	2021-07-05 21:16:03.000000000 +0200
++++ b/third_party/python/voluptuous/voluptuous/validators.py	2021-07-21 09:42:47.776128229 +0200
+@@ -192,15 +192,26 @@ class _WithSubValidators(object):
+     def __init__(self, *validators, **kwargs):
+         self.validators = validators
+         self.msg = kwargs.pop('msg', None)
++        self.required = kwargs.pop('required', False)
++        self.discriminant = kwargs.pop('discriminant', None)
+ 
+     def __voluptuous_compile__(self, schema):
+-        self._compiled = [
+-            schema._compile(v)
+-            for v in self.validators
+-        ]
++        self._compiled = []
++        old_required = schema.required
++        self.schema = schema
++        for v in self.validators:
++            schema.required = self.required
++            self._compiled.append(schema._compile(v))
++        schema.required = old_required
+         return self._run
+ 
+     def _run(self, path, value):
++        if self.discriminant is not None:
++            self._compiled = [
++                self.schema._compile(v)
++                for v in self.discriminant(value, self.validators)
++            ]
++
+         return self._exec(self._compiled, value, path)
+ 
+     def __call__(self, v):
+@@ -218,7 +229,7 @@ class Any(_WithSubValidators):
+     """Use the first validated value.
+ 
+     :param msg: Message to deliver to user if validation fails.
+-    :param kwargs: All other keyword arguments are passed to the sub-Schema constructors.
++    :param kwargs: All other keyword arguments are passed to the sub-schema constructors.
+     :returns: Return value of the first validator that passes.
+ 
+     >>> validate = Schema(Any('true', 'false',
+@@ -262,13 +273,57 @@ class Any(_WithSubValidators):
+ Or = Any
+ 
+ 
++class Union(_WithSubValidators):
++    """Use the first validated value among those selected by discriminant.
++
++    :param msg: Message to deliver to user if validation fails.
++    :param discriminant(value, validators): Returns the filtered list of validators based on the value.
++    :param kwargs: All other keyword arguments are passed to the sub-schema constructors.
++    :returns: Return value of the first validator that passes.
++
++    >>> validate = Schema(Union({'type':'a', 'a_val':'1'},{'type':'b', 'b_val':'2'},
++    ...                         discriminant=lambda val, alt: filter(
++    ...                         lambda v : v['type'] == val['type'] , alt)))
++    >>> validate({'type':'a', 'a_val':'1'}) == {'type':'a', 'a_val':'1'}
++    True
++    >>> with raises(MultipleInvalid, "not a valid value for dictionary value @ data['b_val']"):
++    ...   validate({'type':'b', 'b_val':'5'})
++
++    ```discriminant({'type':'b', 'a_val':'5'}, [{'type':'a', 'a_val':'1'},{'type':'b', 'b_val':'2'}])``` is invoked
++
++    Without the discriminant, the exception would be "extra keys not allowed @ data['b_val']"
++    """
++
++    def _exec(self, funcs, v, path=None):
++        error = None
++        for func in funcs:
++            try:
++                if path is None:
++                    return func(v)
++                else:
++                    return func(path, v)
++            except Invalid as e:
++                if error is None or len(e.path) > len(error.path):
++                    error = e
++        else:
++            if error:
++                raise error if self.msg is None else AnyInvalid(
++                    self.msg, path=path)
++            raise AnyInvalid(self.msg or 'no valid value found',
++                             path=path)
++
++
++# Convenience alias
++Switch = Union
++
++
+ class All(_WithSubValidators):
+     """Value must pass all validators.
+ 
+     The output of each validator is passed as input to the next.
+ 
+     :param msg: Message to deliver to user if validation fails.
+-    :param kwargs: All other keyword arguments are passed to the sub-Schema constructors.
++    :param kwargs: All other keyword arguments are passed to the sub-schema constructors.
+ 
+     >>> validate = Schema(All('10', Coerce(int)))
+     >>> validate('10')
+@@ -303,7 +358,7 @@ class Match(object):
+     >>> with raises(MultipleInvalid, 'expected string or buffer'):
+     ...   validate(123)
+ 
+-    Pattern may also be a _compiled regular expression:
++    Pattern may also be a compiled regular expression:
+ 
+     >>> validate = Schema(Match(re.compile(r'0x[A-F0-9]+', re.I)))
+     >>> validate('0x123ef4')
+@@ -361,38 +416,38 @@ def _url_validation(v):
+     return parsed
+ 
+ 
+-@message('expected an Email', cls=EmailInvalid)
++@message('expected an email address', cls=EmailInvalid)
+ def Email(v):
+-    """Verify that the value is an Email or not.
++    """Verify that the value is an email address or not.
+ 
+     >>> s = Schema(Email())
+-    >>> with raises(MultipleInvalid, 'expected an Email'):
++    >>> with raises(MultipleInvalid, 'expected an email address'):
+     ...   s("a.com")
+-    >>> with raises(MultipleInvalid, 'expected an Email'):
++    >>> with raises(MultipleInvalid, 'expected an email address'):
+     ...   s("a@.com")
+-    >>> with raises(MultipleInvalid, 'expected an Email'):
++    >>> with raises(MultipleInvalid, 'expected an email address'):
+     ...   s("a@.com")
+     >>> s('t@x.com')
+     't@x.com'
+     """
+     try:
+         if not v or "@" not in v:
+-            raise EmailInvalid("Invalid Email")
++            raise EmailInvalid("Invalid email address")
+         user_part, domain_part = v.rsplit('@', 1)
+ 
+         if not (USER_REGEX.match(user_part) and DOMAIN_REGEX.match(domain_part)):
+-            raise EmailInvalid("Invalid Email")
++            raise EmailInvalid("Invalid email address")
+         return v
+     except:
+         raise ValueError
+ 
+ 
+-@message('expected a Fully qualified domain name URL', cls=UrlInvalid)
++@message('expected a fully qualified domain name URL', cls=UrlInvalid)
+ def FqdnUrl(v):
+-    """Verify that the value is a Fully qualified domain name URL.
++    """Verify that the value is a fully qualified domain name URL.
+ 
+     >>> s = Schema(FqdnUrl())
+-    >>> with raises(MultipleInvalid, 'expected a Fully qualified domain name URL'):
++    >>> with raises(MultipleInvalid, 'expected a fully qualified domain name URL'):
+     ...   s("http://localhost/")
+     >>> s('http://w3.org')
+     'http://w3.org'
+@@ -423,14 +478,14 @@ def Url(v):
+         raise ValueError
+ 
+ 
+-@message('not a file', cls=FileInvalid)
++@message('Not a file', cls=FileInvalid)
+ @truth
+ def IsFile(v):
+     """Verify the file exists.
+ 
+     >>> os.path.basename(IsFile()(__file__)).startswith('validators.py')
+     True
+-    >>> with raises(FileInvalid, 'not a file'):
++    >>> with raises(FileInvalid, 'Not a file'):
+     ...   IsFile()("random_filename_goes_here.py")
+     >>> with raises(FileInvalid, 'Not a file'):
+     ...   IsFile()(None)
+@@ -445,7 +500,7 @@ def IsFile(v):
+         raise FileInvalid('Not a file')
+ 
+ 
+-@message('not a directory', cls=DirInvalid)
++@message('Not a directory', cls=DirInvalid)
+ @truth
+ def IsDir(v):
+     """Verify the directory exists.
+@@ -487,11 +542,11 @@ def PathExists(v):
+         raise PathInvalid("Not a Path")
+ 
+ 
+-def Maybe(validator):
++def Maybe(validator, msg=None):
+     """Validate that the object matches given validator or is None.
+ 
+-    :raises Invalid: if the value does not match the given validator and is not
+-        None
++    :raises Invalid: If the value does not match the given validator and is not
++        None.
+ 
+     >>> s = Schema(Maybe(int))
+     >>> s(10)
+@@ -500,7 +555,7 @@ def Maybe(validator):
+     ...  s("string")
+ 
+     """
+-    return Any(None, validator)
++    return Any(validator, None, msg=msg)
+ 
+ 
+ class Range(object):
+@@ -533,23 +588,30 @@ class Range(object):
+         self.msg = msg
+ 
+     def __call__(self, v):
+-        if self.min_included:
+-            if self.min is not None and not v >= self.min:
+-                raise RangeInvalid(
+-                    self.msg or 'value must be at least %s' % self.min)
+-        else:
+-            if self.min is not None and not v > self.min:
+-                raise RangeInvalid(
+-                    self.msg or 'value must be higher than %s' % self.min)
+-        if self.max_included:
+-            if self.max is not None and not v <= self.max:
+-                raise RangeInvalid(
+-                    self.msg or 'value must be at most %s' % self.max)
+-        else:
+-            if self.max is not None and not v < self.max:
+-                raise RangeInvalid(
+-                    self.msg or 'value must be lower than %s' % self.max)
+-        return v
++        try:
++            if self.min_included:
++                if self.min is not None and not v >= self.min:
++                    raise RangeInvalid(
++                        self.msg or 'value must be at least %s' % self.min)
++            else:
++                if self.min is not None and not v > self.min:
++                    raise RangeInvalid(
++                        self.msg or 'value must be higher than %s' % self.min)
++            if self.max_included:
++                if self.max is not None and not v <= self.max:
++                    raise RangeInvalid(
++                        self.msg or 'value must be at most %s' % self.max)
++            else:
++                if self.max is not None and not v < self.max:
++                    raise RangeInvalid(
++                        self.msg or 'value must be lower than %s' % self.max)
++
++            return v
++
++        # Objects that lack a partial ordering, e.g. None or strings will raise TypeError
++        except TypeError:
++            raise RangeInvalid(
++                self.msg or 'invalid value or type (must have a partial ordering)')
+ 
+     def __repr__(self):
+         return ('Range(min=%r, max=%r, min_included=%r,'
+@@ -579,11 +641,17 @@ class Clamp(object):
+         self.msg = msg
+ 
+     def __call__(self, v):
+-        if self.min is not None and v < self.min:
+-            v = self.min
+-        if self.max is not None and v > self.max:
+-            v = self.max
+-        return v
++        try:
++            if self.min is not None and v < self.min:
++                v = self.min
++            if self.max is not None and v > self.max:
++                v = self.max
++            return v
++
++        # Objects that lack a partial ordering, e.g. None or strings will raise TypeError
++        except TypeError:
++            raise RangeInvalid(
++                self.msg or 'invalid value or type (must have a partial ordering)')
+ 
+     def __repr__(self):
+         return 'Clamp(min=%s, max=%s)' % (self.min, self.max)
+@@ -598,13 +666,19 @@ class Length(object):
+         self.msg = msg
+ 
+     def __call__(self, v):
+-        if self.min is not None and len(v) < self.min:
+-            raise LengthInvalid(
+-                self.msg or 'length of value must be at least %s' % self.min)
+-        if self.max is not None and len(v) > self.max:
+-            raise LengthInvalid(
+-                self.msg or 'length of value must be at most %s' % self.max)
+-        return v
++        try:
++            if self.min is not None and len(v) < self.min:
++                raise LengthInvalid(
++                    self.msg or 'length of value must be at least %s' % self.min)
++            if self.max is not None and len(v) > self.max:
++                raise LengthInvalid(
++                    self.msg or 'length of value must be at most %s' % self.max)
++            return v
++
++        # Objects that havbe no length e.g. None or strings will raise TypeError
++        except TypeError:
++            raise RangeInvalid(
++                self.msg or 'invalid value or type')
+ 
+     def __repr__(self):
+         return 'Length(min=%s, max=%s)' % (self.min, self.max)
+@@ -663,7 +737,8 @@ class In(object):
+         except TypeError:
+             check = True
+         if check:
+-            raise InInvalid(self.msg or 'value is not allowed')
++            raise InInvalid(self.msg or 
++                            'value must be one of {}'.format(sorted(self.container)))
+         return v
+ 
+     def __repr__(self):
+@@ -683,7 +758,8 @@ class NotIn(object):
+         except TypeError:
+             check = True
+         if check:
+-            raise NotInInvalid(self.msg or 'value is not allowed')
++            raise NotInInvalid(self.msg or 
++                               'value must not be one of {}'.format(sorted(self.container)))
+         return v
+ 
+     def __repr__(self):
+@@ -722,7 +798,7 @@ class ExactSequence(object):
+     the validators.
+ 
+     :param msg: Message to deliver to user if validation fails.
+-    :param kwargs: All other keyword arguments are passed to the sub-Schema
++    :param kwargs: All other keyword arguments are passed to the sub-schema
+         constructors.
+ 
+     >>> from voluptuous import Schema, ExactSequence
+@@ -887,7 +963,7 @@ class Unordered(object):
+ class Number(object):
+     """
+     Verify the number of digits that are present in the number(Precision),
+-    and the decimal places(Scale)
++    and the decimal places(Scale).
+ 
+     :raises Invalid: If the value does not match the provided Precision and Scale.
+ 
+@@ -951,13 +1027,13 @@ class SomeOf(_WithSubValidators):
+     The output of each validator is passed as input to the next.
+ 
+     :param min_valid: Minimum number of valid schemas.
+-    :param validators: a list of schemas or validators to match input against
++    :param validators: List of schemas or validators to match input against.
+     :param max_valid: Maximum number of valid schemas.
+     :param msg: Message to deliver to user if validation fails.
+-    :param kwargs: All other keyword arguments are passed to the sub-Schema constructors.
++    :param kwargs: All other keyword arguments are passed to the sub-schema constructors.
+ 
+-    :raises NotEnoughValid: if the minimum number of validations isn't met
+-    :raises TooManyValid: if the more validations than the given amount is met
++    :raises NotEnoughValid: If the minimum number of validations isn't met.
++    :raises TooManyValid: If the maximum number of validations is exceeded.
+ 
+     >>> validate = Schema(SomeOf(min_valid=2, validators=[Range(1, 5), Any(float, int), 6.6]))
+     >>> validate(6.6)
+
+    Add to Phrasebook
+        No word lists for English (USA) → Italian...
+        Create a new word list...
+    Copy
diff --git a/icecat.spec b/icecat.spec
index 231243f..a0bc3cb 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -889,7 +889,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
 %changelog
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 78.12.0-4.rh2.test
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild 
 
 * Tue Jul 20 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.12.0-3.rh2.test
 - Disable debug build mode

From 9002dba6c6f87e0f382932dbe00849ac440b5e32 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Mon, 2 Aug 2021 22:17:51 +0200
Subject: [PATCH 246/473] Release Candidate 78.13.0-rc1

---
 .gitignore  |  1 +
 icecat.spec | 24 ++++++++----------------
 sources     |  3 +--
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index a031239..560773a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,3 +158,4 @@
 /icecat-78.12.0-langpacks.tar.gz
 /icecat-78.12.0-rh1.tar.bz2
 /icecat-78.12.0-rh2.tar.bz2
+/icecat-78.13.0-rh1.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index a0bc3cb..d762c56 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -5,23 +5,12 @@ ExcludeArch: ppc64le
 # Set to true if it's going to be submitted as update
 %global release_build 0
 
-# Set to true if it's going to be submitted as release candidate
-%global release_candidate 0
-
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh2
-
-# Set extra version tag
-# This tag comes from Mozilla's releases
-%if 0%{?release_candidate}
-%global extra_ver .rc1
-%else
-%global extra_ver %{nil}
-%endif
+%global redhat_ver rh1
 
 #%%global pre_tag .test
-%global pre_tag .test
+%global pre_tag %{nil}
 
 ####################
 
@@ -52,7 +41,7 @@ ExcludeArch: ppc64le
 ####################
 
 # Active/Deactive language files handling
-%global build_langpacks 1
+%global build_langpacks 0
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
@@ -107,8 +96,8 @@ ExcludeArch: ppc64le
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 78.12.0
-Release: 4%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.13.0
+Release: 0.1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -888,6 +877,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Mon Aug 02 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.1.rh1.test
+- Release Candidate 78.13.0-rc1
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 78.12.0-4.rh2.test
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild 
 
diff --git a/sources b/sources
index befd8d1..33947bf 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 7703fc71380cf872b75be8eecee7638e21a9a8b9480460ce90b63eaf2a841bb05ef45e80159803f6cf41c4c4fa93ff7ec217d8fdec60cbb9d7bd24a83fde4855
-SHA512 (icecat-78.12.0-langpacks.tar.gz) = c877089e583d8fff4542c9e0b5f21a9c2bb76f0ea00906190f5bb8c4991d65322d699cb13b2eb73f19e88d92f7e00ed67b61a19c0006ed7827697bea9352ad15
-SHA512 (icecat-78.12.0-rh2.tar.bz2) = 72aa068a7c611acf6d9e5f72cfb6ee5ba70225d8cca50df8653e7313c403e6e820452fc6c40789a158b89c0727feee9a73d3719b3de4001a701b03068330566c
+SHA512 (icecat-78.13.0-rh1.tar.bz2) = d386365ea6fceb19c45ba834cefb015a41f27de270f0c34fdeb6f36aceef77a650ede54b1ced4970443d7058244c4d5f8f2c98f22e8745512887000042ea08de
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 6f9ab8eb888c4f55aa8de59e5f5b5f1a3dceb766 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 3 Aug 2021 17:28:43 +0200
Subject: [PATCH 247/473] Include patch for porting to dynamic
 PTHREAD_STACK_MIN (glibc 2.34 related)

---
 ...45-19.patch => icecat-glibc-dynstack.patch | 19 +++++++++++--------
 icecat.spec                                   |  4 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)
 rename icecat-PTHREAD_STACK_MIN-porting-1983645-19.patch => icecat-glibc-dynstack.patch (79%)

diff --git a/icecat-PTHREAD_STACK_MIN-porting-1983645-19.patch b/icecat-glibc-dynstack.patch
similarity index 79%
rename from icecat-PTHREAD_STACK_MIN-porting-1983645-19.patch
rename to icecat-glibc-dynstack.patch
index 5206251..74878b5 100644
--- a/icecat-PTHREAD_STACK_MIN-porting-1983645-19.patch
+++ b/icecat-glibc-dynstack.patch
@@ -1,10 +1,3 @@
-From bfd45aefe777e9b07df52fc52a5621e9a9ad67c2 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 19 Jul 2021 12:54:46 +0200
-Subject: [PATCH] Python 3.10 and PTHREAD_STACK_MIN porting (#1983645,
- #1983696)
-
-@@ -0,0 +1,64 @@
 diff -ur a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp
 --- a/js/xpconnect/src/XPCJSContext.cpp	2021-07-05 21:16:02.000000000 +0200
 +++ b/js/xpconnect/src/XPCJSContext.cpp	2021-07-19 15:01:24.083460460 +0200
@@ -35,7 +28,17 @@ diff -ur a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp
 diff -ur a/security/sandbox/linux/launch/SandboxLaunch.cpp b/security/sandbox/linux/launch/SandboxLaunch.cpp
 --- a/security/sandbox/linux/launch/SandboxLaunch.cpp	2021-07-05 18:20:36.000000000 +0200
 +++ b/security/sandbox/linux/launch/SandboxLaunch.cpp	2021-07-20 08:39:17.272136982 +0200
-@@ -523,13 +522,19 @@
+@@ -489,7 +489,8 @@ static int CloneCallee(void* aPtr) {
+ // we don't currently support sandboxing under valgrind.
+ MOZ_NEVER_INLINE MOZ_ASAN_BLACKLIST static pid_t DoClone(int aFlags,
+                                                          jmp_buf* aCtx) {
+-  uint8_t miniStack[PTHREAD_STACK_MIN];
++  static constexpr size_t kStackAlignment = 16;
++  uint8_t miniStack[4096] __attribute__((aligned(kStackAlignment)));
+ #ifdef __hppa__
+   void* stackPtr = miniStack;
+ #else
+@@ -510,13 +511,19 @@ static pid_t ForkWithFlags(int aFlags) {
                                 CLONE_CHILD_CLEARTID;
    MOZ_RELEASE_ASSERT((aFlags & kBadFlags) == 0);
  
diff --git a/icecat.spec b/icecat.spec
index d762c56..ed6980b 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -166,7 +166,7 @@ Patch219: rhbz-1173156.patch
 Patch220: firefox-nss-version.patch
 Patch221: firefox-nss-addon-hack.patch
 Patch222: %{name}-porting_to_python310.patch
-Patch223: %{name}-PTHREAD_STACK_MIN-porting-1983645-19.patch
+Patch223: %{name}-glibc-dynstack.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
@@ -387,7 +387,7 @@ tar -xf %{SOURCE5}
 %if 0%{?python3_version_nodots} > 39
 %patch222 -p1 -b .porting_to_python310
 %endif
-%patch223 -p1 -b .PTHREAD_STACK_MIN
+%patch223 -p1 -b .glibc-dynstack
 
 # ARM run-time patch
 %ifarch aarch64

From c0a826276e2f687e731f0ee04a7dc681920de17c Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 3 Aug 2021 18:39:40 +0200
Subject: [PATCH 248/473] Enable PGO build

---
 icecat.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index ed6980b..af4d2eb 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -3,7 +3,7 @@ ExcludeArch: ppc64le
 
 ### Naming ###
 # Set to true if it's going to be submitted as update
-%global release_build 0
+%global release_build 1
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
@@ -29,8 +29,8 @@ ExcludeArch: ppc64le
 # on other arches.
 %ifarch x86_64
 %if 0%{?release_build}
-%global build_with_pgo 0
-%global pgo_wayland    0
+%global build_with_pgo 1
+%global pgo_wayland    1
 %else
 %global build_with_pgo 0
 %endif
@@ -97,7 +97,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.13.0
-Release: 0.1.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 0.2.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -877,6 +877,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Aug 03 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.2.rh1.test
+- Enable PGO build
+
 * Mon Aug 02 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.1.rh1.test
 - Release Candidate 78.13.0-rc1
 

From aa3876c5ec4df4561250b91da7de59b9c2fb71d3 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 3 Aug 2021 21:53:32 +0200
Subject: [PATCH 249/473] Update porting to Python-3.10

---
 icecat-porting_to_python310.patch | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/icecat-porting_to_python310.patch b/icecat-porting_to_python310.patch
index c0dca60..279fb72 100644
--- a/icecat-porting_to_python310.patch
+++ b/icecat-porting_to_python310.patch
@@ -297,6 +297,35 @@ diff --git a/testing/mozbase/manifestparser/manifestparser/filters.py b/testing/
                  raise ConstructorError("while constructing a mapping", node.start_mark,
                          "found unhashable key", key_node.start_mark)
              value = self.construct_object(value_node, deep=deep)
+--- a/third_party/python/requests/requests/cookies.orig.py	2021-08-02 21:40:27.000000000 +0200
++++ b/third_party/python/requests/requests/cookies.py	2021-08-03 21:46:38.917998970 +0200
+@@ -10,6 +10,7 @@
+ import time
+ import calendar
+ import collections
++import collections.abc
+ from .compat import cookielib, urlparse, urlunparse, Morsel
+ 
+ try:
+@@ -161,7 +162,7 @@
+     Use .get and .set and include domain and path args in order to be more specific."""
+ 
+ 
+-class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
++class RequestsCookieJar(cookielib.CookieJar, collections.abc.MutableMapping):
+     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
+     interface.
+ 
+--- a/third_party/python/requests/requests/utils.orig.py	2021-08-02 21:40:27.000000000 +0200
++++ b/third_party/python/requests/requests/utils.py	2021-08-03 21:47:12.396466647 +0200
+@@ -12,6 +12,7 @@
+ import cgi
+ import codecs
+ import collections
++import collections.abc
+ import io
+ import os
+ import platform
 diff -up a/third_party/python/voluptuous/voluptuous-0.11.5.dist-info/RECORD.build-python-2 b/third_party/python/voluptuous/voluptuous-0.11.5.dist-info/RECORD
 diff -up a/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/COPYING.build-python-2 b/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/COPYING
 --- a/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/COPYING.build-python-2	2021-07-21 09:42:47.774128166 +0200

From 2ed2aebfd45d417d4aaab2bda847b8fe8219db91 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 4 Aug 2021 08:06:12 +0200
Subject: [PATCH 250/473] Update porting to Python-3.10 /2

---
 icecat-porting_to_python310.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/icecat-porting_to_python310.patch b/icecat-porting_to_python310.patch
index 279fb72..920ca96 100644
--- a/icecat-porting_to_python310.patch
+++ b/icecat-porting_to_python310.patch
@@ -326,6 +326,20 @@ diff --git a/testing/mozbase/manifestparser/manifestparser/filters.py b/testing/
  import io
  import os
  import platform
+--- a/third_party/python/requests/requests/structures.orig.py	2021-08-02 21:40:27.000000000 +0200
++++ b/third_party/python/requests/requests/structures.py	2021-08-04 08:03:34.858332348 +0200
+@@ -9,9 +9,10 @@
+ """
+ 
+ import collections
++import collections.abc
+ 
+ 
+-class CaseInsensitiveDict(collections.MutableMapping):
++class CaseInsensitiveDict(collections.abc.MutableMapping):
+     """
+     A case-insensitive ``dict``-like object.
+ 
 diff -up a/third_party/python/voluptuous/voluptuous-0.11.5.dist-info/RECORD.build-python-2 b/third_party/python/voluptuous/voluptuous-0.11.5.dist-info/RECORD
 diff -up a/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/COPYING.build-python-2 b/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/COPYING
 --- a/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/COPYING.build-python-2	2021-07-21 09:42:47.774128166 +0200

From 4dafe38fe782f4967c69819652771812d094fdbf Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 5 Aug 2021 12:53:15 +0200
Subject: [PATCH 251/473] Release Candidate 78.13.0-rc2| Disable PGO build
 (incomplete porting to Python 3.10)

---
 .gitignore  |  1 +
 icecat.spec | 16 ++++++++++------
 sources     |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 560773a..94ac450 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,3 +159,4 @@
 /icecat-78.12.0-rh1.tar.bz2
 /icecat-78.12.0-rh2.tar.bz2
 /icecat-78.13.0-rh1.tar.bz2
+/icecat-78.13.0-rh2.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index af4d2eb..79dfae2 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -7,7 +7,7 @@ ExcludeArch: ppc64le
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh1
+%global redhat_ver rh2
 
 #%%global pre_tag .test
 %global pre_tag %{nil}
@@ -29,8 +29,8 @@ ExcludeArch: ppc64le
 # on other arches.
 %ifarch x86_64
 %if 0%{?release_build}
-%global build_with_pgo 1
-%global pgo_wayland    1
+%global build_with_pgo 0
+%global pgo_wayland    0
 %else
 %global build_with_pgo 0
 %endif
@@ -97,7 +97,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.13.0
-Release: 0.2.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 0.3.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -877,10 +877,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
-* Tue Aug 03 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.2.rh1.test
+* Thu Aug 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.3.rh2
+- Release Candidate 78.13.0-rc2
+- Disable PGO build (incomplete porting to Python 3.10) 
+
+* Tue Aug 03 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.2.rh1
 - Enable PGO build
 
-* Mon Aug 02 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.1.rh1.test
+* Mon Aug 02 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.1.rh1
 - Release Candidate 78.13.0-rc1
 
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 78.12.0-4.rh2.test
diff --git a/sources b/sources
index 33947bf..a4ac6b7 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 7703fc71380cf872b75be8eecee7638e21a9a8b9480460ce90b63eaf2a841bb05ef45e80159803f6cf41c4c4fa93ff7ec217d8fdec60cbb9d7bd24a83fde4855
-SHA512 (icecat-78.13.0-rh1.tar.bz2) = d386365ea6fceb19c45ba834cefb015a41f27de270f0c34fdeb6f36aceef77a650ede54b1ced4970443d7058244c4d5f8f2c98f22e8745512887000042ea08de
+SHA512 (icecat-78.13.0-rh2.tar.bz2) = 14432f34e7606f3c06611990227a66994c5927aab1f70eef5ac21162e8ede8e69b74d8d8083e426ae61b71e511230a6e27e92f41c3a98a5615104e208fedfd03
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From aec8a9fc4ed952809724e46f9903b4c8a8b727bd Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 7 Aug 2021 19:48:06 +0200
Subject: [PATCH 252/473] Update cbindgen to 0.19.0

---
 icecat.spec | 5 ++++-
 sources     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 79dfae2..4cdd6fc 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -97,7 +97,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.13.0
-Release: 0.3.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 0.4.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -877,6 +877,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Sat Aug 07 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.4.rh2
+- Update cbindgen to 0.19.0
+
 * Thu Aug 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.3.rh2
 - Release Candidate 78.13.0-rc2
 - Disable PGO build (incomplete porting to Python 3.10) 
diff --git a/sources b/sources
index a4ac6b7..7001bdc 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = 7703fc71380cf872b75be8eecee7638e21a9a8b9480460ce90b63eaf2a841bb05ef45e80159803f6cf41c4c4fa93ff7ec217d8fdec60cbb9d7bd24a83fde4855
+SHA512 (cbindgen-vendor.tar.xz) = 41a8c7717849f225f0ce81f2829fbb50c326b58126b330b2e3f0704afdf07a3fa7be40e47f412d9fee8516cad15720769c0e1672b0aa470a7973e04db6d53ac5
 SHA512 (icecat-78.13.0-rh2.tar.bz2) = 14432f34e7606f3c06611990227a66994c5927aab1f70eef5ac21162e8ede8e69b74d8d8083e426ae61b71e511230a6e27e92f41c3a98a5615104e208fedfd03
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 300eedcb8f64b9ff0d2aaf3efb02b0e051390780 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 8 Aug 2021 17:24:29 +0200
Subject: [PATCH 253/473] Patched for Mozilla bug 1715254

---
 icecat.spec                      |  7 ++++-
 mozilla-1715254_glibc_2.34.patch | 54 ++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 mozilla-1715254_glibc_2.34.patch

diff --git a/icecat.spec b/icecat.spec
index 4cdd6fc..1c3f26d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -97,7 +97,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.13.0
-Release: 0.4.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 0.5.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -175,6 +175,7 @@ Patch226: rhbz-1354671.patch
 Patch401: mozilla-1526653.patch
 Patch402: mozilla-1196777.patch
 Patch403: mozilla-1640567.patch
+Patch404: mozilla-1715254_glibc_2.34.patch
 Patch412: mozilla-1337988.patch
 Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
@@ -403,6 +404,7 @@ tar -xf %{SOURCE5}
 
 %patch402 -p1 -b .1196777
 %patch403 -p1 -b .1640567
+%patch404 -p1 -b .1715254
 %patch423 -p1 -b .1596503
 %patch424 -p1 -b .1669471
 %patch425 -p1 -b .1692706
@@ -877,6 +879,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Sun Aug 08 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.5.rh2
+- Patched for Mozilla bug 1715254
+
 * Sat Aug 07 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.4.rh2
 - Update cbindgen to 0.19.0
 
diff --git a/mozilla-1715254_glibc_2.34.patch b/mozilla-1715254_glibc_2.34.patch
new file mode 100644
index 0000000..1626b10
--- /dev/null
+++ b/mozilla-1715254_glibc_2.34.patch
@@ -0,0 +1,54 @@
+
+# HG changeset patch
+# User Alexandre Lissy <lissyx+mozillians@lissyx.dyndns.org>
+# Date 1623246328 0
+# Node ID ecb4011a0c76a1c7040054a44712e277f3dc24a1
+# Parent  9ec189804055442e5cc98d69dd01b71e90ed0cb5
+Bug 1715254 - Deny clone3 to force glibc fallback r=gcp
+
+Differential Revision: https://phabricator.services.mozilla.com/D117297
+
+diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp
+--- a/security/sandbox/linux/SandboxFilter.cpp
++++ b/security/sandbox/linux/SandboxFilter.cpp
+@@ -853,16 +853,19 @@ class SandboxPolicyCommon : public Sandb
+         // Yield
+       case __NR_sched_yield:
+         return Allow();
+ 
+         // Thread creation.
+       case __NR_clone:
+         return ClonePolicy(InvalidSyscall());
+ 
++      case __NR_clone3:
++        return Error(ENOSYS);
++
+         // More thread creation.
+ #ifdef __NR_set_robust_list
+       case __NR_set_robust_list:
+         return Allow();
+ #endif
+ #ifdef ANDROID
+       case __NR_set_tid_address:
+         return Allow();
+@@ -1499,16 +1502,19 @@ class ContentSandboxPolicy : public Sand
+         // the child would inherit the seccomp-bpf policy and almost
+         // certainly die from an unexpected SIGSYS.  We also can't have
+         // fork() crash, currently, because there are too many system
+         // libraries/plugins that try to run commands.  But they can
+         // usually do something reasonable on error.
+       case __NR_clone:
+         return ClonePolicy(Error(EPERM));
+ 
++      case __NR_clone3:
++        return Error(ENOSYS);
++
+ #  ifdef __NR_fadvise64
+       case __NR_fadvise64:
+         return Allow();
+ #  endif
+ 
+ #  ifdef __NR_fadvise64_64
+       case __NR_fadvise64_64:
+         return Allow();
+

From 33047efdb7cdafde64eabfbe49409fc9417bd720 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 10 Aug 2021 15:38:19 +0200
Subject: [PATCH 254/473] Release 78.13.0

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 11 +++++++----
 sources                 |  3 ++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 94ac450..b5954fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,3 +160,5 @@
 /icecat-78.12.0-rh2.tar.bz2
 /icecat-78.13.0-rh1.tar.bz2
 /icecat-78.13.0-rh2.tar.bz2
+/icecat-78.13.0-langpacks.tar.gz
+/icecat-78.13.0-rh3.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index eecd885..4da2dd8 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.12.0
+VERSION=78.13.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 1c3f26d..16e1b89 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -7,7 +7,7 @@ ExcludeArch: ppc64le
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh2
+%global redhat_ver rh3
 
 #%%global pre_tag .test
 %global pre_tag %{nil}
@@ -41,7 +41,7 @@ ExcludeArch: ppc64le
 ####################
 
 # Active/Deactive language files handling
-%global build_langpacks 0
+%global build_langpacks 1
 
 %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 
@@ -97,7 +97,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.13.0
-Release: 0.5.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 1%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -879,8 +879,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Aug 10 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-1.rh3
+- Release 78.13.0
+
 * Sun Aug 08 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.5.rh2
-- Patched for Mozilla bug 1715254
+- Patched for Mozilla bug 1715254 (rhbz#1990612)
 
 * Sat Aug 07 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.4.rh2
 - Update cbindgen to 0.19.0
diff --git a/sources b/sources
index 7001bdc..bcc0a55 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 41a8c7717849f225f0ce81f2829fbb50c326b58126b330b2e3f0704afdf07a3fa7be40e47f412d9fee8516cad15720769c0e1672b0aa470a7973e04db6d53ac5
-SHA512 (icecat-78.13.0-rh2.tar.bz2) = 14432f34e7606f3c06611990227a66994c5927aab1f70eef5ac21162e8ede8e69b74d8d8083e426ae61b71e511230a6e27e92f41c3a98a5615104e208fedfd03
+SHA512 (icecat-78.13.0-langpacks.tar.gz) = ac5bb4bd3be3def92a51a92f0d62f06c6a51e95abdb7c338dcefd83aaf4ea3d0cf9c371c64cdb54d62d41c88b8ce22d32e04e0d8502d6c37417bf6d1220ddc77
+SHA512 (icecat-78.13.0-rh3.tar.bz2) = 0e9df217c1e2dbee20b3bd24a7e4600d0494d7d7aea8502a57e59ed15b17a0442719aaa7eee34df7a4ecd09db48899663bc5959b83f65c241acdaee5e157ca62
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 5a92d6a1230fc94f95de5de0c296434d616819f0 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 11 Aug 2021 19:21:39 +0200
Subject: [PATCH 255/473] Enable build on PPC64le

---
 icecat.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 16e1b89..43c1789 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,6 +1,3 @@
-# Temporarily disabled, filed as rhbz#1932204
-ExcludeArch: ppc64le 
-
 ### Naming ###
 # Set to true if it's going to be submitted as update
 %global release_build 1
@@ -97,7 +94,7 @@ ExcludeArch: ppc64le
 
 Name: icecat
 Version: 78.13.0
-Release: 1%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -879,6 +876,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Wed Aug 11 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-2.rh3
+- Enable build on PPC64le
+
 * Tue Aug 10 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-1.rh3
 - Release 78.13.0
 

From 520bb3f8e1a62b26b5d5b675121500471fc1125c Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 11 Aug 2021 19:24:49 +0200
Subject: [PATCH 256/473] Fix Release tag

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 43c1789..61996e9 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -4,7 +4,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh3
+%global redhat_ver .rh3
 
 #%%global pre_tag .test
 %global pre_tag %{nil}

From 563533b6cd9b2b9eebad5e47ae096a77d15a2dfe Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 11 Aug 2021 19:32:12 +0200
Subject: [PATCH 257/473] Fix Source0 tag

---
 icecat.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 61996e9..4a6dc5d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -4,7 +4,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver .rh3
+%global redhat_ver rh3
 
 #%%global pre_tag .test
 %global pre_tag %{nil}
@@ -94,7 +94,7 @@
 
 Name: icecat
 Version: 78.13.0
-Release: 2%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included

From 7f7c90bdfa977d32aa8c63a33be6a1df6805a38f Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 7 Sep 2021 18:53:49 +0200
Subject: [PATCH 258/473] Release 78.14.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 9 ++++++---
 sources                 | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index b5954fd..5fd68ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -162,3 +162,5 @@
 /icecat-78.13.0-rh2.tar.bz2
 /icecat-78.13.0-langpacks.tar.gz
 /icecat-78.13.0-rh3.tar.bz2
+/icecat-78.14.0-langpacks.tar.gz
+/icecat-78.14.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 4da2dd8..e71f63d 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.13.0
+VERSION=78.14.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 4a6dc5d..632c2de 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -4,7 +4,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh3
+%global redhat_ver rh1
 
 #%%global pre_tag .test
 %global pre_tag %{nil}
@@ -93,8 +93,8 @@
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 78.13.0
-Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.14.0
+Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -876,6 +876,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Sep 07 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.14.0-1.rh1
+- Release 78.14.0
+
 * Wed Aug 11 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-2.rh3
 - Enable build on PPC64le
 
diff --git a/sources b/sources
index bcc0a55..a32a760 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 41a8c7717849f225f0ce81f2829fbb50c326b58126b330b2e3f0704afdf07a3fa7be40e47f412d9fee8516cad15720769c0e1672b0aa470a7973e04db6d53ac5
-SHA512 (icecat-78.13.0-langpacks.tar.gz) = ac5bb4bd3be3def92a51a92f0d62f06c6a51e95abdb7c338dcefd83aaf4ea3d0cf9c371c64cdb54d62d41c88b8ce22d32e04e0d8502d6c37417bf6d1220ddc77
-SHA512 (icecat-78.13.0-rh3.tar.bz2) = 0e9df217c1e2dbee20b3bd24a7e4600d0494d7d7aea8502a57e59ed15b17a0442719aaa7eee34df7a4ecd09db48899663bc5959b83f65c241acdaee5e157ca62
+SHA512 (icecat-78.14.0-langpacks.tar.gz) = de3cceb67f98c7f10614c743fb47f5f5495b14f2c4c90bf6688ed51807700f2beac803ecbdabec94ad2e2e4ac27d2c4cd4e072998b54ccfe9602c8f0856ab634
+SHA512 (icecat-78.14.0-rh1.tar.bz2) = c03c490dbecc89dfe1f30adf7e905d76cdced8066d707d42ab18e0b7c4b76438144333c57b9dadf8d81bc209b6f5851efa40caa5c099e090ac5c724816af74dd
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 414ede8a89c42fedc3f484f745148e60ea0d88f5 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 5 Oct 2021 14:27:26 +0200
Subject: [PATCH 259/473] Release 78.15.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 9 ++++++---
 sources                 | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5fd68ff..7b987f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -164,3 +164,5 @@
 /icecat-78.13.0-rh3.tar.bz2
 /icecat-78.14.0-langpacks.tar.gz
 /icecat-78.14.0-rh1.tar.bz2
+/icecat-78.15.0-langpacks.tar.gz
+/icecat-78.15.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index e71f63d..dfb1c71 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.14.0
+VERSION=78.15.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 632c2de..5e6baec 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -64,9 +64,9 @@
 
 %global system_nss  1
 %if %{?system_nss}
-%global nspr_version 4.31.0
+%global nspr_version 4.26
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.67.0
+%global nss_version 3.69
 %global nss_build_version %{nss_version}
 %endif
 
@@ -93,7 +93,7 @@
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 78.14.0
+Version: 78.15.0
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -876,6 +876,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Oct 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.15.0-1.rh1
+- Release 78.15.0
+
 * Tue Sep 07 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.14.0-1.rh1
 - Release 78.14.0
 
diff --git a/sources b/sources
index a32a760..d7ea5ed 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 41a8c7717849f225f0ce81f2829fbb50c326b58126b330b2e3f0704afdf07a3fa7be40e47f412d9fee8516cad15720769c0e1672b0aa470a7973e04db6d53ac5
-SHA512 (icecat-78.14.0-langpacks.tar.gz) = de3cceb67f98c7f10614c743fb47f5f5495b14f2c4c90bf6688ed51807700f2beac803ecbdabec94ad2e2e4ac27d2c4cd4e072998b54ccfe9602c8f0856ab634
-SHA512 (icecat-78.14.0-rh1.tar.bz2) = c03c490dbecc89dfe1f30adf7e905d76cdced8066d707d42ab18e0b7c4b76438144333c57b9dadf8d81bc209b6f5851efa40caa5c099e090ac5c724816af74dd
+SHA512 (icecat-78.15.0-langpacks.tar.gz) = f46d8be1a5dca39d68c3c55f6764ddfec8c99f3a15b1112e873f7e7828a21739a3a1a927ee03465107ee80c8878d6fecaedaa9c6d4657e211293c40bd36ea2ea
+SHA512 (icecat-78.15.0-rh1.tar.bz2) = 01f8f941df48a78b654d5ac81ad0ac1aae9ac6aecc769beafefc62590ebc30a2e98df72517df3c2cd8a657b4cfceed2b51f6eda979c5f3bc3208f89ce43953a7
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From f7f92cabef8a6ebb50a53b6dabca0b62d0d9b4b5 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 12 Oct 2021 21:32:06 +0200
Subject: [PATCH 260/473] Release 91.2.0

---
 .gitignore                                    |   2 +
 ...fix-mozillaSignalTrampoline-to-work-.patch |  12 -
 build-disable-elfhack.patch                   |  16 +-
 firefox-disable-ffvpx-with-vapi.patch         | 112 ++-
 firefox-pipewire.patch                        | 846 ----------------
 icecat-lang_download.sh                       |   2 +-
 icecat-mozilla-1613672.patch                  |  84 --
 icecat-mozilla-1669471.patch                  |  27 -
 icecat-porting_to_python310.patch             | 928 ------------------
 icecat.appdata.xml                            |   9 +-
 icecat.metainfo.xml                           |  11 -
 icecat.spec                                   |  73 +-
 mozilla-1196777.patch                         |  20 +-
 mozilla-1526653.patch                         |  22 -
 mozilla-1634213.patch                         |  96 --
 mozilla-1640567.patch                         |  18 -
 mozilla-1669442.patch                         |  13 -
 mozilla-1692706.patch                         |  32 -
 mozilla-1715254_glibc_2.34.patch              |  54 -
 sources                                       |   4 +-
 20 files changed, 106 insertions(+), 2275 deletions(-)
 delete mode 100644 Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
 delete mode 100644 firefox-pipewire.patch
 delete mode 100644 icecat-mozilla-1613672.patch
 delete mode 100644 icecat-mozilla-1669471.patch
 delete mode 100644 icecat-porting_to_python310.patch
 delete mode 100644 icecat.metainfo.xml
 delete mode 100644 mozilla-1526653.patch
 delete mode 100644 mozilla-1634213.patch
 delete mode 100644 mozilla-1640567.patch
 delete mode 100644 mozilla-1669442.patch
 delete mode 100644 mozilla-1692706.patch
 delete mode 100644 mozilla-1715254_glibc_2.34.patch

diff --git a/.gitignore b/.gitignore
index 7b987f4..f60d3a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,3 +166,5 @@
 /icecat-78.14.0-rh1.tar.bz2
 /icecat-78.15.0-langpacks.tar.gz
 /icecat-78.15.0-rh1.tar.bz2
+/icecat-91.2.0-langpacks.tar.gz
+/icecat-91.2.0-rh1.tar.bz2
diff --git a/Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch b/Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
deleted file mode 100644
index 1e358a8..0000000
--- a/Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h
---- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661	2018-04-27 08:55:38.848241768 +0200
-+++ firefox-60.0/mfbt/LinuxSignal.h	2018-04-27 09:06:47.946769859 +0200
-@@ -22,7 +22,7 @@
-                                              void* aContext) {
-   asm volatile("nop; nop; nop; nop" : : : "memory");
- 
--  asm volatile("b %0" : : "X"(H) : "memory");
-+  asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory");
- }
- 
- #  define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
diff --git a/build-disable-elfhack.patch b/build-disable-elfhack.patch
index a80c551..faaf669 100644
--- a/build-disable-elfhack.patch
+++ b/build-disable-elfhack.patch
@@ -1,12 +1,12 @@
-diff -up firefox-65.0/toolkit/moz.configure.disable-elfhack firefox-65.0/toolkit/moz.configure
---- firefox-65.0/toolkit/moz.configure.disable-elfhack	2019-01-28 14:16:48.530345132 +0100
-+++ firefox-65.0/toolkit/moz.configure	2019-01-28 14:18:03.231029682 +0100
-@@ -1036,7 +1036,7 @@ with only_when('--enable-compile-environ
-                help='{Enable|Disable} elf hacks')
+diff -up firefox-84.0/toolkit/moz.configure.disable-elfhack firefox-84.0/toolkit/moz.configure
+--- firefox-84.0/toolkit/moz.configure.disable-elfhack	2020-12-10 12:37:30.727243266 +0100
++++ firefox-84.0/toolkit/moz.configure	2020-12-10 12:39:42.771967894 +0100
+@@ -1280,7 +1280,7 @@ with only_when("--enable-compile-environ
+             help="{Enable|Disable} elf hacks",
+         )
  
-         set_config('USE_ELF_HACK',
--                   depends_if('--enable-elf-hack')(lambda _: True))
-+                   depends_if('--enable-elf-hack')(lambda _: False))
+-        set_config("USE_ELF_HACK", depends_if("--enable-elf-hack")(lambda _: True))
++        set_config("USE_ELF_HACK", depends_if("--enable-elf-hack")(lambda _: False))
  
  
  @depends(check_build_environment)
diff --git a/firefox-disable-ffvpx-with-vapi.patch b/firefox-disable-ffvpx-with-vapi.patch
index df179b0..3ecdbed 100644
--- a/firefox-disable-ffvpx-with-vapi.patch
+++ b/firefox-disable-ffvpx-with-vapi.patch
@@ -1,41 +1,77 @@
-diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory.cpp
---- a/dom/media/platforms/PDMFactory.cpp
-+++ b/dom/media/platforms/PDMFactory.cpp
-@@ -21,16 +21,17 @@
- #include "mozilla/GpuDecoderModule.h"
- #include "mozilla/RemoteDecoderModule.h"
- #include "mozilla/SharedThreadPool.h"
- #include "mozilla/StaticPrefs_media.h"
- #include "mozilla/StaticPtr.h"
- #include "mozilla/SyncRunnable.h"
- #include "mozilla/TaskQueue.h"
- #include "mozilla/gfx/gfxVars.h"
-+#include "gfxPlatformGtk.h"
- 
- #ifdef XP_WIN
- #  include "WMFDecoderModule.h"
- #  include "mozilla/WindowsVersion.h"
- #endif
- #ifdef MOZ_FFVPX
- #  include "FFVPXRuntimeLinker.h"
- #endif
-@@ -362,17 +363,18 @@ void PDMFactory::CreatePDMs() {
- #endif
- #ifdef MOZ_OMX
-   if (StaticPrefs::media_omx_enabled()) {
-     m = OmxDecoderModule::Create();
-     StartupPDM(m);
-   }
- #endif
- #ifdef MOZ_FFVPX
--  if (StaticPrefs::media_ffvpx_enabled()) {
-+  if (StaticPrefs::media_ffvpx_enabled() &&
-+      !gfxPlatformGtk::GetPlatform()->UseWaylandHardwareVideoDecoding()) {
-     m = FFVPXRuntimeLinker::CreateDecoderModule();
-     StartupPDM(m);
+diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi firefox-88.0/dom/media/platforms/PDMFactory.cpp
+--- firefox-88.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi	2021-04-15 21:44:28.000000000 +0200
++++ firefox-88.0/dom/media/platforms/PDMFactory.cpp	2021-04-19 13:27:07.808429721 +0200
+@@ -481,12 +481,6 @@ void PDMFactory::CreateRddPDMs() {
+     CreateAndStartupPDM<AppleDecoderModule>();
    }
  #endif
+-#ifdef MOZ_FFVPX
+-  if (StaticPrefs::media_ffvpx_enabled() &&
+-      StaticPrefs::media_rdd_ffvpx_enabled()) {
+-    CreateAndStartupPDM<FFVPXRuntimeLinker>();
+-  }
+-#endif
  #ifdef MOZ_FFMPEG
-   if (StaticPrefs::media_ffmpeg_enabled()) {
-     m = FFmpegRuntimeLinker::CreateDecoderModule();
-     mFFmpegFailedToLoad = !StartupPDM(m);
+   if (StaticPrefs::media_ffmpeg_enabled() &&
+       StaticPrefs::media_rdd_ffmpeg_enabled() &&
+@@ -495,6 +489,12 @@ void PDMFactory::CreateRddPDMs() {
+         FFmpegRuntimeLinker::LinkStatusCode());
+   }
+ #endif
++#ifdef MOZ_FFVPX
++  if (StaticPrefs::media_ffvpx_enabled() &&
++      StaticPrefs::media_rdd_ffvpx_enabled()) {
++    CreateAndStartupPDM<FFVPXRuntimeLinker>();
++  }
++#endif
+   CreateAndStartupPDM<AgnosticDecoderModule>();
+ }
+ 
+@@ -525,11 +525,6 @@ void PDMFactory::CreateContentPDMs() {
+     CreateAndStartupPDM<OmxDecoderModule>();
+   }
+ #endif
+-#ifdef MOZ_FFVPX
+-  if (StaticPrefs::media_ffvpx_enabled()) {
+-    CreateAndStartupPDM<FFVPXRuntimeLinker>();
+-  }
+-#endif
+ #ifdef MOZ_FFMPEG
+   if (StaticPrefs::media_ffmpeg_enabled() &&
+       !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
+@@ -537,6 +532,11 @@ void PDMFactory::CreateContentPDMs() {
+         FFmpegRuntimeLinker::LinkStatusCode());
+   }
+ #endif
++#ifdef MOZ_FFVPX
++  if (StaticPrefs::media_ffvpx_enabled()) {
++    CreateAndStartupPDM<FFVPXRuntimeLinker>();
++  }
++#endif
+ #ifdef MOZ_WIDGET_ANDROID
+   if (StaticPrefs::media_android_media_codec_enabled()) {
+     StartupPDM(AndroidDecoderModule::Create(),
+@@ -571,11 +571,6 @@ void PDMFactory::CreateDefaultPDMs() {
+     CreateAndStartupPDM<OmxDecoderModule>();
+   }
+ #endif
+-#ifdef MOZ_FFVPX
+-  if (StaticPrefs::media_ffvpx_enabled()) {
+-    CreateAndStartupPDM<FFVPXRuntimeLinker>();
+-  }
+-#endif
+ #ifdef MOZ_FFMPEG
+   if (StaticPrefs::media_ffmpeg_enabled() &&
+       !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
+@@ -583,6 +578,11 @@ void PDMFactory::CreateDefaultPDMs() {
+         FFmpegRuntimeLinker::LinkStatusCode());
+   }
+ #endif
++#ifdef MOZ_FFVPX
++  if (StaticPrefs::media_ffvpx_enabled()) {
++    CreateAndStartupPDM<FFVPXRuntimeLinker>();
++  }
++#endif
+ #ifdef MOZ_WIDGET_ANDROID
+   if (StaticPrefs::media_android_media_codec_enabled()) {
+     StartupPDM(AndroidDecoderModule::Create(),
diff --git a/firefox-pipewire.patch b/firefox-pipewire.patch
deleted file mode 100644
index 0844209..0000000
--- a/firefox-pipewire.patch
+++ /dev/null
@@ -1,846 +0,0 @@
-diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
-index 2081d0c683a4..641133bf1ea4 100644
---- a/config/system-headers.mozbuild
-+++ b/config/system-headers.mozbuild
-@@ -314,6 +314,7 @@ system_headers = [
-     'Gestalt.h',
-     'getopt.h',
-     'gio/gio.h',
-+    'gio/gunixfdlist.h',
-     'glibconfig.h',
-     'glib.h',
-     'glib-object.h',
-@@ -607,6 +608,7 @@ system_headers = [
-     'Pgenerr.h',
-     'PGenErr.h',
-     'Ph.h',
-+    'pipewire/pipewire.h',
-     'pixman.h',
-     'pk11func.h',
-     'pk11pqg.h',
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
-index ba885217b3ba..201d3b755221 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
-@@ -158,7 +158,7 @@ if (rtc_include_tests) {
- if (is_linux) {
-   if (rtc_use_pipewire) {
-     pkg_config("pipewire") {
--      packages = [ "libpipewire-0.2" ]
-+      packages = [ "libpipewire-0.3" ]
- 
-       defines = [ "WEBRTC_USE_PIPEWIRE" ]
-     }
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-index 90b40431c7e4..d844aa79d591 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-@@ -194,6 +194,30 @@ if CONFIG["OS_TARGET"] == "Linux":
-         "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
-     ]
- 
-+# PipeWire specific files
-+if CONFIG["OS_TARGET"] == "Linux":
-+
-+    DEFINES["WEBRTC_USE_PIPEWIRE"] = "1"
-+
-+    OS_LIBS += [
-+        "rt",
-+        "pipewire-0.3",
-+        "glib-2.0",
-+        "gio-2.0",
-+        "gobject-2.0"
-+    ]
-+
-+    CXXFLAGS += CONFIG['TK_CFLAGS']
-+    CXXFLAGS += [ "-I/usr/include/pipewire-0.3" ]
-+    CXXFLAGS += [ "-I/usr/include/spa-0.2" ]
-+
-+    UNIFIED_SOURCES += [
-+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
-+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
-+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
-+    ]
-+
-+
- if CONFIG["OS_TARGET"] == "NetBSD":
- 
-     DEFINES["USE_X11"] = "1"
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
-index 1eb8ead26efa..316468eed1fc 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
-@@ -141,7 +141,7 @@ class DesktopCaptureOptions {
-   bool disable_effects_ = true;
-   bool detect_updated_region_ = false;
- #if defined(WEBRTC_USE_PIPEWIRE)
--  bool allow_pipewire_ = false;
-+  bool allow_pipewire_ = true;
- #endif
- };
- 
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-index 379341c833de..76349f1fbd4d 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-@@ -15,8 +15,11 @@
- 
- #include <spa/param/format-utils.h>
- #include <spa/param/props.h>
--#include <spa/param/video/raw-utils.h>
--#include <spa/support/type-map.h>
-+
-+#include <linux/dma-buf.h>
-+#include <sys/mman.h>
-+#include <sys/ioctl.h>
-+#include <sys/syscall.h>
- 
- #include <memory>
- #include <utility>
-@@ -36,31 +39,36 @@ const char kSessionInterfaceName[] = "org.freedesktop.portal.Session";
- const char kRequestInterfaceName[] = "org.freedesktop.portal.Request";
- const char kScreenCastInterfaceName[] = "org.freedesktop.portal.ScreenCast";
- 
--// static
--void BaseCapturerPipeWire::OnStateChanged(void* data,
--                                          pw_remote_state old_state,
--                                          pw_remote_state state,
--                                          const char* error_message) {
--  BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
--  RTC_DCHECK(that);
- 
--  switch (state) {
--    case PW_REMOTE_STATE_ERROR:
--      RTC_LOG(LS_ERROR) << "PipeWire remote state error: " << error_message;
--      break;
--    case PW_REMOTE_STATE_CONNECTED:
--      RTC_LOG(LS_INFO) << "PipeWire remote state: connected.";
--      that->CreateReceivingStream();
--      break;
--    case PW_REMOTE_STATE_CONNECTING:
--      RTC_LOG(LS_INFO) << "PipeWire remote state: connecting.";
-+// static
-+void BaseCapturerPipeWire::SyncDmaBuf(int fd, uint64_t start_or_end) {
-+  struct dma_buf_sync sync = { 0 };
-+
-+  sync.flags = start_or_end | DMA_BUF_SYNC_READ;
-+
-+  while(true) {
-+    int ret;
-+    ret = ioctl (fd, DMA_BUF_IOCTL_SYNC, &sync);
-+    if (ret == -1 && errno == EINTR) {
-+      continue;
-+    } else if (ret == -1) {
-+      RTC_LOG(LS_ERROR) << "Failed to synchronize DMA buffer: " << g_strerror(errno);
-       break;
--    case PW_REMOTE_STATE_UNCONNECTED:
--      RTC_LOG(LS_INFO) << "PipeWire remote state: unconnected.";
-+    } else {
-       break;
-+    }
-   }
- }
- 
-+// static
-+void BaseCapturerPipeWire::OnCoreError(void *data,
-+                                       uint32_t id,
-+                                       int seq,
-+                                       int res,
-+                                       const char *message) {
-+  RTC_LOG(LS_ERROR) << "core error: " << message;
-+}
-+
- // static
- void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
-                                                 pw_stream_state old_state,
-@@ -73,76 +81,54 @@ void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
-     case PW_STREAM_STATE_ERROR:
-       RTC_LOG(LS_ERROR) << "PipeWire stream state error: " << error_message;
-       break;
--    case PW_STREAM_STATE_CONFIGURE:
--      pw_stream_set_active(that->pw_stream_, true);
--      break;
--    case PW_STREAM_STATE_UNCONNECTED:
--    case PW_STREAM_STATE_CONNECTING:
--    case PW_STREAM_STATE_READY:
-     case PW_STREAM_STATE_PAUSED:
-     case PW_STREAM_STATE_STREAMING:
-+    case PW_STREAM_STATE_UNCONNECTED:
-+    case PW_STREAM_STATE_CONNECTING:
-       break;
-   }
- }
- 
- // static
--void BaseCapturerPipeWire::OnStreamFormatChanged(void* data,
--                                                 const struct spa_pod* format) {
-+void BaseCapturerPipeWire::OnStreamParamChanged(void *data, uint32_t id,
-+                                                const struct spa_pod *format) {
-   BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
-   RTC_DCHECK(that);
- 
--  RTC_LOG(LS_INFO) << "PipeWire stream format changed.";
-+  RTC_LOG(LS_INFO) << "PipeWire stream param changed.";
- 
--  if (!format) {
--    pw_stream_finish_format(that->pw_stream_, /*res=*/0, /*params=*/nullptr,
--                            /*n_params=*/0);
-+  if (!format || id != SPA_PARAM_Format) {
-     return;
-   }
- 
--  that->spa_video_format_ = new spa_video_info_raw();
--  spa_format_video_raw_parse(format, that->spa_video_format_,
--                             &that->pw_type_->format_video);
-+  spa_format_video_raw_parse(format, &that->spa_video_format_);
- 
--  auto width = that->spa_video_format_->size.width;
--  auto height = that->spa_video_format_->size.height;
-+  auto width = that->spa_video_format_.size.width;
-+  auto height = that->spa_video_format_.size.height;
-   auto stride = SPA_ROUND_UP_N(width * kBytesPerPixel, 4);
-   auto size = height * stride;
- 
-+  that->desktop_size_ = DesktopSize(width, height);
-+
-   uint8_t buffer[1024] = {};
-   auto builder = spa_pod_builder{buffer, sizeof(buffer)};
- 
-   // Setup buffers and meta header for new format.
--  const struct spa_pod* params[2];
--  params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
--      &builder,
--      // id to enumerate buffer requirements
--      that->pw_core_type_->param.idBuffers,
--      that->pw_core_type_->param_buffers.Buffers,
--      // Size: specified as integer (i) and set to specified size
--      ":", that->pw_core_type_->param_buffers.size, "i", size,
--      // Stride: specified as integer (i) and set to specified stride
--      ":", that->pw_core_type_->param_buffers.stride, "i", stride,
--      // Buffers: specifies how many buffers we want to deal with, set as
--      // integer (i) where preferred number is 8, then allowed number is defined
--      // as range (r) from min and max values and it is undecided (u) to allow
--      // negotiation
--      ":", that->pw_core_type_->param_buffers.buffers, "iru", 8,
--      SPA_POD_PROP_MIN_MAX(1, 32),
--      // Align: memory alignment of the buffer, set as integer (i) to specified
--      // value
--      ":", that->pw_core_type_->param_buffers.align, "i", 16));
--  params[1] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
--      &builder,
--      // id to enumerate supported metadata
--      that->pw_core_type_->param.idMeta, that->pw_core_type_->param_meta.Meta,
--      // Type: specified as id or enum (I)
--      ":", that->pw_core_type_->param_meta.type, "I",
--      that->pw_core_type_->meta.Header,
--      // Size: size of the metadata, specified as integer (i)
--      ":", that->pw_core_type_->param_meta.size, "i",
--      sizeof(struct spa_meta_header)));
--
--  pw_stream_finish_format(that->pw_stream_, /*res=*/0, params, /*n_params=*/2);
-+  const struct spa_pod* params[3];
-+  params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
-+              SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
-+              SPA_PARAM_BUFFERS_size, SPA_POD_Int(size),
-+              SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride),
-+              SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(8, 1, 32)));
-+  params[1] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
-+              SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
-+              SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),
-+              SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header))));
-+  params[2] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
-+              SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
-+              SPA_PARAM_META_type, SPA_POD_Id (SPA_META_VideoCrop),
-+              SPA_PARAM_META_size, SPA_POD_Int (sizeof(struct spa_meta_region))));
-+  pw_stream_update_params(that->pw_stream_, params, 3);
- }
- 
- // static
-@@ -150,15 +136,25 @@ void BaseCapturerPipeWire::OnStreamProcess(void* data) {
-   BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
-   RTC_DCHECK(that);
- 
--  pw_buffer* buf = nullptr;
-+  struct pw_buffer *next_buffer;
-+  struct pw_buffer *buffer = nullptr;
-+
-+  next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
-+  while (next_buffer) {
-+    buffer = next_buffer;
-+    next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
- 
--  if (!(buf = pw_stream_dequeue_buffer(that->pw_stream_))) {
-+    if (next_buffer)
-+      pw_stream_queue_buffer (that->pw_stream_, buffer);
-+  }
-+
-+  if (!buffer) {
-     return;
-   }
- 
--  that->HandleBuffer(buf);
-+  that->HandleBuffer(buffer);
- 
--  pw_stream_queue_buffer(that->pw_stream_, buf);
-+  pw_stream_queue_buffer(that->pw_stream_, buffer);
- }
- 
- BaseCapturerPipeWire::BaseCapturerPipeWire(CaptureSourceType source_type)
-@@ -169,38 +165,22 @@ BaseCapturerPipeWire::~BaseCapturerPipeWire() {
-     pw_thread_loop_stop(pw_main_loop_);
-   }
- 
--  if (pw_type_) {
--    delete pw_type_;
--  }
--
--  if (spa_video_format_) {
--    delete spa_video_format_;
--  }
--
-   if (pw_stream_) {
-     pw_stream_destroy(pw_stream_);
-   }
- 
--  if (pw_remote_) {
--    pw_remote_destroy(pw_remote_);
-+  if (pw_core_) {
-+    pw_core_disconnect(pw_core_);
-   }
- 
--  if (pw_core_) {
--    pw_core_destroy(pw_core_);
-+  if (pw_context_) {
-+    pw_context_destroy(pw_context_);
-   }
- 
-   if (pw_main_loop_) {
-     pw_thread_loop_destroy(pw_main_loop_);
-   }
- 
--  if (pw_loop_) {
--    pw_loop_destroy(pw_loop_);
--  }
--
--  if (current_frame_) {
--    free(current_frame_);
--  }
--
-   if (start_request_signal_id_) {
-     g_dbus_connection_signal_unsubscribe(connection_, start_request_signal_id_);
-   }
-@@ -250,27 +230,35 @@ void BaseCapturerPipeWire::InitPortal() {
- void BaseCapturerPipeWire::InitPipeWire() {
-   pw_init(/*argc=*/nullptr, /*argc=*/nullptr);
- 
--  pw_loop_ = pw_loop_new(/*properties=*/nullptr);
--  pw_main_loop_ = pw_thread_loop_new(pw_loop_, "pipewire-main-loop");
--
--  pw_core_ = pw_core_new(pw_loop_, /*properties=*/nullptr);
--  pw_core_type_ = pw_core_get_type(pw_core_);
--  pw_remote_ = pw_remote_new(pw_core_, nullptr, /*user_data_size=*/0);
-+  pw_main_loop_ = pw_thread_loop_new("pipewire-main-loop", nullptr);
-+  pw_context_ = pw_context_new(pw_thread_loop_get_loop(pw_main_loop_), nullptr, 0);
-+  if (!pw_context_) {
-+    RTC_LOG(LS_ERROR) << "Failed to create PipeWire context";
-+    return;
-+  }
- 
--  InitPipeWireTypes();
-+  pw_core_ = pw_context_connect(pw_context_, nullptr, 0);
-+  if (!pw_core_) {
-+    RTC_LOG(LS_ERROR) << "Failed to connect PipeWire context";
-+    return;
-+  }
- 
-   // Initialize event handlers, remote end and stream-related.
--  pw_remote_events_.version = PW_VERSION_REMOTE_EVENTS;
--  pw_remote_events_.state_changed = &OnStateChanged;
-+  pw_core_events_.version = PW_VERSION_CORE_EVENTS;
-+  pw_core_events_.error = &OnCoreError;
- 
-   pw_stream_events_.version = PW_VERSION_STREAM_EVENTS;
-   pw_stream_events_.state_changed = &OnStreamStateChanged;
--  pw_stream_events_.format_changed = &OnStreamFormatChanged;
-+  pw_stream_events_.param_changed = &OnStreamParamChanged;
-   pw_stream_events_.process = &OnStreamProcess;
- 
--  pw_remote_add_listener(pw_remote_, &spa_remote_listener_, &pw_remote_events_,
--                         this);
--  pw_remote_connect_fd(pw_remote_, pw_fd_);
-+  pw_core_add_listener(pw_core_, &spa_core_listener_, &pw_core_events_, this);
-+
-+  pw_stream_ = CreateReceivingStream();
-+  if (!pw_stream_) {
-+    RTC_LOG(LS_ERROR) << "Failed to create PipeWire stream";
-+    return;
-+  }
- 
-   if (pw_thread_loop_start(pw_main_loop_) < 0) {
-     RTC_LOG(LS_ERROR) << "Failed to start main PipeWire loop";
-@@ -278,81 +266,132 @@ void BaseCapturerPipeWire::InitPipeWire() {
-   }
- }
- 
--void BaseCapturerPipeWire::InitPipeWireTypes() {
--  spa_type_map* map = pw_core_type_->map;
--  pw_type_ = new PipeWireType();
--
--  spa_type_media_type_map(map, &pw_type_->media_type);
--  spa_type_media_subtype_map(map, &pw_type_->media_subtype);
--  spa_type_format_video_map(map, &pw_type_->format_video);
--  spa_type_video_format_map(map, &pw_type_->video_format);
--}
--
--void BaseCapturerPipeWire::CreateReceivingStream() {
-+pw_stream* BaseCapturerPipeWire::CreateReceivingStream() {
-   spa_rectangle pwMinScreenBounds = spa_rectangle{1, 1};
--  spa_rectangle pwScreenBounds =
--      spa_rectangle{static_cast<uint32_t>(desktop_size_.width()),
--                    static_cast<uint32_t>(desktop_size_.height())};
-+  spa_rectangle pwMaxScreenBounds = spa_rectangle{INT32_MAX, INT32_MAX};
- 
--  spa_fraction pwFrameRateMin = spa_fraction{0, 1};
--  spa_fraction pwFrameRateMax = spa_fraction{60, 1};
-+  auto stream = pw_stream_new(pw_core_, "webrtc-pipewire-stream", nullptr);
- 
--  pw_properties* reuseProps = pw_properties_new("pipewire.client.reuse", "1",
--                                                /*end of varargs*/ nullptr);
--  pw_stream_ = pw_stream_new(pw_remote_, "webrtc-consume-stream", reuseProps);
-+  if (!stream) {
-+    RTC_LOG(LS_ERROR) << "Could not create receiving stream.";
-+    return nullptr;
-+  }
- 
-   uint8_t buffer[1024] = {};
--  const spa_pod* params[1];
--  spa_pod_builder builder = spa_pod_builder{buffer, sizeof(buffer)};
--  params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
--      &builder,
--      // id to enumerate formats
--      pw_core_type_->param.idEnumFormat, pw_core_type_->spa_format, "I",
--      pw_type_->media_type.video, "I", pw_type_->media_subtype.raw,
--      // Video format: specified as id or enum (I), preferred format is BGRx,
--      // then allowed formats are enumerated (e) and the format is undecided (u)
--      // to allow negotiation
--      ":", pw_type_->format_video.format, "Ieu", pw_type_->video_format.BGRx,
--      SPA_POD_PROP_ENUM(2, pw_type_->video_format.RGBx,
--                        pw_type_->video_format.BGRx),
--      // Video size: specified as rectangle (R), preferred size is specified as
--      // first parameter, then allowed size is defined as range (r) from min and
--      // max values and the format is undecided (u) to allow negotiation
--      ":", pw_type_->format_video.size, "Rru", &pwScreenBounds, 2,
--      &pwMinScreenBounds, &pwScreenBounds,
--      // Frame rate: specified as fraction (F) and set to minimum frame rate
--      // value
--      ":", pw_type_->format_video.framerate, "F", &pwFrameRateMin,
--      // Max frame rate: specified as fraction (F), preferred frame rate is set
--      // to maximum value, then allowed frame rate is defined as range (r) from
--      // min and max values and it is undecided (u) to allow negotiation
--      ":", pw_type_->format_video.max_framerate, "Fru", &pwFrameRateMax, 2,
--      &pwFrameRateMin, &pwFrameRateMax));
--
--  pw_stream_add_listener(pw_stream_, &spa_stream_listener_, &pw_stream_events_,
--                         this);
-+  const spa_pod* params[2];
-+  spa_pod_builder builder = SPA_POD_BUILDER_INIT(buffer, sizeof (buffer));
-+
-+  params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
-+              SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-+              SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video),
-+              SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
-+              SPA_FORMAT_VIDEO_format, SPA_POD_CHOICE_ENUM_Id(5, SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_RGBx, SPA_VIDEO_FORMAT_RGBA,
-+                                                                 SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_BGRA),
-+              SPA_FORMAT_VIDEO_size, SPA_POD_CHOICE_RANGE_Rectangle(&pwMinScreenBounds,
-+                                                                    &pwMinScreenBounds,
-+                                                                    &pwMaxScreenBounds),
-+              0));
-+  pw_stream_add_listener(stream, &spa_stream_listener_, &pw_stream_events_, this);
-+
-   pw_stream_flags flags = static_cast<pw_stream_flags>(
--      PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE |
--      PW_STREAM_FLAG_MAP_BUFFERS);
--  if (pw_stream_connect(pw_stream_, PW_DIRECTION_INPUT, /*port_path=*/nullptr,
--                        flags, params,
--                        /*n_params=*/1) != 0) {
-+      PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE);
-+
-+  if (pw_stream_connect(stream, PW_DIRECTION_INPUT, pw_stream_node_id_, PW_STREAM_FLAG_AUTOCONNECT, params, 1) != 0) {
-     RTC_LOG(LS_ERROR) << "Could not connect receiving stream.";
-     portal_init_failed_ = true;
--    return;
-   }
-+
-+  return stream;
- }
- 
- void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
-+  struct spa_meta_region* video_crop;
-   spa_buffer* spaBuffer = buffer->buffer;
--  void* src = nullptr;
-+  uint8_t *map = nullptr;
-+  uint8_t* src = nullptr;
-+  uint8_t* dst = nullptr;
-+
-+  if (spaBuffer->datas[0].chunk->size == 0) {
-+    map = nullptr;
-+    src = nullptr;
-+  } else if (spaBuffer->datas[0].type == SPA_DATA_MemFd) {
-+    map = static_cast<uint8_t*>(mmap(
-+        nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
-+        PROT_READ, MAP_PRIVATE, spaBuffer->datas[0].fd, 0));
-+
-+    if (map == MAP_FAILED) {
-+      RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno);
-+      return;
-+    }
-+
-+    src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
-+  } else if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
-+    int fd;
-+    fd = spaBuffer->datas[0].fd;
- 
--  if (!(src = spaBuffer->datas[0].data)) {
-+    map = static_cast<uint8_t*>(mmap(
-+        nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
-+        PROT_READ, MAP_PRIVATE, fd, 0));
-+
-+    if (map == MAP_FAILED) {
-+      RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno);
-+      return;
-+    }
-+
-+    SyncDmaBuf(fd, DMA_BUF_SYNC_START);
-+
-+    src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
-+  } else if (spaBuffer->datas[0].type == SPA_DATA_MemPtr) {
-+    map = nullptr;
-+    src = static_cast<uint8_t*>(spaBuffer->datas[0].data);
-+  } else {
-     return;
-   }
- 
--  uint32_t maxSize = spaBuffer->datas[0].maxsize;
--  int32_t srcStride = spaBuffer->datas[0].chunk->stride;
-+  if (!src) {
-+    return;
-+  }
-+
-+  DesktopSize prev_crop_size = DesktopSize(0, 0);
-+  if (video_crop_size_initialized_) {
-+    prev_crop_size = video_crop_size_;
-+  }  
-+
-+  if ((video_crop = static_cast<struct spa_meta_region*>(
-+           spa_buffer_find_meta_data(spaBuffer, SPA_META_VideoCrop, sizeof(*video_crop))))) {
-+    RTC_DCHECK(video_crop->region.size.width <= desktop_size_.width() &&
-+               video_crop->region.size.height <= desktop_size_.height());
-+    if ((video_crop->region.size.width != desktop_size_.width() ||
-+        video_crop->region.size.height != desktop_size_.height()) && video_crop->region.size.width && video_crop->region.size.height) {
-+      video_crop_size_ = DesktopSize(video_crop->region.size.width, video_crop->region.size.height);
-+      video_crop_size_initialized_ = true;
-+    } else {
-+      video_crop_size_initialized_ = false;
-+    }
-+  } else {
-+    video_crop_size_initialized_ = false;
-+  }
-+
-+  size_t frame_size;
-+  if (video_crop_size_initialized_) {
-+    frame_size =
-+        video_crop_size_.width() * video_crop_size_.height() * kBytesPerPixel;
-+  } else {
-+    frame_size =
-+        desktop_size_.width() * desktop_size_.height() * kBytesPerPixel;
-+  }
-+
-+  if (!current_frame_ ||
-+      (video_crop_size_initialized_ && !video_crop_size_.equals(prev_crop_size))) {
-+    current_frame_ = std::make_unique<uint8_t[]>(frame_size);
-+  }
-+  RTC_DCHECK(current_frame_ != nullptr);
-+
-+  const int32_t dstStride = video_crop_size_initialized_
-+                                ? video_crop_size_.width() * kBytesPerPixel
-+                                : desktop_size_.width() * kBytesPerPixel;
-+  const int32_t srcStride = spaBuffer->datas[0].chunk->stride;
-+
-   if (srcStride != (desktop_size_.width() * kBytesPerPixel)) {
-     RTC_LOG(LS_ERROR) << "Got buffer with stride different from screen stride: "
-                       << srcStride
-@@ -361,21 +400,40 @@ void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
-     return;
-   }
- 
--  if (!current_frame_) {
--    current_frame_ = static_cast<uint8_t*>(malloc(maxSize));
-+  dst = current_frame_.get();
-+
-+  // Adjust source content based on crop video position
-+  if (video_crop_size_initialized_ &&
-+      (video_crop->region.position.y + video_crop_size_.height() <= desktop_size_.height())) {
-+    for (int i = 0; i < video_crop->region.position.y; ++i) {
-+      src += srcStride;
-+    }
-+  }
-+  const int xOffset =
-+      video_crop_size_initialized_ && (video_crop->region.position.x + video_crop_size_.width() <=
-+                           desktop_size_.width())
-+          ? video_crop->region.position.x * kBytesPerPixel
-+          : 0;
-+  const int height = video_crop_size_initialized_ ? video_crop_size_.height() : desktop_size_.height();
-+  for (int i = 0; i < height; ++i) {
-+    // Adjust source content based on crop video position if needed
-+    src += xOffset;
-+    std::memcpy(dst, src, dstStride);
-+    // If both sides decided to go with the RGBx format we need to convert it to
-+    // BGRx to match color format expected by WebRTC.
-+    if (spa_video_format_.format == SPA_VIDEO_FORMAT_RGBx ||
-+        spa_video_format_.format == SPA_VIDEO_FORMAT_RGBA) {
-+      ConvertRGBxToBGRx(dst, dstStride);
-+    }
-+    src += srcStride - xOffset;
-+    dst += dstStride;
-   }
--  RTC_DCHECK(current_frame_ != nullptr);
- 
--  // If both sides decided to go with the RGBx format we need to convert it to
--  // BGRx to match color format expected by WebRTC.
--  if (spa_video_format_->format == pw_type_->video_format.RGBx) {
--    uint8_t* tempFrame = static_cast<uint8_t*>(malloc(maxSize));
--    std::memcpy(tempFrame, src, maxSize);
--    ConvertRGBxToBGRx(tempFrame, maxSize);
--    std::memcpy(current_frame_, tempFrame, maxSize);
--    free(tempFrame);
--  } else {
--    std::memcpy(current_frame_, src, maxSize);
-+  if (map) {
-+    if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
-+      SyncDmaBuf(spaBuffer->datas[0].fd, DMA_BUF_SYNC_END);
-+    }
-+    munmap(map, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset);
-   }
- }
- 
-@@ -725,10 +783,7 @@ void BaseCapturerPipeWire::OnStartRequestResponseSignal(
-       g_variant_get(variant, "(u@a{sv})", &stream_id, &options);
-       RTC_DCHECK(options != nullptr);
- 
--      g_variant_lookup(options, "size", "(ii)", &width, &height);
--
--      that->desktop_size_.set(width, height);
--
-+      that->pw_stream_node_id_ = stream_id;
-       g_variant_unref(options);
-       g_variant_unref(variant);
-     }
-@@ -813,10 +868,15 @@ void BaseCapturerPipeWire::CaptureFrame() {
-     return;
-   }
- 
--  std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(desktop_size_));
-+  DesktopSize frame_size = desktop_size_;
-+  if (video_crop_size_initialized_) {
-+    frame_size = video_crop_size_;
-+  }
-+  
-+  std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(frame_size));
-   result->CopyPixelsFrom(
--      current_frame_, (desktop_size_.width() * kBytesPerPixel),
--      DesktopRect::MakeWH(desktop_size_.width(), desktop_size_.height()));
-+      current_frame_.get(), (frame_size.width() * kBytesPerPixel),
-+      DesktopRect::MakeWH(frame_size.width(), frame_size.height()));
-   if (!result) {
-     callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
-     return;
-@@ -837,4 +897,22 @@ bool BaseCapturerPipeWire::SelectSource(SourceId id) {
-   return true;
- }
- 
-+// static
-+std::unique_ptr<DesktopCapturer>
-+BaseCapturerPipeWire::CreateRawScreenCapturer(
-+    const DesktopCaptureOptions& options) {
-+  std::unique_ptr<BaseCapturerPipeWire> capturer =
-+      std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny);
-+  return std::move(capturer);}
-+
-+// static
-+std::unique_ptr<DesktopCapturer>
-+BaseCapturerPipeWire::CreateRawWindowCapturer(
-+    const DesktopCaptureOptions& options) {
-+
-+  std::unique_ptr<BaseCapturerPipeWire> capturer =
-+      std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny);
-+  return std::move(capturer);
-+}
-+
- }  // namespace webrtc
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
-index 56b101acbaa6..de54157d1a2a 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
-@@ -22,17 +22,13 @@
- 
- namespace webrtc {
- 
--class PipeWireType {
-- public:
--  spa_type_media_type media_type;
--  spa_type_media_subtype media_subtype;
--  spa_type_format_video format_video;
--  spa_type_video_format video_format;
--};
--
- class BaseCapturerPipeWire : public DesktopCapturer {
-  public:
--  enum CaptureSourceType { Screen = 1, Window };
-+  enum CaptureSourceType : uint32_t {
-+    kScreen = 0b01,
-+    kWindow = 0b10,
-+    kAny = 0b11
-+  };
- 
-   explicit BaseCapturerPipeWire(CaptureSourceType source_type);
-   ~BaseCapturerPipeWire() override;
-@@ -43,28 +39,32 @@ class BaseCapturerPipeWire : public DesktopCapturer {
-   bool GetSourceList(SourceList* sources) override;
-   bool SelectSource(SourceId id) override;
- 
-+  static std::unique_ptr<DesktopCapturer> CreateRawScreenCapturer(
-+      const DesktopCaptureOptions& options);
-+
-+  static std::unique_ptr<DesktopCapturer> CreateRawWindowCapturer(
-+      const DesktopCaptureOptions& options);
-+
-  private:
-   // PipeWire types -->
-+  pw_context* pw_context_ = nullptr;
-   pw_core* pw_core_ = nullptr;
--  pw_type* pw_core_type_ = nullptr;
-   pw_stream* pw_stream_ = nullptr;
--  pw_remote* pw_remote_ = nullptr;
--  pw_loop* pw_loop_ = nullptr;
-   pw_thread_loop* pw_main_loop_ = nullptr;
--  PipeWireType* pw_type_ = nullptr;
- 
-+  spa_hook spa_core_listener_ = {};
-   spa_hook spa_stream_listener_ = {};
--  spa_hook spa_remote_listener_ = {};
- 
-+  pw_core_events pw_core_events_ = {};
-   pw_stream_events pw_stream_events_ = {};
--  pw_remote_events pw_remote_events_ = {};
- 
--  spa_video_info_raw* spa_video_format_ = nullptr;
-+  struct spa_video_info_raw spa_video_format_;
- 
-+  guint32 pw_stream_node_id_ = 0;
-   gint32 pw_fd_ = -1;
- 
-   CaptureSourceType capture_source_type_ =
--      BaseCapturerPipeWire::CaptureSourceType::Screen;
-+      BaseCapturerPipeWire::CaptureSourceType::kAny;
- 
-   // <-- end of PipeWire types
- 
-@@ -78,33 +78,37 @@ class BaseCapturerPipeWire : public DesktopCapturer {
-   guint sources_request_signal_id_ = 0;
-   guint start_request_signal_id_ = 0;
- 
-+  bool video_crop_size_initialized_ = false;
-+  DesktopSize video_crop_size_;;
-   DesktopSize desktop_size_ = {};
-   DesktopCaptureOptions options_ = {};
- 
--  uint8_t* current_frame_ = nullptr;
-+  std::unique_ptr<uint8_t[]> current_frame_;
-   Callback* callback_ = nullptr;
- 
-   bool portal_init_failed_ = false;
- 
-   void InitPortal();
-   void InitPipeWire();
--  void InitPipeWireTypes();
- 
--  void CreateReceivingStream();
-+  pw_stream* CreateReceivingStream();
-   void HandleBuffer(pw_buffer* buffer);
- 
-   void ConvertRGBxToBGRx(uint8_t* frame, uint32_t size);
- 
--  static void OnStateChanged(void* data,
--                             pw_remote_state old_state,
--                             pw_remote_state state,
--                             const char* error);
-+  static void SyncDmaBuf(int fd, uint64_t start_or_end);
-+  static void OnCoreError(void *data,
-+                          uint32_t id,
-+                          int seq,
-+                          int res,
-+                          const char *message);
-+  static void OnStreamParamChanged(void *data,
-+                                   uint32_t id,
-+                                   const struct spa_pod *format);
-   static void OnStreamStateChanged(void* data,
-                                    pw_stream_state old_state,
-                                    pw_stream_state state,
-                                    const char* error_message);
--
--  static void OnStreamFormatChanged(void* data, const struct spa_pod* format);
-   static void OnStreamProcess(void* data);
-   static void OnNewBuffer(void* data, uint32_t id);
- 
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
-index 26956fc67dc8..3813d697bb38 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
-@@ -15,7 +15,7 @@
- namespace webrtc {
- 
- ScreenCapturerPipeWire::ScreenCapturerPipeWire()
--    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Screen) {}
-+    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kScreen) {}
- ScreenCapturerPipeWire::~ScreenCapturerPipeWire() {}
- 
- // static
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
-index 35436475cb4d..c43a1f1a0c4e 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
-@@ -15,7 +15,7 @@
- namespace webrtc {
- 
- WindowCapturerPipeWire::WindowCapturerPipeWire()
--    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Window) {}
-+    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kWindow) {}
- WindowCapturerPipeWire::~WindowCapturerPipeWire() {}
- 
- // static
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
-index cf8a9dd0e0db..d27fab8d28d9 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
-@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
-     const DesktopCaptureOptions& options) {
- #if defined(WEBRTC_USE_PIPEWIRE)
-   if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
--    return ScreenCapturerPipeWire::CreateRawScreenCapturer(options);
-+    return BaseCapturerPipeWire::CreateRawScreenCapturer(options);
-   }
- #endif  // defined(WEBRTC_USE_PIPEWIRE)
- 
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
-index 82359e50c2db..bb9724cf7cc2 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
-@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawWindowCapturer(
-     const DesktopCaptureOptions& options) {
- #if defined(WEBRTC_USE_PIPEWIRE)
-   if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
--    return WindowCapturerPipeWire::CreateRawWindowCapturer(options);
-+    return BaseCapturerPipeWire::CreateRawWindowCapturer(options);
-   }
- #endif  // defined(WEBRTC_USE_PIPEWIRE)
- 
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index dfb1c71..0b1d807 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=78.15.0
+VERSION=91.2.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat-mozilla-1613672.patch b/icecat-mozilla-1613672.patch
deleted file mode 100644
index b9f11cb..0000000
--- a/icecat-mozilla-1613672.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-
-# HG changeset patch
-# User alwu <alwu@mozilla.com>
-# Date 1608617164 0
-# Node ID 1c00de8c800ee726863fab0a9245e2c9a8e58136
-# Parent  ab7649dc7fddc8fd9a81a54d61b1e7221fc298ca
-Bug 1613672 - return `NS_ERROR_DOM_MEDIA_CANCELED` to indicate that track buffer manager has been detached from the demuxer. r=jya
-
-When we shutdown `MediaSourceDecoder`, it would trigger a shutdown for `MDSM` and a detaching for media source.
-
-In the previous one, that would eventually shutdown `MediaFormatReader` via tasks going through different threads (main->MDSM->MFR's supervisor).
-
-In the latter one, it would eventually detach the `TrackBufferManager` from the `MediaSourceTrackDemuxer`. (main->Demuxer's supervisor)
-
-As these two tasks running in different threads, and the latter usually get finished before the former one, which would result in `MediaSourceTrackDemuxer` no longer being able to get a sample.
-
-When that happens, the reader hasn't been shutdown yet, so it's still holding track demuxers and keeps requesting data from them. Then demuxers would return error because their corresponding track managers have been detached.
-
-The reader would report the demuxing error to the console, but that's acutally not a fatal error, because in this situation the reader is going to be shutdown soon. Therefore, return `NS_ERROR_DOM_MEDIA_CANCELED` to allow MFR to treat this error differently.
-
-Differential Revision: https://phabricator.services.mozilla.com/D100153
-
-diff --git a/dom/media/mediasource/MediaSourceDemuxer.cpp b/dom/media/mediasource/MediaSourceDemuxer.cpp
---- a/dom/media/mediasource/MediaSourceDemuxer.cpp
-+++ b/dom/media/mediasource/MediaSourceDemuxer.cpp
-@@ -338,17 +338,17 @@ void MediaSourceTrackDemuxer::BreakCycle
-   MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
-   Unused << rv;
- }
- 
- RefPtr<MediaSourceTrackDemuxer::SeekPromise> MediaSourceTrackDemuxer::DoSeek(
-     const TimeUnit& aTime) {
-   if (!mManager) {
-     return SeekPromise::CreateAndReject(
--        MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,
-+        MediaResult(NS_ERROR_DOM_MEDIA_CANCELED,
-                     RESULT_DETAIL("manager is detached.")),
-         __func__);
-   }
- 
-   MOZ_ASSERT(OnTaskQueue());
-   TimeIntervals buffered = mManager->Buffered(mType);
-   // Fuzz factor represents a +/- threshold. So when seeking it allows the gap
-   // to be twice as big as the fuzz value. We only want to allow EOS_FUZZ gap.
-@@ -390,17 +390,17 @@ RefPtr<MediaSourceTrackDemuxer::SeekProm
-   }
-   return SeekPromise::CreateAndResolve(seekTime, __func__);
- }
- 
- RefPtr<MediaSourceTrackDemuxer::SamplesPromise>
- MediaSourceTrackDemuxer::DoGetSamples(int32_t aNumSamples) {
-   if (!mManager) {
-     return SamplesPromise::CreateAndReject(
--        MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,
-+        MediaResult(NS_ERROR_DOM_MEDIA_CANCELED,
-                     RESULT_DETAIL("manager is detached.")),
-         __func__);
-   }
- 
-   MOZ_ASSERT(OnTaskQueue());
-   if (mReset) {
-     // If a seek (or reset) was recently performed, we ensure that the data
-     // we are about to retrieve is still available.
-@@ -446,17 +446,17 @@ MediaSourceTrackDemuxer::DoGetSamples(in
-   return SamplesPromise::CreateAndResolve(samples, __func__);
- }
- 
- RefPtr<MediaSourceTrackDemuxer::SkipAccessPointPromise>
- MediaSourceTrackDemuxer::DoSkipToNextRandomAccessPoint(
-     const TimeUnit& aTimeThreadshold) {
-   if (!mManager) {
-     return SkipAccessPointPromise::CreateAndReject(
--        SkipFailureHolder(MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,
-+        SkipFailureHolder(MediaResult(NS_ERROR_DOM_MEDIA_CANCELED,
-                                       RESULT_DETAIL("manager is detached.")),
-                           0),
-         __func__);
-   }
- 
-   MOZ_ASSERT(OnTaskQueue());
-   uint32_t parsed = 0;
-   // Ensure that the data we are about to skip to is still available.
-
-
diff --git a/icecat-mozilla-1669471.patch b/icecat-mozilla-1669471.patch
deleted file mode 100644
index c3818e0..0000000
--- a/icecat-mozilla-1669471.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# Bug 1669471 - Get rid of `DeprecationWarning` in `file_generate.py` r=firefox-build-system-reviewers,mhentges
-# `imp` is deprecated since Python 3.4 and later Python versions are very noisy about printing `DeprecationWarning`s; instead, use its replacement, `importlib`.
-
---- a/python/mozbuild/mozbuild/action/file_generate.py
-+++ b/python/mozbuild/mozbuild/action/file_generate.py
-@@ -9,7 +9,7 @@
- from __future__ import absolute_import, print_function
- 
- import argparse
--import imp
-+import importlib.util
- import os
- import six
- import sys
-@@ -56,9 +56,9 @@
-     # Since we're invoking the script in a roundabout way, we provide this
-     # bit of convenience.
-     sys.path.append(os.path.dirname(script))
--    with open(script, 'r') as fh:
--        module = imp.load_module('script', fh, script,
--                                 ('.py', 'r', imp.PY_SOURCE))
-+    spec = importlib.util.spec_from_file_location('script', script)
-+    module = importlib.util.module_from_spec(spec)
-+    spec.loader.exec_module(module)
-     method = args.method_name
-     if not hasattr(module, method):
-         print('Error: script "{0}" is missing a {1} method'.format(script, method),
diff --git a/icecat-porting_to_python310.patch b/icecat-porting_to_python310.patch
deleted file mode 100644
index 920ca96..0000000
--- a/icecat-porting_to_python310.patch
+++ /dev/null
@@ -1,928 +0,0 @@
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1625585189 0
-# Node ID 2418633d529c6df00a83e973295eed0e891990a6
-# Parent  0b5bfe85b344b34894f72176099da78c3849b5cc
-Bug 1719144 - Fix various imports for Python 3.10. r=firefox-build-system-reviewers,mhentges
-
-These are enough for me to run bootstrap+configure+build.
-
-Some touch third-party code (gyp), but per discussion in the earlier
-versions of this revision that seems fine.
-
-Differential Revision: https://phabricator.services.mozilla.com/D119080
-
-diff --git a/python/mach/mach/config.py b/python/mach/mach/config.py
---- a/python/mach/mach/config.py
-+++ b/python/mach/mach/config.py
-@@ -17,6 +17,7 @@
- from __future__ import absolute_import, unicode_literals
- 
- import collections
-+import collections.abc
- import os
- import sys
- import six
-@@ -144,7 +145,7 @@
-     return _
- 
- 
--class ConfigSettings(collections.Mapping):
-+class ConfigSettings(collections.abc.Mapping):
-     """Interface for configuration settings.
- 
-     This is the main interface to the configuration.
-@@ -190,7 +191,7 @@
-     will result in exceptions being raised.
-     """
- 
--    class ConfigSection(collections.MutableMapping, object):
-+    class ConfigSection(collections.abc.MutableMapping, object):
-         """Represents an individual config section."""
-         def __init__(self, config, name, settings):
-             object.__setattr__(self, '_config', config)
-@@ -312,8 +313,8 @@
-         self._config.write(fh)
- 
-     @classmethod
--    def _format_metadata(cls, provider, section, option, type_cls, description,
--                         default=DefaultValue, extra=None):
-+    def _format_metadata(cls, provider, section, option, type_cls, description,
-+                         default=DefaultValue, extra=None):
-         """Formats and returns the metadata for a setting.
- 
-         Each setting must have:
-@@ -340,10 +340,7 @@
-         if isinstance(type_cls, string_types):
-             type_cls = TYPE_CLASSES[type_cls]
- 
--        meta = {
--            'description': description,
--            'type_cls': type_cls,
--        }
-+        meta = {'description': description, 'type_cls': type_cls}
- 
-         if default != DefaultValue:
-             meta['default'] = default
-diff --git a/python/mach/mach/decorators.py b/python/mach/mach/decorators.py
---- a/python/mach/mach/decorators.py
-+++ b/python/mach/mach/decorators.py
-@@ -1,16 +1,17 @@
- # 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/.
- 
- from __future__ import absolute_import, unicode_literals
- 
- import argparse
- import collections
-+import collections.abc
- 
- from .base import MachError
- from .registrar import Registrar
- from mozbuild.base import MachCommandBase
- 
- 
- class _MachCommand(object):
-     """Container for mach command metadata."""
-@@ -140,7 +141,7 @@
-               'Conditions argument must take a list ' + \
-               'of functions. Found %s instead.'
- 
--        if not isinstance(command.conditions, collections.Iterable):
-+        if not isinstance(command.conditions, collections.abc.Iterable):
-             msg = msg % (command.name, type(command.conditions))
-             raise MachError(msg)
- 
-diff --git a/python/mach/mach/main.py b/python/mach/mach/main.py
---- a/python/mach/mach/main.py
-+++ b/python/mach/mach/main.py
-@@ -11,17 +11,17 @@ import argparse
- import codecs
- import errno
- import imp
- import logging
- import os
- import sys
- import traceback
- import uuid
--from collections import Iterable
-+from collections.abc import Iterable
- 
- from six import string_types
- 
- from .base import (
-     CommandContext,
-     MachError,
-     MissingFileError,
-     NoCommandError,
-diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py
---- a/python/mozbuild/mozbuild/backend/configenvironment.py
-+++ b/python/mozbuild/mozbuild/backend/configenvironment.py
-@@ -4,17 +4,18 @@
- 
- from __future__ import absolute_import, print_function
- 
- import os
- import six
- import sys
- import json
- 
--from collections import Iterable, OrderedDict
-+from collections.abc import Iterable
-+from collections import OrderedDict
- from types import ModuleType
- 
- import mozpack.path as mozpath
- 
- from mozbuild.util import (
-     FileAvoidWrite,
-     memoized_property,
-     ReadOnlyDict,
-@@ -63,10 +64,7 @@
-                     compile(source, path, 'exec', dont_inherit=1)
-                 )
- 
--        g = {
--            '__builtins__': __builtins__,
--            '__file__': path,
--        }
-+        g = {"__builtins__": __builtins__, "__file__": path}
-         l = {}
-         try:
-             exec(code_cache[path][1], g, l)
-diff --git a/python/mozbuild/mozbuild/makeutil.py b/python/mozbuild/mozbuild/makeutil.py
---- a/python/mozbuild/mozbuild/makeutil.py
-+++ b/python/mozbuild/mozbuild/makeutil.py
-@@ -7,7 +7,7 @@
- import os
- import re
- import six
--from collections import Iterable
-+from collections.abc import Iterable
- 
- 
- class Makefile(object):
-diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
---- a/python/mozbuild/mozbuild/util.py
-+++ b/python/mozbuild/mozbuild/util.py
-@@ -4,16 +4,17 @@
- 
- # This file contains miscellaneous utility functions that don't belong anywhere
- # in particular.
- 
- from __future__ import absolute_import, print_function, unicode_literals
- 
- import argparse
- import collections
-+import collections.abc
- import ctypes
- import difflib
- import errno
- import functools
- import hashlib
- import io
- import itertools
- import os
-@@ -782,7 +783,7 @@
-         self._strings = StrictOrderingOnAppendList()
-         self._children = {}
- 
--    class StringListAdaptor(collections.Sequence):
-+    class StringListAdaptor(collections.abc.Sequence):
-         def __init__(self, hsl):
-             self._hsl = hsl
- 
-diff --git a/taskcluster/taskgraph/util/schema.py b/taskcluster/taskgraph/util/schema.py
---- a/taskcluster/taskgraph/util/schema.py
-+++ b/taskcluster/taskgraph/util/schema.py
-@@ -6,7 +6,7 @@
- 
- import re
- import pprint
--import collections
-+import collections.abc
- import voluptuous
- 
- from six import text_type, iteritems
-@@ -160,7 +160,7 @@
-                     'Unexpected type in YAML schema: {} @ {}'.format(
-                         type(k).__name__, path))
- 
--        if isinstance(sch, collections.Mapping):
-+        if isinstance(sch, collections.abc.Mapping):
-             for k, v in iteritems(sch):
-                 child = "{}[{!r}]".format(path, k)
-                 check_identifier(child, k)
-diff --git a/third_party/python/gyp/pylib/gyp/common.py b/third_party/python/gyp/pylib/gyp/common.py
---- a/third_party/python/gyp/pylib/gyp/common.py
-+++ b/third_party/python/gyp/pylib/gyp/common.py
-@@ -1,15 +1,16 @@
- # Copyright (c) 2012 Google Inc. All rights reserved.
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
- 
- from __future__ import with_statement
- 
- import collections
-+import collections.abc
- import errno
- import filecmp
- import os.path
- import re
- import tempfile
- import sys
- 
- 
-@@ -489,17 +490,17 @@ def uniquer(seq, idfun=None):
-         marker = idfun(item)
-         if marker in seen: continue
-         seen[marker] = 1
-         result.append(item)
-     return result
- 
- 
- # Based on http://code.activestate.com/recipes/576694/.
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(collections.abc.MutableSet):
-   def __init__(self, iterable=None):
-     self.end = end = []
-     end += [None, end, end]         # sentinel node for doubly linked list
-     self.map = {}                   # key --> [key, prev, next]
-     if iterable is not None:
-       self |= iterable
- 
-   def __len__(self):
-
-
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1625657350 -7200
-# Node ID 6b2a1a09cd4735386414483dd4050c25f9e58e86
-# Parent  d2ab10b1b1619f8e2473837ed9043ad28c842aa5
-Bug 1719144 - Keep some code python2 compatible since we still run it in some windows talos jobs.
-
-MANUAL PUSH: Orange fix CLOSED TREE
-
-
-diff --git a/testing/mozbase/manifestparser/manifestparser/filters.py b/testing/mozbase/manifestparser/manifestparser/filters.py
---- a/testing/mozbase/manifestparser/manifestparser/filters.py
-+++ b/testing/mozbase/manifestparser/manifestparser/filters.py
-@@ -12,7 +12,7 @@
- 
- import itertools
- import os
--from collections import defaultdict, MutableSequence
-+from collections.abc import MutableSequence
- 
- import six
- from six import string_types
---- a/third_party/python/pyyaml/lib3/yaml/constructor.orig.py	2021-07-13 12:14:20.000000000 +0200
-+++ b/third_party/python/pyyaml/lib3/yaml/constructor.py	2021-07-14 14:36:31.579176122 +0200
-@@ -5,7 +5,7 @@
- from .error import *
- from .nodes import *
- 
--import collections, datetime, base64, binascii, re, sys, types
-+import collections.abc, datetime, base64, binascii, re, sys, types
- 
- class ConstructorError(MarkedYAMLError):
-     pass
-@@ -123,7 +123,7 @@
-         mapping = {}
-         for key_node, value_node in node.value:
-             key = self.construct_object(key_node, deep=deep)
--            if not isinstance(key, collections.Hashable):
-+            if not isinstance(key, collections.abc.Hashable):
-                 raise ConstructorError("while constructing a mapping", node.start_mark,
-                         "found unhashable key", key_node.start_mark)
-             value = self.construct_object(value_node, deep=deep)
---- a/third_party/python/requests/requests/cookies.orig.py	2021-08-02 21:40:27.000000000 +0200
-+++ b/third_party/python/requests/requests/cookies.py	2021-08-03 21:46:38.917998970 +0200
-@@ -10,6 +10,7 @@
- import time
- import calendar
- import collections
-+import collections.abc
- from .compat import cookielib, urlparse, urlunparse, Morsel
- 
- try:
-@@ -161,7 +162,7 @@
-     Use .get and .set and include domain and path args in order to be more specific."""
- 
- 
--class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
-+class RequestsCookieJar(cookielib.CookieJar, collections.abc.MutableMapping):
-     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
-     interface.
- 
---- a/third_party/python/requests/requests/utils.orig.py	2021-08-02 21:40:27.000000000 +0200
-+++ b/third_party/python/requests/requests/utils.py	2021-08-03 21:47:12.396466647 +0200
-@@ -12,6 +12,7 @@
- import cgi
- import codecs
- import collections
-+import collections.abc
- import io
- import os
- import platform
---- a/third_party/python/requests/requests/structures.orig.py	2021-08-02 21:40:27.000000000 +0200
-+++ b/third_party/python/requests/requests/structures.py	2021-08-04 08:03:34.858332348 +0200
-@@ -9,9 +9,10 @@
- """
- 
- import collections
-+import collections.abc
- 
- 
--class CaseInsensitiveDict(collections.MutableMapping):
-+class CaseInsensitiveDict(collections.abc.MutableMapping):
-     """
-     A case-insensitive ``dict``-like object.
- 
-diff -up a/third_party/python/voluptuous/voluptuous-0.11.5.dist-info/RECORD.build-python-2 b/third_party/python/voluptuous/voluptuous-0.11.5.dist-info/RECORD
-diff -up a/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/COPYING.build-python-2 b/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/COPYING
---- a/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/COPYING.build-python-2	2021-07-21 09:42:47.774128166 +0200
-+++ b/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/COPYING	2021-07-21 09:42:47.774128166 +0200
-@@ -0,0 +1,25 @@
-+Copyright (c) 2010, Alec Thomas
-+All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions are met:
-+
-+ - Redistributions of source code must retain the above copyright notice, this
-+   list of conditions and the following disclaimer.
-+ - Redistributions in binary form must reproduce the above copyright notice,
-+   this list of conditions and the following disclaimer in the documentation
-+   and/or other materials provided with the distribution.
-+ - Neither the name of SwapOff.org nor the names of its contributors may
-+   be used to endorse or promote products derived from this software without
-+   specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff -up a/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/RECORD.build-python-2 b/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/RECORD
---- a/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/RECORD.build-python-2	2021-07-21 09:42:47.774128166 +0200
-+++ b/third_party/python/voluptuous/voluptuous-0.12.1.dist-info/RECORD	2021-07-21 09:42:47.774128166 +0200
-@@ -0,0 +1,11 @@
-+voluptuous/__init__.py,sha256=tSYWPAIWee6YwcMK8hxmaiagG_swokUMeH8MluJLWZM,203
-+voluptuous/error.py,sha256=fLRmJwKp0bqRGgBM34ztg9MTxhEOf465sbQcvJlEtAk,4026
-+voluptuous/humanize.py,sha256=hZlhdN4aVeGDIXdtSTeyEbmku65SDPRuut3mOfuRQP0,1606
-+voluptuous/schema_builder.py,sha256=xVJpf3uJMyS1CKwzDw3rEK39ebqDiF_A2Kbq4VnZ3Aw,43677
-+voluptuous/util.py,sha256=RXLZ2b5y-A4az3teG6UpCx2UZcXpS11sIVCdORyKar8,3150
-+voluptuous/validators.py,sha256=xZgyKH-EVqUHCHral5gzViXq4HfEjJEsGdQy7z6llc0,32798
-+voluptuous-0.12.1.dist-info/COPYING,sha256=JHtJdren-k2J2Vh8qlCVVh60bcVFfyJ59ipitUUq3qk,1486
-+voluptuous-0.12.1.dist-info/METADATA,sha256=OdEydy5NydPFFzAhP8qj_YqJsQPQvoIt5ZT1t8B14Ok,20120
-+voluptuous-0.12.1.dist-info/WHEEL,sha256=S6zePDbUAjzMmpYOg2cHDxuYFWw7WiOXt6ogM6hIB5Q,92
-+voluptuous-0.12.1.dist-info/top_level.txt,sha256=TTdVb7M-vndb67UqTmAxuVjpAUakrlAWJYqvo3w4Iqc,11
-+voluptuous-0.12.1.dist-info/RECORD,,
-diff -up a/third_party/python/voluptuous/voluptuous/error.py.build-python-2 b/third_party/python/voluptuous/voluptuous/error.py
---- a/third_party/python/voluptuous/voluptuous/error.py.build-python-2	2021-07-05 21:16:03.000000000 +0200
-+++ b/third_party/python/voluptuous/voluptuous/error.py	2021-07-21 09:42:47.775128197 +0200
-@@ -142,11 +142,11 @@ class BooleanInvalid(Invalid):
- 
- 
- class UrlInvalid(Invalid):
--    """The value is not a url."""
-+    """The value is not a URL."""
- 
- 
- class EmailInvalid(Invalid):
--    """The value is not a email."""
-+    """The value is not an email address."""
- 
- 
- class FileInvalid(Invalid):
-diff -up a/third_party/python/voluptuous/voluptuous/__init__.py.build-python-2 b/third_party/python/voluptuous/voluptuous/__init__.py
---- a/third_party/python/voluptuous/voluptuous/__init__.py.build-python-2	2021-07-05 21:16:03.000000000 +0200
-+++ b/third_party/python/voluptuous/voluptuous/__init__.py	2021-07-21 09:42:47.775128197 +0200
-@@ -5,5 +5,5 @@ from voluptuous.validators import *
- from voluptuous.util import *
- from voluptuous.error import *
- 
--__version__ = '0.11.5'
-+__version__ = '0.12.1'
- __author__ = 'alecthomas'
-diff -up a/third_party/python/voluptuous/voluptuous/schema_builder.py.build-python-2 b/third_party/python/voluptuous/voluptuous/schema_builder.py
---- a/third_party/python/voluptuous/voluptuous/schema_builder.py.build-python-2	2021-07-05 21:16:03.000000000 +0200
-+++ b/third_party/python/voluptuous/voluptuous/schema_builder.py	2021-07-21 09:42:47.775128197 +0200
-@@ -22,6 +22,11 @@ else:
-     def iteritems(d):
-         return d.iteritems()
- 
-+if sys.version_info >= (3, 3):
-+    _Mapping = collections.abc.Mapping
-+else:
-+    _Mapping = collections.Mapping
-+
- """Schema validation for Python data structures.
- 
- Given eg. a nested data structure like this:
-@@ -280,7 +285,7 @@ class Schema(object):
-             return schema.__voluptuous_compile__(self)
-         if isinstance(schema, Object):
-             return self._compile_object(schema)
--        if isinstance(schema, collections.Mapping):
-+        if isinstance(schema, _Mapping):
-             return self._compile_dict(schema)
-         elif isinstance(schema, list):
-             return self._compile_list(schema)
-@@ -610,11 +615,11 @@ class Schema(object):
-             if not isinstance(data, seq_type):
-                 raise er.SequenceTypeInvalid('expected a %s' % seq_type_name, path)
- 
--            # Empty seq schema, allow any data.
-+            # Empty seq schema, reject any data.
-             if not schema:
-                 if data:
-                     raise er.MultipleInvalid([
--                        er.ValueInvalid('not a valid value', [value]) for value in data
-+                        er.ValueInvalid('not a valid value', path if path else data)
-                     ])
-                 return data
- 
-@@ -735,7 +740,7 @@ class Schema(object):
- 
-         result = self.schema.copy()
- 
--        # returns the key that may have been passed as arugment to Marker constructor
-+        # returns the key that may have been passed as an argument to Marker constructor
-         def key_literal(key):
-             return (key.schema if isinstance(key, Marker) else key)
- 
-@@ -771,9 +776,10 @@ class Schema(object):
-                 result[key] = value
- 
-         # recompile and send old object
-+        result_cls = type(self)
-         result_required = (required if required is not None else self.required)
-         result_extra = (extra if extra is not None else self.extra)
--        return Schema(result, required=result_required, extra=result_extra)
-+        return result_cls(result, required=result_required, extra=result_extra)
- 
- 
- def _compile_scalar(schema):
-@@ -809,7 +815,7 @@ def _compile_scalar(schema):
-         def validate_callable(path, data):
-             try:
-                 return schema(data)
--            except ValueError as e:
-+            except ValueError:
-                 raise er.ValueInvalid('not a valid value', path)
-             except er.Invalid as e:
-                 e.prepend(path)
-@@ -1121,8 +1127,11 @@ class Inclusive(Optional):
-     True
-     """
- 
--    def __init__(self, schema, group_of_inclusion, msg=None):
--        super(Inclusive, self).__init__(schema, msg=msg)
-+    def __init__(self, schema, group_of_inclusion,
-+                 msg=None, description=None, default=UNDEFINED):
-+        super(Inclusive, self).__init__(schema, msg=msg,
-+                                        default=default,
-+                                        description=description)
-         self.group_of_inclusion = group_of_inclusion
- 
- 
-diff -up a/third_party/python/voluptuous/voluptuous/util.py.build-python-2 b/third_party/python/voluptuous/voluptuous/util.py
---- a/third_party/python/voluptuous/voluptuous/util.py.build-python-2	2021-07-05 21:16:03.000000000 +0200
-+++ b/third_party/python/voluptuous/voluptuous/util.py	2021-07-21 09:42:47.776128229 +0200
-@@ -7,6 +7,14 @@ from voluptuous import validators
- __author__ = 'tusharmakkar08'
- 
- 
-+def _fix_str(v):
-+    if sys.version_info[0] == 2 and isinstance(v, unicode):
-+        s = v
-+    else:
-+        s = str(v)
-+    return s
-+
-+
- def Lower(v):
-     """Transform a string to lower case.
- 
-@@ -14,7 +22,7 @@ def Lower(v):
-     >>> s('HI')
-     'hi'
-     """
--    return str(v).lower()
-+    return _fix_str(v).lower()
- 
- 
- def Upper(v):
-@@ -24,7 +32,7 @@ def Upper(v):
-     >>> s('hi')
-     'HI'
-     """
--    return str(v).upper()
-+    return _fix_str(v).upper()
- 
- 
- def Capitalize(v):
-@@ -34,7 +42,7 @@ def Capitalize(v):
-     >>> s('hello world')
-     'Hello world'
-     """
--    return str(v).capitalize()
-+    return _fix_str(v).capitalize()
- 
- 
- def Title(v):
-@@ -44,7 +52,7 @@ def Title(v):
-     >>> s('hello world')
-     'Hello World'
-     """
--    return str(v).title()
-+    return _fix_str(v).title()
- 
- 
- def Strip(v):
-@@ -54,7 +62,7 @@ def Strip(v):
-     >>> s('  hello world  ')
-     'hello world'
-     """
--    return str(v).strip()
-+    return _fix_str(v).strip()
- 
- 
- class DefaultTo(object):
-diff -up a/third_party/python/voluptuous/voluptuous/validators.py.build-python-2 b/third_party/python/voluptuous/voluptuous/validators.py
---- a/third_party/python/voluptuous/voluptuous/validators.py.build-python-2	2021-07-05 21:16:03.000000000 +0200
-+++ b/third_party/python/voluptuous/voluptuous/validators.py	2021-07-21 09:42:47.776128229 +0200
-@@ -192,15 +192,26 @@ class _WithSubValidators(object):
-     def __init__(self, *validators, **kwargs):
-         self.validators = validators
-         self.msg = kwargs.pop('msg', None)
-+        self.required = kwargs.pop('required', False)
-+        self.discriminant = kwargs.pop('discriminant', None)
- 
-     def __voluptuous_compile__(self, schema):
--        self._compiled = [
--            schema._compile(v)
--            for v in self.validators
--        ]
-+        self._compiled = []
-+        old_required = schema.required
-+        self.schema = schema
-+        for v in self.validators:
-+            schema.required = self.required
-+            self._compiled.append(schema._compile(v))
-+        schema.required = old_required
-         return self._run
- 
-     def _run(self, path, value):
-+        if self.discriminant is not None:
-+            self._compiled = [
-+                self.schema._compile(v)
-+                for v in self.discriminant(value, self.validators)
-+            ]
-+
-         return self._exec(self._compiled, value, path)
- 
-     def __call__(self, v):
-@@ -218,7 +229,7 @@ class Any(_WithSubValidators):
-     """Use the first validated value.
- 
-     :param msg: Message to deliver to user if validation fails.
--    :param kwargs: All other keyword arguments are passed to the sub-Schema constructors.
-+    :param kwargs: All other keyword arguments are passed to the sub-schema constructors.
-     :returns: Return value of the first validator that passes.
- 
-     >>> validate = Schema(Any('true', 'false',
-@@ -262,13 +273,57 @@ class Any(_WithSubValidators):
- Or = Any
- 
- 
-+class Union(_WithSubValidators):
-+    """Use the first validated value among those selected by discriminant.
-+
-+    :param msg: Message to deliver to user if validation fails.
-+    :param discriminant(value, validators): Returns the filtered list of validators based on the value.
-+    :param kwargs: All other keyword arguments are passed to the sub-schema constructors.
-+    :returns: Return value of the first validator that passes.
-+
-+    >>> validate = Schema(Union({'type':'a', 'a_val':'1'},{'type':'b', 'b_val':'2'},
-+    ...                         discriminant=lambda val, alt: filter(
-+    ...                         lambda v : v['type'] == val['type'] , alt)))
-+    >>> validate({'type':'a', 'a_val':'1'}) == {'type':'a', 'a_val':'1'}
-+    True
-+    >>> with raises(MultipleInvalid, "not a valid value for dictionary value @ data['b_val']"):
-+    ...   validate({'type':'b', 'b_val':'5'})
-+
-+    ```discriminant({'type':'b', 'a_val':'5'}, [{'type':'a', 'a_val':'1'},{'type':'b', 'b_val':'2'}])``` is invoked
-+
-+    Without the discriminant, the exception would be "extra keys not allowed @ data['b_val']"
-+    """
-+
-+    def _exec(self, funcs, v, path=None):
-+        error = None
-+        for func in funcs:
-+            try:
-+                if path is None:
-+                    return func(v)
-+                else:
-+                    return func(path, v)
-+            except Invalid as e:
-+                if error is None or len(e.path) > len(error.path):
-+                    error = e
-+        else:
-+            if error:
-+                raise error if self.msg is None else AnyInvalid(
-+                    self.msg, path=path)
-+            raise AnyInvalid(self.msg or 'no valid value found',
-+                             path=path)
-+
-+
-+# Convenience alias
-+Switch = Union
-+
-+
- class All(_WithSubValidators):
-     """Value must pass all validators.
- 
-     The output of each validator is passed as input to the next.
- 
-     :param msg: Message to deliver to user if validation fails.
--    :param kwargs: All other keyword arguments are passed to the sub-Schema constructors.
-+    :param kwargs: All other keyword arguments are passed to the sub-schema constructors.
- 
-     >>> validate = Schema(All('10', Coerce(int)))
-     >>> validate('10')
-@@ -303,7 +358,7 @@ class Match(object):
-     >>> with raises(MultipleInvalid, 'expected string or buffer'):
-     ...   validate(123)
- 
--    Pattern may also be a _compiled regular expression:
-+    Pattern may also be a compiled regular expression:
- 
-     >>> validate = Schema(Match(re.compile(r'0x[A-F0-9]+', re.I)))
-     >>> validate('0x123ef4')
-@@ -361,38 +416,38 @@ def _url_validation(v):
-     return parsed
- 
- 
--@message('expected an Email', cls=EmailInvalid)
-+@message('expected an email address', cls=EmailInvalid)
- def Email(v):
--    """Verify that the value is an Email or not.
-+    """Verify that the value is an email address or not.
- 
-     >>> s = Schema(Email())
--    >>> with raises(MultipleInvalid, 'expected an Email'):
-+    >>> with raises(MultipleInvalid, 'expected an email address'):
-     ...   s("a.com")
--    >>> with raises(MultipleInvalid, 'expected an Email'):
-+    >>> with raises(MultipleInvalid, 'expected an email address'):
-     ...   s("a@.com")
--    >>> with raises(MultipleInvalid, 'expected an Email'):
-+    >>> with raises(MultipleInvalid, 'expected an email address'):
-     ...   s("a@.com")
-     >>> s('t@x.com')
-     't@x.com'
-     """
-     try:
-         if not v or "@" not in v:
--            raise EmailInvalid("Invalid Email")
-+            raise EmailInvalid("Invalid email address")
-         user_part, domain_part = v.rsplit('@', 1)
- 
-         if not (USER_REGEX.match(user_part) and DOMAIN_REGEX.match(domain_part)):
--            raise EmailInvalid("Invalid Email")
-+            raise EmailInvalid("Invalid email address")
-         return v
-     except:
-         raise ValueError
- 
- 
--@message('expected a Fully qualified domain name URL', cls=UrlInvalid)
-+@message('expected a fully qualified domain name URL', cls=UrlInvalid)
- def FqdnUrl(v):
--    """Verify that the value is a Fully qualified domain name URL.
-+    """Verify that the value is a fully qualified domain name URL.
- 
-     >>> s = Schema(FqdnUrl())
--    >>> with raises(MultipleInvalid, 'expected a Fully qualified domain name URL'):
-+    >>> with raises(MultipleInvalid, 'expected a fully qualified domain name URL'):
-     ...   s("http://localhost/")
-     >>> s('http://w3.org')
-     'http://w3.org'
-@@ -423,14 +478,14 @@ def Url(v):
-         raise ValueError
- 
- 
--@message('not a file', cls=FileInvalid)
-+@message('Not a file', cls=FileInvalid)
- @truth
- def IsFile(v):
-     """Verify the file exists.
- 
-     >>> os.path.basename(IsFile()(__file__)).startswith('validators.py')
-     True
--    >>> with raises(FileInvalid, 'not a file'):
-+    >>> with raises(FileInvalid, 'Not a file'):
-     ...   IsFile()("random_filename_goes_here.py")
-     >>> with raises(FileInvalid, 'Not a file'):
-     ...   IsFile()(None)
-@@ -445,7 +500,7 @@ def IsFile(v):
-         raise FileInvalid('Not a file')
- 
- 
--@message('not a directory', cls=DirInvalid)
-+@message('Not a directory', cls=DirInvalid)
- @truth
- def IsDir(v):
-     """Verify the directory exists.
-@@ -487,11 +542,11 @@ def PathExists(v):
-         raise PathInvalid("Not a Path")
- 
- 
--def Maybe(validator):
-+def Maybe(validator, msg=None):
-     """Validate that the object matches given validator or is None.
- 
--    :raises Invalid: if the value does not match the given validator and is not
--        None
-+    :raises Invalid: If the value does not match the given validator and is not
-+        None.
- 
-     >>> s = Schema(Maybe(int))
-     >>> s(10)
-@@ -500,7 +555,7 @@ def Maybe(validator):
-     ...  s("string")
- 
-     """
--    return Any(None, validator)
-+    return Any(validator, None, msg=msg)
- 
- 
- class Range(object):
-@@ -533,23 +588,30 @@ class Range(object):
-         self.msg = msg
- 
-     def __call__(self, v):
--        if self.min_included:
--            if self.min is not None and not v >= self.min:
--                raise RangeInvalid(
--                    self.msg or 'value must be at least %s' % self.min)
--        else:
--            if self.min is not None and not v > self.min:
--                raise RangeInvalid(
--                    self.msg or 'value must be higher than %s' % self.min)
--        if self.max_included:
--            if self.max is not None and not v <= self.max:
--                raise RangeInvalid(
--                    self.msg or 'value must be at most %s' % self.max)
--        else:
--            if self.max is not None and not v < self.max:
--                raise RangeInvalid(
--                    self.msg or 'value must be lower than %s' % self.max)
--        return v
-+        try:
-+            if self.min_included:
-+                if self.min is not None and not v >= self.min:
-+                    raise RangeInvalid(
-+                        self.msg or 'value must be at least %s' % self.min)
-+            else:
-+                if self.min is not None and not v > self.min:
-+                    raise RangeInvalid(
-+                        self.msg or 'value must be higher than %s' % self.min)
-+            if self.max_included:
-+                if self.max is not None and not v <= self.max:
-+                    raise RangeInvalid(
-+                        self.msg or 'value must be at most %s' % self.max)
-+            else:
-+                if self.max is not None and not v < self.max:
-+                    raise RangeInvalid(
-+                        self.msg or 'value must be lower than %s' % self.max)
-+
-+            return v
-+
-+        # Objects that lack a partial ordering, e.g. None or strings will raise TypeError
-+        except TypeError:
-+            raise RangeInvalid(
-+                self.msg or 'invalid value or type (must have a partial ordering)')
- 
-     def __repr__(self):
-         return ('Range(min=%r, max=%r, min_included=%r,'
-@@ -579,11 +641,17 @@ class Clamp(object):
-         self.msg = msg
- 
-     def __call__(self, v):
--        if self.min is not None and v < self.min:
--            v = self.min
--        if self.max is not None and v > self.max:
--            v = self.max
--        return v
-+        try:
-+            if self.min is not None and v < self.min:
-+                v = self.min
-+            if self.max is not None and v > self.max:
-+                v = self.max
-+            return v
-+
-+        # Objects that lack a partial ordering, e.g. None or strings will raise TypeError
-+        except TypeError:
-+            raise RangeInvalid(
-+                self.msg or 'invalid value or type (must have a partial ordering)')
- 
-     def __repr__(self):
-         return 'Clamp(min=%s, max=%s)' % (self.min, self.max)
-@@ -598,13 +666,19 @@ class Length(object):
-         self.msg = msg
- 
-     def __call__(self, v):
--        if self.min is not None and len(v) < self.min:
--            raise LengthInvalid(
--                self.msg or 'length of value must be at least %s' % self.min)
--        if self.max is not None and len(v) > self.max:
--            raise LengthInvalid(
--                self.msg or 'length of value must be at most %s' % self.max)
--        return v
-+        try:
-+            if self.min is not None and len(v) < self.min:
-+                raise LengthInvalid(
-+                    self.msg or 'length of value must be at least %s' % self.min)
-+            if self.max is not None and len(v) > self.max:
-+                raise LengthInvalid(
-+                    self.msg or 'length of value must be at most %s' % self.max)
-+            return v
-+
-+        # Objects that havbe no length e.g. None or strings will raise TypeError
-+        except TypeError:
-+            raise RangeInvalid(
-+                self.msg or 'invalid value or type')
- 
-     def __repr__(self):
-         return 'Length(min=%s, max=%s)' % (self.min, self.max)
-@@ -663,7 +737,8 @@ class In(object):
-         except TypeError:
-             check = True
-         if check:
--            raise InInvalid(self.msg or 'value is not allowed')
-+            raise InInvalid(self.msg or 
-+                            'value must be one of {}'.format(sorted(self.container)))
-         return v
- 
-     def __repr__(self):
-@@ -683,7 +758,8 @@ class NotIn(object):
-         except TypeError:
-             check = True
-         if check:
--            raise NotInInvalid(self.msg or 'value is not allowed')
-+            raise NotInInvalid(self.msg or 
-+                               'value must not be one of {}'.format(sorted(self.container)))
-         return v
- 
-     def __repr__(self):
-@@ -722,7 +798,7 @@ class ExactSequence(object):
-     the validators.
- 
-     :param msg: Message to deliver to user if validation fails.
--    :param kwargs: All other keyword arguments are passed to the sub-Schema
-+    :param kwargs: All other keyword arguments are passed to the sub-schema
-         constructors.
- 
-     >>> from voluptuous import Schema, ExactSequence
-@@ -887,7 +963,7 @@ class Unordered(object):
- class Number(object):
-     """
-     Verify the number of digits that are present in the number(Precision),
--    and the decimal places(Scale)
-+    and the decimal places(Scale).
- 
-     :raises Invalid: If the value does not match the provided Precision and Scale.
- 
-@@ -951,13 +1027,13 @@ class SomeOf(_WithSubValidators):
-     The output of each validator is passed as input to the next.
- 
-     :param min_valid: Minimum number of valid schemas.
--    :param validators: a list of schemas or validators to match input against
-+    :param validators: List of schemas or validators to match input against.
-     :param max_valid: Maximum number of valid schemas.
-     :param msg: Message to deliver to user if validation fails.
--    :param kwargs: All other keyword arguments are passed to the sub-Schema constructors.
-+    :param kwargs: All other keyword arguments are passed to the sub-schema constructors.
- 
--    :raises NotEnoughValid: if the minimum number of validations isn't met
--    :raises TooManyValid: if the more validations than the given amount is met
-+    :raises NotEnoughValid: If the minimum number of validations isn't met.
-+    :raises TooManyValid: If the maximum number of validations is exceeded.
- 
-     >>> validate = Schema(SomeOf(min_valid=2, validators=[Range(1, 5), Any(float, int), 6.6]))
-     >>> validate(6.6)
-
-    Add to Phrasebook
-        No word lists for English (USA) → Italian...
-        Create a new word list...
-    Copy
diff --git a/icecat.appdata.xml b/icecat.appdata.xml
index 6e1f7ab..8739a61 100644
--- a/icecat.appdata.xml
+++ b/icecat.appdata.xml
@@ -51,16 +51,13 @@
   <url type="homepage">http://www.gnu.org/software/gnuzilla/</url>
   <screenshots>
     <screenshot type="default">
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat681.png</image>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat91.png</image>
     </screenshot>
     <screenshot>
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat682.png</image>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat91_2.png</image>
     </screenshot>
     <screenshot>
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat683.png</image>
-    </screenshot>
-    <screenshot>
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat684.png</image>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat91_3.png</image>
     </screenshot>
   </screenshots>
   <updatecontact>sagitter_at_fedoraproject.org</updatecontact>
diff --git a/icecat.metainfo.xml b/icecat.metainfo.xml
deleted file mode 100644
index 691082e..0000000
--- a/icecat.metainfo.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="addon">
- <id>mozilla-requestpolicy</id>
- <extends>icecat.desktop</extends>
- <name>mozilla-requestpolicy</name>
- <summary>Extension that gives you control over cross-site requests</summary>
- <url type="homepage">https://requestpolicycontinued.github.io/</url>
- <url type="bugtracker">https://github.com/requestpolicycontinued/requestpolicy/issues</url>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-3.0+ and LGPL-3.0+</project_license>
-</component>
diff --git a/icecat.spec b/icecat.spec
index 5e6baec..10531fd 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -59,9 +59,6 @@
 %global big_endian    1
 %endif
 
-# Use system libicu?
-%global system_libicu 1
-
 %global system_nss  1
 %if %{?system_nss}
 %global nspr_version 4.26
@@ -72,7 +69,6 @@
 
 # Audio backends
 %bcond_without pulseaudio
-%bcond_without jack
 %bcond_with alsa
 
 %global with_vpx 1
@@ -93,7 +89,7 @@
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 78.15.0
+Version: 91.2.0
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -125,7 +121,6 @@ Source7: %{name}-lang_download.sh
 # Desktop files
 Source9:  %{name}-wayland.desktop
 Source10: %{name}.appdata.xml
-Source11: %{name}.metainfo.xml
 Source12: %{name}-wayland.sh.in
 Source13: %{name}.sh.in
 Source14: %{name}.desktop
@@ -134,7 +129,6 @@ Source16: %{name}-x11.desktop
 
 # cbingen
 Source17: cbindgen-vendor.tar.xz
-
 Source18: node-stdout-nonblocking-wrapper
 
 # Build patches
@@ -154,47 +148,32 @@ Patch8: %{name}-fix_installer.patch
 Patch40: build-aarch64-skia.patch
 Patch41: build-disable-elfhack.patch
 Patch44: build-arm-libopus.patch
-
 Patch54: mozilla-1669639.patch
-Patch55: mozilla-1669442.patch
 
 # Fedora specific patches
 Patch219: rhbz-1173156.patch
 Patch220: firefox-nss-version.patch
 Patch221: firefox-nss-addon-hack.patch
-Patch222: %{name}-porting_to_python310.patch
 Patch223: %{name}-glibc-dynstack.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
 
 # Upstream patches
-Patch401: mozilla-1526653.patch
 Patch402: mozilla-1196777.patch
-Patch403: mozilla-1640567.patch
-Patch404: mozilla-1715254_glibc_2.34.patch
 Patch412: mozilla-1337988.patch
-Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
-Patch424: %{name}-mozilla-1669471.patch
-Patch425: mozilla-1692706.patch
-Patch426: %{name}-mozilla-1613672.patch
 
 # PGO/LTO patches
 Patch600: %{name}-pgo.patch
 Patch602: mozilla-1516803.patch
 
-# Wayland specific upstream patches
-Patch565: firefox-pipewire.patch
-#
-
 #VA-API patches
 Patch584: firefox-disable-ffvpx-with-vapi.patch
 Patch585: firefox-vaapi-extra-frames.patch
-Patch589: mozilla-1634213.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf213
@@ -228,9 +207,6 @@ BuildRequires: java-1.8.0-openjdk-headless
 BuildRequires: intltool
 BuildRequires: libappstream-glib
 BuildRequires: libevent-devel
-%if 0%{?system_libicu}
-BuildRequires: libicu-devel
-%endif
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libX11-devel
@@ -269,9 +245,6 @@ BuildRequires: pkgconfig(libcurl)
 %if %{with pulseaudio}
 BuildRequires: pulseaudio-libs-devel
 %endif
-%if %{with jack}
-BuildRequires: jack-audio-connection-kit-devel
-%endif
 BuildRequires: yasm
 BuildRequires: llvm
 BuildRequires: llvm-devel
@@ -287,6 +260,7 @@ BuildRequires:  mutter
 BuildRequires:  gsettings-desktop-schemas
 BuildRequires:  gnome-settings-daemon
 BuildRequires:  mesa-dri-drivers
+BuildRequires:  xorg-x11-server-Xwayland
 %endif
 %if 0%{?build_with_pgo}
 BuildRequires:  xorg-x11-server-Xvfb
@@ -379,14 +353,8 @@ tar -xf %{SOURCE5}
 
 # Fedora patches
 %patch219 -p1 -b .rhbz-1173156
-#%%patch220 -p1 -b .nss-version
 %patch221 -p1 -b .firefox-nss-addon-hack
 
-%if 0%{?python3_version_nodots} > 39
-%patch222 -p1 -b .porting_to_python310
-%endif
-%patch223 -p1 -b .glibc-dynstack
-
 # ARM run-time patch
 %ifarch aarch64
 %patch40 -p1 -b .aarch64-skia
@@ -394,28 +362,15 @@ tar -xf %{SOURCE5}
 %endif
 
 %ifarch %{arm}
-%patch401 -p1 -b .1526653
-%patch414 -p1 -b .Bug-1238661---fix-mozillaSignalTrampoline-to-work
 %patch44  -p1 -b .build-arm-libopus
 %endif
 
 %patch402 -p1 -b .1196777
-%patch403 -p1 -b .1640567
-%patch404 -p1 -b .1715254
 %patch423 -p1 -b .1596503
-%patch424 -p1 -b .1669471
-%patch425 -p1 -b .1692706
-%patch426 -p1 -b .1613672
-
-# Wayland specific upstream patches
-%patch565 -p1 -b .firefox-pipewire
 
 %patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
 %patch585 -p1 -b .firefox-vaapi-extra-frames
-%patch589 -p1 -b .1634213
-
 %patch54 -p1 -b .1669639
-%patch55 -p1 -b .1669442
 
 # PGO patches
 %if 0%{?build_with_pgo}
@@ -448,10 +403,6 @@ echo "ac_add_options --disable-eme" >> .mozconfig
 echo "ac_add_options --enable-pulseaudio" >> .mozconfig
 %endif
 
-%if %{with jack}
-echo "ac_add_options --enable-jack" >> .mozconfig
-%endif
-
 %if %{with alsa}
 echo "ac_add_options --enable-alsa" >> .mozconfig
 %endif
@@ -470,12 +421,6 @@ echo "ac_add_options --without-system-nss" >> .mozconfig
 %endif
 # Workaround for mozbz#1341234
 echo "ac_add_options --allow-addon-sideload" >> .mozconfig
-
-%if 0%{?system_libicu}
-echo "ac_add_options --with-system-icu" >> .mozconfig
-%else
-echo "ac_add_options --without-system-icu" >> .mozconfig
-%endif
 echo "ac_add_options --disable-system-cairo" >> .mozconfig
 echo "ac_add_options --enable-system-pixman" >> .mozconfig
 echo "ac_add_options --with-system-libevent=%{_prefix}" >> .mozconfig
@@ -570,13 +515,6 @@ env CARGO_HOME=.cargo cargo install cbindgen
 export PATH=`pwd`/.cargo/bin:$PATH
 %endif
 
-echo "Generate big endian version of config/external/icu/data/icudt67l.dat"
-%if 0%{?big_endian}
-  icupkg -tb config/external/icu/data/icudt67l.dat config/external/icu/data/icudt67b.dat
-  ls -l config/external/icu/data
-  rm -f config/external/icu/data/icudt*l.dat
-%endif
-
 mkdir %{_buildrootdir}/bin || :
 cp %{SOURCE18} %{_buildrootdir}/bin || :
 
@@ -811,7 +749,6 @@ rm -rf %{buildroot}%{icecatappdir}/gtk2
 
 mkdir -p %{buildroot}%{_metainfodir}
 install -pm 644 %{SOURCE10} %{buildroot}%{_metainfodir}/
-install -pm 644 %{SOURCE11} %{buildroot}%{_metainfodir}/
 
 # Moves defaults/preferences to browser/defaults/preferences
 %pretrans -p <lua>
@@ -842,12 +779,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %files
 %endif
 %doc README.* AUTHORS
-%license LICENSE LEGAL COPYING-*
+%license LICENSE COPYING-*
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*x*/apps/%{name}*.png
 %{_metainfodir}/*.appdata.xml
-%{_metainfodir}/%{name}.metainfo.xml
 %{_mandir}/man1/%{name}*
 %dir %{icecatappdir}
 %{icecatappdir}/browser/
@@ -876,6 +812,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Oct 12 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.2.0-1.rh1
+- Release 91.2.0
+
 * Tue Oct 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.15.0-1.rh1
 - Release 78.15.0
 
diff --git a/mozilla-1196777.patch b/mozilla-1196777.patch
index ed3ab16..1ab70f7 100644
--- a/mozilla-1196777.patch
+++ b/mozilla-1196777.patch
@@ -1,13 +1,13 @@
-diff -up firefox-68.0/widget/gtk/nsWindow.cpp.1196777 firefox-68.0/widget/gtk/nsWindow.cpp
---- firefox-68.0/widget/gtk/nsWindow.cpp.1196777	2019-07-02 11:47:06.864726826 +0200
-+++ firefox-68.0/widget/gtk/nsWindow.cpp	2019-07-02 11:48:09.896544339 +0200
-@@ -156,7 +156,8 @@ const gint kEvents =
- #if GTK_CHECK_VERSION(3, 4, 0)
-     GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK |
- #endif
--    GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
-+    GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
-+    GDK_FOCUS_CHANGE_MASK;
+diff -up firefox-86.0/widget/gtk/nsWindow.cpp.1196777 firefox-86.0/widget/gtk/nsWindow.cpp
+--- firefox-86.0/widget/gtk/nsWindow.cpp.1196777	2021-02-23 17:52:42.291702566 +0100
++++ firefox-86.0/widget/gtk/nsWindow.cpp	2021-02-23 17:57:52.434895984 +0100
+@@ -195,7 +195,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTUR
+                      GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
+                      GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+                      GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SCROLL_MASK |
+-                     GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
++                     GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
++                     GDK_FOCUS_CHANGE_MASK;
  
  #if !GTK_CHECK_VERSION(3, 22, 0)
  typedef enum {
diff --git a/mozilla-1526653.patch b/mozilla-1526653.patch
deleted file mode 100644
index 31631d5..0000000
--- a/mozilla-1526653.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
-index 636537f847862ef693dd6582e2783de4e3d403c5..383c380f04ceb6a111dbfe9a046e3454a56e31b4 100644
---- a/js/src/wasm/WasmSignalHandlers.cpp
-+++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -248,7 +248,16 @@ using mozilla::DebugOnly;
- #endif
- 
- #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
--#  include <sys/user.h>
-+struct user_vfp {
-+  unsigned long long fpregs[32];
-+  unsigned long fpscr;
-+};
-+
-+struct user_vfp_exc {
-+  unsigned long fpexc;
-+  unsigned long fpinst;
-+  unsigned long fpinst2;
-+};
- #endif
- 
- #if defined(ANDROID)
diff --git a/mozilla-1634213.patch b/mozilla-1634213.patch
deleted file mode 100644
index d2a4138..0000000
--- a/mozilla-1634213.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/gfx/gl/GLScreenBuffer.cpp b/gfx/gl/GLScreenBuffer.cpp
---- a/gfx/gl/GLScreenBuffer.cpp
-+++ b/gfx/gl/GLScreenBuffer.cpp
-@@ -88,10 +88,14 @@
- #if defined(XP_MACOSX)
-     factory = SurfaceFactory_IOSurface::Create(gl, caps, ipcChannel, flags);
- #elif defined(MOZ_WAYLAND)
--    if (gl->GetContextType() == GLContextType::EGL) {
--      if (gfxPlatformGtk::GetPlatform()->UseWaylandDMABufWebGL()) {
--        factory =
--            MakeUnique<SurfaceFactory_DMABUF>(gl, caps, ipcChannel, flags);
-+    if (gl->GetContextType() == GLContextType::EGL &&
-+        gfxPlatformGtk::GetPlatform()->UseWaylandDMABufWebGL()) {
-+      auto DMABUFFactory =
-+          MakeUnique<SurfaceFactory_DMABUF>(gl, caps, ipcChannel, flags);
-+      if (DMABUFFactory && DMABUFFactory->CanCreateSurface()) {
-+        factory = std::move(DMABUFFactory);
-+      } else {
-+        gfxPlatformGtk::GetPlatform()->DisableWaylandDMABufWebGL();
-       }
-     }
- #elif defined(MOZ_X11)
-diff --git a/gfx/gl/SharedSurfaceDMABUF.h b/gfx/gl/SharedSurfaceDMABUF.h
---- a/gfx/gl/SharedSurfaceDMABUF.h
-+++ b/gfx/gl/SharedSurfaceDMABUF.h
-@@ -71,6 +71,11 @@
-     bool hasAlpha = mReadCaps.alpha;
-     return SharedSurface_DMABUF::Create(mGL, mFormats, size, hasAlpha);
-   }
-+
-+  bool CanCreateSurface() {
-+    UniquePtr<SharedSurface> test = CreateShared(gfx::IntSize(1, 1));
-+    return test != nullptr;
-+  }
- };
- 
- }  // namespace gl
-diff --git a/gfx/thebes/gfxPlatformGtk.h b/gfx/thebes/gfxPlatformGtk.h
---- a/gfx/thebes/gfxPlatformGtk.h
-+++ b/gfx/thebes/gfxPlatformGtk.h
-@@ -88,7 +88,8 @@
- 
- #ifdef MOZ_WAYLAND
-   bool UseWaylandDMABufTextures();
--  bool UseWaylandDMABufWebGL();
-+  bool UseWaylandDMABufWebGL() { return mUseWebGLDmabufBackend; }
-+  void DisableWaylandDMABufWebGL() { mUseWebGLDmabufBackend = false; }
-   bool UseWaylandHardwareVideoDecoding();
- #endif
- 
-@@ -110,6 +111,9 @@
- #ifdef MOZ_X11
-   Display* mCompositorDisplay;
- #endif
-+#ifdef MOZ_WAYLAND
-+  bool mUseWebGLDmabufBackend;
-+#endif
- };
- 
- #endif /* GFX_PLATFORM_GTK_H */
-diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp
---- a/gfx/thebes/gfxPlatformGtk.cpp
-+++ b/gfx/thebes/gfxPlatformGtk.cpp
-@@ -116,6 +116,9 @@
- 
-   Factory::ReleaseFTLibrary(gPlatformFTLibrary);
-   gPlatformFTLibrary = nullptr;
-+
-+  mUseWebGLDmabufBackend =
-+      IsWaylandDisplay() && nsWaylandDisplay::IsDMABufWebGLEnabled();
- }
- 
- void gfxPlatformGtk::FlushContentDrawing() {
-@@ -725,9 +728,6 @@
- bool gfxPlatformGtk::UseWaylandDMABufTextures() {
-   return IsWaylandDisplay() && nsWaylandDisplay::IsDMABufTexturesEnabled();
- }
--bool gfxPlatformGtk::UseWaylandDMABufWebGL() {
--  return IsWaylandDisplay() && nsWaylandDisplay::IsDMABufWebGLEnabled();
--}
- bool gfxPlatformGtk::UseWaylandHardwareVideoDecoding() {
-   return IsWaylandDisplay() && nsWaylandDisplay::IsDMABufVAAPIEnabled() &&
-          gfxPlatform::CanUseHardwareVideoDecoding();
-diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
---- a/modules/libpref/init/StaticPrefList.yaml
-+++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -9111,7 +9111,7 @@
- # Use DMABuf backend for WebGL on Wayland.
- - name: widget.wayland-dmabuf-webgl.enabled
-   type: RelaxedAtomicBool
--  value: false
-+  value: true
-   mirror: always
- 
- # Use VA-API for video playback on Wayland.
-
diff --git a/mozilla-1640567.patch b/mozilla-1640567.patch
deleted file mode 100644
index c1f3f44..0000000
--- a/mozilla-1640567.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/layout/xul/nsMenuPopupFrame.cpp b/layout/xul/nsMenuPopupFrame.cpp
---- a/layout/xul/nsMenuPopupFrame.cpp
-+++ b/layout/xul/nsMenuPopupFrame.cpp
-@@ -1422,11 +1422,9 @@
-           !GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
-         screenPoint = nsPoint(anchorRect.x, anchorRect.y);
-         mAnchorRect = anchorRect;
--      } else
-+      }
- #endif
--      {
--        screenPoint = AdjustPositionForAnchorAlign(anchorRect, hFlip, vFlip);
--      }
-+      screenPoint = AdjustPositionForAnchorAlign(anchorRect, hFlip, vFlip);
-     } else {
-       // with no anchor, the popup is positioned relative to the root frame
-       anchorRect = rootScreenRect;
-
diff --git a/mozilla-1669442.patch b/mozilla-1669442.patch
deleted file mode 100644
index 6373816..0000000
--- a/mozilla-1669442.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config/recurse.mk b/config/recurse.mk
---- a/config/recurse.mk
-+++ b/config/recurse.mk
-@@ -206,7 +206,7 @@
- # Interdependencies that moz.build world don't know about yet for compilation.
- # Note some others are hardcoded or "guessed" in recursivemake.py and emitter.py
- ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
--toolkit/library/target: widget/gtk/mozgtk/gtk3/target
-+toolkit/library/build/target: widget/gtk/mozgtk/gtk3/target
- endif
- 
- ifndef MOZ_FOLD_LIBS
-
diff --git a/mozilla-1692706.patch b/mozilla-1692706.patch
deleted file mode 100644
index b25d5dd..0000000
--- a/mozilla-1692706.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User Ian Neal <iann_cvs@blueyonder.co.uk>
-# Date 1614236439 0
-# Node ID cc45c336687916a6d1bfed79a80dc8a292b139a5
-# Parent  8024f219bda91c98fcbba16f2bfc6b4833014bfc
-Bug 1692706 - Update ccache stats parser for ccache 4.x. r=glandium
-
-Differential Revision: https://phabricator.services.mozilla.com/D105863
-
-diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
---- a/python/mozbuild/mozbuild/controller/building.py
-+++ b/python/mozbuild/mozbuild/controller/building.py
-@@ -842,7 +842,7 @@
- 
-     DIRECTORY_DESCRIPTION = "cache directory"
-     PRIMARY_CONFIG_DESCRIPTION = "primary config"
--    SECONDARY_CONFIG_DESCRIPTION = "secondary config      (readonly)"
-+    SECONDARY_CONFIG_DESCRIPTION = "secondary config"
-     ABSOLUTE_KEYS = {'cache_files', 'cache_size', 'cache_max_size'}
-     FORMAT_KEYS = {'cache_size', 'cache_max_size'}
- 
-@@ -874,7 +874,9 @@
-                 line, self.PRIMARY_CONFIG_DESCRIPTION)
-         elif line.startswith(self.SECONDARY_CONFIG_DESCRIPTION):
-             self.secondary_config = self._strip_prefix(
--                line, self.SECONDARY_CONFIG_DESCRIPTION)
-+                self._strip_prefix(line, self.SECONDARY_CONFIG_DESCRIPTION),
-+                "(readonly)",
-+            )
-         else:
-             for stat_key, stat_description in self.STATS_KEYS:
-                 if line.startswith(stat_description):
diff --git a/mozilla-1715254_glibc_2.34.patch b/mozilla-1715254_glibc_2.34.patch
deleted file mode 100644
index 1626b10..0000000
--- a/mozilla-1715254_glibc_2.34.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-
-# HG changeset patch
-# User Alexandre Lissy <lissyx+mozillians@lissyx.dyndns.org>
-# Date 1623246328 0
-# Node ID ecb4011a0c76a1c7040054a44712e277f3dc24a1
-# Parent  9ec189804055442e5cc98d69dd01b71e90ed0cb5
-Bug 1715254 - Deny clone3 to force glibc fallback r=gcp
-
-Differential Revision: https://phabricator.services.mozilla.com/D117297
-
-diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp
---- a/security/sandbox/linux/SandboxFilter.cpp
-+++ b/security/sandbox/linux/SandboxFilter.cpp
-@@ -853,16 +853,19 @@ class SandboxPolicyCommon : public Sandb
-         // Yield
-       case __NR_sched_yield:
-         return Allow();
- 
-         // Thread creation.
-       case __NR_clone:
-         return ClonePolicy(InvalidSyscall());
- 
-+      case __NR_clone3:
-+        return Error(ENOSYS);
-+
-         // More thread creation.
- #ifdef __NR_set_robust_list
-       case __NR_set_robust_list:
-         return Allow();
- #endif
- #ifdef ANDROID
-       case __NR_set_tid_address:
-         return Allow();
-@@ -1499,16 +1502,19 @@ class ContentSandboxPolicy : public Sand
-         // the child would inherit the seccomp-bpf policy and almost
-         // certainly die from an unexpected SIGSYS.  We also can't have
-         // fork() crash, currently, because there are too many system
-         // libraries/plugins that try to run commands.  But they can
-         // usually do something reasonable on error.
-       case __NR_clone:
-         return ClonePolicy(Error(EPERM));
- 
-+      case __NR_clone3:
-+        return Error(ENOSYS);
-+
- #  ifdef __NR_fadvise64
-       case __NR_fadvise64:
-         return Allow();
- #  endif
- 
- #  ifdef __NR_fadvise64_64
-       case __NR_fadvise64_64:
-         return Allow();
-
diff --git a/sources b/sources
index d7ea5ed..e4f6983 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 41a8c7717849f225f0ce81f2829fbb50c326b58126b330b2e3f0704afdf07a3fa7be40e47f412d9fee8516cad15720769c0e1672b0aa470a7973e04db6d53ac5
-SHA512 (icecat-78.15.0-langpacks.tar.gz) = f46d8be1a5dca39d68c3c55f6764ddfec8c99f3a15b1112e873f7e7828a21739a3a1a927ee03465107ee80c8878d6fecaedaa9c6d4657e211293c40bd36ea2ea
-SHA512 (icecat-78.15.0-rh1.tar.bz2) = 01f8f941df48a78b654d5ac81ad0ac1aae9ac6aecc769beafefc62590ebc30a2e98df72517df3c2cd8a657b4cfceed2b51f6eda979c5f3bc3208f89ce43953a7
+SHA512 (icecat-91.2.0-langpacks.tar.gz) = a9cbdd57b0823ca9634686274bb3cc119b4060acb07141ca02c3307d0301e835f546e6326384cf22b2e5d41dfb41fcaad4d37e74f9fcf26bf680a1ef28192f15
+SHA512 (icecat-91.2.0-rh1.tar.bz2) = b1777e49f631a8c38596684111e856c7a17976e798f0ebed643dd92f4afa01c248b93d029d52a87c3d0289d18192f8ae1008d6c973c4251dad1bae9b3a276140
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 5b55bcb5b257bb8c33fbcb7006c5129c4aeb0404 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 2 Nov 2021 11:27:54 +0100
Subject: [PATCH 261/473] Release 91.3.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 5 ++++-
 sources                 | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f60d3a4..9dba0bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -168,3 +168,5 @@
 /icecat-78.15.0-rh1.tar.bz2
 /icecat-91.2.0-langpacks.tar.gz
 /icecat-91.2.0-rh1.tar.bz2
+/icecat-91.3.0-langpacks.tar.gz
+/icecat-91.3.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 0b1d807..2e66387 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.2.0
+VERSION=91.3.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 10531fd..30ec245 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -89,7 +89,7 @@
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.2.0
+Version: 91.3.0
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -812,6 +812,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Nov 02 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.3.0-1.rh1
+- Release 91.3.0
+
 * Tue Oct 12 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.2.0-1.rh1
 - Release 91.2.0
 
diff --git a/sources b/sources
index e4f6983..ff46f0b 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 41a8c7717849f225f0ce81f2829fbb50c326b58126b330b2e3f0704afdf07a3fa7be40e47f412d9fee8516cad15720769c0e1672b0aa470a7973e04db6d53ac5
-SHA512 (icecat-91.2.0-langpacks.tar.gz) = a9cbdd57b0823ca9634686274bb3cc119b4060acb07141ca02c3307d0301e835f546e6326384cf22b2e5d41dfb41fcaad4d37e74f9fcf26bf680a1ef28192f15
-SHA512 (icecat-91.2.0-rh1.tar.bz2) = b1777e49f631a8c38596684111e856c7a17976e798f0ebed643dd92f4afa01c248b93d029d52a87c3d0289d18192f8ae1008d6c973c4251dad1bae9b3a276140
+SHA512 (icecat-91.3.0-langpacks.tar.gz) = ea58395837bda6b539687030a1478ecc8cd19ab12f4bd8e74764318b7d0d02b8168d04ca193c311207a8d3c28f84ce22a01f6336181266f2c7795a6449ffb1b6
+SHA512 (icecat-91.3.0-rh1.tar.bz2) = 71513f0eedab7edc3207e76167e07cb4fe88ae26571812879505f5ddcda459c90cf7d946130a30efa7cd948c2d8df98ae5458f05df00478669302626ce3bf903
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From c472a02982ca840f1d85978631c0a7b9e85220fa Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 3 Nov 2021 19:43:13 +0100
Subject: [PATCH 262/473] Release 91.3.0 |Update cbindgen to 0.20.0

---
 icecat.spec | 3 ++-
 sources     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 30ec245..13babe8 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -812,8 +812,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
-* Tue Nov 02 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.3.0-1.rh1
+* Wed Nov 03 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.3.0-1.rh1
 - Release 91.3.0
+- Update cbindgen to 0.20.0
 
 * Tue Oct 12 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.2.0-1.rh1
 - Release 91.2.0
diff --git a/sources b/sources
index ff46f0b..0f431d1 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = 41a8c7717849f225f0ce81f2829fbb50c326b58126b330b2e3f0704afdf07a3fa7be40e47f412d9fee8516cad15720769c0e1672b0aa470a7973e04db6d53ac5
+SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
 SHA512 (icecat-91.3.0-langpacks.tar.gz) = ea58395837bda6b539687030a1478ecc8cd19ab12f4bd8e74764318b7d0d02b8168d04ca193c311207a8d3c28f84ce22a01f6336181266f2c7795a6449ffb1b6
 SHA512 (icecat-91.3.0-rh1.tar.bz2) = 71513f0eedab7edc3207e76167e07cb4fe88ae26571812879505f5ddcda459c90cf7d946130a30efa7cd948c2d8df98ae5458f05df00478669302626ce3bf903
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From d4d149b77674c4cbed73542d8ede1fdbd319107d Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 4 Nov 2021 18:57:11 +0100
Subject: [PATCH 263/473] Release 91.3.0 |Exclude ARM builds

---
 icecat.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 13babe8..dade2d9 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -9,6 +9,12 @@
 #%%global pre_tag .test
 %global pre_tag %{nil}
 
+# Exclude ARM for the following error:
+#  terminate called after throwing an instance of 'std::bad_alloc'
+#   what():  std::bad_alloc
+#   error: could not compile `gkrust`
+ExcludeArch: %{arm}
+
 ####################
 
 ### Optimization ###
@@ -812,9 +818,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
-* Wed Nov 03 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.3.0-1.rh1
+* Tue Nov 04 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.3.0-1.rh1
 - Release 91.3.0
 - Update cbindgen to 0.20.0
+- Exclude ARM builds
 
 * Tue Oct 12 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.2.0-1.rh1
 - Release 91.2.0

From 52df09fc142779d9d969e3247b8fb1a4ded33d93 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 4 Nov 2021 19:13:24 +0100
Subject: [PATCH 264/473] Release 91.3.0 |Fix Changelog

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index dade2d9..780dd9c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -818,7 +818,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
-* Tue Nov 04 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.3.0-1.rh1
+* Thu Nov 04 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.3.0-1.rh1
 - Release 91.3.0
 - Update cbindgen to 0.20.0
 - Exclude ARM builds

From aa19dbd6498fe2dfb44abd26695fde08797f6e6f Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Mon, 6 Dec 2021 21:53:41 +0100
Subject: [PATCH 265/473] Release 91.4.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 5 ++++-
 sources                 | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9dba0bf..d0734f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -170,3 +170,5 @@
 /icecat-91.2.0-rh1.tar.bz2
 /icecat-91.3.0-langpacks.tar.gz
 /icecat-91.3.0-rh1.tar.bz2
+/icecat-91.4.0-langpacks.tar.gz
+/icecat-91.4.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 2e66387..22601f0 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.3.0
+VERSION=91.4.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 780dd9c..2b7cbfe 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -95,7 +95,7 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.3.0
+Version: 91.4.0
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -818,6 +818,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Mon Dec 06 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.4.0-1.rh1
+- Release 91.4.0
+
 * Thu Nov 04 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.3.0-1.rh1
 - Release 91.3.0
 - Update cbindgen to 0.20.0
diff --git a/sources b/sources
index 0f431d1..8c90030 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
-SHA512 (icecat-91.3.0-langpacks.tar.gz) = ea58395837bda6b539687030a1478ecc8cd19ab12f4bd8e74764318b7d0d02b8168d04ca193c311207a8d3c28f84ce22a01f6336181266f2c7795a6449ffb1b6
-SHA512 (icecat-91.3.0-rh1.tar.bz2) = 71513f0eedab7edc3207e76167e07cb4fe88ae26571812879505f5ddcda459c90cf7d946130a30efa7cd948c2d8df98ae5458f05df00478669302626ce3bf903
+SHA512 (icecat-91.4.0-langpacks.tar.gz) = 5550ad50fda6712ba4c72443c60fdc79e5a9811152c2f2a9042add062b83e87c66af1a4a9e37b0fa2ef51506ebf2c172171f21667d573ea84f6df7d9ac75dd0e
+SHA512 (icecat-91.4.0-rh1.tar.bz2) = 732d30dd6c7d78572e542a4c795d0b61020ebc6fb66c259d0f6423b3a54264ce973bde57770294ea3d8cf5e459a293f7d3652c41cdc7ab4449373f940b7a6afd
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 7e87f3512bf6a698c112256ca75a28de60bedee6 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 22 Dec 2021 11:41:30 +0100
Subject: [PATCH 266/473] Release 91.4.1

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 5 ++++-
 sources                 | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d0734f9..3cf2e10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -172,3 +172,5 @@
 /icecat-91.3.0-rh1.tar.bz2
 /icecat-91.4.0-langpacks.tar.gz
 /icecat-91.4.0-rh1.tar.bz2
+/icecat-91.4.1-langpacks.tar.gz
+/icecat-91.4.1-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 22601f0..6599fb5 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.4.0
+VERSION=91.4.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 2b7cbfe..396fa29 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -95,7 +95,7 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.4.0
+Version: 91.4.1
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -818,6 +818,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Wed Dec 22 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.4.1-1.rh1
+- Release 91.4.1
+
 * Mon Dec 06 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.4.0-1.rh1
 - Release 91.4.0
 
diff --git a/sources b/sources
index 8c90030..36ca6b5 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
-SHA512 (icecat-91.4.0-langpacks.tar.gz) = 5550ad50fda6712ba4c72443c60fdc79e5a9811152c2f2a9042add062b83e87c66af1a4a9e37b0fa2ef51506ebf2c172171f21667d573ea84f6df7d9ac75dd0e
-SHA512 (icecat-91.4.0-rh1.tar.bz2) = 732d30dd6c7d78572e542a4c795d0b61020ebc6fb66c259d0f6423b3a54264ce973bde57770294ea3d8cf5e459a293f7d3652c41cdc7ab4449373f940b7a6afd
+SHA512 (icecat-91.4.1-langpacks.tar.gz) = 04250828425bc59f2a7c91d8c32a6d54b67bd3450d6689bf356464d308af455e1d21aef351007106788814791b42c7064b2b7aba34c1c751a2f086f353bf3b16
+SHA512 (icecat-91.4.1-rh1.tar.bz2) = 94d1ae0973bdc1affdb4430d4ab63ac66125e750f5195563ef0bcdd22dd7e895091784d8d0f893c4ea745cd1df972615dd1be7dfc7f1db54573f021479a9359b
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 5711d012bf6f52de3d3fcc0d1f3212f625b80f74 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 22 Dec 2021 14:32:43 +0100
Subject: [PATCH 267/473] Patched for Mozilla bug #1745560

---
 icecat.spec           | 12 +++++++++++-
 mozilla-1745560.patch | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 mozilla-1745560.patch

diff --git a/icecat.spec b/icecat.spec
index 396fa29..cc21372 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 91.4.1
-Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -170,6 +170,9 @@ Patch402: mozilla-1196777.patch
 Patch412: mozilla-1337988.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
 
+# Fix for Wayland-1.20.0+
+Patch425: mozilla-1745560.patch
+
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
 
@@ -374,6 +377,10 @@ tar -xf %{SOURCE5}
 %patch402 -p1 -b .1196777
 %patch423 -p1 -b .1596503
 
+%if 0%{?fedora} > 35
+%patch425 -p1 -b .1745560
+%endif
+
 %patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
 %patch585 -p1 -b .firefox-vaapi-extra-frames
 %patch54 -p1 -b .1669639
@@ -818,6 +825,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Wed Dec 22 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.4.1-2.rh1
+- Patched for Mozilla bug #1745560
+
 * Wed Dec 22 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.4.1-1.rh1
 - Release 91.4.1
 
diff --git a/mozilla-1745560.patch b/mozilla-1745560.patch
new file mode 100644
index 0000000..610c335
--- /dev/null
+++ b/mozilla-1745560.patch
@@ -0,0 +1,32 @@
+
+# HG changeset patch
+# User Kevin Daudt <kdaudt@alpinelinux.org>
+# Date 1639316328 0
+# Node ID f7e2cf808d303d04b1b92dc825621b2fdba5559b
+# Parent  ce23c0066bacde4cef8dac8e5e8e42df6cac4bff
+Bug 1745560 - Add missing stub for wl_proxy_marshal_flags, r=stransky
+
+Firefox fails to build against wayland 1.20 because this symbol is missing
+
+Differential Revision: https://phabricator.services.mozilla.com/D133583
+
+diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
+--- a/widget/gtk/mozwayland/mozwayland.c
++++ b/widget/gtk/mozwayland/mozwayland.c
+@@ -195,8 +195,15 @@ MOZ_EXPORT void wl_list_insert(struct wl
+ MOZ_EXPORT void wl_list_remove(struct wl_list* elm) {}
+ 
+ MOZ_EXPORT int wl_list_length(const struct wl_list* list) { return -1; }
+ 
+ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; }
+ 
+ MOZ_EXPORT void wl_list_insert_list(struct wl_list* list,
+                                     struct wl_list* other) {}
++
++MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags(
++    struct wl_proxy* proxy, uint32_t opcode,
++    const struct wl_interface* interface, uint32_t version, uint32_t flags,
++    ...) {
++  return NULL;
++}
+

From 454e2f83bf41a0e39519e3f26b3fbe81573e7fc5 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 11 Jan 2022 20:43:13 +0100
Subject: [PATCH 268/473] Release 91.5.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 7 +++++--
 sources                 | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3cf2e10..26befd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -174,3 +174,5 @@
 /icecat-91.4.0-rh1.tar.bz2
 /icecat-91.4.1-langpacks.tar.gz
 /icecat-91.4.1-rh1.tar.bz2
+/icecat-91.5.0-langpacks.tar.gz
+/icecat-91.5.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 6599fb5..17c9919 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.4.1
+VERSION=91.5.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index cc21372..2671e68 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -95,8 +95,8 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.4.1
-Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 91.5.0
+Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -825,6 +825,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Jan 11 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.5.0-1.rh1
+- Release 91.5.0
+
 * Wed Dec 22 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.4.1-2.rh1
 - Patched for Mozilla bug #1745560
 
diff --git a/sources b/sources
index 36ca6b5..99dfe5e 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
-SHA512 (icecat-91.4.1-langpacks.tar.gz) = 04250828425bc59f2a7c91d8c32a6d54b67bd3450d6689bf356464d308af455e1d21aef351007106788814791b42c7064b2b7aba34c1c751a2f086f353bf3b16
-SHA512 (icecat-91.4.1-rh1.tar.bz2) = 94d1ae0973bdc1affdb4430d4ab63ac66125e750f5195563ef0bcdd22dd7e895091784d8d0f893c4ea745cd1df972615dd1be7dfc7f1db54573f021479a9359b
+SHA512 (icecat-91.5.0-langpacks.tar.gz) = 5c465c607be0d1a129949e6681e5d4e08708eb6a3e84805b9606865683fad5d2aaedec4c016babad60c0d4589cd34e7cdaa3a4decfead7e7fb57c3332bc0a089
+SHA512 (icecat-91.5.0-rh1.tar.bz2) = 8bf0ea0ef393780d64141e53be3db47b1c39e4e3bb2bbdfe53395ce0e4f83fede2beb588082acd89121d8a5c75d314f1805a40e9289f0ee611e72af158728b0c
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 2fe979aefe561348d1760e3fe5869e263b63a03e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 13:08:12 +0000
Subject: [PATCH 269/473] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 icecat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 2671e68..3fa6962 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 91.5.0
-Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -825,6 +825,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 91.5.0-2.rh1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Tue Jan 11 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.5.0-1.rh1
 - Release 91.5.0
 

From c92a9b47249064e7c3b63fb3fc8fc53089c40800 Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@fedoraproject.org>
Date: Tue, 25 Jan 2022 16:55:11 +0530
Subject: [PATCH 270/473] Update hunspell directory path

  F36 Change https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change

Signed-off-by: Parag Nemade <pnemade@fedoraproject.org>
---
 icecat.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 3fa6962..6499b05 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 91.5.0
-Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -746,7 +746,7 @@ ln -sf %{icecatappdir}/%{name}-bin ${RPM_BUILD_ROOT}%{icecatappdir}/%{name}
 
 # Use the system hunspell dictionaries
 rm -rf ${RPM_BUILD_ROOT}%{icecatappdir}/dictionaries
-ln -s %{_datadir}/myspell ${RPM_BUILD_ROOT}%{icecatappdir}/dictionaries
+ln -s %{_datadir}/hunspell ${RPM_BUILD_ROOT}%{icecatappdir}/dictionaries
 
 # Copy over run-icecat.sh
 cp -p build/unix/run-%{name}.sh %{buildroot}%{icecatappdir}/
@@ -825,6 +825,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Jan 25 2022 Parag Nemade <pnemade AT redhat DOT com> - 91.5.0-3.rh1
+- Update hunspell directory path
+  F36 Change https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 91.5.0-2.rh1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 14a718a1f77cda263f047ae295d6996668535c09 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Sat, 5 Feb 2022 21:28:34 +0100
Subject: [PATCH 271/473] Rebuilt for java-17-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java17
---
 icecat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 6499b05..4161a7f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 91.5.0
-Release: 3.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 4.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -825,6 +825,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 91.5.0-4.rh1
+- Rebuilt for java-17-openjdk as system jdk
+
 * Tue Jan 25 2022 Parag Nemade <pnemade AT redhat DOT com> - 91.5.0-3.rh1
 - Update hunspell directory path
   F36 Change https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change

From 7ae49b344c5b496d3b6575e0b424f6efcb058a38 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 16 Feb 2022 17:45:10 +0100
Subject: [PATCH 272/473] Release 91.6.0

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 14 +++++---------
 mozilla-1745560.patch   | 32 --------------------------------
 sources                 |  4 ++--
 5 files changed, 10 insertions(+), 44 deletions(-)
 delete mode 100644 mozilla-1745560.patch

diff --git a/.gitignore b/.gitignore
index 26befd9..deba8bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -176,3 +176,5 @@
 /icecat-91.4.1-rh1.tar.bz2
 /icecat-91.5.0-langpacks.tar.gz
 /icecat-91.5.0-rh1.tar.bz2
+/icecat-91.6.0-langpacks.tar.gz
+/icecat-91.6.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 17c9919..53f6fa1 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.5.0
+VERSION=91.6.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 4161a7f..c71ba16 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -95,8 +95,8 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.5.0
-Release: 4.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 91.6.0
+Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -170,9 +170,6 @@ Patch402: mozilla-1196777.patch
 Patch412: mozilla-1337988.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
 
-# Fix for Wayland-1.20.0+
-Patch425: mozilla-1745560.patch
-
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
 
@@ -377,10 +374,6 @@ tar -xf %{SOURCE5}
 %patch402 -p1 -b .1196777
 %patch423 -p1 -b .1596503
 
-%if 0%{?fedora} > 35
-%patch425 -p1 -b .1745560
-%endif
-
 %patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
 %patch585 -p1 -b .firefox-vaapi-extra-frames
 %patch54 -p1 -b .1669639
@@ -825,6 +818,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Feb 15 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.6.0-1.rh1
+- Release 91.6.0
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 91.5.0-4.rh1
 - Rebuilt for java-17-openjdk as system jdk
 
diff --git a/mozilla-1745560.patch b/mozilla-1745560.patch
deleted file mode 100644
index 610c335..0000000
--- a/mozilla-1745560.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-# HG changeset patch
-# User Kevin Daudt <kdaudt@alpinelinux.org>
-# Date 1639316328 0
-# Node ID f7e2cf808d303d04b1b92dc825621b2fdba5559b
-# Parent  ce23c0066bacde4cef8dac8e5e8e42df6cac4bff
-Bug 1745560 - Add missing stub for wl_proxy_marshal_flags, r=stransky
-
-Firefox fails to build against wayland 1.20 because this symbol is missing
-
-Differential Revision: https://phabricator.services.mozilla.com/D133583
-
-diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
---- a/widget/gtk/mozwayland/mozwayland.c
-+++ b/widget/gtk/mozwayland/mozwayland.c
-@@ -195,8 +195,15 @@ MOZ_EXPORT void wl_list_insert(struct wl
- MOZ_EXPORT void wl_list_remove(struct wl_list* elm) {}
- 
- MOZ_EXPORT int wl_list_length(const struct wl_list* list) { return -1; }
- 
- MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; }
- 
- MOZ_EXPORT void wl_list_insert_list(struct wl_list* list,
-                                     struct wl_list* other) {}
-+
-+MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags(
-+    struct wl_proxy* proxy, uint32_t opcode,
-+    const struct wl_interface* interface, uint32_t version, uint32_t flags,
-+    ...) {
-+  return NULL;
-+}
-
diff --git a/sources b/sources
index 99dfe5e..e58d23c 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
-SHA512 (icecat-91.5.0-langpacks.tar.gz) = 5c465c607be0d1a129949e6681e5d4e08708eb6a3e84805b9606865683fad5d2aaedec4c016babad60c0d4589cd34e7cdaa3a4decfead7e7fb57c3332bc0a089
-SHA512 (icecat-91.5.0-rh1.tar.bz2) = 8bf0ea0ef393780d64141e53be3db47b1c39e4e3bb2bbdfe53395ce0e4f83fede2beb588082acd89121d8a5c75d314f1805a40e9289f0ee611e72af158728b0c
+SHA512 (icecat-91.6.0-langpacks.tar.gz) = 20a0940fcd768ccf01df258e09288e4d297e486fc9b216a5341044b3c59924063580f72b4abe4c5744fb4a721d87b1907b7d9d68ed6ce7d80c715036d476968c
+SHA512 (icecat-91.6.0-rh1.tar.bz2) = adb4d5b4171f443e0099dbf2cd4534451b415f18489712ef01dd7c543ae806668a39ab5278803b85687e3efeb17c2a9fdb4a1ed27f55c5490e6f3a06d3f5f523
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 0163a46ea8f0789c4ff414988e6a3fdc40564aa6 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 18 Feb 2022 21:49:36 +0100
Subject: [PATCH 273/473] Patched for GCC-12

---
 icecat-mozilla-1754752.patch | 171 +++++++++++++++++++++++++++++++++++
 icecat.spec                  |  13 ++-
 2 files changed, 182 insertions(+), 2 deletions(-)
 create mode 100644 icecat-mozilla-1754752.patch

diff --git a/icecat-mozilla-1754752.patch b/icecat-mozilla-1754752.patch
new file mode 100644
index 0000000..b0df2ff
--- /dev/null
+++ b/icecat-mozilla-1754752.patch
@@ -0,0 +1,171 @@
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio@crisal.io>
+# Date 1645177075 0
+# Node ID 8af9ccb50f19e293ab7eb2b3d76961827ba84a54
+# Parent  2c092e335ae05bf05c0217a1936b185a68a66a8b
+Bug 1754752 - Use initializer lists in some swgl constructors. r=lsalzman,gfx-reviewers
+
+We call it from another constexpr function. Clang seems to not be so
+strict about this.
+
+Differential Revision: https://phabricator.services.mozilla.com/D139078
+
+diff --git a/gfx/wr/swgl/src/glsl.h b/gfx/wr/swgl/src/glsl.h
+--- a/gfx/wr/swgl/src/glsl.h
++++ b/gfx/wr/swgl/src/glsl.h
+@@ -2296,30 +2296,22 @@ struct mat4;
+ 
+ struct mat2 {
+   vec2 data[2];
+ 
+   vec2& operator[](int index) { return data[index]; }
+   const vec2& operator[](int index) const { return data[index]; }
+   mat2() = default;
+ 
+-  IMPLICIT mat2(Float a) {
+-    data[0] = vec2(a);
+-    data[1] = vec2(a);
+-  }
+-
+-  mat2(vec2 a, vec2 b) {
+-    data[0] = a;
+-    data[1] = b;
+-  }
++  IMPLICIT constexpr mat2(Float a) : data{vec2(a), vec2(a)} {}
++
++  constexpr mat2(vec2 a, vec2 b) : data{a, b} {}
+   IMPLICIT mat2(const mat4& mat);
+-  IMPLICIT constexpr mat2(mat2_scalar s) {
+-    data[0] = vec2(s.data[0]);
+-    data[1] = vec2(s.data[1]);
+-  }
++  IMPLICIT constexpr mat2(mat2_scalar s)
++      : data{vec2(s.data[0]), vec2(s.data[1])} {}
+ 
+   friend vec2 operator*(mat2 m, vec2 v) {
+     vec2 u;
+     u.x = m[0].x * v.x + m[1].x * v.y;
+     u.y = m[0].y * v.x + m[1].y * v.y;
+     return u;
+   }
+   friend mat2 operator*(mat2 m, Float f) {
+@@ -2399,40 +2391,29 @@ struct mat3_scalar {
+ };
+ 
+ struct mat3 {
+   vec3 data[3];
+ 
+   vec3& operator[](int index) { return data[index]; }
+   const vec3& operator[](int index) const { return data[index]; }
+   mat3() = default;
+-  mat3(vec3 a, vec3 b, vec3 c) {
+-    data[0] = a;
+-    data[1] = b;
+-    data[2] = c;
+-  }
+-
+-  IMPLICIT constexpr mat3(mat3_scalar s) {
+-    data[0] = vec3(s.data[0]);
+-    data[1] = vec3(s.data[1]);
+-    data[2] = vec3(s.data[2]);
+-  }
+-  constexpr mat3(mat3_scalar s0, mat3_scalar s1, mat3_scalar s2,
+-                 mat3_scalar s3) {
+-    data[0] = vec3(s0.data[0], s1.data[0], s2.data[0], s3.data[0]);
+-    data[1] = vec3(s0.data[1], s1.data[1], s2.data[1], s3.data[1]);
+-    data[2] = vec3(s0.data[2], s1.data[2], s2.data[2], s3.data[2]);
+-  }
++  constexpr mat3(vec3 a, vec3 b, vec3 c) : data{a, b, c} {}
++
++  IMPLICIT constexpr mat3(mat3_scalar s)
++      : data{vec3(s.data[0]), vec3(s.data[1]), vec3(s.data[2])} {}
++
++  constexpr mat3(mat3_scalar s0, mat3_scalar s1, mat3_scalar s2, mat3_scalar s3)
++      : data{vec3(s0.data[0], s1.data[0], s2.data[0], s3.data[0]),
++             vec3(s0.data[1], s1.data[1], s2.data[1], s3.data[1]),
++             vec3(s0.data[2], s1.data[2], s2.data[2], s3.data[2])} {}
+ 
+   constexpr mat3(Float d1, Float d2, Float d3, Float d4, Float d5, Float d6,
+-                 Float d7, Float d8, Float d9) {
+-    data[0] = vec3(d1, d2, d3);
+-    data[1] = vec3(d4, d5, d6);
+-    data[2] = vec3(d7, d8, d9);
+-  }
++                 Float d7, Float d8, Float d9)
++      : data{vec3(d1, d2, d3), vec3(d4, d5, d6), vec3(d7, d8, d9)} {}
+ 
+   IMPLICIT mat3(const mat4& mat);
+ 
+   friend vec3 operator*(mat3 m, vec3 v) {
+     vec3 u;
+     u.x = m[0].x * v.x + m[1].x * v.y + m[2].x * v.z;
+     u.y = m[0].y * v.x + m[1].y * v.y + m[2].y * v.z;
+     u.z = m[0].z * v.x + m[1].z * v.y + m[2].z * v.z;
+@@ -2592,29 +2573,21 @@ struct mat4_scalar {
+     return u;
+   }
+ };
+ 
+ struct mat4 {
+   vec4 data[4];
+ 
+   mat4() = default;
+-  IMPLICIT constexpr mat4(mat4_scalar s) {
+-    data[0] = vec4(s.data[0]);
+-    data[1] = vec4(s.data[1]);
+-    data[2] = vec4(s.data[2]);
+-    data[3] = vec4(s.data[3]);
+-  }
+-
+-  mat4(vec4 a, vec4 b, vec4 c, vec4 d) {
+-    data[0] = a;
+-    data[1] = b;
+-    data[2] = c;
+-    data[3] = d;
+-  }
++  IMPLICIT constexpr mat4(mat4_scalar s)
++      : data{vec4(s.data[0]), vec4(s.data[1]), vec4(s.data[2]),
++             vec4(s.data[3])} {}
++
++  constexpr mat4(vec4 a, vec4 b, vec4 c, vec4 d) : data{a, b, c, d} {}
+ 
+   vec4& operator[](int index) { return data[index]; }
+   const vec4& operator[](int index) const { return data[index]; }
+ 
+   friend vec4 operator*(mat4 m, vec4 v) {
+     vec4 u;
+     u.x = m[0].x * v.x + m[1].x * v.y + m[2].x * v.z + m[3].x * v.w;
+     u.y = m[0].y * v.x + m[1].y * v.y + m[2].y * v.z + m[3].y * v.w;
+
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio@crisal.io>
+# Date 1645177101 0
+# Node ID 00128c425ebb4d4094e829f1936490d0aa2507f1
+# Parent  8af9ccb50f19e293ab7eb2b3d76961827ba84a54
+Bug 1754752 - Avoid a ton of warning spam when building swgl with gcc. r=lsalzman
+
+Differential Revision: https://phabricator.services.mozilla.com/D139088
+
+diff --git a/gfx/wr/swgl/src/gl.cc b/gfx/wr/swgl/src/gl.cc
+--- a/gfx/wr/swgl/src/gl.cc
++++ b/gfx/wr/swgl/src/gl.cc
+@@ -77,17 +77,17 @@ WINBASEAPI BOOL WINAPI QueryPerformanceF
+ #endif
+ 
+ #define UNREACHABLE __builtin_unreachable()
+ 
+ #define UNUSED [[maybe_unused]]
+ 
+ #define FALLTHROUGH [[fallthrough]]
+ 
+-#ifdef MOZILLA_CLIENT
++#if defined(MOZILLA_CLIENT) && defined(MOZ_CLANG_PLUGIN)
+ #  define IMPLICIT __attribute__((annotate("moz_implicit")))
+ #else
+ #  define IMPLICIT
+ #endif
+ 
+ #include "gl_defs.h"
+ #include "glsl.h"
+ #include "program.h"
+
diff --git a/icecat.spec b/icecat.spec
index c71ba16..e704bd1 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 91.6.0
-Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -169,6 +169,7 @@ Patch226: rhbz-1354671.patch
 Patch402: mozilla-1196777.patch
 Patch412: mozilla-1337988.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
+Patch424: icecat-mozilla-1754752.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
@@ -372,7 +373,12 @@ tar -xf %{SOURCE5}
 %endif
 
 %patch402 -p1 -b .1196777
-%patch423 -p1 -b .1596503
+%ifarch %{power64}
+%patch423 -p1 -b .1512162
+%endif
+%if 0%{?fedora} > 35
+%patch424 -p1 -b .1754752
+%endif
 
 %patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
 %patch585 -p1 -b .firefox-vaapi-extra-frames
@@ -818,6 +824,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Fri Feb 18 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.6.0-2.rh1
+- Patched for GCC-12
+
 * Tue Feb 15 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.6.0-1.rh1
 - Release 91.6.0
 

From 37c438b574cbba39af83890e575ef02f97150fd3 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 6 Mar 2022 12:48:06 +0100
Subject: [PATCH 274/473] Release 91.6.1

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 7 +++++--
 sources                 | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index deba8bf..d943282 100644
--- a/.gitignore
+++ b/.gitignore
@@ -178,3 +178,5 @@
 /icecat-91.5.0-rh1.tar.bz2
 /icecat-91.6.0-langpacks.tar.gz
 /icecat-91.6.0-rh1.tar.bz2
+/icecat-91.6.1-langpacks.tar.gz
+/icecat-91.6.1-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 53f6fa1..6053060 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.6.0
+VERSION=91.6.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index e704bd1..a2980eb 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -95,8 +95,8 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.6.0
-Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 91.6.1
+Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -824,6 +824,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Sun Mar 06 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.6.1-1.rh1
+- Release 91.6.1
+
 * Fri Feb 18 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.6.0-2.rh1
 - Patched for GCC-12
 
diff --git a/sources b/sources
index e58d23c..dc3d702 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
-SHA512 (icecat-91.6.0-langpacks.tar.gz) = 20a0940fcd768ccf01df258e09288e4d297e486fc9b216a5341044b3c59924063580f72b4abe4c5744fb4a721d87b1907b7d9d68ed6ce7d80c715036d476968c
-SHA512 (icecat-91.6.0-rh1.tar.bz2) = adb4d5b4171f443e0099dbf2cd4534451b415f18489712ef01dd7c543ae806668a39ab5278803b85687e3efeb17c2a9fdb4a1ed27f55c5490e6f3a06d3f5f523
+SHA512 (icecat-91.6.1-langpacks.tar.gz) = cf294a74de25dcdc783850912d2b79694ed90c67345e230a9709ff06c44c6c9e8f147e67cacaaca6506e8505a8e0563281eebe0995ab8164117c4eb07b261d41
+SHA512 (icecat-91.6.1-rh1.tar.bz2) = d25e408ab2f9e79e69c5c8e7ba9fb7e36ccba17381097512c1c222d865a480069714192441879a6a387866abc3142bd24c3d199a38149179ff692500a6638517
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From b4f40e7059dc88511314b9ccb1c7662c4b1d1772 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 8 Mar 2022 21:43:49 +0100
Subject: [PATCH 275/473] Release 91.7.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 5 ++++-
 sources                 | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d943282..8b6c8b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -180,3 +180,5 @@
 /icecat-91.6.0-rh1.tar.bz2
 /icecat-91.6.1-langpacks.tar.gz
 /icecat-91.6.1-rh1.tar.bz2
+/icecat-91.7.0-langpacks.tar.gz
+/icecat-91.7.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 6053060..eb1cd4c 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.6.1
+VERSION=91.7.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index a2980eb..4611973 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -95,7 +95,7 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.6.1
+Version: 91.7.0
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -824,6 +824,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Mar 08 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.7.0-1.rh1
+- Release 91.7.0
+
 * Sun Mar 06 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.6.1-1.rh1
 - Release 91.6.1
 
diff --git a/sources b/sources
index dc3d702..092add4 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
-SHA512 (icecat-91.6.1-langpacks.tar.gz) = cf294a74de25dcdc783850912d2b79694ed90c67345e230a9709ff06c44c6c9e8f147e67cacaaca6506e8505a8e0563281eebe0995ab8164117c4eb07b261d41
-SHA512 (icecat-91.6.1-rh1.tar.bz2) = d25e408ab2f9e79e69c5c8e7ba9fb7e36ccba17381097512c1c222d865a480069714192441879a6a387866abc3142bd24c3d199a38149179ff692500a6638517
+SHA512 (icecat-91.7.0-langpacks.tar.gz) = 5a23a901102899e75d8357e703dbb7d321ebf004531cf9395c15d21408cf45063600e2f6350419f70bbfa71f8e4d45e4552cbc9fee4b5a7d5c0935614a3fdf9a
+SHA512 (icecat-91.7.0-rh1.tar.bz2) = c8f278ee8156e268889fd870ae047fdae2dec8058d9c2683638aa3e1e7f3cac07967bea2c9eae42f11edb5090e99e6ff547da64763546c64756f205389a26d41
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From a20c59e311d91798e8f5332931f78bf8419e081e Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 17 Mar 2022 22:17:18 +0100
Subject: [PATCH 276/473] Release 91.7.1

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 5 ++++-
 sources                 | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8b6c8b9..3393f77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -182,3 +182,5 @@
 /icecat-91.6.1-rh1.tar.bz2
 /icecat-91.7.0-langpacks.tar.gz
 /icecat-91.7.0-rh1.tar.bz2
+/icecat-91.7.1-langpacks.tar.gz
+/icecat-91.7.1-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index eb1cd4c..ac5ae40 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.7.0
+VERSION=91.7.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 4611973..716adfa 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -95,7 +95,7 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.7.0
+Version: 91.7.1
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -824,6 +824,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Thu Mar 17 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.7.1-1.rh1
+- Release 91.7.1
+
 * Tue Mar 08 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.7.0-1.rh1
 - Release 91.7.0
 
diff --git a/sources b/sources
index 092add4..b485300 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
-SHA512 (icecat-91.7.0-langpacks.tar.gz) = 5a23a901102899e75d8357e703dbb7d321ebf004531cf9395c15d21408cf45063600e2f6350419f70bbfa71f8e4d45e4552cbc9fee4b5a7d5c0935614a3fdf9a
-SHA512 (icecat-91.7.0-rh1.tar.bz2) = c8f278ee8156e268889fd870ae047fdae2dec8058d9c2683638aa3e1e7f3cac07967bea2c9eae42f11edb5090e99e6ff547da64763546c64756f205389a26d41
+SHA512 (icecat-91.7.1-langpacks.tar.gz) = fd7bc4fe715381cb043f7ad409a82ca9ebe19161a07c67e9c47c125905c4847f987d7f9a881d92a100d49141c6821a57c2b9b2c02e360d12695ebb03f33a5dfd
+SHA512 (icecat-91.7.1-rh1.tar.bz2) = 132484f66720f9f9fa72bdd7330a55b536820663db1ba084fa3bfbb6346d84c182ce306402adb241f9835989eedb8985c60eb426c3d5ea8a2763cc044a11eb68
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 9945f48de7d1dfc72da6f23ac5413daacec4ae82 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 6 Apr 2022 14:40:53 +0200
Subject: [PATCH 277/473] Release 91.8.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 5 ++++-
 sources                 | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3393f77..5a697d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -184,3 +184,5 @@
 /icecat-91.7.0-rh1.tar.bz2
 /icecat-91.7.1-langpacks.tar.gz
 /icecat-91.7.1-rh1.tar.bz2
+/icecat-91.8.0-langpacks.tar.gz
+/icecat-91.8.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index ac5ae40..e3de2f6 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.7.1
+VERSION=91.8.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 716adfa..aebbbcb 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -95,7 +95,7 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.7.1
+Version: 91.8.0
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -824,6 +824,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Wed Apr 06 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.8.0-1.rh1
+- Release 91.8.0
+
 * Thu Mar 17 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.7.1-1.rh1
 - Release 91.7.1
 
diff --git a/sources b/sources
index b485300..4f89c4d 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
-SHA512 (icecat-91.7.1-langpacks.tar.gz) = fd7bc4fe715381cb043f7ad409a82ca9ebe19161a07c67e9c47c125905c4847f987d7f9a881d92a100d49141c6821a57c2b9b2c02e360d12695ebb03f33a5dfd
-SHA512 (icecat-91.7.1-rh1.tar.bz2) = 132484f66720f9f9fa72bdd7330a55b536820663db1ba084fa3bfbb6346d84c182ce306402adb241f9835989eedb8985c60eb426c3d5ea8a2763cc044a11eb68
+SHA512 (icecat-91.8.0-langpacks.tar.gz) = c2e64c68f8b77196b3aff28bc1ad63885fb6d6b22e40df40ef71b20b3978859e1d76fc0960a3929c246e21dc4226affde7845085c292a6d9d218d0191662fe7b
+SHA512 (icecat-91.8.0-rh1.tar.bz2) = a4805039985f4f60848336b20d4a224ed26b9bd21d2339bc7e1fcea2fd51a8d1995a17df08486f442d6683ec9680f031493b3890f696834533a0b4fc5a63692d
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 761fd23eb5367edbdbaac47b58154e3104525220 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 3 May 2022 22:28:28 +0200
Subject: [PATCH 278/473]  Release 91.9.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 5 ++++-
 sources                 | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5a697d5..8535463 100644
--- a/.gitignore
+++ b/.gitignore
@@ -186,3 +186,5 @@
 /icecat-91.7.1-rh1.tar.bz2
 /icecat-91.8.0-langpacks.tar.gz
 /icecat-91.8.0-rh1.tar.bz2
+/icecat-91.9.0-langpacks.tar.gz
+/icecat-91.9.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index e3de2f6..e95e5ba 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.8.0
+VERSION=91.9.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index aebbbcb..e62d0b4 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -95,7 +95,7 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.8.0
+Version: 91.9.0
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -824,6 +824,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue May 03 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.9.0-1.rh1
+- Release 91.9.0
+
 * Wed Apr 06 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.8.0-1.rh1
 - Release 91.8.0
 
diff --git a/sources b/sources
index 4f89c4d..e528df8 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
-SHA512 (icecat-91.8.0-langpacks.tar.gz) = c2e64c68f8b77196b3aff28bc1ad63885fb6d6b22e40df40ef71b20b3978859e1d76fc0960a3929c246e21dc4226affde7845085c292a6d9d218d0191662fe7b
-SHA512 (icecat-91.8.0-rh1.tar.bz2) = a4805039985f4f60848336b20d4a224ed26b9bd21d2339bc7e1fcea2fd51a8d1995a17df08486f442d6683ec9680f031493b3890f696834533a0b4fc5a63692d
+SHA512 (icecat-91.9.0-langpacks.tar.gz) = 03b7a5dfb5bab3c9b45a236c3b9bb0103b603937075715909291a1df296581111e3faa9e4095e1d052f61a98abf3f8138acdec30fb57d93e41785c0b65c93750
+SHA512 (icecat-91.9.0-rh1.tar.bz2) = f3cec796306d20ff99192b0b7fc057b9f0c53ebaaf3cd2ed953bdda05e95009e5844a547c90528de015707c38fabb9a14484610e208cc2e9d438f7dab1bf6fac
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From efba73005db36f4e0fa4129649d50b09cccc7711 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Mon, 9 May 2022 21:30:26 +0200
Subject: [PATCH 279/473] Fix rhbz#20831110

---
 icecat.sh.in | 26 ++++++++++++++++----------
 icecat.spec  |  5 ++++-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/icecat.sh.in b/icecat.sh.in
index d21c731..f74bd16 100644
--- a/icecat.sh.in
+++ b/icecat.sh.in
@@ -39,12 +39,12 @@ cmdname=`basename $0`
 MOZ_ARCH=$(uname -m)
 case $MOZ_ARCH in
 	x86_64 | s390x | sparc64)
-		MOZ_LIB_DIR="/usr/lib64"
-		SECONDARY_LIB_DIR="/usr/lib"
+		MOZ_LIB_DIR="/__PREFIX__/lib64"
+		SECONDARY_LIB_DIR="/__PREFIX__/lib"
 		;;
 	* )
-		MOZ_LIB_DIR="/usr/lib"
-		SECONDARY_LIB_DIR="/usr/lib64"
+		MOZ_LIB_DIR="/__PREFIX__/lib"
+		SECONDARY_LIB_DIR="/__PREFIX__/lib64"
 		;;
 esac
 
@@ -65,14 +65,20 @@ MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
 MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
 MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE"
 MOZ_LAUNCHER="$MOZ_DIST_BIN/run-icecat.sh"
+GETENFORCE_FILE="/usr/sbin/getenforce"
 
 ##
-## Enable Wayland backend by default?	
+## Enable Wayland backend?	
 ##
-if __DEFAULT_WAYLAND__ && ! [ $MOZ_DISABLE_WAYLAND ]; then
+if ! [ $MOZ_DISABLE_WAYLAND ] && [ "$WAYLAND_DISPLAY" ]; then
   if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ]; then
     export MOZ_ENABLE_WAYLAND=1
   fi
+##  Enable Wayland on KDE/Sway
+##
+  if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
+    export MOZ_ENABLE_WAYLAND=1
+  fi
 fi
 
 ##
@@ -86,7 +92,7 @@ fi
 ## Set MOZ_GRE_CONF
 ##
 MOZ_GRE_CONF=/etc/gre.d/gre.conf
-if [ "$MOZ_LIB_DIR" == "/usr/lib64" ]; then
+if [ "$MOZ_LIB_DIR" == "/__PREFIX__/lib64" ]; then
   MOZ_GRE_CONF=/etc/gre.d/gre64.conf
 fi
 export MOZ_GRE_CONF
@@ -175,7 +181,7 @@ MOZILLA_DOWN=0
 if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then
     if [ -x $MOZ_DIST_BIN/$MOZ_FIREFOX_FILE ]; then
         # Is icecat running?
-        /usr/bin/pidof icecat > /dev/null 2>&1
+        /__PREFIX__/pidof icecat > /dev/null 2>&1
         MOZILLA_DOWN=$?
     fi
 fi
@@ -207,8 +213,8 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
     CURRENT_LOCALE=${CURRENT_LOCALE:-$LANG}
 
     # Try with a local variant first, then without a local variant
-    SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g"`
-    MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g"`
+    SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g" | sed "s|\..*||g"`
+    MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g" | sed "s|\..*||g"`
 
     function create_langpack_link() {
         local language=$*
diff --git a/icecat.spec b/icecat.spec
index e62d0b4..71711d7 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 91.9.0
-Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -824,6 +824,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Mon May 09 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.9.0-2.rh1
+- Fix rhbz#20831110
+
 * Tue May 03 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.9.0-1.rh1
 - Release 91.9.0
 

From daa8b02ddd0db6675b4e56abe4ec05c1f11ca86d Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Mon, 9 May 2022 21:52:23 +0200
Subject: [PATCH 280/473] Fix rhbz#20831110 /2

---
 icecat.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 71711d7..99ceb54 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -666,8 +666,7 @@ mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE14}
 
 rm -rf %{buildroot}%{_bindir}/%{name}
-%{__sed} -e 's/__DEFAULT_WAYLAND__/%{wayland_default}/' \
- -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE13} > %{buildroot}%{_bindir}/%{name}
+%{__sed} -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE13} > %{buildroot}%{_bindir}/%{name}
 chmod 755 %{buildroot}%{_bindir}/%{name}
 
 %{__sed} -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE15} > %{buildroot}%{_bindir}/%{name}-x11

From 3342504b6abc3585e3f5b59e87d88d3e0afed1d5 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 22 May 2022 18:48:40 +0200
Subject: [PATCH 281/473] Release 91.9.1

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 7 +++++--
 sources                 | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8535463..2813bdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -188,3 +188,5 @@
 /icecat-91.8.0-rh1.tar.bz2
 /icecat-91.9.0-langpacks.tar.gz
 /icecat-91.9.0-rh1.tar.bz2
+/icecat-91.9.1-langpacks.tar.gz
+/icecat-91.9.1-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index e95e5ba..b898e8f 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.9.0
+VERSION=91.9.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 99ceb54..7743ba9 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -95,8 +95,8 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.9.0
-Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 91.9.1
+Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -823,6 +823,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Sun May 22 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.9.1-1.rh1
+- Release 91.9.1
+
 * Mon May 09 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.9.0-2.rh1
 - Fix rhbz#20831110
 
diff --git a/sources b/sources
index e528df8..c216f4f 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
-SHA512 (icecat-91.9.0-langpacks.tar.gz) = 03b7a5dfb5bab3c9b45a236c3b9bb0103b603937075715909291a1df296581111e3faa9e4095e1d052f61a98abf3f8138acdec30fb57d93e41785c0b65c93750
-SHA512 (icecat-91.9.0-rh1.tar.bz2) = f3cec796306d20ff99192b0b7fc057b9f0c53ebaaf3cd2ed953bdda05e95009e5844a547c90528de015707c38fabb9a14484610e208cc2e9d438f7dab1bf6fac
+SHA512 (icecat-91.9.1-langpacks.tar.gz) = 56b9d20104254f2546ac4ab5de8f2c3e570632706d329ccf8d0546ec6ee558ac0bf30aa60e921b7b6fac4002dc5bd99e4bfbeff732ffd217131d180f9f5de3f2
+SHA512 (icecat-91.9.1-rh1.tar.bz2) = 776656eaa8a1eb636708faa96bbfdccef0d8aa1594213bd69acd22f775d50e33904b624400ad11db14e337ba339960c7740725f3e47e2b5d8f3e1ae21ad642d6
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From ebbe1bb6d5ebe8f40d1ba1bd4843aed34c614388 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 1 Jun 2022 21:46:52 +0200
Subject: [PATCH 282/473] Release 91.10.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 9 ++++++---
 sources                 | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2813bdc..2387a37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -190,3 +190,5 @@
 /icecat-91.9.0-rh1.tar.bz2
 /icecat-91.9.1-langpacks.tar.gz
 /icecat-91.9.1-rh1.tar.bz2
+/icecat-91.10.0-langpacks.tar.gz
+/icecat-91.10.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index b898e8f..a942e21 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.9.1
+VERSION=91.10.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 7743ba9..f13b50d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -67,9 +67,9 @@ ExcludeArch: %{arm}
 
 %global system_nss  1
 %if %{?system_nss}
-%global nspr_version 4.26
+%global nspr_version 4.32
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.69
+%global nss_version 3.78
 %global nss_build_version %{nss_version}
 %endif
 
@@ -95,7 +95,7 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.9.1
+Version: 91.10.0
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -823,6 +823,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Wed Jun 01 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.10.0-1.rh1
+- Release 91.10.0
+
 * Sun May 22 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.9.1-1.rh1
 - Release 91.9.1
 
diff --git a/sources b/sources
index c216f4f..9bfb79a 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
-SHA512 (icecat-91.9.1-langpacks.tar.gz) = 56b9d20104254f2546ac4ab5de8f2c3e570632706d329ccf8d0546ec6ee558ac0bf30aa60e921b7b6fac4002dc5bd99e4bfbeff732ffd217131d180f9f5de3f2
-SHA512 (icecat-91.9.1-rh1.tar.bz2) = 776656eaa8a1eb636708faa96bbfdccef0d8aa1594213bd69acd22f775d50e33904b624400ad11db14e337ba339960c7740725f3e47e2b5d8f3e1ae21ad642d6
+SHA512 (icecat-91.10.0-langpacks.tar.gz) = fd9e7de622f3a0d9d9c40e66c80cb2cc82ce0b3121f4f1657b4e98dfa16e449cd25a1efde48986f416e683877c7a0eadcdd096e53b46a819d7a230b48a67563a
+SHA512 (icecat-91.10.0-rh1.tar.bz2) = c2e21c5c1d59fa75d5ccbb5624ffa770e6da192e191772a7630a5404901397c683fbca754b438ede00d0b77ae8fc151e0489e996291a5ce6acbbf3178127147c
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From d59c8c882b35f6c0653b0c9f55b2c4a398130c51 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 2 Jun 2022 12:25:25 +0200
Subject: [PATCH 283/473] Release 91.10.0 rh2

---
 .gitignore  | 1 +
 icecat.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2387a37..2f577bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -192,3 +192,4 @@
 /icecat-91.9.1-rh1.tar.bz2
 /icecat-91.10.0-langpacks.tar.gz
 /icecat-91.10.0-rh1.tar.bz2
+/icecat-91.10.0-rh2.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index f13b50d..fa915cf 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -4,7 +4,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh1
+%global redhat_ver rh2
 
 #%%global pre_tag .test
 %global pre_tag %{nil}
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 91.10.0
-Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -823,6 +823,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Thu Jun 02 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.10.0-2.rh2
+- Release 91.10.0 rh2
+
 * Wed Jun 01 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.10.0-1.rh1
 - Release 91.10.0
 
diff --git a/sources b/sources
index 9bfb79a..640c8d0 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
 SHA512 (icecat-91.10.0-langpacks.tar.gz) = fd9e7de622f3a0d9d9c40e66c80cb2cc82ce0b3121f4f1657b4e98dfa16e449cd25a1efde48986f416e683877c7a0eadcdd096e53b46a819d7a230b48a67563a
-SHA512 (icecat-91.10.0-rh1.tar.bz2) = c2e21c5c1d59fa75d5ccbb5624ffa770e6da192e191772a7630a5404901397c683fbca754b438ede00d0b77ae8fc151e0489e996291a5ce6acbbf3178127147c
+SHA512 (icecat-91.10.0-rh2.tar.bz2) = 9b46b67d5a6206c491aa9285a361170420cc0b421acd46be8e658b39a26b75c07e89d201525fcbde7bec125699d52970f0fb3d5a7a00dad8408e2a1201ae2f9a
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 3cf2effd5e7a4a0d5017c6067f7add929b322683 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 11 Jun 2022 22:53:42 +0200
Subject: [PATCH 284/473] Release 91.10.0 rh3| Enable PGO builds| Disable
 FFMpeg support

---
 .gitignore            |   1 +
 icecat-pgo.patch      | 104 +++++++++++++++---------------------------
 icecat.spec           |  12 +++--
 mozilla-1516803.patch |  11 ++---
 sources               |   2 +-
 5 files changed, 54 insertions(+), 76 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2f577bf..91102c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -193,3 +193,4 @@
 /icecat-91.10.0-langpacks.tar.gz
 /icecat-91.10.0-rh1.tar.bz2
 /icecat-91.10.0-rh2.tar.bz2
+/icecat-91.10.0-rh3.tar.bz2
diff --git a/icecat-pgo.patch b/icecat-pgo.patch
index 66a5e2a..1ee1425 100644
--- a/icecat-pgo.patch
+++ b/icecat-pgo.patch
@@ -1,24 +1,7 @@
-diff -up a/build/moz.configure/lto-pgo.configure.pgo b/build/moz.configure/lto-pgo.configure
---- a/build/moz.configure/lto-pgo.configure.pgo	2020-09-30 19:41:10.000000000 +0200
-+++ b/build/moz.configure/lto-pgo.configure	2020-10-01 14:48:15.459225300 +0200
-@@ -69,12 +69,14 @@ set_config('PGO_PROFILE_PATH', pgo_profi
- @imports(_from='__builtin__', _import='min')
- def pgo_flags(compiler, profdata, target_is_windows):
-     if compiler.type == 'gcc':
-+        #profile_use = '-fprofile-use=$(topobjdir)'
-+        profile_use = '-fprofile-use'
-         return namespace(
-             gen_cflags=['-fprofile-generate'],
-             gen_ldflags=['-fprofile-generate'],
--            use_cflags=['-fprofile-use', '-fprofile-correction',
-+            use_cflags=[profile_use, '-fprofile-correction',
-                         '-Wcoverage-mismatch'],
--            use_ldflags=['-fprofile-use'],
-+            use_ldflags=[profile_use],
-         )
- 
-     if compiler.type in ('clang-cl', 'clang'):
-@@ -192,13 +194,13 @@ def lto(value, c_compiler, ld64_known_go
+diff -up icecat-91/build/moz.configure/lto-pgo.configure.pgo icecat-91/build/moz.configure/lto-pgo.configure
+--- icecat-91/build/moz.configure/lto-pgo.configure.pgo	2022-03-31 01:24:38.000000000 +0200
++++ icecat-91/build/moz.configure/lto-pgo.configure	2022-04-04 10:15:45.387694143 +0200
+@@ -240,13 +240,13 @@
                  cflags.append("-flto")
                  ldflags.append("-flto")
              else:
@@ -26,18 +9,18 @@ diff -up a/build/moz.configure/lto-pgo.configure.pgo b/build/moz.configure/lto-p
 -                ldflags.append("-flto=thin")
 +                cflags.append("-flto")
 +                ldflags.append("-flto")
-         elif c_compiler.type == 'clang-cl':
-             if len(value) and value[0].lower() == 'full':
+         elif c_compiler.type == "clang-cl":
+             if len(value) and value[0].lower() == "full":
                  cflags.append("-flto")
              else:
 -                cflags.append("-flto=thin")
 +                cflags.append("-flto")
              # With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
              # AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
-             cflags.append("-fuse-ld=lld");
-diff -up a/build/pgo/profileserver.py.pgo b/build/pgo/profileserver.py
---- a/build/pgo/profileserver.py.pgo	2020-09-30 19:41:10.000000000 +0200
-+++ b/build/pgo/profileserver.py	2020-10-01 13:54:58.535312905 +0200
+             cflags.append("-fuse-ld=lld")
+diff -up icecat-91/build/pgo/profileserver.py.pgo icecat-91/build/pgo/profileserver.py
+--- icecat-91/build/pgo/profileserver.py.pgo	2022-03-31 01:24:38.000000000 +0200
++++ icecat-91/build/pgo/profileserver.py	2022-04-04 10:15:45.387694143 +0200
 @@ -11,7 +11,7 @@
  import subprocess
  
@@ -47,11 +30,11 @@ diff -up a/build/pgo/profileserver.py.pgo b/build/pgo/profileserver.py
  from mozfile import TemporaryDirectory
  from mozhttpd import MozHttpd
  from mozprofile import IceCatProfile, Preferences
-@@ -84,9 +84,22 @@ if __name__ == '__main__':
-                        port=PORT,
-                        options='primary,privileged')
+@@ -87,9 +87,22 @@
+     locations = ServerLocations()
+     locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged")
  
--    old_profraw_files = glob.glob('*.profraw')
+-    old_profraw_files = glob.glob("*.profraw")
 -    for f in old_profraw_files:
 -        os.remove(f)
 +    using_gcc = False
@@ -73,22 +56,22 @@ diff -up a/build/pgo/profileserver.py.pgo b/build/pgo/profileserver.py
  
      with TemporaryDirectory() as profilePath:
          # TODO: refactor this into mozprofile
-@@ -191,6 +204,11 @@
+@@ -211,6 +224,11 @@
+         if get_crashreports(profilePath, name="IceCat exited successfully?") != 0:
              print("IceCat exited successfully, but produced a crashreport")
              sys.exit(1)
- 
-+
++            
 +        print('Copying profile data....')
 +        os.system('pwd');
 +        os.system('tar cf profdata.tar.gz `find . -name "*.gcda"`; cd ..; tar xf instrumented/profdata.tar.gz;');
 +
-         llvm_profdata = env.get('LLVM_PROFDATA')
+ 
+         llvm_profdata = env.get("LLVM_PROFDATA")
          if llvm_profdata:
-             profraw_files = glob.glob('*.profraw')
-diff -up a/build/unix/mozconfig.unix.pgo b/build/unix/mozconfig.unix
---- a/build/unix/mozconfig.unix.pgo	2020-09-30 19:41:10.000000000 +0200
-+++ b/build/unix/mozconfig.unix	2020-10-01 13:54:58.535312905 +0200
-@@ -6,6 +6,15 @@ if [ -n "$FORCE_GCC" ]; then
+diff -up icecat-91/build/unix/mozconfig.unix.pgo icecat-91/build/unix/mozconfig.unix
+--- icecat-91/build/unix/mozconfig.unix.pgo	2022-03-31 01:24:38.000000000 +0200
++++ icecat-91/build/unix/mozconfig.unix	2022-04-04 10:15:45.387694143 +0200
+@@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
      CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
      CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
  
@@ -104,32 +87,21 @@ diff -up a/build/unix/mozconfig.unix.pgo b/build/unix/mozconfig.unix
      # We want to make sure we use binutils and other binaries in the tooltool
      # package.
      mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
-diff -up a/extensions/spellcheck/src/moz.build.pgo b/extensions/spellcheck/src/moz.build
---- a/extensions/spellcheck/src/moz.build.pgo	2020-09-30 19:41:17.000000000 +0200
-+++ b/extensions/spellcheck/src/moz.build	2020-10-01 13:54:58.535312905 +0200
-@@ -31,3 +31,5 @@ EXPORTS.mozilla += [
- 
- if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
-     CXXFLAGS += ['-Wno-error=shadow']
-+
+diff -up icecat-91/extensions/spellcheck/src/moz.build.pgo icecat-91/extensions/spellcheck/src/moz.build
+--- icecat-91/extensions/spellcheck/src/moz.build.pgo	2022-03-31 01:24:50.000000000 +0200
++++ icecat-91/extensions/spellcheck/src/moz.build	2022-04-04 10:15:45.387694143 +0200
+@@ -28,6 +28,7 @@
+     "mozInlineSpellChecker.h",
+     "mozSpellChecker.h",
+ ]
 +CXXFLAGS += ['-fno-devirtualize']
-\ No newline at end of file
-diff -up a/python/mozbuild/mozbuild/build_commands.py.pgo b/python/mozbuild/mozbuild/build_commands.py
---- a/python/mozbuild/mozbuild/build_commands.py.pgo	2020-09-30 19:41:46.000000000 +0200
-+++ b/python/mozbuild/mozbuild/build_commands.py	2020-10-01 13:54:58.535312905 +0200
-@@ -108,7 +108,8 @@ class Build(MachCommandBase):
-                 return status
  
-             pgo_env = os.environ.copy()
--            pgo_env['LLVM_PROFDATA'] = instr.config_environment.substs.get('LLVM_PROFDATA')
-+            if instr.config_environment.substs.get('CC_TYPE') != 'gcc':
-+                pgo_env['LLVM_PROFDATA'] = instr.config_environment.substs.get('LLVM_PROFDATA')
-             pgo_env['JARLOG_FILE'] = mozpath.join(orig_topobjdir, 'jarlog/en-US.log')
-             pgo_cmd = [
-                 instr.virtualenv_manager.python_path,
---- a/toolkit/components/terminator/nsTerminator.cpp.pgo	2020-10-07 09:22:26.698243673 +0200
-+++ b/toolkit/components/terminator/nsTerminator.cpp	2020-10-07 09:22:43.026312999 +0200
-@@ -418,6 +418,11 @@ void nsTerminator::StartWatchdog() {
+ if CONFIG["CC_TYPE"] in ("clang", "gcc"):
+     CXXFLAGS += ["-Wno-error=shadow"]
+diff -up icecat-91/toolkit/components/terminator/nsTerminator.cpp.pgo icecat-91/toolkit/components/terminator/nsTerminator.cpp
+--- icecat-91/toolkit/components/terminator/nsTerminator.cpp.pgo	2022-04-04 10:15:45.387694143 +0200
++++ icecat-91/toolkit/components/terminator/nsTerminator.cpp	2022-04-04 10:19:07.022239556 +0200
+@@ -456,6 +456,11 @@
    }
  #endif
  
@@ -139,5 +111,5 @@ diff -up a/python/mozbuild/mozbuild/build_commands.py.pgo b/python/mozbuild/mozb
 +  crashAfterMS = INT32_MAX;
 +
    UniquePtr<Options> options(new Options());
-   const PRIntervalTime ticksDuration = PR_MillisecondsToInterval(1000);
-   options->crashAfterTicks = crashAfterMS / ticksDuration;
+   const PRIntervalTime ticksDuration =
+       PR_MillisecondsToInterval(HEARTBEAT_INTERVAL_MS);
diff --git a/icecat.spec b/icecat.spec
index fa915cf..75f81df 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -4,7 +4,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh2
+%global redhat_ver rh3
 
 #%%global pre_tag .test
 %global pre_tag %{nil}
@@ -32,7 +32,7 @@ ExcludeArch: %{arm}
 # on other arches.
 %ifarch x86_64
 %if 0%{?release_build}
-%global build_with_pgo 0
+%global build_with_pgo 1
 %global pgo_wayland    0
 %else
 %global build_with_pgo 0
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 91.10.0
-Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -442,6 +442,7 @@ echo "ac_add_options --with-system-libvpx" >> .mozconfig
 echo "ac_add_options --without-system-libvpx" >> .mozconfig
 %endif
 echo "ac_add_options --with-system-jpeg" >> .mozconfig
+echo "ac_add_options --disable-ffmpeg" >> .mozconfig
 
 # This option works on these architectures only
 %ifarch %{arm}
@@ -823,6 +824,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Sat Jun 11 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.10.0-3.rh3
+- Release 91.10.0 rh3
+- Enable PGO builds
+- Disable FFMpeg support
+
 * Thu Jun 02 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.10.0-2.rh2
 - Release 91.10.0 rh2
 
diff --git a/mozilla-1516803.patch b/mozilla-1516803.patch
index f1f37f4..6c4ff59 100644
--- a/mozilla-1516803.patch
+++ b/mozilla-1516803.patch
@@ -1,16 +1,15 @@
 diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
 --- a/security/sandbox/linux/moz.build
 +++ b/security/sandbox/linux/moz.build
-@@ -99,9 +99,8 @@
+@@ -114,9 +114,8 @@
  # gcc lto likes to put the top level asm in syscall.cc in a different partition
  # from the function using it which breaks the build.  Work around that by
  # forcing there to be only one partition.
--for f in CONFIG['OS_CXXFLAGS']:
--    if f.startswith('-flto') and CONFIG['CC_TYPE'] != 'clang':
--        LDFLAGS += ['--param lto-partitions=1']
+-for f in CONFIG["OS_CXXFLAGS"]:
+-    if f.startswith("-flto") and CONFIG["CC_TYPE"] != "clang":
+-        LDFLAGS += ["--param lto-partitions=1"]
 +if CONFIG['CC_TYPE'] != 'clang':
 +    LDFLAGS += ['--param', 'lto-partitions=1']
  
- DEFINES['NS_NO_XPCOM'] = True
+ DEFINES["NS_NO_XPCOM"] = True
  DisableStlWrapping()
-
diff --git a/sources b/sources
index 640c8d0..cba9890 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
 SHA512 (icecat-91.10.0-langpacks.tar.gz) = fd9e7de622f3a0d9d9c40e66c80cb2cc82ce0b3121f4f1657b4e98dfa16e449cd25a1efde48986f416e683877c7a0eadcdd096e53b46a819d7a230b48a67563a
-SHA512 (icecat-91.10.0-rh2.tar.bz2) = 9b46b67d5a6206c491aa9285a361170420cc0b421acd46be8e658b39a26b75c07e89d201525fcbde7bec125699d52970f0fb3d5a7a00dad8408e2a1201ae2f9a
+SHA512 (icecat-91.10.0-rh3.tar.bz2) = 20df6f799973a3730ba7a85aff969cce4cc8417d7812786c227ffdb1b369ff285da5ccf6c344ad3af58de63e26e12af574581377f2289931765cf866e1477d97
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 213be47502cc8fe0706156c15dcfd3201a3dd347 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 12 Jun 2022 13:16:05 +0200
Subject: [PATCH 285/473] Disable fmp4

---
 icecat.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 75f81df..7048c58 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -380,8 +380,8 @@ tar -xf %{SOURCE5}
 %patch424 -p1 -b .1754752
 %endif
 
-%patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
-%patch585 -p1 -b .firefox-vaapi-extra-frames
+#%%patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
+#%%patch585 -p1 -b .firefox-vaapi-extra-frames
 %patch54 -p1 -b .1669639
 
 # PGO patches
@@ -441,8 +441,10 @@ echo "ac_add_options --with-system-libvpx" >> .mozconfig
 %else
 echo "ac_add_options --without-system-libvpx" >> .mozconfig
 %endif
+
 echo "ac_add_options --with-system-jpeg" >> .mozconfig
 echo "ac_add_options --disable-ffmpeg" >> .mozconfig
+echo "ac_add_options --disable-fmp4" >> .mozconfig
 
 # This option works on these architectures only
 %ifarch %{arm}

From eebaa1fed6b5801cae4ef4950aed653677b8c5fa Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 12 Jun 2022 15:55:25 +0200
Subject: [PATCH 286/473] Re-enable ffmpeg support| Add libavcodec-free
 dependency

---
 icecat.spec | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 7048c58..5b8cb81 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -32,7 +32,7 @@ ExcludeArch: %{arm}
 # on other arches.
 %ifarch x86_64
 %if 0%{?release_build}
-%global build_with_pgo 1
+%global build_with_pgo 0
 %global pgo_wayland    0
 %else
 %global build_with_pgo 0
@@ -213,6 +213,7 @@ BuildRequires: ImageMagick, autotrace
 BuildRequires: java-1.8.0-openjdk-headless
 BuildRequires: intltool
 BuildRequires: libappstream-glib
+BuildRequires: libavcodec-free-devel
 BuildRequires: libevent-devel
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: libjpeg-devel
@@ -443,8 +444,7 @@ echo "ac_add_options --without-system-libvpx" >> .mozconfig
 %endif
 
 echo "ac_add_options --with-system-jpeg" >> .mozconfig
-echo "ac_add_options --disable-ffmpeg" >> .mozconfig
-echo "ac_add_options --disable-fmp4" >> .mozconfig
+echo "ac_add_options --enable-ffmpeg" >> .mozconfig
 
 # This option works on these architectures only
 %ifarch %{arm}
@@ -826,10 +826,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
-* Sat Jun 11 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.10.0-3.rh3
+* Sun Jun 12 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.10.0-3.rh3
 - Release 91.10.0 rh3
-- Enable PGO builds
-- Disable FFMpeg support
+- Add libavcodec-free dependency
 
 * Thu Jun 02 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.10.0-2.rh2
 - Release 91.10.0 rh2

From 14b2511c60aed573441a327996e3b0d0c346a1ca Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 29 Jun 2022 14:24:16 +0200
Subject: [PATCH 287/473] Release 91.11.0 rh1

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 9 ++++++---
 sources                 | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 91102c6..94ffc2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -194,3 +194,5 @@
 /icecat-91.10.0-rh1.tar.bz2
 /icecat-91.10.0-rh2.tar.bz2
 /icecat-91.10.0-rh3.tar.bz2
+/icecat-91.11.0-langpacks.tar.gz
+/icecat-91.11.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index a942e21..6c5a68a 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.10.0
+VERSION=91.11.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 5b8cb81..d5cc846 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -4,7 +4,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh3
+%global redhat_ver rh1
 
 #%%global pre_tag .test
 %global pre_tag %{nil}
@@ -95,8 +95,8 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.10.0
-Release: 3.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 91.11.0
+Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -826,6 +826,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Wed Jun 29 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-1.rh1
+- Release 91.11.0 rh1
+
 * Sun Jun 12 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.10.0-3.rh3
 - Release 91.10.0 rh3
 - Add libavcodec-free dependency
diff --git a/sources b/sources
index cba9890..296542c 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
-SHA512 (icecat-91.10.0-langpacks.tar.gz) = fd9e7de622f3a0d9d9c40e66c80cb2cc82ce0b3121f4f1657b4e98dfa16e449cd25a1efde48986f416e683877c7a0eadcdd096e53b46a819d7a230b48a67563a
-SHA512 (icecat-91.10.0-rh3.tar.bz2) = 20df6f799973a3730ba7a85aff969cce4cc8417d7812786c227ffdb1b369ff285da5ccf6c344ad3af58de63e26e12af574581377f2289931765cf866e1477d97
+SHA512 (icecat-91.11.0-langpacks.tar.gz) = 7f2067e1340c1ecc2d8148d20d9d8e388d057c50af7ae5f9de35ab74d2b4b41c2ab8fbc4c3c8ba9e3aa3076fd025bce938bf0e70d18f655a9f5d901faa879b4b
+SHA512 (icecat-91.11.0-rh1.tar.bz2) = 5b7346417868e8051a42a6335802cd3c41e5dda5d42c6d6c5be2645bcd829a4a615a90ebdccdadc5d27e6a0513ade9ad88b26cefff9defd22fd097d9afac6c47
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 555e14708a0b659cf6ad596d4562ac1617967ff9 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 29 Jun 2022 20:15:48 +0200
Subject: [PATCH 288/473] Release 91.11.0 rh1| Remove obsolete patch

---
 icecat-mozilla-1754752.patch | 171 -----------------------------------
 icecat.spec                  |   4 -
 2 files changed, 175 deletions(-)
 delete mode 100644 icecat-mozilla-1754752.patch

diff --git a/icecat-mozilla-1754752.patch b/icecat-mozilla-1754752.patch
deleted file mode 100644
index b0df2ff..0000000
--- a/icecat-mozilla-1754752.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1645177075 0
-# Node ID 8af9ccb50f19e293ab7eb2b3d76961827ba84a54
-# Parent  2c092e335ae05bf05c0217a1936b185a68a66a8b
-Bug 1754752 - Use initializer lists in some swgl constructors. r=lsalzman,gfx-reviewers
-
-We call it from another constexpr function. Clang seems to not be so
-strict about this.
-
-Differential Revision: https://phabricator.services.mozilla.com/D139078
-
-diff --git a/gfx/wr/swgl/src/glsl.h b/gfx/wr/swgl/src/glsl.h
---- a/gfx/wr/swgl/src/glsl.h
-+++ b/gfx/wr/swgl/src/glsl.h
-@@ -2296,30 +2296,22 @@ struct mat4;
- 
- struct mat2 {
-   vec2 data[2];
- 
-   vec2& operator[](int index) { return data[index]; }
-   const vec2& operator[](int index) const { return data[index]; }
-   mat2() = default;
- 
--  IMPLICIT mat2(Float a) {
--    data[0] = vec2(a);
--    data[1] = vec2(a);
--  }
--
--  mat2(vec2 a, vec2 b) {
--    data[0] = a;
--    data[1] = b;
--  }
-+  IMPLICIT constexpr mat2(Float a) : data{vec2(a), vec2(a)} {}
-+
-+  constexpr mat2(vec2 a, vec2 b) : data{a, b} {}
-   IMPLICIT mat2(const mat4& mat);
--  IMPLICIT constexpr mat2(mat2_scalar s) {
--    data[0] = vec2(s.data[0]);
--    data[1] = vec2(s.data[1]);
--  }
-+  IMPLICIT constexpr mat2(mat2_scalar s)
-+      : data{vec2(s.data[0]), vec2(s.data[1])} {}
- 
-   friend vec2 operator*(mat2 m, vec2 v) {
-     vec2 u;
-     u.x = m[0].x * v.x + m[1].x * v.y;
-     u.y = m[0].y * v.x + m[1].y * v.y;
-     return u;
-   }
-   friend mat2 operator*(mat2 m, Float f) {
-@@ -2399,40 +2391,29 @@ struct mat3_scalar {
- };
- 
- struct mat3 {
-   vec3 data[3];
- 
-   vec3& operator[](int index) { return data[index]; }
-   const vec3& operator[](int index) const { return data[index]; }
-   mat3() = default;
--  mat3(vec3 a, vec3 b, vec3 c) {
--    data[0] = a;
--    data[1] = b;
--    data[2] = c;
--  }
--
--  IMPLICIT constexpr mat3(mat3_scalar s) {
--    data[0] = vec3(s.data[0]);
--    data[1] = vec3(s.data[1]);
--    data[2] = vec3(s.data[2]);
--  }
--  constexpr mat3(mat3_scalar s0, mat3_scalar s1, mat3_scalar s2,
--                 mat3_scalar s3) {
--    data[0] = vec3(s0.data[0], s1.data[0], s2.data[0], s3.data[0]);
--    data[1] = vec3(s0.data[1], s1.data[1], s2.data[1], s3.data[1]);
--    data[2] = vec3(s0.data[2], s1.data[2], s2.data[2], s3.data[2]);
--  }
-+  constexpr mat3(vec3 a, vec3 b, vec3 c) : data{a, b, c} {}
-+
-+  IMPLICIT constexpr mat3(mat3_scalar s)
-+      : data{vec3(s.data[0]), vec3(s.data[1]), vec3(s.data[2])} {}
-+
-+  constexpr mat3(mat3_scalar s0, mat3_scalar s1, mat3_scalar s2, mat3_scalar s3)
-+      : data{vec3(s0.data[0], s1.data[0], s2.data[0], s3.data[0]),
-+             vec3(s0.data[1], s1.data[1], s2.data[1], s3.data[1]),
-+             vec3(s0.data[2], s1.data[2], s2.data[2], s3.data[2])} {}
- 
-   constexpr mat3(Float d1, Float d2, Float d3, Float d4, Float d5, Float d6,
--                 Float d7, Float d8, Float d9) {
--    data[0] = vec3(d1, d2, d3);
--    data[1] = vec3(d4, d5, d6);
--    data[2] = vec3(d7, d8, d9);
--  }
-+                 Float d7, Float d8, Float d9)
-+      : data{vec3(d1, d2, d3), vec3(d4, d5, d6), vec3(d7, d8, d9)} {}
- 
-   IMPLICIT mat3(const mat4& mat);
- 
-   friend vec3 operator*(mat3 m, vec3 v) {
-     vec3 u;
-     u.x = m[0].x * v.x + m[1].x * v.y + m[2].x * v.z;
-     u.y = m[0].y * v.x + m[1].y * v.y + m[2].y * v.z;
-     u.z = m[0].z * v.x + m[1].z * v.y + m[2].z * v.z;
-@@ -2592,29 +2573,21 @@ struct mat4_scalar {
-     return u;
-   }
- };
- 
- struct mat4 {
-   vec4 data[4];
- 
-   mat4() = default;
--  IMPLICIT constexpr mat4(mat4_scalar s) {
--    data[0] = vec4(s.data[0]);
--    data[1] = vec4(s.data[1]);
--    data[2] = vec4(s.data[2]);
--    data[3] = vec4(s.data[3]);
--  }
--
--  mat4(vec4 a, vec4 b, vec4 c, vec4 d) {
--    data[0] = a;
--    data[1] = b;
--    data[2] = c;
--    data[3] = d;
--  }
-+  IMPLICIT constexpr mat4(mat4_scalar s)
-+      : data{vec4(s.data[0]), vec4(s.data[1]), vec4(s.data[2]),
-+             vec4(s.data[3])} {}
-+
-+  constexpr mat4(vec4 a, vec4 b, vec4 c, vec4 d) : data{a, b, c, d} {}
- 
-   vec4& operator[](int index) { return data[index]; }
-   const vec4& operator[](int index) const { return data[index]; }
- 
-   friend vec4 operator*(mat4 m, vec4 v) {
-     vec4 u;
-     u.x = m[0].x * v.x + m[1].x * v.y + m[2].x * v.z + m[3].x * v.w;
-     u.y = m[0].y * v.x + m[1].y * v.y + m[2].y * v.z + m[3].y * v.w;
-
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1645177101 0
-# Node ID 00128c425ebb4d4094e829f1936490d0aa2507f1
-# Parent  8af9ccb50f19e293ab7eb2b3d76961827ba84a54
-Bug 1754752 - Avoid a ton of warning spam when building swgl with gcc. r=lsalzman
-
-Differential Revision: https://phabricator.services.mozilla.com/D139088
-
-diff --git a/gfx/wr/swgl/src/gl.cc b/gfx/wr/swgl/src/gl.cc
---- a/gfx/wr/swgl/src/gl.cc
-+++ b/gfx/wr/swgl/src/gl.cc
-@@ -77,17 +77,17 @@ WINBASEAPI BOOL WINAPI QueryPerformanceF
- #endif
- 
- #define UNREACHABLE __builtin_unreachable()
- 
- #define UNUSED [[maybe_unused]]
- 
- #define FALLTHROUGH [[fallthrough]]
- 
--#ifdef MOZILLA_CLIENT
-+#if defined(MOZILLA_CLIENT) && defined(MOZ_CLANG_PLUGIN)
- #  define IMPLICIT __attribute__((annotate("moz_implicit")))
- #else
- #  define IMPLICIT
- #endif
- 
- #include "gl_defs.h"
- #include "glsl.h"
- #include "program.h"
-
diff --git a/icecat.spec b/icecat.spec
index d5cc846..63dd3a3 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -169,7 +169,6 @@ Patch226: rhbz-1354671.patch
 Patch402: mozilla-1196777.patch
 Patch412: mozilla-1337988.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
-Patch424: icecat-mozilla-1754752.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
@@ -377,9 +376,6 @@ tar -xf %{SOURCE5}
 %ifarch %{power64}
 %patch423 -p1 -b .1512162
 %endif
-%if 0%{?fedora} > 35
-%patch424 -p1 -b .1754752
-%endif
 
 #%%patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
 #%%patch585 -p1 -b .firefox-vaapi-extra-frames

From 8f1406c203238b0f5060f3a5e4da22097aff7153 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 29 Jun 2022 20:39:51 +0200
Subject: [PATCH 289/473] Release 91.11.0 rh1| Update cbindgen to 0.24.0

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index 296542c..1b1b385 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = 99ac9076366d7f567909754635918e61710c3e4d17b00bebb4373bd072fa9fe0d01bbd877074f0cee0893f5db724d6c9db4398fa3e589194bd15d63f5baaa3ae
+SHA512 (cbindgen-vendor.tar.xz) = bc825cd86928cd897f5c5e8e8a9f81a01284730a340b0e264c07317b5aa934e69bd617a1574d3e023b65993404c409f0ac0fd14bad417366fd2755c6755873da
 SHA512 (icecat-91.11.0-langpacks.tar.gz) = 7f2067e1340c1ecc2d8148d20d9d8e388d057c50af7ae5f9de35ab74d2b4b41c2ab8fbc4c3c8ba9e3aa3076fd025bce938bf0e70d18f655a9f5d901faa879b4b
 SHA512 (icecat-91.11.0-rh1.tar.bz2) = 5b7346417868e8051a42a6335802cd3c41e5dda5d42c6d6c5be2645bcd829a4a615a90ebdccdadc5d27e6a0513ade9ad88b26cefff9defd22fd097d9afac6c47
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 5b01f78e2d16bf37965bb8f01947d1ad07f4e662 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 2 Jul 2022 14:28:57 +0200
Subject: [PATCH 290/473] Release 91.11.0 rh1| Add GLIBCXX fix for GCC 12

---
 icecat-GLIBCXX-fix-for-GCC-12.patch | 41 +++++++++++++++++++++++++++++
 icecat.spec                         |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 icecat-GLIBCXX-fix-for-GCC-12.patch

diff --git a/icecat-GLIBCXX-fix-for-GCC-12.patch b/icecat-GLIBCXX-fix-for-GCC-12.patch
new file mode 100644
index 0000000..d8e2d9f
--- /dev/null
+++ b/icecat-GLIBCXX-fix-for-GCC-12.patch
@@ -0,0 +1,41 @@
+From efd5bc0715e5477318be95a76811cda0a89e8289 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Fri, 4 Mar 2022 12:00:26 +0100
+Subject: [PATCH] GLIBCXX fix for GCC 12?
+
+---
+ build/unix/stdc++compat/stdc++compat.cpp | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/build/unix/stdc++compat/stdc++compat.cpp b/build/unix/stdc++compat/stdc++compat.cpp
+index 0180f6bcfa998..8d7a542ff11f0 100644
+--- a/build/unix/stdc++compat/stdc++compat.cpp
++++ b/build/unix/stdc++compat/stdc++compat.cpp
+@@ -24,6 +24,7 @@
+    GLIBCXX_3.4.27 is from gcc 10
+    GLIBCXX_3.4.28 is from gcc 10
+    GLIBCXX_3.4.29 is from gcc 11
++   GLIBCXX_3.4.30 is from gcc 12
+ 
+ This file adds the necessary compatibility tricks to avoid symbols with
+ version GLIBCXX_3.4.20 and bigger, keeping binary compatibility with
+@@ -73,6 +74,19 @@
+ 
+ }  // namespace std
+ #endif
++
++#if _GLIBCXX_RELEASE >= 12
++namespace std {
++
++/* This avoids the GLIBCXX_3.4.30 symbol version. */
++void __attribute__((weak))
++__glibcxx_assert_fail(const char* __file, int __line, const char* __function,
++                      const char* __condition) {
++  MOZ_CRASH();
++}
++
++}  // namespace std
++#endif
+ 
+ #if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 21)
+ /* While we generally don't build with exceptions, we have some host tools
diff --git a/icecat.spec b/icecat.spec
index 63dd3a3..fb52e3f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -161,6 +161,7 @@ Patch219: rhbz-1173156.patch
 Patch220: firefox-nss-version.patch
 Patch221: firefox-nss-addon-hack.patch
 Patch223: %{name}-glibc-dynstack.patch
+Patch224: %{name}-GLIBCXX-fix-for-GCC-12.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
@@ -361,6 +362,7 @@ tar -xf %{SOURCE5}
 # Fedora patches
 %patch219 -p1 -b .rhbz-1173156
 %patch221 -p1 -b .firefox-nss-addon-hack
+%patch224 -p1 -b .glibxx
 
 # ARM run-time patch
 %ifarch aarch64

From 4e890a226722a714b53725d8a49391aa28daf421 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 7 Jul 2022 20:37:00 +0200
Subject: [PATCH 291/473] Less optbuild activated

---
 icecat.spec | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index fb52e3f..8df5d08 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,13 +1,13 @@
 ### Naming ###
 # Set to true if it's going to be submitted as update
-%global release_build 1
+%global release_build 0
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
 %global redhat_ver rh1
 
-#%%global pre_tag .test
-%global pre_tag %{nil}
+%global pre_tag .test
+#%%global pre_tag %{nil}
 
 # Exclude ARM for the following error:
 #  terminate called after throwing an instance of 'std::bad_alloc'
@@ -22,7 +22,7 @@ ExcludeArch: %{arm}
 %global debug_build   0
 
 # Downgrade optimization
-%global less_optbuild 0
+%global less_optbuild 1
 
 # Use mozilla hardening option?
 %global hardened_build 1
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 91.11.0
-Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -824,6 +824,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Wed Jun 29 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-2.rh1.test
+- Release 91.11.0
+- Less optbuild activated
+
 * Wed Jun 29 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-1.rh1
 - Release 91.11.0 rh1
 

From 3f1fe5373d37cc61e39c2488aa361b4e69484d41 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 8 Jul 2022 22:07:34 +0200
Subject: [PATCH 292/473] Add patch for mozilla bug #1773336

---
 icecat.spec           |  7 +++++--
 mozilla-1773336.patch | 12 ++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 mozilla-1773336.patch

diff --git a/icecat.spec b/icecat.spec
index 8df5d08..ccf383f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -7,7 +7,7 @@
 %global redhat_ver rh1
 
 %global pre_tag .test
-#%%global pre_tag %{nil}
+#%%global pre_tag %%{nil}
 
 # Exclude ARM for the following error:
 #  terminate called after throwing an instance of 'std::bad_alloc'
@@ -144,6 +144,7 @@ Patch2: %{name}-libevent_linkflag.patch
 Patch3: mozilla-build-arm.patch
 Patch4: %{name}-build-arm-libaom.patch
 Patch5: rhbz-1219542-s390-build.patch
+Patch6: mozilla-1773336.patch
 
 # Unrecognized file?
 Patch7: %{name}-fix_jar.patch
@@ -352,6 +353,7 @@ tar -xf %{SOURCE5}
 %ifarch s390
 %patch5 -p1 -b .rhbz-1219542-s390
 %endif
+%patch6 -p1 -b .1773336
 %patch7 -p0 -b .fix_jar
 %patch8 -p0 -b .fix_installer
 
@@ -824,9 +826,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
-* Wed Jun 29 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-2.rh1.test
+* Fri Jul 08 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-2.rh1.test
 - Release 91.11.0
 - Less optbuild activated
+- Add patch for mozilla bug #1773336
 
 * Wed Jun 29 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-1.rh1
 - Release 91.11.0 rh1
diff --git a/mozilla-1773336.patch b/mozilla-1773336.patch
new file mode 100644
index 0000000..b65ff89
--- /dev/null
+++ b/mozilla-1773336.patch
@@ -0,0 +1,12 @@
+diff -up firefox-101.0.1/gfx/webrender_bindings/webrender_ffi.h.old firefox-101.0.1/gfx/webrender_bindings/webrender_ffi.h
+--- firefox-101.0.1/gfx/webrender_bindings/webrender_ffi.h.old	2022-06-09 10:31:16.122495733 +0200
++++ firefox-101.0.1/gfx/webrender_bindings/webrender_ffi.h	2022-06-09 10:31:22.880724352 +0200
+@@ -72,8 +72,6 @@ struct WrPipelineInfo;
+ struct WrPipelineIdAndEpoch;
+ using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
+ 
+-const uint64_t ROOT_CLIP_CHAIN = ~0;
+-
+ }  // namespace wr
+ }  // namespace mozilla
+ 

From a6dc7c4bb848837b631e546a56ef9c0e243b12be Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 9 Jul 2022 12:42:54 +0200
Subject: [PATCH 293/473] Drop Java dependency (rhbz#2104050)

---
 icecat.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index ccf383f..6129f69 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 91.11.0
-Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -211,7 +211,6 @@ BuildRequires: gstreamer1-devel
 BuildRequires: gstreamer1-plugins-base-devel
 BuildRequires: hunspell-devel
 BuildRequires: ImageMagick, autotrace
-BuildRequires: java-1.8.0-openjdk-headless
 BuildRequires: intltool
 BuildRequires: libappstream-glib
 BuildRequires: libavcodec-free-devel
@@ -826,6 +825,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Sat Jul 09 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-3.rh1.test
+- Drop Java dependency (rhbz#2104050)
+
 * Fri Jul 08 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-2.rh1.test
 - Release 91.11.0
 - Less optbuild activated

From 687dfc9088745e43de9cfea8cfa2bb8e7cbc5aa1 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 9 Jul 2022 21:08:39 +0200
Subject: [PATCH 294/473] Release build

---
 icecat.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 6129f69..89af403 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,13 +1,13 @@
 ### Naming ###
 # Set to true if it's going to be submitted as update
-%global release_build 0
+%global release_build 1
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
 %global redhat_ver rh1
 
-%global pre_tag .test
-#%%global pre_tag %%{nil}
+#%%global pre_tag .test
+%global pre_tag %{nil}
 
 # Exclude ARM for the following error:
 #  terminate called after throwing an instance of 'std::bad_alloc'
@@ -22,7 +22,7 @@ ExcludeArch: %{arm}
 %global debug_build   0
 
 # Downgrade optimization
-%global less_optbuild 1
+%global less_optbuild 0
 
 # Use mozilla hardening option?
 %global hardened_build 1

From 7feab46c2a8c88188f63079f334dd0e7270de361 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 9 Jul 2022 21:10:16 +0200
Subject: [PATCH 295/473] Fix Changelog

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 89af403..8471e2c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -825,7 +825,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
-* Sat Jul 09 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-3.rh1.test
+* Sat Jul 09 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-3.rh1
 - Drop Java dependency (rhbz#2104050)
 
 * Fri Jul 08 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-2.rh1.test

From 1d11971fbbb9a2233afde20872dd2a07a917726d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 21 Jul 2022 14:29:09 +0000
Subject: [PATCH 296/473] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 icecat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 8471e2c..95e01ab 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 91.11.0
-Release: 3.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 4.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -825,6 +825,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 91.11.0-4.rh1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sat Jul 09 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-3.rh1
 - Drop Java dependency (rhbz#2104050)
 

From 8a7918552108a8a63aaf4b90bb68be746103aa3d Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Mon, 25 Jul 2022 23:18:49 +0200
Subject: [PATCH 297/473] Release 91.12.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 7 +++++--
 sources                 | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 94ffc2c..d0697d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -196,3 +196,5 @@
 /icecat-91.10.0-rh3.tar.bz2
 /icecat-91.11.0-langpacks.tar.gz
 /icecat-91.11.0-rh1.tar.bz2
+/icecat-91.12.0-langpacks.tar.gz
+/icecat-91.12.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 6c5a68a..1b1283c 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.11.0
+VERSION=91.12.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 95e01ab..c37623a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -95,8 +95,8 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.11.0
-Release: 4.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 91.12.0
+Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -825,6 +825,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Mon Jul 25 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.12.0-1.rh1
+- Release 91.12.0
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 91.11.0-4.rh1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 1b1b385..4ad8acb 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = bc825cd86928cd897f5c5e8e8a9f81a01284730a340b0e264c07317b5aa934e69bd617a1574d3e023b65993404c409f0ac0fd14bad417366fd2755c6755873da
-SHA512 (icecat-91.11.0-langpacks.tar.gz) = 7f2067e1340c1ecc2d8148d20d9d8e388d057c50af7ae5f9de35ab74d2b4b41c2ab8fbc4c3c8ba9e3aa3076fd025bce938bf0e70d18f655a9f5d901faa879b4b
-SHA512 (icecat-91.11.0-rh1.tar.bz2) = 5b7346417868e8051a42a6335802cd3c41e5dda5d42c6d6c5be2645bcd829a4a615a90ebdccdadc5d27e6a0513ade9ad88b26cefff9defd22fd097d9afac6c47
+SHA512 (icecat-91.12.0-langpacks.tar.gz) = 58d46b08241eadc06b7f7a3876c9353a2c42aedf6ae0748ccb6c03c19d93fb0c110e9d2868ef5436c53dc1489fb498bcb8af6cffd96be672290fc77f205e4328
+SHA512 (icecat-91.12.0-rh1.tar.bz2) = e6d20293f39189ace944772c4d2a97186cda1666063dd29ed1b0f630f18c957ac71dc0f40c6c8dcaa4e3ffa773de9eef6303c894201e65470153a1e48ad20e0c
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 7978e3edfa72b23f30ae0c706c35f5d7b77e5f46 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 26 Jul 2022 12:54:32 +0200
Subject: [PATCH 298/473] Release 91.12.0| Update to cbindgen 0.24.3

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index 4ad8acb..69b037f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = bc825cd86928cd897f5c5e8e8a9f81a01284730a340b0e264c07317b5aa934e69bd617a1574d3e023b65993404c409f0ac0fd14bad417366fd2755c6755873da
+SHA512 (cbindgen-vendor.tar.xz) = d597b5422af9d3a3f9310bdad94c5897cf2605f5214ef4c447ad79612d81fbbb9d86b50a1b122b0000b54ada66bf6962c92b3b5ff8fc44e4167a18a532359cc4
 SHA512 (icecat-91.12.0-langpacks.tar.gz) = 58d46b08241eadc06b7f7a3876c9353a2c42aedf6ae0748ccb6c03c19d93fb0c110e9d2868ef5436c53dc1489fb498bcb8af6cffd96be672290fc77f205e4328
 SHA512 (icecat-91.12.0-rh1.tar.bz2) = e6d20293f39189ace944772c4d2a97186cda1666063dd29ed1b0f630f18c957ac71dc0f40c6c8dcaa4e3ffa773de9eef6303c894201e65470153a1e48ad20e0c
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 6b2a80bcc8a60f5caf0bcce0562509700199f07a Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 26 Jul 2022 15:00:57 +0200
Subject: [PATCH 299/473] Release 91.12.0| Add patch for mzb#1772635

---
 icecat-1772635.patch | 32 ++++++++++++++++++++++++++++++++
 icecat.spec          |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 icecat-1772635.patch

diff --git a/icecat-1772635.patch b/icecat-1772635.patch
new file mode 100644
index 0000000..ec471b5
--- /dev/null
+++ b/icecat-1772635.patch
@@ -0,0 +1,32 @@
+
+# HG changeset patch
+# User Jim Blandy <jimb@red-bean.com>
+# Date 1658360296 0
+# Node ID 6069ced802d8d6b98ee43470473328b4de38fb0e
+# Parent  d6c85070b665bbb41dcfb230f2f882f85ce0a217
+Bug 1772635: Handle some new ccache categories. r=ahochheiden
+
+Differential Revision: https://phabricator.services.mozilla.com/D151570
+
+diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
+--- a/python/mozbuild/mozbuild/controller/building.py
++++ b/python/mozbuild/mozbuild/controller/building.py
+@@ -868,12 +868,17 @@
+         ("cant_use_pch", "can't use precompiled header"),
+         ("compiler_missing", "couldn't find the compiler"),
+         ("cache_file_missing", "cache file missing"),
+-        ("bad_args", "bad compiler arguments"),
++        ("internal_error", "Errors/Internal error"),
+         ("unsupported_lang", "unsupported source language"),
+         ("compiler_check_failed", "compiler check failed"),
+         ("autoconf", "autoconf compile/link"),
+         ("unsupported_code_directive", "unsupported code directive"),
+         ("unsupported_compiler_option", "unsupported compiler option"),
++        ("unsupported_compiler_options", "Uncacheable/Unsupported compiler option"),
++        ("could_not_use_precompiled", "Uncacheable/Could not use precompiled header"),
++        ("compiler_stdout", "Uncacheable/Compiler produced stdout"),
++        ("unsupported_language", "Uncacheable/Unsupported source language"),
++        ("bad_args", "Uncacheable/Bad compiler arguments"),
+         ("out_stdout", "output to stdout"),
+         ("out_device", "output to a non-regular file"),
+         ("no_input", "no input file"),
diff --git a/icecat.spec b/icecat.spec
index c37623a..df9d4e0 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -168,6 +168,7 @@ Patch224: %{name}-GLIBCXX-fix-for-GCC-12.patch
 Patch226: rhbz-1354671.patch
 
 # Upstream patches
+Patch401: icecat-1772635.patch
 Patch402: mozilla-1196777.patch
 Patch412: mozilla-1337988.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
@@ -375,6 +376,7 @@ tar -xf %{SOURCE5}
 %patch44  -p1 -b .build-arm-libopus
 %endif
 
+%patch401 -p1 -b .1772635
 %patch402 -p1 -b .1196777
 %ifarch %{power64}
 %patch423 -p1 -b .1512162

From e22ab3dd8db01c19cbf45a0d230d062cf3abff96 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 26 Jul 2022 15:18:43 +0200
Subject: [PATCH 300/473] Release 91.12.0| ccache always disabled

---
 icecat.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index df9d4e0..63e1147 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -604,10 +604,7 @@ export AR="gcc-ar"
 export NM="gcc-nm"
 export RANLIB="gcc-ranlib"
 %endif
-%if 0%{?build_with_pgo}
-# PGO build doesn't work with ccache
 export CCACHE_DISABLE=1
-%endif
 
 %if %{?less_optbuild}
 MOZ_SMP_FLAGS=-j1

From 5b58b667a3b281570fef762fec3ff071e44f5ca0 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 26 Jul 2022 16:11:51 +0200
Subject: [PATCH 301/473] Release 91.12.0| Add patch for mzb#1742849

---
 icecat-1742849.patch | 425 +++++++++++++++++++++++++++++++++++++++++++
 icecat-1772635.patch |  32 ----
 icecat.spec          |   4 +-
 3 files changed, 427 insertions(+), 34 deletions(-)
 create mode 100644 icecat-1742849.patch
 delete mode 100644 icecat-1772635.patch

diff --git a/icecat-1742849.patch b/icecat-1742849.patch
new file mode 100644
index 0000000..be05497
--- /dev/null
+++ b/icecat-1742849.patch
@@ -0,0 +1,425 @@
+
+# HG changeset patch
+# User Alexandre Lissy <lissyx+mozillians@lissyx.dyndns.org>
+# Date 1639046833 0
+# Node ID 33f81fb07d792be30dcd1008b21b187ca24f21e6
+# Parent  3382e4da79289240c4c2fe718b461f7a58bce553
+Bug 1742849 - Parsing CCache 4.4+ stats output r=mhentges
+
+Statistics output changed after 4.4 and requires different parsing, as
+well as an extra --verbose to get the same informations as before.
+
+See https://github.com/ccache/ccache/commit/8892814e8a790d615e44262c0005513d6d49f9e1
+
+Differential Revision: https://phabricator.services.mozilla.com/D133086
+
+diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
+--- a/python/mozbuild/mozbuild/controller/building.py
++++ b/python/mozbuild/mozbuild/controller/building.py
+@@ -5,16 +5,17 @@
+ from __future__ import absolute_import, print_function, unicode_literals
+ 
+ import errno
+ import getpass
+ import io
+ import json
+ import logging
+ import os
++import re
+ import shutil
+ import six
+ import subprocess
+ import sys
+ import time
+ 
+ from collections import (
+     Counter,
+@@ -583,21 +584,24 @@ class BuildMonitor(MozbuildObject):
+                 "Swap in/out (MB): {sin}/{sout}",
+             )
+ 
+     def ccache_stats(self):
+         ccache_stats = None
+ 
+         ccache = mozfile.which("ccache")
+         if ccache:
++            # With CCache v4.4+ statistics might require --verbose
++            is_version_4_4_or_newer = CCacheStats.check_version_4_4_or_newer(ccache)
+             try:
+                 output = subprocess.check_output(
+-                    [ccache, "-s"], universal_newlines=True
++                    [ccache, "-s" if not is_version_4_4_or_newer else "-sv"],
++                    universal_newlines=True,
+                 )
+-                ccache_stats = CCacheStats(output)
++                ccache_stats = CCacheStats(output, is_version_4_4_or_newer)
+             except ValueError as e:
+                 self.log(logging.WARNING, "ccache", {"msg": str(e)}, "{msg}")
+         return ccache_stats
+ 
+ 
+ class TerminalLoggingHandler(logging.Handler):
+     """Custom logging handler that works with terminal window dressing.
+ 
+@@ -883,33 +887,154 @@ class CCacheStats(object):
+         ("cache_files", "files in cache"),
+         ("cache_size", "cache size"),
+         ("cache_max_size", "max cache size"),
+     ]
+ 
+     DIRECTORY_DESCRIPTION = "cache directory"
+     PRIMARY_CONFIG_DESCRIPTION = "primary config"
+     SECONDARY_CONFIG_DESCRIPTION = "secondary config"
++
++    STATS_KEYS_4_4 = [
++        ("stats_updated", "Summary/Stats updated"),
++        (
++            "cache_hit_rate",
++            "Summary/Hits",
++            lambda x: next(iter(re.findall(r"\((.*) %\)", x)), "0.00 %"),
++        ),
++        (
++            "cache_hit_direct",
++            "Summary/Hits/Direct",
++            lambda x: next(iter(re.findall(r"(\d+)\s+/\s+\d+\s+\(", x)), "0"),
++        ),
++        (
++            "cache_hit_preprocessed",
++            "Summary/Hits/Preprocessed",
++            lambda x: next(iter(re.findall(r"(\d+)\s+/\s+\d+\s+\(", x)), "0"),
++        ),
++        ("cache_miss", "Summary/Misses"),
++        ("error", "Summary/Errors"),
++        ("linking", "Uncacheable/Called for linking"),
++        ("preprocessing", "Uncacheable/Called for preprocessing"),
++        ("failed", "Uncacheable/Compilation failed"),
++        ("preprocessor_error", "Uncacheable/Preprocessing failed"),
++        ("cache_file_missing", "Errors/Missing cache file"),
++        ("bad_args", "Uncacheable/Bad compiler arguments"),
++        ("autoconf", "Uncacheable/Autoconf compile/link"),
++        ("no_input", "Uncacheable/No input file"),
++        ("num_cleanups", "Primary storage/Cleanups"),
++        ("cache_files", "Primary storage/Files"),
++        # Cache size is reported in GB, see
++        # https://github.com/ccache/ccache/commit/8892814e8a790d615e44262c0005513d6d49f9e1#diff-30ec2bbfafe4c3842c8e35179ef0d3253a66dcc054812e50049d0ca3b10e317fR274
++        (
++            "cache_size",
++            "Primary storage/Cache size (GB)",
++            lambda x: str(
++                float(next(iter(re.findall(r"(.*)\s+/\s+.*\s+\(", x)), "0"))
++                * CCacheStats.GiB
++            ),
++            True,  # Allow to continue evaluation for the next value
++        ),
++        (
++            "cache_max_size",
++            "Primary storage/Cache size (GB)",
++            lambda x: str(
++                float(next(iter(re.findall(r".*\s+/\s+(.*)\s+\(", x)), "0"))
++                * CCacheStats.GiB
++            ),
++        ),
++    ]
++
++    SKIP_KEYS_4_4 = [
++        "Summary/Uncacheable",
++        "Summary/Misses/Direct",
++        "Summary/Misses/Preprocessed",
++        "Primary storage/Hits",
++        "Primary storage/Misses",
++    ]
++
++    DIRECTORY_DESCRIPTION_4_4 = "Summary/Cache directory"
++    PRIMARY_CONFIG_DESCRIPTION_4_4 = "Summary/Primary config"
++    SECONDARY_CONFIG_DESCRIPTION_4_4 = "Summary/Secondary config"
++
+     ABSOLUTE_KEYS = {"cache_files", "cache_size", "cache_max_size"}
+     FORMAT_KEYS = {"cache_size", "cache_max_size"}
+ 
+     GiB = 1024 ** 3
+     MiB = 1024 ** 2
+     KiB = 1024
+ 
+-    def __init__(self, output=None):
++    def __init__(self, output=None, is_version_4_4_or_newer=False):
+         """Construct an instance from the output of ccache -s."""
+         self._values = {}
+         self.cache_dir = ""
+         self.primary_config = ""
+         self.secondary_config = ""
+ 
+         if not output:
+             return
+ 
++        if is_version_4_4_or_newer:
++            self._parse_human_format_4_4_plus(output)
++        else:
++            self._parse_human_format(output)
++
++    def _parse_human_format_4_4_plus(self, content):
++        head = ""
++        subhead = ""
++
++        for line in content.splitlines():
++            name = ""
++            if not line:
++                continue
++            if line.startswith("  "):
++                if not line.startswith("    "):
++                    subhead = line.strip().split(":")[0]
++                name = line.strip().split(":")[0]
++                raw_value = ":".join(line.split(":")[1:]).strip()
++                if raw_value:
++                    key = head
++                    if subhead != name:
++                        key += "/{}".format(subhead)
++                    key += "/{}".format(name)
++                    self._parse_line_4_4_plus(key, raw_value)
++            else:
++                head = line.strip(":")
++                subhead = ""
++
++    def _parse_line_4_4_plus(self, key, value):
++        if key.startswith(self.DIRECTORY_DESCRIPTION_4_4):
++            self.cache_dir = value
++        elif key.startswith(self.PRIMARY_CONFIG_DESCRIPTION_4_4):
++            self.primary_config = value
++        elif key.startswith(self.SECONDARY_CONFIG_DESCRIPTION_4_4):
++            self.secondary_config = value
++        else:
++            for seq in self.STATS_KEYS_4_4:
++                stat_key = seq[0]
++                stat_description = seq[1]
++                raw_value = value
++                if len(seq) > 2:
++                    raw_value = seq[2](value)
++                if stat_key not in self._values and key == stat_description:
++                    self._values[stat_key] = self._parse_value(raw_value)
++
++                    # We dont want to break when we need to extract two infos
++                    # from the same line
++                    if len(seq) < 4:
++                        break
++            else:
++                if key not in self.SKIP_KEYS_4_4:
++                    raise ValueError(
++                        "Failed to parse ccache stats output: '{}' '{}'".format(
++                            key, value
++                        )
++                    )
++
++    def _parse_human_format(self, output):
+         for line in output.splitlines():
+             line = line.strip()
+             if line:
+                 self._parse_line(line)
+ 
+     def _parse_line(self, line):
+         line = six.ensure_text(line)
+         if line.startswith(self.DIRECTORY_DESCRIPTION):
+@@ -1050,6 +1175,29 @@
+         else:
+             return "%.1f Kbytes" % (float(v) / CCacheStats.KiB)
+ 
++    @staticmethod
++    def check_version_4_4_or_newer(ccache):
++        output_version = subprocess.check_output(
++            [ccache, "--version"], universal_newlines=True
++        )
++        return CCacheStats._is_version_4_4_or_newer(output_version)
++
++    @staticmethod
++    def _is_version_4_4_or_newer(output):
++        if "ccache version" not in output:
++            return False
++
++        major = 0
++        minor = 0
++
++        for line in output.splitlines():
++            version = re.search(r"ccache version (\d+).(\d+).*", line)
++            if version:
++                major = int(version.group(1))
++                minor = int(version.group(2))
++                break
++
++        return ((major << 8) + minor) >= ((4 << 8) + 4)
+ 
+ class BuildDriver(MozbuildObject):
+     """Provides a high-level API for build actions."""
+diff --git a/python/mozbuild/mozbuild/test/controller/test_ccachestats.py b/python/mozbuild/mozbuild/test/controller/test_ccachestats.py
+--- a/python/mozbuild/mozbuild/test/controller/test_ccachestats.py
++++ b/python/mozbuild/mozbuild/test/controller/test_ccachestats.py
+@@ -223,16 +223,143 @@ class TestCcacheStats(unittest.TestCase)
+     cleanups performed                  3154
+     files in cache                     18525
+     cache size                          13.4 GB
+     max cache size                      15.0 GB
+     """.format(
+         timestamp=time.strftime("%c"), timestamp2=time.strftime("%c")
+     )
+ 
++    VERSION_3_5_GIT = """
++    ccache version 3.5.1+2_gf5309092_dirty
++
++    Copyright (C) 2002-2007 Andrew Tridgell
++    Copyright (C) 2009-2019 Joel Rosdahl
++
++    This program is free software; you can redistribute it and/or modify it under
++    the terms of the GNU General Public License as published by the Free Software
++    Foundation; either version 3 of the License, or (at your option) any later
++    version.
++    """
++
++    VERSION_4_2 = """
++    ccache version 4.2.1
++
++    Copyright (C) 2002-2007 Andrew Tridgell
++    Copyright (C) 2009-2021 Joel Rosdahl and other contributors
++
++    See <https://ccache.dev/credits.html> for a complete list of contributors.
++
++    This program is free software; you can redistribute it and/or modify it under
++    the terms of the GNU General Public License as published by the Free Software
++    Foundation; either version 3 of the License, or (at your option) any later
++    version.
++    """
++
++    VERSION_4_4 = """
++    ccache version 4.4
++    Features: file-storage http-storage
++
++    Copyright (C) 2002-2007 Andrew Tridgell
++    Copyright (C) 2009-2021 Joel Rosdahl and other contributors
++
++    See <https://ccache.dev/credits.html> for a complete list of contributors.
++
++    This program is free software; you can redistribute it and/or modify it under
++    the terms of the GNU General Public License as published by the Free Software
++    Foundation; either version 3 of the License, or (at your option) any later
++    version.
++    """
++
++    VERSION_4_4_2 = """
++    ccache version 4.4.2
++    Features: file-storage http-storage
++
++    Copyright (C) 2002-2007 Andrew Tridgell
++    Copyright (C) 2009-2021 Joel Rosdahl and other contributors
++
++    See <https://ccache.dev/credits.html> for a complete list of contributors.
++
++    This program is free software; you can redistribute it and/or modify it under
++    the terms of the GNU General Public License as published by the Free Software
++    Foundation; either version 3 of the License, or (at your option) any later
++    version.
++    """
++
++    VERSION_4_5 = """
++    ccache version 4.5.1
++    Features: file-storage http-storage redis-storage
++
++    Copyright (C) 2002-2007 Andrew Tridgell
++    Copyright (C) 2009-2021 Joel Rosdahl and other contributors
++
++    See <https://ccache.dev/credits.html> for a complete list of contributors.
++
++    This program is free software; you can redistribute it and/or modify it under
++    the terms of the GNU General Public License as published by the Free Software
++    Foundation; either version 3 of the License, or (at your option) any later
++    version.
++    """
++
++    STAT10 = """
++Summary:
++  Cache directory:          /home/suer/.ccache
++  Primary config:           /home/suer/.ccache/ccache.conf
++  Secondary config:         /etc/ccache.conf
++  Stats updated:            {timestamp}
++  Hits:                      916 / 9343 (9.80 %)
++    Direct:                  197 /  197 (100.0 %)
++    Preprocessed:            719 /  719 (100.0 %)
++  Misses:                   8427
++    Direct:                    0
++    Preprocessed:              0
++  Errors:                      1
++  Uncacheable:              1251
++Primary storage:
++  Hits:                        0 /    0
++  Misses:                      0
++  Cache size (GB):          4.41 / 5.00 (88.27 %)
++  Files:                    4425
++  Cleanups:                  161
++Errors:
++  Missing cache file:          1
++Uncacheable:
++  Autoconf compile/link:     418
++  Bad compiler arguments:      6
++  Called for linking:        569
++  Called for preprocessing:  110
++  Compilation failed:         49
++  No input file:               9
++  Preprocessing failed:       90
++    """.format(
++        timestamp=time.strftime("%c")
++    )
++
++    STAT11 = """
++Summary:
++  Cache directory:  /home/suer/.ccache
++  Primary config:   /home/suer/.ccache/ccache.conf
++  Secondary config: /etc/ccache.conf
++  Stats updated:    {timestamp}
++  Hits:                0 /    0
++    Direct:            0 /    0
++    Preprocessed:      0 /    0
++  Misses:              0
++    Direct:            0
++    Preprocessed:      0
++Primary storage:
++  Hits:                0 /    0
++  Misses:              0
++  Cache size (GB):  0.00 / 5.00 (0.00 %)
++  Files:               0
++  Cleanups:           16
++    """.format(
++        timestamp=time.strftime("%c")
++    )
++
+     def test_parse_garbage_stats_message(self):
+         self.assertRaises(ValueError, CCacheStats, self.STAT_GARBAGE)
+ 
+     def test_parse_zero_stats_message(self):
+         stats = CCacheStats(self.STAT0)
+         self.assertEqual(stats.cache_dir, "/home/tlin/.ccache")
+         self.assertEqual(stats.hit_rates(), (0, 0, 0))
+ 
+@@ -290,11 +417,26 @@ class TestCcacheStats(unittest.TestCase)
+         stat8 = CCacheStats(self.STAT8)
+         self.assertTrue(stat8)
+ 
+     def test_stats_version35(self):
+         # Test parsing 3.5 output.
+         stat9 = CCacheStats(self.STAT9)
+         self.assertTrue(stat9)
+ 
++    def test_stats_version44(self):
++        # verify version checks
++        self.assertFalse(CCacheStats._is_version_4_4_or_newer(self.VERSION_3_5_GIT))
++        self.assertFalse(CCacheStats._is_version_4_4_or_newer(self.VERSION_4_2))
++        self.assertTrue(CCacheStats._is_version_4_4_or_newer(self.VERSION_4_4))
++        self.assertTrue(CCacheStats._is_version_4_4_or_newer(self.VERSION_4_4_2))
++        self.assertTrue(CCacheStats._is_version_4_4_or_newer(self.VERSION_4_5))
++
++        # Test parsing 4.4+ output.
++        stat10 = CCacheStats(self.STAT10, True)
++        self.assertTrue(stat10)
++
++        stat11 = CCacheStats(self.STAT11, True)
++        self.assertTrue(stat11)
++
+ 
+ if __name__ == "__main__":
+     main()
+
+
diff --git a/icecat-1772635.patch b/icecat-1772635.patch
deleted file mode 100644
index ec471b5..0000000
--- a/icecat-1772635.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-# HG changeset patch
-# User Jim Blandy <jimb@red-bean.com>
-# Date 1658360296 0
-# Node ID 6069ced802d8d6b98ee43470473328b4de38fb0e
-# Parent  d6c85070b665bbb41dcfb230f2f882f85ce0a217
-Bug 1772635: Handle some new ccache categories. r=ahochheiden
-
-Differential Revision: https://phabricator.services.mozilla.com/D151570
-
-diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
---- a/python/mozbuild/mozbuild/controller/building.py
-+++ b/python/mozbuild/mozbuild/controller/building.py
-@@ -868,12 +868,17 @@
-         ("cant_use_pch", "can't use precompiled header"),
-         ("compiler_missing", "couldn't find the compiler"),
-         ("cache_file_missing", "cache file missing"),
--        ("bad_args", "bad compiler arguments"),
-+        ("internal_error", "Errors/Internal error"),
-         ("unsupported_lang", "unsupported source language"),
-         ("compiler_check_failed", "compiler check failed"),
-         ("autoconf", "autoconf compile/link"),
-         ("unsupported_code_directive", "unsupported code directive"),
-         ("unsupported_compiler_option", "unsupported compiler option"),
-+        ("unsupported_compiler_options", "Uncacheable/Unsupported compiler option"),
-+        ("could_not_use_precompiled", "Uncacheable/Could not use precompiled header"),
-+        ("compiler_stdout", "Uncacheable/Compiler produced stdout"),
-+        ("unsupported_language", "Uncacheable/Unsupported source language"),
-+        ("bad_args", "Uncacheable/Bad compiler arguments"),
-         ("out_stdout", "output to stdout"),
-         ("out_device", "output to a non-regular file"),
-         ("no_input", "no input file"),
diff --git a/icecat.spec b/icecat.spec
index 63e1147..3d7ff7c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -168,7 +168,7 @@ Patch224: %{name}-GLIBCXX-fix-for-GCC-12.patch
 Patch226: rhbz-1354671.patch
 
 # Upstream patches
-Patch401: icecat-1772635.patch
+Patch401: icecat-1742849.patch
 Patch402: mozilla-1196777.patch
 Patch412: mozilla-1337988.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
@@ -376,7 +376,7 @@ tar -xf %{SOURCE5}
 %patch44  -p1 -b .build-arm-libopus
 %endif
 
-%patch401 -p1 -b .1772635
+%patch401 -p1 -b .1742849
 %patch402 -p1 -b .1196777
 %ifarch %{power64}
 %patch423 -p1 -b .1512162

From 2217b1655984c02b07c84d881f34b9590b28d0f4 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 27 Jul 2022 21:57:39 +0200
Subject: [PATCH 302/473] Use mach busted

---
 icecat.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 3d7ff7c..e116a12 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -647,7 +647,8 @@ MOZ_ENABLE_WAYLAND=1 ./mach build  2>&1 | cat -
 GDK_BACKEND=x11 xvfb-run ./mach build  2>&1 | cat -
 %endif
 %else
-./mach build -v 2>&1 | cat -
+./mach busted -v 2>&1 | cat -
+#./mach build -v 2>&1 | cat -
 %endif
 
 %install

From 721a82167926ffeb25d9ab005830e61c5c88b483 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 27 Jul 2022 22:12:50 +0200
Subject: [PATCH 303/473] Fix mach commad

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index e116a12..07d7f0e 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -647,7 +647,7 @@ MOZ_ENABLE_WAYLAND=1 ./mach build  2>&1 | cat -
 GDK_BACKEND=x11 xvfb-run ./mach build  2>&1 | cat -
 %endif
 %else
-./mach busted -v 2>&1 | cat -
+./mach busted 2>&1 | cat -
 #./mach build -v 2>&1 | cat -
 %endif
 

From 5a3ba385bfce7d42591ea5b60e098142c28d792d Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 27 Jul 2022 22:56:19 +0200
Subject: [PATCH 304/473] Patched for Python3.11

---
 icecat-python3.11-open-U.patch             | 102 +++++++++++++++++++++
 icecat-python3.11-regex-inline-flags.patch |  27 ++++++
 icecat.spec                                |  12 ++-
 3 files changed, 138 insertions(+), 3 deletions(-)
 create mode 100644 icecat-python3.11-open-U.patch
 create mode 100644 icecat-python3.11-regex-inline-flags.patch

diff --git a/icecat-python3.11-open-U.patch b/icecat-python3.11-open-U.patch
new file mode 100644
index 0000000..f6f1f65
--- /dev/null
+++ b/icecat-python3.11-open-U.patch
@@ -0,0 +1,102 @@
+--- a/dom/base/usecounters.py.python-open-U	2022-06-28 04:37:00.000000000 +0200
++++ b/dom/base/usecounters.py	2022-07-11 19:17:46.266517761 +0200
+@@ -8,7 +8,7 @@ import re
+ 
+ def read_conf(conf_filename):
+     # Can't read/write from a single StringIO, so make a new one for reading.
+-    stream = open(conf_filename, "rU")
++    stream = open(conf_filename, "r")
+ 
+     def parse_counters(stream):
+         for line_num, line in enumerate(stream):
+--- a/python/mozbuild/mozbuild/action/process_define_files.py.python-open-U	2022-06-28 04:37:39.000000000 +0200
++++ b/python/mozbuild/mozbuild/action/process_define_files.py	2022-07-11 19:18:24.056417112 +0200
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+     ) and not config.substs.get("JS_STANDALONE"):
+         config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+ 
+-    with open(path, "rU") as input:
++    with open(path, "r") as input:
+         r = re.compile(
+             "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+         )
+--- a/python/mozbuild/mozbuild/backend/base.py.python-open-U	2022-06-28 04:37:39.000000000 +0200
++++ b/python/mozbuild/mozbuild/backend/base.py	2022-07-11 19:18:34.165390187 +0200
+@@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin):
+         return status
+ 
+     @contextmanager
+-    def _write_file(self, path=None, fh=None, readmode="rU"):
++    def _write_file(self, path=None, fh=None, readmode="r"):
+         """Context manager to write a file.
+ 
+         This is a glorified wrapper around FileAvoidWrite with integration to
+--- a/python/mozbuild/mozbuild/preprocessor.py.python-open-U	2022-06-28 04:37:20.000000000 +0200
++++ b/python/mozbuild/mozbuild/preprocessor.py	2022-07-11 19:19:30.677239685 +0200
+@@ -531,7 +531,7 @@ class Preprocessor:
+ 
+         if args:
+             for f in args:
+-                with io.open(f, "rU", encoding="utf-8") as input:
++                with io.open(f, "r", encoding="utf-8") as input:
+                     self.processFile(input=input, output=out)
+             if depfile:
+                 mk = Makefile()
+@@ -860,7 +860,7 @@ class Preprocessor:
+                     args = self.applyFilters(args)
+                 if not os.path.isabs(args):
+                     args = os.path.join(self.curdir, args)
+-                args = io.open(args, "rU", encoding="utf-8")
++                args = io.open(args, "r", encoding="utf-8")
+             except Preprocessor.Error:
+                 raise
+             except Exception:
+@@ -914,7 +914,7 @@ class Preprocessor:
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+     pp = Preprocessor(defines=defines, marker=marker)
+     for f in includes:
+-        with io.open(f, "rU", encoding="utf-8") as input:
++        with io.open(f, "r", encoding="utf-8") as input:
+             pp.processFile(input=input, output=output)
+     return pp.includes
+ 
+--- a/python/mozbuild/mozbuild/util.py.python-open-U	2022-06-28 04:37:40.000000000 +0200
++++ b/python/mozbuild/mozbuild/util.py	2022-07-11 19:19:19.903268374 +0200
+@@ -225,7 +225,7 @@ class FileAvoidWrite(BytesIO):
+     still occur, as well as diff capture if requested.
+     """
+ 
+-    def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++    def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+         BytesIO.__init__(self)
+         self.name = filename
+         assert type(capture_diff) == bool
+@@ -1447,7 +1447,7 @@ def patch_main():
+ 
+         def my_get_command_line():
+             with open(
+-                os.path.join(os.path.dirname(__file__), "fork_interpose.py"), "rU"
++                os.path.join(os.path.dirname(__file__), "fork_interpose.py"), "r"
+             ) as fork_file:
+                 fork_code = fork_file.read()
+             # Add our relevant globals.
+--- a/python/mozbuild/mozpack/files.py.python-open-U	2022-06-28 04:37:40.000000000 +0200
++++ b/python/mozbuild/mozpack/files.py	2022-07-11 19:19:40.372213866 +0200
+@@ -574,7 +574,7 @@ class PreprocessedFile(BaseFile):
+         pp = Preprocessor(defines=self.defines, marker=self.marker)
+         pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+ 
+-        with _open(self.path, "rU") as input:
++        with _open(self.path, "r") as input:
+             with _open(os.devnull, "w") as output:
+                 pp.processFile(input=input, output=output)
+ 
+@@ -631,7 +631,7 @@ class PreprocessedFile(BaseFile):
+         pp = Preprocessor(defines=self.defines, marker=self.marker)
+         pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+ 
+-        with _open(self.path, "rU") as input:
++        with _open(self.path, "r") as input:
+             pp.processFile(input=input, output=dest, depfile=deps_out)
+ 
+         dest.close()
diff --git a/icecat-python3.11-regex-inline-flags.patch b/icecat-python3.11-regex-inline-flags.patch
new file mode 100644
index 0000000..39481ec
--- /dev/null
+++ b/icecat-python3.11-regex-inline-flags.patch
@@ -0,0 +1,27 @@
+--- thunderbird-91.11.0/xpcom/idl-parser/xpidl/xpidl.py.python-inline-flags	2022-06-28 04:39:56.000000000 +0200
++++ thunderbird-91.11.0/xpcom/idl-parser/xpidl/xpidl.py	2022-07-11 21:55:05.287553042 +0200
+@@ -1563,13 +1563,13 @@ class IDLParser(object):
+     t_ignore = " \t"
+ 
+     def t_multilinecomment(self, t):
+-        r"/\*(?s).*?\*/"
++        r"/\*(?s:.*?)\*/"
+         t.lexer.lineno += t.value.count("\n")
+         if t.value.startswith("/**"):
+             self._doccomments.append(t.value)
+ 
+     def t_singlelinecomment(self, t):
+-        r"(?m)//.*?$"
++        r"(?m://.*?$)"
+ 
+     def t_IID(self, t):
+         return t
+@@ -1582,7 +1582,7 @@ class IDLParser(object):
+         return t
+ 
+     def t_LCDATA(self, t):
+-        r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?"
++        r"(?s:%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?)"
+         t.type = "CDATA"
+         t.value = t.lexer.lexmatch.group("cdata")
+         t.lexer.lineno += t.value.count("\n")
diff --git a/icecat.spec b/icecat.spec
index 07d7f0e..725cad3 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -96,7 +96,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Version: 91.12.0
-Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -170,6 +170,8 @@ Patch226: rhbz-1354671.patch
 # Upstream patches
 Patch401: icecat-1742849.patch
 Patch402: mozilla-1196777.patch
+Patch403: icecat-python3.11-open-U.patch
+Patch404: icecat-python3.11-regex-inline-flags.patch
 Patch412: mozilla-1337988.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
 
@@ -378,6 +380,8 @@ tar -xf %{SOURCE5}
 
 %patch401 -p1 -b .1742849
 %patch402 -p1 -b .1196777
+%patch403 -p1 -b .python311
+%patch404 -p1 -b .python311
 %ifarch %{power64}
 %patch423 -p1 -b .1512162
 %endif
@@ -647,8 +651,7 @@ MOZ_ENABLE_WAYLAND=1 ./mach build  2>&1 | cat -
 GDK_BACKEND=x11 xvfb-run ./mach build  2>&1 | cat -
 %endif
 %else
-./mach busted 2>&1 | cat -
-#./mach build -v 2>&1 | cat -
+./mach build -v 2>&1 | cat -
 %endif
 
 %install
@@ -825,6 +828,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Wed Jul 27 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.12.0-2.rh1
+- Patched for Python3.11
+
 * Mon Jul 25 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.12.0-1.rh1
 - Release 91.12.0
 

From ac11ffa7042676b8971eca49691c91c13bb49ae5 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Mon, 22 Aug 2022 22:00:43 +0200
Subject: [PATCH 305/473] Release 91.13.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 7 +++++--
 sources                 | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index d0697d8..8a1a9a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -198,3 +198,5 @@
 /icecat-91.11.0-rh1.tar.bz2
 /icecat-91.12.0-langpacks.tar.gz
 /icecat-91.12.0-rh1.tar.bz2
+/icecat-91.13.0-langpacks.tar.gz
+/icecat-91.13.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 1b1283c..5d68aed 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.12.0
+VERSION=91.13.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 725cad3..3d64fa1 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -95,8 +95,8 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.12.0
-Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 91.13.0
+Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -828,6 +828,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Mon Aug 22 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.13.0-1.rh1
+- Release 91.13.0
+
 * Wed Jul 27 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.12.0-2.rh1
 - Patched for Python3.11
 
diff --git a/sources b/sources
index 69b037f..6d37f5e 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = d597b5422af9d3a3f9310bdad94c5897cf2605f5214ef4c447ad79612d81fbbb9d86b50a1b122b0000b54ada66bf6962c92b3b5ff8fc44e4167a18a532359cc4
-SHA512 (icecat-91.12.0-langpacks.tar.gz) = 58d46b08241eadc06b7f7a3876c9353a2c42aedf6ae0748ccb6c03c19d93fb0c110e9d2868ef5436c53dc1489fb498bcb8af6cffd96be672290fc77f205e4328
-SHA512 (icecat-91.12.0-rh1.tar.bz2) = e6d20293f39189ace944772c4d2a97186cda1666063dd29ed1b0f630f18c957ac71dc0f40c6c8dcaa4e3ffa773de9eef6303c894201e65470153a1e48ad20e0c
+SHA512 (icecat-91.13.0-langpacks.tar.gz) = 0a2351d3a259f5f542fb7b337506f5849d4afd939dfcc70c75f4605e5af90e065fc3d993e4d3ab04004a0558f9170615eb5bf5c7776275f7daf436e8f17084dd
+SHA512 (icecat-91.13.0-rh1.tar.bz2) = b1aedd0aeee4d5f0e6ecfb647bbc0ca722a5210de98de181075c9290d977a8c4a66ecd7db533f4785df3aae0a0f560491800947f7a496d27c98e49399638a1f1
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From e2a7e8d1fbbdf849808b865a7a4e3b786c5fa0ee Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 18 Sep 2022 16:18:51 +0200
Subject: [PATCH 306/473] Release 102.2.0

---
 .gitignore                          |  2 +
 build-disable-elfhack.patch         | 10 ++--
 icecat-GLIBCXX-fix-for-GCC-12.patch | 14 +++--
 icecat-fix_installer.patch          | 32 -----------
 icecat-fix_jar.patch                | 11 ----
 icecat-lang_download.sh             |  2 +-
 icecat-mozconfig-common             |  1 +
 icecat-pgo.patch                    | 84 ++++++++++++++---------------
 icecat-python3.11-open-U.patch      |  9 ----
 icecat.spec                         | 63 +++++++++-------------
 mozilla-1196777.patch               | 13 ++---
 mozilla-1669639.patch               |  6 +--
 sources                             |  4 +-
 13 files changed, 98 insertions(+), 153 deletions(-)
 delete mode 100644 icecat-fix_installer.patch
 delete mode 100644 icecat-fix_jar.patch

diff --git a/.gitignore b/.gitignore
index 8a1a9a2..7421b33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -200,3 +200,5 @@
 /icecat-91.12.0-rh1.tar.bz2
 /icecat-91.13.0-langpacks.tar.gz
 /icecat-91.13.0-rh1.tar.bz2
+/icecat-102.2.0-langpacks.tar.gz
+/icecat-102.2.0-rh1.tar.bz2
diff --git a/build-disable-elfhack.patch b/build-disable-elfhack.patch
index faaf669..04d49f2 100644
--- a/build-disable-elfhack.patch
+++ b/build-disable-elfhack.patch
@@ -1,7 +1,7 @@
-diff -up firefox-84.0/toolkit/moz.configure.disable-elfhack firefox-84.0/toolkit/moz.configure
---- firefox-84.0/toolkit/moz.configure.disable-elfhack	2020-12-10 12:37:30.727243266 +0100
-+++ firefox-84.0/toolkit/moz.configure	2020-12-10 12:39:42.771967894 +0100
-@@ -1280,7 +1280,7 @@ with only_when("--enable-compile-environ
+diff -up firefox-97.0/toolkit/moz.configure.disable-elfhack firefox-97.0/toolkit/moz.configure
+--- firefox-97.0/toolkit/moz.configure.disable-elfhack	2022-02-08 09:58:47.518047952 +0100
++++ firefox-97.0/toolkit/moz.configure	2022-02-08 10:17:49.552945956 +0100
+@@ -1273,7 +1273,7 @@ with only_when("--enable-compile-environ
              help="{Enable|Disable} elf hacks",
          )
  
@@ -9,4 +9,4 @@ diff -up firefox-84.0/toolkit/moz.configure.disable-elfhack firefox-84.0/toolkit
 +        set_config("USE_ELF_HACK", depends_if("--enable-elf-hack")(lambda _: False))
  
  
- @depends(check_build_environment)
+ @depends(build_environment)
diff --git a/icecat-GLIBCXX-fix-for-GCC-12.patch b/icecat-GLIBCXX-fix-for-GCC-12.patch
index d8e2d9f..8fdc264 100644
--- a/icecat-GLIBCXX-fix-for-GCC-12.patch
+++ b/icecat-GLIBCXX-fix-for-GCC-12.patch
@@ -19,11 +19,10 @@ index 0180f6bcfa998..8d7a542ff11f0 100644
  
  This file adds the necessary compatibility tricks to avoid symbols with
  version GLIBCXX_3.4.20 and bigger, keeping binary compatibility with
-@@ -73,6 +74,19 @@
- 
+@@ -69,6 +70,19 @@ void __attribute__((weak)) __throw_bad_array_new_length() { MOZ_CRASH(); }
  }  // namespace std
  #endif
-+
+ 
 +#if _GLIBCXX_RELEASE >= 12
 +namespace std {
 +
@@ -36,6 +35,11 @@ index 0180f6bcfa998..8d7a542ff11f0 100644
 +
 +}  // namespace std
 +#endif
- 
- #if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 21)
++
  /* While we generally don't build with exceptions, we have some host tools
+  * that do use them. libstdc++ from GCC 5.0 added exception constructors with
+  * char const* argument. Older versions only have a constructor with
+-- 
+2.35.1
+
+
diff --git a/icecat-fix_installer.patch b/icecat-fix_installer.patch
deleted file mode 100644
index cefa8e5..0000000
--- a/icecat-fix_installer.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- browser/installer/package-manifest.orig.in	2017-03-24 21:09:39.027022000 +0100
-+++ browser/installer/package-manifest.in	2017-03-24 23:07:21.881504771 +0100
-@@ -74,9 +74,9 @@
- #endif
- #ifndef MOZ_SYSTEM_NSPR
- #ifndef MOZ_FOLD_LIBS
--@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
--@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
--@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
-+#@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
-+#@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
-+#@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
- #endif
- #endif
- #ifdef XP_MACOSX
-@@ -610,11 +610,11 @@
- @RESPATH@/chrome/recording.manifest
- @RESPATH@/chrome/recording/*
- #ifdef MOZ_GTK
--@RESPATH@/browser/chrome/icons/default/default16.png
--@RESPATH@/browser/chrome/icons/default/default32.png
--@RESPATH@/browser/chrome/icons/default/default48.png
--@RESPATH@/browser/chrome/icons/default/default64.png
--@RESPATH@/browser/chrome/icons/default/default128.png
-+#@RESPATH@/browser/chrome/icons/default/default16.png
-+#@RESPATH@/browser/chrome/icons/default/default32.png
-+#@RESPATH@/browser/chrome/icons/default/default48.png
-+@RESPATH@/browser/chrome/icons/default/default64.png
-+@RESPATH@/browser/chrome/icons/default/default128.png
- #endif
- @RESPATH@/browser/features/*
- 
diff --git a/icecat-fix_jar.patch b/icecat-fix_jar.patch
deleted file mode 100644
index 9a64fab..0000000
--- a/icecat-fix_jar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- browser/locales/jar.orig.mn	2017-03-19 19:59:09.000000000 +0100
-+++ browser/locales/jar.mn	2017-03-22 19:49:57.602190867 +0100
-@@ -14,7 +14,7 @@
- @AB_CD@.jar:
- % locale browser @AB_CD@ %locale/browser/
- # bookmarks.html is produced by LOCALIZED_GENERATED_FILES.
--    locale/browser/bookmarks.html                  (bookmarks.html)
-+    locale/browser/bookmarks.html                  (generic/profile/bookmarks.html.in)
- 
-     locale/browser/accounts.properties             (%chrome/browser/accounts.properties)
-     locale/browser/app-extension-fields.properties (%chrome/browser/app-extension-fields.properties)
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 5d68aed..9fd6aaa 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=91.13.0
+VERSION=102.2.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat-mozconfig-common b/icecat-mozconfig-common
index bc960b7..bb3300d 100644
--- a/icecat-mozconfig-common
+++ b/icecat-mozconfig-common
@@ -6,6 +6,7 @@ export MOZ_TELEMETRY_REPORTING=
 mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+ac_add_options --without-wasm-sandboxed-libraries
 
 ac_add_options --prefix="$PREFIX"
 ac_add_options --libdir="$LIBDIR"
diff --git a/icecat-pgo.patch b/icecat-pgo.patch
index 1ee1425..3b9fde4 100644
--- a/icecat-pgo.patch
+++ b/icecat-pgo.patch
@@ -1,26 +1,29 @@
-diff -up icecat-91/build/moz.configure/lto-pgo.configure.pgo icecat-91/build/moz.configure/lto-pgo.configure
---- icecat-91/build/moz.configure/lto-pgo.configure.pgo	2022-03-31 01:24:38.000000000 +0200
-+++ icecat-91/build/moz.configure/lto-pgo.configure	2022-04-04 10:15:45.387694143 +0200
-@@ -240,13 +240,13 @@
-                 cflags.append("-flto")
-                 ldflags.append("-flto")
-             else:
--                cflags.append("-flto=thin")
--                ldflags.append("-flto=thin")
-+                cflags.append("-flto")
-+                ldflags.append("-flto")
-         elif c_compiler.type == "clang-cl":
-             if len(value) and value[0].lower() == "full":
-                 cflags.append("-flto")
-             else:
--                cflags.append("-flto=thin")
-+                cflags.append("-flto")
-             # With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
-             # AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
-             cflags.append("-fuse-ld=lld")
-diff -up icecat-91/build/pgo/profileserver.py.pgo icecat-91/build/pgo/profileserver.py
---- icecat-91/build/pgo/profileserver.py.pgo	2022-03-31 01:24:38.000000000 +0200
-+++ icecat-91/build/pgo/profileserver.py	2022-04-04 10:15:45.387694143 +0200
+diff -up firefox-99.0/build/moz.configure/lto-pgo.configure.pgo firefox-99.0/build/moz.configure/lto-pgo.configure
+--- firefox-99.0/build/moz.configure/lto-pgo.configure.pgo	2022-03-31 01:24:38.000000000 +0200
++++ firefox-99.0/build/moz.configure/lto-pgo.configure	2022-04-04 10:15:45.387694143 +0200
+@@ -247,8 +247,8 @@ def lto(
+             cflags.append("-flto")
+             ldflags.append("-flto")
+         else:
+-            cflags.append("-flto=thin")
+-            ldflags.append("-flto=thin")
++            cflags.append("-flto")
++            ldflags.append("-flto")
+ 
+         if target.os == "Android" and value == "cross":
+             # Work around https://github.com/rust-lang/rust/issues/90088
+@@ -264,7 +264,7 @@ def lto(
+         if value == "full":
+             cflags.append("-flto")
+         else:
+-            cflags.append("-flto=thin")
++            cflags.append("-flto")
+         # With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
+         # AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
+         cflags.append("-fuse-ld=lld")
+diff -up firefox-99.0/build/pgo/profileserver.py.pgo firefox-99.0/build/pgo/profileserver.py
+--- firefox-99.0/build/pgo/profileserver.py.pgo	2022-03-31 01:24:38.000000000 +0200
++++ firefox-99.0/build/pgo/profileserver.py	2022-04-04 10:15:45.387694143 +0200
 @@ -11,7 +11,7 @@
  import subprocess
  
@@ -56,21 +59,19 @@ diff -up icecat-91/build/pgo/profileserver.py.pgo icecat-91/build/pgo/profileser
  
      with TemporaryDirectory() as profilePath:
          # TODO: refactor this into mozprofile
-@@ -211,6 +224,11 @@
+@@ -212,6 +225,9 @@
          if get_crashreports(profilePath, name="IceCat exited successfully?") != 0:
              print("IceCat exited successfully, but produced a crashreport")
              sys.exit(1)
-+            
 +        print('Copying profile data....')
 +        os.system('pwd');
 +        os.system('tar cf profdata.tar.gz `find . -name "*.gcda"`; cd ..; tar xf instrumented/profdata.tar.gz;');
-+
  
          llvm_profdata = env.get("LLVM_PROFDATA")
          if llvm_profdata:
-diff -up icecat-91/build/unix/mozconfig.unix.pgo icecat-91/build/unix/mozconfig.unix
---- icecat-91/build/unix/mozconfig.unix.pgo	2022-03-31 01:24:38.000000000 +0200
-+++ icecat-91/build/unix/mozconfig.unix	2022-04-04 10:15:45.387694143 +0200
+diff -up firefox-99.0/build/unix/mozconfig.unix.pgo firefox-99.0/build/unix/mozconfig.unix
+--- firefox-99.0/build/unix/mozconfig.unix.pgo	2022-03-31 01:24:38.000000000 +0200
++++ firefox-99.0/build/unix/mozconfig.unix	2022-04-04 10:15:45.387694143 +0200
 @@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
      CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
      CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
@@ -87,21 +88,19 @@ diff -up icecat-91/build/unix/mozconfig.unix.pgo icecat-91/build/unix/mozconfig.
      # We want to make sure we use binutils and other binaries in the tooltool
      # package.
      mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
-diff -up icecat-91/extensions/spellcheck/src/moz.build.pgo icecat-91/extensions/spellcheck/src/moz.build
---- icecat-91/extensions/spellcheck/src/moz.build.pgo	2022-03-31 01:24:50.000000000 +0200
-+++ icecat-91/extensions/spellcheck/src/moz.build	2022-04-04 10:15:45.387694143 +0200
-@@ -28,6 +28,7 @@
+diff -up firefox-99.0/extensions/spellcheck/src/moz.build.pgo firefox-99.0/extensions/spellcheck/src/moz.build
+--- firefox-99.0/extensions/spellcheck/src/moz.build.pgo	2022-03-31 01:24:50.000000000 +0200
++++ firefox-99.0/extensions/spellcheck/src/moz.build	2022-04-04 10:15:45.387694143 +0200
+@@ -28,3 +28,5 @@ EXPORTS.mozilla += [
      "mozInlineSpellChecker.h",
      "mozSpellChecker.h",
  ]
++
 +CXXFLAGS += ['-fno-devirtualize']
- 
- if CONFIG["CC_TYPE"] in ("clang", "gcc"):
-     CXXFLAGS += ["-Wno-error=shadow"]
-diff -up icecat-91/toolkit/components/terminator/nsTerminator.cpp.pgo icecat-91/toolkit/components/terminator/nsTerminator.cpp
---- icecat-91/toolkit/components/terminator/nsTerminator.cpp.pgo	2022-04-04 10:15:45.387694143 +0200
-+++ icecat-91/toolkit/components/terminator/nsTerminator.cpp	2022-04-04 10:19:07.022239556 +0200
-@@ -456,6 +456,11 @@
+diff -up firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-99.0/toolkit/components/terminator/nsTerminator.cpp
+--- firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo	2022-04-04 10:15:45.387694143 +0200
++++ firefox-99.0/toolkit/components/terminator/nsTerminator.cpp	2022-04-04 10:19:07.022239556 +0200
+@@ -466,6 +466,11 @@ void nsTerminator::StartWatchdog() {
    }
  #endif
  
@@ -111,5 +110,6 @@ diff -up icecat-91/toolkit/components/terminator/nsTerminator.cpp.pgo icecat-91/
 +  crashAfterMS = INT32_MAX;
 +
    UniquePtr<Options> options(new Options());
-   const PRIntervalTime ticksDuration =
-       PR_MillisecondsToInterval(HEARTBEAT_INTERVAL_MS);
+   // crashAfterTicks is guaranteed to be > 0 as
+   // crashAfterMS >= ADDITIONAL_WAIT_BEFORE_CRASH_MS >> HEARTBEAT_INTERVAL_MS
+
diff --git a/icecat-python3.11-open-U.patch b/icecat-python3.11-open-U.patch
index f6f1f65..5490515 100644
--- a/icecat-python3.11-open-U.patch
+++ b/icecat-python3.11-open-U.patch
@@ -71,15 +71,6 @@
          BytesIO.__init__(self)
          self.name = filename
          assert type(capture_diff) == bool
-@@ -1447,7 +1447,7 @@ def patch_main():
- 
-         def my_get_command_line():
-             with open(
--                os.path.join(os.path.dirname(__file__), "fork_interpose.py"), "rU"
-+                os.path.join(os.path.dirname(__file__), "fork_interpose.py"), "r"
-             ) as fork_file:
-                 fork_code = fork_file.read()
-             # Add our relevant globals.
 --- a/python/mozbuild/mozpack/files.py.python-open-U	2022-06-28 04:37:40.000000000 +0200
 +++ b/python/mozbuild/mozpack/files.py	2022-07-11 19:19:40.372213866 +0200
 @@ -574,7 +574,7 @@ class PreprocessedFile(BaseFile):
diff --git a/icecat.spec b/icecat.spec
index 3d64fa1..cc6b1ed 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -32,8 +32,8 @@ ExcludeArch: %{arm}
 # on other arches.
 %ifarch x86_64
 %if 0%{?release_build}
-%global build_with_pgo 0
-%global pgo_wayland    0
+%global build_with_pgo 1
+%global pgo_wayland    1
 %else
 %global build_with_pgo 0
 %endif
@@ -69,7 +69,7 @@ ExcludeArch: %{arm}
 %if %{?system_nss}
 %global nspr_version 4.32
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.78
+%global nss_version 3.80
 %global nss_build_version %{nss_version}
 %endif
 
@@ -95,7 +95,8 @@ ExcludeArch: %{arm}
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name: icecat
-Version: 91.13.0
+Epoch:   1
+Version: 102.2.0
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -146,12 +147,6 @@ Patch4: %{name}-build-arm-libaom.patch
 Patch5: rhbz-1219542-s390-build.patch
 Patch6: mozilla-1773336.patch
 
-# Unrecognized file?
-Patch7: %{name}-fix_jar.patch
-
-# Fix files list for installer
-Patch8: %{name}-fix_installer.patch
-
 Patch40: build-aarch64-skia.patch
 Patch41: build-disable-elfhack.patch
 Patch44: build-arm-libopus.patch
@@ -340,24 +335,22 @@ to run GNU IceCat native on Wayland.
 %autosetup -N -n %{name}-%{version}
 
 # Fix permissions
-find . -type f -name "*.h" -exec chmod 0644 '{}' \;
-find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
-find . -type f -name "*.cc" -exec chmod 0644 '{}' \;
-find . -type f -name "*.c" -exec chmod 0644 '{}' \;
+#find . -type f -name "*.h" -exec chmod 0644 '{}' \;
+#find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
+#find . -type f -name "*.cc" -exec chmod 0644 '{}' \;
+#find . -type f -name "*.c" -exec chmod 0644 '{}' \;
 
 # Copy license files
 tar -xf %{SOURCE5}
 
 %patch1 -p1 -b .fix_addon_installation
-%patch2 -p0 -b .libevent_linkflag
+#patch2 -p0 -b .libevent_linkflag
 %patch3 -p1 -b .build-arm-libaom
 %patch4 -p1 -b .arm
 %ifarch s390
 %patch5 -p1 -b .rhbz-1219542-s390
 %endif
 %patch6 -p1 -b .1773336
-%patch7 -p0 -b .fix_jar
-%patch8 -p0 -b .fix_installer
 
 %if 0%{?disable_elfhack}
 %patch41 -p1 -b .disable-elfhack
@@ -366,7 +359,7 @@ tar -xf %{SOURCE5}
 # Fedora patches
 %patch219 -p1 -b .rhbz-1173156
 %patch221 -p1 -b .firefox-nss-addon-hack
-%patch224 -p1 -b .glibxx
+%patch224 -p1 -b .glibcxx
 
 # ARM run-time patch
 %ifarch aarch64
@@ -378,7 +371,7 @@ tar -xf %{SOURCE5}
 %patch44  -p1 -b .build-arm-libopus
 %endif
 
-%patch401 -p1 -b .1742849
+#patch401 -p1 -b .1742849
 %patch402 -p1 -b .1196777
 %patch403 -p1 -b .python311
 %patch404 -p1 -b .python311
@@ -439,9 +432,8 @@ echo "ac_add_options --without-system-nss" >> .mozconfig
 %endif
 # Workaround for mozbz#1341234
 echo "ac_add_options --allow-addon-sideload" >> .mozconfig
-echo "ac_add_options --disable-system-cairo" >> .mozconfig
 echo "ac_add_options --enable-system-pixman" >> .mozconfig
-echo "ac_add_options --with-system-libevent=%{_prefix}" >> .mozconfig
+echo "ac_add_options --with-system-libevent" >> .mozconfig
 %if %{?with_vpx}
 echo "ac_add_options --with-system-libvpx" >> .mozconfig
 %else
@@ -503,8 +495,6 @@ echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .
 
 # Remove executable bit to make brp-mangle-shebangs happy.
 chmod -x third_party/rust/itertools/src/lib.rs
-chmod a-x third_party/rust/gfx-backend-vulkan/src/*.rs
-chmod a-x third_party/rust/gfx-hal/src/*.rs
 chmod a-x third_party/rust/ash/src/extensions/ext/*.rs
 chmod a-x third_party/rust/ash/src/extensions/khr/*.rs
 chmod a-x third_party/rust/ash/src/extensions/nv/*.rs
@@ -616,17 +606,21 @@ MOZ_SMP_FLAGS=-j1
 MOZ_SMP_FLAGS=-j1
 # On x86_64 architectures, Mozilla can build up to 4 jobs at once in parallel,
 # however builds tend to fail on other arches when building in parallel.
-%ifarch %{ix86}
+%ifarch %{ix86} s390x %{arm} aarch64
 [ -z "$RPM_BUILD_NCPUS" ] && \
      RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
 %endif
-%ifarch x86_64 %{power64} aarch64
+%ifarch x86_64 ppc ppc64 ppc64le
 [ -z "$RPM_BUILD_NCPUS" ] && \
      RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
 [ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
 [ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
+[ "$RPM_BUILD_NCPUS" -ge 16 ] && MOZ_SMP_FLAGS=-j16
+[ "$RPM_BUILD_NCPUS" -ge 24 ] && MOZ_SMP_FLAGS=-j24
+[ "$RPM_BUILD_NCPUS" -ge 32 ] && MOZ_SMP_FLAGS=-j32
+[ "$RPM_BUILD_NCPUS" -ge 64 ] && MOZ_SMP_FLAGS=-j64
 %endif
 %endif
 
@@ -637,21 +631,12 @@ echo "export STRIP=/bin/true" >> .mozconfig
 export MACH_USE_SYSTEM_PYTHON=1
 %if 0%{?build_with_pgo}
 %if 0%{?pgo_wayland}
-if [ -z "$XDG_RUNTIME_DIR" ]; then
-  export XDG_RUNTIME_DIR=$HOME
-fi
-xvfb-run mutter --wayland --nested &
-if [ -z "$WAYLAND_DISPLAY" ]; then
-  export WAYLAND_DISPLAY=wayland-0
-else
-  export WAYLAND_DISPLAY=wayland-1
-fi
-MOZ_ENABLE_WAYLAND=1 ./mach build  2>&1 | cat -
+MOZ_ENABLE_WAYLAND=1 ./mach build -v 2>&1 | cat - && exit 1
 %else
-GDK_BACKEND=x11 xvfb-run ./mach build  2>&1 | cat -
+xvfb-run ./mach build  2>&1 | cat - || exit 1
 %endif
 %else
-./mach build -v 2>&1 | cat -
+./mach build -v 2>&1 | cat - || exit 1
 %endif
 
 %install
@@ -828,6 +813,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Sat Sep 17 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.2.0-1.rh1
+- Release 102.2.0
+- Epoch 1
+
 * Mon Aug 22 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.13.0-1.rh1
 - Release 91.13.0
 
diff --git a/mozilla-1196777.patch b/mozilla-1196777.patch
index 1ab70f7..3cc90e4 100644
--- a/mozilla-1196777.patch
+++ b/mozilla-1196777.patch
@@ -1,7 +1,7 @@
-diff -up firefox-86.0/widget/gtk/nsWindow.cpp.1196777 firefox-86.0/widget/gtk/nsWindow.cpp
---- firefox-86.0/widget/gtk/nsWindow.cpp.1196777	2021-02-23 17:52:42.291702566 +0100
-+++ firefox-86.0/widget/gtk/nsWindow.cpp	2021-02-23 17:57:52.434895984 +0100
-@@ -195,7 +195,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTUR
+diff -up firefox-100.0/widget/gtk/nsWindow.cpp.1196777 firefox-100.0/widget/gtk/nsWindow.cpp
+--- firefox-100.0/widget/gtk/nsWindow.cpp.1196777	2022-05-02 11:29:06.763325015 +0200
++++ firefox-100.0/widget/gtk/nsWindow.cpp	2022-05-02 11:30:49.100717334 +0200
+@@ -163,7 +163,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTUR
                       GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
                       GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
                       GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SCROLL_MASK |
@@ -9,5 +9,6 @@ diff -up firefox-86.0/widget/gtk/nsWindow.cpp.1196777 firefox-86.0/widget/gtk/ns
 +                     GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
 +                     GDK_FOCUS_CHANGE_MASK;
  
- #if !GTK_CHECK_VERSION(3, 22, 0)
- typedef enum {
+ /* utility functions */
+ static bool is_mouse_in_window(GdkWindow* aWindow, gdouble aMouseX,
+
diff --git a/mozilla-1669639.patch b/mozilla-1669639.patch
index 2d79542..3639133 100644
--- a/mozilla-1669639.patch
+++ b/mozilla-1669639.patch
@@ -1,6 +1,5 @@
-diff -up firefox-81.0.1/build/mach_bootstrap.py.old firefox-81.0.1/build/mach_bootstrap.py
---- firefox-81.0.1/build/mach_bootstrap.py.old	2020-10-06 14:16:06.212974910 +0200
-+++ firefox-81.0.1/build/mach_bootstrap.py	2020-10-06 14:19:03.313179557 +0200
+--- firefox-81.0.1/build/mach_initialize.py.old	2020-10-06 14:16:06.212974910 +0200
++++ firefox-81.0.1/build/mach_initialize.py	2020-10-06 14:19:03.313179557 +0200
 @@ -507,7 +507,10 @@ class ImportHook(object):
          # doesn't happen or because it doesn't matter).
          if not os.path.exists(module.__file__[:-1]):
@@ -13,3 +12,4 @@ diff -up firefox-81.0.1/build/mach_bootstrap.py.old firefox-81.0.1/build/mach_bo
              del sys.modules[module.__name__]
              module = self(name, globals, locals, fromlist, level)
  
+
diff --git a/sources b/sources
index 6d37f5e..295df4d 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = d597b5422af9d3a3f9310bdad94c5897cf2605f5214ef4c447ad79612d81fbbb9d86b50a1b122b0000b54ada66bf6962c92b3b5ff8fc44e4167a18a532359cc4
-SHA512 (icecat-91.13.0-langpacks.tar.gz) = 0a2351d3a259f5f542fb7b337506f5849d4afd939dfcc70c75f4605e5af90e065fc3d993e4d3ab04004a0558f9170615eb5bf5c7776275f7daf436e8f17084dd
-SHA512 (icecat-91.13.0-rh1.tar.bz2) = b1aedd0aeee4d5f0e6ecfb647bbc0ca722a5210de98de181075c9290d977a8c4a66ecd7db533f4785df3aae0a0f560491800947f7a496d27c98e49399638a1f1
+SHA512 (icecat-102.2.0-langpacks.tar.gz) = f0ab8190310645a14c6185ac43812c54f48423c6a6de1c20355ce62c4fdcbae321258cbec7719a4a10a417f40f2879a5965b0893d42064dd4b4c21a8983e4bbb
+SHA512 (icecat-102.2.0-rh1.tar.bz2) = 9d7146be250faa4f5ef3fe24e41d03080622c3268932d668c81174ea075a9d5ff3c0ef7df2bfc93557611083a4cd4ca62c880b3a4ade088b734a7d1ab41eb2a2
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 1ab65a6c2b15ab1e79e95577daf6ce3b7bef0848 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 18 Sep 2022 18:52:53 +0200
Subject: [PATCH 307/473] Fix DISPLAY environment

---
 icecat.spec            | 13 +++++++++++
 run-wayland-compositor | 50 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100755 run-wayland-compositor

diff --git a/icecat.spec b/icecat.spec
index cc6b1ed..514c346 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -39,6 +39,11 @@ ExcludeArch: %{arm}
 %endif
 %endif
 
+%global launch_wayland_compositor 0
+%if 0%{?build_with_pgo}
+%global launch_wayland_compositor 1
+%endif
+
 # Disable LTO to work around rhbz#1883904
 %define _lto_cflags %{nil}
 ####################
@@ -138,6 +143,8 @@ Source16: %{name}-x11.desktop
 Source17: cbindgen-vendor.tar.xz
 Source18: node-stdout-nonblocking-wrapper
 
+Source19: run-wayland-compositor
+
 # Build patches
 # Fixes installation of those addons which don't have ID on IceCat ("Cannot find id for addon" error).
 Patch1: %{name}-fix_addon_installation.patch
@@ -628,9 +635,15 @@ echo "mk_add_options MOZ_MAKE_FLAGS=\"$MOZ_SMP_FLAGS\"" >> .mozconfig
 echo "mk_add_options MOZ_SERVICES_SYNC=1" >> .mozconfig
 echo "export STRIP=/bin/true" >> .mozconfig
 
+%if %{launch_wayland_compositor}
+cp -p %{SOURCE19} .
+. ./run-wayland-compositor	
+%endif
+
 export MACH_USE_SYSTEM_PYTHON=1
 %if 0%{?build_with_pgo}
 %if 0%{?pgo_wayland}
+env | grep "WAYLAND"
 MOZ_ENABLE_WAYLAND=1 ./mach build -v 2>&1 | cat - && exit 1
 %else
 xvfb-run ./mach build  2>&1 | cat - || exit 1
diff --git a/run-wayland-compositor b/run-wayland-compositor
new file mode 100755
index 0000000..0480ed2
--- /dev/null
+++ b/run-wayland-compositor
@@ -0,0 +1,50 @@
+#!/usr/bin/bash
+# Run wayland compositor and set WAYLAND_DISPLAY env variable
+
+set -x
+
+echo export DESKTOP_SESSION=gnome > $HOME/.xsessionrc
+echo export XDG_CURRENT_DESKTOP=GNOME > $HOME/.xsessionrc
+echo export XDG_SESSION_TYPE=wayland >> $HOME/.xsessionrc
+
+# Turn off the screen saver and screen locking
+gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
+gsettings set org.gnome.desktop.screensaver lock-enabled false
+gsettings set org.gnome.desktop.screensaver lock-delay 3600
+
+# Disable the screen saver
+# This starts the gnome-keyring-daemon with an unlocked login keyring. libsecret uses this to
+# store secrets. Firefox uses libsecret to store a key that protects sensitive information like
+# credit card numbers.
+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+    # if not found, launch a new one
+    eval `dbus-launch --sh-syntax`
+fi
+eval `echo '' | /usr/bin/gnome-keyring-daemon -r -d --unlock --components=secrets`
+
+if [ -z "$XDG_RUNTIME_DIR" ]; then
+  export XDG_RUNTIME_DIR=$HOME
+fi
+
+. xvfb-run -s "-screen 0 1600x1200x24" -n 80 mutter --display=:80 --wayland --nested &
+export DISPLAY=:80
+
+if [ -z "$WAYLAND_DISPLAY" ] ; then
+  export WAYLAND_DISPLAY=wayland-0
+else
+  export WAYLAND_DISPLAY=wayland-1
+fi
+sleep 10
+retry_count=0
+max_retries=5
+until [ $retry_count -gt $max_retries ]; do
+  if [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; then
+    retry_count=$(($max_retries + 1))
+  else
+    retry_count=$(($retry_count + 1))
+    echo "Waiting for Mutter, retry: $retry_count"
+    sleep 2
+  fi
+done
+
+env | grep "DISPLAY"

From b225abb01b3790540878da23c88a7e786d3b9d75 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 18 Sep 2022 21:36:55 +0200
Subject: [PATCH 308/473] Add dbus-x11 build dependency

---
 icecat.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 514c346..8c62de7 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -199,6 +199,7 @@ BuildRequires: cbindgen
 BuildRequires: ccache
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
+BuildRequires: dbus-x11
 BuildRequires: dconf
 BuildRequires: desktop-file-utils
 BuildRequires: dos2unix
@@ -635,7 +636,7 @@ echo "mk_add_options MOZ_MAKE_FLAGS=\"$MOZ_SMP_FLAGS\"" >> .mozconfig
 echo "mk_add_options MOZ_SERVICES_SYNC=1" >> .mozconfig
 echo "export STRIP=/bin/true" >> .mozconfig
 
-%if %{launch_wayland_compositor}
+%if 0%{?launch_wayland_compositor}
 cp -p %{SOURCE19} .
 . ./run-wayland-compositor	
 %endif

From f60c04b4ff1efbc005e33541a6777367d944dee6 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Mon, 19 Sep 2022 12:25:29 +0200
Subject: [PATCH 309/473] Disable PGO builds

---
 icecat.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 8c62de7..57a8049 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -32,8 +32,8 @@ ExcludeArch: %{arm}
 # on other arches.
 %ifarch x86_64
 %if 0%{?release_build}
-%global build_with_pgo 1
-%global pgo_wayland    1
+%global build_with_pgo 0
+%global pgo_wayland    0
 %else
 %global build_with_pgo 0
 %endif

From 8ac937ba3ca3698b267967267b65e7298f5284cc Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 20 Sep 2022 23:38:03 +0200
Subject: [PATCH 310/473] Release 102.3.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 9 ++++++---
 sources                 | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7421b33..2ebfa36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -202,3 +202,5 @@
 /icecat-91.13.0-rh1.tar.bz2
 /icecat-102.2.0-langpacks.tar.gz
 /icecat-102.2.0-rh1.tar.bz2
+/icecat-102.3.0-langpacks.tar.gz
+/icecat-102.3.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 9fd6aaa..a330510 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=102.2.0
+VERSION=102.3.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 57a8049..e44678f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -32,8 +32,8 @@ ExcludeArch: %{arm}
 # on other arches.
 %ifarch x86_64
 %if 0%{?release_build}
-%global build_with_pgo 0
-%global pgo_wayland    0
+%global build_with_pgo 1
+%global pgo_wayland    1
 %else
 %global build_with_pgo 0
 %endif
@@ -101,7 +101,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Epoch:   1
-Version: 102.2.0
+Version: 102.3.0
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -827,6 +827,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Sep 20 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.3.0-1.rh1
+- Release 102.3.0
+
 * Sat Sep 17 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.2.0-1.rh1
 - Release 102.2.0
 - Epoch 1
diff --git a/sources b/sources
index 295df4d..cec67c9 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = d597b5422af9d3a3f9310bdad94c5897cf2605f5214ef4c447ad79612d81fbbb9d86b50a1b122b0000b54ada66bf6962c92b3b5ff8fc44e4167a18a532359cc4
-SHA512 (icecat-102.2.0-langpacks.tar.gz) = f0ab8190310645a14c6185ac43812c54f48423c6a6de1c20355ce62c4fdcbae321258cbec7719a4a10a417f40f2879a5965b0893d42064dd4b4c21a8983e4bbb
-SHA512 (icecat-102.2.0-rh1.tar.bz2) = 9d7146be250faa4f5ef3fe24e41d03080622c3268932d668c81174ea075a9d5ff3c0ef7df2bfc93557611083a4cd4ca62c880b3a4ade088b734a7d1ab41eb2a2
+SHA512 (icecat-102.3.0-langpacks.tar.gz) = a9e279b40fb01e7b550d4954fadb2ea4ce283d8c1c020de2a68defef73e48a34ae184091c7b1283bae30956172aa545470d3e2d1a9d4ac24c64deb1f79899ef5
+SHA512 (icecat-102.3.0-rh1.tar.bz2) = 33f10e7aeb3fa635ad2a5a7d989c56cdbc78378382b23a77d278f943f21a922e68582b8b448c8b005892111c4cafe720e0c3eb49373149b9204ff813be9cd70f
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 096d8832a6dd7355680e0a61dadf4356e60b57b6 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 22 Sep 2022 17:26:09 +0200
Subject: [PATCH 311/473] Disable PGO builds

---
 icecat.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index e44678f..d3000ea 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -32,8 +32,8 @@ ExcludeArch: %{arm}
 # on other arches.
 %ifarch x86_64
 %if 0%{?release_build}
-%global build_with_pgo 1
-%global pgo_wayland    1
+%global build_with_pgo 0
+%global pgo_wayland    0
 %else
 %global build_with_pgo 0
 %endif

From 2174554c7f8772db0cee64b08915812806017956 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 20 Oct 2022 19:59:31 +0200
Subject: [PATCH 312/473] Release 102.4.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 5 ++++-
 sources                 | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2ebfa36..009b724 100644
--- a/.gitignore
+++ b/.gitignore
@@ -204,3 +204,5 @@
 /icecat-102.2.0-rh1.tar.bz2
 /icecat-102.3.0-langpacks.tar.gz
 /icecat-102.3.0-rh1.tar.bz2
+/icecat-102.4.0-langpacks.tar.gz
+/icecat-102.4.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index a330510..fb30e03 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=102.3.0
+VERSION=102.4.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index d3000ea..40481cc 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -101,7 +101,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Epoch:   1
-Version: 102.3.0
+Version: 102.4.0
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -827,6 +827,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Thu Oct 20 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.4.0-1.rh1
+- Release 102.4.0
+
 * Tue Sep 20 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.3.0-1.rh1
 - Release 102.3.0
 
diff --git a/sources b/sources
index cec67c9..d47feea 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = d597b5422af9d3a3f9310bdad94c5897cf2605f5214ef4c447ad79612d81fbbb9d86b50a1b122b0000b54ada66bf6962c92b3b5ff8fc44e4167a18a532359cc4
-SHA512 (icecat-102.3.0-langpacks.tar.gz) = a9e279b40fb01e7b550d4954fadb2ea4ce283d8c1c020de2a68defef73e48a34ae184091c7b1283bae30956172aa545470d3e2d1a9d4ac24c64deb1f79899ef5
-SHA512 (icecat-102.3.0-rh1.tar.bz2) = 33f10e7aeb3fa635ad2a5a7d989c56cdbc78378382b23a77d278f943f21a922e68582b8b448c8b005892111c4cafe720e0c3eb49373149b9204ff813be9cd70f
+SHA512 (icecat-102.4.0-langpacks.tar.gz) = 4e356c59891a507abb24ff0810bcedb066aa52ddf05dae8ca5f84150b56353a1621bf040c7ff5aca59acea26a53740183b730f2baac431d9d78993f3c56b00b2
+SHA512 (icecat-102.4.0-rh1.tar.bz2) = d182ebc2f009006f6551ed397a01827204492490b0c384513fc505f52e7f3140105b22787810e289198e804cc8da135941f7d53c494680fcfd847a789d3bd6b5
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 1d4906474bd46871e380dafa96c124582d962943 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 16 Nov 2022 14:53:25 +0100
Subject: [PATCH 313/473] Release 102.5.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 5 ++++-
 sources                 | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 009b724..2481bb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -206,3 +206,5 @@
 /icecat-102.3.0-rh1.tar.bz2
 /icecat-102.4.0-langpacks.tar.gz
 /icecat-102.4.0-rh1.tar.bz2
+/icecat-102.5.0-langpacks.tar.gz
+/icecat-102.5.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index fb30e03..dc71ceb 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=102.4.0
+VERSION=102.5.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 40481cc..bacbd83 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -101,7 +101,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Epoch:   1
-Version: 102.4.0
+Version: 102.5.0
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -827,6 +827,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Wed Nov 16 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.5.0-1.rh1
+- Release 102.5.0
+
 * Thu Oct 20 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.4.0-1.rh1
 - Release 102.4.0
 
diff --git a/sources b/sources
index d47feea..c0a0f31 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = d597b5422af9d3a3f9310bdad94c5897cf2605f5214ef4c447ad79612d81fbbb9d86b50a1b122b0000b54ada66bf6962c92b3b5ff8fc44e4167a18a532359cc4
-SHA512 (icecat-102.4.0-langpacks.tar.gz) = 4e356c59891a507abb24ff0810bcedb066aa52ddf05dae8ca5f84150b56353a1621bf040c7ff5aca59acea26a53740183b730f2baac431d9d78993f3c56b00b2
-SHA512 (icecat-102.4.0-rh1.tar.bz2) = d182ebc2f009006f6551ed397a01827204492490b0c384513fc505f52e7f3140105b22787810e289198e804cc8da135941f7d53c494680fcfd847a789d3bd6b5
+SHA512 (icecat-102.5.0-langpacks.tar.gz) = d5b08bbddc955aba4258c1f64c83bc196b1f2e84b83ca354fbbe087bfc05f446434c695205c359d1c89c25e09ccbe7ff9c86721ac6ed5d8ff3e4d6499e2b4e25
+SHA512 (icecat-102.5.0-rh1.tar.bz2) = c4679b2895f479da55a786a99f27bbffe2c137fbf39b9a4eb89d54a4f9f3ee3384fe46a7985621a33842ab2f60a26802c1e958514ff3af9f4f16a11d9586c6bb
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From c2ca8cd4524548f3981d4ab4ed1df08c3e41b812 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 18 Nov 2022 15:26:52 +0100
Subject: [PATCH 314/473] Update README.md file

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 4b63398..91c75f8 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,6 @@ Extensions included to this version of IceCat:
    HTTPS Everywhere is an extension that encrypts your communications with
    many major websites, making your browsing more secure.
 
- * ViewTube
-
-   Watch videos from video sharing websites with extra options.
-
  * A set of companion extensions for LibreJS by Nathan Nichols
    are pre-installed, and provide workarounds to use some services at USPS,
    RSF.org, SumOfUs.org, pay.gov, McDonalds, goteo.org and Google Docs

From c3f922b4145bff4aebe60f6fb059633209ccf04a Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 18 Nov 2022 15:28:27 +0100
Subject: [PATCH 315/473] Update Description of SPEC file

---
 icecat.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index bacbd83..96e643e 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -311,9 +311,6 @@ Extensions included to this version of IceCat:
    HTTPS Everywhere is an extension that encrypts your communications with
    many major websites, making your browsing more secure.
 
- * ViewTube
-   Watch videos from video sharing websites with extra options.
-
  * A set of companion extensions for LibreJS by Nathan Nichols
    are pre-installed, and provide workarounds to use some services at USPS,
    RSF.org, SumOfUs.org, pay.gov, McDonalds, goteo.org and Google Docs

From 091918819c6c37aae39a7b26123b32b1a720a8a2 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 22 Nov 2022 17:22:36 +0100
Subject: [PATCH 316/473] Update appdata file

---
 icecat.appdata.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/icecat.appdata.xml b/icecat.appdata.xml
index 8739a61..ad0171c 100644
--- a/icecat.appdata.xml
+++ b/icecat.appdata.xml
@@ -33,10 +33,6 @@
           HTTPS Everywhere is an extension that encrypts your communications with many major websites, making your browsing more secure
        </li>
        <li>
-       ViewTube
-          Watch videos from video sharing websites with extra options
-       </li>
-       <li>
        A set of companion extensions for LibreJS by Nathan Nichols (https://addons.mozilla.org/en-US/firefox/user/NateN1222/)
        are pre-installed, and provide workarounds to use some services at USPS, RSF.org, SumOfUs.org, pay.gov, McDonald's, goteo.org
        and Google Docs without using nonfree JavaScript.
@@ -51,13 +47,16 @@
   <url type="homepage">http://www.gnu.org/software/gnuzilla/</url>
   <screenshots>
     <screenshot type="default">
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat91.png</image>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat1021.png</image>
     </screenshot>
     <screenshot>
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat91_2.png</image>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat1022.png</image>
     </screenshot>
     <screenshot>
-     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat91_3.png</image>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat1023.png</image>
+    </screenshot>
+    <screenshot>
+     <image>https://sagitter.fedorapeople.org/icecat/icecat-screenshots/icecat1024.png</image>
     </screenshot>
   </screenshots>
   <updatecontact>sagitter_at_fedoraproject.org</updatecontact>

From 7f6efcfe1da28d89fb790514480ca7d1230cad8f Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 15 Dec 2022 20:53:09 +0100
Subject: [PATCH 317/473] git reset --hard HEAD

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 3 ++-
 icecat.spec             | 8 +++++++-
 sources                 | 4 ++--
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2481bb2..a4590e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -208,3 +208,5 @@
 /icecat-102.4.0-rh1.tar.bz2
 /icecat-102.5.0-langpacks.tar.gz
 /icecat-102.5.0-rh1.tar.bz2
+/icecat-102.6.0-langpacks.tar.gz
+/icecat-102.6.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index dc71ceb..a8d45da 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=102.5.0
+VERSION=102.6.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
@@ -17,6 +17,7 @@ done
 #  mv "${FILE}" "${newfile}" ;
 #done
 #popd
+rm -f icecat-*-langpacks.tar.gz
 tar -zcvf icecat-${VERSION}-langpacks.tar.gz langpacks
 rm -rf langpacks
 exit 0
diff --git a/icecat.spec b/icecat.spec
index 96e643e..11dafac 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -101,7 +101,7 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Epoch:   1
-Version: 102.5.0
+Version: 102.6.0
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -311,6 +311,9 @@ Extensions included to this version of IceCat:
    HTTPS Everywhere is an extension that encrypts your communications with
    many major websites, making your browsing more secure.
 
+ * ViewTube
+   Watch videos from video sharing websites with extra options.
+
  * A set of companion extensions for LibreJS by Nathan Nichols
    are pre-installed, and provide workarounds to use some services at USPS,
    RSF.org, SumOfUs.org, pay.gov, McDonalds, goteo.org and Google Docs
@@ -824,6 +827,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Thu Dec 15 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.6.0-1.rh1
+- Release 102.6.0
+
 * Wed Nov 16 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.5.0-1.rh1
 - Release 102.5.0
 
diff --git a/sources b/sources
index c0a0f31..467c027 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = d597b5422af9d3a3f9310bdad94c5897cf2605f5214ef4c447ad79612d81fbbb9d86b50a1b122b0000b54ada66bf6962c92b3b5ff8fc44e4167a18a532359cc4
-SHA512 (icecat-102.5.0-langpacks.tar.gz) = d5b08bbddc955aba4258c1f64c83bc196b1f2e84b83ca354fbbe087bfc05f446434c695205c359d1c89c25e09ccbe7ff9c86721ac6ed5d8ff3e4d6499e2b4e25
-SHA512 (icecat-102.5.0-rh1.tar.bz2) = c4679b2895f479da55a786a99f27bbffe2c137fbf39b9a4eb89d54a4f9f3ee3384fe46a7985621a33842ab2f60a26802c1e958514ff3af9f4f16a11d9586c6bb
+SHA512 (icecat-102.6.0-langpacks.tar.gz) = 65668a99db2dac9f718e9bd2e2d5e215784670aa9e5363e5224fa33a73a137d94e9cf0bfbe8589013c8cff32ab41606095b96d93582c7fa6d150135c79832997
+SHA512 (icecat-102.6.0-rh1.tar.bz2) = 3804f85183aba03d1c1eed6eb17bfbb2a73a03fd7b98ffc113682dd5094fc4ab50ee4c1c6430af8699bf5b260915181d39875032aa4ba95a288ae437bd7069ed
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From b60c75f975b95a650c677b10f8797355e4c6bbb3 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 15 Dec 2022 20:55:53 +0100
Subject: [PATCH 318/473] Release 102.6.0

---
 icecat.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 11dafac..4ede5a4 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -311,9 +311,6 @@ Extensions included to this version of IceCat:
    HTTPS Everywhere is an extension that encrypts your communications with
    many major websites, making your browsing more secure.
 
- * ViewTube
-   Watch videos from video sharing websites with extra options.
-
  * A set of companion extensions for LibreJS by Nathan Nichols
    are pre-installed, and provide workarounds to use some services at USPS,
    RSF.org, SumOfUs.org, pay.gov, McDonalds, goteo.org and Google Docs

From 855ee44513a00dc7a83360d4ab3c7f638c9871c1 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 15 Dec 2022 21:24:19 +0100
Subject: [PATCH 319/473] Release 102.6.0| Update patch6

---
 icecat.spec           | 2 ++
 mozilla-1773336.patch | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 4ede5a4..b19c84c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -152,6 +152,8 @@ Patch2: %{name}-libevent_linkflag.patch
 Patch3: mozilla-build-arm.patch
 Patch4: %{name}-build-arm-libaom.patch
 Patch5: rhbz-1219542-s390-build.patch
+
+# If cbindgen=0.24
 Patch6: mozilla-1773336.patch
 
 Patch40: build-aarch64-skia.patch
diff --git a/mozilla-1773336.patch b/mozilla-1773336.patch
index b65ff89..0f299f7 100644
--- a/mozilla-1773336.patch
+++ b/mozilla-1773336.patch
@@ -1,11 +1,13 @@
 diff -up firefox-101.0.1/gfx/webrender_bindings/webrender_ffi.h.old firefox-101.0.1/gfx/webrender_bindings/webrender_ffi.h
---- firefox-101.0.1/gfx/webrender_bindings/webrender_ffi.h.old	2022-06-09 10:31:16.122495733 +0200
-+++ firefox-101.0.1/gfx/webrender_bindings/webrender_ffi.h	2022-06-09 10:31:22.880724352 +0200
-@@ -72,8 +72,6 @@ struct WrPipelineInfo;
+--- a/gfx/webrender_bindings/webrender_ffi.h.old	2022-06-09 10:31:16.122495733 +0200
++++ b/gfx/webrender_bindings/webrender_ffi.h	2022-06-09 10:31:22.880724352 +0200
+@@ -73,10 +73,6 @@
  struct WrPipelineIdAndEpoch;
  using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
  
+-#ifndef CBINDGEN_0_24
 -const uint64_t ROOT_CLIP_CHAIN = ~0;
+-#endif
 -
  }  // namespace wr
  }  // namespace mozilla

From 8faef9ea239f324c1847b5493af2b225371e34fe Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Mon, 19 Dec 2022 18:51:39 +0100
Subject: [PATCH 320/473] Remove openjpeg dependency

---
 icecat.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index b19c84c..6e2abb4 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -102,7 +102,7 @@ ExcludeArch: %{arm}
 Name: icecat
 Epoch:   1
 Version: 102.6.0
-Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -248,7 +248,6 @@ BuildRequires: pkgconfig(nss) >= %{nss_version}
 BuildRequires: nss-static >= %{nss_version}
 %endif
 
-BuildRequires: openjpeg-devel
 BuildRequires: pango-devel
 BuildRequires: pipewire-devel
 BuildRequires: python3-devel
@@ -826,6 +825,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Mon Dec 19 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.6.0-2.rh1
+- Remove openjpeg dependency
+
 * Thu Dec 15 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.6.0-1.rh1
 - Release 102.6.0
 

From 70ff6b81f4ffe113bf6b259317170f4ccfe16b9d Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 18 Jan 2023 21:55:44 +0100
Subject: [PATCH 321/473] Release 102.7.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 7 +++++--
 sources                 | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index a4590e1..2219053 100644
--- a/.gitignore
+++ b/.gitignore
@@ -210,3 +210,5 @@
 /icecat-102.5.0-rh1.tar.bz2
 /icecat-102.6.0-langpacks.tar.gz
 /icecat-102.6.0-rh1.tar.bz2
+/icecat-102.7.0-langpacks.tar.gz
+/icecat-102.7.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index a8d45da..276a5ab 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=102.6.0
+VERSION=102.7.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 6e2abb4..ee1932a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -101,8 +101,8 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Epoch:   1
-Version: 102.6.0
-Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 102.7.0
+Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -825,6 +825,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Jan 17 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.7.0-1.rh1
+- Release 102.7.0
+
 * Mon Dec 19 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.6.0-2.rh1
 - Remove openjpeg dependency
 
diff --git a/sources b/sources
index 467c027..086b0f0 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = d597b5422af9d3a3f9310bdad94c5897cf2605f5214ef4c447ad79612d81fbbb9d86b50a1b122b0000b54ada66bf6962c92b3b5ff8fc44e4167a18a532359cc4
-SHA512 (icecat-102.6.0-langpacks.tar.gz) = 65668a99db2dac9f718e9bd2e2d5e215784670aa9e5363e5224fa33a73a137d94e9cf0bfbe8589013c8cff32ab41606095b96d93582c7fa6d150135c79832997
-SHA512 (icecat-102.6.0-rh1.tar.bz2) = 3804f85183aba03d1c1eed6eb17bfbb2a73a03fd7b98ffc113682dd5094fc4ab50ee4c1c6430af8699bf5b260915181d39875032aa4ba95a288ae437bd7069ed
+SHA512 (icecat-102.7.0-langpacks.tar.gz) = 2eef6a136cacc3a5030b441205309852110a4b8622a71e275c6e3f6eb9c711e98f5f29a731ffc366550950427bc05385d4ce6035800a35df84936fb61898323e
+SHA512 (icecat-102.7.0-rh1.tar.bz2) = 76c0703894d5b6a37b808a01677eb5f9c3a71fdfbe6df24be3610e868172eedf7ac82378b6fa23c88b7e4e2758e9516c27dd1aa1b1cf9b9c0dae6936af7945b1
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 305101e0e24ffc257299fe9692b41b1637c8aaf4 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 20 Jan 2023 22:30:11 +0100
Subject: [PATCH 322/473] Set RUSTFLAGS -Cdebuginfo=0 in s390x

---
 icecat.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index ee1932a..10237d9 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -102,7 +102,7 @@ ExcludeArch: %{arm}
 Name: icecat
 Epoch:   1
 Version: 102.7.0
-Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -578,7 +578,7 @@ MOZ_LINK_FLAGS="-Wl,--no-keep-memory"
 echo "ac_add_options --enable-linker=gold" >> .mozconfig
 %endif
 %endif
-%ifarch %{arm} %{ix86} %{power64}
+%ifarch %{arm} %{ix86} %{power64} s390x
 export RUSTFLAGS="-Cdebuginfo=0"
 export MOZ_RUST_DEFAULT_FLAGS="-Cdebuginfo=0 -Copt-level=0"
 %endif
@@ -825,6 +825,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Fri Jan 20 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.7.0-2.rh1
+- Set RUSTFLAGS -Cdebuginfo=0 in s390x
+
 * Tue Jan 17 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.7.0-1.rh1
 - Release 102.7.0
 

From 8150ce3e87daa2e03c8a21f70b0471eb02550f64 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 21 Jan 2023 17:24:14 +0100
Subject: [PATCH 323/473] Test build |Fix error with GCC-13

---
 icecat-102.7.0-fix_gcc13_build.patch | 10 ++++++++++
 icecat.spec                          | 13 +++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 icecat-102.7.0-fix_gcc13_build.patch

diff --git a/icecat-102.7.0-fix_gcc13_build.patch b/icecat-102.7.0-fix_gcc13_build.patch
new file mode 100644
index 0000000..114a57b
--- /dev/null
+++ b/icecat-102.7.0-fix_gcc13_build.patch
@@ -0,0 +1,10 @@
+--- a/gfx/2d/Rect.orig..h	2023-01-17 19:49:02.818099401 +0100
++++ b/gfx/2d/Rect.h	2023-01-21 17:11:01.695573664 +0100
+@@ -15,6 +15,7 @@
+ #include "mozilla/Maybe.h"
+ 
+ #include <cmath>
++#include <cstdint>
+ 
+ namespace mozilla {
+ 
diff --git a/icecat.spec b/icecat.spec
index 10237d9..e9d8fe2 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,13 +1,13 @@
 ### Naming ###
 # Set to true if it's going to be submitted as update
-%global release_build 1
+%global release_build 0
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
 %global redhat_ver rh1
 
-#%%global pre_tag .test
-%global pre_tag %{nil}
+%global pre_tag .test
+#global pre_tag %%{nil}
 
 # Exclude ARM for the following error:
 #  terminate called after throwing an instance of 'std::bad_alloc'
@@ -102,7 +102,7 @@ ExcludeArch: %{arm}
 Name: icecat
 Epoch:   1
 Version: 102.7.0
-Release: 2.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -167,6 +167,7 @@ Patch220: firefox-nss-version.patch
 Patch221: firefox-nss-addon-hack.patch
 Patch223: %{name}-glibc-dynstack.patch
 Patch224: %{name}-GLIBCXX-fix-for-GCC-12.patch
+Patch225: %{name}-%{version}-fix_gcc13_build.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
@@ -366,6 +367,7 @@ tar -xf %{SOURCE5}
 %patch219 -p1 -b .rhbz-1173156
 %patch221 -p1 -b .firefox-nss-addon-hack
 %patch224 -p1 -b .glibcxx
+%patch225 -p1 -b .gcc13
 
 # ARM run-time patch
 %ifarch aarch64
@@ -825,6 +827,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Sat Jan 21 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.7.0-3.rh1.test
+- Fix GCC-13 build
+
 * Fri Jan 20 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.7.0-2.rh1
 - Set RUSTFLAGS -Cdebuginfo=0 in s390x
 

From 1fc6bbb5f6dfd0fd3e905f6366db24668cb307da Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 21 Jan 2023 20:08:22 +0100
Subject: [PATCH 324/473] Test build |Fix error with GCC-13 /2

---
 icecat-102.7.0-fix_gcc13_build.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/icecat-102.7.0-fix_gcc13_build.patch b/icecat-102.7.0-fix_gcc13_build.patch
index 114a57b..cb6ea1a 100644
--- a/icecat-102.7.0-fix_gcc13_build.patch
+++ b/icecat-102.7.0-fix_gcc13_build.patch
@@ -8,3 +8,13 @@
  
  namespace mozilla {
  
+--- a/toolkit/components/telemetry/pingsender/pingsender.orig.cpp	2023-01-17 19:48:16.000000000 +0100
++++ b/toolkit/components/telemetry/pingsender/pingsender.cpp	2023-01-21 20:05:29.765527367 +0100
+@@ -10,6 +10,7 @@
+ #include <iomanip>
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ #include <zlib.h>
+ 

From faa96934e4de9b83244838eacf02e25e3ae8c22b Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 17 Feb 2023 15:53:07 +0100
Subject: [PATCH 325/473] Release 102.8.0

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 20 ++++++++++----------
 sources                 |  4 ++--
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2219053..35ddf9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -212,3 +212,5 @@
 /icecat-102.6.0-rh1.tar.bz2
 /icecat-102.7.0-langpacks.tar.gz
 /icecat-102.7.0-rh1.tar.bz2
+/icecat-102.8.0-langpacks.tar.gz
+/icecat-102.8.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 276a5ab..6a60421 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=102.7.0
+VERSION=102.8.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index e9d8fe2..622b378 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,13 +1,13 @@
 ### Naming ###
 # Set to true if it's going to be submitted as update
-%global release_build 0
+%global release_build 1
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
 %global redhat_ver rh1
 
-%global pre_tag .test
-#global pre_tag %%{nil}
+#%%global pre_tag .test
+%global pre_tag %{nil}
 
 # Exclude ARM for the following error:
 #  terminate called after throwing an instance of 'std::bad_alloc'
@@ -101,12 +101,12 @@ ExcludeArch: %{arm}
 
 Name: icecat
 Epoch:   1
-Version: 102.7.0
-Release: 3.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 102.8.0
+Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
-License: (MPLv1.1 or GPLv2+ or LGPLv2+) and GPLv3+ and MIT and BSD and ISC and ASL 2.0 and MPLv2.0
+License: (MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later) and GPL-3.0-or-later and MIT and BSD and ISC and Apache-2.0 and MPL-2.0
 URL:   http://www.gnu.org/software/gnuzilla/
 
 ## Source archive created by scripts based on Gnuzilla files.
@@ -167,7 +167,7 @@ Patch220: firefox-nss-version.patch
 Patch221: firefox-nss-addon-hack.patch
 Patch223: %{name}-glibc-dynstack.patch
 Patch224: %{name}-GLIBCXX-fix-for-GCC-12.patch
-Patch225: %{name}-%{version}-fix_gcc13_build.patch
+Patch225: %{name}-102.7.0-fix_gcc13_build.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
@@ -379,10 +379,7 @@ tar -xf %{SOURCE5}
 %patch44  -p1 -b .build-arm-libopus
 %endif
 
-#patch401 -p1 -b .1742849
 %patch402 -p1 -b .1196777
-%patch403 -p1 -b .python311
-%patch404 -p1 -b .python311
 %ifarch %{power64}
 %patch423 -p1 -b .1512162
 %endif
@@ -827,6 +824,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Fri Feb 17 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.8.0-1.rh1
+- Release 102.8.0
+
 * Sat Jan 21 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.7.0-3.rh1.test
 - Fix GCC-13 build
 
diff --git a/sources b/sources
index 086b0f0..f08dbed 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = d597b5422af9d3a3f9310bdad94c5897cf2605f5214ef4c447ad79612d81fbbb9d86b50a1b122b0000b54ada66bf6962c92b3b5ff8fc44e4167a18a532359cc4
-SHA512 (icecat-102.7.0-langpacks.tar.gz) = 2eef6a136cacc3a5030b441205309852110a4b8622a71e275c6e3f6eb9c711e98f5f29a731ffc366550950427bc05385d4ce6035800a35df84936fb61898323e
-SHA512 (icecat-102.7.0-rh1.tar.bz2) = 76c0703894d5b6a37b808a01677eb5f9c3a71fdfbe6df24be3610e868172eedf7ac82378b6fa23c88b7e4e2758e9516c27dd1aa1b1cf9b9c0dae6936af7945b1
+SHA512 (icecat-102.8.0-langpacks.tar.gz) = f91077b7bf0c0b6248048045626db45f6bbc6e7bdead4af0e6f0d83c347dd7aed017e3fdd2fd421cf622d76356fc4e57dcb3894ec154dd81728afb9e366bc9e0
+SHA512 (icecat-102.8.0-rh1.tar.bz2) = e047910fcb4b499526c47b613a17b7e2219aa87d6d4a2b577b8ba1b72eddf0db5dc4b61f8c8a8a1b1b56aa57eee0128296901edef629f687cc5d860cf387f21f
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 627198ba3d1382fc5932b6748acf7bf9b9123103 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 17 Feb 2023 21:30:28 +0100
Subject: [PATCH 326/473] Release 102.8.0 |Exclude s390x in Fedora 37+

---
 icecat.spec | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 622b378..76e620a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -15,6 +15,12 @@
 #   error: could not compile `gkrust`
 ExcludeArch: %{arm}
 
+# Build is failing because of
+# include/mozilla/FloatingPoint.h:212:31: error: inlining failed in call to ‘always_inline’ ‘bool mozilla::IsNegativeZero(T) [with T = double]’: indirect function call with a yet undetermined callee
+%if 0%{?fedora} > 37
+ExcludeArch: s390x
+%endif
+
 ####################
 
 ### Optimization ###
@@ -826,6 +832,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %changelog
 * Fri Feb 17 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.8.0-1.rh1
 - Release 102.8.0
+- Exclude s390x in Fedora 37+
 
 * Sat Jan 21 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.7.0-3.rh1.test
 - Fix GCC-13 build

From b764389c15a3aad08c0ba69c205ea1c7ae77ed8c Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 14 Mar 2023 20:45:06 +0100
Subject: [PATCH 327/473] Release 102.9.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 8 ++++++--
 sources                 | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 35ddf9f..6661cf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -214,3 +214,5 @@
 /icecat-102.7.0-rh1.tar.bz2
 /icecat-102.8.0-langpacks.tar.gz
 /icecat-102.8.0-rh1.tar.bz2
+/icecat-102.9.0-langpacks.tar.gz
+/icecat-102.9.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 6a60421..027c4ec 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=102.8.0
+VERSION=102.9.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 76e620a..fc0c045 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -18,7 +18,7 @@ ExcludeArch: %{arm}
 # Build is failing because of
 # include/mozilla/FloatingPoint.h:212:31: error: inlining failed in call to ‘always_inline’ ‘bool mozilla::IsNegativeZero(T) [with T = double]’: indirect function call with a yet undetermined callee
 %if 0%{?fedora} > 37
-ExcludeArch: s390x
+#ExcludeArch: s390x
 %endif
 
 ####################
@@ -107,7 +107,7 @@ ExcludeArch: s390x
 
 Name: icecat
 Epoch:   1
-Version: 102.8.0
+Version: 102.9.0
 Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
@@ -830,6 +830,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
+* Tue Mar 14 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.9.0-1.rh1
+- Release 102.9.0
+- s390x builds re-enabled
+
 * Fri Feb 17 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.8.0-1.rh1
 - Release 102.8.0
 - Exclude s390x in Fedora 37+
diff --git a/sources b/sources
index f08dbed..28c6b2f 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = d597b5422af9d3a3f9310bdad94c5897cf2605f5214ef4c447ad79612d81fbbb9d86b50a1b122b0000b54ada66bf6962c92b3b5ff8fc44e4167a18a532359cc4
-SHA512 (icecat-102.8.0-langpacks.tar.gz) = f91077b7bf0c0b6248048045626db45f6bbc6e7bdead4af0e6f0d83c347dd7aed017e3fdd2fd421cf622d76356fc4e57dcb3894ec154dd81728afb9e366bc9e0
-SHA512 (icecat-102.8.0-rh1.tar.bz2) = e047910fcb4b499526c47b613a17b7e2219aa87d6d4a2b577b8ba1b72eddf0db5dc4b61f8c8a8a1b1b56aa57eee0128296901edef629f687cc5d860cf387f21f
+SHA512 (icecat-102.9.0-langpacks.tar.gz) = fae74c7dbbe910bfd71a3399bfe20a722598c87d16e6e6e70f4216f482cb171705aed92d94547297a5250e29b630b600757fd689fdb57173af1792d01cd678eb
+SHA512 (icecat-102.9.0-rh1.tar.bz2) = ad3bf6f6b1f5386b16a084acc5c6c87036aaac306b4fe10491e77c39dc30feb27890f367f705eaf10aadf370c26abf59f006d7d02707f21505a181af42d956ed
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 75e4d9b2a7043a7d049eb553120ed48e6f56ab6a Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 15 Mar 2023 22:08:10 +0100
Subject: [PATCH 328/473] Remove old env variables

---
 icecat.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index fc0c045..57e8005 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -585,7 +585,6 @@ echo "ac_add_options --enable-linker=gold" >> .mozconfig
 %endif
 %ifarch %{arm} %{ix86} %{power64} s390x
 export RUSTFLAGS="-Cdebuginfo=0"
-export MOZ_RUST_DEFAULT_FLAGS="-Cdebuginfo=0 -Copt-level=0"
 %endif
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive"
@@ -644,7 +643,7 @@ cp -p %{SOURCE19} .
 . ./run-wayland-compositor	
 %endif
 
-export MACH_USE_SYSTEM_PYTHON=1
+#export MACH_USE_SYSTEM_PYTHON=1
 %if 0%{?build_with_pgo}
 %if 0%{?pgo_wayland}
 env | grep "WAYLAND"

From 0f7991b50b79fa33266232813427a92cc1a8cfe3 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 16 Mar 2023 18:32:23 +0100
Subject: [PATCH 329/473] Unset RUSTFLAGS env variable in some architectures

---
 icecat.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 57e8005..b072454 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -18,7 +18,7 @@ ExcludeArch: %{arm}
 # Build is failing because of
 # include/mozilla/FloatingPoint.h:212:31: error: inlining failed in call to ‘always_inline’ ‘bool mozilla::IsNegativeZero(T) [with T = double]’: indirect function call with a yet undetermined callee
 %if 0%{?fedora} > 37
-#ExcludeArch: s390x
+ExcludeArch: s390x
 %endif
 
 ####################
@@ -583,9 +583,11 @@ MOZ_LINK_FLAGS="-Wl,--no-keep-memory"
 echo "ac_add_options --enable-linker=gold" >> .mozconfig
 %endif
 %endif
-%ifarch %{arm} %{ix86} %{power64} s390x
+%ifarch %{arm} %{ix86} s390x
 export RUSTFLAGS="-Cdebuginfo=0"
-%endif
+%else
+# Otherwise since https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/243 breaks build.
+unset RUSTFLAGS
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive"
 export LDFLAGS=$MOZ_LINK_FLAGS

From 279f18e37f74091c5ec1238f2261e4da024afd9a Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 16 Mar 2023 18:35:46 +0100
Subject: [PATCH 330/473] Fix conditional macro

---
 icecat.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/icecat.spec b/icecat.spec
index b072454..5623456 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -588,6 +588,7 @@ export RUSTFLAGS="-Cdebuginfo=0"
 %else
 # Otherwise since https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/243 breaks build.
 unset RUSTFLAGS
+%endif
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive"
 export LDFLAGS=$MOZ_LINK_FLAGS

From c51f3a7673dd43fd82f5d6f0765cd29ede0b214b Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 18 Mar 2023 21:20:42 +0100
Subject: [PATCH 331/473] Downgrade optimization level in i686

---
 icecat.spec | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 5623456..31870e8 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -563,8 +563,16 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
 %endif
 
-%ifarch s390x %{arm}
-MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/' -e 's/-O2/-O1/')
+%ifarch s390x
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/')
+# If MOZ_DEBUG_FLAGS is empty, firefox's build will default it to "-g" which
+# overrides the -g1 from line above and breaks building on s390
+# (OOM when linking, rhbz#1238225)
+export MOZ_DEBUG_FLAGS=" "
+%endif
+
+%ifarch %{arm} %{ix86}
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g0/')
 # If MOZ_DEBUG_FLAGS is empty, firefox's build will default it to "-g" which
 # overrides the -g1 from line above and breaks building on s390
 # (OOM when linking, rhbz#1238225)

From b3921374af9c4ad448892ab1151f68179c5ec340 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 19 Mar 2023 10:13:59 +0100
Subject: [PATCH 332/473] Fix version of bundled HTTPS-Everywhere extension

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 31870e8..462028b 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -305,7 +305,7 @@ Requires: fedora-bookmarks
 Suggests: mozilla-ublock-origin
 
 Provides: webclient
-Provides: bundled(mozilla-https-everywhere) = 2021.7.13
+Provides: bundled(mozilla-https-everywhere) = 2022.5.11
 
 %description
 GNU IceCat is the GNU version of the Firefox ESR browser.

From f3f3265221b5e9a28d2478af6db067f48c9c71bc Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 19 Mar 2023 11:09:17 +0100
Subject: [PATCH 333/473] Switch to rpmautospec

---
 icecat.spec | 1074 +--------------------------------------------------
 1 file changed, 3 insertions(+), 1071 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 462028b..82075c3 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -108,7 +108,8 @@ ExcludeArch: s390x
 Name: icecat
 Epoch:   1
 Version: 102.9.0
-Release: 1.%{redhat_ver}%{?pre_tag}%{?dist}
+#Release: 1.%%{redhat_ver}%%{?pre_tag}%%{?dist}
+Release: %autorelease -p -e %{redhat_ver}%{?pre_tag}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -840,1073 +841,4 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}-wayland.desktop
 
 %changelog
-* Tue Mar 14 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.9.0-1.rh1
-- Release 102.9.0
-- s390x builds re-enabled
-
-* Fri Feb 17 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.8.0-1.rh1
-- Release 102.8.0
-- Exclude s390x in Fedora 37+
-
-* Sat Jan 21 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.7.0-3.rh1.test
-- Fix GCC-13 build
-
-* Fri Jan 20 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.7.0-2.rh1
-- Set RUSTFLAGS -Cdebuginfo=0 in s390x
-
-* Tue Jan 17 2023 Antonio Trande <sagitter@fedoraproject.org> - 1:102.7.0-1.rh1
-- Release 102.7.0
-
-* Mon Dec 19 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.6.0-2.rh1
-- Remove openjpeg dependency
-
-* Thu Dec 15 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.6.0-1.rh1
-- Release 102.6.0
-
-* Wed Nov 16 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.5.0-1.rh1
-- Release 102.5.0
-
-* Thu Oct 20 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.4.0-1.rh1
-- Release 102.4.0
-
-* Tue Sep 20 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.3.0-1.rh1
-- Release 102.3.0
-
-* Sat Sep 17 2022 Antonio Trande <sagitter@fedoraproject.org> - 1:102.2.0-1.rh1
-- Release 102.2.0
-- Epoch 1
-
-* Mon Aug 22 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.13.0-1.rh1
-- Release 91.13.0
-
-* Wed Jul 27 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.12.0-2.rh1
-- Patched for Python3.11
-
-* Mon Jul 25 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.12.0-1.rh1
-- Release 91.12.0
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 91.11.0-4.rh1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jul 09 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-3.rh1
-- Drop Java dependency (rhbz#2104050)
-
-* Fri Jul 08 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-2.rh1.test
-- Release 91.11.0
-- Less optbuild activated
-- Add patch for mozilla bug #1773336
-
-* Wed Jun 29 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.11.0-1.rh1
-- Release 91.11.0 rh1
-
-* Sun Jun 12 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.10.0-3.rh3
-- Release 91.10.0 rh3
-- Add libavcodec-free dependency
-
-* Thu Jun 02 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.10.0-2.rh2
-- Release 91.10.0 rh2
-
-* Wed Jun 01 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.10.0-1.rh1
-- Release 91.10.0
-
-* Sun May 22 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.9.1-1.rh1
-- Release 91.9.1
-
-* Mon May 09 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.9.0-2.rh1
-- Fix rhbz#20831110
-
-* Tue May 03 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.9.0-1.rh1
-- Release 91.9.0
-
-* Wed Apr 06 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.8.0-1.rh1
-- Release 91.8.0
-
-* Thu Mar 17 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.7.1-1.rh1
-- Release 91.7.1
-
-* Tue Mar 08 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.7.0-1.rh1
-- Release 91.7.0
-
-* Sun Mar 06 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.6.1-1.rh1
-- Release 91.6.1
-
-* Fri Feb 18 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.6.0-2.rh1
-- Patched for GCC-12
-
-* Tue Feb 15 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.6.0-1.rh1
-- Release 91.6.0
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 91.5.0-4.rh1
-- Rebuilt for java-17-openjdk as system jdk
-
-* Tue Jan 25 2022 Parag Nemade <pnemade AT redhat DOT com> - 91.5.0-3.rh1
-- Update hunspell directory path
-  F36 Change https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 91.5.0-2.rh1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Jan 11 2022 Antonio Trande <sagitter@fedoraproject.org> - 91.5.0-1.rh1
-- Release 91.5.0
-
-* Wed Dec 22 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.4.1-2.rh1
-- Patched for Mozilla bug #1745560
-
-* Wed Dec 22 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.4.1-1.rh1
-- Release 91.4.1
-
-* Mon Dec 06 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.4.0-1.rh1
-- Release 91.4.0
-
-* Thu Nov 04 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.3.0-1.rh1
-- Release 91.3.0
-- Update cbindgen to 0.20.0
-- Exclude ARM builds
-
-* Tue Oct 12 2021 Antonio Trande <sagitter@fedoraproject.org> - 91.2.0-1.rh1
-- Release 91.2.0
-
-* Tue Oct 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.15.0-1.rh1
-- Release 78.15.0
-
-* Tue Sep 07 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.14.0-1.rh1
-- Release 78.14.0
-
-* Wed Aug 11 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-2.rh3
-- Enable build on PPC64le
-
-* Tue Aug 10 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-1.rh3
-- Release 78.13.0
-
-* Sun Aug 08 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.5.rh2
-- Patched for Mozilla bug 1715254 (rhbz#1990612)
-
-* Sat Aug 07 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.4.rh2
-- Update cbindgen to 0.19.0
-
-* Thu Aug 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.3.rh2
-- Release Candidate 78.13.0-rc2
-- Disable PGO build (incomplete porting to Python 3.10) 
-
-* Tue Aug 03 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.2.rh1
-- Enable PGO build
-
-* Mon Aug 02 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.13.0-0.1.rh1
-- Release Candidate 78.13.0-rc1
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 78.12.0-4.rh2.test
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild 
-
-* Tue Jul 20 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.12.0-3.rh2.test
-- Disable debug build mode
-- Patched for Mozilla bug #1721326
-
-* Thu Jul 15 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.12.0-2.rh2.test
-- Enable debug build mode
-
-* Wed Jul 14 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.12.0-1.rh2
-- Release 78.12.0
-- HTTPS Everywhere 2021.7.13
-
-* Tue Jun 01 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.11.0-1.rh1
-- Release 78.11.0
-
-* Fri May 07 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.10.1-2.rh1
-- Hide DRM Content option in Preference
-
-* Wed May 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.10.1-1.rh1
-- Release 78.10.1
-
-* Sat Apr 24 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.10.0-2.rh1
-- Patched for rhbz#1945720 (Mozilla bug #1680166)
-
-* Mon Apr 19 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.10.0-1.rh1
-- Release 78.10.0
-
-* Fri Apr 09 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.9.0-3.rh1
-- Patched for bug #1613672
-- Use cbindgen 0.18.0
-- Debug build on
-
-* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 78.9.0-2.rh1
-- Rebuilt for removed libstdc++ symbol (#1937698)
-
-* Tue Mar 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.9.0-1.rh1
-- Release 78.9.0
-
-* Thu Feb 25 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-3.rh1
-- Add patch #1692706
-
-* Tue Feb 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-2.rh1
-- Exclude Power64 (rhbz#1932204)
-- Fix build option for s390x
-
-* Tue Feb 23 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.8.0-1.rh1
-- Release 78.8.0
-
-* Fri Feb 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.1-1.rh1
-- Release 78.7.1
-
-* Fri Feb 05 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.0-3.rh2
-- Fix parameter passing on ppc64le (mozb#1690152)
-- Remove gtk2 support as flash plugin is no longer supported
-
-* Wed Jan 27 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.0-2.rh2
-- Build Release 78.7.0-rh2
-- HTTPS Everywhere 2021.1.27
-
-* Tue Jan 26 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.7.0-1.rh1
-- Release 78.7.0
-
-* Mon Jan 11 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.6.1-3.rh1
-- Added a workaround for rhbz#1908018
-
-* Wed Jan 06 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.6.1-2.rh1
-- Fix desktop files
-
-* Wed Jan 06 2021 Antonio Trande <sagitter@fedoraproject.org> - 78.6.1-1.rh1
-- Release 78.6.1
-
-* Sat Dec 26 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-6.rh1
-- Use wayland/x11 launchers
-- Test ARM build with gcc-11.0.0-0.11
-
-* Tue Dec 22 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-5.rh1
-- Add __requires_exclude_from
-
-* Sun Dec 20 2020 Miro Hrončok <mhroncok@redhat.com> - 78.6.0-4.rh1
-- Filter out private libraries provides
-- Fixes: rhbz#1908792
-
-* Sun Dec 20 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-3.rh1
-- Add build-arm-libaom patch
-- Exclude ARM architectures
-
-* Sat Dec 19 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-2.rh1
-- Re-enable system NSS (rhbz#1908792)
-- Disable PGO builds (x86_64)
-
-* Tue Dec 15 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.6.0-1.rh1
-- Release 78.6.0
-- Disable system nss (rhbz#1908018)
-
-* Thu Nov 19 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.5.0-2.rh2
-- Build Release 78.5.0-rh2
-- HTTPS Everywhere 2020.11.17
-
-* Mon Nov 16 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.5.0-1.rh1
-- Release 78.5.0
-
-* Tue Oct 27 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.4.0-2.rh1
-- Patched for rhbz#1891234
-
-* Fri Oct 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.4.0-1.rh1
-- Release 78.4.0
-- Regenerate cbindgen-0.14.3
-- Patched for using Rust-1.47 (mzbz#1663715)
-
-* Wed Oct 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.1-2.rh1.test
-- PGO build test
-
-* Thu Oct 01 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.1-1.rh1
-- Release 78.3.1 (rh1)
-- Patched for mzbz#1640567
-
-* Wed Sep 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.0-2.rh1
-- Rebuild for libevent-2.1.12
-
-* Mon Sep 21 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.3.0-1.rh1
-- Release 78.3.0 (rh1)
-
-* Fri Sep 18 2020 Miro Hrončok <mhroncok@redhat.com> - 78.2.0-7.rh6
-- Use python3 instead of python2 for build
-
-* Wed Sep 09 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-6.rh6
-- Build Release 78.2.0-rh6
-
-* Tue Sep 08 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-5.rh5
-- Add configure options to allow loading unsigned bundled addons
-
-* Sun Sep 06 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-4.rh5
-- Build Release 78.2.0-rh5
-
-* Sun Sep 06 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-3.rh4
-- Build Release 78.2.0-rh4
-- PPC64le build disabled on Fedora 33
-
-* Thu Sep 03 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-2.rh3
-- Build Release 78.2.0-rh3
-- Reintroduce PPC64LE builds
-
-* Tue Aug 25 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-1.rh2
-- Release 78.2.0
-
-* Sun Aug 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.2.0-0.1.rc1.rh1.test
-- Release Candidate 78.2.0
-
-* Wed Jul 29 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0.1-2.rh1.test
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 02 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0.1-1.rh1.test
-- Release 78.0.1
-- Disable crash reporter
-
-* Wed Jul 01 2020 Antonio Trande <sagitter@fedoraproject.org> - 78.0-1.rh1.test
-- Release 78.0
-
-* Tue Jun 02 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.9.0-1.rh2
-- Release 68.9.0
-
-* Thu May 28 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.9.0-0.1.rc1.rh1
-- Release candidate 68.9.0 build1
-
-* Wed May 20 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-5.rh1
-- Explicit perl-interpreter BR dependency
-
-* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 68.8.0-4.rh1
-- Rebuild for ICU 67
-
-* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 68.8.0-3.rh1
-- Rebuild for ICU 67
-- Remove libgen references
-
-* Fri May 08 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 68.8.0-2.rh1
-- Don't exclude aarch64 architecture
-
-* Tue May 05 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.8.0-1.rh1
-- Release 68.8.0
-- Exclude s390x architecture
-
-* Tue Apr 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.7.0-1.rh1
-- Release 68.7.0
-
-* Sun Mar 29 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-4.rh4
-- Remove libgen addon
-
-* Sat Mar 21 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-3.rh3
-- Source code archive regenerated
-- HTTPS-everywhere updated to the 2020.3.16
-
-* Wed Mar 11 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-2.rh2
-- Remove useless build dependency
-
-* Tue Mar 10 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-1.rh2
-- Release 68.6.0
-
-* Sat Mar 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.6.0-0.1.rc1.rh1
-- Release candidate 68.6.0
-
-* Mon Feb 10 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.5.0-1.rh1
-- Release 68.5.0
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 68.4.1-2.rh1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-- Undefine strict symbol checks on s390x
-
-* Sat Jan 11 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.1-1.rh1
-- Release 68.4.1 (release build)
-
-* Wed Jan 08 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-2.rh2
-- Release 68.4.0 (release build)
-
-* Tue Jan 07 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-1.rh2.test
-- Release 68.4.0
-- Test build for ARM and s390x
-- Patched for mzbz#1526653 to disable wasm on ARM
-- Add --disable-av1 build option for ARM
-
-* Fri Jan 03 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-0.2.rc1.rh1
-- New rebuild of source archive (extensions updated)
-- Use rh prefix instead of gnu
-
-* Wed Jan 01 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.4.0-0.1.rc1.gnu1
-- Release candidate 68.4.0
-- Fix rhbz#1785956
-
-* Thu Dec 05 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.3.0-2.gnu1
-- Appdata file updated
-- Description updated
-
-* Wed Dec 04 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.3.0-1.gnu1
-- Release 68.3.0
-- Patch for cbindgen/rust-1.39
-
-* Wed Nov 27 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.3.0-0.1.rc2.gnu1
-- Release candidate 68.3.0
-
-* Fri Nov 22 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.2.0-4.gnu3.test
-- Build release 68.2.0-gnu3
-- Undo latest change
-- Patched for rust-1.39+
-
-* Sun Nov 10 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.2.0-3.gnu2
-- Do not remove cose.manifest files
-
-* Fri Nov 08 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.2.0-2.gnu2
-- Build release 68.2.0-gnu2
-- HTTPS-Everywhere 2019_11_7
-- Use always system vpx (Fedora 30+)
-- Patched for Mozilla bug #1556602
-
-* Tue Oct 22 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.2.0-1.gnu1
-- Release 68.2.0
-
-* Tue Sep 03 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.1.0-1.gnu1
-- Release 68.1.0
-- Incorporate Wayland patches from Firefox 68
-
-* Sun Sep 01 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.0.2-5.gnu3
-- Rebuild after retiring of Python2
-
-* Fri Aug 23 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.0.2-4.gnu3
-- Enable langpacks
-
-* Wed Aug 21 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.0.2-3.gnu3
-- gnu3 build release
-
-* Mon Aug 19 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.0.2-2.gnu2
-- WebRTC always disabled
-- Do not build langpacks
-- gnu2 build release
-- Disable MOZ_SERVICES_SYNC
-
-* Thu Aug 15 2019 Antonio Trande <sagitter@fedoraproject.org> - 68.0.2-1.gnu1
-- Release 68.0.2
-- Import cbindgen stuff from Firefox package
-- Do not use sqlite from system
-
-* Sun Jul 28 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.8.0-6.gnu1
-- Add patch to fix the addon installation
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 60.8.0-6.gnu1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jul 23 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.8.0-5.gnu1
-- Enable WebRTC on ppc64le
-
-* Fri Jul 12 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.8.0-4.gnu1
-- Remove redundant Python2 dependencies 
-
-* Thu Jul 11 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.8.0-3.gnu1
-- Remove filtering of private libraries
-- Enable webrtc on %%{ix86} x86_64 only
-
-* Wed Jul 10 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.8.0-2.gnu1
-- Use mozilla-1512162.patch on Fedora 30+ only (GCC-9)
-
-* Tue Jul 09 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.8.0-1.gnu1
-- Release 60.8.0
-
-* Sat Jun 22 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.7.2-1.gnu1
-- Release 60.7.2
-
-* Wed Jun 19 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.7.1-1.gnu1
-- Release 60.7.1
-- Do not list Git-tracked icecat.rpmlintrc as source
-
-* Tue May 28 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.7.0-2.gnu2
-- Build release 60.7.0-gnu2
-
-* Mon May 20 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.7.0-1.gnu1
-- Release 60.7.0
-
-* Sun May 12 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.3-2.gnu2
-- Build release 60.6.3-gnu2
-
-* Thu May 09 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.3-1.gnu1
-- Release 60.6.3 (bugfix mozb #1549249)
-
-* Mon May 06 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.2-1.gnu1
-- Release 60.6.2 (bugfix mozb #1549061)
-
-* Sat Apr 06 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.1-2.gnu2
-- Source archive rebuilt (gnu2)
-- Update extensions
-- Use bundled https-everywhere extension
-
-* Fri Mar 22 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.1-1
-- Release 60.6.1
-- Wayland backend made default starting from Fedora 31 (rhbz#1691852)
-
-* Thu Mar 21 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.0-2
-- Patched for building with newer glibc (2.29.9000-4) (mozilla #1533969)
-- Excluded on ARM (rhbz #1658940)
-- Language files re-based
-
-* Tue Mar 19 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.6.0-1
-- Release 60.6.0
-- Enable languages
-
-* Sun Mar 03 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.5.2-1
-- Release 60.5.2
-- Disable Werror-format-security flags
-- Enable linker=gold on ARM
-- Try to fix libevent LD path
-
-* Thu Feb 14 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.5.1-1
-- Release 60.5.1
-- Conditional macro for libvpx support
-
-* Tue Feb 05 2019 Björn Esser <besser82@fedoraproject.org> - 60.5.0-2
-- rebuilt (libvpx)
-
-* Tue Jan 29 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.5.0-1
-- Release 60.5.0
-
-* Sun Jan 13 2019 Antonio Trande <sagitter@fedoraproject.org> - 60.4.0-2
-- Make Wayland support default on fedora 30+
-- Enable Wayland support
-- Drop old patches
-- Backported Wayland related code from Firefox 63
-- Added fix for mozbz#1507475 - crash when display changes 
-
-* Wed Dec 12 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.4.0-1
-- Upstream release 60.4.0
-
-* Tue Nov 13 2018 Caolán McNamara <caolanm@redhat.com> - 60.3.0-4
-- rebuild for hunspell-1.7.0
-
-* Sat Nov 10 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.3.0-3
-- Rebuild with latest changes from Gnuzilla
-
-* Wed Oct 31 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.3.0-2
-- Drop UserAgent patch (rhbz#1644898)
-
-* Wed Oct 24 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.3.0-1
-- Upstream release 60.3.0
-
-* Wed Oct 03 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.2.2-2
-- Drop UserAgent patch (rhbz#1644898)
-
-* Wed Oct 03 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.2.2-1
-- Upstream release 60.2.2
-
-* Fri Sep 28 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.2.1-1
-- Upstream release 60.2.1
-
-* Fri Sep 14 2018 Antonio Trande <sagitter@fedoraproject.org> - 60.2.0-0.1
-- Pre-release 60.2.0
-- Integrate firefox patches for wayland (disabled)
-- Setting of upstream patches for 60 releases
-- Manpage updated
-- Include languages
-- Use options to reduce memory requirements at ld runtime on ix86
-
-* Sun Aug 05 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.9.0-1
-- Update to 52.9.0
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 52.8.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 52.8.1-2
-- Rebuild for ICU 62
-
-* Thu Jun 07 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.8.1-1
-- Update to 52.8.1
-- Add icecat.rpmlintrc
-
-* Wed Jun 06 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.8.0-3
-- Source tarball re-created without non-free code
-
-* Tue Jun  5 2018 Tom Callaway <spot@fedoraproject.org> - 52.8.0-2
-- remove non-free files from tarball
-
-* Sat May 12 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.8.0-1
-- Update to 52.8.0
-
-* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 52.7.3-2
-- Rebuild for ICU 61.1
-
-* Tue Mar 27 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.7.3-1
-- Update to 52.7.3
-
-* Tue Mar 20 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.7.2-1
-- Update to 52.7.2
-
-* Sat Mar 10 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.7.0-1
-- Update to 52.7.0
-
-* Tue Feb 27 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.6.0-7
-- HTTPS Everywhere updated to 2018.1.11
-- "goteo.org payments with free JS" updated to 1.1
-- "LibreJS compatible Pay.gov" updated to 1.3
-- "Reveal hidden HTML" updated to 1.6
-- Enabled WebRTC, but prevent leaking the LAN ip
-
-* Sun Feb 18 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.6.0-6
-- Add gcc gcc-c++ BR
-
-* Sun Feb 18 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.6.0-5
-- Rebuild for libevent-2.1.8
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 52.6.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sun Jan 28 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.6.0-3
-- Rebuild for libvpx again
-
-* Fri Jan 26 2018 Tom Callaway <spot@fedoraproject.org> - 52.6.0-2
-- rebuild for new libvpx
-
-* Wed Jan 24 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.6.0-1
-- Update to 52.6.0
-
-* Thu Jan 11 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 52.5.3-4
-- Remove obsolete scriptlets
-
-* Sun Jan 07 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.5.3-3
-- Set build against NSS-3.34/NSPR-4.17.0 at least
-
-* Sun Jan 07 2018 Antonio Trande <sagitter@fedoraproject.org> - 52.5.3-2
-- Patched for mozilla bug-1427870
-
-* Sun Dec 31 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.5.3-1
-- Update to 52.5.3
-- Use 'with-l10n' option
-
-* Fri Dec 29 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.5.2-1
-- Update to 52.5.2
-- WebRTC is always disabled
-- Add JACK audio backend (bz#1528742)
-
-* Thu Dec 21 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.3.0-4
-- Appdata file moved into metainfo data directory
-
-* Mon Dec 04 2017 Caolán McNamara <caolanm@redhat.com> - 52.3.0-3
-- rebuild for hunspell-1.5.2
-
-* Sat Sep 02 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.3.0-2
-- Enable language files
-
-* Wed Aug 16 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.3.0-1
-- Update to 52.3.0
-
-* Thu Aug 03 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.2.1-1
-- Update to 52.2.1
-- ICU source code patched to work on big-endian architectures
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 52.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 52.1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Sat May 06 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.1.0-2
-- Fix language files
-
-* Sat May 06 2017 Jens Lody <fedora@jenslody.de> - 52.1.0-1
-- Update to 52.1.0
-- Remove obsolete firefox-debug.patch
-- Spec-file: fix typo in description
-
-* Sun Apr 16 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.0.2-3
-- Enable languages
-
-* Fri Apr 14 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.0.2-2
-- Update to 52.0.2
-- Add patch for mozbz#1158076 - enable dark theme by pref
-
-* Sun Mar 26 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.0.1-5
-- Skia support disabled on ARM/ix86 builds (failed for memory exhausted)
-
-* Sun Mar 26 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.0.1-4
-- Downgrade optimization level on ARM builds (failed for memory exhausted)
-- Use one job with Make on ix86
-
-* Wed Mar 22 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.0.1-3
-- Added fix for mozbz#1158076
-
-* Mon Mar 20 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.0.1-2
-- Set cflags/libs options for NSS/NSPR
-- Add --disable-elf-hack
-
-* Sun Mar 19 2017 Antonio Trande <sagitter@fedoraproject.org> - 52.0.1-1
-- Update to 52.0.1
-- All patches synchronized with firefox
-
-* Mon Mar 06 2017 Jens Lody <fedora@jenslody.de> - 45.7.0-8
-- aarch64build-fix (taken from mozjs45)
-- include aarch64 again
-
-* Sun Mar 05 2017 Antonio Trande <sagitter@fedoraproject.org> - 45.7.0-7
-- Build with language files
-- Use new source archive
-- Exclude aarch64
-
-* Sun Mar 05 2017 Jens Lody <fedora@jenslody.de> - 45.7.0-6
-- do not set debug-build-flag
-
-* Sun Mar 05 2017 Jens Lody <fedora@jenslody.de> - 45.7.0-5
-- (Re-)add language-download.script and make Source-tag unconditional.
-- Fix debug build.
-
-* Sat Feb 18 2017 Antonio Trande <sagitter@fedoraproject.org> - 45.7.0-3
-- Optimization flags disabled on arm/arm64
-
-* Thu Feb 16 2017 Jens Lody <fedora@jenslody.de> - - 45.7.0-3
-- Fix gcc7 build, with backport of fix for mozb#1269171
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 45.7.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sat Feb 04 2017 Antonio Trande <sagitter@fedoraproject.org> - 45.7.0-1
-- Update to 45.7.0
-
-* Sat Jan 21 2017 Antonio Trande <sagitter@fedoraproject.org> - 45.5.1-7
-- Test for trying ICU patch
-
-* Fri Jan 20 2017 Antonio Trande <sagitter@fedoraproject.org> - 45.5.1-6
-- System ICU disabled on Fedora > 25
-
-* Fri Jan 20 2017 Antonio Trande <sagitter@fedoraproject.org> - 45.5.1-5
-- Patched to make compatible with NSS 3.28.1 (bz#1414987)
-
-* Thu Jan 05 2017 Antonio Trande <sagitter@fedoraproject.org> - 45.5.1-4
-- Conformed to new rules for scriptlets
-
-* Tue Dec 13 2016 Caolán McNamara <caolanm@redhat.com> - 45.5.1-3
-- rebuild for hunspell-1.5.4
-
-* Fri Dec 02 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.5.1-2
-- Keep workaround for bz#1332926
-
-* Fri Dec 02 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.5.1-1
-- Update to 45.5.1
-
-* Sun Nov 27 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.3.0-0.6.beta
-- Debug build
-- Debug builds patched (mozb#1013882)
-- Patched for removing unnecessary warns
-
-* Sun Sep 04 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.3.0-0.5.beta
-- Drop obsolete patch
-
-* Sat Sep 03 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.3.0-0.4.beta
-- Use MOZ_SMP_FLAGS instead of MOZ_MAKE_FLAGS
-
-* Thu Sep 01 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.3.0-0.3.beta
-- Update desktop file's translations
-- Enable jemalloc
-
-* Thu Sep 01 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.3.0-0.2.beta
-- Disable optimization on ARM
-
-* Mon Aug 29 2016 Antonio Trande <sagitter@fedoraproject.org> - 45.3.0-0.1.beta
-- Update to 45.3.0 (beta)
-- Drop old patches
-- Reset default compiler flags
-- Filtering private libraries
-
-* Fri Jul 22 2016 Tom Callaway <spot@fedoraproject.org> - 38.8.0-13
-- rebuild for libvpx 1.6.0
-
-* Wed Jun 29 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-12
-- Optimization level increased to -O1
-
-* Tue Jun 28 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-11
-- Fix appadata file's tags
-
-* Sun Jun 26 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-10
-- Rebuild with newest icecat-38.8.0-gnu2 source archive (24 June)
-
-* Sun Jun 26 2016 Jens Lody <fedora@jenslody.de> - 38.8.0-9
-- Workaround for #1332926
-
-* Sat Jun 18 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-8
-- Set MOZ_SMP_FLAGS
-
-* Sat Jun 18 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-7
-- Undo latest change
-
-* Sat Jun 18 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-6
-- Set C++14 standard flag
-
-* Fri Jun 17 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-5
-- Set C++ standard flag
-
-* Fri Jun 17 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-4
-- Disable install stripping
-- Disable builds for debugging
-
-* Fri Jun 17 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-3
-- Enable builds for debugging
-
-* Fri May 13 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-2
-- Remove additional flag
-
-* Fri May 13 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.8.0-1
-- Update to 38.8.0
-
-* Mon Apr 18 2016 Caolán McNamara <caolanm@redhat.com> - 38.7.1-4
-- rebuild for hunspell 1.4.0
-
-* Fri Apr 15 2016 David Tardon <dtardon@redhat.com> - 38.7.1-3
-- rebuild for ICU 57.1
-
-* Sat Apr 09 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.7.1-2
-- Downgrade optimization level on ARM
-
-* Fri Apr 08 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.7.1-1
-- Update to 38.7.1
-
-* Thu Feb 04 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.6.0-1
-- Update to 38.6.0
-- Patched for GCC6 builds
-- Cut off Provides bundled libraries except xulrunner
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 38.5.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 
-
-* Mon Jan 04 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.5.2-4
-- Fix description of appdata file
-
-* Mon Jan 04 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.5.2-3
-- Fix validating of desktop file
-
-* Sun Jan 03 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.5.2-2
-- .desktop .appdata and .metainfo files renamed (bz#1295234)
-
-* Fri Jan 01 2016 Antonio Trande <sagitter@fedoraproject.org> - 38.5.2-1
-- Update to 38.5.2
-
-* Fri Dec 18 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.5.0-1
-- Update to 38.5.0
-
-* Tue Dec 08 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.4.0-3
-- Force -fstack-protector-all flag (bz#1283307)
-
-* Tue Dec  1 2015 Tom Callaway <spot@fedoraproject.org> - 38.4.0-2
-- rebuild for libvpx 1.5.0
-
-* Tue Nov 17 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.4.0-1
-- Update to 38.4.0
-
-* Tue Nov 03 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-12
-- ARM neon support disabled on aarch64
-
-* Sat Oct 31 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-11
-- Rebuild for ICU 56
-
-* Wed Oct 28 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-10
-- Rebuild with RPM_LD_FLAGS
-
-* Wed Oct 28 2015 David Tardon <dtardon@redhat.com> - 38.3.0-9
-- rebuild for ICU 56.1
-
-* Tue Oct 20 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-8
-- Active hardened_build
-
-* Tue Oct 13 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-7
-- Rebuilt with updated Addons
-
-* Mon Oct 12 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-6
-- Fixed header files directory for freetype-2.6.1
-
-* Mon Oct 12 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-5
-- Languages packaged
-
-* Tue Oct 06 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-4
-- WebRTC disabled on extra arches
-
-* Tue Oct 06 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-3
-- Updated appdata and manpage files
-
-* Mon Oct 05 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-2
-- Disabled crashreporter on F22+
-
-* Sat Oct 03 2015 Antonio Trande <sagitter@fedoraproject.org> - 38.3.0-1
-- Update to 38.3.0
-- Patches updated
-- Language files not packaged
-- Build defined for Gtk3 
-
-* Thu Aug 13 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.8.0-5
-- Added backported patch for CVE-2015-4473_4482_4488_4489_4491_4492 vulnerabilities
-
-* Thu Aug 13 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.8.0-4
-- Added backported patch for CVE-2015-4495 vulnerability
-
-* Tue Jul 21 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.8.0-3
-- Fixed on secondary arches
-
-* Mon Jul 20 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.8.0-2
-- Un-bundle libvpx-1.4
-
-* Fri Jul 17 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.8.0-1
-- Update to 31.8.0
-
-* Sun Jul 12 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.7.0-8
-- Packaged IceCat 31.7 in Fedora 21
-
-* Fri Jul 03 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.7.0-7
-- Fix .metainfo.xml file
-
-* Thu Jul 02 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.7.0-6
-- Added .metainfo.xml file
-
-* Thu Jun 18 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.7.0-5
-- Added options --enable-tree-freetype --enable-stdcxx-compat
-- Added patch for Freetype-2.6 headers
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 31.7.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun Jun 14 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.7.0-3
-- Re-built locale files
-- Re-organized mozconfig options
-- Compiled with ccache
-
-* Wed Jun 10 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.7.0-2
-- Unpacked files found
-
-* Mon Jun 08 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.7.0-1
-- Update to 31.7.0
-- Make sure locale works for langpacks
-- Set default bookmarks
-- Made appdata file
-- devel package obsoleted
-
-* Mon May 04 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.6.0-6
-- Required VPX from system for < F23
-
-* Sun May 03 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.6.0-5
-- libvpx-1.3.0 bundled only in >= F23
-
-* Tue Apr 07 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.6.0-4
-- Disable optimization flags (when GCC5 compiles) on ARM
-
-* Tue Apr 07 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.6.0-3
-- Compiled against bundle libvpx-1.3.0
-
-* Mon Apr 06 2015 Tom Callaway <spot@fedoraproject.org> - 31.6.0-2
-- Rebuild for libvpx 1.4.0
-
-* Sat Apr 04 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.6.0-1
-- Update to 31.6.0
-
-* Mon Mar 16 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.5.0-2
-- New rebuild to fix profile's storage problem
-
-* Thu Mar 12 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.5.0-1
-- Update to 31.5.0
-- Patched to fix Mozilla Bug1021171
-- crashreporter disabled on > F21
-- Improved .desktop file
-
-* Wed Feb 04 2015 Petr Machata <pmachata@redhat.com> - 31.4.0-5
-- Bump for rebuild.
-
-* Mon Feb 02 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.4.0-4
-- Desktop file missing %%u (bz#1188078)
-
-* Sat Jan 31 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.4.0-3
-- Annulled the user-agent string customization
-
-* Thu Jan 29 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.4.0-2
-- Added %%license macro
-
-* Thu Jan 29 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.4.0-1
-- Update to 31.4.0
-- Added MPLv2.0 license of HTML5-video-everywhere extension
-- Description updated
-
-* Mon Jan 26 2015 David Tardon <dtardon@redhat.com> - 31.2.0-8
-- rebuild for ICU 54.1
-
-* Wed Jan 21 2015 Antonio Trande <sagitter@fedoraproject.org> - 31.2.0-7
-- Package now requires system-bookmarks (bz#1184297)
-
-* Wed Nov 26 2014 Antonio Trande <sagitter@fedoraproject.org> - 31.2.0-6
-- libjpeg-turbo unbundled (bz#1164815)
-
-* Thu Nov 06 2014 Antonio Trande <sagitter@fedoraproject.org> - 31.2.0-5
-- Added -Wno-error=declaration-after-statement
-- Built against GStreamer-1.0
-- Package compiled against bundled JPEG
-
-* Sat Oct 25 2014 Antonio Trande <sagitter@fedoraproject.org> - 31.2.0-4
-- Removed -fexceptions flags from Fedora optflags
-
-* Thu Oct 23 2014 Antonio Trande <sagitter@fedoraproject.org> - 31.2.0-3
-- Added -Wformat-security flags
-- Added special link flags for ARM
-
-* Wed Oct 22 2014 Antonio Trande <sagitter@fedoraproject.org> - 31.2.0-2
-- Fixed compiler flags
-
-* Tue Oct 21 2014 Antonio Trande <sagitter@fedoraproject.org> - 31.2.0-1
-- Update to 31.2.0
-- Added 'configure' options
-- Built against system NSS/NSPR
-
-* Thu Oct 16 2014 Antonio Trande <sagitter@fedoraproject.org> - 31.1.1-1
-- Update to 31.1.1
-- New bundled files (bz#1153135)
-- Static sub-package is not built anymore
-- Man-page updated
-- Spyblock addon included
-
-* Tue Aug 26 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-14
-- Added "Provides: webclient"
-- Installed manpage file
-
-* Tue Aug 19 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-13
-- Removed system xulrunner conditional
-- Ghosted all .xpi language files (handled by %%find_lang)
-- Added BSD, ISC, MIT, Apache2.0 licenses
-
-* Sat Aug 09 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-12
-- Removed HTTPS-everywhere RequestPolicy extensions (patch7)
-
-* Thu Jul 24 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-11
-- Remove precompiled .egg files
-- Remove bundled jar/class files
-- Delete chrpaths
-- Added 'Public Domain' license
-- Added a patch for using system Python Virtualenv (patch6)
-
-* Wed Jul 16 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-10
-- Added freetype2 system-headers list for Fedora>=21 (patch5)
-
-* Fri Apr 04 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-9
-- Defined other bundled() Provides
-
-* Sat Mar 29 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-8
-- Use system nspr
-
-* Wed Mar 26 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-7
-- Removed much more bundled files (added related BR packages)
-- Build browser and xulrunner
-- Added freetype2 reference patch
-
-* Thu Feb 27 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-6
-- Sources patched to use system ogg/opus/vorbis libraries
-- Build browser alone
-
-* Wed Feb 05 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-5
-- Fix some executable permissions
-- Added some tricks
-- Build browser and xulrunner
-- Defined a conditional macro for xulrunner
-- Built a static sub-package
-- Added COPYING separated license files
-- Added bundled() Provides
-
-* Mon Jan 27 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-4
-- Build browser alone
-- Added libffi/libpng linkage from system to .mozconfig file
-- Added a patch to exclude APNG support missing error for libpng
-- Added libpng-devel BR
-
-* Tue Jan 14 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-3
-- Removed bundled files
-- Added nspr/nss Requires
-
-* Wed Jan 08 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-2
-- Timestamp preserving for the 'install' commands
-- Added a comment interpretation to the License tag
-- Defined all command calls in normal mode 
-
-* Sun Jan 05 2014 Antonio Trande <sagitter@fedoraproject.org> - 24.0-1
-- Initial package
-
+%autochangelog

From adb980f26953411c1a571db8c5175efccf1f07fa Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 19 Mar 2023 11:14:04 +0100
Subject: [PATCH 334/473] Fix autorelease macro

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 82075c3..6cc15d0 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -109,7 +109,7 @@ Name: icecat
 Epoch:   1
 Version: 102.9.0
 #Release: 1.%%{redhat_ver}%%{?pre_tag}%%{?dist}
-Release: %autorelease -p -e %{redhat_ver}%{?pre_tag}
+Release: %autorelease -e %{redhat_ver} -s %{?pre_tag}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included

From 8f4b84c5c3ac3c6521b5204e71d3eeb1059fbf5e Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 19 Mar 2023 11:30:05 +0100
Subject: [PATCH 335/473] Remove pretag from Release

---
 icecat.spec | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 6cc15d0..fb83962 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -6,9 +6,6 @@
 # This tag indicates a new rebuild for Fedora
 %global redhat_ver rh1
 
-#%%global pre_tag .test
-%global pre_tag %{nil}
-
 # Exclude ARM for the following error:
 #  terminate called after throwing an instance of 'std::bad_alloc'
 #   what():  std::bad_alloc
@@ -108,8 +105,7 @@ ExcludeArch: s390x
 Name: icecat
 Epoch:   1
 Version: 102.9.0
-#Release: 1.%%{redhat_ver}%%{?pre_tag}%%{?dist}
-Release: %autorelease -e %{redhat_ver} -s %{?pre_tag}
+Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included

From c7ae0a2cfd6bad309ba42cdc839f3740daaef6da Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 19 Mar 2023 11:34:29 +0100
Subject: [PATCH 336/473] Specify the baserelease number

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index fb83962..e1ebe39 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -105,7 +105,7 @@ ExcludeArch: s390x
 Name: icecat
 Epoch:   1
 Version: 102.9.0
-Release: %autorelease -e %{redhat_ver}
+Release: %autorelease -b 2 -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included

From 73b3502d455ab832b6f5d2cff9ae0844fc867f6c Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 19 Mar 2023 11:37:50 +0100
Subject: [PATCH 337/473] Specify -n option to autorelease

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index e1ebe39..59e6cb1 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -105,7 +105,7 @@ ExcludeArch: s390x
 Name: icecat
 Epoch:   1
 Version: 102.9.0
-Release: %autorelease -b 2 -e %{redhat_ver}
+Release: %autorelease -n -b 2 -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included

From 3ea24739e87038861a5949d4d45306deca82e553 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 19 Mar 2023 11:45:32 +0100
Subject: [PATCH 338/473] Reset autorelease macro

---
 icecat.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 59e6cb1..fc46023 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -102,10 +102,10 @@ ExcludeArch: s390x
 %global __provides_exclude_from ^%{icecatappdir}
 %global __requires_exclude_from ^%{icecatappdir}
 
-Name: icecat
+Name:    icecat
 Epoch:   1
 Version: 102.9.0
-Release: %autorelease -n -b 2 -e %{redhat_ver}
+Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included

From 1dd01d652c5bac648857e519537dead6582c99f0 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 11 Apr 2023 22:51:22 +0200
Subject: [PATCH 339/473] Release 102.10.0 rh1

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6661cf8..b9d663e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -216,3 +216,5 @@
 /icecat-102.8.0-rh1.tar.bz2
 /icecat-102.9.0-langpacks.tar.gz
 /icecat-102.9.0-rh1.tar.bz2
+/icecat-102.10.0-langpacks.tar.gz
+/icecat-102.10.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 027c4ec..46af596 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=102.9.0
+VERSION=102.10.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index fc46023..36fbb9a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -104,7 +104,7 @@ ExcludeArch: s390x
 
 Name:    icecat
 Epoch:   1
-Version: 102.9.0
+Version: 102.10.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index 28c6b2f..a91df34 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = d597b5422af9d3a3f9310bdad94c5897cf2605f5214ef4c447ad79612d81fbbb9d86b50a1b122b0000b54ada66bf6962c92b3b5ff8fc44e4167a18a532359cc4
-SHA512 (icecat-102.9.0-langpacks.tar.gz) = fae74c7dbbe910bfd71a3399bfe20a722598c87d16e6e6e70f4216f482cb171705aed92d94547297a5250e29b630b600757fd689fdb57173af1792d01cd678eb
-SHA512 (icecat-102.9.0-rh1.tar.bz2) = ad3bf6f6b1f5386b16a084acc5c6c87036aaac306b4fe10491e77c39dc30feb27890f367f705eaf10aadf370c26abf59f006d7d02707f21505a181af42d956ed
+SHA512 (icecat-102.10.0-langpacks.tar.gz) = 6f6d4d26c2e4b54b555f4caa6edcde7733c41b187ec7332289714d7eb8e3ca3923927f8c1586e2f5ac29fabcfacf9b2b25a26d69c0cb471e115304e2e5eb60a9
+SHA512 (icecat-102.10.0-rh1.tar.bz2) = 17ddf8da02195a794ff6e6083d3c0ce970cf5f3d32eb4260a7b9792f32b85cbc01290f51a816c3944a4086b56bb311f39c5e4dd6cb9acba04e407f11a110716f
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From aeeb81624de90961ba43a430f3f83baad7c4cb7b Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 12 Apr 2023 21:22:04 +0200
Subject: [PATCH 340/473] Fix Patch commands| Add commasplit patch from Firefox
 builds

---
 icecat-commasplit.patch        | 76 ++++++++++++++++++++++++++++++++++
 icecat-libevent_linkflag.patch | 20 ---------
 icecat.spec                    | 40 +++++++++---------
 3 files changed, 96 insertions(+), 40 deletions(-)
 create mode 100644 icecat-commasplit.patch
 delete mode 100644 icecat-libevent_linkflag.patch

diff --git a/icecat-commasplit.patch b/icecat-commasplit.patch
new file mode 100644
index 0000000..a56aec4
--- /dev/null
+++ b/icecat-commasplit.patch
@@ -0,0 +1,76 @@
+--- firefox-111.0.1/build/moz.configure/rust.configure	2023-03-21 06:16:03.000000000 -0700
++++ firefox-111.0.1/build/moz.configure/rust.configure.new	2023-04-05 08:57:29.403219120 -0700
+@@ -593,7 +593,7 @@
+ 
+ # ==============================================================
+ 
+-option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags")
++option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags", comma_split=False)
+ set_config("RUSTFLAGS", depends("RUSTFLAGS")(lambda flags: flags))
+ 
+ 
+--- firefox-111.0.1/python/mozbuild/mozbuild/configure/options.py	2023-03-21 06:16:09.000000000 -0700
++++ firefox-111.0.1/python/mozbuild/mozbuild/configure/options.py.new	2023-04-05 08:57:31.270193468 -0700
+@@ -191,6 +191,10 @@
+       to instantiate an option indirectly. Set this to a positive integer to
+       force the script to look into a deeper stack frame when inferring the
+       `category`.
++    - `comma_split` specifies whether the value string should be split on
++      commas. The default is True. Setting it False is necessary for things
++      like compiler flags which should be a single string that may contain
++      commas.
+     """
+ 
+     __slots__ = (
+@@ -205,6 +209,7 @@
+         "possible_origins",
+         "category",
+         "define_depth",
++        "comma_split",
+     )
+ 
+     def __init__(
+@@ -218,6 +223,7 @@
+         category=None,
+         help=None,
+         define_depth=0,
++        comma_split=True,
+     ):
+         if not name and not env:
+             raise InvalidOptionError(
+@@ -335,9 +341,10 @@
+         self.choices = choices
+         self.help = help
+         self.category = category or _infer_option_category(define_depth)
++        self.comma_split = comma_split
+ 
+     @staticmethod
+-    def split_option(option):
++    def split_option(option, comma_split=True):
+         """Split a flag or variable into a prefix, a name and values
+ 
+         Variables come in the form NAME=values (no prefix).
+@@ -350,7 +357,13 @@
+ 
+         elements = option.split("=", 1)
+         name = elements[0]
+-        values = tuple(elements[1].split(",")) if len(elements) == 2 else ()
++        if len(elements) == 2:
++            if comma_split:
++                values = tuple(elements[1].split(","))
++            else:
++                values = (elements[1],)
++        else:
++            values = ()
+         if name.startswith("--"):
+             name = name[2:]
+             if not name.islower():
+@@ -426,7 +439,7 @@
+                 % (option, origin, ", ".join(self.possible_origins))
+             )
+ 
+-        prefix, name, values = self.split_option(option)
++        prefix, name, values = self.split_option(option, self.comma_split)
+         option = self._join_option(prefix, name)
+ 
+         assert name in (self.name, self.env)
diff --git a/icecat-libevent_linkflag.patch b/icecat-libevent_linkflag.patch
deleted file mode 100644
index 918c7e4..0000000
--- a/icecat-libevent_linkflag.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- old-configure.orig.in	2019-03-02 21:49:16.000000000 +0100
-+++ old-configure.in	2019-03-04 12:14:23.842685662 +0100
-@@ -1715,7 +1715,7 @@
-     MOZ_SYSTEM_LIBEVENT=
- elif test -z "$MOZ_SYSTEM_LIBEVENT"; then
-     CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
--    LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
-+    LDFLAGS="-L${LIBDIR} $LDFLAGS"
-     MOZ_CHECK_HEADER(event.h,
-         [if test ! -f "${LIBEVENT_DIR}/include/event.h"; then
-              AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include])
-@@ -1724,7 +1724,7 @@
-     AC_CHECK_LIB(event, event_init,
-                  [MOZ_SYSTEM_LIBEVENT=1
-                   MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
--                  MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
-+                  MOZ_LIBEVENT_LIBS="-L${LIBDIR} -levent"],
-                  [MOZ_SYSTEM_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
- fi
- CFLAGS=$_SAVE_CFLAGS
diff --git a/icecat.spec b/icecat.spec
index 36fbb9a..0d821a0 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -151,7 +151,7 @@ Source19: run-wayland-compositor
 # Build patches
 # Fixes installation of those addons which don't have ID on IceCat ("Cannot find id for addon" error).
 Patch1: %{name}-fix_addon_installation.patch
-Patch2: %{name}-libevent_linkflag.patch
+Patch2: %{name}-commasplit.patch
 Patch3: mozilla-build-arm.patch
 Patch4: %{name}-build-arm-libaom.patch
 Patch5: rhbz-1219542-s390-build.patch
@@ -353,49 +353,49 @@ to run GNU IceCat native on Wayland.
 # Copy license files
 tar -xf %{SOURCE5}
 
-%patch1 -p1 -b .fix_addon_installation
-#patch2 -p0 -b .libevent_linkflag
-%patch3 -p1 -b .build-arm-libaom
-%patch4 -p1 -b .arm
+%patch1 -p 1 -b .fix_addon_installation
+%patch2 -p 1 -b .commasplit
+%patch3 -p 1 -b .build-arm-libaom
+%patch4 -p 1 -b .arm
 %ifarch s390
-%patch5 -p1 -b .rhbz-1219542-s390
+%patch5 -p 1 -b .rhbz-1219542-s390
 %endif
-%patch6 -p1 -b .1773336
+%patch6 -p 1 -b .1773336
 
 %if 0%{?disable_elfhack}
-%patch41 -p1 -b .disable-elfhack
+%patch41 -p 1 -b .disable-elfhack
 %endif
 
 # Fedora patches
-%patch219 -p1 -b .rhbz-1173156
-%patch221 -p1 -b .firefox-nss-addon-hack
-%patch224 -p1 -b .glibcxx
-%patch225 -p1 -b .gcc13
+%patch219 -p 1 -b .rhbz-1173156
+%patch221 -p 1 -b .firefox-nss-addon-hack
+%patch224 -p 1 -b .glibcxx
+%patch225 -p 1 -b .gcc13
 
 # ARM run-time patch
 %ifarch aarch64
-%patch40 -p1 -b .aarch64-skia
-%patch226 -p1 -b .1354671
+%patch40 -p 1 -b .aarch64-skia
+%patch226 -p 1 -b .1354671
 %endif
 
 %ifarch %{arm}
-%patch44  -p1 -b .build-arm-libopus
+%patch44  -p 1 -b .build-arm-libopus
 %endif
 
-%patch402 -p1 -b .1196777
+%patch402 -p 1 -b .1196777
 %ifarch %{power64}
-%patch423 -p1 -b .1512162
+%patch423 -p 1 -b .1512162
 %endif
 
 #%%patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
 #%%patch585 -p1 -b .firefox-vaapi-extra-frames
-%patch54 -p1 -b .1669639
+%patch54 -p 1 -b .1669639
 
 # PGO patches
 %if 0%{?build_with_pgo}
 %if !%{build_with_clang}
-%patch600 -p1 -b .pgo
-%patch602 -p1 -b .1516803
+%patch600 -p 1 -b .pgo
+%patch602 -p 1 -b .1516803
 %endif
 %endif
 

From 6d80f1870d48a4408a0963cce09b45e09e542189 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 25 Apr 2023 12:17:10 +0200
Subject: [PATCH 341/473] Debug builds

---
 icecat.spec | 48 ++++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 0d821a0..0b36f35 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -22,7 +22,7 @@ ExcludeArch: s390x
 
 ### Optimization ###
 # Builds for debugging
-%global debug_build   0
+%global debug_build   1
 
 # Downgrade optimization
 %global less_optbuild 0
@@ -353,49 +353,49 @@ to run GNU IceCat native on Wayland.
 # Copy license files
 tar -xf %{SOURCE5}
 
-%patch1 -p 1 -b .fix_addon_installation
-%patch2 -p 1 -b .commasplit
-%patch3 -p 1 -b .build-arm-libaom
-%patch4 -p 1 -b .arm
+%patch 1 -p 1 -b .fix_addon_installation
+%patch 2 -p 1 -b .commasplit
+%patch 3 -p 1 -b .build-arm-libaom
+%patch 4 -p 1 -b .arm
 %ifarch s390
-%patch5 -p 1 -b .rhbz-1219542-s390
+%patch 5 -p 1 -b .rhbz-1219542-s390
 %endif
-%patch6 -p 1 -b .1773336
+%patch 6 -p 1 -b .1773336
 
 %if 0%{?disable_elfhack}
-%patch41 -p 1 -b .disable-elfhack
+%patch 41 -p 1 -b .disable-elfhack
 %endif
 
 # Fedora patches
-%patch219 -p 1 -b .rhbz-1173156
-%patch221 -p 1 -b .firefox-nss-addon-hack
-%patch224 -p 1 -b .glibcxx
-%patch225 -p 1 -b .gcc13
+%patch 219 -p 1 -b .rhbz-1173156
+%patch 221 -p 1 -b .firefox-nss-addon-hack
+%patch 224 -p 1 -b .glibcxx
+%patch 225 -p 1 -b .gcc13
 
 # ARM run-time patch
 %ifarch aarch64
-%patch40 -p 1 -b .aarch64-skia
-%patch226 -p 1 -b .1354671
+%patch 40 -p 1 -b .aarch64-skia
+%patch 226 -p 1 -b .1354671
 %endif
 
 %ifarch %{arm}
-%patch44  -p 1 -b .build-arm-libopus
+%patch 44  -p 1 -b .build-arm-libopus
 %endif
 
-%patch402 -p 1 -b .1196777
+%patch 402 -p 1 -b .1196777
 %ifarch %{power64}
-%patch423 -p 1 -b .1512162
+%patch 423 -p 1 -b .1512162
 %endif
 
-#%%patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
-#%%patch585 -p1 -b .firefox-vaapi-extra-frames
-%patch54 -p 1 -b .1669639
+#%%patch 584 -p1 -b .firefox-disable-ffvpx-with-vapi
+#%%patch 585 -p1 -b .firefox-vaapi-extra-frames
+%patch 54 -p 1 -b .1669639
 
 # PGO patches
 %if 0%{?build_with_pgo}
 %if !%{build_with_clang}
-%patch600 -p 1 -b .pgo
-%patch602 -p 1 -b .1516803
+%patch 600 -p 1 -b .pgo
+%patch 602 -p 1 -b .1516803
 %endif
 %endif
 
@@ -651,6 +651,10 @@ cp -p %{SOURCE19} .
 . ./run-wayland-compositor	
 %endif
 
+%if %{?debug_build}
+export CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG=true
+%endif
+
 #export MACH_USE_SYSTEM_PYTHON=1
 %if 0%{?build_with_pgo}
 %if 0%{?pgo_wayland}

From db252abf7895d2dc165c3bf976643c1a3b758db2 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 9 May 2023 21:37:28 +0200
Subject: [PATCH 342/473] Release 102.11.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 4 ++--
 sources                 | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index b9d663e..d7615bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -218,3 +218,5 @@
 /icecat-102.9.0-rh1.tar.bz2
 /icecat-102.10.0-langpacks.tar.gz
 /icecat-102.10.0-rh1.tar.bz2
+/icecat-102.11.0-langpacks.tar.gz
+/icecat-102.11.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 46af596..6454571 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=102.10.0
+VERSION=102.11.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 0b36f35..58a49e9 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -22,7 +22,7 @@ ExcludeArch: s390x
 
 ### Optimization ###
 # Builds for debugging
-%global debug_build   1
+%global debug_build   0
 
 # Downgrade optimization
 %global less_optbuild 0
@@ -104,7 +104,7 @@ ExcludeArch: s390x
 
 Name:    icecat
 Epoch:   1
-Version: 102.10.0
+Version: 102.11.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index a91df34..d7542c4 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (cbindgen-vendor.tar.xz) = d597b5422af9d3a3f9310bdad94c5897cf2605f5214ef4c447ad79612d81fbbb9d86b50a1b122b0000b54ada66bf6962c92b3b5ff8fc44e4167a18a532359cc4
-SHA512 (icecat-102.10.0-langpacks.tar.gz) = 6f6d4d26c2e4b54b555f4caa6edcde7733c41b187ec7332289714d7eb8e3ca3923927f8c1586e2f5ac29fabcfacf9b2b25a26d69c0cb471e115304e2e5eb60a9
-SHA512 (icecat-102.10.0-rh1.tar.bz2) = 17ddf8da02195a794ff6e6083d3c0ce970cf5f3d32eb4260a7b9792f32b85cbc01290f51a816c3944a4086b56bb311f39c5e4dd6cb9acba04e407f11a110716f
+SHA512 (cbindgen-vendor.tar.xz) = 56397d9865c899420b70e953fb66dc9be80f6a8aae439e059384b37080ae09d6e6b7346bfeae8deece12242317d276013306755595717fc6932a6450fec1bade
+SHA512 (icecat-102.11.0-langpacks.tar.gz) = 1832e872bb346f3e5e5716ab8ae1fbd55dda07d5998be34898630e4050393c442e0ba88ce43b98764a49082aed3f01b4fbcebd9a07c853eaa08215354bc26d52
+SHA512 (icecat-102.11.0-rh1.tar.bz2) = c5e5715ceddf275c9a739627c78597c53495300d53b7e8f256a914537affa52b10073990fd39a1b627ef6efe8fedc51ba911dd4ebbb7b7a41e05ffb17dc0f7a3
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 2d8e9a18398663dd21761fd2da586258ea654c78 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 14 May 2023 17:20:28 +0200
Subject: [PATCH 343/473] New source archive rh2| Update bundled bindgen to the
 release 0.65.1

---
 .gitignore  | 1 +
 icecat.spec | 2 +-
 sources     | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d7615bc..8430532 100644
--- a/.gitignore
+++ b/.gitignore
@@ -220,3 +220,4 @@
 /icecat-102.10.0-rh1.tar.bz2
 /icecat-102.11.0-langpacks.tar.gz
 /icecat-102.11.0-rh1.tar.bz2
+/icecat-102.11.0-rh2.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index 58a49e9..402e0ef 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -4,7 +4,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh1
+%global redhat_ver rh2
 
 # Exclude ARM for the following error:
 #  terminate called after throwing an instance of 'std::bad_alloc'
diff --git a/sources b/sources
index d7542c4..7923b16 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (cbindgen-vendor.tar.xz) = 56397d9865c899420b70e953fb66dc9be80f6a8aae439e059384b37080ae09d6e6b7346bfeae8deece12242317d276013306755595717fc6932a6450fec1bade
+SHA512 (cbindgen-vendor.tar.xz) = 96da99311fd01a865d8da5f3c47c94d20f260241a5761ba28423bab949da99748d07cc5a85436177d861126c7b8378ddf1208ccf8f4e84f9ddc9f79a33108b56
 SHA512 (icecat-102.11.0-langpacks.tar.gz) = 1832e872bb346f3e5e5716ab8ae1fbd55dda07d5998be34898630e4050393c442e0ba88ce43b98764a49082aed3f01b4fbcebd9a07c853eaa08215354bc26d52
-SHA512 (icecat-102.11.0-rh1.tar.bz2) = c5e5715ceddf275c9a739627c78597c53495300d53b7e8f256a914537affa52b10073990fd39a1b627ef6efe8fedc51ba911dd4ebbb7b7a41e05ffb17dc0f7a3
+SHA512 (icecat-102.11.0-rh2.tar.bz2) = 10efa9b652e5944420173d7416ecb2562c30dfbcf83a97e65f554ad789f32de73a5a26eb300c41947f2f5b80473d02a961606331c329818b5517f0e79c0c2c42
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From f45d231b6b568fb11b35832eb5ac61c5cf3dfd79 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 16 May 2023 18:31:17 +0200
Subject: [PATCH 344/473] Change RUSTFLAGS setting

---
 icecat.spec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 402e0ef..fdab3bf 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -590,10 +590,18 @@ echo "ac_add_options --enable-linker=gold" >> .mozconfig
 %endif
 %ifarch %{arm} %{ix86} s390x
 export RUSTFLAGS="-Cdebuginfo=0"
-%else
-# Otherwise since https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/243 breaks build.
-unset RUSTFLAGS
 %endif
+
+%ifarch %{arm}
+# disable hard-coded LTO due to RAM constraints
+sed -i '/cargo_rustc_flags += -Clto/d' config/makefiles/rust.mk
+sed -i '/RUSTFLAGS += -Cembed-bitcode=yes/d' config/makefiles/rust.mk
+sed -i 's/codegen-units=1/codegen-units=16/' config/makefiles/rust.mk
+
+# make sure "-g0" is the last flag so there's no debug info
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -g0"
+%endif
+
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive"
 export LDFLAGS=$MOZ_LINK_FLAGS

From 5ba1bc0a67e9dfa85b6dbaed1d5952cac91f1cc6 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 2 Jun 2023 15:08:58 +0200
Subject: [PATCH 345/473] Release 102.12.0 rh1

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 4 ++--
 sources                 | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8430532..30ae722 100644
--- a/.gitignore
+++ b/.gitignore
@@ -221,3 +221,5 @@
 /icecat-102.11.0-langpacks.tar.gz
 /icecat-102.11.0-rh1.tar.bz2
 /icecat-102.11.0-rh2.tar.bz2
+/icecat-102.12.0-langpacks.tar.gz
+/icecat-102.12.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 6454571..c60d98a 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=102.11.0
+VERSION=102.12.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index fdab3bf..98a56d1 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -4,7 +4,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh2
+%global redhat_ver rh1
 
 # Exclude ARM for the following error:
 #  terminate called after throwing an instance of 'std::bad_alloc'
@@ -104,7 +104,7 @@ ExcludeArch: s390x
 
 Name:    icecat
 Epoch:   1
-Version: 102.11.0
+Version: 102.12.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index 7923b16..b6262e3 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 96da99311fd01a865d8da5f3c47c94d20f260241a5761ba28423bab949da99748d07cc5a85436177d861126c7b8378ddf1208ccf8f4e84f9ddc9f79a33108b56
-SHA512 (icecat-102.11.0-langpacks.tar.gz) = 1832e872bb346f3e5e5716ab8ae1fbd55dda07d5998be34898630e4050393c442e0ba88ce43b98764a49082aed3f01b4fbcebd9a07c853eaa08215354bc26d52
-SHA512 (icecat-102.11.0-rh2.tar.bz2) = 10efa9b652e5944420173d7416ecb2562c30dfbcf83a97e65f554ad789f32de73a5a26eb300c41947f2f5b80473d02a961606331c329818b5517f0e79c0c2c42
+SHA512 (icecat-102.12.0-langpacks.tar.gz) = a44a094e4acec3c72ecdca8491ddd6bfbff3a4bcf7a466e50c95fd639f5c88b59f36bfc0a1a831a8065e38f15549a43895a61e95f2dc9dd7157ca4c2a4f647ed
+SHA512 (icecat-102.12.0-rh1.tar.bz2) = c1f3e9d1855084fdce9f6a832ad98e1548a19b6c3002f3d019e4272e47c5d4dd06075a47fde24ab74c3583549192c85669d60e3630c2bccbccb9e7bccde08e39
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From e998cbea1654b554fc153b44ea83b73d6a3a0b66 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 2 Jun 2023 19:37:52 +0200
Subject: [PATCH 346/473] Release 102.12.0| Try to build with cbindgen-0.24.5

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index b6262e3..294852a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = 96da99311fd01a865d8da5f3c47c94d20f260241a5761ba28423bab949da99748d07cc5a85436177d861126c7b8378ddf1208ccf8f4e84f9ddc9f79a33108b56
+SHA512 (cbindgen-vendor.tar.xz) = 60b8bc05e599fadfa80a06560326c84efc72c1a9aeb9f1667ec9e235c66f0efd8939c390795254fa9bde7d30402f1b92c61ca848d1eda8d487788cc9107213e9
 SHA512 (icecat-102.12.0-langpacks.tar.gz) = a44a094e4acec3c72ecdca8491ddd6bfbff3a4bcf7a466e50c95fd639f5c88b59f36bfc0a1a831a8065e38f15549a43895a61e95f2dc9dd7157ca4c2a4f647ed
 SHA512 (icecat-102.12.0-rh1.tar.bz2) = c1f3e9d1855084fdce9f6a832ad98e1548a19b6c3002f3d019e4272e47c5d4dd06075a47fde24ab74c3583549192c85669d60e3630c2bccbccb9e7bccde08e39
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From a939d1fb6d316fcea7d62aa590c03d692365dc66 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 10 Jun 2023 19:27:56 +0200
Subject: [PATCH 347/473] Patched for Rust-1.70

---
 icecat.spec                                   |  60 ++++---
 ...652d38e007e736bb442ccd5aa5ed699db100.patch |  25 +++
 rust-bindgen-2319-2339.patch                  | 154 ++++++++++++++++++
 sources                                       |   2 +-
 4 files changed, 215 insertions(+), 26 deletions(-)
 create mode 100644 mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100.patch
 create mode 100644 rust-bindgen-2319-2339.patch

diff --git a/icecat.spec b/icecat.spec
index 98a56d1..698bf66 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -159,6 +159,15 @@ Patch5: rhbz-1219542-s390-build.patch
 # If cbindgen=0.24
 Patch6: mozilla-1773336.patch
 
+# With clang LLVM 16 rust-bindgen 0.56.0 is too old, combined
+# https://github.com/rust-lang/rust-bindgen/pull/2319
+# https://github.com/rust-lang/rust-bindgen/pull/2339
+Patch7:  rust-bindgen-2319-2339.patch
+
+# Needed with rust 1.70
+# https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100
+Patch8:  mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100.patch 
+
 Patch40: build-aarch64-skia.patch
 Patch41: build-disable-elfhack.patch
 Patch44: build-arm-libopus.patch
@@ -344,58 +353,59 @@ to run GNU IceCat native on Wayland.
 %prep
 %autosetup -N -n %{name}-%{version}
 
-# Fix permissions
-#find . -type f -name "*.h" -exec chmod 0644 '{}' \;
-#find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
-#find . -type f -name "*.cc" -exec chmod 0644 '{}' \;
-#find . -type f -name "*.c" -exec chmod 0644 '{}' \;
-
 # Copy license files
 tar -xf %{SOURCE5}
 
-%patch 1 -p 1 -b .fix_addon_installation
-%patch 2 -p 1 -b .commasplit
-%patch 3 -p 1 -b .build-arm-libaom
-%patch 4 -p 1 -b .arm
+%patch -P 1 -p 1 -b .fix_addon_installation
+%patch -P 2 -p 1 -b .commasplit
+%patch -P 3 -p 1 -b .build-arm-libaom
+%patch -P 4 -p 1 -b .arm
 %ifarch s390
-%patch 5 -p 1 -b .rhbz-1219542-s390
+%patch -P 5 -p 1 -b .rhbz-1219542-s390
+%endif
+%patch -P 6 -p 1 -b .1773336
+
+  
+%if 0%{?fedora} >= 38
+# MUST ONLY be applied for building against clang LLVM 16.
+%patch -P 7 -p1 -b .rust-bindgen-2319-2339
+%patch -P 8 -p1 -b .mp4parse-rust
 %endif
-%patch 6 -p 1 -b .1773336
 
 %if 0%{?disable_elfhack}
-%patch 41 -p 1 -b .disable-elfhack
+%patch -P 41 -p 1 -b .disable-elfhack
 %endif
 
 # Fedora patches
-%patch 219 -p 1 -b .rhbz-1173156
-%patch 221 -p 1 -b .firefox-nss-addon-hack
-%patch 224 -p 1 -b .glibcxx
-%patch 225 -p 1 -b .gcc13
+%patch -P 219 -p 1 -b .rhbz-1173156
+%patch -P 221 -p 1 -b .firefox-nss-addon-hack
+%patch -P 224 -p 1 -b .glibcxx
+%patch -P 225 -p 1 -b .gcc13
 
 # ARM run-time patch
 %ifarch aarch64
-%patch 40 -p 1 -b .aarch64-skia
-%patch 226 -p 1 -b .1354671
+%patch -P 40 -p 1 -b .aarch64-skia
+%patch -P 226 -p 1 -b .1354671
 %endif
 
 %ifarch %{arm}
-%patch 44  -p 1 -b .build-arm-libopus
+%patch -P 44  -p 1 -b .build-arm-libopus
 %endif
 
-%patch 402 -p 1 -b .1196777
+%patch -P 402 -p 1 -b .1196777
 %ifarch %{power64}
-%patch 423 -p 1 -b .1512162
+%patch -P 423 -p 1 -b .1512162
 %endif
 
 #%%patch 584 -p1 -b .firefox-disable-ffvpx-with-vapi
 #%%patch 585 -p1 -b .firefox-vaapi-extra-frames
-%patch 54 -p 1 -b .1669639
+%patch -P 54 -p 1 -b .1669639
 
 # PGO patches
 %if 0%{?build_with_pgo}
 %if !%{build_with_clang}
-%patch 600 -p 1 -b .pgo
-%patch 602 -p 1 -b .1516803
+%patch -P 600 -p 1 -b .pgo
+%patch -P 602 -p 1 -b .1516803
 %endif
 %endif
 
diff --git a/mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100.patch b/mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100.patch
new file mode 100644
index 0000000..bdad203
--- /dev/null
+++ b/mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100.patch
@@ -0,0 +1,25 @@
+--- thunderbird-102.11.1/third_party/rust/mp4parse/.cargo-checksum.json.mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100	2023-05-24 00:50:52.000000000 +0200
++++ thunderbird-102.11.1/third_party/rust/mp4parse/.cargo-checksum.json	2023-06-08 15:26:57.584198289 +0200
+@@ -1 +1 @@
+-{"files":{"Cargo.toml":"f283fc1597f492cd1e03cd08b9c77f042ae4494fc96b4dcb566ec0abbda65efc","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"86cb40854b93f988e3a63ce6fe39d2ce95367f8ca301a5ba50676ff98a0ad791","benches/avif_benchmark.rs":"cd99c0dde025ab40d2cd860f53dc697a1587a48c164c3e5c8adfd40add29d772","link-u-avif-sample-images/.github/workflows/encode-and-decode-daily.yml":"84b787f721024a100ce09ac5714a1d78a4811893861e89495313f435b9d02359","link-u-avif-sample-images/.gitignore":"ac16d40779ab2d608843a3cb1b0418a1ffdc0e71a06c4d140386fadf007a54a7","link-u-avif-sample-images/LICENSE.txt":"da89f9867822be4b8adb1e601d9e9226c195016c6508015eb7593e68ead0c98a","link-u-avif-sample-images/Makefile":"b5697e8685d2a9ce0f4b4c976a5f707022ed113782d16dc59ae280d3a8ce77b1","link-u-avif-sample-images/README.md":"d249fb7bef4f21359cfc4f2977e1b2f2c6e6dd6e57cb1cdc1da1f0edd8aa55d0","link-u-avif-sample-images/fox.jpg":"927997a90ae88ead007283bf9c1392159d0acd2e9890522146211fda2112a2d9","link-u-avif-sample-images/fox.odd-height.png":"6136247772bd1c0edd50426bca4f3485473ac25a784e5ec8777f7491598e96db","link-u-avif-sample-images/fox.odd-width.odd-height.png":"6f91dc21c137f318d0443ce28bbf3f74d5502180c254327b46e41040a33f1363","link-u-avif-sample-images/fox.odd-width.png":"a8b2328c8700c16280c5ab40a34147edac598d4d48ca101bef649e468ae1492e","link-u-avif-sample-images/fox.png":"c45bfb5780843c70a37426340020e3e7ff41d7cf1df9fec614a5cf429d078573","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.avif":"811af5e96631309030a14cbc30c3bacfaa667f2e36e16a4f30434b8f5a23310c","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.avif":"e35713343e9ee04c51ab9cfdc99a0c7d126a1917cb83f5b9a23c71ed59269be2","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-height.avif":"485623f7838d8f442c47348c6492765e6aafbc3d5ccd8e90efc9c812ff15e265","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.avif":"8e75b9a8975267359d827e4cbc6877b1674aa31b87f88f222dde03263f9254df","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.odd-height.avif":"1fff5915a332d6aaa85d668f3f338bda6fad9c6ec1f380f2c46737d536cea5de","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-height.avif":"cca9785f14c74d865453518c0962dabd6d1b92d2c6c5f5ac67efdbf5606acb83","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.avif":"de3399d8b56431f0ed34e2f14200f31dd54544fddbb12f39b4d55449d5660c56","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.odd-height.avif":"07507744cb76b74a3586b93fc3b273a98f998d75f7687db3e9cb3725d7b1fb9d","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.avif":"cb884c82ac7b6d4fa03b1f687e9e20abc346107095473e9c1d422aaf0de14eaf","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.avif":"15d84077066c47fdbe2a7b8ed583a17017d09a033144ac1b31486d6c8f6f5c82","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-height.avif":"365439d2ee2fe5229e066362c03a73a182c7f6626772ecf5345b22752d32e681","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.avif":"c623b9943123d6c47d3300444f7255cbdfebfe2b47a670287f2baeb717fac42b","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.odd-height.avif":"dd069f3c3c4f7589f5f7ef1d7b6a91b8cb975d32663a4a92b6d75219edd72954","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-height.avif":"75628450288ace3386651725411c8f0ffff7eb95f82c5307b0faa3350f09f50e","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.avif":"f91b6f455412adabc5094011362eaaa1f6a9d5740de0b8a1be42a96c16e7617f","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.odd-height.avif":"bb8695cacacaf8f2e13a739de75e5e8a9d970d68c3acdfb7d82171a9bac2f01e","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.avif":"a10de8204aee73ba1786daca6390546bd7aa6b069aaa644012219a1c11246a43","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-height.avif":"734a5badc59a8bed19e8eb476911048ddb011ca7c9eac31b7a7ed20e0135ac2c","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.avif":"68d15d76d95f268e810dfd87bbf96d8c3197580afce2d30b50bb1f07865077f3","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.odd-height.avif":"01e469b33bacb7e07e15e23b2997907bbcf02d8fcc99885a027494d31c45547c","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.avif":"a0cdc981a6b056c8af2d177a1438c332d630040dacbfd1c89bb5e3e381ba5822","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-height.avif":"77e0510def73213c00ebcf051cf45fa63cf27d7c69340cc145ab6d44ec77bb07","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.avif":"12787042364bd13be01830f988cb714220bde340a3329baa808df27a269b83f8","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.odd-height.avif":"fad3b6dd9cb99e6925858f69aafae3f68c861845f2c3d4a6d1c51c6161490134","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.avif":"e34f3bab5df802be2d422c685824464eb5f7e182b235ca99bde11c4c34ff3ac2","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.avif":"05804752621e2fd7a9d85b01e2995a50e3efd30693efd934152560622d66e841","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-height.avif":"ef041f2efa0424d3a6dcfc5f0c3f619aea0e197aaeb5a050a2d877a457513921","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.avif":"b711b321b8a4d3a41e08f80a17c2203b839458cb6346aff6fff3f8d7699032e6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.odd-height.avif":"e3f40aad0ddd6c04ffacf4a754a0525986c89d519119d37655282551e3ea3a59","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-height.avif":"4ef74c37712b41d6e5269d939f9d52031bc10746f7c8c029db618c5935aff9a6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.avif":"4cf6c849f4a48a639217ad9a1e0d027f4fc804d524c03e6707ec9714a252532f","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.odd-height.avif":"3d3978e8e8d07270f82a877d3535f9483b88fce93a1c4accb658b494452b1d36","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.avif":"626d73272e59722084c528b27b72a0920bec462a10749b3e87036e42bf8a24e5","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-height.avif":"d1786723a5d6ea1e1764b0045dc3f669fe3905ffc2913011a2b1b424d2393397","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.avif":"a2d9178cc5622e28472a735650d9c4deaec6d27d69830110911f4158f9d4a04e","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.odd-height.avif":"89a9fc7598d72251b903e0c7088ab3e7a7f316b5e02b85f8c69e51f8eb0c7e69","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.avif":"51476b8471e1c0a5ebbd1e7545709495bef619cc96c02d277aad32b1deff8ea9","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-height.avif":"4808960cdcd1207b29eb6ef5b4db81ae5e63c5d40ef92f7a1e8f4430e765bde4","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.avif":"71f3c73737bc04c23d93ea2c61a8a07408f604192fe53fe12c65050927dacb4e","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.odd-height.avif":"8f9649384fa09c70af0c2e9e0d94ecd17492c702e015d9d6290d3aefc57c548c","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.avif":"ed96eca6ed79863eaf91e4d666e4e220b5fa4e5a6cb1696477ba901ac12f5dde","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-height.avif":"c43b4c607e301e34eb953770133d89d15e77d63be8d6421a80d6212fbbbf3453","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.avif":"0e6218ce250ee7f84a621f3af73286fd4dabea19e9898d3575c20c5955aa427d","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.odd-height.avif":"9f19846d884ac7d161ac2ca15811bb22ff7f3847bc1ad5d7713971ea024631aa","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.avif":"2cb363d30f83bff58ee049874b1808b37cb1d35342edf16b3ce25cb243c9ea55","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.avif":"8217b88f350c5d3812d7f863fe9d710c4c1b846b0be8df29ce6b3eb30d2b8d8f","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-height.avif":"51eccd8c1368ddec9bc1f3a7631dadb00682e985fbfea66c0a2f533f6a73b67e","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.avif":"83fe4593ab839cf296a2ccb8a146daf826d1d602f4f239cb63ee020f2cc326f6","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.odd-height.avif":"4e63b84a980a81adde586314a94d8f834ec763749d8797c286471415b6b75647","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-height.avif":"efc70882aacbb533c0e833a4401949d152dceb364846442cdccca5048ad17a60","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.avif":"c07575c88ef400c1725c9260a19439e0e784da41c7db3867059019ddbdb3bebe","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.odd-height.avif":"86aee64fd7b11b9834537ea14b2eff234c062c98d32fab51ff14aba262d5b106","link-u-avif-sample-images/hato.16bpc.png":"53b550c587cd1d19a1997184e47f4a3ff2a05cedf7cb4e42a9466a6d6cb60d8d","link-u-avif-sample-images/hato.jpg":"6d4804e5e4adf36a6b138544c81b743ed7abdd9a495a43e883ec77689ca28943","link-u-avif-sample-images/hato.png":"313880f4cc51160fec522d78f1fb7f06df70fe1929a731fc86c68ecefd312277","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.avif":"1e84598c94bc795c55a551bdf6f283b4eed4997bda15e5c4bb2e29d0dc70897b","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.monochrome.avif":"25c19a187d10eac963bb51b3fae1ffe50f3ccbc7ad02e51948dc7467b397ce61","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.avif":"07cd454de19dd638354f75d9e97aab08bc8a04dd45c4f7531cb62a1a5656c8c9","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.monochrome.avif":"120a3f26f3d6cde80869fb52bdb8fdd55b443882c98070ea938575e4790982ff","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.avif":"d54251d4bc023f2e53624a46cb18e56cbc45768bd1bd50394de191c2a42106e8","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.monochrome.avif":"ed33dfdb5e663b3394298b6921f9b19b129e14788dead776430eee2f14780a73","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.avif":"ad361ac7d94fbc6af7ef30cbd3601ff366bc360c304480387a58a4c6fecee9b6","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.monochrome.avif":"e28b4cacda95750e465e205fbfcba6a6af1d8418dac649838730c555ff7d828f","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.avif":"69c353c482c2eb3d3671bb55f7ccfc932e4d781c714a72116e9138ffc6f6c720","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.monochrome.avif":"e7d6f7d42a8519e1482f225fe447b5642d19a54ee830529223eac114a0dec189","link-u-avif-sample-images/images.html":"9e18453dfe5b205600f158282c6896265281e3b04b2fbc332804fab1dbdb3faf","link-u-avif-sample-images/kimono.avif":"63412e0f67f37c8b6fcf0e8269a2afae0a017fa6a3a99d37d055c590b0be52d3","link-u-avif-sample-images/kimono.crop.avif":"f175dcd9c64813b759da185fa67076fb772b76059845b2aad3ddcfab257f75ad","link-u-avif-sample-images/kimono.crop.png":"0d5605bae0ec9d39aad9dc8e1a371d0327c6a224643983e3ee1f4d44cb00f19d","link-u-avif-sample-images/kimono.jpg":"a6ad58e3cea437ee0c841115ba67ae7354de7af734de50de9d0853dd4e571577","link-u-avif-sample-images/kimono.mirror-horizontal.avif":"2bbc004d91145488610158a5acdb4d706495a2b15511db20ff57bb9efd80885c","link-u-avif-sample-images/kimono.mirror-horizontal.png":"9af9e839fe6bf6342831970c20291f619570d2fc687951ae00cd81ea766f53fe","link-u-avif-sample-images/kimono.mirror-vertical.avif":"f10eb04791fcca3409868b367128649f32e6b6fffcf02484cdefa57909f6bb74","link-u-avif-sample-images/kimono.mirror-vertical.png":"4ed003c5868fd2e78c7b2dcbd54a67a0e7593dabb3ac82b1c9e5e2dbdf09b8ec","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.avif":"33c36ec2274b00ac6f81c9f61e55c20cbfce1649ad27520afe635310f516ead1","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.crop.avif":"90ca48f657455b8f8e4a4e1769a05af90a3e34dca11a8b3c32552daf378ee956","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.png":"74b9b7ffa8955761f747a0e6e81d5b7ecb5e325383546110e1b6aa9986728035","link-u-avif-sample-images/kimono.png":"84fd6cfb97a27739608e21779f874b4ae7e80342b2588e8b0b092dee2d57c881","link-u-avif-sample-images/kimono.rotate270.avif":"79a99a0415276cc11f2e871d070a9df84df3385888a2f2fa3534320f6bed98ed","link-u-avif-sample-images/kimono.rotate270.png":"1918a47c02b378945a705301abd4250ddc65bb95afce9424572ffd0fdd1f45ef","link-u-avif-sample-images/kimono.rotate90.avif":"bd1157d8c840713c82b907b9d3ae80bc3817849e11c323d875f8016e035bd3cc","link-u-avif-sample-images/kimono.rotate90.png":"1a73c61692abe96d0a7a9accdb36a83d51bceac79bbb83a00571570f494cca49","link-u-avif-sample-images/plum-blossom-large.png":"af6ea005b726ca39f342e946aa53bed88e5a140413ce896d166bb35ab0aa3b4f","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"b413440309d5669a7aefa06f291f72de0d0c09972e3da9a385e6016d6a1c5562","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.avif":"64f6f2b1fda594af5c9e2d6e4bc752b55e8121000cdcedc0066018e53f76de40","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"2b175a600aed64c1c1de4b2d661fb405437b1ff000b964d4be6ac437ce73136f","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.avif":"21ebb3732186bf7c6c13cf7197155b64201e674b9c79cf613b6e5718bde14c2a","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"65917797e511c9033b3e225eb5d84f3c0440b7a496d4b8ab5674e123ad68aab7","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.avif":"f4809df9188fa46ed100f63c78c4cf42559d90a98351a8f69e177385920672b4","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"dffc213dc36f0b5ff3d86254f5185c2d1fb03380918a8fa39d186fb59cbba7cc","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-full.avif":"0a615cfb673ab45e37da3582c17dd36f86d5da3d81246a32951d1db4ed90149d","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-limited.avif":"d1cc6a0db116a68e229676b289e8ced84d42a9f0e8d3ccd760fc92dbeb932547","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-full.avif":"8626cf0b2c60fee51cf1df7fe4d8a18081b72e3604f7d3ff14cc5a35581927d9","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-limited.avif":"56bf18e4bcbfbea460c306ab900fc506169854d2b91690e1a48156a86fff3264","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.avif":"b56f3c33797e4c5bb80418ae25f6f2c6fc88ddc1f6965d82abc44059f052f36c","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"c3c6db4ce801c68e2afd7bfb72abacc13287cc2e247917a817ff5632bd4b18fb","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.avif":"095f57fff1dc037a6414c60263415dcfa86b10d81f58e8e4c3aef17cffae0e5f","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"ba3035a69296d12f47d1c450f2de8cc0c9059ebbf27bb8b0996ff6d1ab1132a1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.avif":"a9551e1963049b874216b40aaf9be45bc44dc11887770712b77240862c6c08a9","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.avif":"6891b5bdbed7f541c673c66cec4584b191bb737a49b37cca16ae069830890b42","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.avif":"a466503110f60dcadaafe78c2cb0a8ca58334c22868efe428c7ac12b69407c95","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.avif":"061b4c70707e7fc8866580656cca7ca2da2263645829a564dbf8f205d639f058","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.avif":"4a03c8bcfcaadccdeb07432ed80680b06aba5ae5e616fc370b376acb478f6cd1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.avif":"376625ce4e7ec3b57344a9f2185a34975fe380774c9f8e0dd4ef61c46da94fca","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.avif":"1e17b7dd8e351cb667bc6ec0b81fdebca9fd30ad5e588b3eac57bf9f90a9b58b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"f77588d2ff39e4461869a95ca236efdf4a3fdc17b8a6e3907e63b417e56c81b5","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.avif":"f2eabd3fc2db07b361d55b5af63023d28b5bdd0047a665e9d0685651ce9db94b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"dd88c377b253d689bfd4600d7c3007448df0ed92f679b661d5d51e051a6916d8","link-u-avif-sample-images/plum-blossom-small.png":"c859fd97b647e494461f65835b9c1c3476807aee77076599adf18a832b3617a4","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.avif":"fe3379620f983e5da4210b0f7c5d164e86208b34106d6b11d56e2b52beee5dfe","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"9e6234686053dba2e44bb32192c641074095a61e45aa1bede85bb83751e6e157","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.avif":"60ffa59dd007aea3bb596cfb03853b3dad490b1ffd10471ad4fe1901ec819907","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"58abfa027525aca7339a705f311bc30b000aef9822c7c50b232894ece1ba9cb1","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.avif":"541ca66a11b1430d11f77b74a13f859239a3bd9f44976b8dfe163c5d7595a69f","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"6d7852c63c27a77bef94443e178ecf6b6a3da8cc846f9f0c1adc17f7fc35e1f3","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.avif":"3712216ffc7edb95a976b68469ead533fda6fe9f3d2e8cb09cbdb0d01d9c094b","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"59672af536b169ebf7e48129167dc91cb253925517c37db28b64539f7afba5d3","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-full.avif":"561d5158425ad39425916a3be048b0202e82efef44cf1a9f711db57192d2ff01","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-limited.avif":"88336f29457c1dc4ae0b754ef14b791de4d8c337f2b44d7960aafcca08a5586e","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-full.avif":"245a3dad6371dc702f29eb7e9735f843b63c525da871859728bedbe5bb274985","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-limited.avif":"490c216b5850c670f6088ee72c7fd906102b2dd0c8432c01a517b3328db27c75","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.avif":"0d0bbbcb0c9ade1c827317a6409ce6ba25027b36da1b6752379a5f5d4c8af056","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"418a9d4b7dcbc1f67fc4b95ccb2e7946c446fddd35a79f0d587b3f2165cb3f14","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.avif":"a41dcfabb3795ed93a05881a91bf4d1c5d1b9b0e5d0db728f12684b12613e0c9","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"4b6a18f4f608d1b00598e67c1c91a4e8f4943ae5acf0166ae0121cc21f3b7437","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.avif":"5e6b83adee3aeac4bba3f38e854e2ed7585aa1557a74b5fa66596098c53e26f2","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.avif":"f42e780bff644167e27525fee65b23e70814f7665ea19b6d693eb127c5eeebd8","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.avif":"c6ee9234ee7783d0203f9512e3cc8fe76a694675bcf03c320ff8bab4684bd4e9","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.avif":"21e1e51fc6da66e090e12e1df5aeabf1f478df64bcb8151caaa687ad262bdd9d","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.avif":"dfed73d646d7159d3ee4f9ce95ea628fdd33bf8bf1bb02a83d88302d088f4d97","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.avif":"5539cd575256772ba31d6e87cb0136d5f465f84b041a4677b1023cfd6bee9956","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.avif":"f205cf2c05265b84e45ceb723e9a3707fd8749130166d4797e64c8c62b497f8c","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"ad2244cb7b2ac487a5104d6e5a07270f9ceb2550e4d56d3662fcc1868910ced5","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.avif":"7ef9468effdc970e4e6e8cc7533d66dc967686e357dda3dda186c021f9e6156b","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"3dd34d854ff83b6e27a2bf98301380a6cac272084ed863735285ab5dc8acda00","link-u-avif-sample-images/plum-blossom.svg":"be1f03dd05f63292c85a96b1c48fb06727283610cc69b1e116d547bab27b171d","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-10bpc.avif":"5842951d81118d256962384e08a986816e8ade6b05530269f0208c6b69cedb3b","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-12bpc.avif":"1f0c9f36d69b9aa13eff3897ada3e78b81099c613b329a402c27e09453e7e261","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-8bpc.avif":"3e6f2f4016e66e3c94707eaa8373e6f582321e005964cd35b64bc183e1bf10ea","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-lossy.avif":"79483242f2dca12c4ec18bd33ff8099216b3094fb55a26a909f046b2f9b4ce58","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.jpg":"d56f809ea5eda74578af57e2f80b41856a1fe2ff436c741aa58757387af998bd","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.png":"4eab95e358eb48e052c7b8c94d30a8c6cb1c9c3c2dfd9845240281dd5dd7b800","link-u-avif-sample-images/scripts/compare.sh":"0562689bcd40e9fc1322bf037d6f999aa4406a2229f19e74b96cc450e370e429","link-u-avif-sample-images/star-10bpc-with-alpha.avifs":"5643ac1f235ae6599186dd66c66507db6fa46a17b2b18e82ea9344870eb98a9b","link-u-avif-sample-images/star-10bpc.avifs":"c61d899a59dbd8c7b2f7bcfca9069a0e13ff1606899af227938a28502e6cbf88","link-u-avif-sample-images/star-12bpc-with-alpha.avifs":"88a350c3550ce36c1777fe7eb1e906c6829d3ed8b241aa1e0e46f1a4e2567c4b","link-u-avif-sample-images/star-12bpc.avifs":"c1a59db6f180208a3177d77c7f9ab08290e903c7bdaf929331b807a510f8c619","link-u-avif-sample-images/star-8bpc-with-alpha.avifs":"13a12908cb162a855cccc9221a5f9f736e8ea07902ffbdcf007f8fde5ed255f2","link-u-avif-sample-images/star-8bpc.avifs":"ae35b161de67a5afeb195ee401f369c34990f0ff8662f70ab4065bc6931f0a66","link-u-avif-sample-images/star.gif":"389cdd02efbdce4f0205cae6e91c1f64e34fa0ca1fe02351da1b37e16cbb642a","link-u-avif-sample-images/star.input.txt":"970163b942843618616f42233abe91d40fb68f6f5451860db259551711867b55","link-u-avif-sample-images/star.png":"18569167cf7ebd265ab6973d071d259aacfbb46c0408b7d4874c8cc9df9bb1ad","link-u-avif-sample-images/star.svg":"13089d0986b31b87919029fa69f2b68981af4023306bf0f79922f6772396008a","link-u-avif-sample-images/star180.png":"21bc11be2b51334fe4589634507612e7edce96d36e6a99219d029e440164e8b8","link-u-avif-sample-images/star270.png":"5c93f538dcdc70840b9925b4089083acc9c25e95265b3f3dea18d695451b441e","link-u-avif-sample-images/star90.png":"2defc5d21e70447653fec5dc14a697d9dd555d7a0c14e79cb2d9f80796a51a6d","src/boxes.rs":"270a3e3bf90279bfc83f95acadaba9611c25243280bca71dfa9c044d5441cf15","src/lib.rs":"73114a5c28472e77082ad259113ffafb418ed602c1741f26da3e10278b0bf93e","src/macros.rs":"76c840f9299797527fe71aa5b378ffb01312767372b45cc62deddb19775400ae","src/tests.rs":"75fe5467109242b2cc7991f8228e2e2ad1de5be2f29272a4a7f08c4e21ab5fa4","src/unstable.rs":"c2cef9a3b2b08a4da66fa0305fce7a117bd99c9b8d57b0a044e1d99dbda6faf5","tests/1x1-black-alpha-50pct-premultiplied.avif":"31a8c235bf2cf601a593a7bc33f7f2779f2d5b2e0cd145897b931fce94b0c0b8","tests/a1lx.avif":"81a784c568e7619bd47c4e7153181e9a86c8a03221097aa63979f97affd7efbb","tests/a1op.avif":"184e50efd3ad226800c610da7bc470d29b548d9fa942fd1fd1848ed02e2e5f0a","tests/alpha_video_avif_major_avis_compatible.avif":"81771981248c4e0d708f0828eadb20e9e37e7c21280efe5726666958f899c237","tests/alpha_video_fixed.avif":"67051d1a4ccf9f3e38d4514d8a6b3a2e07f1beb979369cabdc60881a698a36ac","tests/alpha_video_no_avis.avif":"a95f0e7c818bc5bf646143cf43474b70722e17669d4f2a32874c125936207d6a","tests/amr_nb_1f.3gp":"d1423e3414ad06b69f8b58d5c916ec353ba2d0402d99dec9f1c88acc33b6a127","tests/amr_wb_1f.3gp":"be635b24097e8757b0c04d70ab28e00417ca113e86108b6c269b79b64b89bcd5","tests/av1C-missing-essential.avif":"a1501254c4071847b2269fe40b81409c389ff14e91cf7c0005a47e6ea97a6803","tests/bad-ipma-flags.avif":"ecde7997b97db1910b9dcc7ca8e3c8957da0e83681ea9008c66dc9f12b78ad19","tests/bad-ipma-version.avif":"7f9a1a0b4ebbf8d800d22eaae5ff78970cc6b811317db6c1467c6883952b7c9b","tests/bbb_sunflower_QCIF_30fps_h263_noaudio_1f.3gp":"03e5b1264d0a188d77b9e676ba3ce23a801b17aaa11c0343dfd851d6ea4e3a40","tests/clap-basic-1_3x3-to-1x1.avif":"83af9c8196fa93b2475163585a23d0eb5a8f8015d0db8da7a5d6de61adfb1876","tests/clap-missing-essential.avif":"4d61aacd2327661a456abc76d3d490e5ddd2b6f8cbfa52922a6c541c9d983193","tests/clusterfuzz-testcase-minimized-mp4-6093954524250112":"af7044a470732d4e7e34ac7ab5ff038c58b66f09702cbcd774931d7766bbfd35","tests/corrupt/a1lx-marked-essential.avif":"0d481240222450827ea335ae9a1a300777a0db4f9b0f4c17ed77c758c5133fa3","tests/corrupt/a1op-missing-essential.avif":"33c24d54f43f1a7be7a8334718881c8a0de24730c997c7842b9d7140e75017ea","tests/corrupt/alpha_video_moov_is_moop.avif":"89e0091edd6efc2c5b163525553c5abc56263fe1b3b885184bb07b9ea4bf346d","tests/corrupt/bug-1655846.avif":"e0a5a06225800fadf05f5352503a4cec11af73eef705c43b4acab5f4a99dea50","tests/corrupt/bug-1661347.avif":"31c26561e1d9eafb60f7c5968b82a0859d203d73f17f26b29276256acee12966","tests/corrupt/clusterfuzz-testcase-minimized-avif-4914209301856256.avif":"34a142c7916e314881f3fb6394add1c543fac0e5b45109e3a425eeb4c68998d0","tests/corrupt/hdlr-not-first.avif":"2c29308af077209b9c984921b7e36f8fb7ca7cf379cf8eba4c7a91f65bc7a304","tests/corrupt/hdlr-not-pict.avif":"9fe37619606645a95725300a9e34fada9190d1e0b3919881db84353941ca9291","tests/corrupt/imir-before-clap.avif":"22d6b5dacf0ef0be59053beba7564b08037fed859ada2885e3476e0ff0d19c95","tests/corrupt/invalid-avif-colr-multiple-nclx.avif":"7990a995855120dc4f724a6098816595becc35077fcd9e0de8c68300b49c4f1f","tests/corrupt/invalid-avif-colr-multiple-prof.avif":"b077a6b58e3a13ad743ee3f19fbae53b521eab8727606e0dba9bf06384f3121c","tests/corrupt/invalid-avif-colr-multiple-rICC.avif":"88b24d4d588744b9f2cdc03944f28283e9315eb3de7d7d57773a0541137f6529","tests/corrupt/invalid-avif-colr-multiple.zip":"9abddcbc47fde6da20263a29b770c6a9e76c8ab8dc785ef8512f35d9cb3206ed","tests/corrupt/ipma-duplicate-item_id.avif":"ca8c5275b0b8b79c1068489a52d0a5c8f0b4453463971e72b694189f11c10745","tests/corrupt/ipma-duplicate-version-and-flags.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","tests/corrupt/ipma-invalid-property-index.avif":"2480e773fa716d22883032d05fd4cf2c6b00fba8796cf4ff286a5d1ba26adff6","tests/corrupt/lsel-missing-essential.avif":"43c3b1e4c4acecd7559a9a7197a7befd43c71705748f0f8c063bca3be1c6d074","tests/corrupt/no-alpha-av1C.avif":"ad3d34d6331db7d9bea0c5f37efb88923520e33e08e7c636a5df435a4575eae7","tests/corrupt/no-av1C.avif":"eeb4fc50930c91465999f787c4a2a3b12de20556da0857be72da5a1a9eaa3f01","tests/corrupt/no-ftyp.avif":"74b431f32b2e2761e77df7fdb260f623b4e8f7e3f4c8af8a42d6826911706d7b","tests/corrupt/no-hdlr.avif":"91a1eb70c7b6adf2104e471d7deeeb98084a591d64ce09ba106c27edfbc3a409","tests/corrupt/no-ispe.avif":"4b6edfd8c9b40c25dc40305a6057e32b5e65f40da4a9d810c58dbff53254113f","tests/corrupt/no-pitm.avif":"7960eeb9e6e5140fbe5eb6d281e6974efd6c3c0147562f3dcf06f6b009dc540a","tests/corrupt/no-pixi-for-alpha.avif":"f8adc3573c79ee25bf6d4dd2693c61661469b28f86a5c7b1d9e41b0e8d2d53bb","tests/corrupt/no-pixi.avif":"4b1776def440dc8b913c170e4479772ee6bbb299b8679f7c564704bd03c9597e","tests/hdlr-nonzero-reserved.avif":"b872dcd7b4f49c6808d6da109cf4fedc26a237c42e8529c5aa8f7130abaf40a9","tests/imir-missing-essential.avif":"b1226e4b1358528befbd3f1126b5caf0c5051b4354777b87e71f6001f3829f87","tests/invalid-avif-hdlr-name-multiple-nul.avif":"0d3e4a6ce42154ee288c18339c2b59ff2104fd890cd2d616e5dbf26375a90e98","tests/irot-missing-essential.avif":"b7da1fc1d1b45bb1b7ca3494476e052f711d794a6d010df6870872ed8b9da10e","tests/lsel.avif":"ef8ba6827709f48cd45f749efb580129162d9599ea98f3363d2140957502d806","tests/multiple-extents.avif":"b5549ac68793e155a726d754e565cea0da03fa17833d3545f45c79e13f4c9360","tests/no-mif1.avif":"1442aa6ffaeb9512724287768bfd1850d3aa29a651ef05abb33e5dec2b3ee5c2","tests/overflow.rs":"16b591d8def1a155b3b997622f6ea255536870d99c3d8f97c51755b77a50de3c","tests/public.rs":"8918d5190a36c697445aa4b140a31cd3032582f1e504b4c2527f75a2155f80ae","tests/valid-alpha.avif":"9d417a35b9b62ad3ff66ffbc55f16552aacf821a092aa5ef4adff7e746bd4c2f","tests/valid-avif-colr-nclx-and-prof-and-rICC.avif":"ab6f5e786d26f8bcade5993f8b9cca3cd004a3d7fcec76e829f5d0f98cb18e7b","tests/valid-avif-colr-nclx-and-prof.avif":"0e982818de61869fcb85a2a4c2b7b8aeecb3053cbfdc6276987f91204998eefb","tests/valid-avif-colr-nclx-and-rICC.avif":"8530ef1305ff956a0c2912d0b3d1e0fc3a68cf3103e70b04cc2574530389b030","tests/valid-avif-colr-nclx.avif":"345ab58b7b1cb48aba2e21eb8dc5ab0a751a78a752ce1896c59b4bf361992f38","tests/valid-avif-colr-prof-and-rICC.avif":"1f0f085141106885bda78b0879c768818420d8196b39440a36578456a7d50a6c","tests/valid-avif-colr-prof.avif":"5d7aaefb5204ebe1cc296456866b8e46e023748b921a38ee56fd6c776a9733ff","tests/valid-avif-colr-rICC.avif":"e1c7b49bfad5904b484bd5118e6b33b78e2dc708a31a10fcbb0e4a373ed8dbb7","tests/valid.avif":"f0b33e09bf01232e0877df325f47986c0bee7764f2a81c9c908ae109e7dc63c4"},"package":null}
+\ No newline at end of file
++{"files":{"Cargo.toml":"f283fc1597f492cd1e03cd08b9c77f042ae4494fc96b4dcb566ec0abbda65efc","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"86cb40854b93f988e3a63ce6fe39d2ce95367f8ca301a5ba50676ff98a0ad791","benches/avif_benchmark.rs":"cd99c0dde025ab40d2cd860f53dc697a1587a48c164c3e5c8adfd40add29d772","link-u-avif-sample-images/.github/workflows/encode-and-decode-daily.yml":"84b787f721024a100ce09ac5714a1d78a4811893861e89495313f435b9d02359","link-u-avif-sample-images/.gitignore":"ac16d40779ab2d608843a3cb1b0418a1ffdc0e71a06c4d140386fadf007a54a7","link-u-avif-sample-images/LICENSE.txt":"da89f9867822be4b8adb1e601d9e9226c195016c6508015eb7593e68ead0c98a","link-u-avif-sample-images/Makefile":"b5697e8685d2a9ce0f4b4c976a5f707022ed113782d16dc59ae280d3a8ce77b1","link-u-avif-sample-images/README.md":"d249fb7bef4f21359cfc4f2977e1b2f2c6e6dd6e57cb1cdc1da1f0edd8aa55d0","link-u-avif-sample-images/fox.jpg":"927997a90ae88ead007283bf9c1392159d0acd2e9890522146211fda2112a2d9","link-u-avif-sample-images/fox.odd-height.png":"6136247772bd1c0edd50426bca4f3485473ac25a784e5ec8777f7491598e96db","link-u-avif-sample-images/fox.odd-width.odd-height.png":"6f91dc21c137f318d0443ce28bbf3f74d5502180c254327b46e41040a33f1363","link-u-avif-sample-images/fox.odd-width.png":"a8b2328c8700c16280c5ab40a34147edac598d4d48ca101bef649e468ae1492e","link-u-avif-sample-images/fox.png":"c45bfb5780843c70a37426340020e3e7ff41d7cf1df9fec614a5cf429d078573","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.avif":"811af5e96631309030a14cbc30c3bacfaa667f2e36e16a4f30434b8f5a23310c","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.avif":"e35713343e9ee04c51ab9cfdc99a0c7d126a1917cb83f5b9a23c71ed59269be2","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-height.avif":"485623f7838d8f442c47348c6492765e6aafbc3d5ccd8e90efc9c812ff15e265","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.avif":"8e75b9a8975267359d827e4cbc6877b1674aa31b87f88f222dde03263f9254df","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.odd-height.avif":"1fff5915a332d6aaa85d668f3f338bda6fad9c6ec1f380f2c46737d536cea5de","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-height.avif":"cca9785f14c74d865453518c0962dabd6d1b92d2c6c5f5ac67efdbf5606acb83","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.avif":"de3399d8b56431f0ed34e2f14200f31dd54544fddbb12f39b4d55449d5660c56","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.odd-height.avif":"07507744cb76b74a3586b93fc3b273a98f998d75f7687db3e9cb3725d7b1fb9d","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.avif":"cb884c82ac7b6d4fa03b1f687e9e20abc346107095473e9c1d422aaf0de14eaf","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.avif":"15d84077066c47fdbe2a7b8ed583a17017d09a033144ac1b31486d6c8f6f5c82","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-height.avif":"365439d2ee2fe5229e066362c03a73a182c7f6626772ecf5345b22752d32e681","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.avif":"c623b9943123d6c47d3300444f7255cbdfebfe2b47a670287f2baeb717fac42b","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.odd-height.avif":"dd069f3c3c4f7589f5f7ef1d7b6a91b8cb975d32663a4a92b6d75219edd72954","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-height.avif":"75628450288ace3386651725411c8f0ffff7eb95f82c5307b0faa3350f09f50e","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.avif":"f91b6f455412adabc5094011362eaaa1f6a9d5740de0b8a1be42a96c16e7617f","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.odd-height.avif":"bb8695cacacaf8f2e13a739de75e5e8a9d970d68c3acdfb7d82171a9bac2f01e","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.avif":"a10de8204aee73ba1786daca6390546bd7aa6b069aaa644012219a1c11246a43","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-height.avif":"734a5badc59a8bed19e8eb476911048ddb011ca7c9eac31b7a7ed20e0135ac2c","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.avif":"68d15d76d95f268e810dfd87bbf96d8c3197580afce2d30b50bb1f07865077f3","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.odd-height.avif":"01e469b33bacb7e07e15e23b2997907bbcf02d8fcc99885a027494d31c45547c","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.avif":"a0cdc981a6b056c8af2d177a1438c332d630040dacbfd1c89bb5e3e381ba5822","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-height.avif":"77e0510def73213c00ebcf051cf45fa63cf27d7c69340cc145ab6d44ec77bb07","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.avif":"12787042364bd13be01830f988cb714220bde340a3329baa808df27a269b83f8","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.odd-height.avif":"fad3b6dd9cb99e6925858f69aafae3f68c861845f2c3d4a6d1c51c6161490134","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.avif":"e34f3bab5df802be2d422c685824464eb5f7e182b235ca99bde11c4c34ff3ac2","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.avif":"05804752621e2fd7a9d85b01e2995a50e3efd30693efd934152560622d66e841","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-height.avif":"ef041f2efa0424d3a6dcfc5f0c3f619aea0e197aaeb5a050a2d877a457513921","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.avif":"b711b321b8a4d3a41e08f80a17c2203b839458cb6346aff6fff3f8d7699032e6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.odd-height.avif":"e3f40aad0ddd6c04ffacf4a754a0525986c89d519119d37655282551e3ea3a59","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-height.avif":"4ef74c37712b41d6e5269d939f9d52031bc10746f7c8c029db618c5935aff9a6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.avif":"4cf6c849f4a48a639217ad9a1e0d027f4fc804d524c03e6707ec9714a252532f","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.odd-height.avif":"3d3978e8e8d07270f82a877d3535f9483b88fce93a1c4accb658b494452b1d36","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.avif":"626d73272e59722084c528b27b72a0920bec462a10749b3e87036e42bf8a24e5","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-height.avif":"d1786723a5d6ea1e1764b0045dc3f669fe3905ffc2913011a2b1b424d2393397","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.avif":"a2d9178cc5622e28472a735650d9c4deaec6d27d69830110911f4158f9d4a04e","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.odd-height.avif":"89a9fc7598d72251b903e0c7088ab3e7a7f316b5e02b85f8c69e51f8eb0c7e69","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.avif":"51476b8471e1c0a5ebbd1e7545709495bef619cc96c02d277aad32b1deff8ea9","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-height.avif":"4808960cdcd1207b29eb6ef5b4db81ae5e63c5d40ef92f7a1e8f4430e765bde4","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.avif":"71f3c73737bc04c23d93ea2c61a8a07408f604192fe53fe12c65050927dacb4e","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.odd-height.avif":"8f9649384fa09c70af0c2e9e0d94ecd17492c702e015d9d6290d3aefc57c548c","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.avif":"ed96eca6ed79863eaf91e4d666e4e220b5fa4e5a6cb1696477ba901ac12f5dde","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-height.avif":"c43b4c607e301e34eb953770133d89d15e77d63be8d6421a80d6212fbbbf3453","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.avif":"0e6218ce250ee7f84a621f3af73286fd4dabea19e9898d3575c20c5955aa427d","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.odd-height.avif":"9f19846d884ac7d161ac2ca15811bb22ff7f3847bc1ad5d7713971ea024631aa","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.avif":"2cb363d30f83bff58ee049874b1808b37cb1d35342edf16b3ce25cb243c9ea55","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.avif":"8217b88f350c5d3812d7f863fe9d710c4c1b846b0be8df29ce6b3eb30d2b8d8f","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-height.avif":"51eccd8c1368ddec9bc1f3a7631dadb00682e985fbfea66c0a2f533f6a73b67e","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.avif":"83fe4593ab839cf296a2ccb8a146daf826d1d602f4f239cb63ee020f2cc326f6","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.odd-height.avif":"4e63b84a980a81adde586314a94d8f834ec763749d8797c286471415b6b75647","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-height.avif":"efc70882aacbb533c0e833a4401949d152dceb364846442cdccca5048ad17a60","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.avif":"c07575c88ef400c1725c9260a19439e0e784da41c7db3867059019ddbdb3bebe","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.odd-height.avif":"86aee64fd7b11b9834537ea14b2eff234c062c98d32fab51ff14aba262d5b106","link-u-avif-sample-images/hato.16bpc.png":"53b550c587cd1d19a1997184e47f4a3ff2a05cedf7cb4e42a9466a6d6cb60d8d","link-u-avif-sample-images/hato.jpg":"6d4804e5e4adf36a6b138544c81b743ed7abdd9a495a43e883ec77689ca28943","link-u-avif-sample-images/hato.png":"313880f4cc51160fec522d78f1fb7f06df70fe1929a731fc86c68ecefd312277","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.avif":"1e84598c94bc795c55a551bdf6f283b4eed4997bda15e5c4bb2e29d0dc70897b","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.monochrome.avif":"25c19a187d10eac963bb51b3fae1ffe50f3ccbc7ad02e51948dc7467b397ce61","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.avif":"07cd454de19dd638354f75d9e97aab08bc8a04dd45c4f7531cb62a1a5656c8c9","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.monochrome.avif":"120a3f26f3d6cde80869fb52bdb8fdd55b443882c98070ea938575e4790982ff","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.avif":"d54251d4bc023f2e53624a46cb18e56cbc45768bd1bd50394de191c2a42106e8","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.monochrome.avif":"ed33dfdb5e663b3394298b6921f9b19b129e14788dead776430eee2f14780a73","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.avif":"ad361ac7d94fbc6af7ef30cbd3601ff366bc360c304480387a58a4c6fecee9b6","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.monochrome.avif":"e28b4cacda95750e465e205fbfcba6a6af1d8418dac649838730c555ff7d828f","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.avif":"69c353c482c2eb3d3671bb55f7ccfc932e4d781c714a72116e9138ffc6f6c720","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.monochrome.avif":"e7d6f7d42a8519e1482f225fe447b5642d19a54ee830529223eac114a0dec189","link-u-avif-sample-images/images.html":"9e18453dfe5b205600f158282c6896265281e3b04b2fbc332804fab1dbdb3faf","link-u-avif-sample-images/kimono.avif":"63412e0f67f37c8b6fcf0e8269a2afae0a017fa6a3a99d37d055c590b0be52d3","link-u-avif-sample-images/kimono.crop.avif":"f175dcd9c64813b759da185fa67076fb772b76059845b2aad3ddcfab257f75ad","link-u-avif-sample-images/kimono.crop.png":"0d5605bae0ec9d39aad9dc8e1a371d0327c6a224643983e3ee1f4d44cb00f19d","link-u-avif-sample-images/kimono.jpg":"a6ad58e3cea437ee0c841115ba67ae7354de7af734de50de9d0853dd4e571577","link-u-avif-sample-images/kimono.mirror-horizontal.avif":"2bbc004d91145488610158a5acdb4d706495a2b15511db20ff57bb9efd80885c","link-u-avif-sample-images/kimono.mirror-horizontal.png":"9af9e839fe6bf6342831970c20291f619570d2fc687951ae00cd81ea766f53fe","link-u-avif-sample-images/kimono.mirror-vertical.avif":"f10eb04791fcca3409868b367128649f32e6b6fffcf02484cdefa57909f6bb74","link-u-avif-sample-images/kimono.mirror-vertical.png":"4ed003c5868fd2e78c7b2dcbd54a67a0e7593dabb3ac82b1c9e5e2dbdf09b8ec","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.avif":"33c36ec2274b00ac6f81c9f61e55c20cbfce1649ad27520afe635310f516ead1","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.crop.avif":"90ca48f657455b8f8e4a4e1769a05af90a3e34dca11a8b3c32552daf378ee956","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.png":"74b9b7ffa8955761f747a0e6e81d5b7ecb5e325383546110e1b6aa9986728035","link-u-avif-sample-images/kimono.png":"84fd6cfb97a27739608e21779f874b4ae7e80342b2588e8b0b092dee2d57c881","link-u-avif-sample-images/kimono.rotate270.avif":"79a99a0415276cc11f2e871d070a9df84df3385888a2f2fa3534320f6bed98ed","link-u-avif-sample-images/kimono.rotate270.png":"1918a47c02b378945a705301abd4250ddc65bb95afce9424572ffd0fdd1f45ef","link-u-avif-sample-images/kimono.rotate90.avif":"bd1157d8c840713c82b907b9d3ae80bc3817849e11c323d875f8016e035bd3cc","link-u-avif-sample-images/kimono.rotate90.png":"1a73c61692abe96d0a7a9accdb36a83d51bceac79bbb83a00571570f494cca49","link-u-avif-sample-images/plum-blossom-large.png":"af6ea005b726ca39f342e946aa53bed88e5a140413ce896d166bb35ab0aa3b4f","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"b413440309d5669a7aefa06f291f72de0d0c09972e3da9a385e6016d6a1c5562","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.avif":"64f6f2b1fda594af5c9e2d6e4bc752b55e8121000cdcedc0066018e53f76de40","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"2b175a600aed64c1c1de4b2d661fb405437b1ff000b964d4be6ac437ce73136f","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.avif":"21ebb3732186bf7c6c13cf7197155b64201e674b9c79cf613b6e5718bde14c2a","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"65917797e511c9033b3e225eb5d84f3c0440b7a496d4b8ab5674e123ad68aab7","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.avif":"f4809df9188fa46ed100f63c78c4cf42559d90a98351a8f69e177385920672b4","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"dffc213dc36f0b5ff3d86254f5185c2d1fb03380918a8fa39d186fb59cbba7cc","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-full.avif":"0a615cfb673ab45e37da3582c17dd36f86d5da3d81246a32951d1db4ed90149d","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-limited.avif":"d1cc6a0db116a68e229676b289e8ced84d42a9f0e8d3ccd760fc92dbeb932547","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-full.avif":"8626cf0b2c60fee51cf1df7fe4d8a18081b72e3604f7d3ff14cc5a35581927d9","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-limited.avif":"56bf18e4bcbfbea460c306ab900fc506169854d2b91690e1a48156a86fff3264","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.avif":"b56f3c33797e4c5bb80418ae25f6f2c6fc88ddc1f6965d82abc44059f052f36c","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"c3c6db4ce801c68e2afd7bfb72abacc13287cc2e247917a817ff5632bd4b18fb","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.avif":"095f57fff1dc037a6414c60263415dcfa86b10d81f58e8e4c3aef17cffae0e5f","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"ba3035a69296d12f47d1c450f2de8cc0c9059ebbf27bb8b0996ff6d1ab1132a1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.avif":"a9551e1963049b874216b40aaf9be45bc44dc11887770712b77240862c6c08a9","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.avif":"6891b5bdbed7f541c673c66cec4584b191bb737a49b37cca16ae069830890b42","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.avif":"a466503110f60dcadaafe78c2cb0a8ca58334c22868efe428c7ac12b69407c95","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.avif":"061b4c70707e7fc8866580656cca7ca2da2263645829a564dbf8f205d639f058","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.avif":"4a03c8bcfcaadccdeb07432ed80680b06aba5ae5e616fc370b376acb478f6cd1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.avif":"376625ce4e7ec3b57344a9f2185a34975fe380774c9f8e0dd4ef61c46da94fca","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.avif":"1e17b7dd8e351cb667bc6ec0b81fdebca9fd30ad5e588b3eac57bf9f90a9b58b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"f77588d2ff39e4461869a95ca236efdf4a3fdc17b8a6e3907e63b417e56c81b5","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.avif":"f2eabd3fc2db07b361d55b5af63023d28b5bdd0047a665e9d0685651ce9db94b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"dd88c377b253d689bfd4600d7c3007448df0ed92f679b661d5d51e051a6916d8","link-u-avif-sample-images/plum-blossom-small.png":"c859fd97b647e494461f65835b9c1c3476807aee77076599adf18a832b3617a4","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.avif":"fe3379620f983e5da4210b0f7c5d164e86208b34106d6b11d56e2b52beee5dfe","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"9e6234686053dba2e44bb32192c641074095a61e45aa1bede85bb83751e6e157","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.avif":"60ffa59dd007aea3bb596cfb03853b3dad490b1ffd10471ad4fe1901ec819907","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"58abfa027525aca7339a705f311bc30b000aef9822c7c50b232894ece1ba9cb1","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.avif":"541ca66a11b1430d11f77b74a13f859239a3bd9f44976b8dfe163c5d7595a69f","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"6d7852c63c27a77bef94443e178ecf6b6a3da8cc846f9f0c1adc17f7fc35e1f3","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.avif":"3712216ffc7edb95a976b68469ead533fda6fe9f3d2e8cb09cbdb0d01d9c094b","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"59672af536b169ebf7e48129167dc91cb253925517c37db28b64539f7afba5d3","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-full.avif":"561d5158425ad39425916a3be048b0202e82efef44cf1a9f711db57192d2ff01","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-limited.avif":"88336f29457c1dc4ae0b754ef14b791de4d8c337f2b44d7960aafcca08a5586e","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-full.avif":"245a3dad6371dc702f29eb7e9735f843b63c525da871859728bedbe5bb274985","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-limited.avif":"490c216b5850c670f6088ee72c7fd906102b2dd0c8432c01a517b3328db27c75","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.avif":"0d0bbbcb0c9ade1c827317a6409ce6ba25027b36da1b6752379a5f5d4c8af056","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"418a9d4b7dcbc1f67fc4b95ccb2e7946c446fddd35a79f0d587b3f2165cb3f14","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.avif":"a41dcfabb3795ed93a05881a91bf4d1c5d1b9b0e5d0db728f12684b12613e0c9","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"4b6a18f4f608d1b00598e67c1c91a4e8f4943ae5acf0166ae0121cc21f3b7437","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.avif":"5e6b83adee3aeac4bba3f38e854e2ed7585aa1557a74b5fa66596098c53e26f2","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.avif":"f42e780bff644167e27525fee65b23e70814f7665ea19b6d693eb127c5eeebd8","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.avif":"c6ee9234ee7783d0203f9512e3cc8fe76a694675bcf03c320ff8bab4684bd4e9","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.avif":"21e1e51fc6da66e090e12e1df5aeabf1f478df64bcb8151caaa687ad262bdd9d","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.avif":"dfed73d646d7159d3ee4f9ce95ea628fdd33bf8bf1bb02a83d88302d088f4d97","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.avif":"5539cd575256772ba31d6e87cb0136d5f465f84b041a4677b1023cfd6bee9956","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.avif":"f205cf2c05265b84e45ceb723e9a3707fd8749130166d4797e64c8c62b497f8c","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"ad2244cb7b2ac487a5104d6e5a07270f9ceb2550e4d56d3662fcc1868910ced5","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.avif":"7ef9468effdc970e4e6e8cc7533d66dc967686e357dda3dda186c021f9e6156b","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"3dd34d854ff83b6e27a2bf98301380a6cac272084ed863735285ab5dc8acda00","link-u-avif-sample-images/plum-blossom.svg":"be1f03dd05f63292c85a96b1c48fb06727283610cc69b1e116d547bab27b171d","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-10bpc.avif":"5842951d81118d256962384e08a986816e8ade6b05530269f0208c6b69cedb3b","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-12bpc.avif":"1f0c9f36d69b9aa13eff3897ada3e78b81099c613b329a402c27e09453e7e261","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-8bpc.avif":"3e6f2f4016e66e3c94707eaa8373e6f582321e005964cd35b64bc183e1bf10ea","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-lossy.avif":"79483242f2dca12c4ec18bd33ff8099216b3094fb55a26a909f046b2f9b4ce58","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.jpg":"d56f809ea5eda74578af57e2f80b41856a1fe2ff436c741aa58757387af998bd","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.png":"4eab95e358eb48e052c7b8c94d30a8c6cb1c9c3c2dfd9845240281dd5dd7b800","link-u-avif-sample-images/scripts/compare.sh":"0562689bcd40e9fc1322bf037d6f999aa4406a2229f19e74b96cc450e370e429","link-u-avif-sample-images/star-10bpc-with-alpha.avifs":"5643ac1f235ae6599186dd66c66507db6fa46a17b2b18e82ea9344870eb98a9b","link-u-avif-sample-images/star-10bpc.avifs":"c61d899a59dbd8c7b2f7bcfca9069a0e13ff1606899af227938a28502e6cbf88","link-u-avif-sample-images/star-12bpc-with-alpha.avifs":"88a350c3550ce36c1777fe7eb1e906c6829d3ed8b241aa1e0e46f1a4e2567c4b","link-u-avif-sample-images/star-12bpc.avifs":"c1a59db6f180208a3177d77c7f9ab08290e903c7bdaf929331b807a510f8c619","link-u-avif-sample-images/star-8bpc-with-alpha.avifs":"13a12908cb162a855cccc9221a5f9f736e8ea07902ffbdcf007f8fde5ed255f2","link-u-avif-sample-images/star-8bpc.avifs":"ae35b161de67a5afeb195ee401f369c34990f0ff8662f70ab4065bc6931f0a66","link-u-avif-sample-images/star.gif":"389cdd02efbdce4f0205cae6e91c1f64e34fa0ca1fe02351da1b37e16cbb642a","link-u-avif-sample-images/star.input.txt":"970163b942843618616f42233abe91d40fb68f6f5451860db259551711867b55","link-u-avif-sample-images/star.png":"18569167cf7ebd265ab6973d071d259aacfbb46c0408b7d4874c8cc9df9bb1ad","link-u-avif-sample-images/star.svg":"13089d0986b31b87919029fa69f2b68981af4023306bf0f79922f6772396008a","link-u-avif-sample-images/star180.png":"21bc11be2b51334fe4589634507612e7edce96d36e6a99219d029e440164e8b8","link-u-avif-sample-images/star270.png":"5c93f538dcdc70840b9925b4089083acc9c25e95265b3f3dea18d695451b441e","link-u-avif-sample-images/star90.png":"2defc5d21e70447653fec5dc14a697d9dd555d7a0c14e79cb2d9f80796a51a6d","src/boxes.rs":"270a3e3bf90279bfc83f95acadaba9611c25243280bca71dfa9c044d5441cf15","src/lib.rs":"a88d6cc10ec1322b53a8f4c782b5133135ace0fdfcf03d1624b768788e17be0f","src/macros.rs":"76c840f9299797527fe71aa5b378ffb01312767372b45cc62deddb19775400ae","src/tests.rs":"75fe5467109242b2cc7991f8228e2e2ad1de5be2f29272a4a7f08c4e21ab5fa4","src/unstable.rs":"c2cef9a3b2b08a4da66fa0305fce7a117bd99c9b8d57b0a044e1d99dbda6faf5","tests/1x1-black-alpha-50pct-premultiplied.avif":"31a8c235bf2cf601a593a7bc33f7f2779f2d5b2e0cd145897b931fce94b0c0b8","tests/a1lx.avif":"81a784c568e7619bd47c4e7153181e9a86c8a03221097aa63979f97affd7efbb","tests/a1op.avif":"184e50efd3ad226800c610da7bc470d29b548d9fa942fd1fd1848ed02e2e5f0a","tests/alpha_video_avif_major_avis_compatible.avif":"81771981248c4e0d708f0828eadb20e9e37e7c21280efe5726666958f899c237","tests/alpha_video_fixed.avif":"67051d1a4ccf9f3e38d4514d8a6b3a2e07f1beb979369cabdc60881a698a36ac","tests/alpha_video_no_avis.avif":"a95f0e7c818bc5bf646143cf43474b70722e17669d4f2a32874c125936207d6a","tests/amr_nb_1f.3gp":"d1423e3414ad06b69f8b58d5c916ec353ba2d0402d99dec9f1c88acc33b6a127","tests/amr_wb_1f.3gp":"be635b24097e8757b0c04d70ab28e00417ca113e86108b6c269b79b64b89bcd5","tests/av1C-missing-essential.avif":"a1501254c4071847b2269fe40b81409c389ff14e91cf7c0005a47e6ea97a6803","tests/bad-ipma-flags.avif":"ecde7997b97db1910b9dcc7ca8e3c8957da0e83681ea9008c66dc9f12b78ad19","tests/bad-ipma-version.avif":"7f9a1a0b4ebbf8d800d22eaae5ff78970cc6b811317db6c1467c6883952b7c9b","tests/bbb_sunflower_QCIF_30fps_h263_noaudio_1f.3gp":"03e5b1264d0a188d77b9e676ba3ce23a801b17aaa11c0343dfd851d6ea4e3a40","tests/clap-basic-1_3x3-to-1x1.avif":"83af9c8196fa93b2475163585a23d0eb5a8f8015d0db8da7a5d6de61adfb1876","tests/clap-missing-essential.avif":"4d61aacd2327661a456abc76d3d490e5ddd2b6f8cbfa52922a6c541c9d983193","tests/clusterfuzz-testcase-minimized-mp4-6093954524250112":"af7044a470732d4e7e34ac7ab5ff038c58b66f09702cbcd774931d7766bbfd35","tests/corrupt/a1lx-marked-essential.avif":"0d481240222450827ea335ae9a1a300777a0db4f9b0f4c17ed77c758c5133fa3","tests/corrupt/a1op-missing-essential.avif":"33c24d54f43f1a7be7a8334718881c8a0de24730c997c7842b9d7140e75017ea","tests/corrupt/alpha_video_moov_is_moop.avif":"89e0091edd6efc2c5b163525553c5abc56263fe1b3b885184bb07b9ea4bf346d","tests/corrupt/bug-1655846.avif":"e0a5a06225800fadf05f5352503a4cec11af73eef705c43b4acab5f4a99dea50","tests/corrupt/bug-1661347.avif":"31c26561e1d9eafb60f7c5968b82a0859d203d73f17f26b29276256acee12966","tests/corrupt/clusterfuzz-testcase-minimized-avif-4914209301856256.avif":"34a142c7916e314881f3fb6394add1c543fac0e5b45109e3a425eeb4c68998d0","tests/corrupt/hdlr-not-first.avif":"2c29308af077209b9c984921b7e36f8fb7ca7cf379cf8eba4c7a91f65bc7a304","tests/corrupt/hdlr-not-pict.avif":"9fe37619606645a95725300a9e34fada9190d1e0b3919881db84353941ca9291","tests/corrupt/imir-before-clap.avif":"22d6b5dacf0ef0be59053beba7564b08037fed859ada2885e3476e0ff0d19c95","tests/corrupt/invalid-avif-colr-multiple-nclx.avif":"7990a995855120dc4f724a6098816595becc35077fcd9e0de8c68300b49c4f1f","tests/corrupt/invalid-avif-colr-multiple-prof.avif":"b077a6b58e3a13ad743ee3f19fbae53b521eab8727606e0dba9bf06384f3121c","tests/corrupt/invalid-avif-colr-multiple-rICC.avif":"88b24d4d588744b9f2cdc03944f28283e9315eb3de7d7d57773a0541137f6529","tests/corrupt/invalid-avif-colr-multiple.zip":"9abddcbc47fde6da20263a29b770c6a9e76c8ab8dc785ef8512f35d9cb3206ed","tests/corrupt/ipma-duplicate-item_id.avif":"ca8c5275b0b8b79c1068489a52d0a5c8f0b4453463971e72b694189f11c10745","tests/corrupt/ipma-duplicate-version-and-flags.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","tests/corrupt/ipma-invalid-property-index.avif":"2480e773fa716d22883032d05fd4cf2c6b00fba8796cf4ff286a5d1ba26adff6","tests/corrupt/lsel-missing-essential.avif":"43c3b1e4c4acecd7559a9a7197a7befd43c71705748f0f8c063bca3be1c6d074","tests/corrupt/no-alpha-av1C.avif":"ad3d34d6331db7d9bea0c5f37efb88923520e33e08e7c636a5df435a4575eae7","tests/corrupt/no-av1C.avif":"eeb4fc50930c91465999f787c4a2a3b12de20556da0857be72da5a1a9eaa3f01","tests/corrupt/no-ftyp.avif":"74b431f32b2e2761e77df7fdb260f623b4e8f7e3f4c8af8a42d6826911706d7b","tests/corrupt/no-hdlr.avif":"91a1eb70c7b6adf2104e471d7deeeb98084a591d64ce09ba106c27edfbc3a409","tests/corrupt/no-ispe.avif":"4b6edfd8c9b40c25dc40305a6057e32b5e65f40da4a9d810c58dbff53254113f","tests/corrupt/no-pitm.avif":"7960eeb9e6e5140fbe5eb6d281e6974efd6c3c0147562f3dcf06f6b009dc540a","tests/corrupt/no-pixi-for-alpha.avif":"f8adc3573c79ee25bf6d4dd2693c61661469b28f86a5c7b1d9e41b0e8d2d53bb","tests/corrupt/no-pixi.avif":"4b1776def440dc8b913c170e4479772ee6bbb299b8679f7c564704bd03c9597e","tests/hdlr-nonzero-reserved.avif":"b872dcd7b4f49c6808d6da109cf4fedc26a237c42e8529c5aa8f7130abaf40a9","tests/imir-missing-essential.avif":"b1226e4b1358528befbd3f1126b5caf0c5051b4354777b87e71f6001f3829f87","tests/invalid-avif-hdlr-name-multiple-nul.avif":"0d3e4a6ce42154ee288c18339c2b59ff2104fd890cd2d616e5dbf26375a90e98","tests/irot-missing-essential.avif":"b7da1fc1d1b45bb1b7ca3494476e052f711d794a6d010df6870872ed8b9da10e","tests/lsel.avif":"ef8ba6827709f48cd45f749efb580129162d9599ea98f3363d2140957502d806","tests/multiple-extents.avif":"b5549ac68793e155a726d754e565cea0da03fa17833d3545f45c79e13f4c9360","tests/no-mif1.avif":"1442aa6ffaeb9512724287768bfd1850d3aa29a651ef05abb33e5dec2b3ee5c2","tests/overflow.rs":"16b591d8def1a155b3b997622f6ea255536870d99c3d8f97c51755b77a50de3c","tests/public.rs":"8918d5190a36c697445aa4b140a31cd3032582f1e504b4c2527f75a2155f80ae","tests/valid-alpha.avif":"9d417a35b9b62ad3ff66ffbc55f16552aacf821a092aa5ef4adff7e746bd4c2f","tests/valid-avif-colr-nclx-and-prof-and-rICC.avif":"ab6f5e786d26f8bcade5993f8b9cca3cd004a3d7fcec76e829f5d0f98cb18e7b","tests/valid-avif-colr-nclx-and-prof.avif":"0e982818de61869fcb85a2a4c2b7b8aeecb3053cbfdc6276987f91204998eefb","tests/valid-avif-colr-nclx-and-rICC.avif":"8530ef1305ff956a0c2912d0b3d1e0fc3a68cf3103e70b04cc2574530389b030","tests/valid-avif-colr-nclx.avif":"345ab58b7b1cb48aba2e21eb8dc5ab0a751a78a752ce1896c59b4bf361992f38","tests/valid-avif-colr-prof-and-rICC.avif":"1f0f085141106885bda78b0879c768818420d8196b39440a36578456a7d50a6c","tests/valid-avif-colr-prof.avif":"5d7aaefb5204ebe1cc296456866b8e46e023748b921a38ee56fd6c776a9733ff","tests/valid-avif-colr-rICC.avif":"e1c7b49bfad5904b484bd5118e6b33b78e2dc708a31a10fcbb0e4a373ed8dbb7","tests/valid.avif":"f0b33e09bf01232e0877df325f47986c0bee7764f2a81c9c908ae109e7dc63c4"},"package":null}
+\ No newline at end of file
+--- thunderbird-102.11.1/third_party/rust/mp4parse/src/lib.rs.mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100	2023-05-24 00:50:52.000000000 +0200
++++ thunderbird-102.11.1/third_party/rust/mp4parse/src/lib.rs	2023-06-08 14:17:40.193695212 +0200
+@@ -3184,8 +3184,13 @@ macro_rules! impl_mul {
+             type Output = $output;
+ 
+             fn mul(self, rhs: $rhs) -> Self::Output {
+-                static_assertions::const_assert!(<$output>::MAX <= <$inner>::MAX as u64);
+-                static_assertions::const_assert!(<$lhs>::MAX * <$rhs>::MAX <= <$output>::MAX);
++                static_assertions::const_assert!(
++                    <$output as UpperBounded>::MAX <= <$inner>::MAX as u64
++                );
++                static_assertions::const_assert!(
++                    <$lhs as UpperBounded>::MAX * <$rhs as UpperBounded>::MAX
++                        <= <$output as UpperBounded>::MAX
++                );
+ 
+                 let lhs: $inner = self.get().into();
+                 let rhs: $inner = rhs.get().into();
diff --git a/rust-bindgen-2319-2339.patch b/rust-bindgen-2319-2339.patch
new file mode 100644
index 0000000..fcf2ae0
--- /dev/null
+++ b/rust-bindgen-2319-2339.patch
@@ -0,0 +1,154 @@
+--- thunderbird-102.11.1/third_party/rust/bindgen/.cargo-checksum.json.rust-bindgen-2319-2339	2023-05-24 00:50:52.000000000 +0200
++++ thunderbird-102.11.1/third_party/rust/bindgen/.cargo-checksum.json	2023-06-07 01:11:35.838302019 +0200
+@@ -1 +1 @@
+-{"files":{"Cargo.lock":"836e8f8431bd4ebdac9b1251676f6afa755757e401455259fe659e7280be8230","Cargo.toml":"3a585a6e27a177f08dedcb21f7d555e9db58fa158203273b228db91ebee4e6b3","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"29fe30d7a2729922b13a578bc8f5eedc808fd0f2ef67a3f12017548baf8f293a","build.rs":"3fe1e534c99df4ee207606794f133fb187c0948e055389f74c904994ecaed38a","csmith-fuzzing/README.md":"7107b70fedb0c0a0cadb3c439a49c1bd0119a6d38dc63b1aecc74d1942256ef2","src/callbacks.rs":"1e5a118b94977938751758ac0495b1d41ce5e280c066614a4a7cbd930f326350","src/clang.rs":"aa0644278a8319506be08904c0f6706fbcdcd72eb1e85564b8c7488bd810e126","src/codegen/bitfield_unit.rs":"a8fb1a2d97a99685106fcaac87d2013f79d2690d6a46ff05ad1e3629b6075664","src/codegen/bitfield_unit_tests.rs":"dd252134118450800b516e375c872e17b4c1aee63a7b8adbe5b2cd53434bbc7e","src/codegen/dyngen.rs":"15149bc927e5b2706f93e52a6b26ef55384b3baf40bfc9bc4343e9820479f26b","src/codegen/error.rs":"5e308b8c54b68511fc8ea2ad15ddac510172c4ff460a80a265336440b0c9653d","src/codegen/helpers.rs":"ea83104addb8af31736aaeb850e10c694cd434befe7ffaaa206208f722d72c58","src/codegen/impl_debug.rs":"1ff9ec754b610c98c757b114c6509473ead0e1a9375e9089a7fa40a41a753709","src/codegen/impl_partialeq.rs":"5e526fd88dd15dd1f04addd3c6ecea1d3da92293fadf04346d6c716791f436f9","src/codegen/mod.rs":"19fd11feefab0ff9ecaf8a01583583008269adce805508fb61b9a8acc49da586","src/codegen/struct_layout.rs":"b62c3569dcfb011daa4d09f1aa9eb732da69546c3deb9f247fa8ce7114dbc7b9","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"fafb85510b1dfc9a41ed71f7d765fca49b236deb4ee567e00204e751362aaf23","src/ir/analysis/derive.rs":"ff4821d810961696008a57ae496f95ebcdc14b4c439fe87d78a84817442fa759","src/ir/analysis/has_destructor.rs":"d9a3a24bd4cabc87cddb0c76d27da1691f8f37ffb8eadf5b5975a1c44dea99c2","src/ir/analysis/has_float.rs":"5242cc07ec4d4bdf5a792e1f8ee5758a87838314917d42dbb9dcfc19620520ce","src/ir/analysis/has_type_param_in_array.rs":"ec3fb67f782abb4c866da91bce3f7ee6f8e2310c47a54065282431b909233f7d","src/ir/analysis/has_vtable.rs":"63e2d0f62171811893615c11453bc7b39438d0d83c3eb444dec2346140d86efe","src/ir/analysis/mod.rs":"2c54f0cd6f3d86cf3fcb07d9d0be06cde839cab4170671c80d806a3f27820faf","src/ir/analysis/sizedness.rs":"17f1f2b6affd025f73853b9b5a76b3f157b5f9e563e9eaa374735fcb84c13308","src/ir/analysis/template_params.rs":"da949976a7fd04d6fc564ea6a77dfdbf4f5bf05db64687ed7a0616cba598a42d","src/ir/annotations.rs":"1c931d7bbba1e1613e9cccaab58d14f75e79b831b5c881e41f5b5257a9cbced7","src/ir/comment.rs":"31d64a49ae3d9c3c348fa2539e03306ca3a23fae429cab452e42b31ecf632145","src/ir/comp.rs":"abaa90e27dc6416f1b8db003f87888e7651d5b46c4d4526153980e5621612e54","src/ir/context.rs":"3a76458a5aa74075a60a5cd752ed59ad3943054f55b017700389f78072935215","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"e25ff72ac174a798894c9673d81bdfb86fa9f4228b34a14ce0dc741a186a52bd","src/ir/enum_ty.rs":"e49e3c6ffc0289584e2f836fe56a4b7ebf6ca3f8b602248141d67b9f533770cc","src/ir/function.rs":"aa454ace56bda8074b2865933282aa124624310c8bc0c994d454f5799f4e88be","src/ir/int.rs":"68a86182743ec338d58e42203364dc7c8970cb7ec3550433ca92f0c9489b4442","src/ir/item.rs":"a71bdacc7419ec86d52ac534158cf4bfa4600e9cbc214c0075766700f5b053b0","src/ir/item_kind.rs":"7666a1ff1b8260978b790a08b4139ab56b5c65714a5652bbcec7faa7443adc36","src/ir/layout.rs":"755e3787c262de434a53a8c326f0e825f95415ed6b0f925c1cddf208ca8e3bc4","src/ir/mod.rs":"713cd537434567003197a123cbae679602c715e976d22f7b23dafd0826ea4c70","src/ir/module.rs":"70cf6ddfeabe6cdc13fdc767c783216c073404848d827e85fc6c2de3a19b5c3f","src/ir/objc.rs":"195fb2a3e4371b90244f3a8f295fd80cc77e0f2daf8fd27e3d8e5b78bd6b55d6","src/ir/template.rs":"44bd7214cf1e7f70e60694115082aac5b8a6c1687fff584cd08cdcfadabc5734","src/ir/traversal.rs":"5ac088277f4dfe2918d81b9294aaee41fd83db8e46def66a05f89de078bf4c49","src/ir/ty.rs":"8f2b970da76850685c4d334289af6dede7742862d7a81f2236115afaa1a92fa9","src/ir/var.rs":"86e9f19403fb9231ba60dec0a04e5b56fe28a37c7a5e6f676c978789c9d93c5a","src/lib.rs":"ed2d0aeb48b28b4a96b8e76a10e00b10cb6cc32c0a686d536f9021463b7ee0e8","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"74e582c37b146090332b1496f5b4bca02c7629d03a4ae40302cb4a723f08e445","src/options.rs":"119358b741601dafc13560856f6e4b4f78b6cd2b19067893c2672ba8f5dc6de1","src/parse.rs":"4ffc54415eadb622ee488603862788c78361ef2c889de25259441a340c2a010f","src/regex_set.rs":"6c46357fb1ee68250e5e017cbf691f340041489ae78599eee7a5665a6ddce27f","src/time.rs":"8efe317e7c6b5ba8e0865ce7b49ca775ee8a02590f4241ef62f647fa3c22b68e"},"package":"2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239"}
+\ No newline at end of file
++{"files":{"Cargo.lock":"836e8f8431bd4ebdac9b1251676f6afa755757e401455259fe659e7280be8230","Cargo.toml":"3a585a6e27a177f08dedcb21f7d555e9db58fa158203273b228db91ebee4e6b3","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"29fe30d7a2729922b13a578bc8f5eedc808fd0f2ef67a3f12017548baf8f293a","build.rs":"3fe1e534c99df4ee207606794f133fb187c0948e055389f74c904994ecaed38a","csmith-fuzzing/README.md":"7107b70fedb0c0a0cadb3c439a49c1bd0119a6d38dc63b1aecc74d1942256ef2","src/callbacks.rs":"1e5a118b94977938751758ac0495b1d41ce5e280c066614a4a7cbd930f326350","src/clang.rs":"30fdc473ff70dcbc394927d6fb674d70a62c1a3847e855becd988dc476997815","src/codegen/bitfield_unit.rs":"a8fb1a2d97a99685106fcaac87d2013f79d2690d6a46ff05ad1e3629b6075664","src/codegen/bitfield_unit_tests.rs":"dd252134118450800b516e375c872e17b4c1aee63a7b8adbe5b2cd53434bbc7e","src/codegen/dyngen.rs":"15149bc927e5b2706f93e52a6b26ef55384b3baf40bfc9bc4343e9820479f26b","src/codegen/error.rs":"5e308b8c54b68511fc8ea2ad15ddac510172c4ff460a80a265336440b0c9653d","src/codegen/helpers.rs":"ea83104addb8af31736aaeb850e10c694cd434befe7ffaaa206208f722d72c58","src/codegen/impl_debug.rs":"1ff9ec754b610c98c757b114c6509473ead0e1a9375e9089a7fa40a41a753709","src/codegen/impl_partialeq.rs":"5e526fd88dd15dd1f04addd3c6ecea1d3da92293fadf04346d6c716791f436f9","src/codegen/mod.rs":"19fd11feefab0ff9ecaf8a01583583008269adce805508fb61b9a8acc49da586","src/codegen/struct_layout.rs":"b62c3569dcfb011daa4d09f1aa9eb732da69546c3deb9f247fa8ce7114dbc7b9","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"fafb85510b1dfc9a41ed71f7d765fca49b236deb4ee567e00204e751362aaf23","src/ir/analysis/derive.rs":"ff4821d810961696008a57ae496f95ebcdc14b4c439fe87d78a84817442fa759","src/ir/analysis/has_destructor.rs":"d9a3a24bd4cabc87cddb0c76d27da1691f8f37ffb8eadf5b5975a1c44dea99c2","src/ir/analysis/has_float.rs":"5242cc07ec4d4bdf5a792e1f8ee5758a87838314917d42dbb9dcfc19620520ce","src/ir/analysis/has_type_param_in_array.rs":"ec3fb67f782abb4c866da91bce3f7ee6f8e2310c47a54065282431b909233f7d","src/ir/analysis/has_vtable.rs":"63e2d0f62171811893615c11453bc7b39438d0d83c3eb444dec2346140d86efe","src/ir/analysis/mod.rs":"2c54f0cd6f3d86cf3fcb07d9d0be06cde839cab4170671c80d806a3f27820faf","src/ir/analysis/sizedness.rs":"17f1f2b6affd025f73853b9b5a76b3f157b5f9e563e9eaa374735fcb84c13308","src/ir/analysis/template_params.rs":"da949976a7fd04d6fc564ea6a77dfdbf4f5bf05db64687ed7a0616cba598a42d","src/ir/annotations.rs":"1c931d7bbba1e1613e9cccaab58d14f75e79b831b5c881e41f5b5257a9cbced7","src/ir/comment.rs":"31d64a49ae3d9c3c348fa2539e03306ca3a23fae429cab452e42b31ecf632145","src/ir/comp.rs":"232300be66abbbc3d7ef948c24f000dd8a50d78e72aa0e4b2cc43ffd4f800226","src/ir/context.rs":"3a76458a5aa74075a60a5cd752ed59ad3943054f55b017700389f78072935215","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"e25ff72ac174a798894c9673d81bdfb86fa9f4228b34a14ce0dc741a186a52bd","src/ir/enum_ty.rs":"e49e3c6ffc0289584e2f836fe56a4b7ebf6ca3f8b602248141d67b9f533770cc","src/ir/function.rs":"aa454ace56bda8074b2865933282aa124624310c8bc0c994d454f5799f4e88be","src/ir/int.rs":"68a86182743ec338d58e42203364dc7c8970cb7ec3550433ca92f0c9489b4442","src/ir/item.rs":"a71bdacc7419ec86d52ac534158cf4bfa4600e9cbc214c0075766700f5b053b0","src/ir/item_kind.rs":"7666a1ff1b8260978b790a08b4139ab56b5c65714a5652bbcec7faa7443adc36","src/ir/layout.rs":"755e3787c262de434a53a8c326f0e825f95415ed6b0f925c1cddf208ca8e3bc4","src/ir/mod.rs":"713cd537434567003197a123cbae679602c715e976d22f7b23dafd0826ea4c70","src/ir/module.rs":"70cf6ddfeabe6cdc13fdc767c783216c073404848d827e85fc6c2de3a19b5c3f","src/ir/objc.rs":"195fb2a3e4371b90244f3a8f295fd80cc77e0f2daf8fd27e3d8e5b78bd6b55d6","src/ir/template.rs":"44bd7214cf1e7f70e60694115082aac5b8a6c1687fff584cd08cdcfadabc5734","src/ir/traversal.rs":"5ac088277f4dfe2918d81b9294aaee41fd83db8e46def66a05f89de078bf4c49","src/ir/ty.rs":"8d7e7883316245c54e5dfa2fd150df1be2dc559c7df0828da736dd6b18d2165b","src/ir/var.rs":"1e7be8eedba72effa995b48c581504e61e407867d8794a8528975688742b0420","src/lib.rs":"ed2d0aeb48b28b4a96b8e76a10e00b10cb6cc32c0a686d536f9021463b7ee0e8","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"74e582c37b146090332b1496f5b4bca02c7629d03a4ae40302cb4a723f08e445","src/options.rs":"119358b741601dafc13560856f6e4b4f78b6cd2b19067893c2672ba8f5dc6de1","src/parse.rs":"4ffc54415eadb622ee488603862788c78361ef2c889de25259441a340c2a010f","src/regex_set.rs":"6c46357fb1ee68250e5e017cbf691f340041489ae78599eee7a5665a6ddce27f","src/time.rs":"8efe317e7c6b5ba8e0865ce7b49ca775ee8a02590f4241ef62f647fa3c22b68e"},"package":"2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239"}
+\ No newline at end of file
+--- thunderbird-102.11.1/third_party/rust/bindgen/src/clang.rs.rust-bindgen-2319-2339	2023-05-24 00:50:51.000000000 +0200
++++ thunderbird-102.11.1/third_party/rust/bindgen/src/clang.rs	2023-06-07 00:59:18.845709213 +0200
+@@ -54,6 +54,11 @@ impl Cursor {
+         unsafe { clang_isDeclaration(self.kind()) != 0 }
+     }
+ 
++    /// Is this cursor's referent an anonymous record or so?
++    pub fn is_anonymous(&self) -> bool {
++        unsafe { clang_Cursor_isAnonymous(self.x) != 0 }
++    }
++
+     /// Get this cursor's referent's spelling.
+     pub fn spelling(&self) -> String {
+         unsafe { cxstring_into_string(clang_getCursorSpelling(self.x)) }
+--- thunderbird-102.11.1/third_party/rust/bindgen/src/ir/comp.rs.rust-bindgen-2319-2339	2023-05-24 00:50:52.000000000 +0200
++++ thunderbird-102.11.1/third_party/rust/bindgen/src/ir/comp.rs	2023-06-07 00:59:18.846709211 +0200
+@@ -1372,8 +1372,7 @@ impl CompInfo {
+ 
+                     // A declaration of an union or a struct without name could
+                     // also be an unnamed field, unfortunately.
+-                    if cur.spelling().is_empty() &&
+-                        cur.kind() != CXCursor_EnumDecl
++                    if cur.is_anonymous() && cur.kind() != CXCursor_EnumDecl
+                     {
+                         let ty = cur.cur_type();
+                         let offset = cur.offset_of_field().ok();
+--- thunderbird-102.11.1/third_party/rust/bindgen/src/ir/ty.rs.rust-bindgen-2319-2339	2023-05-24 00:50:52.000000000 +0200
++++ thunderbird-102.11.1/third_party/rust/bindgen/src/ir/ty.rs	2023-06-07 00:59:18.847709209 +0200
+@@ -737,7 +737,12 @@ impl Type {
+ 
+         let layout = ty.fallible_layout(ctx).ok();
+         let cursor = ty.declaration();
+-        let mut name = cursor.spelling();
++        let is_anonymous = cursor.is_anonymous();
++        let mut name = if is_anonymous {
++            None
++        } else {
++            Some(cursor.spelling()).filter(|n| !n.is_empty())
++        };
+ 
+         debug!(
+             "from_clang_ty: {:?}, ty: {:?}, loc: {:?}",
+@@ -771,7 +776,7 @@ impl Type {
+             if is_canonical_objcpointer && is_template_type_param {
+                 // Objective-C generics are just ids with fancy name.
+                 // To keep it simple, just name them ids
+-                name = "id".to_owned();
++                name = Some("id".to_owned());
+             }
+         }
+ 
+@@ -900,7 +905,7 @@ impl Type {
+                                         return Err(ParseError::Recurse);
+                                     }
+                                 } else {
+-                                    name = location.spelling();
++                                    name = Some(location.spelling());
+                                 }
+ 
+                                 let complex = CompInfo::from_ty(
+@@ -942,7 +947,7 @@ impl Type {
+                                                 CXType_Typedef
+                                             );
+ 
+-                                            name = current.spelling();
++                                            name = Some(location.spelling());
+ 
+                                             let inner_ty = cur
+                                                 .typedef_type()
+@@ -1126,10 +1131,10 @@ impl Type {
+                 CXType_Enum => {
+                     let enum_ = Enum::from_ty(ty, ctx).expect("Not an enum?");
+ 
+-                    if name.is_empty() {
++                    if !is_anonymous {
+                         let pretty_name = ty.spelling();
+                         if clang::is_valid_identifier(&pretty_name) {
+-                            name = pretty_name;
++                            name = Some(pretty_name);
+                         }
+                     }
+ 
+@@ -1144,12 +1149,12 @@ impl Type {
+                     )
+                     .expect("Not a complex type?");
+ 
+-                    if name.is_empty() {
++                    if !is_anonymous {
+                         // The pretty-printed name may contain typedefed name,
+                         // but may also be "struct (anonymous at .h:1)"
+                         let pretty_name = ty.spelling();
+                         if clang::is_valid_identifier(&pretty_name) {
+-                            name = pretty_name;
++                            name = Some(pretty_name);
+                         }
+                     }
+ 
+@@ -1189,7 +1194,9 @@ impl Type {
+                 CXType_ObjCClass | CXType_ObjCInterface => {
+                     let interface = ObjCInterface::from_ty(&location, ctx)
+                         .expect("Not a valid objc interface?");
+-                    name = interface.rust_name();
++                    if !is_anonymous {
++                        name = Some(interface.rust_name());
++                    }
+                     TypeKind::ObjCInterface(interface)
+                 }
+                 CXType_Dependent => {
+@@ -1207,7 +1214,7 @@ impl Type {
+             }
+         };
+ 
+-        let name = if name.is_empty() { None } else { Some(name) };
++        name = name.filter(|n| !n.is_empty());
+ 
+         let is_const = ty.is_const() ||
+             (ty.kind() == CXType_ConstantArray &&
+--- thunderbird-102.11.1/third_party/rust/bindgen/src/ir/ty.rs.rust-bindgen-2319-2339
++++ thunderbird-102.11.1/third_party/rust/bindgen/src/ir/ty.rs
+@@ -1145,8 +1145,7 @@ impl Type {
+                         location,
+                         None,
+                         ctx,
+-                    )
+-                    .expect("Not able to resolve vector element?");
++                    )?;
+                     TypeKind::Vector(inner, ty.num_elements().unwrap())
+                 }
+                 CXType_ConstantArray => {
+--- thunderbird-102.11.1/third_party/rust/bindgen/src/ir/var.rs.rust-bindgen-2319-2339
++++ thunderbird-102.11.1/third_party/rust/bindgen/src/ir/var.rs
+@@ -293,11 +293,11 @@ impl ClangSubItemParser for Var {
+                 let ty = match Item::from_ty(&ty, cursor, None, ctx) {
+                     Ok(ty) => ty,
+                     Err(e) => {
+-                        assert_eq!(
+-                            ty.kind(),
+-                            CXType_Auto,
++                        assert!(
++                            matches!(ty.kind(), CXType_Auto | CXType_Unexposed),
+                             "Couldn't resolve constant type, and it \
+-                             wasn't an nondeductible auto type!"
++                             wasn't an nondeductible auto type or unexposed \
++                             type!"
+                         );
+                         return Err(e);
+                     }
diff --git a/sources b/sources
index 294852a..29dd19f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = 60b8bc05e599fadfa80a06560326c84efc72c1a9aeb9f1667ec9e235c66f0efd8939c390795254fa9bde7d30402f1b92c61ca848d1eda8d487788cc9107213e9
+SHA512 (cbindgen-vendor.tar.xz) = da016ecd9ac6dd3ecd1a65b80c2728db59bccd9ca5e6b54888f02398e3f97a90d1bae3bef85f0eb0950c07734bf3e191fb679fc39527205ba0520009ca4769d2
 SHA512 (icecat-102.12.0-langpacks.tar.gz) = a44a094e4acec3c72ecdca8491ddd6bfbff3a4bcf7a466e50c95fd639f5c88b59f36bfc0a1a831a8065e38f15549a43895a61e95f2dc9dd7157ca4c2a4f647ed
 SHA512 (icecat-102.12.0-rh1.tar.bz2) = c1f3e9d1855084fdce9f6a832ad98e1548a19b6c3002f3d019e4272e47c5d4dd06075a47fde24ab74c3583549192c85669d60e3630c2bccbccb9e7bccde08e39
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 0990aced235f90b7100dc456dd79c1d496a143da Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 10 Jun 2023 19:52:00 +0200
Subject: [PATCH 348/473] Reload new cbindgen-vendor archive

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index 29dd19f..47fe096 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = da016ecd9ac6dd3ecd1a65b80c2728db59bccd9ca5e6b54888f02398e3f97a90d1bae3bef85f0eb0950c07734bf3e191fb679fc39527205ba0520009ca4769d2
+SHA512 (cbindgen-vendor.tar.xz) = 8a1ca804eea80cb70b02d1d8722b6c24e0ec2037ad1e61ec0383ea014f2c48ec1f60ee3c5866f70272102bc7b318168965376f6c5483b694b06ab697729077a0
 SHA512 (icecat-102.12.0-langpacks.tar.gz) = a44a094e4acec3c72ecdca8491ddd6bfbff3a4bcf7a466e50c95fd639f5c88b59f36bfc0a1a831a8065e38f15549a43895a61e95f2dc9dd7157ca4c2a4f647ed
 SHA512 (icecat-102.12.0-rh1.tar.bz2) = c1f3e9d1855084fdce9f6a832ad98e1548a19b6c3002f3d019e4272e47c5d4dd06075a47fde24ab74c3583549192c85669d60e3630c2bccbccb9e7bccde08e39
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 02aad2983b9fe4eca038dbf7919200c0783c309a Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Mon, 12 Jun 2023 21:52:18 +0200
Subject: [PATCH 349/473] Fix required NSS

---
 icecat.spec | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 698bf66..537070d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -14,7 +14,7 @@ ExcludeArch: %{arm}
 
 # Build is failing because of
 # include/mozilla/FloatingPoint.h:212:31: error: inlining failed in call to ‘always_inline’ ‘bool mozilla::IsNegativeZero(T) [with T = double]’: indirect function call with a yet undetermined callee
-%if 0%{?fedora} > 37
+%if 0%{?fedora}
 ExcludeArch: s390x
 %endif
 
@@ -54,8 +54,6 @@ ExcludeArch: s390x
 # Active/Deactive language files handling
 %global build_langpacks 1
 
-%global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
-
 # Define installation directories
 %global icecatappdir %{_libdir}/%{name}
 %global icecat_ver   %{name}-%{version}
@@ -73,11 +71,15 @@ ExcludeArch: s390x
 %global big_endian    1
 %endif
 
+%if 0%{?fedora}
 %global system_nss  1
+%else
+%global system_nss  0
+%endif
 %if %{?system_nss}
 %global nspr_version 4.32
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.80
+%global nss_version 3.88
 %global nss_build_version %{nss_version}
 %endif
 
@@ -220,7 +222,6 @@ BuildRequires: desktop-file-utils
 BuildRequires: dos2unix
 BuildRequires: gcc, gcc-c++
 BuildRequires: make
-BuildRequires: fedora-bookmarks
 BuildRequires: freetype-devel
 BuildRequires: gdk-pixbuf2
 BuildRequires: glib2-devel
@@ -307,11 +308,13 @@ Requires: nspr >= %{nspr_build_version}
 Requires: nss >= %{nss_build_version}
 %endif
 
+%if 0%{?fedora}
+BuildRequires: fedora-bookmarks
 Requires: fedora-bookmarks
-Suggests: mozilla-ublock-origin
+%endif
 
+Suggests: mozilla-ublock-origin
 Provides: webclient
-Provides: bundled(mozilla-https-everywhere) = 2022.5.11
 
 %description
 GNU IceCat is the GNU version of the Firefox ESR browser.
@@ -378,7 +381,9 @@ tar -xf %{SOURCE5}
 
 # Fedora patches
 %patch -P 219 -p 1 -b .rhbz-1173156
+%if 0%{?fedora}
 %patch -P 221 -p 1 -b .firefox-nss-addon-hack
+%endif
 %patch -P 224 -p 1 -b .glibcxx
 %patch -P 225 -p 1 -b .gcc13
 
@@ -687,7 +692,10 @@ xvfb-run ./mach build  2>&1 | cat - || exit 1
 
 %install
 # set up our default bookmarks
+%if 0%{?fedora}
+%global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 cp -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html
+%endif
 
 %make_install -C objdir
 

From 643a8f2734b4b3ee819185473ee74db401be9af4 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 4 Jul 2023 22:38:54 +0200
Subject: [PATCH 350/473] Release 102.13.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 30ae722..983ad8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -223,3 +223,5 @@
 /icecat-102.11.0-rh2.tar.bz2
 /icecat-102.12.0-langpacks.tar.gz
 /icecat-102.12.0-rh1.tar.bz2
+/icecat-102.13.0-langpacks.tar.gz
+/icecat-102.13.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index c60d98a..6a57bd3 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=102.12.0
+VERSION=102.13.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 537070d..ecc41ed 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -106,7 +106,7 @@ ExcludeArch: s390x
 
 Name:    icecat
 Epoch:   1
-Version: 102.12.0
+Version: 102.13.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index 47fe096..ad422c3 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 8a1ca804eea80cb70b02d1d8722b6c24e0ec2037ad1e61ec0383ea014f2c48ec1f60ee3c5866f70272102bc7b318168965376f6c5483b694b06ab697729077a0
-SHA512 (icecat-102.12.0-langpacks.tar.gz) = a44a094e4acec3c72ecdca8491ddd6bfbff3a4bcf7a466e50c95fd639f5c88b59f36bfc0a1a831a8065e38f15549a43895a61e95f2dc9dd7157ca4c2a4f647ed
-SHA512 (icecat-102.12.0-rh1.tar.bz2) = c1f3e9d1855084fdce9f6a832ad98e1548a19b6c3002f3d019e4272e47c5d4dd06075a47fde24ab74c3583549192c85669d60e3630c2bccbccb9e7bccde08e39
+SHA512 (icecat-102.13.0-langpacks.tar.gz) = c6c04a64a17ab04faaa4f12c5b470c1337e18ff7069c4ec474eeb2af22c94bb9fc44dc96cbc1af776cc02d5372b9c3c1e9b6556aa1180de6a576a31975d396e1
+SHA512 (icecat-102.13.0-rh1.tar.bz2) = a9e2f8ede6419e14bfb7f75f89e9b97b689e0afeda4b7203565f17e84962545901da573516f3ddc9c3d9296d6472409ebb3ec05e426303eeaf2aa3d34071d02c
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 01e7faaeda2418d973c5e5837f4785b8d7570097 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 4 Jul 2023 23:14:07 +0200
Subject: [PATCH 351/473] Drop obsolete patches

---
 icecat.spec | 7 -------
 sources     | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index ecc41ed..de4d91d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -368,13 +368,6 @@ tar -xf %{SOURCE5}
 %endif
 %patch -P 6 -p 1 -b .1773336
 
-  
-%if 0%{?fedora} >= 38
-# MUST ONLY be applied for building against clang LLVM 16.
-%patch -P 7 -p1 -b .rust-bindgen-2319-2339
-%patch -P 8 -p1 -b .mp4parse-rust
-%endif
-
 %if 0%{?disable_elfhack}
 %patch -P 41 -p 1 -b .disable-elfhack
 %endif
diff --git a/sources b/sources
index ad422c3..a4b6d37 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = 8a1ca804eea80cb70b02d1d8722b6c24e0ec2037ad1e61ec0383ea014f2c48ec1f60ee3c5866f70272102bc7b318168965376f6c5483b694b06ab697729077a0
+SHA512 (cbindgen-vendor.tar.xz) = 9cb2a3007939aa2eae5e94b1adf2040d1fdbee9e1ce4367175f79e716e6a02e976c4053452b93c9b8c12cd19ffc4c7cb8ab66b1e97b1a90a64dfbff92698c792
 SHA512 (icecat-102.13.0-langpacks.tar.gz) = c6c04a64a17ab04faaa4f12c5b470c1337e18ff7069c4ec474eeb2af22c94bb9fc44dc96cbc1af776cc02d5372b9c3c1e9b6556aa1180de6a576a31975d396e1
 SHA512 (icecat-102.13.0-rh1.tar.bz2) = a9e2f8ede6419e14bfb7f75f89e9b97b689e0afeda4b7203565f17e84962545901da573516f3ddc9c3d9296d6472409ebb3ec05e426303eeaf2aa3d34071d02c
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 67531fb3c5800d366d2b9428debe5d78b07b5dae Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jul 2023 07:13:30 +0000
Subject: [PATCH 352/473] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From a02439e31147410d0cae002f4c1942391e2c0322 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 1 Aug 2023 20:16:14 +0200
Subject: [PATCH 353/473] Release 102.14.0| Use Python-3.11

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 12 ++++++++----
 sources                 |  4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 983ad8a..36e775f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -225,3 +225,5 @@
 /icecat-102.12.0-rh1.tar.bz2
 /icecat-102.13.0-langpacks.tar.gz
 /icecat-102.13.0-rh1.tar.bz2
+/icecat-102.14.0-langpacks.tar.gz
+/icecat-102.14.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 6a57bd3..e4efa8c 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=102.13.0
+VERSION=102.14.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index de4d91d..3e7d2cf 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -106,7 +106,7 @@ ExcludeArch: s390x
 
 Name:    icecat
 Epoch:   1
-Version: 102.13.0
+Version: 102.14.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
@@ -264,8 +264,9 @@ BuildRequires: nss-static >= %{nss_version}
 
 BuildRequires: pango-devel
 BuildRequires: pipewire-devel
-BuildRequires: python3-devel
-BuildRequires: python3-setuptools
+#BuildRequires: python3-devel
+#BuildRequires: python3-setuptools
+BuildRequires: python3.11-devel
 BuildRequires: perl-interpreter
 BuildRequires: pkgconfig(xrender)
 BuildRequires: pkgconfig(libstartup-notification-1.0)
@@ -671,7 +672,10 @@ cp -p %{SOURCE19} .
 export CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG=true
 %endif
 
-#export MACH_USE_SYSTEM_PYTHON=1
+	
+export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
+#Use python 3.11 for mach
+sed -i -e 's|#!/usr/bin/env python3|#!/usr/bin/env python3.11|' mach
 %if 0%{?build_with_pgo}
 %if 0%{?pgo_wayland}
 env | grep "WAYLAND"
diff --git a/sources b/sources
index a4b6d37..e061110 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9cb2a3007939aa2eae5e94b1adf2040d1fdbee9e1ce4367175f79e716e6a02e976c4053452b93c9b8c12cd19ffc4c7cb8ab66b1e97b1a90a64dfbff92698c792
-SHA512 (icecat-102.13.0-langpacks.tar.gz) = c6c04a64a17ab04faaa4f12c5b470c1337e18ff7069c4ec474eeb2af22c94bb9fc44dc96cbc1af776cc02d5372b9c3c1e9b6556aa1180de6a576a31975d396e1
-SHA512 (icecat-102.13.0-rh1.tar.bz2) = a9e2f8ede6419e14bfb7f75f89e9b97b689e0afeda4b7203565f17e84962545901da573516f3ddc9c3d9296d6472409ebb3ec05e426303eeaf2aa3d34071d02c
+SHA512 (icecat-102.14.0-langpacks.tar.gz) = 67f4791a7aedf7c8dd52f235fc0bc68fd861e33e9ece3572d20fc87a853700286986d6d173bcc1256ec6b793286e883586107e0b11c23b91346e77d89430d21e
+SHA512 (icecat-102.14.0-rh1.tar.bz2) = 638b26f444b1abc7b72c25c3277ec3ae825fb9238db88e05c0789e4267046fbe8cd89fc79a2748133b2f331c1499c941b2a50a960217ec90ba8d149926238fef
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 37373373d3d9545eae4af48e5556689857e5ced9 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 31 Aug 2023 19:10:14 +0200
Subject: [PATCH 354/473] Release 102.15.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 36e775f..2c9077f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -227,3 +227,5 @@
 /icecat-102.13.0-rh1.tar.bz2
 /icecat-102.14.0-langpacks.tar.gz
 /icecat-102.14.0-rh1.tar.bz2
+/icecat-102.15.0-langpacks.tar.gz
+/icecat-102.15.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index e4efa8c..5a53eb4 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=102.14.0
+VERSION=102.15.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 3e7d2cf..18185fc 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -106,7 +106,7 @@ ExcludeArch: s390x
 
 Name:    icecat
 Epoch:   1
-Version: 102.14.0
+Version: 102.15.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index e061110..160ae90 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9cb2a3007939aa2eae5e94b1adf2040d1fdbee9e1ce4367175f79e716e6a02e976c4053452b93c9b8c12cd19ffc4c7cb8ab66b1e97b1a90a64dfbff92698c792
-SHA512 (icecat-102.14.0-langpacks.tar.gz) = 67f4791a7aedf7c8dd52f235fc0bc68fd861e33e9ece3572d20fc87a853700286986d6d173bcc1256ec6b793286e883586107e0b11c23b91346e77d89430d21e
-SHA512 (icecat-102.14.0-rh1.tar.bz2) = 638b26f444b1abc7b72c25c3277ec3ae825fb9238db88e05c0789e4267046fbe8cd89fc79a2748133b2f331c1499c941b2a50a960217ec90ba8d149926238fef
+SHA512 (icecat-102.15.0-langpacks.tar.gz) = c660922676463c2f384adf413af1aa3b16457e9ea308e348d3eea81daf407465ae350f864e02f186337134f6f2f2cdfa386d18dbad5ccb7831fed52d20e13fd0
+SHA512 (icecat-102.15.0-rh1.tar.bz2) = 25891798ff791a2ea50f8a342a3bde99a297b68769990549afd9cd4e289795014b9d5858e2e1e5a0a471a05755fc1acc57113f3e38558e4e1baa507ec4066953
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 239fb07bd41ca2403b0984c037906ef31dfbc053 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 31 Aug 2023 20:15:26 +0200
Subject: [PATCH 355/473] Fix rhbz#2235654

---
 icecat-rhbz-2235654.patch | 59 +++++++++++++++++++++++++++++++++++++++
 icecat.spec               |  2 ++
 2 files changed, 61 insertions(+)
 create mode 100644 icecat-rhbz-2235654.patch

diff --git a/icecat-rhbz-2235654.patch b/icecat-rhbz-2235654.patch
new file mode 100644
index 0000000..0c3780c
--- /dev/null
+++ b/icecat-rhbz-2235654.patch
@@ -0,0 +1,59 @@
+diff -up firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h.gccfailure firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h
+--- firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h.gccfailure	2023-08-24 20:33:54.000000000 +0200
++++ firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h	2023-08-30 13:04:56.174949736 +0200
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+     int rt, dummy;
++    if (__builtin_constant_p(shift))
+     __asm__ (
+         "imull %3               \n\t"
+         "shrdl %4, %%edx, %%eax \n\t"
+         :"=a"(rt), "=d"(dummy)
+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
+     );
++    else
++        __asm__ (
++            "imull %3               \n\t"
++            "shrdl %4, %%edx, %%eax \n\t"
++            :"=a"(rt), "=d"(dummy)
++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
++        );
+     return rt;
+ }
+ 
+@@ -113,19 +121,31 @@ __asm__ volatile(\
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("sarl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("sarl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+ 
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("shrl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("shrl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+ 
diff --git a/icecat.spec b/icecat.spec
index 18185fc..8403753 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -182,6 +182,7 @@ Patch221: firefox-nss-addon-hack.patch
 Patch223: %{name}-glibc-dynstack.patch
 Patch224: %{name}-GLIBCXX-fix-for-GCC-12.patch
 Patch225: %{name}-102.7.0-fix_gcc13_build.patch
+Patch227: %{name}-rhbz-2235654.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
@@ -380,6 +381,7 @@ tar -xf %{SOURCE5}
 %endif
 %patch -P 224 -p 1 -b .glibcxx
 %patch -P 225 -p 1 -b .gcc13
+%patch -P 227 -p 1 -b .backup
 
 # ARM run-time patch
 %ifarch aarch64

From 90fab27e532c309a557eee7668dd5f8ca23814b5 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 29 Sep 2023 23:19:53 +0200
Subject: [PATCH 356/473] Release 115.3.1 rh1| Epoch 2

---
 .gitignore                            |  2 +
 build-aarch64-skia.patch              | 51 +++++-------------
 build-disable-elfhack.patch           | 19 ++++---
 firefox-disable-ffvpx-with-vapi.patch | 77 ---------------------------
 firefox-vaapi-extra-frames.patch      | 14 -----
 icecat-102.7.0-fix_gcc13_build.patch  | 20 -------
 icecat-build-arm-libaom.patch         | 12 -----
 icecat-lang_download.sh               |  2 +-
 icecat.spec                           | 25 +++------
 mozilla-1773336.patch                 | 14 -----
 mozilla-build-arm.patch               | 14 -----
 sources                               |  4 +-
 12 files changed, 35 insertions(+), 219 deletions(-)
 delete mode 100644 firefox-disable-ffvpx-with-vapi.patch
 delete mode 100644 firefox-vaapi-extra-frames.patch
 delete mode 100644 icecat-102.7.0-fix_gcc13_build.patch
 delete mode 100644 icecat-build-arm-libaom.patch
 delete mode 100644 mozilla-1773336.patch
 delete mode 100644 mozilla-build-arm.patch

diff --git a/.gitignore b/.gitignore
index 2c9077f..5a00452 100644
--- a/.gitignore
+++ b/.gitignore
@@ -229,3 +229,5 @@
 /icecat-102.14.0-rh1.tar.bz2
 /icecat-102.15.0-langpacks.tar.gz
 /icecat-102.15.0-rh1.tar.bz2
+/icecat-115.3.1-langpacks.tar.gz
+/icecat-115.3.1-rh1.tar.bz2
diff --git a/build-aarch64-skia.patch b/build-aarch64-skia.patch
index a63e3e8..e669ba5 100644
--- a/build-aarch64-skia.patch
+++ b/build-aarch64-skia.patch
@@ -1,40 +1,6 @@
-diff -up firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia firefox-72.0/gfx/skia/skia/include/private/SkHalf.h
---- firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia	2020-01-02 22:33:02.000000000 +0100
-+++ firefox-72.0/gfx/skia/skia/include/private/SkHalf.h	2020-01-03 09:00:37.537296105 +0100
-@@ -40,7 +40,7 @@ static inline Sk4h SkFloatToHalf_finite_
- 
- static inline Sk4f SkHalfToFloat_finite_ftz(uint64_t rgba) {
-     Sk4h hs = Sk4h::Load(&rgba);
--#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
-+#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
-     float32x4_t fs;
-     asm ("fcvtl %[fs].4s, %[hs].4h   \n"   // vcvt_f32_f16(...)
-         : [fs] "=w" (fs)                   // =w: write-only NEON register
-@@ -62,7 +62,7 @@ static inline Sk4f SkHalfToFloat_finite_
- }
- 
- static inline Sk4h SkFloatToHalf_finite_ftz(const Sk4f& fs) {
--#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
-+#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
-     float32x4_t vec = fs.fVec;
-     asm ("fcvtn %[vec].4h, %[vec].4s  \n"   // vcvt_f16_f32(vec)
-         : [vec] "+w" (vec));                // +w: read-write NEON register
-diff -up firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
---- firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia	2020-01-03 09:00:37.538296107 +0100
-+++ firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2020-01-03 10:11:41.259219508 +0100
-@@ -1087,7 +1087,7 @@ SI F from_half(U16 h) {
- }
- 
- SI U16 to_half(F f) {
--#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
-+#if 0 //defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
-     && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-     return vcvt_f16_f32(f);
- 
-diff -up firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
---- firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia	2020-01-03 09:00:37.538296107 +0100
-+++ firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h	2020-01-03 10:11:53.513250979 +0100
-@@ -183,8 +183,6 @@ SI F F_from_Half(U16 half) {
+--- a/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia	2023-06-02 03:15:22.000000000 +0200
++++ b/gfx/skia/skia/modules/skcms/src/Transform_inl.h	2023-06-05 10:18:46.942777997 +0200
+@@ -189,8 +189,6 @@ SI F F_from_Half(U16 half) {
  SI U16 Half_from_F(F f) {
  #if defined(USING_NEON_FP16)
      return bit_pun<U16>(f);
@@ -43,3 +9,14 @@ diff -up firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch6
  #elif defined(USING_AVX512F)
      return (U16)_mm512_cvtps_ph((__m512 )f, _MM_FROUND_CUR_DIRECTION );
  #elif defined(USING_AVX_F16C)
+--- a/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia	2023-06-05 10:18:46.941777963 +0200
++++ b/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2023-06-05 10:20:44.924843847 +0200
+@@ -1128,7 +1128,7 @@ SI F from_half(U16 h) {
+ }
+ 
+ SI U16 to_half(F f) {
+-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
++#if 0 //defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
+     && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
+     return sk_bit_cast<U16>(vcvt_f16_f32(f));
+ 
diff --git a/build-disable-elfhack.patch b/build-disable-elfhack.patch
index 04d49f2..483d4c4 100644
--- a/build-disable-elfhack.patch
+++ b/build-disable-elfhack.patch
@@ -1,12 +1,11 @@
-diff -up firefox-97.0/toolkit/moz.configure.disable-elfhack firefox-97.0/toolkit/moz.configure
---- firefox-97.0/toolkit/moz.configure.disable-elfhack	2022-02-08 09:58:47.518047952 +0100
-+++ firefox-97.0/toolkit/moz.configure	2022-02-08 10:17:49.552945956 +0100
-@@ -1273,7 +1273,7 @@ with only_when("--enable-compile-environ
-             help="{Enable|Disable} elf hacks",
-         )
+--- firefox-115.0.2/toolkit/moz.configure.disable-elfhack	2023-07-18 12:21:22.507358334 +0200
++++ firefox-115.0.2/toolkit/moz.configure	2023-07-18 12:52:55.972727498 +0200
+@@ -1520,7 +1520,7 @@ with only_when("--enable-compile-environ
+                     "Cannot enable elfhack with lld."
+                     " Use --enable-linker=bfd, --enable-linker=gold, or --disable-elf-hack"
+                 )
+-            return True
++            return False
  
--        set_config("USE_ELF_HACK", depends_if("--enable-elf-hack")(lambda _: True))
-+        set_config("USE_ELF_HACK", depends_if("--enable-elf-hack")(lambda _: False))
+         set_config("USE_ELF_HACK", use_elf_hack)
  
- 
- @depends(build_environment)
diff --git a/firefox-disable-ffvpx-with-vapi.patch b/firefox-disable-ffvpx-with-vapi.patch
deleted file mode 100644
index 3ecdbed..0000000
--- a/firefox-disable-ffvpx-with-vapi.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi firefox-88.0/dom/media/platforms/PDMFactory.cpp
---- firefox-88.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi	2021-04-15 21:44:28.000000000 +0200
-+++ firefox-88.0/dom/media/platforms/PDMFactory.cpp	2021-04-19 13:27:07.808429721 +0200
-@@ -481,12 +481,6 @@ void PDMFactory::CreateRddPDMs() {
-     CreateAndStartupPDM<AppleDecoderModule>();
-   }
- #endif
--#ifdef MOZ_FFVPX
--  if (StaticPrefs::media_ffvpx_enabled() &&
--      StaticPrefs::media_rdd_ffvpx_enabled()) {
--    CreateAndStartupPDM<FFVPXRuntimeLinker>();
--  }
--#endif
- #ifdef MOZ_FFMPEG
-   if (StaticPrefs::media_ffmpeg_enabled() &&
-       StaticPrefs::media_rdd_ffmpeg_enabled() &&
-@@ -495,6 +489,12 @@ void PDMFactory::CreateRddPDMs() {
-         FFmpegRuntimeLinker::LinkStatusCode());
-   }
- #endif
-+#ifdef MOZ_FFVPX
-+  if (StaticPrefs::media_ffvpx_enabled() &&
-+      StaticPrefs::media_rdd_ffvpx_enabled()) {
-+    CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+  }
-+#endif
-   CreateAndStartupPDM<AgnosticDecoderModule>();
- }
- 
-@@ -525,11 +525,6 @@ void PDMFactory::CreateContentPDMs() {
-     CreateAndStartupPDM<OmxDecoderModule>();
-   }
- #endif
--#ifdef MOZ_FFVPX
--  if (StaticPrefs::media_ffvpx_enabled()) {
--    CreateAndStartupPDM<FFVPXRuntimeLinker>();
--  }
--#endif
- #ifdef MOZ_FFMPEG
-   if (StaticPrefs::media_ffmpeg_enabled() &&
-       !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-@@ -537,6 +532,11 @@ void PDMFactory::CreateContentPDMs() {
-         FFmpegRuntimeLinker::LinkStatusCode());
-   }
- #endif
-+#ifdef MOZ_FFVPX
-+  if (StaticPrefs::media_ffvpx_enabled()) {
-+    CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+  }
-+#endif
- #ifdef MOZ_WIDGET_ANDROID
-   if (StaticPrefs::media_android_media_codec_enabled()) {
-     StartupPDM(AndroidDecoderModule::Create(),
-@@ -571,11 +571,6 @@ void PDMFactory::CreateDefaultPDMs() {
-     CreateAndStartupPDM<OmxDecoderModule>();
-   }
- #endif
--#ifdef MOZ_FFVPX
--  if (StaticPrefs::media_ffvpx_enabled()) {
--    CreateAndStartupPDM<FFVPXRuntimeLinker>();
--  }
--#endif
- #ifdef MOZ_FFMPEG
-   if (StaticPrefs::media_ffmpeg_enabled() &&
-       !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-@@ -583,6 +578,11 @@ void PDMFactory::CreateDefaultPDMs() {
-         FFmpegRuntimeLinker::LinkStatusCode());
-   }
- #endif
-+#ifdef MOZ_FFVPX
-+  if (StaticPrefs::media_ffvpx_enabled()) {
-+    CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+  }
-+#endif
- #ifdef MOZ_WIDGET_ANDROID
-   if (StaticPrefs::media_android_media_codec_enabled()) {
-     StartupPDM(AndroidDecoderModule::Create(),
diff --git a/firefox-vaapi-extra-frames.patch b/firefox-vaapi-extra-frames.patch
deleted file mode 100644
index c2ed7a2..0000000
--- a/firefox-vaapi-extra-frames.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up firefox-76.0.1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp.old firefox-76.0.1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
---- firefox-76.0.1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp.old	2020-05-13 14:28:26.556800474 +0200
-+++ firefox-76.0.1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp	2020-05-13 14:28:31.562768959 +0200
-@@ -43,7 +43,7 @@ typedef int VAStatus;
- #endif
- 
- // Use some extra HW frames for potential rendering lags.
--#define EXTRA_HW_FRAMES 6
-+#define EXTRA_HW_FRAMES 20
- 
- typedef mozilla::layers::Image Image;
- typedef mozilla::layers::PlanarYCbCrImage PlanarYCbCrImage;
-diff -up firefox-76.0.1/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-76.0.1/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
-diff -up firefox-76.0.1/media/webrtc/trunk/Makefile.old firefox-76.0.1/media/webrtc/trunk/Makefile
diff --git a/icecat-102.7.0-fix_gcc13_build.patch b/icecat-102.7.0-fix_gcc13_build.patch
deleted file mode 100644
index cb6ea1a..0000000
--- a/icecat-102.7.0-fix_gcc13_build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/gfx/2d/Rect.orig..h	2023-01-17 19:49:02.818099401 +0100
-+++ b/gfx/2d/Rect.h	2023-01-21 17:11:01.695573664 +0100
-@@ -15,6 +15,7 @@
- #include "mozilla/Maybe.h"
- 
- #include <cmath>
-+#include <cstdint>
- 
- namespace mozilla {
- 
---- a/toolkit/components/telemetry/pingsender/pingsender.orig.cpp	2023-01-17 19:48:16.000000000 +0100
-+++ b/toolkit/components/telemetry/pingsender/pingsender.cpp	2023-01-21 20:05:29.765527367 +0100
-@@ -10,6 +10,7 @@
- #include <iomanip>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- #include <zlib.h>
- 
diff --git a/icecat-build-arm-libaom.patch b/icecat-build-arm-libaom.patch
deleted file mode 100644
index 985f01d..0000000
--- a/icecat-build-arm-libaom.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-73.0/media/libaom/moz.build.old firefox-73.0/media/libaom/moz.build
---- firefox-73.0/media/libaom/moz.build.old	2020-02-07 23:13:28.000000000 +0200
-+++ firefox-73.0/media/libaom/moz.build	2020-02-17 10:30:08.509805092 +0200
-@@ -55,7 +55,7 @@ elif CONFIG['CPU_ARCH'] == 'arm':
- 
-     for f in SOURCES:
-         if f.endswith('neon.c'):
--            SOURCES[f].flags += CONFIG['VPX_ASFLAGS']
-+            SOURCES[f].flags += CONFIG['NEON_FLAGS']
- 
-     if CONFIG['OS_TARGET'] == 'Android':
-         # For cpu-features.h
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 5a53eb4..038d106 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=102.15.0
+VERSION=115.3.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 8403753..4fbed9e 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -105,8 +105,8 @@ ExcludeArch: s390x
 %global __requires_exclude_from ^%{icecatappdir}
 
 Name:    icecat
-Epoch:   1
-Version: 102.15.0
+Epoch:   2
+Version: 115.3.1
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
@@ -154,13 +154,8 @@ Source19: run-wayland-compositor
 # Fixes installation of those addons which don't have ID on IceCat ("Cannot find id for addon" error).
 Patch1: %{name}-fix_addon_installation.patch
 Patch2: %{name}-commasplit.patch
-Patch3: mozilla-build-arm.patch
-Patch4: %{name}-build-arm-libaom.patch
 Patch5: rhbz-1219542-s390-build.patch
 
-# If cbindgen=0.24
-Patch6: mozilla-1773336.patch
-
 # With clang LLVM 16 rust-bindgen 0.56.0 is too old, combined
 # https://github.com/rust-lang/rust-bindgen/pull/2319
 # https://github.com/rust-lang/rust-bindgen/pull/2339
@@ -181,7 +176,6 @@ Patch220: firefox-nss-version.patch
 Patch221: firefox-nss-addon-hack.patch
 Patch223: %{name}-glibc-dynstack.patch
 Patch224: %{name}-GLIBCXX-fix-for-GCC-12.patch
-Patch225: %{name}-102.7.0-fix_gcc13_build.patch
 Patch227: %{name}-rhbz-2235654.patch
 
 # ARM run-time patch
@@ -202,10 +196,6 @@ Patch423: mozilla-1512162.patch
 Patch600: %{name}-pgo.patch
 Patch602: mozilla-1516803.patch
 
-#VA-API patches
-Patch584: firefox-disable-ffvpx-with-vapi.patch
-Patch585: firefox-vaapi-extra-frames.patch
-
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf213
 BuildRequires: bzip2-devel
@@ -363,12 +353,9 @@ tar -xf %{SOURCE5}
 
 %patch -P 1 -p 1 -b .fix_addon_installation
 %patch -P 2 -p 1 -b .commasplit
-%patch -P 3 -p 1 -b .build-arm-libaom
-%patch -P 4 -p 1 -b .arm
 %ifarch s390
 %patch -P 5 -p 1 -b .rhbz-1219542-s390
 %endif
-%patch -P 6 -p 1 -b .1773336
 
 %if 0%{?disable_elfhack}
 %patch -P 41 -p 1 -b .disable-elfhack
@@ -380,7 +367,6 @@ tar -xf %{SOURCE5}
 %patch -P 221 -p 1 -b .firefox-nss-addon-hack
 %endif
 %patch -P 224 -p 1 -b .glibcxx
-%patch -P 225 -p 1 -b .gcc13
 %patch -P 227 -p 1 -b .backup
 
 # ARM run-time patch
@@ -398,8 +384,6 @@ tar -xf %{SOURCE5}
 %patch -P 423 -p 1 -b .1512162
 %endif
 
-#%%patch 584 -p1 -b .firefox-disable-ffvpx-with-vapi
-#%%patch 585 -p1 -b .firefox-vaapi-extra-frames
 %patch -P 54 -p 1 -b .1669639
 
 # PGO patches
@@ -499,6 +483,11 @@ echo "ac_add_options --disable-crashreporter" >> .mozconfig
 echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 %endif
 
+# Clang
+%if 0%{?build_with_clang}
+echo "ac_add_options --with-libclang-path=%{_libdir}" >> .mozconfig
+%endif
+
 %ifarch s390x
 echo "ac_add_options --disable-jit" >> .mozconfig
 %endif
diff --git a/mozilla-1773336.patch b/mozilla-1773336.patch
deleted file mode 100644
index 0f299f7..0000000
--- a/mozilla-1773336.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up firefox-101.0.1/gfx/webrender_bindings/webrender_ffi.h.old firefox-101.0.1/gfx/webrender_bindings/webrender_ffi.h
---- a/gfx/webrender_bindings/webrender_ffi.h.old	2022-06-09 10:31:16.122495733 +0200
-+++ b/gfx/webrender_bindings/webrender_ffi.h	2022-06-09 10:31:22.880724352 +0200
-@@ -73,10 +73,6 @@
- struct WrPipelineIdAndEpoch;
- using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
- 
--#ifndef CBINDGEN_0_24
--const uint64_t ROOT_CLIP_CHAIN = ~0;
--#endif
--
- }  // namespace wr
- }  // namespace mozilla
- 
diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch
deleted file mode 100644
index e390a28..0000000
--- a/mozilla-build-arm.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h
---- firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm	2017-03-03 13:53:52.480754536 +0100
-+++ firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h	2017-03-03 13:56:01.476018102 +0100
-@@ -203,6 +203,10 @@
-     #define SK_ARM_HAS_CRC32
- #endif
- 
-+#if defined(__aarch64__)
-+    #undef SK_ARM_HAS_NEON
-+#endif
-+
- //////////////////////////////////////////////////////////////////////
- 
- #if !defined(SKIA_IMPLEMENTATION)
diff --git a/sources b/sources
index 160ae90..9b6a90b 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9cb2a3007939aa2eae5e94b1adf2040d1fdbee9e1ce4367175f79e716e6a02e976c4053452b93c9b8c12cd19ffc4c7cb8ab66b1e97b1a90a64dfbff92698c792
-SHA512 (icecat-102.15.0-langpacks.tar.gz) = c660922676463c2f384adf413af1aa3b16457e9ea308e348d3eea81daf407465ae350f864e02f186337134f6f2f2cdfa386d18dbad5ccb7831fed52d20e13fd0
-SHA512 (icecat-102.15.0-rh1.tar.bz2) = 25891798ff791a2ea50f8a342a3bde99a297b68769990549afd9cd4e289795014b9d5858e2e1e5a0a471a05755fc1acc57113f3e38558e4e1baa507ec4066953
+SHA512 (icecat-115.3.1-langpacks.tar.gz) = 410d00ab15e1e871246ccad43c60f7b1d0cd602f279db465e2418c6cf7c4f156e50d76e59012baba8c9d15fe9515f6f3ecf35d755a9a0aed24412c807674c496
+SHA512 (icecat-115.3.1-rh1.tar.bz2) = cff35e4aa0e13cfc3d220f28422201a9b724f33db243ea01b556509e6b7a9e555d826b08bfafabfd7ba01127c9afc3154afdee451efc7a9eaadec9eb03b0332c
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 84b7afbd5fce3762f507c035b804ca0bc6830654 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 29 Sep 2023 23:36:07 +0200
Subject: [PATCH 357/473] Release 115.3.1 rh1| Fix clang path

---
 icecat.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 4fbed9e..dd7bd09 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -484,9 +484,7 @@ echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 %endif
 
 # Clang
-%if 0%{?build_with_clang}
 echo "ac_add_options --with-libclang-path=%{_libdir}" >> .mozconfig
-%endif
 
 %ifarch s390x
 echo "ac_add_options --disable-jit" >> .mozconfig

From 68cf0224aeab8c04385978d263d7508639f0cef7 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 30 Sep 2023 19:19:52 +0200
Subject: [PATCH 358/473] Fix files for processing MOZBUILD

---
 icecat.spec | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index dd7bd09..42e9759 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -351,6 +351,13 @@ to run GNU IceCat native on Wayland.
 # Copy license files
 tar -xf %{SOURCE5}
 
+# Rename test files
+cp -p browser/components/icecatview/tests/browser/browser_firefoxview.js browser/components/icecatview/tests/browser/browser_icecatview.js
+cp -p browser/components/icecatview/tests/browser/browser_firefoxview_accessibility.js browser/components/icecatview/tests/browser/browser_icecatview_accessibility.js
+cp -p browser/components/icecatview/tests/browser/browser_firefoxview_feature_callout_a11y.js browser/components/icecatview/tests/browser/browser_icecatview_feature_callout_a11y.js
+cp -p browser/components/icecatview/tests/browser/browser_firefoxview_tab.js browser/components/icecatview/tests/browser/browser_icecatview_tab.js
+cp -p browser/components/icecatview/tests/browser/browser_reload_firefoxview.js browser/components/icecatview/tests/browser/browser_reload_icecatview.js
+
 %patch -P 1 -p 1 -b .fix_addon_installation
 %patch -P 2 -p 1 -b .commasplit
 %ifarch s390

From dde38c0354f6bdbbdbd584d9243b3a76715110a2 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 30 Sep 2023 21:09:09 +0200
Subject: [PATCH 359/473] Fix icecatview.html file

---
 icecat.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/icecat.spec b/icecat.spec
index 42e9759..a6e1370 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -357,6 +357,7 @@ cp -p browser/components/icecatview/tests/browser/browser_firefoxview_accessibil
 cp -p browser/components/icecatview/tests/browser/browser_firefoxview_feature_callout_a11y.js browser/components/icecatview/tests/browser/browser_icecatview_feature_callout_a11y.js
 cp -p browser/components/icecatview/tests/browser/browser_firefoxview_tab.js browser/components/icecatview/tests/browser/browser_icecatview_tab.js
 cp -p browser/components/icecatview/tests/browser/browser_reload_firefoxview.js browser/components/icecatview/tests/browser/browser_reload_icecatview.js
+cp -p browser/components/icecatview/firefoxview.html browser/components/icecatview/icecatview.html
 
 %patch -P 1 -p 1 -b .fix_addon_installation
 %patch -P 2 -p 1 -b .commasplit

From 31005b53e471d484a6a26850db6eabd904690e41 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 1 Oct 2023 19:45:00 +0200
Subject: [PATCH 360/473] Upload new source archive rh2

---
 .gitignore  |  1 +
 icecat.spec | 10 +---------
 sources     |  2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5a00452..1b751ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -231,3 +231,4 @@
 /icecat-102.15.0-rh1.tar.bz2
 /icecat-115.3.1-langpacks.tar.gz
 /icecat-115.3.1-rh1.tar.bz2
+/icecat-115.3.1-rh2.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index a6e1370..98e3068 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -4,7 +4,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh1
+%global redhat_ver rh2
 
 # Exclude ARM for the following error:
 #  terminate called after throwing an instance of 'std::bad_alloc'
@@ -351,14 +351,6 @@ to run GNU IceCat native on Wayland.
 # Copy license files
 tar -xf %{SOURCE5}
 
-# Rename test files
-cp -p browser/components/icecatview/tests/browser/browser_firefoxview.js browser/components/icecatview/tests/browser/browser_icecatview.js
-cp -p browser/components/icecatview/tests/browser/browser_firefoxview_accessibility.js browser/components/icecatview/tests/browser/browser_icecatview_accessibility.js
-cp -p browser/components/icecatview/tests/browser/browser_firefoxview_feature_callout_a11y.js browser/components/icecatview/tests/browser/browser_icecatview_feature_callout_a11y.js
-cp -p browser/components/icecatview/tests/browser/browser_firefoxview_tab.js browser/components/icecatview/tests/browser/browser_icecatview_tab.js
-cp -p browser/components/icecatview/tests/browser/browser_reload_firefoxview.js browser/components/icecatview/tests/browser/browser_reload_icecatview.js
-cp -p browser/components/icecatview/firefoxview.html browser/components/icecatview/icecatview.html
-
 %patch -P 1 -p 1 -b .fix_addon_installation
 %patch -P 2 -p 1 -b .commasplit
 %ifarch s390
diff --git a/sources b/sources
index 9b6a90b..db50cb7 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9cb2a3007939aa2eae5e94b1adf2040d1fdbee9e1ce4367175f79e716e6a02e976c4053452b93c9b8c12cd19ffc4c7cb8ab66b1e97b1a90a64dfbff92698c792
 SHA512 (icecat-115.3.1-langpacks.tar.gz) = 410d00ab15e1e871246ccad43c60f7b1d0cd602f279db465e2418c6cf7c4f156e50d76e59012baba8c9d15fe9515f6f3ecf35d755a9a0aed24412c807674c496
-SHA512 (icecat-115.3.1-rh1.tar.bz2) = cff35e4aa0e13cfc3d220f28422201a9b724f33db243ea01b556509e6b7a9e555d826b08bfafabfd7ba01127c9afc3154afdee451efc7a9eaadec9eb03b0332c
+SHA512 (icecat-115.3.1-rh2.tar.bz2) = 29581d2070914d8cbf759aa14252606aa87b03916798e3d5beefdfe48fcedba1b814a9be8f439d089c0f58f1439a62cfed69ccecbee7afa39bfe9e206ee5f3ee
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From fd9745a59a098834e5ff222b333d4f8f8dc065b2 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 1 Oct 2023 21:30:32 +0200
Subject: [PATCH 361/473] Exclude manpage temporarily

---
 icecat.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 98e3068..21a9eb0 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -709,9 +709,9 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE9}
 
 #
 
-##Install man page
-mkdir -p %{buildroot}%{_mandir}/man1
-install -p -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/
+# Install man page
+#mkdir -p %%{buildroot}%%{_mandir}/man1
+#install -p -m 644 %%{name}.1 %%{buildroot}%%{_mandir}/man1/
 
 ##Extract langpacks, make any mods needed, repack the langpack, and install it.
 %if 0%{?build_langpacks}
@@ -825,7 +825,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*x*/apps/%{name}*.png
 %{_metainfodir}/*.appdata.xml
-%{_mandir}/man1/%{name}*
+#%%{_mandir}/man1/%%{name}*
 %dir %{icecatappdir}
 %{icecatappdir}/browser/
 %{icecatappdir}/defaults/

From 775cb0ebfd1f0b24412fe9c809eaec8bb6e54c74 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Mon, 2 Oct 2023 21:18:26 +0200
Subject: [PATCH 362/473] Add missing installed files

---
 icecat.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 21a9eb0..3eb0b31 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -827,6 +827,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_metainfodir}/*.appdata.xml
 #%%{_mandir}/man1/%%{name}*
 %dir %{icecatappdir}
+%{icecatappdir}/glxtest
+%{icecatappdir}/vaapitest
 %{icecatappdir}/browser/
 %{icecatappdir}/defaults/
 %{icecatappdir}/dictionaries

From c66197e48040164cb31ddf2427d41b841aeda5b1 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 29 Oct 2023 21:15:25 +0100
Subject: [PATCH 363/473] Release 115.4.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 4 ++--
 sources                 | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b751ff..b578056 100644
--- a/.gitignore
+++ b/.gitignore
@@ -232,3 +232,5 @@
 /icecat-115.3.1-langpacks.tar.gz
 /icecat-115.3.1-rh1.tar.bz2
 /icecat-115.3.1-rh2.tar.bz2
+/icecat-115.4.0-langpacks.tar.gz
+/icecat-115.4.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 038d106..c9c2e84 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.3.1
+VERSION=115.4.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 3eb0b31..0b29079 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -4,7 +4,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh2
+%global redhat_ver rh1
 
 # Exclude ARM for the following error:
 #  terminate called after throwing an instance of 'std::bad_alloc'
@@ -106,7 +106,7 @@ ExcludeArch: s390x
 
 Name:    icecat
 Epoch:   2
-Version: 115.3.1
+Version: 115.4.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index db50cb7..5c85f2d 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9cb2a3007939aa2eae5e94b1adf2040d1fdbee9e1ce4367175f79e716e6a02e976c4053452b93c9b8c12cd19ffc4c7cb8ab66b1e97b1a90a64dfbff92698c792
-SHA512 (icecat-115.3.1-langpacks.tar.gz) = 410d00ab15e1e871246ccad43c60f7b1d0cd602f279db465e2418c6cf7c4f156e50d76e59012baba8c9d15fe9515f6f3ecf35d755a9a0aed24412c807674c496
-SHA512 (icecat-115.3.1-rh2.tar.bz2) = 29581d2070914d8cbf759aa14252606aa87b03916798e3d5beefdfe48fcedba1b814a9be8f439d089c0f58f1439a62cfed69ccecbee7afa39bfe9e206ee5f3ee
+SHA512 (icecat-115.4.0-langpacks.tar.gz) = 11b95a24df508946a318bf593a96275b59554f5ef453fb25ae9c455dc679759a9498ff2a92628b4d138f2ef981c85ba069d2e7f860bd30f723fc4e6c34195a99
+SHA512 (icecat-115.4.0-rh1.tar.bz2) = 3d322199399a88062b628a56cc17e7746f900872aa3d45db6d7e15a4b548dc7418b4d77815b64db89dd4222c2a3bb6273ad98c7568645e0af8937680d6361bf0
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 6253ffe421a5157356d6a0eff43ad7942aea3264 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 29 Oct 2023 21:47:42 +0100
Subject: [PATCH 364/473] Remove old patch

---
 icecat-rhbz-2235654.patch | 59 ---------------------------------------
 icecat.spec               |  2 --
 2 files changed, 61 deletions(-)
 delete mode 100644 icecat-rhbz-2235654.patch

diff --git a/icecat-rhbz-2235654.patch b/icecat-rhbz-2235654.patch
deleted file mode 100644
index 0c3780c..0000000
--- a/icecat-rhbz-2235654.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -up firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h.gccfailure firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h
---- firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h.gccfailure	2023-08-24 20:33:54.000000000 +0200
-+++ firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h	2023-08-30 13:04:56.174949736 +0200
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
-     int rt, dummy;
-+    if (__builtin_constant_p(shift))
-     __asm__ (
-         "imull %3               \n\t"
-         "shrdl %4, %%edx, %%eax \n\t"
-         :"=a"(rt), "=d"(dummy)
--        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+        :"a"(a), "rm"(b), "i"(shift & 0x1F)
-     );
-+    else
-+        __asm__ (
-+            "imull %3               \n\t"
-+            "shrdl %4, %%edx, %%eax \n\t"
-+            :"=a"(rt), "=d"(dummy)
-+            :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+        );
-     return rt;
- }
- 
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
-+    if (__builtin_constant_p(s))
-     __asm__ ("sarl %1, %0\n\t"
-          : "+r" (a)
--         : "ic" ((uint8_t)(-s))
-+         : "i" (-s & 0x1F)
-     );
-+    else
-+        __asm__ ("sarl %1, %0\n\t"
-+               : "+r" (a)
-+               : "c" ((uint8_t)(-s))
-+        );
-     return a;
- }
- 
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+    if (__builtin_constant_p(s))
-     __asm__ ("shrl %1, %0\n\t"
-          : "+r" (a)
--         : "ic" ((uint8_t)(-s))
-+         : "i" (-s & 0x1F)
-     );
-+    else
-+        __asm__ ("shrl %1, %0\n\t"
-+               : "+r" (a)
-+               : "c" ((uint8_t)(-s))
-+        );
-     return a;
- }
- 
diff --git a/icecat.spec b/icecat.spec
index 0b29079..33026fd 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -176,7 +176,6 @@ Patch220: firefox-nss-version.patch
 Patch221: firefox-nss-addon-hack.patch
 Patch223: %{name}-glibc-dynstack.patch
 Patch224: %{name}-GLIBCXX-fix-for-GCC-12.patch
-Patch227: %{name}-rhbz-2235654.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
@@ -367,7 +366,6 @@ tar -xf %{SOURCE5}
 %patch -P 221 -p 1 -b .firefox-nss-addon-hack
 %endif
 %patch -P 224 -p 1 -b .glibcxx
-%patch -P 227 -p 1 -b .backup
 
 # ARM run-time patch
 %ifarch aarch64

From fe2bfbe1dc3ffa5e5fa045bc01080ee9139d3f1d Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 12 Nov 2023 18:23:39 +0100
Subject: [PATCH 365/473] Upload source code archive rh2

---
 .gitignore  | 1 +
 icecat.spec | 2 +-
 sources     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index b578056..3b169e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -234,3 +234,4 @@
 /icecat-115.3.1-rh2.tar.bz2
 /icecat-115.4.0-langpacks.tar.gz
 /icecat-115.4.0-rh1.tar.bz2
+/icecat-115.4.0-rh2.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index 33026fd..3416d5f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -4,7 +4,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh1
+%global redhat_ver rh2
 
 # Exclude ARM for the following error:
 #  terminate called after throwing an instance of 'std::bad_alloc'
diff --git a/sources b/sources
index 5c85f2d..29ffc2c 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9cb2a3007939aa2eae5e94b1adf2040d1fdbee9e1ce4367175f79e716e6a02e976c4053452b93c9b8c12cd19ffc4c7cb8ab66b1e97b1a90a64dfbff92698c792
 SHA512 (icecat-115.4.0-langpacks.tar.gz) = 11b95a24df508946a318bf593a96275b59554f5ef453fb25ae9c455dc679759a9498ff2a92628b4d138f2ef981c85ba069d2e7f860bd30f723fc4e6c34195a99
-SHA512 (icecat-115.4.0-rh1.tar.bz2) = 3d322199399a88062b628a56cc17e7746f900872aa3d45db6d7e15a4b548dc7418b4d77815b64db89dd4222c2a3bb6273ad98c7568645e0af8937680d6361bf0
+SHA512 (icecat-115.4.0-rh2.tar.bz2) = 343a50e5d9032d981cf901c4a31379f0733b0da6a796864e81e0e04a7ddd18ad05debf5342a87c72be74c813ff43a3cb765e4f203a1b997f6951113a4aa4a82e
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 27357afda622f32a0fd243b5929ae6118cd943b6 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 22 Nov 2023 23:25:28 +0100
Subject: [PATCH 366/473] Release 115.5.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 8 ++++----
 sources                 | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3b169e9..a8957bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -235,3 +235,5 @@
 /icecat-115.4.0-langpacks.tar.gz
 /icecat-115.4.0-rh1.tar.bz2
 /icecat-115.4.0-rh2.tar.bz2
+/icecat-115.5.0-langpacks.tar.gz
+/icecat-115.5.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index c9c2e84..032a3a4 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.4.0
+VERSION=115.5.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 3416d5f..b85cab1 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -4,7 +4,7 @@
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh2
+%global redhat_ver rh1
 
 # Exclude ARM for the following error:
 #  terminate called after throwing an instance of 'std::bad_alloc'
@@ -106,7 +106,7 @@ ExcludeArch: s390x
 
 Name:    icecat
 Epoch:   2
-Version: 115.4.0
+Version: 115.5.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
@@ -254,8 +254,8 @@ BuildRequires: nss-static >= %{nss_version}
 
 BuildRequires: pango-devel
 BuildRequires: pipewire-devel
-#BuildRequires: python3-devel
-#BuildRequires: python3-setuptools
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
 BuildRequires: python3.11-devel
 BuildRequires: perl-interpreter
 BuildRequires: pkgconfig(xrender)
diff --git a/sources b/sources
index 29ffc2c..9def839 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9cb2a3007939aa2eae5e94b1adf2040d1fdbee9e1ce4367175f79e716e6a02e976c4053452b93c9b8c12cd19ffc4c7cb8ab66b1e97b1a90a64dfbff92698c792
-SHA512 (icecat-115.4.0-langpacks.tar.gz) = 11b95a24df508946a318bf593a96275b59554f5ef453fb25ae9c455dc679759a9498ff2a92628b4d138f2ef981c85ba069d2e7f860bd30f723fc4e6c34195a99
-SHA512 (icecat-115.4.0-rh2.tar.bz2) = 343a50e5d9032d981cf901c4a31379f0733b0da6a796864e81e0e04a7ddd18ad05debf5342a87c72be74c813ff43a3cb765e4f203a1b997f6951113a4aa4a82e
+SHA512 (icecat-115.5.0-langpacks.tar.gz) = 3d0ced6d2cfffbdb60a22857475fd47e66f391f21dd8f9b579bc006c3b1b7e2c11ea47f992da5763a8dc1a11f69eded5dcc7895711d165699d7687ffa7419b67
+SHA512 (icecat-115.5.0-rh1.tar.bz2) = 404fea837edd8423322e007302f340f3a8fa54a2428df317d2c3bf238674ad21bb74010fcd05532a72e2e20df4e9962927fa1cd070066d78a82aeee01d50fef5
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 87f2b73b907f5b7fb85ff03630dcf32f87c0434f Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 20 Dec 2023 22:12:40 +0100
Subject: [PATCH 367/473] Release 115.6.0 rh1

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 6 +++---
 sources                 | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index a8957bb..44b3d2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -237,3 +237,5 @@
 /icecat-115.4.0-rh2.tar.bz2
 /icecat-115.5.0-langpacks.tar.gz
 /icecat-115.5.0-rh1.tar.bz2
+/icecat-115.6.0-langpacks.tar.gz
+/icecat-115.6.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 032a3a4..554f39d 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.5.0
+VERSION=115.6.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index b85cab1..1771eeb 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -101,12 +101,13 @@ ExcludeArch: s390x
 %global build_with_clang  0
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1908792
+# https://bugzilla.redhat.com/show_bug.cgi?id=2255254
 %global __provides_exclude_from ^%{icecatappdir}
-%global __requires_exclude_from ^%{icecatappdir}
+%global __requires_exclude ^(%%(find %{buildroot}%{icecatappdir} -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -))
 
 Name:    icecat
 Epoch:   2
-Version: 115.5.0
+Version: 115.6.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
@@ -823,7 +824,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*x*/apps/%{name}*.png
 %{_metainfodir}/*.appdata.xml
-#%%{_mandir}/man1/%%{name}*
 %dir %{icecatappdir}
 %{icecatappdir}/glxtest
 %{icecatappdir}/vaapitest
diff --git a/sources b/sources
index 9def839..2841346 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9cb2a3007939aa2eae5e94b1adf2040d1fdbee9e1ce4367175f79e716e6a02e976c4053452b93c9b8c12cd19ffc4c7cb8ab66b1e97b1a90a64dfbff92698c792
-SHA512 (icecat-115.5.0-langpacks.tar.gz) = 3d0ced6d2cfffbdb60a22857475fd47e66f391f21dd8f9b579bc006c3b1b7e2c11ea47f992da5763a8dc1a11f69eded5dcc7895711d165699d7687ffa7419b67
-SHA512 (icecat-115.5.0-rh1.tar.bz2) = 404fea837edd8423322e007302f340f3a8fa54a2428df317d2c3bf238674ad21bb74010fcd05532a72e2e20df4e9962927fa1cd070066d78a82aeee01d50fef5
+SHA512 (icecat-115.6.0-langpacks.tar.gz) = 75d3dca30f7bb05a2e96ddbadd07bd35cd0e9528bdf9e73bce1c25afe335430ae58ef16cbeb389aad3933e7df6497a3a8e942a908d05ede7f96028f158b527e1
+SHA512 (icecat-115.6.0-rh1.tar.bz2) = 3c307379acde59f9d74209516d80a29e264557fd60490026d20252e2df631d03100c9c7e51697bac444d8713d434106c6d43ddf7f5c7a697e3ceaabe8985d533
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From ac22d825a0e6d39583a8ebb0f111e927a8f4d682 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jan 2024 22:54:38 +0000
Subject: [PATCH 368/473] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild


From c1e0f10b13533f125e1b17319c229bbc66df38f4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jan 2024 22:32:24 +0000
Subject: [PATCH 369/473] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild


From 5ceaf9629576c3ae5ecb490054adf510b94c025b Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 25 Jan 2024 19:52:45 +0100
Subject: [PATCH 370/473] Release 115.7.0

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 15 +++++++++------
 sources                 |  4 ++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 44b3d2c..8db9376 100644
--- a/.gitignore
+++ b/.gitignore
@@ -239,3 +239,5 @@
 /icecat-115.5.0-rh1.tar.bz2
 /icecat-115.6.0-langpacks.tar.gz
 /icecat-115.6.0-rh1.tar.bz2
+/icecat-115.7.0-langpacks.tar.gz
+/icecat-115.7.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 554f39d..27f69db 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.6.0
+VERSION=115.7.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 1771eeb..910367e 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -107,12 +107,12 @@ ExcludeArch: s390x
 
 Name:    icecat
 Epoch:   2
-Version: 115.6.0
+Version: 115.7.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
-License: (MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later) and GPL-3.0-or-later and MIT and BSD and ISC and Apache-2.0 and MPL-2.0
+License: (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later) AND GPL-3.0-or-later AND MIT AND BSD AND ISC AND Apache-2.0 AND MPL-2.0
 URL:   http://www.gnu.org/software/gnuzilla/
 
 ## Source archive created by scripts based on Gnuzilla files.
@@ -315,10 +315,13 @@ Extensions included to this version of IceCat:
  * LibreJS
    GNU LibreJS aims to address the JavaScript problem described in the article
    "The JavaScript Trap" of Richard Stallman.
-
- * HTTPS Everywhere
-   HTTPS Everywhere is an extension that encrypts your communications with
-   many major websites, making your browsing more secure.
+   
+ * JShelter: Mitigates potential threats from JavaScript, including fingerprinting,
+   tracking, and data collection. Slightly modifies the results of API calls,
+   differently on different domains, so that the cross-site fingerprint is not
+   stable. Applies security counter-measures that are likely not to break web pages.
+   Allows fine-grained control over the restrictions and counter-measures applied
+   to each domain. 
 
  * A set of companion extensions for LibreJS by Nathan Nichols
    are pre-installed, and provide workarounds to use some services at USPS,
diff --git a/sources b/sources
index 2841346..57f4f90 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9cb2a3007939aa2eae5e94b1adf2040d1fdbee9e1ce4367175f79e716e6a02e976c4053452b93c9b8c12cd19ffc4c7cb8ab66b1e97b1a90a64dfbff92698c792
-SHA512 (icecat-115.6.0-langpacks.tar.gz) = 75d3dca30f7bb05a2e96ddbadd07bd35cd0e9528bdf9e73bce1c25afe335430ae58ef16cbeb389aad3933e7df6497a3a8e942a908d05ede7f96028f158b527e1
-SHA512 (icecat-115.6.0-rh1.tar.bz2) = 3c307379acde59f9d74209516d80a29e264557fd60490026d20252e2df631d03100c9c7e51697bac444d8713d434106c6d43ddf7f5c7a697e3ceaabe8985d533
+SHA512 (icecat-115.7.0-langpacks.tar.gz) = 2690afad59d9c4f063b55f3c8c5644343d8727ad07a620a04bfd60f656dc71382b84a7586bc6912812dbb77ab5bcfb9627f259c2f4cff64bcf539692dba9c316
+SHA512 (icecat-115.7.0-rh1.tar.bz2) = 1f11b8760c8d53f9cb67d97539d350289e1c7b9ad46dbecc7b83260a47df2799ddc3f280ef5259fa9a91ab740f7982a741432ecfe2423f694021ad4cf0d6fd20
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From fc1527d129312cf9232c675c9f53e10f7408b188 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 27 Jan 2024 12:22:46 +0100
Subject: [PATCH 371/473] Update README file

---
 README.md   | 11 +++++++----
 icecat.spec |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 91c75f8..fd35930 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,13 @@ Extensions included to this version of IceCat:
    GNU LibreJS aims to address the JavaScript problem described in the article
    "[The JavaScript Trap](https://www.gnu.org/philosophy/javascript-trap.html)" of Richard Stallman.
 
- * HTTPS Everywhere
-
-   HTTPS Everywhere is an extension that encrypts your communications with
-   many major websites, making your browsing more secure.
+ * JShelter
+   Mitigates potential threats from JavaScript, including fingerprinting,
+   tracking, and data collection. Slightly modifies the results of API calls,
+   differently on different domains, so that the cross-site fingerprint is not
+   stable. Applies security counter-measures that are likely not to break web pages.
+   Allows fine-grained control over the restrictions and counter-measures applied
+   to each domain. 
 
  * A set of companion extensions for LibreJS by Nathan Nichols
    are pre-installed, and provide workarounds to use some services at USPS,
diff --git a/icecat.spec b/icecat.spec
index 910367e..1cfd369 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -316,7 +316,8 @@ Extensions included to this version of IceCat:
    GNU LibreJS aims to address the JavaScript problem described in the article
    "The JavaScript Trap" of Richard Stallman.
    
- * JShelter: Mitigates potential threats from JavaScript, including fingerprinting,
+ * JShelter
+   Mitigates potential threats from JavaScript, including fingerprinting,
    tracking, and data collection. Slightly modifies the results of API calls,
    differently on different domains, so that the cross-site fingerprint is not
    stable. Applies security counter-measures that are likely not to break web pages.

From cde761c2a49bcdcacb44862efe252eaf3b634e74 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 27 Jan 2024 12:33:34 +0100
Subject: [PATCH 372/473] Fix README file

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index fd35930..f490435 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,9 @@ Extensions included to this version of IceCat:
    GNU LibreJS aims to address the JavaScript problem described in the article
    "[The JavaScript Trap](https://www.gnu.org/philosophy/javascript-trap.html)" of Richard Stallman.
 
+
  * JShelter
+
    Mitigates potential threats from JavaScript, including fingerprinting,
    tracking, and data collection. Slightly modifies the results of API calls,
    differently on different domains, so that the cross-site fingerprint is not
@@ -14,16 +16,19 @@ Extensions included to this version of IceCat:
    Allows fine-grained control over the restrictions and counter-measures applied
    to each domain. 
 
+
  * A set of companion extensions for LibreJS by Nathan Nichols
    are pre-installed, and provide workarounds to use some services at USPS,
    RSF.org, SumOfUs.org, pay.gov, McDonalds, goteo.org and Google Docs
    without using nonfree JavaScript.
 
+
  * A series of configuration changes and tweaks were applied to ensure that
    IceCat does not initiate network connections that the user has not explicitly
    requested. This implies not downloading feeds, updates, blacklists or any
    other similar data needed during startup.
 
+
 Origin of the name
 
 The name “IceCat” was coined to show our relationship to the Mozilla Firefox browser. Ice isn't Fire and a Cat isn't a Fox, so it is clearly a different package (we don't want Mozilla blamed for our mistakes, nor cause confusion with their trademarks), but is equally clearly intimately related (of course nearly all of the work comes from the Mozilla foundation effort, so we want to give credit).

From 925cffd0e5899fa5c8b7dc7d230597c706ab6ec8 Mon Sep 17 00:00:00 2001
From: Pete Walter <pwalter@fedoraproject.org>
Date: Thu, 8 Feb 2024 00:02:33 +0000
Subject: [PATCH 373/473] Rebuild for libvpx 1.14.x


From 66b640dd224bcd979ad59f332ee0a58a7f34c5bf Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 20 Feb 2024 20:43:26 +0100
Subject: [PATCH 374/473] Release 115.8.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 5 ++---
 sources                 | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8db9376..c6b8353 100644
--- a/.gitignore
+++ b/.gitignore
@@ -241,3 +241,5 @@
 /icecat-115.6.0-rh1.tar.bz2
 /icecat-115.7.0-langpacks.tar.gz
 /icecat-115.7.0-rh1.tar.bz2
+/icecat-115.8.0-langpacks.tar.gz
+/icecat-115.8.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 27f69db..70498c5 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.7.0
+VERSION=115.8.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 1cfd369..acd76d9 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -107,7 +107,7 @@ ExcludeArch: s390x
 
 Name:    icecat
 Epoch:   2
-Version: 115.7.0
+Version: 115.8.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
@@ -316,8 +316,7 @@ Extensions included to this version of IceCat:
    GNU LibreJS aims to address the JavaScript problem described in the article
    "The JavaScript Trap" of Richard Stallman.
    
- * JShelter
-   Mitigates potential threats from JavaScript, including fingerprinting,
+ * JShelter: Mitigates potential threats from JavaScript, including fingerprinting,
    tracking, and data collection. Slightly modifies the results of API calls,
    differently on different domains, so that the cross-site fingerprint is not
    stable. Applies security counter-measures that are likely not to break web pages.
diff --git a/sources b/sources
index 57f4f90..dcf9e9d 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9cb2a3007939aa2eae5e94b1adf2040d1fdbee9e1ce4367175f79e716e6a02e976c4053452b93c9b8c12cd19ffc4c7cb8ab66b1e97b1a90a64dfbff92698c792
-SHA512 (icecat-115.7.0-langpacks.tar.gz) = 2690afad59d9c4f063b55f3c8c5644343d8727ad07a620a04bfd60f656dc71382b84a7586bc6912812dbb77ab5bcfb9627f259c2f4cff64bcf539692dba9c316
-SHA512 (icecat-115.7.0-rh1.tar.bz2) = 1f11b8760c8d53f9cb67d97539d350289e1c7b9ad46dbecc7b83260a47df2799ddc3f280ef5259fa9a91ab740f7982a741432ecfe2423f694021ad4cf0d6fd20
+SHA512 (icecat-115.8.0-langpacks.tar.gz) = 762d24628bc5edbdce807b2be5de6ec1cfbc984f290a6bf9b25421af57480350cb454345a4303614f752bf2cc48eb7653d28c626b2a4f071dfcab3d11042ef9e
+SHA512 (icecat-115.8.0-rh1.tar.bz2) = 1ebd0791d54c7112263964d47a96b918728040cd04d39703f208c616b04fbaadc047f234ee2fc38c7b074e527a7014959b7280458796d60e1f8a5c80107a0505
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From be99293fa424e7512785559218bc435cee4c817d Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 27 Feb 2024 14:48:01 +0100
Subject: [PATCH 375/473] Rebuilt for java-21-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java21

From f6f8cc4499fe1db39f59a3e792b88156168416cf Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Sat, 2 Mar 2024 16:42:03 +0100
Subject: [PATCH 376/473] Rebuilt for java-21-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java21

From bf05a6d1c92d284ba533f38d690d23f234de1648 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 22 Mar 2024 14:10:18 +0100
Subject: [PATCH 377/473] Release 115.9.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index c6b8353..7c9d2cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -243,3 +243,5 @@
 /icecat-115.7.0-rh1.tar.bz2
 /icecat-115.8.0-langpacks.tar.gz
 /icecat-115.8.0-rh1.tar.bz2
+/icecat-115.9.0-langpacks.tar.gz
+/icecat-115.9.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 70498c5..c1b0fc5 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.8.0
+VERSION=115.9.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index acd76d9..02b442b 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -107,7 +107,7 @@ ExcludeArch: s390x
 
 Name:    icecat
 Epoch:   2
-Version: 115.8.0
+Version: 115.9.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index dcf9e9d..7c92e93 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 9cb2a3007939aa2eae5e94b1adf2040d1fdbee9e1ce4367175f79e716e6a02e976c4053452b93c9b8c12cd19ffc4c7cb8ab66b1e97b1a90a64dfbff92698c792
-SHA512 (icecat-115.8.0-langpacks.tar.gz) = 762d24628bc5edbdce807b2be5de6ec1cfbc984f290a6bf9b25421af57480350cb454345a4303614f752bf2cc48eb7653d28c626b2a4f071dfcab3d11042ef9e
-SHA512 (icecat-115.8.0-rh1.tar.bz2) = 1ebd0791d54c7112263964d47a96b918728040cd04d39703f208c616b04fbaadc047f234ee2fc38c7b074e527a7014959b7280458796d60e1f8a5c80107a0505
+SHA512 (icecat-115.9.0-langpacks.tar.gz) = b427be4f3b213c5cf2162c5e8027bc3fd610a9fd34afa925f6cab876ae0e5fd9150af4e2f638636fc62f7f3f5fb6a0a1e74520452443950be90bd9386505e553
+SHA512 (icecat-115.9.0-rh1.tar.bz2) = 510da953c00c021e0617e15ea8cc31ee7b4a1336953b2b59d9dfb4b040df99d3d532a143d00a95f51aa6c6ec09599bc3ffb68fa9087c8d196d0c8ac79ba8193e
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 331ec3a977d78c2fcb75393efba1c228e72151e9 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 22 Mar 2024 21:23:11 +0100
Subject: [PATCH 378/473] Update to cbindgen-0.26.0

---
 icecat.spec | 10 ++++++----
 sources     |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 02b442b..92bf0f6 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -18,6 +18,10 @@ ExcludeArch: %{arm}
 ExcludeArch: s390x
 %endif
 
+# Bundled cbindgen makes build slow.
+# Enable only if system cbindgen is not available.
+%global use_bundled_cbindgen  1
+
 ####################
 
 ### Optimization ###
@@ -94,9 +98,6 @@ ExcludeArch: s390x
 
 %global disable_elfhack 1
 
-# cbingen
-%global use_bundled_cbindgen 1
-
 # Use clang?
 %global build_with_clang  0
 
@@ -515,7 +516,6 @@ find extensions/gnu -name cose.manifest -delete
 %build
 # cbindgen
 %if 0%{?use_bundled_cbindgen}
-
 mkdir -p my_rust_vendor
 cd my_rust_vendor
 %{__tar} xf %{SOURCE17}
@@ -531,6 +531,8 @@ EOL
 
 env CARGO_HOME=.cargo cargo install cbindgen
 export PATH=`pwd`/.cargo/bin:$PATH
+%else
+export CBINDGEN=/usr/bin/cbindgen
 %endif
 
 mkdir %{_buildrootdir}/bin || :
diff --git a/sources b/sources
index 7c92e93..c36cd04 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = 9cb2a3007939aa2eae5e94b1adf2040d1fdbee9e1ce4367175f79e716e6a02e976c4053452b93c9b8c12cd19ffc4c7cb8ab66b1e97b1a90a64dfbff92698c792
+SHA512 (cbindgen-vendor.tar.xz) = 6142d1b08e75ee39ca706b8c7ab9b2c6f8585bb375a3c4231481fa5d974e53cbcaa4940279678a9cf8e5a974050f30841d99ff63c1efa7a294fd6e156e9af443
 SHA512 (icecat-115.9.0-langpacks.tar.gz) = b427be4f3b213c5cf2162c5e8027bc3fd610a9fd34afa925f6cab876ae0e5fd9150af4e2f638636fc62f7f3f5fb6a0a1e74520452443950be90bd9386505e553
 SHA512 (icecat-115.9.0-rh1.tar.bz2) = 510da953c00c021e0617e15ea8cc31ee7b4a1336953b2b59d9dfb4b040df99d3d532a143d00a95f51aa6c6ec09599bc3ffb68fa9087c8d196d0c8ac79ba8193e
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From e223a3cc93f6fd313857665c312a2a5ec1914cd0 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 10 Apr 2024 22:57:42 +0200
Subject: [PATCH 379/473] Debug build

---
 icecat.spec | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 92bf0f6..a8ceacc 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,6 +1,6 @@
 ### Naming ###
 # Set to true if it's going to be submitted as update
-%global release_build 1
+%global release_build 0
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
@@ -14,9 +14,7 @@ ExcludeArch: %{arm}
 
 # Build is failing because of
 # include/mozilla/FloatingPoint.h:212:31: error: inlining failed in call to ‘always_inline’ ‘bool mozilla::IsNegativeZero(T) [with T = double]’: indirect function call with a yet undetermined callee
-%if 0%{?fedora}
 ExcludeArch: s390x
-%endif
 
 # Bundled cbindgen makes build slow.
 # Enable only if system cbindgen is not available.
@@ -26,10 +24,10 @@ ExcludeArch: s390x
 
 ### Optimization ###
 # Builds for debugging
-%global debug_build   0
+%global debug_build   1
 
 # Downgrade optimization
-%global less_optbuild 0
+%global less_optbuild 1
 
 # Use mozilla hardening option?
 %global hardened_build 1

From 000866408200878042a9172965b53879f3ce18e8 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 17 Apr 2024 23:27:44 +0200
Subject: [PATCH 380/473] Release 115.10.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 8 ++++----
 sources                 | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c9d2cb..dd29aec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -245,3 +245,5 @@
 /icecat-115.8.0-rh1.tar.bz2
 /icecat-115.9.0-langpacks.tar.gz
 /icecat-115.9.0-rh1.tar.bz2
+/icecat-115.10.0-langpacks.tar.gz
+/icecat-115.10.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index c1b0fc5..5c0108c 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.9.0
+VERSION=115.10.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index a8ceacc..07ef3b6 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,6 +1,6 @@
 ### Naming ###
 # Set to true if it's going to be submitted as update
-%global release_build 0
+%global release_build 1
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
@@ -24,10 +24,10 @@ ExcludeArch: s390x
 
 ### Optimization ###
 # Builds for debugging
-%global debug_build   1
+%global debug_build   0
 
 # Downgrade optimization
-%global less_optbuild 1
+%global less_optbuild 0
 
 # Use mozilla hardening option?
 %global hardened_build 1
@@ -106,7 +106,7 @@ ExcludeArch: s390x
 
 Name:    icecat
 Epoch:   2
-Version: 115.9.0
+Version: 115.10.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index c36cd04..8d82209 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 6142d1b08e75ee39ca706b8c7ab9b2c6f8585bb375a3c4231481fa5d974e53cbcaa4940279678a9cf8e5a974050f30841d99ff63c1efa7a294fd6e156e9af443
-SHA512 (icecat-115.9.0-langpacks.tar.gz) = b427be4f3b213c5cf2162c5e8027bc3fd610a9fd34afa925f6cab876ae0e5fd9150af4e2f638636fc62f7f3f5fb6a0a1e74520452443950be90bd9386505e553
-SHA512 (icecat-115.9.0-rh1.tar.bz2) = 510da953c00c021e0617e15ea8cc31ee7b4a1336953b2b59d9dfb4b040df99d3d532a143d00a95f51aa6c6ec09599bc3ffb68fa9087c8d196d0c8ac79ba8193e
+SHA512 (icecat-115.10.0-langpacks.tar.gz) = c779294970427f2a95e9744f90778808734550638433f07d954bc53186425d6d15cdaafd50dc4fde8210944aa30396ae0cdacd51b2d939176ca833f50732b0ef
+SHA512 (icecat-115.10.0-rh1.tar.bz2) = 0187c919e795da8d9950fc67ac9919eb77d5e31a5121e95f03a29331e2e281731b12e6b9cd19f3ca4e8cd6a52fcbc288221ce09e78dcc2d02ae139e56250af44
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 8384f31f4f080471d9ce4193a6debe4efafd8298 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 24 Apr 2024 21:30:19 +0200
Subject: [PATCH 381/473] Rebuild in Fedora 40+ with clang

---
 icecat.spec | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 07ef3b6..e4f7274 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -16,6 +16,11 @@ ExcludeArch: %{arm}
 # include/mozilla/FloatingPoint.h:212:31: error: inlining failed in call to ‘always_inline’ ‘bool mozilla::IsNegativeZero(T) [with T = double]’: indirect function call with a yet undetermined callee
 ExcludeArch: s390x
 
+	
+# Excluded due to https://bugzilla.mozilla.org/show_bug.cgi?id=1792159
+# https://bugzilla.redhat.com/show_bug.cgi?id=2129720
+ExcludeArch: i686
+
 # Bundled cbindgen makes build slow.
 # Enable only if system cbindgen is not available.
 %global use_bundled_cbindgen  1
@@ -97,7 +102,11 @@ ExcludeArch: s390x
 %global disable_elfhack 1
 
 # Use clang?
+%if 0%{?fedora} > 39
+%global build_with_clang  1
+%else
 %global build_with_clang  0
+%endif
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1908792
 # https://bugzilla.redhat.com/show_bug.cgi?id=2255254
@@ -268,12 +277,19 @@ BuildRequires: pulseaudio-libs-devel
 BuildRequires: yasm
 BuildRequires: llvm
 BuildRequires: llvm-devel
-BuildRequires: clang
-BuildRequires: clang-libs
-BuildRequires: clang-devel
 %if 0%{?build_with_clang}
+%if 0%{?fedora} >= 40
+BuildRequires:  clang17
+BuildRequires:  clang17-libs
+BuildRequires:  clang17-devel
+%else
+BuildRequires:  clang
+BuildRequires:  clang-libs
+BuildRequires:  clang-devel
+%endif
 BuildRequires: lld
 %endif
+%endif
 BuildRequires: rust
 %if 0%{?pgo_wayland}
 BuildRequires:  mutter
@@ -485,7 +501,12 @@ echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 %endif
 
 # Clang
+%if 0%{?fedora} >= 40
+echo "ac_add_options --with-clang-path=%{_bindir}/clang-17" >> .mozconfig
+echo "ac_add_options --with-libclang-path=%{_libdir}llvm17/lib" >> .mozconfig
+%else
 echo "ac_add_options --with-libclang-path=%{_libdir}" >> .mozconfig
+%endif
 
 %ifarch s390x
 echo "ac_add_options --disable-jit" >> .mozconfig

From 199a717b3cda25b3712e257b5bd9975761eb7d85 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 24 Apr 2024 21:34:07 +0200
Subject: [PATCH 382/473] Rebuild in Fedora 40+ with clang

---
 icecat.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index e4f7274..2ab9fab 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -289,7 +289,6 @@ BuildRequires:  clang-devel
 %endif
 BuildRequires: lld
 %endif
-%endif
 BuildRequires: rust
 %if 0%{?pgo_wayland}
 BuildRequires:  mutter

From 1f2f0134d4ec9e038b468be8d5775377c060a70b Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 24 Apr 2024 21:39:43 +0200
Subject: [PATCH 383/473] Fix conditional clang options

---
 icecat.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 2ab9fab..f7f20e4 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -500,12 +500,14 @@ echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 %endif
 
 # Clang
+%if 0%{?build_with_clang}
 %if 0%{?fedora} >= 40
 echo "ac_add_options --with-clang-path=%{_bindir}/clang-17" >> .mozconfig
 echo "ac_add_options --with-libclang-path=%{_libdir}llvm17/lib" >> .mozconfig
 %else
 echo "ac_add_options --with-libclang-path=%{_libdir}" >> .mozconfig
 %endif
+%endif
 
 %ifarch s390x
 echo "ac_add_options --disable-jit" >> .mozconfig

From 1499cbc50f8d8ca433373fd762d34f715c1c560b Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 24 Apr 2024 22:05:40 +0200
Subject: [PATCH 384/473] Fix libdir typo

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index f7f20e4..e1d1645 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -503,7 +503,7 @@ echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 %if 0%{?build_with_clang}
 %if 0%{?fedora} >= 40
 echo "ac_add_options --with-clang-path=%{_bindir}/clang-17" >> .mozconfig
-echo "ac_add_options --with-libclang-path=%{_libdir}llvm17/lib" >> .mozconfig
+echo "ac_add_options --with-libclang-path=%{_libdir}/llvm17/lib" >> .mozconfig
 %else
 echo "ac_add_options --with-libclang-path=%{_libdir}" >> .mozconfig
 %endif

From 07431212fd22e1774920dbca07dfe97c59834144 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 15 May 2024 14:36:40 +0200
Subject: [PATCH 385/473] Release 115.11.0 | Exclude 32-bit architectures

---
 .gitignore                     |  2 +
 icecat-115.11.0-gfx-qcms.patch | 49 ++++++++++++++++++++++++
 icecat-lang_download.sh        |  2 +-
 icecat.spec                    | 70 +++++++---------------------------
 sources                        |  6 +--
 5 files changed, 68 insertions(+), 61 deletions(-)
 create mode 100644 icecat-115.11.0-gfx-qcms.patch

diff --git a/.gitignore b/.gitignore
index dd29aec..e75e2b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -247,3 +247,5 @@
 /icecat-115.9.0-rh1.tar.bz2
 /icecat-115.10.0-langpacks.tar.gz
 /icecat-115.10.0-rh1.tar.bz2
+/icecat-115.11.0-langpacks.tar.gz
+/icecat-115.11.0-rh1.tar.bz2
diff --git a/icecat-115.11.0-gfx-qcms.patch b/icecat-115.11.0-gfx-qcms.patch
new file mode 100644
index 0000000..b4e0207
--- /dev/null
+++ b/icecat-115.11.0-gfx-qcms.patch
@@ -0,0 +1,49 @@
+diff -up firefox-115.11.0/Cargo.lock.gfx-qcms firefox-115.11.0/Cargo.lock
+--- firefox-115.11.0/Cargo.lock.gfx-qcms	2024-05-13 18:22:10.848690842 +0200
++++ firefox-115.11.0/Cargo.lock	2024-05-13 18:26:01.991124505 +0200
+@@ -4276,6 +4276,7 @@ name = "qcms"
+ version = "0.2.0"
+ dependencies = [
+  "libc",
++ "version_check",
+ ]
+ 
+ [[package]]
+diff -up firefox-115.11.0/gfx/qcms/build.rs.gfx-qcms firefox-115.11.0/gfx/qcms/build.rs
+--- firefox-115.11.0/gfx/qcms/build.rs.gfx-qcms	2024-05-13 18:22:10.848690842 +0200
++++ firefox-115.11.0/gfx/qcms/build.rs	2024-05-13 18:22:10.848690842 +0200
+@@ -0,0 +1,7 @@
++extern crate version_check as rustc;
++
++fn main() {
++    if rustc::is_min_version("1.78.0").unwrap_or(false) {
++        println!("cargo:rustc-cfg=stdsimd_split");
++    }
++}
+diff -up firefox-115.11.0/gfx/qcms/Cargo.toml.gfx-qcms firefox-115.11.0/gfx/qcms/Cargo.toml
+--- firefox-115.11.0/gfx/qcms/Cargo.toml.gfx-qcms	2024-05-06 20:27:35.000000000 +0200
++++ firefox-115.11.0/gfx/qcms/Cargo.toml	2024-05-13 18:22:10.848690842 +0200
+@@ -20,3 +20,6 @@ cmyk = []
+ 
+ [dependencies]
+ libc = {version = "0.2", optional = true }
++
++[build-dependencies]
++version_check = "0.9"
+diff -up firefox-115.11.0/gfx/qcms/src/lib.rs.gfx-qcms firefox-115.11.0/gfx/qcms/src/lib.rs
+--- firefox-115.11.0/gfx/qcms/src/lib.rs.gfx-qcms	2024-05-06 20:27:35.000000000 +0200
++++ firefox-115.11.0/gfx/qcms/src/lib.rs	2024-05-13 18:22:10.848690842 +0200
+@@ -7,9 +7,11 @@
+ #![allow(non_upper_case_globals)]
+ // These are needed for the neon SIMD code and can be removed once the MSRV supports the
+ // instrinsics we use
+-#![cfg_attr(feature = "neon", feature(stdsimd))]
++#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))]
++#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))]
++#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))]
+ #![cfg_attr(
+-    feature = "neon",
++    all(target_arch = "arm", feature = "neon"),
+     feature(arm_target_feature, raw_ref_op)
+ 
+ )]
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 5c0108c..8885f64 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.10.0
+VERSION=115.11.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index e1d1645..dbddd01 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -6,20 +6,11 @@
 # This tag indicates a new rebuild for Fedora
 %global redhat_ver rh1
 
-# Exclude ARM for the following error:
-#  terminate called after throwing an instance of 'std::bad_alloc'
-#   what():  std::bad_alloc
-#   error: could not compile `gkrust`
-ExcludeArch: %{arm}
-
 # Build is failing because of
 # include/mozilla/FloatingPoint.h:212:31: error: inlining failed in call to ‘always_inline’ ‘bool mozilla::IsNegativeZero(T) [with T = double]’: indirect function call with a yet undetermined callee
-ExcludeArch: s390x
+#ExcludeArch: s390x
 
-	
-# Excluded due to https://bugzilla.mozilla.org/show_bug.cgi?id=1792159
-# https://bugzilla.redhat.com/show_bug.cgi?id=2129720
-ExcludeArch: i686
+ExcludeArch: %{ix86} %{arm}
 
 # Bundled cbindgen makes build slow.
 # Enable only if system cbindgen is not available.
@@ -72,7 +63,7 @@ ExcludeArch: i686
 %global toolkit_gtk3  1
 
 # Big endian platforms
-%ifarch ppc64 s390x
+%ifarch %{power64} s390x
 # Javascript Intl API is not supported on big endian platforms right now:
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1322212
 %global big_endian    1
@@ -115,7 +106,7 @@ ExcludeArch: i686
 
 Name:    icecat
 Epoch:   2
-Version: 115.10.0
+Version: 115.11.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
@@ -178,6 +169,7 @@ Patch40: build-aarch64-skia.patch
 Patch41: build-disable-elfhack.patch
 Patch44: build-arm-libopus.patch
 Patch54: mozilla-1669639.patch
+Patch55: %{name}-115.11.0-gfx-qcms.patch
 
 # Fedora specific patches
 Patch219: rhbz-1173156.patch
@@ -370,7 +362,7 @@ tar -xf %{SOURCE5}
 
 %patch -P 1 -p 1 -b .fix_addon_installation
 %patch -P 2 -p 1 -b .commasplit
-%ifarch s390
+%ifarch s390x
 %patch -P 5 -p 1 -b .rhbz-1219542-s390
 %endif
 
@@ -385,16 +377,13 @@ tar -xf %{SOURCE5}
 %endif
 %patch -P 224 -p 1 -b .glibcxx
 
-# ARM run-time patch
-%ifarch aarch64
+# ARM64
+%ifarch %{arm64}
 %patch -P 40 -p 1 -b .aarch64-skia
+%patch -P 55 -p 1 -b .backup
 %patch -P 226 -p 1 -b .1354671
 %endif
 
-%ifarch %{arm}
-%patch -P 44  -p 1 -b .build-arm-libopus
-%endif
-
 %patch -P 402 -p 1 -b .1196777
 %ifarch %{power64}
 %patch -P 423 -p 1 -b .1512162
@@ -425,9 +414,7 @@ echo "ac_add_options --disable-webrtc" >> .mozconfig
 
 # Hide DRM Content option
 # This option does not work on other architectures
-%ifarch x86_64 %{ix86}
 echo "ac_add_options --disable-eme" >> .mozconfig
-%endif
 
 %if %{with pulseaudio}
 echo "ac_add_options --enable-pulseaudio" >> .mozconfig
@@ -461,16 +448,7 @@ echo "ac_add_options --without-system-libvpx" >> .mozconfig
 
 echo "ac_add_options --with-system-jpeg" >> .mozconfig
 echo "ac_add_options --enable-ffmpeg" >> .mozconfig
-
-# This option works on these architectures only
-%ifarch %{arm}
-echo "ac_add_options --disable-elf-hack" >> .mozconfig
-echo "ac_add_options --disable-av1" >> .mozconfig
-echo 'export NEON_FLAGS=-mfpu=vfpv3-d16' >> .mozconfig
-%endif
-%ifnarch %{arm}
 echo "ac_add_options --enable-av1" >> .mozconfig
-%endif
 
 %if 0%{?debug_build}
 echo "ac_add_options --enable-debug" >> .mozconfig
@@ -478,7 +456,7 @@ echo "ac_add_options --disable-optimize" >> .mozconfig
 echo "ac_add_options --enable-rust-debug" >> .mozconfig
 %else
 %global optimize_flags "none"
-%ifarch %{arm} s390x
+%ifarch s390x
 # ARMv7 need that (rhbz#1426850)
 %define optimize_flags " -fno-schedule-insns"
 %endif
@@ -590,40 +568,18 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/')
 export MOZ_DEBUG_FLAGS=" "
 %endif
 
-%ifarch %{arm} %{ix86}
-MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g0/')
-# If MOZ_DEBUG_FLAGS is empty, firefox's build will default it to "-g" which
-# overrides the -g1 from line above and breaks building on s390
-# (OOM when linking, rhbz#1238225)
-export MOZ_DEBUG_FLAGS=" "
-%endif
-
 # We don't wantfirefox to use CK_GCM_PARAMS_V3 in nss
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -DNSS_PKCS11_3_0_STRICT"
 
 %if !0%{?build_with_clang}
-%ifarch s390x %{power64} aarch64 %{ix86}
+%ifarch s390x %{power64} %{arm64}
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--print-memory-usage"
 %endif
-%ifarch %{arm}
-MOZ_LINK_FLAGS="-Wl,--no-keep-memory"
-echo "ac_add_options --enable-linker=gold" >> .mozconfig
 %endif
-%endif
-%ifarch %{arm} %{ix86} s390x
+%ifarch s390x
 export RUSTFLAGS="-Cdebuginfo=0"
 %endif
 
-%ifarch %{arm}
-# disable hard-coded LTO due to RAM constraints
-sed -i '/cargo_rustc_flags += -Clto/d' config/makefiles/rust.mk
-sed -i '/RUSTFLAGS += -Cembed-bitcode=yes/d' config/makefiles/rust.mk
-sed -i 's/codegen-units=1/codegen-units=16/' config/makefiles/rust.mk
-
-# make sure "-g0" is the last flag so there's no debug info
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -g0"
-%endif
-
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive"
 export LDFLAGS=$MOZ_LINK_FLAGS
@@ -654,7 +610,7 @@ MOZ_SMP_FLAGS=-j1
 MOZ_SMP_FLAGS=-j1
 # On x86_64 architectures, Mozilla can build up to 4 jobs at once in parallel,
 # however builds tend to fail on other arches when building in parallel.
-%ifarch %{ix86} s390x %{arm} aarch64
+%ifarch s390x %{arm64}
 [ -z "$RPM_BUILD_NCPUS" ] && \
      RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
diff --git a/sources b/sources
index 8d82209..dffdebf 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (cbindgen-vendor.tar.xz) = 6142d1b08e75ee39ca706b8c7ab9b2c6f8585bb375a3c4231481fa5d974e53cbcaa4940279678a9cf8e5a974050f30841d99ff63c1efa7a294fd6e156e9af443
-SHA512 (icecat-115.10.0-langpacks.tar.gz) = c779294970427f2a95e9744f90778808734550638433f07d954bc53186425d6d15cdaafd50dc4fde8210944aa30396ae0cdacd51b2d939176ca833f50732b0ef
-SHA512 (icecat-115.10.0-rh1.tar.bz2) = 0187c919e795da8d9950fc67ac9919eb77d5e31a5121e95f03a29331e2e281731b12e6b9cd19f3ca4e8cd6a52fcbc288221ce09e78dcc2d02ae139e56250af44
+SHA512 (cbindgen-vendor.tar.xz) = da016ecd9ac6dd3ecd1a65b80c2728db59bccd9ca5e6b54888f02398e3f97a90d1bae3bef85f0eb0950c07734bf3e191fb679fc39527205ba0520009ca4769d2
+SHA512 (icecat-115.11.0-langpacks.tar.gz) = 6074e27182c09dcab4f286e706303e0f2cc351bbfb7dc968fe4ed8acc736847135c270f9135e3d3d9e05b089734f3ce3b138018f7a9b6c3a2e4ce6f15eaa2ad3
+SHA512 (icecat-115.11.0-rh1.tar.bz2) = 595313e556ebed011ab26ee30dbe31956d69c8893f26369524d17bf67b7253cd46af4883bad52a43b1bf2ad1ef890d4c16239ccbc063a60ef1ab1b3f183c42dd
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 00bb264463a8966d7aac563925d221c1b30cbae0 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 15 May 2024 15:44:39 +0200
Subject: [PATCH 386/473] Rename the file .cargo/config

---
 icecat.spec | 5 +++++
 sources     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index dbddd01..8cffe55 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -527,6 +527,11 @@ replace-with = "vendored-sources"
 directory = "`pwd`/my_rust_vendor"
 EOL
 
+# note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`
+pushd .cargo
+mv config config.toml
+popd
+
 env CARGO_HOME=.cargo cargo install cbindgen
 export PATH=`pwd`/.cargo/bin:$PATH
 %else
diff --git a/sources b/sources
index dffdebf..82554e6 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = da016ecd9ac6dd3ecd1a65b80c2728db59bccd9ca5e6b54888f02398e3f97a90d1bae3bef85f0eb0950c07734bf3e191fb679fc39527205ba0520009ca4769d2
+SHA512 (cbindgen-vendor.tar.xz) = e229f15cb3d9213413ea4793478458887167f9c78943a6fd0e0c967a78c45457ffb8c4d933096b338e1dcf9a3c81931b6eaa4fdfb46d342ac1f3c251c99cd0d5
 SHA512 (icecat-115.11.0-langpacks.tar.gz) = 6074e27182c09dcab4f286e706303e0f2cc351bbfb7dc968fe4ed8acc736847135c270f9135e3d3d9e05b089734f3ce3b138018f7a9b6c3a2e4ce6f15eaa2ad3
 SHA512 (icecat-115.11.0-rh1.tar.bz2) = 595313e556ebed011ab26ee30dbe31956d69c8893f26369524d17bf67b7253cd46af4883bad52a43b1bf2ad1ef890d4c16239ccbc063a60ef1ab1b3f183c42dd
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 84112ccf17880ab52f796128f6755bfbe768412c Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 15 May 2024 18:44:33 +0200
Subject: [PATCH 387/473] Fix disable-eme option

---
 icecat.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 8cffe55..3b36021 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -414,7 +414,9 @@ echo "ac_add_options --disable-webrtc" >> .mozconfig
 
 # Hide DRM Content option
 # This option does not work on other architectures
+%ifarch x86_64
 echo "ac_add_options --disable-eme" >> .mozconfig
+%endif
 
 %if %{with pulseaudio}
 echo "ac_add_options --enable-pulseaudio" >> .mozconfig

From 0d3a82d7834536a0ea4d424484e57d6aeb81d64a Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 17 May 2024 22:07:03 +0200
Subject: [PATCH 388/473] Use always Patch55

---
 icecat.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 3b36021..4eb30f0 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -380,10 +380,11 @@ tar -xf %{SOURCE5}
 # ARM64
 %ifarch %{arm64}
 %patch -P 40 -p 1 -b .aarch64-skia
-%patch -P 55 -p 1 -b .backup
 %patch -P 226 -p 1 -b .1354671
 %endif
 
+%patch -P 55 -p 1 -b .backup
+
 %patch -P 402 -p 1 -b .1196777
 %ifarch %{power64}
 %patch -P 423 -p 1 -b .1512162

From 397e2ef82188e135d0a299a887d2127d46b5751d Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 18 May 2024 17:39:20 +0200
Subject: [PATCH 389/473] Use clang on Fedora 40+ only

---
 icecat.spec | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 4eb30f0..332b008 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -270,15 +270,9 @@ BuildRequires: yasm
 BuildRequires: llvm
 BuildRequires: llvm-devel
 %if 0%{?build_with_clang}
-%if 0%{?fedora} >= 40
 BuildRequires:  clang17
 BuildRequires:  clang17-libs
 BuildRequires:  clang17-devel
-%else
-BuildRequires:  clang
-BuildRequires:  clang-libs
-BuildRequires:  clang-devel
-%endif
 BuildRequires: lld
 %endif
 BuildRequires: rust

From 49a86580997155d35a5cbfab30046b491c11666f Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 18 May 2024 18:33:53 +0200
Subject: [PATCH 390/473] Fix clang path in Fedora 39

---
 icecat.spec | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 332b008..07bd2cf 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -273,7 +273,7 @@ BuildRequires: llvm-devel
 BuildRequires:  clang17
 BuildRequires:  clang17-libs
 BuildRequires:  clang17-devel
-BuildRequires: lld
+BuildRequires:  lld
 %endif
 BuildRequires: rust
 %if 0%{?pgo_wayland}
@@ -476,12 +476,8 @@ echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 
 # Clang
 %if 0%{?build_with_clang}
-%if 0%{?fedora} >= 40
 echo "ac_add_options --with-clang-path=%{_bindir}/clang-17" >> .mozconfig
 echo "ac_add_options --with-libclang-path=%{_libdir}/llvm17/lib" >> .mozconfig
-%else
-echo "ac_add_options --with-libclang-path=%{_libdir}" >> .mozconfig
-%endif
 %endif
 
 %ifarch s390x

From 654d5d10277c2c89f54607919a8d3b10abca78a7 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 19 May 2024 00:24:38 +0200
Subject: [PATCH 391/473] Install clang BR

---
 icecat.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 07bd2cf..e796aa9 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -274,6 +274,10 @@ BuildRequires:  clang17
 BuildRequires:  clang17-libs
 BuildRequires:  clang17-devel
 BuildRequires:  lld
+%else
+BuildRequires:  clang
+BuildRequires:  clang-libs
+BuildRequires:  clang-devel
 %endif
 BuildRequires: rust
 %if 0%{?pgo_wayland}

From a075ca1fec9b9c4ac7343bb79a3ba58b17c91429 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 19 May 2024 00:49:55 +0200
Subject: [PATCH 392/473] Fix clang path in no-clang builds

---
 icecat.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index e796aa9..d9a6728 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -482,6 +482,8 @@ echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 %if 0%{?build_with_clang}
 echo "ac_add_options --with-clang-path=%{_bindir}/clang-17" >> .mozconfig
 echo "ac_add_options --with-libclang-path=%{_libdir}/llvm17/lib" >> .mozconfig
+%else
+echo "ac_add_options --with-libclang-path=%{_libdir}" >> .mozconfig 
 %endif
 
 %ifarch s390x

From 94f70e9d2babfc5302f9882fb40fc3467cc7ab71 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 11 Jun 2024 22:26:02 +0200
Subject: [PATCH 393/473] Release 115.2.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 4 ++--
 sources                 | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e75e2b3..8d20c51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -249,3 +249,5 @@
 /icecat-115.10.0-rh1.tar.bz2
 /icecat-115.11.0-langpacks.tar.gz
 /icecat-115.11.0-rh1.tar.bz2
+/icecat-115.12.0-langpacks.tar.gz
+/icecat-115.12.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 8885f64..42bb997 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.11.0
+VERSION=115.12.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index d9a6728..b0d7b7f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -77,7 +77,7 @@ ExcludeArch: %{ix86} %{arm}
 %if %{?system_nss}
 %global nspr_version 4.32
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.88
+%global nss_version 3.100
 %global nss_build_version %{nss_version}
 %endif
 
@@ -106,7 +106,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.11.0
+Version: 115.12.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index 82554e6..44b7f0c 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = e229f15cb3d9213413ea4793478458887167f9c78943a6fd0e0c967a78c45457ffb8c4d933096b338e1dcf9a3c81931b6eaa4fdfb46d342ac1f3c251c99cd0d5
-SHA512 (icecat-115.11.0-langpacks.tar.gz) = 6074e27182c09dcab4f286e706303e0f2cc351bbfb7dc968fe4ed8acc736847135c270f9135e3d3d9e05b089734f3ce3b138018f7a9b6c3a2e4ce6f15eaa2ad3
-SHA512 (icecat-115.11.0-rh1.tar.bz2) = 595313e556ebed011ab26ee30dbe31956d69c8893f26369524d17bf67b7253cd46af4883bad52a43b1bf2ad1ef890d4c16239ccbc063a60ef1ab1b3f183c42dd
+SHA512 (icecat-115.12.0-langpacks.tar.gz) = 9394d004da6d08c2d68727b795bdb7db44624837502040a1cf67e1fbea6b578dd0847c6f0775efd9f1b459cb86490d45510885d9edd983689ba59a83e9ca5611
+SHA512 (icecat-115.12.0-rh1.tar.bz2) = 05993db25741d18c696ddefba7e533460e87c48b2d90771aacadf4aba5d1dd365994f9c5be82e481690380f344008150f87258a0d052b55e7bcb8f4840732d29
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From f040fc0ab8f25cc0167fc1f99cb7ad44313479ea Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 11 Jun 2024 22:27:42 +0200
Subject: [PATCH 394/473] Remove obsolete patch

---
 icecat-115.11.0-gfx-qcms.patch | 49 ----------------------------------
 icecat.spec                    |  3 ---
 2 files changed, 52 deletions(-)
 delete mode 100644 icecat-115.11.0-gfx-qcms.patch

diff --git a/icecat-115.11.0-gfx-qcms.patch b/icecat-115.11.0-gfx-qcms.patch
deleted file mode 100644
index b4e0207..0000000
--- a/icecat-115.11.0-gfx-qcms.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -up firefox-115.11.0/Cargo.lock.gfx-qcms firefox-115.11.0/Cargo.lock
---- firefox-115.11.0/Cargo.lock.gfx-qcms	2024-05-13 18:22:10.848690842 +0200
-+++ firefox-115.11.0/Cargo.lock	2024-05-13 18:26:01.991124505 +0200
-@@ -4276,6 +4276,7 @@ name = "qcms"
- version = "0.2.0"
- dependencies = [
-  "libc",
-+ "version_check",
- ]
- 
- [[package]]
-diff -up firefox-115.11.0/gfx/qcms/build.rs.gfx-qcms firefox-115.11.0/gfx/qcms/build.rs
---- firefox-115.11.0/gfx/qcms/build.rs.gfx-qcms	2024-05-13 18:22:10.848690842 +0200
-+++ firefox-115.11.0/gfx/qcms/build.rs	2024-05-13 18:22:10.848690842 +0200
-@@ -0,0 +1,7 @@
-+extern crate version_check as rustc;
-+
-+fn main() {
-+    if rustc::is_min_version("1.78.0").unwrap_or(false) {
-+        println!("cargo:rustc-cfg=stdsimd_split");
-+    }
-+}
-diff -up firefox-115.11.0/gfx/qcms/Cargo.toml.gfx-qcms firefox-115.11.0/gfx/qcms/Cargo.toml
---- firefox-115.11.0/gfx/qcms/Cargo.toml.gfx-qcms	2024-05-06 20:27:35.000000000 +0200
-+++ firefox-115.11.0/gfx/qcms/Cargo.toml	2024-05-13 18:22:10.848690842 +0200
-@@ -20,3 +20,6 @@ cmyk = []
- 
- [dependencies]
- libc = {version = "0.2", optional = true }
-+
-+[build-dependencies]
-+version_check = "0.9"
-diff -up firefox-115.11.0/gfx/qcms/src/lib.rs.gfx-qcms firefox-115.11.0/gfx/qcms/src/lib.rs
---- firefox-115.11.0/gfx/qcms/src/lib.rs.gfx-qcms	2024-05-06 20:27:35.000000000 +0200
-+++ firefox-115.11.0/gfx/qcms/src/lib.rs	2024-05-13 18:22:10.848690842 +0200
-@@ -7,9 +7,11 @@
- #![allow(non_upper_case_globals)]
- // These are needed for the neon SIMD code and can be removed once the MSRV supports the
- // instrinsics we use
--#![cfg_attr(feature = "neon", feature(stdsimd))]
-+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))]
-+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))]
-+#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))]
- #![cfg_attr(
--    feature = "neon",
-+    all(target_arch = "arm", feature = "neon"),
-     feature(arm_target_feature, raw_ref_op)
- 
- )]
diff --git a/icecat.spec b/icecat.spec
index b0d7b7f..52c21ef 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -169,7 +169,6 @@ Patch40: build-aarch64-skia.patch
 Patch41: build-disable-elfhack.patch
 Patch44: build-arm-libopus.patch
 Patch54: mozilla-1669639.patch
-Patch55: %{name}-115.11.0-gfx-qcms.patch
 
 # Fedora specific patches
 Patch219: rhbz-1173156.patch
@@ -381,8 +380,6 @@ tar -xf %{SOURCE5}
 %patch -P 226 -p 1 -b .1354671
 %endif
 
-%patch -P 55 -p 1 -b .backup
-
 %patch -P 402 -p 1 -b .1196777
 %ifarch %{power64}
 %patch -P 423 -p 1 -b .1512162

From 95b0a6923fd2da94453387e8d5f6b17d1e16b49e Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 12 Jun 2024 22:16:17 +0200
Subject: [PATCH 395/473] Fix NSS version for Fedora 39

---
 icecat.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 52c21ef..e3315e2 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -77,7 +77,11 @@ ExcludeArch: %{ix86} %{arm}
 %if %{?system_nss}
 %global nspr_version 4.32
 %global nspr_build_version %{nspr_version}
+%if 0%{?fedora} > 39
 %global nss_version 3.100
+%else
+%global nss_version 3.99
+%endif
 %global nss_build_version %{nss_version}
 %endif
 

From 21f3241219e9d6495720bdd6cebe93f33d0673b2 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 9 Jul 2024 23:42:56 +0200
Subject: [PATCH 396/473] Release 115.13.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d20c51..3c728ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -251,3 +251,5 @@
 /icecat-115.11.0-rh1.tar.bz2
 /icecat-115.12.0-langpacks.tar.gz
 /icecat-115.12.0-rh1.tar.bz2
+/icecat-115.13.0-langpacks.tar.gz
+/icecat-115.13.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 42bb997..efe7632 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.12.0
+VERSION=115.13.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index e3315e2..6f3cf06 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -110,7 +110,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.12.0
+Version: 115.13.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index 44b7f0c..f1ba286 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = e229f15cb3d9213413ea4793478458887167f9c78943a6fd0e0c967a78c45457ffb8c4d933096b338e1dcf9a3c81931b6eaa4fdfb46d342ac1f3c251c99cd0d5
-SHA512 (icecat-115.12.0-langpacks.tar.gz) = 9394d004da6d08c2d68727b795bdb7db44624837502040a1cf67e1fbea6b578dd0847c6f0775efd9f1b459cb86490d45510885d9edd983689ba59a83e9ca5611
-SHA512 (icecat-115.12.0-rh1.tar.bz2) = 05993db25741d18c696ddefba7e533460e87c48b2d90771aacadf4aba5d1dd365994f9c5be82e481690380f344008150f87258a0d052b55e7bcb8f4840732d29
+SHA512 (icecat-115.13.0-langpacks.tar.gz) = 1af778306bc913904f8c95b3577d0a6de640df5acf81c6f78598b181776400b29b34f61cdcd257cf566b9476c143eb2f1dc4616d9c601bc79b5e4bdce1142451
+SHA512 (icecat-115.13.0-rh1.tar.bz2) = a9222009a03946b363b739ded715a830423d5bbdb2daede7602c3fb480124a966e94b016ea7d610cb032c2657680350143c937d20b5cbcaf1cd49e966661b17f
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From ff2c86d61273d0c35cba681e17cc6786ebad2ef9 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Tue, 9 Jul 2024 19:53:06 -0400
Subject: [PATCH 397/473] Fix flatpak build

pkg-config is part of the flatpak buildroot and is therefore in /usr even
when building for /app.  The default llvm/clang are in the runtime, and the
compat packages are only built in /app when needed at runtime for apps
(currently, only 15), otherwise the buildroot version suffices here.
Therefore, the location of these dependencies needs to be detected.
---
 icecat.spec | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 6f3cf06..db45cb0 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -275,12 +275,13 @@ BuildRequires: llvm-devel
 %if 0%{?build_with_clang}
 BuildRequires:  clang17
 BuildRequires:  clang17-libs
-BuildRequires:  clang17-devel
+BuildRequires:  llvm17-devel
 BuildRequires:  lld
+%global llvm_suffix -17
 %else
 BuildRequires:  clang
 BuildRequires:  clang-libs
-BuildRequires:  clang-devel
+BuildRequires:  llvm-devel
 %endif
 BuildRequires: rust
 %if 0%{?pgo_wayland}
@@ -481,11 +482,9 @@ echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 
 # Clang
 %if 0%{?build_with_clang}
-echo "ac_add_options --with-clang-path=%{_bindir}/clang-17" >> .mozconfig
-echo "ac_add_options --with-libclang-path=%{_libdir}/llvm17/lib" >> .mozconfig
-%else
-echo "ac_add_options --with-libclang-path=%{_libdir}" >> .mozconfig 
+echo "ac_add_options --with-clang-path=`which clang%{?llvm_suffix}`" >> .mozconfig
 %endif
+echo "ac_add_options --with-libclang-path=`llvm-config%{?llvm_suffix} --libdir`" >> .mozconfig
 
 %ifarch s390x
 echo "ac_add_options --disable-jit" >> .mozconfig
@@ -591,7 +590,7 @@ export LDFLAGS=$MOZ_LINK_FLAGS
 
 export PREFIX='%{_prefix}'
 export LIBDIR='%{_libdir}'
-export PKG_CONFIG='%{_bindir}/pkg-config'
+export PKG_CONFIG="`which pkg-config`"
 export PYTHON='%{__python3}'
 
 %if 0%{?build_with_clang}

From d1b5817a4ce2bfda7c6456a63f6bf10a69e61966 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 10:10:32 +0000
Subject: [PATCH 398/473] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild


From 037bec18a559b84594c3939cac7737c6846d2faf Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 9 Aug 2024 23:44:37 +0200
Subject: [PATCH 399/473] Release 115.14.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3c728ff..37d576a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -253,3 +253,5 @@
 /icecat-115.12.0-rh1.tar.bz2
 /icecat-115.13.0-langpacks.tar.gz
 /icecat-115.13.0-rh1.tar.bz2
+/icecat-115.14.0-langpacks.tar.gz
+/icecat-115.14.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index efe7632..f143422 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.13.0
+VERSION=115.14.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index db45cb0..40f5d5d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -110,7 +110,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.13.0
+Version: 115.14.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index f1ba286..db10dcb 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = e229f15cb3d9213413ea4793478458887167f9c78943a6fd0e0c967a78c45457ffb8c4d933096b338e1dcf9a3c81931b6eaa4fdfb46d342ac1f3c251c99cd0d5
-SHA512 (icecat-115.13.0-langpacks.tar.gz) = 1af778306bc913904f8c95b3577d0a6de640df5acf81c6f78598b181776400b29b34f61cdcd257cf566b9476c143eb2f1dc4616d9c601bc79b5e4bdce1142451
-SHA512 (icecat-115.13.0-rh1.tar.bz2) = a9222009a03946b363b739ded715a830423d5bbdb2daede7602c3fb480124a966e94b016ea7d610cb032c2657680350143c937d20b5cbcaf1cd49e966661b17f
+SHA512 (icecat-115.14.0-langpacks.tar.gz) = 590a8f3ab4fe024b3db234fe594289682f7ace2adb85febc4e37a291d184837b8de5a38d971272f731b13e7f7fac516721206d87a04699ee902602593ab78b87
+SHA512 (icecat-115.14.0-rh1.tar.bz2) = 5d212b0a1e22c1bcee7d5eff8584ad9ac653b69515e1310cc1067d374ffcf2d3c8ec6bf489fc51122eb6184c9af5f9d1027185da99fb0d21d17d2a950a749cb1
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From a59842c0bf05f4ad952424c363e71ab90c0377d6 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 5 Sep 2024 22:03:20 +0200
Subject: [PATCH 400/473] Release 115.15.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 37d576a..934b8d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -255,3 +255,5 @@
 /icecat-115.13.0-rh1.tar.bz2
 /icecat-115.14.0-langpacks.tar.gz
 /icecat-115.14.0-rh1.tar.bz2
+/icecat-115.15.0-langpacks.tar.gz
+/icecat-115.15.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index f143422..94b0cc9 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.14.0
+VERSION=115.15.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 40f5d5d..73b94d3 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -110,7 +110,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.14.0
+Version: 115.15.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index db10dcb..5358985 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = e229f15cb3d9213413ea4793478458887167f9c78943a6fd0e0c967a78c45457ffb8c4d933096b338e1dcf9a3c81931b6eaa4fdfb46d342ac1f3c251c99cd0d5
-SHA512 (icecat-115.14.0-langpacks.tar.gz) = 590a8f3ab4fe024b3db234fe594289682f7ace2adb85febc4e37a291d184837b8de5a38d971272f731b13e7f7fac516721206d87a04699ee902602593ab78b87
-SHA512 (icecat-115.14.0-rh1.tar.bz2) = 5d212b0a1e22c1bcee7d5eff8584ad9ac653b69515e1310cc1067d374ffcf2d3c8ec6bf489fc51122eb6184c9af5f9d1027185da99fb0d21d17d2a950a749cb1
+SHA512 (icecat-115.15.0-langpacks.tar.gz) = d931df261573b7807eac9a072f6160606c32a34bd08591c5a12815cc88e77906113987ad823d666619790de83767b37a838e7ace28c86e090d2c8cca6a709736
+SHA512 (icecat-115.15.0-rh1.tar.bz2) = cd9461738aa2a9e5dd1408a31adbe3f9cad37dadea9e877f66e75a0db6af2d55fa6855549876c0d708b191d81a0af5dd9784fbfc11fa511351f8cd4aefc57dd2
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 624743709a776a5c78e904317f1bc8d77af7c431 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 7 Sep 2024 23:02:14 +0200
Subject: [PATCH 401/473] Rebuild for F40 build issue


From f2c1a42b4b6decac6d77c3281fe89675c508bb73 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Wed, 25 Sep 2024 15:00:35 +0200
Subject: [PATCH 402/473] Rebuilt for FFmpeg 7


From 2a863ee65d021c2d82a56c62547778c2f4b4ea18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Thu, 26 Sep 2024 10:02:37 +0000
Subject: [PATCH 403/473] Correct SPDX license

The file COPYING-BSD.txt matches BSD-4-Clause-UC

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

If there will be no comments in two weeks, I will merge this.
---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 73b94d3..073133c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -115,7 +115,7 @@ Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
-License: (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later) AND GPL-3.0-or-later AND MIT AND BSD AND ISC AND Apache-2.0 AND MPL-2.0
+License: (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later) AND GPL-3.0-or-later AND MIT AND BSD-4-Clause-UC AND ISC AND Apache-2.0 AND MPL-2.0
 URL:   http://www.gnu.org/software/gnuzilla/
 
 ## Source archive created by scripts based on Gnuzilla files.

From c7d064dc506f32e7b7235555345552dad3475472 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 3 Oct 2024 20:13:58 +0200
Subject: [PATCH 404/473] Release 115.16.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 934b8d8..028081f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -257,3 +257,5 @@
 /icecat-115.14.0-rh1.tar.bz2
 /icecat-115.15.0-langpacks.tar.gz
 /icecat-115.15.0-rh1.tar.bz2
+/icecat-115.16.0-langpacks.tar.gz
+/icecat-115.16.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 94b0cc9..b55f0f1 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.15.0
+VERSION=115.16.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 073133c..aff2660 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -110,7 +110,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.15.0
+Version: 115.16.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index 5358985..729862c 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = e229f15cb3d9213413ea4793478458887167f9c78943a6fd0e0c967a78c45457ffb8c4d933096b338e1dcf9a3c81931b6eaa4fdfb46d342ac1f3c251c99cd0d5
-SHA512 (icecat-115.15.0-langpacks.tar.gz) = d931df261573b7807eac9a072f6160606c32a34bd08591c5a12815cc88e77906113987ad823d666619790de83767b37a838e7ace28c86e090d2c8cca6a709736
-SHA512 (icecat-115.15.0-rh1.tar.bz2) = cd9461738aa2a9e5dd1408a31adbe3f9cad37dadea9e877f66e75a0db6af2d55fa6855549876c0d708b191d81a0af5dd9784fbfc11fa511351f8cd4aefc57dd2
+SHA512 (icecat-115.16.0-langpacks.tar.gz) = 3a8d5db042c327bd7364649f011f8be064ee08d81439745666037d3582abb85196a558e703457f54967b91171889f9e647621aece0dbf04e403377902547eaae
+SHA512 (icecat-115.16.0-rh1.tar.bz2) = 5ad6ce252b44dc06b9103134bb07d7aba6003aa47574b99c6ab9a395d824260fab59c9fc0d79e005f53b4e437b6964e5a444428dd56f45e5480994941417fe46
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From fafac2aff6a456bf9f9f2a1a179e4bb01f55136c Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Sat, 5 Oct 2024 08:49:45 -0400
Subject: [PATCH 405/473] Rebuild for ffmpeg 7 (again)


From 7d7154152744b584ff61ffd385bd60e445b79ce8 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 10 Oct 2024 19:49:04 +0200
Subject: [PATCH 406/473] Release 115.16.1

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 028081f..8f60452 100644
--- a/.gitignore
+++ b/.gitignore
@@ -259,3 +259,5 @@
 /icecat-115.15.0-rh1.tar.bz2
 /icecat-115.16.0-langpacks.tar.gz
 /icecat-115.16.0-rh1.tar.bz2
+/icecat-115.16.1-langpacks.tar.gz
+/icecat-115.16.1-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index b55f0f1..7a73277 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.16.0
+VERSION=115.16.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index aff2660..1c2e5df 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -110,7 +110,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.16.0
+Version: 115.16.1
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index 729862c..dbfca91 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = e229f15cb3d9213413ea4793478458887167f9c78943a6fd0e0c967a78c45457ffb8c4d933096b338e1dcf9a3c81931b6eaa4fdfb46d342ac1f3c251c99cd0d5
-SHA512 (icecat-115.16.0-langpacks.tar.gz) = 3a8d5db042c327bd7364649f011f8be064ee08d81439745666037d3582abb85196a558e703457f54967b91171889f9e647621aece0dbf04e403377902547eaae
-SHA512 (icecat-115.16.0-rh1.tar.bz2) = 5ad6ce252b44dc06b9103134bb07d7aba6003aa47574b99c6ab9a395d824260fab59c9fc0d79e005f53b4e437b6964e5a444428dd56f45e5480994941417fe46
+SHA512 (icecat-115.16.1-langpacks.tar.gz) = 315239a2740e9e26ec2321b571ba220010607e3c3615ac6989190486189dabc60a7411cd6572a4dc66d29a8e2e5fa32692b54f7586e06162f9a76a0531fd50a8
+SHA512 (icecat-115.16.1-rh1.tar.bz2) = 9c8fd76ee7084963632f212458da61d48d6f96551d9f58b55e202b18188d605a928d80693d17f3fd0faffea9dd636e086c0d427fc066b9f9cb90541bea2b681d
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 3633261b4a2f38d1e949ea9ec87cb0882e7ccd4c Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 1 Nov 2024 14:59:13 +0100
Subject: [PATCH 407/473] Release 115.17.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8f60452..8cb4610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -261,3 +261,5 @@
 /icecat-115.16.0-rh1.tar.bz2
 /icecat-115.16.1-langpacks.tar.gz
 /icecat-115.16.1-rh1.tar.bz2
+/icecat-115.17.0-langpacks.tar.gz
+/icecat-115.17.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 7a73277..b485383 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.16.1
+VERSION=115.17.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 1c2e5df..ff1605a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -110,7 +110,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.16.1
+Version: 115.17.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index dbfca91..bc1c158 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = e229f15cb3d9213413ea4793478458887167f9c78943a6fd0e0c967a78c45457ffb8c4d933096b338e1dcf9a3c81931b6eaa4fdfb46d342ac1f3c251c99cd0d5
-SHA512 (icecat-115.16.1-langpacks.tar.gz) = 315239a2740e9e26ec2321b571ba220010607e3c3615ac6989190486189dabc60a7411cd6572a4dc66d29a8e2e5fa32692b54f7586e06162f9a76a0531fd50a8
-SHA512 (icecat-115.16.1-rh1.tar.bz2) = 9c8fd76ee7084963632f212458da61d48d6f96551d9f58b55e202b18188d605a928d80693d17f3fd0faffea9dd636e086c0d427fc066b9f9cb90541bea2b681d
+SHA512 (icecat-115.17.0-langpacks.tar.gz) = 1f5906f0806d63bf58685799220588a86d24b0dabf2f8e8d4b6b9752a267331646cf79a86451b97f2280149ffab6c22d096853e845d332f504f79934f811d8f6
+SHA512 (icecat-115.17.0-rh1.tar.bz2) = b363dde77d1e84ddc0eab05b6bb01c898ca099a9fd45a5642f5dd8d4cecc698874c4118e8bc17a0e0ab1ec5afd4c98f3ca44dbbb898efcb1e1908df3606961bb
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 1ef3ae80344e2cbb5b526dc27bb143d0531b2a9f Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 27 Nov 2024 21:54:43 +0100
Subject: [PATCH 408/473] Release 115.18.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8cb4610..249f626 100644
--- a/.gitignore
+++ b/.gitignore
@@ -263,3 +263,5 @@
 /icecat-115.16.1-rh1.tar.bz2
 /icecat-115.17.0-langpacks.tar.gz
 /icecat-115.17.0-rh1.tar.bz2
+/icecat-115.18.0-langpacks.tar.gz
+/icecat-115.18.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index b485383..1b6b598 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.17.0
+VERSION=115.18.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index ff1605a..9cb8aa4 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -110,7 +110,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.17.0
+Version: 115.18.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index bc1c158..4205af6 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = e229f15cb3d9213413ea4793478458887167f9c78943a6fd0e0c967a78c45457ffb8c4d933096b338e1dcf9a3c81931b6eaa4fdfb46d342ac1f3c251c99cd0d5
-SHA512 (icecat-115.17.0-langpacks.tar.gz) = 1f5906f0806d63bf58685799220588a86d24b0dabf2f8e8d4b6b9752a267331646cf79a86451b97f2280149ffab6c22d096853e845d332f504f79934f811d8f6
-SHA512 (icecat-115.17.0-rh1.tar.bz2) = b363dde77d1e84ddc0eab05b6bb01c898ca099a9fd45a5642f5dd8d4cecc698874c4118e8bc17a0e0ab1ec5afd4c98f3ca44dbbb898efcb1e1908df3606961bb
+SHA512 (icecat-115.18.0-langpacks.tar.gz) = f0fd3cd553994cd9380d5898cce7360eab2cd80a277a906ac0e3287077f328d6f74759b2a4f48e382104f87c9f3d7ba30ac7a3ef05802b7721399478bcb7423f
+SHA512 (icecat-115.18.0-rh1.tar.bz2) = 28f29eee31bfbe87cc25deed82bd5fa2b7c88a606b9a921bcd8a865acb7efdc65f7d23bd2b9b5d41f5642bc2e18fb66c972efcf9fd7aae27e013ddeaad6dd507
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 2b058c423b46a9ae741be634b311259212695d58 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 8 Dec 2024 23:29:54 +0100
Subject: [PATCH 409/473] Fix CVE-2024-11693 CVE-2024-11697 CVE-2024-11692

---
 .gitignore  | 1 +
 icecat.spec | 9 ++-------
 sources     | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 249f626..95e0ace 100644
--- a/.gitignore
+++ b/.gitignore
@@ -265,3 +265,4 @@
 /icecat-115.17.0-rh1.tar.bz2
 /icecat-115.18.0-langpacks.tar.gz
 /icecat-115.18.0-rh1.tar.bz2
+/icecat-115.18.0-rh2.tar.bz2
diff --git a/icecat.spec b/icecat.spec
index 9cb8aa4..10fa795 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -2,13 +2,8 @@
 # Set to true if it's going to be submitted as update
 %global release_build 1
 
-# Set new source-code build version
-# This tag indicates a new rebuild for Fedora
-%global redhat_ver rh1
-
-# Build is failing because of
-# include/mozilla/FloatingPoint.h:212:31: error: inlining failed in call to ‘always_inline’ ‘bool mozilla::IsNegativeZero(T) [with T = double]’: indirect function call with a yet undetermined callee
-#ExcludeArch: s390x
+# Set new source-code build version for Fedora and, not necessarily, for upstream too
+%global redhat_ver rh2
 
 ExcludeArch: %{ix86} %{arm}
 
diff --git a/sources b/sources
index 4205af6..0b0c6f8 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = e229f15cb3d9213413ea4793478458887167f9c78943a6fd0e0c967a78c45457ffb8c4d933096b338e1dcf9a3c81931b6eaa4fdfb46d342ac1f3c251c99cd0d5
 SHA512 (icecat-115.18.0-langpacks.tar.gz) = f0fd3cd553994cd9380d5898cce7360eab2cd80a277a906ac0e3287077f328d6f74759b2a4f48e382104f87c9f3d7ba30ac7a3ef05802b7721399478bcb7423f
-SHA512 (icecat-115.18.0-rh1.tar.bz2) = 28f29eee31bfbe87cc25deed82bd5fa2b7c88a606b9a921bcd8a865acb7efdc65f7d23bd2b9b5d41f5642bc2e18fb66c972efcf9fd7aae27e013ddeaad6dd507
+SHA512 (icecat-115.18.0-rh2.tar.bz2) = 270ad24f00feb1a8a23285323a41a23a4e42987ccb8f5c06b156e27795873af1812521121ec8c68d95337233a4f4a6b9f01b16e23b49a8a4a83b1fcc890d1003
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 6895b2796e3af986af769ecaef0e778d03f01d1c Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 9 Jan 2025 20:56:24 +0100
Subject: [PATCH 410/473] Release 115.19.0

---
 .gitignore              |   2 +
 icecat-lang_download.sh |   2 +-
 icecat-wayland.desktop  |  23 ---
 icecat-wayland.sh.in    |   7 -
 icecat-x11.desktop      | 338 ----------------------------------------
 icecat-x11.sh.in        |   7 -
 icecat.spec             |  85 ++++------
 sources                 |   4 +-
 8 files changed, 39 insertions(+), 429 deletions(-)
 delete mode 100644 icecat-wayland.desktop
 delete mode 100644 icecat-wayland.sh.in
 delete mode 100644 icecat-x11.desktop
 delete mode 100644 icecat-x11.sh.in

diff --git a/.gitignore b/.gitignore
index 95e0ace..5e08528 100644
--- a/.gitignore
+++ b/.gitignore
@@ -266,3 +266,5 @@
 /icecat-115.18.0-langpacks.tar.gz
 /icecat-115.18.0-rh1.tar.bz2
 /icecat-115.18.0-rh2.tar.bz2
+/icecat-115.19.0-langpacks.tar.gz
+/icecat-115.19.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 1b6b598..20ee05b 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.18.0
+VERSION=115.19.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat-wayland.desktop b/icecat-wayland.desktop
deleted file mode 100644
index 44e6c47..0000000
--- a/icecat-wayland.desktop
+++ /dev/null
@@ -1,23 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=GNU IceCat on Wayland
-Comment=Browse the World Wide Web
-GenericName=Web Browser
-Keywords=Internet;WWW;Browser;Web;Explorer;
-Exec=icecat-wayland --name icecat-wayland %u
-Icon=icecat
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
-Categories=Network;WebBrowser;
-StartupNotify=true
-Name[en_US]=GNU IceCat on Wayland
-Actions=new-window;new-private-window;
-
-[Desktop Action new-window]
-Name=Open a New Window
-Exec=icecat-wayland --name icecat-wayland --new-window %u
-
-[Desktop Action new-private-window]
-Name=Open a New Private Window
-Exec=icecat-wayland --private-window --name icecat-wayland %u
diff --git a/icecat-wayland.sh.in b/icecat-wayland.sh.in
deleted file mode 100644
index d04465c..0000000
--- a/icecat-wayland.sh.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-#
-# Run GNU IceCat under Wayland
-#
-
-export MOZ_ENABLE_WAYLAND=1
-exec /__PREFIX__/bin/icecat "$@"
diff --git a/icecat-x11.desktop b/icecat-x11.desktop
deleted file mode 100644
index 6e7eea8..0000000
--- a/icecat-x11.desktop
+++ /dev/null
@@ -1,338 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=GNU IceCat on X11
-Comment=Browse the World Wide Web
-Comment[ar]=تصفح الشبكة العنكبوتية العالمية
-Comment[ast]=Restola pela Rede
-Comment[bn]=ইন্টারনেট ব্রাউজ করুন
-Comment[ca]=Navegueu per la web
-Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[da]=Surf på internettet
-Comment[de]=Im Internet surfen
-Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
-Comment[es]=Navegue por la web
-Comment[et]=Lehitse veebi
-Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
-Comment[fi]=Selaa Internetin WWW-sivuja
-Comment[fr]=Naviguer sur le Web
-Comment[gl]=Navegar pola rede
-Comment[he]=גלישה ברחבי האינטרנט
-Comment[hr]=Pretražite web
-Comment[hu]=A világháló böngészése
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[ku]=Li torê bigere
-Comment[lt]=Naršykite internete
-Comment[nb]=Surf på nettet
-Comment[nl]=Verken het internet
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pl]=Przeglądanie stron WWW 
-Comment[pt]=Navegue na Internet
-Comment[pt_BR]=Navegue na Internet
-Comment[ro]=Navigați pe Internet
-Comment[ru]=Доступ в Интернет
-Comment[sk]=Prehliadanie internetu
-Comment[sl]=Brskajte po spletu
-Comment[sv]=Surfa på webben
-Comment[tr]=İnternet'te Gezinin
-Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
-Comment[uk]=Перегляд сторінок Інтернету
-Comment[vi]=Để duyệt các trang web
-Comment[zh_CN]=浏览互联网
-Comment[zh_TW]=瀏覽網際網路
-GenericName=Web Browser
-GenericName[ar]=متصفح ويب
-GenericName[ast]=Restolador Web
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[ca]=Navegador web
-GenericName[cs]=Webový prohlížeč
-GenericName[da]=Webbrowser
-GenericName[el]=Περιηγητής διαδικτύου
-GenericName[es]=Navegador web
-GenericName[et]=Veebibrauser
-GenericName[fa]=مرورگر اینترنتی
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[it]=Browser web
-GenericName[ja]=ウェブ・ブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[ku]=Geroka torê
-GenericName[lt]=Interneto naršyklė
-GenericName[nb]=Nettleser
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[no]=Nettleser
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator Internet
-GenericName[ru]=Веб-браузер
-GenericName[sk]=Internetový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sv]=Webbläsare
-GenericName[tr]=Web Tarayıcı
-GenericName[ug]=توركۆرگۈ
-GenericName[uk]=Веб-браузер
-GenericName[vi]=Trình duyệt Web
-GenericName[zh_CN]=网络浏览器
-GenericName[zh_TW]=網路瀏覽器
-Keywords=Internet;WWW;Browser;Web;Explorer;
-Keywords[ar]=انترنت;إنترنت;متصفح;ويب;وب;
-Keywords[ast]=Internet;WWW;Restolador;Web;Esplorador;
-Keywords[ca]=Internet;WWW;Navegador;Web;Explorador;Explorer;
-Keywords[cs]=Internet;WWW;Prohlížeč;Web;Explorer;
-Keywords[da]=Internet;Internettet;WWW;Browser;Browse;Web;Surf;Nettet;
-Keywords[de]=Internet;WWW;Browser;Web;Explorer;Webseite;Site;surfen;online;browsen;
-Keywords[el]=Internet;WWW;Browser;Web;Explorer;Διαδίκτυο;Περιηγητής;IceCat;Φιρεφοχ;Ιντερνετ;
-Keywords[es]=Explorador;Internet;WWW;
-Keywords[fi]=Internet;WWW;Browser;Web;Explorer;selain;Internet-selain;internetselain;verkkoselain;netti;surffaa;
-Keywords[fr]=Internet;WWW;Browser;Web;Explorer;Fureteur;Surfer;Navigateur;
-Keywords[he]=דפדפן;אינטרנט;רשת;אתרים;אתר;פיירפוקס;מוזילה;
-Keywords[hr]=Internet;WWW;preglednik;Web;
-Keywords[hu]=Internet;WWW;Böngésző;Web;Háló;Net;Explorer;
-Keywords[it]=Internet;WWW;Browser;Web;Navigatore;
-Keywords[is]=Internet;WWW;Vafri;Vefur;Netvafri;Flakk;
-Keywords[ja]=Internet;WWW;Web;インターネット;ブラウザ;ウェブ;エクスプローラ;
-Keywords[nb]=Internett;WWW;Nettleser;Explorer;Web;Browser;Nettside;
-Keywords[nl]=Internet;WWW;Browser;Web;Explorer;Verkenner;Website;Surfen;Online;
-Keywords[pt]=Internet;WWW;Browser;Web;Explorador;Navegador;
-Keywords[pt_BR]=Internet;WWW;Browser;Web;Explorador;Navegador;
-Keywords[ru]=Internet;WWW;Browser;Web;Explorer;интернет;браузер;веб;файрфокс;огнелис;
-Keywords[sk]=Internet;WWW;Prehliadač;Web;Explorer;
-Keywords[sl]=Internet;WWW;Browser;Web;Explorer;Brskalnik;Splet;
-Keywords[tr]=İnternet;WWW;Tarayıcı;Web;Gezgin;Web sitesi;Site;sörf;çevrimiçi;tara;
-Keywords[uk]=Internet;WWW;Browser;Web;Explorer;Інтернет;мережа;переглядач;оглядач;браузер;веб;файрфокс;вогнелис;перегляд;
-Keywords[vi]=Internet;WWW;Browser;Web;Explorer;Trình duyệt;Trang web;
-Keywords[zh_CN]=Internet;WWW;Browser;Web;Explorer;网页;浏览;上网;火狐;IceCat;ff;互联网;网站;
-Keywords[zh_TW]=Internet;WWW;Browser;Web;Explorer;網際網路;網路;瀏覽器;上網;網頁;火狐;
-Exec=icecat-x11 --name icecat-x11 %u
-Icon=icecat
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
-Categories=Network;WebBrowser;
-StartupNotify=true
-Name[en_US]=GNU IceCat on X11
-Actions=new-window;new-private-window;
-
-[Desktop Action new-window]
-Name=Open a New Window
-Name[ach]=Dirica manyen
-Name[af]=Nuwe venster
-Name[an]=Nueva finestra
-Name[ar]=نافذة جديدة
-Name[as]=নতুন উইন্ডো
-Name[ast]=Ventana nueva
-Name[az]=Yeni Pəncərə
-Name[be]=Новае акно
-Name[bg]=Нов прозорец
-Name[bn-BD]=নতুন উইন্ডো (N)
-Name[bn-IN]=নতুন উইন্ডো
-Name[br]=Prenestr nevez
-Name[brx]=गोदान उइन्ड'(N)
-Name[bs]=Novi prozor
-Name[ca]=Finestra nova
-Name[cak]=K'ak'a' tzuwäch
-Name[cs]=Nové okno
-Name[cy]=Ffenestr Newydd
-Name[da]=Nyt vindue
-Name[de]=&#xad;Neues Fenster
-Name[dsb]=Nowe wokno
-Name[el]=Νέο παράθυρο
-Name[en-GB]=New Window
-Name[en-US]=New Window
-Name[en-ZA]=New Window
-Name[eo]=Nova fenestro
-Name[es-AR]=Nueva ventana
-Name[es-CL]=Nueva ventana
-Name[es-ES]=Nueva ventana
-Name[es-MX]=Nueva ventana
-Name[et]=Uus aken
-Name[eu]=Leiho berria
-Name[fa]=پنجره جدید‌
-Name[ff]=Henorde Hesere
-Name[fi]=Uusi ikkuna
-Name[fr]=&#xad;Nouvelle fenêtre
-Name[fy-NL]=Nij finster
-Name[ga-IE]=Fuinneog Nua
-Name[gd]=Uinneag ùr
-Name[gl]=Nova xanela
-Name[gn]=Ovetã pyahu
-Name[gu-IN]=નવી વિન્ડો
-Name[he]=חלון חדש
-Name[hi-IN]=नया विंडो
-Name[hr]=Novi prozor
-Name[hsb]=Nowe wokno
-Name[hu]=Új ablak
-Name[hy-AM]=Նոր Պատուհան
-Name[id]=Jendela Baru
-Name[is]=Nýr gluggi
-Name[it]=Nuova finestra&#173;
-Name[ja]=新しいウィンドウ
-Name[ja-JP-mac]=新規ウインドウ
-Name[ka]=ახალი ფანჯარა
-Name[kk]=Жаңа терезе
-Name[km]=បង្អួច​​​ថ្មី
-Name[kn]=ಹೊಸ ಕಿಟಕಿ
-Name[ko]=새 창
-Name[kok]=नवें जनेल
-Name[ks]=نئئ وِنڈو
-Name[lij]=Neuvo barcon
-Name[lo]=ຫນ້າຕ່າງໃຫມ່
-Name[lt]=Naujas langas
-Name[ltg]=Jauns lūgs
-Name[lv]=Jauns logs
-Name[mai]=नव विंडो
-Name[mk]=Нов прозорец
-Name[ml]=പുതിയ ജാലകം
-Name[mr]=नवीन पटल
-Name[ms]=Tetingkap Baru
-Name[my]=ဝင်းဒိုးအသစ်
-Name[nb-NO]=Nytt vindu
-Name[ne-NP]=नयाँ सञ्झ्याल
-Name[nl]=Nieuw venster
-Name[nn-NO]=Nytt vindauge
-Name[or]=ନୂତନ ୱିଣ୍ଡୋ
-Name[pa-IN]=ਨਵੀਂ ਵਿੰਡੋ
-Name[pl]=Nowe okno
-Name[pt-BR]=Nova janela
-Name[pt-PT]=Nova janela
-Name[rm]=Nova fanestra
-Name[ro]=Fereastră nouă
-Name[ru]=Новое окно
-Name[sat]=नावा विंडो (N)
-Name[si]=නව කවුළුවක්
-Name[sk]=Nové okno
-Name[sl]=Novo okno
-Name[son]=Zanfun taaga
-Name[sq]=Dritare e Re
-Name[sr]=Нови прозор
-Name[sv-SE]=Nytt fönster
-Name[ta]=புதிய சாளரம்
-Name[te]=కొత్త విండో
-Name[th]=หน้าต่างใหม่
-Name[tr]=Yeni pencere
-Name[tsz]=Eraatarakua jimpani
-Name[uk]=Нове вікно
-Name[ur]=نیا دریچہ
-Name[uz]=Yangi oyna
-Name[vi]=Cửa sổ mới
-Name[wo]=Palanteer bu bees
-Name[xh]=Ifestile entsha
-Name[zh-CN]=新建窗口
-Name[zh-TW]=開新視窗
-Exec=icecat-x11 --name icecat-x11 --new-window %u
-
-[Desktop Action new-private-window]
-Name=Open a New Private Window
-Name[ach]=Dirica manyen me mung
-Name[af]=Nuwe privaatvenster
-Name[an]=Nueva finestra privada
-Name[ar]=نافذة خاصة جديدة
-Name[as]=নতুন ব্যক্তিগত উইন্ডো
-Name[ast]=Ventana privada nueva
-Name[az]=Yeni Məxfi Pəncərə
-Name[be]=Новае акно адасаблення
-Name[bg]=Нов прозорец за поверително сърфиране
-Name[bn-BD]=নতুন ব্যক্তিগত উইন্ডো
-Name[bn-IN]=নতুন ব্যক্তিগত উইন্ডো
-Name[br]=Prenestr merdeiñ prevez nevez
-Name[brx]=गोदान प्राइभेट उइन्ड'
-Name[bs]=Novi privatni prozor
-Name[ca]=Finestra privada nova
-Name[cak]=K'ak'a' ichinan tzuwäch
-Name[cs]=Nové anonymní okno
-Name[cy]=Ffenestr Breifat Newydd
-Name[da]=Nyt privat vindue
-Name[de]=Neues privates Fenster
-Name[dsb]=Nowe priwatne wokno
-Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης
-Name[en-GB]=New Private Window
-Name[en-US]=New Private Window
-Name[en-ZA]=New Private Window
-Name[eo]=Nova privata fenestro
-Name[es-AR]=Nueva ventana privada
-Name[es-CL]=Nueva ventana privada
-Name[es-ES]=Nueva ventana privada
-Name[es-MX]=Nueva ventana privada
-Name[et]=Uus privaatne aken
-Name[eu]=Leiho pribatu berria
-Name[fa]=پنجره ناشناس جدید
-Name[ff]=Henorde Suturo Hesere
-Name[fi]=Uusi yksityinen ikkuna
-Name[fr]=Nouvelle fenêtre de navigation privée
-Name[fy-NL]=Nij priveefinster
-Name[ga-IE]=Fuinneog Nua Phríobháideach
-Name[gd]=Uinneag phrìobhaideach ùr
-Name[gl]=Nova xanela privada
-Name[gn]=Ovetã ñemi pyahu
-Name[gu-IN]=નવી ખાનગી વિન્ડો
-Name[he]=חלון פרטי חדש
-Name[hi-IN]=नयी निजी विंडो
-Name[hr]=Novi privatni prozor
-Name[hsb]=Nowe priwatne wokno
-Name[hu]=Új privát ablak
-Name[hy-AM]=Սկսել Գաղտնի դիտարկում
-Name[id]=Jendela Mode Pribadi Baru
-Name[is]=Nýr huliðsgluggi
-Name[it]=Nuova finestra anonima
-Name[ja]=新しいプライベートウィンドウ
-Name[ja-JP-mac]=新規プライベートウインドウ
-Name[ka]=ახალი პირადი ფანჯარა
-Name[kk]=Жаңа жекелік терезе
-Name[km]=បង្អួច​ឯកជន​ថ្មី
-Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ
-Name[ko]=새 사생활 보호 모드
-Name[kok]=नवो खाजगी विंडो
-Name[ks]=نْو پرایوٹ وینڈو&amp;
-Name[lij]=Neuvo barcon privou
-Name[lo]=ເປີດຫນ້າຕ່າງສວນຕົວຂື້ນມາໃຫມ່
-Name[lt]=Naujas privataus naršymo langas
-Name[ltg]=Jauns privatais lūgs
-Name[lv]=Jauns privātais logs
-Name[mai]=नया निज विंडो (W)
-Name[mk]=Нов приватен прозорец
-Name[ml]=പുതിയ സ്വകാര്യ ജാലകം
-Name[mr]=नवीन वैयक्तिक पटल
-Name[ms]=Tetingkap Persendirian Baharu
-Name[my]=New Private Window
-Name[nb-NO]=Nytt privat vindu
-Name[ne-NP]=नयाँ निजी सञ्झ्याल
-Name[nl]=Nieuw privévenster
-Name[nn-NO]=Nytt privat vindauge
-Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ
-Name[pa-IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
-Name[pl]=Nowe okno prywatne
-Name[pt-BR]=Nova janela privativa
-Name[pt-PT]=Nova janela privada
-Name[rm]=Nova fanestra privata
-Name[ro]=Fereastră privată nouă
-Name[ru]=Новое приватное окно
-Name[sat]=नावा निजेराक् विंडो (W )
-Name[si]=නව පුද්ගලික කවුළුව (W)
-Name[sk]=Nové okno v režime Súkromné prehliadanie
-Name[sl]=Novo zasebno okno
-Name[son]=Sutura zanfun taaga
-Name[sq]=Dritare e Re Private
-Name[sr]=Нови приватан прозор
-Name[sv-SE]=Nytt privat fönster
-Name[ta]=புதிய தனிப்பட்ட சாளரம்
-Name[te]=కొత్త ఆంతరంగిక విండో
-Name[th]=หน้าต่างส่วนตัวใหม่
-Name[tr]=Yeni gizli pencere
-Name[tsz]=Juchiiti eraatarakua jimpani
-Name[uk]=Приватне вікно
-Name[ur]=نیا نجی دریچہ
-Name[uz]=Yangi maxfiy oyna
-Name[vi]=Cửa sổ riêng tư mới
-Name[wo]=Panlanteeru biir bu bees
-Name[xh]=Ifestile yangasese entsha
-Name[zh-CN]=新建隐私浏览窗口
-Name[zh-TW]=新增隱私視窗
-Exec=icecat-x11 --name icecat-x11 --private-window %u
diff --git a/icecat-x11.sh.in b/icecat-x11.sh.in
deleted file mode 100644
index e80fad2..0000000
--- a/icecat-x11.sh.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash	
-#
-# Run GNU IceCat on X11 backend	
-#
-
-export MOZ_DISABLE_WAYLAND=1
-exec /__PREFIX__/bin/icecat "$@"
diff --git a/icecat.spec b/icecat.spec
index 10fa795..5a1f628 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -3,7 +3,7 @@
 %global release_build 1
 
 # Set new source-code build version for Fedora and, not necessarily, for upstream too
-%global redhat_ver rh2
+%global redhat_ver rh1
 
 ExcludeArch: %{ix86} %{arm}
 
@@ -28,10 +28,11 @@ ExcludeArch: %{ix86} %{arm}
 # on other arches.
 %ifarch x86_64
 %if 0%{?release_build}
-%global build_with_pgo 0
-%global pgo_wayland    0
+%global build_with_pgo 1
+%global pgo_wayland    1
 %else
 %global build_with_pgo 0
+%global pgo_wayland    0
 %endif
 %endif
 
@@ -45,7 +46,11 @@ ExcludeArch: %{ix86} %{arm}
 ####################
 
 # Active/Deactive language files handling
-%global build_langpacks 1
+%bcond_without langpacks
+
+%if %{with langpacks}
+%bcond_without langpacks_subpkg
+%endif
 
 # Define installation directories
 %global icecatappdir %{_libdir}/%{name}
@@ -105,7 +110,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.18.0
+Version: 115.19.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
@@ -122,7 +127,7 @@ Source2: %{name}.png
 Source3: %{name}-mozconfig-common
 
 # Language files downloaded by source7 script
-%if 0%{?build_langpacks}
+%if %{with langpacks}
 Source4:  %{name}-%{version}-langpacks.tar.gz
 %endif
 
@@ -135,13 +140,9 @@ Source5: %{name}-COPYING-licensefiles.tar.gz
 Source7: %{name}-lang_download.sh
 
 # Desktop files
-Source9:  %{name}-wayland.desktop
 Source10: %{name}.appdata.xml
-Source12: %{name}-wayland.sh.in
 Source13: %{name}.sh.in
 Source14: %{name}.desktop
-Source15: %{name}-x11.sh.in
-Source16: %{name}-x11.desktop
 
 # cbingen
 Source17: cbindgen-vendor.tar.xz
@@ -311,6 +312,11 @@ Requires: fedora-bookmarks
 Suggests: mozilla-ublock-origin
 Provides: webclient
 
+%if 0%{?fedora} >= 40
+Obsoletes:  icecat-wayland < 2:115.19.0-1
+Obsoletes:  icecat-x11 < 2:115.19.0-1
+%endif
+
 %description
 GNU IceCat is the GNU version of the Firefox ESR browser.
 Extensions included to this version of IceCat:
@@ -336,20 +342,16 @@ Extensions included to this version of IceCat:
    requested. This implies not downloading feeds, updates, blacklists or any
    other similar data needed during startup.
 
-%package x11
-Summary: GNU IceCat X11 launcher
-Requires: %{name}%{?_isa}
-%description x11
-The %{name}-x11 package contains launcher and desktop file
-to run GNU IceCat native on X11.
-
-%package wayland
-Summary: GNU IceCat Wayland launcher
-Requires: %{name}%{?_isa}
-Obsoletes: %{name} < 0:78.6.1-1
-%description wayland
-The icecat-wayland package contains launcher and desktop file
-to run GNU IceCat native on Wayland.
+%if %{with langpacks_subpkg}
+%package langpacks
+Summary: IceCat langpacks
+Requires: %{name} = 2:%{version}-%{release}
+%description langpacks
+The icecat-langpacks package contains all the localization
+and translations langpack add-ons.
+%files langpacks -f %{name}.lang
+%dir %{langpackdir}
+%endif
 
 %prep
 %autosetup -N -n %{name}-%{version}
@@ -471,7 +473,7 @@ echo "ac_add_options --disable-tests" >> .mozconfig
 echo "ac_add_options --disable-crashreporter" >> .mozconfig
 
 # Localization
-%if 0%{?build_langpacks}
+%if %{with langpacks}
 echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 %endif
 
@@ -677,23 +679,10 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE14}
 rm -rf %{buildroot}%{_bindir}/%{name}
 %{__sed} -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE13} > %{buildroot}%{_bindir}/%{name}
 chmod 755 %{buildroot}%{_bindir}/%{name}
-
-%{__sed} -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE15} > %{buildroot}%{_bindir}/%{name}-x11
-chmod 755 %{buildroot}%{_bindir}/%{name}-x11
-desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE16}
-
-%{__sed} -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE12} > %{buildroot}%{_bindir}/%{name}-wayland
-chmod 755 %{buildroot}%{_bindir}/%{name}-wayland
-desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE9}
-
 #
 
-# Install man page
-#mkdir -p %%{buildroot}%%{_mandir}/man1
-#install -p -m 644 %%{name}.1 %%{buildroot}%%{_mandir}/man1/
-
 ##Extract langpacks, make any mods needed, repack the langpack, and install it.
-%if 0%{?build_langpacks}
+%if %{with langpacks}
 echo > %{name}.lang
 mkdir -p %{buildroot}%{langpackdir}
 tar xf %{SOURCE4}
@@ -793,10 +782,10 @@ end
 appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
-%if 0%{?build_langpacks}
-%files -f %{name}.lang
-%else
+%if %{with langpacks_subpkg}
 %files
+%else
+%files -f %{name}.lang
 %endif
 %doc README.* AUTHORS
 %license LICENSE COPYING-*
@@ -820,17 +809,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{icecatappdir}/plugin-container
 %{icecatappdir}/pingsender
 %{icecatappdir}/gmp-clearkey/
-%if 0%{?build_langpacks}
+%if %{without langpacks_subpkg}
+%if %{with langpacks}
 %dir %{langpackdir}
 %endif
-
-%files x11
-%{_bindir}/%{name}-x11
-%{_datadir}/applications/%{name}-x11.desktop
-
-%files wayland
-%{_bindir}/%{name}-wayland
-%{_datadir}/applications/%{name}-wayland.desktop
+%endif
 
 %changelog
 %autochangelog
diff --git a/sources b/sources
index 0b0c6f8..bd92d25 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = e229f15cb3d9213413ea4793478458887167f9c78943a6fd0e0c967a78c45457ffb8c4d933096b338e1dcf9a3c81931b6eaa4fdfb46d342ac1f3c251c99cd0d5
-SHA512 (icecat-115.18.0-langpacks.tar.gz) = f0fd3cd553994cd9380d5898cce7360eab2cd80a277a906ac0e3287077f328d6f74759b2a4f48e382104f87c9f3d7ba30ac7a3ef05802b7721399478bcb7423f
-SHA512 (icecat-115.18.0-rh2.tar.bz2) = 270ad24f00feb1a8a23285323a41a23a4e42987ccb8f5c06b156e27795873af1812521121ec8c68d95337233a4f4a6b9f01b16e23b49a8a4a83b1fcc890d1003
+SHA512 (icecat-115.19.0-langpacks.tar.gz) = ca3d6446e4a140369cd788a3ab790f2084b297c62754118fd3714fb03fe54a62494c0d762c774087d74545b061922beef59414df3dec7ff9ff991ddefe68efec
+SHA512 (icecat-115.19.0-rh1.tar.bz2) = 43ef502eccd1c1777d860165681781eb0702f0a968a7701c6230c81930c80f972dc20cdce5b023b4caabe3f12b22095fac15d512ec430f3917ff4d5d299b4c07
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 8aae756e78230300b2c29198b857869ad424db89 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 10 Jan 2025 12:20:44 +0100
Subject: [PATCH 411/473] Add missing BR pciutils-libs

---
 icecat.spec | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 5a1f628..de1ae1a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -54,12 +54,12 @@ ExcludeArch: %{ix86} %{arm}
 
 # Define installation directories
 %global icecatappdir %{_libdir}/%{name}
-%global icecat_ver   %{name}-%{version}
-%global icecat_devel %{name}-devel-%{version}
-
 # Define language files directory
 %global langpackdir  %{icecatappdir}/langpacks
 
+%global icecat_ver   %{name}-%{version}
+%global icecat_devel %{name}-devel-%{version}
+
 %global toolkit_gtk3  1
 
 # Big endian platforms
@@ -97,11 +97,7 @@ ExcludeArch: %{ix86} %{arm}
 %global disable_elfhack 1
 
 # Use clang?
-%if 0%{?fedora} > 39
 %global build_with_clang  1
-%else
-%global build_with_clang  0
-%endif
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1908792
 # https://bugzilla.redhat.com/show_bug.cgi?id=2255254
@@ -253,6 +249,7 @@ BuildRequires: nss-static >= %{nss_version}
 %endif
 
 BuildRequires: pango-devel
+BuildRequires: pciutils-libs
 BuildRequires: pipewire-devel
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
@@ -811,7 +808,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{icecatappdir}/gmp-clearkey/
 %if %{without langpacks_subpkg}
 %if %{with langpacks}
-%dir %{langpackdir}
+%dir %{icecatappdir}/langpacks
 %endif
 %endif
 

From e29d8d6633f45fcbdcae2d6b8f3cb94b86733c25 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 10 Jan 2025 21:40:17 +0100
Subject: [PATCH 412/473] Disable PGO at all

---
 icecat.spec | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index de1ae1a..d799d89 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -28,8 +28,8 @@ ExcludeArch: %{ix86} %{arm}
 # on other arches.
 %ifarch x86_64
 %if 0%{?release_build}
-%global build_with_pgo 1
-%global pgo_wayland    1
+%global build_with_pgo 0
+%global pgo_wayland    0
 %else
 %global build_with_pgo 0
 %global pgo_wayland    0
@@ -77,11 +77,7 @@ ExcludeArch: %{ix86} %{arm}
 %if %{?system_nss}
 %global nspr_version 4.32
 %global nspr_build_version %{nspr_version}
-%if 0%{?fedora} > 39
 %global nss_version 3.100
-%else
-%global nss_version 3.99
-%endif
 %global nss_build_version %{nss_version}
 %endif
 
@@ -190,6 +186,7 @@ Patch423: mozilla-1512162.patch
 # PGO/LTO patches
 Patch600: %{name}-pgo.patch
 Patch602: mozilla-1516803.patch
+Patch603: %{name}-gcc-always-inline.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf213
@@ -393,6 +390,7 @@ tar -xf %{SOURCE5}
 %patch -P 602 -p 1 -b .1516803
 %endif
 %endif
+%patch -P 603 -p1 -b .inline
 
 # Remove default configuration and copy the customized one
 rm -f .mozconfig
@@ -679,8 +677,8 @@ chmod 755 %{buildroot}%{_bindir}/%{name}
 #
 
 ##Extract langpacks, make any mods needed, repack the langpack, and install it.
-%if %{with langpacks}
 echo > %{name}.lang
+%if %{with langpacks}
 mkdir -p %{buildroot}%{langpackdir}
 tar xf %{SOURCE4}
  for langpack in `ls langpacks/*.xpi`; do

From 8c80932926f9a8cef446b522407046bebaa6ded6 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 10 Jan 2025 21:44:42 +0100
Subject: [PATCH 413/473] Disable PGO at all

---
 icecat-gcc-always-inline.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 icecat-gcc-always-inline.patch

diff --git a/icecat-gcc-always-inline.patch b/icecat-gcc-always-inline.patch
new file mode 100644
index 0000000..d7af60f
--- /dev/null
+++ b/icecat-gcc-always-inline.patch
@@ -0,0 +1,14 @@
+diff -up firefox-114.0.2/gfx/wr/swgl/src/gl.cc.inline firefox-114.0.2/gfx/wr/swgl/src/gl.cc
+--- firefox-114.0.2/gfx/wr/swgl/src/gl.cc.inline	2023-06-22 11:08:53.294593327 +0200
++++ firefox-114.0.2/gfx/wr/swgl/src/gl.cc	2023-06-22 11:12:43.663486734 +0200
+@@ -58,9 +58,7 @@ WINBASEAPI BOOL WINAPI QueryPerformanceF
+ }
+ 
+ #else
+-// GCC is slower when dealing with always_inline, especially in debug builds.
+-// When using Clang, use always_inline more aggressively.
+-#  if defined(__clang__) || defined(NDEBUG)
++#  if defined(__clang__) || defined (__GNUC__) || defined(NDEBUG)
+ #    define ALWAYS_INLINE __attribute__((always_inline)) inline
+ #  else
+ #    define ALWAYS_INLINE inline

From 20f4ffff0744314985f86300d12d0908938314fc Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 10 Jan 2025 21:52:34 +0100
Subject: [PATCH 414/473] Require icu on s390x only

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index d799d89..7354a0b 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -63,7 +63,7 @@ ExcludeArch: %{ix86} %{arm}
 %global toolkit_gtk3  1
 
 # Big endian platforms
-%ifarch %{power64} s390x
+%ifarch s390x
 # Javascript Intl API is not supported on big endian platforms right now:
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1322212
 %global big_endian    1

From a4318122caca199511f1150f59520684057ad5c7 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 11 Jan 2025 14:44:19 +0100
Subject: [PATCH 415/473] Drop some obsolete conditions

---
 icecat.spec | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 7354a0b..6fd0a61 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -20,10 +20,6 @@ ExcludeArch: %{ix86} %{arm}
 # Downgrade optimization
 %global less_optbuild 0
 
-# Use mozilla hardening option?
-%global hardened_build 1
-####################
-
 # Build PGO+LTO on x86_64 and aarch64 only due to build issues
 # on other arches.
 %ifarch x86_64
@@ -452,7 +448,6 @@ echo "ac_add_options --enable-rust-debug" >> .mozconfig
 %else
 %global optimize_flags "none"
 %ifarch s390x
-# ARMv7 need that (rhbz#1426850)
 %define optimize_flags " -fno-schedule-insns"
 %endif
 %if %{?optimize_flags} != "none"
@@ -551,11 +546,6 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2/-O0/')
 # Workaround for mozbz#1531309
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//')
 
-# Use hardened build?
-%if %{?hardened_build}
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
-%endif
-
 %ifarch s390x
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/')
 # If MOZ_DEBUG_FLAGS is empty, firefox's build will default it to "-g" which
@@ -611,7 +601,7 @@ MOZ_SMP_FLAGS=-j1
      RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
 %endif
-%ifarch x86_64 ppc ppc64 ppc64le
+%ifarch x86_64 %{power64}
 [ -z "$RPM_BUILD_NCPUS" ] && \
      RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
@@ -789,6 +779,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*x*/apps/%{name}*.png
 %{_metainfodir}/*.appdata.xml
 %dir %{icecatappdir}
+%if %{with langpacks}
+%dir %{langpackdir}
+%endif
 %{icecatappdir}/glxtest
 %{icecatappdir}/vaapitest
 %{icecatappdir}/browser/
@@ -804,11 +797,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{icecatappdir}/plugin-container
 %{icecatappdir}/pingsender
 %{icecatappdir}/gmp-clearkey/
-%if %{without langpacks_subpkg}
-%if %{with langpacks}
-%dir %{icecatappdir}/langpacks
-%endif
-%endif
 
 %changelog
 %autochangelog

From 6b3f455d4ff07f7cde145d747e6e0c2600d5cf1c Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 11 Jan 2025 17:37:27 +0100
Subject: [PATCH 416/473] Revert commit 20f4fff

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 6fd0a61..c0f7e45 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -59,7 +59,7 @@ ExcludeArch: %{ix86} %{arm}
 %global toolkit_gtk3  1
 
 # Big endian platforms
-%ifarch s390x
+%ifarch s390x %{power64}
 # Javascript Intl API is not supported on big endian platforms right now:
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1322212
 %global big_endian    1

From 08d4b41252f5b61718e0b4a9cce161d60572a6e6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 06:56:06 +0000
Subject: [PATCH 417/473] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From 5f9ce733b72c40176bf76eed7bb8e0a01ae39dc7 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 17 Jan 2025 12:55:09 +0100
Subject: [PATCH 418/473] Fix GCC15 builds

---
 icecat.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index c0f7e45..4e173d4 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -554,7 +554,7 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/')
 export MOZ_DEBUG_FLAGS=" "
 %endif
 
-# We don't wantfirefox to use CK_GCM_PARAMS_V3 in nss
+# We don't want firefox to use CK_GCM_PARAMS_V3 in nss
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -DNSS_PKCS11_3_0_STRICT"
 
 %if !0%{?build_with_clang}
@@ -566,8 +566,8 @@ MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--print-m
 export RUSTFLAGS="-Cdebuginfo=0"
 %endif
 
-export CFLAGS=$MOZ_OPT_FLAGS
-export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive"
+export CFLAGS="$MOZ_OPT_FLAGS -std=gnu17"
+export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive -std=gnu17"
 export LDFLAGS=$MOZ_LINK_FLAGS
 
 export PREFIX='%{_prefix}'

From 8e609e5072db70c7e4ab4625abd511a10ad5b3cd Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 23 Jan 2025 19:25:51 +0100
Subject: [PATCH 419/473] Try to build with GCC

---
 icecat.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 4e173d4..e6337d6 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -89,7 +89,7 @@ ExcludeArch: %{ix86} %{arm}
 %global disable_elfhack 1
 
 # Use clang?
-%global build_with_clang  1
+%global build_with_clang  0
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1908792
 # https://bugzilla.redhat.com/show_bug.cgi?id=2255254
@@ -567,7 +567,7 @@ export RUSTFLAGS="-Cdebuginfo=0"
 %endif
 
 export CFLAGS="$MOZ_OPT_FLAGS -std=gnu17"
-export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive -std=gnu17"
+export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive -std=gnu++17"
 export LDFLAGS=$MOZ_LINK_FLAGS
 
 export PREFIX='%{_prefix}'

From 8b817ce1187d522ccb9d60c5fb66e51a07f2e933 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 31 Jan 2025 21:25:18 +0100
Subject: [PATCH 420/473] Return to clang

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index e6337d6..9866148 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -89,7 +89,7 @@ ExcludeArch: %{ix86} %{arm}
 %global disable_elfhack 1
 
 # Use clang?
-%global build_with_clang  0
+%global build_with_clang  1
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1908792
 # https://bugzilla.redhat.com/show_bug.cgi?id=2255254

From 9f2bc0fee055d5c3b51d34a98d5ac0e54c97fc63 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 31 Jan 2025 22:22:46 +0100
Subject: [PATCH 421/473] Update to cbindgen-0.28.0

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index bd92d25..5d7cfcf 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = e229f15cb3d9213413ea4793478458887167f9c78943a6fd0e0c967a78c45457ffb8c4d933096b338e1dcf9a3c81931b6eaa4fdfb46d342ac1f3c251c99cd0d5
+SHA512 (cbindgen-vendor.tar.xz) = 662fbf92c54e9c044d639bf6b3243ffcfd73c737967517f66e41f193c798d475ad4526f53ebcf57587f10ba01e0ebd3b63bad2bd2942c728f2d77b03e83faaa8
 SHA512 (icecat-115.19.0-langpacks.tar.gz) = ca3d6446e4a140369cd788a3ab790f2084b297c62754118fd3714fb03fe54a62494c0d762c774087d74545b061922beef59414df3dec7ff9ff991ddefe68efec
 SHA512 (icecat-115.19.0-rh1.tar.bz2) = 43ef502eccd1c1777d860165681781eb0702f0a968a7701c6230c81930c80f972dc20cdce5b023b4caabe3f12b22095fac15d512ec430f3917ff4d5d299b4c07
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From f143d871a03d4895671b5241a2c2cf54d860803d Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 31 Jan 2025 22:45:10 +0100
Subject: [PATCH 422/473] Try to use system cbindgen

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 9866148..7ba7216 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -9,7 +9,7 @@ ExcludeArch: %{ix86} %{arm}
 
 # Bundled cbindgen makes build slow.
 # Enable only if system cbindgen is not available.
-%global use_bundled_cbindgen  1
+%global use_bundled_cbindgen  0
 
 ####################
 

From 576f5d64b7908003ad49f179b4a7d951867a1279 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 31 Jan 2025 23:09:40 +0100
Subject: [PATCH 423/473] Fix mozilla #1912663

---
 icecat-115.19.0-fix_mz1912663.patch | 82 +++++++++++++++++++++++++++++
 icecat.spec                         |  2 +
 2 files changed, 84 insertions(+)
 create mode 100644 icecat-115.19.0-fix_mz1912663.patch

diff --git a/icecat-115.19.0-fix_mz1912663.patch b/icecat-115.19.0-fix_mz1912663.patch
new file mode 100644
index 0000000..2168003
--- /dev/null
+++ b/icecat-115.19.0-fix_mz1912663.patch
@@ -0,0 +1,82 @@
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio@crisal.io>
+# Date 1723389149 0
+# Node ID 0e6f95e0b777abd64b1224c28ecd1beb614035cf
+# Parent  ac782ec8027890a85265514cef6b564f07b18a71
+Bug 1912663 - Fix some build issues with cbindgen 0.27. r=firefox-style-system-reviewers,zrhoffman a=pascalc
+
+It updates serde and syn and they are more strict. In particular, syn 2
+doesn't parse the rust 2015 syntax where try is not a keyword, and serde
+rejects duplicate keys.
+
+Differential Revision: https://phabricator.services.mozilla.com/D219025
+
+diff --git a/servo/components/style_traits/values.rs b/servo/components/style_traits/values.rs
+--- a/servo/components/style_traits/values.rs
++++ b/servo/components/style_traits/values.rs
+@@ -384,21 +384,21 @@ impl Separator for Space {
+ 
+     fn parse<'i, 't, F, T, E>(
+         input: &mut Parser<'i, 't>,
+         mut parse_one: F,
+     ) -> Result<Vec<T>, ParseError<'i, E>>
+     where
+         F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
+     {
+-        input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
++        input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
+         let mut results = vec![parse_one(input)?];
+         loop {
+-            input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
+-            if let Ok(item) = input.try(&mut parse_one) {
++            input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
++            if let Ok(item) = input.try_parse(&mut parse_one) {
+                 results.push(item);
+             } else {
+                 return Ok(results);
+             }
+         }
+     }
+ }
+ 
+@@ -409,24 +409,24 @@ impl Separator for CommaWithSpace {
+ 
+     fn parse<'i, 't, F, T, E>(
+         input: &mut Parser<'i, 't>,
+         mut parse_one: F,
+     ) -> Result<Vec<T>, ParseError<'i, E>>
+     where
+         F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
+     {
+-        input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
++        input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
+         let mut results = vec![parse_one(input)?];
+         loop {
+-            input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
++            input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
+             let comma_location = input.current_source_location();
+-            let comma = input.try(|i| i.expect_comma()).is_ok();
+-            input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
+-            if let Ok(item) = input.try(&mut parse_one) {
++            let comma = input.try_parse(|i| i.expect_comma()).is_ok();
++            input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
++            if let Ok(item) = input.try_parse(&mut parse_one) {
+                 results.push(item);
+             } else if comma {
+                 return Err(comma_location.new_unexpected_token_error(Token::Comma));
+             } else {
+                 break;
+             }
+         }
+         Ok(results)
+diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml
+--- a/servo/ports/geckolib/cbindgen.toml
++++ b/servo/ports/geckolib/cbindgen.toml
+@@ -318,7 +318,6 @@
+ "Keyframe" = "Keyframe"
+ "nsChangeHint" = "nsChangeHint"
+ "ServoElementSnapshotTable" = "ServoElementSnapshotTable"
+-"Keyframe" = "Keyframe"
+ "ComputedKeyframeValues" = "ComputedKeyframeValues"
+ "OriginFlags" = "OriginFlags"
+ "ServoTraversalFlags" = "ServoTraversalFlags"
diff --git a/icecat.spec b/icecat.spec
index 7ba7216..a5ffa50 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -175,6 +175,7 @@ Patch403: icecat-python3.11-open-U.patch
 Patch404: icecat-python3.11-regex-inline-flags.patch
 Patch412: mozilla-1337988.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
+Patch425: icecat-115.19.0-fix_mz1912663.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
@@ -376,6 +377,7 @@ tar -xf %{SOURCE5}
 %ifarch %{power64}
 %patch -P 423 -p 1 -b .1512162
 %endif
+%patch -P 425 -p 1 -b .1912663
 
 %patch -P 54 -p 1 -b .1669639
 

From 48814c09711ba06bd8443d16adb5a2e9d35417fd Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 31 Jan 2025 23:38:19 +0100
Subject: [PATCH 424/473] Fix mozilla #1917964

---
 icecat-115.19.0-fix_mz1917964.patch | 327 ++++++++++++++++++++++++++++
 icecat.spec                         |   4 +
 2 files changed, 331 insertions(+)
 create mode 100644 icecat-115.19.0-fix_mz1917964.patch

diff --git a/icecat-115.19.0-fix_mz1917964.patch b/icecat-115.19.0-fix_mz1917964.patch
new file mode 100644
index 0000000..935485d
--- /dev/null
+++ b/icecat-115.19.0-fix_mz1917964.patch
@@ -0,0 +1,327 @@
+# HG changeset patch
+# User Lee Salzman <lsalzman@mozilla.com>
+# Date 1726239330 0
+# Node ID d36ca9941b2f90d910854e38293875e32c49796b
+# Parent  156543617de576c07a7914dd20d13692ddb0845a
+Bug 1917964 - Use __builtin_convertvector and __builtin_shufflevector on GCC when available. r=aosmond
+
+GCC upstream recommends we use __builtin_convertvector and __builtin_shufflevector instead of __builtin_shuffle
+for better code generation.
+
+See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116666#c7
+
+Differential Revision: https://phabricator.services.mozilla.com/D222067
+
+diff --git a/gfx/wr/swgl/src/vector_type.h b/gfx/wr/swgl/src/vector_type.h
+--- a/gfx/wr/swgl/src/vector_type.h
++++ b/gfx/wr/swgl/src/vector_type.h
+@@ -89,16 +89,25 @@ template <>
+ struct VectorMask<uint8_t> {
+   typedef int8_t type;
+ };
+ template <>
+ struct VectorMask<float> {
+   typedef int type;
+ };
+ 
++#  ifdef __has_builtin
++#    if __has_builtin(__builtin_convertvector)
++#      define HAS_BUILTIN_CONVERTVECTOR
++#    endif
++#    if __has_builtin(__builtin_shufflevector)
++#      define HAS_BUILTIN_SHUFFLEVECTOR
++#    endif
++#  endif
++
+ template <typename T, int N>
+ struct VectorType {
+   enum { SIZE = N };
+ 
+   typedef T data_type __attribute__((vector_size(sizeof(T) * N)));
+   typedef typename VectorMask<T>::type mask_index;
+   typedef mask_index mask_type
+       __attribute__((vector_size(sizeof(mask_index) * N)));
+@@ -131,16 +140,23 @@ struct VectorType {
+     VectorType v;
+     v.data = data;
+     return v;
+   }
+ 
+   T& operator[](size_t i) { return elements[i]; }
+   T operator[](size_t i) const { return elements[i]; }
+ 
++#  ifdef HAS_BUILTIN_CONVERTVECTOR
++  template <typename U, int M>
++  operator VectorType<U, M>() const {
++    return VectorType<U, M>::wrap(
++        __builtin_convertvector(data, typename VectorType<U, M>::data_type));
++  }
++#  else
+   template <typename U>
+   operator VectorType<U, 2>() const {
+     return VectorType<U, 2>::wrap(
+         (typename VectorType<U, N>::data_type){U(x), U(y)});
+   }
+   template <typename U>
+   operator VectorType<U, 4>() const {
+     return VectorType<U, 4>::wrap(
+@@ -168,16 +184,17 @@ struct VectorType {
+         U(elements[10]),
+         U(elements[11]),
+         U(elements[12]),
+         U(elements[13]),
+         U(elements[14]),
+         U(elements[15]),
+     });
+   }
++#  endif
+ 
+   VectorType operator-() const { return wrap(-data); }
+   VectorType operator~() const { return wrap(~data); }
+ 
+   VectorType operator&(VectorType x) const { return wrap(data & x.data); }
+   VectorType operator&(T x) const { return wrap(data & x); }
+   VectorType operator|(VectorType x) const { return wrap(data | x.data); }
+   VectorType operator|(T x) const { return wrap(data | x); }
+@@ -263,110 +280,107 @@ struct VectorType {
+   VectorType operator&&(VectorType x) const { return wrap(data & x.data); }
+   VectorType operator||(VectorType x) const { return wrap(data | x.data); }
+ 
+   VectorType& operator=(VectorType x) {
+     data = x.data;
+     return *this;
+   }
+ 
+-  VectorType<T, 4> shuffle(VectorType b, mask_index x, mask_index y,
+-                           mask_index z, mask_index w) const {
+-    return VectorType<T, 4>::wrap(__builtin_shuffle(
+-        data, b.data, (typename VectorType<T, 4>::mask_type){x, y, z, w}));
+-  }
+-  VectorType<T, 8> shuffle(VectorType b, mask_index x, mask_index y,
+-                           mask_index z, mask_index w, mask_index s,
+-                           mask_index t, mask_index u, mask_index v) const {
+-    return VectorType<T, 8>::wrap(__builtin_shuffle(
+-        data, b.data,
+-        (typename VectorType<T, 8>::mask_type){x, y, z, w, s, t, u, v}));
+-  }
+-  VectorType<T, 16> shuffle(VectorType b, mask_index x, mask_index y,
+-                            mask_index z, mask_index w, mask_index s,
+-                            mask_index t, mask_index u, mask_index v,
+-                            mask_index i, mask_index j, mask_index k,
+-                            mask_index l, mask_index m, mask_index n,
+-                            mask_index o, mask_index p) const {
+-    return VectorType<T, 16>::wrap(
+-        __builtin_shuffle(data, b.data,
+-                          (typename VectorType<T, 16>::mask_type){
+-                              x, y, z, w, s, t, u, v, i, j, k, l, m, n, o, p}));
+-  }
+-
+-  VectorType<T, 4> swizzle(mask_index x, mask_index y, mask_index z,
+-                           mask_index w) const {
+-    return VectorType<T, 4>::wrap(__builtin_shuffle(
+-        data, (typename VectorType<T, 4>::mask_type){x, y, z, w}));
+-  }
+-  VectorType<T, 8> swizzle(mask_index x, mask_index y, mask_index z,
+-                           mask_index w, mask_index s, mask_index t,
+-                           mask_index u, mask_index v) const {
+-    return VectorType<T, 8>::wrap(__builtin_shuffle(
+-        data, (typename VectorType<T, 8>::mask_type){x, y, z, w, s, t, u, v}));
+-  }
+-
+   SI VectorType wrap(half_type low, half_type high) {
+     VectorType v;
+     v.low_half = low;
+     v.high_half = high;
+     return v;
+   }
+ 
+   VectorType<T, N * 2> combine(VectorType high) const {
+     return VectorType<T, N * 2>::wrap(data, high.data);
+   }
+ 
+-#  define xxxx swizzle(0, 0, 0, 0)
+-#  define yyyy swizzle(1, 1, 1, 1)
+-#  define zzzz swizzle(2, 2, 2, 2)
+-#  define wwww swizzle(3, 3, 3, 3)
+-#  define xxyy swizzle(0, 0, 1, 1)
+-#  define xxzz swizzle(0, 0, 2, 2)
+-#  define yyww swizzle(1, 1, 3, 3)
+-#  define zzww swizzle(2, 2, 3, 3)
+-#  define xyxy swizzle(0, 1, 0, 1)
+-#  define xzxz swizzle(0, 2, 0, 2)
+-#  define ywyw swizzle(1, 3, 1, 3)
+-#  define zwzw swizzle(2, 3, 2, 3)
+-#  define zwxy swizzle(2, 3, 0, 1)
+-#  define zyxw swizzle(2, 1, 0, 3)
+-#  define xxyz swizzle(0, 0, 1, 2)
+-#  define xyyz swizzle(0, 1, 1, 2)
+-#  define xyzz swizzle(0, 1, 2, 2)
+-#  define xzyw swizzle(0, 2, 1, 3)
+-#  define yzwx swizzle(1, 2, 3, 0)
+-#  define wxyz swizzle(3, 0, 1, 2)
+-#  define wzyx swizzle(3, 2, 1, 0)
+-#  define xxxxyyyy XXXXYYYY()
+-  VectorType<T, 8> XXXXYYYY() const {
+-    return swizzle(0, 0, 0, 0).combine(swizzle(1, 1, 1, 1));
++#  ifdef HAS_BUILTIN_SHUFFLEVECTOR
++  template <mask_index... INDEXES, int M = sizeof...(INDEXES)>
++  VectorType<T, M> shuffle(VectorType b) const {
++    return VectorType<T, M>::wrap(
++        __builtin_shufflevector(data, b.data, INDEXES...));
++  }
++
++  template <mask_index... INDEXES, int M = sizeof...(INDEXES)>
++  VectorType<T, M> swizzle() const {
++    return VectorType<T, M>::wrap(
++        __builtin_shufflevector(data, data, INDEXES...));
++  }
++#  else
++  template <mask_index... INDEXES, int M = sizeof...(INDEXES)>
++  VectorType<T, M> shuffle(VectorType<T, M> b) const {
++    return VectorType<T, M>::wrap(__builtin_shuffle(
++        data, b.data, (typename VectorType<T, M>::mask_type){INDEXES...}));
++  }
++
++  template <mask_index A, mask_index B, mask_index C, mask_index D,
++            mask_index E, mask_index F, mask_index G, mask_index H>
++  VectorType<T, 8> shuffle(VectorType<T, 4> b) const {
++    return shuffle<A, B, C, D>(b).combine(shuffle<E, F, G, H>(b));
++  }
++
++  template <mask_index A, mask_index B, mask_index C, mask_index D,
++            mask_index E, mask_index F, mask_index G, mask_index H,
++            mask_index I, mask_index J, mask_index K, mask_index L,
++            mask_index W, mask_index X, mask_index Y, mask_index Z>
++  VectorType<T, 16> shuffle(VectorType<T, 4> b) const {
++    return shuffle<A, B, C, D, E, F, G, H>(b).combine(
++        shuffle<I, J, K, L, W, X, Y, Z>(b));
+   }
+-#  define zzzzwwww ZZZZWWWW()
+-  VectorType<T, 8> ZZZZWWWW() const {
+-    return swizzle(2, 2, 2, 2).combine(swizzle(3, 3, 3, 3));
++
++  template <mask_index A, mask_index B, mask_index C, mask_index D,
++            mask_index E, mask_index F, mask_index G, mask_index H,
++            mask_index I, mask_index J, mask_index K, mask_index L,
++            mask_index W, mask_index X, mask_index Y, mask_index Z>
++  VectorType<T, 16> shuffle(VectorType<T, 8> b) const {
++    return shuffle<A, B, C, D, E, F, G, H>(b).combine(
++        shuffle<I, J, K, L, W, X, Y, Z>(b));
+   }
+-#  define xyzwxyzw XYZWXYZW()
+-  VectorType<T, 8> XYZWXYZW() const { return combine(*this); }
+-#  define xyxyxyxy XYXYXYXY()
+-  VectorType<T, 8> XYXYXYXY() const {
+-    return swizzle(0, 1, 0, 1).combine(swizzle(0, 1, 0, 1));
++
++  template <mask_index... INDEXES, int M = sizeof...(INDEXES)>
++  VectorType<T, M> swizzle() const {
++    return shuffle<INDEXES...>(*this);
+   }
+-#  define zwzwzwzw ZWZWZWZW()
+-  VectorType<T, 8> ZWZWZWZW() const {
+-    return swizzle(2, 3, 2, 3).combine(swizzle(2, 3, 2, 3));
+-  }
+-#  define xxyyzzww XXYYZZWW()
+-  VectorType<T, 8> XXYYZZWW() const {
+-    return swizzle(0, 0, 1, 1).combine(swizzle(2, 2, 3, 3));
+-  }
+-#  define xxxxyyyyzzzzwwww XXXXYYYYZZZZWWWW()
+-  VectorType<T, 16> XXXXYYYYZZZZWWWW() {
+-    return XXXXYYYY().combine(ZZZZWWWW());
+-  }
++#  endif
++
++#  define SWIZZLE(...) template swizzle<__VA_ARGS__>()
++
++#  define xxxx SWIZZLE(0, 0, 0, 0)
++#  define yyyy SWIZZLE(1, 1, 1, 1)
++#  define zzzz SWIZZLE(2, 2, 2, 2)
++#  define wwww SWIZZLE(3, 3, 3, 3)
++#  define xxyy SWIZZLE(0, 0, 1, 1)
++#  define xxzz SWIZZLE(0, 0, 2, 2)
++#  define yyww SWIZZLE(1, 1, 3, 3)
++#  define zzww SWIZZLE(2, 2, 3, 3)
++#  define xyxy SWIZZLE(0, 1, 0, 1)
++#  define xzxz SWIZZLE(0, 2, 0, 2)
++#  define ywyw SWIZZLE(1, 3, 1, 3)
++#  define zwzw SWIZZLE(2, 3, 2, 3)
++#  define zwxy SWIZZLE(2, 3, 0, 1)
++#  define zyxw SWIZZLE(2, 1, 0, 3)
++#  define xxyz SWIZZLE(0, 0, 1, 2)
++#  define xyyz SWIZZLE(0, 1, 1, 2)
++#  define xyzz SWIZZLE(0, 1, 2, 2)
++#  define xzyw SWIZZLE(0, 2, 1, 3)
++#  define yzwx SWIZZLE(1, 2, 3, 0)
++#  define wxyz SWIZZLE(3, 0, 1, 2)
++#  define wzyx SWIZZLE(3, 2, 1, 0)
++#  define xxxxyyyy SWIZZLE(0, 0, 0, 0, 1, 1, 1, 1)
++#  define zzzzwwww SWIZZLE(2, 2, 2, 2, 3, 3, 3, 3)
++#  define xyzwxyzw SWIZZLE(0, 1, 2, 3, 0, 1, 2, 3)
++#  define xyxyxyxy SWIZZLE(0, 1, 0, 1, 0, 1, 0, 1)
++#  define zwzwzwzw SWIZZLE(2, 3, 2, 3, 2, 3, 2, 3)
++#  define xxyyzzww SWIZZLE(0, 0, 1, 1, 2, 2, 3, 3)
++#  define xxxxyyyyzzzzwwww \
++    SWIZZLE(0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3)
+ };
+ 
+ template <typename T>
+ struct VectorType<T, 2> {
+   typedef T data_type __attribute__((vector_size(sizeof(T) * 2)));
+   union {
+     data_type data;
+     struct {
+@@ -383,17 +397,17 @@ struct VectorType<T, 2> {
+ 
+   VectorType operator&(VectorType x) const { return wrap(data & x.data); }
+   VectorType operator&(T x) const { return wrap(data & x); }
+   VectorType operator|(VectorType x) const { return wrap(data | x.data); }
+   VectorType operator|(T x) const { return wrap(data | x); }
+ };
+ 
+ #  define CONVERT(vector, type) ((type)(vector))
+-#  define SHUFFLE(a, b, ...) a.shuffle(b, __VA_ARGS__)
++#  define SHUFFLE(a, b, ...) ((a).template shuffle<__VA_ARGS__>(b))
+ 
+ template <typename T, int N>
+ SI VectorType<T, N * 2> combine(VectorType<T, N> a, VectorType<T, N> b) {
+   return VectorType<T, N * 2>::wrap(a.data, b.data);
+ }
+ 
+ template <typename T, int N>
+ SI VectorType<T, N / 2> lowHalf(VectorType<T, N> a) {
+@@ -473,32 +487,25 @@ SI VectorType<T, 8> zip2Low(VectorType<T
+   return SHUFFLE(a, b, 0, 1, 8, 9, 2, 3, 10, 11);
+ }
+ 
+ template <typename T>
+ SI VectorType<T, 8> zip2High(VectorType<T, 8> a, VectorType<T, 8> b) {
+   return SHUFFLE(a, b, 4, 5, 12, 13, 6, 7, 14, 15);
+ }
+ 
+-#ifdef __clang__
+ template <typename T>
+ SI VectorType<T, 8> zip(VectorType<T, 4> a, VectorType<T, 4> b) {
+   return SHUFFLE(a, b, 0, 4, 1, 5, 2, 6, 3, 7);
+ }
+ 
+ template <typename T>
+ SI VectorType<T, 16> zip(VectorType<T, 8> a, VectorType<T, 8> b) {
+   return SHUFFLE(a, b, 0, 8, 1, 9, 2, 10, 3, 11, 4, 12, 5, 13, 6, 14, 7, 15);
+ }
+-#else
+-template <typename T, int N>
+-SI VectorType<T, N * 2> zip(VectorType<T, N> a, VectorType<T, N> b) {
+-  return combine(zipLow(a, b), zipHigh(a, b));
+-}
+-#endif
+ 
+ template <typename T>
+ struct Unaligned {
+   template <typename P>
+   SI T load(const P* p) {
+     T v;
+     memcpy(&v, p, sizeof(v));
+     return v;
+
+
diff --git a/icecat.spec b/icecat.spec
index a5ffa50..e755951 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -176,6 +176,8 @@ Patch404: icecat-python3.11-regex-inline-flags.patch
 Patch412: mozilla-1337988.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
 Patch425: icecat-115.19.0-fix_mz1912663.patch
+# Patch for GCC-15
+Patch426: icecat-115.19.0-fix_mz1917964.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
@@ -271,6 +273,7 @@ BuildRequires:  clang-libs
 BuildRequires:  llvm-devel
 %endif
 BuildRequires: rust
+BuildRequires: rustfmt
 %if 0%{?pgo_wayland}
 BuildRequires:  mutter
 BuildRequires:  gsettings-desktop-schemas
@@ -378,6 +381,7 @@ tar -xf %{SOURCE5}
 %patch -P 423 -p 1 -b .1512162
 %endif
 %patch -P 425 -p 1 -b .1912663
+%patch -P 426 -p 1 -b .1917964
 
 %patch -P 54 -p 1 -b .1669639
 

From a3963a5de6398216cf917131f508d4486736736c Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 1 Feb 2025 18:52:16 +0100
Subject: [PATCH 425/473] Re-testing with GCC

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index e755951..44d4fd7 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -89,7 +89,7 @@ ExcludeArch: %{ix86} %{arm}
 %global disable_elfhack 1
 
 # Use clang?
-%global build_with_clang  1
+%global build_with_clang  0
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1908792
 # https://bugzilla.redhat.com/show_bug.cgi?id=2255254

From ed541732a68fc43c97dae4ad832dde0d46c72fc9 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 2 Feb 2025 00:22:15 +0100
Subject: [PATCH 426/473] Fix swgl build with GCC 15

---
 icecat-115.19.0-fix_mz1917964.patch | 65 +++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/icecat-115.19.0-fix_mz1917964.patch b/icecat-115.19.0-fix_mz1917964.patch
index 935485d..89fc16a 100644
--- a/icecat-115.19.0-fix_mz1917964.patch
+++ b/icecat-115.19.0-fix_mz1917964.patch
@@ -1,3 +1,68 @@
+
+# HG changeset patch
+# User Sam James <sam@cmpct.info>
+# Date 1726081531 0
+# Node ID 0249085453e0d5c8378a1a053b94753fd52c956c
+# Parent  3fca72d15659808d8f453b44a13320d4f6ceca86
+Bug 1917964 - Fix swgl build with GCC 15. r=gfx-reviewers,lsalzman
+
+Fix broken specialisations which are exposed by a recent change in GCC trunk.
+
+See https://gcc.gnu.org/PR116666.
+
+Differential Revision: https://phabricator.services.mozilla.com/D221744
+
+diff --git a/gfx/wr/swgl/src/vector_type.h b/gfx/wr/swgl/src/vector_type.h
+--- a/gfx/wr/swgl/src/vector_type.h
++++ b/gfx/wr/swgl/src/vector_type.h
+@@ -235,33 +235,33 @@ struct VectorType {
+     data /= x.data;
+     return *this;
+   }
+   VectorType& operator%=(int x) {
+     data %= x;
+     return *this;
+   }
+ 
+-  VectorType<mask_type, N> operator==(VectorType x) const {
+-    return VectorType<mask_type, N>::wrap(data == x.data);
++  VectorType<mask_index, N> operator==(VectorType x) const {
++    return VectorType<mask_index, N>::wrap(data == x.data);
+   }
+-  VectorType<mask_type, N> operator!=(VectorType x) const {
+-    return VectorType<mask_type, N>::wrap(data != x.data);
++  VectorType<mask_index, N> operator!=(VectorType x) const {
++    return VectorType<mask_index, N>::wrap(data != x.data);
+   }
+-  VectorType<mask_type, N> operator<(VectorType x) const {
+-    return VectorType<mask_type, N>::wrap(data < x.data);
++  VectorType<mask_index, N> operator<(VectorType x) const {
++    return VectorType<mask_index, N>::wrap(data < x.data);
+   }
+-  VectorType<mask_type, N> operator>(VectorType x) const {
+-    return VectorType<mask_type, N>::wrap(data > x.data);
++  VectorType<mask_index, N> operator>(VectorType x) const {
++    return VectorType<mask_index, N>::wrap(data > x.data);
+   }
+-  VectorType<mask_type, N> operator<=(VectorType x) const {
+-    return VectorType<mask_type, N>::wrap(data <= x.data);
++  VectorType<mask_index, N> operator<=(VectorType x) const {
++    return VectorType<mask_index, N>::wrap(data <= x.data);
+   }
+-  VectorType<mask_type, N> operator>=(VectorType x) const {
+-    return VectorType<mask_type, N>::wrap(data >= x.data);
++  VectorType<mask_index, N> operator>=(VectorType x) const {
++    return VectorType<mask_index, N>::wrap(data >= x.data);
+   }
+ 
+   VectorType operator!() const { return wrap(!data); }
+   VectorType operator&&(VectorType x) const { return wrap(data & x.data); }
+   VectorType operator||(VectorType x) const { return wrap(data | x.data); }
+ 
+   VectorType& operator=(VectorType x) {
+     data = x.data;
+
+
 # HG changeset patch
 # User Lee Salzman <lsalzman@mozilla.com>
 # Date 1726239330 0

From 2e957031566e75a98e698a399ef9d0e572e65c51 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 7 Feb 2025 22:31:07 +0100
Subject: [PATCH 427/473] Release 115.20.0

---
 .gitignore              |  2 ++
 icecat-lang_download.sh |  2 +-
 icecat.spec             | 54 +++++++++++++++++++++++++----------------
 sources                 |  4 +--
 4 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e08528..e84bce5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -268,3 +268,5 @@
 /icecat-115.18.0-rh2.tar.bz2
 /icecat-115.19.0-langpacks.tar.gz
 /icecat-115.19.0-rh1.tar.bz2
+/icecat-115.20.0-langpacks.tar.gz
+/icecat-115.20.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 20ee05b..9853483 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.19.0
+VERSION=115.20.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 44d4fd7..9b8dbfb 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -89,7 +89,11 @@ ExcludeArch: %{ix86} %{arm}
 %global disable_elfhack 1
 
 # Use clang?
-%global build_with_clang  0
+%bcond_without toolchain_clang
+
+%if %{with toolchain_clang}
+%global toolchain clang
+%endif
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1908792
 # https://bugzilla.redhat.com/show_bug.cgi?id=2255254
@@ -98,7 +102,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.19.0
+Version: 115.20.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
@@ -261,17 +265,19 @@ BuildRequires: pulseaudio-libs-devel
 BuildRequires: yasm
 BuildRequires: llvm
 BuildRequires: llvm-devel
-%if 0%{?build_with_clang}
+%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
 BuildRequires:  clang17
 BuildRequires:  clang17-libs
 BuildRequires:  llvm17-devel
-BuildRequires:  lld
 %global llvm_suffix -17
 %else
 BuildRequires:  clang
 BuildRequires:  clang-libs
 BuildRequires:  llvm-devel
 %endif
+%if "%toolchain" == "clang"
+BuildRequires:  lld
+%endif
 BuildRequires: rust
 BuildRequires: rustfmt
 %if 0%{?pgo_wayland}
@@ -387,11 +393,9 @@ tar -xf %{SOURCE5}
 
 # PGO patches
 %if 0%{?build_with_pgo}
-%if !%{build_with_clang}
 %patch -P 600 -p 1 -b .pgo
 %patch -P 602 -p 1 -b .1516803
 %endif
-%endif
 %patch -P 603 -p1 -b .inline
 
 # Remove default configuration and copy the customized one
@@ -474,9 +478,7 @@ echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 %endif
 
 # Clang
-%if 0%{?build_with_clang}
 echo "ac_add_options --with-clang-path=`which clang%{?llvm_suffix}`" >> .mozconfig
-%endif
 echo "ac_add_options --with-libclang-path=`llvm-config%{?llvm_suffix} --libdir`" >> .mozconfig
 
 %ifarch s390x
@@ -563,11 +565,16 @@ export MOZ_DEBUG_FLAGS=" "
 # We don't want firefox to use CK_GCM_PARAMS_V3 in nss
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -DNSS_PKCS11_3_0_STRICT"
 
-%if !0%{?build_with_clang}
-%ifarch s390x %{power64} %{arm64}
-MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--print-memory-usage"
+%if "%toolchain" != "clang"
+%ifarch s390 ppc aarch64 %{ix86}
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+%endif
+%ifarch %{arm}
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory"
+echo "ac_add_options --enable-linker=gold" >> .mozconfig
 %endif
 %endif
+
 %ifarch s390x
 export RUSTFLAGS="-Cdebuginfo=0"
 %endif
@@ -581,20 +588,25 @@ export LIBDIR='%{_libdir}'
 export PKG_CONFIG="`which pkg-config`"
 export PYTHON='%{__python3}'
 
-%if 0%{?build_with_clang}
-export LLVM_PROFDATA="llvm-profdata"
-export AR="llvm-ar"
-export NM="llvm-nm"
-export RANLIB="llvm-ranlib"
+%if "%toolchain" == "clang"
+echo "export LLVM_PROFDATA=\"llvm-profdata\"" >> .mozconfig
+echo "export AR=\"llvm-ar\"" >> .mozconfig
+echo "export NM=\"llvm-nm\"" >> .mozconfig
+echo "export RANLIB=\"llvm-ranlib\"" >> .mozconfig
 echo "ac_add_options --enable-linker=lld" >> .mozconfig
 %else
-export CC=gcc
-export CXX=g++
-export AR="gcc-ar"
-export NM="gcc-nm"
-export RANLIB="gcc-ranlib"
+echo "export CC=gcc" >> .mozconfig
+echo "export CXX=g++" >> .mozconfig
+echo "export AR=\"gcc-ar\"" >> .mozconfig
+echo "export NM=\"gcc-nm\"" >> .mozconfig
+echo "export RANLIB=\"gcc-ranlib\"" >> .mozconfig
 %endif
+
+%if 0%{?build_with_pgo}
+echo "ac_add_options MOZ_PGO=1" >> .mozconfig
+# PGO build doesn't work with ccache
 export CCACHE_DISABLE=1
+%endif
 
 %if %{?less_optbuild}
 MOZ_SMP_FLAGS=-j1
diff --git a/sources b/sources
index 5d7cfcf..daae311 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 662fbf92c54e9c044d639bf6b3243ffcfd73c737967517f66e41f193c798d475ad4526f53ebcf57587f10ba01e0ebd3b63bad2bd2942c728f2d77b03e83faaa8
-SHA512 (icecat-115.19.0-langpacks.tar.gz) = ca3d6446e4a140369cd788a3ab790f2084b297c62754118fd3714fb03fe54a62494c0d762c774087d74545b061922beef59414df3dec7ff9ff991ddefe68efec
-SHA512 (icecat-115.19.0-rh1.tar.bz2) = 43ef502eccd1c1777d860165681781eb0702f0a968a7701c6230c81930c80f972dc20cdce5b023b4caabe3f12b22095fac15d512ec430f3917ff4d5d299b4c07
+SHA512 (icecat-115.20.0-langpacks.tar.gz) = f1ebabced65506073ee2b886ac44df87455ed932f4a6321b09639945fade576196558a03c872cc74f1632456b8e1df5ffe6876cb790ee3cae2d2a13d24d02fee
+SHA512 (icecat-115.20.0-rh1.tar.bz2) = e8356dca1636975df9e91045b96add6b41f7596ac10a9ff3fab3de437c2937b18fa6a77459e07da58014aa2d313e144fde7a70bbd1bee00136f55238a4532438
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 153e450492df71f72c703b9e767bba6a8b2db230 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 7 Feb 2025 22:54:59 +0100
Subject: [PATCH 428/473] Fix clang build

---
 icecat.spec | 54 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 44d4fd7..93fdd3f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -89,7 +89,11 @@ ExcludeArch: %{ix86} %{arm}
 %global disable_elfhack 1
 
 # Use clang?
-%global build_with_clang  0
+%bcond_without toolchain_clang
+
+%if %{with toolchain_clang}
+%global toolchain clang
+%endif
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1908792
 # https://bugzilla.redhat.com/show_bug.cgi?id=2255254
@@ -98,7 +102,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.19.0
+Version: 115.20.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
@@ -260,18 +264,19 @@ BuildRequires: pulseaudio-libs-devel
 %endif
 BuildRequires: yasm
 BuildRequires: llvm
-BuildRequires: llvm-devel
-%if 0%{?build_with_clang}
+%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
 BuildRequires:  clang17
 BuildRequires:  clang17-libs
 BuildRequires:  llvm17-devel
-BuildRequires:  lld
 %global llvm_suffix -17
 %else
 BuildRequires:  clang
 BuildRequires:  clang-libs
 BuildRequires:  llvm-devel
 %endif
+%if "%toolchain" == "clang"
+BuildRequires:  lld
+%endif
 BuildRequires: rust
 BuildRequires: rustfmt
 %if 0%{?pgo_wayland}
@@ -387,11 +392,9 @@ tar -xf %{SOURCE5}
 
 # PGO patches
 %if 0%{?build_with_pgo}
-%if !%{build_with_clang}
 %patch -P 600 -p 1 -b .pgo
 %patch -P 602 -p 1 -b .1516803
 %endif
-%endif
 %patch -P 603 -p1 -b .inline
 
 # Remove default configuration and copy the customized one
@@ -473,11 +476,10 @@ echo "ac_add_options --disable-crashreporter" >> .mozconfig
 echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 %endif
 
-# Clang
-%if 0%{?build_with_clang}
-echo "ac_add_options --with-clang-path=`which clang%{?llvm_suffix}`" >> .mozconfig
-%endif
+%if "%toolchain" == "clang"
 echo "ac_add_options --with-libclang-path=`llvm-config%{?llvm_suffix} --libdir`" >> .mozconfig
+#echo "ac_add_options --with-clang-path=%%{_bindir}/clang%%{?llvm_suffix}" >> .mozconfig
+%endif
 
 %ifarch s390x
 echo "ac_add_options --disable-jit" >> .mozconfig
@@ -563,11 +565,12 @@ export MOZ_DEBUG_FLAGS=" "
 # We don't want firefox to use CK_GCM_PARAMS_V3 in nss
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -DNSS_PKCS11_3_0_STRICT"
 
-%if !0%{?build_with_clang}
+%if "%toolchain" != "clang"
 %ifarch s390x %{power64} %{arm64}
-MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--print-memory-usage"
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
 %endif
+
 %ifarch s390x
 export RUSTFLAGS="-Cdebuginfo=0"
 %endif
@@ -581,20 +584,25 @@ export LIBDIR='%{_libdir}'
 export PKG_CONFIG="`which pkg-config`"
 export PYTHON='%{__python3}'
 
-%if 0%{?build_with_clang}
-export LLVM_PROFDATA="llvm-profdata"
-export AR="llvm-ar"
-export NM="llvm-nm"
-export RANLIB="llvm-ranlib"
+%if "%toolchain" == "clang"
+echo "export LLVM_PROFDATA=\"llvm-profdata\"" >> .mozconfig
+echo "export AR=\"llvm-ar\"" >> .mozconfig
+echo "export NM=\"llvm-nm\"" >> .mozconfig
+echo "export RANLIB=\"llvm-ranlib\"" >> .mozconfig
 echo "ac_add_options --enable-linker=lld" >> .mozconfig
 %else
-export CC=gcc
-export CXX=g++
-export AR="gcc-ar"
-export NM="gcc-nm"
-export RANLIB="gcc-ranlib"
+echo "export CC=gcc" >> .mozconfig
+echo "export CXX=g++" >> .mozconfig
+echo "export AR=\"gcc-ar\"" >> .mozconfig
+echo "export NM=\"gcc-nm\"" >> .mozconfig
+echo "export RANLIB=\"gcc-ranlib\"" >> .mozconfig
 %endif
+
+%if 0%{?build_with_pgo}
+echo "ac_add_options MOZ_PGO=1" >> .mozconfig
+# PGO build doesn't work with ccache
 export CCACHE_DISABLE=1
+%endif
 
 %if %{?less_optbuild}
 MOZ_SMP_FLAGS=-j1

From 1eb82a11390063d4eca62fffacca39017892ab4d Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 7 Feb 2025 22:56:46 +0100
Subject: [PATCH 429/473] Release 115.20.0| Fix clang build

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 sources                 | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e08528..e84bce5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -268,3 +268,5 @@
 /icecat-115.18.0-rh2.tar.bz2
 /icecat-115.19.0-langpacks.tar.gz
 /icecat-115.19.0-rh1.tar.bz2
+/icecat-115.20.0-langpacks.tar.gz
+/icecat-115.20.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 20ee05b..9853483 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.19.0
+VERSION=115.20.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/sources b/sources
index 5d7cfcf..daae311 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 662fbf92c54e9c044d639bf6b3243ffcfd73c737967517f66e41f193c798d475ad4526f53ebcf57587f10ba01e0ebd3b63bad2bd2942c728f2d77b03e83faaa8
-SHA512 (icecat-115.19.0-langpacks.tar.gz) = ca3d6446e4a140369cd788a3ab790f2084b297c62754118fd3714fb03fe54a62494c0d762c774087d74545b061922beef59414df3dec7ff9ff991ddefe68efec
-SHA512 (icecat-115.19.0-rh1.tar.bz2) = 43ef502eccd1c1777d860165681781eb0702f0a968a7701c6230c81930c80f972dc20cdce5b023b4caabe3f12b22095fac15d512ec430f3917ff4d5d299b4c07
+SHA512 (icecat-115.20.0-langpacks.tar.gz) = f1ebabced65506073ee2b886ac44df87455ed932f4a6321b09639945fade576196558a03c872cc74f1632456b8e1df5ffe6876cb790ee3cae2d2a13d24d02fee
+SHA512 (icecat-115.20.0-rh1.tar.bz2) = e8356dca1636975df9e91045b96add6b41f7596ac10a9ff3fab3de437c2937b18fa6a77459e07da58014aa2d313e144fde7a70bbd1bee00136f55238a4532438
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From af5987fea71450e2af537272d9ad09352272abeb Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 8 Feb 2025 14:20:56 +0100
Subject: [PATCH 430/473] Set compilers

---
 icecat.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 93fdd3f..830c0fb 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -590,6 +590,8 @@ echo "export AR=\"llvm-ar\"" >> .mozconfig
 echo "export NM=\"llvm-nm\"" >> .mozconfig
 echo "export RANLIB=\"llvm-ranlib\"" >> .mozconfig
 echo "ac_add_options --enable-linker=lld" >> .mozconfig
+echo "export CC=clang%{?llvm_suffix}" >> .mozconfig
+echo "export CXX=clang++%{?llvm_suffix}" >> .mozconfig
 %else
 echo "export CC=gcc" >> .mozconfig
 echo "export CXX=g++" >> .mozconfig

From 825d8dec9725dbcd48a01601be026f7fca31d38b Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 4 Mar 2025 21:53:38 +0100
Subject: [PATCH 431/473] Release 115.21.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index e84bce5..abccc3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -270,3 +270,5 @@
 /icecat-115.19.0-rh1.tar.bz2
 /icecat-115.20.0-langpacks.tar.gz
 /icecat-115.20.0-rh1.tar.bz2
+/icecat-115.21.0-langpacks.tar.gz
+/icecat-115.21.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 9853483..d44357b 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.20.0
+VERSION=115.21.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 830c0fb..45bc454 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -102,7 +102,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.20.0
+Version: 115.21.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index daae311..57c7f26 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 662fbf92c54e9c044d639bf6b3243ffcfd73c737967517f66e41f193c798d475ad4526f53ebcf57587f10ba01e0ebd3b63bad2bd2942c728f2d77b03e83faaa8
-SHA512 (icecat-115.20.0-langpacks.tar.gz) = f1ebabced65506073ee2b886ac44df87455ed932f4a6321b09639945fade576196558a03c872cc74f1632456b8e1df5ffe6876cb790ee3cae2d2a13d24d02fee
-SHA512 (icecat-115.20.0-rh1.tar.bz2) = e8356dca1636975df9e91045b96add6b41f7596ac10a9ff3fab3de437c2937b18fa6a77459e07da58014aa2d313e144fde7a70bbd1bee00136f55238a4532438
+SHA512 (icecat-115.21.0-langpacks.tar.gz) = 1a82c2b6ecf650c1698f21022dec685aa65193f2fb67e399c201925e26531a895a95188ad607b4f9ad1a0dcd3633cf08c0f15219fc448a32b074417b7566ef03
+SHA512 (icecat-115.21.0-rh1.tar.bz2) = 07ab55b322397207164419480ec4812f77bb63021b3afb17fa98e800f7dc457f2a8b914e73b513b0436648f51404f56669d15bda0042bb65e41f1af457ac1565
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 3d7f8e2c514cb3549c4887fca801975e12971c09 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 4 Apr 2025 21:51:37 +0200
Subject: [PATCH 432/473] Release 115.22.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index abccc3b..39bc895 100644
--- a/.gitignore
+++ b/.gitignore
@@ -272,3 +272,5 @@
 /icecat-115.20.0-rh1.tar.bz2
 /icecat-115.21.0-langpacks.tar.gz
 /icecat-115.21.0-rh1.tar.bz2
+/icecat-115.22.0-langpacks.tar.gz
+/icecat-115.22.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index d44357b..f64b694 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.21.0
+VERSION=115.22.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 45bc454..cd5afdf 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -102,7 +102,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.21.0
+Version: 115.22.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index 57c7f26..6cce0e2 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 662fbf92c54e9c044d639bf6b3243ffcfd73c737967517f66e41f193c798d475ad4526f53ebcf57587f10ba01e0ebd3b63bad2bd2942c728f2d77b03e83faaa8
-SHA512 (icecat-115.21.0-langpacks.tar.gz) = 1a82c2b6ecf650c1698f21022dec685aa65193f2fb67e399c201925e26531a895a95188ad607b4f9ad1a0dcd3633cf08c0f15219fc448a32b074417b7566ef03
-SHA512 (icecat-115.21.0-rh1.tar.bz2) = 07ab55b322397207164419480ec4812f77bb63021b3afb17fa98e800f7dc457f2a8b914e73b513b0436648f51404f56669d15bda0042bb65e41f1af457ac1565
+SHA512 (icecat-115.22.0-langpacks.tar.gz) = 10c9e0cbc41e49d882cf0849941efd7f526d5b6f5c51c16ad26e66ed84f94862aeb2698e028905fe64b8777931dd4099f0d1a03216ab8e33b131f44ec0c65037
+SHA512 (icecat-115.22.0-rh1.tar.bz2) = 290366c86dff9733d4ab3deb150d9ac10e77c292a1fba242e4d7c91d3a8e74fce66cf00817e59733deb73b8decf88315364225762c366be71d0295325849c2b7
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From ce1f8ffead3a0ef4fae7614d444672771978d61b Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 20 Apr 2025 20:04:13 +0200
Subject: [PATCH 433/473] Upload regenerated built-in cbindgen

---
 icecat.spec | 2 +-
 sources     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index cd5afdf..eece565 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -9,7 +9,7 @@ ExcludeArch: %{ix86} %{arm}
 
 # Bundled cbindgen makes build slow.
 # Enable only if system cbindgen is not available.
-%global use_bundled_cbindgen  0
+%global use_bundled_cbindgen  1
 
 ####################
 
diff --git a/sources b/sources
index 6cce0e2..8224304 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = 662fbf92c54e9c044d639bf6b3243ffcfd73c737967517f66e41f193c798d475ad4526f53ebcf57587f10ba01e0ebd3b63bad2bd2942c728f2d77b03e83faaa8
+SHA512 (cbindgen-vendor.tar.xz) = 6d354d65674395b8171f262ae9aa08f656fdd83b6d29d70bd1ad2f13c4a52db81df780cfdf6ac86e9d1f16426c9ab3cdc0160f0785a0909ad7525fd8a9bc3b25
 SHA512 (icecat-115.22.0-langpacks.tar.gz) = 10c9e0cbc41e49d882cf0849941efd7f526d5b6f5c51c16ad26e66ed84f94862aeb2698e028905fe64b8777931dd4099f0d1a03216ab8e33b131f44ec0c65037
 SHA512 (icecat-115.22.0-rh1.tar.bz2) = 290366c86dff9733d4ab3deb150d9ac10e77c292a1fba242e4d7c91d3a8e74fce66cf00817e59733deb73b8decf88315364225762c366be71d0295325849c2b7
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From fb5b31aab67d9c717713a5a25969ad940360c2cf Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 6 May 2025 23:17:18 +0200
Subject: [PATCH 434/473] Release 115.23.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 39bc895..88bfe66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -274,3 +274,5 @@
 /icecat-115.21.0-rh1.tar.bz2
 /icecat-115.22.0-langpacks.tar.gz
 /icecat-115.22.0-rh1.tar.bz2
+/icecat-115.23.0-langpacks.tar.gz
+/icecat-115.23.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index f64b694..a2c61ec 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.22.0
+VERSION=115.23.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index eece565..19b2e38 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -102,7 +102,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.22.0
+Version: 115.23.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index 8224304..b03c490 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 6d354d65674395b8171f262ae9aa08f656fdd83b6d29d70bd1ad2f13c4a52db81df780cfdf6ac86e9d1f16426c9ab3cdc0160f0785a0909ad7525fd8a9bc3b25
-SHA512 (icecat-115.22.0-langpacks.tar.gz) = 10c9e0cbc41e49d882cf0849941efd7f526d5b6f5c51c16ad26e66ed84f94862aeb2698e028905fe64b8777931dd4099f0d1a03216ab8e33b131f44ec0c65037
-SHA512 (icecat-115.22.0-rh1.tar.bz2) = 290366c86dff9733d4ab3deb150d9ac10e77c292a1fba242e4d7c91d3a8e74fce66cf00817e59733deb73b8decf88315364225762c366be71d0295325849c2b7
+SHA512 (icecat-115.23.0-langpacks.tar.gz) = e457d3d040b0e121293d635fdd17e735183a170ba8d9359871ada492e87f0e82efecb2ba3323639fba0ccb4fb5f6e13fb9671e60a4921947378f03c4a4033a56
+SHA512 (icecat-115.23.0-rh1.tar.bz2) = a80c380f927e28f459a272aeca8b1ebe03847d517d8757f40f6f4c04ec2ea3c72262fc6b082cc6125f4fcf508d3d5305207afd17bceece5162dd01dccf00aa1d
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 8aad7d09048c7a582e2ef3ebc59fb7daa25c4e79 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 22 May 2025 22:05:07 +0200
Subject: [PATCH 435/473] Release 115.23.1

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 88bfe66..c40fe6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -276,3 +276,5 @@
 /icecat-115.22.0-rh1.tar.bz2
 /icecat-115.23.0-langpacks.tar.gz
 /icecat-115.23.0-rh1.tar.bz2
+/icecat-115.23.1-langpacks.tar.gz
+/icecat-115.23.1-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index a2c61ec..3b9da52 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.23.0
+VERSION=115.23.1
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 19b2e38..1bf8d5b 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -102,7 +102,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.23.0
+Version: 115.23.1
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index b03c490..9946222 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 6d354d65674395b8171f262ae9aa08f656fdd83b6d29d70bd1ad2f13c4a52db81df780cfdf6ac86e9d1f16426c9ab3cdc0160f0785a0909ad7525fd8a9bc3b25
-SHA512 (icecat-115.23.0-langpacks.tar.gz) = e457d3d040b0e121293d635fdd17e735183a170ba8d9359871ada492e87f0e82efecb2ba3323639fba0ccb4fb5f6e13fb9671e60a4921947378f03c4a4033a56
-SHA512 (icecat-115.23.0-rh1.tar.bz2) = a80c380f927e28f459a272aeca8b1ebe03847d517d8757f40f6f4c04ec2ea3c72262fc6b082cc6125f4fcf508d3d5305207afd17bceece5162dd01dccf00aa1d
+SHA512 (icecat-115.23.1-langpacks.tar.gz) = 4795b33c1d142866b42b38ab15e1f883fc98bba2871d98276c837da062fc9540785806c77f2a1b9b38db773b4e0ed96b5f7a3b716f7b1325915630023667d743
+SHA512 (icecat-115.23.1-rh1.tar.bz2) = 9732f3b925b7acc84339ee41014de92b0f34846dc279ba68f49347f3631fc391b44fc1f4263d356c9065a9a1f8a1a6de5a77a6b4cb388acbde85f84ca963e1f2
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From d0d7b964ddd40deff9aca5920f770e647ca759c7 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 31 May 2025 22:32:51 +0200
Subject: [PATCH 436/473] Release 115.24.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index c40fe6b..96fb26d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -278,3 +278,5 @@
 /icecat-115.23.0-rh1.tar.bz2
 /icecat-115.23.1-langpacks.tar.gz
 /icecat-115.23.1-rh1.tar.bz2
+/icecat-115.24.0-langpacks.tar.gz
+/icecat-115.24.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 3b9da52..1bce42c 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.23.1
+VERSION=115.24.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 1bf8d5b..f4c2135 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -102,7 +102,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   2
-Version: 115.23.1
+Version: 115.24.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index 9946222..2603140 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 6d354d65674395b8171f262ae9aa08f656fdd83b6d29d70bd1ad2f13c4a52db81df780cfdf6ac86e9d1f16426c9ab3cdc0160f0785a0909ad7525fd8a9bc3b25
-SHA512 (icecat-115.23.1-langpacks.tar.gz) = 4795b33c1d142866b42b38ab15e1f883fc98bba2871d98276c837da062fc9540785806c77f2a1b9b38db773b4e0ed96b5f7a3b716f7b1325915630023667d743
-SHA512 (icecat-115.23.1-rh1.tar.bz2) = 9732f3b925b7acc84339ee41014de92b0f34846dc279ba68f49347f3631fc391b44fc1f4263d356c9065a9a1f8a1a6de5a77a6b4cb388acbde85f84ca963e1f2
+SHA512 (icecat-115.24.0-langpacks.tar.gz) = f54612b6f39c72edb0fe874c1c290cea254661566e7062d220d396c7bb5f85c032effc0e7acb70b11e316ed782abda2e5686c666ce9d792c57330318a766d17a
+SHA512 (icecat-115.24.0-rh1.tar.bz2) = e4f89dda5b71de63632dc743582d31b0314a51edb3b21766cb8a16dfe44005a56a9b4be08c7d58f605f0ac3c9de9d65495dd079b2eeeb667ec4b65e009d16947
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From b3710024139a3ebb9f08ff9b398355097435044d Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 26 Jun 2025 00:06:00 +0200
Subject: [PATCH 437/473] Release 128.12.0

---
 .gitignore                          |   2 +
 build-aarch64-skia.patch            |  44 +++++++----
 build-disable-elfhack.patch         |  11 ---
 icecat-115.19.0-fix_mz1912663.patch |  82 --------------------
 icecat-fix_addon_installation.patch |  36 ---------
 icecat-lang_download.sh             |   2 +-
 icecat-pgo.patch                    | 115 ----------------------------
 icecat.spec                         |  33 +-------
 mozilla-1512162.patch               |  31 +-------
 mozilla-1516803.patch               |  15 ----
 mozilla-1669639.patch               |  15 ----
 rhbz-1219542-s390-build.patch       |  23 ------
 sources                             |   4 +-
 13 files changed, 42 insertions(+), 371 deletions(-)
 delete mode 100644 build-disable-elfhack.patch
 delete mode 100644 icecat-115.19.0-fix_mz1912663.patch
 delete mode 100644 icecat-fix_addon_installation.patch
 delete mode 100644 icecat-pgo.patch
 delete mode 100644 mozilla-1516803.patch
 delete mode 100644 mozilla-1669639.patch
 delete mode 100644 rhbz-1219542-s390-build.patch

diff --git a/.gitignore b/.gitignore
index 96fb26d..aefc450 100644
--- a/.gitignore
+++ b/.gitignore
@@ -280,3 +280,5 @@
 /icecat-115.23.1-rh1.tar.bz2
 /icecat-115.24.0-langpacks.tar.gz
 /icecat-115.24.0-rh1.tar.bz2
+/icecat-128.12.0-langpacks.tar.gz
+/icecat-128.12.0-rh1.tar.bz2
diff --git a/build-aarch64-skia.patch b/build-aarch64-skia.patch
index e669ba5..c6a9be6 100644
--- a/build-aarch64-skia.patch
+++ b/build-aarch64-skia.patch
@@ -1,22 +1,36 @@
---- a/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia	2023-06-02 03:15:22.000000000 +0200
-+++ b/gfx/skia/skia/modules/skcms/src/Transform_inl.h	2023-06-05 10:18:46.942777997 +0200
-@@ -189,8 +189,6 @@ SI F F_from_Half(U16 half) {
+diff -up firefox-128.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia firefox-128.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h
+--- firefox-128.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia	2024-07-02 11:10:25.047099913 +0200
++++ firefox-128.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h	2024-07-02 11:15:43.855410571 +0200
+@@ -151,7 +151,7 @@ SI U32 to_fixed(F f) {  return (U32)cast
+ 
+ 
+ SI F F_from_Half(U16 half) {
+-#if defined(USING_NEON_F16C)
++#if 0 // defined(USING_NEON_F16C)
+     return vcvt_f32_f16((float16x4_t)half);
+ #elif defined(USING_AVX512F)
+     return (F)_mm512_cvtph_ps((__m256i)half);
+@@ -178,7 +178,7 @@ SI F F_from_Half(U16 half) {
+     __attribute__((no_sanitize("unsigned-integer-overflow")))
+ #endif
  SI U16 Half_from_F(F f) {
- #if defined(USING_NEON_FP16)
-     return bit_pun<U16>(f);
--#elif defined(USING_NEON_F16C)
--    return (U16)vcvt_f16_f32(f);
+-#if defined(USING_NEON_F16C)
++#if 0 //defined(USING_NEON_F16C)
+     return (U16)vcvt_f16_f32(f);
  #elif defined(USING_AVX512F)
      return (U16)_mm512_cvtps_ph((__m512 )f, _MM_FROUND_CUR_DIRECTION );
- #elif defined(USING_AVX_F16C)
---- a/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia	2023-06-05 10:18:46.941777963 +0200
-+++ b/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2023-06-05 10:20:44.924843847 +0200
-@@ -1128,7 +1128,7 @@ SI F from_half(U16 h) {
+diff -up firefox-128.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia firefox-128.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
+--- firefox-128.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia	2024-07-02 11:10:25.048099949 +0200
++++ firefox-128.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2024-07-02 11:13:33.384783413 +0200
+@@ -1425,8 +1425,8 @@ SI F from_half(U16 h) {
  }
  
  SI U16 to_half(F f) {
--#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
-+#if 0 //defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
-     && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-     return sk_bit_cast<U16>(vcvt_f16_f32(f));
+-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64)
+-    return (U16)vcvt_f16_f32(f);
++#if 0 //defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64)
++    return (U16)vcvt_f16_f32(f);
  
+ #elif defined(JUMPER_IS_SKX)
+     return (U16)_mm512_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION);
+
diff --git a/build-disable-elfhack.patch b/build-disable-elfhack.patch
deleted file mode 100644
index 483d4c4..0000000
--- a/build-disable-elfhack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- firefox-115.0.2/toolkit/moz.configure.disable-elfhack	2023-07-18 12:21:22.507358334 +0200
-+++ firefox-115.0.2/toolkit/moz.configure	2023-07-18 12:52:55.972727498 +0200
-@@ -1520,7 +1520,7 @@ with only_when("--enable-compile-environ
-                     "Cannot enable elfhack with lld."
-                     " Use --enable-linker=bfd, --enable-linker=gold, or --disable-elf-hack"
-                 )
--            return True
-+            return False
- 
-         set_config("USE_ELF_HACK", use_elf_hack)
- 
diff --git a/icecat-115.19.0-fix_mz1912663.patch b/icecat-115.19.0-fix_mz1912663.patch
deleted file mode 100644
index 2168003..0000000
--- a/icecat-115.19.0-fix_mz1912663.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1723389149 0
-# Node ID 0e6f95e0b777abd64b1224c28ecd1beb614035cf
-# Parent  ac782ec8027890a85265514cef6b564f07b18a71
-Bug 1912663 - Fix some build issues with cbindgen 0.27. r=firefox-style-system-reviewers,zrhoffman a=pascalc
-
-It updates serde and syn and they are more strict. In particular, syn 2
-doesn't parse the rust 2015 syntax where try is not a keyword, and serde
-rejects duplicate keys.
-
-Differential Revision: https://phabricator.services.mozilla.com/D219025
-
-diff --git a/servo/components/style_traits/values.rs b/servo/components/style_traits/values.rs
---- a/servo/components/style_traits/values.rs
-+++ b/servo/components/style_traits/values.rs
-@@ -384,21 +384,21 @@ impl Separator for Space {
- 
-     fn parse<'i, 't, F, T, E>(
-         input: &mut Parser<'i, 't>,
-         mut parse_one: F,
-     ) -> Result<Vec<T>, ParseError<'i, E>>
-     where
-         F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
-     {
--        input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
-+        input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
-         let mut results = vec![parse_one(input)?];
-         loop {
--            input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
--            if let Ok(item) = input.try(&mut parse_one) {
-+            input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
-+            if let Ok(item) = input.try_parse(&mut parse_one) {
-                 results.push(item);
-             } else {
-                 return Ok(results);
-             }
-         }
-     }
- }
- 
-@@ -409,24 +409,24 @@ impl Separator for CommaWithSpace {
- 
-     fn parse<'i, 't, F, T, E>(
-         input: &mut Parser<'i, 't>,
-         mut parse_one: F,
-     ) -> Result<Vec<T>, ParseError<'i, E>>
-     where
-         F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>,
-     {
--        input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
-+        input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
-         let mut results = vec![parse_one(input)?];
-         loop {
--            input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
-+            input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
-             let comma_location = input.current_source_location();
--            let comma = input.try(|i| i.expect_comma()).is_ok();
--            input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less.
--            if let Ok(item) = input.try(&mut parse_one) {
-+            let comma = input.try_parse(|i| i.expect_comma()).is_ok();
-+            input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less.
-+            if let Ok(item) = input.try_parse(&mut parse_one) {
-                 results.push(item);
-             } else if comma {
-                 return Err(comma_location.new_unexpected_token_error(Token::Comma));
-             } else {
-                 break;
-             }
-         }
-         Ok(results)
-diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml
---- a/servo/ports/geckolib/cbindgen.toml
-+++ b/servo/ports/geckolib/cbindgen.toml
-@@ -318,7 +318,6 @@
- "Keyframe" = "Keyframe"
- "nsChangeHint" = "nsChangeHint"
- "ServoElementSnapshotTable" = "ServoElementSnapshotTable"
--"Keyframe" = "Keyframe"
- "ComputedKeyframeValues" = "ComputedKeyframeValues"
- "OriginFlags" = "OriginFlags"
- "ServoTraversalFlags" = "ServoTraversalFlags"
diff --git a/icecat-fix_addon_installation.patch b/icecat-fix_addon_installation.patch
deleted file mode 100644
index 5cc140d..0000000
--- a/icecat-fix_addon_installation.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-# Fixes installation of those addons which don't have ID on IceCat ("Cannot find id for addon" error).
---- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm
-+++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
-@@ -627,8 +627,30 @@
-         throw new Error(`Extension is signed with an invalid id (${addon.id})`);
-       }
-     }
--    if (!addon.id && aLocation.isTemporary) {
--      addon.id = generateTemporaryInstallID(aPackage.file);
-+    if (!addon.id) {
-+      if (aInstallLocation.name == KEY_APP_TEMPORARY) {
-+        addon.id = generateTemporaryInstallID(aZipReader.file);
-+      } else {
-+        try {
-+          let sigInput = aZipReader.getInputStream("META-INF/cose.sig");
-+          let sigBinary = Cc['@mozilla.org/binaryinputstream;1']
-+            .createInstance(Ci.nsIBinaryInputStream);
-+          sigBinary.setInputStream(sigInput);
-+          var sig = ''
-+          var sigCount;
-+          while ((sigCount = sigBinary.available()) > 0) {
-+            sig += sigBinary.readBytes(sigCount);
-+          }
-+          let sigMatch = sig.match(/\{\w{8}-\w{4}-\w{4}-\w{4}-\w{12}\}/g)
-+          if (sigMatch && sigMatch.length == 1) {
-+            addon.id = sigMatch[0]
-+          } else {
-+            logger.warn("Failed to find addon id");
-+          }
-+        } catch (e) {
-+          logger.warn("Failed to process META-INF/cose.sig");
-+        }
-+      }
-     }
-   }
- 
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 1bce42c..945dd4b 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=115.24.0
+VERSION=128.12.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat-pgo.patch b/icecat-pgo.patch
deleted file mode 100644
index 3b9fde4..0000000
--- a/icecat-pgo.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -up firefox-99.0/build/moz.configure/lto-pgo.configure.pgo firefox-99.0/build/moz.configure/lto-pgo.configure
---- firefox-99.0/build/moz.configure/lto-pgo.configure.pgo	2022-03-31 01:24:38.000000000 +0200
-+++ firefox-99.0/build/moz.configure/lto-pgo.configure	2022-04-04 10:15:45.387694143 +0200
-@@ -247,8 +247,8 @@ def lto(
-             cflags.append("-flto")
-             ldflags.append("-flto")
-         else:
--            cflags.append("-flto=thin")
--            ldflags.append("-flto=thin")
-+            cflags.append("-flto")
-+            ldflags.append("-flto")
- 
-         if target.os == "Android" and value == "cross":
-             # Work around https://github.com/rust-lang/rust/issues/90088
-@@ -264,7 +264,7 @@ def lto(
-         if value == "full":
-             cflags.append("-flto")
-         else:
--            cflags.append("-flto=thin")
-+            cflags.append("-flto")
-         # With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
-         # AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
-         cflags.append("-fuse-ld=lld")
-diff -up firefox-99.0/build/pgo/profileserver.py.pgo firefox-99.0/build/pgo/profileserver.py
---- firefox-99.0/build/pgo/profileserver.py.pgo	2022-03-31 01:24:38.000000000 +0200
-+++ firefox-99.0/build/pgo/profileserver.py	2022-04-04 10:15:45.387694143 +0200
-@@ -11,7 +11,7 @@
- import subprocess
- 
- import mozcrash
--from mozbuild.base import MozbuildObject, BinaryNotFoundException
-+from mozbuild.base import MozbuildObject, BinaryNotFoundException, BuildEnvironmentNotFoundException
- from mozfile import TemporaryDirectory
- from mozhttpd import MozHttpd
- from mozprofile import IceCatProfile, Preferences
-@@ -87,9 +87,22 @@
-     locations = ServerLocations()
-     locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged")
- 
--    old_profraw_files = glob.glob("*.profraw")
--    for f in old_profraw_files:
--        os.remove(f)
-+    using_gcc = False
-+    try:
-+        if build.config_environment.substs.get('CC_TYPE') == 'gcc':
-+            using_gcc = True
-+    except BuildEnvironmentNotFoundException:
-+        pass
-+
-+    if using_gcc:
-+        for dirpath, _, filenames in os.walk('.'):
-+            for f in filenames:
-+                if f.endswith('.gcda'):
-+                    os.remove(os.path.join(dirpath, f))
-+    else:
-+        old_profraw_files = glob.glob('*.profraw')
-+        for f in old_profraw_files:
-+            os.remove(f)
- 
-     with TemporaryDirectory() as profilePath:
-         # TODO: refactor this into mozprofile
-@@ -212,6 +225,9 @@
-         if get_crashreports(profilePath, name="IceCat exited successfully?") != 0:
-             print("IceCat exited successfully, but produced a crashreport")
-             sys.exit(1)
-+        print('Copying profile data....')
-+        os.system('pwd');
-+        os.system('tar cf profdata.tar.gz `find . -name "*.gcda"`; cd ..; tar xf instrumented/profdata.tar.gz;');
- 
-         llvm_profdata = env.get("LLVM_PROFDATA")
-         if llvm_profdata:
-diff -up firefox-99.0/build/unix/mozconfig.unix.pgo firefox-99.0/build/unix/mozconfig.unix
---- firefox-99.0/build/unix/mozconfig.unix.pgo	2022-03-31 01:24:38.000000000 +0200
-+++ firefox-99.0/build/unix/mozconfig.unix	2022-04-04 10:15:45.387694143 +0200
-@@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
-     CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
-     CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
- 
-+    if [ -n "$MOZ_PGO" ]; then
-+        if [ -z "$USE_ARTIFACT" ]; then
-+            ac_add_options --enable-lto
-+        fi
-+        export AR="$topsrcdir/gcc/bin/gcc-ar"
-+        export NM="$topsrcdir/gcc/bin/gcc-nm"
-+        export RANLIB="$topsrcdir/gcc/bin/gcc-ranlib"
-+    fi
-+
-     # We want to make sure we use binutils and other binaries in the tooltool
-     # package.
-     mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
-diff -up firefox-99.0/extensions/spellcheck/src/moz.build.pgo firefox-99.0/extensions/spellcheck/src/moz.build
---- firefox-99.0/extensions/spellcheck/src/moz.build.pgo	2022-03-31 01:24:50.000000000 +0200
-+++ firefox-99.0/extensions/spellcheck/src/moz.build	2022-04-04 10:15:45.387694143 +0200
-@@ -28,3 +28,5 @@ EXPORTS.mozilla += [
-     "mozInlineSpellChecker.h",
-     "mozSpellChecker.h",
- ]
-+
-+CXXFLAGS += ['-fno-devirtualize']
-diff -up firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-99.0/toolkit/components/terminator/nsTerminator.cpp
---- firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo	2022-04-04 10:15:45.387694143 +0200
-+++ firefox-99.0/toolkit/components/terminator/nsTerminator.cpp	2022-04-04 10:19:07.022239556 +0200
-@@ -466,6 +466,11 @@ void nsTerminator::StartWatchdog() {
-   }
- #endif
- 
-+  // Disable watchdog for PGO train builds - writting profile information at
-+  // exit may take time and it is better to make build hang rather than
-+  // silently produce poorly performing binary.
-+  crashAfterMS = INT32_MAX;
-+
-   UniquePtr<Options> options(new Options());
-   // crashAfterTicks is guaranteed to be > 0 as
-   // crashAfterMS >= ADDITIONAL_WAIT_BEFORE_CRASH_MS >> HEARTBEAT_INTERVAL_MS
-
diff --git a/icecat.spec b/icecat.spec
index f4c2135..65d55ad 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -86,8 +86,6 @@ ExcludeArch: %{ix86} %{arm}
 %global libvpx_version 1.8.2
 %endif
 
-%global disable_elfhack 1
-
 # Use clang?
 %bcond_without toolchain_clang
 
@@ -101,8 +99,8 @@ ExcludeArch: %{ix86} %{arm}
 %global __requires_exclude ^(%%(find %{buildroot}%{icecatappdir} -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -))
 
 Name:    icecat
-Epoch:   2
-Version: 115.24.0
+Epoch:   3
+Version: 128.12.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
@@ -144,9 +142,7 @@ Source19: run-wayland-compositor
 
 # Build patches
 # Fixes installation of those addons which don't have ID on IceCat ("Cannot find id for addon" error).
-Patch1: %{name}-fix_addon_installation.patch
 Patch2: %{name}-commasplit.patch
-Patch5: rhbz-1219542-s390-build.patch
 
 # With clang LLVM 16 rust-bindgen 0.56.0 is too old, combined
 # https://github.com/rust-lang/rust-bindgen/pull/2319
@@ -158,9 +154,7 @@ Patch7:  rust-bindgen-2319-2339.patch
 Patch8:  mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100.patch 
 
 Patch40: build-aarch64-skia.patch
-Patch41: build-disable-elfhack.patch
 Patch44: build-arm-libopus.patch
-Patch54: mozilla-1669639.patch
 
 # Fedora specific patches
 Patch219: rhbz-1173156.patch
@@ -179,7 +173,6 @@ Patch403: icecat-python3.11-open-U.patch
 Patch404: icecat-python3.11-regex-inline-flags.patch
 Patch412: mozilla-1337988.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
-Patch425: icecat-115.19.0-fix_mz1912663.patch
 # Patch for GCC-15
 Patch426: icecat-115.19.0-fix_mz1917964.patch
 
@@ -187,8 +180,6 @@ Patch426: icecat-115.19.0-fix_mz1917964.patch
 Patch423: mozilla-1512162.patch
 
 # PGO/LTO patches
-Patch600: %{name}-pgo.patch
-Patch602: mozilla-1516803.patch
 Patch603: %{name}-gcc-always-inline.patch
 
 BuildRequires: alsa-lib-devel
@@ -358,15 +349,7 @@ and translations langpack add-ons.
 # Copy license files
 tar -xf %{SOURCE5}
 
-%patch -P 1 -p 1 -b .fix_addon_installation
 %patch -P 2 -p 1 -b .commasplit
-%ifarch s390x
-%patch -P 5 -p 1 -b .rhbz-1219542-s390
-%endif
-
-%if 0%{?disable_elfhack}
-%patch -P 41 -p 1 -b .disable-elfhack
-%endif
 
 # Fedora patches
 %patch -P 219 -p 1 -b .rhbz-1173156
@@ -385,16 +368,7 @@ tar -xf %{SOURCE5}
 %ifarch %{power64}
 %patch -P 423 -p 1 -b .1512162
 %endif
-%patch -P 425 -p 1 -b .1912663
 %patch -P 426 -p 1 -b .1917964
-
-%patch -P 54 -p 1 -b .1669639
-
-# PGO patches
-%if 0%{?build_with_pgo}
-%patch -P 600 -p 1 -b .pgo
-%patch -P 602 -p 1 -b .1516803
-%endif
 %patch -P 603 -p1 -b .inline
 
 # Remove default configuration and copy the customized one
@@ -481,8 +455,9 @@ echo "ac_add_options --with-libclang-path=`llvm-config%{?llvm_suffix} --libdir`"
 #echo "ac_add_options --with-clang-path=%%{_bindir}/clang%%{?llvm_suffix}" >> .mozconfig
 %endif
 
-%ifarch s390x
+%ifarch s390x %{arm64}
 echo "ac_add_options --disable-jit" >> .mozconfig
+echo "ac_add_options --disable-elf-hack" >> .mozconfig
 %endif
 
 %if 0%{?build_with_pgo}
diff --git a/mozilla-1512162.patch b/mozilla-1512162.patch
index 99a0b14..02e9585 100644
--- a/mozilla-1512162.patch
+++ b/mozilla-1512162.patch
@@ -1,7 +1,6 @@
-diff -up firefox-68.0.1/js/xpconnect/src/XPCWrappedNative.cpp.1512162 firefox-68.0.1/js/xpconnect/src/XPCWrappedNative.cpp
---- firefox-68.0.1/js/xpconnect/src/XPCWrappedNative.cpp.1512162	2019-07-17 22:51:30.000000000 +0200
-+++ firefox-68.0.1/js/xpconnect/src/XPCWrappedNative.cpp	2019-07-25 08:08:18.512528313 +0200
-@@ -1092,7 +1092,7 @@ class MOZ_STACK_CLASS CallMethodHelper f
+--- a/js/xpconnect/src/XPCWrappedNative.cpp.1512162	2019-07-17 22:51:30.000000000 +0200
++++ b/js/xpconnect/src/XPCWrappedNative.cpp	2019-07-25 08:08:18.512528313 +0200
+@@ -1055,7 +1055,7 @@
    MOZ_ALWAYS_INLINE bool GetOutParamSource(uint8_t paramIndex,
                                             MutableHandleValue srcp) const;
  
@@ -10,7 +9,7 @@ diff -up firefox-68.0.1/js/xpconnect/src/XPCWrappedNative.cpp.1512162 firefox-68
  
    MOZ_ALWAYS_INLINE bool QueryInterfaceFastPath();
  
-@@ -1139,7 +1139,7 @@ class MOZ_STACK_CLASS CallMethodHelper f
+@@ -1102,7 +1102,7 @@
  
    ~CallMethodHelper();
  
@@ -19,25 +18,3 @@ diff -up firefox-68.0.1/js/xpconnect/src/XPCWrappedNative.cpp.1512162 firefox-68
  
    // Trace implementation so we can put our CallMethodHelper in a Rooted<T>.
    void trace(JSTracer* aTrc);
-@@ -1157,6 +1157,10 @@ bool XPCWrappedNative::CallMethod(XPCCal
-   return helper.get().Call();
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::Call() {
-   mCallContext.SetRetVal(JS::UndefinedValue());
- 
-@@ -1315,6 +1319,10 @@ bool CallMethodHelper::GetOutParamSource
-   return true;
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::GatherAndConvertResults() {
-   // now we iterate through the native params to gather and convert results
-   uint8_t paramCount = mMethodInfo->GetParamCount();
diff --git a/mozilla-1516803.patch b/mozilla-1516803.patch
deleted file mode 100644
index 6c4ff59..0000000
--- a/mozilla-1516803.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
---- a/security/sandbox/linux/moz.build
-+++ b/security/sandbox/linux/moz.build
-@@ -114,9 +114,8 @@
- # gcc lto likes to put the top level asm in syscall.cc in a different partition
- # from the function using it which breaks the build.  Work around that by
- # forcing there to be only one partition.
--for f in CONFIG["OS_CXXFLAGS"]:
--    if f.startswith("-flto") and CONFIG["CC_TYPE"] != "clang":
--        LDFLAGS += ["--param lto-partitions=1"]
-+if CONFIG['CC_TYPE'] != 'clang':
-+    LDFLAGS += ['--param', 'lto-partitions=1']
- 
- DEFINES["NS_NO_XPCOM"] = True
- DisableStlWrapping()
diff --git a/mozilla-1669639.patch b/mozilla-1669639.patch
deleted file mode 100644
index 3639133..0000000
--- a/mozilla-1669639.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- firefox-81.0.1/build/mach_initialize.py.old	2020-10-06 14:16:06.212974910 +0200
-+++ firefox-81.0.1/build/mach_initialize.py	2020-10-06 14:19:03.313179557 +0200
-@@ -507,7 +507,10 @@ class ImportHook(object):
-         # doesn't happen or because it doesn't matter).
-         if not os.path.exists(module.__file__[:-1]):
-             if os.path.exists(module.__file__):
--                os.remove(module.__file__)
-+                try:
-+                    os.remove(module.__file__)
-+                except:
-+                    pass
-             del sys.modules[module.__name__]
-             module = self(name, globals, locals, fromlist, level)
- 
-
diff --git a/rhbz-1219542-s390-build.patch b/rhbz-1219542-s390-build.patch
deleted file mode 100644
index f94e43a..0000000
--- a/rhbz-1219542-s390-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up firefox-55.0/js/src/old-configure.in.rhbz-1219542-s390 firefox-55.0/js/src/old-configure.in
---- firefox-55.0/js/src/old-configure.in.rhbz-1219542-s390	2017-07-31 18:20:48.000000000 +0200
-+++ firefox-55.0/js/src/old-configure.in	2017-08-02 14:31:32.190243669 +0200
-@@ -541,7 +541,7 @@ case "$host" in
- 
- *-linux*|*-kfreebsd*-gnu|*-gnu*)
-     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
--    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-+    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O1}"
-     ;;
- 
- *)
-@@ -617,8 +617,8 @@ case "$target" in
- 
- *-*linux*)
-     if test "$GNU_CC" -o "$GNU_CXX"; then
--        MOZ_PGO_OPTIMIZE_FLAGS="-O3"
--        MOZ_OPTIMIZE_FLAGS="-O3"
-+        MOZ_PGO_OPTIMIZE_FLAGS="-O1"
-+        MOZ_OPTIMIZE_FLAGS="-O1"
-         if test -z "$CLANG_CC"; then
-            MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS"
-         fi
diff --git a/sources b/sources
index 2603140..44be745 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 6d354d65674395b8171f262ae9aa08f656fdd83b6d29d70bd1ad2f13c4a52db81df780cfdf6ac86e9d1f16426c9ab3cdc0160f0785a0909ad7525fd8a9bc3b25
-SHA512 (icecat-115.24.0-langpacks.tar.gz) = f54612b6f39c72edb0fe874c1c290cea254661566e7062d220d396c7bb5f85c032effc0e7acb70b11e316ed782abda2e5686c666ce9d792c57330318a766d17a
-SHA512 (icecat-115.24.0-rh1.tar.bz2) = e4f89dda5b71de63632dc743582d31b0314a51edb3b21766cb8a16dfe44005a56a9b4be08c7d58f605f0ac3c9de9d65495dd079b2eeeb667ec4b65e009d16947
+SHA512 (icecat-128.12.0-langpacks.tar.gz) = c3caecad5756513409af6cd8426a1a0e6a05c6286756fd4350d5ca1fac9a110a8ea3bdac94451c2a5d1824ff5a73c3b54f3754c0ab19203aea22f7001ca46886
+SHA512 (icecat-128.12.0-rh1.tar.bz2) = d1d3724c706d81246d2a35834236a2eab75deb51434a215f07f24221f6b75369d7d702724d175420c74cefa23c0081a28421dcbe85ead489e5bffac28bf2314a
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 1d3f9fe61f5577d6e313eeb50c0c43c7aa5a131d Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 26 Jun 2025 16:53:04 +0200
Subject: [PATCH 438/473] Set CXXFLAGS without -fpermissive

---
 icecat.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 65d55ad..4f6e937 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -550,10 +550,13 @@ MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 export RUSTFLAGS="-Cdebuginfo=0"
 %endif
 
-export CFLAGS="$MOZ_OPT_FLAGS -std=gnu17"
-export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive -std=gnu++17"
-export LDFLAGS=$MOZ_LINK_FLAGS
+#  error "STL code can only be used with -fno-exceptions"
+CXXFLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-fexceptions/-fno-exceptions/')
+export CXXFLAGS="$CXXFLAGS"
+export CXXFLAGS="$CXXFLAGS -fpermissive -std=gnu++17"
 
+export CFLAGS="$MOZ_OPT_FLAGS -std=gnu17"
+export LDFLAGS=$MOZ_LINK_FLAGS
 export PREFIX='%{_prefix}'
 export LIBDIR='%{_libdir}'
 export PKG_CONFIG="`which pkg-config`"

From 4ce587552c2e8895c5b3933ef9fcce99f7be1676 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 26 Jun 2025 17:44:25 +0200
Subject: [PATCH 439/473] Remove old configuration option

---
 icecat.spec | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 4f6e937..4245c9d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -457,7 +457,6 @@ echo "ac_add_options --with-libclang-path=`llvm-config%{?llvm_suffix} --libdir`"
 
 %ifarch s390x %{arm64}
 echo "ac_add_options --disable-jit" >> .mozconfig
-echo "ac_add_options --disable-elf-hack" >> .mozconfig
 %endif
 
 %if 0%{?build_with_pgo}
@@ -723,9 +722,6 @@ ln -sf %{icecatappdir}/%{name}-bin ${RPM_BUILD_ROOT}%{icecatappdir}/%{name}
 rm -rf ${RPM_BUILD_ROOT}%{icecatappdir}/dictionaries
 ln -s %{_datadir}/hunspell ${RPM_BUILD_ROOT}%{icecatappdir}/dictionaries
 
-# Copy over run-icecat.sh
-cp -p build/unix/run-%{name}.sh %{buildroot}%{icecatappdir}/
-
 # Remove unused directories
 rm -rf %{buildroot}%{_libdir}/%{icecat_devel}
 rm -rf %{buildroot}%{_datadir}/idl/%{icecat_ver}
@@ -786,7 +782,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{icecatappdir}/*.so
 %{icecatappdir}/*.ini
 %{icecatappdir}/omni.ja
-%{icecatappdir}/run-icecat.sh
 %{icecatappdir}/dependentlibs.list
 %{icecatappdir}/plugin-container
 %{icecatappdir}/pingsender

From e5a96df9ac9e4756df732436f2fe5cba57958b08 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 26 Jun 2025 19:23:54 +0200
Subject: [PATCH 440/473] Remove directory

---
 icecat.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 4245c9d..544d495 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -783,7 +783,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{icecatappdir}/*.ini
 %{icecatappdir}/omni.ja
 %{icecatappdir}/dependentlibs.list
-%{icecatappdir}/plugin-container
 %{icecatappdir}/pingsender
 %{icecatappdir}/gmp-clearkey/
 

From 21b334e53d5822e38e658413e2682c0858bb72b7 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 26 Jun 2025 23:02:01 +0200
Subject: [PATCH 441/473] Fix Epoch

---
 icecat.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 544d495..6c3d12d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -303,8 +303,8 @@ Suggests: mozilla-ublock-origin
 Provides: webclient
 
 %if 0%{?fedora} >= 40
-Obsoletes:  icecat-wayland < 2:115.19.0-1
-Obsoletes:  icecat-x11 < 2:115.19.0-1
+Obsoletes:  icecat-wayland < 3:128.12.0-1
+Obsoletes:  icecat-x11 < 3:128.12.0-1
 %endif
 
 %description
@@ -335,7 +335,7 @@ Extensions included to this version of IceCat:
 %if %{with langpacks_subpkg}
 %package langpacks
 Summary: IceCat langpacks
-Requires: %{name} = 2:%{version}-%{release}
+Requires: %{name} = 3:%{version}-%{release}
 %description langpacks
 The icecat-langpacks package contains all the localization
 and translations langpack add-ons.

From ad3a48a2cd6a817a80244116f7fcd573cccac54f Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 27 Jun 2025 12:41:37 +0200
Subject: [PATCH 442/473] Add v4l2test file for ARM64 and RISC-V

---
 icecat.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 6c3d12d..5dd651b 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -785,6 +785,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{icecatappdir}/dependentlibs.list
 %{icecatappdir}/pingsender
 %{icecatappdir}/gmp-clearkey/
+%ifarch aarch64 riscv64
+%{icecatappdir}/v4l2test
+%endif
 
 %changelog
 %autochangelog

From ae640ad6619bd8ca8c7fdf1c2bebc96c4463d077 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 27 Jun 2025 13:38:59 +0200
Subject: [PATCH 443/473] Set linker flags

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 5dd651b..a043f65 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -555,7 +555,7 @@ export CXXFLAGS="$CXXFLAGS"
 export CXXFLAGS="$CXXFLAGS -fpermissive -std=gnu++17"
 
 export CFLAGS="$MOZ_OPT_FLAGS -std=gnu17"
-export LDFLAGS=$MOZ_LINK_FLAGS
+export LDFLAGS="%{__global_ldflags} $MOZ_LINK_FLAGS -L%{_libdir} -L%{icecatappdir}"
 export PREFIX='%{_prefix}'
 export LIBDIR='%{_libdir}'
 export PKG_CONFIG="`which pkg-config`"

From 7da8ecdbdf49ed8c5d906197f15d7f2b508bf5c9 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 27 Jun 2025 16:12:21 +0200
Subject: [PATCH 444/473] Fix launcher

---
 icecat.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.sh.in b/icecat.sh.in
index f74bd16..ef9c34d 100644
--- a/icecat.sh.in
+++ b/icecat.sh.in
@@ -64,7 +64,7 @@ MOZ_DIST_BIN="$MOZ_LIB_DIR/icecat"
 MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
 MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
 MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE"
-MOZ_LAUNCHER="$MOZ_DIST_BIN/run-icecat.sh"
+MOZ_LAUNCHER="$MOZ_DIST_BIN/icecat-bin"
 GETENFORCE_FILE="/usr/sbin/getenforce"
 
 ##

From b3959a29a60c3c9ddd6d06ceeb9eb0aeb71dd8c5 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 27 Jun 2025 21:10:31 +0200
Subject: [PATCH 445/473] Update launcher

---
 icecat.sh.in | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/icecat.sh.in b/icecat.sh.in
index ef9c34d..a269749 100644
--- a/icecat.sh.in
+++ b/icecat.sh.in
@@ -64,7 +64,7 @@ MOZ_DIST_BIN="$MOZ_LIB_DIR/icecat"
 MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
 MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
 MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE"
-MOZ_LAUNCHER="$MOZ_DIST_BIN/icecat-bin"
+MOZ_LAUNCHER="$MOZ_DIST_BIN/icecat"
 GETENFORCE_FILE="/usr/sbin/getenforce"
 
 ##
@@ -269,13 +269,11 @@ do
       ;;
   esac
 done
-
-# Run the browser
-debugging=0
-if [ $debugging = 1 ]
-then
-  echo $MOZ_LAUNCHER $script_args $MOZ_PROGRAM "$@"
-fi
+	
+## Allow downgrade because during distro upgrade the build time can be
+## older in newer version than the previous one.
+##
+export MOZ_ALLOW_DOWNGRADE=1
 
 
-exec $MOZ_LAUNCHER $script_args $MOZ_PROGRAM "$@"
+exec $MOZ_PROGRAM "$@"

From 4b1c39c5226da827afc8f830c749f18e8a866651 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 27 Jun 2025 21:18:30 +0200
Subject: [PATCH 446/473] Use system cbindgen

---
 icecat.spec | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index a043f65..66c60a8 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -9,7 +9,7 @@ ExcludeArch: %{ix86} %{arm}
 
 # Bundled cbindgen makes build slow.
 # Enable only if system cbindgen is not available.
-%global use_bundled_cbindgen  1
+%global use_bundled_cbindgen  0
 
 ####################
 
@@ -759,6 +759,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
 %if %{with langpacks_subpkg}
 %files
+%dir %{langpackdir}
 %else
 %files -f %{name}.lang
 %endif
@@ -769,9 +770,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*x*/apps/%{name}*.png
 %{_metainfodir}/*.appdata.xml
 %dir %{icecatappdir}
-%if %{with langpacks}
-%dir %{langpackdir}
-%endif
 %{icecatappdir}/glxtest
 %{icecatappdir}/vaapitest
 %{icecatappdir}/browser/
@@ -785,7 +783,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{icecatappdir}/dependentlibs.list
 %{icecatappdir}/pingsender
 %{icecatappdir}/gmp-clearkey/
-%ifarch aarch64 riscv64
+%ifarch %{arm64} riscv64
 %{icecatappdir}/v4l2test
 %endif
 

From b37045e88b41f7830b57229d49b77018139e5b9a Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 23 Jul 2025 17:00:39 +0200
Subject: [PATCH 447/473] Release 125.13.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index aefc450..71763df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -282,3 +282,5 @@
 /icecat-115.24.0-rh1.tar.bz2
 /icecat-128.12.0-langpacks.tar.gz
 /icecat-128.12.0-rh1.tar.bz2
+/icecat-128.13.0-langpacks.tar.gz
+/icecat-128.13.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 945dd4b..2ef85df 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=128.12.0
+VERSION=128.13.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 66c60a8..188fba3 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -100,7 +100,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   3
-Version: 128.12.0
+Version: 128.13.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index 44be745..ccec311 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 6d354d65674395b8171f262ae9aa08f656fdd83b6d29d70bd1ad2f13c4a52db81df780cfdf6ac86e9d1f16426c9ab3cdc0160f0785a0909ad7525fd8a9bc3b25
-SHA512 (icecat-128.12.0-langpacks.tar.gz) = c3caecad5756513409af6cd8426a1a0e6a05c6286756fd4350d5ca1fac9a110a8ea3bdac94451c2a5d1824ff5a73c3b54f3754c0ab19203aea22f7001ca46886
-SHA512 (icecat-128.12.0-rh1.tar.bz2) = d1d3724c706d81246d2a35834236a2eab75deb51434a215f07f24221f6b75369d7d702724d175420c74cefa23c0081a28421dcbe85ead489e5bffac28bf2314a
+SHA512 (icecat-128.13.0-langpacks.tar.gz) = b0d4ac1f6014f23d587e9168689b292c29139794bf5c9f24ef0ab296add4d3198403eddfd7c8c67ae493ce533e1294b3e74e977e418a3455510f6219e2391d87
+SHA512 (icecat-128.13.0-rh1.tar.bz2) = f16c8a329db890be32f8024a5852667500d8a2a8a8cedcbbb9e473c7a65f8ef90002210388ccb84716463d10e5f56048abdf27fb479d669b489be502cf4cadcf
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From e42fb72424b97a8b06f2f77be5656433f29a10b8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 17:32:58 +0000
Subject: [PATCH 448/473] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From b2f3ed3cfef6ead95efd86c8f4b7a21ca727b89e Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 20 Aug 2025 15:32:52 +0200
Subject: [PATCH 449/473] Release 128.14.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 71763df..c460c02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -284,3 +284,5 @@
 /icecat-128.12.0-rh1.tar.bz2
 /icecat-128.13.0-langpacks.tar.gz
 /icecat-128.13.0-rh1.tar.bz2
+/icecat-128.14.0-langpacks.tar.gz
+/icecat-128.14.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 2ef85df..539b540 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=128.13.0
+VERSION=128.14.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 188fba3..901524c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -100,7 +100,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   3
-Version: 128.13.0
+Version: 128.14.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index ccec311..509cd2e 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 6d354d65674395b8171f262ae9aa08f656fdd83b6d29d70bd1ad2f13c4a52db81df780cfdf6ac86e9d1f16426c9ab3cdc0160f0785a0909ad7525fd8a9bc3b25
-SHA512 (icecat-128.13.0-langpacks.tar.gz) = b0d4ac1f6014f23d587e9168689b292c29139794bf5c9f24ef0ab296add4d3198403eddfd7c8c67ae493ce533e1294b3e74e977e418a3455510f6219e2391d87
-SHA512 (icecat-128.13.0-rh1.tar.bz2) = f16c8a329db890be32f8024a5852667500d8a2a8a8cedcbbb9e473c7a65f8ef90002210388ccb84716463d10e5f56048abdf27fb479d669b489be502cf4cadcf
+SHA512 (icecat-128.14.0-langpacks.tar.gz) = 1b7276be14eb378c216b1c7f8ea4594ed0a5c3e4c765d5d41f2c223ce48c061d68d6066b6dd4892b0460b4ab4d1d732d47c3b4cafe311e9fb87bca41e9d65e84
+SHA512 (icecat-128.14.0-rh1.tar.bz2) = a5c0da970d0320bb49c1eba82140fba8dd46cac2ca8d78078517ae3b917ec90496d2ac9e5e1ec5db903834156e28a508f1593b0147dec5e54d7357ce8ead1c44
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 35e9900c2f10ee1fec2d309cb0a039adec181af1 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 20 Aug 2025 18:11:26 +0200
Subject: [PATCH 450/473] Exclude -mtls-dialect=gnu2 on x86_64

---
 icecat.spec | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 901524c..c62b233 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -536,6 +536,13 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/')
 export MOZ_DEBUG_FLAGS=" "
 %endif
 
+# -mtls-dialect=gnu2 is not recognized by clang-17
+%if "%toolchain" == "clang"
+%ifarch x86_64
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-mtls-dialect=gnu2//')
+%endif
+%endif
+
 # We don't want firefox to use CK_GCM_PARAMS_V3 in nss
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -DNSS_PKCS11_3_0_STRICT"
 

From 3e712e05b7e3ef8cae2290aeff403c71e02eda43 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Wed, 20 Aug 2025 22:50:53 +0200
Subject: [PATCH 451/473] Drop unused yasm build dependency

See https://fedoraproject.org/wiki/Changes/DeprecateYASM .
---
 icecat.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index c62b233..73d8f0f 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -253,7 +253,6 @@ BuildRequires: pkgconfig(libcurl)
 %if %{with pulseaudio}
 BuildRequires: pulseaudio-libs-devel
 %endif
-BuildRequires: yasm
 BuildRequires: llvm
 %if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
 BuildRequires:  clang17

From 043fa72cdd11ca5a437d98686922e2dd8ca86a12 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Fri, 19 Sep 2025 22:29:00 +0200
Subject: [PATCH 452/473] Release 140.3.0

---
 .gitignore                          |   2 +
 icecat-115.19.0-fix_mz1917964.patch | 392 ----------------------------
 icecat-commasplit.patch             |  76 ------
 icecat-lang_download.sh             |   2 +-
 icecat.spec                         |  40 +--
 mozilla-1196777.patch               |  14 -
 rhbz-1173156.patch                  |  12 -
 sources                             |   6 +-
 8 files changed, 16 insertions(+), 528 deletions(-)
 delete mode 100644 icecat-115.19.0-fix_mz1917964.patch
 delete mode 100644 icecat-commasplit.patch
 delete mode 100644 mozilla-1196777.patch
 delete mode 100644 rhbz-1173156.patch

diff --git a/.gitignore b/.gitignore
index c460c02..5e6f785 100644
--- a/.gitignore
+++ b/.gitignore
@@ -286,3 +286,5 @@
 /icecat-128.13.0-rh1.tar.bz2
 /icecat-128.14.0-langpacks.tar.gz
 /icecat-128.14.0-rh1.tar.bz2
+/icecat-140.3.0-langpacks.tar.gz
+/icecat-140.3.0-rh1.tar.bz2
diff --git a/icecat-115.19.0-fix_mz1917964.patch b/icecat-115.19.0-fix_mz1917964.patch
deleted file mode 100644
index 89fc16a..0000000
--- a/icecat-115.19.0-fix_mz1917964.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-
-# HG changeset patch
-# User Sam James <sam@cmpct.info>
-# Date 1726081531 0
-# Node ID 0249085453e0d5c8378a1a053b94753fd52c956c
-# Parent  3fca72d15659808d8f453b44a13320d4f6ceca86
-Bug 1917964 - Fix swgl build with GCC 15. r=gfx-reviewers,lsalzman
-
-Fix broken specialisations which are exposed by a recent change in GCC trunk.
-
-See https://gcc.gnu.org/PR116666.
-
-Differential Revision: https://phabricator.services.mozilla.com/D221744
-
-diff --git a/gfx/wr/swgl/src/vector_type.h b/gfx/wr/swgl/src/vector_type.h
---- a/gfx/wr/swgl/src/vector_type.h
-+++ b/gfx/wr/swgl/src/vector_type.h
-@@ -235,33 +235,33 @@ struct VectorType {
-     data /= x.data;
-     return *this;
-   }
-   VectorType& operator%=(int x) {
-     data %= x;
-     return *this;
-   }
- 
--  VectorType<mask_type, N> operator==(VectorType x) const {
--    return VectorType<mask_type, N>::wrap(data == x.data);
-+  VectorType<mask_index, N> operator==(VectorType x) const {
-+    return VectorType<mask_index, N>::wrap(data == x.data);
-   }
--  VectorType<mask_type, N> operator!=(VectorType x) const {
--    return VectorType<mask_type, N>::wrap(data != x.data);
-+  VectorType<mask_index, N> operator!=(VectorType x) const {
-+    return VectorType<mask_index, N>::wrap(data != x.data);
-   }
--  VectorType<mask_type, N> operator<(VectorType x) const {
--    return VectorType<mask_type, N>::wrap(data < x.data);
-+  VectorType<mask_index, N> operator<(VectorType x) const {
-+    return VectorType<mask_index, N>::wrap(data < x.data);
-   }
--  VectorType<mask_type, N> operator>(VectorType x) const {
--    return VectorType<mask_type, N>::wrap(data > x.data);
-+  VectorType<mask_index, N> operator>(VectorType x) const {
-+    return VectorType<mask_index, N>::wrap(data > x.data);
-   }
--  VectorType<mask_type, N> operator<=(VectorType x) const {
--    return VectorType<mask_type, N>::wrap(data <= x.data);
-+  VectorType<mask_index, N> operator<=(VectorType x) const {
-+    return VectorType<mask_index, N>::wrap(data <= x.data);
-   }
--  VectorType<mask_type, N> operator>=(VectorType x) const {
--    return VectorType<mask_type, N>::wrap(data >= x.data);
-+  VectorType<mask_index, N> operator>=(VectorType x) const {
-+    return VectorType<mask_index, N>::wrap(data >= x.data);
-   }
- 
-   VectorType operator!() const { return wrap(!data); }
-   VectorType operator&&(VectorType x) const { return wrap(data & x.data); }
-   VectorType operator||(VectorType x) const { return wrap(data | x.data); }
- 
-   VectorType& operator=(VectorType x) {
-     data = x.data;
-
-
-# HG changeset patch
-# User Lee Salzman <lsalzman@mozilla.com>
-# Date 1726239330 0
-# Node ID d36ca9941b2f90d910854e38293875e32c49796b
-# Parent  156543617de576c07a7914dd20d13692ddb0845a
-Bug 1917964 - Use __builtin_convertvector and __builtin_shufflevector on GCC when available. r=aosmond
-
-GCC upstream recommends we use __builtin_convertvector and __builtin_shufflevector instead of __builtin_shuffle
-for better code generation.
-
-See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116666#c7
-
-Differential Revision: https://phabricator.services.mozilla.com/D222067
-
-diff --git a/gfx/wr/swgl/src/vector_type.h b/gfx/wr/swgl/src/vector_type.h
---- a/gfx/wr/swgl/src/vector_type.h
-+++ b/gfx/wr/swgl/src/vector_type.h
-@@ -89,16 +89,25 @@ template <>
- struct VectorMask<uint8_t> {
-   typedef int8_t type;
- };
- template <>
- struct VectorMask<float> {
-   typedef int type;
- };
- 
-+#  ifdef __has_builtin
-+#    if __has_builtin(__builtin_convertvector)
-+#      define HAS_BUILTIN_CONVERTVECTOR
-+#    endif
-+#    if __has_builtin(__builtin_shufflevector)
-+#      define HAS_BUILTIN_SHUFFLEVECTOR
-+#    endif
-+#  endif
-+
- template <typename T, int N>
- struct VectorType {
-   enum { SIZE = N };
- 
-   typedef T data_type __attribute__((vector_size(sizeof(T) * N)));
-   typedef typename VectorMask<T>::type mask_index;
-   typedef mask_index mask_type
-       __attribute__((vector_size(sizeof(mask_index) * N)));
-@@ -131,16 +140,23 @@ struct VectorType {
-     VectorType v;
-     v.data = data;
-     return v;
-   }
- 
-   T& operator[](size_t i) { return elements[i]; }
-   T operator[](size_t i) const { return elements[i]; }
- 
-+#  ifdef HAS_BUILTIN_CONVERTVECTOR
-+  template <typename U, int M>
-+  operator VectorType<U, M>() const {
-+    return VectorType<U, M>::wrap(
-+        __builtin_convertvector(data, typename VectorType<U, M>::data_type));
-+  }
-+#  else
-   template <typename U>
-   operator VectorType<U, 2>() const {
-     return VectorType<U, 2>::wrap(
-         (typename VectorType<U, N>::data_type){U(x), U(y)});
-   }
-   template <typename U>
-   operator VectorType<U, 4>() const {
-     return VectorType<U, 4>::wrap(
-@@ -168,16 +184,17 @@ struct VectorType {
-         U(elements[10]),
-         U(elements[11]),
-         U(elements[12]),
-         U(elements[13]),
-         U(elements[14]),
-         U(elements[15]),
-     });
-   }
-+#  endif
- 
-   VectorType operator-() const { return wrap(-data); }
-   VectorType operator~() const { return wrap(~data); }
- 
-   VectorType operator&(VectorType x) const { return wrap(data & x.data); }
-   VectorType operator&(T x) const { return wrap(data & x); }
-   VectorType operator|(VectorType x) const { return wrap(data | x.data); }
-   VectorType operator|(T x) const { return wrap(data | x); }
-@@ -263,110 +280,107 @@ struct VectorType {
-   VectorType operator&&(VectorType x) const { return wrap(data & x.data); }
-   VectorType operator||(VectorType x) const { return wrap(data | x.data); }
- 
-   VectorType& operator=(VectorType x) {
-     data = x.data;
-     return *this;
-   }
- 
--  VectorType<T, 4> shuffle(VectorType b, mask_index x, mask_index y,
--                           mask_index z, mask_index w) const {
--    return VectorType<T, 4>::wrap(__builtin_shuffle(
--        data, b.data, (typename VectorType<T, 4>::mask_type){x, y, z, w}));
--  }
--  VectorType<T, 8> shuffle(VectorType b, mask_index x, mask_index y,
--                           mask_index z, mask_index w, mask_index s,
--                           mask_index t, mask_index u, mask_index v) const {
--    return VectorType<T, 8>::wrap(__builtin_shuffle(
--        data, b.data,
--        (typename VectorType<T, 8>::mask_type){x, y, z, w, s, t, u, v}));
--  }
--  VectorType<T, 16> shuffle(VectorType b, mask_index x, mask_index y,
--                            mask_index z, mask_index w, mask_index s,
--                            mask_index t, mask_index u, mask_index v,
--                            mask_index i, mask_index j, mask_index k,
--                            mask_index l, mask_index m, mask_index n,
--                            mask_index o, mask_index p) const {
--    return VectorType<T, 16>::wrap(
--        __builtin_shuffle(data, b.data,
--                          (typename VectorType<T, 16>::mask_type){
--                              x, y, z, w, s, t, u, v, i, j, k, l, m, n, o, p}));
--  }
--
--  VectorType<T, 4> swizzle(mask_index x, mask_index y, mask_index z,
--                           mask_index w) const {
--    return VectorType<T, 4>::wrap(__builtin_shuffle(
--        data, (typename VectorType<T, 4>::mask_type){x, y, z, w}));
--  }
--  VectorType<T, 8> swizzle(mask_index x, mask_index y, mask_index z,
--                           mask_index w, mask_index s, mask_index t,
--                           mask_index u, mask_index v) const {
--    return VectorType<T, 8>::wrap(__builtin_shuffle(
--        data, (typename VectorType<T, 8>::mask_type){x, y, z, w, s, t, u, v}));
--  }
--
-   SI VectorType wrap(half_type low, half_type high) {
-     VectorType v;
-     v.low_half = low;
-     v.high_half = high;
-     return v;
-   }
- 
-   VectorType<T, N * 2> combine(VectorType high) const {
-     return VectorType<T, N * 2>::wrap(data, high.data);
-   }
- 
--#  define xxxx swizzle(0, 0, 0, 0)
--#  define yyyy swizzle(1, 1, 1, 1)
--#  define zzzz swizzle(2, 2, 2, 2)
--#  define wwww swizzle(3, 3, 3, 3)
--#  define xxyy swizzle(0, 0, 1, 1)
--#  define xxzz swizzle(0, 0, 2, 2)
--#  define yyww swizzle(1, 1, 3, 3)
--#  define zzww swizzle(2, 2, 3, 3)
--#  define xyxy swizzle(0, 1, 0, 1)
--#  define xzxz swizzle(0, 2, 0, 2)
--#  define ywyw swizzle(1, 3, 1, 3)
--#  define zwzw swizzle(2, 3, 2, 3)
--#  define zwxy swizzle(2, 3, 0, 1)
--#  define zyxw swizzle(2, 1, 0, 3)
--#  define xxyz swizzle(0, 0, 1, 2)
--#  define xyyz swizzle(0, 1, 1, 2)
--#  define xyzz swizzle(0, 1, 2, 2)
--#  define xzyw swizzle(0, 2, 1, 3)
--#  define yzwx swizzle(1, 2, 3, 0)
--#  define wxyz swizzle(3, 0, 1, 2)
--#  define wzyx swizzle(3, 2, 1, 0)
--#  define xxxxyyyy XXXXYYYY()
--  VectorType<T, 8> XXXXYYYY() const {
--    return swizzle(0, 0, 0, 0).combine(swizzle(1, 1, 1, 1));
-+#  ifdef HAS_BUILTIN_SHUFFLEVECTOR
-+  template <mask_index... INDEXES, int M = sizeof...(INDEXES)>
-+  VectorType<T, M> shuffle(VectorType b) const {
-+    return VectorType<T, M>::wrap(
-+        __builtin_shufflevector(data, b.data, INDEXES...));
-+  }
-+
-+  template <mask_index... INDEXES, int M = sizeof...(INDEXES)>
-+  VectorType<T, M> swizzle() const {
-+    return VectorType<T, M>::wrap(
-+        __builtin_shufflevector(data, data, INDEXES...));
-+  }
-+#  else
-+  template <mask_index... INDEXES, int M = sizeof...(INDEXES)>
-+  VectorType<T, M> shuffle(VectorType<T, M> b) const {
-+    return VectorType<T, M>::wrap(__builtin_shuffle(
-+        data, b.data, (typename VectorType<T, M>::mask_type){INDEXES...}));
-+  }
-+
-+  template <mask_index A, mask_index B, mask_index C, mask_index D,
-+            mask_index E, mask_index F, mask_index G, mask_index H>
-+  VectorType<T, 8> shuffle(VectorType<T, 4> b) const {
-+    return shuffle<A, B, C, D>(b).combine(shuffle<E, F, G, H>(b));
-+  }
-+
-+  template <mask_index A, mask_index B, mask_index C, mask_index D,
-+            mask_index E, mask_index F, mask_index G, mask_index H,
-+            mask_index I, mask_index J, mask_index K, mask_index L,
-+            mask_index W, mask_index X, mask_index Y, mask_index Z>
-+  VectorType<T, 16> shuffle(VectorType<T, 4> b) const {
-+    return shuffle<A, B, C, D, E, F, G, H>(b).combine(
-+        shuffle<I, J, K, L, W, X, Y, Z>(b));
-   }
--#  define zzzzwwww ZZZZWWWW()
--  VectorType<T, 8> ZZZZWWWW() const {
--    return swizzle(2, 2, 2, 2).combine(swizzle(3, 3, 3, 3));
-+
-+  template <mask_index A, mask_index B, mask_index C, mask_index D,
-+            mask_index E, mask_index F, mask_index G, mask_index H,
-+            mask_index I, mask_index J, mask_index K, mask_index L,
-+            mask_index W, mask_index X, mask_index Y, mask_index Z>
-+  VectorType<T, 16> shuffle(VectorType<T, 8> b) const {
-+    return shuffle<A, B, C, D, E, F, G, H>(b).combine(
-+        shuffle<I, J, K, L, W, X, Y, Z>(b));
-   }
--#  define xyzwxyzw XYZWXYZW()
--  VectorType<T, 8> XYZWXYZW() const { return combine(*this); }
--#  define xyxyxyxy XYXYXYXY()
--  VectorType<T, 8> XYXYXYXY() const {
--    return swizzle(0, 1, 0, 1).combine(swizzle(0, 1, 0, 1));
-+
-+  template <mask_index... INDEXES, int M = sizeof...(INDEXES)>
-+  VectorType<T, M> swizzle() const {
-+    return shuffle<INDEXES...>(*this);
-   }
--#  define zwzwzwzw ZWZWZWZW()
--  VectorType<T, 8> ZWZWZWZW() const {
--    return swizzle(2, 3, 2, 3).combine(swizzle(2, 3, 2, 3));
--  }
--#  define xxyyzzww XXYYZZWW()
--  VectorType<T, 8> XXYYZZWW() const {
--    return swizzle(0, 0, 1, 1).combine(swizzle(2, 2, 3, 3));
--  }
--#  define xxxxyyyyzzzzwwww XXXXYYYYZZZZWWWW()
--  VectorType<T, 16> XXXXYYYYZZZZWWWW() {
--    return XXXXYYYY().combine(ZZZZWWWW());
--  }
-+#  endif
-+
-+#  define SWIZZLE(...) template swizzle<__VA_ARGS__>()
-+
-+#  define xxxx SWIZZLE(0, 0, 0, 0)
-+#  define yyyy SWIZZLE(1, 1, 1, 1)
-+#  define zzzz SWIZZLE(2, 2, 2, 2)
-+#  define wwww SWIZZLE(3, 3, 3, 3)
-+#  define xxyy SWIZZLE(0, 0, 1, 1)
-+#  define xxzz SWIZZLE(0, 0, 2, 2)
-+#  define yyww SWIZZLE(1, 1, 3, 3)
-+#  define zzww SWIZZLE(2, 2, 3, 3)
-+#  define xyxy SWIZZLE(0, 1, 0, 1)
-+#  define xzxz SWIZZLE(0, 2, 0, 2)
-+#  define ywyw SWIZZLE(1, 3, 1, 3)
-+#  define zwzw SWIZZLE(2, 3, 2, 3)
-+#  define zwxy SWIZZLE(2, 3, 0, 1)
-+#  define zyxw SWIZZLE(2, 1, 0, 3)
-+#  define xxyz SWIZZLE(0, 0, 1, 2)
-+#  define xyyz SWIZZLE(0, 1, 1, 2)
-+#  define xyzz SWIZZLE(0, 1, 2, 2)
-+#  define xzyw SWIZZLE(0, 2, 1, 3)
-+#  define yzwx SWIZZLE(1, 2, 3, 0)
-+#  define wxyz SWIZZLE(3, 0, 1, 2)
-+#  define wzyx SWIZZLE(3, 2, 1, 0)
-+#  define xxxxyyyy SWIZZLE(0, 0, 0, 0, 1, 1, 1, 1)
-+#  define zzzzwwww SWIZZLE(2, 2, 2, 2, 3, 3, 3, 3)
-+#  define xyzwxyzw SWIZZLE(0, 1, 2, 3, 0, 1, 2, 3)
-+#  define xyxyxyxy SWIZZLE(0, 1, 0, 1, 0, 1, 0, 1)
-+#  define zwzwzwzw SWIZZLE(2, 3, 2, 3, 2, 3, 2, 3)
-+#  define xxyyzzww SWIZZLE(0, 0, 1, 1, 2, 2, 3, 3)
-+#  define xxxxyyyyzzzzwwww \
-+    SWIZZLE(0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3)
- };
- 
- template <typename T>
- struct VectorType<T, 2> {
-   typedef T data_type __attribute__((vector_size(sizeof(T) * 2)));
-   union {
-     data_type data;
-     struct {
-@@ -383,17 +397,17 @@ struct VectorType<T, 2> {
- 
-   VectorType operator&(VectorType x) const { return wrap(data & x.data); }
-   VectorType operator&(T x) const { return wrap(data & x); }
-   VectorType operator|(VectorType x) const { return wrap(data | x.data); }
-   VectorType operator|(T x) const { return wrap(data | x); }
- };
- 
- #  define CONVERT(vector, type) ((type)(vector))
--#  define SHUFFLE(a, b, ...) a.shuffle(b, __VA_ARGS__)
-+#  define SHUFFLE(a, b, ...) ((a).template shuffle<__VA_ARGS__>(b))
- 
- template <typename T, int N>
- SI VectorType<T, N * 2> combine(VectorType<T, N> a, VectorType<T, N> b) {
-   return VectorType<T, N * 2>::wrap(a.data, b.data);
- }
- 
- template <typename T, int N>
- SI VectorType<T, N / 2> lowHalf(VectorType<T, N> a) {
-@@ -473,32 +487,25 @@ SI VectorType<T, 8> zip2Low(VectorType<T
-   return SHUFFLE(a, b, 0, 1, 8, 9, 2, 3, 10, 11);
- }
- 
- template <typename T>
- SI VectorType<T, 8> zip2High(VectorType<T, 8> a, VectorType<T, 8> b) {
-   return SHUFFLE(a, b, 4, 5, 12, 13, 6, 7, 14, 15);
- }
- 
--#ifdef __clang__
- template <typename T>
- SI VectorType<T, 8> zip(VectorType<T, 4> a, VectorType<T, 4> b) {
-   return SHUFFLE(a, b, 0, 4, 1, 5, 2, 6, 3, 7);
- }
- 
- template <typename T>
- SI VectorType<T, 16> zip(VectorType<T, 8> a, VectorType<T, 8> b) {
-   return SHUFFLE(a, b, 0, 8, 1, 9, 2, 10, 3, 11, 4, 12, 5, 13, 6, 14, 7, 15);
- }
--#else
--template <typename T, int N>
--SI VectorType<T, N * 2> zip(VectorType<T, N> a, VectorType<T, N> b) {
--  return combine(zipLow(a, b), zipHigh(a, b));
--}
--#endif
- 
- template <typename T>
- struct Unaligned {
-   template <typename P>
-   SI T load(const P* p) {
-     T v;
-     memcpy(&v, p, sizeof(v));
-     return v;
-
-
diff --git a/icecat-commasplit.patch b/icecat-commasplit.patch
deleted file mode 100644
index a56aec4..0000000
--- a/icecat-commasplit.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- firefox-111.0.1/build/moz.configure/rust.configure	2023-03-21 06:16:03.000000000 -0700
-+++ firefox-111.0.1/build/moz.configure/rust.configure.new	2023-04-05 08:57:29.403219120 -0700
-@@ -593,7 +593,7 @@
- 
- # ==============================================================
- 
--option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags")
-+option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags", comma_split=False)
- set_config("RUSTFLAGS", depends("RUSTFLAGS")(lambda flags: flags))
- 
- 
---- firefox-111.0.1/python/mozbuild/mozbuild/configure/options.py	2023-03-21 06:16:09.000000000 -0700
-+++ firefox-111.0.1/python/mozbuild/mozbuild/configure/options.py.new	2023-04-05 08:57:31.270193468 -0700
-@@ -191,6 +191,10 @@
-       to instantiate an option indirectly. Set this to a positive integer to
-       force the script to look into a deeper stack frame when inferring the
-       `category`.
-+    - `comma_split` specifies whether the value string should be split on
-+      commas. The default is True. Setting it False is necessary for things
-+      like compiler flags which should be a single string that may contain
-+      commas.
-     """
- 
-     __slots__ = (
-@@ -205,6 +209,7 @@
-         "possible_origins",
-         "category",
-         "define_depth",
-+        "comma_split",
-     )
- 
-     def __init__(
-@@ -218,6 +223,7 @@
-         category=None,
-         help=None,
-         define_depth=0,
-+        comma_split=True,
-     ):
-         if not name and not env:
-             raise InvalidOptionError(
-@@ -335,9 +341,10 @@
-         self.choices = choices
-         self.help = help
-         self.category = category or _infer_option_category(define_depth)
-+        self.comma_split = comma_split
- 
-     @staticmethod
--    def split_option(option):
-+    def split_option(option, comma_split=True):
-         """Split a flag or variable into a prefix, a name and values
- 
-         Variables come in the form NAME=values (no prefix).
-@@ -350,7 +357,13 @@
- 
-         elements = option.split("=", 1)
-         name = elements[0]
--        values = tuple(elements[1].split(",")) if len(elements) == 2 else ()
-+        if len(elements) == 2:
-+            if comma_split:
-+                values = tuple(elements[1].split(","))
-+            else:
-+                values = (elements[1],)
-+        else:
-+            values = ()
-         if name.startswith("--"):
-             name = name[2:]
-             if not name.islower():
-@@ -426,7 +439,7 @@
-                 % (option, origin, ", ".join(self.possible_origins))
-             )
- 
--        prefix, name, values = self.split_option(option)
-+        prefix, name, values = self.split_option(option, self.comma_split)
-         option = self._join_option(prefix, name)
- 
-         assert name in (self.name, self.env)
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 539b540..5444252 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=128.14.0
+VERSION=140.3.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 73d8f0f..2254983 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -99,8 +99,8 @@ ExcludeArch: %{ix86} %{arm}
 %global __requires_exclude ^(%%(find %{buildroot}%{icecatappdir} -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -))
 
 Name:    icecat
-Epoch:   3
-Version: 128.14.0
+Epoch:   4
+Version: 140.3.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
@@ -109,7 +109,7 @@ License: (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later) AND GPL-3.0-or-later
 URL:   http://www.gnu.org/software/gnuzilla/
 
 ## Source archive created by scripts based on Gnuzilla files.
-## Modified files are hosted in a dedicated fork repository:
+## All modified files are hosted in a dedicated fork repository:
 ## https://gitlab.com/anto.trande/icecat
 Source0: %{name}-%{version}-%{redhat_ver}.tar.bz2
 
@@ -140,10 +140,6 @@ Source18: node-stdout-nonblocking-wrapper
 
 Source19: run-wayland-compositor
 
-# Build patches
-# Fixes installation of those addons which don't have ID on IceCat ("Cannot find id for addon" error).
-Patch2: %{name}-commasplit.patch
-
 # With clang LLVM 16 rust-bindgen 0.56.0 is too old, combined
 # https://github.com/rust-lang/rust-bindgen/pull/2319
 # https://github.com/rust-lang/rust-bindgen/pull/2339
@@ -157,7 +153,6 @@ Patch40: build-aarch64-skia.patch
 Patch44: build-arm-libopus.patch
 
 # Fedora specific patches
-Patch219: rhbz-1173156.patch
 Patch220: firefox-nss-version.patch
 Patch221: firefox-nss-addon-hack.patch
 Patch223: %{name}-glibc-dynstack.patch
@@ -168,13 +163,10 @@ Patch226: rhbz-1354671.patch
 
 # Upstream patches
 Patch401: icecat-1742849.patch
-Patch402: mozilla-1196777.patch
 Patch403: icecat-python3.11-open-U.patch
 Patch404: icecat-python3.11-regex-inline-flags.patch
 Patch412: mozilla-1337988.patch
 Patch422: mozilla-1580174-webrtc-popup.patch
-# Patch for GCC-15
-Patch426: icecat-115.19.0-fix_mz1917964.patch
 
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
@@ -255,10 +247,10 @@ BuildRequires: pulseaudio-libs-devel
 %endif
 BuildRequires: llvm
 %if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
-BuildRequires:  clang17
-BuildRequires:  clang17-libs
-BuildRequires:  llvm17-devel
-%global llvm_suffix -17
+BuildRequires:  clang
+BuildRequires:  clang-libs
+BuildRequires:  llvm-devel
+%global llvm_suffix -20
 %else
 BuildRequires:  clang
 BuildRequires:  clang-libs
@@ -301,11 +293,6 @@ Requires: fedora-bookmarks
 Suggests: mozilla-ublock-origin
 Provides: webclient
 
-%if 0%{?fedora} >= 40
-Obsoletes:  icecat-wayland < 3:128.12.0-1
-Obsoletes:  icecat-x11 < 3:128.12.0-1
-%endif
-
 %description
 GNU IceCat is the GNU version of the Firefox ESR browser.
 Extensions included to this version of IceCat:
@@ -334,7 +321,7 @@ Extensions included to this version of IceCat:
 %if %{with langpacks_subpkg}
 %package langpacks
 Summary: IceCat langpacks
-Requires: %{name} = 3:%{version}-%{release}
+Requires: %{name} = 4:%{version}-%{release}
 %description langpacks
 The icecat-langpacks package contains all the localization
 and translations langpack add-ons.
@@ -348,10 +335,7 @@ and translations langpack add-ons.
 # Copy license files
 tar -xf %{SOURCE5}
 
-%patch -P 2 -p 1 -b .commasplit
-
 # Fedora patches
-%patch -P 219 -p 1 -b .rhbz-1173156
 %if 0%{?fedora}
 %patch -P 221 -p 1 -b .firefox-nss-addon-hack
 %endif
@@ -359,15 +343,12 @@ tar -xf %{SOURCE5}
 
 # ARM64
 %ifarch %{arm64}
-%patch -P 40 -p 1 -b .aarch64-skia
 %patch -P 226 -p 1 -b .1354671
 %endif
 
-%patch -P 402 -p 1 -b .1196777
 %ifarch %{power64}
 %patch -P 423 -p 1 -b .1512162
 %endif
-%patch -P 426 -p 1 -b .1917964
 %patch -P 603 -p1 -b .inline
 
 # Remove default configuration and copy the customized one
@@ -451,7 +432,6 @@ echo "ac_add_options --with-l10n-base=$PWD/l10n" >> .mozconfig
 
 %if "%toolchain" == "clang"
 echo "ac_add_options --with-libclang-path=`llvm-config%{?llvm_suffix} --libdir`" >> .mozconfig
-#echo "ac_add_options --with-clang-path=%%{_bindir}/clang%%{?llvm_suffix}" >> .mozconfig
 %endif
 
 %ifarch s390x %{arm64}
@@ -535,10 +515,10 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/')
 export MOZ_DEBUG_FLAGS=" "
 %endif
 
-# -mtls-dialect=gnu2 is not recognized by clang-17
+# -mtls-dialect=gnu2 is not recognized by clang-20
 %if "%toolchain" == "clang"
 %ifarch x86_64
-MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-mtls-dialect=gnu2//')
+#MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %%{__sed} -e 's/-mtls-dialect=gnu2//')
 %endif
 %endif
 
diff --git a/mozilla-1196777.patch b/mozilla-1196777.patch
deleted file mode 100644
index 3cc90e4..0000000
--- a/mozilla-1196777.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up firefox-100.0/widget/gtk/nsWindow.cpp.1196777 firefox-100.0/widget/gtk/nsWindow.cpp
---- firefox-100.0/widget/gtk/nsWindow.cpp.1196777	2022-05-02 11:29:06.763325015 +0200
-+++ firefox-100.0/widget/gtk/nsWindow.cpp	2022-05-02 11:30:49.100717334 +0200
-@@ -163,7 +163,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTUR
-                      GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
-                      GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
-                      GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SCROLL_MASK |
--                     GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
-+                     GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
-+                     GDK_FOCUS_CHANGE_MASK;
- 
- /* utility functions */
- static bool is_mouse_in_window(GdkWindow* aWindow, gdouble aMouseX,
-
diff --git a/rhbz-1173156.patch b/rhbz-1173156.patch
deleted file mode 100644
index 9750861..0000000
--- a/rhbz-1173156.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up a/extensions/auth/nsAuthSambaNTLM.cpp.old b/extensions/auth/nsAuthSambaNTLM.cpp
---- a/extensions/auth/nsAuthSambaNTLM.cpp.old	2014-11-25 12:23:22.000000000 +0100
-+++ b/extensions/auth/nsAuthSambaNTLM.cpp	2014-12-23 15:26:36.606674625 +0100
-@@ -161,7 +161,7 @@
-   const char* username = PR_GetEnv("USER");
-   if (!username) return NS_ERROR_FAILURE;
- 
--  const char* const args[] = {"ntlm_auth",
-+  const char* const args[] = {"/usr/bin/ntlm_auth",
-                               "--helper-protocol",
-                               "ntlmssp-client-1",
-                               "--use-cached-creds",
diff --git a/sources b/sources
index 509cd2e..fe5892b 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (cbindgen-vendor.tar.xz) = 6d354d65674395b8171f262ae9aa08f656fdd83b6d29d70bd1ad2f13c4a52db81df780cfdf6ac86e9d1f16426c9ab3cdc0160f0785a0909ad7525fd8a9bc3b25
-SHA512 (icecat-128.14.0-langpacks.tar.gz) = 1b7276be14eb378c216b1c7f8ea4594ed0a5c3e4c765d5d41f2c223ce48c061d68d6066b6dd4892b0460b4ab4d1d732d47c3b4cafe311e9fb87bca41e9d65e84
-SHA512 (icecat-128.14.0-rh1.tar.bz2) = a5c0da970d0320bb49c1eba82140fba8dd46cac2ca8d78078517ae3b917ec90496d2ac9e5e1ec5db903834156e28a508f1593b0147dec5e54d7357ce8ead1c44
+SHA512 (cbindgen-vendor.tar.xz) = 31f55007d57ae62905c9b1efec89e86a9aa949ffe9983c6fa437cbe98e64b99c96cfecbdebe961e04310ea8a5600df703be5aa7f774e123575212eefe35cd595
+SHA512 (icecat-140.3.0-langpacks.tar.gz) = ee1f36e6adf38a98e6ac48f9db5603860cfc5e0a610b98fba7683d70c26474f64f78951df8dc2434362d46e297143f17791ca42180a85ce99d1ab96cf17ebdcf
+SHA512 (icecat-140.3.0-rh1.tar.bz2) = 4580dc49248292b8d1e3e9daea3feccf9042aa9184465e9ca40cfeeb1f63745dfa5b0dc32dd47a4b5a5eee66a28eb19e2d5c8e98f7d61c433bf1eb7e05cf1f31
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 6d1f9dcda7a126907521e3db4ee60923b0b59398 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 20 Sep 2025 12:47:24 +0200
Subject: [PATCH 453/473] Reload and use bundled cbindgen

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 2254983..2864e7d 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -9,7 +9,7 @@ ExcludeArch: %{ix86} %{arm}
 
 # Bundled cbindgen makes build slow.
 # Enable only if system cbindgen is not available.
-%global use_bundled_cbindgen  0
+%global use_bundled_cbindgen  1
 
 ####################
 

From c66c28f8d66633c5790360f2c86406cdaa8b1cd0 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 20 Sep 2025 12:51:27 +0200
Subject: [PATCH 454/473] Upload bundled cbindgen

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index fe5892b..037d664 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = 31f55007d57ae62905c9b1efec89e86a9aa949ffe9983c6fa437cbe98e64b99c96cfecbdebe961e04310ea8a5600df703be5aa7f774e123575212eefe35cd595
+SHA512 (cbindgen-vendor.tar.xz) = 647dcadf3507bd05262613d03ff18a8c876bcbb4e83ce59f911128ae020ac16695298987c6c14f8b7a7aee5bb096740c6885c0a854d8b26431fc9a8ff864c369
 SHA512 (icecat-140.3.0-langpacks.tar.gz) = ee1f36e6adf38a98e6ac48f9db5603860cfc5e0a610b98fba7683d70c26474f64f78951df8dc2434362d46e297143f17791ca42180a85ce99d1ab96cf17ebdcf
 SHA512 (icecat-140.3.0-rh1.tar.bz2) = 4580dc49248292b8d1e3e9daea3feccf9042aa9184465e9ca40cfeeb1f63745dfa5b0dc32dd47a4b5a5eee66a28eb19e2d5c8e98f7d61c433bf1eb7e05cf1f31
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c

From 31e9323f9e4a751385d523bad62f0f4b4c8ba69d Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 20 Sep 2025 16:02:19 +0200
Subject: [PATCH 455/473] Remove old patches| Remove --frozen Cargo flag

---
 build-aarch64-skia.patch                      |  36 --
 build-arm-libopus.patch                       |  12 -
 firefox-nss-version.patch                     |  12 -
 icecat-140.3.0-remove_frozen_cargo_flag.patch |  11 +
 icecat-1742849.patch                          | 425 ---------------
 icecat-glibc-dynstack.patch                   |  62 ---
 icecat-python3.11-open-U.patch                |  93 ----
 icecat-python3.11-regex-inline-flags.patch    |  27 -
 icecat.spec                                   |  25 +-
 mozilla-1337988.patch                         | 496 ------------------
 mozilla-1580174-webrtc-popup.patch            |  51 --
 ...652d38e007e736bb442ccd5aa5ed699db100.patch |  25 -
 rust-bindgen-2319-2339.patch                  | 154 ------
 13 files changed, 15 insertions(+), 1414 deletions(-)
 delete mode 100644 build-aarch64-skia.patch
 delete mode 100644 build-arm-libopus.patch
 delete mode 100644 firefox-nss-version.patch
 create mode 100644 icecat-140.3.0-remove_frozen_cargo_flag.patch
 delete mode 100644 icecat-1742849.patch
 delete mode 100644 icecat-glibc-dynstack.patch
 delete mode 100644 icecat-python3.11-open-U.patch
 delete mode 100644 icecat-python3.11-regex-inline-flags.patch
 delete mode 100644 mozilla-1337988.patch
 delete mode 100644 mozilla-1580174-webrtc-popup.patch
 delete mode 100644 mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100.patch
 delete mode 100644 rust-bindgen-2319-2339.patch

diff --git a/build-aarch64-skia.patch b/build-aarch64-skia.patch
deleted file mode 100644
index c6a9be6..0000000
--- a/build-aarch64-skia.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up firefox-128.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia firefox-128.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h
---- firefox-128.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia	2024-07-02 11:10:25.047099913 +0200
-+++ firefox-128.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h	2024-07-02 11:15:43.855410571 +0200
-@@ -151,7 +151,7 @@ SI U32 to_fixed(F f) {  return (U32)cast
- 
- 
- SI F F_from_Half(U16 half) {
--#if defined(USING_NEON_F16C)
-+#if 0 // defined(USING_NEON_F16C)
-     return vcvt_f32_f16((float16x4_t)half);
- #elif defined(USING_AVX512F)
-     return (F)_mm512_cvtph_ps((__m256i)half);
-@@ -178,7 +178,7 @@ SI F F_from_Half(U16 half) {
-     __attribute__((no_sanitize("unsigned-integer-overflow")))
- #endif
- SI U16 Half_from_F(F f) {
--#if defined(USING_NEON_F16C)
-+#if 0 //defined(USING_NEON_F16C)
-     return (U16)vcvt_f16_f32(f);
- #elif defined(USING_AVX512F)
-     return (U16)_mm512_cvtps_ph((__m512 )f, _MM_FROUND_CUR_DIRECTION );
-diff -up firefox-128.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia firefox-128.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
---- firefox-128.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia	2024-07-02 11:10:25.048099949 +0200
-+++ firefox-128.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2024-07-02 11:13:33.384783413 +0200
-@@ -1425,8 +1425,8 @@ SI F from_half(U16 h) {
- }
- 
- SI U16 to_half(F f) {
--#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64)
--    return (U16)vcvt_f16_f32(f);
-+#if 0 //defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64)
-+    return (U16)vcvt_f16_f32(f);
- 
- #elif defined(JUMPER_IS_SKX)
-     return (U16)_mm512_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION);
-
diff --git a/build-arm-libopus.patch b/build-arm-libopus.patch
deleted file mode 100644
index 1b3f31b..0000000
--- a/build-arm-libopus.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-66.0/media/libopus/silk/arm/arm_silk_map.c.old firefox-66.0/media/libopus/silk/arm/arm_silk_map.c
---- firefox-66.0/media/libopus/silk/arm/arm_silk_map.c.old	2019-03-12 21:07:35.356677522 +0100
-+++ firefox-66.0/media/libopus/silk/arm/arm_silk_map.c	2019-03-12 21:07:42.937693394 +0100
-@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
- # include "config.h"
- #endif
- 
--#include "main_FIX.h"
-+#include "fixed/main_FIX.h"
- #include "NSQ.h"
- #include "SigProc_FIX.h"
- 
diff --git a/firefox-nss-version.patch b/firefox-nss-version.patch
deleted file mode 100644
index fee93bb..0000000
--- a/firefox-nss-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-78.0/toolkit/moz.configure.nss-version firefox-78.0/toolkit/moz.configure
---- firefox-78.0/toolkit/moz.configure.nss-version	2020-06-30 08:47:09.657501414 +0200
-+++ firefox-78.0/toolkit/moz.configure	2020-06-30 08:47:12.652510169 +0200
-@@ -2089,7 +2089,7 @@ option('--with-system-nss', help='Use sy
- 
- imply_option('--with-system-nspr', True, when='--with-system-nss')
- 
--nss_pkg = pkg_check_modules('NSS', 'nss >= 3.53.1', when='--with-system-nss', config=False)
-+nss_pkg = pkg_check_modules('NSS', 'nss >= 3.53.0', when='--with-system-nss', config=False)
- 
- set_config('MOZ_SYSTEM_NSS', True, when='--with-system-nss')
- 
diff --git a/icecat-140.3.0-remove_frozen_cargo_flag.patch b/icecat-140.3.0-remove_frozen_cargo_flag.patch
new file mode 100644
index 0000000..5ba729e
--- /dev/null
+++ b/icecat-140.3.0-remove_frozen_cargo_flag.patch
@@ -0,0 +1,11 @@
+--- a/build/RunCbindgen.orig.py	2025-09-19 17:30:54.000000000 +0200
++++ b/build/RunCbindgen.py	2025-09-20 15:53:53.173474575 +0200
+@@ -54,8 +54,6 @@
+     # tree, so we want to let Cargo create lock files in this case. When built
+     # within a tree, the Rust dependencies have been vendored in so Cargo won't
+     # touch the lock file.
+-    if not buildconfig.substs.get("JS_STANDALONE"):
+-        args.append("--frozen")
+ 
+     stdout, returncode = _run_process(args)
+ 
diff --git a/icecat-1742849.patch b/icecat-1742849.patch
deleted file mode 100644
index be05497..0000000
--- a/icecat-1742849.patch
+++ /dev/null
@@ -1,425 +0,0 @@
-
-# HG changeset patch
-# User Alexandre Lissy <lissyx+mozillians@lissyx.dyndns.org>
-# Date 1639046833 0
-# Node ID 33f81fb07d792be30dcd1008b21b187ca24f21e6
-# Parent  3382e4da79289240c4c2fe718b461f7a58bce553
-Bug 1742849 - Parsing CCache 4.4+ stats output r=mhentges
-
-Statistics output changed after 4.4 and requires different parsing, as
-well as an extra --verbose to get the same informations as before.
-
-See https://github.com/ccache/ccache/commit/8892814e8a790d615e44262c0005513d6d49f9e1
-
-Differential Revision: https://phabricator.services.mozilla.com/D133086
-
-diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
---- a/python/mozbuild/mozbuild/controller/building.py
-+++ b/python/mozbuild/mozbuild/controller/building.py
-@@ -5,16 +5,17 @@
- from __future__ import absolute_import, print_function, unicode_literals
- 
- import errno
- import getpass
- import io
- import json
- import logging
- import os
-+import re
- import shutil
- import six
- import subprocess
- import sys
- import time
- 
- from collections import (
-     Counter,
-@@ -583,21 +584,24 @@ class BuildMonitor(MozbuildObject):
-                 "Swap in/out (MB): {sin}/{sout}",
-             )
- 
-     def ccache_stats(self):
-         ccache_stats = None
- 
-         ccache = mozfile.which("ccache")
-         if ccache:
-+            # With CCache v4.4+ statistics might require --verbose
-+            is_version_4_4_or_newer = CCacheStats.check_version_4_4_or_newer(ccache)
-             try:
-                 output = subprocess.check_output(
--                    [ccache, "-s"], universal_newlines=True
-+                    [ccache, "-s" if not is_version_4_4_or_newer else "-sv"],
-+                    universal_newlines=True,
-                 )
--                ccache_stats = CCacheStats(output)
-+                ccache_stats = CCacheStats(output, is_version_4_4_or_newer)
-             except ValueError as e:
-                 self.log(logging.WARNING, "ccache", {"msg": str(e)}, "{msg}")
-         return ccache_stats
- 
- 
- class TerminalLoggingHandler(logging.Handler):
-     """Custom logging handler that works with terminal window dressing.
- 
-@@ -883,33 +887,154 @@ class CCacheStats(object):
-         ("cache_files", "files in cache"),
-         ("cache_size", "cache size"),
-         ("cache_max_size", "max cache size"),
-     ]
- 
-     DIRECTORY_DESCRIPTION = "cache directory"
-     PRIMARY_CONFIG_DESCRIPTION = "primary config"
-     SECONDARY_CONFIG_DESCRIPTION = "secondary config"
-+
-+    STATS_KEYS_4_4 = [
-+        ("stats_updated", "Summary/Stats updated"),
-+        (
-+            "cache_hit_rate",
-+            "Summary/Hits",
-+            lambda x: next(iter(re.findall(r"\((.*) %\)", x)), "0.00 %"),
-+        ),
-+        (
-+            "cache_hit_direct",
-+            "Summary/Hits/Direct",
-+            lambda x: next(iter(re.findall(r"(\d+)\s+/\s+\d+\s+\(", x)), "0"),
-+        ),
-+        (
-+            "cache_hit_preprocessed",
-+            "Summary/Hits/Preprocessed",
-+            lambda x: next(iter(re.findall(r"(\d+)\s+/\s+\d+\s+\(", x)), "0"),
-+        ),
-+        ("cache_miss", "Summary/Misses"),
-+        ("error", "Summary/Errors"),
-+        ("linking", "Uncacheable/Called for linking"),
-+        ("preprocessing", "Uncacheable/Called for preprocessing"),
-+        ("failed", "Uncacheable/Compilation failed"),
-+        ("preprocessor_error", "Uncacheable/Preprocessing failed"),
-+        ("cache_file_missing", "Errors/Missing cache file"),
-+        ("bad_args", "Uncacheable/Bad compiler arguments"),
-+        ("autoconf", "Uncacheable/Autoconf compile/link"),
-+        ("no_input", "Uncacheable/No input file"),
-+        ("num_cleanups", "Primary storage/Cleanups"),
-+        ("cache_files", "Primary storage/Files"),
-+        # Cache size is reported in GB, see
-+        # https://github.com/ccache/ccache/commit/8892814e8a790d615e44262c0005513d6d49f9e1#diff-30ec2bbfafe4c3842c8e35179ef0d3253a66dcc054812e50049d0ca3b10e317fR274
-+        (
-+            "cache_size",
-+            "Primary storage/Cache size (GB)",
-+            lambda x: str(
-+                float(next(iter(re.findall(r"(.*)\s+/\s+.*\s+\(", x)), "0"))
-+                * CCacheStats.GiB
-+            ),
-+            True,  # Allow to continue evaluation for the next value
-+        ),
-+        (
-+            "cache_max_size",
-+            "Primary storage/Cache size (GB)",
-+            lambda x: str(
-+                float(next(iter(re.findall(r".*\s+/\s+(.*)\s+\(", x)), "0"))
-+                * CCacheStats.GiB
-+            ),
-+        ),
-+    ]
-+
-+    SKIP_KEYS_4_4 = [
-+        "Summary/Uncacheable",
-+        "Summary/Misses/Direct",
-+        "Summary/Misses/Preprocessed",
-+        "Primary storage/Hits",
-+        "Primary storage/Misses",
-+    ]
-+
-+    DIRECTORY_DESCRIPTION_4_4 = "Summary/Cache directory"
-+    PRIMARY_CONFIG_DESCRIPTION_4_4 = "Summary/Primary config"
-+    SECONDARY_CONFIG_DESCRIPTION_4_4 = "Summary/Secondary config"
-+
-     ABSOLUTE_KEYS = {"cache_files", "cache_size", "cache_max_size"}
-     FORMAT_KEYS = {"cache_size", "cache_max_size"}
- 
-     GiB = 1024 ** 3
-     MiB = 1024 ** 2
-     KiB = 1024
- 
--    def __init__(self, output=None):
-+    def __init__(self, output=None, is_version_4_4_or_newer=False):
-         """Construct an instance from the output of ccache -s."""
-         self._values = {}
-         self.cache_dir = ""
-         self.primary_config = ""
-         self.secondary_config = ""
- 
-         if not output:
-             return
- 
-+        if is_version_4_4_or_newer:
-+            self._parse_human_format_4_4_plus(output)
-+        else:
-+            self._parse_human_format(output)
-+
-+    def _parse_human_format_4_4_plus(self, content):
-+        head = ""
-+        subhead = ""
-+
-+        for line in content.splitlines():
-+            name = ""
-+            if not line:
-+                continue
-+            if line.startswith("  "):
-+                if not line.startswith("    "):
-+                    subhead = line.strip().split(":")[0]
-+                name = line.strip().split(":")[0]
-+                raw_value = ":".join(line.split(":")[1:]).strip()
-+                if raw_value:
-+                    key = head
-+                    if subhead != name:
-+                        key += "/{}".format(subhead)
-+                    key += "/{}".format(name)
-+                    self._parse_line_4_4_plus(key, raw_value)
-+            else:
-+                head = line.strip(":")
-+                subhead = ""
-+
-+    def _parse_line_4_4_plus(self, key, value):
-+        if key.startswith(self.DIRECTORY_DESCRIPTION_4_4):
-+            self.cache_dir = value
-+        elif key.startswith(self.PRIMARY_CONFIG_DESCRIPTION_4_4):
-+            self.primary_config = value
-+        elif key.startswith(self.SECONDARY_CONFIG_DESCRIPTION_4_4):
-+            self.secondary_config = value
-+        else:
-+            for seq in self.STATS_KEYS_4_4:
-+                stat_key = seq[0]
-+                stat_description = seq[1]
-+                raw_value = value
-+                if len(seq) > 2:
-+                    raw_value = seq[2](value)
-+                if stat_key not in self._values and key == stat_description:
-+                    self._values[stat_key] = self._parse_value(raw_value)
-+
-+                    # We dont want to break when we need to extract two infos
-+                    # from the same line
-+                    if len(seq) < 4:
-+                        break
-+            else:
-+                if key not in self.SKIP_KEYS_4_4:
-+                    raise ValueError(
-+                        "Failed to parse ccache stats output: '{}' '{}'".format(
-+                            key, value
-+                        )
-+                    )
-+
-+    def _parse_human_format(self, output):
-         for line in output.splitlines():
-             line = line.strip()
-             if line:
-                 self._parse_line(line)
- 
-     def _parse_line(self, line):
-         line = six.ensure_text(line)
-         if line.startswith(self.DIRECTORY_DESCRIPTION):
-@@ -1050,6 +1175,29 @@
-         else:
-             return "%.1f Kbytes" % (float(v) / CCacheStats.KiB)
- 
-+    @staticmethod
-+    def check_version_4_4_or_newer(ccache):
-+        output_version = subprocess.check_output(
-+            [ccache, "--version"], universal_newlines=True
-+        )
-+        return CCacheStats._is_version_4_4_or_newer(output_version)
-+
-+    @staticmethod
-+    def _is_version_4_4_or_newer(output):
-+        if "ccache version" not in output:
-+            return False
-+
-+        major = 0
-+        minor = 0
-+
-+        for line in output.splitlines():
-+            version = re.search(r"ccache version (\d+).(\d+).*", line)
-+            if version:
-+                major = int(version.group(1))
-+                minor = int(version.group(2))
-+                break
-+
-+        return ((major << 8) + minor) >= ((4 << 8) + 4)
- 
- class BuildDriver(MozbuildObject):
-     """Provides a high-level API for build actions."""
-diff --git a/python/mozbuild/mozbuild/test/controller/test_ccachestats.py b/python/mozbuild/mozbuild/test/controller/test_ccachestats.py
---- a/python/mozbuild/mozbuild/test/controller/test_ccachestats.py
-+++ b/python/mozbuild/mozbuild/test/controller/test_ccachestats.py
-@@ -223,16 +223,143 @@ class TestCcacheStats(unittest.TestCase)
-     cleanups performed                  3154
-     files in cache                     18525
-     cache size                          13.4 GB
-     max cache size                      15.0 GB
-     """.format(
-         timestamp=time.strftime("%c"), timestamp2=time.strftime("%c")
-     )
- 
-+    VERSION_3_5_GIT = """
-+    ccache version 3.5.1+2_gf5309092_dirty
-+
-+    Copyright (C) 2002-2007 Andrew Tridgell
-+    Copyright (C) 2009-2019 Joel Rosdahl
-+
-+    This program is free software; you can redistribute it and/or modify it under
-+    the terms of the GNU General Public License as published by the Free Software
-+    Foundation; either version 3 of the License, or (at your option) any later
-+    version.
-+    """
-+
-+    VERSION_4_2 = """
-+    ccache version 4.2.1
-+
-+    Copyright (C) 2002-2007 Andrew Tridgell
-+    Copyright (C) 2009-2021 Joel Rosdahl and other contributors
-+
-+    See <https://ccache.dev/credits.html> for a complete list of contributors.
-+
-+    This program is free software; you can redistribute it and/or modify it under
-+    the terms of the GNU General Public License as published by the Free Software
-+    Foundation; either version 3 of the License, or (at your option) any later
-+    version.
-+    """
-+
-+    VERSION_4_4 = """
-+    ccache version 4.4
-+    Features: file-storage http-storage
-+
-+    Copyright (C) 2002-2007 Andrew Tridgell
-+    Copyright (C) 2009-2021 Joel Rosdahl and other contributors
-+
-+    See <https://ccache.dev/credits.html> for a complete list of contributors.
-+
-+    This program is free software; you can redistribute it and/or modify it under
-+    the terms of the GNU General Public License as published by the Free Software
-+    Foundation; either version 3 of the License, or (at your option) any later
-+    version.
-+    """
-+
-+    VERSION_4_4_2 = """
-+    ccache version 4.4.2
-+    Features: file-storage http-storage
-+
-+    Copyright (C) 2002-2007 Andrew Tridgell
-+    Copyright (C) 2009-2021 Joel Rosdahl and other contributors
-+
-+    See <https://ccache.dev/credits.html> for a complete list of contributors.
-+
-+    This program is free software; you can redistribute it and/or modify it under
-+    the terms of the GNU General Public License as published by the Free Software
-+    Foundation; either version 3 of the License, or (at your option) any later
-+    version.
-+    """
-+
-+    VERSION_4_5 = """
-+    ccache version 4.5.1
-+    Features: file-storage http-storage redis-storage
-+
-+    Copyright (C) 2002-2007 Andrew Tridgell
-+    Copyright (C) 2009-2021 Joel Rosdahl and other contributors
-+
-+    See <https://ccache.dev/credits.html> for a complete list of contributors.
-+
-+    This program is free software; you can redistribute it and/or modify it under
-+    the terms of the GNU General Public License as published by the Free Software
-+    Foundation; either version 3 of the License, or (at your option) any later
-+    version.
-+    """
-+
-+    STAT10 = """
-+Summary:
-+  Cache directory:          /home/suer/.ccache
-+  Primary config:           /home/suer/.ccache/ccache.conf
-+  Secondary config:         /etc/ccache.conf
-+  Stats updated:            {timestamp}
-+  Hits:                      916 / 9343 (9.80 %)
-+    Direct:                  197 /  197 (100.0 %)
-+    Preprocessed:            719 /  719 (100.0 %)
-+  Misses:                   8427
-+    Direct:                    0
-+    Preprocessed:              0
-+  Errors:                      1
-+  Uncacheable:              1251
-+Primary storage:
-+  Hits:                        0 /    0
-+  Misses:                      0
-+  Cache size (GB):          4.41 / 5.00 (88.27 %)
-+  Files:                    4425
-+  Cleanups:                  161
-+Errors:
-+  Missing cache file:          1
-+Uncacheable:
-+  Autoconf compile/link:     418
-+  Bad compiler arguments:      6
-+  Called for linking:        569
-+  Called for preprocessing:  110
-+  Compilation failed:         49
-+  No input file:               9
-+  Preprocessing failed:       90
-+    """.format(
-+        timestamp=time.strftime("%c")
-+    )
-+
-+    STAT11 = """
-+Summary:
-+  Cache directory:  /home/suer/.ccache
-+  Primary config:   /home/suer/.ccache/ccache.conf
-+  Secondary config: /etc/ccache.conf
-+  Stats updated:    {timestamp}
-+  Hits:                0 /    0
-+    Direct:            0 /    0
-+    Preprocessed:      0 /    0
-+  Misses:              0
-+    Direct:            0
-+    Preprocessed:      0
-+Primary storage:
-+  Hits:                0 /    0
-+  Misses:              0
-+  Cache size (GB):  0.00 / 5.00 (0.00 %)
-+  Files:               0
-+  Cleanups:           16
-+    """.format(
-+        timestamp=time.strftime("%c")
-+    )
-+
-     def test_parse_garbage_stats_message(self):
-         self.assertRaises(ValueError, CCacheStats, self.STAT_GARBAGE)
- 
-     def test_parse_zero_stats_message(self):
-         stats = CCacheStats(self.STAT0)
-         self.assertEqual(stats.cache_dir, "/home/tlin/.ccache")
-         self.assertEqual(stats.hit_rates(), (0, 0, 0))
- 
-@@ -290,11 +417,26 @@ class TestCcacheStats(unittest.TestCase)
-         stat8 = CCacheStats(self.STAT8)
-         self.assertTrue(stat8)
- 
-     def test_stats_version35(self):
-         # Test parsing 3.5 output.
-         stat9 = CCacheStats(self.STAT9)
-         self.assertTrue(stat9)
- 
-+    def test_stats_version44(self):
-+        # verify version checks
-+        self.assertFalse(CCacheStats._is_version_4_4_or_newer(self.VERSION_3_5_GIT))
-+        self.assertFalse(CCacheStats._is_version_4_4_or_newer(self.VERSION_4_2))
-+        self.assertTrue(CCacheStats._is_version_4_4_or_newer(self.VERSION_4_4))
-+        self.assertTrue(CCacheStats._is_version_4_4_or_newer(self.VERSION_4_4_2))
-+        self.assertTrue(CCacheStats._is_version_4_4_or_newer(self.VERSION_4_5))
-+
-+        # Test parsing 4.4+ output.
-+        stat10 = CCacheStats(self.STAT10, True)
-+        self.assertTrue(stat10)
-+
-+        stat11 = CCacheStats(self.STAT11, True)
-+        self.assertTrue(stat11)
-+
- 
- if __name__ == "__main__":
-     main()
-
-
diff --git a/icecat-glibc-dynstack.patch b/icecat-glibc-dynstack.patch
deleted file mode 100644
index 74878b5..0000000
--- a/icecat-glibc-dynstack.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ur a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp
---- a/js/xpconnect/src/XPCJSContext.cpp	2021-07-05 21:16:02.000000000 +0200
-+++ b/js/xpconnect/src/XPCJSContext.cpp	2021-07-19 15:01:24.083460460 +0200
-@@ -81,14 +81,6 @@
- using namespace JS;
- using mozilla::dom::AutoEntryScript;
- 
--// The watchdog thread loop is pretty trivial, and should not require much stack
--// space to do its job. So only give it 32KiB or the platform minimum.
--#if !defined(PTHREAD_STACK_MIN)
--#  define PTHREAD_STACK_MIN 0
--#endif
--static constexpr size_t kWatchdogStackSize =
--    PTHREAD_STACK_MIN < 32 * 1024 ? 32 * 1024 : PTHREAD_STACK_MIN;
--
- static void WatchdogMain(void* arg);
- class Watchdog;
- class WatchdogManager;
-@@ -161,7 +153,7 @@
-       // watchdog, we need to join it on shutdown.
-       mThread = PR_CreateThread(PR_USER_THREAD, WatchdogMain, this,
-                                 PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
--                                PR_JOINABLE_THREAD, kWatchdogStackSize);
-+                                PR_JOINABLE_THREAD, 0);
-       if (!mThread) {
-         MOZ_CRASH("PR_CreateThread failed!");
-       }
-diff -ur a/security/sandbox/linux/launch/SandboxLaunch.cpp b/security/sandbox/linux/launch/SandboxLaunch.cpp
---- a/security/sandbox/linux/launch/SandboxLaunch.cpp	2021-07-05 18:20:36.000000000 +0200
-+++ b/security/sandbox/linux/launch/SandboxLaunch.cpp	2021-07-20 08:39:17.272136982 +0200
-@@ -489,7 +489,8 @@ static int CloneCallee(void* aPtr) {
- // we don't currently support sandboxing under valgrind.
- MOZ_NEVER_INLINE MOZ_ASAN_BLACKLIST static pid_t DoClone(int aFlags,
-                                                          jmp_buf* aCtx) {
--  uint8_t miniStack[PTHREAD_STACK_MIN];
-+  static constexpr size_t kStackAlignment = 16;
-+  uint8_t miniStack[4096] __attribute__((aligned(kStackAlignment)));
- #ifdef __hppa__
-   void* stackPtr = miniStack;
- #else
-@@ -510,13 +511,19 @@ static pid_t ForkWithFlags(int aFlags) {
-                                CLONE_CHILD_CLEARTID;
-   MOZ_RELEASE_ASSERT((aFlags & kBadFlags) == 0);
- 
-+  // Block signals due to small stack in DoClone.
-+  sigset_t oldSigs;
-+  BlockAllSignals(&oldSigs);
-+
-+  int ret = 0;
-   jmp_buf ctx;
-   if (setjmp(ctx) == 0) {
-     // In the parent and just called setjmp:
--    return DoClone(aFlags | SIGCHLD, &ctx);
-+    ret = DoClone(aFlags | SIGCHLD, &ctx);
-   }
-+  RestoreSignals(&oldSigs);
-   // In the child and have longjmp'ed:
--  return 0;
-+  return ret;
- }
- 
- static bool WriteStringToFile(const char* aPath, const char* aStr,
diff --git a/icecat-python3.11-open-U.patch b/icecat-python3.11-open-U.patch
deleted file mode 100644
index 5490515..0000000
--- a/icecat-python3.11-open-U.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- a/dom/base/usecounters.py.python-open-U	2022-06-28 04:37:00.000000000 +0200
-+++ b/dom/base/usecounters.py	2022-07-11 19:17:46.266517761 +0200
-@@ -8,7 +8,7 @@ import re
- 
- def read_conf(conf_filename):
-     # Can't read/write from a single StringIO, so make a new one for reading.
--    stream = open(conf_filename, "rU")
-+    stream = open(conf_filename, "r")
- 
-     def parse_counters(stream):
-         for line_num, line in enumerate(stream):
---- a/python/mozbuild/mozbuild/action/process_define_files.py.python-open-U	2022-06-28 04:37:39.000000000 +0200
-+++ b/python/mozbuild/mozbuild/action/process_define_files.py	2022-07-11 19:18:24.056417112 +0200
-@@ -36,7 +36,7 @@ def process_define_file(output, input):
-     ) and not config.substs.get("JS_STANDALONE"):
-         config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
- 
--    with open(path, "rU") as input:
-+    with open(path, "r") as input:
-         r = re.compile(
-             "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
-         )
---- a/python/mozbuild/mozbuild/backend/base.py.python-open-U	2022-06-28 04:37:39.000000000 +0200
-+++ b/python/mozbuild/mozbuild/backend/base.py	2022-07-11 19:18:34.165390187 +0200
-@@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin):
-         return status
- 
-     @contextmanager
--    def _write_file(self, path=None, fh=None, readmode="rU"):
-+    def _write_file(self, path=None, fh=None, readmode="r"):
-         """Context manager to write a file.
- 
-         This is a glorified wrapper around FileAvoidWrite with integration to
---- a/python/mozbuild/mozbuild/preprocessor.py.python-open-U	2022-06-28 04:37:20.000000000 +0200
-+++ b/python/mozbuild/mozbuild/preprocessor.py	2022-07-11 19:19:30.677239685 +0200
-@@ -531,7 +531,7 @@ class Preprocessor:
- 
-         if args:
-             for f in args:
--                with io.open(f, "rU", encoding="utf-8") as input:
-+                with io.open(f, "r", encoding="utf-8") as input:
-                     self.processFile(input=input, output=out)
-             if depfile:
-                 mk = Makefile()
-@@ -860,7 +860,7 @@ class Preprocessor:
-                     args = self.applyFilters(args)
-                 if not os.path.isabs(args):
-                     args = os.path.join(self.curdir, args)
--                args = io.open(args, "rU", encoding="utf-8")
-+                args = io.open(args, "r", encoding="utf-8")
-             except Preprocessor.Error:
-                 raise
-             except Exception:
-@@ -914,7 +914,7 @@ class Preprocessor:
- def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
-     pp = Preprocessor(defines=defines, marker=marker)
-     for f in includes:
--        with io.open(f, "rU", encoding="utf-8") as input:
-+        with io.open(f, "r", encoding="utf-8") as input:
-             pp.processFile(input=input, output=output)
-     return pp.includes
- 
---- a/python/mozbuild/mozbuild/util.py.python-open-U	2022-06-28 04:37:40.000000000 +0200
-+++ b/python/mozbuild/mozbuild/util.py	2022-07-11 19:19:19.903268374 +0200
-@@ -225,7 +225,7 @@ class FileAvoidWrite(BytesIO):
-     still occur, as well as diff capture if requested.
-     """
- 
--    def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
-+    def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
-         BytesIO.__init__(self)
-         self.name = filename
-         assert type(capture_diff) == bool
---- a/python/mozbuild/mozpack/files.py.python-open-U	2022-06-28 04:37:40.000000000 +0200
-+++ b/python/mozbuild/mozpack/files.py	2022-07-11 19:19:40.372213866 +0200
-@@ -574,7 +574,7 @@ class PreprocessedFile(BaseFile):
-         pp = Preprocessor(defines=self.defines, marker=self.marker)
-         pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
- 
--        with _open(self.path, "rU") as input:
-+        with _open(self.path, "r") as input:
-             with _open(os.devnull, "w") as output:
-                 pp.processFile(input=input, output=output)
- 
-@@ -631,7 +631,7 @@ class PreprocessedFile(BaseFile):
-         pp = Preprocessor(defines=self.defines, marker=self.marker)
-         pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
- 
--        with _open(self.path, "rU") as input:
-+        with _open(self.path, "r") as input:
-             pp.processFile(input=input, output=dest, depfile=deps_out)
- 
-         dest.close()
diff --git a/icecat-python3.11-regex-inline-flags.patch b/icecat-python3.11-regex-inline-flags.patch
deleted file mode 100644
index 39481ec..0000000
--- a/icecat-python3.11-regex-inline-flags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- thunderbird-91.11.0/xpcom/idl-parser/xpidl/xpidl.py.python-inline-flags	2022-06-28 04:39:56.000000000 +0200
-+++ thunderbird-91.11.0/xpcom/idl-parser/xpidl/xpidl.py	2022-07-11 21:55:05.287553042 +0200
-@@ -1563,13 +1563,13 @@ class IDLParser(object):
-     t_ignore = " \t"
- 
-     def t_multilinecomment(self, t):
--        r"/\*(?s).*?\*/"
-+        r"/\*(?s:.*?)\*/"
-         t.lexer.lineno += t.value.count("\n")
-         if t.value.startswith("/**"):
-             self._doccomments.append(t.value)
- 
-     def t_singlelinecomment(self, t):
--        r"(?m)//.*?$"
-+        r"(?m://.*?$)"
- 
-     def t_IID(self, t):
-         return t
-@@ -1582,7 +1582,7 @@ class IDLParser(object):
-         return t
- 
-     def t_LCDATA(self, t):
--        r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?"
-+        r"(?s:%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?)"
-         t.type = "CDATA"
-         t.value = t.lexer.lexmatch.group("cdata")
-         t.lexer.lineno += t.value.count("\n")
diff --git a/icecat.spec b/icecat.spec
index 2864e7d..c4eff6e 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -9,7 +9,7 @@ ExcludeArch: %{ix86} %{arm}
 
 # Bundled cbindgen makes build slow.
 # Enable only if system cbindgen is not available.
-%global use_bundled_cbindgen  1
+%global use_bundled_cbindgen  0
 
 ####################
 
@@ -140,34 +140,17 @@ Source18: node-stdout-nonblocking-wrapper
 
 Source19: run-wayland-compositor
 
-# With clang LLVM 16 rust-bindgen 0.56.0 is too old, combined
-# https://github.com/rust-lang/rust-bindgen/pull/2319
-# https://github.com/rust-lang/rust-bindgen/pull/2339
-Patch7:  rust-bindgen-2319-2339.patch
-
-# Needed with rust 1.70
-# https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100
-Patch8:  mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100.patch 
-
-Patch40: build-aarch64-skia.patch
-Patch44: build-arm-libopus.patch
+# Gnuzilla patch:
+# https://lists.gnu.org/archive/html/help-gnuzilla/2025-09/msg00002.html
+Patch7:  icecat-140.3.0-remove_frozen_cargo_flag.patch
 
 # Fedora specific patches
-Patch220: firefox-nss-version.patch
 Patch221: firefox-nss-addon-hack.patch
-Patch223: %{name}-glibc-dynstack.patch
 Patch224: %{name}-GLIBCXX-fix-for-GCC-12.patch
 
 # ARM run-time patch
 Patch226: rhbz-1354671.patch
 
-# Upstream patches
-Patch401: icecat-1742849.patch
-Patch403: icecat-python3.11-open-U.patch
-Patch404: icecat-python3.11-regex-inline-flags.patch
-Patch412: mozilla-1337988.patch
-Patch422: mozilla-1580174-webrtc-popup.patch
-
 # Fix crash on ppc64le (mozilla#1512162)
 Patch423: mozilla-1512162.patch
 
diff --git a/mozilla-1337988.patch b/mozilla-1337988.patch
deleted file mode 100644
index 8c40445..0000000
--- a/mozilla-1337988.patch
+++ /dev/null
@@ -1,496 +0,0 @@
-diff -up firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp.1337988 firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp
---- firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp.1337988	2017-09-14 22:15:56.000000000 +0200
-+++ firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp	2017-09-25 10:34:11.205611698 +0200
-@@ -1719,7 +1719,7 @@ NPObjWrapper_ObjectMoved(JSObject *obj,
-   auto entry =
-     static_cast<NPObjWrapperHashEntry*>(sNPObjWrappers->Search(npobj));
-   MOZ_ASSERT(entry && entry->mJSObj);
--  MOZ_ASSERT(entry->mJSObj == old);
-+  MOZ_ASSERT(entry->mJSObj.unbarrieredGetPtr() == old);
-   entry->mJSObj = obj;
- }
- 
-diff -up firefox-56.0/js/ipc/JavaScriptShared.cpp.1337988 firefox-56.0/js/ipc/JavaScriptShared.cpp
---- firefox-56.0/js/ipc/JavaScriptShared.cpp.1337988	2017-07-31 18:20:47.000000000 +0200
-+++ firefox-56.0/js/ipc/JavaScriptShared.cpp	2017-09-25 10:34:11.205611698 +0200
-@@ -101,7 +101,7 @@ IdToObjectMap::has(const ObjectId& id, c
-     auto p = table_.lookup(id);
-     if (!p)
-         return false;
--    return p->value() == obj;
-+    return p->value().unbarrieredGet() == obj;
- }
- #endif
- 
-diff -up firefox-56.0/js/public/RootingAPI.h.1337988 firefox-56.0/js/public/RootingAPI.h
---- firefox-56.0/js/public/RootingAPI.h.1337988	2017-07-31 18:20:47.000000000 +0200
-+++ firefox-56.0/js/public/RootingAPI.h	2017-09-25 10:34:11.206611695 +0200
-@@ -148,6 +148,10 @@ template<typename T>
- struct PersistentRootedMarker;
- } /* namespace gc */
- 
-+#define DECLARE_POINTER_COMPARISON_OPS(T)                                                         \
-+    bool operator==(const T& other) const { return get() == other; }                              \
-+    bool operator!=(const T& other) const { return get() != other; }
-+
- // Important: Return a reference so passing a Rooted<T>, etc. to
- // something that takes a |const T&| is not a GC hazard.
- #define DECLARE_POINTER_CONSTREF_OPS(T)                                                           \
-@@ -237,8 +241,6 @@ class Heap : public js::HeapBase<T, Heap
-     static_assert(js::IsHeapConstructibleType<T>::value,
-                   "Type T must be a public GC pointer type");
-   public:
--    using ElementType = T;
--
-     Heap() {
-         static_assert(sizeof(T) == sizeof(Heap<T>),
-                       "Heap<T> must be binary compatible with T.");
-@@ -385,8 +387,6 @@ template <typename T>
- class TenuredHeap : public js::HeapBase<T, TenuredHeap<T>>
- {
-   public:
--    using ElementType = T;
--
-     TenuredHeap() : bits(0) {
-         static_assert(sizeof(T) == sizeof(TenuredHeap<T>),
-                       "TenuredHeap<T> must be binary compatible with T.");
-@@ -394,6 +394,9 @@ class TenuredHeap : public js::HeapBase<
-     explicit TenuredHeap(T p) : bits(0) { setPtr(p); }
-     explicit TenuredHeap(const TenuredHeap<T>& p) : bits(0) { setPtr(p.getPtr()); }
- 
-+    bool operator==(const TenuredHeap<T>& other) { return bits == other.bits; }
-+    bool operator!=(const TenuredHeap<T>& other) { return bits != other.bits; }
-+
-     void setPtr(T newPtr) {
-         MOZ_ASSERT((reinterpret_cast<uintptr_t>(newPtr) & flagsMask) == 0);
-         if (newPtr)
-@@ -470,8 +473,6 @@ class MOZ_NONHEAP_CLASS Handle : public
-     friend class JS::MutableHandle<T>;
- 
-   public:
--    using ElementType = T;
--
-     /* Creates a handle from a handle of a type convertible to T. */
-     template <typename S>
-     MOZ_IMPLICIT Handle(Handle<S> handle,
-@@ -533,6 +534,7 @@ class MOZ_NONHEAP_CLASS Handle : public
-     MOZ_IMPLICIT Handle(MutableHandle<S>& root,
-                         typename mozilla::EnableIf<mozilla::IsConvertible<S, T>::value, int>::Type dummy = 0);
- 
-+    DECLARE_POINTER_COMPARISON_OPS(T);
-     DECLARE_POINTER_CONSTREF_OPS(T);
-     DECLARE_NONPOINTER_ACCESSOR_METHODS(*ptr);
- 
-@@ -559,8 +561,6 @@ template <typename T>
- class MOZ_STACK_CLASS MutableHandle : public js::MutableHandleBase<T, MutableHandle<T>>
- {
-   public:
--    using ElementType = T;
--
-     inline MOZ_IMPLICIT MutableHandle(Rooted<T>* root);
-     inline MOZ_IMPLICIT MutableHandle(PersistentRooted<T>* root);
- 
-@@ -589,6 +589,7 @@ class MOZ_STACK_CLASS MutableHandle : pu
-         return h;
-     }
- 
-+    DECLARE_POINTER_COMPARISON_OPS(T);
-     DECLARE_POINTER_CONSTREF_OPS(T);
-     DECLARE_NONPOINTER_ACCESSOR_METHODS(*ptr);
-     DECLARE_NONPOINTER_MUTABLE_ACCESSOR_METHODS(*ptr);
-@@ -805,8 +806,6 @@ class MOZ_RAII Rooted : public js::Roote
-     }
- 
-   public:
--    using ElementType = T;
--
-     template <typename RootingContext>
-     explicit Rooted(const RootingContext& cx)
-       : ptr(GCPolicy<T>::initial())
-@@ -839,6 +838,7 @@ class MOZ_RAII Rooted : public js::Roote
-         ptr = mozilla::Move(value);
-     }
- 
-+    DECLARE_POINTER_COMPARISON_OPS(T);
-     DECLARE_POINTER_CONSTREF_OPS(T);
-     DECLARE_POINTER_ASSIGN_OPS(Rooted, T);
-     DECLARE_NONPOINTER_ACCESSOR_METHODS(ptr);
-@@ -903,14 +903,13 @@ template <typename T>
- class MOZ_RAII FakeRooted : public RootedBase<T, FakeRooted<T>>
- {
-   public:
--    using ElementType = T;
--
-     template <typename CX>
-     explicit FakeRooted(CX* cx) : ptr(JS::GCPolicy<T>::initial()) {}
- 
-     template <typename CX>
-     FakeRooted(CX* cx, T initial) : ptr(initial) {}
- 
-+    DECLARE_POINTER_COMPARISON_OPS(T);
-     DECLARE_POINTER_CONSTREF_OPS(T);
-     DECLARE_POINTER_ASSIGN_OPS(FakeRooted, T);
-     DECLARE_NONPOINTER_ACCESSOR_METHODS(ptr);
-@@ -931,8 +930,6 @@ template <typename T>
- class FakeMutableHandle : public js::MutableHandleBase<T, FakeMutableHandle<T>>
- {
-   public:
--    using ElementType = T;
--
-     MOZ_IMPLICIT FakeMutableHandle(T* t) {
-         ptr = t;
-     }
-@@ -1124,8 +1121,6 @@ class PersistentRooted : public js::Root
-     }
- 
-   public:
--    using ElementType = T;
--
-     PersistentRooted() : ptr(GCPolicy<T>::initial()) {}
- 
-     explicit PersistentRooted(RootingContext* cx)
-@@ -1203,6 +1198,7 @@ class PersistentRooted : public js::Root
-         }
-     }
- 
-+    DECLARE_POINTER_COMPARISON_OPS(T);
-     DECLARE_POINTER_CONSTREF_OPS(T);
-     DECLARE_POINTER_ASSIGN_OPS(PersistentRooted, T);
-     DECLARE_NONPOINTER_ACCESSOR_METHODS(ptr);
-@@ -1234,8 +1230,6 @@ class JS_PUBLIC_API(ObjectPtr)
-     Heap<JSObject*> value;
- 
-   public:
--    using ElementType = JSObject*;
--
-     ObjectPtr() : value(nullptr) {}
- 
-     explicit ObjectPtr(JSObject* obj) : value(obj) {}
-@@ -1342,177 +1336,6 @@ Swap(JS::TenuredHeap<T>& aX, JS::Tenured
- 
- } /* namespace mozilla */
- 
--namespace js {
--namespace detail {
--
--// DefineComparisonOps is a trait which selects which wrapper classes to define
--// operator== and operator!= for. It supplies a getter function to extract the
--// value to compare. This is used to avoid triggering the automatic read
--// barriers where appropriate.
--//
--// If DefineComparisonOps is not specialized for a particular wrapper you may
--// get errors such as 'invalid operands to binary expression' or 'no match for
--// operator==' when trying to compare against instances of the wrapper.
--
--template <typename T>
--struct DefineComparisonOps : mozilla::FalseType {};
--
--template <typename T>
--struct DefineComparisonOps<JS::Heap<T>> : mozilla::TrueType {
--    static const T& get(const JS::Heap<T>& v) { return v.unbarrieredGet(); }
--};
--
--template <typename T>
--struct DefineComparisonOps<JS::TenuredHeap<T>> : mozilla::TrueType {
--    static const T get(const JS::TenuredHeap<T>& v) { return v.unbarrieredGetPtr(); }
--};
--
--template <>
--struct DefineComparisonOps<JS::ObjectPtr> : mozilla::TrueType {
--    static const JSObject* get(const JS::ObjectPtr& v) { return v.unbarrieredGet(); }
--};
--
--template <typename T>
--struct DefineComparisonOps<JS::Rooted<T>> : mozilla::TrueType {
--    static const T& get(const JS::Rooted<T>& v) { return v.get(); }
--};
--
--template <typename T>
--struct DefineComparisonOps<JS::Handle<T>> : mozilla::TrueType {
--    static const T& get(const JS::Handle<T>& v) { return v.get(); }
--};
--
--template <typename T>
--struct DefineComparisonOps<JS::MutableHandle<T>> : mozilla::TrueType {
--    static const T& get(const JS::MutableHandle<T>& v) { return v.get(); }
--};
--
--template <typename T>
--struct DefineComparisonOps<JS::PersistentRooted<T>> : mozilla::TrueType {
--    static const T& get(const JS::PersistentRooted<T>& v) { return v.get(); }
--};
--
--template <typename T>
--struct DefineComparisonOps<js::FakeRooted<T>> : mozilla::TrueType {
--    static const T& get(const js::FakeRooted<T>& v) { return v.get(); }
--};
--
--template <typename T>
--struct DefineComparisonOps<js::FakeMutableHandle<T>> : mozilla::TrueType {
--    static const T& get(const js::FakeMutableHandle<T>& v) { return v.get(); }
--};
--
--} /* namespace detail */
--} /* namespace js */
--
--// Overload operator== and operator!= for all types with the DefineComparisonOps
--// trait using the supplied getter.
--//
--// There are four cases:
--
--// Case 1: comparison between two wrapper objects.
--
--template <typename T, typename U>
--typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
--                           js::detail::DefineComparisonOps<U>::value, bool>::Type
--operator==(const T& a, const U& b) {
--    return js::detail::DefineComparisonOps<T>::get(a) == js::detail::DefineComparisonOps<U>::get(b);
--}
--
--template <typename T, typename U>
--typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
--                           js::detail::DefineComparisonOps<U>::value, bool>::Type
--operator!=(const T& a, const U& b) {
--    return !(a == b);
--}
--
--// Case 2: comparison between a wrapper object and its unwrapped element type.
--
--template <typename T>
--typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value, bool>::Type
--operator==(const T& a, const typename T::ElementType& b) {
--    return js::detail::DefineComparisonOps<T>::get(a) == b;
--}
--
--template <typename T>
--typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value, bool>::Type
--operator!=(const T& a, const typename T::ElementType& b) {
--    return !(a == b);
--}
--
--template <typename T>
--typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value, bool>::Type
--operator==(const typename T::ElementType& a, const T& b) {
--    return a == js::detail::DefineComparisonOps<T>::get(b);
--}
--
--template <typename T>
--typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value, bool>::Type
--operator!=(const typename T::ElementType& a, const T& b) {
--    return !(a == b);
--}
--
--// Case 3: For pointer wrappers, comparison between the wrapper and a const
--// element pointer.
--
--template <typename T>
--typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
--                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
--operator==(const typename mozilla::RemovePointer<typename T::ElementType>::Type* a, const T& b) {
--    return a == js::detail::DefineComparisonOps<T>::get(b);
--}
--
--template <typename T>
--typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
--                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
--operator!=(const typename mozilla::RemovePointer<typename T::ElementType>::Type* a, const T& b) {
--    return !(a == b);
--}
--
--template <typename T>
--typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
--                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
--operator==(const T& a, const typename mozilla::RemovePointer<typename T::ElementType>::Type* b) {
--    return js::detail::DefineComparisonOps<T>::get(a) == b;
--}
--
--template <typename T>
--typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
--                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
--operator!=(const T& a, const typename mozilla::RemovePointer<typename T::ElementType>::Type* b) {
--    return !(a == b);
--}
--
--// Case 4: For pointer wrappers, comparison between the wrapper and nullptr.
--
--template <typename T>
--typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
--                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
--operator==(std::nullptr_t a, const T& b) {
--    return a == js::detail::DefineComparisonOps<T>::get(b);
--}
--
--template <typename T>
--typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
--                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
--operator!=(std::nullptr_t a, const T& b) {
--    return !(a == b);
--}
--
--template <typename T>
--typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
--                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
--operator==(const T& a, std::nullptr_t b) {
--    return js::detail::DefineComparisonOps<T>::get(a) == b;
--}
--
--template <typename T>
--typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
--                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
--operator!=(const T& a, std::nullptr_t b) {
--    return !(a == b);
--}
--
- #undef DELETE_ASSIGNMENT_OPS
- 
- #endif  /* js_RootingAPI_h */
-diff -up firefox-56.0/js/src/gc/Barrier.h.1337988 firefox-56.0/js/src/gc/Barrier.h
---- firefox-56.0/js/src/gc/Barrier.h.1337988	2017-09-14 22:16:01.000000000 +0200
-+++ firefox-56.0/js/src/gc/Barrier.h	2017-09-25 10:34:11.206611695 +0200
-@@ -353,8 +353,8 @@ class WriteBarrieredBase : public Barrie
-     explicit WriteBarrieredBase(const T& v) : BarrieredBase<T>(v) {}
- 
-   public:
--    using ElementType = T;
- 
-+    DECLARE_POINTER_COMPARISON_OPS(T);
-     DECLARE_POINTER_CONSTREF_OPS(T);
- 
-     // Use this if the automatic coercion to T isn't working.
-@@ -612,13 +612,14 @@ class ReadBarriered : public ReadBarrier
-         return *this;
-     }
- 
--    const T& get() const {
--        if (InternalBarrierMethods<T>::isMarkable(this->value))
--            this->read();
-+    const T get() const {
-+        if (!InternalBarrierMethods<T>::isMarkable(this->value))
-+            return JS::GCPolicy<T>::initial();
-+        this->read();
-         return this->value;
-     }
- 
--    const T& unbarrieredGet() const {
-+    const T unbarrieredGet() const {
-         return this->value;
-     }
- 
-@@ -626,9 +627,9 @@ class ReadBarriered : public ReadBarrier
-         return bool(this->value);
-     }
- 
--    operator const T&() const { return get(); }
-+    operator const T() const { return get(); }
- 
--    const T& operator->() const { return get(); }
-+    const T operator->() const { return get(); }
- 
-     T* unsafeGet() { return &this->value; }
-     T const* unsafeGet() const { return &this->value; }
-@@ -955,35 +956,6 @@ typedef ReadBarriered<WasmTableObject*>
- 
- typedef ReadBarriered<Value> ReadBarrieredValue;
- 
--namespace detail {
--
--template <typename T>
--struct DefineComparisonOps<PreBarriered<T>> : mozilla::TrueType {
--    static const T& get(const PreBarriered<T>& v) { return v.get(); }
--};
--
--template <typename T>
--struct DefineComparisonOps<GCPtr<T>> : mozilla::TrueType {
--    static const T& get(const GCPtr<T>& v) { return v.get(); }
--};
--
--template <typename T>
--struct DefineComparisonOps<HeapPtr<T>> : mozilla::TrueType {
--    static const T& get(const HeapPtr<T>& v) { return v.get(); }
--};
--
--template <typename T>
--struct DefineComparisonOps<ReadBarriered<T>> : mozilla::TrueType {
--    static const T& get(const ReadBarriered<T>& v) { return v.unbarrieredGet(); }
--};
--
--template <>
--struct DefineComparisonOps<HeapSlot> : mozilla::TrueType {
--    static const Value& get(const HeapSlot& v) { return v.get(); }
--};
--
--} /* namespace detail */
--
- } /* namespace js */
- 
- #endif /* gc_Barrier_h */
-diff -up firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp.1337988 firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp
---- firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp.1337988	2017-09-14 22:16:02.000000000 +0200
-+++ firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp	2017-09-25 10:34:11.206611695 +0200
-@@ -5,7 +5,6 @@
-  * 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/. */
- 
--#include "mozilla/TypeTraits.h"
- #include "mozilla/UniquePtr.h"
- 
- #include "js/RootingAPI.h"
-diff -up firefox-56.0/js/src/vm/SharedMem.h.1337988 firefox-56.0/js/src/vm/SharedMem.h
---- firefox-56.0/js/src/vm/SharedMem.h.1337988	2017-06-15 22:52:29.000000000 +0200
-+++ firefox-56.0/js/src/vm/SharedMem.h	2017-09-25 10:34:11.206611695 +0200
-@@ -12,8 +12,8 @@
- template<typename T>
- class SharedMem
- {
--    // static_assert(mozilla::IsPointer<T>::value,
--    //               "SharedMem encapsulates pointer types");
-+    static_assert(mozilla::IsPointer<T>::value,
-+                  "SharedMem encapsulates pointer types");
- 
-     enum Sharedness {
-         IsUnshared,
-diff -up firefox-56.0/js/xpconnect/src/XPCInlines.h.1337988 firefox-56.0/js/xpconnect/src/XPCInlines.h
---- firefox-56.0/js/xpconnect/src/XPCInlines.h.1337988	2017-09-14 22:16:03.000000000 +0200
-+++ firefox-56.0/js/xpconnect/src/XPCInlines.h	2017-09-25 10:34:11.206611695 +0200
-@@ -465,7 +465,7 @@ inline
- void XPCWrappedNativeTearOff::JSObjectMoved(JSObject* obj, const JSObject* old)
- {
-     MOZ_ASSERT(!IsMarked());
--    MOZ_ASSERT(mJSObject == old);
-+    MOZ_ASSERT(mJSObject.unbarrieredGetPtr() == old);
-     mJSObject = obj;
- }
- 
-diff -up firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp.1337988 firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp
---- firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp.1337988	2017-09-14 22:16:03.000000000 +0200
-+++ firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp	2017-09-25 10:34:11.207611692 +0200
-@@ -874,7 +874,7 @@ void
- XPCWrappedNative::FlatJSObjectMoved(JSObject* obj, const JSObject* old)
- {
-     JS::AutoAssertGCCallback inCallback;
--    MOZ_ASSERT(mFlatJSObject == old);
-+    MOZ_ASSERT(mFlatJSObject.unbarrieredGetPtr() == old);
- 
-     nsWrapperCache* cache = nullptr;
-     CallQueryInterface(mIdentity, &cache);
-diff -up firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp.1337988 firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp
---- firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp.1337988	2017-07-31 18:20:47.000000000 +0200
-+++ firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp	2017-09-25 10:34:11.207611692 +0200
-@@ -101,7 +101,7 @@ XPCWrappedNativeProto::CallPostCreatePro
- void
- XPCWrappedNativeProto::JSProtoObjectFinalized(js::FreeOp* fop, JSObject* obj)
- {
--    MOZ_ASSERT(obj == mJSProtoObject, "huh?");
-+    MOZ_ASSERT(obj == mJSProtoObject.unbarrieredGet(), "huh?");
- 
- #ifdef DEBUG
-     // Check that this object has already been swept from the map.
-@@ -117,7 +117,7 @@ XPCWrappedNativeProto::JSProtoObjectFina
- void
- XPCWrappedNativeProto::JSProtoObjectMoved(JSObject* obj, const JSObject* old)
- {
--    MOZ_ASSERT(mJSProtoObject == old);
-+    MOZ_ASSERT(mJSProtoObject.unbarrieredGet() == old);
-     mJSProtoObject.init(obj); // Update without triggering barriers.
- }
- 
diff --git a/mozilla-1580174-webrtc-popup.patch b/mozilla-1580174-webrtc-popup.patch
deleted file mode 100644
index 2d154eb..0000000
--- a/mozilla-1580174-webrtc-popup.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
---- a/widget/gtk/nsWindow.cpp
-+++ b/widget/gtk/nsWindow.cpp
-@@ -1155,6 +1155,28 @@
-   }
- }
- 
-+bool IsPopupWithoutToplevelParent(nsMenuPopupFrame* aMenuPopupFrame) {
-+  // Check if the popup is autocomplete (like tags autocomplete
-+  // in the bookmark edit popup).
-+  nsAtom* popupId = aMenuPopupFrame->GetContent()->GetID();
-+  if (popupId && popupId->Equals(NS_LITERAL_STRING("PopupAutoComplete"))) {
-+    return true;
-+  }
-+
-+  // Check if the popup is in popupnotificationcontent (like choosing capture
-+  // device when starting webrtc session).
-+  nsIFrame* parentFrame = aMenuPopupFrame->GetParent();
-+  if (!parentFrame) {
-+    return false;
-+  }
-+  parentFrame = parentFrame->GetParent();
-+  if (parentFrame && parentFrame->GetContent()->NodeName().EqualsLiteral(
-+                         "popupnotificationcontent")) {
-+    return true;
-+  }
-+  return false;
-+}
-+
- // Wayland keeps strong popup window hierarchy. We need to track active
- // (visible) popup windows and make sure we hide popup on the same level
- // before we open another one on that level. It means that every open
-@@ -1211,10 +1233,14 @@
-       LOG(("...[%p] GetParentMenuWidget() = %p\n", (void*)this, parentWindow));
- 
-       // If the popup is a regular menu but GetParentMenuWidget() returns
--      // nullptr which means it's connected non-menu parent
--      // (bookmark toolbar for instance).
-+      // nullptr which means is not a submenu of any other menu.
-       // In this case use a parent given at nsWindow::Create().
--      if (!parentWindow && !menuPopupFrame->IsContextMenu()) {
-+      // But we have to avoid using mToplevelParentWindow in case the popup
-+      // is in 'popupnotificationcontent' element or autocomplete popup,
-+      //  otherwise the popupnotification would disappear when for
-+      // example opening a popup with microphone selection.
-+      if (!parentWindow && !menuPopupFrame->IsContextMenu() &&
-+          !IsPopupWithoutToplevelParent(menuPopupFrame)) {
-         parentWindow =
-             get_window_for_gtk_widget(GTK_WIDGET(mToplevelParentWindow));
-       }
-
diff --git a/mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100.patch b/mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100.patch
deleted file mode 100644
index bdad203..0000000
--- a/mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- thunderbird-102.11.1/third_party/rust/mp4parse/.cargo-checksum.json.mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100	2023-05-24 00:50:52.000000000 +0200
-+++ thunderbird-102.11.1/third_party/rust/mp4parse/.cargo-checksum.json	2023-06-08 15:26:57.584198289 +0200
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"f283fc1597f492cd1e03cd08b9c77f042ae4494fc96b4dcb566ec0abbda65efc","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"86cb40854b93f988e3a63ce6fe39d2ce95367f8ca301a5ba50676ff98a0ad791","benches/avif_benchmark.rs":"cd99c0dde025ab40d2cd860f53dc697a1587a48c164c3e5c8adfd40add29d772","link-u-avif-sample-images/.github/workflows/encode-and-decode-daily.yml":"84b787f721024a100ce09ac5714a1d78a4811893861e89495313f435b9d02359","link-u-avif-sample-images/.gitignore":"ac16d40779ab2d608843a3cb1b0418a1ffdc0e71a06c4d140386fadf007a54a7","link-u-avif-sample-images/LICENSE.txt":"da89f9867822be4b8adb1e601d9e9226c195016c6508015eb7593e68ead0c98a","link-u-avif-sample-images/Makefile":"b5697e8685d2a9ce0f4b4c976a5f707022ed113782d16dc59ae280d3a8ce77b1","link-u-avif-sample-images/README.md":"d249fb7bef4f21359cfc4f2977e1b2f2c6e6dd6e57cb1cdc1da1f0edd8aa55d0","link-u-avif-sample-images/fox.jpg":"927997a90ae88ead007283bf9c1392159d0acd2e9890522146211fda2112a2d9","link-u-avif-sample-images/fox.odd-height.png":"6136247772bd1c0edd50426bca4f3485473ac25a784e5ec8777f7491598e96db","link-u-avif-sample-images/fox.odd-width.odd-height.png":"6f91dc21c137f318d0443ce28bbf3f74d5502180c254327b46e41040a33f1363","link-u-avif-sample-images/fox.odd-width.png":"a8b2328c8700c16280c5ab40a34147edac598d4d48ca101bef649e468ae1492e","link-u-avif-sample-images/fox.png":"c45bfb5780843c70a37426340020e3e7ff41d7cf1df9fec614a5cf429d078573","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.avif":"811af5e96631309030a14cbc30c3bacfaa667f2e36e16a4f30434b8f5a23310c","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.avif":"e35713343e9ee04c51ab9cfdc99a0c7d126a1917cb83f5b9a23c71ed59269be2","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-height.avif":"485623f7838d8f442c47348c6492765e6aafbc3d5ccd8e90efc9c812ff15e265","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.avif":"8e75b9a8975267359d827e4cbc6877b1674aa31b87f88f222dde03263f9254df","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.odd-height.avif":"1fff5915a332d6aaa85d668f3f338bda6fad9c6ec1f380f2c46737d536cea5de","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-height.avif":"cca9785f14c74d865453518c0962dabd6d1b92d2c6c5f5ac67efdbf5606acb83","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.avif":"de3399d8b56431f0ed34e2f14200f31dd54544fddbb12f39b4d55449d5660c56","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.odd-height.avif":"07507744cb76b74a3586b93fc3b273a98f998d75f7687db3e9cb3725d7b1fb9d","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.avif":"cb884c82ac7b6d4fa03b1f687e9e20abc346107095473e9c1d422aaf0de14eaf","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.avif":"15d84077066c47fdbe2a7b8ed583a17017d09a033144ac1b31486d6c8f6f5c82","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-height.avif":"365439d2ee2fe5229e066362c03a73a182c7f6626772ecf5345b22752d32e681","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.avif":"c623b9943123d6c47d3300444f7255cbdfebfe2b47a670287f2baeb717fac42b","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.odd-height.avif":"dd069f3c3c4f7589f5f7ef1d7b6a91b8cb975d32663a4a92b6d75219edd72954","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-height.avif":"75628450288ace3386651725411c8f0ffff7eb95f82c5307b0faa3350f09f50e","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.avif":"f91b6f455412adabc5094011362eaaa1f6a9d5740de0b8a1be42a96c16e7617f","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.odd-height.avif":"bb8695cacacaf8f2e13a739de75e5e8a9d970d68c3acdfb7d82171a9bac2f01e","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.avif":"a10de8204aee73ba1786daca6390546bd7aa6b069aaa644012219a1c11246a43","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-height.avif":"734a5badc59a8bed19e8eb476911048ddb011ca7c9eac31b7a7ed20e0135ac2c","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.avif":"68d15d76d95f268e810dfd87bbf96d8c3197580afce2d30b50bb1f07865077f3","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.odd-height.avif":"01e469b33bacb7e07e15e23b2997907bbcf02d8fcc99885a027494d31c45547c","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.avif":"a0cdc981a6b056c8af2d177a1438c332d630040dacbfd1c89bb5e3e381ba5822","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-height.avif":"77e0510def73213c00ebcf051cf45fa63cf27d7c69340cc145ab6d44ec77bb07","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.avif":"12787042364bd13be01830f988cb714220bde340a3329baa808df27a269b83f8","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.odd-height.avif":"fad3b6dd9cb99e6925858f69aafae3f68c861845f2c3d4a6d1c51c6161490134","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.avif":"e34f3bab5df802be2d422c685824464eb5f7e182b235ca99bde11c4c34ff3ac2","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.avif":"05804752621e2fd7a9d85b01e2995a50e3efd30693efd934152560622d66e841","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-height.avif":"ef041f2efa0424d3a6dcfc5f0c3f619aea0e197aaeb5a050a2d877a457513921","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.avif":"b711b321b8a4d3a41e08f80a17c2203b839458cb6346aff6fff3f8d7699032e6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.odd-height.avif":"e3f40aad0ddd6c04ffacf4a754a0525986c89d519119d37655282551e3ea3a59","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-height.avif":"4ef74c37712b41d6e5269d939f9d52031bc10746f7c8c029db618c5935aff9a6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.avif":"4cf6c849f4a48a639217ad9a1e0d027f4fc804d524c03e6707ec9714a252532f","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.odd-height.avif":"3d3978e8e8d07270f82a877d3535f9483b88fce93a1c4accb658b494452b1d36","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.avif":"626d73272e59722084c528b27b72a0920bec462a10749b3e87036e42bf8a24e5","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-height.avif":"d1786723a5d6ea1e1764b0045dc3f669fe3905ffc2913011a2b1b424d2393397","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.avif":"a2d9178cc5622e28472a735650d9c4deaec6d27d69830110911f4158f9d4a04e","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.odd-height.avif":"89a9fc7598d72251b903e0c7088ab3e7a7f316b5e02b85f8c69e51f8eb0c7e69","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.avif":"51476b8471e1c0a5ebbd1e7545709495bef619cc96c02d277aad32b1deff8ea9","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-height.avif":"4808960cdcd1207b29eb6ef5b4db81ae5e63c5d40ef92f7a1e8f4430e765bde4","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.avif":"71f3c73737bc04c23d93ea2c61a8a07408f604192fe53fe12c65050927dacb4e","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.odd-height.avif":"8f9649384fa09c70af0c2e9e0d94ecd17492c702e015d9d6290d3aefc57c548c","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.avif":"ed96eca6ed79863eaf91e4d666e4e220b5fa4e5a6cb1696477ba901ac12f5dde","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-height.avif":"c43b4c607e301e34eb953770133d89d15e77d63be8d6421a80d6212fbbbf3453","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.avif":"0e6218ce250ee7f84a621f3af73286fd4dabea19e9898d3575c20c5955aa427d","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.odd-height.avif":"9f19846d884ac7d161ac2ca15811bb22ff7f3847bc1ad5d7713971ea024631aa","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.avif":"2cb363d30f83bff58ee049874b1808b37cb1d35342edf16b3ce25cb243c9ea55","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.avif":"8217b88f350c5d3812d7f863fe9d710c4c1b846b0be8df29ce6b3eb30d2b8d8f","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-height.avif":"51eccd8c1368ddec9bc1f3a7631dadb00682e985fbfea66c0a2f533f6a73b67e","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.avif":"83fe4593ab839cf296a2ccb8a146daf826d1d602f4f239cb63ee020f2cc326f6","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.odd-height.avif":"4e63b84a980a81adde586314a94d8f834ec763749d8797c286471415b6b75647","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-height.avif":"efc70882aacbb533c0e833a4401949d152dceb364846442cdccca5048ad17a60","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.avif":"c07575c88ef400c1725c9260a19439e0e784da41c7db3867059019ddbdb3bebe","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.odd-height.avif":"86aee64fd7b11b9834537ea14b2eff234c062c98d32fab51ff14aba262d5b106","link-u-avif-sample-images/hato.16bpc.png":"53b550c587cd1d19a1997184e47f4a3ff2a05cedf7cb4e42a9466a6d6cb60d8d","link-u-avif-sample-images/hato.jpg":"6d4804e5e4adf36a6b138544c81b743ed7abdd9a495a43e883ec77689ca28943","link-u-avif-sample-images/hato.png":"313880f4cc51160fec522d78f1fb7f06df70fe1929a731fc86c68ecefd312277","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.avif":"1e84598c94bc795c55a551bdf6f283b4eed4997bda15e5c4bb2e29d0dc70897b","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.monochrome.avif":"25c19a187d10eac963bb51b3fae1ffe50f3ccbc7ad02e51948dc7467b397ce61","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.avif":"07cd454de19dd638354f75d9e97aab08bc8a04dd45c4f7531cb62a1a5656c8c9","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.monochrome.avif":"120a3f26f3d6cde80869fb52bdb8fdd55b443882c98070ea938575e4790982ff","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.avif":"d54251d4bc023f2e53624a46cb18e56cbc45768bd1bd50394de191c2a42106e8","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.monochrome.avif":"ed33dfdb5e663b3394298b6921f9b19b129e14788dead776430eee2f14780a73","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.avif":"ad361ac7d94fbc6af7ef30cbd3601ff366bc360c304480387a58a4c6fecee9b6","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.monochrome.avif":"e28b4cacda95750e465e205fbfcba6a6af1d8418dac649838730c555ff7d828f","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.avif":"69c353c482c2eb3d3671bb55f7ccfc932e4d781c714a72116e9138ffc6f6c720","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.monochrome.avif":"e7d6f7d42a8519e1482f225fe447b5642d19a54ee830529223eac114a0dec189","link-u-avif-sample-images/images.html":"9e18453dfe5b205600f158282c6896265281e3b04b2fbc332804fab1dbdb3faf","link-u-avif-sample-images/kimono.avif":"63412e0f67f37c8b6fcf0e8269a2afae0a017fa6a3a99d37d055c590b0be52d3","link-u-avif-sample-images/kimono.crop.avif":"f175dcd9c64813b759da185fa67076fb772b76059845b2aad3ddcfab257f75ad","link-u-avif-sample-images/kimono.crop.png":"0d5605bae0ec9d39aad9dc8e1a371d0327c6a224643983e3ee1f4d44cb00f19d","link-u-avif-sample-images/kimono.jpg":"a6ad58e3cea437ee0c841115ba67ae7354de7af734de50de9d0853dd4e571577","link-u-avif-sample-images/kimono.mirror-horizontal.avif":"2bbc004d91145488610158a5acdb4d706495a2b15511db20ff57bb9efd80885c","link-u-avif-sample-images/kimono.mirror-horizontal.png":"9af9e839fe6bf6342831970c20291f619570d2fc687951ae00cd81ea766f53fe","link-u-avif-sample-images/kimono.mirror-vertical.avif":"f10eb04791fcca3409868b367128649f32e6b6fffcf02484cdefa57909f6bb74","link-u-avif-sample-images/kimono.mirror-vertical.png":"4ed003c5868fd2e78c7b2dcbd54a67a0e7593dabb3ac82b1c9e5e2dbdf09b8ec","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.avif":"33c36ec2274b00ac6f81c9f61e55c20cbfce1649ad27520afe635310f516ead1","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.crop.avif":"90ca48f657455b8f8e4a4e1769a05af90a3e34dca11a8b3c32552daf378ee956","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.png":"74b9b7ffa8955761f747a0e6e81d5b7ecb5e325383546110e1b6aa9986728035","link-u-avif-sample-images/kimono.png":"84fd6cfb97a27739608e21779f874b4ae7e80342b2588e8b0b092dee2d57c881","link-u-avif-sample-images/kimono.rotate270.avif":"79a99a0415276cc11f2e871d070a9df84df3385888a2f2fa3534320f6bed98ed","link-u-avif-sample-images/kimono.rotate270.png":"1918a47c02b378945a705301abd4250ddc65bb95afce9424572ffd0fdd1f45ef","link-u-avif-sample-images/kimono.rotate90.avif":"bd1157d8c840713c82b907b9d3ae80bc3817849e11c323d875f8016e035bd3cc","link-u-avif-sample-images/kimono.rotate90.png":"1a73c61692abe96d0a7a9accdb36a83d51bceac79bbb83a00571570f494cca49","link-u-avif-sample-images/plum-blossom-large.png":"af6ea005b726ca39f342e946aa53bed88e5a140413ce896d166bb35ab0aa3b4f","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"b413440309d5669a7aefa06f291f72de0d0c09972e3da9a385e6016d6a1c5562","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.avif":"64f6f2b1fda594af5c9e2d6e4bc752b55e8121000cdcedc0066018e53f76de40","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"2b175a600aed64c1c1de4b2d661fb405437b1ff000b964d4be6ac437ce73136f","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.avif":"21ebb3732186bf7c6c13cf7197155b64201e674b9c79cf613b6e5718bde14c2a","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"65917797e511c9033b3e225eb5d84f3c0440b7a496d4b8ab5674e123ad68aab7","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.avif":"f4809df9188fa46ed100f63c78c4cf42559d90a98351a8f69e177385920672b4","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"dffc213dc36f0b5ff3d86254f5185c2d1fb03380918a8fa39d186fb59cbba7cc","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-full.avif":"0a615cfb673ab45e37da3582c17dd36f86d5da3d81246a32951d1db4ed90149d","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-limited.avif":"d1cc6a0db116a68e229676b289e8ced84d42a9f0e8d3ccd760fc92dbeb932547","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-full.avif":"8626cf0b2c60fee51cf1df7fe4d8a18081b72e3604f7d3ff14cc5a35581927d9","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-limited.avif":"56bf18e4bcbfbea460c306ab900fc506169854d2b91690e1a48156a86fff3264","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.avif":"b56f3c33797e4c5bb80418ae25f6f2c6fc88ddc1f6965d82abc44059f052f36c","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"c3c6db4ce801c68e2afd7bfb72abacc13287cc2e247917a817ff5632bd4b18fb","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.avif":"095f57fff1dc037a6414c60263415dcfa86b10d81f58e8e4c3aef17cffae0e5f","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"ba3035a69296d12f47d1c450f2de8cc0c9059ebbf27bb8b0996ff6d1ab1132a1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.avif":"a9551e1963049b874216b40aaf9be45bc44dc11887770712b77240862c6c08a9","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.avif":"6891b5bdbed7f541c673c66cec4584b191bb737a49b37cca16ae069830890b42","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.avif":"a466503110f60dcadaafe78c2cb0a8ca58334c22868efe428c7ac12b69407c95","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.avif":"061b4c70707e7fc8866580656cca7ca2da2263645829a564dbf8f205d639f058","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.avif":"4a03c8bcfcaadccdeb07432ed80680b06aba5ae5e616fc370b376acb478f6cd1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.avif":"376625ce4e7ec3b57344a9f2185a34975fe380774c9f8e0dd4ef61c46da94fca","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.avif":"1e17b7dd8e351cb667bc6ec0b81fdebca9fd30ad5e588b3eac57bf9f90a9b58b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"f77588d2ff39e4461869a95ca236efdf4a3fdc17b8a6e3907e63b417e56c81b5","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.avif":"f2eabd3fc2db07b361d55b5af63023d28b5bdd0047a665e9d0685651ce9db94b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"dd88c377b253d689bfd4600d7c3007448df0ed92f679b661d5d51e051a6916d8","link-u-avif-sample-images/plum-blossom-small.png":"c859fd97b647e494461f65835b9c1c3476807aee77076599adf18a832b3617a4","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.avif":"fe3379620f983e5da4210b0f7c5d164e86208b34106d6b11d56e2b52beee5dfe","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"9e6234686053dba2e44bb32192c641074095a61e45aa1bede85bb83751e6e157","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.avif":"60ffa59dd007aea3bb596cfb03853b3dad490b1ffd10471ad4fe1901ec819907","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"58abfa027525aca7339a705f311bc30b000aef9822c7c50b232894ece1ba9cb1","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.avif":"541ca66a11b1430d11f77b74a13f859239a3bd9f44976b8dfe163c5d7595a69f","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"6d7852c63c27a77bef94443e178ecf6b6a3da8cc846f9f0c1adc17f7fc35e1f3","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.avif":"3712216ffc7edb95a976b68469ead533fda6fe9f3d2e8cb09cbdb0d01d9c094b","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"59672af536b169ebf7e48129167dc91cb253925517c37db28b64539f7afba5d3","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-full.avif":"561d5158425ad39425916a3be048b0202e82efef44cf1a9f711db57192d2ff01","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-limited.avif":"88336f29457c1dc4ae0b754ef14b791de4d8c337f2b44d7960aafcca08a5586e","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-full.avif":"245a3dad6371dc702f29eb7e9735f843b63c525da871859728bedbe5bb274985","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-limited.avif":"490c216b5850c670f6088ee72c7fd906102b2dd0c8432c01a517b3328db27c75","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.avif":"0d0bbbcb0c9ade1c827317a6409ce6ba25027b36da1b6752379a5f5d4c8af056","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"418a9d4b7dcbc1f67fc4b95ccb2e7946c446fddd35a79f0d587b3f2165cb3f14","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.avif":"a41dcfabb3795ed93a05881a91bf4d1c5d1b9b0e5d0db728f12684b12613e0c9","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"4b6a18f4f608d1b00598e67c1c91a4e8f4943ae5acf0166ae0121cc21f3b7437","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.avif":"5e6b83adee3aeac4bba3f38e854e2ed7585aa1557a74b5fa66596098c53e26f2","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.avif":"f42e780bff644167e27525fee65b23e70814f7665ea19b6d693eb127c5eeebd8","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.avif":"c6ee9234ee7783d0203f9512e3cc8fe76a694675bcf03c320ff8bab4684bd4e9","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.avif":"21e1e51fc6da66e090e12e1df5aeabf1f478df64bcb8151caaa687ad262bdd9d","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.avif":"dfed73d646d7159d3ee4f9ce95ea628fdd33bf8bf1bb02a83d88302d088f4d97","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.avif":"5539cd575256772ba31d6e87cb0136d5f465f84b041a4677b1023cfd6bee9956","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.avif":"f205cf2c05265b84e45ceb723e9a3707fd8749130166d4797e64c8c62b497f8c","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"ad2244cb7b2ac487a5104d6e5a07270f9ceb2550e4d56d3662fcc1868910ced5","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.avif":"7ef9468effdc970e4e6e8cc7533d66dc967686e357dda3dda186c021f9e6156b","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"3dd34d854ff83b6e27a2bf98301380a6cac272084ed863735285ab5dc8acda00","link-u-avif-sample-images/plum-blossom.svg":"be1f03dd05f63292c85a96b1c48fb06727283610cc69b1e116d547bab27b171d","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-10bpc.avif":"5842951d81118d256962384e08a986816e8ade6b05530269f0208c6b69cedb3b","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-12bpc.avif":"1f0c9f36d69b9aa13eff3897ada3e78b81099c613b329a402c27e09453e7e261","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-8bpc.avif":"3e6f2f4016e66e3c94707eaa8373e6f582321e005964cd35b64bc183e1bf10ea","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-lossy.avif":"79483242f2dca12c4ec18bd33ff8099216b3094fb55a26a909f046b2f9b4ce58","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.jpg":"d56f809ea5eda74578af57e2f80b41856a1fe2ff436c741aa58757387af998bd","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.png":"4eab95e358eb48e052c7b8c94d30a8c6cb1c9c3c2dfd9845240281dd5dd7b800","link-u-avif-sample-images/scripts/compare.sh":"0562689bcd40e9fc1322bf037d6f999aa4406a2229f19e74b96cc450e370e429","link-u-avif-sample-images/star-10bpc-with-alpha.avifs":"5643ac1f235ae6599186dd66c66507db6fa46a17b2b18e82ea9344870eb98a9b","link-u-avif-sample-images/star-10bpc.avifs":"c61d899a59dbd8c7b2f7bcfca9069a0e13ff1606899af227938a28502e6cbf88","link-u-avif-sample-images/star-12bpc-with-alpha.avifs":"88a350c3550ce36c1777fe7eb1e906c6829d3ed8b241aa1e0e46f1a4e2567c4b","link-u-avif-sample-images/star-12bpc.avifs":"c1a59db6f180208a3177d77c7f9ab08290e903c7bdaf929331b807a510f8c619","link-u-avif-sample-images/star-8bpc-with-alpha.avifs":"13a12908cb162a855cccc9221a5f9f736e8ea07902ffbdcf007f8fde5ed255f2","link-u-avif-sample-images/star-8bpc.avifs":"ae35b161de67a5afeb195ee401f369c34990f0ff8662f70ab4065bc6931f0a66","link-u-avif-sample-images/star.gif":"389cdd02efbdce4f0205cae6e91c1f64e34fa0ca1fe02351da1b37e16cbb642a","link-u-avif-sample-images/star.input.txt":"970163b942843618616f42233abe91d40fb68f6f5451860db259551711867b55","link-u-avif-sample-images/star.png":"18569167cf7ebd265ab6973d071d259aacfbb46c0408b7d4874c8cc9df9bb1ad","link-u-avif-sample-images/star.svg":"13089d0986b31b87919029fa69f2b68981af4023306bf0f79922f6772396008a","link-u-avif-sample-images/star180.png":"21bc11be2b51334fe4589634507612e7edce96d36e6a99219d029e440164e8b8","link-u-avif-sample-images/star270.png":"5c93f538dcdc70840b9925b4089083acc9c25e95265b3f3dea18d695451b441e","link-u-avif-sample-images/star90.png":"2defc5d21e70447653fec5dc14a697d9dd555d7a0c14e79cb2d9f80796a51a6d","src/boxes.rs":"270a3e3bf90279bfc83f95acadaba9611c25243280bca71dfa9c044d5441cf15","src/lib.rs":"73114a5c28472e77082ad259113ffafb418ed602c1741f26da3e10278b0bf93e","src/macros.rs":"76c840f9299797527fe71aa5b378ffb01312767372b45cc62deddb19775400ae","src/tests.rs":"75fe5467109242b2cc7991f8228e2e2ad1de5be2f29272a4a7f08c4e21ab5fa4","src/unstable.rs":"c2cef9a3b2b08a4da66fa0305fce7a117bd99c9b8d57b0a044e1d99dbda6faf5","tests/1x1-black-alpha-50pct-premultiplied.avif":"31a8c235bf2cf601a593a7bc33f7f2779f2d5b2e0cd145897b931fce94b0c0b8","tests/a1lx.avif":"81a784c568e7619bd47c4e7153181e9a86c8a03221097aa63979f97affd7efbb","tests/a1op.avif":"184e50efd3ad226800c610da7bc470d29b548d9fa942fd1fd1848ed02e2e5f0a","tests/alpha_video_avif_major_avis_compatible.avif":"81771981248c4e0d708f0828eadb20e9e37e7c21280efe5726666958f899c237","tests/alpha_video_fixed.avif":"67051d1a4ccf9f3e38d4514d8a6b3a2e07f1beb979369cabdc60881a698a36ac","tests/alpha_video_no_avis.avif":"a95f0e7c818bc5bf646143cf43474b70722e17669d4f2a32874c125936207d6a","tests/amr_nb_1f.3gp":"d1423e3414ad06b69f8b58d5c916ec353ba2d0402d99dec9f1c88acc33b6a127","tests/amr_wb_1f.3gp":"be635b24097e8757b0c04d70ab28e00417ca113e86108b6c269b79b64b89bcd5","tests/av1C-missing-essential.avif":"a1501254c4071847b2269fe40b81409c389ff14e91cf7c0005a47e6ea97a6803","tests/bad-ipma-flags.avif":"ecde7997b97db1910b9dcc7ca8e3c8957da0e83681ea9008c66dc9f12b78ad19","tests/bad-ipma-version.avif":"7f9a1a0b4ebbf8d800d22eaae5ff78970cc6b811317db6c1467c6883952b7c9b","tests/bbb_sunflower_QCIF_30fps_h263_noaudio_1f.3gp":"03e5b1264d0a188d77b9e676ba3ce23a801b17aaa11c0343dfd851d6ea4e3a40","tests/clap-basic-1_3x3-to-1x1.avif":"83af9c8196fa93b2475163585a23d0eb5a8f8015d0db8da7a5d6de61adfb1876","tests/clap-missing-essential.avif":"4d61aacd2327661a456abc76d3d490e5ddd2b6f8cbfa52922a6c541c9d983193","tests/clusterfuzz-testcase-minimized-mp4-6093954524250112":"af7044a470732d4e7e34ac7ab5ff038c58b66f09702cbcd774931d7766bbfd35","tests/corrupt/a1lx-marked-essential.avif":"0d481240222450827ea335ae9a1a300777a0db4f9b0f4c17ed77c758c5133fa3","tests/corrupt/a1op-missing-essential.avif":"33c24d54f43f1a7be7a8334718881c8a0de24730c997c7842b9d7140e75017ea","tests/corrupt/alpha_video_moov_is_moop.avif":"89e0091edd6efc2c5b163525553c5abc56263fe1b3b885184bb07b9ea4bf346d","tests/corrupt/bug-1655846.avif":"e0a5a06225800fadf05f5352503a4cec11af73eef705c43b4acab5f4a99dea50","tests/corrupt/bug-1661347.avif":"31c26561e1d9eafb60f7c5968b82a0859d203d73f17f26b29276256acee12966","tests/corrupt/clusterfuzz-testcase-minimized-avif-4914209301856256.avif":"34a142c7916e314881f3fb6394add1c543fac0e5b45109e3a425eeb4c68998d0","tests/corrupt/hdlr-not-first.avif":"2c29308af077209b9c984921b7e36f8fb7ca7cf379cf8eba4c7a91f65bc7a304","tests/corrupt/hdlr-not-pict.avif":"9fe37619606645a95725300a9e34fada9190d1e0b3919881db84353941ca9291","tests/corrupt/imir-before-clap.avif":"22d6b5dacf0ef0be59053beba7564b08037fed859ada2885e3476e0ff0d19c95","tests/corrupt/invalid-avif-colr-multiple-nclx.avif":"7990a995855120dc4f724a6098816595becc35077fcd9e0de8c68300b49c4f1f","tests/corrupt/invalid-avif-colr-multiple-prof.avif":"b077a6b58e3a13ad743ee3f19fbae53b521eab8727606e0dba9bf06384f3121c","tests/corrupt/invalid-avif-colr-multiple-rICC.avif":"88b24d4d588744b9f2cdc03944f28283e9315eb3de7d7d57773a0541137f6529","tests/corrupt/invalid-avif-colr-multiple.zip":"9abddcbc47fde6da20263a29b770c6a9e76c8ab8dc785ef8512f35d9cb3206ed","tests/corrupt/ipma-duplicate-item_id.avif":"ca8c5275b0b8b79c1068489a52d0a5c8f0b4453463971e72b694189f11c10745","tests/corrupt/ipma-duplicate-version-and-flags.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","tests/corrupt/ipma-invalid-property-index.avif":"2480e773fa716d22883032d05fd4cf2c6b00fba8796cf4ff286a5d1ba26adff6","tests/corrupt/lsel-missing-essential.avif":"43c3b1e4c4acecd7559a9a7197a7befd43c71705748f0f8c063bca3be1c6d074","tests/corrupt/no-alpha-av1C.avif":"ad3d34d6331db7d9bea0c5f37efb88923520e33e08e7c636a5df435a4575eae7","tests/corrupt/no-av1C.avif":"eeb4fc50930c91465999f787c4a2a3b12de20556da0857be72da5a1a9eaa3f01","tests/corrupt/no-ftyp.avif":"74b431f32b2e2761e77df7fdb260f623b4e8f7e3f4c8af8a42d6826911706d7b","tests/corrupt/no-hdlr.avif":"91a1eb70c7b6adf2104e471d7deeeb98084a591d64ce09ba106c27edfbc3a409","tests/corrupt/no-ispe.avif":"4b6edfd8c9b40c25dc40305a6057e32b5e65f40da4a9d810c58dbff53254113f","tests/corrupt/no-pitm.avif":"7960eeb9e6e5140fbe5eb6d281e6974efd6c3c0147562f3dcf06f6b009dc540a","tests/corrupt/no-pixi-for-alpha.avif":"f8adc3573c79ee25bf6d4dd2693c61661469b28f86a5c7b1d9e41b0e8d2d53bb","tests/corrupt/no-pixi.avif":"4b1776def440dc8b913c170e4479772ee6bbb299b8679f7c564704bd03c9597e","tests/hdlr-nonzero-reserved.avif":"b872dcd7b4f49c6808d6da109cf4fedc26a237c42e8529c5aa8f7130abaf40a9","tests/imir-missing-essential.avif":"b1226e4b1358528befbd3f1126b5caf0c5051b4354777b87e71f6001f3829f87","tests/invalid-avif-hdlr-name-multiple-nul.avif":"0d3e4a6ce42154ee288c18339c2b59ff2104fd890cd2d616e5dbf26375a90e98","tests/irot-missing-essential.avif":"b7da1fc1d1b45bb1b7ca3494476e052f711d794a6d010df6870872ed8b9da10e","tests/lsel.avif":"ef8ba6827709f48cd45f749efb580129162d9599ea98f3363d2140957502d806","tests/multiple-extents.avif":"b5549ac68793e155a726d754e565cea0da03fa17833d3545f45c79e13f4c9360","tests/no-mif1.avif":"1442aa6ffaeb9512724287768bfd1850d3aa29a651ef05abb33e5dec2b3ee5c2","tests/overflow.rs":"16b591d8def1a155b3b997622f6ea255536870d99c3d8f97c51755b77a50de3c","tests/public.rs":"8918d5190a36c697445aa4b140a31cd3032582f1e504b4c2527f75a2155f80ae","tests/valid-alpha.avif":"9d417a35b9b62ad3ff66ffbc55f16552aacf821a092aa5ef4adff7e746bd4c2f","tests/valid-avif-colr-nclx-and-prof-and-rICC.avif":"ab6f5e786d26f8bcade5993f8b9cca3cd004a3d7fcec76e829f5d0f98cb18e7b","tests/valid-avif-colr-nclx-and-prof.avif":"0e982818de61869fcb85a2a4c2b7b8aeecb3053cbfdc6276987f91204998eefb","tests/valid-avif-colr-nclx-and-rICC.avif":"8530ef1305ff956a0c2912d0b3d1e0fc3a68cf3103e70b04cc2574530389b030","tests/valid-avif-colr-nclx.avif":"345ab58b7b1cb48aba2e21eb8dc5ab0a751a78a752ce1896c59b4bf361992f38","tests/valid-avif-colr-prof-and-rICC.avif":"1f0f085141106885bda78b0879c768818420d8196b39440a36578456a7d50a6c","tests/valid-avif-colr-prof.avif":"5d7aaefb5204ebe1cc296456866b8e46e023748b921a38ee56fd6c776a9733ff","tests/valid-avif-colr-rICC.avif":"e1c7b49bfad5904b484bd5118e6b33b78e2dc708a31a10fcbb0e4a373ed8dbb7","tests/valid.avif":"f0b33e09bf01232e0877df325f47986c0bee7764f2a81c9c908ae109e7dc63c4"},"package":null}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"f283fc1597f492cd1e03cd08b9c77f042ae4494fc96b4dcb566ec0abbda65efc","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"86cb40854b93f988e3a63ce6fe39d2ce95367f8ca301a5ba50676ff98a0ad791","benches/avif_benchmark.rs":"cd99c0dde025ab40d2cd860f53dc697a1587a48c164c3e5c8adfd40add29d772","link-u-avif-sample-images/.github/workflows/encode-and-decode-daily.yml":"84b787f721024a100ce09ac5714a1d78a4811893861e89495313f435b9d02359","link-u-avif-sample-images/.gitignore":"ac16d40779ab2d608843a3cb1b0418a1ffdc0e71a06c4d140386fadf007a54a7","link-u-avif-sample-images/LICENSE.txt":"da89f9867822be4b8adb1e601d9e9226c195016c6508015eb7593e68ead0c98a","link-u-avif-sample-images/Makefile":"b5697e8685d2a9ce0f4b4c976a5f707022ed113782d16dc59ae280d3a8ce77b1","link-u-avif-sample-images/README.md":"d249fb7bef4f21359cfc4f2977e1b2f2c6e6dd6e57cb1cdc1da1f0edd8aa55d0","link-u-avif-sample-images/fox.jpg":"927997a90ae88ead007283bf9c1392159d0acd2e9890522146211fda2112a2d9","link-u-avif-sample-images/fox.odd-height.png":"6136247772bd1c0edd50426bca4f3485473ac25a784e5ec8777f7491598e96db","link-u-avif-sample-images/fox.odd-width.odd-height.png":"6f91dc21c137f318d0443ce28bbf3f74d5502180c254327b46e41040a33f1363","link-u-avif-sample-images/fox.odd-width.png":"a8b2328c8700c16280c5ab40a34147edac598d4d48ca101bef649e468ae1492e","link-u-avif-sample-images/fox.png":"c45bfb5780843c70a37426340020e3e7ff41d7cf1df9fec614a5cf429d078573","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.avif":"811af5e96631309030a14cbc30c3bacfaa667f2e36e16a4f30434b8f5a23310c","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.avif":"e35713343e9ee04c51ab9cfdc99a0c7d126a1917cb83f5b9a23c71ed59269be2","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-height.avif":"485623f7838d8f442c47348c6492765e6aafbc3d5ccd8e90efc9c812ff15e265","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.avif":"8e75b9a8975267359d827e4cbc6877b1674aa31b87f88f222dde03263f9254df","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.odd-height.avif":"1fff5915a332d6aaa85d668f3f338bda6fad9c6ec1f380f2c46737d536cea5de","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-height.avif":"cca9785f14c74d865453518c0962dabd6d1b92d2c6c5f5ac67efdbf5606acb83","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.avif":"de3399d8b56431f0ed34e2f14200f31dd54544fddbb12f39b4d55449d5660c56","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.odd-height.avif":"07507744cb76b74a3586b93fc3b273a98f998d75f7687db3e9cb3725d7b1fb9d","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.avif":"cb884c82ac7b6d4fa03b1f687e9e20abc346107095473e9c1d422aaf0de14eaf","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.avif":"15d84077066c47fdbe2a7b8ed583a17017d09a033144ac1b31486d6c8f6f5c82","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-height.avif":"365439d2ee2fe5229e066362c03a73a182c7f6626772ecf5345b22752d32e681","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.avif":"c623b9943123d6c47d3300444f7255cbdfebfe2b47a670287f2baeb717fac42b","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.odd-height.avif":"dd069f3c3c4f7589f5f7ef1d7b6a91b8cb975d32663a4a92b6d75219edd72954","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-height.avif":"75628450288ace3386651725411c8f0ffff7eb95f82c5307b0faa3350f09f50e","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.avif":"f91b6f455412adabc5094011362eaaa1f6a9d5740de0b8a1be42a96c16e7617f","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.odd-height.avif":"bb8695cacacaf8f2e13a739de75e5e8a9d970d68c3acdfb7d82171a9bac2f01e","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.avif":"a10de8204aee73ba1786daca6390546bd7aa6b069aaa644012219a1c11246a43","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-height.avif":"734a5badc59a8bed19e8eb476911048ddb011ca7c9eac31b7a7ed20e0135ac2c","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.avif":"68d15d76d95f268e810dfd87bbf96d8c3197580afce2d30b50bb1f07865077f3","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.odd-height.avif":"01e469b33bacb7e07e15e23b2997907bbcf02d8fcc99885a027494d31c45547c","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.avif":"a0cdc981a6b056c8af2d177a1438c332d630040dacbfd1c89bb5e3e381ba5822","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-height.avif":"77e0510def73213c00ebcf051cf45fa63cf27d7c69340cc145ab6d44ec77bb07","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.avif":"12787042364bd13be01830f988cb714220bde340a3329baa808df27a269b83f8","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.odd-height.avif":"fad3b6dd9cb99e6925858f69aafae3f68c861845f2c3d4a6d1c51c6161490134","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.avif":"e34f3bab5df802be2d422c685824464eb5f7e182b235ca99bde11c4c34ff3ac2","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.avif":"05804752621e2fd7a9d85b01e2995a50e3efd30693efd934152560622d66e841","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-height.avif":"ef041f2efa0424d3a6dcfc5f0c3f619aea0e197aaeb5a050a2d877a457513921","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.avif":"b711b321b8a4d3a41e08f80a17c2203b839458cb6346aff6fff3f8d7699032e6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.odd-height.avif":"e3f40aad0ddd6c04ffacf4a754a0525986c89d519119d37655282551e3ea3a59","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-height.avif":"4ef74c37712b41d6e5269d939f9d52031bc10746f7c8c029db618c5935aff9a6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.avif":"4cf6c849f4a48a639217ad9a1e0d027f4fc804d524c03e6707ec9714a252532f","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.odd-height.avif":"3d3978e8e8d07270f82a877d3535f9483b88fce93a1c4accb658b494452b1d36","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.avif":"626d73272e59722084c528b27b72a0920bec462a10749b3e87036e42bf8a24e5","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-height.avif":"d1786723a5d6ea1e1764b0045dc3f669fe3905ffc2913011a2b1b424d2393397","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.avif":"a2d9178cc5622e28472a735650d9c4deaec6d27d69830110911f4158f9d4a04e","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.odd-height.avif":"89a9fc7598d72251b903e0c7088ab3e7a7f316b5e02b85f8c69e51f8eb0c7e69","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.avif":"51476b8471e1c0a5ebbd1e7545709495bef619cc96c02d277aad32b1deff8ea9","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-height.avif":"4808960cdcd1207b29eb6ef5b4db81ae5e63c5d40ef92f7a1e8f4430e765bde4","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.avif":"71f3c73737bc04c23d93ea2c61a8a07408f604192fe53fe12c65050927dacb4e","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.odd-height.avif":"8f9649384fa09c70af0c2e9e0d94ecd17492c702e015d9d6290d3aefc57c548c","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.avif":"ed96eca6ed79863eaf91e4d666e4e220b5fa4e5a6cb1696477ba901ac12f5dde","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-height.avif":"c43b4c607e301e34eb953770133d89d15e77d63be8d6421a80d6212fbbbf3453","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.avif":"0e6218ce250ee7f84a621f3af73286fd4dabea19e9898d3575c20c5955aa427d","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.odd-height.avif":"9f19846d884ac7d161ac2ca15811bb22ff7f3847bc1ad5d7713971ea024631aa","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.avif":"2cb363d30f83bff58ee049874b1808b37cb1d35342edf16b3ce25cb243c9ea55","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.avif":"8217b88f350c5d3812d7f863fe9d710c4c1b846b0be8df29ce6b3eb30d2b8d8f","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-height.avif":"51eccd8c1368ddec9bc1f3a7631dadb00682e985fbfea66c0a2f533f6a73b67e","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.avif":"83fe4593ab839cf296a2ccb8a146daf826d1d602f4f239cb63ee020f2cc326f6","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.odd-height.avif":"4e63b84a980a81adde586314a94d8f834ec763749d8797c286471415b6b75647","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-height.avif":"efc70882aacbb533c0e833a4401949d152dceb364846442cdccca5048ad17a60","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.avif":"c07575c88ef400c1725c9260a19439e0e784da41c7db3867059019ddbdb3bebe","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.odd-height.avif":"86aee64fd7b11b9834537ea14b2eff234c062c98d32fab51ff14aba262d5b106","link-u-avif-sample-images/hato.16bpc.png":"53b550c587cd1d19a1997184e47f4a3ff2a05cedf7cb4e42a9466a6d6cb60d8d","link-u-avif-sample-images/hato.jpg":"6d4804e5e4adf36a6b138544c81b743ed7abdd9a495a43e883ec77689ca28943","link-u-avif-sample-images/hato.png":"313880f4cc51160fec522d78f1fb7f06df70fe1929a731fc86c68ecefd312277","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.avif":"1e84598c94bc795c55a551bdf6f283b4eed4997bda15e5c4bb2e29d0dc70897b","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.monochrome.avif":"25c19a187d10eac963bb51b3fae1ffe50f3ccbc7ad02e51948dc7467b397ce61","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.avif":"07cd454de19dd638354f75d9e97aab08bc8a04dd45c4f7531cb62a1a5656c8c9","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.monochrome.avif":"120a3f26f3d6cde80869fb52bdb8fdd55b443882c98070ea938575e4790982ff","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.avif":"d54251d4bc023f2e53624a46cb18e56cbc45768bd1bd50394de191c2a42106e8","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.monochrome.avif":"ed33dfdb5e663b3394298b6921f9b19b129e14788dead776430eee2f14780a73","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.avif":"ad361ac7d94fbc6af7ef30cbd3601ff366bc360c304480387a58a4c6fecee9b6","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.monochrome.avif":"e28b4cacda95750e465e205fbfcba6a6af1d8418dac649838730c555ff7d828f","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.avif":"69c353c482c2eb3d3671bb55f7ccfc932e4d781c714a72116e9138ffc6f6c720","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.monochrome.avif":"e7d6f7d42a8519e1482f225fe447b5642d19a54ee830529223eac114a0dec189","link-u-avif-sample-images/images.html":"9e18453dfe5b205600f158282c6896265281e3b04b2fbc332804fab1dbdb3faf","link-u-avif-sample-images/kimono.avif":"63412e0f67f37c8b6fcf0e8269a2afae0a017fa6a3a99d37d055c590b0be52d3","link-u-avif-sample-images/kimono.crop.avif":"f175dcd9c64813b759da185fa67076fb772b76059845b2aad3ddcfab257f75ad","link-u-avif-sample-images/kimono.crop.png":"0d5605bae0ec9d39aad9dc8e1a371d0327c6a224643983e3ee1f4d44cb00f19d","link-u-avif-sample-images/kimono.jpg":"a6ad58e3cea437ee0c841115ba67ae7354de7af734de50de9d0853dd4e571577","link-u-avif-sample-images/kimono.mirror-horizontal.avif":"2bbc004d91145488610158a5acdb4d706495a2b15511db20ff57bb9efd80885c","link-u-avif-sample-images/kimono.mirror-horizontal.png":"9af9e839fe6bf6342831970c20291f619570d2fc687951ae00cd81ea766f53fe","link-u-avif-sample-images/kimono.mirror-vertical.avif":"f10eb04791fcca3409868b367128649f32e6b6fffcf02484cdefa57909f6bb74","link-u-avif-sample-images/kimono.mirror-vertical.png":"4ed003c5868fd2e78c7b2dcbd54a67a0e7593dabb3ac82b1c9e5e2dbdf09b8ec","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.avif":"33c36ec2274b00ac6f81c9f61e55c20cbfce1649ad27520afe635310f516ead1","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.crop.avif":"90ca48f657455b8f8e4a4e1769a05af90a3e34dca11a8b3c32552daf378ee956","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.png":"74b9b7ffa8955761f747a0e6e81d5b7ecb5e325383546110e1b6aa9986728035","link-u-avif-sample-images/kimono.png":"84fd6cfb97a27739608e21779f874b4ae7e80342b2588e8b0b092dee2d57c881","link-u-avif-sample-images/kimono.rotate270.avif":"79a99a0415276cc11f2e871d070a9df84df3385888a2f2fa3534320f6bed98ed","link-u-avif-sample-images/kimono.rotate270.png":"1918a47c02b378945a705301abd4250ddc65bb95afce9424572ffd0fdd1f45ef","link-u-avif-sample-images/kimono.rotate90.avif":"bd1157d8c840713c82b907b9d3ae80bc3817849e11c323d875f8016e035bd3cc","link-u-avif-sample-images/kimono.rotate90.png":"1a73c61692abe96d0a7a9accdb36a83d51bceac79bbb83a00571570f494cca49","link-u-avif-sample-images/plum-blossom-large.png":"af6ea005b726ca39f342e946aa53bed88e5a140413ce896d166bb35ab0aa3b4f","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"b413440309d5669a7aefa06f291f72de0d0c09972e3da9a385e6016d6a1c5562","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.avif":"64f6f2b1fda594af5c9e2d6e4bc752b55e8121000cdcedc0066018e53f76de40","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"2b175a600aed64c1c1de4b2d661fb405437b1ff000b964d4be6ac437ce73136f","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.avif":"21ebb3732186bf7c6c13cf7197155b64201e674b9c79cf613b6e5718bde14c2a","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"65917797e511c9033b3e225eb5d84f3c0440b7a496d4b8ab5674e123ad68aab7","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.avif":"f4809df9188fa46ed100f63c78c4cf42559d90a98351a8f69e177385920672b4","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"dffc213dc36f0b5ff3d86254f5185c2d1fb03380918a8fa39d186fb59cbba7cc","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-full.avif":"0a615cfb673ab45e37da3582c17dd36f86d5da3d81246a32951d1db4ed90149d","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-limited.avif":"d1cc6a0db116a68e229676b289e8ced84d42a9f0e8d3ccd760fc92dbeb932547","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-full.avif":"8626cf0b2c60fee51cf1df7fe4d8a18081b72e3604f7d3ff14cc5a35581927d9","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-limited.avif":"56bf18e4bcbfbea460c306ab900fc506169854d2b91690e1a48156a86fff3264","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.avif":"b56f3c33797e4c5bb80418ae25f6f2c6fc88ddc1f6965d82abc44059f052f36c","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"c3c6db4ce801c68e2afd7bfb72abacc13287cc2e247917a817ff5632bd4b18fb","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.avif":"095f57fff1dc037a6414c60263415dcfa86b10d81f58e8e4c3aef17cffae0e5f","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"ba3035a69296d12f47d1c450f2de8cc0c9059ebbf27bb8b0996ff6d1ab1132a1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.avif":"a9551e1963049b874216b40aaf9be45bc44dc11887770712b77240862c6c08a9","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.avif":"6891b5bdbed7f541c673c66cec4584b191bb737a49b37cca16ae069830890b42","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.avif":"a466503110f60dcadaafe78c2cb0a8ca58334c22868efe428c7ac12b69407c95","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.avif":"061b4c70707e7fc8866580656cca7ca2da2263645829a564dbf8f205d639f058","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.avif":"4a03c8bcfcaadccdeb07432ed80680b06aba5ae5e616fc370b376acb478f6cd1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.avif":"376625ce4e7ec3b57344a9f2185a34975fe380774c9f8e0dd4ef61c46da94fca","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.avif":"1e17b7dd8e351cb667bc6ec0b81fdebca9fd30ad5e588b3eac57bf9f90a9b58b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"f77588d2ff39e4461869a95ca236efdf4a3fdc17b8a6e3907e63b417e56c81b5","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.avif":"f2eabd3fc2db07b361d55b5af63023d28b5bdd0047a665e9d0685651ce9db94b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"dd88c377b253d689bfd4600d7c3007448df0ed92f679b661d5d51e051a6916d8","link-u-avif-sample-images/plum-blossom-small.png":"c859fd97b647e494461f65835b9c1c3476807aee77076599adf18a832b3617a4","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.avif":"fe3379620f983e5da4210b0f7c5d164e86208b34106d6b11d56e2b52beee5dfe","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"9e6234686053dba2e44bb32192c641074095a61e45aa1bede85bb83751e6e157","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.avif":"60ffa59dd007aea3bb596cfb03853b3dad490b1ffd10471ad4fe1901ec819907","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"58abfa027525aca7339a705f311bc30b000aef9822c7c50b232894ece1ba9cb1","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.avif":"541ca66a11b1430d11f77b74a13f859239a3bd9f44976b8dfe163c5d7595a69f","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"6d7852c63c27a77bef94443e178ecf6b6a3da8cc846f9f0c1adc17f7fc35e1f3","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.avif":"3712216ffc7edb95a976b68469ead533fda6fe9f3d2e8cb09cbdb0d01d9c094b","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"59672af536b169ebf7e48129167dc91cb253925517c37db28b64539f7afba5d3","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-full.avif":"561d5158425ad39425916a3be048b0202e82efef44cf1a9f711db57192d2ff01","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-limited.avif":"88336f29457c1dc4ae0b754ef14b791de4d8c337f2b44d7960aafcca08a5586e","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-full.avif":"245a3dad6371dc702f29eb7e9735f843b63c525da871859728bedbe5bb274985","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-limited.avif":"490c216b5850c670f6088ee72c7fd906102b2dd0c8432c01a517b3328db27c75","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.avif":"0d0bbbcb0c9ade1c827317a6409ce6ba25027b36da1b6752379a5f5d4c8af056","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"418a9d4b7dcbc1f67fc4b95ccb2e7946c446fddd35a79f0d587b3f2165cb3f14","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.avif":"a41dcfabb3795ed93a05881a91bf4d1c5d1b9b0e5d0db728f12684b12613e0c9","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"4b6a18f4f608d1b00598e67c1c91a4e8f4943ae5acf0166ae0121cc21f3b7437","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.avif":"5e6b83adee3aeac4bba3f38e854e2ed7585aa1557a74b5fa66596098c53e26f2","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.avif":"f42e780bff644167e27525fee65b23e70814f7665ea19b6d693eb127c5eeebd8","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.avif":"c6ee9234ee7783d0203f9512e3cc8fe76a694675bcf03c320ff8bab4684bd4e9","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.avif":"21e1e51fc6da66e090e12e1df5aeabf1f478df64bcb8151caaa687ad262bdd9d","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.avif":"dfed73d646d7159d3ee4f9ce95ea628fdd33bf8bf1bb02a83d88302d088f4d97","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.avif":"5539cd575256772ba31d6e87cb0136d5f465f84b041a4677b1023cfd6bee9956","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.avif":"f205cf2c05265b84e45ceb723e9a3707fd8749130166d4797e64c8c62b497f8c","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"ad2244cb7b2ac487a5104d6e5a07270f9ceb2550e4d56d3662fcc1868910ced5","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.avif":"7ef9468effdc970e4e6e8cc7533d66dc967686e357dda3dda186c021f9e6156b","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"3dd34d854ff83b6e27a2bf98301380a6cac272084ed863735285ab5dc8acda00","link-u-avif-sample-images/plum-blossom.svg":"be1f03dd05f63292c85a96b1c48fb06727283610cc69b1e116d547bab27b171d","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-10bpc.avif":"5842951d81118d256962384e08a986816e8ade6b05530269f0208c6b69cedb3b","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-12bpc.avif":"1f0c9f36d69b9aa13eff3897ada3e78b81099c613b329a402c27e09453e7e261","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-8bpc.avif":"3e6f2f4016e66e3c94707eaa8373e6f582321e005964cd35b64bc183e1bf10ea","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-lossy.avif":"79483242f2dca12c4ec18bd33ff8099216b3094fb55a26a909f046b2f9b4ce58","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.jpg":"d56f809ea5eda74578af57e2f80b41856a1fe2ff436c741aa58757387af998bd","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.png":"4eab95e358eb48e052c7b8c94d30a8c6cb1c9c3c2dfd9845240281dd5dd7b800","link-u-avif-sample-images/scripts/compare.sh":"0562689bcd40e9fc1322bf037d6f999aa4406a2229f19e74b96cc450e370e429","link-u-avif-sample-images/star-10bpc-with-alpha.avifs":"5643ac1f235ae6599186dd66c66507db6fa46a17b2b18e82ea9344870eb98a9b","link-u-avif-sample-images/star-10bpc.avifs":"c61d899a59dbd8c7b2f7bcfca9069a0e13ff1606899af227938a28502e6cbf88","link-u-avif-sample-images/star-12bpc-with-alpha.avifs":"88a350c3550ce36c1777fe7eb1e906c6829d3ed8b241aa1e0e46f1a4e2567c4b","link-u-avif-sample-images/star-12bpc.avifs":"c1a59db6f180208a3177d77c7f9ab08290e903c7bdaf929331b807a510f8c619","link-u-avif-sample-images/star-8bpc-with-alpha.avifs":"13a12908cb162a855cccc9221a5f9f736e8ea07902ffbdcf007f8fde5ed255f2","link-u-avif-sample-images/star-8bpc.avifs":"ae35b161de67a5afeb195ee401f369c34990f0ff8662f70ab4065bc6931f0a66","link-u-avif-sample-images/star.gif":"389cdd02efbdce4f0205cae6e91c1f64e34fa0ca1fe02351da1b37e16cbb642a","link-u-avif-sample-images/star.input.txt":"970163b942843618616f42233abe91d40fb68f6f5451860db259551711867b55","link-u-avif-sample-images/star.png":"18569167cf7ebd265ab6973d071d259aacfbb46c0408b7d4874c8cc9df9bb1ad","link-u-avif-sample-images/star.svg":"13089d0986b31b87919029fa69f2b68981af4023306bf0f79922f6772396008a","link-u-avif-sample-images/star180.png":"21bc11be2b51334fe4589634507612e7edce96d36e6a99219d029e440164e8b8","link-u-avif-sample-images/star270.png":"5c93f538dcdc70840b9925b4089083acc9c25e95265b3f3dea18d695451b441e","link-u-avif-sample-images/star90.png":"2defc5d21e70447653fec5dc14a697d9dd555d7a0c14e79cb2d9f80796a51a6d","src/boxes.rs":"270a3e3bf90279bfc83f95acadaba9611c25243280bca71dfa9c044d5441cf15","src/lib.rs":"a88d6cc10ec1322b53a8f4c782b5133135ace0fdfcf03d1624b768788e17be0f","src/macros.rs":"76c840f9299797527fe71aa5b378ffb01312767372b45cc62deddb19775400ae","src/tests.rs":"75fe5467109242b2cc7991f8228e2e2ad1de5be2f29272a4a7f08c4e21ab5fa4","src/unstable.rs":"c2cef9a3b2b08a4da66fa0305fce7a117bd99c9b8d57b0a044e1d99dbda6faf5","tests/1x1-black-alpha-50pct-premultiplied.avif":"31a8c235bf2cf601a593a7bc33f7f2779f2d5b2e0cd145897b931fce94b0c0b8","tests/a1lx.avif":"81a784c568e7619bd47c4e7153181e9a86c8a03221097aa63979f97affd7efbb","tests/a1op.avif":"184e50efd3ad226800c610da7bc470d29b548d9fa942fd1fd1848ed02e2e5f0a","tests/alpha_video_avif_major_avis_compatible.avif":"81771981248c4e0d708f0828eadb20e9e37e7c21280efe5726666958f899c237","tests/alpha_video_fixed.avif":"67051d1a4ccf9f3e38d4514d8a6b3a2e07f1beb979369cabdc60881a698a36ac","tests/alpha_video_no_avis.avif":"a95f0e7c818bc5bf646143cf43474b70722e17669d4f2a32874c125936207d6a","tests/amr_nb_1f.3gp":"d1423e3414ad06b69f8b58d5c916ec353ba2d0402d99dec9f1c88acc33b6a127","tests/amr_wb_1f.3gp":"be635b24097e8757b0c04d70ab28e00417ca113e86108b6c269b79b64b89bcd5","tests/av1C-missing-essential.avif":"a1501254c4071847b2269fe40b81409c389ff14e91cf7c0005a47e6ea97a6803","tests/bad-ipma-flags.avif":"ecde7997b97db1910b9dcc7ca8e3c8957da0e83681ea9008c66dc9f12b78ad19","tests/bad-ipma-version.avif":"7f9a1a0b4ebbf8d800d22eaae5ff78970cc6b811317db6c1467c6883952b7c9b","tests/bbb_sunflower_QCIF_30fps_h263_noaudio_1f.3gp":"03e5b1264d0a188d77b9e676ba3ce23a801b17aaa11c0343dfd851d6ea4e3a40","tests/clap-basic-1_3x3-to-1x1.avif":"83af9c8196fa93b2475163585a23d0eb5a8f8015d0db8da7a5d6de61adfb1876","tests/clap-missing-essential.avif":"4d61aacd2327661a456abc76d3d490e5ddd2b6f8cbfa52922a6c541c9d983193","tests/clusterfuzz-testcase-minimized-mp4-6093954524250112":"af7044a470732d4e7e34ac7ab5ff038c58b66f09702cbcd774931d7766bbfd35","tests/corrupt/a1lx-marked-essential.avif":"0d481240222450827ea335ae9a1a300777a0db4f9b0f4c17ed77c758c5133fa3","tests/corrupt/a1op-missing-essential.avif":"33c24d54f43f1a7be7a8334718881c8a0de24730c997c7842b9d7140e75017ea","tests/corrupt/alpha_video_moov_is_moop.avif":"89e0091edd6efc2c5b163525553c5abc56263fe1b3b885184bb07b9ea4bf346d","tests/corrupt/bug-1655846.avif":"e0a5a06225800fadf05f5352503a4cec11af73eef705c43b4acab5f4a99dea50","tests/corrupt/bug-1661347.avif":"31c26561e1d9eafb60f7c5968b82a0859d203d73f17f26b29276256acee12966","tests/corrupt/clusterfuzz-testcase-minimized-avif-4914209301856256.avif":"34a142c7916e314881f3fb6394add1c543fac0e5b45109e3a425eeb4c68998d0","tests/corrupt/hdlr-not-first.avif":"2c29308af077209b9c984921b7e36f8fb7ca7cf379cf8eba4c7a91f65bc7a304","tests/corrupt/hdlr-not-pict.avif":"9fe37619606645a95725300a9e34fada9190d1e0b3919881db84353941ca9291","tests/corrupt/imir-before-clap.avif":"22d6b5dacf0ef0be59053beba7564b08037fed859ada2885e3476e0ff0d19c95","tests/corrupt/invalid-avif-colr-multiple-nclx.avif":"7990a995855120dc4f724a6098816595becc35077fcd9e0de8c68300b49c4f1f","tests/corrupt/invalid-avif-colr-multiple-prof.avif":"b077a6b58e3a13ad743ee3f19fbae53b521eab8727606e0dba9bf06384f3121c","tests/corrupt/invalid-avif-colr-multiple-rICC.avif":"88b24d4d588744b9f2cdc03944f28283e9315eb3de7d7d57773a0541137f6529","tests/corrupt/invalid-avif-colr-multiple.zip":"9abddcbc47fde6da20263a29b770c6a9e76c8ab8dc785ef8512f35d9cb3206ed","tests/corrupt/ipma-duplicate-item_id.avif":"ca8c5275b0b8b79c1068489a52d0a5c8f0b4453463971e72b694189f11c10745","tests/corrupt/ipma-duplicate-version-and-flags.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","tests/corrupt/ipma-invalid-property-index.avif":"2480e773fa716d22883032d05fd4cf2c6b00fba8796cf4ff286a5d1ba26adff6","tests/corrupt/lsel-missing-essential.avif":"43c3b1e4c4acecd7559a9a7197a7befd43c71705748f0f8c063bca3be1c6d074","tests/corrupt/no-alpha-av1C.avif":"ad3d34d6331db7d9bea0c5f37efb88923520e33e08e7c636a5df435a4575eae7","tests/corrupt/no-av1C.avif":"eeb4fc50930c91465999f787c4a2a3b12de20556da0857be72da5a1a9eaa3f01","tests/corrupt/no-ftyp.avif":"74b431f32b2e2761e77df7fdb260f623b4e8f7e3f4c8af8a42d6826911706d7b","tests/corrupt/no-hdlr.avif":"91a1eb70c7b6adf2104e471d7deeeb98084a591d64ce09ba106c27edfbc3a409","tests/corrupt/no-ispe.avif":"4b6edfd8c9b40c25dc40305a6057e32b5e65f40da4a9d810c58dbff53254113f","tests/corrupt/no-pitm.avif":"7960eeb9e6e5140fbe5eb6d281e6974efd6c3c0147562f3dcf06f6b009dc540a","tests/corrupt/no-pixi-for-alpha.avif":"f8adc3573c79ee25bf6d4dd2693c61661469b28f86a5c7b1d9e41b0e8d2d53bb","tests/corrupt/no-pixi.avif":"4b1776def440dc8b913c170e4479772ee6bbb299b8679f7c564704bd03c9597e","tests/hdlr-nonzero-reserved.avif":"b872dcd7b4f49c6808d6da109cf4fedc26a237c42e8529c5aa8f7130abaf40a9","tests/imir-missing-essential.avif":"b1226e4b1358528befbd3f1126b5caf0c5051b4354777b87e71f6001f3829f87","tests/invalid-avif-hdlr-name-multiple-nul.avif":"0d3e4a6ce42154ee288c18339c2b59ff2104fd890cd2d616e5dbf26375a90e98","tests/irot-missing-essential.avif":"b7da1fc1d1b45bb1b7ca3494476e052f711d794a6d010df6870872ed8b9da10e","tests/lsel.avif":"ef8ba6827709f48cd45f749efb580129162d9599ea98f3363d2140957502d806","tests/multiple-extents.avif":"b5549ac68793e155a726d754e565cea0da03fa17833d3545f45c79e13f4c9360","tests/no-mif1.avif":"1442aa6ffaeb9512724287768bfd1850d3aa29a651ef05abb33e5dec2b3ee5c2","tests/overflow.rs":"16b591d8def1a155b3b997622f6ea255536870d99c3d8f97c51755b77a50de3c","tests/public.rs":"8918d5190a36c697445aa4b140a31cd3032582f1e504b4c2527f75a2155f80ae","tests/valid-alpha.avif":"9d417a35b9b62ad3ff66ffbc55f16552aacf821a092aa5ef4adff7e746bd4c2f","tests/valid-avif-colr-nclx-and-prof-and-rICC.avif":"ab6f5e786d26f8bcade5993f8b9cca3cd004a3d7fcec76e829f5d0f98cb18e7b","tests/valid-avif-colr-nclx-and-prof.avif":"0e982818de61869fcb85a2a4c2b7b8aeecb3053cbfdc6276987f91204998eefb","tests/valid-avif-colr-nclx-and-rICC.avif":"8530ef1305ff956a0c2912d0b3d1e0fc3a68cf3103e70b04cc2574530389b030","tests/valid-avif-colr-nclx.avif":"345ab58b7b1cb48aba2e21eb8dc5ab0a751a78a752ce1896c59b4bf361992f38","tests/valid-avif-colr-prof-and-rICC.avif":"1f0f085141106885bda78b0879c768818420d8196b39440a36578456a7d50a6c","tests/valid-avif-colr-prof.avif":"5d7aaefb5204ebe1cc296456866b8e46e023748b921a38ee56fd6c776a9733ff","tests/valid-avif-colr-rICC.avif":"e1c7b49bfad5904b484bd5118e6b33b78e2dc708a31a10fcbb0e4a373ed8dbb7","tests/valid.avif":"f0b33e09bf01232e0877df325f47986c0bee7764f2a81c9c908ae109e7dc63c4"},"package":null}
-\ No newline at end of file
---- thunderbird-102.11.1/third_party/rust/mp4parse/src/lib.rs.mp4parse-rust-8b5b652d38e007e736bb442ccd5aa5ed699db100	2023-05-24 00:50:52.000000000 +0200
-+++ thunderbird-102.11.1/third_party/rust/mp4parse/src/lib.rs	2023-06-08 14:17:40.193695212 +0200
-@@ -3184,8 +3184,13 @@ macro_rules! impl_mul {
-             type Output = $output;
- 
-             fn mul(self, rhs: $rhs) -> Self::Output {
--                static_assertions::const_assert!(<$output>::MAX <= <$inner>::MAX as u64);
--                static_assertions::const_assert!(<$lhs>::MAX * <$rhs>::MAX <= <$output>::MAX);
-+                static_assertions::const_assert!(
-+                    <$output as UpperBounded>::MAX <= <$inner>::MAX as u64
-+                );
-+                static_assertions::const_assert!(
-+                    <$lhs as UpperBounded>::MAX * <$rhs as UpperBounded>::MAX
-+                        <= <$output as UpperBounded>::MAX
-+                );
- 
-                 let lhs: $inner = self.get().into();
-                 let rhs: $inner = rhs.get().into();
diff --git a/rust-bindgen-2319-2339.patch b/rust-bindgen-2319-2339.patch
deleted file mode 100644
index fcf2ae0..0000000
--- a/rust-bindgen-2319-2339.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- thunderbird-102.11.1/third_party/rust/bindgen/.cargo-checksum.json.rust-bindgen-2319-2339	2023-05-24 00:50:52.000000000 +0200
-+++ thunderbird-102.11.1/third_party/rust/bindgen/.cargo-checksum.json	2023-06-07 01:11:35.838302019 +0200
-@@ -1 +1 @@
--{"files":{"Cargo.lock":"836e8f8431bd4ebdac9b1251676f6afa755757e401455259fe659e7280be8230","Cargo.toml":"3a585a6e27a177f08dedcb21f7d555e9db58fa158203273b228db91ebee4e6b3","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"29fe30d7a2729922b13a578bc8f5eedc808fd0f2ef67a3f12017548baf8f293a","build.rs":"3fe1e534c99df4ee207606794f133fb187c0948e055389f74c904994ecaed38a","csmith-fuzzing/README.md":"7107b70fedb0c0a0cadb3c439a49c1bd0119a6d38dc63b1aecc74d1942256ef2","src/callbacks.rs":"1e5a118b94977938751758ac0495b1d41ce5e280c066614a4a7cbd930f326350","src/clang.rs":"aa0644278a8319506be08904c0f6706fbcdcd72eb1e85564b8c7488bd810e126","src/codegen/bitfield_unit.rs":"a8fb1a2d97a99685106fcaac87d2013f79d2690d6a46ff05ad1e3629b6075664","src/codegen/bitfield_unit_tests.rs":"dd252134118450800b516e375c872e17b4c1aee63a7b8adbe5b2cd53434bbc7e","src/codegen/dyngen.rs":"15149bc927e5b2706f93e52a6b26ef55384b3baf40bfc9bc4343e9820479f26b","src/codegen/error.rs":"5e308b8c54b68511fc8ea2ad15ddac510172c4ff460a80a265336440b0c9653d","src/codegen/helpers.rs":"ea83104addb8af31736aaeb850e10c694cd434befe7ffaaa206208f722d72c58","src/codegen/impl_debug.rs":"1ff9ec754b610c98c757b114c6509473ead0e1a9375e9089a7fa40a41a753709","src/codegen/impl_partialeq.rs":"5e526fd88dd15dd1f04addd3c6ecea1d3da92293fadf04346d6c716791f436f9","src/codegen/mod.rs":"19fd11feefab0ff9ecaf8a01583583008269adce805508fb61b9a8acc49da586","src/codegen/struct_layout.rs":"b62c3569dcfb011daa4d09f1aa9eb732da69546c3deb9f247fa8ce7114dbc7b9","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"fafb85510b1dfc9a41ed71f7d765fca49b236deb4ee567e00204e751362aaf23","src/ir/analysis/derive.rs":"ff4821d810961696008a57ae496f95ebcdc14b4c439fe87d78a84817442fa759","src/ir/analysis/has_destructor.rs":"d9a3a24bd4cabc87cddb0c76d27da1691f8f37ffb8eadf5b5975a1c44dea99c2","src/ir/analysis/has_float.rs":"5242cc07ec4d4bdf5a792e1f8ee5758a87838314917d42dbb9dcfc19620520ce","src/ir/analysis/has_type_param_in_array.rs":"ec3fb67f782abb4c866da91bce3f7ee6f8e2310c47a54065282431b909233f7d","src/ir/analysis/has_vtable.rs":"63e2d0f62171811893615c11453bc7b39438d0d83c3eb444dec2346140d86efe","src/ir/analysis/mod.rs":"2c54f0cd6f3d86cf3fcb07d9d0be06cde839cab4170671c80d806a3f27820faf","src/ir/analysis/sizedness.rs":"17f1f2b6affd025f73853b9b5a76b3f157b5f9e563e9eaa374735fcb84c13308","src/ir/analysis/template_params.rs":"da949976a7fd04d6fc564ea6a77dfdbf4f5bf05db64687ed7a0616cba598a42d","src/ir/annotations.rs":"1c931d7bbba1e1613e9cccaab58d14f75e79b831b5c881e41f5b5257a9cbced7","src/ir/comment.rs":"31d64a49ae3d9c3c348fa2539e03306ca3a23fae429cab452e42b31ecf632145","src/ir/comp.rs":"abaa90e27dc6416f1b8db003f87888e7651d5b46c4d4526153980e5621612e54","src/ir/context.rs":"3a76458a5aa74075a60a5cd752ed59ad3943054f55b017700389f78072935215","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"e25ff72ac174a798894c9673d81bdfb86fa9f4228b34a14ce0dc741a186a52bd","src/ir/enum_ty.rs":"e49e3c6ffc0289584e2f836fe56a4b7ebf6ca3f8b602248141d67b9f533770cc","src/ir/function.rs":"aa454ace56bda8074b2865933282aa124624310c8bc0c994d454f5799f4e88be","src/ir/int.rs":"68a86182743ec338d58e42203364dc7c8970cb7ec3550433ca92f0c9489b4442","src/ir/item.rs":"a71bdacc7419ec86d52ac534158cf4bfa4600e9cbc214c0075766700f5b053b0","src/ir/item_kind.rs":"7666a1ff1b8260978b790a08b4139ab56b5c65714a5652bbcec7faa7443adc36","src/ir/layout.rs":"755e3787c262de434a53a8c326f0e825f95415ed6b0f925c1cddf208ca8e3bc4","src/ir/mod.rs":"713cd537434567003197a123cbae679602c715e976d22f7b23dafd0826ea4c70","src/ir/module.rs":"70cf6ddfeabe6cdc13fdc767c783216c073404848d827e85fc6c2de3a19b5c3f","src/ir/objc.rs":"195fb2a3e4371b90244f3a8f295fd80cc77e0f2daf8fd27e3d8e5b78bd6b55d6","src/ir/template.rs":"44bd7214cf1e7f70e60694115082aac5b8a6c1687fff584cd08cdcfadabc5734","src/ir/traversal.rs":"5ac088277f4dfe2918d81b9294aaee41fd83db8e46def66a05f89de078bf4c49","src/ir/ty.rs":"8f2b970da76850685c4d334289af6dede7742862d7a81f2236115afaa1a92fa9","src/ir/var.rs":"86e9f19403fb9231ba60dec0a04e5b56fe28a37c7a5e6f676c978789c9d93c5a","src/lib.rs":"ed2d0aeb48b28b4a96b8e76a10e00b10cb6cc32c0a686d536f9021463b7ee0e8","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"74e582c37b146090332b1496f5b4bca02c7629d03a4ae40302cb4a723f08e445","src/options.rs":"119358b741601dafc13560856f6e4b4f78b6cd2b19067893c2672ba8f5dc6de1","src/parse.rs":"4ffc54415eadb622ee488603862788c78361ef2c889de25259441a340c2a010f","src/regex_set.rs":"6c46357fb1ee68250e5e017cbf691f340041489ae78599eee7a5665a6ddce27f","src/time.rs":"8efe317e7c6b5ba8e0865ce7b49ca775ee8a02590f4241ef62f647fa3c22b68e"},"package":"2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239"}
-\ No newline at end of file
-+{"files":{"Cargo.lock":"836e8f8431bd4ebdac9b1251676f6afa755757e401455259fe659e7280be8230","Cargo.toml":"3a585a6e27a177f08dedcb21f7d555e9db58fa158203273b228db91ebee4e6b3","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"29fe30d7a2729922b13a578bc8f5eedc808fd0f2ef67a3f12017548baf8f293a","build.rs":"3fe1e534c99df4ee207606794f133fb187c0948e055389f74c904994ecaed38a","csmith-fuzzing/README.md":"7107b70fedb0c0a0cadb3c439a49c1bd0119a6d38dc63b1aecc74d1942256ef2","src/callbacks.rs":"1e5a118b94977938751758ac0495b1d41ce5e280c066614a4a7cbd930f326350","src/clang.rs":"30fdc473ff70dcbc394927d6fb674d70a62c1a3847e855becd988dc476997815","src/codegen/bitfield_unit.rs":"a8fb1a2d97a99685106fcaac87d2013f79d2690d6a46ff05ad1e3629b6075664","src/codegen/bitfield_unit_tests.rs":"dd252134118450800b516e375c872e17b4c1aee63a7b8adbe5b2cd53434bbc7e","src/codegen/dyngen.rs":"15149bc927e5b2706f93e52a6b26ef55384b3baf40bfc9bc4343e9820479f26b","src/codegen/error.rs":"5e308b8c54b68511fc8ea2ad15ddac510172c4ff460a80a265336440b0c9653d","src/codegen/helpers.rs":"ea83104addb8af31736aaeb850e10c694cd434befe7ffaaa206208f722d72c58","src/codegen/impl_debug.rs":"1ff9ec754b610c98c757b114c6509473ead0e1a9375e9089a7fa40a41a753709","src/codegen/impl_partialeq.rs":"5e526fd88dd15dd1f04addd3c6ecea1d3da92293fadf04346d6c716791f436f9","src/codegen/mod.rs":"19fd11feefab0ff9ecaf8a01583583008269adce805508fb61b9a8acc49da586","src/codegen/struct_layout.rs":"b62c3569dcfb011daa4d09f1aa9eb732da69546c3deb9f247fa8ce7114dbc7b9","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"fafb85510b1dfc9a41ed71f7d765fca49b236deb4ee567e00204e751362aaf23","src/ir/analysis/derive.rs":"ff4821d810961696008a57ae496f95ebcdc14b4c439fe87d78a84817442fa759","src/ir/analysis/has_destructor.rs":"d9a3a24bd4cabc87cddb0c76d27da1691f8f37ffb8eadf5b5975a1c44dea99c2","src/ir/analysis/has_float.rs":"5242cc07ec4d4bdf5a792e1f8ee5758a87838314917d42dbb9dcfc19620520ce","src/ir/analysis/has_type_param_in_array.rs":"ec3fb67f782abb4c866da91bce3f7ee6f8e2310c47a54065282431b909233f7d","src/ir/analysis/has_vtable.rs":"63e2d0f62171811893615c11453bc7b39438d0d83c3eb444dec2346140d86efe","src/ir/analysis/mod.rs":"2c54f0cd6f3d86cf3fcb07d9d0be06cde839cab4170671c80d806a3f27820faf","src/ir/analysis/sizedness.rs":"17f1f2b6affd025f73853b9b5a76b3f157b5f9e563e9eaa374735fcb84c13308","src/ir/analysis/template_params.rs":"da949976a7fd04d6fc564ea6a77dfdbf4f5bf05db64687ed7a0616cba598a42d","src/ir/annotations.rs":"1c931d7bbba1e1613e9cccaab58d14f75e79b831b5c881e41f5b5257a9cbced7","src/ir/comment.rs":"31d64a49ae3d9c3c348fa2539e03306ca3a23fae429cab452e42b31ecf632145","src/ir/comp.rs":"232300be66abbbc3d7ef948c24f000dd8a50d78e72aa0e4b2cc43ffd4f800226","src/ir/context.rs":"3a76458a5aa74075a60a5cd752ed59ad3943054f55b017700389f78072935215","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"e25ff72ac174a798894c9673d81bdfb86fa9f4228b34a14ce0dc741a186a52bd","src/ir/enum_ty.rs":"e49e3c6ffc0289584e2f836fe56a4b7ebf6ca3f8b602248141d67b9f533770cc","src/ir/function.rs":"aa454ace56bda8074b2865933282aa124624310c8bc0c994d454f5799f4e88be","src/ir/int.rs":"68a86182743ec338d58e42203364dc7c8970cb7ec3550433ca92f0c9489b4442","src/ir/item.rs":"a71bdacc7419ec86d52ac534158cf4bfa4600e9cbc214c0075766700f5b053b0","src/ir/item_kind.rs":"7666a1ff1b8260978b790a08b4139ab56b5c65714a5652bbcec7faa7443adc36","src/ir/layout.rs":"755e3787c262de434a53a8c326f0e825f95415ed6b0f925c1cddf208ca8e3bc4","src/ir/mod.rs":"713cd537434567003197a123cbae679602c715e976d22f7b23dafd0826ea4c70","src/ir/module.rs":"70cf6ddfeabe6cdc13fdc767c783216c073404848d827e85fc6c2de3a19b5c3f","src/ir/objc.rs":"195fb2a3e4371b90244f3a8f295fd80cc77e0f2daf8fd27e3d8e5b78bd6b55d6","src/ir/template.rs":"44bd7214cf1e7f70e60694115082aac5b8a6c1687fff584cd08cdcfadabc5734","src/ir/traversal.rs":"5ac088277f4dfe2918d81b9294aaee41fd83db8e46def66a05f89de078bf4c49","src/ir/ty.rs":"8d7e7883316245c54e5dfa2fd150df1be2dc559c7df0828da736dd6b18d2165b","src/ir/var.rs":"1e7be8eedba72effa995b48c581504e61e407867d8794a8528975688742b0420","src/lib.rs":"ed2d0aeb48b28b4a96b8e76a10e00b10cb6cc32c0a686d536f9021463b7ee0e8","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"74e582c37b146090332b1496f5b4bca02c7629d03a4ae40302cb4a723f08e445","src/options.rs":"119358b741601dafc13560856f6e4b4f78b6cd2b19067893c2672ba8f5dc6de1","src/parse.rs":"4ffc54415eadb622ee488603862788c78361ef2c889de25259441a340c2a010f","src/regex_set.rs":"6c46357fb1ee68250e5e017cbf691f340041489ae78599eee7a5665a6ddce27f","src/time.rs":"8efe317e7c6b5ba8e0865ce7b49ca775ee8a02590f4241ef62f647fa3c22b68e"},"package":"2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239"}
-\ No newline at end of file
---- thunderbird-102.11.1/third_party/rust/bindgen/src/clang.rs.rust-bindgen-2319-2339	2023-05-24 00:50:51.000000000 +0200
-+++ thunderbird-102.11.1/third_party/rust/bindgen/src/clang.rs	2023-06-07 00:59:18.845709213 +0200
-@@ -54,6 +54,11 @@ impl Cursor {
-         unsafe { clang_isDeclaration(self.kind()) != 0 }
-     }
- 
-+    /// Is this cursor's referent an anonymous record or so?
-+    pub fn is_anonymous(&self) -> bool {
-+        unsafe { clang_Cursor_isAnonymous(self.x) != 0 }
-+    }
-+
-     /// Get this cursor's referent's spelling.
-     pub fn spelling(&self) -> String {
-         unsafe { cxstring_into_string(clang_getCursorSpelling(self.x)) }
---- thunderbird-102.11.1/third_party/rust/bindgen/src/ir/comp.rs.rust-bindgen-2319-2339	2023-05-24 00:50:52.000000000 +0200
-+++ thunderbird-102.11.1/third_party/rust/bindgen/src/ir/comp.rs	2023-06-07 00:59:18.846709211 +0200
-@@ -1372,8 +1372,7 @@ impl CompInfo {
- 
-                     // A declaration of an union or a struct without name could
-                     // also be an unnamed field, unfortunately.
--                    if cur.spelling().is_empty() &&
--                        cur.kind() != CXCursor_EnumDecl
-+                    if cur.is_anonymous() && cur.kind() != CXCursor_EnumDecl
-                     {
-                         let ty = cur.cur_type();
-                         let offset = cur.offset_of_field().ok();
---- thunderbird-102.11.1/third_party/rust/bindgen/src/ir/ty.rs.rust-bindgen-2319-2339	2023-05-24 00:50:52.000000000 +0200
-+++ thunderbird-102.11.1/third_party/rust/bindgen/src/ir/ty.rs	2023-06-07 00:59:18.847709209 +0200
-@@ -737,7 +737,12 @@ impl Type {
- 
-         let layout = ty.fallible_layout(ctx).ok();
-         let cursor = ty.declaration();
--        let mut name = cursor.spelling();
-+        let is_anonymous = cursor.is_anonymous();
-+        let mut name = if is_anonymous {
-+            None
-+        } else {
-+            Some(cursor.spelling()).filter(|n| !n.is_empty())
-+        };
- 
-         debug!(
-             "from_clang_ty: {:?}, ty: {:?}, loc: {:?}",
-@@ -771,7 +776,7 @@ impl Type {
-             if is_canonical_objcpointer && is_template_type_param {
-                 // Objective-C generics are just ids with fancy name.
-                 // To keep it simple, just name them ids
--                name = "id".to_owned();
-+                name = Some("id".to_owned());
-             }
-         }
- 
-@@ -900,7 +905,7 @@ impl Type {
-                                         return Err(ParseError::Recurse);
-                                     }
-                                 } else {
--                                    name = location.spelling();
-+                                    name = Some(location.spelling());
-                                 }
- 
-                                 let complex = CompInfo::from_ty(
-@@ -942,7 +947,7 @@ impl Type {
-                                                 CXType_Typedef
-                                             );
- 
--                                            name = current.spelling();
-+                                            name = Some(location.spelling());
- 
-                                             let inner_ty = cur
-                                                 .typedef_type()
-@@ -1126,10 +1131,10 @@ impl Type {
-                 CXType_Enum => {
-                     let enum_ = Enum::from_ty(ty, ctx).expect("Not an enum?");
- 
--                    if name.is_empty() {
-+                    if !is_anonymous {
-                         let pretty_name = ty.spelling();
-                         if clang::is_valid_identifier(&pretty_name) {
--                            name = pretty_name;
-+                            name = Some(pretty_name);
-                         }
-                     }
- 
-@@ -1144,12 +1149,12 @@ impl Type {
-                     )
-                     .expect("Not a complex type?");
- 
--                    if name.is_empty() {
-+                    if !is_anonymous {
-                         // The pretty-printed name may contain typedefed name,
-                         // but may also be "struct (anonymous at .h:1)"
-                         let pretty_name = ty.spelling();
-                         if clang::is_valid_identifier(&pretty_name) {
--                            name = pretty_name;
-+                            name = Some(pretty_name);
-                         }
-                     }
- 
-@@ -1189,7 +1194,9 @@ impl Type {
-                 CXType_ObjCClass | CXType_ObjCInterface => {
-                     let interface = ObjCInterface::from_ty(&location, ctx)
-                         .expect("Not a valid objc interface?");
--                    name = interface.rust_name();
-+                    if !is_anonymous {
-+                        name = Some(interface.rust_name());
-+                    }
-                     TypeKind::ObjCInterface(interface)
-                 }
-                 CXType_Dependent => {
-@@ -1207,7 +1214,7 @@ impl Type {
-             }
-         };
- 
--        let name = if name.is_empty() { None } else { Some(name) };
-+        name = name.filter(|n| !n.is_empty());
- 
-         let is_const = ty.is_const() ||
-             (ty.kind() == CXType_ConstantArray &&
---- thunderbird-102.11.1/third_party/rust/bindgen/src/ir/ty.rs.rust-bindgen-2319-2339
-+++ thunderbird-102.11.1/third_party/rust/bindgen/src/ir/ty.rs
-@@ -1145,8 +1145,7 @@ impl Type {
-                         location,
-                         None,
-                         ctx,
--                    )
--                    .expect("Not able to resolve vector element?");
-+                    )?;
-                     TypeKind::Vector(inner, ty.num_elements().unwrap())
-                 }
-                 CXType_ConstantArray => {
---- thunderbird-102.11.1/third_party/rust/bindgen/src/ir/var.rs.rust-bindgen-2319-2339
-+++ thunderbird-102.11.1/third_party/rust/bindgen/src/ir/var.rs
-@@ -293,11 +293,11 @@ impl ClangSubItemParser for Var {
-                 let ty = match Item::from_ty(&ty, cursor, None, ctx) {
-                     Ok(ty) => ty,
-                     Err(e) => {
--                        assert_eq!(
--                            ty.kind(),
--                            CXType_Auto,
-+                        assert!(
-+                            matches!(ty.kind(), CXType_Auto | CXType_Unexposed),
-                             "Couldn't resolve constant type, and it \
--                             wasn't an nondeductible auto type!"
-+                             wasn't an nondeductible auto type or unexposed \
-+                             type!"
-                         );
-                         return Err(e);
-                     }

From d6489329debdc29bdb2cca0125186e52a6d3a74f Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 20 Sep 2025 16:18:15 +0200
Subject: [PATCH 456/473] Apply Patch7

---
 icecat.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index c4eff6e..e03cd37 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -318,6 +318,8 @@ and translations langpack add-ons.
 # Copy license files
 tar -xf %{SOURCE5}
 
+%patch -P 7 -p 1 -b .frozen
+
 # Fedora patches
 %if 0%{?fedora}
 %patch -P 221 -p 1 -b .firefox-nss-addon-hack

From e6e6897ae4d16b5bea60844e11c6b57a6758c2c1 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 20 Sep 2025 16:42:30 +0200
Subject: [PATCH 457/473] Remove useless flag on s390x

---
 icecat.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index e03cd37..ce2e3d5 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -395,9 +395,6 @@ echo "ac_add_options --disable-optimize" >> .mozconfig
 echo "ac_add_options --enable-rust-debug" >> .mozconfig
 %else
 %global optimize_flags "none"
-%ifarch s390x
-%define optimize_flags " -fno-schedule-insns"
-%endif
 %if %{?optimize_flags} != "none"
 echo 'ac_add_options --enable-optimize=%{?optimize_flags}' >> .mozconfig
 %else

From 92658a248fa01af0dd1c705d79bc5dbb0cc6e4ff Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 20 Sep 2025 17:33:19 +0200
Subject: [PATCH 458/473] Use clang19+LTO+PGO

---
 icecat.spec | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index ce2e3d5..2cf195c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -22,9 +22,9 @@ ExcludeArch: %{ix86} %{arm}
 
 # Build PGO+LTO on x86_64 and aarch64 only due to build issues
 # on other arches.
-%ifarch x86_64
+%ifarch x86_64 %{arm64}
 %if 0%{?release_build}
-%global build_with_pgo 0
+%global build_with_pgo 1
 %global pgo_wayland    0
 %else
 %global build_with_pgo 0
@@ -38,7 +38,7 @@ ExcludeArch: %{ix86} %{arm}
 %endif
 
 # Disable LTO to work around rhbz#1883904
-%define _lto_cflags %{nil}
+#define _lto_cflags #{nil}
 ####################
 
 # Active/Deactive language files handling
@@ -229,15 +229,16 @@ BuildRequires: pkgconfig(libcurl)
 BuildRequires: pulseaudio-libs-devel
 %endif
 BuildRequires: llvm
-%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
-BuildRequires:  clang
-BuildRequires:  clang-libs
-BuildRequires:  llvm-devel
-%global llvm_suffix -20
+%if 0%{?fedora} >= 42 || 0%{?rhel} >= 10
+BuildRequires:  clang19
+BuildRequires:  clang19-libs
+BuildRequires:  llvm19-devel
+%global llvm_suffix -19
 %else
-BuildRequires:  clang
-BuildRequires:  clang-libs
-BuildRequires:  llvm-devel
+BuildRequires:  clang17
+BuildRequires:  clang17-libs
+BuildRequires:  llvm17-devel
+%global llvm_suffix -17
 %endif
 %if "%toolchain" == "clang"
 BuildRequires:  lld
@@ -497,13 +498,6 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/')
 export MOZ_DEBUG_FLAGS=" "
 %endif
 
-# -mtls-dialect=gnu2 is not recognized by clang-20
-%if "%toolchain" == "clang"
-%ifarch x86_64
-#MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %%{__sed} -e 's/-mtls-dialect=gnu2//')
-%endif
-%endif
-
 # We don't want firefox to use CK_GCM_PARAMS_V3 in nss
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -DNSS_PKCS11_3_0_STRICT"
 
@@ -597,7 +591,7 @@ sed -i -e 's|#!/usr/bin/env python3|#!/usr/bin/env python3.11|' mach
 env | grep "WAYLAND"
 MOZ_ENABLE_WAYLAND=1 ./mach build -v 2>&1 | cat - && exit 1
 %else
-xvfb-run ./mach build  2>&1 | cat - || exit 1
+xvfb-run ./mach build -v 2>&1 | cat - || exit 1
 %endif
 %else
 ./mach build -v 2>&1 | cat - || exit 1

From e6c13d721ba671b679692f7ebc4e4927a7022493 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 20 Sep 2025 20:18:52 +0200
Subject: [PATCH 459/473] Re-organize PGO+Wayland builds

---
 icecat.spec | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 2cf195c..b04f2ed 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -20,25 +20,19 @@ ExcludeArch: %{ix86} %{arm}
 # Downgrade optimization
 %global less_optbuild 0
 
-# Build PGO+LTO on x86_64 and aarch64 only due to build issues
-# on other arches.
+# Build PGO+LTO on x86_64 and aarch64 only
 %ifarch x86_64 %{arm64}
 %if 0%{?release_build}
 %global build_with_pgo 1
-%global pgo_wayland    0
+%global pgo_wayland    1
+%global launch_wayland_compositor 1
 %else
 %global build_with_pgo 0
 %global pgo_wayland    0
-%endif
-%endif
-
 %global launch_wayland_compositor 0
-%if 0%{?build_with_pgo}
-%global launch_wayland_compositor 1
+%endif
 %endif
 
-# Disable LTO to work around rhbz#1883904
-#define _lto_cflags #{nil}
 ####################
 
 # Active/Deactive language files handling
@@ -245,15 +239,16 @@ BuildRequires:  lld
 %endif
 BuildRequires: rust
 BuildRequires: rustfmt
+
 %if 0%{?pgo_wayland}
+BuildRequires:  xorg-x11-server-Xvfb
 BuildRequires:  mutter
 BuildRequires:  gsettings-desktop-schemas
 BuildRequires:  gnome-settings-daemon
 BuildRequires:  mesa-dri-drivers
 BuildRequires:  xorg-x11-server-Xwayland
-%endif
-%if 0%{?build_with_pgo}
-BuildRequires:  xorg-x11-server-Xvfb
+BuildRequires:  dbus-x11
+BuildRequires:  gnome-keyring
 %endif
 
 %if 0%{?big_endian}

From bac41826b05f9b67abbfef142de904533172ec06 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 20 Sep 2025 20:58:43 +0200
Subject: [PATCH 460/473] Add compiler-rt19 BR

---
 icecat.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index b04f2ed..3779383 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -227,11 +227,13 @@ BuildRequires: llvm
 BuildRequires:  clang19
 BuildRequires:  clang19-libs
 BuildRequires:  llvm19-devel
+BuildRequires:  compiler-rt19
 %global llvm_suffix -19
 %else
 BuildRequires:  clang17
 BuildRequires:  clang17-libs
 BuildRequires:  llvm17-devel
+BuildRequires:  compiler-rt17
 %global llvm_suffix -17
 %endif
 %if "%toolchain" == "clang"

From dd1ff590fb6def353fd623938762f3df8c0ced99 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 20 Sep 2025 22:35:10 +0200
Subject: [PATCH 461/473] Kill MUTTER_PID

---
 icecat.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 3779383..f0484b0 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -594,6 +594,10 @@ xvfb-run ./mach build -v 2>&1 | cat - || exit 1
 ./mach build -v 2>&1 | cat - || exit 1
 %endif
 
+%if %{build_with_pgo}
+kill $MUTTER_PID	
+%endif
+
 %install
 # set up our default bookmarks
 %if 0%{?fedora}

From 0082e2e455b0c5a8bb509db6327af9de8ee90d0d Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sat, 20 Sep 2025 22:42:50 +0200
Subject: [PATCH 462/473] Fix PGO macro

---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index f0484b0..fca662b 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -594,7 +594,7 @@ xvfb-run ./mach build -v 2>&1 | cat - || exit 1
 ./mach build -v 2>&1 | cat - || exit 1
 %endif
 
-%if %{build_with_pgo}
+%if 0%{?build_with_pgo}
 kill $MUTTER_PID	
 %endif
 

From 949daab63acc8e55dc70eb3c7dd05ebcdeb5836b Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 21 Sep 2025 12:33:51 +0200
Subject: [PATCH 463/473] Modify build command | Use constraints-build

---
 icecat.spec | 37 +++++--------------------------------
 1 file changed, 5 insertions(+), 32 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index fca662b..be7932b 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -154,6 +154,7 @@ Patch603: %{name}-gcc-always-inline.patch
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf213
 BuildRequires: bzip2-devel
+BuildRequires: build-constraints-rpm-macros
 BuildRequires: cairo-devel
 BuildRequires: cargo
 %if !0%{?use_bundled_cbindgen}
@@ -542,31 +543,14 @@ echo "ac_add_options MOZ_PGO=1" >> .mozconfig
 export CCACHE_DISABLE=1
 %endif
 
+# Require 4 GB of RAM per CPU core
+%constrain_build -m 4096
 %if %{?less_optbuild}
-MOZ_SMP_FLAGS=-j1
+echo "mk_add_options MOZ_MAKE_FLAGS=\"-j1\"" >> .mozconfig
 %else
-MOZ_SMP_FLAGS=-j1
-# On x86_64 architectures, Mozilla can build up to 4 jobs at once in parallel,
-# however builds tend to fail on other arches when building in parallel.
-%ifarch s390x %{arm64}
-[ -z "$RPM_BUILD_NCPUS" ] && \
-     RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
-[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
-%endif
-%ifarch x86_64 %{power64}
-[ -z "$RPM_BUILD_NCPUS" ] && \
-     RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
-[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
-[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
-[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
-[ "$RPM_BUILD_NCPUS" -ge 16 ] && MOZ_SMP_FLAGS=-j16
-[ "$RPM_BUILD_NCPUS" -ge 24 ] && MOZ_SMP_FLAGS=-j24
-[ "$RPM_BUILD_NCPUS" -ge 32 ] && MOZ_SMP_FLAGS=-j32
-[ "$RPM_BUILD_NCPUS" -ge 64 ] && MOZ_SMP_FLAGS=-j64
-%endif
+echo "mk_add_options MOZ_MAKE_FLAGS=\"-j%{_smp_build_ncpus}\"" >> .mozconfig
 %endif
 
-echo "mk_add_options MOZ_MAKE_FLAGS=\"$MOZ_SMP_FLAGS\"" >> .mozconfig
 echo "mk_add_options MOZ_SERVICES_SYNC=1" >> .mozconfig
 echo "export STRIP=/bin/true" >> .mozconfig
 
@@ -579,20 +563,9 @@ cp -p %{SOURCE19} .
 export CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG=true
 %endif
 
-	
-export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 #Use python 3.11 for mach
 sed -i -e 's|#!/usr/bin/env python3|#!/usr/bin/env python3.11|' mach
-%if 0%{?build_with_pgo}
-%if 0%{?pgo_wayland}
-env | grep "WAYLAND"
-MOZ_ENABLE_WAYLAND=1 ./mach build -v 2>&1 | cat - && exit 1
-%else
-xvfb-run ./mach build -v 2>&1 | cat - || exit 1
-%endif
-%else
 ./mach build -v 2>&1 | cat - || exit 1
-%endif
 
 %if 0%{?build_with_pgo}
 kill $MUTTER_PID	

From d0a50452edf1e0d2641018e945cfe06f6ea1dc5c Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 21 Sep 2025 12:43:50 +0200
Subject: [PATCH 464/473] Remove useless BR package

---
 icecat.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index be7932b..28cb717 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -154,7 +154,6 @@ Patch603: %{name}-gcc-always-inline.patch
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf213
 BuildRequires: bzip2-devel
-BuildRequires: build-constraints-rpm-macros
 BuildRequires: cairo-devel
 BuildRequires: cargo
 %if !0%{?use_bundled_cbindgen}

From 601940babcc4e33b80043a844b8965ac40f3d944 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 21 Sep 2025 14:32:41 +0200
Subject: [PATCH 465/473] Remove kill command

---
 icecat.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 28cb717..78f2c40 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -566,10 +566,6 @@ export CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG=true
 sed -i -e 's|#!/usr/bin/env python3|#!/usr/bin/env python3.11|' mach
 ./mach build -v 2>&1 | cat - || exit 1
 
-%if 0%{?build_with_pgo}
-kill $MUTTER_PID	
-%endif
-
 %install
 # set up our default bookmarks
 %if 0%{?fedora}

From 12620ddec75782e18c94cc1d7512a81f2708633e Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 21 Sep 2025 18:24:21 +0200
Subject: [PATCH 466/473] Set wayland environment

---
 icecat.spec | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/icecat.spec b/icecat.spec
index 78f2c40..83359a8 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -564,7 +564,13 @@ export CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG=true
 
 #Use python 3.11 for mach
 sed -i -e 's|#!/usr/bin/env python3|#!/usr/bin/env python3.11|' mach
+
+%if 0%{?pgo_wayland} 
+env | grep "WAYLAND"
+MOZ_ENABLE_WAYLAND=1 ./mach build -v 2>&1 | cat - || exit 1
+%else
 ./mach build -v 2>&1 | cat - || exit 1
+%endif
 
 %install
 # set up our default bookmarks

From 67543ab854e7f58aab98c612df368b7571e078c1 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 21 Sep 2025 19:55:28 +0200
Subject: [PATCH 467/473] Fix Wayland compositor script

---
 icecat.spec            | 10 +++++-----
 run-wayland-compositor | 30 ++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/icecat.spec b/icecat.spec
index 83359a8..15d3d03 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -214,6 +214,7 @@ BuildRequires: pipewire-devel
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3.11-devel
+BuildRequires: python3-orjson
 BuildRequires: perl-interpreter
 BuildRequires: pkgconfig(xrender)
 BuildRequires: pkgconfig(libstartup-notification-1.0)
@@ -555,7 +556,7 @@ echo "export STRIP=/bin/true" >> .mozconfig
 
 %if 0%{?launch_wayland_compositor}
 cp -p %{SOURCE19} .
-. ./run-wayland-compositor	
+. ./run-wayland-compositor
 %endif
 
 %if %{?debug_build}
@@ -565,11 +566,10 @@ export CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG=true
 #Use python 3.11 for mach
 sed -i -e 's|#!/usr/bin/env python3|#!/usr/bin/env python3.11|' mach
 
-%if 0%{?pgo_wayland} 
-env | grep "WAYLAND"
-MOZ_ENABLE_WAYLAND=1 ./mach build -v 2>&1 | cat - || exit 1
-%else
 ./mach build -v 2>&1 | cat - || exit 1
+
+%if 0%{?build_with_pgo}
+kill $MUTTER_PID	
 %endif
 
 %install
diff --git a/run-wayland-compositor b/run-wayland-compositor
index 0480ed2..23ead19 100755
--- a/run-wayland-compositor
+++ b/run-wayland-compositor
@@ -20,21 +20,24 @@ if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
     # if not found, launch a new one
     eval `dbus-launch --sh-syntax`
 fi
-eval `echo '' | /usr/bin/gnome-keyring-daemon -r -d --unlock --components=secrets`
 
 if [ -z "$XDG_RUNTIME_DIR" ]; then
   export XDG_RUNTIME_DIR=$HOME
 fi
 
-. xvfb-run -s "-screen 0 1600x1200x24" -n 80 mutter --display=:80 --wayland --nested &
-export DISPLAY=:80
-
-if [ -z "$WAYLAND_DISPLAY" ] ; then
-  export WAYLAND_DISPLAY=wayland-0
-else
-  export WAYLAND_DISPLAY=wayland-1
+export WAYLAND_DISPLAY=icecat-pgo-wayland-0
+if [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; then
+  rm -f $XDG_RUNTIME_DIR/$WAYLAND_DISPLAY
+  rm -f $XDG_RUNTIME_DIR/$WAYLAND_DISPLAY.lock
 fi
-sleep 10
+
+echo "Launch mutter for $WAYLAND_DISPLAY"
+mutter --headless --virtual-monitor 1920x1080 --wayland-display=$WAYLAND_DISPLAY --no-x11 & MUTTER_PID=$!
+export MUTTER_PID
+echo "Mutter PID $MUTTER_PID"
+
+echo "Waiting for mutter to start..."
+sleep 5
 retry_count=0
 max_retries=5
 until [ $retry_count -gt $max_retries ]; do
@@ -47,4 +50,11 @@ until [ $retry_count -gt $max_retries ]; do
   fi
 done
 
-env | grep "DISPLAY"
+if [ ! -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; then
+  echo "Mutter failed to start!"
+  exit 1
+fi
+
+echo "Mutter is running, $XDG_RUNTIME_DIR/$WAYLAND_DISPLAY is here."
+
+

From c7108086b882ffa62255084f7b2ac2087a0c301d Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Sun, 12 Oct 2025 01:17:59 -0400
Subject: [PATCH 468/473] BuildRequires: mesa-libEGL

This too is needed to run mutter during the build. At least for flatpaks,
libglvnd-egl does not pull in mesa-libEGL, so that the latter can be
shipped as an extension rather than in the runtime.
---
 icecat.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/icecat.spec b/icecat.spec
index 15d3d03..351f0ec 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -249,6 +249,7 @@ BuildRequires:  mutter
 BuildRequires:  gsettings-desktop-schemas
 BuildRequires:  gnome-settings-daemon
 BuildRequires:  mesa-dri-drivers
+BuildRequires:  mesa-libEGL
 BuildRequires:  xorg-x11-server-Xwayland
 BuildRequires:  dbus-x11
 BuildRequires:  gnome-keyring

From 5c7dc50188ec23427a0b06878dcd843d667fcf15 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 14 Oct 2025 23:05:52 +0200
Subject: [PATCH 469/473] Release 140.4.0

---
 .gitignore                                    |  2 ++
 icecat-140.3.0-remove_frozen_cargo_flag.patch | 11 -----------
 icecat-lang_download.sh                       |  2 +-
 icecat.spec                                   | 11 ++---------
 sources                                       |  4 ++--
 5 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 icecat-140.3.0-remove_frozen_cargo_flag.patch

diff --git a/.gitignore b/.gitignore
index 5e6f785..322cada 100644
--- a/.gitignore
+++ b/.gitignore
@@ -288,3 +288,5 @@
 /icecat-128.14.0-rh1.tar.bz2
 /icecat-140.3.0-langpacks.tar.gz
 /icecat-140.3.0-rh1.tar.bz2
+/icecat-140.4.0-langpacks.tar.gz
+/icecat-140.4.0-rh1.tar.bz2
diff --git a/icecat-140.3.0-remove_frozen_cargo_flag.patch b/icecat-140.3.0-remove_frozen_cargo_flag.patch
deleted file mode 100644
index 5ba729e..0000000
--- a/icecat-140.3.0-remove_frozen_cargo_flag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/RunCbindgen.orig.py	2025-09-19 17:30:54.000000000 +0200
-+++ b/build/RunCbindgen.py	2025-09-20 15:53:53.173474575 +0200
-@@ -54,8 +54,6 @@
-     # tree, so we want to let Cargo create lock files in this case. When built
-     # within a tree, the Rust dependencies have been vendored in so Cargo won't
-     # touch the lock file.
--    if not buildconfig.substs.get("JS_STANDALONE"):
--        args.append("--frozen")
- 
-     stdout, returncode = _run_process(args)
- 
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 5444252..234df7f 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=140.3.0
+VERSION=140.4.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 351f0ec..388f0ca 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -94,7 +94,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   4
-Version: 140.3.0
+Version: 140.4.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
@@ -131,13 +131,8 @@ Source14: %{name}.desktop
 # cbingen
 Source17: cbindgen-vendor.tar.xz
 Source18: node-stdout-nonblocking-wrapper
-
 Source19: run-wayland-compositor
 
-# Gnuzilla patch:
-# https://lists.gnu.org/archive/html/help-gnuzilla/2025-09/msg00002.html
-Patch7:  icecat-140.3.0-remove_frozen_cargo_flag.patch
-
 # Fedora specific patches
 Patch221: firefox-nss-addon-hack.patch
 Patch224: %{name}-GLIBCXX-fix-for-GCC-12.patch
@@ -318,8 +313,6 @@ and translations langpack add-ons.
 # Copy license files
 tar -xf %{SOURCE5}
 
-%patch -P 7 -p 1 -b .frozen
-
 # Fedora patches
 %if 0%{?fedora}
 %patch -P 221 -p 1 -b .firefox-nss-addon-hack
@@ -570,7 +563,7 @@ sed -i -e 's|#!/usr/bin/env python3|#!/usr/bin/env python3.11|' mach
 ./mach build -v 2>&1 | cat - || exit 1
 
 %if 0%{?build_with_pgo}
-kill $MUTTER_PID	
+kill $MUTTER_PID
 %endif
 
 %install
diff --git a/sources b/sources
index 037d664..95b42b3 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 647dcadf3507bd05262613d03ff18a8c876bcbb4e83ce59f911128ae020ac16695298987c6c14f8b7a7aee5bb096740c6885c0a854d8b26431fc9a8ff864c369
-SHA512 (icecat-140.3.0-langpacks.tar.gz) = ee1f36e6adf38a98e6ac48f9db5603860cfc5e0a610b98fba7683d70c26474f64f78951df8dc2434362d46e297143f17791ca42180a85ce99d1ab96cf17ebdcf
-SHA512 (icecat-140.3.0-rh1.tar.bz2) = 4580dc49248292b8d1e3e9daea3feccf9042aa9184465e9ca40cfeeb1f63745dfa5b0dc32dd47a4b5a5eee66a28eb19e2d5c8e98f7d61c433bf1eb7e05cf1f31
+SHA512 (icecat-140.4.0-langpacks.tar.gz) = 10cc6b24baf85adf0fa62dcfb70a19896bd1b76fd1089d407181001d387c1ee2d18a7216be0d18093ed7233afedea23b8b9ed99dbd6c9b824d8984ba7160592b
+SHA512 (icecat-140.4.0-rh1.tar.bz2) = 053574810625cca918fd6e2aa569e49866e2c94bdeb76bb0e9b2ceccfba6477a941c8fc3ca7ba8954fe372e9e2c8f4ad124029e84b01cd8eb20da75de29ba0d6
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From e815651b48206bf2340e9b514ea40de6ef8d355a Mon Sep 17 00:00:00 2001
From: Gordon Messmer <gordon.messmer@gmail.com>
Date: Thu, 16 Oct 2025 14:32:32 -0700
Subject: [PATCH 470/473] Use rpm's native resource tunable to limit
 parallelism.

rpm 4.19 and newer have built-in tunable settings to limit
parallel tasks which make %constrain_build redundant.

See BZ#2404624
---
 icecat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icecat.spec b/icecat.spec
index 388f0ca..1811bae 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -538,7 +538,7 @@ export CCACHE_DISABLE=1
 %endif
 
 # Require 4 GB of RAM per CPU core
-%constrain_build -m 4096
+%global _smp_tasksize_proc 4096
 %if %{?less_optbuild}
 echo "mk_add_options MOZ_MAKE_FLAGS=\"-j1\"" >> .mozconfig
 %else

From 877e1d349473f60ac822b4864c0353af98058c8c Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Wed, 12 Nov 2025 21:11:37 +0100
Subject: [PATCH 471/473] Release 140.5.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 322cada..bb8c8b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -290,3 +290,5 @@
 /icecat-140.3.0-rh1.tar.bz2
 /icecat-140.4.0-langpacks.tar.gz
 /icecat-140.4.0-rh1.tar.bz2
+/icecat-140.5.0-langpacks.tar.gz
+/icecat-140.5.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 234df7f..60877a0 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=140.4.0
+VERSION=140.5.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 1811bae..acabc43 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -94,7 +94,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   4
-Version: 140.4.0
+Version: 140.5.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index 95b42b3..9212653 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 647dcadf3507bd05262613d03ff18a8c876bcbb4e83ce59f911128ae020ac16695298987c6c14f8b7a7aee5bb096740c6885c0a854d8b26431fc9a8ff864c369
-SHA512 (icecat-140.4.0-langpacks.tar.gz) = 10cc6b24baf85adf0fa62dcfb70a19896bd1b76fd1089d407181001d387c1ee2d18a7216be0d18093ed7233afedea23b8b9ed99dbd6c9b824d8984ba7160592b
-SHA512 (icecat-140.4.0-rh1.tar.bz2) = 053574810625cca918fd6e2aa569e49866e2c94bdeb76bb0e9b2ceccfba6477a941c8fc3ca7ba8954fe372e9e2c8f4ad124029e84b01cd8eb20da75de29ba0d6
+SHA512 (icecat-140.5.0-langpacks.tar.gz) = cf70c8926de6cb08caaf7bfefc9e99aa313e2233579934d0ea0b0c03288a09e8e6b8e55e9bdce5bf467256e85bc42deade1255fe9bbb1d4e565635765bc7952a
+SHA512 (icecat-140.5.0-rh1.tar.bz2) = 8601ea8b02f41502ce152bd6e171f3c866b69359d23a5572d9e4473cfd7a939ba3f6d67545eca7c61bb776358bc5523156a60ba8c88b02496944e25fee0af52f
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 76cf83117ee0df239b05474f6e2a78d944a5aae4 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Thu, 11 Dec 2025 12:04:28 +0100
Subject: [PATCH 472/473] Release 140.6.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 4 ++--
 sources                 | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index bb8c8b1..8e6c66e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -292,3 +292,5 @@
 /icecat-140.4.0-rh1.tar.bz2
 /icecat-140.5.0-langpacks.tar.gz
 /icecat-140.5.0-rh1.tar.bz2
+/icecat-140.6.0-langpacks.tar.gz
+/icecat-140.6.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 60877a0..e9b368e 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=140.5.0
+VERSION=140.6.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index acabc43..9d5cb90 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -94,13 +94,13 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   4
-Version: 140.5.0
+Version: 140.6.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
 License: (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later) AND GPL-3.0-or-later AND MIT AND BSD-4-Clause-UC AND ISC AND Apache-2.0 AND MPL-2.0
-URL:   http://www.gnu.org/software/gnuzilla/
+URL:     http://www.gnu.org/software/gnuzilla/
 
 ## Source archive created by scripts based on Gnuzilla files.
 ## All modified files are hosted in a dedicated fork repository:
diff --git a/sources b/sources
index 9212653..406260c 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 647dcadf3507bd05262613d03ff18a8c876bcbb4e83ce59f911128ae020ac16695298987c6c14f8b7a7aee5bb096740c6885c0a854d8b26431fc9a8ff864c369
-SHA512 (icecat-140.5.0-langpacks.tar.gz) = cf70c8926de6cb08caaf7bfefc9e99aa313e2233579934d0ea0b0c03288a09e8e6b8e55e9bdce5bf467256e85bc42deade1255fe9bbb1d4e565635765bc7952a
-SHA512 (icecat-140.5.0-rh1.tar.bz2) = 8601ea8b02f41502ce152bd6e171f3c866b69359d23a5572d9e4473cfd7a939ba3f6d67545eca7c61bb776358bc5523156a60ba8c88b02496944e25fee0af52f
+SHA512 (icecat-140.6.0-langpacks.tar.gz) = ebe0f017daf0b8560f250b6181ec142796b90b1e7e6338da2e339c1844ed957138781642843f9fa8445c62afe89aa3745cecdff6dbccfcef1ffddcd2b7ad059d
+SHA512 (icecat-140.6.0-rh1.tar.bz2) = 6d591eb9443dac5ecfdfa9b648f58cc393db97afe0faf6e05eed74db7eaf71d0ff77ec7437868c65503739bc79fbc37a92603c0e006a904477cf8c49cdbe2daf
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c

From 9bb51044667b988385bf7b4c659ce0dd8ce2020d Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Tue, 13 Jan 2026 22:43:09 +0100
Subject: [PATCH 473/473] Release 140.7.0

---
 .gitignore              | 2 ++
 icecat-lang_download.sh | 2 +-
 icecat.spec             | 2 +-
 sources                 | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8e6c66e..241f013 100644
--- a/.gitignore
+++ b/.gitignore
@@ -294,3 +294,5 @@
 /icecat-140.5.0-rh1.tar.bz2
 /icecat-140.6.0-langpacks.tar.gz
 /icecat-140.6.0-rh1.tar.bz2
+/icecat-140.7.0-langpacks.tar.gz
+/icecat-140.7.0-rh1.tar.bz2
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index e9b368e..3c0c445 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=140.6.0
+VERSION=140.7.0
 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
 
 for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index 9d5cb90..6e50c61 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -94,7 +94,7 @@ ExcludeArch: %{ix86} %{arm}
 
 Name:    icecat
 Epoch:   4
-Version: 140.6.0
+Version: 140.7.0
 Release: %autorelease -e %{redhat_ver}
 Summary: GNU version of Firefox browser
 
diff --git a/sources b/sources
index 406260c..889ba13 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (cbindgen-vendor.tar.xz) = 647dcadf3507bd05262613d03ff18a8c876bcbb4e83ce59f911128ae020ac16695298987c6c14f8b7a7aee5bb096740c6885c0a854d8b26431fc9a8ff864c369
-SHA512 (icecat-140.6.0-langpacks.tar.gz) = ebe0f017daf0b8560f250b6181ec142796b90b1e7e6338da2e339c1844ed957138781642843f9fa8445c62afe89aa3745cecdff6dbccfcef1ffddcd2b7ad059d
-SHA512 (icecat-140.6.0-rh1.tar.bz2) = 6d591eb9443dac5ecfdfa9b648f58cc393db97afe0faf6e05eed74db7eaf71d0ff77ec7437868c65503739bc79fbc37a92603c0e006a904477cf8c49cdbe2daf
+SHA512 (icecat-140.7.0-langpacks.tar.gz) = a4618e3272b48be4307c79222bdd55f321aefb6d6ba08beb10178d0b95530bc4130cf86901d0906e714bd75106ad8513957fe3ad335431c8faf5b2d9767e17de
+SHA512 (icecat-140.7.0-rh1.tar.bz2) = 7a19f7928322bea905828e6a4e981395687f1b649e37518a8000bcfcb29446b424ee592f708d0c7c93ebeb901820752785f883a937e9361e9f172a0a9bacb603
 SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c